[kernel] r8039 - in dists/trunk/modules/unicorn/unicorn: adsl_status adsl_status/intl adsl_status/m4 adsl_status/po adsl_status/src amu debian include msw tools unicorn_atm unicorn_eth unicorn_pci unicorn_usb unicorntest

[Philippe COVAL]

Author: rzr-guest
Date: Wed Dec 27 00:38:25 2006
New Revision: 8039

Added:
   dists/trunk/modules/unicorn/unicorn/amu/amas.c
   dists/trunk/modules/unicorn/unicorn/amu/amu.c
   dists/trunk/modules/unicorn/unicorn/amu/bsp_pci.c
   dists/trunk/modules/unicorn/unicorn/amu/bsp_usb.c
   dists/trunk/modules/unicorn/unicorn/msw/msw.c
Modified:
   dists/trunk/modules/unicorn/unicorn/adsl_status/Makefile
   dists/trunk/modules/unicorn/unicorn/adsl_status/config.h
   dists/trunk/modules/unicorn/unicorn/adsl_status/config.log
   dists/trunk/modules/unicorn/unicorn/adsl_status/config.status
   dists/trunk/modules/unicorn/unicorn/adsl_status/intl/Makefile
   dists/trunk/modules/unicorn/unicorn/adsl_status/m4/Makefile
   dists/trunk/modules/unicorn/unicorn/adsl_status/po/Makefile
   dists/trunk/modules/unicorn/unicorn/adsl_status/po/Makefile.in
   dists/trunk/modules/unicorn/unicorn/adsl_status/src/Makefile
   dists/trunk/modules/unicorn/unicorn/amu/amu.h
   dists/trunk/modules/unicorn/unicorn/amu/bsp.h
   dists/trunk/modules/unicorn/unicorn/debian/changelog
   dists/trunk/modules/unicorn/unicorn/include/types.h
   dists/trunk/modules/unicorn/unicorn/msw/.crc.o.cmd
   dists/trunk/modules/unicorn/unicorn/msw/.linrapi.o.cmd
   dists/trunk/modules/unicorn/unicorn/msw/fp_stubs.c
   dists/trunk/modules/unicorn/unicorn/msw/linrapi.c
   dists/trunk/modules/unicorn/unicorn/tools/Makefile
   dists/trunk/modules/unicorn/unicorn/unicorn_atm/.unicorn_atmdrv.o.cmd
   dists/trunk/modules/unicorn/unicorn/unicorn_atm/unicorn_atmdrv.c
   dists/trunk/modules/unicorn/unicorn/unicorn_eth/.unicorn_ethdrv.o.cmd
   dists/trunk/modules/unicorn/unicorn/unicorn_eth/unicorn_ethdrv.c
   dists/trunk/modules/unicorn/unicorn/unicorn_pci/unicorn_pcidrv.c
   dists/trunk/modules/unicorn/unicorn/unicorn_usb/unicorn_usbdrv.c
   dists/trunk/modules/unicorn/unicorn/unicorntest/Makefile
   dists/trunk/modules/unicorn/unicorn/unicorntest/unicorntest.c
Log:
applied gentoo patches : bewan-adsl-0.9.3-patches-20061220.tar.gz



Modified: dists/trunk/modules/unicorn/unicorn/adsl_status/Makefile
==============================================================================
--- dists/trunk/modules/unicorn/unicorn/adsl_status/Makefile	(original)
+++ dists/trunk/modules/unicorn/unicorn/adsl_status/Makefile	Wed Dec 27 00:38:25 2006
@@ -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 -L/usr/X11R6/lib -lgtk -lgdk -rdynamic -lgmodule -lglib -ldl -lXi -lXext -lX11 -lm
 HAVE_LIB = @HAVE_LIB@
 INSTOBJEXT = .mo
 INTLBISON = bison
@@ -81,7 +81,7 @@
 LTLIB = @LTLIB@
 LTLIBICONV = 
 LTLIBINTL = 
-MAKEINFO = makeinfo
+MAKEINFO = /local/home/rzr/home/src/unicorn/unicorn/unicorn/adsl_status/missing makeinfo
 MKINSTALLDIRS = ./mkinstalldirs
 PACKAGE = bewan_adsl_status
 POSUB = po

Modified: dists/trunk/modules/unicorn/unicorn/adsl_status/config.h
==============================================================================
--- dists/trunk/modules/unicorn/unicorn/adsl_status/config.h	(original)
+++ dists/trunk/modules/unicorn/unicorn/adsl_status/config.h	Wed Dec 27 00:38:25 2006
@@ -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/unicorn/unicorn/unicorn/adsl_status"
 
 /* Define if you have the __argz_count function.  */
 #define HAVE___ARGZ_COUNT 1

Modified: dists/trunk/modules/unicorn/unicorn/adsl_status/config.log
==============================================================================
--- dists/trunk/modules/unicorn/unicorn/adsl_status/config.log	(original)
+++ dists/trunk/modules/unicorn/unicorn/adsl_status/config.log	Wed Dec 27 00:38:25 2006
@@ -23,7 +23,7 @@
 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:1614: gcc -o conftest -g -O2 -I/usr/include/gtk-1.2 -I/usr/include/glib-1.2 -I/usr/lib/glib/include   conftest.c -L/usr/lib -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

Modified: dists/trunk/modules/unicorn/unicorn/adsl_status/config.status
==============================================================================
--- dists/trunk/modules/unicorn/unicorn/adsl_status/config.status	(original)
+++ dists/trunk/modules/unicorn/unicorn/adsl_status/config.status	Wed Dec 27 00:38:25 2006
@@ -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
@@ -72,13 +72,13 @@
 s%@AUTOCONF@%autoconf%g
 s%@AUTOMAKE@%automake-1.4%g
 s%@AUTOHEADER@%autoheader%g
-s%@MAKEINFO@%makeinfo%g
+s%@MAKEINFO@%/local/home/rzr/home/src/unicorn/unicorn/unicorn/adsl_status/missing makeinfo%g
 s%@SET_MAKE@%%g
 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 -L/usr/X11R6/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 <<CEOF
-${ac_dA}PACKAGE_DATA_DIR${ac_dB}PACKAGE_DATA_DIR${ac_dC}"/usr/local/share/bewan_adsl_status"${ac_dD}
-${ac_uA}PACKAGE_DATA_DIR${ac_uB}PACKAGE_DATA_DIR${ac_uC}"/usr/local/share/bewan_adsl_status"${ac_uD}
-${ac_eA}PACKAGE_DATA_DIR${ac_eB}PACKAGE_DATA_DIR${ac_eC}"/usr/local/share/bewan_adsl_status"${ac_eD}
-${ac_dA}PACKAGE_SOURCE_DIR${ac_dB}PACKAGE_SOURCE_DIR${ac_dC}"/home/fisaksen/src/unicorn/adsl_status"${ac_dD}
-${ac_uA}PACKAGE_SOURCE_DIR${ac_uB}PACKAGE_SOURCE_DIR${ac_uC}"/home/fisaksen/src/unicorn/adsl_status"${ac_uD}
-${ac_eA}PACKAGE_SOURCE_DIR${ac_eB}PACKAGE_SOURCE_DIR${ac_eC}"/home/fisaksen/src/unicorn/adsl_status"${ac_eD}
+${ac_dA}PACKAGE_DATA_DIR${ac_dB}PACKAGE_DATA_DIR${ac_dC}"/usr/share/bewan_adsl_status"${ac_dD}
+${ac_uA}PACKAGE_DATA_DIR${ac_uB}PACKAGE_DATA_DIR${ac_uC}"/usr/share/bewan_adsl_status"${ac_uD}
+${ac_eA}PACKAGE_DATA_DIR${ac_eB}PACKAGE_DATA_DIR${ac_eC}"/usr/share/bewan_adsl_status"${ac_eD}
+${ac_dA}PACKAGE_SOURCE_DIR${ac_dB}PACKAGE_SOURCE_DIR${ac_dC}"/local/home/rzr/home/src/unicorn/unicorn/unicorn/adsl_status"${ac_dD}
+${ac_uA}PACKAGE_SOURCE_DIR${ac_uB}PACKAGE_SOURCE_DIR${ac_uC}"/local/home/rzr/home/src/unicorn/unicorn/unicorn/adsl_status"${ac_uD}
+${ac_eA}PACKAGE_SOURCE_DIR${ac_eB}PACKAGE_SOURCE_DIR${ac_eC}"/local/home/rzr/home/src/unicorn/unicorn/unicorn/adsl_status"${ac_eD}
 s%^[ 	]*#[ 	]*undef[ 	][ 	]*[a-zA-Z_][a-zA-Z_0-9]*%/* & */%
 CEOF
   sed -f conftest.frag conftest.in > conftest.out

Modified: dists/trunk/modules/unicorn/unicorn/adsl_status/intl/Makefile
==============================================================================
--- dists/trunk/modules/unicorn/unicorn/adsl_status/intl/Makefile	(original)
+++ dists/trunk/modules/unicorn/unicorn/adsl_status/intl/Makefile	Wed Dec 27 00:38:25 2006
@@ -26,7 +26,7 @@
 top_srcdir = ..
 top_builddir = ..
 
-prefix = /usr/local
+prefix = /usr
 exec_prefix = ${prefix}
 transform = s,x,x,
 libdir = ${exec_prefix}/lib

Modified: dists/trunk/modules/unicorn/unicorn/adsl_status/m4/Makefile
==============================================================================
--- dists/trunk/modules/unicorn/unicorn/adsl_status/m4/Makefile	(original)
+++ dists/trunk/modules/unicorn/unicorn/adsl_status/m4/Makefile	Wed Dec 27 00:38:25 2006
@@ -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 -L/usr/X11R6/lib -lgtk -lgdk -rdynamic -lgmodule -lglib -ldl -lXi -lXext -lX11 -lm
 HAVE_LIB = @HAVE_LIB@
 INSTOBJEXT = .mo
 INTLBISON = bison
@@ -81,7 +81,7 @@
 LTLIB = @LTLIB@
 LTLIBICONV = 
 LTLIBINTL = 
-MAKEINFO = makeinfo
+MAKEINFO = /local/home/rzr/home/src/unicorn/unicorn/unicorn/adsl_status/missing makeinfo
 MKINSTALLDIRS = ./mkinstalldirs
 PACKAGE = bewan_adsl_status
 POSUB = po

Modified: dists/trunk/modules/unicorn/unicorn/adsl_status/po/Makefile
==============================================================================
--- dists/trunk/modules/unicorn/unicorn/adsl_status/po/Makefile	(original)
+++ dists/trunk/modules/unicorn/unicorn/adsl_status/po/Makefile	Wed Dec 27 00:38:25 2006
@@ -18,7 +18,7 @@
 srcdir = .
 top_srcdir = ..
 
-prefix = /usr/local
+prefix = /usr
 exec_prefix = ${prefix}
 datadir = ${prefix}/share
 localedir = $(datadir)/locale

Modified: dists/trunk/modules/unicorn/unicorn/adsl_status/po/Makefile.in
==============================================================================
--- dists/trunk/modules/unicorn/unicorn/adsl_status/po/Makefile.in	(original)
+++ dists/trunk/modules/unicorn/unicorn/adsl_status/po/Makefile.in	Wed Dec 27 00:38:25 2006
@@ -18,7 +18,7 @@
 srcdir = .
 top_srcdir = ..
 
-prefix = /usr/local
+prefix = /usr
 exec_prefix = ${prefix}
 datadir = ${prefix}/share
 localedir = $(datadir)/locale

Modified: dists/trunk/modules/unicorn/unicorn/adsl_status/src/Makefile
==============================================================================
--- dists/trunk/modules/unicorn/unicorn/adsl_status/src/Makefile	(original)
+++ dists/trunk/modules/unicorn/unicorn/adsl_status/src/Makefile	Wed Dec 27 00:38:25 2006
@@ -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 -L/usr/X11R6/lib -lgtk -lgdk -rdynamic -lgmodule -lglib -ldl -lXi -lXext -lX11 -lm
 HAVE_LIB = @HAVE_LIB@
 INSTOBJEXT = .mo
 INTLBISON = bison
@@ -81,7 +81,7 @@
 LTLIB = @LTLIB@
 LTLIBICONV = 
 LTLIBINTL = 
-MAKEINFO = makeinfo
+MAKEINFO = /local/home/rzr/home/src/unicorn/unicorn/unicorn/adsl_status/missing makeinfo
 MKINSTALLDIRS = ./mkinstalldirs
 PACKAGE = bewan_adsl_status
 POSUB = po
@@ -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 -L/usr/X11R6/lib -lgtk -lgdk -rdynamic -lgmodule -lglib -ldl -lXi -lXext -lX11 -lm $(INTLLIBS)
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = ../config.h
 CONFIG_CLEAN_FILES = 

Added: dists/trunk/modules/unicorn/unicorn/amu/amas.c
==============================================================================
--- (empty file)
+++ dists/trunk/modules/unicorn/unicorn/amu/amas.c	Wed Dec 27 00:38:25 2006
@@ -0,0 +1,161 @@
+#include "types.h"
+#include "tracetool.h"
+#include "amas.h"				/* AMAS API's and typedefs */
+#include "rapi.h"
+
+extern unsigned long	g_ModemState, g_ShowtimeCounter;
+extern unsigned int 	g_WaitForShowtime, g_WaitForInit;
+extern BOOLEAN				L3_flag;
+									
+extern T_AMSW_ANT_StaticConfiguration	g_StaticCfg;
+extern T_AMSW_NT_NearEndLineOperData 	g_NearEndLineOperData;
+extern T_AMSW_NT_FarEndLineOperData 	g_FarEndLineOperData;
+extern T_AMSW_def_counter_set 			g_def_counter_set;
+extern T_AMSW_def_bitmap_set 			g_def_bitmap_set;
+extern T_AMSW_def_counters				g_def_counters;
+extern T_AMSW_NT_ChannelOperData 		g_ChannelOperData;
+extern T_AMSW_ANT_CustomerConfiguration	g_CustomerCfg;
+extern T_AMSW_PowerStateConfiguration 	g_PowerStateCfg;
+extern T_AMSW_Teq						g_Teq;
+extern T_AMSW_Ber						g_Ber;
+extern T_AMSW_VersionMS					g_VersionMS;
+
+// 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;
+
+	switch(p_ModemState)
+	{
+	case C_AMSW_IDLE             : s = "IDLE";             break; 
+	case C_AMSW_L3               : s = "L3";               break; 
+	case C_AMSW_LISTENING        : s = "LISTENING";        break; 
+	case C_AMSW_ACTIVATING       : s = "ACTIVATING";       break;
+	case C_AMSW_Ghs_HANDSHAKING  : s = "Ghs_HANDSHAKING";  break; 
+	case C_AMSW_ANSI_HANDSHAKING : s = "ANSI_HANDSHAKING"; break; 
+	case C_AMSW_INITIALIZING     : s = "INITIALIZING";     break; 
+	case C_AMSW_RESTARTING       : s = "RESTARTING";       break; 
+	case C_AMSW_FAST_RETRAIN     : s = "FAST_RETRAIN";     break; 
+	case C_AMSW_SHOWTIME_L0      : s = "SHOWTIME_L0";      break; 
+	case C_AMSW_SHOWTIME_LQ      : s = "SHOWTIME_LQ";      break; 
+	case C_AMSW_SHOWTIME_L1      : s = "SHOWTIME_L1";      break; 
+	case C_AMSW_EXCHANGE         : s = "EXCHANGE";         break; 
+	case C_AMSW_TRUNCATE         : s = "TRUNCATE";         break; 
+	case C_AMSW_ESCAPE           : s = "ESCAPE";           break; 
+	default                      : s = "Unknown State";    break; 
+	}
+	PRINT_ERROR("Current Modem State (%d): %s\n", g_ModemState, s);
+
+	msw_report_event(MSW_EVENT_STATE,p_ModemState);
+}
+
+// ADSL Modem Software calls this function to report events
+void AMSW_ANT_reportEvent(AMSW_ModemEvent p_Event)
+{
+	char *s;
+	switch(p_Event)
+	{
+	default                            : s = "UNKNOWN";                break;
+	case C_AMSW_PEER_ATU_FOUND         : s = "Peer ATU Found";         break;
+	case C_AMSW_RESTART_REQUEST        : s = "Restart Request";        break;
+	case C_AMSW_ACTIVATION_REQUEST     : s = "Activation Request";     break;
+	case C_AMSW_L3_EXECUTED            : s = "L3 Executed"; 
+		g_ModemState = C_AMSW_IDLE;
+		L3_flag = TRUE;
+		break;
+	case C_AMSW_L3_REJECTED            : s = "L3 Rejected";       
+		L3_flag = TRUE;
+		break;
+	case C_AMSW_L1_EXECUTED            : s = "L1 Executed";            break;
+	case C_AMSW_L1_REJECTED            : s = "L1 Rejected";            break;
+	case C_AMSW_L0_REJECTED            : s = "L0 Rejected";            break;
+	case C_AMSW_RESTART_ACCEPTABLE     : s = "Restart Acceptable";     break;
+	case C_AMSW_RESTART_NOT_ACCEPTABLE : s = "Restart Not Acceptable"; break;
+
+	case C_AMSW_TO_INITIALIZING        : s = "Initializing";
+		g_WaitForInit = 0;
+		g_WaitForShowtime = 0;
+		break;
+
+	case C_AMSW_SHOWTIME               : s = "Showtime";
+		g_WaitForShowtime = 0;
+		g_ShowtimeCounter = 0;	
+		break;
+
+	case C_AMSW_SUICIDE_REQUEST        : s = "Suicide Request"; 
+		// orderly shutdown request from peer ATU
+		g_ModemState = C_AMSW_DISORDERLY;
+		break;
+
+	}
+	PRINT_ERROR("Event Reported (%d): %s\n", (int)p_Event, s);
+
+	msw_report_event(MSW_EVENT_REPORT,p_Event);
+}
+
+// ADSL Modem Software calls this function to report the reason for failure
+void AMSW_ANT_reportModemFailure(AMSW_ModemFailure p_FailureCause)
+{
+	char *s;
+	switch(p_FailureCause)
+	{
+	case C_AMSW_UNCOMPATIBLE_LINECONDITIONS :
+		s = "Uncompatible Line Conditions";
+		break;
+
+	case C_AMSW_NO_LOCK_POSSIBLE :
+		s = "No Lock Possible";
+		break;
+
+	case C_AMSW_PROTOCOL_ERROR :
+		s = "Protocol Error";
+		break;
+
+	case C_AMSW_MESSAGE_ERROR :
+		s = "Message Error";
+		break;
+
+	case C_AMSW_SPURIOUS_ATU_DETECTED :
+		s = "Spurious ATU Detected";
+		break;
+
+	case C_AMSW_FORCED_SILENCE :
+		s = "Forced Silence";
+		break;
+
+	case C_AMSW_DS_REQ_BITRATE_TOO_HIGH_FOR_LITE :
+		s = "Requested Bit Rate Too High";
+		break;
+
+	case C_AMSW_INTERLEAVED_PROFILE_REQUIRED_FOR_LITE :
+		s = "Interleaved Profile Required for LITE";
+		break;
+
+	case C_AMSW_UNSELECTABLE_OPERATION_MODE :
+		s = "Unselectable Operation Mode";
+		break;
+
+	case C_AMSW_STATE_REFUSED_BY_GOLDEN :
+		s = "State Refused By Golden";
+		break;
+
+	default : 
+		s = "Unknown Cause";
+		break;
+	}
+
+	// Disorderly shutdown
+	PRINT_ERROR("Modem Init Failure: %s (%d)\n", s, p_FailureCause); 
+	g_ModemState = C_AMSW_DISORDERLY;
+
+	msw_report_event(MSW_EVENT_FAILURE,p_FailureCause);
+}
+
+AMSW_ResultCode AMSW_ANT_wait_event(unsigned long *event)
+{
+  *event= last_report;
+  return 0;
+}
+

Added: dists/trunk/modules/unicorn/unicorn/amu/amu.c
==============================================================================
--- (empty file)
+++ dists/trunk/modules/unicorn/unicorn/amu/amu.c	Wed Dec 27 00:38:25 2006
@@ -0,0 +1,524 @@
+#include "types.h"
+#include "tracetool.h"
+#include "rapi.h"  
+#include "hard.h"
+#include "hal.h"
+#include "amas.h"
+#include "amu.h"
+#define _PICAP_CODE_
+#ifdef _PICAP_CODE_
+extern long Vendor_Id_code_ECI;
+#endif
+
+
+
+//#define PM_FM_POLLING_RATE          1000// milliseconds
+//#define INIT_POLLING_TIME           2    // (INIT_POLLING_TIME* PM_FM_POLLING_RATE) milliseconds
+//#define WAITFOR_SHOWTIME_COUNT      20   // (WAITFOR_SHOWTIME_COUNT * PM_FM_POLLING_RATE) millisecs 
+#define RETRY_WAIT_TIME_MIN_MSEC      5000 // 5 seconds (between line disable and reenable)
+
+//#define WAITFOR_DISORDERLY_COUNT    2000   // (WAITFOR_DISORDERLY_COUNT * PM_FM_POLLING_RATE) msecs 
+
+//#define NEAR_LCDNI_COUNT            15  // 15 seconds timeout of near end LCD persistency
+//#define NEAR_LCDI_COUNT             15  // 15 seconds timeout of near end LCDI persistency
+//#define NEAR_LOS_COUNT              5   // 5 seconds timeout of near end LOS persistency
+//#define NEAR_LOF_COUNT              5   // 5 seconds timeout of near end LOF persistency
+//#define FAR_LCDNI_COUNT             17  // 17 seconds timeout of far end LCD persistency
+//#define FAR_LCDI_COUNT							17  // 17 seconds timeout of far end LCD persistency
+//#define FAR_LOS_COUNT               5   // 6 seconds timeout of far end LOS persistency
+//#define FAR_LOF_COUNT               5   // 6 seconds timeout of far end LOF persistency
+//#define FAR_LOS_SHORT_COUNT         4   // 4 seconds timeout of far end LOS persistency
+//#define FAR_LOF_SHORT_COUNT         4   // 4 seconds timeout of far end LOF persistency
+
+
+//#define CRC_FAST_COUNT              5   // (CRC_FAST_COUNT * AMUTASK_MSG_WAIT_TIME) millisecs
+//#define CRC_INTERLEAVED_COUNT       5   // (CRC_INTERLEAVED_COUNT * AMUTASK_MSG_WAIT_TIME) milli
+//#define WATCHDOG_COUNTER_VALUE      500	// Time to reset = (WATCHDOG_COUNTER_VALUE * 2) * 8.192 
+																					// milli sec
+
+unsigned long NEAR_LCDNI_COUNT;         
+unsigned long NEAR_LCDI_COUNT;          
+unsigned long NEAR_LOS_COUNT;           
+unsigned long NEAR_LOF_COUNT;           
+unsigned long FAR_LCDNI_COUNT;          
+unsigned long FAR_LCDI_COUNT;						
+unsigned long FAR_LOS_COUNT;            
+unsigned long FAR_LOF_COUNT;            
+unsigned long FAR_LOS_SHORT_COUNT;      
+unsigned long FAR_LOF_SHORT_COUNT;      
+
+#if 0
+//ModemSW variables
+extern T_AMSW_Identification                g_Identification;
+extern T_AMSW_NT_NearEndLineOperData        g_NearEndLineOperData;
+extern T_AMSW_NT_FarEndLineOperData         g_FarEndLineOperData;
+extern T_AMSW_def_counter_set               g_def_counter_set;
+extern T_AMSW_def_bitmap_set                g_def_bitmap_set;
+extern T_AMSW_def_counters                  g_def_counters;
+extern T_AMSW_NT_ChannelOperData            g_ChannelOperData;
+extern T_AMSW_ANT_CustomerConfiguration     g_CustomerCfg;
+extern T_AMSW_ANT_StaticConfiguration       g_StaticCfg;
+extern T_AMSW_PowerStateConfiguration       g_PowerStateCfg;   
+extern T_AMSW_Teq g_Teq; //STM G
+extern T_AMSW_Ber g_Ber;
+extern T_AMSW_VersionMS g_VersionMS;
+#endif
+
+extern unsigned long DownstreamRate;	// In Kbits/sec	
+unsigned long FmPollingRate = 1000;
+unsigned long InitTimeout = 20000;
+//unsigned long ActTimeout = 10000;
+unsigned long ActTimeout = 300000;	// Fix for Alcatel 4.2.13
+unsigned long RetryTime = 5000;
+
+unsigned long LCD_Trig = 15000;
+unsigned long LOS_LOF_Trig = 5000;
+
+extern unsigned long Vendor_Id_code_Globspan;
+unsigned long Vendor_Id_code_Globspan=0;
+
+#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)
+{
+	unsigned long l_RetCode;
+
+	//
+	// Static Configuration
+	//
+	g_StaticCfg.utopiaMode = C_AMSW_UTOPIA_LEVEL1;
+	g_StaticCfg.utopiaFast = 0;
+	g_StaticCfg.utopiaSlow = 0;
+	for (l_RetCode=0; l_RetCode<32; l_RetCode++)
+		g_StaticCfg.serialNumber[l_RetCode] = '9';
+//	g_StaticCfg.maximumDownstreamLineRate = 5000;				
+	g_StaticCfg.maximumDownstreamLineRate = DownstreamRate;
+	g_StaticCfg.managementVersion = 1;
+	g_StaticCfg.goldenMode = AMSW_GOLDEN_OFF;
+	g_StaticCfg.vendorIdentif.countryCode = 0x0f;
+	g_StaticCfg.vendorIdentif.reserved = 0x00;
+	g_StaticCfg.vendorIdentif.vendorCode = (0x41 << 24) | (0x4c << 16) | (0x43 << 8) | (0x42); /*"ALCB"*/ //RFC016
+//	g_StaticCfg.vendorIdentif.vendorCode = 0x3A; //STMicroelectronics
+	g_StaticCfg.vendorIdentif.vendorSpecific = 0x0451;
+
+	//
+	//	Customer Configuration
+	//
+
+	switch(MODE)
+	{
+	case MSW_MODE_ANSI:
+		g_CustomerCfg.POTSoverlayOperationModes = AMSW_ANSI;
+		break;
+	case MSW_MODE_GLITE:
+		g_CustomerCfg.POTSoverlayOperationModes = AMSW_G_LITE;
+		break;
+	case MSW_MODE_GDMT:
+		g_CustomerCfg.POTSoverlayOperationModes = AMSW_G_DMT;
+		break;		
+	case MSW_MODE_MULTI:	default:
+		g_CustomerCfg.POTSoverlayOperationModes = AMSW_G_DMT | AMSW_ANSI | AMSW_G_LITE;
+		break;
+	}
+
+	g_CustomerCfg.POTSoverlayPermissions[0] = AMSW_TRELLIS | AMSW_BITSWAP;   // ANSI
+	
+#ifdef SUICIDE_FIX	
+	g_CustomerCfg.POTSoverlayPermissions[1] = AMSW_TRELLIS | AMSW_DS_PILOT_MODULATED | AMSW_POWER_MANAGEMENT;	    //DMT
+#else
+	g_CustomerCfg.POTSoverlayPermissions[1] = AMSW_TRELLIS | AMSW_DS_PILOT_MODULATED;							// DMT													
+#endif
+														
+	g_CustomerCfg.POTSoverlayPermissions[2] = AMSW_LQ;																														// UAWG
+	g_CustomerCfg.POTSoverlayPermissions[3] = AMSW_BITSWAP | AMSW_RS16 | AMSW_TRELLIS | AMSW_DS_PILOT_MODULATED ;	// G.LITE
+	g_CustomerCfg.POTSoverlayPermissions[4] = 0;
+	g_CustomerCfg.POTSoverlayPermissions[5] = 0;
+	g_CustomerCfg.POTSoverlayPermissions[6] = 0;
+	g_CustomerCfg.POTSoverlayPermissions[7] = 0;
+	
+	//
+	// ISDN
+	//
+	g_CustomerCfg.ISDNoverlayOperationModes = 0;
+	for (l_RetCode = 0; l_RetCode < 8; l_RetCode++)
+		g_CustomerCfg.ISDNoverlayPermissions[l_RetCode] = 0;
+	for (l_RetCode = 0; l_RetCode < 8; l_RetCode++)
+		g_CustomerCfg.ISDNoverlayPermissions[l_RetCode] = 0;
+		
+	//
+	// Power State Configuration
+	//
+	g_PowerStateCfg.powerStateControl = AMSW_L3 | AMSW_L1;
+
+	// Setup modem configuration
+	l_RetCode = AMSW_ANT_setModemConfiguration(C_AMSW_STATIC_CONFIGURATION,&g_StaticCfg);
+	if (l_RetCode != C_AMSW_ACK)
+		PRINT_ERROR("Error in AMSW_ANT_setModemConfiguration-1 (%d)\n", l_RetCode);
+	l_RetCode = AMSW_ANT_setModemConfiguration(C_AMSW_CUSTOMER_CONFIGURATION,&g_CustomerCfg);
+	if (l_RetCode != C_AMSW_ACK)
+		PRINT_ERROR("Error in AMSW_ANT_setModemConfiguration-2 (%d)\n", l_RetCode);
+	l_RetCode = AMSW_ANT_setModemConfiguration(C_AMSW_POWER_STATE_CONTROL,&g_PowerStateCfg);
+	if (l_RetCode != C_AMSW_ACK)
+		PRINT_ERROR("Error in AMSW_ANT_setModemConfiguration-3 (%d)\n", l_RetCode);
+	return l_RetCode;
+}
+
+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 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;
+	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;           
+	NEAR_LOF_COUNT = NEAR_LOS_COUNT;           
+	FAR_LCDNI_COUNT = NEAR_LCDNI_COUNT;          
+	FAR_LCDI_COUNT = NEAR_LCDNI_COUNT;						
+	FAR_LOS_COUNT = NEAR_LOS_COUNT;            
+	FAR_LOF_COUNT = NEAR_LOS_COUNT;            
+	FAR_LOS_SHORT_COUNT = NEAR_LOS_COUNT;      
+	FAR_LOF_SHORT_COUNT = NEAR_LOS_COUNT;      
+
+	while (amu_go)
+	{
+		xtm_wkafter(500);
+		delay += 500;
+           
+		
+		// Exit immediately on surprise removal
+		// ------------------------------------
+		if (GlobalRemove) return;
+
+		HandleAtmError();
+		HandleLeds();
+		
+		// Modem Software polling
+		// ----------------------
+		if (delay < PM_FM_POLLING_RATE) continue;
+		delay = 0;
+           
+		// Modem Software polling
+		// ----------------------
+		switch(g_ModemState)
+		{
+		case C_AMSW_IDLE       : 
+			g_WaitForRetry = 0; // STM Gian clear
+			g_WaitForInit = 0;  // STM Gian clear
+
+			break;
+		case C_AMSW_ACTIVATING : 
+			g_WaitForInit++;
+			if(g_WaitForInit >= WAITFOR_INIT_COUNT)
+			{
+				msw_report_event(AMU_EVENT_ACT_TIMEOUT,0);
+				PRINT_ERROR("Timeout in activation!!!!\n");
+				g_ModemState = C_AMSW_DISORDERLY;
+				g_WaitForInit = 0;
+			}
+			break;
+		case C_AMSW_L3         : break;
+		case C_AMSW_SHOWTIME_L0:
+		case C_AMSW_SHOWTIME_LQ:
+		case C_AMSW_SHOWTIME_L1:
+			// Poll line for defects and performance
+			g_ShowtimeCounter++;
+			if (g_ShowtimeCounter >= INIT_POLLING_TIME)
+			{
+//				PRINT_ERROR("Polling Defects after %d ms\n", g_ShowtimeCounter*PM_FM_POLLING_RATE);
+				if ( (FM_Polling(PM_toggle) != C_AMSW_ACK ))
+				{
+					PRINT_ERROR("Error in AMSW_get_Data during Fm Polling....\n");
+					PRINT_ERROR("Fm Polling will be stopped for %d sec!!!\n",(INIT_POLLING_TIME*PM_FM_POLLING_RATE)/1000);
+					g_ShowtimeCounter = 0;
+				}
+				else
+					PM_toggle = !PM_toggle;
+			}
+			break;
+		case C_AMSW_INITIALIZING :
+		case C_AMSW_Ghs_HANDSHAKING :
+		case C_AMSW_ANSI_HANDSHAKING :
+
+			// WAIT to reach SHOWTIME
+			g_WaitForShowtime++;
+			if(g_WaitForShowtime >= WAITFOR_SHOWTIME_COUNT)
+			{
+				msw_report_event(AMU_EVENT_INI_TIMEOUT,0);
+				PRINT_ERROR("Timeout in initialization!!!!\n");
+				// Reset count
+				g_WaitForShowtime = 0;
+				// Disorderly shutdown 
+				g_ModemState = C_AMSW_DISORDERLY;
+			}
+			break;
+
+		case C_AMSW_DISORDERLY :
+
+			// Special state for disorderly shutdown
+			// Wait out the period of heavy burst of interrupts
+			// from CO side when line length is changed while in
+			// showtime
+		
+			g_WaitForDisorderly++;
+			if(g_WaitForDisorderly >= WAITFOR_DISORDERLY_COUNT)
+			{
+				int i;
+
+//				if (RetryTime != 0)
+//						msw_report_event(AMU_EVENT_RETRY,0);
+
+				board_disable_intrs();
+
+//				xtm_wkafter(WAITFOR_DISORDERLY_COUNT);
+
+				
+				g_ShowtimeCounter = 0;							
+				g_WaitForDisorderly = 0;
+
+				// Disorderly shutdown 
+				l_RetCode = AMSW_ANT_requestModemStateChange(C_AMSW_IDLE);
+				if(l_RetCode != C_AMSW_ACK) {
+					PRINT_ERROR("Error in AMSW_ANT_requestModemStateChange(C_AMSW_IDLE) = %d\n", l_RetCode);
+				}
+				else for (i=0; i<6; i++)
+				{
+					if (g_ModemState == C_AMSW_IDLE || GlobalRemove) break;
+					xtm_wkafter(500);
+				}
+				if (RetryTime != 0)
+				{
+					g_ModemState = C_AMSW_RETRY;
+					g_WaitForRetry = 0;
+				}
+        
+			}
+			break;
+			
+		case C_AMSW_RETRY:
+			if (RetryTime != 0)
+			{
+				g_WaitForRetry++;
+				//xtm_wkafter(RETRY_WAIT_TIME);
+#ifdef _PICAP_CODE_
+				if(Vendor_Id_code_ECI==TRUE)
+					xtm_wkafter(1000);  //modif PICAP ECI CK
+#endif
+				if (g_WaitForRetry >= RETRY_WAIT_TIME)
+                {
+					msw_report_event(AMU_EVENT_RETRY,0);
+					g_WaitForRetry = 0;
+					msw_start();
+				}
+			}
+			else
+			{
+				PRINT_ERROR("Error in AMUTask (C_AMSW_RETRY) with RetryTime != 0 (%ld)\n",RetryTime);
+				g_ModemState = C_AMSW_IDLE;
+			}
+			break;
+		default:
+			PRINT_ERROR("Error in AMUTask g_ModemState =%d not catched\n",g_ModemState);
+			g_ModemState = C_AMSW_IDLE;
+	        break;
+		}						//end switch
+	}
+}
+
+// This function  monitors the line for LOS (Loss Of Signal), LOF (Loss Of Frame),
+// LCDI (Loss Of Cell Delineation Interleaved), 
+// LCDNI (Loss Of Cell Delineation Fast)defects
+
+unsigned long FM_Polling(BOOLEAN pm_poll)
+{
+	unsigned long l_RetCode = C_AMSW_REJ;
+
+	if ((g_ModemState == C_AMSW_SHOWTIME_L0) ||
+			(g_ModemState == C_AMSW_SHOWTIME_LQ) ||
+			(g_ModemState == C_AMSW_SHOWTIME_L1))
+	{
+		// Get defect bit map
+		l_RetCode = AMSW_ANT_getData(C_AMSW_FM_DATA, &g_def_bitmap_set);
+		
+		if(l_RetCode == C_AMSW_ACK)
+		{
+//#######################  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_NEAR_LOS++;
+			}
+			else
+			{
+				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_FAR_LOS++;
+			}
+			else
+			{
+				g_FAR_LOS = 0;
+			}
+
+//######################  Loss Of Cell Delineation Fast  ######################	
+
+			if((g_def_bitmap_set.near_end.status & LCDNI) == LCDNI)
+			{
+				g_NEAR_LCDNI++;
+			}
+			else
+			{
+				g_NEAR_LCDNI = 0;
+			}
+			if((g_def_bitmap_set.far_end.status & LCDNI) == LCDNI)
+			{
+				g_FAR_LCDNI++;
+			}
+			else
+			{
+				g_FAR_LCDNI = 0;
+			}
+
+//######################  Loss Of Cell Delineation Interleaved ######################
+
+			if((g_def_bitmap_set.near_end.status & LCDI) == LCDI)
+			{
+				g_NEAR_LCDI++;
+			}
+			else
+			{
+				g_NEAR_LCDI = 0;
+			}
+			if((g_def_bitmap_set.far_end.status & LCDI) == LCDI)
+			{
+				g_FAR_LCDI++;
+			}
+			else
+			{
+				g_FAR_LCDI = 0;
+			}
+
+		// WAIT : If over a period of time defect persists, do a disorderly shutdown
+
+			if( (g_NEAR_LOS >= NEAR_LOS_COUNT) || (g_NEAR_LCDNI >= NEAR_LCDNI_COUNT) ||
+				(g_NEAR_LCDI >= NEAR_LCDI_COUNT) )
+			{
+				g_FAR_LOS = 0;
+				g_FAR_LCDNI = 0;
+				g_FAR_LCDI = 0;
+				g_ModemState = C_AMSW_DISORDERLY;
+			}
+			else if ( (g_FAR_LOS >= FAR_LOS_COUNT) || (g_FAR_LCDNI >= FAR_LCDNI_COUNT) ||
+					(g_FAR_LCDI >= FAR_LCDI_COUNT) ||
+					((g_FAR_LOS >= FAR_LOS_SHORT_COUNT) && g_NEAR_LOS ) )
+				g_ModemState = C_AMSW_DISORDERLY;
+								
+			if(g_ModemState == C_AMSW_DISORDERLY)
+			{
+
+				PRINT_ERROR("Bringing down line due to persistent:\n");
+				PRINT_ERROR("NEAR_LOS = %d/NEAR_LCD = %d/NEAR_LCDI = %d\nFAR_LOS = %d  FAR_LCDI = %d  FAR_LCDNI = %d\n",
+					g_NEAR_LOS,  g_NEAR_LCDNI, g_NEAR_LCDI,g_FAR_LOS, g_FAR_LCDNI, g_FAR_LCDI);
+				
+				msw_report_event(AMU_EVENT_SHUTDOWN,0);
+	/*			
+				if (RetryTime != 0)
+				{
+					msw_report_event(AMU_EVENT_RETRY,0);
+					PRINT_ERROR("Auto-Retry will take place\n");
+				}
+	*/			
+
+				g_NEAR_LOS = 0; g_NEAR_LCDNI = 0; g_NEAR_LCDI = 0;
+				g_FAR_LOS = 0; g_FAR_LCDNI = 0; g_FAR_LCDI = 0;
+			}
+		/*		
+			if (pm_poll)
+			{
+				PM_Polling();
+			}
+		*/
+		}
+	}
+
+	return l_RetCode;
+}
+
+unsigned long PM_Polling(void)
+{
+   
+	  unsigned long l_RetCode = C_AMSW_REJ;
+
+		if   ((g_ModemState == C_AMSW_SHOWTIME_L0) ||
+          (g_ModemState == C_AMSW_SHOWTIME_LQ) ||
+					(g_ModemState == C_AMSW_SHOWTIME_L1)
+         )
+    {
+
+				l_RetCode = AMSW_ANT_getData(C_AMSW_PM_DATA, &g_def_counter_set);
+				if(l_RetCode != C_AMSW_ACK)
+				{
+						PRINT_ERROR("AMSW_ANT_getData error\n");
+				}
+				else
+				{
+						PRINT_INFO("\nFast Path Performance Counters:\n\n");	
+
+						PRINT_INFO("Near-end Fec-F = %5u\n", g_def_counter_set.near_end.FecNotInterleaved);
+						PRINT_INFO("Far-end Fec-F  = %5u\n", g_def_counter_set.far_end.FecNotInterleaved);
+						
+						PRINT_INFO("Near-end Crc-F = %5u\n", g_def_counter_set.near_end.CrcNotInterleaved);
+						PRINT_INFO("Far-end Crc-F  = %5u\n", g_def_counter_set.far_end.CrcNotInterleaved);
+
+						PRINT_INFO("Near-end Hec-F = %5u\n", g_def_counter_set.near_end.HecNotInterleaved);
+						PRINT_INFO("Far-end Hec-F  = %5u\n", g_def_counter_set.far_end.HecNotInterleaved);
+						
+						PRINT_INFO("Near-end Total Cell-F  = %5u\n", g_def_counter_set.near_end.TotalCellCountNotInterleaved);								
+						PRINT_INFO("Near-end Active Cell-F = %5u\n", g_def_counter_set.near_end.ActiveCellCountNotInterleaved);
+						
+						PRINT_INFO("\nInterleave Path Performance Counters:\n\n");	
+
+						PRINT_INFO("Near-end Fec-I = %5u\n", g_def_counter_set.near_end.FecInterleaved);
+						PRINT_INFO("Far-end Fec-I  = %5u\n", g_def_counter_set.far_end.FecInterleaved);
+												
+						PRINT_INFO("Near-end Crc-I = %5u\n", g_def_counter_set.near_end.CrcInterleaved);
+						PRINT_INFO("Far-end Crc-I  = %5u\n", g_def_counter_set.far_end.CrcInterleaved);
+						
+						PRINT_INFO("Near-end Hec-I = %5u\n", g_def_counter_set.near_end.HecInterleaved);
+						PRINT_INFO("Far-end Hec-I  = %5u\n", g_def_counter_set.far_end.HecInterleaved);
+						
+						PRINT_INFO("Near-end Total Cell-I  = %5u\n", g_def_counter_set.near_end.TotalCellCountInterleaved);
+						PRINT_INFO("Near-end Active Cell-I = %5u\n", g_def_counter_set.near_end.ActiveCellCountInterleaved);
+				}
+		}
+
+		return l_RetCode;
+}

Modified: dists/trunk/modules/unicorn/unicorn/amu/amu.h
==============================================================================
--- dists/trunk/modules/unicorn/unicorn/amu/amu.h	(original)
+++ dists/trunk/modules/unicorn/unicorn/amu/amu.h	Wed Dec 27 00:38:25 2006
@@ -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_

Modified: dists/trunk/modules/unicorn/unicorn/amu/bsp.h
==============================================================================
--- dists/trunk/modules/unicorn/unicorn/amu/bsp.h	(original)
+++ dists/trunk/modules/unicorn/unicorn/amu/bsp.h	Wed Dec 27 00:38:25 2006
@@ -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

Added: dists/trunk/modules/unicorn/unicorn/amu/bsp_pci.c
==============================================================================
--- (empty file)
+++ dists/trunk/modules/unicorn/unicorn/amu/bsp_pci.c	Wed Dec 27 00:38:25 2006
@@ -0,0 +1,115 @@
+#include "types.h"
+#include "tracetool.h"
+#include "hal.h"
+#include "hard.h"
+#include "rapi.h"
+#include "bsp.h"		// AMAS API's and typedefs
+
+#ifndef _PCI_DRIVER
+#error not_PCI_DRIVER
+#endif
+
+unsigned short initializeBoard(void)
+{
+	T_SlaveMaskData p;
+	ST_STATUS status;
+
+	// TX_DSP_Register configured in ATU-R Mode
+	p.iaddr  = SACHEM_TX_DSP;
+	p.idata  = TX_DSP_MODE_ATUR;
+	p.mask   = MASK_TX_DSP_MODE;
+	p.status = 0x2823;
+	status = PCI_SlaveRMWrite(&p);
+	if (status == FAILURE) PRINT_ERROR("PCI_SlaveRMWrite() failed\n");
+
+	xtm_wkafter(1);
+
+	// AFE in Reset (UNICORN)
+	p.iaddr  = DMT_GPIO_OFFSET;
+	p.idata  = DMT_OUT_PIN_LOW;
+	p.mask   = MASK_DMT_OUT_PIN_LOW;
+	p.status = 0x2823;
+	status = PCI_SlaveRMWrite(&p);
+	if (status == FAILURE) PRINT_ERROR("PCI_SlaveRMWrite() failed\n");
+
+	xtm_wkafter(1);
+
+	// AFE in Power Down (UNICORN)
+	p.iaddr  = SACHEM_TX_DSP;
+	p.idata  = AFE_POWER_DOWN; // fisaksen
+	p.mask   = MASK_AFE_POWER_DOWN;
+	p.status = 0x2823;
+	status = PCI_SlaveRMWrite(&p);
+	if (status == FAILURE) PRINT_ERROR("PCI_SlaveRMWrite() failed\n");
+
+	xtm_wkafter(1);
+
+	// AFE out of Reset (UNICORN)
+	p.iaddr  = DMT_GPIO_OFFSET;
+	p.idata  = DMT_OUT_PIN_HIGH;
+	p.mask   = MASK_DMT_OUT_PIN_LOW;
+	p.status = 0x2823;
+	status = PCI_SlaveRMWrite(&p);
+	if (status == FAILURE) PRINT_ERROR("PCI_SlaveRMWrite() failed\n");
+
+	xtm_wkafter(1);
+
+	// AFE in PowerUp (UNICORN)
+	p.iaddr  = SACHEM_TX_DSP;
+	p.idata  = AFE_POWER_UP; // fisaksen
+	p.mask   = MASK_AFE_POWER_DOWN;
+	p.status = 0x2823;
+	status = PCI_SlaveRMWrite(&p);
+	if (status == FAILURE) PRINT_ERROR("PCI_SlaveRMWrite() failed\n");
+
+	xtm_wkafter(1);
+	return 0;
+}
+
+unsigned long powerUp_Modem_Chipset (unsigned long Chipset)
+{
+	T_SlaveMaskData p;
+	ST_STATUS status;
+
+	// AFE out of Reset (UNICORN)
+	p.iaddr  = DMT_GPIO_OFFSET;
+	p.idata  = DMT_OUT_PIN_HIGH;
+	p.mask   = MASK_DMT_OUT_PIN_LOW;
+	p.status = 0x2823;
+	status = PCI_SlaveRMWrite(&p);
+	if (status == FAILURE) PRINT_ERROR("PCI_SlaveRMWrite() failed\n");
+	xtm_wkafter(1);
+	return 0;
+}
+
+
+unsigned long powerDown_Modem_Chipset (unsigned long Chipset)
+{
+	return 0;
+}
+
+unsigned long pull_Modem_Chipset_out_of_reset(unsigned long Chipset)
+{
+	return 0;
+}
+
+unsigned long put_Modem_Chipset_in_reset(unsigned long Chipset)
+{
+	return 0;
+}
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+void HandleAtmError(void)
+{
+}
+
+void HandleLeds(void)
+{
+}
+
+#ifdef __cplusplus
+}
+#endif

Added: dists/trunk/modules/unicorn/unicorn/amu/bsp_usb.c
==============================================================================
--- (empty file)
+++ dists/trunk/modules/unicorn/unicorn/amu/bsp_usb.c	Wed Dec 27 00:38:25 2006
@@ -0,0 +1,152 @@
+//#define USB_KERNEL_DEBUG
+
+#include "types.h"
+#include "tracetool.h"
+#include "hal.h"
+#include "hard.h"
+#include "rapi.h"
+#include "bsp.h"		// AMAS API's and typedefs
+
+#ifndef _USB_DRIVER
+#error not_USB_DRIVER
+#endif
+
+unsigned short initializeBoard(void)
+{
+
+	ST_STATUS status;
+	unsigned short iaddr_val, idata_val, irmw_val;
+
+	// TX_DSP_Register configured in ATU-R Mode
+
+	status = USB_controlWrite(UR_IADR,SACHEM_TX_DSP);
+	if (status == FAILURE) PRINT_ERROR("USB_controlWrite() failed\n");
+	status = USB_controlWrite(UR_IDATA,TX_DSP_MODE_ATUR);
+	if (status == FAILURE) PRINT_ERROR("USB_controlWrite() failed\n");
+	status = USB_controlWrite(UR_IRMW,MASK_TX_DSP_MODE);
+	if (status == FAILURE) PRINT_ERROR("USB_controlWrite() failed\n");
+	status = USB_controlWrite(UR_STATUS,0x2823);
+	if (status == FAILURE) PRINT_ERROR("USB_controlWrite() failed\n");
+
+	PRINT_INFO("USB> TX_DSP_Register configuration DONE!\n");
+
+	// AFE in Reset
+
+	iaddr_val = DMT_GPIO_OFFSET;
+	idata_val = DMT_OUT_PIN_LOW;
+	irmw_val  = MASK_DMT_OUT_PIN_LOW;
+
+	status = USB_controlWrite(UR_IADR,iaddr_val);
+	if (status == FAILURE) PRINT_ERROR("USB_controlWrite() failed\n");
+	status = USB_controlWrite(UR_IDATA,idata_val);
+	if (status == FAILURE) PRINT_ERROR("USB_controlWrite() failed\n");
+	status = USB_controlWrite(UR_IRMW,irmw_val);
+	if (status == FAILURE) PRINT_ERROR("USB_controlWrite() failed\n");
+	status = USB_controlWrite(UR_STATUS,0x2823);
+	if (status == FAILURE) PRINT_ERROR("USB_controlWrite() failed\n");
+
+	PRINT_INFO("USB> AFE_RESET: DONE!\n");
+
+	// AFE in PowerDown
+
+	iaddr_val = SACHEM_TX_DSP;
+	idata_val = AFE_POWER_UP;
+	irmw_val  = MASK_AFE_POWER_DOWN;
+
+	status = USB_controlWrite(UR_IADR,iaddr_val);
+	if (status == FAILURE) PRINT_ERROR("USB_controlWrite() failed\n");
+	status = USB_controlWrite(UR_IDATA,idata_val);
+	if (status == FAILURE) PRINT_ERROR("USB_controlWrite() failed\n");
+	status = USB_controlWrite(UR_IRMW,irmw_val);
+	if (status == FAILURE) PRINT_ERROR("USB_controlWrite() failed\n");
+	status = USB_controlWrite(UR_STATUS,0x2823);
+	if (status == FAILURE) PRINT_ERROR("USB_controlWrite() failed\n");
+
+	PRINT_INFO("USB> AFE_POWER_DOWN: DONE!\n");
+
+	// AFE out of Reset
+
+	iaddr_val = DMT_GPIO_OFFSET;
+	idata_val = DMT_OUT_PIN_HIGH;
+	irmw_val  = MASK_DMT_OUT_PIN_LOW;
+
+	status = USB_controlWrite(UR_IADR,iaddr_val);
+	if (status == FAILURE) PRINT_ERROR("USB_controlWrite() failed\n");
+	status = USB_controlWrite(UR_IDATA,idata_val);
+	if (status == FAILURE) PRINT_ERROR("USB_controlWrite() failed\n");
+	status = USB_controlWrite(UR_IRMW,irmw_val);
+	if (status == FAILURE) PRINT_ERROR("USB_controlWrite() failed\n");
+	status = USB_controlWrite(UR_STATUS,0x2823);
+	if (status == FAILURE) PRINT_ERROR("USB_controlWrite() failed\n");
+
+	PRINT_INFO("USB> AFE_OUT_OF_RESET: DONE!\n");
+
+		// AFE Power Up
+
+	iaddr_val = SACHEM_TX_DSP;
+	idata_val = AFE_POWER_DOWN;
+	irmw_val  = MASK_AFE_POWER_DOWN;
+
+	status = USB_controlWrite(UR_IADR,iaddr_val);
+	if (status == FAILURE) PRINT_ERROR("USB_controlWrite() failed\n");
+	status = USB_controlWrite(UR_IDATA,idata_val);
+	if (status == FAILURE) PRINT_ERROR("USB_controlWrite() failed\n");
+	status = USB_controlWrite(UR_IRMW,irmw_val);
+	if (status == FAILURE) PRINT_ERROR("USB_controlWrite() failed\n");
+	status = USB_controlWrite(UR_STATUS,0x2823);
+	if (status == FAILURE) PRINT_ERROR("USB_controlWrite() failed\n");
+
+	PRINT_INFO("USB> AFE_POWER_UP: DONE!\n");
+
+#ifdef USB_KERNEL_DEBUG
+  if ( (status = USB_controlWrite(0x61,0x00)) == FAILURE )
+			PRINT_ERROR("Configuration of GPIO_DIR register failed!\n");
+
+	PRINT_INFO("USB> GPIO_DIR: INITIALIZED!\n");
+#endif
+
+	return 0;
+}
+
+unsigned long powerUp_Modem_Chipset (unsigned long Chipset)
+{
+	ST_STATUS				status;
+	unsigned short  iaddr_val, idata_val, irmw_val;
+
+	iaddr_val = DMT_GPIO_OFFSET;
+	idata_val = DMT_OUT_PIN_HIGH;
+	irmw_val	= MASK_DMT_OUT_PIN_LOW;
+
+	status = USB_controlWrite(UR_IADR,iaddr_val);
+	if (status == FAILURE) PRINT_ERROR("USB_controlWrite() failed\n");
+
+	status = USB_controlWrite(UR_IDATA,idata_val);
+	if (status == FAILURE) PRINT_ERROR("USB_controlWrite() failed\n");
+
+	status = USB_controlWrite(UR_IRMW,irmw_val);
+	if (status == FAILURE) PRINT_ERROR("USB_controlWrite() failed\n");
+
+	status = USB_controlWrite(UR_STATUS,0x2823);
+	if (status == FAILURE) PRINT_ERROR("USB_controlWrite() failed\n");
+
+	PRINT_INFO("USB powerUp_Modem_Chipset completed\n");
+
+	return 0;
+}
+
+
+unsigned long powerDown_Modem_Chipset (unsigned long Chipset)
+{
+	return 0;
+}
+
+unsigned long pull_Modem_Chipset_out_of_reset(unsigned long Chipset)
+{
+	return 0;
+}
+
+unsigned long put_Modem_Chipset_in_reset(unsigned long Chipset)
+{
+	return 0;
+}
+

Modified: dists/trunk/modules/unicorn/unicorn/debian/changelog
==============================================================================
--- dists/trunk/modules/unicorn/unicorn/debian/changelog	(original)
+++ dists/trunk/modules/unicorn/unicorn/debian/changelog	Wed Dec 27 00:38:25 2006
@@ -1,3 +1,10 @@
+unicorn (0.9.3-2) unstable; urgency=low
+
+  * Added gentoo patches for current kernel :
+     - bewan-adsl-0.9.3-patches-20061220.tar.gz
+
+ -- Philippe Coval <rzr at users.sf.net>  Wed, 27 Dec 2006 00:20:00 +0100
+
 unicorn (0.9.3-1) unstable; urgency=low
 
   * New upstream release

Modified: dists/trunk/modules/unicorn/unicorn/include/types.h
==============================================================================
--- dists/trunk/modules/unicorn/unicorn/include/types.h	(original)
+++ dists/trunk/modules/unicorn/unicorn/include/types.h	Wed Dec 27 00:38:25 2006
@@ -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

Modified: dists/trunk/modules/unicorn/unicorn/msw/.crc.o.cmd
==============================================================================
--- dists/trunk/modules/unicorn/unicorn/msw/.crc.o.cmd	(original)
+++ dists/trunk/modules/unicorn/unicorn/msw/.crc.o.cmd	Wed Dec 27 00:38:25 2006
@@ -1,9 +1,9 @@
-cmd_/home/fisaksen/src/unicorn/unicorn_usb/../msw/crc.o := gcc -Wp,-MD,/home/fisaksen/src/unicorn/unicorn_usb/../msw/.crc.o.d  -nostdinc -isystem /usr/lib/gcc/i486-linux-gnu/4.0.2/include -D__KERNEL__ -Iinclude  -Wall -Wstrict-prototypes -Wno-trigraphs -fno-strict-aliasing -fno-common -ffreestanding -Os     -fomit-frame-pointer -pipe -msoft-float -mpreferred-stack-boundary=2 -fno-unit-at-a-time -march=i386 -Iinclude/asm-i386/mach-default -Wdeclaration-after-statement -Wno-pointer-sign -DVERS=0x093 -D_USB_DRIVER -DDEBUG=1 -I/home/fisaksen/src/unicorn/unicorn_usb/../include -I/home/fisaksen/src/unicorn/unicorn_usb/../   -DMODULE -DKBUILD_BASENAME=crc  -c -o /home/fisaksen/src/unicorn/unicorn_usb/../msw/.tmp_crc.o /home/fisaksen/src/unicorn/unicorn_usb/../msw/crc.c
+cmd_/local/home/rzr/home/src/unicorn/unicorn/unicorn/unicorn_usb/../msw/crc.o := gcc -Wp,-MD,/local/home/rzr/home/src/unicorn/unicorn/unicorn/unicorn_usb/../msw/.crc.o.d  -nostdinc -isystem /usr/lib/gcc/i486-linux-gnu/4.1.2/include -D__KERNEL__ -Iinclude  -include include/linux/autoconf.h -Wall -Wundef -Wstrict-prototypes -Wno-trigraphs -fno-strict-aliasing -fno-common -Os -pipe -msoft-float -mpreferred-stack-boundary=2  -march=athlon  -ffreestanding -maccumulate-outgoing-args -DCONFIG_AS_CFI=1 -DCONFIG_AS_CFI_SIGNAL_FRAME=1 -Iinclude/asm-i386/mach-default -fomit-frame-pointer  -fno-stack-protector -Wdeclaration-after-statement -Wno-pointer-sign -DVERS=0x093 -D_USB_DRIVER -DDEBUG=1 -I/local/home/rzr/home/src/unicorn/unicorn/unicorn/unicorn_usb/../include -I/local/home/rzr/home/src/unicorn/unicorn/unicorn/unicorn_usb/../   -DMODULE -D"KBUILD_STR(s)=\#s" -D"KBUILD_BASENAME=KBUILD_STR(crc)"  -c -o /local/home/rzr/home/src/unicorn/unicorn/unicorn/unicorn_usb/../msw/crc.o /local/home/rzr/home/src/unicorn/unicorn/unicorn/unicorn_usb/../msw/crc.c
 
-deps_/home/fisaksen/src/unicorn/unicorn_usb/../msw/crc.o := \
-  /home/fisaksen/src/unicorn/unicorn_usb/../msw/crc.c \
-  /home/fisaksen/src/unicorn/unicorn_usb/../include/crc.h \
+deps_/local/home/rzr/home/src/unicorn/unicorn/unicorn/unicorn_usb/../msw/crc.o := \
+  /local/home/rzr/home/src/unicorn/unicorn/unicorn/unicorn_usb/../msw/crc.c \
+  /local/home/rzr/home/src/unicorn/unicorn/unicorn/unicorn_usb/../include/crc.h \
 
-/home/fisaksen/src/unicorn/unicorn_usb/../msw/crc.o: $(deps_/home/fisaksen/src/unicorn/unicorn_usb/../msw/crc.o)
+/local/home/rzr/home/src/unicorn/unicorn/unicorn/unicorn_usb/../msw/crc.o: $(deps_/local/home/rzr/home/src/unicorn/unicorn/unicorn/unicorn_usb/../msw/crc.o)
 
-$(deps_/home/fisaksen/src/unicorn/unicorn_usb/../msw/crc.o):
+$(deps_/local/home/rzr/home/src/unicorn/unicorn/unicorn/unicorn_usb/../msw/crc.o):

Modified: dists/trunk/modules/unicorn/unicorn/msw/.linrapi.o.cmd
==============================================================================
--- dists/trunk/modules/unicorn/unicorn/msw/.linrapi.o.cmd	(original)
+++ dists/trunk/modules/unicorn/unicorn/msw/.linrapi.o.cmd	Wed Dec 27 00:38:25 2006
@@ -1,49 +1,62 @@
-cmd_/home/fisaksen/src/unicorn/unicorn_usb/../msw/linrapi.o := gcc -Wp,-MD,/home/fisaksen/src/unicorn/unicorn_usb/../msw/.linrapi.o.d  -nostdinc -isystem /usr/lib/gcc/i486-linux-gnu/4.0.2/include -D__KERNEL__ -Iinclude  -Wall -Wstrict-prototypes -Wno-trigraphs -fno-strict-aliasing -fno-common -ffreestanding -Os     -fomit-frame-pointer -pipe -msoft-float -mpreferred-stack-boundary=2 -fno-unit-at-a-time -march=i386 -Iinclude/asm-i386/mach-default -Wdeclaration-after-statement -Wno-pointer-sign -DVERS=0x093 -D_USB_DRIVER -DDEBUG=1 -I/home/fisaksen/src/unicorn/unicorn_usb/../include -I/home/fisaksen/src/unicorn/unicorn_usb/../   -DMODULE -DKBUILD_BASENAME=linrapi  -c -o /home/fisaksen/src/unicorn/unicorn_usb/../msw/.tmp_linrapi.o /home/fisaksen/src/unicorn/unicorn_usb/../msw/linrapi.c
+cmd_/local/home/rzr/home/src/unicorn/unicorn/unicorn/unicorn_usb/../msw/linrapi.o := gcc -Wp,-MD,/local/home/rzr/home/src/unicorn/unicorn/unicorn/unicorn_usb/../msw/.linrapi.o.d  -nostdinc -isystem /usr/lib/gcc/i486-linux-gnu/4.1.2/include -D__KERNEL__ -Iinclude  -include include/linux/autoconf.h -Wall -Wundef -Wstrict-prototypes -Wno-trigraphs -fno-strict-aliasing -fno-common -Os -pipe -msoft-float -mpreferred-stack-boundary=2  -march=athlon  -ffreestanding -maccumulate-outgoing-args -DCONFIG_AS_CFI=1 -DCONFIG_AS_CFI_SIGNAL_FRAME=1 -Iinclude/asm-i386/mach-default -fomit-frame-pointer  -fno-stack-protector -Wdeclaration-after-statement -Wno-pointer-sign -DVERS=0x093 -D_USB_DRIVER -DDEBUG=1 -I/local/home/rzr/home/src/unicorn/unicorn/unicorn/unicorn_usb/../include -I/local/home/rzr/home/src/unicorn/unicorn/unicorn/unicorn_usb/../   -DMODULE -D"KBUILD_STR(s)=\#s" -D"KBUILD_BASENAME=KBUILD_STR(linrapi)"  -c -o /local/home/rzr/home/src/unicorn/unicorn/unicorn/unicorn_usb/../msw/linrapi.o /local/home/rzr/home/src/unicorn/unicorn/unicorn/unicorn_usb/../msw/linrapi.c
 
-deps_/home/fisaksen/src/unicorn/unicorn_usb/../msw/linrapi.o := \
-  /home/fisaksen/src/unicorn/unicorn_usb/../msw/linrapi.c \
+deps_/local/home/rzr/home/src/unicorn/unicorn/unicorn/unicorn_usb/../msw/linrapi.o := \
+  /local/home/rzr/home/src/unicorn/unicorn/unicorn/unicorn_usb/../msw/linrapi.c \
     $(wildcard include/config/modversions.h) \
     $(wildcard include/config/smp.h) \
-  include/linux/config.h \
-    $(wildcard include/config/h.h) \
   include/linux/version.h \
   include/linux/kernel.h \
+    $(wildcard include/config/preempt/voluntary.h) \
     $(wildcard include/config/debug/spinlock/sleep.h) \
     $(wildcard include/config/printk.h) \
-    $(wildcard include/config/sysctl.h) \
-  /usr/lib/gcc/i486-linux-gnu/4.0.2/include/stdarg.h \
+    $(wildcard include/config/numa.h) \
+  /usr/lib/gcc/i486-linux-gnu/4.1.2/include/stdarg.h \
   include/linux/linkage.h \
   include/asm/linkage.h \
     $(wildcard include/config/x86/alignment/16.h) \
   include/linux/stddef.h \
   include/linux/compiler.h \
+    $(wildcard include/config/enable/must/check.h) \
   include/linux/compiler-gcc4.h \
+    $(wildcard include/config/forced/inlining.h) \
   include/linux/compiler-gcc.h \
   include/linux/types.h \
     $(wildcard include/config/uid16.h) \
+    $(wildcard include/config/resources/64bit.h) \
   include/linux/posix_types.h \
   include/asm/posix_types.h \
   include/asm/types.h \
     $(wildcard include/config/highmem64g.h) \
     $(wildcard include/config/lbd.h) \
+    $(wildcard include/config/lsf.h) \
   include/linux/bitops.h \
   include/asm/bitops.h \
+  include/asm/alternative.h \
+  include/asm-generic/bitops/sched.h \
+  include/asm-generic/bitops/hweight.h \
+  include/asm-generic/bitops/fls64.h \
+  include/asm-generic/bitops/ext2-non-atomic.h \
+  include/asm-generic/bitops/le.h \
   include/asm/byteorder.h \
     $(wildcard include/config/x86/bswap.h) \
   include/linux/byteorder/little_endian.h \
   include/linux/byteorder/swab.h \
   include/linux/byteorder/generic.h \
+  include/asm-generic/bitops/minix.h \
   include/asm/bug.h \
     $(wildcard include/config/bug.h) \
     $(wildcard include/config/debug/bugverbose.h) \
   include/asm-generic/bug.h \
   include/linux/list.h \
+    $(wildcard include/config/debug/list.h) \
+  include/linux/poison.h \
   include/linux/prefetch.h \
   include/asm/processor.h \
     $(wildcard include/config/x86/ht.h) \
     $(wildcard include/config/mk8.h) \
     $(wildcard include/config/mk7.h) \
   include/asm/vm86.h \
+    $(wildcard include/config/vm86.h) \
   include/asm/math_emu.h \
   include/asm/sigcontext.h \
   include/asm/segment.h \
@@ -52,12 +65,26 @@
     $(wildcard include/config/x86/pae.h) \
     $(wildcard include/config/hugetlb/page.h) \
     $(wildcard include/config/highmem4g.h) \
+    $(wildcard include/config/page/offset.h) \
+    $(wildcard include/config/physical/start.h) \
+    $(wildcard include/config/flatmem.h) \
+  include/asm/mmx.h \
+  include/asm-generic/memory_model.h \
     $(wildcard include/config/discontigmem.h) \
+    $(wildcard include/config/sparsemem.h) \
+    $(wildcard include/config/out/of/line/pfn/to/page.h) \
+  include/asm-generic/page.h \
   include/asm/cpufeature.h \
   include/asm/msr.h \
   include/asm/system.h \
+    $(wildcard include/config/x86/cmpxchg64.h) \
     $(wildcard include/config/x86/cmpxchg.h) \
     $(wildcard include/config/x86/oostore.h) \
+  include/linux/irqflags.h \
+    $(wildcard include/config/trace/irqflags.h) \
+    $(wildcard include/config/trace/irqflags/support.h) \
+    $(wildcard include/config/x86.h) \
+  include/asm/irqflags.h \
   include/linux/cache.h \
   include/asm/cache.h \
     $(wildcard include/config/x86/l1/cache/shift.h) \
@@ -66,14 +93,21 @@
     $(wildcard include/config/base/small.h) \
   include/asm/percpu.h \
   include/asm-generic/percpu.h \
+  include/linux/cpumask.h \
+    $(wildcard include/config/hotplug/cpu.h) \
+  include/linux/bitmap.h \
+  include/linux/string.h \
+  include/asm/string.h \
   include/asm/semaphore.h \
   include/asm/atomic.h \
     $(wildcard include/config/m386.h) \
+  include/asm-generic/atomic.h \
   include/linux/wait.h \
+    $(wildcard include/config/lockdep.h) \
   include/linux/spinlock.h \
-    $(wildcard include/config/preempt.h) \
     $(wildcard include/config/debug/spinlock.h) \
-    $(wildcard include/config/lockmeter.h) \
+    $(wildcard include/config/preempt.h) \
+    $(wildcard include/config/debug/lock/alloc.h) \
   include/linux/preempt.h \
     $(wildcard include/config/debug/preempt.h) \
   include/linux/thread_info.h \
@@ -81,34 +115,63 @@
     $(wildcard include/config/4kstacks.h) \
     $(wildcard include/config/debug/stack/usage.h) \
   include/linux/stringify.h \
+  include/linux/bottom_half.h \
+  include/linux/spinlock_types.h \
+  include/linux/lockdep.h \
+    $(wildcard include/config/generic/hardirqs.h) \
+    $(wildcard include/config/prove/locking.h) \
+  include/linux/spinlock_types_up.h \
+  include/linux/spinlock_up.h \
+  include/linux/spinlock_api_up.h \
   include/asm/current.h \
   include/linux/rwsem.h \
     $(wildcard include/config/rwsem/generic/spinlock.h) \
-  include/linux/rwsem-spinlock.h \
+  include/asm/rwsem.h \
   include/asm/timex.h \
     $(wildcard include/config/x86/elan.h) \
+  include/asm/tsc.h \
     $(wildcard include/config/x86/tsc.h) \
     $(wildcard include/config/x86/generic.h) \
   include/linux/timer.h \
   include/linux/slab.h \
-    $(wildcard include/config/.h) \
-    $(wildcard include/config/numa.h) \
+    $(wildcard include/config/slob.h) \
+    $(wildcard include/config/debug/slab.h) \
   include/linux/gfp.h \
+    $(wildcard include/config/zone/dma32.h) \
+    $(wildcard include/config/highmem.h) \
   include/linux/mmzone.h \
     $(wildcard include/config/force/max/zoneorder.h) \
+    $(wildcard include/config/memory/hotplug.h) \
+    $(wildcard include/config/arch/populates/node/map.h) \
+    $(wildcard include/config/flat/node/mem/map.h) \
     $(wildcard include/config/have/memory/present.h) \
     $(wildcard include/config/need/node/memmap/size.h) \
+    $(wildcard include/config/need/multiple/nodes.h) \
+    $(wildcard include/config/have/arch/early/pfn/to/nid.h) \
+    $(wildcard include/config/sparsemem/extreme.h) \
+    $(wildcard include/config/nodes/span/other/nodes.h) \
   include/linux/numa.h \
+    $(wildcard include/config/nodes/shift.h) \
   include/linux/init.h \
     $(wildcard include/config/modules.h) \
     $(wildcard include/config/hotplug.h) \
+    $(wildcard include/config/acpi/hotplug/memory.h) \
+    $(wildcard include/config/acpi/hotplug/memory/module.h) \
+  include/linux/seqlock.h \
+  include/linux/nodemask.h \
+  include/linux/memory_hotplug.h \
+    $(wildcard include/config/have/arch/nodedata/extension.h) \
+  include/linux/notifier.h \
+  include/linux/errno.h \
+  include/asm/errno.h \
+  include/asm-generic/errno.h \
+  include/asm-generic/errno-base.h \
+  include/linux/mutex.h \
+    $(wildcard include/config/debug/mutexes.h) \
+  include/linux/srcu.h \
   include/linux/topology.h \
     $(wildcard include/config/sched/smt.h) \
-  include/linux/cpumask.h \
-    $(wildcard include/config/hotplug/cpu.h) \
-  include/linux/bitmap.h \
-  include/linux/string.h \
-  include/asm/string.h \
+    $(wildcard include/config/sched/mc.h) \
   include/linux/smp.h \
   include/asm/topology.h \
   include/asm-generic/topology.h \
@@ -116,37 +179,44 @@
     $(wildcard include/config/mmu.h) \
     $(wildcard include/config/large/allocs.h) \
   include/linux/sched.h \
+    $(wildcard include/config/detect/softlockup.h) \
+    $(wildcard include/config/split/ptlock/cpus.h) \
     $(wildcard include/config/keys.h) \
-    $(wildcard include/config/inotify.h) \
-    $(wildcard include/config/schedstats.h) \
     $(wildcard include/config/bsd/process/acct.h) \
+    $(wildcard include/config/taskstats.h) \
+    $(wildcard include/config/inotify/user.h) \
+    $(wildcard include/config/schedstats.h) \
+    $(wildcard include/config/task/delay/acct.h) \
+    $(wildcard include/config/blk/dev/io/trace.h) \
+    $(wildcard include/config/cc/stackprotector.h) \
+    $(wildcard include/config/sysvipc.h) \
+    $(wildcard include/config/rt/mutexes.h) \
+    $(wildcard include/config/task/xacct.h) \
     $(wildcard include/config/cpusets.h) \
-    $(wildcard include/config/security.h) \
-    $(wildcard include/config/magic/sysrq.h) \
+    $(wildcard include/config/compat.h) \
     $(wildcard include/config/pm.h) \
+  include/linux/auxvec.h \
+  include/asm/auxvec.h \
   include/asm/param.h \
+    $(wildcard include/config/hz.h) \
   include/linux/capability.h \
   include/linux/timex.h \
     $(wildcard include/config/time/interpolation.h) \
   include/linux/time.h \
-  include/linux/seqlock.h \
   include/linux/jiffies.h \
+  include/linux/calc64.h \
   include/asm/div64.h \
   include/linux/rbtree.h \
-  include/linux/errno.h \
-  include/asm/errno.h \
-  include/asm-generic/errno.h \
-  include/asm-generic/errno-base.h \
-  include/linux/nodemask.h \
   include/asm/ptrace.h \
-    $(wildcard include/config/frame/pointer.h) \
+  include/asm/ptrace-abi.h \
   include/asm/mmu.h \
   include/asm/cputime.h \
   include/asm-generic/cputime.h \
   include/linux/sem.h \
-    $(wildcard include/config/sysvipc.h) \
   include/linux/ipc.h \
+    $(wildcard include/config/ipc/ns.h) \
   include/asm/ipcbuf.h \
+  include/linux/kref.h \
   include/asm/sembuf.h \
   include/linux/signal.h \
   include/asm/signal.h \
@@ -157,32 +227,51 @@
   include/linux/fs_struct.h \
   include/linux/completion.h \
   include/linux/pid.h \
+  include/linux/rcupdate.h \
   include/linux/percpu.h \
   include/linux/seccomp.h \
     $(wildcard include/config/seccomp.h) \
   include/asm/seccomp.h \
   include/linux/unistd.h \
   include/asm/unistd.h \
+  include/linux/err.h \
+  include/linux/futex.h \
+    $(wildcard include/config/futex.h) \
+  include/linux/rtmutex.h \
+    $(wildcard include/config/debug/rt/mutexes.h) \
+  include/linux/plist.h \
+    $(wildcard include/config/debug/pi/list.h) \
   include/linux/param.h \
   include/linux/resource.h \
   include/asm/resource.h \
   include/asm-generic/resource.h \
+  include/linux/hrtimer.h \
+    $(wildcard include/config/no/idle/hz.h) \
+  include/linux/ktime.h \
+    $(wildcard include/config/ktime/scalar.h) \
   include/linux/aio.h \
   include/linux/workqueue.h \
   include/linux/aio_abi.h \
+  include/linux/uio.h \
+  include/linux/sysdev.h \
+  include/linux/kobject.h \
+  include/linux/sysfs.h \
+    $(wildcard include/config/sysfs.h) \
+  include/linux/pm.h \
   include/linux/delay.h \
   include/asm/delay.h \
   include/linux/smp_lock.h \
     $(wildcard include/config/lock/kernel.h) \
     $(wildcard include/config/preempt/bkl.h) \
-  /home/fisaksen/src/unicorn/unicorn_usb/../include/types.h \
-  /home/fisaksen/src/unicorn/unicorn_usb/../include/hal.h \
-  /home/fisaksen/src/unicorn/unicorn_usb/../include/hard.h \
-  /home/fisaksen/src/unicorn/unicorn_usb/../amu/amas.h \
-  /home/fisaksen/src/unicorn/unicorn_usb/../include/tracetool.h \
-  /home/fisaksen/src/unicorn/unicorn_usb/../include/rapi.h \
-  /home/fisaksen/src/unicorn/unicorn_usb/../include/debug.h \
+  /local/home/rzr/home/src/unicorn/unicorn/unicorn/unicorn_usb/../include/types.h \
+  /local/home/rzr/home/src/unicorn/unicorn/unicorn/unicorn_usb/../include/hal.h \
+  /local/home/rzr/home/src/unicorn/unicorn/unicorn/unicorn_usb/../include/hard.h \
+  /local/home/rzr/home/src/unicorn/unicorn/unicorn/unicorn_usb/../amu/amas.h \
+  /local/home/rzr/home/src/unicorn/unicorn/unicorn/unicorn_usb/../include/types.h \
+  /local/home/rzr/home/src/unicorn/unicorn/unicorn/unicorn_usb/../include/tracetool.h \
+  /local/home/rzr/home/src/unicorn/unicorn/unicorn/unicorn_usb/../include/rapi.h \
+  /local/home/rzr/home/src/unicorn/unicorn/unicorn/unicorn_usb/../include/debug.h \
 
-/home/fisaksen/src/unicorn/unicorn_usb/../msw/linrapi.o: $(deps_/home/fisaksen/src/unicorn/unicorn_usb/../msw/linrapi.o)
+/local/home/rzr/home/src/unicorn/unicorn/unicorn/unicorn_usb/../msw/linrapi.o: $(deps_/local/home/rzr/home/src/unicorn/unicorn/unicorn/unicorn_usb/../msw/linrapi.o)
 
-$(deps_/home/fisaksen/src/unicorn/unicorn_usb/../msw/linrapi.o):
+$(deps_/local/home/rzr/home/src/unicorn/unicorn/unicorn/unicorn_usb/../msw/linrapi.o):

Modified: dists/trunk/modules/unicorn/unicorn/msw/fp_stubs.c
==============================================================================
--- dists/trunk/modules/unicorn/unicorn/msw/fp_stubs.c	(original)
+++ dists/trunk/modules/unicorn/unicorn/msw/fp_stubs.c	Wed Dec 27 00:38:25 2006
@@ -1,11 +1,13 @@
-#include <linux/config.h>
+#include <linux/version.h>
+#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,18)
+#	include <linux/config.h>
+#endif
 #if defined(CONFIG_MODVERSIONS) && !defined(MODVERSIONS)
 #define MODVERSIONS
 #endif
 #ifdef MODVERSIONS
 #include <linux/modversions.h>
 #endif
-#include <linux/version.h>
 #include <linux/kernel.h>
 #include <linux/types.h>
 #include <stdio.h>

Modified: dists/trunk/modules/unicorn/unicorn/msw/linrapi.c
==============================================================================
--- dists/trunk/modules/unicorn/unicorn/msw/linrapi.c	(original)
+++ dists/trunk/modules/unicorn/unicorn/msw/linrapi.c	Wed Dec 27 00:38:25 2006
@@ -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 <linux/config.h>
 #include <linux/version.h>
+#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,18)
+#	include <linux/config.h>
+#endif
 #if defined(CONFIG_MODVERSIONS) && (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0))
 #include <linux/modversions.h>
 #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)
 {
@@ -922,7 +924,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;	
 }

Added: dists/trunk/modules/unicorn/unicorn/msw/msw.c
==============================================================================
--- (empty file)
+++ dists/trunk/modules/unicorn/unicorn/msw/msw.c	Wed Dec 27 00:38:25 2006
@@ -0,0 +1,249 @@
+//----------------------------------------------------------------------
+// Test driver for the ST Microelectronics ADSL Chip Taurus PCI/USB
+//----------------------------------------------------------------------
+// file: msw.cpp
+// Authors: Maddalena Brattoli, Christophe Piel
+// Copyright STMicroelectronics 2000
+// Copyright F.H.L.P. 2000
+//----------------------------------------------------------------------
+// #include <string.h>
+#include "types.h"
+#include "tracetool.h"
+#include "hal.h"
+#include "rapi.h"
+
+#include "../amu/amas.h"
+#include "../amu/bsp.h"
+
+int amu_go;
+
+unsigned long amu_init_modem(unsigned short MODE);
+void  AMUTask(unsigned long,unsigned long ,unsigned long ,unsigned long);
+  
+extern unsigned long g_AMUQid;
+extern unsigned long g_ModemState;
+extern unsigned int  g_WaitForInit;
+extern unsigned int  g_WaitForShowtime;
+extern BOOLEAN          L3_flag;
+extern unsigned long GlobalRemove;
+
+#if 0
+extern void *operator new(size_t size)
+{
+  void *ptr;
+
+  if (xm_getmem(size,&ptr) == SUCCESS) {
+  	//PRINT_INFO("new: size=%d,ptr=%p\n",size,ptr);
+  } else {
+  	ptr = NULL;
+  	PRINT_ERROR("### xm_getmem failed,size=%ld\n",size);
+  }
+  return ptr;
+}
+
+extern void *operator new[](size_t size)
+{
+  void *ptr;
+
+  if (xm_getmem(size,&ptr) == SUCCESS) {
+  	//PRINT_INFO("new[]: size=%d,ptr=%p\n",size,ptr);
+  } else {
+  	ptr = NULL;
+  	PRINT_ERROR("### xm_getmem failed,size=%ld\n",size);
+  }
+  return ptr;
+}
+
+extern void operator delete(void *ptr)
+{
+  //PRINT_INFO("delete: ptr=%p\n",ptr);
+  xm_retmem(ptr);
+}
+
+extern void operator delete[](void *ptr)
+{
+  //PRINT_INFO("delete[]: ptr=%p\n",ptr);
+  xm_retmem(ptr);
+}
+#endif
+
+void msw_init(unsigned short MODE)
+{
+	int err = 0;
+	unsigned long l_Tid;
+	unsigned long l_RetCode;
+	unsigned long l_TaskArgs[4];
+
+	err = AMSW_Modem_SW_Init(0,0,1);
+	if(err) PRINT_ERROR("AMSW_Modem_SW_Init() error\n");
+
+	err = AMSW_Chip_Halt();
+	if(err) PRINT_ERROR("AMSW_Chip_Halt() error\n");
+
+	err = initializeBoard();
+	if(err) PRINT_ERROR("initializeBoard() error\n");
+
+	err = amu_init_modem(MODE);
+ 	if(err) PRINT_ERROR("amu_init_modem error\n");
+
+	l_RetCode = xq_create((char *)"AMUQ", 0, 0, &l_TaskArgs[0]);
+	if (l_RetCode != 0)
+	{
+		PRINT_ERROR("***** AMU Queue creation error *****\n");
+	}
+	g_AMUQid = l_TaskArgs[0];
+
+	// create the AMU task
+
+	l_RetCode = xt_create((char *)"AMU0", 2, 1024, 0, 0, &l_Tid);
+	if (l_RetCode != 0)
+	{
+		PRINT_ERROR("***** AMU task creation error *****\n");
+	}
+
+	// start the AMU Task
+	amu_go = TRUE;
+	l_RetCode = xt_start(l_Tid, 0, AMUTask, l_TaskArgs);
+	if (l_RetCode != 0)
+	{
+		PRINT_ERROR("***** AMU task start error *****\n");
+	}
+}
+
+void msw_start(void)
+{
+	unsigned long 	l_RetCode = C_AMSW_REJ;
+	AMSW_ModemState l_modemState;
+
+	l_RetCode = AMSW_ANT_getModemState(&l_modemState);
+	if(l_RetCode != C_AMSW_ACK)
+	{
+		PRINT_ERROR("AMSW_ANT_getModemState error %d!\n",l_RetCode);
+	}
+	else switch(l_modemState)
+	{
+		case C_AMSW_SHOWTIME_L0 :
+		case C_AMSW_SHOWTIME_LQ :
+		case C_AMSW_SHOWTIME_L1 :
+			PRINT_ERROR("ATU_R already in SHOWTIME\n");
+			break;
+		case C_AMSW_ACTIVATING  :
+		case C_AMSW_INITIALIZING:
+//			AMSW_ANT_requestModemStateChange(C_AMSW_IDLE);
+			break;
+		case C_AMSW_L3          :
+		case C_AMSW_IDLE        :
+			l_RetCode = AMSW_ANT_requestModemStateChange(C_AMSW_ACTIVATING);
+			if(l_RetCode != C_AMSW_ACK)
+				PRINT_ERROR("AMSW_ANT_requestModemStateChange error!\n");
+			else
+			{
+				// Reset counters
+				g_WaitForInit = 0;
+				g_WaitForShowtime = 0;
+			}
+			break;
+
+		default:
+			break;
+	}
+}
+
+void msw_stop(void)
+{
+	unsigned long 	l_RetCode = C_AMSW_REJ;
+	AMSW_ModemState l_modemState;
+
+        PRINT_INFO("msw_stop\n");
+
+        if (GlobalRemove) return;
+      
+	l_RetCode = AMSW_ANT_getModemState(&l_modemState);
+	PRINT_INFO("l_modemState=%d\n",l_modemState);	
+	if (l_RetCode != C_AMSW_ACK)
+	{
+            PRINT_ERROR("AMSW_ANT_getModemState error\n");
+	}
+	else switch(l_modemState)
+	{
+		case C_AMSW_L3 :
+		case C_AMSW_IDLE :
+			PRINT_ERROR("ATU_R is DOWN\n");
+			break;
+		case C_AMSW_SHOWTIME_L0 :
+		case C_AMSW_SHOWTIME_L1 :
+		case C_AMSW_SHOWTIME_LQ :
+
+			// Perform orderly shutdown
+			l_RetCode = AMSW_ANT_requestModemStateChange(C_AMSW_L3);
+			if(l_RetCode != C_AMSW_ACK)
+			{
+				// If Error Give Disorderly shutdown
+				PRINT_ERROR("AMSW_ANT_requestModemStateChange(C_AMSW_L3) error!\n");
+				l_RetCode = AMSW_ANT_requestModemStateChange(C_AMSW_IDLE);
+				if(l_RetCode != C_AMSW_ACK)
+					PRINT_ERROR("AMSW_ANT_requestModemStateChange(C_AMSW_IDLE) error!\n");
+			}
+			else
+			{
+                            int i;
+                            PRINT_ERROR("Waiting 5 sec to verify L3_executed\n");
+                            for (i=0; i<10; i++)
+                            {
+                                // Abort everything on surprise removal
+                                if (GlobalRemove) return;
+                                				// verify acceptance of orderly shutdown
+                                if ((
+                                     g_ModemState != C_AMSW_SHOWTIME_L0 &&
+                                     g_ModemState != C_AMSW_SHOWTIME_L1 &&
+                                     g_ModemState != C_AMSW_SHOWTIME_LQ
+                                     )) break;
+                                xtm_wkafter(500);
+                            }
+                            if ((
+                                 g_ModemState == C_AMSW_SHOWTIME_L0 ||
+                                 g_ModemState == C_AMSW_SHOWTIME_L1 ||
+                                 g_ModemState == C_AMSW_SHOWTIME_LQ
+                                 ))
+                            {
+                                if (L3_flag == FALSE) // no answer received within 1 sec
+                                    PRINT_ERROR("No answer to orderly shutdown request for 1 sec!!\n");
+                                				PRINT_ERROR("Performing disorderly shutdown!!!\n");
+                                                                l_RetCode = AMSW_ANT_requestModemStateChange(C_AMSW_IDLE);
+                                                                if(l_RetCode != C_AMSW_ACK)
+                                                                    PRINT_ERROR("AMSW_ANT_requestModemStateChange(C_AMSW_IDLE) error!\n", l_RetCode);
+                            }
+                        }
+                            break;
+
+			default: 			// IDLE request FIX : 15/01/2001
+			  PRINT_ERROR("Performing disorderly shutdown!!!\n");
+				l_RetCode = AMSW_ANT_requestModemStateChange(C_AMSW_IDLE);
+				if(l_RetCode != C_AMSW_ACK)
+					PRINT_ERROR("AMSW_ANT_requestModemStateChange(C_AMSW_IDLE) error!\n");
+
+			break;
+ 	}
+}
+
+void msw_exit(void)
+{
+
+	unsigned long 	l_RetCode = C_AMSW_REJ;
+	amu_go = FALSE;
+
+        PRINT_INFO("msw_exit\n");
+
+	if (!GlobalRemove)
+        {
+            board_disable_intrs();		// disable interrupts before disabling the driver
+
+            l_RetCode = AMSW_ANT_requestModemStateChange(C_AMSW_IDLE);
+            PRINT_ERROR("Modem going to IDLE\n");
+            if	(l_RetCode != C_AMSW_ACK)
+                PRINT_ERROR("AMSW_ANT_requestModemStateChange(C_AMSW_IDLE) error!\n", l_RetCode);
+        } else {
+            g_ModemState = C_AMSW_IDLE;
+        }
+        AMSW_Modem_SW_Exit();
+}

Modified: dists/trunk/modules/unicorn/unicorn/tools/Makefile
==============================================================================
--- dists/trunk/modules/unicorn/unicorn/tools/Makefile	(original)
+++ dists/trunk/modules/unicorn/unicorn/tools/Makefile	Wed Dec 27 00:38:25 2006
@@ -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)

Modified: dists/trunk/modules/unicorn/unicorn/unicorn_atm/.unicorn_atmdrv.o.cmd
==============================================================================
--- dists/trunk/modules/unicorn/unicorn/unicorn_atm/.unicorn_atmdrv.o.cmd	(original)
+++ dists/trunk/modules/unicorn/unicorn/unicorn_atm/.unicorn_atmdrv.o.cmd	Wed Dec 27 00:38:25 2006
@@ -1,63 +1,87 @@
-cmd_/home/fisaksen/src/unicorn/unicorn_usb/../unicorn_atm/unicorn_atmdrv.o := gcc -Wp,-MD,/home/fisaksen/src/unicorn/unicorn_usb/../unicorn_atm/.unicorn_atmdrv.o.d  -nostdinc -isystem /usr/lib/gcc/i486-linux-gnu/4.0.2/include -D__KERNEL__ -Iinclude  -Wall -Wstrict-prototypes -Wno-trigraphs -fno-strict-aliasing -fno-common -ffreestanding -Os     -fomit-frame-pointer -pipe -msoft-float -mpreferred-stack-boundary=2 -fno-unit-at-a-time -march=i386 -Iinclude/asm-i386/mach-default -Wdeclaration-after-statement -Wno-pointer-sign -DVERS=0x093 -D_USB_DRIVER -DDEBUG=1 -I/home/fisaksen/src/unicorn/unicorn_usb/../include -I/home/fisaksen/src/unicorn/unicorn_usb/../   -DMODULE -DKBUILD_BASENAME=unicorn_atmdrv -DKBUILD_MODNAME=unicorn_usb_atm -c -o /home/fisaksen/src/unicorn/unicorn_usb/../unicorn_atm/.tmp_unicorn_atmdrv.o /home/fisaksen/src/unicorn/unicorn_usb/../unicorn_atm/unicorn_atmdrv.c
+cmd_/local/home/rzr/home/src/unicorn/unicorn/unicorn/unicorn_usb/../unicorn_atm/unicorn_atmdrv.o := gcc -Wp,-MD,/local/home/rzr/home/src/unicorn/unicorn/unicorn/unicorn_usb/../unicorn_atm/.unicorn_atmdrv.o.d  -nostdinc -isystem /usr/lib/gcc/i486-linux-gnu/4.1.2/include -D__KERNEL__ -Iinclude  -include include/linux/autoconf.h -Wall -Wundef -Wstrict-prototypes -Wno-trigraphs -fno-strict-aliasing -fno-common -Os -pipe -msoft-float -mpreferred-stack-boundary=2  -march=athlon  -ffreestanding -maccumulate-outgoing-args -DCONFIG_AS_CFI=1 -DCONFIG_AS_CFI_SIGNAL_FRAME=1 -Iinclude/asm-i386/mach-default -fomit-frame-pointer  -fno-stack-protector -Wdeclaration-after-statement -Wno-pointer-sign -DVERS=0x093 -D_USB_DRIVER -DDEBUG=1 -I/local/home/rzr/home/src/unicorn/unicorn/unicorn/unicorn_usb/../include -I/local/home/rzr/home/src/unicorn/unicorn/unicorn/unicorn_usb/../   -DMODULE -D"KBUILD_STR(s)=\#s" -D"KBUILD_BASENAME=KBUILD_STR(unicorn_atmdrv)"  -D"KBUILD_MODNAME=KBUILD_STR(unicorn_usb_atm)" -c -o /local/home/rzr/home/src/unicorn/unicorn/unicorn/unicorn_usb/../unicorn_atm/unicorn_atmdrv.o /local/home/rzr/home/src/unicorn/unicorn/unicorn/unicorn_usb/../unicorn_atm/unicorn_atmdrv.c
 
-deps_/home/fisaksen/src/unicorn/unicorn_usb/../unicorn_atm/unicorn_atmdrv.o := \
-  /home/fisaksen/src/unicorn/unicorn_usb/../unicorn_atm/unicorn_atmdrv.c \
+deps_/local/home/rzr/home/src/unicorn/unicorn/unicorn/unicorn_usb/../unicorn_atm/unicorn_atmdrv.o := \
+  /local/home/rzr/home/src/unicorn/unicorn/unicorn/unicorn_usb/../unicorn_atm/unicorn_atmdrv.c \
     $(wildcard include/config/modversions.h) \
-  include/linux/config.h \
-    $(wildcard include/config/h.h) \
   include/linux/version.h \
   include/linux/kernel.h \
+    $(wildcard include/config/preempt/voluntary.h) \
     $(wildcard include/config/debug/spinlock/sleep.h) \
     $(wildcard include/config/printk.h) \
-    $(wildcard include/config/sysctl.h) \
-  /usr/lib/gcc/i486-linux-gnu/4.0.2/include/stdarg.h \
+    $(wildcard include/config/numa.h) \
+  /usr/lib/gcc/i486-linux-gnu/4.1.2/include/stdarg.h \
   include/linux/linkage.h \
   include/asm/linkage.h \
     $(wildcard include/config/x86/alignment/16.h) \
   include/linux/stddef.h \
   include/linux/compiler.h \
+    $(wildcard include/config/enable/must/check.h) \
   include/linux/compiler-gcc4.h \
+    $(wildcard include/config/forced/inlining.h) \
   include/linux/compiler-gcc.h \
   include/linux/types.h \
     $(wildcard include/config/uid16.h) \
+    $(wildcard include/config/resources/64bit.h) \
   include/linux/posix_types.h \
   include/asm/posix_types.h \
   include/asm/types.h \
     $(wildcard include/config/highmem64g.h) \
     $(wildcard include/config/lbd.h) \
+    $(wildcard include/config/lsf.h) \
   include/linux/bitops.h \
   include/asm/bitops.h \
+  include/asm/alternative.h \
     $(wildcard include/config/smp.h) \
+  include/asm-generic/bitops/sched.h \
+  include/asm-generic/bitops/hweight.h \
+  include/asm-generic/bitops/fls64.h \
+  include/asm-generic/bitops/ext2-non-atomic.h \
+  include/asm-generic/bitops/le.h \
   include/asm/byteorder.h \
     $(wildcard include/config/x86/bswap.h) \
   include/linux/byteorder/little_endian.h \
   include/linux/byteorder/swab.h \
   include/linux/byteorder/generic.h \
+  include/asm-generic/bitops/minix.h \
   include/asm/bug.h \
     $(wildcard include/config/bug.h) \
     $(wildcard include/config/debug/bugverbose.h) \
   include/asm-generic/bug.h \
   include/linux/module.h \
     $(wildcard include/config/modules.h) \
+    $(wildcard include/config/unused/symbols.h) \
     $(wildcard include/config/module/unload.h) \
     $(wildcard include/config/kallsyms.h) \
   include/linux/sched.h \
+    $(wildcard include/config/detect/softlockup.h) \
+    $(wildcard include/config/split/ptlock/cpus.h) \
     $(wildcard include/config/keys.h) \
-    $(wildcard include/config/inotify.h) \
-    $(wildcard include/config/schedstats.h) \
     $(wildcard include/config/bsd/process/acct.h) \
-    $(wildcard include/config/numa.h) \
+    $(wildcard include/config/taskstats.h) \
+    $(wildcard include/config/inotify/user.h) \
+    $(wildcard include/config/schedstats.h) \
+    $(wildcard include/config/task/delay/acct.h) \
+    $(wildcard include/config/blk/dev/io/trace.h) \
+    $(wildcard include/config/cc/stackprotector.h) \
+    $(wildcard include/config/sysvipc.h) \
+    $(wildcard include/config/rt/mutexes.h) \
+    $(wildcard include/config/debug/mutexes.h) \
+    $(wildcard include/config/trace/irqflags.h) \
+    $(wildcard include/config/lockdep.h) \
+    $(wildcard include/config/task/xacct.h) \
     $(wildcard include/config/cpusets.h) \
+    $(wildcard include/config/compat.h) \
     $(wildcard include/config/hotplug/cpu.h) \
-    $(wildcard include/config/security.h) \
     $(wildcard include/config/preempt.h) \
-    $(wildcard include/config/magic/sysrq.h) \
     $(wildcard include/config/pm.h) \
+  include/linux/auxvec.h \
+  include/asm/auxvec.h \
   include/asm/param.h \
+    $(wildcard include/config/hz.h) \
   include/linux/capability.h \
   include/linux/spinlock.h \
     $(wildcard include/config/debug/spinlock.h) \
-    $(wildcard include/config/lockmeter.h) \
+    $(wildcard include/config/debug/lock/alloc.h) \
   include/linux/preempt.h \
     $(wildcard include/config/debug/preempt.h) \
   include/linux/thread_info.h \
@@ -69,20 +93,34 @@
     $(wildcard include/config/x86/pae.h) \
     $(wildcard include/config/hugetlb/page.h) \
     $(wildcard include/config/highmem4g.h) \
+    $(wildcard include/config/page/offset.h) \
+    $(wildcard include/config/physical/start.h) \
+    $(wildcard include/config/flatmem.h) \
+  include/asm/mmx.h \
+  include/asm-generic/memory_model.h \
     $(wildcard include/config/discontigmem.h) \
+    $(wildcard include/config/sparsemem.h) \
+    $(wildcard include/config/out/of/line/pfn/to/page.h) \
+  include/asm-generic/page.h \
   include/asm/processor.h \
     $(wildcard include/config/x86/ht.h) \
     $(wildcard include/config/mk8.h) \
     $(wildcard include/config/mk7.h) \
   include/asm/vm86.h \
+    $(wildcard include/config/vm86.h) \
   include/asm/math_emu.h \
   include/asm/sigcontext.h \
   include/asm/segment.h \
   include/asm/cpufeature.h \
   include/asm/msr.h \
   include/asm/system.h \
+    $(wildcard include/config/x86/cmpxchg64.h) \
     $(wildcard include/config/x86/cmpxchg.h) \
     $(wildcard include/config/x86/oostore.h) \
+  include/linux/irqflags.h \
+    $(wildcard include/config/trace/irqflags/support.h) \
+    $(wildcard include/config/x86.h) \
+  include/asm/irqflags.h \
   include/linux/cache.h \
   include/asm/cache.h \
     $(wildcard include/config/x86/l1/cache/shift.h) \
@@ -91,48 +129,63 @@
     $(wildcard include/config/base/small.h) \
   include/asm/percpu.h \
   include/asm-generic/percpu.h \
+  include/linux/cpumask.h \
+  include/linux/bitmap.h \
+  include/linux/string.h \
+  include/asm/string.h \
   include/linux/stringify.h \
+  include/linux/bottom_half.h \
+  include/linux/spinlock_types.h \
+  include/linux/lockdep.h \
+    $(wildcard include/config/generic/hardirqs.h) \
+    $(wildcard include/config/prove/locking.h) \
+  include/linux/spinlock_types_up.h \
+  include/linux/spinlock_up.h \
+  include/linux/spinlock_api_up.h \
+  include/asm/atomic.h \
+    $(wildcard include/config/m386.h) \
+  include/asm-generic/atomic.h \
+  include/asm/current.h \
   include/linux/timex.h \
     $(wildcard include/config/time/interpolation.h) \
   include/linux/time.h \
   include/linux/seqlock.h \
   include/asm/timex.h \
     $(wildcard include/config/x86/elan.h) \
+  include/asm/tsc.h \
     $(wildcard include/config/x86/tsc.h) \
     $(wildcard include/config/x86/generic.h) \
   include/linux/jiffies.h \
+  include/linux/calc64.h \
   include/asm/div64.h \
   include/linux/rbtree.h \
-  include/linux/cpumask.h \
-  include/linux/bitmap.h \
-  include/linux/string.h \
-  include/asm/string.h \
   include/linux/errno.h \
   include/asm/errno.h \
   include/asm-generic/errno.h \
   include/asm-generic/errno-base.h \
   include/linux/nodemask.h \
   include/linux/numa.h \
+    $(wildcard include/config/nodes/shift.h) \
   include/asm/semaphore.h \
-  include/asm/atomic.h \
-    $(wildcard include/config/m386.h) \
   include/linux/wait.h \
   include/linux/list.h \
+    $(wildcard include/config/debug/list.h) \
+  include/linux/poison.h \
   include/linux/prefetch.h \
-  include/asm/current.h \
   include/linux/rwsem.h \
     $(wildcard include/config/rwsem/generic/spinlock.h) \
-  include/linux/rwsem-spinlock.h \
+  include/asm/rwsem.h \
   include/asm/ptrace.h \
-    $(wildcard include/config/frame/pointer.h) \
+  include/asm/ptrace-abi.h \
   include/asm/mmu.h \
   include/asm/cputime.h \
   include/asm-generic/cputime.h \
   include/linux/smp.h \
   include/linux/sem.h \
-    $(wildcard include/config/sysvipc.h) \
   include/linux/ipc.h \
+    $(wildcard include/config/ipc/ns.h) \
   include/asm/ipcbuf.h \
+  include/linux/kref.h \
   include/asm/sembuf.h \
   include/linux/signal.h \
   include/asm/signal.h \
@@ -143,18 +196,37 @@
   include/linux/fs_struct.h \
   include/linux/completion.h \
   include/linux/pid.h \
+  include/linux/rcupdate.h \
   include/linux/percpu.h \
   include/linux/slab.h \
-    $(wildcard include/config/.h) \
+    $(wildcard include/config/slob.h) \
+    $(wildcard include/config/debug/slab.h) \
   include/linux/gfp.h \
+    $(wildcard include/config/zone/dma32.h) \
+    $(wildcard include/config/highmem.h) \
   include/linux/mmzone.h \
     $(wildcard include/config/force/max/zoneorder.h) \
+    $(wildcard include/config/memory/hotplug.h) \
+    $(wildcard include/config/arch/populates/node/map.h) \
+    $(wildcard include/config/flat/node/mem/map.h) \
     $(wildcard include/config/have/memory/present.h) \
     $(wildcard include/config/need/node/memmap/size.h) \
+    $(wildcard include/config/need/multiple/nodes.h) \
+    $(wildcard include/config/have/arch/early/pfn/to/nid.h) \
+    $(wildcard include/config/sparsemem/extreme.h) \
+    $(wildcard include/config/nodes/span/other/nodes.h) \
   include/linux/init.h \
     $(wildcard include/config/hotplug.h) \
+    $(wildcard include/config/acpi/hotplug/memory.h) \
+    $(wildcard include/config/acpi/hotplug/memory/module.h) \
+  include/linux/memory_hotplug.h \
+    $(wildcard include/config/have/arch/nodedata/extension.h) \
+  include/linux/notifier.h \
+  include/linux/mutex.h \
+  include/linux/srcu.h \
   include/linux/topology.h \
     $(wildcard include/config/sched/smt.h) \
+    $(wildcard include/config/sched/mc.h) \
   include/asm/topology.h \
   include/asm-generic/topology.h \
   include/linux/kmalloc_sizes.h \
@@ -165,28 +237,45 @@
   include/asm/seccomp.h \
   include/linux/unistd.h \
   include/asm/unistd.h \
+  include/linux/err.h \
+  include/linux/futex.h \
+    $(wildcard include/config/futex.h) \
+  include/linux/rtmutex.h \
+    $(wildcard include/config/debug/rt/mutexes.h) \
+  include/linux/plist.h \
+    $(wildcard include/config/debug/pi/list.h) \
   include/linux/param.h \
   include/linux/resource.h \
   include/asm/resource.h \
   include/asm-generic/resource.h \
   include/linux/timer.h \
+  include/linux/hrtimer.h \
+    $(wildcard include/config/no/idle/hz.h) \
+  include/linux/ktime.h \
+    $(wildcard include/config/ktime/scalar.h) \
   include/linux/aio.h \
   include/linux/workqueue.h \
   include/linux/aio_abi.h \
+  include/linux/uio.h \
+  include/linux/sysdev.h \
+  include/linux/kobject.h \
+  include/linux/sysfs.h \
+    $(wildcard include/config/sysfs.h) \
+  include/linux/pm.h \
   include/linux/stat.h \
   include/asm/stat.h \
   include/linux/kmod.h \
     $(wildcard include/config/kmod.h) \
   include/linux/elf.h \
+  include/linux/elf-em.h \
   include/asm/elf.h \
+    $(wildcard include/config/compat/vdso.h) \
   include/asm/user.h \
   include/linux/utsname.h \
-  include/linux/kobject.h \
-  include/linux/sysfs.h \
-    $(wildcard include/config/sysfs.h) \
-  include/linux/kref.h \
-  include/linux/kobject_uevent.h \
-    $(wildcard include/config/kobject/uevent.h) \
+    $(wildcard include/config/uts/ns.h) \
+  include/linux/nsproxy.h \
+  include/asm/desc.h \
+  include/asm/ldt.h \
   include/linux/moduleparam.h \
   include/asm/local.h \
   include/asm/module.h \
@@ -208,6 +297,7 @@
     $(wildcard include/config/mcyrixiii.h) \
     $(wildcard include/config/mviac3/2.h) \
     $(wildcard include/config/mgeodegx1.h) \
+    $(wildcard include/config/mgeode/lx.h) \
     $(wildcard include/config/regparm.h) \
   include/linux/smp_lock.h \
     $(wildcard include/config/lock/kernel.h) \
@@ -215,44 +305,55 @@
   include/linux/random.h \
   include/linux/ioctl.h \
   include/asm/ioctl.h \
+  include/asm-generic/ioctl.h \
   include/linux/atm.h \
   include/linux/socket.h \
-    $(wildcard include/config/compat.h) \
+    $(wildcard include/config/proc/fs.h) \
   include/asm/socket.h \
   include/asm/sockios.h \
   include/linux/sockios.h \
-  include/linux/uio.h \
   include/linux/atmapi.h \
   include/linux/atmsap.h \
   include/linux/atmioc.h \
   include/linux/atmdev.h \
-    $(wildcard include/config/proc/fs.h) \
+  include/linux/device.h \
+  include/linux/ioport.h \
+  include/linux/klist.h \
   include/linux/net.h \
+    $(wildcard include/config/sysctl.h) \
+  include/linux/sysctl.h \
   include/linux/skbuff.h \
     $(wildcard include/config/netfilter.h) \
     $(wildcard include/config/bridge/netfilter.h) \
     $(wildcard include/config/vlan/8021q.h) \
     $(wildcard include/config/vlan/8021q/module.h) \
-    $(wildcard include/config/netfilter/debug.h) \
-    $(wildcard include/config/hippi.h) \
+    $(wildcard include/config/nf/conntrack.h) \
+    $(wildcard include/config/nf/conntrack/module.h) \
     $(wildcard include/config/net/sched.h) \
     $(wildcard include/config/net/cls/act.h) \
-    $(wildcard include/config/have/arch/dev/alloc/skb.h) \
-    $(wildcard include/config/highmem.h) \
+    $(wildcard include/config/net/dma.h) \
+    $(wildcard include/config/network/secmark.h) \
   include/linux/mm.h \
     $(wildcard include/config/stack/growsup.h) \
+    $(wildcard include/config/debug/vm.h) \
     $(wildcard include/config/shmem.h) \
+    $(wildcard include/config/ia64.h) \
     $(wildcard include/config/debug/pagealloc.h) \
   include/linux/prio_tree.h \
   include/linux/fs.h \
     $(wildcard include/config/dnotify.h) \
     $(wildcard include/config/quota.h) \
+    $(wildcard include/config/inotify.h) \
+    $(wildcard include/config/security.h) \
     $(wildcard include/config/epoll.h) \
     $(wildcard include/config/auditsyscall.h) \
+    $(wildcard include/config/block.h) \
+    $(wildcard include/config/fs/xip.h) \
+    $(wildcard include/config/migration.h) \
   include/linux/limits.h \
   include/linux/kdev_t.h \
   include/linux/dcache.h \
-  include/linux/rcupdate.h \
+    $(wildcard include/config/profiling.h) \
   include/linux/radix-tree.h \
   include/linux/quota.h \
   include/linux/dqblk_xfs.h \
@@ -263,7 +364,12 @@
   include/linux/sunrpc/msg_prot.h \
   include/linux/fcntl.h \
   include/asm/fcntl.h \
-  include/linux/err.h \
+  include/asm-generic/fcntl.h \
+    $(wildcard include/config/64bit.h) \
+  include/linux/debug_locks.h \
+    $(wildcard include/config/debug/locking/api/selftests.h) \
+  include/linux/backing-dev.h \
+  include/linux/mm_types.h \
   include/asm/pgtable.h \
     $(wildcard include/config/highpte.h) \
   include/asm/fixmap.h \
@@ -272,63 +378,52 @@
     $(wildcard include/config/x86/visws/apic.h) \
     $(wildcard include/config/x86/f00f/bug.h) \
     $(wildcard include/config/x86/cyclone/timer.h) \
-    $(wildcard include/config/acpi/boot.h) \
+    $(wildcard include/config/acpi.h) \
     $(wildcard include/config/pci/mmconfig.h) \
   include/asm/acpi.h \
-    $(wildcard include/config/acpi/pci.h) \
     $(wildcard include/config/acpi/sleep.h) \
   include/acpi/pdc_intel.h \
   include/asm/apicdef.h \
-  include/asm/kmap_types.h \
-    $(wildcard include/config/debug/highmem.h) \
   include/asm/pgtable-2level-defs.h \
   include/asm/pgtable-2level.h \
   include/asm-generic/pgtable-nopmd.h \
   include/asm-generic/pgtable-nopud.h \
   include/asm-generic/pgtable.h \
   include/linux/page-flags.h \
+    $(wildcard include/config/s390.h) \
     $(wildcard include/config/swap.h) \
+  include/linux/vmstat.h \
+    $(wildcard include/config/vm/event/counters.h) \
   include/linux/highmem.h \
   include/asm/cacheflush.h \
-  include/asm/highmem.h \
-  include/linux/interrupt.h \
-    $(wildcard include/config/generic/hardirqs.h) \
-    $(wildcard include/config/generic/irq/probe.h) \
-  include/linux/hardirq.h \
-    $(wildcard include/config/virt/cpu/accounting.h) \
-  include/asm/hardirq.h \
-  include/linux/irq.h \
-    $(wildcard include/config/arch/s390.h) \
-  include/asm/irq.h \
-    $(wildcard include/config/irqbalance.h) \
-  include/asm-i386/mach-default/irq_vectors.h \
-  include/asm-i386/mach-default/irq_vectors_limits.h \
-    $(wildcard include/config/pci/msi.h) \
-  include/asm/hw_irq.h \
-  include/linux/profile.h \
-    $(wildcard include/config/profiling.h) \
-  include/asm/sections.h \
-  include/asm-generic/sections.h \
-  include/linux/irq_cpustat.h \
-  include/asm/tlbflush.h \
-    $(wildcard include/config/x86/invlpg.h) \
+    $(wildcard include/config/debug/rodata.h) \
   include/linux/poll.h \
   include/asm/poll.h \
   include/asm/uaccess.h \
     $(wildcard include/config/x86/intel/usercopy.h) \
     $(wildcard include/config/x86/wp/works/ok.h) \
+  include/linux/textsearch.h \
   include/net/checksum.h \
   include/asm/checksum.h \
   include/linux/in6.h \
+  include/linux/dmaengine.h \
+    $(wildcard include/config/dma/engine.h) \
   include/net/sock.h \
+    $(wildcard include/config/security/network.h) \
+    $(wildcard include/config/netdebug.h) \
     $(wildcard include/config/net.h) \
   include/linux/netdevice.h \
     $(wildcard include/config/ax25.h) \
     $(wildcard include/config/ax25/module.h) \
     $(wildcard include/config/tr.h) \
     $(wildcard include/config/net/ipip.h) \
-    $(wildcard include/config/ipv6.h) \
-    $(wildcard include/config/ipv6/module.h) \
+    $(wildcard include/config/net/ipip/module.h) \
+    $(wildcard include/config/net/ipgre.h) \
+    $(wildcard include/config/net/ipgre/module.h) \
+    $(wildcard include/config/ipv6/sit.h) \
+    $(wildcard include/config/ipv6/sit/module.h) \
+    $(wildcard include/config/ipv6/tunnel.h) \
+    $(wildcard include/config/ipv6/tunnel/module.h) \
     $(wildcard include/config/netpoll.h) \
     $(wildcard include/config/net/poll/controller.h) \
     $(wildcard include/config/net/divert.h) \
@@ -337,36 +432,63 @@
   include/linux/hdlc/ioctl.h \
   include/linux/if_ether.h \
   include/linux/if_packet.h \
-  include/linux/device.h \
-  include/linux/ioport.h \
-  include/linux/pm.h \
-  include/linux/notifier.h \
+  include/linux/interrupt.h \
+    $(wildcard include/config/generic/irq/probe.h) \
+  include/linux/irqreturn.h \
+  include/linux/hardirq.h \
+    $(wildcard include/config/virt/cpu/accounting.h) \
+  include/asm/hardirq.h \
+  include/linux/irq.h \
+    $(wildcard include/config/irq/per/cpu.h) \
+    $(wildcard include/config/irq/release/method.h) \
+    $(wildcard include/config/generic/pending/irq.h) \
+    $(wildcard include/config/irqbalance.h) \
+    $(wildcard include/config/auto/irq/affinity.h) \
+    $(wildcard include/config/generic/hardirqs/no//do/irq.h) \
+  include/asm/irq.h \
+  include/asm-i386/mach-default/irq_vectors.h \
+  include/asm-i386/mach-default/irq_vectors_limits.h \
+  include/asm/irq_regs.h \
+  include/asm-generic/irq_regs.h \
+  include/asm/hw_irq.h \
+  include/linux/profile.h \
+  include/asm/sections.h \
+  include/asm-generic/sections.h \
+  include/linux/irq_cpustat.h \
   include/linux/security.h \
-    $(wildcard include/config/security/network.h) \
+    $(wildcard include/config/security/network/xfrm.h) \
   include/linux/binfmts.h \
   include/linux/shm.h \
   include/asm/shmparam.h \
   include/asm/shmbuf.h \
   include/linux/msg.h \
   include/asm/msgbuf.h \
+  include/linux/key.h \
+  include/linux/xfrm.h \
+  include/net/flow.h \
+    $(wildcard include/config/ipv6/mip6.h) \
   include/linux/filter.h \
   include/net/dst.h \
     $(wildcard include/config/net/cls/route.h) \
     $(wildcard include/config/xfrm.h) \
   include/linux/rtnetlink.h \
   include/linux/netlink.h \
+  include/linux/if_link.h \
+  include/linux/if_addr.h \
+  include/linux/neighbour.h \
   include/net/neighbour.h \
   include/linux/seq_file.h \
-  include/linux/sysctl.h \
   include/linux/proc_fs.h \
     $(wildcard include/config/proc/devicetree.h) \
     $(wildcard include/config/proc/kcore.h) \
-  /home/fisaksen/src/unicorn/unicorn_usb/../include/types.h \
-  /home/fisaksen/src/unicorn/unicorn_usb/../amu/amas.h \
-  /home/fisaksen/src/unicorn/unicorn_usb/../include/crc.h \
-  /home/fisaksen/src/unicorn/unicorn_usb/../include/unicorn.h \
-  /home/fisaksen/src/unicorn/unicorn_usb/../include/debug.h \
+  include/linux/magic.h \
+  /local/home/rzr/home/src/unicorn/unicorn/unicorn/unicorn_usb/../include/types.h \
+  /local/home/rzr/home/src/unicorn/unicorn/unicorn/unicorn_usb/../amu/amas.h \
+  /local/home/rzr/home/src/unicorn/unicorn/unicorn/unicorn_usb/../include/types.h \
+  /local/home/rzr/home/src/unicorn/unicorn/unicorn/unicorn_usb/../include/crc.h \
+  /local/home/rzr/home/src/unicorn/unicorn/unicorn/unicorn_usb/../include/unicorn.h \
+  /local/home/rzr/home/src/unicorn/unicorn/unicorn/unicorn_usb/../include/debug.h \
 
-/home/fisaksen/src/unicorn/unicorn_usb/../unicorn_atm/unicorn_atmdrv.o: $(deps_/home/fisaksen/src/unicorn/unicorn_usb/../unicorn_atm/unicorn_atmdrv.o)
+/local/home/rzr/home/src/unicorn/unicorn/unicorn/unicorn_usb/../unicorn_atm/unicorn_atmdrv.o: $(deps_/local/home/rzr/home/src/unicorn/unicorn/unicorn/unicorn_usb/../unicorn_atm/unicorn_atmdrv.o)
 
-$(deps_/home/fisaksen/src/unicorn/unicorn_usb/../unicorn_atm/unicorn_atmdrv.o):
+$(deps_/local/home/rzr/home/src/unicorn/unicorn/unicorn/unicorn_usb/../unicorn_atm/unicorn_atmdrv.o):

Modified: dists/trunk/modules/unicorn/unicorn/unicorn_atm/unicorn_atmdrv.c
==============================================================================
--- dists/trunk/modules/unicorn/unicorn/unicorn_atm/unicorn_atmdrv.c	(original)
+++ dists/trunk/modules/unicorn/unicorn/unicorn_atm/unicorn_atmdrv.c	Wed Dec 27 00:38:25 2006
@@ -4,8 +4,10 @@
   ST70134A or ST70136 Analog Front End (AFE).
   This file contains the ATM interface and SAR routines.
 */
-#include <linux/config.h>
 #include <linux/version.h>
+#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,18)
+#	include <linux/config.h>
+#endif
 #if defined(CONFIG_MODVERSIONS) && (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0))
 #include <linux/modversions.h>
 #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
 

Modified: dists/trunk/modules/unicorn/unicorn/unicorn_eth/.unicorn_ethdrv.o.cmd
==============================================================================
--- dists/trunk/modules/unicorn/unicorn/unicorn_eth/.unicorn_ethdrv.o.cmd	(original)
+++ dists/trunk/modules/unicorn/unicorn/unicorn_eth/.unicorn_ethdrv.o.cmd	Wed Dec 27 00:38:25 2006
@@ -1,64 +1,88 @@
-cmd_/home/fisaksen/src/unicorn/unicorn_usb/../unicorn_eth/unicorn_ethdrv.o := gcc -Wp,-MD,/home/fisaksen/src/unicorn/unicorn_usb/../unicorn_eth/.unicorn_ethdrv.o.d  -nostdinc -isystem /usr/lib/gcc/i486-linux-gnu/4.0.2/include -D__KERNEL__ -Iinclude  -Wall -Wstrict-prototypes -Wno-trigraphs -fno-strict-aliasing -fno-common -ffreestanding -Os     -fomit-frame-pointer -pipe -msoft-float -mpreferred-stack-boundary=2 -fno-unit-at-a-time -march=i386 -Iinclude/asm-i386/mach-default -Wdeclaration-after-statement -Wno-pointer-sign -DVERS=0x093 -D_USB_DRIVER -DDEBUG=1 -I/home/fisaksen/src/unicorn/unicorn_usb/../include -I/home/fisaksen/src/unicorn/unicorn_usb/../   -DMODULE -DKBUILD_BASENAME=unicorn_ethdrv -DKBUILD_MODNAME=unicorn_usb_eth -c -o /home/fisaksen/src/unicorn/unicorn_usb/../unicorn_eth/.tmp_unicorn_ethdrv.o /home/fisaksen/src/unicorn/unicorn_usb/../unicorn_eth/unicorn_ethdrv.c
+cmd_/local/home/rzr/home/src/unicorn/unicorn/unicorn/unicorn_usb/../unicorn_eth/unicorn_ethdrv.o := gcc -Wp,-MD,/local/home/rzr/home/src/unicorn/unicorn/unicorn/unicorn_usb/../unicorn_eth/.unicorn_ethdrv.o.d  -nostdinc -isystem /usr/lib/gcc/i486-linux-gnu/4.1.2/include -D__KERNEL__ -Iinclude  -include include/linux/autoconf.h -Wall -Wundef -Wstrict-prototypes -Wno-trigraphs -fno-strict-aliasing -fno-common -Os -pipe -msoft-float -mpreferred-stack-boundary=2  -march=athlon  -ffreestanding -maccumulate-outgoing-args -DCONFIG_AS_CFI=1 -DCONFIG_AS_CFI_SIGNAL_FRAME=1 -Iinclude/asm-i386/mach-default -fomit-frame-pointer  -fno-stack-protector -Wdeclaration-after-statement -Wno-pointer-sign -DVERS=0x093 -D_USB_DRIVER -DDEBUG=1 -I/local/home/rzr/home/src/unicorn/unicorn/unicorn/unicorn_usb/../include -I/local/home/rzr/home/src/unicorn/unicorn/unicorn/unicorn_usb/../   -DMODULE -D"KBUILD_STR(s)=\#s" -D"KBUILD_BASENAME=KBUILD_STR(unicorn_ethdrv)"  -D"KBUILD_MODNAME=KBUILD_STR(unicorn_usb_eth)" -c -o /local/home/rzr/home/src/unicorn/unicorn/unicorn/unicorn_usb/../unicorn_eth/unicorn_ethdrv.o /local/home/rzr/home/src/unicorn/unicorn/unicorn/unicorn_usb/../unicorn_eth/unicorn_ethdrv.c
 
-deps_/home/fisaksen/src/unicorn/unicorn_usb/../unicorn_eth/unicorn_ethdrv.o := \
-  /home/fisaksen/src/unicorn/unicorn_usb/../unicorn_eth/unicorn_ethdrv.c \
+deps_/local/home/rzr/home/src/unicorn/unicorn/unicorn/unicorn_usb/../unicorn_eth/unicorn_ethdrv.o := \
+  /local/home/rzr/home/src/unicorn/unicorn/unicorn/unicorn_usb/../unicorn_eth/unicorn_ethdrv.c \
     $(wildcard include/config/modversions.h) \
     $(wildcard include/config/atm.h) \
-  include/linux/config.h \
-    $(wildcard include/config/h.h) \
   include/linux/version.h \
   include/linux/kernel.h \
+    $(wildcard include/config/preempt/voluntary.h) \
     $(wildcard include/config/debug/spinlock/sleep.h) \
     $(wildcard include/config/printk.h) \
-    $(wildcard include/config/sysctl.h) \
-  /usr/lib/gcc/i486-linux-gnu/4.0.2/include/stdarg.h \
+    $(wildcard include/config/numa.h) \
+  /usr/lib/gcc/i486-linux-gnu/4.1.2/include/stdarg.h \
   include/linux/linkage.h \
   include/asm/linkage.h \
     $(wildcard include/config/x86/alignment/16.h) \
   include/linux/stddef.h \
   include/linux/compiler.h \
+    $(wildcard include/config/enable/must/check.h) \
   include/linux/compiler-gcc4.h \
+    $(wildcard include/config/forced/inlining.h) \
   include/linux/compiler-gcc.h \
   include/linux/types.h \
     $(wildcard include/config/uid16.h) \
+    $(wildcard include/config/resources/64bit.h) \
   include/linux/posix_types.h \
   include/asm/posix_types.h \
   include/asm/types.h \
     $(wildcard include/config/highmem64g.h) \
     $(wildcard include/config/lbd.h) \
+    $(wildcard include/config/lsf.h) \
   include/linux/bitops.h \
   include/asm/bitops.h \
+  include/asm/alternative.h \
     $(wildcard include/config/smp.h) \
+  include/asm-generic/bitops/sched.h \
+  include/asm-generic/bitops/hweight.h \
+  include/asm-generic/bitops/fls64.h \
+  include/asm-generic/bitops/ext2-non-atomic.h \
+  include/asm-generic/bitops/le.h \
   include/asm/byteorder.h \
     $(wildcard include/config/x86/bswap.h) \
   include/linux/byteorder/little_endian.h \
   include/linux/byteorder/swab.h \
   include/linux/byteorder/generic.h \
+  include/asm-generic/bitops/minix.h \
   include/asm/bug.h \
     $(wildcard include/config/bug.h) \
     $(wildcard include/config/debug/bugverbose.h) \
   include/asm-generic/bug.h \
   include/linux/module.h \
     $(wildcard include/config/modules.h) \
+    $(wildcard include/config/unused/symbols.h) \
     $(wildcard include/config/module/unload.h) \
     $(wildcard include/config/kallsyms.h) \
   include/linux/sched.h \
+    $(wildcard include/config/detect/softlockup.h) \
+    $(wildcard include/config/split/ptlock/cpus.h) \
     $(wildcard include/config/keys.h) \
-    $(wildcard include/config/inotify.h) \
-    $(wildcard include/config/schedstats.h) \
     $(wildcard include/config/bsd/process/acct.h) \
-    $(wildcard include/config/numa.h) \
+    $(wildcard include/config/taskstats.h) \
+    $(wildcard include/config/inotify/user.h) \
+    $(wildcard include/config/schedstats.h) \
+    $(wildcard include/config/task/delay/acct.h) \
+    $(wildcard include/config/blk/dev/io/trace.h) \
+    $(wildcard include/config/cc/stackprotector.h) \
+    $(wildcard include/config/sysvipc.h) \
+    $(wildcard include/config/rt/mutexes.h) \
+    $(wildcard include/config/debug/mutexes.h) \
+    $(wildcard include/config/trace/irqflags.h) \
+    $(wildcard include/config/lockdep.h) \
+    $(wildcard include/config/task/xacct.h) \
     $(wildcard include/config/cpusets.h) \
+    $(wildcard include/config/compat.h) \
     $(wildcard include/config/hotplug/cpu.h) \
-    $(wildcard include/config/security.h) \
     $(wildcard include/config/preempt.h) \
-    $(wildcard include/config/magic/sysrq.h) \
     $(wildcard include/config/pm.h) \
+  include/linux/auxvec.h \
+  include/asm/auxvec.h \
   include/asm/param.h \
+    $(wildcard include/config/hz.h) \
   include/linux/capability.h \
   include/linux/spinlock.h \
     $(wildcard include/config/debug/spinlock.h) \
-    $(wildcard include/config/lockmeter.h) \
+    $(wildcard include/config/debug/lock/alloc.h) \
   include/linux/preempt.h \
     $(wildcard include/config/debug/preempt.h) \
   include/linux/thread_info.h \
@@ -70,20 +94,34 @@
     $(wildcard include/config/x86/pae.h) \
     $(wildcard include/config/hugetlb/page.h) \
     $(wildcard include/config/highmem4g.h) \
+    $(wildcard include/config/page/offset.h) \
+    $(wildcard include/config/physical/start.h) \
+    $(wildcard include/config/flatmem.h) \
+  include/asm/mmx.h \
+  include/asm-generic/memory_model.h \
     $(wildcard include/config/discontigmem.h) \
+    $(wildcard include/config/sparsemem.h) \
+    $(wildcard include/config/out/of/line/pfn/to/page.h) \
+  include/asm-generic/page.h \
   include/asm/processor.h \
     $(wildcard include/config/x86/ht.h) \
     $(wildcard include/config/mk8.h) \
     $(wildcard include/config/mk7.h) \
   include/asm/vm86.h \
+    $(wildcard include/config/vm86.h) \
   include/asm/math_emu.h \
   include/asm/sigcontext.h \
   include/asm/segment.h \
   include/asm/cpufeature.h \
   include/asm/msr.h \
   include/asm/system.h \
+    $(wildcard include/config/x86/cmpxchg64.h) \
     $(wildcard include/config/x86/cmpxchg.h) \
     $(wildcard include/config/x86/oostore.h) \
+  include/linux/irqflags.h \
+    $(wildcard include/config/trace/irqflags/support.h) \
+    $(wildcard include/config/x86.h) \
+  include/asm/irqflags.h \
   include/linux/cache.h \
   include/asm/cache.h \
     $(wildcard include/config/x86/l1/cache/shift.h) \
@@ -92,48 +130,63 @@
     $(wildcard include/config/base/small.h) \
   include/asm/percpu.h \
   include/asm-generic/percpu.h \
+  include/linux/cpumask.h \
+  include/linux/bitmap.h \
+  include/linux/string.h \
+  include/asm/string.h \
   include/linux/stringify.h \
+  include/linux/bottom_half.h \
+  include/linux/spinlock_types.h \
+  include/linux/lockdep.h \
+    $(wildcard include/config/generic/hardirqs.h) \
+    $(wildcard include/config/prove/locking.h) \
+  include/linux/spinlock_types_up.h \
+  include/linux/spinlock_up.h \
+  include/linux/spinlock_api_up.h \
+  include/asm/atomic.h \
+    $(wildcard include/config/m386.h) \
+  include/asm-generic/atomic.h \
+  include/asm/current.h \
   include/linux/timex.h \
     $(wildcard include/config/time/interpolation.h) \
   include/linux/time.h \
   include/linux/seqlock.h \
   include/asm/timex.h \
     $(wildcard include/config/x86/elan.h) \
+  include/asm/tsc.h \
     $(wildcard include/config/x86/tsc.h) \
     $(wildcard include/config/x86/generic.h) \
   include/linux/jiffies.h \
+  include/linux/calc64.h \
   include/asm/div64.h \
   include/linux/rbtree.h \
-  include/linux/cpumask.h \
-  include/linux/bitmap.h \
-  include/linux/string.h \
-  include/asm/string.h \
   include/linux/errno.h \
   include/asm/errno.h \
   include/asm-generic/errno.h \
   include/asm-generic/errno-base.h \
   include/linux/nodemask.h \
   include/linux/numa.h \
+    $(wildcard include/config/nodes/shift.h) \
   include/asm/semaphore.h \
-  include/asm/atomic.h \
-    $(wildcard include/config/m386.h) \
   include/linux/wait.h \
   include/linux/list.h \
+    $(wildcard include/config/debug/list.h) \
+  include/linux/poison.h \
   include/linux/prefetch.h \
-  include/asm/current.h \
   include/linux/rwsem.h \
     $(wildcard include/config/rwsem/generic/spinlock.h) \
-  include/linux/rwsem-spinlock.h \
+  include/asm/rwsem.h \
   include/asm/ptrace.h \
-    $(wildcard include/config/frame/pointer.h) \
+  include/asm/ptrace-abi.h \
   include/asm/mmu.h \
   include/asm/cputime.h \
   include/asm-generic/cputime.h \
   include/linux/smp.h \
   include/linux/sem.h \
-    $(wildcard include/config/sysvipc.h) \
   include/linux/ipc.h \
+    $(wildcard include/config/ipc/ns.h) \
   include/asm/ipcbuf.h \
+  include/linux/kref.h \
   include/asm/sembuf.h \
   include/linux/signal.h \
   include/asm/signal.h \
@@ -144,18 +197,37 @@
   include/linux/fs_struct.h \
   include/linux/completion.h \
   include/linux/pid.h \
+  include/linux/rcupdate.h \
   include/linux/percpu.h \
   include/linux/slab.h \
-    $(wildcard include/config/.h) \
+    $(wildcard include/config/slob.h) \
+    $(wildcard include/config/debug/slab.h) \
   include/linux/gfp.h \
+    $(wildcard include/config/zone/dma32.h) \
+    $(wildcard include/config/highmem.h) \
   include/linux/mmzone.h \
     $(wildcard include/config/force/max/zoneorder.h) \
+    $(wildcard include/config/memory/hotplug.h) \
+    $(wildcard include/config/arch/populates/node/map.h) \
+    $(wildcard include/config/flat/node/mem/map.h) \
     $(wildcard include/config/have/memory/present.h) \
     $(wildcard include/config/need/node/memmap/size.h) \
+    $(wildcard include/config/need/multiple/nodes.h) \
+    $(wildcard include/config/have/arch/early/pfn/to/nid.h) \
+    $(wildcard include/config/sparsemem/extreme.h) \
+    $(wildcard include/config/nodes/span/other/nodes.h) \
   include/linux/init.h \
     $(wildcard include/config/hotplug.h) \
+    $(wildcard include/config/acpi/hotplug/memory.h) \
+    $(wildcard include/config/acpi/hotplug/memory/module.h) \
+  include/linux/memory_hotplug.h \
+    $(wildcard include/config/have/arch/nodedata/extension.h) \
+  include/linux/notifier.h \
+  include/linux/mutex.h \
+  include/linux/srcu.h \
   include/linux/topology.h \
     $(wildcard include/config/sched/smt.h) \
+    $(wildcard include/config/sched/mc.h) \
   include/asm/topology.h \
   include/asm-generic/topology.h \
   include/linux/kmalloc_sizes.h \
@@ -166,28 +238,45 @@
   include/asm/seccomp.h \
   include/linux/unistd.h \
   include/asm/unistd.h \
+  include/linux/err.h \
+  include/linux/futex.h \
+    $(wildcard include/config/futex.h) \
+  include/linux/rtmutex.h \
+    $(wildcard include/config/debug/rt/mutexes.h) \
+  include/linux/plist.h \
+    $(wildcard include/config/debug/pi/list.h) \
   include/linux/param.h \
   include/linux/resource.h \
   include/asm/resource.h \
   include/asm-generic/resource.h \
   include/linux/timer.h \
+  include/linux/hrtimer.h \
+    $(wildcard include/config/no/idle/hz.h) \
+  include/linux/ktime.h \
+    $(wildcard include/config/ktime/scalar.h) \
   include/linux/aio.h \
   include/linux/workqueue.h \
   include/linux/aio_abi.h \
+  include/linux/uio.h \
+  include/linux/sysdev.h \
+  include/linux/kobject.h \
+  include/linux/sysfs.h \
+    $(wildcard include/config/sysfs.h) \
+  include/linux/pm.h \
   include/linux/stat.h \
   include/asm/stat.h \
   include/linux/kmod.h \
     $(wildcard include/config/kmod.h) \
   include/linux/elf.h \
+  include/linux/elf-em.h \
   include/asm/elf.h \
+    $(wildcard include/config/compat/vdso.h) \
   include/asm/user.h \
   include/linux/utsname.h \
-  include/linux/kobject.h \
-  include/linux/sysfs.h \
-    $(wildcard include/config/sysfs.h) \
-  include/linux/kref.h \
-  include/linux/kobject_uevent.h \
-    $(wildcard include/config/kobject/uevent.h) \
+    $(wildcard include/config/uts/ns.h) \
+  include/linux/nsproxy.h \
+  include/asm/desc.h \
+  include/asm/ldt.h \
   include/linux/moduleparam.h \
   include/asm/local.h \
   include/asm/module.h \
@@ -209,6 +298,7 @@
     $(wildcard include/config/mcyrixiii.h) \
     $(wildcard include/config/mviac3/2.h) \
     $(wildcard include/config/mgeodegx1.h) \
+    $(wildcard include/config/mgeode/lx.h) \
     $(wildcard include/config/regparm.h) \
   include/linux/smp_lock.h \
     $(wildcard include/config/lock/kernel.h) \
@@ -216,32 +306,41 @@
   include/linux/random.h \
   include/linux/ioctl.h \
   include/asm/ioctl.h \
+  include/asm-generic/ioctl.h \
   include/linux/skbuff.h \
     $(wildcard include/config/netfilter.h) \
     $(wildcard include/config/bridge/netfilter.h) \
     $(wildcard include/config/vlan/8021q.h) \
     $(wildcard include/config/vlan/8021q/module.h) \
-    $(wildcard include/config/netfilter/debug.h) \
-    $(wildcard include/config/hippi.h) \
+    $(wildcard include/config/nf/conntrack.h) \
+    $(wildcard include/config/nf/conntrack/module.h) \
     $(wildcard include/config/net/sched.h) \
     $(wildcard include/config/net/cls/act.h) \
-    $(wildcard include/config/have/arch/dev/alloc/skb.h) \
-    $(wildcard include/config/highmem.h) \
+    $(wildcard include/config/net/dma.h) \
+    $(wildcard include/config/network/secmark.h) \
   include/linux/mm.h \
+    $(wildcard include/config/sysctl.h) \
     $(wildcard include/config/stack/growsup.h) \
+    $(wildcard include/config/debug/vm.h) \
     $(wildcard include/config/shmem.h) \
+    $(wildcard include/config/ia64.h) \
     $(wildcard include/config/proc/fs.h) \
     $(wildcard include/config/debug/pagealloc.h) \
   include/linux/prio_tree.h \
   include/linux/fs.h \
     $(wildcard include/config/dnotify.h) \
     $(wildcard include/config/quota.h) \
+    $(wildcard include/config/inotify.h) \
+    $(wildcard include/config/security.h) \
     $(wildcard include/config/epoll.h) \
     $(wildcard include/config/auditsyscall.h) \
+    $(wildcard include/config/block.h) \
+    $(wildcard include/config/fs/xip.h) \
+    $(wildcard include/config/migration.h) \
   include/linux/limits.h \
   include/linux/kdev_t.h \
   include/linux/dcache.h \
-  include/linux/rcupdate.h \
+    $(wildcard include/config/profiling.h) \
   include/linux/radix-tree.h \
   include/linux/quota.h \
   include/linux/dqblk_xfs.h \
@@ -252,7 +351,12 @@
   include/linux/sunrpc/msg_prot.h \
   include/linux/fcntl.h \
   include/asm/fcntl.h \
-  include/linux/err.h \
+  include/asm-generic/fcntl.h \
+    $(wildcard include/config/64bit.h) \
+  include/linux/debug_locks.h \
+    $(wildcard include/config/debug/locking/api/selftests.h) \
+  include/linux/backing-dev.h \
+  include/linux/mm_types.h \
   include/asm/pgtable.h \
     $(wildcard include/config/highpte.h) \
   include/asm/fixmap.h \
@@ -261,46 +365,25 @@
     $(wildcard include/config/x86/visws/apic.h) \
     $(wildcard include/config/x86/f00f/bug.h) \
     $(wildcard include/config/x86/cyclone/timer.h) \
-    $(wildcard include/config/acpi/boot.h) \
+    $(wildcard include/config/acpi.h) \
     $(wildcard include/config/pci/mmconfig.h) \
   include/asm/acpi.h \
-    $(wildcard include/config/acpi/pci.h) \
     $(wildcard include/config/acpi/sleep.h) \
   include/acpi/pdc_intel.h \
   include/asm/apicdef.h \
-  include/asm/kmap_types.h \
-    $(wildcard include/config/debug/highmem.h) \
   include/asm/pgtable-2level-defs.h \
   include/asm/pgtable-2level.h \
   include/asm-generic/pgtable-nopmd.h \
   include/asm-generic/pgtable-nopud.h \
   include/asm-generic/pgtable.h \
   include/linux/page-flags.h \
+    $(wildcard include/config/s390.h) \
     $(wildcard include/config/swap.h) \
+  include/linux/vmstat.h \
+    $(wildcard include/config/vm/event/counters.h) \
   include/linux/highmem.h \
   include/asm/cacheflush.h \
-  include/asm/highmem.h \
-  include/linux/interrupt.h \
-    $(wildcard include/config/generic/hardirqs.h) \
-    $(wildcard include/config/generic/irq/probe.h) \
-  include/linux/hardirq.h \
-    $(wildcard include/config/virt/cpu/accounting.h) \
-  include/asm/hardirq.h \
-  include/linux/irq.h \
-    $(wildcard include/config/arch/s390.h) \
-  include/asm/irq.h \
-    $(wildcard include/config/irqbalance.h) \
-  include/asm-i386/mach-default/irq_vectors.h \
-  include/asm-i386/mach-default/irq_vectors_limits.h \
-    $(wildcard include/config/pci/msi.h) \
-  include/asm/hw_irq.h \
-  include/linux/profile.h \
-    $(wildcard include/config/profiling.h) \
-  include/asm/sections.h \
-  include/asm-generic/sections.h \
-  include/linux/irq_cpustat.h \
-  include/asm/tlbflush.h \
-    $(wildcard include/config/x86/invlpg.h) \
+    $(wildcard include/config/debug/rodata.h) \
   include/linux/poll.h \
   include/asm/poll.h \
   include/asm/uaccess.h \
@@ -309,14 +392,16 @@
   include/linux/net.h \
   include/asm/socket.h \
   include/asm/sockios.h \
+  include/linux/sysctl.h \
+  include/linux/textsearch.h \
   include/net/checksum.h \
   include/asm/checksum.h \
   include/linux/in6.h \
+  include/linux/dmaengine.h \
+    $(wildcard include/config/dma/engine.h) \
   include/linux/atm.h \
   include/linux/socket.h \
-    $(wildcard include/config/compat.h) \
   include/linux/sockios.h \
-  include/linux/uio.h \
   include/linux/atmapi.h \
   include/linux/atmsap.h \
   include/linux/atmioc.h \
@@ -325,8 +410,13 @@
     $(wildcard include/config/ax25/module.h) \
     $(wildcard include/config/tr.h) \
     $(wildcard include/config/net/ipip.h) \
-    $(wildcard include/config/ipv6.h) \
-    $(wildcard include/config/ipv6/module.h) \
+    $(wildcard include/config/net/ipip/module.h) \
+    $(wildcard include/config/net/ipgre.h) \
+    $(wildcard include/config/net/ipgre/module.h) \
+    $(wildcard include/config/ipv6/sit.h) \
+    $(wildcard include/config/ipv6/sit/module.h) \
+    $(wildcard include/config/ipv6/tunnel.h) \
+    $(wildcard include/config/ipv6/tunnel/module.h) \
     $(wildcard include/config/netpoll.h) \
     $(wildcard include/config/net/poll/controller.h) \
     $(wildcard include/config/net/divert.h) \
@@ -337,44 +427,73 @@
   include/linux/if_packet.h \
   include/linux/device.h \
   include/linux/ioport.h \
-  include/linux/pm.h \
-  include/linux/notifier.h \
+  include/linux/klist.h \
+  include/linux/interrupt.h \
+    $(wildcard include/config/generic/irq/probe.h) \
+  include/linux/irqreturn.h \
+  include/linux/hardirq.h \
+    $(wildcard include/config/virt/cpu/accounting.h) \
+  include/asm/hardirq.h \
+  include/linux/irq.h \
+    $(wildcard include/config/irq/per/cpu.h) \
+    $(wildcard include/config/irq/release/method.h) \
+    $(wildcard include/config/generic/pending/irq.h) \
+    $(wildcard include/config/irqbalance.h) \
+    $(wildcard include/config/auto/irq/affinity.h) \
+    $(wildcard include/config/generic/hardirqs/no//do/irq.h) \
+  include/asm/irq.h \
+  include/asm-i386/mach-default/irq_vectors.h \
+  include/asm-i386/mach-default/irq_vectors_limits.h \
+  include/asm/irq_regs.h \
+  include/asm-generic/irq_regs.h \
+  include/asm/hw_irq.h \
+  include/linux/profile.h \
+  include/asm/sections.h \
+  include/asm-generic/sections.h \
+  include/linux/irq_cpustat.h \
   include/linux/etherdevice.h \
   include/linux/if_arp.h \
   include/linux/if_pppox.h \
   include/linux/ppp_channel.h \
   include/net/sock.h \
+    $(wildcard include/config/security/network.h) \
+    $(wildcard include/config/netdebug.h) \
     $(wildcard include/config/net.h) \
   include/linux/security.h \
-    $(wildcard include/config/security/network.h) \
+    $(wildcard include/config/security/network/xfrm.h) \
   include/linux/binfmts.h \
   include/linux/shm.h \
   include/asm/shmparam.h \
   include/asm/shmbuf.h \
   include/linux/msg.h \
   include/asm/msgbuf.h \
+  include/linux/key.h \
+  include/linux/xfrm.h \
+  include/net/flow.h \
+    $(wildcard include/config/ipv6/mip6.h) \
   include/linux/filter.h \
   include/net/dst.h \
     $(wildcard include/config/net/cls/route.h) \
     $(wildcard include/config/xfrm.h) \
   include/linux/rtnetlink.h \
   include/linux/netlink.h \
+  include/linux/if_link.h \
+  include/linux/if_addr.h \
+  include/linux/neighbour.h \
   include/net/neighbour.h \
   include/linux/seq_file.h \
-  include/linux/sysctl.h \
   include/linux/ip.h \
-  include/linux/igmp.h \
-  include/linux/in.h \
-  include/net/flow.h \
   include/linux/proc_fs.h \
     $(wildcard include/config/proc/devicetree.h) \
     $(wildcard include/config/proc/kcore.h) \
-  /home/fisaksen/src/unicorn/unicorn_usb/../include/types.h \
-  /home/fisaksen/src/unicorn/unicorn_usb/../amu/amas.h \
-  /home/fisaksen/src/unicorn/unicorn_usb/../include/crc.h \
-  /home/fisaksen/src/unicorn/unicorn_usb/../include/unicorn.h \
-  /home/fisaksen/src/unicorn/unicorn_usb/../include/debug.h \
+  include/linux/magic.h \
+  /local/home/rzr/home/src/unicorn/unicorn/unicorn/unicorn_usb/../include/types.h \
+  /local/home/rzr/home/src/unicorn/unicorn/unicorn/unicorn_usb/../amu/amas.h \
+  /local/home/rzr/home/src/unicorn/unicorn/unicorn/unicorn_usb/../include/types.h \
+  /local/home/rzr/home/src/unicorn/unicorn/unicorn/unicorn_usb/../include/crc.h \
+  /local/home/rzr/home/src/unicorn/unicorn/unicorn/unicorn_usb/../include/unicorn.h \
+  /local/home/rzr/home/src/unicorn/unicorn/unicorn/unicorn_usb/../include/debug.h \
 
-/home/fisaksen/src/unicorn/unicorn_usb/../unicorn_eth/unicorn_ethdrv.o: $(deps_/home/fisaksen/src/unicorn/unicorn_usb/../unicorn_eth/unicorn_ethdrv.o)
+/local/home/rzr/home/src/unicorn/unicorn/unicorn/unicorn_usb/../unicorn_eth/unicorn_ethdrv.o: $(deps_/local/home/rzr/home/src/unicorn/unicorn/unicorn/unicorn_usb/../unicorn_eth/unicorn_ethdrv.o)
 
-$(deps_/home/fisaksen/src/unicorn/unicorn_usb/../unicorn_eth/unicorn_ethdrv.o):
+$(deps_/local/home/rzr/home/src/unicorn/unicorn/unicorn/unicorn_usb/../unicorn_eth/unicorn_ethdrv.o):

Modified: dists/trunk/modules/unicorn/unicorn/unicorn_eth/unicorn_ethdrv.c
==============================================================================
--- dists/trunk/modules/unicorn/unicorn/unicorn_eth/unicorn_ethdrv.c	(original)
+++ dists/trunk/modules/unicorn/unicorn/unicorn_eth/unicorn_ethdrv.c	Wed Dec 27 00:38:25 2006
@@ -4,8 +4,10 @@
   ST70134A or ST70136 Analog Front End (AFE).
   This file contains the ethernet interface and SAR routines.
 */
-#include <linux/config.h>
 #include <linux/version.h>
+#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,18)
+#	include <linux/config.h>
+#endif
 #if defined(CONFIG_MODVERSIONS) && (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0))
 #include <linux/modversions.h>
 #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
 

Modified: dists/trunk/modules/unicorn/unicorn/unicorn_pci/unicorn_pcidrv.c
==============================================================================
--- dists/trunk/modules/unicorn/unicorn/unicorn_pci/unicorn_pcidrv.c	(original)
+++ dists/trunk/modules/unicorn/unicorn/unicorn_pci/unicorn_pcidrv.c	Wed Dec 27 00:38:25 2006
@@ -4,8 +4,10 @@
   ST70134A, ST70136 or ST20174 Analog Front End (AFE).
   This file contains the PCI specific routines.
 */
-#include <linux/config.h>
 #include <linux/version.h>
+#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,18)
+#	include <linux/config.h>
+#endif
 #if defined(CONFIG_MODVERSIONS) && (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0))
 #include <linux/modversions.h>
 #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

Modified: dists/trunk/modules/unicorn/unicorn/unicorn_usb/unicorn_usbdrv.c
==============================================================================
--- dists/trunk/modules/unicorn/unicorn/unicorn_usb/unicorn_usbdrv.c	(original)
+++ dists/trunk/modules/unicorn/unicorn/unicorn_usb/unicorn_usbdrv.c	Wed Dec 27 00:38:25 2006
@@ -4,8 +4,10 @@
   Analog Front End (AFE).
   This file contains the USB specific routines.
 */
-#include <linux/config.h>
 #include <linux/version.h>
+#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,18)
+#	include <linux/config.h>
+#endif
 #if defined(CONFIG_MODVERSIONS) && (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0))
 #include <linux/modversions.h>
 #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
 
 //----------------------------------------------------------------------

Modified: dists/trunk/modules/unicorn/unicorn/unicorntest/Makefile
==============================================================================
--- dists/trunk/modules/unicorn/unicorn/unicorntest/Makefile	(original)
+++ dists/trunk/modules/unicorn/unicorn/unicorntest/Makefile	Wed Dec 27 00:38:25 2006
@@ -18,4 +18,4 @@
 	rm -f unicorntest *.o
 
 install: all  
-	$(INSTALL) -s -c unicorntest $(DESTDIR)$(BINDIR)
+	$(INSTALL) -c unicorntest $(DESTDIR)$(BINDIR)

Modified: dists/trunk/modules/unicorn/unicorn/unicorntest/unicorntest.c
==============================================================================
--- dists/trunk/modules/unicorn/unicorn/unicorntest/unicorntest.c	(original)
+++ dists/trunk/modules/unicorn/unicorn/unicorntest/unicorntest.c	Wed Dec 27 00:38:25 2006
@@ -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)