Skip to content

Commit

Permalink
Work in progress with new Ethernet TUN/TAP interface.
Browse files Browse the repository at this point in the history
  • Loading branch information
jeremybennett committed Nov 26, 2010
1 parent 8f42ba5 commit ba4a376
Show file tree
Hide file tree
Showing 19 changed files with 325 additions and 247 deletions.
21 changes: 21 additions & 0 deletions ChangeLog
Original file line number Diff line number Diff line change
@@ -1,3 +1,24 @@
2010-11-26 Jeremy Bennett <[email protected]>

* configure: Regenerated.
* configure.ac: Updated version.
* peripheral/eth.c: Now uses TUN/TAP tunnelling. ETH_PHY
conditional compilation removed throughout.
<struct eth_device>: Redundant fields removed. New fields added.
(eth_controller_tx_clock): Use write to TAP instead of sendto
socket.
(eth_controller_rx_clock): Use read from TAP instead of recv from
socket.
(eth_reset): Socket initialization replaced by opening TAP.
(eth_rtx_type): Now string parameter. Currently "FILE" or "TAP"
permitted.
(eth_tap_dev): Created.
(eth_sock_if): Deleted.
(eth_sec_start, eth_sec_end, reg_ethernet_sec): Updated to add
tap_dev.
* peripheral/etch.h: ETH_PHY conditional compilation removed
throughout.

2010-11-25 Jeremy Bennett <[email protected]>

* configure: Regenerated.
Expand Down
20 changes: 10 additions & 10 deletions configure
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#! /bin/sh
# From configure.ac Id: configure.ac 420 2010-11-11 14:43:33Z jeremybennett using automake version AC_ACVERSION.
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.65 for or1ksim 2010-11-25.
# Generated by GNU Autoconf 2.65 for or1ksim 2010-11-26.
#
# Report bugs to <[email protected]>.
#
Expand Down Expand Up @@ -722,8 +722,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='or1ksim'
PACKAGE_TARNAME='or1ksim'
PACKAGE_VERSION='2010-11-25'
PACKAGE_STRING='or1ksim 2010-11-25'
PACKAGE_VERSION='2010-11-26'
PACKAGE_STRING='or1ksim 2010-11-26'
PACKAGE_BUGREPORT='[email protected]'
PACKAGE_URL=''

Expand Down Expand Up @@ -1476,7 +1476,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
\`configure' configures or1ksim 2010-11-25 to adapt to many kinds of systems.
\`configure' configures or1ksim 2010-11-26 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
Expand Down Expand Up @@ -1547,7 +1547,7 @@ fi

if test -n "$ac_init_help"; then
case $ac_init_help in
short | recursive ) echo "Configuration of or1ksim 2010-11-25:";;
short | recursive ) echo "Configuration of or1ksim 2010-11-26:";;
esac
cat <<\_ACEOF
Expand Down Expand Up @@ -1654,7 +1654,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
or1ksim configure 2010-11-25
or1ksim configure 2010-11-26
generated by GNU Autoconf 2.65
Copyright (C) 2009 Free Software Foundation, Inc.
Expand Down Expand Up @@ -2316,7 +2316,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
It was created by or1ksim $as_me 2010-11-25, which was
It was created by or1ksim $as_me 2010-11-26, which was
generated by GNU Autoconf 2.65. Invocation command line was
$ $0 $@
Expand Down Expand Up @@ -10717,7 +10717,7 @@ fi
# Define the identity of the package.
PACKAGE='or1ksim'
VERSION='2010-11-25'
VERSION='2010-11-26'
cat >>confdefs.h <<_ACEOF
Expand Down Expand Up @@ -13736,7 +13736,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
This file was extended by or1ksim $as_me 2010-11-25, which was
This file was extended by or1ksim $as_me 2010-11-26, which was
generated by GNU Autoconf 2.65. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
Expand Down Expand Up @@ -13802,7 +13802,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
or1ksim config.status 2010-11-25
or1ksim config.status 2010-11-26
configured by $0, generated by GNU Autoconf 2.65,
with options \\"\$ac_cs_config\\"
Expand Down
2 changes: 1 addition & 1 deletion configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@

# Use a full version number (x.y.z, possibly with "rcn" as a suffix) when
# preparing a release, otherwise use a the date version (yyyy-mm-dd).
AC_INIT([or1ksim], [2010-11-25], [[email protected]])
AC_INIT([or1ksim], [2010-11-26], [[email protected]])
AC_CONFIG_MACRO_DIR([m4])

# Generically use extensions such as _GNU_SOURCE if available.
Expand Down
4 changes: 2 additions & 2 deletions doc/or1ksim.info
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ File: or1ksim.info, Node: Preparation, Next: Configuring the Build, Up: Insta
Unpack the software and create a _separate_ directory in which to build
it:

tar jxf or1ksim-2010-11-25.tar.bz2
tar jxf or1ksim-2010-11-26.tar.bz2
mkdir builddir_or1ksim
cd builddir_or1ksim

Expand All @@ -81,7 +81,7 @@ The most significant argument is `--target', which should specify the
OpenRISC 1000 32-bit architecture. If this argument is omitted, it will
default to OpenRISC 1000 32-bit with a warning

../or1ksim-2010-11-25/configure --target=or32-uclinux ...
../or1ksim-2010-11-26/configure --target=or32-uclinux ...

There are several other options available, many of which are standard
to GNU `configure' scripts. Use `configure --help' to see all the
Expand Down
4 changes: 2 additions & 2 deletions doc/version.texi
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@set UPDATED 25 November 2010
@set UPDATED-MONTH November 2010
@set EDITION 2010-11-25
@set VERSION 2010-11-25
@set EDITION 2010-11-26
@set VERSION 2010-11-26
Loading

0 comments on commit ba4a376

Please sign in to comment.