From fa2e6e4b8ec83c04d2ff0bfb5891ba53ba2f549e Mon Sep 17 00:00:00 2001 From: Oyvind Repvik Date: Wed, 28 Feb 2007 08:35:00 +0000 Subject: Unbreak asterisk. Silly arm-specific variables --- packages/asterisk/asterisk_1.2.13.bb | 5 ++--- packages/asterisk/asterisk_1.2.14.bb | 5 ++--- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/packages/asterisk/asterisk_1.2.13.bb b/packages/asterisk/asterisk_1.2.13.bb index 42a3214f0a..3378f6e48b 100644 --- a/packages/asterisk/asterisk_1.2.13.bb +++ b/packages/asterisk/asterisk_1.2.13.bb @@ -2,7 +2,7 @@ DESCRIPTION="The Asterisk open source software PBX" HOMEPAGE="www.asterisk.org" LICENSE="GPL" DEPENDS="ncurses zlib openssl curl alsa-lib libogg libvorbis popt" -PR = "r1" +PR = "r2" SRC_URI="http://ftp.digium.com/pub/asterisk/releases/asterisk-${PV}.tar.gz \ file://uclibc-compat-getloadavg.patch;patch=1 \ @@ -15,8 +15,7 @@ export CROSS_COMPILE_BIN="${STAGING_BINDIR_CROSS}" export CROSS_COMPILE_TARGET="${STAGING_DIR}/${HOST_SYS}" export CROSS_ARCH="Linux" -export CROSS_PROC="arm" -export SUB_PROC="xscale" +export CROSS_PROC="${TARGET_ARCH}" export MAKECMDGOALS="dont-optimize" diff --git a/packages/asterisk/asterisk_1.2.14.bb b/packages/asterisk/asterisk_1.2.14.bb index 42a3214f0a..3378f6e48b 100644 --- a/packages/asterisk/asterisk_1.2.14.bb +++ b/packages/asterisk/asterisk_1.2.14.bb @@ -2,7 +2,7 @@ DESCRIPTION="The Asterisk open source software PBX" HOMEPAGE="www.asterisk.org" LICENSE="GPL" DEPENDS="ncurses zlib openssl curl alsa-lib libogg libvorbis popt" -PR = "r1" +PR = "r2" SRC_URI="http://ftp.digium.com/pub/asterisk/releases/asterisk-${PV}.tar.gz \ file://uclibc-compat-getloadavg.patch;patch=1 \ @@ -15,8 +15,7 @@ export CROSS_COMPILE_BIN="${STAGING_BINDIR_CROSS}" export CROSS_COMPILE_TARGET="${STAGING_DIR}/${HOST_SYS}" export CROSS_ARCH="Linux" -export CROSS_PROC="arm" -export SUB_PROC="xscale" +export CROSS_PROC="${TARGET_ARCH}" export MAKECMDGOALS="dont-optimize" -- cgit v1.2.3 From b1b994c23a68d11fc11f0242cc0ee308ca097a86 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Wed, 28 Feb 2007 09:00:00 +0000 Subject: openmoko-panel-demo(simple): fix packaging --- packages/openmoko-examples/openmoko-panel-demo-simple_svn.bb | 8 ++++++++ packages/openmoko-examples/openmoko-panel-demo_svn.bb | 2 ++ 2 files changed, 10 insertions(+) diff --git a/packages/openmoko-examples/openmoko-panel-demo-simple_svn.bb b/packages/openmoko-examples/openmoko-panel-demo-simple_svn.bb index 40d0f1aa8e..9f80fbf7dc 100644 --- a/packages/openmoko-examples/openmoko-panel-demo-simple_svn.bb +++ b/packages/openmoko-examples/openmoko-panel-demo-simple_svn.bb @@ -3,9 +3,17 @@ SECTION = "openmoko/examples" DEPENDS += "libmatchbox" PV = "0.0.1+svn${SRCDATE}" +PR = "r1" + inherit openmoko do_configure_prepend() { sed -i -e s:-Werror::g src/Makefile.am } + +FILES_${PN} += "${libdir}/matchbox-panel/*.so.*" +FILES_${PN}-dev += "${libdir}/matchbox-panel/*.so \ + ${libdir}/matchbox-panel/*.la" +FILES_${PN}-dbg += "${libdir}/matchbox-panel/.debug" + diff --git a/packages/openmoko-examples/openmoko-panel-demo_svn.bb b/packages/openmoko-examples/openmoko-panel-demo_svn.bb index ea40dd608d..6121bcccbc 100644 --- a/packages/openmoko-examples/openmoko-panel-demo_svn.bb +++ b/packages/openmoko-examples/openmoko-panel-demo_svn.bb @@ -5,3 +5,5 @@ PV = "0.0.1+svn${SRCDATE}" inherit openmoko +PARALLEL_MAKE = "" + -- cgit v1.2.3 From 6a256a1c7c66ddce7845df726723ff8959a8c174 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Wed, 28 Feb 2007 09:04:22 +0000 Subject: openmoko-session: fix depends, make startup 2 seconds faster and add some matchbox-panel-2 tweaks --- packages/openmoko-base/files/session | 7 ++----- packages/openmoko-base/openmoko-session_svn.bb | 4 ++-- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/packages/openmoko-base/files/session b/packages/openmoko-base/files/session index e6aeaa6c9d..6183038e3f 100644 --- a/packages/openmoko-base/files/session +++ b/packages/openmoko-base/files/session @@ -2,16 +2,13 @@ SHOWCURSOR="no" -rxvt & -sleep 2 - matchbox-desktop --icon-size 100 \ --icon-padding 60 \ --font sans-16 \ --titlefont sans-20:bold \ --bg img-tiled:/usr/share/themes/openmoko-standard/gtk-2.0/mokopanedwindow-upper-enclosing.png & # --bg col-gradient-vertical:#000000,#aaaaaa & -matchbox-panel --orientation north -b /usr/share/openmoko/pixmaps/openmoko-header-background.png & -matchbox-panel --orientation south -b /usr/share/openmoko/pixmaps/openmoko-footer-background.png -ns -nm --id 2 & +matchbox-panel & +matchbox-panel -ns -nm --id 2 & exec matchbox-window-manager -use_titlebar no -use_cursor $SHOWCURSOR $@ diff --git a/packages/openmoko-base/openmoko-session_svn.bb b/packages/openmoko-base/openmoko-session_svn.bb index 6cf588d9dc..bf7032ccde 100644 --- a/packages/openmoko-base/openmoko-session_svn.bb +++ b/packages/openmoko-base/openmoko-session_svn.bb @@ -1,8 +1,8 @@ DESCRIPTION = "Matchbox session files for OpenMoko" SECTION = "openmoko/base" -RDEPENDS = "matchbox matchbox-applet-startup-monitor gtk-theme-clearlooks" +RDEPENDS = "matchbox gconf matchbox-applet-startup-monitor gtk-theme-clearlooks" PV = "0.0+svn${SRCDATE}" -PR = "r1" +PR = "r2" inherit openmoko-base -- cgit v1.2.3 From 8ec7f11fbf28f46f2f917d9d6aae9d9b8c7b59be Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Wed, 28 Feb 2007 09:05:19 +0000 Subject: task-openmoko: switch back to matchbox-panel-2 now openmoko-session can handle it --- packages/tasks/task-openmoko.bb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/tasks/task-openmoko.bb b/packages/tasks/task-openmoko.bb index 57a0d045c1..1d748f1235 100644 --- a/packages/tasks/task-openmoko.bb +++ b/packages/tasks/task-openmoko.bb @@ -5,7 +5,7 @@ PACKAGE_ARCH = "all" LICENSE = "MIT" PROVIDES = "task-openmoko-everything" -PR = "r27" +PR = "r28" PACKAGES = "\ task-openmoko-linux \ @@ -80,7 +80,7 @@ RDEPENDS_task-openmoko-ui = "\ gtk+ \ matchbox-common \ matchbox-wm \ - matchbox-panel \ + matchbox-panel-2 \ xserver-kdrive-fbdev \ xserver-kdrive-common \ xserver-nodm-init \ @@ -101,7 +101,7 @@ RDEPENDS_task-openmoko-ui = "\ DESCRIPTION_task-openmoko-base = "OpenMoko: Main-Menu Launcher, Top Panel, and Footer" RDEPENDS_task-openmoko-base = "\ openmoko-mainmenu \ - matchbox-panel \ + matchbox-panel-2 \ openmoko-footer \ openmoko-taskmanager \ openmoko-panel-mainmenu \ -- cgit v1.2.3 From e6db4724e6c8a22897eb618f785d23be7706029d Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Wed, 28 Feb 2007 09:26:19 +0000 Subject: bitbake.conf: add matchbox-panel debug dirs --- conf/bitbake.conf | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/conf/bitbake.conf b/conf/bitbake.conf index ab9a28d628..0bba2a2e15 100644 --- a/conf/bitbake.conf +++ b/conf/bitbake.conf @@ -124,7 +124,8 @@ FILES_${PN}-dev = "${includedir} ${libdir}/lib*.so ${libdir}/*.la \ /lib/*.a /lib/*.o ${datadir}/aclocal" FILES_${PN}-locale = "${datadir}/locale" FILES_${PN}-dbg = "${bindir}/.debug ${sbindir}/.debug ${libexecdir}/.debug ${libdir}/.debug \ - /bin/.debug /sbin/.debug /lib/.debug ${libdir}/${PN}/.debug" + /bin/.debug /sbin/.debug /lib/.debug ${libdir}/${PN}/.debug \ + ${libdir}/matchbox-panel/.debug" # File manifest -- cgit v1.2.3 From 7dab346564aff7199eaf8609a18de1c43ea6805b Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Wed, 28 Feb 2007 09:48:32 +0000 Subject: openmoko-sesson: scale icons to 96px instead of 100px --- packages/openmoko-base/files/session | 2 +- packages/openmoko-base/openmoko-session_svn.bb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/openmoko-base/files/session b/packages/openmoko-base/files/session index 6183038e3f..82b9bfea9a 100644 --- a/packages/openmoko-base/files/session +++ b/packages/openmoko-base/files/session @@ -2,7 +2,7 @@ SHOWCURSOR="no" -matchbox-desktop --icon-size 100 \ +matchbox-desktop --icon-size 96 \ --icon-padding 60 \ --font sans-16 \ --titlefont sans-20:bold \ diff --git a/packages/openmoko-base/openmoko-session_svn.bb b/packages/openmoko-base/openmoko-session_svn.bb index bf7032ccde..13cf7bf0c2 100644 --- a/packages/openmoko-base/openmoko-session_svn.bb +++ b/packages/openmoko-base/openmoko-session_svn.bb @@ -2,7 +2,7 @@ DESCRIPTION = "Matchbox session files for OpenMoko" SECTION = "openmoko/base" RDEPENDS = "matchbox gconf matchbox-applet-startup-monitor gtk-theme-clearlooks" PV = "0.0+svn${SRCDATE}" -PR = "r2" +PR = "r3" inherit openmoko-base -- cgit v1.2.3 From 040dc88079885976327a2b51c31271645b1a1f83 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Wed, 28 Feb 2007 10:08:56 +0000 Subject: openmoko-session: start some panel applets by default --- packages/openmoko-base/files/session | 5 +++-- packages/openmoko-base/openmoko-session_svn.bb | 14 +++++++------- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/packages/openmoko-base/files/session b/packages/openmoko-base/files/session index 82b9bfea9a..4b3d50dd95 100644 --- a/packages/openmoko-base/files/session +++ b/packages/openmoko-base/files/session @@ -8,7 +8,8 @@ matchbox-desktop --icon-size 96 \ --titlefont sans-20:bold \ --bg img-tiled:/usr/share/themes/openmoko-standard/gtk-2.0/mokopanedwindow-upper-enclosing.png & # --bg col-gradient-vertical:#000000,#aaaaaa & -matchbox-panel & -matchbox-panel -ns -nm --id 2 & +matchbox-panel --start-applets=showdesktop,systray,windowselector --end-applets=openmoko-panel-demo-simple,openmoko-panel-battery,openmoko-panel-clock && +#can't figure out a way to start a panel-2 at the bottom... +#matchbox-panel & exec matchbox-window-manager -use_titlebar no -use_cursor $SHOWCURSOR $@ diff --git a/packages/openmoko-base/openmoko-session_svn.bb b/packages/openmoko-base/openmoko-session_svn.bb index 13cf7bf0c2..edb58b05fb 100644 --- a/packages/openmoko-base/openmoko-session_svn.bb +++ b/packages/openmoko-base/openmoko-session_svn.bb @@ -2,21 +2,21 @@ DESCRIPTION = "Matchbox session files for OpenMoko" SECTION = "openmoko/base" RDEPENDS = "matchbox gconf matchbox-applet-startup-monitor gtk-theme-clearlooks" PV = "0.0+svn${SRCDATE}" -PR = "r3" +PR = "r4" inherit openmoko-base -SRC_URI = "${OPENMOKO_MIRROR}/src/target/${OPENMOKO_RELEASE};module=etc;proto=https \ +SRC_URI = "${OPENMOKO_MIRROR}/src/target/${OPENMOKO_RELEASE};module=etc;proto=http \ file://session" S = "${WORKDIR}" do_install() { - cp -R ${S}/etc ${D}/etc - rm -fR ${D}/etc/.svn - rm -fR ${D}/etc/matchbox/.svn - chmod -R 755 ${D}/etc + cp -R ${S}/etc ${D}/${sysconfdir} + rm -fR ${D}/${sysconfdir}/.svn + rm -fR ${D}/${sysconfdir}/matchbox/.svn + chmod -R 755 ${D}/${sysconfdir} # DEMO only! - install -m 0755 ${WORKDIR}/session ${D}/etc/matchbox/session + install -m 0755 ${WORKDIR}/session ${D}/${sysconfdir}/matchbox/session } pkg_postinst_openmoko-session () { -- cgit v1.2.3 From 28a1342ea121686da11c9e4b8beb1e4095c7e5c3 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Wed, 28 Feb 2007 11:42:01 +0000 Subject: openmoko-session: use openmoko-footer instead of second panel (thanks Mickey!), start mbimputmgr by hand --- packages/openmoko-base/files/session | 9 ++++++--- packages/openmoko-base/openmoko-session_svn.bb | 2 +- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/packages/openmoko-base/files/session b/packages/openmoko-base/files/session index 4b3d50dd95..41bb8a2439 100644 --- a/packages/openmoko-base/files/session +++ b/packages/openmoko-base/files/session @@ -8,8 +8,11 @@ matchbox-desktop --icon-size 96 \ --titlefont sans-20:bold \ --bg img-tiled:/usr/share/themes/openmoko-standard/gtk-2.0/mokopanedwindow-upper-enclosing.png & # --bg col-gradient-vertical:#000000,#aaaaaa & -matchbox-panel --start-applets=showdesktop,systray,windowselector --end-applets=openmoko-panel-demo-simple,openmoko-panel-battery,openmoko-panel-clock && -#can't figure out a way to start a panel-2 at the bottom... -#matchbox-panel & +matchbox-panel --start-applets=showdesktop,systray,windowselector --end-applets=openmoko-panel-demo-simple,openmoko-panel-battery,openmoko-panel-clock & + +#start some old-style panel plugins to get a keyboard and battery status +mbinputmgr & + +openmoko-footer & exec matchbox-window-manager -use_titlebar no -use_cursor $SHOWCURSOR $@ diff --git a/packages/openmoko-base/openmoko-session_svn.bb b/packages/openmoko-base/openmoko-session_svn.bb index edb58b05fb..00e4ec6117 100644 --- a/packages/openmoko-base/openmoko-session_svn.bb +++ b/packages/openmoko-base/openmoko-session_svn.bb @@ -2,7 +2,7 @@ DESCRIPTION = "Matchbox session files for OpenMoko" SECTION = "openmoko/base" RDEPENDS = "matchbox gconf matchbox-applet-startup-monitor gtk-theme-clearlooks" PV = "0.0+svn${SRCDATE}" -PR = "r4" +PR = "r5" inherit openmoko-base -- cgit v1.2.3 From 3b2777f0f7b7e53b5168eacdc46b8aa8db4ccf8f Mon Sep 17 00:00:00 2001 From: Philip Balister Date: Wed, 28 Feb 2007 12:21:14 +0000 Subject: usrp-0.12.bb : Fix QA problems with python packages. Apply usb1.1 patch only for omap5912osk. --- packages/usrp/usrp_0.12.bb | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/packages/usrp/usrp_0.12.bb b/packages/usrp/usrp_0.12.bb index ade37baf60..b47ea9b62e 100644 --- a/packages/usrp/usrp_0.12.bb +++ b/packages/usrp/usrp_0.12.bb @@ -7,10 +7,11 @@ RDEPENDS = "python-core" PR = "r0" SRC_URI = "ftp://ftp.gnu.org/gnu/gnuradio/usrp-${PV}.tar.gz \ - file://usb11.patch;patch=1 \ file://fix_compile_h.patch;patch=1;pnum=3 \ file://install_test.patch;patch=1" +SRC_URI_append_omap5912osk = "file://usb11.patch;patch=1" + S = "${WORKDIR}/usrp-${PV}" inherit autotools pkgconfig @@ -35,5 +36,6 @@ do_stage () { install -m 644 firmware/include/usrp_spi_defs.h ${STAGING_INCDIR} } -PACKAGES += "python-pyursp" -FILES_python-pyursp = "${libdir}/python*" +PACKAGES += "python-pyusrp-dbg python-pyusrp" +FILES_python-pyusrp-dbg = "${libdir}/python*/site-packages/.debug" +FILES_python-pyusrp = "${libdir}/python*" -- cgit v1.2.3 From dfc393303a2a688bf00f609d993ab530ef377f6b Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Wed, 28 Feb 2007 13:07:50 +0000 Subject: bitbake.conf: ensure root flash size is set and default to '0' --- conf/bitbake.conf | 2 ++ 1 file changed, 2 insertions(+) diff --git a/conf/bitbake.conf b/conf/bitbake.conf index 0bba2a2e15..8fddb25df6 100644 --- a/conf/bitbake.conf +++ b/conf/bitbake.conf @@ -449,6 +449,8 @@ OES_BITBAKE_CONF = "1" MACHINE_FEATURES ?= "kernel26" DISTRO_FEATURES ?= "" +ROOT_FLASH_SIZE ?= "0" + GUI_MACHINE_CLASS ?= "smallscreen" DISTRO_EXTRA_RDEPENDS ?= "" -- cgit v1.2.3 From 976c51eb9c16c9f536018758ae39aa1f476d883e Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Wed, 28 Feb 2007 15:13:06 +0000 Subject: sparc-linux: add glib_cv_uscore=${glib_cv_uscore=no} --- site/sparc-linux | 3 +++ 1 file changed, 3 insertions(+) diff --git a/site/sparc-linux b/site/sparc-linux index 616510a38b..db1bb5eb91 100644 --- a/site/sparc-linux +++ b/site/sparc-linux @@ -46,3 +46,6 @@ am_cv_sys_posix_termios=${am_cv_sys_posix_termios=yes} # gettext am_cv_func_working_getline=${am_cv_func_working_getline=yes} + +#glib +glib_cv_uscore=${glib_cv_uscore=no} -- cgit v1.2.3 From 9a8e7e6686bc1f062586cd9f38f1ed08fa4a90fe Mon Sep 17 00:00:00 2001 From: Philip Balister Date: Wed, 28 Feb 2007 15:19:26 +0000 Subject: ossie-usrp-tx-control_svn.bb : Update path in subversion repository. --- packages/ossie/ossie-usrp-tx-control_svn.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/ossie/ossie-usrp-tx-control_svn.bb b/packages/ossie/ossie-usrp-tx-control_svn.bb index 0171b2d9f2..756fce9d61 100644 --- a/packages/ossie/ossie-usrp-tx-control_svn.bb +++ b/packages/ossie/ossie-usrp-tx-control_svn.bb @@ -9,7 +9,7 @@ DEPENDS = "ossiecf ossie-standardinterfaces" S = "${WORKDIR}/USRP_TX_Control" -SRC_URI = "svn://oe:oe@ossie-dev.mprg.org/repos/ossie/waveforms/USRP_TX_Control/trunk;module=USRP_TX_Control;proto=https" +SRC_URI = "svn://oe:oe@ossie-dev.mprg.org/repos/ossie/components/USRP_TX_Control/trunk;module=USRP_TX_Control;proto=https" prefix="/home/sca" -- cgit v1.2.3 From 53c4697821820b1b2bbdbb244c8c6202cb7dd4a7 Mon Sep 17 00:00:00 2001 From: Mike Westerhof Date: Wed, 28 Feb 2007 18:11:24 +0000 Subject: madwifi-ng: The wackelf patch also applies to compulab-pxa270 --- packages/madwifi/madwifi-ng_r.inc | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/madwifi/madwifi-ng_r.inc b/packages/madwifi/madwifi-ng_r.inc index 2124bfe6c1..2f476a8b3c 100644 --- a/packages/madwifi/madwifi-ng_r.inc +++ b/packages/madwifi/madwifi-ng_r.inc @@ -8,6 +8,7 @@ PR="r3" WACKELF_SRC_URI = "" WACKELF_SRC_URI_ixp4xx = " file://20-xscale-VFP-wackelf.patch;patch=1" +WACKELF_SRC_URI_compulab-pxa270 = " file://20-xscale-VFP-wackelf.patch;patch=1" SRC_URI = "http://snapshots.madwifi.org/${PN}/${PN}-${PV}.tar.gz \ file://10-xscale-be-elf-copts.patch;patch=1 \ -- cgit v1.2.3 From 71c77e8e02dba9a9cda8dbd5e1f16115fe823d40 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Wed, 28 Feb 2007 19:15:42 +0000 Subject: o-hand tasks: add 0.2 --- packages/ohand-tasks/.mtn2git_empty | 0 packages/ohand-tasks/tasks_0.2.bb | 12 ++++++++++++ 2 files changed, 12 insertions(+) create mode 100644 packages/ohand-tasks/.mtn2git_empty create mode 100644 packages/ohand-tasks/tasks_0.2.bb diff --git a/packages/ohand-tasks/.mtn2git_empty b/packages/ohand-tasks/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/ohand-tasks/tasks_0.2.bb b/packages/ohand-tasks/tasks_0.2.bb new file mode 100644 index 0000000000..ea9c1b0703 --- /dev/null +++ b/packages/ohand-tasks/tasks_0.2.bb @@ -0,0 +1,12 @@ +DESCRIPTION = "Tasks is a simple TODO application." +SECTION = "x11" +LICENSE = "LGPL" +PR = "r0" + +DEPENDS = "glib-2.0 gtk+ libglade eds-dbus" + +SRC_URI = "http://projects.o-hand.com/sources/tasks/${P}.tar.gz" + +inherit autotools pkgconfig gtk-icon-cache + + -- cgit v1.2.3 From eb5e55f8eb2da4a653a2da0486cd53e42f364df1 Mon Sep 17 00:00:00 2001 From: Philip Balister Date: Wed, 28 Feb 2007 23:34:00 +0000 Subject: ossie-usrp-tx-control_svn.bb : Fix path in ossie subversion server. --- packages/ossie/ossie-usrp-tx-control_svn.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/ossie/ossie-usrp-tx-control_svn.bb b/packages/ossie/ossie-usrp-tx-control_svn.bb index 0171b2d9f2..756fce9d61 100644 --- a/packages/ossie/ossie-usrp-tx-control_svn.bb +++ b/packages/ossie/ossie-usrp-tx-control_svn.bb @@ -9,7 +9,7 @@ DEPENDS = "ossiecf ossie-standardinterfaces" S = "${WORKDIR}/USRP_TX_Control" -SRC_URI = "svn://oe:oe@ossie-dev.mprg.org/repos/ossie/waveforms/USRP_TX_Control/trunk;module=USRP_TX_Control;proto=https" +SRC_URI = "svn://oe:oe@ossie-dev.mprg.org/repos/ossie/components/USRP_TX_Control/trunk;module=USRP_TX_Control;proto=https" prefix="/home/sca" -- cgit v1.2.3 From b47f572122d09f6462952bb8d7d19ea47cce538a Mon Sep 17 00:00:00 2001 From: Matthias Hentges Date: Thu, 1 Mar 2007 02:06:34 +0000 Subject: rootfs_ipk.bbclass: Implements a sensational new feature called 'oe-feed' which, for the first time ever, actually lets you use your ipk deploy dir as a feed in ipkg.conf./mtcommit ../classes/rootfs_ipk.bbclass Oh wait......we already could do that in the past, now couldn't we?? Set DEPLOY_ENABLE_OEFEED=1 in your shell env or local.conf to activate fast oe-feed/Packages creation, set DEPLOY_ENABLE_OEFEED=2 to enable traditional (and slooooow) oe-feed/Packages creation. --- classes/rootfs_ipk.bbclass | 43 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) diff --git a/classes/rootfs_ipk.bbclass b/classes/rootfs_ipk.bbclass index fdd42ee429..eeb2f3f4c4 100644 --- a/classes/rootfs_ipk.bbclass +++ b/classes/rootfs_ipk.bbclass @@ -31,6 +31,49 @@ rootfs_ipk_do_indexes () { fi fi done + + test "${DEPLOY_ENABLE_OEFEED}" -gt 0 && rootfs_create_combined_feed || /bin/true +} + +rootfs_create_combined_feed() { + + # Create deploy/oe-feed which can be used as a feed in ipkg.conf + # Set DEPLOY_ENABLE_OEFEED=2 to rebuild Packages with ipkg-make-index (very slow) + # Set DEPLOY_ENABLE_OEFEED=1 to use the Packages files from ipk/ARCH/ (fast) + + mkdir -p "${DEPLOY_DIR}/oe-feed" + cd "${DEPLOY_DIR}/oe-feed" || exit 1 + + # To catch deleted / changed packages, we have to completly rebuild + # the symlinks every time. + test -d "${DEPLOY_DIR}/oe-feed" && rm -rf "${DEPLOY_DIR}/oe-feed/" + + case "${DEPLOY_ENABLE_OEFEED}" in + 1) MAKE_INDEX_TYPE="fast" ;; + *) MAKE_INDEX_TYPE="traditional" ;; + esac + + for arch in $ipkgarchs + do + if test -d ${DEPLOY_DIR_IPK}/$arch/ + then + # Note: *.ipk won't work (too many arguments) + for ipk in `ls -1 "${DEPLOY_DIR_IPK}/$arch/" | grep ".ipk$"` + do + ln -s "${DEPLOY_DIR_IPK}/$arch/$ipk" . + done + fi + + # Doesn't get faster than that =) + test "$MAKE_INDEX_TYPE" = "fast" && cat ${DEPLOY_DIR_IPK}/$arch/Packages >> ./Packages + done + + if test "$MAKE_INDEX_TYPE" = "traditional" + then + rm -f ${DEPLOY_DIR}/oe-feed/Packages + touch ${DEPLOY_DIR}/oe-feed/Packages + ipkg-make-index -r ${DEPLOY_DIR}/oe-feed/Packages -p ${DEPLOY_DIR}/oe-feed/Packages -l ${DEPLOY_DIR}/oe-feed/Packages.filelist -m ${DEPLOY_DIR}/oe-feed/ + fi } fakeroot rootfs_ipk_do_rootfs () { -- cgit v1.2.3 From 716006a3dc9d250baf3e80a235300367daa2f949 Mon Sep 17 00:00:00 2001 From: Matthias Hentges Date: Thu, 1 Mar 2007 03:22:17 +0000 Subject: rootfs_ipk.bbclass: Work around PATH'ing problems in other image-related bbclasses and / or .bb's --- classes/rootfs_ipk.bbclass | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/classes/rootfs_ipk.bbclass b/classes/rootfs_ipk.bbclass index eeb2f3f4c4..c7b0b6cc1c 100644 --- a/classes/rootfs_ipk.bbclass +++ b/classes/rootfs_ipk.bbclass @@ -41,6 +41,7 @@ rootfs_create_combined_feed() { # Set DEPLOY_ENABLE_OEFEED=2 to rebuild Packages with ipkg-make-index (very slow) # Set DEPLOY_ENABLE_OEFEED=1 to use the Packages files from ipk/ARCH/ (fast) + OLD_PWD="$PWD" mkdir -p "${DEPLOY_DIR}/oe-feed" cd "${DEPLOY_DIR}/oe-feed" || exit 1 @@ -74,6 +75,9 @@ rootfs_create_combined_feed() { touch ${DEPLOY_DIR}/oe-feed/Packages ipkg-make-index -r ${DEPLOY_DIR}/oe-feed/Packages -p ${DEPLOY_DIR}/oe-feed/Packages -l ${DEPLOY_DIR}/oe-feed/Packages.filelist -m ${DEPLOY_DIR}/oe-feed/ fi + + # Some *-image.bb's are kinda touchy-feely about a changing $PWD + cd "$OLD_PWD" } fakeroot rootfs_ipk_do_rootfs () { -- cgit v1.2.3 From cdd0e350a24d329c2332ed8e45f6e6ce7d6b1085 Mon Sep 17 00:00:00 2001 From: Matthias Hentges Date: Thu, 1 Mar 2007 03:59:20 +0000 Subject: rootfs_ipk.bbclass: All good things... --- classes/rootfs_ipk.bbclass | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/classes/rootfs_ipk.bbclass b/classes/rootfs_ipk.bbclass index c7b0b6cc1c..43ea5cecd0 100644 --- a/classes/rootfs_ipk.bbclass +++ b/classes/rootfs_ipk.bbclass @@ -42,12 +42,12 @@ rootfs_create_combined_feed() { # Set DEPLOY_ENABLE_OEFEED=1 to use the Packages files from ipk/ARCH/ (fast) OLD_PWD="$PWD" - mkdir -p "${DEPLOY_DIR}/oe-feed" - cd "${DEPLOY_DIR}/oe-feed" || exit 1 # To catch deleted / changed packages, we have to completly rebuild # the symlinks every time. test -d "${DEPLOY_DIR}/oe-feed" && rm -rf "${DEPLOY_DIR}/oe-feed/" + mkdir -p "${DEPLOY_DIR}/oe-feed" + cd "${DEPLOY_DIR}/oe-feed" || exit 1 case "${DEPLOY_ENABLE_OEFEED}" in 1) MAKE_INDEX_TYPE="fast" ;; -- cgit v1.2.3 From 23ab0d6a49d623845add37f93fdc9218733cc63f Mon Sep 17 00:00:00 2001 From: Mike Westerhof Date: Thu, 1 Mar 2007 05:28:00 +0000 Subject: rootfs_ipk.bbclass: placate Fedora Core 5 by removing only the contents of the oe-feed directory and not the directory itself. --- classes/rootfs_ipk.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/classes/rootfs_ipk.bbclass b/classes/rootfs_ipk.bbclass index eeb2f3f4c4..4f9af8864c 100644 --- a/classes/rootfs_ipk.bbclass +++ b/classes/rootfs_ipk.bbclass @@ -46,7 +46,7 @@ rootfs_create_combined_feed() { # To catch deleted / changed packages, we have to completly rebuild # the symlinks every time. - test -d "${DEPLOY_DIR}/oe-feed" && rm -rf "${DEPLOY_DIR}/oe-feed/" + test -d "${DEPLOY_DIR}/oe-feed" && rm -rf "${DEPLOY_DIR}/oe-feed/*" case "${DEPLOY_ENABLE_OEFEED}" in 1) MAKE_INDEX_TYPE="fast" ;; -- cgit v1.2.3 From 292235480d1c86a2648b4f9f349253e57a9ae119 Mon Sep 17 00:00:00 2001 From: Mike Westerhof Date: Thu, 1 Mar 2007 05:51:23 +0000 Subject: disapproval of revision '5a21074748883be7137fee8d724cd0787c547ae8' --- classes/rootfs_ipk.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/classes/rootfs_ipk.bbclass b/classes/rootfs_ipk.bbclass index 4f9af8864c..eeb2f3f4c4 100644 --- a/classes/rootfs_ipk.bbclass +++ b/classes/rootfs_ipk.bbclass @@ -46,7 +46,7 @@ rootfs_create_combined_feed() { # To catch deleted / changed packages, we have to completly rebuild # the symlinks every time. - test -d "${DEPLOY_DIR}/oe-feed" && rm -rf "${DEPLOY_DIR}/oe-feed/*" + test -d "${DEPLOY_DIR}/oe-feed" && rm -rf "${DEPLOY_DIR}/oe-feed/" case "${DEPLOY_ENABLE_OEFEED}" in 1) MAKE_INDEX_TYPE="fast" ;; -- cgit v1.2.3 From dda2e9f4694ce2118ff6e764810a05188c04b081 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Thu, 1 Mar 2007 08:30:25 +0000 Subject: rootfs_ipk: as per OE policy: remove feed management tools --- classes/rootfs_ipk.bbclass | 47 ---------------------------------------------- 1 file changed, 47 deletions(-) diff --git a/classes/rootfs_ipk.bbclass b/classes/rootfs_ipk.bbclass index 43ea5cecd0..fdd42ee429 100644 --- a/classes/rootfs_ipk.bbclass +++ b/classes/rootfs_ipk.bbclass @@ -31,53 +31,6 @@ rootfs_ipk_do_indexes () { fi fi done - - test "${DEPLOY_ENABLE_OEFEED}" -gt 0 && rootfs_create_combined_feed || /bin/true -} - -rootfs_create_combined_feed() { - - # Create deploy/oe-feed which can be used as a feed in ipkg.conf - # Set DEPLOY_ENABLE_OEFEED=2 to rebuild Packages with ipkg-make-index (very slow) - # Set DEPLOY_ENABLE_OEFEED=1 to use the Packages files from ipk/ARCH/ (fast) - - OLD_PWD="$PWD" - - # To catch deleted / changed packages, we have to completly rebuild - # the symlinks every time. - test -d "${DEPLOY_DIR}/oe-feed" && rm -rf "${DEPLOY_DIR}/oe-feed/" - mkdir -p "${DEPLOY_DIR}/oe-feed" - cd "${DEPLOY_DIR}/oe-feed" || exit 1 - - case "${DEPLOY_ENABLE_OEFEED}" in - 1) MAKE_INDEX_TYPE="fast" ;; - *) MAKE_INDEX_TYPE="traditional" ;; - esac - - for arch in $ipkgarchs - do - if test -d ${DEPLOY_DIR_IPK}/$arch/ - then - # Note: *.ipk won't work (too many arguments) - for ipk in `ls -1 "${DEPLOY_DIR_IPK}/$arch/" | grep ".ipk$"` - do - ln -s "${DEPLOY_DIR_IPK}/$arch/$ipk" . - done - fi - - # Doesn't get faster than that =) - test "$MAKE_INDEX_TYPE" = "fast" && cat ${DEPLOY_DIR_IPK}/$arch/Packages >> ./Packages - done - - if test "$MAKE_INDEX_TYPE" = "traditional" - then - rm -f ${DEPLOY_DIR}/oe-feed/Packages - touch ${DEPLOY_DIR}/oe-feed/Packages - ipkg-make-index -r ${DEPLOY_DIR}/oe-feed/Packages -p ${DEPLOY_DIR}/oe-feed/Packages -l ${DEPLOY_DIR}/oe-feed/Packages.filelist -m ${DEPLOY_DIR}/oe-feed/ - fi - - # Some *-image.bb's are kinda touchy-feely about a changing $PWD - cd "$OLD_PWD" } fakeroot rootfs_ipk_do_rootfs () { -- cgit v1.2.3 From be3cc4b2e5bd53abee2aa9bb300727369996f306 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Thu, 1 Mar 2007 09:08:42 +0000 Subject: fic-gta01: set flash size to '60' instead of '60M' --- conf/machine/fic-gta01.conf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/conf/machine/fic-gta01.conf b/conf/machine/fic-gta01.conf index b47c81d476..f6b35d721b 100644 --- a/conf/machine/fic-gta01.conf +++ b/conf/machine/fic-gta01.conf @@ -7,7 +7,7 @@ TARGET_ARCH = "arm" PACKAGE_EXTRA_ARCHS = "armv4t" -PREFERRED_PROVIDER_virtual/kernel = "gta01-kernel" +PREFERRED_PROVIDER_virtual/kernel = "linux-gta01" MACHINE_FEATURES = "kernel26 apm alsa bluetooth usbgadget usbhost" @@ -26,7 +26,7 @@ MACHINE_TASK_PROVIDER = "task-base" SERIAL_CONSOLE = "115200 ttySAC0" # used by some images -ROOT_FLASH_SIZE = "60M" +ROOT_FLASH_SIZE = "60" # extra jffs2 tweaks EXTRA_IMAGECMD_jffs2 = "--eraseblock=0x4000 --pad -n" -- cgit v1.2.3 From 81705e540bce36684491a61e246fdd9eea9913b7 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Thu, 1 Mar 2007 09:48:10 +0000 Subject: sparc-linux: add more glib entries, provided by Jorik Jonker --- site/sparc-linux | 2 ++ 1 file changed, 2 insertions(+) diff --git a/site/sparc-linux b/site/sparc-linux index db1bb5eb91..4d74f52dbd 100644 --- a/site/sparc-linux +++ b/site/sparc-linux @@ -48,4 +48,6 @@ am_cv_sys_posix_termios=${am_cv_sys_posix_termios=yes} am_cv_func_working_getline=${am_cv_func_working_getline=yes} #glib +glib_cv_sizeof_system_thread=${glib_cv_sizeof_system_thread=4} +glib_cv_sizeof_gmutex=${glib_cv_sizeof_gmutex=24} glib_cv_uscore=${glib_cv_uscore=no} -- cgit v1.2.3 From f3bc368fcae8dba840ef39eb02a5dc815cda01f8 Mon Sep 17 00:00:00 2001 From: Oyvind Repvik Date: Thu, 1 Mar 2007 10:00:10 +0000 Subject: turbostation.conf: Add machine turbostation --- conf/machine/turbostation.conf | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 conf/machine/turbostation.conf diff --git a/conf/machine/turbostation.conf b/conf/machine/turbostation.conf new file mode 100644 index 0000000000..d3952e1d4a --- /dev/null +++ b/conf/machine/turbostation.conf @@ -0,0 +1,15 @@ +TARGET_ARCH = "powerpc" +TARGET_OS = "linux" +# TARGET_VENDOR = "oe" +PACKAGE_EXTRA_ARCHS = "ppc ppc603e" +# terminal specs - console, but no other ports +SERIAL_CONSOLE="115200 console" +USE_VT="0" + +MODUTILS=26 +MACHINE_TASK_PROVIDER = "task-base" +MACHINE_FEATURES= "kernel26 usbhost" +BOOTSTRAP_EXTRA_RDEPENDS = "udev mdadm" +PREFERRED_PROVIDER_virtual/kernel = "linux-turbostation" + +require conf/machine/include/tune-ppc603e.conf -- cgit v1.2.3 From d3364fe9b363f0d44fe9e9fdb970fbc7f2fc4bd6 Mon Sep 17 00:00:00 2001 From: Oyvind Repvik Date: Thu, 1 Mar 2007 10:00:45 +0000 Subject: linux: Add linux-turbostation --- packages/linux/linux-turbostation/.mtn2git_empty | 0 packages/linux/linux-turbostation/001_r1000.diff | 2334 ++++++++++++++++++++ .../linux/linux-turbostation/002_qnap-pic.diff | 407 ++++ .../linux-turbostation/2.6.20.1/.mtn2git_empty | 0 packages/linux/linux-turbostation/defconfig | 1435 ++++++++++++ .../linux-2.6.16_arch_ppc_platforms_Makefile | 13 + .../linux-2.6.16_arch_ppc_platforms_sandpoint.c | 293 +++ .../linux-2.6.16_arch_ppc_platforms_sandpoint.h | 52 + .../linux-2.6.16_arch_ppc_syslib_Makefile | 13 + .../linux-2.6.16_arch_ppc_syslib_mpc10x_common.c | 19 + .../linux-2.6.16_arch_ppc_syslib_open_pic.c | 14 + .../linux-2.6.16_drivers_i2c_chips_Kconfig | 17 + .../linux-2.6.16_drivers_i2c_chips_Makefile | 12 + .../linux-2.6.16_drivers_mtd_maps_physmap.c | 59 + .../linux-2.6.16_drivers_net_r8169.c | 13 + .../linux-2.6.16_include_asm-ppc_mpc10x.h | 14 + packages/linux/linux-turbostation_2.6.20.1.bb | 74 + 17 files changed, 4769 insertions(+) create mode 100644 packages/linux/linux-turbostation/.mtn2git_empty create mode 100644 packages/linux/linux-turbostation/001_r1000.diff create mode 100644 packages/linux/linux-turbostation/002_qnap-pic.diff create mode 100644 packages/linux/linux-turbostation/2.6.20.1/.mtn2git_empty create mode 100644 packages/linux/linux-turbostation/defconfig create mode 100644 packages/linux/linux-turbostation/linux-2.6.16_arch_ppc_platforms_Makefile create mode 100644 packages/linux/linux-turbostation/linux-2.6.16_arch_ppc_platforms_sandpoint.c create mode 100644 packages/linux/linux-turbostation/linux-2.6.16_arch_ppc_platforms_sandpoint.h create mode 100644 packages/linux/linux-turbostation/linux-2.6.16_arch_ppc_syslib_Makefile create mode 100644 packages/linux/linux-turbostation/linux-2.6.16_arch_ppc_syslib_mpc10x_common.c create mode 100644 packages/linux/linux-turbostation/linux-2.6.16_arch_ppc_syslib_open_pic.c create mode 100644 packages/linux/linux-turbostation/linux-2.6.16_drivers_i2c_chips_Kconfig create mode 100644 packages/linux/linux-turbostation/linux-2.6.16_drivers_i2c_chips_Makefile create mode 100644 packages/linux/linux-turbostation/linux-2.6.16_drivers_mtd_maps_physmap.c create mode 100644 packages/linux/linux-turbostation/linux-2.6.16_drivers_net_r8169.c create mode 100644 packages/linux/linux-turbostation/linux-2.6.16_include_asm-ppc_mpc10x.h create mode 100644 packages/linux/linux-turbostation_2.6.20.1.bb diff --git a/packages/linux/linux-turbostation/.mtn2git_empty b/packages/linux/linux-turbostation/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/linux/linux-turbostation/001_r1000.diff b/packages/linux/linux-turbostation/001_r1000.diff new file mode 100644 index 0000000000..0f94d685fa --- /dev/null +++ b/packages/linux/linux-turbostation/001_r1000.diff @@ -0,0 +1,2334 @@ +Index: linux-2.6.20.1/drivers/net/Kconfig +=================================================================== +--- linux-2.6.20.1.orig/drivers/net/Kconfig 2007-02-20 07:34:32.000000000 +0100 ++++ linux-2.6.20.1/drivers/net/Kconfig 2007-02-28 20:29:04.000000000 +0100 +@@ -2085,6 +2085,16 @@ + + If in doubt, say Y. + ++config R1000 ++ tristate "Realtek 8169 gigabit ethernet support (R1000)" ++ depends on PCI ++ select CRC32 ++ ---help--- ++ Say Y here if you have a Realtek 8169 PCI Gigabit Ethernet adapter. ++ ++ To compile this driver as a module, choose M here: the module ++ will be called r1000_n. This is recommended. ++ + config SIS190 + tristate "SiS190/SiS191 gigabit ethernet support" + depends on PCI +Index: linux-2.6.20.1/drivers/net/Makefile +=================================================================== +--- linux-2.6.20.1.orig/drivers/net/Makefile 2007-02-20 07:34:32.000000000 +0100 ++++ linux-2.6.20.1/drivers/net/Makefile 2007-02-28 20:29:04.000000000 +0100 +@@ -188,6 +188,7 @@ + obj-$(CONFIG_NET_NETX) += netx-eth.o + obj-$(CONFIG_DL2K) += dl2k.o + obj-$(CONFIG_R8169) += r8169.o ++obj-$(CONFIG_R1000) += r1000_n.o r1000_ioctl.o + obj-$(CONFIG_AMD8111_ETH) += amd8111e.o + obj-$(CONFIG_IBMVETH) += ibmveth.o + obj-$(CONFIG_S2IO) += s2io.o +Index: linux-2.6.20.1/drivers/net/r1000.h +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ linux-2.6.20.1/drivers/net/r1000.h 2007-02-28 20:29:04.000000000 +0100 +@@ -0,0 +1,390 @@ ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++ ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++ ++#define R1000_VERSION "1.05" ++#define RELEASE_DATE "2006/10/25" ++#define MODULENAME "r1000" ++#define R1000_DRIVER_NAME MODULENAME R1000_VERSION ", the Linux device driver for Realtek Ethernet Controllers" ++#define PFX MODULENAME ": " ++ ++ ++#undef R1000_DEBUG ++#undef R1000_JUMBO_FRAME_SUPPORT ++//#undef R1000_HW_FLOW_CONTROL_SUPPORT ++#define R1000_HW_FLOW_CONTROL_SUPPORT ++ ++ ++#undef R1000_IOCTL_SUPPORT ++#define R1000_USE_IO ++ ++#define R1000_BOTTOM_HALVES ++//#undef R1000_BOTTOM_HALVES ++ ++#ifdef R1000_DEBUG ++ #define assert(expr) \ ++ if(!(expr)) { printk( "Assertion failed! %s,%s,%s,line=%d\n", #expr,__FILE__,__FUNCTION__,__LINE__); } ++ #define DBG_PRINT( fmt, args...) printk("r1000: " fmt, ## args); ++#else ++ #define assert(expr) do {} while (0) ++ #define DBG_PRINT( fmt, args...) ; ++#endif // end of #ifdef R1000_DEBUG ++ ++/* media options */ ++#define MAX_UNITS 8 ++ ++#define OPTION_UNSET -1 ++#define OPTION_DISABLED 0 ++#define OPTION_ENABLED 1 ++ ++/* MAC address length*/ ++#define MAC_ADDR_LEN 6 ++ ++#define RX_FIFO_THRESH 7 /* 7 means NO threshold, Rx buffer level before first PCI xfer. */ ++#define RX_DMA_BURST 7 /* Maximum PCI burst, '6' is 1024 */ ++#define TX_DMA_BURST 7 /* Maximum PCI burst, '6' is 1024 */ ++#define ETTh 0x3F /* 0x3F means NO threshold */ ++ ++#define ETH_HDR_LEN 14 ++#define DEFAULT_MTU 1500 ++#define DEFAULT_RX_BUF_LEN 1536 ++ ++ ++#ifdef R1000_JUMBO_FRAME_SUPPORT ++#define MAX_JUMBO_FRAME_MTU ( 10000 ) ++#define MAX_RX_SKBDATA_SIZE ( MAX_JUMBO_FRAME_MTU + ETH_HDR_LEN ) ++#else ++//#define MAX_RX_SKBDATA_SIZE 1600 ++#define MAX_RX_SKBDATA_SIZE 1608 ++#endif //end #ifdef R1000_JUMBO_FRAME_SUPPORT ++ ++ ++#define InterFrameGap 0x03 /* 3 means InterFrameGap = the shortest one */ ++ ++#define NUM_TX_DESC 1024 /* Number of Tx descriptor registers*/ ++#define NUM_RX_DESC 1024 /* Number of Rx descriptor registers*/ ++ ++#define RTL_MIN_IO_SIZE 0x80 ++#define TX_TIMEOUT (6*HZ) ++#define R1000_TIMER_EXPIRE_TIME 100 //100 ++ ++#ifdef R1000_USE_IO ++#define RTL_W8(reg, val8) outb ((val8), ioaddr + (reg)) ++#define RTL_W16(reg, val16) outw ((val16), ioaddr + (reg)) ++#define RTL_W32(reg, val32) outl ((val32), ioaddr + (reg)) ++#define RTL_R8(reg) inb (ioaddr + (reg)) ++#define RTL_R16(reg) inw (ioaddr + (reg)) ++#define RTL_R32(reg) ((unsigned long) inl (ioaddr + (reg))) ++#else //R1000_USE_IO ++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,6) ++/* write/read MMIO register for Linux kernel 2.4.x*/ ++#define RTL_W8(reg, val8) writeb ((val8), ioaddr + (reg)) ++#define RTL_W16(reg, val16) writew ((val16), ioaddr + (reg)) ++#define RTL_W32(reg, val32) writel ((val32), ioaddr + (reg)) ++#define RTL_R8(reg) readb (ioaddr + (reg)) ++#define RTL_R16(reg) readw (ioaddr + (reg)) ++#define RTL_R32(reg) ((unsigned long) readl (ioaddr + (reg))) ++#else ++/* write/read MMIO register for Linux kernel 2.6.x*/ ++#define RTL_W8(reg, val8) iowrite8 ((val8), (void *)(ioaddr + (reg))) ++#define RTL_W16(reg, val16) iowrite16 ((val16), (void *)(ioaddr + (reg))) ++#define RTL_W32(reg, val32) iowrite32 ((val32), (void *)(ioaddr + (reg))) ++#define RTL_R8(reg) ioread8 ((void *)(ioaddr + (reg))) ++#define RTL_R16(reg) ioread16 ((void *)(ioaddr + (reg))) ++#define RTL_R32(reg) ((unsigned long) ioread32 ((void *)(ioaddr + (reg)))) ++#endif ++#endif //R1000_USE_IO ++ ++#define MCFG_METHOD_1 0x01 ++#define MCFG_METHOD_2 0x02 ++#define MCFG_METHOD_3 0x03 ++#define MCFG_METHOD_4 0x04 ++#define MCFG_METHOD_5 0x05 ++#define MCFG_METHOD_11 0x0B ++#define MCFG_METHOD_12 0x0C ++#define MCFG_METHOD_13 0x0D ++#define MCFG_METHOD_14 0x0E ++#define MCFG_METHOD_15 0x0F ++ ++#define PCFG_METHOD_1 0x01 //PHY Reg 0x03 bit0-3 == 0x0000 ++#define PCFG_METHOD_2 0x02 //PHY Reg 0x03 bit0-3 == 0x0001 ++#define PCFG_METHOD_3 0x03 //PHY Reg 0x03 bit0-3 == 0x0002 ++ ++enum pci_config_header_registers { ++ VID = 0x00, ++ DID = 0x02, ++ Command = 0x04, ++ Status = 0x06, ++ Rev_ID = 0x08, ++ Class_Code = 0x09, ++ Cache_Line_Size = 0x0C, ++ Latency_Timer = 0x0D, ++ Header_type = 0x0E, ++ BIST = 0x0F, ++ IOAR = 0x10, ++ MEMAR = 0x14, ++ CIS_Pointer = 0x28, ++ Sub_VID = 0x2C, ++ Sub_DID = 0x2E, ++ BMAR = 0x30, ++ Interrupt_Line = 0x3C, ++ Interrutp_Pin = 0x3D, ++ Min_Gnt = 0x3E, ++ Max_Lat = 0x3F, ++}; ++ ++enum r1000_registers { ++ MAC0 = 0x00, ++ MAR0 = 0x08, ++ TxDescStartAddr = 0x20, ++ TxHDescStartAddr = 0x28, ++ FLASH = 0x30, ++ ERSR = 0x36, ++ ChipCmd = 0x37, ++ TxPoll = 0x38, ++ IntrMask = 0x3C, ++ IntrStatus = 0x3E, ++ TxConfig = 0x40, ++ RxConfig = 0x44, ++ TCTR = 0x48, ++ RxMissed = 0x4C, ++ Cfg9346 = 0x50, ++ Config0 = 0x51, ++ Config1 = 0x52, ++ Config2 = 0x53, ++ Config3 = 0x54, ++ Config4 = 0x55, ++ Config5 = 0x56, ++ TimerInt = 0x58, ++ MultiIntr = 0x5C, ++ PHYAR = 0x60, ++ TBICSR = 0x64, ++ TBI_ANAR = 0x68, ++ TBI_LPAR = 0x6A, ++ PHYstatus = 0x6C, ++ Off7Ch = 0x7C, ++ RxMaxSize = 0xDA, ++ CPlusCmd = 0xE0, ++ RxDescStartAddr = 0xE4, ++ ETThReg = 0xEC, ++ FuncEvent = 0xF0, ++ FuncEventMask = 0xF4, ++ FuncPresetState = 0xF8, ++ FuncForceEvent = 0xFC, ++}; ++ ++enum r1000_register_content { ++ /*InterruptStatusBits*/ ++ SYSErr = 0x8000, ++ PCSTimeout = 0x4000, ++ SWInt = 0x0100, ++ TxDescUnavail = 0x80, ++ RxFIFOOver = 0x40, ++ LinkChg = 0x20, ++ RxDescUnavail = 0x10, ++ TxErr = 0x08, ++ TxOK = 0x04, ++ RxErr = 0x02, ++ RxOK = 0x01, ++ ++ //TCTR/TimerInt contetn ++ CLK_tick = 0x1770, //for PCI clock=33MHz 0x1770=200usec ++ ++ /*RxStatusDesc*/ ++ RxRES = 0x00200000, ++ RxCRC = 0x00080000, ++ RxRUNT = 0x00100000, ++ RxRWT = 0x00400000, ++ ++ /*ChipCmdBits*/ ++ CmdReset = 0x10, ++ CmdRxEnb = 0x08, ++ CmdTxEnb = 0x04, ++ RxBufEmpty = 0x01, ++ ++ /*Cfg9346Bits*/ ++ Cfg9346_Lock = 0x00, ++ Cfg9346_Unlock = 0xC0, ++ ++ /*rx_mode_bits*/ ++ AcceptErr = 0x20, ++ AcceptRunt = 0x10, ++ AcceptBroadcast = 0x08, ++ AcceptMulticast = 0x04, ++ AcceptMyPhys = 0x02, ++ AcceptAllPhys = 0x01, ++ ++ /*RxConfigBits*/ ++ RxCfgFIFOShift = 13, ++ RxCfgDMAShift = 8, ++ ++ /*TxConfigBits*/ ++ TxInterFrameGapShift = 24, ++ TxDMAShift = 8, ++ ++ //C+ Command Register ++ CPCR_MulRW_Enable = 0x0008, ++ ++ /*rtl8169_PHYstatus (MAC offset 0x6C)*/ ++ TBI_Enable = 0x80, ++ TxFlowCtrl = 0x40, ++ RxFlowCtrl = 0x20, ++ _1000Mbps = 0x10, ++ _100Mbps = 0x08, ++ _10Mbps = 0x04, ++ LinkStatus = 0x02, ++ FullDup = 0x01, ++ ++ /*GIGABIT_PHY_registers*/ ++ PHY_CTRL_REG = 0, ++ PHY_STAT_REG = 1, ++ PHY_AUTO_NEGO_REG = 4, ++ PHY_1000_CTRL_REG = 9, ++ ++ /*GIGABIT_PHY_REG_BIT*/ ++ PHY_Restart_Auto_Nego = 0x0200, ++ PHY_Enable_Auto_Nego = 0x1000, ++ ++ //PHY_STAT_REG = 1; ++ PHY_Auto_Neco_Comp = 0x0020, ++ ++ //PHY_AUTO_NEGO_REG = 4; ++ PHY_Cap_10_Half = 0x0020, ++ PHY_Cap_10_Full = 0x0040, ++ PHY_Cap_100_Half = 0x0080, ++ PHY_Cap_100_Full = 0x0100, ++ ++ //PHY_1000_CTRL_REG = 9; ++ PHY_Cap_1000_Full = 0x0200, ++ PHY_Cap_1000_Half = 0x0100, ++ ++ PHY_Cap_PAUSE = 0x0400, ++ PHY_Cap_ASYM_PAUSE = 0x0800, ++ ++ PHY_Cap_Null = 0x0, ++ ++ /*_MediaType*/ ++ _10_Half = 0x01, ++ _10_Full = 0x02, ++ _100_Half = 0x04, ++ _100_Full = 0x08, ++ _1000_Full = 0x10, ++ ++ /*_TBICSRBit*/ ++ TBILinkOK = 0x02000000, ++}; ++ ++ ++ ++enum _DescStatusBit { ++ OWNbit = 0x80000000, ++ EORbit = 0x40000000, ++ FSbit = 0x20000000, ++ LSbit = 0x10000000, ++}; ++ ++ ++struct TxDesc { ++ u32 status; ++ u32 vlan_tag; ++ u32 buf_addr; ++ u32 buf_Haddr; ++}; ++ ++struct RxDesc { ++ u32 status; ++ u32 vlan_tag; ++ u32 buf_addr; ++ u32 buf_Haddr; ++}; ++ ++#define r1000_request_timer( timer, timer_expires, timer_func, timer_data ) \ ++{ \ ++ init_timer(timer); \ ++ timer->expires = (unsigned long)(jiffies + timer_expires); \ ++ timer->data = (unsigned long)(timer_data); \ ++ timer->function = (void *)(timer_func); \ ++ add_timer(timer); \ ++ DBG_PRINT("request_timer at 0x%08lx\n", (unsigned long)timer); \ ++} ++ ++#define r1000_delete_timer( del_timer_t ) \ ++{ \ ++ del_timer(del_timer_t); \ ++ DBG_PRINT("delete_timer at 0x%08lx\n", (unsigned long)del_timer_t); \ ++} ++ ++#define r1000_mod_timer( timer, timer_expires ) \ ++{ \ ++ mod_timer( timer, jiffies + timer_expires ); \ ++} ++ ++typedef struct timer_list rt_timer_t; ++ ++struct r1000_private { ++ unsigned long ioaddr; /* memory map physical address*/ ++ struct pci_dev *pci_dev; /* Index of PCI device */ ++ struct net_device_stats stats; /* statistics of net device */ ++ spinlock_t lock; /* spin lock flag */ ++ spinlock_t tx_lock; /* tx spin lock flag */ ++ spinlock_t rx_lock; /* rx spin lock flag */ ++ int chipset; ++ int mcfg; ++ int pcfg; ++ rt_timer_t r1000_timer; ++ unsigned long expire_time; ++ ++#ifdef R1000_BOTTOM_HALVES ++ struct tasklet_struct r1000_rx_tasklet; ++ struct tasklet_struct r1000_tx_tasklet; ++#endif //R1000_BOTTOM_HALVES ++ ++ unsigned int tx_cnt; ++ ++ unsigned long phy_link_down_cnt; ++ unsigned long cur_rx; /* Index into the Rx descriptor buffer of next Rx pkt. */ ++ unsigned long cur_tx; /* Index into the Tx descriptor buffer of next Rx pkt. */ ++ unsigned long dirty_tx; ++ struct TxDesc *TxDescArray; /* Index of 256-alignment Tx Descriptor buffer */ ++ struct RxDesc *RxDescArray; /* Index of 256-alignment Rx Descriptor buffer */ ++ struct sk_buff *Tx_skbuff[NUM_TX_DESC];/* Index of Transmit data buffer */ ++ struct sk_buff *Rx_skbuff[NUM_RX_DESC];/* Receive data buffer */ ++ unsigned char drvinit_fail; ++ ++ dma_addr_t txdesc_array_dma_addr[NUM_TX_DESC]; ++ dma_addr_t rxdesc_array_dma_addr[NUM_RX_DESC]; ++ dma_addr_t rx_skbuff_dma_addr[NUM_RX_DESC]; ++ ++ void *txdesc_space; ++ dma_addr_t txdesc_phy_dma_addr; ++ int sizeof_txdesc_space; ++ ++ void *rxdesc_space; ++ dma_addr_t rxdesc_phy_dma_addr; ++ int sizeof_rxdesc_space; ++ ++ int curr_mtu_size; ++ int tx_pkt_len; ++ int rx_pkt_len; ++ ++ int hw_rx_pkt_len; ++ ++ u16 speed; ++ u8 duplex; ++ u8 autoneg; ++}; ++ ++ +Index: linux-2.6.20.1/drivers/net/r1000_ioctl.c +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ linux-2.6.20.1/drivers/net/r1000_ioctl.c 2007-02-28 20:29:04.000000000 +0100 +@@ -0,0 +1,129 @@ ++#include "r1000.h" ++ ++extern int R1000_READ_GMII_REG(unsigned long ioaddr, int RegAddr); ++extern int R1000_WRITE_GMII_REG(unsigned long ioaddr, int RegAddr, int value); ++extern int r1000_set_medium(struct net_device *netdev,u16 speed,u8 duplex,u8 autoneg); ++ ++static int ethtool_get_settings(struct net_device *netdev,struct ethtool_cmd *ecmd){ ++ struct r1000_private *priv = (struct r1000_private *)(netdev->priv); ++ unsigned long ioaddr = priv->ioaddr; ++ unsigned int bmcr = R1000_READ_GMII_REG(ioaddr,PHY_STAT_REG); ++ unsigned int bmsr = R1000_READ_GMII_REG(ioaddr,PHY_AUTO_NEGO_REG); ++ unsigned int gbcr = R1000_READ_GMII_REG(ioaddr,PHY_1000_CTRL_REG); ++ ++ ecmd->supported = (SUPPORTED_10baseT_Half| ++ SUPPORTED_10baseT_Full| ++ SUPPORTED_100baseT_Half| ++ SUPPORTED_100baseT_Full| ++ SUPPORTED_1000baseT_Full| ++ SUPPORTED_Autoneg| ++ SUPPORTED_TP); ++ ++ ecmd->advertising = ADVERTISED_TP; ++ ++ if(bmsr&ADVERTISE_10HALF) ++ ecmd->advertising |= ADVERTISED_10baseT_Half; ++ if(bmsr&ADVERTISE_10FULL) ++ ecmd->advertising |= ADVERTISED_10baseT_Full; ++ if(bmsr&ADVERTISE_100HALF) ++ ecmd->advertising |= ADVERTISED_100baseT_Half; ++ if(bmsr&ADVERTISE_100FULL) ++ ecmd->advertising |= ADVERTISED_100baseT_Full; ++ if(gbcr&PHY_Cap_1000_Full) ++ ecmd->advertising |= ADVERTISED_1000baseT_Full; ++ if(bmcr&PHY_Enable_Auto_Nego) ++ ecmd->advertising |= ADVERTISED_Autoneg; ++ ++ ecmd->port = PORT_TP; ++ ++ if(priv->mcfg == MCFG_METHOD_1) ++ ecmd->transceiver = XCVR_EXTERNAL; ++ else ++ ecmd->transceiver = XCVR_INTERNAL; ++ ++ if(RTL_R8(PHYstatus)&LinkStatus){ ++ if(RTL_R8(PHYstatus)&_1000Mbps) ++ ecmd->speed = SPEED_1000; ++ else if(RTL_R8(PHYstatus)&_100Mbps) ++ ecmd->speed = SPEED_100; ++ else if(RTL_R8(PHYstatus)&_10Mbps) ++ ecmd->speed = SPEED_10; ++ ++ if(RTL_R8(PHYstatus)&FullDup) ++ ecmd->duplex = DUPLEX_FULL; ++ else ++ ecmd->duplex = DUPLEX_HALF; ++ ++ }else{ ++ ecmd->speed = -1; ++ ecmd->duplex = -1; ++ } ++ ecmd->autoneg = AUTONEG_ENABLE; ++ return 0; ++} ++ ++static int ethtool_set_settings(struct net_device *netdev,struct ethtool_cmd *ecmd){ ++ return r1000_set_medium(netdev,ecmd->speed,ecmd->duplex,ecmd->autoneg); ++} ++ ++static void ethtool_get_drvinfo(struct net_device *netdev,struct ethtool_drvinfo *drvinfo){ ++ struct r1000_private *priv = netdev_priv(netdev); ++ ++ strncpy(drvinfo->driver, MODULENAME,32); ++ strncpy(drvinfo->version, R1000_VERSION,32); ++ strncpy(drvinfo->fw_version, "N/A", 32); ++ strncpy(drvinfo->bus_info, pci_name(priv->pci_dev), 32); ++} ++ ++static int ethtool_nway_reset(struct net_device *netdev){ ++// struct r1000_private *priv = netdev_priv(netdev); ++ ++ if(netif_running(netdev)){ ++ } ++ ++ return 0; ++} ++ ++uint32_t ethtool_get_link(struct net_device *netdev){ ++ return netif_carrier_ok(netdev) ? 1 : 0; ++} ++ ++int ethtool_ioctl(struct ifreq *ifr){ ++ struct net_device *netdev=__dev_get_by_name(ifr->ifr_name); ++ void *useraddr=(void *)ifr->ifr_data; ++ uint32_t ethcmd; ++ ++ if(!capable(CAP_NET_ADMIN)) ++ return -EPERM; ++ ++ if(!netdev || !netif_device_present(netdev)) ++ return -ENODEV; ++ if(copy_from_user(ðcmd, useraddr, sizeof(ethcmd))) ++ return -EFAULT; ++ ++ switch (ethcmd){ ++ case ETHTOOL_GSET: ++ return ethtool_get_settings(netdev,useraddr); ++ case ETHTOOL_SSET: ++ return ethtool_set_settings(netdev,useraddr); ++ case ETHTOOL_GDRVINFO: ++ ethtool_get_drvinfo(netdev,useraddr); ++ case ETHTOOL_NWAY_RST: ++ return ethtool_nway_reset(netdev); ++ case ETHTOOL_GLINK: ++ return ethtool_get_link(netdev); ++ default: ++ return -EOPNOTSUPP; ++ } ++ return -EOPNOTSUPP; ++} ++ ++#if LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0) ++struct ethtool_ops r1000_ethtool_ops = { ++ .get_settings = ethtool_get_settings, ++ .set_settings = ethtool_set_settings, ++ .get_drvinfo = ethtool_get_drvinfo, ++ .nway_reset = ethtool_nway_reset, ++ .get_link = ethtool_get_link, ++}; ++#endif +Index: linux-2.6.20.1/drivers/net/r1000_n.c +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ linux-2.6.20.1/drivers/net/r1000_n.c 2007-02-28 20:29:04.000000000 +0100 +@@ -0,0 +1,1767 @@ ++//========================================================================= ++//Realtek Ethernet driver for Linux kernel 2.4.x. and 2.6.x ++//========================================================================= ++ ++#include "r1000.h" ++ ++#ifdef MODULE_PARM ++static int speed[MAX_UNITS] = {-1,-1,-1,-1,-1,-1,-1,-1}; ++ ++static int duplex[MAX_UNITS] = {-1,-1,-1,-1,-1,-1,-1,-1}; ++ ++static int autoneg[MAX_UNITS] = {-1,-1,-1,-1,-1,-1,-1,-1}; ++#endif //MODULE_PARM ++ ++/* Maximum events (Rx packets, etc.) to handle at each interrupt. */ ++static int max_interrupt_work = 20; ++ ++/* Maximum number of multicast addresses to filter (vs. Rx-all-multicast). ++ The RTL chips use a 64 element hash table based on the Ethernet CRC. */ ++static int multicast_filter_limit = 32; ++ ++const static struct { ++ const char *name; ++ u8 mcfg; /* depend on documents of Realtek */ ++ u32 RxConfigMask; /* should clear the bits supported by this chip */ ++} rtl_chip_info[] = { ++ { "RTL8169", MCFG_METHOD_1, 0xff7e1880 }, ++ { "RTL8169S/8110S", MCFG_METHOD_2, 0xff7e1880 }, ++ { "RTL8169S/8110S", MCFG_METHOD_3, 0xff7e1880 }, ++ { "RTL8169SB/8110SB", MCFG_METHOD_4, 0xff7e1880 }, ++ { "RTL8110SC", MCFG_METHOD_5, 0xff7e1880 }, ++ { "RTL8168B/8111B", MCFG_METHOD_11, 0xff7e1880 }, ++ { "RTL8168B/8111B", MCFG_METHOD_12, 0xff7e1880 }, ++ { "RTL8101E", MCFG_METHOD_13, 0xff7e1880 }, ++ { "RTL8100E", MCFG_METHOD_14, 0xff7e1880 }, ++ { "RTL8100E", MCFG_METHOD_15, 0xff7e1880 }, ++ { 0 } ++}; ++ ++ ++static struct pci_device_id r1000_pci_tbl[] __devinitdata = { ++ { 0x10ec, 0x8169, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 }, ++ { 0x10ec, 0x8167, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 }, ++ { 0x10ec, 0x8168, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 }, ++ { 0x10ec, 0x8136, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 }, ++ {0,} ++}; ++ ++ ++MODULE_DEVICE_TABLE (pci, r1000_pci_tbl); ++MODULE_AUTHOR ("Realtek"); ++MODULE_DESCRIPTION ("Linux device driver for Realtek Ethernet Controllers"); ++ ++#ifdef MODULE_PARM ++MODULE_PARM (speed, "1-" __MODULE_STRING(MAX_UNITS) "i"); ++MODULE_PARM_DESC(speed,"Link speed"); ++MODULE_PARM (duplex, "1-" __MODULE_STRING(MAX_UNITS) "i"); ++MODULE_PARM_DESC(duplex,"Link duplex"); ++MODULE_PARM (autoneg, "1-" __MODULE_STRING(MAX_UNITS) "i"); ++MODULE_PARM_DESC(autoneg,"Autonegotiation"); ++#else //MODULE_PARM ++/* Module Parameters are always initialized to -1, so that the driver ++ * can tell the difference between no user specified value or the ++ * user asking for the default value. ++ * The true default values are loaded in when e1000_check_options is called. ++ * ++ * This is a GCC extension to ANSI C. ++ * See the item "Labeled Elements in Initializers" in the section ++ * "Extensions to the C Language Family" of the GCC documentation. ++ */ ++#define R1000_PARAM_INIT { [0 ... MAX_UNITS] = OPTION_UNSET } ++/* All parameters are treated the same, as an integer array of values. ++ * This macro just reduces the need to repeat the same declaration code ++ * over and over (plus this helps to avoid typo bugs). ++ */ ++#define R1000_PARAM(X, S) \ ++ static int __devinitdata X[MAX_UNITS+1] = R1000_PARAM_INIT; \ ++ static int num_##X = 0; \ ++ module_param_array(X, int, &num_##X, 0); \ ++ MODULE_PARM_DESC(X, S); ++/* Link Speed ++ * Valid Values: 10Mbps, 100Mbps, and 1000Mbps ++ * Defaule value: 100Mbps ++ */ ++R1000_PARAM(speed, "Link speed"); ++/* Link duplex ++ * Valid Values: half duplex and full duplex ++ * Defaule value: full duplex ++ */ ++R1000_PARAM(duplex, "Link duplex"); ++/* Autonegotiation ++ * Valid Values: enable and disable ++ * Defaule value: enable ++ */ ++R1000_PARAM(autoneg, "Autonegotiation"); ++#endif //MODULE_PARM ++ ++MODULE_LICENSE("GPL"); ++ ++ ++static int r1000_open (struct net_device *netdev); ++static int r1000_start_xmit (struct sk_buff *skb, struct net_device *netdev); ++ ++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0) ++//typedef int irqreturn_t; ++#define IRQ_NONE 0 ++#define IRQ_HANDLED 1 ++static void r1000_interrupt (int irq, void *dev_instance, struct pt_regs *regs); ++#else ++static irqreturn_t r1000_interrupt (int irq, void *dev_instance, struct pt_regs *regs); ++#endif ++ ++static void r1000_init_ring (struct net_device *netdev); ++static void r1000_hw_start (struct net_device *netdev); ++static int r1000_close (struct net_device *netdev); ++static inline u32 ether_crc (int length, unsigned char *data); ++static void r1000_set_rx_mode (struct net_device *netdev); ++static void r1000_tx_timeout (struct net_device *netdev); ++static struct net_device_stats *r1000_get_stats(struct net_device *netdev); ++ ++#ifdef R1000_JUMBO_FRAME_SUPPORT ++static int r1000_change_mtu(struct net_device *netdev, int new_mtu); ++#endif //end #ifdef R1000_JUMBO_FRAME_SUPPORT ++ ++static void r1000_hw_PHY_config (struct net_device *netdev); ++static void r1000_hw_PHY_reset(struct net_device *netdev); ++//static const u16 r1000_intr_mask=LinkChg|RxDescUnavail|RxFIFOOver|TxErr|TxOK|RxErr|RxOK; ++static const u16 r1000_intr_mask=LinkChg|RxDescUnavail|TxErr|TxOK|RxErr|RxOK; ++static const unsigned int r1000_rx_config=(RX_FIFO_THRESH< 0 ; i -- ){ ++ // Check if the RTL8169 has completed writing to the specified MII register ++ if( ! (RTL_R32(PHYAR)&0x80000000) ){ ++ break; ++ } ++ else{ ++ udelay(100); ++ }// end of if( ! (RTL_R32(PHYAR)&0x80000000) ) ++ }// end of for() loop ++} ++//================================================================= ++int R1000_READ_GMII_REG( unsigned long ioaddr, int RegAddr ) ++{ ++ int i, value = -1; ++ ++ RTL_W32 ( PHYAR, 0x0 | (RegAddr&0xFF)<<16 ); ++ udelay(1000); ++ ++ for( i = 2000; i > 0 ; i -- ){ ++ // Check if the RTL8169 has completed retrieving data from the specified MII register ++ if( RTL_R32(PHYAR) & 0x80000000 ){ ++ value = (int)( RTL_R32(PHYAR)&0xFFFF ); ++ break; ++ } ++ else{ ++ udelay(100); ++ }// end of if( RTL_R32(PHYAR) & 0x80000000 ) ++ }// end of for() loop ++ return value; ++} ++ ++void r1000_phy_timer_t_handler( void *timer_data ) ++{ ++ struct net_device *netdev = (struct net_device *)timer_data; ++ struct r1000_private *priv = (struct r1000_private *) (netdev->priv); ++ unsigned long ioaddr = priv->ioaddr; ++ ++ assert( priv->mcfg > MCFG_METHOD_1 ); ++ assert( priv->pcfg < PCFG_METHOD_3 ); ++ ++ if( RTL_R8(PHYstatus) & LinkStatus ){ ++ priv->phy_link_down_cnt = 0 ; ++ } ++ else{ ++ priv->phy_link_down_cnt ++ ; ++ if( priv->phy_link_down_cnt >= 12 ){ ++ // If link on 1000, perform phy reset. ++ if( R1000_READ_GMII_REG( ioaddr, PHY_1000_CTRL_REG ) & PHY_Cap_1000_Full ) ++ { ++ DBG_PRINT("r1000_hw_PHY_reset\n"); ++ r1000_hw_PHY_reset(netdev); ++ } ++ ++ priv->phy_link_down_cnt = 0 ; ++ } ++ } ++ ++ //--------------------------------------------------------------------------- ++ //mod_timer is a more efficient way to update the expire field of an active timer. ++ //--------------------------------------------------------------------------- ++// r1000_mod_timer( (&priv->phy_timer_t), 100 ); ++} ++ ++void r1000_timer_handler( void *timer_data ) ++{ ++ struct net_device *netdev = (struct net_device *)timer_data; ++ struct r1000_private *priv = (struct r1000_private *) (netdev->priv); ++ ++ if( (priv->mcfg > MCFG_METHOD_1) && (priv->pcfg < PCFG_METHOD_3) ){ ++ DBG_PRINT("FIX PCS -> r1000_phy_timer_t_handler\n"); ++ priv->phy_link_down_cnt = 0; ++ r1000_phy_timer_t_handler( timer_data ); ++ } ++ ++ r1000_mod_timer( (&priv->r1000_timer), priv->expire_time ); ++} ++ ++static int r1000_set_speed_duplex(unsigned long ioaddr, unsigned int anar, unsigned int gbcr, unsigned int bmcr){ ++ unsigned int i = 0; ++ unsigned int bmsr; ++ ++ R1000_WRITE_GMII_REG(ioaddr,PHY_AUTO_NEGO_REG,anar); ++ R1000_WRITE_GMII_REG(ioaddr,PHY_1000_CTRL_REG,gbcr); ++ R1000_WRITE_GMII_REG(ioaddr,PHY_CTRL_REG,bmcr); ++ ++ for(i=0;i<10000;i++){ ++ bmsr = R1000_READ_GMII_REG(ioaddr,PHY_STAT_REG); ++ if(bmsr&PHY_Auto_Neco_Comp) ++ return 0; ++ } ++ return -1; ++} ++ ++static int __devinit r1000_init_board ( struct pci_dev *pdev, struct net_device **netdev_out, unsigned long *ioaddr_out) ++{ ++ unsigned long ioaddr = 0; ++ struct net_device *netdev; ++ struct r1000_private *priv; ++ int rc, i; ++#ifndef R1000_USE_IO ++ unsigned long mmio_start, mmio_end, mmio_flags, mmio_len; ++#endif ++ ++ assert (pdev != NULL); ++ assert (ioaddr_out != NULL); ++ ++ *ioaddr_out = 0; ++ *netdev_out = NULL; ++ ++ // dev zeroed in init_etherdev ++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,3,0) ++ netdev = init_etherdev (NULL, sizeof (*priv)); ++#else ++ netdev = alloc_etherdev (sizeof (*priv)); ++#endif ++ ++ if (netdev == NULL) { ++ printk (KERN_ERR PFX "unable to alloc new ethernet\n"); ++ return -ENOMEM; ++ } ++ ++ SET_MODULE_OWNER(netdev); ++ ++#if LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0) ++ SET_NETDEV_DEV(netdev, &pdev->dev); ++#endif ++ ++ priv = netdev->priv; ++ ++ // enable device (incl. PCI PM wakeup and hotplug setup) ++ rc = pci_enable_device (pdev); ++ if (rc) ++ goto err_out; ++ ++#ifndef R1000_USE_IO ++ mmio_start = pci_resource_start (pdev, 1); ++ mmio_end = pci_resource_end (pdev, 1); ++ mmio_flags = pci_resource_flags (pdev, 1); ++ mmio_len = pci_resource_len (pdev, 1); ++ ++ // make sure PCI base addr 1 is MMIO ++ if (!(mmio_flags & IORESOURCE_MEM)) { ++ printk (KERN_ERR PFX "region #1 not an MMIO resource, aborting\n"); ++ rc = -ENODEV; ++ goto err_out; ++ } ++ ++ // check for weird/broken PCI region reporting ++ if ( mmio_len < RTL_MIN_IO_SIZE ) { ++ printk (KERN_ERR PFX "Invalid PCI region size(s), aborting\n"); ++ rc = -ENODEV; ++ goto err_out; ++ } ++#endif ++ ++ rc = pci_request_regions (pdev, netdev->name); ++ if (rc) ++ goto err_out; ++ ++ // enable PCI bus-mastering ++ pci_set_master (pdev); ++ ++#ifdef R1000_USE_IO ++ ioaddr = pci_resource_start(pdev, 0); ++#else ++ // ioremap MMIO region ++ ioaddr = (unsigned long)ioremap (mmio_start, mmio_len); ++ if (ioaddr == 0) { ++ printk (KERN_ERR PFX "cannot remap MMIO, aborting\n"); ++ rc = -EIO; ++ goto err_out_free_res; ++ } ++#endif ++ ++ // Soft reset the chip. ++ RTL_W8 ( ChipCmd, CmdReset); ++ ++ // Check that the chip has finished the reset. ++ for (i = 1000; i > 0; i--){ ++ if ( (RTL_R8(ChipCmd) & CmdReset) == 0){ ++ break; ++ } ++ else{ ++ udelay (10); ++ } ++ } ++ ++ // identify config method ++ { ++ unsigned long val32 = (RTL_R32(TxConfig)&0x7c800000); ++ ++ if( val32 == 0x38800000) ++ priv->mcfg = MCFG_METHOD_15; ++ else if( val32 == 0x30800000) ++ priv->mcfg = MCFG_METHOD_14; ++ else if( val32 == 0x34000000) ++ priv->mcfg = MCFG_METHOD_13; ++ else if( val32 == 0x38000000) ++ priv->mcfg = MCFG_METHOD_12; ++ else if( val32 == 0x30000000) ++ priv->mcfg = MCFG_METHOD_11; ++ else if( val32 == 0x18000000) ++ priv->mcfg = MCFG_METHOD_5; ++ else if( val32 == 0x10000000 ) ++ priv->mcfg = MCFG_METHOD_4; ++ else if( val32 == 0x04000000 ) ++ priv->mcfg = MCFG_METHOD_3; ++ else if( val32 == 0x00800000 ) ++ priv->mcfg = MCFG_METHOD_2; ++ else if( val32 == 0x00000000 ) ++ priv->mcfg = MCFG_METHOD_1; ++ else ++ priv->mcfg = MCFG_METHOD_1; ++ } ++ { ++ unsigned char val8 = (unsigned char)(R1000_READ_GMII_REG(ioaddr,3)&0x000f); ++ if( val8 == 0x00 ){ ++ priv->pcfg = PCFG_METHOD_1; ++ } ++ else if( val8 == 0x01 ){ ++ priv->pcfg = PCFG_METHOD_2; ++ } ++ else if( val8 == 0x02 ){ ++ priv->pcfg = PCFG_METHOD_3; ++ } ++ else{ ++ priv->pcfg = PCFG_METHOD_3; ++ } ++ } ++ ++ ++ for (i = ARRAY_SIZE (rtl_chip_info) - 1; i >= 0; i--){ ++ if (priv->mcfg == rtl_chip_info[i].mcfg) { ++ priv->chipset = i; ++ goto match; ++ } ++ } ++ ++ //if unknown chip, assume array element #0, original RTL-8169 in this case ++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,10) ++ printk (KERN_DEBUG PFX "PCI device %s: unknown chip version, assuming RTL-8169\n", pdev->slot_name); ++#endif ++ priv->chipset = 0; ++ ++match: ++ *ioaddr_out = ioaddr; ++ *netdev_out = ne