--- unicorn-0.9.3.orig/debian/control +++ unicorn-0.9.3/debian/control @@ -0,0 +1,28 @@ +Source: unicorn +Section: non-free/net +Priority: optional +Maintainer: Sven Luther +Uploaders: Philippe Coval +Build-Depends: debhelper (>> 4.0.0), automake1.4, libgtk1.2-dev, quilt +Standards-Version: 3.7.3 +Homepage: http://www.bewan.com + +Package: unicorn +Architecture: i386 +Depends: ${shlibs:Depends} +Description: Monitoring applications for the Bewan ADSL PCI st and USB modems + This package contains applications useful for monitoring the state of the + Bewan ADSL modems. + +Package: unicorn-source +Architecture: all +Depends: make, debhelper, kernel-package, libc6-dev, quilt +Description: Source for the Bewan ADSL PCI st and USB unicorn driver + This package provides the source code for the unicorn kernel modules. + The unicorn package contains applications that can be useful to monitor the + state of the Bewan ADSL modems. Kernel source is required to compile these + modules. + . + Note that the sources build only for i386 for now, but if people would want + to use this modem on other arches, please tell me, and i will try to get the + proprietary part built for this arch. --- unicorn-0.9.3.orig/debian/changelog +++ unicorn-0.9.3/debian/changelog @@ -0,0 +1,193 @@ +unicorn (0.9.3-2) unstable; urgency=low + + * Add gentoo patches "bewan-adsl-0.9.3-patches-20061220.tar.gz" + * Fix modules build with m-a (LP: #945) + + -- Philippe Coval Sat, 29 Dec 2007 01:38:27 +0100 + +unicorn (0.9.3-1) unstable; urgency=low + + * New upstream release "A1012-A1006-A904-A888-A983-0.9.3.tgz" + * Added myself to uploaders. + + -- Philippe Coval Sat, 29 Dec 2007 01:17:54 +0100 + +unicorn (0.9.2-1) unstable; urgency=low + + * New upstream release (Closes: #301215) + - New modem software (0.1.0.10) for PCI with bug fix for Globespan + DSLAM and other interoperability fixes. + - Fixed a bug where changing USB bandwidth dynamically prevented the + adapters with AFE 20174 to work on kernel 2.6. + - Compile problem on kernel 2.6.9 fixed. (Closes: #279971) + - Fix compile problem for kernel 2.6.11. + - Include an option to change the modem SW library for PCI in case of + interoperability problems. To change the modem SW library to the old + 1.9.6.1 version, comment out the line NEW_MSW=1 in the PCI Makefile + (in the unicorn_pci directory). + + * Added libc6-dev as dependency to unicorn-source. (Closes: #267389) + + -- Sven Luther Fri, 2 Sep 2005 19:10:49 +0200 + +unicorn (0.8.7-1.1) unstable; urgency=high + + * NMU at maintainer's request. + * Changed unicorn from Architecture: any to Architecture: i386, since + other archs are currently not supported. (Closes: #267701) + + -- Ben Burton Thu, 26 Aug 2004 08:35:50 +1000 + +unicorn (0.8.7-1) unstable; urgency=medium + + * New upstream release. (Closes: #246800, #245311, #235614) + * Really supports 2.6 kernels now. Thanks to Nuutti Kotivuori + for testing and finsihing the 2.6 port. + (Closes: #234006) + + -- Sven Luther Tue, 17 Aug 2004 15:07:35 +0200 + +unicorn (0.8.3-1) unstable; urgency=low + + * New upstream release. + - Adds support for 2.6 kernels. + + -- Sven Luther Sun, 29 Feb 2004 12:00:49 +0100 + +unicorn (0.8-3) unstable; urgency=low + + * Mmm, let's use the provided libm instead, it ships in sources now, so + there should be no license problem, and the softADSL library seem to be + linking with it, and thus missing some symbols when using the glibc one. + + -- Sven Luther Fri, 20 Feb 2004 10:31:49 +0100 + +unicorn (0.8-2) unstable; urgency=low + + * Fixed missing libm.a library. + + -- Sven Luther Fri, 20 Feb 2004 09:16:49 +0100 + +unicorn (0.8-1) unstable; urgency=low + + * New upstream release. + - adds AFE 20174 support. + - possible fix for SMP machines. + + -- Sven Luther Tue, 17 Feb 2004 19:36:21 +0100 + +unicorn (0.7.6-2) unstable; urgency=low + + * Added small bewan icon for the unicorn status application. + * Now include example peers file provided by Marco d'Itri. + * 0.7.6 doesn't really work on 2.6.x kernels. It compiles, but does not + work yet. + + -- Sven Luther Tue, 9 Dec 2003 11:17:09 +0100 + +unicorn (0.7.6-1) unstable; urgency=low + + * New upstream release. + - Now compiles on newer kernels (2.4.23 & 2.6.x). + * Cleaned up README.Debian to not suggest to modify /etc/ppp/options. + (Closes: #215984). + + -- Sven Luther Mon, 8 Dec 2003 20:11:35 +0100 + +unicorn (0.7.4-2) unstable; urgency=low + + * Now install the unicorn scripts in the unicorn-modules package. + (Closes: #211024) + * Fixed Build-dependencies. (Closes: #203971) + + -- Sven Luther Sat, 4 Oct 2003 10:35:33 +0200 + +unicorn (0.7.4-1) unstable; urgency=low + + * New upstream release. + - unicorntest compiled with DEBUG. + - Fixes in the Makefiles. + - Workaround for SMP disconnection. + - Lock around TOSCA interrupts (for SMP). + - Setting useAFE based on board id. + - Minor changes in adsl parameters. + + -- Sven Luther Fri, 3 Oct 2003 18:22:22 +0200 + +unicorn (0.7.2-2) unstable; urgency=low + + * Fixed bewan_adsl_status pixmap path. (Closes: #211022) + + -- Sven Luther Tue, 16 Sep 2003 12:59:11 +0200 + +unicorn (0.7.2-1) unstable; urgency=low + + * New upstream release. + - Integrated debian Makefile changes. + - Forces the driver to run on cpu #0 only, fix SMP problems. + - Removed the autoconfig tool. + - Some Telecom Italia compatibility fixes. + + -- Sven Luther Tue, 9 Sep 2003 19:13:05 +0200 + +unicorn (0.7-1) unstable; urgency=low + + * New upstream release. + - The status application is now redimensioanable. (Closes: #188990) + - Moved the unicorn_atm code into the corresponding drivers, and removing + the broken unicorn_usb->unicorn_pci dependency (Closes: #204007) + - Added unicorn_eth driver to use ethernet instead of atm. + + -- Sven Luther Mon, 8 Sep 2003 15:55:37 +0200 + +unicorn (0.6.1-1) unstable; urgency=low + + * New upstream release. + - contains small fixes for gcc 3.3 and kernel 2.4.21. (Closes: #199018) + + -- Sven Luther Wed, 2 Jul 2003 13:38:35 +0200 + +unicorn (0.5.3-2) unstable; urgency=low + + * Removed the modem type detection from the Makefile and now build both the + usb and the pci modules. It did not work well, and people could build + the modules on a different box and it does not cost so much anyway. + + -- Sven Luther Sat, 17 May 2003 07:38:15 +0200 + +unicorn (0.5.3-1) unstable; urgency=low + + * New upstream release. + + -- Sven Luther Wed, 23 Apr 2003 16:57:39 +0200 + +unicorn (0.5.2-1) unstable; urgency=low + + * New upstream release. + * Adds a nice graphical status tool as well as an adsl autoconfiguration + program. + * Added a .desktop menu entry for bewan_adsl_status. + * Now put the uncorn source in a .tar.gz instead of a .tar.bz. + (Closes: #187565) + + -- Sven Luther Fri, 4 Apr 2003 15:38:19 +0200 + +unicorn (0.4.5-3) unstable; urgency=low + + * Now upload driver in a tarball. (Closes: #183952) + + -- Sven Luther Sat, 8 Mar 2003 21:37:25 +0100 + +unicorn (0.4.5-2) unstable; urgency=low + + * README.Debian did not get installed in the unicorn-source package, + corrected that. + + -- Sven Luther Thu, 6 Mar 2003 09:54:50 +0100 + +unicorn (0.4.5-1) unstable; urgency=low + + * Initial Release. + + -- Sven Luther Sat, 22 Feb 2003 21:26:43 +0100 + --- unicorn-0.9.3.orig/debian/unicorn-source.docs +++ unicorn-0.9.3/debian/unicorn-source.docs @@ -0,0 +1 @@ +README --- unicorn-0.9.3.orig/debian/watch +++ unicorn-0.9.3/debian/watch @@ -0,0 +1,3 @@ +version=3 +http://www.bewan.com/bewan/drivers \ + A1012-A1006-A904-A888-A983-(\d*\.\d*.\d*)\.tgz --- unicorn-0.9.3.orig/debian/conf.mk +++ unicorn-0.9.3/debian/conf.mk @@ -0,0 +1,3 @@ +#!/usr/bin/make -f +# Configuration for unicorn in Debian +export CONFIG_UNICORN = m --- unicorn-0.9.3.orig/debian/unicorn-modules.postinst.in +++ unicorn-0.9.3/debian/unicorn-modules.postinst.in @@ -0,0 +1,50 @@ +#! /bin/sh +# postinst script for unicorn-module +# +# see: dh_installdeb(1) + +set -e + +# summary of how this script can be called: +# * `configure' +# * `abort-upgrade' +# * `abort-remove' `in-favour' +# +# * `abort-deconfigure' `in-favour' +# `removing' +# +# for details, see http://www.debian.org/doc/debian-policy/ or +# the debian-policy package +# +# quoting from the policy: +# Any necessary prompting should almost always be confined to the +# post-installation script, and should be protected with a conditional +# so that unnecessary prompting doesn't happen if a package's +# installation fails and the `postinst' is called with `abort-upgrade', +# `abort-remove' or `abort-deconfigure'. + +case "$1" in + configure) + /sbin/depmod -ae -F /boot/System.map-#KERNEL_VERSION# + + ;; + + abort-upgrade|abort-remove|abort-deconfigure) + /sbin/depmod -ae -F /boot/System.map-#KERNEL_VERSION# + + ;; + + *) + echo "postinst called with unknown argument \`$1'" >&2 + exit 1 + ;; +esac + +# dh_installdeb will replace this with shell code automatically +# generated by other debhelper scripts. + +#DEBHELPER# + +exit 0 + + --- unicorn-0.9.3.orig/debian/unicorn.desktop +++ unicorn-0.9.3/debian/unicorn.desktop @@ -0,0 +1,10 @@ +[Desktop Entry] +Encoding=UTF-8 +Name=Unicorn status +Comment=Bewan ADSL modem status monitor +Exec=bewan_adsl_status +Icon=bewan.xpm +Terminal=false +Type=Application +Categories=GNOME;Application;System + --- unicorn-0.9.3.orig/debian/unicorn-source.override +++ unicorn-0.9.3/debian/unicorn-source.override @@ -0,0 +1,4 @@ +unicorn-source: script-not-executable ./usr/src/modules/unicorn/debian/unicorn-modules.postinst +unicorn-source: arch-independent-package-contains-binary-or-object ./usr/src/modules/unicorn/arch/i386/modem_ant_PCI.o +unicorn-source: arch-independent-package-contains-binary-or-object ./usr/src/modules/unicorn/arch/i386/modem_ant_USB.o + --- unicorn-0.9.3.orig/debian/rules +++ unicorn-0.9.3/debian/rules @@ -0,0 +1,364 @@ +#!/usr/bin/make -f +# Sample debian/rules that uses debhelper. +# GNU copyright 1997 by Joey Hess. +# +# This version is for a hypothetical package that can build a kernel modules +# architecture-dependant package via make-kpkg, as well as an +# architecture-independent module source package, and other packages +# either dep/indep for things like common files or userspace components +# needed for the kernel modules. + +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 + +DATE := $(shell date +%Y%m%d) +M := $(CURDIR) + +include /usr/share/quilt/quilt.make + +CFLAGS = -Wall -g + +ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) + CFLAGS += -O0 +else + CFLAGS += -O2 +endif +ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS))) + INSTALL_PROGRAM += -s +endif + +### KERNEL SETUP +### Setup the stuff needed for making kernel module packages +### taken from /usr/share/kernel-package/sample.module.rules + +# Name of package +sname=unicorn +# KSRC is the location of the kernel source. This is the default value, +# when make-kpkg is used it will supply to real value +KSRC = /usr/src/linux +# KDREV is the package-revision, as given to make-kpkg by the user. +# Just put a simply default value in here which we use when we test +# the packagebuilding without make-kpkg +ifeq ($(strip $(KDREV)),) +KDREV = "test1.0" +endif + +## Now to determine the kernel version, normally supplied by make-kpkg +ifeq ($(strip $(KVERS)),) +# Now we need to get the kernel-version somehow (we are not running +# under make-kpkg?) +ifeq ($(strip $(KSRC)),) +$(error Error. I do not know how to determine the kernel version) +else +kversion :=$(shell egrep '^VERSION +=' $(KSRC)/Makefile 2>/dev/null | \ + sed -e 's/[^0-9]*\([0-9]*\)/\1/') +kplevel :=$(shell egrep '^PATCHLEVEL +=' $(KSRC)/Makefile 2>/dev/null | \ + sed -e 's/[^0-9]*\([0-9]*\)/\1/') +ksublevel:=$(shell egrep '^SUBLEVEL +=' $(KSRC)/Makefile 2>/dev/null | \ + sed -e 's/[^0-9]*\([0-9]*\)/\1/') +EXTRA_VERSION:=$(shell egrep '^EXTRAVERSION +=' $(KSRC)/Makefile 2>/dev/null | \ + sed -e 's/EXTRAVERSION[\t ]*=[\t ]*\(.*\)/\1/') +kextra:=$(strip $(EXTRA_VERSION)) +HAVE_NEW_MODLIB:=$(shell egrep '\(INSTALL_MOD_PATH\)' \ + $(KSRC)/Makefile 2>/dev/null ) + +# If you want to have more than one kernel configuration per kernel +# version, set FLAVOUR in the top level kernel Makefile *before* +# invoking make-kpkg -- it will be appended to UTS_RELEASE in +# version.h (separated by a hyphen). This affects everything -- the +# names and versions of the image, source, headers, and doc packages, +# and where the modules are searched for in /lib/modules. + +ifdef FLAVOUR +# uhm - should check if we really have a Makefile capable of Flavours? +endif + +FLAVOUR:=$(shell grep ^FLAVOUR $(KSRC)/Makefile 2>/dev/null | \ + perl -ple 's/FLAVOUR[\s:=]+//g') + +ifneq ($(strip $(FLAVOUR)),) +INT_FLAV := -$(FLAVOUR) +FLAV_ARG := FLAVOUR=$(FLAVOUR) +else +INT_FLAV := +FLAV_ARG := +endif + +## This is the replacement for FLAVOUR +ifneq ($(strip $(APPEND_TO_VERSION)),) +iatv := $(strip $(APPEND_TO_VERSION)) +EXTRAV_ARG := EXTRAVERSION=${EXTRA_VERSION}${iatv} +else +iatv := +EXTRAV_ARG := +endif + +KVERS = $(kversion).$(kplevel).$(ksublevel)$(kextra)$(iatv)$(INT_FLAV) + +endif +endif + +non_epoch_version=$(shell echo $(KVERS) | perl -pe 's/^\d+://') +epoch=$(shell echo $(KVERS) | perl -ne 'm/^(\d+:)/ && print $$1') + +# We also need the package version +pversion = $(shell sed -ne '1s/.*\((.*)\).*/\1/' debian/changelog) +pversion = $(shell sed -ne '1s/.*(\(.*\)).*/\1/p' debian/changelog) + +# MODDIR is the place where the final .deb package should be made. This is the +# default value, when make-kpkg is used it will supply to real value +MODDIR = .. + +pmodules = $(sname)-modules-$(non_epoch_version) +psource = $(sname)-source + +# Prepares the package for distribution. Intended for the kernel +# maintainer. +kdist: kdist_clean kdist_config kdist_image + +# The kdist_configure target is called by make-kpkg modules_config. It +# should configure the module so it is ready for compilation (mostly +# useful for calling configure) +kdist_config: + @echo Nothing to configure + +# the kdist_image target is called by make-kpkg modules_image. It is +# responsible for compiling the module and creating the package. It +# should also clean up after making the module. Please note we use a +# seperate binary-modules target to make testing the package building +# easier +kdist_image: + $(MAKE) $(MFLAGS) -f debian/rules binary-modules + $(MAKE) $(MFLAGS) -f debian/rules clean + +# the kdist_clean target is called by make-kpkg modules_clean. It is +# responsible for cleaning up any changes that have been made by the +# other kdist_commands (except for the .deb files created). +kdist_clean: + $(MAKE) $(MFLAGS) debian/rules clean + +### end KERNEL SETUP + + +#ugly hack to use gentoo patches +CXX_FILES?=amu/amas.cpp amu/amu.cpp amu/bsp_pci.cpp amu/bsp_usb.cpp msw/msw.cpp + +GENERATED_C_FILES?=${CXX_FILES:.cpp=.c} + +%.c: %.cpp + ln -fs ${> debian/$(sname).substvars + echo "kpkg:Kernel-Version=$(non_epoch_version)" > \ + debian/$(pmodules).substvars + + # The substvars mechanism seems slightly broken, hack to get around it + # stolen from the qce-ga package. Yaaaa! + sed -e 's/$${kpkg\:Kernel\-Version}/$(non_epoch_version)/' \ + debian/control.in > debian/control + + dh_testdir + dh_testroot + dh_clean -k + # Build and install the module + if [ $(UNICORN_PATCHLEVEL) = 4 ]; then \ + $(MAKE) modules M=${CURDIR} HPATH=$(KSRC)/include KERNEL_SOURCES=$(KSRC); \ + $(MAKE) only_modules_install KERNEL_SOURCES=$(KSRC) \ + DESTDIR=$(CURDIR)/debian/$(pmodules) KVERS=$(KVERS); \ + elif [ $(UNICORN_PATCHLEVEL) = 6 ]; then \ + $(MAKE) -C libm modules; \ + $(MAKE) -C $(KSRC) SUBDIRS=$(CURDIR)/unicorn_pci $(KPKG_EXTRAV_ARG) \ + INSTALL_MOD_PATH=$(CURDIR)/debian/$(pmodules) modules modules_install; \ + $(MAKE) -C $(KSRC) SUBDIRS=$(CURDIR)/unicorn_usb $(KPKG_EXTRAV_ARG) \ + INSTALL_MOD_PATH=$(CURDIR)/debian/$(pmodules) modules modules_install; \ + fi + +# # Build the module +# $(MAKE) modules HPATH=$(KSRC)/include +# +# # Install the module +# $(MAKE) only_modules_install DESTDIR=$(CURDIR)/debian/$(pmodules) KVERS=$(KVERS) + mkdir -p $(CURDIR)/debian/$(pmodules)/usr/share/doc/$(pmodules) + cp -a scripts $(CURDIR)/debian/$(pmodules)/usr/share/doc/$(pmodules) + sed -e "s%#KERNEL_VERSION#%$(KVERS)%" \ + debian/$(sname)-modules.postinst.in >debian/$(sname)-modules.postinst + + dh_installdebconf + dh_installdocs README + dh_installchangelogs + + # We're not using this yet + #dh_installmodules + + dh_installdeb + dh_gencontrol -- -v$(epoch)$(pversion)+$(non_epoch_version)+$(KDREV) + #dh_gencontrol -- -v$(epoch)$(pversion) + dh_md5sums + dh_builddeb --destdir=$(KSRC)/.. + #dh_builddeb --destdir=$(MODDIR) + + +build-indep: configure-stamp build-indep-stamp +build-indep-stamp: + dh_testdir + + # Add here command to compile/build the arch indep package. + # It's ok not to do anything here, if you don't need to build + # anything for this package. + #/usr/bin/docbook-to-man debian/${sname}.sgml > ${sname}.1 + + touch build-indep-stamp + +build: build-arch build-indep + +clean: unpatch + dh_testdir + dh_testroot + rm -f build-arch-stamp build-indep-stamp configure-stamp + # Add here commands to clean up after the build process. + ${MAKE} -C adsl_status clean || echo "# $@" + ${MAKE} clean || echo "# $@" + rm -f ${GENERATED_C_FILES} + dh_clean + +install: DH_OPTIONS= +install: build + dh_testdir + dh_testroot + dh_clean -k + dh_installdirs + + # Create the directories to install the source into + dh_installdirs -p$(psource) usr/src/modules/${sname} + dh_installdirs -p$(psource) usr/src/modules/${sname}/debian + + # Copy only the driver source to the proper location + #cp -s driver/* debian/$(psource)/usr/src/modules/${sname} + cp -a amu arch include msw unicorn_atm README unicorn_eth \ + unicorn_pci unicorn_usb patches COPYING libm \ + scripts debian/$(psource)/usr/src/modules/${sname} + cp -a Makefile debian/$(psource)/usr/src/modules/${sname}/Makefile + install -m 644 debian/$(sname)-source.override \ + $(CURDIR)/debian/$(psource)/usr/share/lintian/overrides/${sname}-source + # Copy the needed debian/ pieces to the proper location + cp debian/*-modules.* \ + debian/$(psource)/usr/src/modules/${sname}/debian + cp debian/control.modules.in \ + debian/$(psource)/usr/src/modules/${sname}/debian/control.in + cp debian/rules \ + debian/$(psource)/usr/src/modules/${sname}/debian + cp debian/changelog \ + debian/$(psource)/usr/src/modules/${sname}/debian + cp debian/copyright \ + debian/$(psource)/usr/src/modules/${sname}/debian + cp debian/compat \ + debian/$(psource)/usr/src/modules/${sname}/debian + cp debian/conf.mk \ + debian/$(psource)/usr/src/modules/${sname}/debian + # And finally, make a tarball from the module source. + tar cfj debian/$(psource)/usr/src/${sname}.tar.bz2 \ + -C debian/$(psource)/usr/src modules + rm -rf debian/$(psource)/usr/src/modules + + # Add here commands to install the package into debian/${sname}. + $(MAKE) applis_install DESTDIR=$(CURDIR)/debian/${sname} prefix=/usr + cp Documentation/unicorntest.8 $(CURDIR)/debian/${sname}/usr/share/man/man8 + cp debian/${sname}.desktop $(CURDIR)/debian/${sname}/usr/share/applications + cp adsl_status/bewan.xpm $(CURDIR)/debian/${sname}/usr/share/pixmaps + cp debian/${sname}.override $(CURDIR)/debian/${sname}/usr/share/lintian/overrides/${sname} + + dh_install + +# Build architecture-independent files here. +# Pass -i to all debhelper commands in this target to reduce clutter. +binary-indep: build install + dh_testdir -i + dh_testroot -i + dh_installchangelogs -i + dh_installdocs -i debian/README.Debian + dh_installexamples -i +# dh_install -i +# dh_installmenu -i +# dh_installdebconf -i +# dh_installlogrotate -i +# dh_installemacsen -i +# dh_installpam -i +# dh_installmime -i +# dh_installinit -i +# dh_installcron -i +# dh_installinfo -i + dh_installman -i + dh_link -i + dh_compress -i + dh_fixperms -i + dh_installdeb -i +# dh_perl -i +# dh_python -i +# dh_makeshlibs -i + dh_installdeb -i + dh_shlibdeps -i + dh_gencontrol -i + dh_md5sums -i + dh_builddeb -i + +# Build architecture-dependent files here. +binary-arch: build install + dh_testdir -s + dh_testroot -s +# dh_installdebconf -s + dh_installdocs -s debian/peers-pppoatm + dh_installexamples -s + dh_installmenu -s +# dh_installlogrotate -s +# dh_installemacsen -s +# dh_installpam -s +# dh_installmime -s +# dh_installinit -s + dh_installcron -s +# dh_installman -s + dh_installinfo -s + dh_installchangelogs -s + dh_strip -s + dh_link -s + dh_compress -s + dh_fixperms -s +# dh_makeshlibs -s + dh_installdeb -s +# dh_perl -s + dh_shlibdeps -s + dh_gencontrol -s + dh_md5sums -s + dh_builddeb -s + +binary: binary-indep binary-arch +.PHONY: build clean binary-indep binary-arch binary install configure binary-modules kdist kdist_config kdist_image kdist_clean + +#eof "$Id: unicorn/debian/rules -- rzr $" --- unicorn-0.9.3.orig/debian/peers-pppoatm +++ unicorn-0.9.3/debian/peers-pppoatm @@ -0,0 +1,31 @@ +# xdslusb driver example configuration for PPPoA +# +# See the manual page pppd(8) for information on all the options. + +# MUST CHANGE: Uncomment the following line, replacing the user@provider.net +# by the DSL user name given to your by your DSL provider. +# There should be a matching entry with the password in /etc/ppp/pap-secrets +# and/or /etc/ppp/chap-secrets. +#user "myusername@myprovider.net" + +# VP and VC must match the ones used by your ISP. +plugin pppoatm.so 8.35 + +# Assumes that your IP address is allocated dynamically by the ISP. +noipdefault +# Try to get the name server addresses from the ISP. +usepeerdns +# Use this connection as the default route. +# Comment out if you already have the correct default route installed. +defaultroute + +# Makes pppd "dial again" when the connection is lost. +persist + +# Do not ask the remote to authenticate. +noauth + +# Do not try to negotiate compression. +nopcomp +noccp +novj --- unicorn-0.9.3.orig/debian/unicorn.docs +++ unicorn-0.9.3/debian/unicorn.docs @@ -0,0 +1 @@ +README --- unicorn-0.9.3.orig/debian/unicorn-source.dirs +++ unicorn-0.9.3/debian/unicorn-source.dirs @@ -0,0 +1,2 @@ +usr/src +usr/share/lintian/overrides --- unicorn-0.9.3.orig/debian/control.modules.in +++ unicorn-0.9.3/debian/control.modules.in @@ -0,0 +1,29 @@ +Source: unicorn +Section: non-free/net +Priority: optional +Maintainer: Sven Luther +Build-Depends: debhelper (>> 4.0.0) +Standards-Version: 3.6.1 + +Package: unicorn-modules-${kpkg:Kernel-Version} +Architecture: any +Provides: unicorn-modules +Suggests: unicorn, ppp (>= 2.4.2+20031002-2) +Description: Bewan ADSL PCI st and USB modems drivers for Linux (kernel ${kpkg:Kernel-Version}). + This package contains the set of loadable kernel modules for the + Bewan ADSL PCI st and Bewan ADSL USB modems. + . + This package contains the compiled kernel modules for ${kpkg:Kernel-Version} + The unicorn package contains applications that can be usefull to monitor the + state of the Bewan ADSL modems. + . + If you have compiled your own kernel, you will most likely need to build + your own unicorn-modules. The unicorn-source package has been + provided for use with the Debian kernel-package utility to produce a version + of unicorn-module for your kernel. + . + Note that this package is i386 only for now, but if people would want + to use this modem on other arches, please tell me, and i will try to get + the proprietary part built for this arch. + + --- unicorn-0.9.3.orig/debian/compat +++ unicorn-0.9.3/debian/compat @@ -0,0 +1 @@ +4 --- unicorn-0.9.3.orig/debian/README.Debian +++ unicorn-0.9.3/debian/README.Debian @@ -0,0 +1,61 @@ +unicorn for Debian +------------------ + +Please see ./README for a description of the unicorn software. + +The Debian unicorn source package provides two packages, + + 1) unicorn, which the provides userspace applications for monitoring the + Bewan ADSL modems + 2) unicorn-source, which provides the source for the kernel modules + +The unicorn-source package can be used in several ways, + + - Using the make-kpkg(1) command provided by the kernel-package Debian + package. This will produce a corresponding unicorn-modules package for + the Debian kernel-image package that you are using. This is "the Debian + way". See the "modules_image" section of the make-kpkg(1) man page. + Notice that you have to be root to build the unicorn-modules, i don't know + why this is, fakeroot is not enough, but sudo will do the trick. + + - Changing to the /usr/src/modules/unicorn/ directory and building as + the README file instructs using "make; make install". This will build + and install a module specific to the system you are building on and is + not under control of the packaging system. + +Note, KT400 users which have problems with the modem may find it useful to +#define KT400 at the start of : + + /usr/src/modules/unicorn/unicorn_pci/unicorn_pcidrv.c. + +Notice that you need a version of ppp with the pppoatm plugin enabled to be +able to connect to your ISP with the pppoatm protocol. Starting from version +2.4.2+20031002-2, the debian ppp package should do. + +You then need to do the following to bring up your connection in pppoatm mode : + + 1) You copy the provider script, found in the unicorn package, + /usr/share/doc/unicorn/peers-pppoatm to /etc/ppp/ + (or whatever you like, and edit it. You then only need to edit + the user line to to something like : + + user + + and adjust the 8.35 VPI/VCI values to the number your ISP provided you : + + plugin pppoatm.so 8.35 + + 2) Copy no_ppp_on_boot to ppp_on_boot and make it executable. Additionnaly, + you can edit it and change the default provider to whatever you renamed + the /etc/ppp/provider script (same as when doing pon ). + + 3) you add your isp password to the /etc/ppp/chap_secrets and/or + /etc/ppp/pap_secrets files as usual. + +You then only need to reboot your box, and the connection will come up. + + + + -- Sven Luther , Mon, 08 Dec 2003 20:08:52 +0100 --- unicorn-0.9.3.orig/debian/unicorn.dirs +++ unicorn-0.9.3/debian/unicorn.dirs @@ -0,0 +1,5 @@ +usr/bin +usr/share/applications +usr/share/pixmaps +usr/share/man/man8 +usr/share/lintian/overrides --- unicorn-0.9.3.orig/debian/unicorn.override +++ unicorn-0.9.3/debian/unicorn.override @@ -0,0 +1,3 @@ +unicorn: binary-without-manpage adsl-autoconfig +unicorn: binary-without-manpage bewan_adsl_status + --- unicorn-0.9.3.orig/debian/patches/series +++ unicorn-0.9.3/debian/patches/series @@ -0,0 +1,4 @@ +bewan-adsl-0.9.3-no-strip.patch +bewan-adsl-0.9.3-kernel-changes.patch +bewan-adsl-0.9.3-smp.patch +bewan-adsl-0.9.3-rzr.patch --- unicorn-0.9.3.orig/debian/patches/bewan-adsl-0.9.3-no-strip.patch +++ unicorn-0.9.3/debian/patches/bewan-adsl-0.9.3-no-strip.patch @@ -0,0 +1,20 @@ +diff -Nru unicorn.orig/tools/Makefile unicorn/tools/Makefile +--- unicorn.orig/tools/Makefile 2003-09-28 11:51:24.000000000 +0300 ++++ unicorn/tools/Makefile 2006-09-27 00:12:31.381904250 +0300 +@@ -24,5 +24,5 @@ + rm -f unicorn_status unicorn_status.cgi oam_ping *.o + + install: all +- $(INSTALL) -s -c unicorn_status $(DESTDIR)$(BINDIR) +- $(INSTALL) -s -c oam_ping $(DESTDIR)$(BINDIR) ++ $(INSTALL) -c unicorn_status $(DESTDIR)$(BINDIR) ++ $(INSTALL) -c oam_ping $(DESTDIR)$(BINDIR) +diff -Nru unicorn.orig/unicorntest/Makefile unicorn/unicorntest/Makefile +--- unicorn.orig/unicorntest/Makefile 2003-09-28 11:48:34.000000000 +0300 ++++ unicorn/unicorntest/Makefile 2006-09-27 00:12:52.979254000 +0300 +@@ -18,4 +18,4 @@ + rm -f unicorntest *.o + + install: all +- $(INSTALL) -s -c unicorntest $(DESTDIR)$(BINDIR) ++ $(INSTALL) -c unicorntest $(DESTDIR)$(BINDIR) --- unicorn-0.9.3.orig/debian/patches/bewan-adsl-0.9.3-kernel-changes.patch +++ unicorn-0.9.3/debian/patches/bewan-adsl-0.9.3-kernel-changes.patch @@ -0,0 +1,630 @@ +diff -Nru unicorn.orig/amu/amas.c unicorn/amu/amas.c +--- unicorn.orig/amu/amas.c 2006-12-20 20:58:11.000000000 +0200 ++++ unicorn/amu/amas.c 2006-12-20 20:56:25.000000000 +0200 +@@ -5,7 +5,7 @@ + + extern unsigned long g_ModemState, g_ShowtimeCounter; + extern unsigned int g_WaitForShowtime, g_WaitForInit; +-extern bool L3_flag; ++extern BOOLEAN L3_flag; + + extern T_AMSW_ANT_StaticConfiguration g_StaticCfg; + extern T_AMSW_NT_NearEndLineOperData g_NearEndLineOperData; +@@ -23,9 +23,10 @@ + // ADSL Modem Software calls this function to report any state changes + void AMSW_ANT_reportModemStateChange(AMSW_ModemState p_ModemState) + { ++ char *s; ++ + g_ModemState = p_ModemState; + +- char *s; + switch(p_ModemState) + { + case C_AMSW_IDLE : s = "IDLE"; break; +diff -Nru unicorn.orig/amu/amu.c unicorn/amu/amu.c +--- unicorn.orig/amu/amu.c 2006-12-20 20:58:11.000000000 +0200 ++++ unicorn/amu/amu.c 2006-12-20 20:56:25.000000000 +0200 +@@ -77,8 +77,14 @@ + extern unsigned long Vendor_Id_code_Globspan; + unsigned long Vendor_Id_code_Globspan=0; + +-extern "C" void HandleAtmError(void); +-extern "C" void HandleLeds(void); ++#ifdef __cplusplus ++extern "C" { ++#endif ++ void HandleAtmError(void); ++ void HandleLeds(void); ++#ifdef __cplusplus ++} ++#endif + + unsigned long amu_init_modem(unsigned short MODE); + unsigned long amu_init_modem(unsigned short MODE) +@@ -165,24 +171,27 @@ + return l_RetCode; + } + +-void AMUTask(unsigned long,unsigned long , unsigned long , unsigned long ) ++void AMUTask(unsigned long Arg1, unsigned long Arg2, unsigned long Arg3, unsigned long Arg4) + { + unsigned long l_RetCode = C_AMSW_REJ; + //static int l_Lit = 0; +- static bool PM_toggle = TRUE; +- +- PRINT_ERROR("FmPollingRate=%ldms,InitTimeout=%ldms,ActTimeout=%ld\n", +- FmPollingRate,InitTimeout,ActTimeout); ++ static BOOLEAN PM_toggle = TRUE; + + unsigned long PM_FM_POLLING_RATE = FmPollingRate; + unsigned long WAITFOR_SHOWTIME_COUNT = InitTimeout / PM_FM_POLLING_RATE; + unsigned long WAITFOR_INIT_COUNT = ActTimeout / PM_FM_POLLING_RATE; + unsigned long RETRY_WAIT_TIME = RETRY_WAIT_TIME_MIN_MSEC / PM_FM_POLLING_RATE; +- if (RetryTime > RETRY_WAIT_TIME_MIN_MSEC) // STM Gian Set RetryTime Only if is Bigger then minimum value +- RETRY_WAIT_TIME = RetryTime / PM_FM_POLLING_RATE; + unsigned long INIT_POLLING_TIME = 5; //(??????) + unsigned long WAITFOR_DISORDERLY_COUNT = 3; + ++ UINT delay = 0; ++ ++ if (RetryTime > RETRY_WAIT_TIME_MIN_MSEC) // STM Gian Set RetryTime Only if is Bigger then minimum value ++ RETRY_WAIT_TIME = RetryTime / PM_FM_POLLING_RATE; ++ ++ PRINT_ERROR("FmPollingRate=%ldms,InitTimeout=%ldms,ActTimeout=%ld\n", ++ FmPollingRate,InitTimeout,ActTimeout); ++ + NEAR_LCDNI_COUNT = LCD_Trig / PM_FM_POLLING_RATE; + NEAR_LCDI_COUNT = NEAR_LCDNI_COUNT; + NEAR_LOS_COUNT = LOS_LOF_Trig / PM_FM_POLLING_RATE; +@@ -194,8 +203,6 @@ + FAR_LOS_SHORT_COUNT = NEAR_LOS_COUNT; + FAR_LOF_SHORT_COUNT = NEAR_LOS_COUNT; + +- UINT delay = 0; +- + while (amu_go) + { + xtm_wkafter(500); +@@ -279,7 +286,7 @@ + g_WaitForDisorderly++; + if(g_WaitForDisorderly >= WAITFOR_DISORDERLY_COUNT) + { +- ++ int i; + + // if (RetryTime != 0) + // msw_report_event(AMU_EVENT_RETRY,0); +@@ -297,7 +304,7 @@ + if(l_RetCode != C_AMSW_ACK) { + PRINT_ERROR("Error in AMSW_ANT_requestModemStateChange(C_AMSW_IDLE) = %d\n", l_RetCode); + } +- else for (int i=0; i<6; i++) ++ else for (i=0; i<6; i++) + { + if (g_ModemState == C_AMSW_IDLE || GlobalRemove) break; + xtm_wkafter(500); +@@ -345,7 +352,7 @@ + // LCDI (Loss Of Cell Delineation Interleaved), + // LCDNI (Loss Of Cell Delineation Fast)defects + +-unsigned long FM_Polling(bool pm_poll) ++unsigned long FM_Polling(BOOLEAN pm_poll) + { + unsigned long l_RetCode = C_AMSW_REJ; + +@@ -361,8 +368,8 @@ + //####################### Loss Of Signal ############################## + + if( ((g_def_bitmap_set.near_end.status & LOS) == LOS) || +- ((g_def_bitmap_set.near_end.status & LOS) == 0) && +- ((g_def_bitmap_set.near_end.change & LOS) == LOS) ) ++ (((g_def_bitmap_set.near_end.status & LOS) == 0) && ++ ((g_def_bitmap_set.near_end.change & LOS) == LOS)) ) + { + g_NEAR_LOS++; + } +@@ -371,8 +378,8 @@ + g_NEAR_LOS = 0; + } + if( ((g_def_bitmap_set.far_end.status & LOS) == LOS) || +- ((g_def_bitmap_set.far_end.status & LOS) == 0) && +- ((g_def_bitmap_set.far_end.change & LOS) == LOS) ) ++ (((g_def_bitmap_set.far_end.status & LOS) == 0) && ++ ((g_def_bitmap_set.far_end.change & LOS) == LOS)) ) + { + g_FAR_LOS++; + } +diff -Nru unicorn.orig/amu/amu.h unicorn/amu/amu.h +--- unicorn.orig/amu/amu.h 2006-12-20 20:58:11.000000000 +0200 ++++ unicorn/amu/amu.h 2006-12-20 20:56:25.000000000 +0200 +@@ -30,7 +30,7 @@ + unsigned char g_FAR_LOS = 0, g_FAR_LOF = 0, g_FAR_LCDNI = 0, g_FAR_LCDI = 0; + unsigned char g_Mode = AMSW_ANSI | AMSW_UAWG | AMSW_G_DMT | AMSW_G_LITE; + unsigned long g_ShowtimeCounter = 0; +-bool L3_flag = FALSE; // bool var to acknowledge answer to orderly shutdown request ++BOOLEAN L3_flag = FALSE; // bool var to acknowledge answer to orderly shutdown request + + T_AMSW_Identification g_Identification; + T_AMSW_NT_NearEndLineOperData g_NearEndLineOperData; +@@ -47,7 +47,7 @@ + T_AMSW_VersionMS g_VersionMS; + + void AMUTask(unsigned long Arg1, unsigned long , unsigned long , unsigned long ); +-unsigned long FM_Polling(bool pm_poll); ++unsigned long FM_Polling(BOOLEAN pm_poll); + unsigned long PM_Polling(void); + + #endif // _AMU_H_ +diff -Nru unicorn.orig/amu/bsp.h unicorn/amu/bsp.h +--- unicorn.orig/amu/bsp.h 2006-12-20 20:58:11.000000000 +0200 ++++ unicorn/amu/bsp.h 2006-12-20 20:56:25.000000000 +0200 +@@ -18,7 +18,9 @@ + #define DMT_IN_PIN0_MASK 0x0001 // GP_IN0 bit 0 + #define DMT_IN_PIN1_MASK 0x0002 // GP_IN1 bit 1 + ++#ifdef __cplusplus + extern "C" { ++#endif + + unsigned short initializeBoard(void); + unsigned long powerUp_Modem_Chipset (unsigned long Chipset); +@@ -26,6 +28,8 @@ + unsigned long pull_Modem_Chipset_out_of_reset(unsigned long Chipset); + unsigned long put_Modem_Chipset_in_reset(unsigned long Chipset); + ++#ifdef __cplusplus + } // extern "C" ++#endif + + #endif +diff -Nru unicorn.orig/amu/bsp_pci.c unicorn/amu/bsp_pci.c +--- unicorn.orig/amu/bsp_pci.c 2006-12-20 20:58:11.000000000 +0200 ++++ unicorn/amu/bsp_pci.c 2006-12-20 20:56:25.000000000 +0200 +@@ -98,10 +98,18 @@ + return 0; + } + +-extern "C" void HandleAtmError(void) ++#ifdef __cplusplus ++extern "C" { ++#endif ++ ++void HandleAtmError(void) + { + } + +-extern "C" void HandleLeds(void) ++void HandleLeds(void) + { + } ++ ++#ifdef __cplusplus ++} ++#endif +diff -Nru unicorn.orig/include/types.h unicorn/include/types.h +--- unicorn.orig/include/types.h 2006-12-20 20:58:11.000000000 +0200 ++++ unicorn/include/types.h 2006-12-20 20:56:25.000000000 +0200 +@@ -29,9 +29,6 @@ + typedef const char *PCSTR, FAR *LPCSTR; + typedef void *PVOID, FAR *LPVOID; + typedef int BOOLEAN; +-#ifndef __cplusplus +-typedef int bool; +-#endif + + + #ifndef MAX +diff -Nru unicorn.orig/msw/fp_stubs.c unicorn/msw/fp_stubs.c +--- unicorn.orig/msw/fp_stubs.c 2006-12-20 20:58:11.000000000 +0200 ++++ unicorn/msw/fp_stubs.c 2006-12-20 21:00:53.000000000 +0200 +@@ -1,11 +1,13 @@ +-#include ++#include ++#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,18) ++# include ++#endif + #if defined(CONFIG_MODVERSIONS) && !defined(MODVERSIONS) + #define MODVERSIONS + #endif + #ifdef MODVERSIONS + #include + #endif +-#include + #include + #include + #include +diff -Nru unicorn.orig/msw/linrapi.c unicorn/msw/linrapi.c +--- unicorn.orig/msw/linrapi.c 2006-12-20 20:58:11.000000000 +0200 ++++ unicorn/msw/linrapi.c 2006-12-20 21:00:15.000000000 +0200 +@@ -5,8 +5,10 @@ + This file contain the rAPI(reduced API) functions. + rAPI is the interface between the Modem SW and the Operating System (here Linux). + */ +-#include + #include ++#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,18) ++# include ++#endif + #if defined(CONFIG_MODVERSIONS) && (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)) + #include + #endif +@@ -201,7 +203,7 @@ + WARN("__cxa_pure_virtual called\n"); + } + +-#if __GNUC__ >= 3 ++#if __GNUC__ >= 3 && defined(__cplusplus) + extern void + __builtin_delete(void *ptr) + { +diff -Nru unicorn.orig/msw/msw.c unicorn/msw/msw.c +--- unicorn.orig/msw/msw.c 2006-12-20 20:58:11.000000000 +0200 ++++ unicorn/msw/msw.c 2006-12-20 20:56:25.000000000 +0200 +@@ -6,7 +6,7 @@ + // Copyright STMicroelectronics 2000 + // Copyright F.H.L.P. 2000 + //---------------------------------------------------------------------- +-#include ++// #include + #include "types.h" + #include "tracetool.h" + #include "hal.h" +@@ -24,10 +24,10 @@ + extern unsigned long g_ModemState; + extern unsigned int g_WaitForInit; + extern unsigned int g_WaitForShowtime; +-extern bool L3_flag; ++extern BOOLEAN L3_flag; + extern unsigned long GlobalRemove; + +-#if 1 ++#if 0 + extern void *operator new(size_t size) + { + void *ptr; +@@ -186,8 +186,9 @@ + } + else + { ++ int i; + PRINT_ERROR("Waiting 5 sec to verify L3_executed\n"); +- for (int i=0; i<10; i++) ++ for (i=0; i<10; i++) + { + // Abort everything on surprise removal + if (GlobalRemove) return; +diff -Nru unicorn.orig/unicorn_atm/unicorn_atmdrv.c unicorn/unicorn_atm/unicorn_atmdrv.c +--- unicorn.orig/unicorn_atm/unicorn_atmdrv.c 2006-12-20 20:58:11.000000000 +0200 ++++ unicorn/unicorn_atm/unicorn_atmdrv.c 2006-12-20 21:01:05.000000000 +0200 +@@ -4,8 +4,10 @@ + ST70134A or ST70136 Analog Front End (AFE). + This file contains the ATM interface and SAR routines. + */ +-#include + #include ++#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,18) ++# include ++#endif + #if defined(CONFIG_MODVERSIONS) && (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)) + #include + #endif +@@ -101,7 +103,7 @@ + struct unicorn_atmdrv *unicorn_atmdrv = NULL; + + // driver parameters +-unsigned char *mac_address=NULL; ++char mac_address[ETH_ALEN*2 + 1] = { 0x0 }; + #if DEBUG + #ifdef ATM_DRIVER + unsigned long DebugLevel=0; // ATM_D,DATA_D +@@ -1293,10 +1295,10 @@ + return 0; + } + +-MODULE_PARM(mac_address, "s"); ++module_param_string(mac_address, mac_address, sizeof(mac_address), 0); + #if DEBUG + #ifdef ATM_DRIVER +-MODULE_PARM(DebugLevel, "i"); ++module_param(DebugLevel, ulong, 0); + #endif + #endif + +diff -Nru unicorn.orig/unicorn_eth/unicorn_ethdrv.c unicorn/unicorn_eth/unicorn_ethdrv.c +--- unicorn.orig/unicorn_eth/unicorn_ethdrv.c 2006-12-20 20:58:11.000000000 +0200 ++++ unicorn/unicorn_eth/unicorn_ethdrv.c 2006-12-20 20:59:57.000000000 +0200 +@@ -4,8 +4,10 @@ + ST70134A or ST70136 Analog Front End (AFE). + This file contains the ethernet interface and SAR routines. + */ +-#include + #include ++#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,18) ++# include ++#endif + #if defined(CONFIG_MODVERSIONS) && (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)) + #include + #endif +@@ -140,12 +142,12 @@ + struct unicorn_ethdrv *unicorn_ethdrv = NULL; + + // driver parameters +-static char *if_name = NULL; +-static unsigned char *mac_address=NULL; ++static char if_name[IFNAMSIZ] = { 0x0 }; ++static char mac_address[ETH_ALEN*2 + 1] = { 0x0 }; + static int VPI= ATM_VPI_UNSPEC; + static int VCI= ATM_VCI_UNSPEC; +-static char *PROTOCOL = NULL; +-static char *ENCAPS = NULL; ++static char PROTOCOL[8] = { 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }; ++static char ENCAPS[11] = { 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }; + #if DEBUG + #ifdef ETH_DRIVER + unsigned long DebugLevel=0; // ATM_D,DATA_D +@@ -1355,15 +1357,15 @@ + WARN("\n"); + } + +-MODULE_PARM(if_name,"s"); +-MODULE_PARM(mac_address, "s"); +-MODULE_PARM(VPI, "i"); +-MODULE_PARM(VCI, "i"); +-MODULE_PARM(PROTOCOL, "s"); +-MODULE_PARM(ENCAPS, "s"); ++module_param_string(if_name, if_name, sizeof(if_name), 0); ++module_param_string(mac_address, mac_address, sizeof(mac_address), 0); ++module_param(VPI, int, 0); ++module_param(VCI, int, 0); ++module_param_string(PROTOCOL, PROTOCOL, sizeof(PROTOCOL), 0); ++module_param_string(ENCAPS, ENCAPS, sizeof(ENCAPS), 0); + #if DEBUG + #ifdef ETH_DRIVER +-MODULE_PARM(DebugLevel, "i"); ++module_param(DebugLevel, ulong, 0); + #endif + #endif + +diff -Nru unicorn.orig/unicorn_pci/unicorn_pcidrv.c unicorn/unicorn_pci/unicorn_pcidrv.c +--- unicorn.orig/unicorn_pci/unicorn_pcidrv.c 2006-12-20 20:58:11.000000000 +0200 ++++ unicorn/unicorn_pci/unicorn_pcidrv.c 2006-12-20 20:59:31.000000000 +0200 +@@ -4,8 +4,10 @@ + ST70134A, ST70136 or ST20174 Analog Front End (AFE). + This file contains the PCI specific routines. + */ +-#include + #include ++#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,18) ++# include ++#endif + #if defined(CONFIG_MODVERSIONS) && (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)) + #include + #endif +@@ -647,7 +649,9 @@ + //---------------------------------------------------------------------- + // Interrupt Service Routine (ISR) for IRQ Irq + //---------------------------------------------------------------------- +-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)) ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,19)) ++static irqreturn_t unicorn_isr(int irq, void *context) ++#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)) + static irqreturn_t unicorn_isr(int irq, void *context, struct pt_regs *regs) + #else + static void unicorn_isr(int irq, void *context, struct pt_regs *regs) +@@ -2157,38 +2161,25 @@ + } + + /* module parameters for MSW */ +-MODULE_PARM(ActivationMode, "i"); +-//MODULE_PARM(ActivationTaskTimeout, "i"); +-MODULE_PARM(ActTimeout, "i"); +-MODULE_PARM(AutoActivation, "i"); +-//MODULE_PARM(BreakOnEntry, "i"); +-MODULE_PARM(DownstreamRate, "i"); +-MODULE_PARM(eocTrace, "i"); +-//MODULE_PARM(ExchangeDelay, "i"); +-MODULE_PARM(FmPollingRate, "i"); +-//MODULE_PARM(g_RefGain, "i"); +-MODULE_PARM(g_TeqMode, "i"); +-MODULE_PARM(InitTimeout, "i"); +-MODULE_PARM(Interoperability, "i"); +-MODULE_PARM(LCD_Trig, "i"); +-MODULE_PARM(LOS_LOF_Trig, "i"); +-MODULE_PARM(LoopbackMode, "i"); +-MODULE_PARM(MswDebugLevel, "i"); +-MODULE_PARM(RetryTime, "i"); +-MODULE_PARM(setINITIALDAC, "i"); +-//MODULE_PARM(TrainingDelay, "i"); +-//MODULE_PARM(TruncateMode, "i"); +-MODULE_PARM(useAFE, "i"); +-//MODULE_PARM(useRFC019v, "i"); +-//MODULE_PARM(useRFC029v, "i"); +-//MODULE_PARM(useRFC033v, "i"); +-//MODULE_PARM(useRFC040v, "i"); +-MODULE_PARM(useRFC041v, "i"); +-//MODULE_PARM(useRFCFixedRate, "i"); +-//MODULE_PARM(useVCXO, "i"); +-//MODULE_PARM(_no_TS652, "i"); ++module_param(ActivationMode, ulong, 0); ++module_param(ActTimeout, ulong, 0); ++module_param(AutoActivation, ulong, 0); ++module_param(DownstreamRate, ulong, 0); ++module_param(eocTrace, ulong, 0); ++module_param(FmPollingRate, ulong, 0); ++module_param(g_TeqMode, ushort, 0); ++module_param(InitTimeout, ulong, 0); ++module_param(Interoperability, ulong, 0); ++module_param(LCD_Trig, ulong, 0); ++module_param(LOS_LOF_Trig, ulong, 0); ++module_param(LoopbackMode, ulong, 0); ++module_param(MswDebugLevel, ulong, 0); ++module_param(RetryTime, ulong, 0); ++module_param(setINITIALDAC, ulong, 0); ++module_param(useAFE, ulong, 0); ++module_param(useRFC041v, ulong, 0); + #if DEBUG +-MODULE_PARM(DebugLevel, "i"); ++module_param(DebugLevel, ulong, 0); + #endif + + static int __init +diff -Nru unicorn.orig/unicorntest/unicorntest.c unicorn/unicorntest/unicorntest.c +--- unicorn.orig/unicorntest/unicorntest.c 2006-12-20 20:58:11.000000000 +0200 ++++ unicorn/unicorntest/unicorntest.c 2006-12-20 20:56:25.000000000 +0200 +@@ -540,10 +540,10 @@ + printf(" ----------------------------------------------------------\n\n"); + } + +-bool InterpretCmdString (char *cmd,ADSL_DEVICE *device) ++BOOLEAN InterpretCmdString (char *cmd,ADSL_DEVICE *device) + { + int err; +- static bool MSW_INIT = FALSE; ++ static BOOLEAN MSW_INIT = FALSE; + int i; + + if (strcmp(cmd,"HELP") == 0) +diff -Nru unicorn.orig/unicorn_usb/unicorn_usbdrv.c unicorn/unicorn_usb/unicorn_usbdrv.c +--- unicorn.orig/unicorn_usb/unicorn_usbdrv.c 2006-12-20 20:58:11.000000000 +0200 ++++ unicorn/unicorn_usb/unicorn_usbdrv.c 2006-12-20 21:00:06.000000000 +0200 +@@ -4,8 +4,10 @@ + Analog Front End (AFE). + This file contains the USB specific routines. + */ +-#include + #include ++#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,18) ++# include ++#endif + #if defined(CONFIG_MODVERSIONS) && (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)) + #include + #endif +@@ -380,7 +382,7 @@ + //---------------------------------------------------------------------- + // ATM US transfer complete + //---------------------------------------------------------------------- +-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)) ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)) && (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19)) + static void AtmUsXferComplete(struct urb *urb,struct pt_regs *pt_regs) + #else + static void AtmUsXferComplete(struct urb *urb) +@@ -430,7 +432,7 @@ + //---------------------------------------------------------------------- + // ATM DS transfer complete + //---------------------------------------------------------------------- +-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)) ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)) && (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19)) + static void AtmDsXferComplete(struct urb *urb,struct pt_regs *pt_regs) + #else + static void AtmDsXferComplete(struct urb *urb) +@@ -890,7 +892,7 @@ + //---------------------------------------------------------------------- + // Interrupt In pipe completion routine + //---------------------------------------------------------------------- +-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)) ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)) && (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19)) + static void IntInComplete(struct urb *urb,struct pt_regs *pt_regs) + #else + static void IntInComplete(struct urb *urb) +@@ -1374,7 +1376,7 @@ + //----------------------------------------------------------------------------- + // ObcWriteIsocComplete: + //----------------------------------------------------------------------------- +-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)) ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)) && (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19)) + static void ObcWriteIsocComplete(struct urb *urb,struct pt_regs *pt_regs) + #else + static void ObcWriteIsocComplete(struct urb *urb) +@@ -1400,7 +1402,7 @@ + //----------------------------------------------------------------------------- + // ObcWriteIntComplete: + //----------------------------------------------------------------------------- +-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)) ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)) && (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19)) + static void ObcWriteIntComplete(struct urb *urb,struct pt_regs *pt_regs) + #else + static void ObcWriteIntComplete(struct urb *urb) +@@ -1427,7 +1429,7 @@ + //----------------------------------------------------------------------------- + // ObcReadIsocComplete: + //----------------------------------------------------------------------------- +-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)) ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)) && (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19)) + static void ObcReadIsocComplete(struct urb *urb,struct pt_regs *pt_regs) + #else + static void ObcReadIsocComplete(struct urb *urb) +@@ -1468,7 +1470,7 @@ + //----------------------------------------------------------------------------- + // ObcReadIntComplete: + //----------------------------------------------------------------------------- +-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)) ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)) && (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19)) + static void ObcReadIntComplete(struct urb *urb,struct pt_regs *pt_regs) + #else + static void ObcReadIntComplete(struct urb *urb) +@@ -2289,39 +2291,32 @@ + }; + + /* module parameters for MSW */ +-MODULE_PARM(ActivationMode, "i"); +-//MODULE_PARM(ActivationTaskTimeout, "i"); +-MODULE_PARM(ActTimeout, "i"); +-MODULE_PARM(AutoActivation, "i"); +-//MODULE_PARM(BreakOnEntry, "i"); +-MODULE_PARM(DownstreamRate, "i"); +-MODULE_PARM(eocTrace, "i"); +-MODULE_PARM(ExchangeDelay, "i"); +-MODULE_PARM(FmPollingRate, "i"); +-MODULE_PARM(g_RefGain, "i"); +-MODULE_PARM(g_TeqMode, "i"); +-MODULE_PARM(InitTimeout, "i"); +-MODULE_PARM(Interoperability, "i"); +-MODULE_PARM(LCD_Trig, "i"); +-MODULE_PARM(LOS_LOF_Trig, "i"); +-MODULE_PARM(LoopbackMode, "i"); +-MODULE_PARM(MswDebugLevel, "i"); +-MODULE_PARM(RetryTime, "i"); +-//MODULE_PARM(setINITIALDAC, "i"); +-MODULE_PARM(TrainingDelay, "i"); +-//MODULE_PARM(TruncateMode, "i"); +-MODULE_PARM(useAFE, "i"); +-MODULE_PARM(useRFC019v, "i"); +-MODULE_PARM(useRFC029v, "i"); +-//MODULE_PARM(useRFC033v, "i"); +-MODULE_PARM(useRFC040v, "i"); +-MODULE_PARM(useRFC041v, "i"); +-//MODULE_PARM(useRFCFixedRate, "i"); +-MODULE_PARM(useVCXO, "i"); +-MODULE_PARM(_no_TS652, "i"); +-//MODULE_PARM(FrameNumber, "i"); ++module_param(ActivationMode, ulong, 0); ++module_param(ActTimeout, ulong, 0); ++module_param(AutoActivation, ulong, 0); ++module_param(DownstreamRate, ulong, 0); ++module_param(eocTrace, ulong, 0); ++module_param(ExchangeDelay, ulong, 0); ++module_param(FmPollingRate, ulong, 0); ++module_param(g_RefGain, ulong, 0); ++module_param(g_TeqMode, ushort, 0); ++module_param(InitTimeout, ulong, 0); ++module_param(Interoperability, ulong, 0); ++module_param(LCD_Trig, ulong, 0); ++module_param(LOS_LOF_Trig, ulong, 0); ++module_param(LoopbackMode, ulong, 0); ++module_param(MswDebugLevel, ulong, 0); ++module_param(RetryTime, ulong, 0); ++module_param(TrainingDelay, ulong, 0); ++module_param(useAFE, ulong, 0); ++module_param(useRFC019v, ulong, 0); ++module_param(useRFC029v, ulong, 0); ++module_param(useRFC040v, ulong, 0); ++module_param(useRFC041v, ulong, 0); ++module_param(useVCXO, ulong, 0); ++module_param(_no_TS652, ulong, 0); + #if DEBUG +-MODULE_PARM(DebugLevel, "i"); ++module_param(DebugLevel, ulong, 0); + #endif + + //---------------------------------------------------------------------- --- unicorn-0.9.3.orig/debian/patches/bewan-adsl-0.9.3-smp.patch +++ unicorn-0.9.3/debian/patches/bewan-adsl-0.9.3-smp.patch @@ -0,0 +1,12 @@ +diff -Nur unicorn.orig/msw/linrapi.c unicorn/msw/linrapi.c +--- unicorn.orig/msw/linrapi.c 2006-01-02 18:54:30.000000000 +0200 ++++ unicorn/msw/linrapi.c 2006-02-12 12:38:32.453937500 +0200 +@@ -922,7 +922,7 @@ + #endif + // Hack to try to make it work on SMP !!!! + // Lock the threads to CPU #0 +- set_cpus_allowed(k->thread,CPU_MASK_CPU0); ++ //set_cpus_allowed(k->thread,CPU_MASK_CPU0); + #endif + return SUCCESS; + } --- unicorn-0.9.3.orig/debian/patches/bewan-adsl-0.9.3-rzr.patch +++ unicorn-0.9.3/debian/patches/bewan-adsl-0.9.3-rzr.patch @@ -0,0 +1,332 @@ +Index: unicorn-0.9.3/Makefile +=================================================================== +--- unicorn-0.9.3.orig/Makefile 2008-01-01 23:01:35.000000000 +0100 ++++ unicorn-0.9.3/Makefile 2008-01-01 23:04:37.000000000 +0100 +@@ -6,9 +6,9 @@ + VERS=0x093 + + # path to kernel sources and headers (must correspond to running kernel) +-KERNEL_SOURCES=/usr/src/linux +-HPATH=$(KERNEL_SOURCES)/include +-MAKE=make ++KERNEL_SOURCES?=/usr/src/linux ++HPATH?=$(KERNEL_SOURCES)/include ++MAKE?=make + + .EXPORT_ALL_VARIABLES: + +@@ -16,15 +16,30 @@ + DRVDIRS = libm unicorn_pci unicorn_usb + + all: applis modules +- ++ + applis: + for i in $(DIRS) ; do make -C $$i all ; done + + modules: + for i in $(DRVDIRS) ; do make -C $$i modules MODDIR=$(PWD)/$$i ; done + +-clean: +- for i in $(DIRS) $(DRVDIRS); do (if [ -d $$i ]; then make -C $$i clean; fi); done ++GENERATED_FILES?=\ ++ adsl_status/m4/Makefile\ ++ adsl_status/po/Makefile\ ++ adsl_status/po/Makefile.in\ ++ adsl_status/src/Makefile\ ++ adsl_status/intl/Makefile\ ++ adsl_status/Makefile\ ++ adsl_status/config.cache\ ++ adsl_status/config.log\ ++ adsl_status/config.status\ ++ adsl_status/config.h\ ++ adsl_status/confdefs.h\ ++ #GENERATED_FILES ++ ++clean: $(DIRS) $(DRVDIRS) ++ -for i in $^ ; do (if [ -d $$i ]; then make -C $$i clean; fi); done ++ rm -f ${GENERATED_FILES} + + install: applis_install modules_install + +@@ -37,3 +52,5 @@ + + only_modules_install: + for i in $(DRVDIRS) ; do make -C $$i modules_install ; done ++ ++#eof "$Id: unicorn-0.9.3/Makefile -- rzr $" +Index: unicorn-0.9.3/unicorn_pci/unicorn_pcidrv.c +=================================================================== +--- unicorn-0.9.3.orig/unicorn_pci/unicorn_pcidrv.c 2008-01-01 23:01:53.000000000 +0100 ++++ unicorn-0.9.3/unicorn_pci/unicorn_pcidrv.c 2008-01-01 23:01:53.000000000 +0100 +@@ -4,6 +4,11 @@ + ST70134A, ST70136 or ST20174 Analog Front End (AFE). + This file contains the PCI specific routines. + */ ++ ++#ifndef KBUILD_MODNAME ++#define KBUILD_MODNAME "unicorn_atm_pci" //#~rzr:TODO ++#endif ++ + #include + #if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,18) + # include +Index: unicorn-0.9.3/unicorn_usb/unicorn_usbdrv.c +=================================================================== +--- unicorn-0.9.3.orig/unicorn_usb/unicorn_usbdrv.c 2008-01-01 23:01:53.000000000 +0100 ++++ unicorn-0.9.3/unicorn_usb/unicorn_usbdrv.c 2008-01-01 23:01:53.000000000 +0100 +@@ -4,6 +4,11 @@ + Analog Front End (AFE). + This file contains the USB specific routines. + */ ++ ++#ifndef KBUILD_MODNAME ++#define KBUILD_MODNAME "unicorn_usb_atm" //#~rzr:TODO ++#endif ++ + #include + #if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,18) + # include +@@ -123,7 +128,7 @@ + printk(KERN_DEBUG "hcpriv=%p,dev=%p,pipe=%x,status=%d,transfer_flags=%d\n", + urb->hcpriv,urb->dev,urb->pipe,urb->status,urb->transfer_flags); + printk(KERN_DEBUG "bandwidth=%d,start_frame=%u,interval=%d,error_count=%d\n", +- urb->bandwidth,urb->start_frame,urb->interval,urb->error_count); ++ 0,urb->start_frame,urb->interval,urb->error_count); //#~rzr:TODO + // buffers + printk(KERN_DEBUG "transfer_buffer=%p,transfer_buffer_length=%d,actual_length=%d\n", + urb->transfer_buffer,urb->transfer_buffer_length,urb->actual_length); +Index: unicorn-0.9.3/libm/Makefile +=================================================================== +--- unicorn-0.9.3.orig/libm/Makefile 2008-01-01 23:08:00.000000000 +0100 ++++ unicorn-0.9.3/libm/Makefile 2008-01-01 23:12:24.000000000 +0100 +@@ -3,8 +3,8 @@ + SINGLE_PRECISION=1 + DOUBLE_PRECISION=1 + +-CC=gcc +-LD=ld ++CC?=gcc ++LD?=ld + + CFLAGS = -O2 -Wstrict-prototypes -fomit-frame-pointer -fno-strict-aliasing -pipe -fno-strength-reduce -Wall -Wno-comment + +@@ -33,7 +33,9 @@ + modules_install: modules + + clean: +- /bin/rm -f *~ +- /bin/rm -f *.s +- /bin/rm -f *.o +- /bin/rm -f *.a ++ ${RM} -f *~ ++ ${RM} -f *.s ++ ${RM} -f *.o ++ ${RM} -f *.a ++ ++#eof "$Id: rzr -- -- rzr@users.sf.net $" +Index: unicorn-0.9.3/tools/Makefile +=================================================================== +--- unicorn-0.9.3.orig/tools/Makefile 2008-01-01 23:04:42.000000000 +0100 ++++ unicorn-0.9.3/tools/Makefile 2008-01-01 23:05:19.000000000 +0100 +@@ -1,13 +1,11 @@ +-CC=gcc +-LD=ld +-INSTALL=install +-CFLAGS := -Wall -Wstrict-prototypes -O2 -DLINUX ++CC?=gcc ++LD?=ld ++INSTALL?=install ++CFLAGS?=-Wall -Wstrict-prototypes -O2 -DLINUX + INCLUDES := -I../amu/ -I../include/ +-prefix=/usr/local +-BINDIR=$(prefix)/bin +-ifndef VERS +-VERS=0 +-endif ++prefix?=/usr/local ++BINDIR?=$(prefix)/bin ++VERS?=0 + + all: unicorn_status unicorn_status.cgi oam_ping + +@@ -26,3 +24,5 @@ + install: all + $(INSTALL) -c unicorn_status $(DESTDIR)$(BINDIR) + $(INSTALL) -c oam_ping $(DESTDIR)$(BINDIR) ++ ++#eof "$Id: rzr -- -- rzr@users.sf.net $" +Index: unicorn-0.9.3/unicorn_pci/Makefile +=================================================================== +--- unicorn-0.9.3.orig/unicorn_pci/Makefile 2008-01-01 23:05:57.000000000 +0100 ++++ unicorn-0.9.3/unicorn_pci/Makefile 2008-01-01 23:06:53.000000000 +0100 +@@ -5,20 +5,10 @@ + src ?= . + obj ?= . + +-ifndef KERNEL_SOURCES +-KERNEL_SOURCES=/usr/src/linux +-endif +-ifndef HPATH +-HPATH=$(KERNEL_SOURCES)/include +-endif +- +-ifndef VERS +-VERS=0 +-endif +- +-ifndef KVERS +-KVERS = `uname -r` +-endif ++KERNEL_SOURCES?=/usr/src/linux ++HPATH?=$(KERNEL_SOURCES)/include ++VERS?=0 ++KVERS?=`uname -r` + + ifndef PATCHLEVEL + PATCHLEVEL=$(shell grep -s PATCHLEVEL ${KERNEL_SOURCES}/Makefile | head -n 1 | sed s/'PATCHLEVEL = '//) +@@ -37,8 +27,8 @@ + COPTIONS = + + # make parameters +-CC=gcc +-LD=ld ++CC?=gcc ++LD?=ld + + INCLUDES := -I$(src)/../include -I$(src)/../ + ifeq ($(PATCHLEVEL),4) +@@ -92,21 +82,23 @@ + + install_atm: unicorn_pci_atm.o + # remove old versions +- /bin/rm -f $(DESTDIR)/lib/modules/$(KVERS)/kernel/drivers/atm/unicorn_*.o ++ ${RM} -f $(DESTDIR)/lib/modules/$(KVERS)/kernel/drivers/atm/unicorn_*.o + + mkdir -p $(DESTDIR)/lib/modules/$(KVERS)/extra + cp $^ $(DESTDIR)/lib/modules/$(KVERS)/extra/ + + install_eth: unicorn_pci_eth.o + # remove old versions +- /bin/rm -f $(DESTDIR)/lib/modules/$(KVERS)/kernel/drivers/atm/unicorn_*.o ++ ${RM} -f $(DESTDIR)/lib/modules/$(KVERS)/kernel/drivers/atm/unicorn_*.o + + mkdir -p $(DESTDIR)/lib/modules/$(KVERS)/extra + cp $^ $(DESTDIR)/lib/modules/$(KVERS)/extra/ + + clean: +- /bin/rm -f $(unicorn_pci_atm-objs) +- /bin/rm -f $(unicorn_pci_eth-objs) +- /bin/rm -f unicorn_pci_atm.* unicorn_pci_eth.* +- /bin/rm -f .*.cmd +- /bin/rm -rf .tmp_versions +\ No newline at end of file ++ ${RM} -f $(unicorn_pci_atm-objs) ++ ${RM} -f $(unicorn_pci_eth-objs) ++ ${RM} -f unicorn_pci_atm.* unicorn_pci_eth.* ++ ${RM} -f .*.cmd ++ ${RM} -rf .tmp_versions ++ ++#eof "$Id: rzr -- -- rzr@users.sf.net $" +Index: unicorn-0.9.3/unicorn_usb/Makefile +=================================================================== +--- unicorn-0.9.3.orig/unicorn_usb/Makefile 2008-01-01 23:06:56.000000000 +0100 ++++ unicorn-0.9.3/unicorn_usb/Makefile 2008-01-01 23:12:00.000000000 +0100 +@@ -5,20 +5,10 @@ + src ?= . + obj ?= . + +-ifndef KERNEL_SOURCES +-KERNEL_SOURCES=/usr/src/linux +-endif +-ifndef HPATH +-HPATH=$(KERNEL_SOURCES)/include +-endif +- +-ifndef VERS +-VERS=0 +-endif +- +-ifndef KVERS +-KVERS = `uname -r` +-endif ++KERNEL_SOURCES?=/usr/src/linux ++HPATH?=$(KERNEL_SOURCES)/include ++VERS?=0 ++KVERS?=`uname -r` + + ifndef PATCHLEVEL + PATCHLEVEL=$(shell grep -s PATCHLEVEL ${KERNEL_SOURCES}/Makefile | head -n 1 | sed s/'PATCHLEVEL = '//) +@@ -33,8 +23,8 @@ + COPTIONS = + + # make parameters +-CC=gcc +-LD=ld ++CC?=gcc ++LD?=ld + + INCLUDES := -I$(src)/../include -I$(src)/../ + ifeq ($(PATCHLEVEL),4) +@@ -84,21 +74,23 @@ + + install_atm: unicorn_usb_atm.o + # remove old versions +- /bin/rm -f $(DESTDIR)/lib/modules/$(KVERS)/kernel/drivers/atm/unicorn_*.o ++ ${RM} -f $(DESTDIR)/lib/modules/$(KVERS)/kernel/drivers/atm/unicorn_*.o + + mkdir -p $(DESTDIR)/lib/modules/$(KVERS)/extra + cp $^ $(DESTDIR)/lib/modules/$(KVERS)/extra/ + + install_eth: unicorn_usb_eth.o + # remove old versions +- /bin/rm -f $(DESTDIR)/lib/modules/$(KVERS)/kernel/drivers/atm/unicorn_*.o ++ ${RM} -f $(DESTDIR)/lib/modules/$(KVERS)/kernel/drivers/atm/unicorn_*.o + + mkdir -p $(DESTDIR)/lib/modules/$(KVERS)/extra + cp $^ $(DESTDIR)/lib/modules/$(KVERS)/extra/ + + clean: +- /bin/rm -f $(unicorn_usb_atm-objs) +- /bin/rm -f $(unicorn_usb_eth-objs) +- /bin/rm -f unicorn_usb_atm.* unicorn_usb_eth.* +- /bin/rm -f .*.cmd +- /bin/rm -rf .tmp_versions +\ No newline at end of file ++ ${RM} -f $(unicorn_usb_atm-objs) ++ ${RM} -f $(unicorn_usb_eth-objs) ++ ${RM} -f unicorn_usb_atm.* unicorn_usb_eth.* ++ ${RM} -f .*.cmd ++ ${RM} -rf .tmp_versions ++ ++#eof "$Id: rzr -- -- rzr@users.sf.net $" +Index: unicorn-0.9.3/unicorntest/Makefile +=================================================================== +--- unicorn-0.9.3.orig/unicorntest/Makefile 2008-01-01 23:07:34.000000000 +0100 ++++ unicorn-0.9.3/unicorntest/Makefile 2008-01-01 23:07:58.000000000 +0100 +@@ -1,13 +1,11 @@ +-CC=gcc +-LD=ld +-INSTALL=install ++CC?=gcc ++LD?=ld ++INSTALL?=install + CFLAGS := -Wall -Wstrict-prototypes -O2 -DLINUX + INCLUDES := -I../amu/ -I../include/ +-prefix=/usr/local +-BINDIR=$(prefix)/bin +-ifndef VERS +-VERS=0 +-endif ++prefix?=/usr/local ++BINDIR?=$(prefix)/bin ++VERS?=0 + + all: unicorntest + +@@ -19,3 +17,5 @@ + + install: all + $(INSTALL) -c unicorntest $(DESTDIR)$(BINDIR) ++ ++#eof "$Id: rzr -- -- rzr@users.sf.net $" --- unicorn-0.9.3.orig/debian/copyright +++ unicorn-0.9.3/debian/copyright @@ -0,0 +1,28 @@ +This package was debianized by Sven Luther on +Sat, 22 Feb 2003 21:26:43 +0100. + +It was downloaded from http://www.bewan.com/bewan/users/downloads/index.php + +Upstream Author: Frode Isaksen + +Copyright: + +Program code and documentation are +(C) Copyright 2002 BeWAN systems +All rights reserved. + +This package 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. The GNU General Public License can be +found on a Debian system in /usr/share/common-licenses/GPL. + +In addition, as a special exception, BeWAN systems gives permission +to link the code of this program with the modem SW library +(modem_ant_PCI.o, modem_ant_USB.o), and distribute linked combinations +including the two. You are also given permission to redistribute the +modem SW library (modem_ant_PCI.o, modem_ant_USB.o) with the rest of the +code. +You must obey the GNU General Public License in all respects for all of +the code used other than the modem SW library. + --- unicorn-0.9.3.orig/debian/modules.mk +++ unicorn-0.9.3/debian/modules.mk @@ -0,0 +1,5 @@ +#!/usr/bin/make -f +# Makefile for building the unicorn module in Debian +include $(M)/debian/conf.mk +include $(M)/Makefile.upstream + --- unicorn-0.9.3.orig/adsl_status/src/Makefile +++ unicorn-0.9.3/adsl_status/src/Makefile @@ -16,7 +16,7 @@ srcdir = . top_srcdir = .. -prefix = /usr/local +prefix = /usr exec_prefix = ${prefix} bindir = ${exec_prefix}/bin @@ -66,9 +66,9 @@ GENCAT = gencat GLIBC21 = yes GMSGFMT = /usr/bin/msgfmt -GTK_CFLAGS = -I/usr/include/gtk-1.2 -I/usr/include/glib-1.2 -I/usr/lib/glib/include -I/usr/X11R6/include +GTK_CFLAGS = -I/usr/include/gtk-1.2 -I/usr/include/glib-1.2 -I/usr/lib/glib/include GTK_CONFIG = /usr/bin/gtk-config -GTK_LIBS = -L/usr/X11R6/lib -lgtk -lgdk -rdynamic -lgmodule -lglib -ldl -lXi -lXext -lX11 -lm +GTK_LIBS = -L/usr/lib -lgtk -lgdk -rdynamic -lgmodule -lglib -ldl -lXi -lXext -lX11 -lm HAVE_LIB = @HAVE_LIB@ INSTOBJEXT = .mo INTLBISON = bison @@ -90,7 +90,7 @@ USE_NLS = yes VERSION = 0.1 -INCLUDES = -I../../amu -I../../include/ -I$(top_srcdir)/intl -I/usr/include/gtk-1.2 -I/usr/include/glib-1.2 -I/usr/lib/glib/include -I/usr/X11R6/include +INCLUDES = -I../../amu -I../../include/ -I$(top_srcdir)/intl -I/usr/include/gtk-1.2 -I/usr/include/glib-1.2 -I/usr/lib/glib/include bin_PROGRAMS = bewan_adsl_status @@ -98,7 +98,7 @@ bewan_adsl_status_SOURCES = main.c support.c support.h interface.c interface.h callbacks.c callbacks.h status.h status.c -bewan_adsl_status_LDADD = -L/usr/X11R6/lib -lgtk -lgdk -rdynamic -lgmodule -lglib -ldl -lXi -lXext -lX11 -lm $(INTLLIBS) +bewan_adsl_status_LDADD = -L/usr/lib -lgtk -lgdk -rdynamic -lgmodule -lglib -ldl -lXi -lXext -lX11 -lm $(INTLLIBS) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = ../config.h CONFIG_CLEAN_FILES = --- unicorn-0.9.3.orig/adsl_status/config.h +++ unicorn-0.9.3/adsl_status/config.h @@ -47,9 +47,9 @@ #define HAVE_LC_MESSAGES 1 #define HAVE_STPCPY 1 /* #undef HAVE_LIBSM */ -#define PACKAGE_LOCALE_DIR "/usr/local/share/locale" -#define PACKAGE_DATA_DIR "/usr/local/share/bewan_adsl_status" -#define PACKAGE_SOURCE_DIR "/home/fisaksen/src/unicorn/adsl_status" +#define PACKAGE_LOCALE_DIR "/usr/share/locale" +#define PACKAGE_DATA_DIR "/usr/share/bewan_adsl_status" +#define PACKAGE_SOURCE_DIR "/local/home/rzr/home/src/debian/unicorn-0.9.3/adsl_status" /* Define if you have the __argz_count function. */ #define HAVE___ARGZ_COUNT 1 --- unicorn-0.9.3.orig/adsl_status/po/Makefile +++ unicorn-0.9.3/adsl_status/po/Makefile @@ -18,7 +18,7 @@ srcdir = . top_srcdir = .. -prefix = /usr/local +prefix = /usr exec_prefix = ${prefix} datadir = ${prefix}/share localedir = $(datadir)/locale --- unicorn-0.9.3.orig/adsl_status/po/Makefile.in +++ unicorn-0.9.3/adsl_status/po/Makefile.in @@ -18,7 +18,7 @@ srcdir = . top_srcdir = .. -prefix = /usr/local +prefix = /usr exec_prefix = ${prefix} datadir = ${prefix}/share localedir = $(datadir)/locale --- unicorn-0.9.3.orig/adsl_status/config.status +++ unicorn-0.9.3/adsl_status/config.status @@ -2,9 +2,9 @@ # Generated automatically by configure. # Run this file to recreate the current configuration. # This directory was configured as follows, -# on host moutons: +# on host nrv: # -# ./configure +# ./configure --prefix=/usr # # Compiler output produced by configure, useful for debugging # configure, is in ./config.log if it exists. @@ -14,8 +14,8 @@ do case "$ac_option" in -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r) - echo "running ${CONFIG_SHELL-/bin/sh} ./configure --no-create --no-recursion" - exec ${CONFIG_SHELL-/bin/sh} ./configure --no-create --no-recursion ;; + echo "running ${CONFIG_SHELL-/bin/sh} ./configure --prefix=/usr --no-create --no-recursion" + exec ${CONFIG_SHELL-/bin/sh} ./configure --prefix=/usr --no-create --no-recursion ;; -version | --version | --versio | --versi | --vers | --ver | --ve | --v) echo "./config.status generated by autoconf version 2.13" exit 0 ;; @@ -49,7 +49,7 @@ s%@LDFLAGS@%%g s%@LIBS@%%g s%@exec_prefix@%${prefix}%g -s%@prefix@%/usr/local%g +s%@prefix@%/usr%g s%@program_transform_name@%s,x,x,%g s%@bindir@%${exec_prefix}/bin%g s%@sbindir@%${exec_prefix}/sbin%g @@ -77,8 +77,8 @@ s%@CC@%gcc%g s%@CPP@%gcc -E%g s%@GTK_CONFIG@%/usr/bin/gtk-config%g -s%@GTK_CFLAGS@%-I/usr/include/gtk-1.2 -I/usr/include/glib-1.2 -I/usr/lib/glib/include -I/usr/X11R6/include%g -s%@GTK_LIBS@%-L/usr/X11R6/lib -lgtk -lgdk -rdynamic -lgmodule -lglib -ldl -lXi -lXext -lX11 -lm%g +s%@GTK_CFLAGS@%-I/usr/include/gtk-1.2 -I/usr/include/glib-1.2 -I/usr/lib/glib/include%g +s%@GTK_LIBS@%-L/usr/lib -lgtk -lgdk -rdynamic -lgmodule -lglib -ldl -lXi -lXext -lX11 -lm%g s%@MKINSTALLDIRS@%./mkinstalldirs%g s%@MSGFMT@%/usr/bin/msgfmt%g s%@GMSGFMT@%/usr/bin/msgfmt%g @@ -467,21 +467,21 @@ ${ac_dA}HAVE_DCGETTEXT${ac_dB}HAVE_DCGETTEXT${ac_dC}1${ac_dD} ${ac_uA}HAVE_DCGETTEXT${ac_uB}HAVE_DCGETTEXT${ac_uC}1${ac_uD} ${ac_eA}HAVE_DCGETTEXT${ac_eB}HAVE_DCGETTEXT${ac_eC}1${ac_eD} -${ac_dA}PACKAGE_LOCALE_DIR${ac_dB}PACKAGE_LOCALE_DIR${ac_dC}"/usr/local/share/locale"${ac_dD} -${ac_uA}PACKAGE_LOCALE_DIR${ac_uB}PACKAGE_LOCALE_DIR${ac_uC}"/usr/local/share/locale"${ac_uD} -${ac_eA}PACKAGE_LOCALE_DIR${ac_eB}PACKAGE_LOCALE_DIR${ac_eC}"/usr/local/share/locale"${ac_eD} +${ac_dA}PACKAGE_LOCALE_DIR${ac_dB}PACKAGE_LOCALE_DIR${ac_dC}"/usr/share/locale"${ac_dD} +${ac_uA}PACKAGE_LOCALE_DIR${ac_uB}PACKAGE_LOCALE_DIR${ac_uC}"/usr/share/locale"${ac_uD} +${ac_eA}PACKAGE_LOCALE_DIR${ac_eB}PACKAGE_LOCALE_DIR${ac_eC}"/usr/share/locale"${ac_eD} CEOF sed -f conftest.frag conftest.in > conftest.out rm -f conftest.in mv conftest.out conftest.in cat > conftest.frag < conftest.out --- unicorn-0.9.3.orig/adsl_status/config.log +++ unicorn-0.9.3/adsl_status/config.log @@ -2,7 +2,7 @@ running configure, to aid debugging if configure makes a mistake. configure:589: checking for non-GNU ld -configure:624: checking if the linker (/usr/bin/ld) is GNU ld +configure:624: checking if the linker (/usr/bin/X11/ld) is GNU ld configure:673: checking for a BSD compatible install configure:726: checking whether build environment is sane configure:783: checking whether make sets ${MAKE} @@ -15,75 +15,3 @@ configure:944: checking for gcc configure:1057: checking whether the C compiler (gcc ) works configure:1073: gcc -o conftest conftest.c 1>&5 -configure:1099: checking whether the C compiler (gcc ) is a cross-compiler -configure:1104: checking whether we are using GNU C -configure:1132: checking whether gcc accepts -g -configure:1167: checking for gcc option to accept ANSI C -configure:1244: checking how to run the C preprocessor -configure:1324: checking for ANSI C header files -configure:1478: checking for gtk-config -configure:1513: checking for GTK - version >= 1.2.0 -configure:1614: gcc -o conftest -g -O2 -I/usr/include/gtk-1.2 -I/usr/include/glib-1.2 -I/usr/lib/glib/include -I/usr/X11R6/include conftest.c -L/usr/X11R6/lib -lgtk -lgdk -rdynamic -lgmodule -lglib -ldl -lXi -lXext -lX11 -lm 1>&5 -configure:1700: checking for inttypes.h -configure:1735: checking for stdint.h -configure:1770: checking for unsigned long long -configure:1821: checking for shared library run path origin -configure:1870: checking host system type -configure:1893: checking for ranlib -configure:1921: checking for working const -configure:1996: checking for inline -configure:2036: checking for off_t -configure:2069: checking for size_t -configure:2104: checking for working alloca.h -configure:2137: checking for alloca -configure:2339: checking for unistd.h -configure:2378: checking for getpagesize -configure:2431: checking for working mmap -configure:2603: checking whether we are using the GNU C Library 2.1 or newer -configure:2641: checking whether integer division by zero raises SIGFPE -configure:2739: checking for inttypes.h -configure:2778: checking whether the inttypes.h PRIxNN macros are broken -configure:3206: checking for msgfmt -configure:3241: checking for gmsgfmt -configure:3278: checking for xgettext -configure:3315: checking for msgmerge -configure:3378: checking for argz.h -configure:3378: checking for limits.h -configure:3378: checking for locale.h -configure:3378: checking for nl_types.h -configure:3378: checking for malloc.h -configure:3378: checking for stddef.h -configure:3378: checking for stdlib.h -configure:3378: checking for string.h -configure:3378: checking for unistd.h -configure:3378: checking for sys/param.h -configure:3419: checking for feof_unlocked -configure:3419: checking for fgets_unlocked -configure:3419: checking for getc_unlocked -configure:3419: checking for getcwd -configure:3419: checking for getegid -configure:3419: checking for geteuid -configure:3419: checking for getgid -configure:3419: checking for getuid -configure:3419: checking for mempcpy -configure:3419: checking for munmap -configure:3419: checking for putenv -configure:3419: checking for setenv -configure:3419: checking for setlocale -configure:3419: checking for stpcpy -configure:3419: checking for strcasecmp -configure:3419: checking for strdup -configure:3419: checking for strtoul -configure:3419: checking for tsearch -configure:3419: checking for __argz_count -configure:3419: checking for __argz_stringify -configure:3419: checking for __argz_next -configure:3503: checking for iconv -configure:3578: checking for iconv declaration -configure:3627: checking for nl_langinfo and CODESET -configure:3663: checking for LC_MESSAGES -configure:3702: checking for bison -configure:3735: checking version of bison -configure:3764: checking whether NLS is requested -configure:3788: checking whether included gettext is requested -configure:3808: checking for GNU gettext in libc --- unicorn-0.9.3.orig/adsl_status/config.cache +++ unicorn-0.9.3/adsl_status/config.cache @@ -75,7 +75,7 @@ acl_cv_hardcode_libdir_separator=${acl_cv_hardcode_libdir_separator=} acl_cv_hardcode_minus_L=${acl_cv_hardcode_minus_L=no} acl_cv_libext=${acl_cv_libext=a} -acl_cv_path_LD=${acl_cv_path_LD=/usr/bin/ld} +acl_cv_path_LD=${acl_cv_path_LD=/usr/bin/X11/ld} acl_cv_prog_gnu_ld=${acl_cv_prog_gnu_ld=yes} acl_cv_rpath=${acl_cv_rpath=done} acl_cv_shlibext=${acl_cv_shlibext=} --- unicorn-0.9.3.orig/adsl_status/Makefile +++ unicorn-0.9.3/adsl_status/Makefile @@ -16,7 +16,7 @@ srcdir = . top_srcdir = . -prefix = /usr/local +prefix = /usr exec_prefix = ${prefix} bindir = ${exec_prefix}/bin @@ -66,9 +66,9 @@ GENCAT = gencat GLIBC21 = yes GMSGFMT = /usr/bin/msgfmt -GTK_CFLAGS = -I/usr/include/gtk-1.2 -I/usr/include/glib-1.2 -I/usr/lib/glib/include -I/usr/X11R6/include +GTK_CFLAGS = -I/usr/include/gtk-1.2 -I/usr/include/glib-1.2 -I/usr/lib/glib/include GTK_CONFIG = /usr/bin/gtk-config -GTK_LIBS = -L/usr/X11R6/lib -lgtk -lgdk -rdynamic -lgmodule -lglib -ldl -lXi -lXext -lX11 -lm +GTK_LIBS = -L/usr/lib -lgtk -lgdk -rdynamic -lgmodule -lglib -ldl -lXi -lXext -lX11 -lm HAVE_LIB = @HAVE_LIB@ INSTOBJEXT = .mo INTLBISON = bison --- unicorn-0.9.3.orig/adsl_status/intl/Makefile +++ unicorn-0.9.3/adsl_status/intl/Makefile @@ -26,7 +26,7 @@ top_srcdir = .. top_builddir = .. -prefix = /usr/local +prefix = /usr exec_prefix = ${prefix} transform = s,x,x, libdir = ${exec_prefix}/lib --- unicorn-0.9.3.orig/adsl_status/m4/Makefile +++ unicorn-0.9.3/adsl_status/m4/Makefile @@ -16,7 +16,7 @@ srcdir = . top_srcdir = .. -prefix = /usr/local +prefix = /usr exec_prefix = ${prefix} bindir = ${exec_prefix}/bin @@ -66,9 +66,9 @@ GENCAT = gencat GLIBC21 = yes GMSGFMT = /usr/bin/msgfmt -GTK_CFLAGS = -I/usr/include/gtk-1.2 -I/usr/include/glib-1.2 -I/usr/lib/glib/include -I/usr/X11R6/include +GTK_CFLAGS = -I/usr/include/gtk-1.2 -I/usr/include/glib-1.2 -I/usr/lib/glib/include GTK_CONFIG = /usr/bin/gtk-config -GTK_LIBS = -L/usr/X11R6/lib -lgtk -lgdk -rdynamic -lgmodule -lglib -ldl -lXi -lXext -lX11 -lm +GTK_LIBS = -L/usr/lib -lgtk -lgdk -rdynamic -lgmodule -lglib -ldl -lXi -lXext -lX11 -lm HAVE_LIB = @HAVE_LIB@ INSTOBJEXT = .mo INTLBISON = bison