Merge branch 'e1000'
authorJeff Garzik <jgarzik@pobox.com>
Tue, 13 Dec 2005 05:01:02 +0000 (00:01 -0500)
committerJeff Garzik <jgarzik@pobox.com>
Tue, 13 Dec 2005 05:01:02 +0000 (00:01 -0500)
235 files changed:
Documentation/dvb/README.dvb-usb
Documentation/dvb/README.flexcop
Documentation/dvb/avermedia.txt
Documentation/dvb/cards.txt
Documentation/dvb/contributors.txt
Documentation/dvb/readme.txt
Documentation/filesystems/ext3.txt
Documentation/networking/gianfar.txt [new file with mode: 0644]
Makefile
arch/i386/kernel/kprobes.c
arch/i386/kernel/traps.c
arch/ia64/Kconfig
arch/ia64/kernel/kprobes.c
arch/mips/mm/init.c
arch/powerpc/Kconfig
arch/powerpc/kernel/kprobes.c
arch/powerpc/kernel/setup_64.c
arch/powerpc/mm/hash_utils_64.c
arch/powerpc/mm/hugetlbpage.c
arch/powerpc/mm/numa.c
arch/powerpc/mm/stab.c
arch/powerpc/platforms/powermac/feature.c
arch/powerpc/platforms/pseries/iommu.c
arch/powerpc/platforms/pseries/lpar.c
arch/ppc/Kconfig
arch/ppc/kernel/smp.c
arch/ppc/platforms/pmac_feature.c
arch/sparc64/kernel/kprobes.c
arch/um/include/um_uaccess.h
arch/um/kernel/skas/include/uaccess-skas.h
arch/x86_64/kernel/kprobes.c
drivers/acpi/pci_link.c
drivers/block/cciss.c
drivers/char/Kconfig
drivers/char/ipmi/ipmi_msghandler.c
drivers/connector/cn_proc.c
drivers/macintosh/windfarm_pm81.c
drivers/md/raid1.c
drivers/md/raid5.c
drivers/media/common/Kconfig
drivers/media/common/Makefile
drivers/media/common/ir-common.c
drivers/media/common/saa7146_core.c
drivers/media/common/saa7146_fops.c
drivers/media/common/saa7146_i2c.c
drivers/media/common/saa7146_vbi.c
drivers/media/common/saa7146_video.c
drivers/media/dvb/b2c2/flexcop-common.h
drivers/media/dvb/b2c2/flexcop-fe-tuner.c
drivers/media/dvb/bt8xx/dvb-bt8xx.c
drivers/media/dvb/dvb-core/demux.h
drivers/media/dvb/dvb-core/dmxdev.c
drivers/media/dvb/dvb-core/dmxdev.h
drivers/media/dvb/dvb-core/dvb_ca_en50221.c
drivers/media/dvb/dvb-core/dvb_filter.c
drivers/media/dvb/dvb-core/dvb_filter.h
drivers/media/dvb/dvb-core/dvb_frontend.c
drivers/media/dvb/dvb-core/dvb_frontend.h
drivers/media/dvb/dvb-core/dvb_net.c
drivers/media/dvb/dvb-core/dvb_ringbuffer.c
drivers/media/dvb/dvb-core/dvb_ringbuffer.h
drivers/media/dvb/dvb-core/dvbdev.c
drivers/media/dvb/dvb-core/dvbdev.h
drivers/media/dvb/dvb-usb/vp702x-fe.c
drivers/media/dvb/dvb-usb/vp7045-fe.c
drivers/media/dvb/frontends/at76c651.c
drivers/media/dvb/frontends/bcm3510.c
drivers/media/dvb/frontends/cx22700.c
drivers/media/dvb/frontends/cx22702.c
drivers/media/dvb/frontends/cx22702.h
drivers/media/dvb/frontends/cx24110.c
drivers/media/dvb/frontends/l64781.c
drivers/media/dvb/frontends/l64781.h
drivers/media/dvb/frontends/lgdt330x.c
drivers/media/dvb/frontends/mt312.c
drivers/media/dvb/frontends/nxt2002.c
drivers/media/dvb/frontends/nxt200x.c
drivers/media/dvb/frontends/nxt6000.c
drivers/media/dvb/frontends/or51132.c
drivers/media/dvb/frontends/s5h1420.c
drivers/media/dvb/frontends/s5h1420.h
drivers/media/dvb/frontends/sp8870.c
drivers/media/dvb/frontends/sp887x.c
drivers/media/dvb/frontends/stv0299.c
drivers/media/dvb/frontends/tda10021.c
drivers/media/dvb/frontends/tda10021.h
drivers/media/dvb/frontends/tda1004x.c
drivers/media/dvb/frontends/tda8083.c
drivers/media/dvb/ttpci/av7110.c
drivers/media/dvb/ttpci/av7110_hw.c
drivers/media/dvb/ttpci/av7110_v4l.c
drivers/media/dvb/ttpci/budget-core.c
drivers/media/dvb/ttpci/budget-patch.c
drivers/media/dvb/ttpci/budget.c
drivers/media/dvb/ttpci/budget.h
drivers/media/dvb/ttpci/fdump.c
drivers/media/dvb/ttpci/ttpci-eeprom.c
drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c
drivers/media/dvb/ttusb-budget/dvb-ttusb-dspbootcode.h
drivers/media/dvb/ttusb-dec/ttusb_dec.c
drivers/media/video/Kconfig
drivers/media/video/bt832.c
drivers/media/video/bttv-driver.c
drivers/media/video/bttvp.h
drivers/media/video/cx88/cx88-blackbird.c
drivers/media/video/cx88/cx88-cards.c
drivers/media/video/cx88/cx88-input.c
drivers/media/video/cx88/cx88.h
drivers/media/video/em28xx/em28xx-core.c
drivers/media/video/em28xx/em28xx-i2c.c
drivers/media/video/em28xx/em28xx-video.c
drivers/media/video/em28xx/em28xx.h
drivers/media/video/ir-kbd-gpio.c
drivers/media/video/ir-kbd-i2c.c
drivers/media/video/msp3400.c
drivers/media/video/saa6588.c
drivers/media/video/saa711x.c
drivers/media/video/saa7134/saa6752hs.c
drivers/media/video/saa7134/saa7134-alsa.c
drivers/media/video/saa7134/saa7134-cards.c
drivers/media/video/saa7134/saa7134-core.c
drivers/media/video/saa7134/saa7134-empress.c
drivers/media/video/saa7134/saa7134-i2c.c
drivers/media/video/saa7134/saa7134-oss.c
drivers/media/video/tda9887.c
drivers/media/video/tvaudio.c
drivers/media/video/tveeprom.c
drivers/media/video/tvp5150.c
drivers/media/video/video-buf-dvb.c
drivers/mfd/ucb1x00-ts.c
drivers/mtd/devices/blkmtd.c
drivers/net/8139too.c
drivers/net/Kconfig
drivers/net/Makefile
drivers/net/bonding/Makefile
drivers/net/bonding/bond_3ad.c
drivers/net/bonding/bond_3ad.h
drivers/net/bonding/bond_alb.c
drivers/net/bonding/bond_alb.h
drivers/net/bonding/bond_main.c
drivers/net/bonding/bond_sysfs.c [new file with mode: 0644]
drivers/net/bonding/bonding.h
drivers/net/gianfar.c
drivers/net/gianfar.h
drivers/net/gianfar_ethtool.c
drivers/net/gianfar_mii.h
drivers/net/gianfar_sysfs.c [new file with mode: 0644]
drivers/net/ixp2000/Kconfig [new file with mode: 0644]
drivers/net/ixp2000/Makefile [new file with mode: 0644]
drivers/net/ixp2000/caleb.c [new file with mode: 0644]
drivers/net/ixp2000/caleb.h [new file with mode: 0644]
drivers/net/ixp2000/enp2611.c [new file with mode: 0644]
drivers/net/ixp2000/ixp2400-msf.c [new file with mode: 0644]
drivers/net/ixp2000/ixp2400-msf.h [new file with mode: 0644]
drivers/net/ixp2000/ixp2400_rx.uc [new file with mode: 0644]
drivers/net/ixp2000/ixp2400_rx.ucode [new file with mode: 0644]
drivers/net/ixp2000/ixp2400_tx.uc [new file with mode: 0644]
drivers/net/ixp2000/ixp2400_tx.ucode [new file with mode: 0644]
drivers/net/ixp2000/ixpdev.c [new file with mode: 0644]
drivers/net/ixp2000/ixpdev.h [new file with mode: 0644]
drivers/net/ixp2000/ixpdev_priv.h [new file with mode: 0644]
drivers/net/ixp2000/pm3386.c [new file with mode: 0644]
drivers/net/ixp2000/pm3386.h [new file with mode: 0644]
drivers/net/s2io.c
drivers/net/s2io.h
drivers/net/sis900.c
drivers/net/sis900.h
drivers/net/sk98lin/Makefile
drivers/net/sk98lin/h/skdrv2nd.h
drivers/net/sk98lin/h/skvpd.h
drivers/net/sk98lin/skethtool.c
drivers/net/sk98lin/skge.c
drivers/net/sk98lin/skproc.c [deleted file]
drivers/net/sky2.c [new file with mode: 0644]
drivers/net/sky2.h [new file with mode: 0644]
drivers/net/tg3.c
drivers/net/wan/lmc/lmc_prot.h [deleted file]
drivers/net/wireless/Kconfig
drivers/net/wireless/airo.c
drivers/net/wireless/atmel.c
drivers/net/wireless/hostap/Makefile
drivers/net/wireless/hostap/hostap.c [deleted file]
drivers/net/wireless/hostap/hostap_main.c [new file with mode: 0644]
drivers/net/wireless/ipw2100.c
drivers/net/wireless/ipw2100.h
drivers/net/wireless/ipw2200.c
drivers/net/wireless/ipw2200.h
drivers/scsi/scsi_lib.c
fs/inotify.c
fs/xattr.c
include/asm-powerpc/mmu.h
include/linux/cn_proc.h
include/linux/dvb/audio.h
include/linux/dvb/ca.h
include/linux/dvb/dmx.h
include/linux/dvb/osd.h
include/linux/dvb/video.h
include/linux/i2c-id.h
include/linux/inotify.h
include/linux/kprobes.h
include/linux/list.h
include/linux/mm.h
include/linux/netdevice.h
include/linux/parport_pc.h
include/linux/rcupdate.h
include/linux/sysctl.h
include/linux/time.h
include/media/saa7146.h
include/media/saa7146_vv.h
include/net/dn.h
kernel/audit.c
kernel/kprobes.c
kernel/rcupdate.c
kernel/rcutorture.c
kernel/sys.c
kernel/time.c
mm/bootmem.c
mm/memory.c
net/core/dev.c
net/core/skbuff.c
net/core/utils.c
net/decnet/af_decnet.c
net/decnet/sysctl_net_decnet.c
net/ipv4/netfilter/Kconfig
net/ipv4/netfilter/ip_conntrack_core.c
net/ipv4/netfilter/ip_conntrack_netlink.c
net/ipv4/netfilter/ip_conntrack_proto_tcp.c
net/ipv4/tcp_output.c
net/ipv4/tcp_vegas.c
net/ipv6/esp6.c
net/ipv6/netfilter/nf_conntrack_proto_icmpv6.c
net/netfilter/Kconfig
net/netfilter/nf_conntrack_core.c
net/netfilter/nfnetlink.c
net/packet/af_packet.c

index ac0797ea646c6f2c725fe4cf8c064ee38532d654..46b78b7331c27e4f0fe131336f08c25235138ad5 100644 (file)
@@ -50,12 +50,12 @@ http://www.linuxtv.org/wiki/index.php/DVB_USB
 0. History & News:
   2005-06-30 - added support for WideView WT-220U (Thanks to Steve Chang)
   2005-05-30 - added basic isochronous support to the dvb-usb-framework
-               added support for Conexant Hybrid reference design and Nebula DigiTV USB
+              added support for Conexant Hybrid reference design and Nebula DigiTV USB
   2005-04-17 - all dibusb devices ported to make use of the dvb-usb-framework
   2005-04-02 - re-enabled and improved remote control code.
   2005-03-31 - ported the Yakumo/Hama/Typhoon DVB-T USB2.0 device to dvb-usb.
   2005-03-30 - first commit of the dvb-usb-module based on the dibusb-source. First device is a new driver for the
-               TwinhanDTV Alpha / MagicBox II USB2.0-only DVB-T device.
+              TwinhanDTV Alpha / MagicBox II USB2.0-only DVB-T device.
 
   (change from dvb-dibusb to dvb-usb)
   2005-03-28 - added support for the AVerMedia AverTV DVB-T USB2.0 device (Thanks to Glen Harris and Jiun-Kuei Jung, AVerMedia)
@@ -64,50 +64,50 @@ http://www.linuxtv.org/wiki/index.php/DVB_USB
   2005-02-02 - added support for the Hauppauge Win-TV Nova-T USB2
   2005-01-31 - distorted streaming is gone for USB1.1 devices
   2005-01-13 - moved the mirrored pid_filter_table back to dvb-dibusb
-             - first almost working version for HanfTek UMT-010
-             - found out, that Yakumo/HAMA/Typhoon are predecessors of the HanfTek UMT-010
+            - first almost working version for HanfTek UMT-010
+            - found out, that Yakumo/HAMA/Typhoon are predecessors of the HanfTek UMT-010
   2005-01-10 - refactoring completed, now everything is very delightful
-             - tuner quirks for some weird devices (Artec T1 AN2235 device has sometimes a
-               Panasonic Tuner assembled). Tunerprobing implemented. Thanks a lot to Gunnar Wittich.
+            - tuner quirks for some weird devices (Artec T1 AN2235 device has sometimes a
+              Panasonic Tuner assembled). Tunerprobing implemented. Thanks a lot to Gunnar Wittich.
   2004-12-29 - after several days of struggling around bug of no returning URBs fixed.
   2004-12-26 - refactored the dibusb-driver, splitted into separate files
-             - i2c-probing enabled
+            - i2c-probing enabled
   2004-12-06 - possibility for demod i2c-address probing
-             - new usb IDs (Compro, Artec)
+            - new usb IDs (Compro, Artec)
   2004-11-23 - merged changes from DiB3000MC_ver2.1
-             - revised the debugging
-             - possibility to deliver the complete TS for USB2.0
+            - revised the debugging
+            - possibility to deliver the complete TS for USB2.0
   2004-11-21 - first working version of the dib3000mc/p frontend driver.
   2004-11-12 - added additional remote control keys. Thanks to Uwe Hanke.
   2004-11-07 - added remote control support. Thanks to David Matthews.
   2004-11-05 - added support for a new devices (Grandtec/Avermedia/Artec)
-             - merged my changes (for dib3000mb/dibusb) to the FE_REFACTORING, because it became HEAD
-             - moved transfer control (pid filter, fifo control) from usb driver to frontend, it seems
-               better settled there (added xfer_ops-struct)
-             - created a common files for frontends (mc/p/mb)
+            - merged my changes (for dib3000mb/dibusb) to the FE_REFACTORING, because it became HEAD
+            - moved transfer control (pid filter, fifo control) from usb driver to frontend, it seems
+              better settled there (added xfer_ops-struct)
+            - created a common files for frontends (mc/p/mb)
   2004-09-28 - added support for a new device (Unkown, vendor ID is Hyper-Paltek)
   2004-09-20 - added support for a new device (Compro DVB-U2000), thanks
-               to Amaury Demol for reporting
-             - changed usb TS transfer method (several urbs, stopping transfer
-               before setting a new pid)
+              to Amaury Demol for reporting
+            - changed usb TS transfer method (several urbs, stopping transfer
+              before setting a new pid)
   2004-09-13 - added support for a new device (Artec T1 USB TVBOX), thanks
-               to Christian Motschke for reporting
+              to Christian Motschke for reporting
   2004-09-05 - released the dibusb device and dib3000mb-frontend driver
 
   (old news for vp7041.c)
   2004-07-15 - found out, by accident, that the device has a TUA6010XS for
-               PLL
+              PLL
   2004-07-12 - figured out, that the driver should also work with the
-               CTS Portable (Chinese Television System)
+              CTS Portable (Chinese Television System)
   2004-07-08 - firmware-extraction-2.422-problem solved, driver is now working
-               properly with firmware extracted from 2.422
-             - #if for 2.6.4 (dvb), compile issue
-             - changed firmware handling, see vp7041.txt sec 1.1
+              properly with firmware extracted from 2.422
+            - #if for 2.6.4 (dvb), compile issue
+            - changed firmware handling, see vp7041.txt sec 1.1
   2004-07-02 - some tuner modifications, v0.1, cleanups, first public
   2004-06-28 - now using the dvb_dmx_swfilter_packets, everything
-               runs fine now
+              runs fine now
   2004-06-27 - able to watch and switching channels (pre-alpha)
-             - no section filtering yet
+            - no section filtering yet
   2004-06-06 - first TS received, but kernel oops :/
   2004-05-14 - firmware loader is working
   2004-05-11 - start writing the driver
index a50c70f9ca7208d90df90f247cf7d38110272163..5515469de7cf6aaf2d339fd18eec62df773b70d2 100644 (file)
@@ -174,7 +174,7 @@ Debugging
 Everything which is identical in the following table, can be put into a common
 flexcop-module.
 
-                  PCI                  USB
+                 PCI                  USB
 -------------------------------------------------------------------------------
 Different:
 Register access:  accessing IO memory  USB control message
index 09020ebd202b1bfa38e2b016f3628922fea26e4e..2dc260b2b0a4a417c0e489b4713037373d1b0dd5 100644 (file)
@@ -1,6 +1,6 @@
 
 HOWTO: Get An Avermedia DVB-T working under Linux
-           ______________________________________________
+          ______________________________________________
 
    Table of Contents
    Assumptions and Introduction
index 19329cf7b09798462293f70928bca66e89b80f5a..9e10092440e1d61836481300004740ee1f89d984 100644 (file)
@@ -16,7 +16,7 @@ Hardware supported by the linuxtv.org DVB drivers
   shielding, and the whole metal box has its own part number.
 
 
-o Frontends drivers: 
+o Frontends drivers:
   - dvb_dummy_fe: for testing...
   DVB-S:
    - ves1x93           : Alps BSRV2 (ves1893 demodulator) and dbox2 (ves1993)
@@ -24,7 +24,7 @@ o Frontends drivers:
    - grundig_29504-491 : Grundig 29504-491 (Philips TDA8083 demodulator), tsa5522 PLL
    - mt312             : Zarlink mt312 or Mitel vp310 demodulator, sl1935 or tsa5059 PLL
    - stv0299           : Alps BSRU6 (tsa5059 PLL), LG TDQB-S00x (tsa5059 PLL),
-                         LG TDQF-S001F (sl1935 PLL), Philips SU1278 (tua6100 PLL), 
+                         LG TDQF-S001F (sl1935 PLL), Philips SU1278 (tua6100 PLL),
                          Philips SU1278SH (tsa5059 PLL), Samsung TBMU24112IMB
   DVB-C:
    - ves1820           : various (ves1820 demodulator, sp5659c or spXXXX PLL)
@@ -35,8 +35,8 @@ o Frontends drivers:
    - grundig_29504-401 : Grundig 29504-401 (LSI L64781 demodulator), tsa5060 PLL
    - tda1004x          : Philips tda10045h (td1344 or tdm1316l PLL)
    - nxt6000           : Alps TDME7 (MITEL SP5659 PLL), Alps TDED4 (TI ALP510 PLL),
-                                 Comtech DVBT-6k07 (SP5730 PLL)
-                                 (NxtWave Communications NXT6000 demodulator)
+                         Comtech DVBT-6k07 (SP5730 PLL)
+                         (NxtWave Communications NXT6000 demodulator)
    - sp887x            : Microtune 7202D
    - dib3000mb : DiBcom 3000-MB demodulator
   DVB-S/C/T:
index 2cbd2d0f6fdf73475d9623fbdcf9075094373d4e..4c33cced5f657fd25be698d01a25473a11c0dfd4 100644 (file)
@@ -15,7 +15,7 @@ Michael Holzt <kju@debian.org>
 
 Diego Picciani <d.picciani@novacomp.it>
   for CyberLogin for Linux which allows logging onto EON
-  (in case you are wondering where CyberLogin is, EON changed its login 
+  (in case you are wondering where CyberLogin is, EON changed its login
   procedure and CyberLogin is no longer used.)
 
 Martin Schaller <martin@smurf.franken.de>
@@ -57,7 +57,7 @@ Augusto Cardoso <augusto@carhil.net>
 Davor Emard <emard@softhome.net>
   for his work on the budget drivers, the demux code,
   the module unloading problems, ...
-  
+
 Hans-Frieder Vogt <hfvogt@arcor.de>
   for his work on calculating and checking the crc's for the
   TechnoTrend/Hauppauge DEC driver firmware
index 754c98c6ad942049dcb5cfcf05e48abd161738f3..f5c50b22de3b89e09bb8553854cc8452d76bc110 100644 (file)
@@ -20,7 +20,7 @@ http://linuxtv.org/downloads/
 
 What's inside this directory:
 
-"cards.txt" 
+"cards.txt"
 contains a list of supported hardware.
 
 "contributors.txt"
@@ -37,7 +37,7 @@ that require it.
 contains detailed informations about the
 TT DEC2000/DEC3000 USB DVB hardware.
 
-"bt8xx.txt" 
+"bt8xx.txt"
 contains detailed installation instructions for the
 various bt8xx based "budget" DVB cards
 (Nebula, Pinnacle PCTV, Twinhan DST)
index 9ab7f446f7adb76e1752aa4d020a9fa201fe03f1..9840d5b8d5b9997621964653f6b3d348dd08f9b7 100644 (file)
@@ -57,19 +57,19 @@ oldalloc            This disables the Orlov block allocator and enables the
                        we'd like to get some feedback if it's the contrary for
                        you.
 
-user_xattr     (*)     Enables POSIX Extended Attributes. It's enabled by
-                       default, however you need to confifure its support
-                       (CONFIG_EXT3_FS_XATTR). This is neccesary if you want
-                       to use POSIX Acces Control Lists support. You can visit
-                       http://acl.bestbits.at to know more about POSIX Extended
-                       attributes.
-
-nouser_xattr           Disables POSIX Extended Attributes.
-
-acl            (*)     Enables POSIX Access Control Lists support. This is
-                       enabled by default, however you need to configure
-                       its support (CONFIG_EXT3_FS_POSIX_ACL). If you want
-                       to know more about ACLs visit http://acl.bestbits.at
+user_xattr             Enables Extended User Attributes. Additionally, you need
+                       to have extended attribute support enabled in the kernel
+                       configuration (CONFIG_EXT3_FS_XATTR). See the attr(5)
+                       manual page and http://acl.bestbits.at to learn more
+                       about extended attributes.
+
+nouser_xattr           Disables Extended User Attributes.
+
+acl                    Enables POSIX Access Control Lists support.  Additionally,
+                       you need to have ACL support enabled in the kernel
+                       configuration (CONFIG_EXT3_FS_POSIX_ACL). See the acl(5)
+                       manual page and http://acl.bestbits.at for more
+                       information.
 
 noacl                  This option disables POSIX Access Control List support.
 
diff --git a/Documentation/networking/gianfar.txt b/Documentation/networking/gianfar.txt
new file mode 100644 (file)
index 0000000..ad474ea
--- /dev/null
@@ -0,0 +1,72 @@
+The Gianfar Ethernet Driver
+Sysfs File description
+
+Author: Andy Fleming <afleming@freescale.com>
+Updated: 2005-07-28
+
+SYSFS
+
+Several of the features of the gianfar driver are controlled
+through sysfs files.  These are:
+
+bd_stash:
+To stash RX Buffer Descriptors in the L2, echo 'on' or '1' to
+bd_stash, echo 'off' or '0' to disable
+
+rx_stash_len:
+To stash the first n bytes of the packet in L2, echo the number
+of bytes to buf_stash_len.  echo 0 to disable.
+
+WARNING: You could really screw these up if you set them too low or high!
+fifo_threshold:
+To change the number of bytes the controller needs in the
+fifo before it starts transmission, echo the number of bytes to 
+fifo_thresh.  Range should be 0-511.
+
+fifo_starve:
+When the FIFO has less than this many bytes during a transmit, it
+enters starve mode, and increases the priority of TX memory
+transactions.  To change, echo the number of bytes to
+fifo_starve.  Range should be 0-511.
+
+fifo_starve_off:
+Once in starve mode, the FIFO remains there until it has this
+many bytes.  To change, echo the number of bytes to
+fifo_starve_off.  Range should be 0-511.
+
+CHECKSUM OFFLOADING
+
+The eTSEC controller (first included in parts from late 2005 like
+the 8548) has the ability to perform TCP, UDP, and IP checksums
+in hardware.  The Linux kernel only offloads the TCP and UDP
+checksums (and always performs the pseudo header checksums), so
+the driver only supports checksumming for TCP/IP and UDP/IP
+packets.  Use ethtool to enable or disable this feature for RX
+and TX.
+
+VLAN
+
+In order to use VLAN, please consult Linux documentation on
+configuring VLANs.  The gianfar driver supports hardware insertion and
+extraction of VLAN headers, but not filtering.  Filtering will be
+done by the kernel.
+
+MULTICASTING
+
+The gianfar driver supports using the group hash table on the
+TSEC (and the extended hash table on the eTSEC) for multicast
+filtering.  On the eTSEC, the exact-match MAC registers are used
+before the hash tables.  See Linux documentation on how to join
+multicast groups.
+
+PADDING
+
+The gianfar driver supports padding received frames with 2 bytes
+to align the IP header to a 16-byte boundary, when supported by
+hardware.
+
+ETHTOOL
+
+The gianfar driver supports the use of ethtool for many
+configuration options.  You must run ethtool only on currently
+open interfaces.  See ethtool documentation for details.
index b1c458c2522d5ae30c538a867101b1f4cbea18cc..ad457e1bd0d25707febd5f6f53934357c86d1326 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -408,7 +408,7 @@ outputmakefile:
 # of make so .config is not included in this case either (for *config).
 
 no-dot-config-targets := clean mrproper distclean \
-                        cscope TAGS tags help %docs check% kernelrelease
+                        cscope TAGS tags help %docs check%
 
 config-targets := 0
 mixed-targets  := 0
index 32b0c24ab9a6dcca721414a7027635aa06d2c828..19edcd526ba4800f9c71c66ef7ad18da5eb1b7bc 100644 (file)
@@ -191,7 +191,7 @@ static int __kprobes kprobe_handler(struct pt_regs *regs)
                         */
                        save_previous_kprobe(kcb);
                        set_current_kprobe(p, regs, kcb);
-                       p->nmissed++;
+                       kprobes_inc_nmissed_count(p);
                        prepare_singlestep(p, regs);
                        kcb->kprobe_status = KPROBE_REENTER;
                        return 1;
index c34d1bfc51619b0ee978740d34ffad9d6dd499bb..f0dffa03fbbaec9d1efec46f02441b0427eb92f8 100644 (file)
@@ -650,13 +650,6 @@ fastcall void do_nmi(struct pt_regs * regs, long error_code)
 
        cpu = smp_processor_id();
 
-#ifdef CONFIG_HOTPLUG_CPU
-       if (!cpu_online(cpu)) {
-               nmi_exit();
-               return;
-       }
-#endif
-
        ++nmi_count(cpu);
 
        if (!rcu_dereference(nmi_callback)(regs, cpu))
index b76ce1fe2e7f31c04858901fac13dd66e7efff29..199eeaf0f4e3829267b6de3ebf4efdedbaa4d68c 100644 (file)
@@ -58,7 +58,7 @@ config IA64_UNCACHED_ALLOCATOR
        bool
        select GENERIC_ALLOCATOR
 
-config ZONE_DMA_IS_DMA32
+config DMA_IS_DMA32
        bool
        default y
 
index 2895d6e6062f72df56f7f064fe8057077496c9d1..89a70400c4f638efa3ed6face511777cf90bb5b4 100644 (file)
@@ -630,7 +630,7 @@ static int __kprobes pre_kprobes_handler(struct die_args *args)
                         */
                        save_previous_kprobe(kcb);
                        set_current_kprobe(p, kcb);
-                       p->nmissed++;
+                       kprobes_inc_nmissed_count(p);
                        prepare_ss(p, regs);
                        kcb->kprobe_status = KPROBE_REENTER;
                        return 1;
index 3a49036e0ae8f378056e46c88689276dda9035bb..4ee91c9a556fed7f53dfb534cfc8d474392952a7 100644 (file)
@@ -67,8 +67,8 @@ unsigned long setup_zero_pages(void)
 
        page = virt_to_page(empty_zero_page);
        while (page < virt_to_page(empty_zero_page + (PAGE_SIZE << order))) {
-               set_bit(PG_reserved, &page->flags);
-               reset_page_mapcount(page);
+               SetPageReserved(page);
+               set_page_count(page, 1);
                page++;
        }
 
index bb2efdd566a9d590d64184b10b097e4b7ed17e95..db93dbc0e21a9896ee25c8dcc1c517f8f330d5cd 100644 (file)
@@ -227,7 +227,7 @@ config SMP
          If you don't know what to do here, say N.
 
 config NR_CPUS
-       int "Maximum number of CPUs (2-32)"
+       int "Maximum number of CPUs (2-128)"
        range 2 128
        depends on SMP
        default "32" if PPC64
index 511af54e6230ca13eeba65dd7765dcb9f7c8947c..5368f9c2e6bff7707c040812f1260c8269d1373d 100644 (file)
@@ -177,7 +177,7 @@ static inline int kprobe_handler(struct pt_regs *regs)
                        save_previous_kprobe(kcb);
                        set_current_kprobe(p, regs, kcb);
                        kcb->kprobe_saved_msr = regs->msr;
-                       p->nmissed++;
+                       kprobes_inc_nmissed_count(p);
                        prepare_singlestep(p, regs);
                        kcb->kprobe_status = KPROBE_REENTER;
                        return 1;
index 608fee7c7e20621dcf829507e893cbaee4ea05da..e3fb78397dc6d2b84e1f6fd8d0b7e9fc89e92ffe 100644 (file)
@@ -102,7 +102,15 @@ int boot_cpuid_phys = 0;
 dev_t boot_dev;
 u64 ppc64_pft_size;
 
-struct ppc64_caches ppc64_caches;
+/* Pick defaults since we might want to patch instructions
+ * before we've read this from the device tree.
+ */
+struct ppc64_caches ppc64_caches = {
+       .dline_size = 0x80,
+       .log_dline_size = 7,
+       .iline_size = 0x80,
+       .log_iline_size = 7
+};
 EXPORT_SYMBOL_GPL(ppc64_caches);
 
 /*
index 706e8a63ced93218334a227b62f5303595c27790..a33583f3b0e7d0e2c7f07b5ccc3bec039bf3f14e 100644 (file)
@@ -601,7 +601,7 @@ int hash_page(unsigned long ea, unsigned long access, unsigned long trap)
        /* Handle hugepage regions */
        if (unlikely(in_hugepage_area(mm->context, ea))) {
                DBG_LOW(" -> huge page !\n");
-               return hash_huge_page(mm, access, ea, vsid, local);
+               return hash_huge_page(mm, access, ea, vsid, local, trap);
        }
 
        /* Get PTE and page size from page tables */
index 6bc9dbad7dea20cd744d10f682f74562533f614f..54131b877da36cb3a827000d802ca76ce82507ad 100644 (file)
@@ -148,43 +148,63 @@ int is_aligned_hugepage_range(unsigned long addr, unsigned long len)
        return 0;
 }
 
+struct slb_flush_info {
+       struct mm_struct *mm;
+       u16 newareas;
+};
+
 static void flush_low_segments(void *parm)
 {
-       u16 areas = (unsigned long) parm;
+       struct slb_flush_info *fi = parm;
        unsigned long i;
 
-       asm volatile("isync" : : : "memory");
+       BUILD_BUG_ON((sizeof(fi->newareas)*8) != NUM_LOW_AREAS);
+
+       if (current->active_mm != fi->mm)
+               return;
+
+       /* Only need to do anything if this CPU is working in the same
+        * mm as the one which has changed */
 
-       BUILD_BUG_ON((sizeof(areas)*8) != NUM_LOW_AREAS);
+       /* update the paca copy of the context struct */
+       get_paca()->context = current->active_mm->context;
 
+       asm volatile("isync" : : : "memory");
        for (i = 0; i < NUM_LOW_AREAS; i++) {
-               if (! (areas & (1U << i)))
+               if (! (fi->newareas & (1U << i)))
                        continue;
                asm volatile("slbie %0"
                             : : "r" ((i << SID_SHIFT) | SLBIE_C));
        }
-
        asm volatile("isync" : : : "memory");
 }
 
 static void flush_high_segments(void *parm)
 {
-       u16 areas = (unsigned long) parm;
+       struct slb_flush_info *fi = parm;
        unsigned long i, j;
 
-       asm volatile("isync" : : : "memory");
 
-       BUILD_BUG_ON((sizeof(areas)*8) != NUM_HIGH_AREAS);
+       BUILD_BUG_ON((sizeof(fi->newareas)*8) != NUM_HIGH_AREAS);
 
+       if (current->active_mm != fi->mm)
+               return;
+
+       /* Only need to do anything if this CPU is working in the same
+        * mm as the one which has changed */
+
+       /* update the paca copy of the context struct */
+       get_paca()->context = current->active_mm->context;
+
+       asm volatile("isync" : : : "memory");
        for (i = 0; i < NUM_HIGH_AREAS; i++) {
-               if (! (areas & (1U << i)))
+               if (! (fi->newareas & (1U << i)))
                        continue;
                for (j = 0; j < (1UL << (HTLB_AREA_SHIFT-SID_SHIFT)); j++)
                        asm volatile("slbie %0"
                                     :: "r" (((i << HTLB_AREA_SHIFT)
-                                            + (j << SID_SHIFT)) | SLBIE_C));
+                                             + (j << SID_SHIFT)) | SLBIE_C));
        }
-
        asm volatile("isync" : : : "memory");
 }
 
@@ -229,6 +249,7 @@ static int prepare_high_area_for_htlb(struct mm_struct *mm, unsigned long area)
 static int open_low_hpage_areas(struct mm_struct *mm, u16 newareas)
 {
        unsigned long i;
+       struct slb_flush_info fi;
 
        BUILD_BUG_ON((sizeof(newareas)*8) != NUM_LOW_AREAS);
        BUILD_BUG_ON((sizeof(mm->context.low_htlb_areas)*8) != NUM_LOW_AREAS);
@@ -244,19 +265,20 @@ static int open_low_hpage_areas(struct mm_struct *mm, u16 newareas)
 
        mm->context.low_htlb_areas |= newareas;
 
-       /* update the paca copy of the context struct */
-       get_paca()->context = mm->context;
-
        /* the context change must make it to memory before the flush,
         * so that further SLB misses do the right thing. */
        mb();
-       on_each_cpu(flush_low_segments, (void *)(unsigned long)newareas, 0, 1);
+
+       fi.mm = mm;
+       fi.newareas = newareas;
+       on_each_cpu(flush_low_segments, &fi, 0, 1);
 
        return 0;
 }
 
 static int open_high_hpage_areas(struct mm_struct *mm, u16 newareas)
 {
+       struct slb_flush_info fi;
        unsigned long i;
 
        BUILD_BUG_ON((sizeof(newareas)*8) != NUM_HIGH_AREAS);
@@ -280,7 +302,10 @@ static int open_high_hpage_areas(struct mm_struct *mm, u16 newareas)
        /* the context change must make it to memory before the flush,
         * so that further SLB misses do the right thing. */
        mb();
-       on_each_cpu(flush_high_segments, (void *)(unsigned long)newareas, 0, 1);
+
+       fi.mm = mm;
+       fi.newareas = newareas;
+       on_each_cpu(flush_high_segments, &fi, 0, 1);
 
        return 0;
 }
@@ -639,8 +664,36 @@ unsigned long hugetlb_get_unmapped_area(struct file *file, unsigned long addr,
        return -ENOMEM;
 }
 
+/*
+ * Called by asm hashtable.S for doing lazy icache flush
+ */
+static unsigned int hash_huge_page_do_lazy_icache(unsigned long rflags,
+                                                 pte_t pte, int trap)
+{
+       struct page *page;
+       int i;
+
+       if (!pfn_valid(pte_pfn(pte)))
+               return rflags;
+
+       page = pte_page(pte);
+
+       /* page is dirty */
+       if (!test_bit(PG_arch_1, &page->flags) && !PageReserved(page)) {
+               if (trap == 0x400) {
+                       for (i = 0; i < (HPAGE_SIZE / PAGE_SIZE); i++)
+                               __flush_dcache_icache(page_address(page+i));
+                       set_bit(PG_arch_1, &page->flags);
+               } else {
+                       rflags |= HPTE_R_N;
+               }
+       }
+       return rflags;
+}
+
 int hash_huge_page(struct mm_struct *mm, unsigned long access,
-                  unsigned long ea, unsigned long vsid, int local)
+                  unsigned long ea, unsigned long vsid, int local,
+                  unsigned long trap)
 {
        pte_t *ptep;
        unsigned long old_pte, new_pte;
@@ -691,6 +744,11 @@ int hash_huge_page(struct mm_struct *mm, unsigned long access,
        rflags = 0x2 | (!(new_pte & _PAGE_RW));
        /* _PAGE_EXEC -> HW_NO_EXEC since it's inverted */
        rflags |= ((new_pte & _PAGE_EXEC) ? 0 : HPTE_R_N);
+       if (!cpu_has_feature(CPU_FTR_COHERENT_ICACHE))
+               /* No CPU has hugepages but lacks no execute, so we
+                * don't need to worry about that case */
+               rflags = hash_huge_page_do_lazy_icache(rflags, __pte(old_pte),
+                                                      trap);
 
        /* Check if pte already has an hpte (case 2) */
        if (unlikely(old_pte & _PAGE_HASHPTE)) {
@@ -703,7 +761,8 @@ int hash_huge_page(struct mm_struct *mm, unsigned long access,
                slot = (hash & htab_hash_mask) * HPTES_PER_GROUP;
                slot += (old_pte & _PAGE_F_GIX) >> 12;
 
-               if (ppc_md.hpte_updatepp(slot, rflags, va, 1, local) == -1)
+               if (ppc_md.hpte_updatepp(slot, rflags, va, mmu_huge_psize,
+                                        local) == -1)
                        old_pte &= ~_PAGE_HPTEFLAGS;
        }
 
index f72cf87364cb29d9953131fc1f0ef46d5a407087..ba7a3055a9fc42f20b70f80b7bc298f40137a559 100644 (file)
@@ -125,7 +125,7 @@ void __init get_region(unsigned int nid, unsigned long *start_pfn,
 
        /* We didnt find a matching region, return start/end as 0 */
        if (*start_pfn == -1UL)
-               start_pfn = 0;
+               *start_pfn = 0;
 }
 
 static inline void map_cpu_to_node(int cpu, int node)
index cfbb4e1f966b3331e7e89dda329ae925841616d1..51e7951414e5ca561b1d51257be70efe52a84139 100644 (file)
@@ -288,11 +288,6 @@ void stab_initialize(unsigned long stab)
                return;
        }
 #endif /* CONFIG_PPC_ISERIES */
-#ifdef CONFIG_PPC_PSERIES
-       if (platform_is_lpar()) {
-               plpar_hcall_norets(H_SET_ASR, stabreal);
-               return;
-       }
-#endif
+
        mtspr(SPRN_ASR, stabreal);
 }
index 0d7fa00fcb00cd8d608b5045557a6f6f5128bb72..f6e22da2a5daa8dd27a2bcade5b12ff19599b60f 100644 (file)
@@ -1650,11 +1650,19 @@ void pmac_tweak_clock_spreading(int enable)
         */
 
        if (macio->type == macio_intrepid) {
-               if (enable)
-                       UN_OUT(UNI_N_CLOCK_SPREADING, 2);
-               else
-                       UN_OUT(UNI_N_CLOCK_SPREADING, 0);
-               mdelay(40);
+               struct device_node *clock =
+                       of_find_node_by_path("/uni-n@f8000000/hw-clock");
+               if (clock && get_property(clock, "platform-do-clockspreading",
+                                         NULL)) {
+                       printk(KERN_INFO "%sabling clock spreading on Intrepid"
+                              " ASIC\n", enable ? "En" : "Dis");
+                       if (enable)
+                               UN_OUT(UNI_N_CLOCK_SPREADING, 2);
+                       else
+                               UN_OUT(UNI_N_CLOCK_SPREADING, 0);
+                       mdelay(40);
+               }
+               of_node_put(clock);
        }
 
        while (machine_is_compatible("PowerBook5,2") ||
@@ -1724,6 +1732,9 @@ void pmac_tweak_clock_spreading(int enable)
                        pmac_low_i2c_close(ui2c);
                        break;
                }
+               printk(KERN_INFO "%sabling clock spreading on i2c clock chip\n",
+                      enable ? "En" : "Dis");
+
                pmac_low_i2c_setmode(ui2c, pmac_low_i2c_mode_stdsub);
                rc = pmac_low_i2c_xfer(ui2c, 0xd2 | pmac_low_i2c_write, 0x80, buffer, 9);
                DBG("write result: %d,", rc);
index c78f2b290a73a52b90356f32f54af51569227796..2043659ea7b19cfb4fcde1ea7d2ce8ddd4768a3b 100644 (file)
@@ -109,6 +109,9 @@ static void tce_build_pSeriesLP(struct iommu_table *tbl, long tcenum,
        u64 rc;
        union tce_entry tce;
 
+       tcenum <<= TCE_PAGE_FACTOR;
+       npages <<= TCE_PAGE_FACTOR;
+
        tce.te_word = 0;
        tce.te_rpn = (virt_to_abs(uaddr)) >> TCE_SHIFT;
        tce.te_rdwr = 1;
@@ -143,10 +146,7 @@ static void tce_buildmulti_pSeriesLP(struct iommu_table *tbl, long tcenum,
        union tce_entry tce, *tcep;
        long l, limit;
 
-       tcenum <<= TCE_PAGE_FACTOR;
-       npages <<= TCE_PAGE_FACTOR;
-
-       if (npages == 1)
+       if (TCE_PAGE_FACTOR == 0 && npages == 1)
                return tce_build_pSeriesLP(tbl, tcenum, npages, uaddr,
                                           direction);
 
@@ -164,6 +164,9 @@ static void tce_buildmulti_pSeriesLP(struct iommu_table *tbl, long tcenum,
                __get_cpu_var(tce_page) = tcep;
        }
 
+       tcenum <<= TCE_PAGE_FACTOR;
+       npages <<= TCE_PAGE_FACTOR;
+
        tce.te_word = 0;
        tce.te_rpn = (virt_to_abs(uaddr)) >> TCE_SHIFT;
        tce.te_rdwr = 1;
index a50e5f3f396dc177da02deea3cbad714d01be4ce..cf1bc11b334685264c296363f0a0dd06ca1b38cf 100644 (file)
@@ -298,18 +298,6 @@ long pSeries_lpar_hpte_insert(unsigned long hpte_group,
        if (!(vflags & HPTE_V_BOLTED))
                DBG_LOW(" hpte_v=%016lx, hpte_r=%016lx\n", hpte_v, hpte_r);
 
-#if 1
-       {
-               int i;
-               for (i=0;i<8;i++) {
-                       unsigned long w0, w1;
-                       plpar_pte_read(0, hpte_group, &w0, &w1);
-                       BUG_ON (HPTE_V_COMPARE(hpte_v, w0)
-                               && (w0 & HPTE_V_VALID));
-               }
-       }
-#endif
-
        /* Now fill in the actual HPTE */
        /* Set CEC cookie to 0         */
        /* Zero page = 0               */
index 8fa51b0a32d2d5390450d6478117ec1e7410a804..cc3f64c084c5e886b29eadd081c77edc5bcace91 100644 (file)
@@ -767,14 +767,14 @@ config CPM2
          on it (826x, 827x, 8560).
 
 config PPC_CHRP
-       bool "  Common Hardware Reference Platform (CHRP) based machines"
+       bool
        depends on PPC_MULTIPLATFORM
        select PPC_I8259
        select PPC_INDIRECT_PCI
        default y
 
 config PPC_PMAC
-       bool "  Apple PowerMac based machines"
+       bool
        depends on PPC_MULTIPLATFORM
        select PPC_INDIRECT_PCI
        default y
@@ -785,7 +785,7 @@ config PPC_PMAC64
        default y
 
 config PPC_PREP
-       bool "  PowerPC Reference Platform (PReP) based machines"
+       bool
        depends on PPC_MULTIPLATFORM
        select PPC_I8259
        select PPC_INDIRECT_PCI
index 43b8fc2ca591c86388427c4b822eababd6991e11..becbfa397556a378c87aea3c05e8418073072fb4 100644 (file)
@@ -301,6 +301,10 @@ void __init smp_prepare_cpus(unsigned int max_cpus)
 
        /* Probe platform for CPUs: always linear. */
        num_cpus = smp_ops->probe();
+       
+       if (num_cpus < 2)
+               smp_tb_synchronized = 1;
+       
        for (i = 0; i < num_cpus; ++i)
                cpu_set(i, cpu_possible_map);
 
index 1e69b05931620a2f1420adea43a27cac67644f6b..6b7b3a150631485cbf7ce43fe763f2ab8f55748a 100644 (file)
@@ -1606,11 +1606,19 @@ void pmac_tweak_clock_spreading(int enable)
         */
 
        if (macio->type == macio_intrepid) {
-               if (enable)
-                       UN_OUT(UNI_N_CLOCK_SPREADING, 2);
-               else
-                       UN_OUT(UNI_N_CLOCK_SPREADING, 0);
-               mdelay(40);
+               struct device_node *clock =
+                       of_find_node_by_path("/uni-n@f8000000/hw-clock");
+               if (clock && get_property(clock, "platform-do-clockspreading",
+                                         NULL)) {
+                       printk(KERN_INFO "%sabling clock spreading on Intrepid"
+                              " ASIC\n", enable ? "En" : "Dis");
+                       if (enable)
+                               UN_OUT(UNI_N_CLOCK_SPREADING, 2);
+                       else
+                               UN_OUT(UNI_N_CLOCK_SPREADING, 0);
+                       mdelay(40);
+               }
+               of_node_put(clock);
        }
 
        while (machine_is_compatible("PowerBook5,2") ||
@@ -1680,6 +1688,8 @@ void pmac_tweak_clock_spreading(int enable)
                        pmac_low_i2c_close(ui2c);
                        break;
                }
+               printk(KERN_INFO "%sabling clock spreading on i2c clock chip\n",
+                      enable ? "En" : "Dis");
                pmac_low_i2c_setmode(ui2c, pmac_low_i2c_mode_stdsub);
                rc = pmac_low_i2c_xfer(ui2c, 0xd2 | pmac_low_i2c_write, 0x80, buffer, 9);
                DBG("write result: %d,", rc);
index 96bd09b098f431876c87778594983f0bf514f85d..a97b0f0727ab15be8ee7678848b5d81ebf282ded 100644 (file)
@@ -138,7 +138,7 @@ static int __kprobes kprobe_handler(struct pt_regs *regs)
                         */
                        save_previous_kprobe(kcb);
                        set_current_kprobe(p, regs, kcb);
-                       p->nmissed++;
+                       kprobes_inc_nmissed_count(p);
                        kcb->kprobe_status = KPROBE_REENTER;
                        prepare_singlestep(p, regs, kcb);
                        return 1;
index f8760a3f43b0f0f6e0402f21089d87e56ba62c29..4567f1eeb4a7d25f8d079aa846a752514e7d6340 100644 (file)
@@ -17,6 +17,8 @@
 #include "uaccess-skas.h"
 #endif
 
+#include "asm/fixmap.h"
+
 #define __under_task_size(addr, size) \
        (((unsigned long) (addr) < TASK_SIZE) && \
          (((unsigned long) (addr) + (size)) < TASK_SIZE))
index f611f83ad4ff815397f1746a10ba2e5656c3d9bc..64516c556cdf98a425b14d4d7c961babc224125d 100644 (file)
@@ -7,7 +7,6 @@
 #define __SKAS_UACCESS_H
 
 #include "asm/errno.h"
-#include "asm/fixmap.h"
 
 /* No SKAS-specific checking. */
 #define access_ok_skas(type, addr, size) 0
index dddeb678b440df5782af858f8db64100082c6f8a..afe11f4fbd1d49d068e7bc3fb64f6d759c342ef1 100644 (file)
@@ -329,7 +329,7 @@ int __kprobes kprobe_handler(struct pt_regs *regs)
                                 */
                                save_previous_kprobe(kcb);
                                set_current_kprobe(p, regs, kcb);
-                               p->nmissed++;
+                               kprobes_inc_nmissed_count(p);
                                prepare_singlestep(p, regs);
                                kcb->kprobe_status = KPROBE_REENTER;
                                return 1;
index 82292b77e5c681b874334913078926106546bb2f..78927c0f155102a01f3acf97b87887819bfc546f 100644 (file)
@@ -316,7 +316,7 @@ static int acpi_pci_link_set(struct acpi_pci_link *link, int irq)
        if (!link || !irq)
                return_VALUE(-EINVAL);
 
-       resource = kmalloc(sizeof(*resource) + 1, GFP_KERNEL);
+       resource = kmalloc(sizeof(*resource) + 1, GFP_ATOMIC);
        if (!resource)
                return_VALUE(-ENOMEM);
 
index a9e33db46e68b5432627835ea1945f02d40d861c..e34104d32637acf4e055d61d2ec52aba78fdac1d 100644 (file)
@@ -1146,7 +1146,6 @@ static int revalidate_allvol(ctlr_info_t *host)
                                del_gendisk(disk);
                        if (q)
                                blk_cleanup_queue(q);
-                       put_disk(disk);
                }
        }
 
@@ -1467,7 +1466,6 @@ static int deregister_disk(struct gendisk *disk, drive_info_struct *drv,
                                del_gendisk(disk);
                        if (q)  
                                blk_cleanup_queue(q);
-                       put_disk(disk); 
                }
        }
 
@@ -3243,7 +3241,6 @@ static void __devexit cciss_remove_one (struct pci_dev *pdev)
                                del_gendisk(disk);
                        if (q)
                                blk_cleanup_queue(q);
-                       put_disk(disk);
                }
        }
 
index 970f70d498f4c814e1cf3362e33d7e23ac53c299..b46a72d782d6ca5d8249dd72e4d4181208799d28 100644 (file)
@@ -943,6 +943,15 @@ config RAW_DRIVER
           Applications should simply open the device (eg /dev/hda1)
           with the O_DIRECT flag.
 
+config MAX_RAW_DEVS
+       int "Maximum number of RAW devices to support (1-8192)"
+       depends on RAW_DRIVER
+       default "256"
+       help
+         The maximum number of RAW devices that are supported.
+         Default is 256. Increase this number in case you need lots of
+         raw devices.
+
 config HPET
        bool "HPET - High Precision Event Timer" if (X86 || IA64)
        default n
@@ -974,15 +983,6 @@ config HPET_MMAP
          exposed to the user.  If this applies to your hardware,
          say N here.
 
-config MAX_RAW_DEVS
-       int "Maximum number of RAW devices to support (1-8192)"
-       depends on RAW_DRIVER
-       default "256"
-       help
-         The maximum number of RAW devices that are supported.
-         Default is 256. Increase this number in case you need lots of
-         raw devices.
-
 config HANGCHECK_TIMER
        tristate "Hangcheck timer"
        depends on X86 || IA64 || PPC64 || ARCH_S390
index 6b302a930e5fad66204630d1fafb4421178b7fdd..1f56b4cf0f589f6622acbdc70da0e1e5a0d520d3 100644 (file)
@@ -2986,7 +2986,7 @@ static void send_panic_events(char *str)
        msg.cmd = 2; /* Platform event command. */
        msg.data = data;
        msg.data_len = 8;
-       data[0] = 0x21; /* Kernel generator ID, IPMI table 5-4 */
+       data[0] = 0x41; /* Kernel generator ID, IPMI table 5-4 */
        data[1] = 0x03; /* This is for IPMI 1.0. */
        data[2] = 0x20; /* OS Critical Stop, IPMI table 36-3 */
        data[4] = 0x6f; /* Sensor specific, IPMI table 36-1 */
index fcdf0fff13a6cc449e431957e061e67d253eefbe..969d2b4aaec06952132d9fc4f516355bcdc38d3b 100644 (file)
@@ -56,6 +56,7 @@ void proc_fork_connector(struct task_struct *task)
        msg = (struct cn_msg*)buffer;
        ev = (struct proc_event*)msg->data;
        get_seq(&msg->seq, &ev->cpu);
+       getnstimestamp(&ev->timestamp);
        ev->what = PROC_EVENT_FORK;
        ev->event_data.fork.parent_pid = task->real_parent->pid;
        ev->event_data.fork.parent_tgid = task->real_parent->tgid;
@@ -81,6 +82,7 @@ void proc_exec_connector(struct task_struct *task)
        msg = (struct cn_msg*)buffer;
        ev = (struct proc_event*)msg->data;
        get_seq(&msg->seq, &ev->cpu);
+       getnstimestamp(&ev->timestamp);
        ev->what = PROC_EVENT_EXEC;
        ev->event_data.exec.process_pid = task->pid;
        ev->event_data.exec.process_tgid = task->tgid;
@@ -114,6 +116,7 @@ void proc_id_connector(struct task_struct *task, int which_id)
        } else
                return;
        get_seq(&msg->seq, &ev->cpu);
+       getnstimestamp(&ev->timestamp);
 
        memcpy(&msg->id, &cn_proc_event_id, sizeof(msg->id));
        msg->ack = 0; /* not used */
@@ -133,6 +136,7 @@ void proc_exit_connector(struct task_struct *task)
        msg = (struct cn_msg*)buffer;
        ev = (struct proc_event*)msg->data;
        get_seq(&msg->seq, &ev->cpu);
+       getnstimestamp(&ev->timestamp);
        ev->what = PROC_EVENT_EXIT;
        ev->event_data.exit.process_pid = task->pid;
        ev->event_data.exit.process_tgid = task->tgid;
@@ -165,6 +169,7 @@ static void cn_proc_ack(int err, int rcvd_seq, int rcvd_ack)
        msg = (struct cn_msg*)buffer;
        ev = (struct proc_event*)msg->data;
        msg->seq = rcvd_seq;
+       getnstimestamp(&ev->timestamp);
        ev->cpu = -1;
        ev->what = PROC_EVENT_NONE;
        ev->event_data.ack.err = err;
index 322c74b2687f4cbe6aa30ec6b3b2a484d937e6f8..80ddf9776bde23c0a85e294e8fa76eef6ac7ee42 100644 (file)
@@ -207,7 +207,7 @@ static struct wf_smu_sys_fans_param wf_smu_sys_all_params[] = {
        },
        /* Model ID 3 */
        {
-               .model_id       = 2,
+               .model_id       = 3,
                .itarget        = 0x350000,
                .gd             = 0x08e00000,
                .gp             = 0x00566666,
@@ -219,7 +219,7 @@ static struct wf_smu_sys_fans_param wf_smu_sys_all_params[] = {
        },
        /* Model ID 5 */
        {
-               .model_id       = 2,
+               .model_id       = 5,
                .itarget        = 0x3a0000,
                .gd             = 0x15400000,
                .gp             = 0x00233333,
index 3066c587b5391202dda91f8e4a9bdc977a4b335a..229d7b20429721f0939fd84d207bff5441127d4b 100644 (file)
@@ -320,7 +320,6 @@ static int raid1_end_write_request(struct bio *bio, unsigned int bytes_done, int
                 * this branch is our 'one mirror IO has finished' event handler:
                 */
                r1_bio->bios[mirror] = NULL;
-               bio_put(bio);
                if (!uptodate) {
                        md_error(r1_bio->mddev, conf->mirrors[mirror].rdev);
                        /* an I/O failed, we can't clear the bitmap */
@@ -377,7 +376,6 @@ static int raid1_end_write_request(struct bio *bio, unsigned int bytes_done, int
                }
                if (test_bit(R1BIO_BehindIO, &r1_bio->state)) {
                        /* free extra copy of the data pages */
-/* FIXME bio has been freed!!! */
                        int i = bio->bi_vcnt;
                        while (i--)
                                __free_page(bio->bi_io_vec[i].bv_page);
@@ -391,6 +389,9 @@ static int raid1_end_write_request(struct bio *bio, unsigned int bytes_done, int
                raid_end_bio_io(r1_bio);
        }
 
+       if (r1_bio->bios[mirror]==NULL)
+               bio_put(bio);
+
        rdev_dec_pending(conf->mirrors[mirror].rdev, conf->mddev);
        return 0;
 }
index 36d5f8ac82650bfb4eda7ddce550b44af2f80ac1..fafc4bc045f79082fe4c2d4d77a09327720af1c8 100644 (file)
@@ -98,7 +98,7 @@ static inline void __release_stripe(raid5_conf_t *conf, struct stripe_head *sh)
                        list_add_tail(&sh->lru, &conf->inactive_list);
                        atomic_dec(&conf->active_stripes);
                        if (!conf->inactive_blocked ||
-                           atomic_read(&conf->active_stripes) < (NR_STRIPES*3/4))
+                           atomic_read(&conf->active_stripes) < (conf->max_nr_stripes*3/4))
                                wake_up(&conf->wait_for_stripe);
                }
        }
@@ -264,7 +264,8 @@ static struct stripe_head *get_active_stripe(raid5_conf_t *conf, sector_t sector
                                conf->inactive_blocked = 1;
                                wait_event_lock_irq(conf->wait_for_stripe,
                                                    !list_empty(&conf->inactive_list) &&
-                                                   (atomic_read(&conf->active_stripes) < (NR_STRIPES *3/4)
+                                                   (atomic_read(&conf->active_stripes)
+                                                    < (conf->max_nr_stripes *3/4)
                                                     || !conf->inactive_blocked),
                                                    conf->device_lock,
                                                    unplug_slaves(conf->mddev);
@@ -1917,7 +1918,7 @@ static int run(mddev_t *mddev)
                        goto abort;
                }
        }
-memory = conf->max_nr_stripes * (sizeof(struct stripe_head) +
+       memory = conf->max_nr_stripes * (sizeof(struct stripe_head) +
                 conf->raid_disks * ((sizeof(struct bio) + PAGE_SIZE))) / 1024;
        if (grow_stripes(conf, conf->max_nr_stripes)) {
                printk(KERN_ERR 
index caebd0a1c021c28745ca089c784f7e35149ae9e9..6a901a0268e174a6cdfde7a4b08aee76ff956fe6 100644 (file)
@@ -1,12 +1,12 @@
 config VIDEO_SAA7146
-        tristate
+       tristate
        select I2C
 
 config VIDEO_SAA7146_VV
-        tristate
+       tristate
        select VIDEO_BUF
        select VIDEO_VIDEOBUF
        select VIDEO_SAA7146
 
 config VIDEO_VIDEOBUF
-        tristate
+       tristate
index 97b4341255ea5bcf9084adde0865b61dcda5daea..bd458cb9b4ea9c972ad13843a2ffabb5cc21f034 100644 (file)
@@ -1,5 +1,5 @@
-saa7146-objs    := saa7146_i2c.o saa7146_core.o 
-saa7146_vv-objs := saa7146_vv_ksyms.o saa7146_fops.o saa7146_video.o saa7146_hlp.o saa7146_vbi.o  
+saa7146-objs    := saa7146_i2c.o saa7146_core.o
+saa7146_vv-objs := saa7146_vv_ksyms.o saa7146_fops.o saa7146_video.o saa7146_hlp.o saa7146_vbi.o
 
 obj-$(CONFIG_VIDEO_SAA7146) += saa7146.o
 obj-$(CONFIG_VIDEO_SAA7146_VV) += saa7146_vv.o
index 7972c73bc14eba1e1c3560a2c072cb28d917e624..97fa3fc571c419d34ec043f56f12863f9ea7132b 100644 (file)
@@ -313,6 +313,7 @@ void ir_input_init(struct input_dev *dev, struct ir_input_state *ir,
        if (ir_codes)
                memcpy(ir->ir_codes, ir_codes, sizeof(ir->ir_codes));
 
+
        dev->keycode     = ir->ir_codes;
        dev->keycodesize = sizeof(IR_KEYTAB_TYPE);
        dev->keycodemax  = IR_KEYTAB_SIZE;
index 206cc2f61f26154bb3f5e1a6b62e888ee74e8065..2899d34e5f7e3249c8be04ea941d2be7bb9af327 100644 (file)
@@ -174,8 +174,8 @@ void saa7146_pgtable_free(struct pci_dev *pci, struct saa7146_pgtable *pt)
 
 int saa7146_pgtable_alloc(struct pci_dev *pci, struct saa7146_pgtable *pt)
 {
-        u32          *cpu;
-        dma_addr_t   dma_addr;
+       u32          *cpu;
+       dma_addr_t   dma_addr;
 
        cpu = pci_alloc_consistent(pci, PAGE_SIZE, &dma_addr);
        if (NULL == cpu) {
@@ -405,7 +405,7 @@ static int saa7146_init_one(struct pci_dev *pci, const struct pci_device_id *ent
 
        pci_set_drvdata(pci, dev);
 
-        init_MUTEX(&dev->lock);
+       init_MUTEX(&dev->lock);
        spin_lock_init(&dev->int_slock);
        spin_lock_init(&dev->slock);
 
index 37888989ea2e36e75b55a9fa22b09947453eee03..09ec964dec5c07742e4afa923c80f7f360762a07 100644 (file)
@@ -1,6 +1,6 @@
 #include <media/saa7146_vv.h>
 
-#define BOARD_CAN_DO_VBI(dev)   (dev->revision != 0 && dev->vv_data->vbi_minor != -1) 
+#define BOARD_CAN_DO_VBI(dev)   (dev->revision != 0 && dev->vv_data->vbi_minor != -1)
 
 /****************************************************************************/
 /* resource management functions, shamelessly stolen from saa7134 driver */
@@ -102,9 +102,9 @@ void saa7146_buffer_finish(struct saa7146_dev *dev,
        /* finish current buffer */
        if (NULL == q->curr) {
                DEB_D(("aiii. no current buffer\n"));
-               return; 
+               return;
        }
-                       
+
        q->curr->vb.state = state;
        do_gettimeofday(&q->curr->vb.ts);
        wake_up(&q->curr->vb.done);
@@ -143,13 +143,13 @@ void saa7146_buffer_next(struct saa7146_dev *dev,
                        // fixme: fix this for vflip != 0
 
                        saa7146_write(dev, PROT_ADDR1, 0);
-                       saa7146_write(dev, MC2, (MASK_02|MASK_18));             
+                       saa7146_write(dev, MC2, (MASK_02|MASK_18));
 
                        /* write the address of the rps-program */
                        saa7146_write(dev, RPS_ADDR0, dev->d_rps0.dma_handle);
                        /* turn on rps */
                        saa7146_write(dev, MC1, (MASK_12 | MASK_28));
-                               
+
 /*
                        printk("vdma%d.base_even:     0x%08x\n", 1,saa7146_read(dev,BASE_EVEN1));
                        printk("vdma%d.base_odd:      0x%08x\n", 1,saa7146_read(dev,BASE_ODD1));
@@ -246,7 +246,7 @@ static int fops_open(struct inode *inode, struct file *file)
                goto out;
        }
        memset(fh,0,sizeof(*fh));
-       
+
        file->private_data = fh;
        fh->dev = dev;
        fh->type = type;
@@ -275,7 +275,7 @@ out:
                file->private_data = NULL;
        }
        up(&saa7146_devices_lock);
-        return result;
+       return result;
 }
 
 static int fops_release(struct inode *inode, struct file *file)
@@ -405,7 +405,7 @@ static struct file_operations video_fops =
 static void vv_callback(struct saa7146_dev *dev, unsigned long status)
 {
        u32 isr = status;
-       
+
        DEB_INT(("dev:%p, isr:0x%08x\n",dev,(u32)status));
 
        if (0 != (isr & (MASK_27))) {
@@ -454,11 +454,11 @@ int saa7146_vv_init(struct saa7146_dev* dev, struct saa7146_ext_vv *ext_vv)
           handle different devices that might need different
           configuration data) */
        dev->ext_vv_data = ext_vv;
-       
+
        vv->video_minor = -1;
        vv->vbi_minor = -1;
 
-       vv->d_clipping.cpu_addr = pci_alloc_consistent(dev->pci, SAA7146_CLIPPING_MEM, &vv->d_clipping.dma_handle);     
+       vv->d_clipping.cpu_addr = pci_alloc_consistent(dev->pci, SAA7146_CLIPPING_MEM, &vv->d_clipping.dma_handle);
        if( NULL == vv->d_clipping.cpu_addr ) {
                ERR(("out of memory. aborting.\n"));
                kfree(vv);
@@ -468,7 +468,7 @@ int saa7146_vv_init(struct saa7146_dev* dev, struct saa7146_ext_vv *ext_vv)
 
        saa7146_video_uops.init(dev,vv);
        saa7146_vbi_uops.init(dev,vv);
-       
+
        dev->vv_data = vv;
        dev->vv_callback = &vv_callback;
 
@@ -480,12 +480,12 @@ int saa7146_vv_release(struct saa7146_dev* dev)
        struct saa7146_vv *vv = dev->vv_data;
 
        DEB_EE(("dev:%p\n",dev));
+
        pci_free_consistent(dev->pci, SAA7146_RPS_MEM, vv->d_clipping.cpu_addr, vv->d_clipping.dma_handle);
-       kfree(vv);
+       kfree(vv);
        dev->vv_data = NULL;
        dev->vv_callback = NULL;
-       
+
        return 0;
 }
 
@@ -498,7 +498,7 @@ int saa7146_register_device(struct video_device **vid, struct saa7146_dev* dev,
        DEB_EE(("dev:%p, name:'%s', type:%d\n",dev,name,type));
 
        // released by vfd->release
-       vfd = video_device_alloc();
+       vfd = video_device_alloc();
        if (vfd == NULL)
                return -ENOMEM;
 
@@ -530,7 +530,7 @@ int saa7146_register_device(struct video_device **vid, struct saa7146_dev* dev,
 int saa7146_unregister_device(struct video_device **vid, struct saa7146_dev* dev)
 {
        struct saa7146_vv *vv = dev->vv_data;
-       
+
        DEB_EE(("dev:%p\n",dev));
 
        if( VFL_TYPE_GRABBER == (*vid)->type ) {
index fec6beab8c2873d95715f67a38b4d20bc97d04c9..8aabdd8fb3c53a5b928fa78ff3e1a3b9d9fd19c1 100644 (file)
@@ -276,8 +276,8 @@ int saa7146_i2c_transfer(struct saa7146_dev *dev, const struct i2c_msg *msgs, in
        int i = 0, count = 0;
        u32* buffer = dev->d_i2c.cpu_addr;
        int err = 0;
-        int address_err = 0;
-        int short_delay = 0;
+       int address_err = 0;
+       int short_delay = 0;
 
        if (down_interruptible (&dev->i2c_lock))
                return -ERESTARTSYS;
@@ -325,7 +325,7 @@ int saa7146_i2c_transfer(struct saa7146_dev *dev, const struct i2c_msg *msgs, in
                                        if( 0 != (SAA7146_USE_I2C_IRQ & dev->ext->flags)) {
                                                goto out;
                                        }
-                                       address_err++;
+                                       address_err++;
                                }
                                DEB_I2C(("error while sending message(s). starting again.\n"));
                                break;
@@ -336,14 +336,14 @@ int saa7146_i2c_transfer(struct saa7146_dev *dev, const struct i2c_msg *msgs, in
                        break;
                }
 
-               /* delay a bit before retrying */
-               msleep(10);
+               /* delay a bit before retrying */
+               msleep(10);
 
        } while (err != num && retries--);
 
-        /* if every retry had an address error, exit right away */
-        if (address_err == retries) {
-               goto out;
+       /* if every retry had an address error, exit right away */
+       if (address_err == retries) {
+               goto out;
        }
 
        /* if any things had to be read, get the results */
index cb86a97fda1faad89cfd12a3f40527803913c7a7..063986ec16b51752868cf1d8440875202327aac7 100644 (file)
@@ -6,8 +6,8 @@ static int vbi_workaround(struct saa7146_dev *dev)
 {
        struct saa7146_vv *vv = dev->vv_data;
 
-        u32          *cpu;
-        dma_addr_t   dma_addr;
+       u32          *cpu;
+       dma_addr_t   dma_addr;
 
        int count = 0;
        int i;
index 8dd4d15ca36d8f038531eacda23af1925a202cba..1d961023b837c973852225cc0ba621205d4651ed 100644 (file)
@@ -150,23 +150,23 @@ static int try_win(struct saa7146_dev *dev, struct v4l2_window *win)
        maxh  = vv->standard->v_max_out;
 
        if (V4L2_FIELD_ANY == field) {
-                field = (win->w.height > maxh/2)
-                        ? V4L2_FIELD_INTERLACED
-                        : V4L2_FIELD_TOP;
-               }
-        switch (field) {
-        case V4L2_FIELD_TOP:
-        case V4L2_FIELD_BOTTOM:
-        case V4L2_FIELD_ALTERNATE:
-                maxh = maxh / 2;
-                break;
-        case V4L2_FIELD_INTERLACED:
-                break;
-        default: {
+               field = (win->w.height > maxh/2)
+                       ? V4L2_FIELD_INTERLACED
+                       : V4L2_FIELD_TOP;
+               }
+       switch (field) {
+       case V4L2_FIELD_TOP:
+       case V4L2_FIELD_BOTTOM:
+       case V4L2_FIELD_ALTERNATE:
+               maxh = maxh / 2;
+               break;
+       case V4L2_FIELD_INTERLACED:
+               break;
+       default: {
                DEB_D(("no known field mode '%d'.\n",field));
-                return -EINVAL;
+               return -EINVAL;
+       }
        }
-        }
 
        win->field = field;
        if (win->w.width > maxw)
@@ -887,7 +887,7 @@ int saa7146_video_do_ioctl(struct inode *inode, struct file *file, unsigned int
 
                DEB_EE(("VIDIOC_QUERYCAP\n"));
 
-                strcpy(cap->driver, "saa7146 v4l2");
+               strcpy(cap->driver, "saa7146 v4l2");
                strlcpy(cap->card, dev->ext->name, sizeof(cap->card));
                sprintf(cap->bus_info,"PCI:%s", pci_name(dev->pci));
                cap->version = SAA7146_VERSION_CODE;
@@ -1011,19 +1011,19 @@ int saa7146_video_do_ioctl(struct inode *inode, struct file *file, unsigned int
                err = set_control(fh,arg);
                return err;
        }
-        case VIDIOC_G_PARM:
-        {
-                struct v4l2_streamparm *parm = arg;
+       case VIDIOC_G_PARM:
+       {
+               struct v4l2_streamparm *parm = arg;
                if( parm->type != V4L2_BUF_TYPE_VIDEO_CAPTURE ) {
                        return -EINVAL;
                }
-                memset(&parm->parm.capture,0,sizeof(struct v4l2_captureparm));
+               memset(&parm->parm.capture,0,sizeof(struct v4l2_captureparm));
                parm->parm.capture.readbuffers = 1;
                // fixme: only for PAL!
                parm->parm.capture.timeperframe.numerator = 1;
                parm->parm.capture.timeperframe.denominator = 25;
-                return 0;
-        }
+               return 0;
+       }
        case VIDIOC_G_FMT:
        {
                struct v4l2_format *f = arg;
@@ -1383,7 +1383,7 @@ static struct videobuf_queue_ops video_qops = {
 
 static void video_init(struct saa7146_dev *dev, struct saa7146_vv *vv)
 {
-        INIT_LIST_HEAD(&vv->video_q.queue);
+       INIT_LIST_HEAD(&vv->video_q.queue);
 
        init_timer(&vv->video_q.timeout);
        vv->video_q.timeout.function = saa7146_buffer_timeout;
index a94912ac1872797384b53f3f4a1e4cba24e476a8..344a3c898460768057e8efdf649ed5b0d937537c 100644 (file)
@@ -132,7 +132,7 @@ int flexcop_eeprom_check_mac_addr(struct flexcop_device *fc, int extended);
  * I2C-channel of the flexcop.
  */
 int flexcop_i2c_request(struct flexcop_device*, flexcop_access_op_t,
-                       flexcop_i2c_port_t, u8 chipaddr, u8 addr, u8 *buf, u16 len);
+                       flexcop_i2c_port_t, u8 chipaddr, u8 addr, u8 *buf, u16 len);
 
 /* from flexcop-sram.c */
 int flexcop_sram_set_dest(struct flexcop_device *fc, flexcop_sram_dest_t dest, flexcop_sram_dest_target_t target);
index a35330315f6597f4019026ca11649f0584bec1c3..21a9045b3ef6f1358cea5d823ed86dfb7553ba05 100644 (file)
@@ -298,7 +298,7 @@ static int flexcop_fe_request_firmware(struct dvb_frontend* fe, const struct fir
 }
 
 static int lgdt3303_pll_set(struct dvb_frontend* fe,
-                            struct dvb_frontend_parameters* params)
+                           struct dvb_frontend_parameters* params)
 {
        struct flexcop_device *fc = fe->dvb->priv;
        u8 buf[4];
@@ -332,7 +332,7 @@ static int lgdt3303_pll_set(struct dvb_frontend* fe,
                        return -EREMOTEIO;
        }
 
-        return 0;
+       return 0;
 }
 
 static struct lgdt330x_config air2pc_atsc_hd5000_config = {
index 2e398090cf63e1e70d3af43aee7b9079862aa760..77977e9c013e7d1e1bfd0b157a5f461e9418502b 100644 (file)
@@ -556,9 +556,9 @@ static int tdvs_tua6034_pll_set(struct dvb_frontend* fe, struct dvb_frontend_par
        dprintk("%s: tuner at 0x%02x bytes: 0x%02x 0x%02x 0x%02x 0x%02x\n",
                __FUNCTION__, msg.addr, buf[0],buf[1],buf[2],buf[3]);
        if ((err = i2c_transfer(card->i2c_adapter, &msg, 1)) != 1) {
-               printk(KERN_WARNING "dvb-bt8xx: %s error "
-                       "(addr %02x <- %02x, err = %i)\n",
-                       __FUNCTION__, buf[0], buf[1], err);
+               printk(KERN_WARNING "dvb-bt8xx: %s error "
+                       "(addr %02x <- %02x, err = %i)\n",
+                       __FUNCTION__, buf[0], buf[1], err);
                if (err < 0)
                        return err;
                else
index 7d7b0067f2281740f4e3393687744742ccbb948b..9f025825b2d2ca816940254fbd3fb8f4dcf9145a 100644 (file)
@@ -86,25 +86,25 @@ enum dmx_success {
 
 enum dmx_ts_pes
 {  /* also send packets to decoder (if it exists) */
-        DMX_TS_PES_AUDIO0,
+       DMX_TS_PES_AUDIO0,
        DMX_TS_PES_VIDEO0,
        DMX_TS_PES_TELETEXT0,
        DMX_TS_PES_SUBTITLE0,
        DMX_TS_PES_PCR0,
 
-        DMX_TS_PES_AUDIO1,
+       DMX_TS_PES_AUDIO1,
        DMX_TS_PES_VIDEO1,
        DMX_TS_PES_TELETEXT1,
        DMX_TS_PES_SUBTITLE1,
        DMX_TS_PES_PCR1,
 
-        DMX_TS_PES_AUDIO2,
+       DMX_TS_PES_AUDIO2,
        DMX_TS_PES_VIDEO2,
        DMX_TS_PES_TELETEXT2,
        DMX_TS_PES_SUBTITLE2,
        DMX_TS_PES_PCR2,
 
-        DMX_TS_PES_AUDIO3,
+       DMX_TS_PES_AUDIO3,
        DMX_TS_PES_VIDEO3,
        DMX_TS_PES_TELETEXT3,
        DMX_TS_PES_SUBTITLE3,
@@ -121,17 +121,17 @@ enum dmx_ts_pes
 
 
 struct dmx_ts_feed {
-        int is_filtering; /* Set to non-zero when filtering in progress */
-        struct dmx_demux *parent; /* Back-pointer */
-        void *priv; /* Pointer to private data of the API client */
-        int (*set) (struct dmx_ts_feed *feed,
+       int is_filtering; /* Set to non-zero when filtering in progress */
+       struct dmx_demux *parent; /* Back-pointer */
+       void *priv; /* Pointer to private data of the API client */
+       int (*set) (struct dmx_ts_feed *feed,
                    u16 pid,
                    int type,
                    enum dmx_ts_pes pes_type,
                    size_t circular_buffer_size,
                    struct timespec timeout);
-        int (*start_filtering) (struct dmx_ts_feed* feed);
-        int (*stop_filtering) (struct dmx_ts_feed* feed);
+       int (*start_filtering) (struct dmx_ts_feed* feed);
+       int (*stop_filtering) (struct dmx_ts_feed* feed);
 };
 
 /*--------------------------------------------------------------------------*/
@@ -139,35 +139,35 @@ struct dmx_ts_feed {
 /*--------------------------------------------------------------------------*/
 
 struct dmx_section_filter {
-        u8 filter_value [DMX_MAX_FILTER_SIZE];
-        u8 filter_mask [DMX_MAX_FILTER_SIZE];
-        u8 filter_mode [DMX_MAX_FILTER_SIZE];
-        struct dmx_section_feed* parent; /* Back-pointer */
-        void* priv; /* Pointer to private data of the API client */
+       u8 filter_value [DMX_MAX_FILTER_SIZE];
+       u8 filter_mask [DMX_MAX_FILTER_SIZE];
+       u8 filter_mode [DMX_MAX_FILTER_SIZE];
+       struct dmx_section_feed* parent; /* Back-pointer */
+       void* priv; /* Pointer to private data of the API client */
 };
 
 struct dmx_section_feed {
-        int is_filtering; /* Set to non-zero when filtering in progress */
-        struct dmx_demux* parent; /* Back-pointer */
-        void* priv; /* Pointer to private data of the API client */
+       int is_filtering; /* Set to non-zero when filtering in progress */
+       struct dmx_demux* parent; /* Back-pointer */
+       void* priv; /* Pointer to private data of the API client */
 
-        int check_crc;
+       int check_crc;
        u32 crc_val;
 
-        u8 *secbuf;
-        u8 secbuf_base[DMX_MAX_SECFEED_SIZE];
-        u16 secbufp, seclen, tsfeedp;
+       u8 *secbuf;
+       u8 secbuf_base[DMX_MAX_SECFEED_SIZE];
+       u16 secbufp, seclen, tsfeedp;
 
-        int (*set) (struct dmx_section_feed* feed,
+       int (*set) (struct dmx_section_feed* feed,
                    u16 pid,
                    size_t circular_buffer_size,
                    int check_crc);
-        int (*allocate_filter) (struct dmx_section_feed* feed,
+       int (*allocate_filter) (struct dmx_section_feed* feed,
                                struct dmx_section_filter** filter);
-        int (*release_filter) (struct dmx_section_feed* feed,
+       int (*release_filter) (struct dmx_section_feed* feed,
                               struct dmx_section_filter* filter);
-        int (*start_filtering) (struct dmx_section_feed* feed);
-        int (*stop_filtering) (struct dmx_section_feed* feed);
+       int (*start_filtering) (struct dmx_section_feed* feed);
+       int (*stop_filtering) (struct dmx_section_feed* feed);
 };
 
 /*--------------------------------------------------------------------------*/
@@ -205,10 +205,10 @@ enum dmx_frontend_source {
 };
 
 struct dmx_frontend {
-        struct list_head connectivity_list; /* List of front-ends that can
+       struct list_head connectivity_list; /* List of front-ends that can
                                               be connected to a particular
                                               demux */
-        enum dmx_frontend_source source;
+       enum dmx_frontend_source source;
 };
 
 /*--------------------------------------------------------------------------*/
@@ -240,38 +240,38 @@ struct dmx_frontend {
 #define DMX_FE_ENTRY(list) list_entry(list, struct dmx_frontend, connectivity_list)
 
 struct dmx_demux {
-        u32 capabilities;            /* Bitfield of capability flags */
-        struct dmx_frontend* frontend;    /* Front-end connected to the demux */
-        void* priv;                  /* Pointer to private data of the API client */
-        int (*open) (struct dmx_demux* demux);
-        int (*close) (struct dmx_demux* demux);
-        int (*write) (struct dmx_demux* demux, const char* buf, size_t count);
-        int (*allocate_ts_feed) (struct dmx_demux* demux,
+       u32 capabilities;            /* Bitfield of capability flags */
+       struct dmx_frontend* frontend;    /* Front-end connected to the demux */
+       void* priv;                  /* Pointer to private data of the API client */
+       int (*open) (struct dmx_demux* demux);
+       int (*close) (struct dmx_demux* demux);
+       int (*write) (struct dmx_demux* demux, const char* buf, size_t count);
+       int (*allocate_ts_feed) (struct dmx_demux* demux,
                                 struct dmx_ts_feed** feed,
                                 dmx_ts_cb callback);
-        int (*release_ts_feed) (struct dmx_demux* demux,
+       int (*release_ts_feed) (struct dmx_demux* demux,
                                struct dmx_ts_feed* feed);
-        int (*allocate_section_feed) (struct dmx_demux* demux,
+       int (*allocate_section_feed) (struct dmx_demux* demux,
                                      struct dmx_section_feed** feed,
                                      dmx_section_cb callback);
-        int (*release_section_feed) (struct dmx_demux* demux,
+       int (*release_section_feed) (struct dmx_demux* demux,
                                     struct dmx_section_feed* feed);
-        int (*add_frontend) (struct dmx_demux* demux,
+       int (*add_frontend) (struct dmx_demux* demux,
                             struct dmx_frontend* frontend);
-        int (*remove_frontend) (struct dmx_demux* demux,
+       int (*remove_frontend) (struct dmx_demux* demux,
                                struct dmx_frontend* frontend);
-        struct list_head* (*get_frontends) (struct dmx_demux* demux);
-        int (*connect_frontend) (struct dmx_demux* demux,
+       struct list_head* (*get_frontends) (struct dmx_demux* demux);
+       int (*connect_frontend) (struct dmx_demux* demux,
                                 struct dmx_frontend* frontend);
-        int (*disconnect_frontend) (struct dmx_demux* demux);
+       int (*disconnect_frontend) (struct dmx_demux* demux);
 
-        int (*get_pes_pids) (struct dmx_demux* demux, u16 *pids);
+       int (*get_pes_pids) (struct dmx_demux* demux, u16 *pids);
 
        int (*get_caps) (struct dmx_demux* demux, struct dmx_caps *caps);
 
        int (*set_source) (struct dmx_demux* demux, const dmx_source_t *src);
 
-        int (*get_stc) (struct dmx_demux* demux, unsigned int num,
+       int (*get_stc) (struct dmx_demux* demux, unsigned int num,
                        u64 *stc, unsigned int *base);
 };
 
index 8028c3a5e287c8a5abe8a42b73984545df911506..7b8373ad121b051cccbcbd675ca32e4f9d16efaa 100644 (file)
@@ -947,7 +947,7 @@ static int dvb_demux_do_ioctl(struct inode *inode, struct file *file,
 
        case DMX_GET_STC:
                if (!dmxdev->demux->get_stc) {
-                       ret=-EINVAL;
+                       ret=-EINVAL;
                        break;
                }
                ret = dmxdev->demux->get_stc(dmxdev->demux,
index 395a9cd75012c148bb0142adcaeb2e9dd67b1931..fd72920c21998586cab856d1796f543460d2968d 100644 (file)
@@ -53,51 +53,51 @@ enum dmxdev_state {
 };
 
 struct dmxdev_buffer {
-        u8 *data;
-        int size;
-        int pread;
-        int pwrite;
+       u8 *data;
+       int size;
+       int pread;
+       int pwrite;
        wait_queue_head_t queue;
-        int error;
+       int error;
 };
 
 struct dmxdev_filter {
        struct dvb_device *dvbdev;
 
-        union {
-               struct dmx_section_filter *sec;
+       union {
+               struct dmx_section_filter *sec;
        } filter;
 
-        union {
-                struct dmx_ts_feed *ts;
-                struct dmx_section_feed *sec;
+       union {
+               struct dmx_ts_feed *ts;
+               struct dmx_section_feed *sec;
        } feed;
 
-        union {
-               struct dmx_sct_filter_params sec;
-               struct dmx_pes_filter_params pes;
+       union {
+               struct dmx_sct_filter_params sec;
+               struct dmx_pes_filter_params pes;
        } params;
 
-        int type;
-        enum dmxdev_state state;
-        struct dmxdev *dev;
-        struct dmxdev_buffer buffer;
+       int type;
+       enum dmxdev_state state;
+       struct dmxdev *dev;
+       struct dmxdev_buffer buffer;
 
        struct semaphore mutex;
 
-        /* only for sections */
-        struct timer_list timer;
-        int todo;
-        u8 secheader[3];
+       /* only for sections */
+       struct timer_list timer;
+       int todo;
+       u8 secheader[3];
 
-        u16 pid;
+       u16 pid;
 };
 
 
 struct dmxdev_dvr {
-        int state;
-        struct dmxdev *dev;
-        struct dmxdev_buffer buffer;
+       int state;
+       struct dmxdev *dev;
+       struct dmxdev_buffer buffer;
 };
 
 
@@ -105,16 +105,16 @@ struct dmxdev {
        struct dvb_device *dvbdev;
        struct dvb_device *dvr_dvbdev;
 
-        struct dmxdev_filter *filter;
-        struct dmxdev_dvr *dvr;
-        struct dmx_demux *demux;
+       struct dmxdev_filter *filter;
+       struct dmxdev_dvr *dvr;
+       struct dmx_demux *demux;
 
-        int filternum;
-        int capabilities;
+       int filternum;
+       int capabilities;
 #define DMXDEV_CAP_DUPLEX 1
-        struct dmx_frontend *dvr_orig_fe;
+       struct dmx_frontend *dvr_orig_fe;
 
-        struct dmxdev_buffer dvr_buffer;
+       struct dmxdev_buffer dvr_buffer;
 #define DVR_BUFFER_SIZE (10*188*1024)
 
        struct semaphore mutex;
index cb2e7d6ba2836c5ca2549b020dbae71770edc3a4..5956c35d34accd234cf1cf5ecf4bc0fdd0a2f12f 100644 (file)
@@ -498,7 +498,7 @@ static int dvb_ca_en50221_parse_attributes(struct dvb_ca_private *ca, int slot)
        /* process the CFTABLE_ENTRY tuples, and any after those */
        while ((!end_chain) && (address < 0x1000)) {
                if ((status = dvb_ca_en50221_read_tuple(ca, slot, &address, &tupleType,
-                                                       &tupleLength, tuple)) < 0)
+                                                       &tupleLength, tuple)) < 0)
                        return status;
                switch (tupleType) {
                case 0x1B:      // CISTPL_CFTABLE_ENTRY
index bd5143906084dea1eb1b26ab5ee29553a2363a25..c49fd0bd7181dd89a2c67d73a891e5073cde6e9f 100644 (file)
@@ -72,12 +72,12 @@ static int read_picture_header(u8 *headr, struct mpg_picture *pic, int field, in
        u8 pct;
 
        if (pr) printk( "Pic header: ");
-        pic->temporal_reference[field] = (( headr[0] << 2 ) |
+       pic->temporal_reference[field] = (( headr[0] << 2 ) |
                                          (headr[1] & 0x03) )& 0x03ff;
        if (pr) printk( " temp ref: 0x%04x", pic->temporal_reference[field]);
 
        pct = ( headr[1] >> 2 ) & 0x07;
-        pic->picture_coding_type[field] = pct;
+       pic->picture_coding_type[field] = pct;
        if (pr) {
                switch(pct){
                        case I_FRAME:
@@ -93,17 +93,17 @@ static int read_picture_header(u8 *headr, struct mpg_picture *pic, int field, in
        }
 
 
-        pic->vinfo.vbv_delay  = (( headr[1] >> 5 ) | ( headr[2] << 3) |
+       pic->vinfo.vbv_delay  = (( headr[1] >> 5 ) | ( headr[2] << 3) |
                                 ( (headr[3] & 0x1F) << 11) ) & 0xffff;
 
        if (pr) printk( " vbv delay: 0x%04x", pic->vinfo.vbv_delay);
 
-        pic->picture_header_parameter = ( headr[3] & 0xe0 ) |
+       pic->picture_header_parameter = ( headr[3] & 0xe0 ) |
                ((headr[4] & 0x80) >> 3);
 
-        if ( pct == B_FRAME ){
-                pic->picture_header_parameter |= ( headr[4] >> 3 ) & 0x0f;
-        }
+       if ( pct == B_FRAME ){
+               pic->picture_header_parameter |= ( headr[4] >> 3 ) & 0x0f;
+       }
        if (pr) printk( " pic head param: 0x%x",
                        pic->picture_header_parameter);
 
@@ -124,18 +124,18 @@ static int read_gop_header(u8 *headr, struct mpg_picture *pic, int pr)
                       ((headr[0]<<4)& 0x30)| ((headr[1]>>4)& 0x0F),
                       ((headr[1]<<3)& 0x38)| ((headr[2]>>5)& 0x0F));
 
-        if ( ( headr[3] & 0x40 ) != 0 ){
-                pic->closed_gop = 1;
-        } else {
-                pic->closed_gop = 0;
-        }
+       if ( ( headr[3] & 0x40 ) != 0 ){
+               pic->closed_gop = 1;
+       } else {
+               pic->closed_gop = 0;
+       }
        if (pr) printk("closed: %d", pic->closed_gop);
 
-        if ( ( headr[3] & 0x20 ) != 0 ){
-                pic->broken_link = 1;
-        } else {
-                pic->broken_link = 0;
-        }
+       if ( ( headr[3] & 0x20 ) != 0 ){
+               pic->broken_link = 1;
+       } else {
+               pic->broken_link = 0;
+       }
        if (pr) printk(" broken: %d\n", pic->broken_link);
 
        return 0;
@@ -146,7 +146,7 @@ static int read_gop_header(u8 *headr, struct mpg_picture *pic, int pr)
 /* needs 8 byte input */
 static int read_sequence_header(u8 *headr, struct dvb_video_info *vi, int pr)
 {
-        int sw;
+       int sw;
        int form = -1;
 
        if (pr) printk("Reading sequence header\n");
@@ -154,9 +154,9 @@ static int read_sequence_header(u8 *headr, struct dvb_video_info *vi, int pr)
        vi->horizontal_size     = ((headr[1] &0xF0) >> 4) | (headr[0] << 4);
        vi->vertical_size       = ((headr[1] &0x0F) << 8) | (headr[2]);
 
-        sw = (int)((headr[3]&0xF0) >> 4) ;
+       sw = (int)((headr[3]&0xF0) >> 4) ;
 
-        switch( sw ){
+       switch( sw ){
        case 1:
                if (pr)
                        printk("Videostream: ASPECT: 1:1");
@@ -165,84 +165,84 @@ static int read_sequence_header(u8 *headr, struct dvb_video_info *vi, int pr)
        case 2:
                if (pr)
                        printk("Videostream: ASPECT: 4:3");
-                vi->aspect_ratio = 133;
+               vi->aspect_ratio = 133;
                break;
        case 3:
                if (pr)
                        printk("Videostream: ASPECT: 16:9");
-                vi->aspect_ratio = 177;
+               vi->aspect_ratio = 177;
                break;
        case 4:
                if (pr)
                        printk("Videostream: ASPECT: 2.21:1");
-                vi->aspect_ratio = 221;
+               vi->aspect_ratio = 221;
                break;
 
-        case 5 ... 15:
+       case 5 ... 15:
                if (pr)
                        printk("Videostream: ASPECT: reserved");
-                vi->aspect_ratio = 0;
+               vi->aspect_ratio = 0;
                break;
 
-        default:
-                vi->aspect_ratio = 0;
-                return -1;
+       default:
+               vi->aspect_ratio = 0;
+               return -1;
        }
 
        if (pr)
                printk("  Size = %dx%d",vi->horizontal_size,vi->vertical_size);
 
-        sw = (int)(headr[3]&0x0F);
+       sw = (int)(headr[3]&0x0F);
 
-        switch ( sw ) {
+       switch ( sw ) {
        case 1:
                if (pr)
                        printk("  FRate: 23.976 fps");
-                vi->framerate = 23976;
+               vi->framerate = 23976;
                form = -1;
                break;
        case 2:
                if (pr)
                        printk("  FRate: 24 fps");
-                vi->framerate = 24000;
+               vi->framerate = 24000;
                form = -1;
                break;
        case 3:
                if (pr)
                        printk("  FRate: 25 fps");
-                vi->framerate = 25000;
+               vi->framerate = 25000;
                form = VIDEO_MODE_PAL;
                break;
        case 4:
                if (pr)
                        printk("  FRate: 29.97 fps");
-                vi->framerate = 29970;
+               vi->framerate = 29970;
                form = VIDEO_MODE_NTSC;
                break;
        case 5:
                if (pr)
                        printk("  FRate: 30 fps");
-                vi->framerate = 30000;
+               vi->framerate = 30000;
                form = VIDEO_MODE_NTSC;
                break;
        case 6:
                if (pr)
                        printk("  FRate: 50 fps");
-                vi->framerate = 50000;
+               vi->framerate = 50000;
                form = VIDEO_MODE_PAL;
                break;
        case 7:
                if (pr)
                        printk("  FRate: 60 fps");
-                vi->framerate = 60000;
+               vi->framerate = 60000;
                form = VIDEO_MODE_NTSC;
                break;
        }
 
        vi->bit_rate = (headr[4] << 10) | (headr[5] << 2) | (headr[6] & 0x03);
 
-        vi->vbv_buffer_size
-                = (( headr[6] & 0xF8) >> 3 ) | (( headr[7] & 0x1F )<< 5);
+       vi->vbv_buffer_size
+               = (( headr[6] & 0xF8) >> 3 ) | (( headr[7] & 0x1F )<< 5);
 
        if (pr){
                printk("  BRate: %d Mbit/s",4*(vi->bit_rate)/10000);
@@ -250,7 +250,7 @@ static int read_sequence_header(u8 *headr, struct dvb_video_info *vi, int pr)
                printk("\n");
        }
 
-        vi->video_format = form;
+       vi->video_format = form;
 
        return 0;
 }
@@ -308,7 +308,7 @@ static int get_ainfo(u8 *mbuf, int count, struct dvb_audio_info *ai, int pr)
        if (!found) return -1;
 
        if (c+3 >= count) return -1;
-        headr = mbuf+c;
+       headr = mbuf+c;
 
        ai->layer = (headr[1] & 0x06) >> 1;
 
@@ -368,7 +368,7 @@ int dvb_filter_get_ac3info(u8 *mbuf, int count, struct dvb_audio_info *ai, int p
        if (c+5 >= count) return -1;
 
        ai->layer = 0;  // 0 for AC3
-        headr = mbuf+c+2;
+       headr = mbuf+c+2;
 
        frame = (headr[2]&0x3f);
        ai->bit_rate = ac3_bitrates[frame >> 1]*1000;
@@ -396,159 +396,159 @@ EXPORT_SYMBOL(dvb_filter_get_ac3info);
 #if 0
 static u8 *skip_pes_header(u8 **bufp)
 {
-        u8 *inbuf = *bufp;
-        u8 *buf = inbuf;
-        u8 *pts = NULL;
-        int skip = 0;
+       u8 *inbuf = *bufp;
+       u8 *buf = inbuf;
+       u8 *pts = NULL;
+       int skip = 0;
 
        static const int mpeg1_skip_table[16] = {
                1, 0xffff,      5,     10, 0xffff, 0xffff, 0xffff, 0xffff,
-               0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff
+               0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff
        };
 
 
-        if ((inbuf[6] & 0xc0) == 0x80){ /* mpeg2 */
-                if (buf[7] & PTS_ONLY)
-                        pts = buf+9;
-                else pts = NULL;
-                buf = inbuf + 9 + inbuf[8];
-        } else {        /* mpeg1 */
-                for (buf = inbuf + 6; *buf == 0xff; buf++)
-                        if (buf == inbuf + 6 + 16) {
-                                break;
-                        }
-                if ((*buf & 0xc0) == 0x40)
-                        buf += 2;
-                skip = mpeg1_skip_table [*buf >> 4];
-                if (skip == 5 || skip == 10) pts = buf;
-                else pts = NULL;
-
-                buf += mpeg1_skip_table [*buf >> 4];
-        }
-
-        *bufp = buf;
-        return pts;
+       if ((inbuf[6] & 0xc0) == 0x80){ /* mpeg2 */
+               if (buf[7] & PTS_ONLY)
+                       pts = buf+9;
+               else pts = NULL;
+               buf = inbuf + 9 + inbuf[8];
+       } else {        /* mpeg1 */
+               for (buf = inbuf + 6; *buf == 0xff; buf++)
+                       if (buf == inbuf + 6 + 16) {
+                               break;
+                       }
+               if ((*buf & 0xc0) == 0x40)
+                       buf += 2;
+               skip = mpeg1_skip_table [*buf >> 4];
+               if (skip == 5 || skip == 10) pts = buf;
+               else pts = NULL;
+
+               buf += mpeg1_skip_table [*buf >> 4];
+       }
+
+       *bufp = buf;
+       return pts;
 }
 #endif
 
 #if 0
 static void initialize_quant_matrix( u32 *matrix )
 {
-        int i;
-
-        matrix[0]  = 0x08101013;
-        matrix[1]  = 0x10131616;
-        matrix[2]  = 0x16161616;
-        matrix[3]  = 0x1a181a1b;
-        matrix[4]  = 0x1b1b1a1a;
-        matrix[5]  = 0x1a1a1b1b;
-        matrix[6]  = 0x1b1d1d1d;
-        matrix[7]  = 0x2222221d;
-        matrix[8]  = 0x1d1d1b1b;
-        matrix[9]  = 0x1d1d2020;
-        matrix[10] = 0x22222526;
-        matrix[11] = 0x25232322;
-        matrix[12] = 0x23262628;
-        matrix[13] = 0x28283030;
-        matrix[14] = 0x2e2e3838;
-        matrix[15] = 0x3a454553;
-
-        for ( i = 16 ; i < 32 ; i++ )
-                matrix[i] = 0x10101010;
+       int i;
+
+       matrix[0]  = 0x08101013;
+       matrix[1]  = 0x10131616;
+       matrix[2]  = 0x16161616;
+       matrix[3]  = 0x1a181a1b;
+       matrix[4]  = 0x1b1b1a1a;
+       matrix[5]  = 0x1a1a1b1b;
+       matrix[6]  = 0x1b1d1d1d;
+       matrix[7]  = 0x2222221d;
+       matrix[8]  = 0x1d1d1b1b;
+       matrix[9]  = 0x1d1d2020;
+       matrix[10] = 0x22222526;
+       matrix[11] = 0x25232322;
+       matrix[12] = 0x23262628;
+       matrix[13] = 0x28283030;
+       matrix[14] = 0x2e2e3838;
+       matrix[15] = 0x3a454553;
+
+       for ( i = 16 ; i < 32 ; i++ )
+               matrix[i] = 0x10101010;
 }
 #endif
 
 #if 0
 static void initialize_mpg_picture(struct mpg_picture *pic)
 {
-        int i;
-
-        /* set MPEG1 */
-        pic->mpeg1_flag = 1;
-        pic->profile_and_level = 0x4A ;        /* MP@LL */
-        pic->progressive_sequence = 1;
-        pic->low_delay = 0;
-
-        pic->sequence_display_extension_flag = 0;
-        for ( i = 0 ; i < 4 ; i++ ){
-                pic->frame_centre_horizontal_offset[i] = 0;
-                pic->frame_centre_vertical_offset[i] = 0;
-        }
-        pic->last_frame_centre_horizontal_offset = 0;
-        pic->last_frame_centre_vertical_offset = 0;
-
-        pic->picture_display_extension_flag[0] = 0;
-        pic->picture_display_extension_flag[1] = 0;
-        pic->sequence_header_flag = 0;
+       int i;
+
+       /* set MPEG1 */
+       pic->mpeg1_flag = 1;
+       pic->profile_and_level = 0x4A ;        /* MP@LL */
+       pic->progressive_sequence = 1;
+       pic->low_delay = 0;
+
+       pic->sequence_display_extension_flag = 0;
+       for ( i = 0 ; i < 4 ; i++ ){
+               pic->frame_centre_horizontal_offset[i] = 0;
+               pic->frame_centre_vertical_offset[i] = 0;
+       }
+       pic->last_frame_centre_horizontal_offset = 0;
+       pic->last_frame_centre_vertical_offset = 0;
+
+       pic->picture_display_extension_flag[0] = 0;
+       pic->picture_display_extension_flag[1] = 0;
+       pic->sequence_header_flag = 0;
        pic->gop_flag = 0;
-        pic->sequence_end_flag = 0;
+       pic->sequence_end_flag = 0;
 }
 #endif
 
 #if 0
 static void mpg_set_picture_parameter( int32_t field_type, struct mpg_picture *pic )
 {
-        int16_t last_h_offset;
-        int16_t last_v_offset;
-
-        int16_t *p_h_offset;
-        int16_t *p_v_offset;
-
-        if ( pic->mpeg1_flag ){
-                pic->picture_structure[field_type] = VIDEO_FRAME_PICTURE;
-                pic->top_field_first = 0;
-                pic->repeat_first_field = 0;
-                pic->progressive_frame = 1;
-                pic->picture_coding_parameter = 0x000010;
-        }
-
-        /* Reset flag */
-        pic->picture_display_extension_flag[field_type] = 0;
-
-        last_h_offset = pic->last_frame_centre_horizontal_offset;
-        last_v_offset = pic->last_frame_centre_vertical_offset;
-        if ( field_type == FIRST_FIELD ){
-                p_h_offset = pic->frame_centre_horizontal_offset;
-                p_v_offset = pic->frame_centre_vertical_offset;
-                *p_h_offset = last_h_offset;
-                *(p_h_offset + 1) = last_h_offset;
-                *(p_h_offset + 2) = last_h_offset;
-                *p_v_offset = last_v_offset;
-                *(p_v_offset + 1) = last_v_offset;
-                *(p_v_offset + 2) = last_v_offset;
-        } else {
-                pic->frame_centre_horizontal_offset[3] = last_h_offset;
-                pic->frame_centre_vertical_offset[3] = last_v_offset;
-        }
+       int16_t last_h_offset;
+       int16_t last_v_offset;
+
+       int16_t *p_h_offset;
+       int16_t *p_v_offset;
+
+       if ( pic->mpeg1_flag ){
+               pic->picture_structure[field_type] = VIDEO_FRAME_PICTURE;
+               pic->top_field_first = 0;
+               pic->repeat_first_field = 0;
+               pic->progressive_frame = 1;
+               pic->picture_coding_parameter = 0x000010;
+       }
+
+       /* Reset flag */
+       pic->picture_display_extension_flag[field_type] = 0;
+
+       last_h_offset = pic->last_frame_centre_horizontal_offset;
+       last_v_offset = pic->last_frame_centre_vertical_offset;
+       if ( field_type == FIRST_FIELD ){
+               p_h_offset = pic->frame_centre_horizontal_offset;
+               p_v_offset = pic->frame_centre_vertical_offset;
+               *p_h_offset = last_h_offset;
+               *(p_h_offset + 1) = last_h_offset;
+               *(p_h_offset + 2) = last_h_offset;
+               *p_v_offset = last_v_offset;
+               *(p_v_offset + 1) = last_v_offset;
+               *(p_v_offset + 2) = last_v_offset;
+       } else {
+               pic->frame_centre_horizontal_offset[3] = last_h_offset;
+               pic->frame_centre_vertical_offset[3] = last_v_offset;
+       }
 }
 #endif
 
 #if 0
 static void init_mpg_picture( struct mpg_picture *pic, int chan, int32_t field_type)
 {
-        pic->picture_header = 0;
-        pic->sequence_header_data
-                = ( INIT_HORIZONTAL_SIZE << 20 )
-                        | ( INIT_VERTICAL_SIZE << 8 )
-                        | ( INIT_ASPECT_RATIO << 4 )
-                        | ( INIT_FRAME_RATE );
-        pic->mpeg1_flag = 0;
-        pic->vinfo.horizontal_size
-                = INIT_DISP_HORIZONTAL_SIZE;
-        pic->vinfo.vertical_size
-                = INIT_DISP_VERTICAL_SIZE;
-        pic->picture_display_extension_flag[field_type]
-                = 0;
-        pic->pts_flag[field_type] = 0;
-
-        pic->sequence_gop_header = 0;
-        pic->picture_header = 0;
-        pic->sequence_header_flag = 0;
-        pic->gop_flag = 0;
-        pic->sequence_end_flag = 0;
-        pic->sequence_display_extension_flag = 0;
-        pic->last_frame_centre_horizontal_offset = 0;
-        pic->last_frame_centre_vertical_offset = 0;
+       pic->picture_header = 0;
+       pic->sequence_header_data
+               = ( INIT_HORIZONTAL_SIZE << 20 )
+                       | ( INIT_VERTICAL_SIZE << 8 )
+                       | ( INIT_ASPECT_RATIO << 4 )
+                       | ( INIT_FRAME_RATE );
+       pic->mpeg1_flag = 0;
+       pic->vinfo.horizontal_size
+               = INIT_DISP_HORIZONTAL_SIZE;
+       pic->vinfo.vertical_size
+               = INIT_DISP_VERTICAL_SIZE;
+       pic->picture_display_extension_flag[field_type]
+               = 0;
+       pic->pts_flag[field_type] = 0;
+
+       pic->sequence_gop_header = 0;
+       pic->picture_header = 0;
+       pic->sequence_header_flag = 0;
+       pic->gop_flag = 0;
+       pic->sequence_end_flag = 0;
+       pic->sequence_display_extension_flag = 0;
+       pic->last_frame_centre_horizontal_offset = 0;
+       pic->last_frame_centre_vertical_offset = 0;
        pic->channel = chan;
 }
 #endif
@@ -588,11 +588,11 @@ int dvb_filter_pes2ts(struct dvb_filter_pes2ts *p2ts, unsigned char *pes,
                buf[1]&=~0x40;
        }
        if (!len)
-               return 0;
+               return 0;
        buf[3]=0x30|((p2ts->cc++)&0x0f);
        rest=183-len;
        if (rest) {
-               buf[5]=0x00;
+               buf[5]=0x00;
                if (rest-1)
                        memset(buf+6, 0xff, rest-1);
        }
index b0848f7836b746026421df1c3e290c0b185c88bc..375e3be184b1afc54bacb55ad951948e819ed1c9 100644 (file)
@@ -29,8 +29,8 @@ typedef int (dvb_filter_pes2ts_cb_t) (void *, unsigned char *);
 
 struct dvb_filter_pes2ts {
        unsigned char buf[188];
-        unsigned char cc;
-        dvb_filter_pes2ts_cb_t *cb;
+       unsigned char cc;
+       dvb_filter_pes2ts_cb_t *cb;
        void *priv;
 };
 
@@ -162,7 +162,7 @@ struct dvb_video_info {
        u32 bit_rate;
        u32 comp_bit_rate;
        u32 vbv_buffer_size;
-        s16 vbv_delay;
+       s16 vbv_delay;
        u32 CSPF;
        u32 off;
 };
@@ -173,60 +173,60 @@ struct dvb_video_info {
 #define VIDEO_FRAME_PICTURE 0x03
 
 struct mpg_picture {
-        int       channel;
+       int       channel;
        struct dvb_video_info vinfo;
-        u32      *sequence_gop_header;
-        u32      *picture_header;
-        s32       time_code;
-        int       low_delay;
-        int       closed_gop;
-        int       broken_link;
-        int       sequence_header_flag;
-        int       gop_flag;
-        int       sequence_end_flag;
-
-        u8        profile_and_level;
-        s32       picture_coding_parameter;
-        u32       matrix[32];
-        s8        matrix_change_flag;
-
-        u8        picture_header_parameter;
+       u32      *sequence_gop_header;
+       u32      *picture_header;
+       s32       time_code;
+       int       low_delay;
+       int       closed_gop;
+       int       broken_link;
+       int       sequence_header_flag;
+       int       gop_flag;
+       int       sequence_end_flag;
+
+       u8        profile_and_level;
+       s32       picture_coding_parameter;
+       u32       matrix[32];
+       s8        matrix_change_flag;
+
+       u8        picture_header_parameter;
   /* bit 0 - 2: bwd f code
      bit 3    : fpb vector
      bit 4 - 6: fwd f code
      bit 7    : fpf vector */
 
-        int       mpeg1_flag;
-        int       progressive_sequence;
-        int       sequence_display_extension_flag;
-        u32       sequence_header_data;
-        s16       last_frame_centre_horizontal_offset;
-        s16       last_frame_centre_vertical_offset;
-
-        u32       pts[2]; /* [0] 1st field, [1] 2nd field */
-        int       top_field_first;
-        int       repeat_first_field;
-        int       progressive_frame;
-        int       bank;
-        int       forward_bank;
-        int       backward_bank;
-        int       compress;
-        s16       frame_centre_horizontal_offset[OFF_SIZE];
-                  /* [0-2] 1st field, [3] 2nd field */
-        s16       frame_centre_vertical_offset[OFF_SIZE];
-                  /* [0-2] 1st field, [3] 2nd field */
-        s16       temporal_reference[2];
-                  /* [0] 1st field, [1] 2nd field */
-
-        s8        picture_coding_type[2];
-                  /* [0] 1st field, [1] 2nd field */
-        s8        picture_structure[2];
-                  /* [0] 1st field, [1] 2nd field */
-        s8        picture_display_extension_flag[2];
-                  /* [0] 1st field, [1] 2nd field */
-                  /* picture_display_extenion() 0:no 1:exit*/
-        s8        pts_flag[2];
-                  /* [0] 1st field, [1] 2nd field */
+       int       mpeg1_flag;
+       int       progressive_sequence;
+       int       sequence_display_extension_flag;
+       u32       sequence_header_data;
+       s16       last_frame_centre_horizontal_offset;
+       s16       last_frame_centre_vertical_offset;
+
+       u32       pts[2]; /* [0] 1st field, [1] 2nd field */
+       int       top_field_first;
+       int       repeat_first_field;
+       int       progressive_frame;
+       int       bank;
+       int       forward_bank;
+       int       backward_bank;
+       int       compress;
+       s16       frame_centre_horizontal_offset[OFF_SIZE];
+                 /* [0-2] 1st field, [3] 2nd field */
+       s16       frame_centre_vertical_offset[OFF_SIZE];
+                 /* [0-2] 1st field, [3] 2nd field */
+       s16       temporal_reference[2];
+                 /* [0] 1st field, [1] 2nd field */
+
+       s8        picture_coding_type[2];
+                 /* [0] 1st field, [1] 2nd field */
+       s8        picture_structure[2];
+                 /* [0] 1st field, [1] 2nd field */
+       s8        picture_display_extension_flag[2];
+                 /* [0] 1st field, [1] 2nd field */
+                 /* picture_display_extenion() 0:no 1:exit*/
+       s8        pts_flag[2];
+                 /* [0] 1st field, [1] 2nd field */
 };
 
 struct dvb_audio_info {
index 6ffa6b2163631117661d16c7a7f540d79b3ee8b6..95ea5095e07e07ae0ecb5d46240aaa297d7b7442 100644 (file)
@@ -372,10 +372,10 @@ static int dvb_frontend_thread(void *data)
 
        snprintf (name, sizeof(name), "kdvb-fe-%i", fe->dvb->num);
 
-        lock_kernel();
-        daemonize(name);
-        sigfillset(&current->blocked);
-        unlock_kernel();
+       lock_kernel();
+       daemonize(name);
+       sigfillset(&current->blocked);
+       unlock_kernel();
 
        fepriv->status = 0;
        dvb_frontend_init(fe);
index 348c9b0b988aeab22245fd58ae369ae91b88fdaf..1e0840d02f1f5e0307cbd7b9cc1d9eabc53c7f56 100644 (file)
 #include "dvbdev.h"
 
 struct dvb_frontend_tune_settings {
-        int min_delay_ms;
-        int step_size;
-        int max_drift;
-        struct dvb_frontend_parameters parameters;
+       int min_delay_ms;
+       int step_size;
+       int max_drift;
+       struct dvb_frontend_parameters parameters;
 };
 
 struct dvb_frontend;
index df536bd2e103b85690645511753fd0b83a29aab8..86bba81e851e0efe9eeed9b06979493328439dcc 100644 (file)
@@ -713,7 +713,7 @@ static int dvb_net_ts_callback(const u8 *buffer1, size_t buffer1_len,
        if (buffer1_len > 32768)
                printk(KERN_WARNING "length > 32k: %zu.\n", buffer1_len);
        /* printk("TS callback: %u bytes, %u TS cells @ %p.\n",
-                 buffer1_len, buffer1_len / TS_SZ, buffer1); */
+                 buffer1_len, buffer1_len / TS_SZ, buffer1); */
        dvb_net_ule(dev, buffer1, buffer1_len);
        return 0;
 }
@@ -721,8 +721,8 @@ static int dvb_net_ts_callback(const u8 *buffer1, size_t buffer1_len,
 
 static void dvb_net_sec(struct net_device *dev, u8 *pkt, int pkt_len)
 {
-        u8 *eth;
-        struct sk_buff *skb;
+       u8 *eth;
+       struct sk_buff *skb;
        struct net_device_stats *stats = &(((struct dvb_net_priv *) dev->priv)->stats);
        int snap = 0;
 
@@ -754,7 +754,7 @@ static void dvb_net_sec(struct net_device *dev, u8 *pkt, int pkt_len)
                        return;
                }
                snap = 8;
-        }
+       }
        if (pkt[7]) {
                /* FIXME: assemble datagram from multiple sections */
                stats->rx_errors++;
@@ -778,14 +778,14 @@ static void dvb_net_sec(struct net_device *dev, u8 *pkt, int pkt_len)
        memcpy(eth + 14, pkt + 12 + snap, pkt_len - 12 - 4 - snap);
 
        /* create ethernet header: */
-        eth[0]=pkt[0x0b];
-        eth[1]=pkt[0x0a];
-        eth[2]=pkt[0x09];
-        eth[3]=pkt[0x08];
-        eth[4]=pkt[0x04];
-        eth[5]=pkt[0x03];
+       eth[0]=pkt[0x0b];
+       eth[1]=pkt[0x0a];
+       eth[2]=pkt[0x09];
+       eth[3]=pkt[0x08];
+       eth[4]=pkt[0x04];
+       eth[5]=pkt[0x03];
 
-        eth[6]=eth[7]=eth[8]=eth[9]=eth[10]=eth[11]=0;
+       eth[6]=eth[7]=eth[8]=eth[9]=eth[10]=eth[11]=0;
 
        if (snap) {
                eth[12] = pkt[18];
@@ -807,7 +807,7 @@ static void dvb_net_sec(struct net_device *dev, u8 *pkt, int pkt_len)
 
        stats->rx_packets++;
        stats->rx_bytes+=skb->len;
-        netif_rx(skb);
+       netif_rx(skb);
 }
 
 static int dvb_net_sec_callback(const u8 *buffer1, size_t buffer1_len,
@@ -815,7 +815,7 @@ static int dvb_net_sec_callback(const u8 *buffer1, size_t buffer1_len,
                 struct dmx_section_filter *filter,
                 enum dmx_success success)
 {
-        struct net_device *dev = filter->priv;
+       struct net_device *dev = filter->priv;
 
        /**
         * we rely on the DVB API definition where exactly one complete
@@ -885,8 +885,8 @@ static int dvb_net_feed_start(struct net_device *dev)
 {
        int ret = 0, i;
        struct dvb_net_priv *priv = dev->priv;
-        struct dmx_demux *demux = priv->demux;
-        unsigned char *mac = (unsigned char *) dev->dev_addr;
+       struct dmx_demux *demux = priv->demux;
+       unsigned char *mac = (unsigned char *) dev->dev_addr;
 
        dprintk("%s: rx_mode %i\n", __FUNCTION__, priv->rx_mode);
        down(&priv->mutex);
@@ -1129,12 +1129,12 @@ static int dvb_net_stop(struct net_device *dev)
        struct dvb_net_priv *priv = dev->priv;
 
        priv->in_use--;
-        return dvb_net_feed_stop(dev);
+       return dvb_net_feed_stop(dev);
 }
 
 static struct net_device_stats * dvb_net_get_stats(struct net_device *dev)
 {
-        return &((struct dvb_net_priv*) dev->priv)->stats;
+       return &((struct dvb_net_priv*) dev->priv)->stats;
 }
 
 static void dvb_net_setup(struct net_device *dev)
@@ -1360,10 +1360,10 @@ static struct file_operations dvb_net_fops = {
 };
 
 static struct dvb_device dvbdev_net = {
-        .priv = NULL,
-        .users = 1,
-        .writers = 1,
-        .fops = &dvb_net_fops,
+       .priv = NULL,
+       .users = 1,
+       .writers = 1,
+       .fops = &dvb_net_fops,
 };
 
 
index fb6d94a69d71f3290814bb73611e12d790345f81..283c6e9339a4651b5b6c954e124d7e38025a1d0a 100644 (file)
 
 void dvb_ringbuffer_init(struct dvb_ringbuffer *rbuf, void *data, size_t len)
 {
-        rbuf->pread=rbuf->pwrite=0;
-        rbuf->data=data;
-        rbuf->size=len;
+       rbuf->pread=rbuf->pwrite=0;
+       rbuf->data=data;
+       rbuf->size=len;
 
-        init_waitqueue_head(&rbuf->queue);
+       init_waitqueue_head(&rbuf->queue);
 
-        spin_lock_init(&(rbuf->lock));
+       spin_lock_init(&(rbuf->lock));
 }
 
 
 
 int dvb_ringbuffer_empty(struct dvb_ringbuffer *rbuf)
 {
-        return (rbuf->pread==rbuf->pwrite);
+       return (rbuf->pread==rbuf->pwrite);
 }
 
 
 
 ssize_t dvb_ringbuffer_free(struct dvb_ringbuffer *rbuf)
 {
-        ssize_t free;
+       ssize_t free;
 
-        free = rbuf->pread - rbuf->pwrite;
-        if (free <= 0)
-                free += rbuf->size;
-        return free-1;
+       free = rbuf->pread - rbuf->pwrite;
+       if (free <= 0)
+               free += rbuf->size;
+       return free-1;
 }
 
 
 
 ssize_t dvb_ringbuffer_avail(struct dvb_ringbuffer *rbuf)
 {
-        ssize_t avail;
+       ssize_t avail;
 
-        avail = rbuf->pwrite - rbuf->pread;
-        if (avail < 0)
-                avail += rbuf->size;
-        return avail;
+       avail = rbuf->pwrite - rbuf->pread;
+       if (avail < 0)
+               avail += rbuf->size;
+       return avail;
 }
 
 
 
 void dvb_ringbuffer_flush(struct dvb_ringbuffer *rbuf)
 {
-        rbuf->pread = rbuf->pwrite;
+       rbuf->pread = rbuf->pwrite;
 }
 
 
 
 void dvb_ringbuffer_flush_spinlock_wakeup(struct dvb_ringbuffer *rbuf)
 {
-        unsigned long flags;
+       unsigned long flags;
 
-        spin_lock_irqsave(&rbuf->lock, flags);
-        dvb_ringbuffer_flush(rbuf);
-        spin_unlock_irqrestore(&rbuf->lock, flags);
+       spin_lock_irqsave(&rbuf->lock, flags);
+       dvb_ringbuffer_flush(rbuf);
+       spin_unlock_irqrestore(&rbuf->lock, flags);
 
-        wake_up(&rbuf->queue);
+       wake_up(&rbuf->queue);
 }
 
 
 
 ssize_t dvb_ringbuffer_read(struct dvb_ringbuffer *rbuf, u8 *buf, size_t len, int usermem)
 {
-        size_t todo = len;
-        size_t split;
-
-        split = (rbuf->pread + len > rbuf->size) ? rbuf->size - rbuf->pread : 0;
-        if (split > 0) {
-                if (!usermem)
-                        memcpy(buf, rbuf->data+rbuf->pread, split);
-                else
-                        if (copy_to_user(buf, rbuf->data+rbuf->pread, split))
-                                return -EFAULT;
-                buf += split;
-                todo -= split;
-                rbuf->pread = 0;
-        }
-        if (!usermem)
-                memcpy(buf, rbuf->data+rbuf->pread, todo);
-        else
-                if (copy_to_user(buf, rbuf->data+rbuf->pread, todo))
-                        return -EFAULT;
-
-        rbuf->pread = (rbuf->pread + todo) % rbuf->size;
-
-        return len;
+       size_t todo = len;
+       size_t split;
+
+       split = (rbuf->pread + len > rbuf->size) ? rbuf->size - rbuf->pread : 0;
+       if (split > 0) {
+               if (!usermem)
+                       memcpy(buf, rbuf->data+rbuf->pread, split);
+               else
+                       if (copy_to_user(buf, rbuf->data+rbuf->pread, split))
+                               return -EFAULT;
+               buf += split;
+               todo -= split;
+               rbuf->pread = 0;
+       }
+       if (!usermem)
+               memcpy(buf, rbuf->data+rbuf->pread, todo);
+       else
+               if (copy_to_user(buf, rbuf->data+rbuf->pread, todo))
+                       return -EFAULT;
+
+       rbuf->pread = (rbuf->pread + todo) % rbuf->size;
+
+       return len;
 }
 
 
 
 ssize_t dvb_ringbuffer_write(struct dvb_ringbuffer *rbuf, const u8 *buf, size_t len)
 {
-        size_t todo = len;
-        size_t split;
+       size_t todo = len;
+       size_t split;
 
-        split = (rbuf->pwrite + len > rbuf->size) ? rbuf->size - rbuf->pwrite : 0;
+       split = (rbuf->pwrite + len > rbuf->size) ? rbuf->size - rbuf->pwrite : 0;
 
-        if (split > 0) {
-                memcpy(rbuf->data+rbuf->pwrite, buf, split);
-                buf += split;
-                todo -= split;
-                rbuf->pwrite = 0;
-        }
-        memcpy(rbuf->data+rbuf->pwrite, buf, todo);
-        rbuf->pwrite = (rbuf->pwrite + todo) % rbuf->size;
+       if (split > 0) {
+               memcpy(rbuf->data+rbuf->pwrite, buf, split);
+               buf += split;
+               todo -= split;
+               rbuf->pwrite = 0;
+       }
+       memcpy(rbuf->data+rbuf->pwrite, buf, todo);
+       rbuf->pwrite = (rbuf->pwrite + todo) % rbuf->size;
 
-        return len;
+       return len;
 }
 
 ssize_t dvb_ringbuffer_pkt_write(struct dvb_ringbuffer *rbuf, u8* buf, size_t len)
 {
-        int status;
-        ssize_t oldpwrite = rbuf->pwrite;
+       int status;
+       ssize_t oldpwrite = rbuf->pwrite;
 
-        DVB_RINGBUFFER_WRITE_BYTE(rbuf, len >> 8);
-        DVB_RINGBUFFER_WRITE_BYTE(rbuf, len & 0xff);
-        DVB_RINGBUFFER_WRITE_BYTE(rbuf, PKT_READY);
-        status = dvb_ringbuffer_write(rbuf, buf, len);
+       DVB_RINGBUFFER_WRITE_BYTE(rbuf, len >> 8);
+       DVB_RINGBUFFER_WRITE_BYTE(rbuf, len & 0xff);
+       DVB_RINGBUFFER_WRITE_BYTE(rbuf, PKT_READY);
+       status = dvb_ringbuffer_write(rbuf, buf, len);
 
-        if (status < 0) rbuf->pwrite = oldpwrite;
-        return status;
+       if (status < 0) rbuf->pwrite = oldpwrite;
+       return status;
 }
 
 ssize_t dvb_ringbuffer_pkt_read(struct dvb_ringbuffer *rbuf, size_t idx,
-                                int offset, u8* buf, size_t len, int usermem)
+                               int offset, u8* buf, size_t len, int usermem)
 {
-        size_t todo;
-        size_t split;
-        size_t pktlen;
-
-        pktlen = rbuf->data[idx] << 8;
-        pktlen |= rbuf->data[(idx + 1) % rbuf->size];
-        if (offset > pktlen) return -EINVAL;
-        if ((offset + len) > pktlen) len = pktlen - offset;
-
-        idx = (idx + DVB_RINGBUFFER_PKTHDRSIZE + offset) % rbuf->size;
-        todo = len;
-        split = ((idx + len) > rbuf->size) ? rbuf->size - idx : 0;
-        if (split > 0) {
-                if (!usermem)
-                        memcpy(buf, rbuf->data+idx, split);
-                else
-                        if (copy_to_user(buf, rbuf->data+idx, split))
-                                return -EFAULT;
-                buf += split;
-                todo -= split;
-                idx = 0;
-        }
-        if (!usermem)
-                memcpy(buf, rbuf->data+idx, todo);
-        else
-                if (copy_to_user(buf, rbuf->data+idx, todo))
-                        return -EFAULT;
-
-        return len;
+       size_t todo;
+       size_t split;
+       size_t pktlen;
+
+       pktlen = rbuf->data[idx] << 8;
+       pktlen |= rbuf->data[(idx + 1) % rbuf->size];
+       if (offset > pktlen) return -EINVAL;
+       if ((offset + len) > pktlen) len = pktlen - offset;
+
+       idx = (idx + DVB_RINGBUFFER_PKTHDRSIZE + offset) % rbuf->size;
+       todo = len;
+       split = ((idx + len) > rbuf->size) ? rbuf->size - idx : 0;
+       if (split > 0) {
+               if (!usermem)
+                       memcpy(buf, rbuf->data+idx, split);
+               else
+                       if (copy_to_user(buf, rbuf->data+idx, split))
+                               return -EFAULT;
+               buf += split;
+               todo -= split;
+               idx = 0;
+       }
+       if (!usermem)
+               memcpy(buf, rbuf->data+idx, todo);
+       else
+               if (copy_to_user(buf, rbuf->data+idx, todo))
+                       return -EFAULT;
+
+       return len;
 }
 
 void dvb_ringbuffer_pkt_dispose(struct dvb_ringbuffer *rbuf, size_t idx)
 {
-        size_t pktlen;
-
-        rbuf->data[(idx + 2) % rbuf->size] = PKT_DISPOSED;
-
-        // clean up disposed packets
-        while(dvb_ringbuffer_avail(rbuf) > DVB_RINGBUFFER_PKTHDRSIZE) {
-                if (DVB_RINGBUFFER_PEEK(rbuf, 2) == PKT_DISPOSED) {
-                        pktlen = DVB_RINGBUFFER_PEEK(rbuf, 0) << 8;
-                        pktlen |= DVB_RINGBUFFER_PEEK(rbuf, 1);
-                        DVB_RINGBUFFER_SKIP(rbuf, pktlen + DVB_RINGBUFFER_PKTHDRSIZE);
-                } else {
-                        // first packet is not disposed, so we stop cleaning now
-                        break;
-                }
-        }
+       size_t pktlen;
+
+       rbuf->data[(idx + 2) % rbuf->size] = PKT_DISPOSED;
+
+       // clean up disposed packets
+       while(dvb_ringbuffer_avail(rbuf) > DVB_RINGBUFFER_PKTHDRSIZE) {
+               if (DVB_RINGBUFFER_PEEK(rbuf, 2) == PKT_DISPOSED) {
+                       pktlen = DVB_RINGBUFFER_PEEK(rbuf, 0) << 8;
+                       pktlen |= DVB_RINGBUFFER_PEEK(rbuf, 1);
+                       DVB_RINGBUFFER_SKIP(rbuf, pktlen + DVB_RINGBUFFER_PKTHDRSIZE);
+               } else {
+                       // first packet is not disposed, so we stop cleaning now
+                       break;
+               }
+       }
 }
 
 ssize_t dvb_ringbuffer_pkt_next(struct dvb_ringbuffer *rbuf, size_t idx, size_t* pktlen)
 {
-        int consumed;
-        int curpktlen;
-        int curpktstatus;
+       int consumed;
+       int curpktlen;
+       int curpktstatus;
 
-        if (idx == -1) {
+       if (idx == -1) {
               idx = rbuf->pread;
        } else {
-                curpktlen = rbuf->data[idx] << 8;
-                curpktlen |= rbuf->data[(idx + 1) % rbuf->size];
-               idx = (idx + curpktlen + DVB_RINGBUFFER_PKTHDRSIZE) % rbuf->size;
+               curpktlen = rbuf->data[idx] << 8;
+               curpktlen |= rbuf->data[(idx + 1) % rbuf->size];
+               idx = (idx + curpktlen + DVB_RINGBUFFER_PKTHDRSIZE) % rbuf->size;
        }
 
-        consumed = (idx - rbuf->pread) % rbuf->size;
+       consumed = (idx - rbuf->pread) % rbuf->size;
 
-        while((dvb_ringbuffer_avail(rbuf) - consumed) > DVB_RINGBUFFER_PKTHDRSIZE) {
+       while((dvb_ringbuffer_avail(rbuf) - consumed) > DVB_RINGBUFFER_PKTHDRSIZE) {
 
-                curpktlen = rbuf->data[idx] << 8;
-                curpktlen |= rbuf->data[(idx + 1) % rbuf->size];
-                curpktstatus = rbuf->data[(idx + 2) % rbuf->size];
+               curpktlen = rbuf->data[idx] << 8;
+               curpktlen |= rbuf->data[(idx + 1) % rbuf->size];
+               curpktstatus = rbuf->data[(idx + 2) % rbuf->size];
 
-                if (curpktstatus == PKT_READY) {
-                        *pktlen = curpktlen;
-                        return idx;
-                }
+               if (curpktstatus == PKT_READY) {
+                       *pktlen = curpktlen;
+                       return idx;
+               }
 
-                consumed += curpktlen + DVB_RINGBUFFER_PKTHDRSIZE;
-                idx = (idx + curpktlen + DVB_RINGBUFFER_PKTHDRSIZE) % rbuf->size;
-        }
+               consumed += curpktlen + DVB_RINGBUFFER_PKTHDRSIZE;
+               idx = (idx + curpktlen + DVB_RINGBUFFER_PKTHDRSIZE) % rbuf->size;
+       }
 
-        // no packets available
-        return -1;
+       // no packets available
+       return -1;
 }
 
 
index d18e9c4ba9ea31a476c18908738035d495c4d96b..fa476f662f82c453da2028ca8267fee6b6ae11f8 100644 (file)
 #include <linux/wait.h>
 
 struct dvb_ringbuffer {
-        u8               *data;
-        ssize_t           size;
-        ssize_t           pread;
-        ssize_t           pwrite;
+       u8               *data;
+       ssize_t           size;
+       ssize_t           pread;
+       ssize_t           pwrite;
 
-        wait_queue_head_t queue;
-        spinlock_t        lock;
+       wait_queue_head_t queue;
+       spinlock_t        lock;
 };
 
 #define DVB_RINGBUFFER_PKTHDRSIZE 3
@@ -106,7 +106,7 @@ extern void dvb_ringbuffer_flush_spinlock_wakeup(struct dvb_ringbuffer *rbuf);
 ** returns number of bytes transferred or -EFAULT
 */
 extern ssize_t dvb_ringbuffer_read(struct dvb_ringbuffer *rbuf, u8 *buf,
-                                   size_t len, int usermem);
+                                  size_t len, int usermem);
 
 
 /* write routines & macros */
@@ -121,7 +121,7 @@ extern ssize_t dvb_ringbuffer_read(struct dvb_ringbuffer *rbuf, u8 *buf,
 ** returns number of bytes transferred or -EFAULT
 */
 extern ssize_t dvb_ringbuffer_write(struct dvb_ringbuffer *rbuf, const u8 *buf,
-                                    size_t len);
+                                   size_t len);
 
 
 /**
@@ -133,7 +133,7 @@ extern ssize_t dvb_ringbuffer_write(struct dvb_ringbuffer *rbuf, const u8 *buf,
  * returns Number of bytes written, or -EFAULT, -ENOMEM, -EVINAL.
  */
 extern ssize_t dvb_ringbuffer_pkt_write(struct dvb_ringbuffer *rbuf, u8* buf,
-                                        size_t len);
+                                       size_t len);
 
 /**
  * Read from a packet in the ringbuffer. Note: unlike dvb_ringbuffer_read(), this
@@ -149,7 +149,7 @@ extern ssize_t dvb_ringbuffer_pkt_write(struct dvb_ringbuffer *rbuf, u8* buf,
  * returns Number of bytes read, or -EFAULT.
  */
 extern ssize_t dvb_ringbuffer_pkt_read(struct dvb_ringbuffer *rbuf, size_t idx,
-                                       int offset, u8* buf, size_t len, int usermem);
+                                      int offset, u8* buf, size_t len, int usermem);
 
 /**
  * Dispose of a packet in the ring buffer.
index 477b4fa56430ab3c4305561277d489aafec1ef0e..a4aee8665854f49691e2f695b6803fa792a80b33 100644 (file)
@@ -47,7 +47,7 @@ static LIST_HEAD(dvb_adapter_list);
 static DECLARE_MUTEX(dvbdev_register_lock);
 
 static const char * const dnames[] = {
-        "video", "audio", "sec", "frontend", "demux", "dvr", "ca",
+       "video", "audio", "sec", "frontend", "demux", "dvr", "ca",
        "net", "osd"
 };
 
@@ -90,15 +90,15 @@ static int dvb_device_open(struct inode *inode, struct file *file)
 
                file->private_data = dvbdev;
                old_fops = file->f_op;
-                file->f_op = fops_get(dvbdev->fops);
-                if(file->f_op->open)
-                        err = file->f_op->open(inode,file);
-                if (err) {
-                        fops_put(file->f_op);
-                        file->f_op = fops_get(old_fops);
-                }
-                fops_put(old_fops);
-                return err;
+               file->f_op = fops_get(dvbdev->fops);
+               if(file->f_op->open)
+                       err = file->f_op->open(inode,file);
+               if (err) {
+                       fops_put(file->f_op);
+                       file->f_op = fops_get(old_fops);
+               }
+               fops_put(old_fops);
+               return err;
        }
        return -ENODEV;
 }
@@ -117,21 +117,21 @@ static struct cdev dvb_device_cdev = {
 
 int dvb_generic_open(struct inode *inode, struct file *file)
 {
-        struct dvb_device *dvbdev = file->private_data;
+       struct dvb_device *dvbdev = file->private_data;
 
-        if (!dvbdev)
-                return -ENODEV;
+       if (!dvbdev)
+               return -ENODEV;
 
        if (!dvbdev->users)
-                return -EBUSY;
+               return -EBUSY;
 
        if ((file->f_flags & O_ACCMODE) == O_RDONLY) {
-                if (!dvbdev->readers)
-                       return -EBUSY;
+               if (!dvbdev->readers)
+                       return -EBUSY;
                dvbdev->readers--;
        } else {
-                if (!dvbdev->writers)
-                       return -EBUSY;
+               if (!dvbdev->writers)
+                       return -EBUSY;
                dvbdev->writers--;
        }
 
@@ -143,10 +143,10 @@ EXPORT_SYMBOL(dvb_generic_open);
 
 int dvb_generic_release(struct inode *inode, struct file *file)
 {
-        struct dvb_device *dvbdev = file->private_data;
+       struct dvb_device *dvbdev = file->private_data;
 
        if (!dvbdev)
-                return -ENODEV;
+               return -ENODEV;
 
        if ((file->f_flags & O_ACCMODE) == O_RDONLY) {
                dvbdev->readers++;
@@ -163,10 +163,10 @@ EXPORT_SYMBOL(dvb_generic_release);
 int dvb_generic_ioctl(struct inode *inode, struct file *file,
                      unsigned int cmd, unsigned long arg)
 {
-        struct dvb_device *dvbdev = file->private_data;
+       struct dvb_device *dvbdev = file->private_data;
 
-        if (!dvbdev)
-               return -ENODEV;
+       if (!dvbdev)
+               return -ENODEV;
 
        if (!dvbdev->kernel_ioctl)
                return -EINVAL;
@@ -334,63 +334,63 @@ EXPORT_SYMBOL(dvb_unregister_adapter);
    to the v4l "videodev.o" module, which is unnecessary for some
    cards (ie. the budget dvb-cards don't need the v4l module...) */
 int dvb_usercopy(struct inode *inode, struct file *file,
-                    unsigned int cmd, unsigned long arg,
+                    unsigned int cmd, unsigned long arg,
                     int (*func)(struct inode *inode, struct file *file,
                     unsigned int cmd, void *arg))
 {
-        char    sbuf[128];
-        void    *mbuf = NULL;
-        void    *parg = NULL;
-        int     err  = -EINVAL;
-
-        /*  Copy arguments into temp kernel buffer  */
-        switch (_IOC_DIR(cmd)) {
-        case _IOC_NONE:
+       char    sbuf[128];
+       void    *mbuf = NULL;
+       void    *parg = NULL;
+       int     err  = -EINVAL;
+
+       /*  Copy arguments into temp kernel buffer  */
+       switch (_IOC_DIR(cmd)) {
+       case _IOC_NONE:
                /*
                 * For this command, the pointer is actually an integer
                 * argument.
                 */
                parg = (void *) arg;
                break;
-        case _IOC_READ: /* some v4l ioctls are marked wrong ... */
-        case _IOC_WRITE:
-        case (_IOC_WRITE | _IOC_READ):
-                if (_IOC_SIZE(cmd) <= sizeof(sbuf)) {
-                        parg = sbuf;
-                } else {
-                        /* too big to allocate from stack */
-                        mbuf = kmalloc(_IOC_SIZE(cmd),GFP_KERNEL);
-                        if (NULL == mbuf)
-                                return -ENOMEM;
-                        parg = mbuf;
-                }
-
-                err = -EFAULT;
-                if (copy_from_user(parg, (void __user *)arg, _IOC_SIZE(cmd)))
-                        goto out;
-                break;
-        }
-
-        /* call driver */
-        if ((err = func(inode, file, cmd, parg)) == -ENOIOCTLCMD)
-                err = -EINVAL;
-
-        if (err < 0)
-                goto out;
-
-        /*  Copy results into user buffer  */
-        switch (_IOC_DIR(cmd))
-        {
-        case _IOC_READ:
-        case (_IOC_WRITE | _IOC_READ):
-                if (copy_to_user((void __user *)arg, parg, _IOC_SIZE(cmd)))
-                        err = -EFAULT;
-                break;
-        }
+       case _IOC_READ: /* some v4l ioctls are marked wrong ... */
+       case _IOC_WRITE:
+       case (_IOC_WRITE | _IOC_READ):
+               if (_IOC_SIZE(cmd) <= sizeof(sbuf)) {
+                       parg = sbuf;
+               } else {
+                       /* too big to allocate from stack */
+                       mbuf = kmalloc(_IOC_SIZE(cmd),GFP_KERNEL);
+                       if (NULL == mbuf)
+                               return -ENOMEM;
+                       parg = mbuf;
+               }
+
+               err = -EFAULT;
+               if (copy_from_user(parg, (void __user *)arg, _IOC_SIZE(cmd)))
+                       goto out;
+               break;
+       }
+
+       /* call driver */
+       if ((err = func(inode, file, cmd, parg)) == -ENOIOCTLCMD)
+               err = -EINVAL;
+
+       if (err < 0)
+               goto out;
+
+       /*  Copy results into user buffer  */
+       switch (_IOC_DIR(cmd))
+       {
+       case _IOC_READ:
+       case (_IOC_WRITE | _IOC_READ):
+               if (copy_to_user((void __user *)arg, parg, _IOC_SIZE(cmd)))
+                       err = -EFAULT;
+               break;
+       }
 
 out:
-        kfree(mbuf);
-        return err;
+       kfree(mbuf);
+       return err;
 }
 
 static int __init init_dvbdev(void)
@@ -427,10 +427,10 @@ error:
 
 static void __exit exit_dvbdev(void)
 {
-        devfs_remove("dvb");
+       devfs_remove("dvb");
        class_destroy(dvb_class);
        cdev_del(&dvb_device_cdev);
-        unregister_chrdev_region(MKDEV(DVB_MAJOR, 0), MAX_DVB_MINORS);
+       unregister_chrdev_region(MKDEV(DVB_MAJOR, 0), MAX_DVB_MINORS);
 }
 
 module_init(init_dvbdev);
index a251867f30f1cfde7cb3523a1eb2a2f9ba36fa7d..0cc6e4a0e27c7e37924c36be26403822536c6b36 100644 (file)
@@ -68,8 +68,8 @@ struct dvb_device {
        int writers;
        int users;
 
-        /* don't really need those !? -- FIXME: use video_usercopy  */
-        int (*kernel_ioctl)(struct inode *inode, struct file *file,
+       /* don't really need those !? -- FIXME: use video_usercopy  */
+       int (*kernel_ioctl)(struct inode *inode, struct file *file,
                            unsigned int cmd, void *arg);
 
        void *priv;
@@ -97,7 +97,7 @@ we simply define out own dvb_usercopy(), which will hopefully become
 generic_usercopy()  someday... */
 
 extern int dvb_usercopy(struct inode *inode, struct file *file,
-                           unsigned int cmd, unsigned long arg,
+                           unsigned int cmd, unsigned long arg,
                            int (*func)(struct inode *inode, struct file *file,
                            unsigned int cmd, void *arg));
 
index f20d8dbd0be825014ac50440e8058db7597990eb..104b5d016c7b17e3c76376164b8c2464c18e9299 100644 (file)
@@ -190,7 +190,7 @@ static int vp702x_fe_get_frontend(struct dvb_frontend* fe,
 }
 
 static int vp702x_fe_send_diseqc_msg (struct dvb_frontend* fe,
-                                   struct dvb_diseqc_master_cmd *m)
+                                   struct dvb_diseqc_master_cmd *m)
 {
        struct vp702x_fe_state *st = fe->demodulator_priv;
        u8 cmd[8],ibuf[10];
index 2746edfeccbaad800bcdec66a149d924503a4a47..83f1de1e7e571daaede818ace9b90c50fbab484a 100644 (file)
@@ -58,7 +58,7 @@ static int vp7045_fe_read_ber(struct dvb_frontend* fe, u32 *ber)
        struct vp7045_fe_state *state = fe->demodulator_priv;
        *ber = (vp7045_read_reg(state->d, 0x0D) << 16) |
               (vp7045_read_reg(state->d, 0x0E) << 8) |
-               vp7045_read_reg(state->d, 0x0F);
+               vp7045_read_reg(state->d, 0x0F);
        return 0;
 }
 
index 72a2b5455b0bfd46873e84eb4ec942547f4f28fa..8e0f4b3a141758757035d3ac8161a8cf5a4e111c 100644 (file)
@@ -361,9 +361,9 @@ static int at76c651_read_ucblocks(struct dvb_frontend* fe, u32* ucblocks)
 
 static int at76c651_get_tune_settings(struct dvb_frontend* fe, struct dvb_frontend_tune_settings *fesettings)
 {
-        fesettings->min_delay_ms = 50;
-        fesettings->step_size = 0;
-        fesettings->max_drift = 0;
+       fesettings->min_delay_ms = 50;
+       fesettings->step_size = 0;
+       fesettings->max_drift = 0;
        return 0;
 }
 
index f6d4ee78bdd43d84b63402dba4a42b13e0713c13..8ceb9a33c7af35bb2fdd70cb9aa513f2947dd71d 100644 (file)
@@ -69,7 +69,7 @@ MODULE_PARM_DESC(debug, "set debugging level (1=info,2=i2c (|-able)).");
 #define dbufout(b,l,m) {\
            int i; \
            for (i = 0; i < l; i++) \
-               m("%02x ",b[i]); \
+               m("%02x ",b[i]); \
 }
 #define deb_info(args...) dprintk(0x01,args)
 #define deb_i2c(args...)  dprintk(0x02,args)
@@ -827,7 +827,7 @@ static struct dvb_frontend_ops bcm3510_ops = {
                .type = FE_ATSC,
                .frequency_min =  54000000,
                .frequency_max = 803000000,
-                /* stepsize is just a guess */
+               /* stepsize is just a guess */
                .frequency_stepsize = 0,
                .caps =
                        FE_CAN_FEC_1_2 | FE_CAN_FEC_2_3 | FE_CAN_FEC_3_4 |
index 0c2ed44386189224518863fb8a28a3e0de5ba8de..755f774f6b7d4262077def4b7a22b4f5b09efec1 100644 (file)
@@ -355,10 +355,10 @@ static int cx22700_get_frontend(struct dvb_frontend* fe, struct dvb_frontend_par
 
 static int cx22700_get_tune_settings(struct dvb_frontend* fe, struct dvb_frontend_tune_settings* fesettings)
 {
-        fesettings->min_delay_ms = 150;
-        fesettings->step_size = 166667;
-        fesettings->max_drift = 166667*2;
-        return 0;
+       fesettings->min_delay_ms = 150;
+       fesettings->step_size = 166667;
+       fesettings->max_drift = 166667*2;
+       return 0;
 }
 
 static void cx22700_release(struct dvb_frontend* fe)
@@ -407,7 +407,7 @@ static struct dvb_frontend_ops cx22700_ops = {
                .caps = FE_CAN_FEC_1_2 | FE_CAN_FEC_2_3 | FE_CAN_FEC_3_4 |
                      FE_CAN_FEC_5_6 | FE_CAN_FEC_7_8 | FE_CAN_FEC_AUTO |
                      FE_CAN_QPSK | FE_CAN_QAM_16 | FE_CAN_QAM_64 |
-                     FE_CAN_RECOVER
+                     FE_CAN_RECOVER
        },
 
        .release = cx22700_release,
index d9a8ede14b45151a019ac43ba51a4465d704d725..5de0e6d350b1ae7223bee890f9710efda14f87d3 100644 (file)
@@ -2,7 +2,7 @@
     Conexant 22702 DVB OFDM demodulator driver
 
     based on:
-        Alps TDMB7 DVB OFDM demodulator driver
+       Alps TDMB7 DVB OFDM demodulator driver
 
     Copyright (C) 2001-2002 Convergence Integrated Media GmbH
          Holger Waechtler <holger@convergence.de>
index 1f250885d2ce40da97fdcb40630d2b7e0f427b23..5633976a58f19b9e90cf5b566510c4c481df6ead 100644 (file)
@@ -2,7 +2,7 @@
     Conexant 22702 DVB OFDM demodulator driver
 
     based on:
-        Alps TDMB7 DVB OFDM demodulator driver
+       Alps TDMB7 DVB OFDM demodulator driver
 
     Copyright (C) 2001-2002 Convergence Integrated Media GmbH
          Holger Waechtler <holger@convergence.de>
index 654d7dc879d9fbb7e7d7fd9acdf43620215270e4..0c4db80ec332b7611e210308204e8a808b64e686 100644 (file)
@@ -55,81 +55,81 @@ static int debug;
        } while (0)
 
 static struct {u8 reg; u8 data;} cx24110_regdata[]=
-                      /* Comments beginning with @ denote this value should
-                         be the default */
-        {{0x09,0x01}, /* SoftResetAll */
-         {0x09,0x00}, /* release reset */
-         {0x01,0xe8}, /* MSB of code rate 27.5MS/s */
-         {0x02,0x17}, /* middle byte " */
-         {0x03,0x29}, /* LSB         " */
-         {0x05,0x03}, /* @ DVB mode, standard code rate 3/4 */
-         {0x06,0xa5}, /* @ PLL 60MHz */
-         {0x07,0x01}, /* @ Fclk, i.e. sampling clock, 60MHz */
-         {0x0a,0x00}, /* @ partial chip disables, do not set */
-         {0x0b,0x01}, /* set output clock in gapped mode, start signal low
-                         active for first byte */
-         {0x0c,0x11}, /* no parity bytes, large hold time, serial data out */
-         {0x0d,0x6f}, /* @ RS Sync/Unsync thresholds */
-         {0x10,0x40}, /* chip doc is misleading here: write bit 6 as 1
-                         to avoid starting the BER counter. Reset the
-                         CRC test bit. Finite counting selected */
-         {0x15,0xff}, /* @ size of the limited time window for RS BER
-                         estimation. It is <value>*256 RS blocks, this
-                         gives approx. 2.6 sec at 27.5MS/s, rate 3/4 */
-         {0x16,0x00}, /* @ enable all RS output ports */
-         {0x17,0x04}, /* @ time window allowed for the RS to sync */
-         {0x18,0xae}, /* @ allow all standard DVB code rates to be scanned
-                         for automatically */
-                      /* leave the current code rate and normalization
-                         registers as they are after reset... */
-         {0x21,0x10}, /* @ during AutoAcq, search each viterbi setting
-                         only once */
-         {0x23,0x18}, /* @ size of the limited time window for Viterbi BER
-                         estimation. It is <value>*65536 channel bits, i.e.
-                         approx. 38ms at 27.5MS/s, rate 3/4 */
-         {0x24,0x24}, /* do not trigger Viterbi CRC test. Finite count window */
-                      /* leave front-end AGC parameters at default values */
-                      /* leave decimation AGC parameters at default values */
-         {0x35,0x40}, /* disable all interrupts. They are not connected anyway */
-         {0x36,0xff}, /* clear all interrupt pending flags */
-         {0x37,0x00}, /* @ fully enable AutoAcqq state machine */
-         {0x38,0x07}, /* @ enable fade recovery, but not autostart AutoAcq */
-                      /* leave the equalizer parameters on their default values */
-                      /* leave the final AGC parameters on their default values */
-         {0x41,0x00}, /* @ MSB of front-end derotator frequency */
-         {0x42,0x00}, /* @ middle bytes " */
-         {0x43,0x00}, /* @ LSB          " */
-                      /* leave the carrier tracking loop parameters on default */
-                      /* leave the bit timing loop parameters at gefault */
-         {0x56,0x4d}, /* set the filtune voltage to 2.7V, as recommended by */
-                      /* the cx24108 data sheet for symbol rates above 15MS/s */
-         {0x57,0x00}, /* @ Filter sigma delta enabled, positive */
-         {0x61,0x95}, /* GPIO pins 1-4 have special function */
-         {0x62,0x05}, /* GPIO pin 5 has special function, pin 6 is GPIO */
-         {0x63,0x00}, /* All GPIO pins use CMOS output characteristics */
-         {0x64,0x20}, /* GPIO 6 is input, all others are outputs */
-         {0x6d,0x30}, /* tuner auto mode clock freq 62kHz */
-         {0x70,0x15}, /* use auto mode, tuner word is 21 bits long */
-         {0x73,0x00}, /* @ disable several demod bypasses */
-         {0x74,0x00}, /* @  " */
-         {0x75,0x00}  /* @  " */
-                      /* the remaining registers are for SEC */
+                     /* Comments beginning with @ denote this value should
+                        be the default */
+       {{0x09,0x01}, /* SoftResetAll */
+        {0x09,0x00}, /* release reset */
+        {0x01,0xe8}, /* MSB of code rate 27.5MS/s */
+        {0x02,0x17}, /* middle byte " */
+        {0x03,0x29}, /* LSB         " */
+        {0x05,0x03}, /* @ DVB mode, standard code rate 3/4 */
+        {0x06,0xa5}, /* @ PLL 60MHz */
+        {0x07,0x01}, /* @ Fclk, i.e. sampling clock, 60MHz */
+        {0x0a,0x00}, /* @ partial chip disables, do not set */
+        {0x0b,0x01}, /* set output clock in gapped mode, start signal low
+                        active for first byte */
+        {0x0c,0x11}, /* no parity bytes, large hold time, serial data out */
+        {0x0d,0x6f}, /* @ RS Sync/Unsync thresholds */
+        {0x10,0x40}, /* chip doc is misleading here: write bit 6 as 1
+                        to avoid starting the BER counter. Reset the
+                        CRC test bit. Finite counting selected */
+        {0x15,0xff}, /* @ size of the limited time window for RS BER
+                        estimation. It is <value>*256 RS blocks, this
+                        gives approx. 2.6 sec at 27.5MS/s, rate 3/4 */
+        {0x16,0x00}, /* @ enable all RS output ports */
+        {0x17,0x04}, /* @ time window allowed for the RS to sync */
+        {0x18,0xae}, /* @ allow all standard DVB code rates to be scanned
+                        for automatically */
+                     /* leave the current code rate and normalization
+                        registers as they are after reset... */
+        {0x21,0x10}, /* @ during AutoAcq, search each viterbi setting
+                        only once */
+        {0x23,0x18}, /* @ size of the limited time window for Viterbi BER
+                        estimation. It is <value>*65536 channel bits, i.e.
+                        approx. 38ms at 27.5MS/s, rate 3/4 */
+        {0x24,0x24}, /* do not trigger Viterbi CRC test. Finite count window */
+                     /* leave front-end AGC parameters at default values */
+                     /* leave decimation AGC parameters at default values */
+        {0x35,0x40}, /* disable all interrupts. They are not connected anyway */
+        {0x36,0xff}, /* clear all interrupt pending flags */
+        {0x37,0x00}, /* @ fully enable AutoAcqq state machine */
+        {0x38,0x07}, /* @ enable fade recovery, but not autostart AutoAcq */
+                     /* leave the equalizer parameters on their default values */
+                     /* leave the final AGC parameters on their default values */
+        {0x41,0x00}, /* @ MSB of front-end derotator frequency */
+        {0x42,0x00}, /* @ middle bytes " */
+        {0x43,0x00}, /* @ LSB          " */
+                     /* leave the carrier tracking loop parameters on default */
+                     /* leave the bit timing loop parameters at gefault */
+        {0x56,0x4d}, /* set the filtune voltage to 2.7V, as recommended by */
+                     /* the cx24108 data sheet for symbol rates above 15MS/s */
+        {0x57,0x00}, /* @ Filter sigma delta enabled, positive */
+        {0x61,0x95}, /* GPIO pins 1-4 have special function */
+        {0x62,0x05}, /* GPIO pin 5 has special function, pin 6 is GPIO */
+        {0x63,0x00}, /* All GPIO pins use CMOS output characteristics */
+        {0x64,0x20}, /* GPIO 6 is input, all others are outputs */
+        {0x6d,0x30}, /* tuner auto mode clock freq 62kHz */
+        {0x70,0x15}, /* use auto mode, tuner word is 21 bits long */
+        {0x73,0x00}, /* @ disable several demod bypasses */
+        {0x74,0x00}, /* @  " */
+        {0x75,0x00}  /* @  " */
+                     /* the remaining registers are for SEC */
        };
 
 
 static int cx24110_writereg (struct cx24110_state* state, int reg, int data)
 {
-        u8 buf [] = { reg, data };
+       u8 buf [] = { reg, data };
        struct i2c_msg msg = { .addr = state->config->demod_address, .flags = 0, .buf = buf, .len = 2 };
        int err;
 
-        if ((err = i2c_transfer(state->i2c, &msg, 1)) != 1) {
+       if ((err = i2c_transfer(state->i2c, &msg, 1)) != 1) {
                dprintk ("%s: writereg error (err == %i, reg == 0x%02x,"
                         " data == 0x%02x)\n", __FUNCTION__, err, reg, data);
                return -EREMOTEIO;
        }
 
-        return 0;
+       return 0;
 }
 
 static int cx24110_readreg (struct cx24110_state* state, u8 reg)
@@ -153,27 +153,27 @@ static int cx24110_set_inversion (struct cx24110_state* state, fe_spectral_inver
 
        switch (inversion) {
        case INVERSION_OFF:
-                cx24110_writereg(state,0x37,cx24110_readreg(state,0x37)|0x1);
-                /* AcqSpectrInvDis on. No idea why someone should want this */
-                cx24110_writereg(state,0x5,cx24110_readreg(state,0x5)&0xf7);
-                /* Initial value 0 at start of acq */
-                cx24110_writereg(state,0x22,cx24110_readreg(state,0x22)&0xef);
-                /* current value 0 */
-                /* The cx24110 manual tells us this reg is read-only.
-                   But what the heck... set it ayways */
-                break;
+               cx24110_writereg(state,0x37,cx24110_readreg(state,0x37)|0x1);
+               /* AcqSpectrInvDis on. No idea why someone should want this */
+               cx24110_writereg(state,0x5,cx24110_readreg(state,0x5)&0xf7);
+               /* Initial value 0 at start of acq */
+               cx24110_writereg(state,0x22,cx24110_readreg(state,0x22)&0xef);
+               /* current value 0 */
+               /* The cx24110 manual tells us this reg is read-only.
+                  But what the heck... set it ayways */
+               break;
        case INVERSION_ON:
-                cx24110_writereg(state,0x37,cx24110_readreg(state,0x37)|0x1);
-                /* AcqSpectrInvDis on. No idea why someone should want this */
-                cx24110_writereg(state,0x5,cx24110_readreg(state,0x5)|0x08);
-                /* Initial value 1 at start of acq */
-                cx24110_writereg(state,0x22,cx24110_readreg(state,0x22)|0x10);
-                /* current value 1 */
-                break;
+               cx24110_writereg(state,0x37,cx24110_readreg(state,0x37)|0x1);
+               /* AcqSpectrInvDis on. No idea why someone should want this */
+               cx24110_writereg(state,0x5,cx24110_readreg(state,0x5)|0x08);
+               /* Initial value 1 at start of acq */
+               cx24110_writereg(state,0x22,cx24110_readreg(state,0x22)|0x10);
+               /* current value 1 */
+               break;
        case INVERSION_AUTO:
-                cx24110_writereg(state,0x37,cx24110_readreg(state,0x37)&0xfe);
-                /* AcqSpectrInvDis off. Leave initial & current states as is */
-                break;
+               cx24110_writereg(state,0x37,cx24110_readreg(state,0x37)&0xfe);
+               /* AcqSpectrInvDis off. Leave initial & current states as is */
+               break;
        default:
                return -EINVAL;
        }
@@ -185,18 +185,18 @@ static int cx24110_set_fec (struct cx24110_state* state, fe_code_rate_t fec)
 {
 /* fixme (low): error handling */
 
-        static const int rate[]={-1,1,2,3,5,7,-1};
-        static const int g1[]={-1,0x01,0x02,0x05,0x15,0x45,-1};
-        static const int g2[]={-1,0x01,0x03,0x06,0x1a,0x7a,-1};
+       static const int rate[]={-1,1,2,3,5,7,-1};
+       static const int g1[]={-1,0x01,0x02,0x05,0x15,0x45,-1};
+       static const int g2[]={-1,0x01,0x03,0x06,0x1a,0x7a,-1};
 
-        /* Well, the AutoAcq engine of the cx24106 and 24110 automatically
-           searches all enabled viterbi rates, and can handle non-standard
-           rates as well. */
+       /* Well, the AutoAcq engine of the cx24106 and 24110 automatically
+          searches all enabled viterbi rates, and can handle non-standard
+          rates as well. */
 
-        if (fec>FEC_AUTO)
-                fec=FEC_AUTO;
+       if (fec>FEC_AUTO)
+               fec=FEC_AUTO;
 
-        if (fec==FEC_AUTO) { /* (re-)establish AutoAcq behaviour */
+       if (fec==FEC_AUTO) { /* (re-)establish AutoAcq behaviour */
                cx24110_writereg(state,0x37,cx24110_readreg(state,0x37)&0xdf);
                /* clear AcqVitDis bit */
                cx24110_writereg(state,0x18,0xae);
@@ -208,7 +208,7 @@ static int cx24110_set_fec (struct cx24110_state* state, fe_code_rate_t fec)
                cx24110_writereg(state,0x1a,0x05); cx24110_writereg(state,0x1b,0x06);
                /* set the puncture registers for code rate 3/4 */
                return 0;
-        } else {
+       } else {
                cx24110_writereg(state,0x37,cx24110_readreg(state,0x37)|0x20);
                /* set AcqVitDis bit */
                if(rate[fec]>0) {
@@ -219,10 +219,10 @@ static int cx24110_set_fec (struct cx24110_state* state, fe_code_rate_t fec)
                        cx24110_writereg(state,0x1a,g1[fec]);
                        cx24110_writereg(state,0x1b,g2[fec]);
                        /* not sure if this is the right way: I always used AutoAcq mode */
-           } else
+          } else
                   return -EOPNOTSUPP;
 /* fixme (low): which is the correct return code? */
-        };
+       };
        return 0;
 }
 
@@ -245,72 +245,72 @@ static fe_code_rate_t cx24110_get_fec (struct cx24110_state* state)
 static int cx24110_set_symbolrate (struct cx24110_state* state, u32 srate)
 {
 /* fixme (low): add error handling */
-        u32 ratio;
-        u32 tmp, fclk, BDRI;
+       u32 ratio;
+       u32 tmp, fclk, BDRI;
 
-        static const u32 bands[]={5000000UL,15000000UL,90999000UL/2};
-        int i;
+       static const u32 bands[]={5000000UL,15000000UL,90999000UL/2};
+       int i;
 
 dprintk("cx24110 debug: entering %s(%d)\n",__FUNCTION__,srate);
-        if (srate>90999000UL/2)
-                srate=90999000UL/2;
-        if (srate<500000)
-                srate=500000;
+       if (srate>90999000UL/2)
+               srate=90999000UL/2;
+       if (srate<500000)
+               srate=500000;
 
-        for(i=0;(i<sizeof(bands)/sizeof(bands[0]))&&(srate>bands[i]);i++)
+       for(i=0;(i<sizeof(bands)/sizeof(bands[0]))&&(srate>bands[i]);i++)
                ;
-        /* first, check which sample rate is appropriate: 45, 60 80 or 90 MHz,
-           and set the PLL accordingly (R07[1:0] Fclk, R06[7:4] PLLmult,
-           R06[3:0] PLLphaseDetGain */
-        tmp=cx24110_readreg(state,0x07)&0xfc;
-        if(srate<90999000UL/4) { /* sample rate 45MHz*/
+       /* first, check which sample rate is appropriate: 45, 60 80 or 90 MHz,
+          and set the PLL accordingly (R07[1:0] Fclk, R06[7:4] PLLmult,
+          R06[3:0] PLLphaseDetGain */
+       tmp=cx24110_readreg(state,0x07)&0xfc;
+       if(srate<90999000UL/4) { /* sample rate 45MHz*/
                cx24110_writereg(state,0x07,tmp);
                cx24110_writereg(state,0x06,0x78);
                fclk=90999000UL/2;
-        } else if(srate<60666000UL/2) { /* sample rate 60MHz */
+       } else if(srate<60666000UL/2) { /* sample rate 60MHz */
                cx24110_writereg(state,0x07,tmp|0x1);
                cx24110_writereg(state,0x06,0xa5);
                fclk=60666000UL;
-        } else if(srate<80888000UL/2) { /* sample rate 80MHz */
+       } else if(srate<80888000UL/2) { /* sample rate 80MHz */
                cx24110_writereg(state,0x07,tmp|0x2);
                cx24110_writereg(state,0x06,0x87);
                fclk=80888000UL;
-        } else { /* sample rate 90MHz */
+       } else { /* sample rate 90MHz */
                cx24110_writereg(state,0x07,tmp|0x3);
                cx24110_writereg(state,0x06,0x78);
                fclk=90999000UL;
-        };
-        dprintk("cx24110 debug: fclk %d Hz\n",fclk);
-        /* we need to divide two integers with approx. 27 bits in 32 bit
-           arithmetic giving a 25 bit result */
-        /* the maximum dividend is 90999000/2, 0x02b6446c, this number is
-           also the most complex divisor. Hence, the dividend has,
-           assuming 32bit unsigned arithmetic, 6 clear bits on top, the
-           divisor 2 unused bits at the bottom. Also, the quotient is
-           always less than 1/2. Borrowed from VES1893.c, of course */
+       };
+       dprintk("cx24110 debug: fclk %d Hz\n",fclk);
+       /* we need to divide two integers with approx. 27 bits in 32 bit
+          arithmetic giving a 25 bit result */
+       /* the maximum dividend is 90999000/2, 0x02b6446c, this number is
+          also the most complex divisor. Hence, the dividend has,
+          assuming 32bit unsigned arithmetic, 6 clear bits on top, the
+          divisor 2 unused bits at the bottom. Also, the quotient is
+          always less than 1/2. Borrowed from VES1893.c, of course */
 
-        tmp=srate<<6;
-        BDRI=fclk>>2;
-        ratio=(tmp/BDRI);
+       tmp=srate<<6;
+       BDRI=fclk>>2;
+       ratio=(tmp/BDRI);
 
-        tmp=(tmp%BDRI)<<8;
-        ratio=(ratio<<8)+(tmp/BDRI);
+       tmp=(tmp%BDRI)<<8;
+       ratio=(ratio<<8)+(tmp/BDRI);
 
-        tmp=(tmp%BDRI)<<8;
-        ratio=(ratio<<8)+(tmp/BDRI);
+       tmp=(tmp%BDRI)<<8;
+       ratio=(ratio<<8)+(tmp/BDRI);
 
-        tmp=(tmp%BDRI)<<1;
-        ratio=(ratio<<1)+(tmp/BDRI);
+       tmp=(tmp%BDRI)<<1;
+       ratio=(ratio<<1)+(tmp/BDRI);
 
-        dprintk("srate= %d (range %d, up to %d)\n", srate,i,bands[i]);
-        dprintk("fclk = %d\n", fclk);
-        dprintk("ratio= %08x\n", ratio);
+       dprintk("srate= %d (range %d, up to %d)\n", srate,i,bands[i]);
+       dprintk("fclk = %d\n", fclk);
+       dprintk("ratio= %08x\n", ratio);
 
-        cx24110_writereg(state, 0x1, (ratio>>16)&0xff);
-        cx24110_writereg(state, 0x2, (ratio>>8)&0xff);
-        cx24110_writereg(state, 0x3, (ratio)&0xff);
+       cx24110_writereg(state, 0x1, (ratio>>16)&0xff);
+       cx24110_writereg(state, 0x2, (ratio>>8)&0xff);
+       cx24110_writereg(state, 0x3, (ratio)&0xff);
 
-        return 0;
+       return 0;
 
 }
 
@@ -324,48 +324,48 @@ int cx24110_pll_write (struct dvb_frontend* fe, u32 data)
 
        dprintk("cx24110 debug: cx24108_write(%8.8x)\n",data);
 
-        cx24110_writereg(state,0x6d,0x30); /* auto mode at 62kHz */
-        cx24110_writereg(state,0x70,0x15); /* auto mode 21 bits */
+       cx24110_writereg(state,0x6d,0x30); /* auto mode at 62kHz */
+       cx24110_writereg(state,0x70,0x15); /* auto mode 21 bits */
 
-        /* if the auto tuner writer is still busy, clear it out */
-        while (cx24110_readreg(state,0x6d)&0x80)
+       /* if the auto tuner writer is still busy, clear it out */
+       while (cx24110_readreg(state,0x6d)&0x80)
                cx24110_writereg(state,0x72,0);
 
-        /* write the topmost 8 bits */
-        cx24110_writereg(state,0x72,(data>>24)&0xff);
+       /* write the topmost 8 bits */
+       cx24110_writereg(state,0x72,(data>>24)&0xff);
 
-        /* wait for the send to be completed */
-        while ((cx24110_readreg(state,0x6d)&0xc0)==0x80)
+       /* wait for the send to be completed */
+       while ((cx24110_readreg(state,0x6d)&0xc0)==0x80)
                ;
 
-        /* send another 8 bytes */
-        cx24110_writereg(state,0x72,(data>>16)&0xff);
-        while ((cx24110_readreg(state,0x6d)&0xc0)==0x80)
+       /* send another 8 bytes */
+       cx24110_writereg(state,0x72,(data>>16)&0xff);
+       while ((cx24110_readreg(state,0x6d)&0xc0)==0x80)
                ;
 
-        /* and the topmost 5 bits of this byte */
-        cx24110_writereg(state,0x72,(data>>8)&0xff);
-        while ((cx24110_readreg(state,0x6d)&0xc0)==0x80)
+       /* and the topmost 5 bits of this byte */
+       cx24110_writereg(state,0x72,(data>>8)&0xff);
+       while ((cx24110_readreg(state,0x6d)&0xc0)==0x80)
                ;
 
-        /* now strobe the enable line once */
-        cx24110_writereg(state,0x6d,0x32);
-        cx24110_writereg(state,0x6d,0x30);
+       /* now strobe the enable line once */
+       cx24110_writereg(state,0x6d,0x32);
+       cx24110_writereg(state,0x6d,0x30);
 
-        return 0;
+       return 0;
 }
 
 static int cx24110_initfe(struct dvb_frontend* fe)
 {
        struct cx24110_state *state = fe->demodulator_priv;
 /* fixme (low): error handling */
-        int i;
+       int i;
 
        dprintk("%s: init chip\n", __FUNCTION__);
 
-        for(i=0;i<sizeof(cx24110_regdata)/sizeof(cx24110_regdata[0]);i++) {
+       for(i=0;i<sizeof(cx24110_regdata)/sizeof(cx24110_regdata[0]);i++) {
                cx24110_writereg(state, cx24110_regdata[i].reg, cx24110_regdata[i].data);
-        };
+       };
 
        if (state->config->pll_init) state->config->pll_init(fe);
 
index 19b4bf7c21a752eed6fa9c390ba803826bb1e59c..1c7c91224472ce6f2078aadec88222eacf46dbd2 100644 (file)
@@ -2,7 +2,7 @@
     driver for LSI L64781 COFDM demodulator
 
     Copyright (C) 2001 Holger Waechtler for Convergence Integrated Media GmbH
-                       Marko Kohtala <marko.kohtala@luukku.com>
+                      Marko Kohtala <marko.kohtala@luukku.com>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -433,7 +433,7 @@ static int l64781_init(struct dvb_frontend* fe)
 {
        struct l64781_state* state = fe->demodulator_priv;
 
-        reset_and_configure (state);
+       reset_and_configure (state);
 
        /* Power up */
        l64781_writereg (state, 0x3e, 0xa5);
@@ -456,9 +456,9 @@ static int l64781_init(struct dvb_frontend* fe)
        l64781_writereg (state, 0x0d, 0x8c);
 
        /* With ppm=8000, it seems the DTR_SENSITIVITY will result in
-           value of 2 with all possible bandwidths and guard
-           intervals, which is the initial value anyway. */
-        /*l64781_writereg (state, 0x19, 0x92);*/
+          value of 2 with all possible bandwidths and guard
+          intervals, which is the initial value anyway. */
+       /*l64781_writereg (state, 0x19, 0x92);*/
 
        /* Everything is two's complement, soft bit and CSI_OUT too */
        l64781_writereg (state, 0x1e, 0x09);
@@ -477,10 +477,10 @@ static int l64781_init(struct dvb_frontend* fe)
 static int l64781_get_tune_settings(struct dvb_frontend* fe,
                                    struct dvb_frontend_tune_settings* fesettings)
 {
-        fesettings->min_delay_ms = 4000;
-        fesettings->step_size = 0;
-        fesettings->max_drift = 0;
-        return 0;
+       fesettings->min_delay_ms = 4000;
+       fesettings->step_size = 0;
+       fesettings->max_drift = 0;
+       return 0;
 }
 
 static void l64781_release(struct dvb_frontend* fe)
@@ -522,7 +522,7 @@ struct dvb_frontend* l64781_attach(const struct l64781_config* config,
 
        /* The chip always responds to reads */
        if (i2c_transfer(state->i2c, msg, 2) != 2) {
-               dprintk("No response to read on I2C bus\n");
+               dprintk("No response to read on I2C bus\n");
                goto error;
        }
 
@@ -531,7 +531,7 @@ struct dvb_frontend* l64781_attach(const struct l64781_config* config,
 
        /* Reading the POWER_DOWN register always returns 0 */
        if (reg0x3e != 0) {
-               dprintk("Device doesn't look like L64781\n");
+               dprintk("Device doesn't look like L64781\n");
                goto error;
        }
 
@@ -540,7 +540,7 @@ struct dvb_frontend* l64781_attach(const struct l64781_config* config,
 
        /* Responds to all reads with 0 */
        if (l64781_readreg(state, 0x1a) != 0) {
-               dprintk("Read 1 returned unexpcted value\n");
+               dprintk("Read 1 returned unexpcted value\n");
                goto error;
        }
 
@@ -549,7 +549,7 @@ struct dvb_frontend* l64781_attach(const struct l64781_config* config,
 
        /* Responds with register default value */
        if (l64781_readreg(state, 0x1a) != 0xa1) {
-               dprintk("Read 2 returned unexpcted value\n");
+               dprintk("Read 2 returned unexpcted value\n");
                goto error;
        }
 
index 7e30fb0fdfa78264a806ff30fa13b0a338a01748..947f65f87465441f366a21312631b243bbbe50f4 100644 (file)
@@ -2,7 +2,7 @@
     driver for LSI L64781 COFDM demodulator
 
     Copyright (C) 2001 Holger Waechtler for Convergence Integrated Media GmbH
-                       Marko Kohtala <marko.kohtala@luukku.com>
+                      Marko Kohtala <marko.kohtala@luukku.com>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
index 6a33f5a19a8d72d96312963f05bc745555f934b5..cb5301865d07e9d0775bb9bb588ff3b05a3483fd 100644 (file)
@@ -301,10 +301,10 @@ static int lgdt330x_set_parameters(struct dvb_frontend* fe,
        static u8 lgdt3303_8vsb_44_data[] = {
                0x04, 0x00,
                0x0d, 0x40,
-        0x0e, 0x87,
-        0x0f, 0x8e,
-        0x10, 0x01,
-        0x47, 0x8b };
+       0x0e, 0x87,
+       0x0f, 0x8e,
+       0x10, 0x01,
+       0x47, 0x8b };
 
        /*
         * Array of byte pairs <address, value>
index 9c67f406d581a7d9a7fe7d964bd1786492ad8c9d..8d672283c93de1ef15c3d500c1fd4896b8a03bb2 100644 (file)
@@ -554,7 +554,7 @@ static int mt312_set_frontend(struct dvb_frontend* fe,
        if ((ret = mt312_write(state, SYM_RATE_H, buf, sizeof(buf))) < 0)
                return ret;
 
-        mt312_reset(state, 0);
+       mt312_reset(state, 0);
 
        return 0;
 }
@@ -695,7 +695,7 @@ static struct dvb_frontend_ops vp310_mt312_ops = {
                    FE_CAN_FEC_1_2 | FE_CAN_FEC_2_3 |
                    FE_CAN_FEC_3_4 | FE_CAN_FEC_5_6 | FE_CAN_FEC_7_8 |
                    FE_CAN_FEC_AUTO | FE_CAN_QPSK | FE_CAN_MUTE_TS |
-                   FE_CAN_RECOVER
+                   FE_CAN_RECOVER
        },
 
        .release = mt312_release,
index 30786b1911bdab48dbec0808f01a44bacb9230e1..52c416043a628f24dd24cc65279a4f45057f306a 100644 (file)
@@ -527,7 +527,7 @@ static int nxt2002_read_snr(struct dvb_frontend* fe, u16* snr)
        else
                snrdb = 1000*0 + ( 1000*(12-0) * ( temp2 - 0 ) / ( 0x7C00 - 0 ) );
 
-        /* the value reported back from the frontend will be FFFF=32db 0000=0db */
+       /* the value reported back from the frontend will be FFFF=32db 0000=0db */
 
        *snr = snrdb * (0xFFFF/32000);
 
@@ -646,7 +646,7 @@ struct dvb_frontend* nxt2002_attach(const struct nxt2002_config* config,
        memcpy(&state->ops, &nxt2002_ops, sizeof(struct dvb_frontend_ops));
        state->initialised = 0;
 
-        /* Check the first 5 registers to ensure this a revision we can handle */
+       /* Check the first 5 registers to ensure this a revision we can handle */
 
        i2c_readbytes(state, 0x00, buf, 5);
        if (buf[0] != 0x04) goto error;         /* device id */
@@ -672,7 +672,7 @@ static struct dvb_frontend_ops nxt2002_ops = {
                .type = FE_ATSC,
                .frequency_min =  54000000,
                .frequency_max = 860000000,
-                /* stepsize is just a guess */
+               /* stepsize is just a guess */
                .frequency_stepsize = 166666,
                .caps = FE_CAN_FEC_1_2 | FE_CAN_FEC_2_3 | FE_CAN_FEC_3_4 |
                        FE_CAN_FEC_5_6 | FE_CAN_FEC_7_8 | FE_CAN_FEC_AUTO |
index 84b62881cea7f81b459924b5b1646d2c07b246a0..aeafef46e3ebd4b68bd03b94624a0fdb3720d83a 100644 (file)
@@ -339,7 +339,7 @@ static int nxt200x_writetuner (struct nxt200x_state* state, u8* data)
        switch (state->demod_chip) {
                case NXT2004:
                        if (i2c_writebytes(state, state->config->pll_address, data, 4))
-                               printk(KERN_WARNING "nxt200x: error writing to tuner\n");
+                               printk(KERN_WARNING "nxt200x: error writing to tuner\n");
                        /* wait until we have a lock */
                        while (count < 20) {
                                i2c_readbytes(state, state->config->pll_address, &buf, 1);
@@ -497,7 +497,7 @@ static int nxt2004_load_firmware (struct dvb_frontend* fe, const struct firmware
 
        /* calculate firmware CRC */
        for (position = 0; position < fw->size; position++) {
-               crc = nxt200x_crc(crc, fw->data[position]);
+               crc = nxt200x_crc(crc, fw->data[position]);
        }
 
        buf[0] = rambase >> 8;
index 88a57b7911124cb58113afd3676d885a221992e1..a458a3bfff7009fa3ed80f99822edcef2e23507d 100644 (file)
@@ -574,11 +574,11 @@ static struct dvb_frontend_ops nxt6000_ops = {
                .symbol_rate_max = 9360000,     /* FIXME */
                .symbol_rate_tolerance = 4000,
                .caps = FE_CAN_FEC_1_2 | FE_CAN_FEC_2_3 | FE_CAN_FEC_3_4 |
-                       FE_CAN_FEC_4_5 | FE_CAN_FEC_5_6 | FE_CAN_FEC_6_7 |
-                       FE_CAN_FEC_7_8 | FE_CAN_FEC_8_9 | FE_CAN_FEC_AUTO |
-                       FE_CAN_QAM_16 | FE_CAN_QAM_64 | FE_CAN_QAM_AUTO |
-                       FE_CAN_TRANSMISSION_MODE_AUTO | FE_CAN_GUARD_INTERVAL_AUTO |
-                       FE_CAN_HIERARCHY_AUTO,
+                       FE_CAN_FEC_4_5 | FE_CAN_FEC_5_6 | FE_CAN_FEC_6_7 |
+                       FE_CAN_FEC_7_8 | FE_CAN_FEC_8_9 | FE_CAN_FEC_AUTO |
+                       FE_CAN_QAM_16 | FE_CAN_QAM_64 | FE_CAN_QAM_AUTO |
+                       FE_CAN_TRANSMISSION_MODE_AUTO | FE_CAN_GUARD_INTERVAL_AUTO |
+                       FE_CAN_HIERARCHY_AUTO,
        },
 
        .release = nxt6000_release,
index 78bded861d02bb8d2c0c807bbbb9277f52cc8466..80e0f28127b7bd44b51cb19cc1d7df730983117f 100644 (file)
@@ -503,7 +503,7 @@ static int or51132_read_signal_strength(struct dvb_frontend* fe, u16* strength)
        rcvr_stat = rec_buf[1];
        usK = (rcvr_stat & 0x10) ? 3 : 0;
 
-        /* The value reported back from the frontend will be FFFF=100% 0000=0% */
+       /* The value reported back from the frontend will be FFFF=100% 0000=0% */
        signal_strength = (((8952 - i20Log10(snr_equ) - usK*100)/3+5)*65535)/1000;
        if (signal_strength > 0xffff)
                *strength = 0xffff;
index f265418e326102ba5c56855a8fc4443aeb3289be..18715091aed8e779e2a64f1241a057aecf642574 100644 (file)
@@ -494,7 +494,7 @@ static int s5h1420_getfreqoffset(struct s5h1420_state* state)
 }
 
 static void s5h1420_setfec_inversion(struct s5h1420_state* state,
-                                    struct dvb_frontend_parameters *p)
+                                    struct dvb_frontend_parameters *p)
 {
        u8 inversion = 0;
 
@@ -521,8 +521,8 @@ static void s5h1420_setfec_inversion(struct s5h1420_state* state,
 
                case FEC_3_4:
                        s5h1420_writereg(state, 0x30, 0x04);
-                        s5h1420_writereg(state, 0x31, 0x12 | inversion);
-                        break;
+                       s5h1420_writereg(state, 0x31, 0x12 | inversion);
+                       break;
 
                case FEC_5_6:
                        s5h1420_writereg(state, 0x30, 0x08);
index 872028ddf2a2df0e76288be17dc4a222dd457c1f..73296f13c324b67910b8f55672395d7e63d3351a 100644 (file)
@@ -39,6 +39,6 @@ struct s5h1420_config
 };
 
 extern struct dvb_frontend* s5h1420_attach(const struct s5h1420_config* config,
-             struct i2c_adapter* i2c);
+            struct i2c_adapter* i2c);
 
 #endif // S5H1420_H
index 1c6b2e9264bc15c7b78cd8bac150ef8957abba41..fc06cd6b46c3c843df95422811cb35faf3a44646 100644 (file)
@@ -67,16 +67,16 @@ static int debug;
 
 static int sp8870_writereg (struct sp8870_state* state, u16 reg, u16 data)
 {
-        u8 buf [] = { reg >> 8, reg & 0xff, data >> 8, data & 0xff };
+       u8 buf [] = { reg >> 8, reg & 0xff, data >> 8, data & 0xff };
        struct i2c_msg msg = { .addr = state->config->demod_address, .flags = 0, .buf = buf, .len = 4 };
        int err;
 
-        if ((err = i2c_transfer (state->i2c, &msg, 1)) != 1) {
+       if ((err = i2c_transfer (state->i2c, &msg, 1)) != 1) {
                dprintk ("%s: writereg error (err == %i, reg == 0x%02x, data == 0x%02x)\n", __FUNCTION__, err, reg, data);
                return -EREMOTEIO;
        }
 
-        return 0;
+       return 0;
 }
 
 static int sp8870_readreg (struct sp8870_state* state, u16 reg)
@@ -305,7 +305,7 @@ static int sp8870_set_frontend_parameters (struct dvb_frontend* fe,
 static int sp8870_init (struct dvb_frontend* fe)
 {
        struct sp8870_state* state = fe->demodulator_priv;
-        const struct firmware *fw = NULL;
+       const struct firmware *fw = NULL;
 
        sp8870_wake_up(state);
        if (state->initialised) return 0;
@@ -534,10 +534,10 @@ static int sp8870_sleep(struct dvb_frontend* fe)
 
 static int sp8870_get_tune_settings(struct dvb_frontend* fe, struct dvb_frontend_tune_settings* fesettings)
 {
-        fesettings->min_delay_ms = 350;
-        fesettings->step_size = 0;
-        fesettings->max_drift = 0;
-        return 0;
+       fesettings->min_delay_ms = 350;
+       fesettings->step_size = 0;
+       fesettings->max_drift = 0;
+       return 0;
 }
 
 static void sp8870_release(struct dvb_frontend* fe)
index 73384e75625ee8ea1d0c83eb222142aba7866fa1..e3b6657822432e98f39fe3a6c6630d092a096581 100644 (file)
@@ -80,7 +80,7 @@ static int sp887x_readreg (struct sp887x_state* state, u16 reg)
        u8 b1 [2];
        int ret;
        struct i2c_msg msg[] = {{ .addr = state->config->demod_address, .flags = 0, .buf = b0, .len = 2 },
-                        { .addr = state->config->demod_address, .flags = I2C_M_RD, .buf = b1, .len = 2 }};
+                        { .addr = state->config->demod_address, .flags = I2C_M_RD, .buf = b1, .len = 2 }};
 
        if ((ret = i2c_transfer(state->i2c, msg, 2)) != 2) {
                printk("%s: readreg error (ret == %i)\n", __FUNCTION__, ret);
@@ -498,7 +498,7 @@ static int sp887x_sleep(struct dvb_frontend* fe)
 static int sp887x_init(struct dvb_frontend* fe)
 {
        struct sp887x_state* state = fe->demodulator_priv;
-        const struct firmware *fw = NULL;
+       const struct firmware *fw = NULL;
        int ret;
 
        if (!state->initialised) {
@@ -528,10 +528,10 @@ static int sp887x_init(struct dvb_frontend* fe)
 
 static int sp887x_get_tune_settings(struct dvb_frontend* fe, struct dvb_frontend_tune_settings* fesettings)
 {
-        fesettings->min_delay_ms = 350;
-        fesettings->step_size = 166666*2;
-        fesettings->max_drift = (166666*2)+1;
-        return 0;
+       fesettings->min_delay_ms = 350;
+       fesettings->step_size = 166666*2;
+       fesettings->max_drift = (166666*2)+1;
+       return 0;
 }
 
 static void sp887x_release(struct dvb_frontend* fe)
@@ -581,7 +581,7 @@ static struct dvb_frontend_ops sp887x_ops = {
                .caps = FE_CAN_FEC_1_2 | FE_CAN_FEC_2_3 | FE_CAN_FEC_3_4 |
                        FE_CAN_FEC_5_6 | FE_CAN_FEC_7_8 | FE_CAN_FEC_AUTO |
                        FE_CAN_QPSK | FE_CAN_QAM_16 | FE_CAN_QAM_64 |
-                       FE_CAN_RECOVER
+                       FE_CAN_RECOVER
        },
 
        .release = sp887x_release,
index 29c48665e1309eb1e95500eac5909d663b09f4b1..177d71d56b67ac579ac9111c5397bffcbfa01dbe 100644 (file)
@@ -95,7 +95,7 @@ static int stv0299_writeregI (struct stv0299_state* state, u8 reg, u8 data)
 
 int stv0299_writereg (struct dvb_frontend* fe, u8 reg, u8 data)
 {
-        struct stv0299_state* state = fe->demodulator_priv;
+       struct stv0299_state* state = fe->demodulator_priv;
 
        return stv0299_writeregI(state, reg, data);
 }
@@ -220,7 +220,7 @@ static int stv0299_wait_diseqc_idle (struct stv0299_state* state, int timeout)
 
 static int stv0299_set_symbolrate (struct dvb_frontend* fe, u32 srate)
 {
-        struct stv0299_state* state = fe->demodulator_priv;
+       struct stv0299_state* state = fe->demodulator_priv;
        u64 big = srate;
        u32 ratio;
 
@@ -271,7 +271,7 @@ static int stv0299_get_symbolrate (struct stv0299_state* state)
 static int stv0299_send_diseqc_msg (struct dvb_frontend* fe,
                                    struct dvb_diseqc_master_cmd *m)
 {
-        struct stv0299_state* state = fe->demodulator_priv;
+       struct stv0299_state* state = fe->demodulator_priv;
        u8 val;
        int i;
 
@@ -301,7 +301,7 @@ static int stv0299_send_diseqc_msg (struct dvb_frontend* fe,
 
 static int stv0299_send_diseqc_burst (struct dvb_frontend* fe, fe_sec_mini_cmd_t burst)
 {
-        struct stv0299_state* state = fe->demodulator_priv;
+       struct stv0299_state* state = fe->demodulator_priv;
        u8 val;
 
        dprintk ("%s\n", __FUNCTION__);
@@ -328,7 +328,7 @@ static int stv0299_send_diseqc_burst (struct dvb_frontend* fe, fe_sec_mini_cmd_t
 
 static int stv0299_set_tone (struct dvb_frontend* fe, fe_sec_tone_mode_t tone)
 {
-        struct stv0299_state* state = fe->demodulator_priv;
+       struct stv0299_state* state = fe->demodulator_priv;
        u8 val;
 
        if (stv0299_wait_diseqc_idle (state, 100) < 0)
@@ -350,7 +350,7 @@ static int stv0299_set_tone (struct dvb_frontend* fe, fe_sec_tone_mode_t tone)
 
 static int stv0299_set_voltage (struct dvb_frontend* fe, fe_sec_voltage_t voltage)
 {
-        struct stv0299_state* state = fe->demodulator_priv;
+       struct stv0299_state* state = fe->demodulator_priv;
        u8 reg0x08;
        u8 reg0x0c;
 
@@ -442,7 +442,7 @@ static int stv0299_send_legacy_dish_cmd (struct dvb_frontend* fe, u32 cmd)
 
 static int stv0299_init (struct dvb_frontend* fe)
 {
-        struct stv0299_state* state = fe->demodulator_priv;
+       struct stv0299_state* state = fe->demodulator_priv;
        int i;
 
        dprintk("stv0299: init chip\n");
@@ -461,7 +461,7 @@ static int stv0299_init (struct dvb_frontend* fe)
 
 static int stv0299_read_status(struct dvb_frontend* fe, fe_status_t* status)
 {
-        struct stv0299_state* state = fe->demodulator_priv;
+       struct stv0299_state* state = fe->demodulator_priv;
 
        u8 signal = 0xff - stv0299_readreg (state, 0x18);
        u8 sync = stv0299_readreg (state, 0x1b);
@@ -489,7 +489,7 @@ static int stv0299_read_status(struct dvb_frontend* fe, fe_status_t* status)
 
 static int stv0299_read_ber(struct dvb_frontend* fe, u32* ber)
 {
-        struct stv0299_state* state = fe->demodulator_priv;
+       struct stv0299_state* state = fe->demodulator_priv;
 
        if (state->errmode != STATUS_BER) return 0;
        *ber = (stv0299_readreg (state, 0x1d) << 8) | stv0299_readreg (state, 0x1e);
@@ -499,7 +499,7 @@ static int stv0299_read_ber(struct dvb_frontend* fe, u32* ber)
 
 static int stv0299_read_signal_strength(struct dvb_frontend* fe, u16* strength)
 {
-        struct stv0299_state* state = fe->demodulator_priv;
+       struct stv0299_state* state = fe->demodulator_priv;
 
        s32 signal =  0xffff - ((stv0299_readreg (state, 0x18) << 8)
                               | stv0299_readreg (state, 0x19));
@@ -516,7 +516,7 @@ static int stv0299_read_signal_strength(struct dvb_frontend* fe, u16* strength)
 
 static int stv0299_read_snr(struct dvb_frontend* fe, u16* snr)
 {
-        struct stv0299_state* state = fe->demodulator_priv;
+       struct stv0299_state* state = fe->demodulator_priv;
 
        s32 xsnr = 0xffff - ((stv0299_readreg (state, 0x24) << 8)
                           | stv0299_readreg (state, 0x25));
@@ -528,7 +528,7 @@ static int stv0299_read_snr(struct dvb_frontend* fe, u16* snr)
 
 static int stv0299_read_ucblocks(struct dvb_frontend* fe, u32* ucblocks)
 {
-        struct stv0299_state* state = fe->demodulator_priv;
+       struct stv0299_state* state = fe->demodulator_priv;
 
        if (state->errmode != STATUS_UCBLOCKS) *ucblocks = 0;
        else *ucblocks = (stv0299_readreg (state, 0x1d) << 8) | stv0299_readreg (state, 0x1e);
@@ -538,7 +538,7 @@ static int stv0299_read_ucblocks(struct dvb_frontend* fe, u32* ucblocks)
 
 static int stv0299_set_frontend(struct dvb_frontend* fe, struct dvb_frontend_parameters * p)
 {
-        struct stv0299_state* state = fe->demodulator_priv;
+       struct stv0299_state* state = fe->demodulator_priv;
        int invval = 0;
 
        dprintk ("%s : FE_SET_FRONTEND\n", __FUNCTION__);
@@ -571,7 +571,7 @@ static int stv0299_set_frontend(struct dvb_frontend* fe, struct dvb_frontend_par
 
 static int stv0299_get_frontend(struct dvb_frontend* fe, struct dvb_frontend_parameters * p)
 {
-        struct stv0299_state* state = fe->demodulator_priv;
+       struct stv0299_state* state = fe->demodulator_priv;
        s32 derot_freq;
        int invval;
 
@@ -596,7 +596,7 @@ static int stv0299_get_frontend(struct dvb_frontend* fe, struct dvb_frontend_par
 
 static int stv0299_sleep(struct dvb_frontend* fe)
 {
-        struct stv0299_state* state = fe->demodulator_priv;
+       struct stv0299_state* state = fe->demodulator_priv;
 
        stv0299_writeregI(state, 0x02, 0x80);
        state->initialised = 0;
@@ -606,7 +606,7 @@ static int stv0299_sleep(struct dvb_frontend* fe)
 
 static int stv0299_get_tune_settings(struct dvb_frontend* fe, struct dvb_frontend_tune_settings* fesettings)
 {
-        struct stv0299_state* state = fe->demodulator_priv;
+       struct stv0299_state* state = fe->demodulator_priv;
 
        fesettings->min_delay_ms = state->config->min_delay_ms;
        if (fesettings->parameters.u.qpsk.symbol_rate < 10000000) {
@@ -658,7 +658,7 @@ struct dvb_frontend* stv0299_attach(const struct stv0299_config* config,
 
        /* create dvb_frontend */
        state->frontend.ops = &state->ops;
-        state->frontend.demodulator_priv = state;
+       state->frontend.demodulator_priv = state;
        return &state->frontend;
 
 error:
@@ -714,7 +714,7 @@ MODULE_PARM_DESC(debug, "Turn on/off frontend debugging (default:off).");
 
 MODULE_DESCRIPTION("ST STV0299 DVB Demodulator driver");
 MODULE_AUTHOR("Ralph Metzler, Holger Waechtler, Peter Schildmann, Felix Domke, "
-              "Andreas Oberritter, Andrew de Quincey, Kenneth Aafløy");
+             "Andreas Oberritter, Andrew de Quincey, Kenneth Aafløy");
 MODULE_LICENSE("GPL");
 
 EXPORT_SYMBOL(stv0299_writereg);
index eaf130e666d8b232b311103a95ebdcb1cfd9db27..425cd19136fe351ed339077cb2e80863a2bf4268 100644 (file)
@@ -1,10 +1,10 @@
 /*
     TDA10021  - Single Chip Cable Channel Receiver driver module
-               used on the the Siemens DVB-C cards
+              used on the the Siemens DVB-C cards
 
     Copyright (C) 1999 Convergence Integrated Media GmbH <ralph@convergence.de>
     Copyright (C) 2004 Markus Schulz <msc@antzsystem.de>
-                   Support for TDA10021
+                  Support for TDA10021
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -76,9 +76,9 @@ static u8 tda10021_inittab[0x40]=
 
 static int tda10021_writereg (struct tda10021_state* state, u8 reg, u8 data)
 {
-        u8 buf[] = { reg, data };
+       u8 buf[] = { reg, data };
        struct i2c_msg msg = { .addr = state->config->demod_address, .flags = 0, .buf = buf, .len = 2 };
-        int ret;
+       int ret;
 
        ret = i2c_transfer (state->i2c, &msg, 1);
        if (ret != 1)
@@ -95,7 +95,7 @@ static u8 tda10021_readreg (struct tda10021_state* state, u8 reg)
        u8 b0 [] = { reg };
        u8 b1 [] = { 0 };
        struct i2c_msg msg [] = { { .addr = state->config->demod_address, .flags = 0, .buf = b0, .len = 1 },
-                                 { .addr = state->config->demod_address, .flags = I2C_M_RD, .buf = b1, .len = 1 } };
+                                 { .addr = state->config->demod_address, .flags = I2C_M_RD, .buf = b1, .len = 1 } };
        int ret;
 
        ret = i2c_transfer (state->i2c, msg, 2);
index 7d6a51ce291e13d41894f4b9c0d84b73fd60c7f7..53be939e8c5583e679f09e5afd25134224d22aab 100644 (file)
@@ -1,10 +1,10 @@
 /*
     TDA10021  - Single Chip Cable Channel Receiver driver module
-               used on the the Siemens DVB-C cards
+              used on the the Siemens DVB-C cards
 
     Copyright (C) 1999 Convergence Integrated Media GmbH <ralph@convergence.de>
     Copyright (C) 2004 Markus Schulz <msc@antzsystem.de>
-                   Support for TDA10021
+                  Support for TDA10021
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
index 7968743826fc50072d3a968baf4a76011cd03525..dd02aff467fe49c4acc7cd2674472cce88a10ad0 100644 (file)
@@ -475,7 +475,7 @@ static int tda10046_fwupload(struct dvb_frontend* fe)
                ret = state->config->request_firmware(fe, &fw, TDA10046_DEFAULT_FIRMWARE);
                if (ret) {
                        printk(KERN_ERR "tda1004x: no firmware upload (timeout or file not found?)\n");
-                       return ret;
+                       return ret;
                }
                tda1004x_write_mask(state, TDA1004X_CONFC4, 8, 8); // going to boot from HOST
                ret = tda1004x_do_upload(state, fw->data, fw->size, TDA10046H_CODE_CPT, TDA10046H_CODE_IN);
index c05cf1861051b3271effd7136625e5cc6b3cd543..91baa9cedd79846c90d58db1e4c12ee23551bb10 100644 (file)
@@ -66,13 +66,13 @@ static int tda8083_writereg (struct tda8083_state* state, u8 reg, u8 data)
        u8 buf [] = { reg, data };
        struct i2c_msg msg = { .addr = state->config->demod_address, .flags = 0, .buf = buf, .len = 2 };
 
-        ret = i2c_transfer(state->i2c, &msg, 1);
+       ret = i2c_transfer(state->i2c, &msg, 1);
 
-        if (ret != 1)
-                dprintk ("%s: writereg error (reg %02x, ret == %i)\n",
+       if (ret != 1)
+               dprintk ("%s: writereg error (reg %02x, ret == %i)\n",
                        __FUNCTION__, reg, ret);
 
-        return (ret != 1) ? -1 : 0;
+       return (ret != 1) ? -1 : 0;
 }
 
 static int tda8083_readregs (struct tda8083_state* state, u8 reg1, u8 *b, u8 len)
@@ -87,7 +87,7 @@ static int tda8083_readregs (struct tda8083_state* state, u8 reg1, u8 *b, u8 len
                dprintk ("%s: readreg error (reg %02x, ret == %i)\n",
                        __FUNCTION__, reg1, ret);
 
-        return ret == 2 ? 0 : -1;
+       return ret == 2 ? 0 : -1;
 }
 
 static inline u8 tda8083_readreg (struct tda8083_state* state, u8 reg)
@@ -132,14 +132,14 @@ static fe_code_rate_t tda8083_get_fec (struct tda8083_state* state)
 
 static int tda8083_set_symbolrate (struct tda8083_state* state, u32 srate)
 {
-        u32 ratio;
+       u32 ratio;
        u32 tmp;
        u8 filter;
 
        if (srate > 32000000)
-                srate = 32000000;
-        if (srate < 500000)
-                srate = 500000;
+               srate = 32000000;
+       if (srate < 500000)
+               srate = 500000;
 
        filter = 0;
        if (srate < 24000000)
@@ -174,7 +174,7 @@ static void tda8083_wait_diseqc_fifo (struct tda8083_state* state, int timeout)
        unsigned long start = jiffies;
 
        while (jiffies - start < timeout &&
-               !(tda8083_readreg(state, 0x02) & 0x80))
+              !(tda8083_readreg(state, 0x02) & 0x80))
        {
                msleep(50);
        };
index 87ea52757a2171243bb7e543d22506ea35a8cb02..992be0be6b1eb9bc2922154946b7d43ab0a6f78b 100644 (file)
@@ -217,10 +217,10 @@ static int arm_thread(void *data)
 
        dprintk(4, "%p\n",av7110);
 
-        lock_kernel();
-        daemonize("arm_mon");
-        sigfillset(&current->blocked);
-        unlock_kernel();
+       lock_kernel();
+       daemonize("arm_mon");
+       sigfillset(&current->blocked);
+       unlock_kernel();
 
        av7110->arm_thread = current;
 
@@ -1535,7 +1535,7 @@ static int alps_bsrv2_pll_set(struct dvb_frontend* fe, struct dvb_frontend_param
        buf[2] = ((div & 0x18000) >> 10) | 0x95;
        buf[3] = (pwr << 6) | 0x30;
 
-        // NOTE: since we're using a prescaler of 2, we set the
+       // NOTE: since we're using a prescaler of 2, we set the
        // divisor frequency to 62.5kHz and divide by 125 above
 
        if (i2c_transfer (&av7110->i2c_adap, &msg, 1) != 1)
@@ -1811,7 +1811,7 @@ static struct tda8083_config grundig_29504_451_config = {
 static int philips_cd1516_pll_set(struct dvb_frontend* fe,
                                  struct dvb_frontend_parameters* params)
 {
-        struct av7110* av7110 = fe->dvb->priv;
+       struct av7110* av7110 = fe->dvb->priv;
        u32 div;
        u32 f = params->frequency;
        u8 data[4];
@@ -2202,7 +2202,7 @@ static u8 read_pwm(struct av7110* av7110)
        struct i2c_msg msg[] = { { .addr = 0x50,.flags = 0,.buf = &b,.len = 1 },
                                 { .addr = 0x50,.flags = I2C_M_RD,.buf = &pwm,.len = 1} };
 
-        if ((i2c_transfer(&av7110->i2c_adap, msg, 2) != 2) || (pwm == 0xff))
+       if ((i2c_transfer(&av7110->i2c_adap, msg, 2) != 2) || (pwm == 0xff))
                pwm = 0x48;
 
        return pwm;
@@ -2245,7 +2245,7 @@ static int frontend_init(struct av7110 *av7110)
                        }
 
                        // Try the grundig 29504-451
-                        av7110->fe = tda8083_attach(&grundig_29504_451_config, &av7110->i2c_adap);
+                       av7110->fe = tda8083_attach(&grundig_29504_451_config, &av7110->i2c_adap);
                        if (av7110->fe) {
                                av7110->fe->ops->diseqc_send_master_cmd = av7110_diseqc_send_master_cmd;
                                av7110->fe->ops->diseqc_send_burst = av7110_diseqc_send_burst;
@@ -2271,12 +2271,12 @@ static int frontend_init(struct av7110 *av7110)
                case 0x0001: // Hauppauge/TT Nexus-T premium rev1.X
 
                        // ALPS TDLB7
-                        av7110->fe = sp8870_attach(&alps_tdlb7_config, &av7110->i2c_adap);
+                       av7110->fe = sp8870_attach(&alps_tdlb7_config, &av7110->i2c_adap);
                        break;
 
                case 0x0002: // Hauppauge/TT DVB-C premium rev2.X
 
-                        av7110->fe = ves1820_attach(&alps_tdbe2_config, &av7110->i2c_adap, read_pwm(av7110));
+                       av7110->fe = ves1820_attach(&alps_tdbe2_config, &av7110->i2c_adap, read_pwm(av7110));
                        break;
 
                case 0x0006: /* Fujitsu-Siemens DVB-S rev 1.6 */
@@ -2421,9 +2421,9 @@ static int av7110_attach(struct saa7146_dev* dev, struct saa7146_pci_extension_d
 
        dprintk(4, "dev: %p\n", dev);
 
-        /* Set RPS_IRQ to 1 to track rps1 activity.
-         * Enabling this won't send any interrupt to PC CPU.
-         */
+       /* Set RPS_IRQ to 1 to track rps1 activity.
+        * Enabling this won't send any interrupt to PC CPU.
+        */
 #define RPS_IRQ 0
 
        if (budgetpatch == 1) {
index 7442f56a72ecc77320f70d13eb68c5e8b9049f75..87106e8bf35bc83b3fa61c85018caae6c6436687 100644 (file)
@@ -1203,15 +1203,15 @@ int av7110_osd_cmd(struct av7110 *av7110, osd_cmd_t *dc)
 
 int av7110_osd_capability(struct av7110 *av7110, osd_cap_t *cap)
 {
-        switch (cap->cmd) {
-        case OSD_CAP_MEMSIZE:
-                if (FW_4M_SDRAM(av7110->arm_app))
-                        cap->val = 1000000;
-                else
-                        cap->val = 92000;
-                return 0;
-        default:
-                return -EINVAL;
-        }
+       switch (cap->cmd) {
+       case OSD_CAP_MEMSIZE:
+               if (FW_4M_SDRAM(av7110->arm_app))
+                       cap->val = 1000000;
+               else
+                       cap->val = 92000;
+               return 0;
+       default:
+               return -EINVAL;
+       }
 }
 #endif /* CONFIG_DVB_AV7110_OSD */
index 6af74f78b3e505a931d125814a12490b315b7efb..b5aea4129fa7304aebdd237678f91760cd6aeb48 100644 (file)
@@ -120,8 +120,8 @@ static int ves1820_writereg(struct saa7146_dev *dev, u8 addr, u8 reg, u8 data)
 
 static int stv0297_writereg(struct saa7146_dev *dev, u8 addr, u8 reg, u8 data)
 {
-        u8 buf [] = { reg, data };
-        struct i2c_msg msg = { .addr = addr, .flags = 0, .buf = buf, .len = 2 };
+       u8 buf [] = { reg, data };
+       struct i2c_msg msg = { .addr = addr, .flags = 0, .buf = buf, .len = 2 };
 
        if (1 != saa7146_i2c_transfer(dev, &msg, 1, 1))
                return -1;
index 0498a055a4cdfbe2d07df5b782e16c3644d35ebd..017fcbccb8cc8c1eb737e7b41916001c16f2496b 100644 (file)
@@ -87,7 +87,7 @@ static int start_ts_capture(struct budget *budget)
         *      Pitch: 188, NumBytes3: 188, NumLines3: 1024
         */
 
-        switch(budget->card->type) {
+       switch(budget->card->type) {
        case BUDGET_FS_ACTIVY:
                saa7146_write(dev, DD1_INIT, 0x04000000);
                saa7146_write(dev, MC2, (MASK_09 | MASK_25));
index 755df81cbc49af739387b8a7e42cc8f0b41df35d..fc416cf5253ca7dacee87fb17fb76d081f8b048e 100644 (file)
@@ -45,11 +45,11 @@ MAKE_BUDGET_INFO(ttbp, "TT-Budget/Patch DVB-S 1.x PCI", BUDGET_PATCH);
 //MAKE_BUDGET_INFO(satel,"TT-Budget/Patch SATELCO PCI", BUDGET_TT_HW_DISEQC);
 
 static struct pci_device_id pci_tbl[] = {
-        MAKE_EXTENSION_PCI(ttbp,0x13c2, 0x0000),
+       MAKE_EXTENSION_PCI(ttbp,0x13c2, 0x0000),
 //        MAKE_EXTENSION_PCI(satel, 0x13c2, 0x1013),
-        {
-                .vendor    = 0,
-        }
+       {
+               .vendor    = 0,
+       }
 };
 
 /* those lines are for budget-patch to be tried
@@ -165,57 +165,57 @@ static int budget_diseqc_send_burst(struct dvb_frontend* fe, fe_sec_mini_cmd_t m
 
 static int budget_av7110_send_fw_cmd(struct budget_patch *budget, u16* buf, int length)
 {
-        int i;
-
-        dprintk(2, "budget: %p\n", budget);
-
-        for (i = 2; i < length; i++)
-        {
-                  ttpci_budget_debiwrite(budget, DEBINOSWAP, COMMAND + 2*i, 2, (u32) buf[i], 0,0);
-                  msleep(5);
-        }
-        if (length)
-                  ttpci_budget_debiwrite(budget, DEBINOSWAP, COMMAND + 2, 2, (u32) buf[1], 0,0);
-        else
-                  ttpci_budget_debiwrite(budget, DEBINOSWAP, COMMAND + 2, 2, 0, 0,0);
-        msleep(5);
-        ttpci_budget_debiwrite(budget, DEBINOSWAP, COMMAND, 2, (u32) buf[0], 0,0);
-        msleep(5);
-        return 0;
+       int i;
+
+       dprintk(2, "budget: %p\n", budget);
+
+       for (i = 2; i < length; i++)
+       {
+                 ttpci_budget_debiwrite(budget, DEBINOSWAP, COMMAND + 2*i, 2, (u32) buf[i], 0,0);
+                 msleep(5);
+       }
+       if (length)
+                 ttpci_budget_debiwrite(budget, DEBINOSWAP, COMMAND + 2, 2, (u32) buf[1], 0,0);
+       else
+                 ttpci_budget_debiwrite(budget, DEBINOSWAP, COMMAND + 2, 2, 0, 0,0);
+       msleep(5);
+       ttpci_budget_debiwrite(budget, DEBINOSWAP, COMMAND, 2, (u32) buf[0], 0,0);
+       msleep(5);
+       return 0;
 }
 
 static void av7110_set22k(struct budget_patch *budget, int state)
 {
-        u16 buf[2] = {( COMTYPE_AUDIODAC << 8) | (state ? ON22K : OFF22K), 0};
+       u16 buf[2] = {( COMTYPE_AUDIODAC << 8) | (state ? ON22K : OFF22K), 0};
 
-        dprintk(2, "budget: %p\n", budget);
-        budget_av7110_send_fw_cmd(budget, buf, 2);
+       dprintk(2, "budget: %p\n", budget);
+       budget_av7110_send_fw_cmd(budget, buf, 2);
 }
 
 static int av7110_send_diseqc_msg(struct budget_patch *budget, int len, u8 *msg, int burst)
 {
-        int i;
-        u16 buf[18] = { ((COMTYPE_AUDIODAC << 8) | SendDiSEqC),
-                16, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 };
+       int i;
+       u16 buf[18] = { ((COMTYPE_AUDIODAC << 8) | SendDiSEqC),
+               16, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 };
 
-        dprintk(2, "budget: %p\n", budget);
+       dprintk(2, "budget: %p\n", budget);
 
-        if (len>10)
-                len=10;
+       if (len>10)
+               len=10;
 
-        buf[1] = len+2;
-        buf[2] = len;
+       buf[1] = len+2;
+       buf[2] = len;
 
-        if (burst != -1)
-                buf[3]=burst ? 0x01 : 0x00;
-        else
-                buf[3]=0xffff;
+       if (burst != -1)
+               buf[3]=burst ? 0x01 : 0x00;
+       else
+               buf[3]=0xffff;
 
-        for (i=0; i<len; i++)
-                buf[i+4]=msg[i];
+       for (i=0; i<len; i++)
+               buf[i+4]=msg[i];
 
-        budget_av7110_send_fw_cmd(budget, buf, 18);
-        return 0;
+       budget_av7110_send_fw_cmd(budget, buf, 18);
+       return 0;
 }
 
 static int budget_patch_set_tone(struct dvb_frontend* fe, fe_sec_tone_mode_t tone)
@@ -276,7 +276,7 @@ static int alps_bsrv2_pll_set(struct dvb_frontend* fe, struct dvb_frontend_param
        buf[2] = ((div & 0x18000) >> 10) | 0x95;
        buf[3] = (pwr << 6) | 0x30;
 
-        // NOTE: since we're using a prescaler of 2, we set the
+       // NOTE: since we're using a prescaler of 2, we set the
        // divisor frequency to 62.5kHz and divide by 125 above
 
        if (i2c_transfer (&budget->i2c_adap, &msg, 1) != 1) return -EIO;
@@ -294,7 +294,7 @@ static u8 alps_bsru6_inittab[] = {
        0x01, 0x15,
        0x02, 0x00,
        0x03, 0x00,
-        0x04, 0x7d,   /* F22FR = 0x7d, F22 = f_VCO / 128 / 0x7d = 22 kHz */
+       0x04, 0x7d,   /* F22FR = 0x7d, F22 = f_VCO / 128 / 0x7d = 22 kHz */
        0x05, 0x35,   /* I2CT = 0, SCLT = 1, SDAT = 1 */
        0x06, 0x40,   /* DAC not used, set to high impendance mode */
        0x07, 0x00,   /* DAC LSB */
@@ -413,7 +413,7 @@ static void frontend_init(struct budget_patch* budget)
 {
        switch(budget->dev->pci->subsystem_device) {
        case 0x0000: // Hauppauge/TT WinTV DVB-S rev1.X
-        case 0x1013: // SATELCO Multimedia PCI
+       case 0x1013: // SATELCO Multimedia PCI
 
                // try the ALPS BSRV2 first of all
                budget->dvb_frontend = ves1x93_attach(&alps_bsrv2_config, &budget->i2c_adap);
@@ -463,8 +463,8 @@ static void frontend_init(struct budget_patch* budget)
 /* written by Emard */
 static int budget_patch_attach (struct saa7146_dev* dev, struct saa7146_pci_extension_data *info)
 {
-        struct budget_patch *budget;
-        int err;
+       struct budget_patch *budget;
+       int err;
        int count = 0;
        int detected = 0;
 
@@ -472,12 +472,12 @@ static int budget_patch_attach (struct saa7146_dev* dev, struct saa7146_pci_exte
 #define RPS_IRQ 0
 #define HPS_SETUP 0
 #if PATCH_RESET
-        saa7146_write(dev, MC1, MASK_31);
-        msleep(40);
+       saa7146_write(dev, MC1, MASK_31);
+       msleep(40);
 #endif
 #if HPS_SETUP
-        // initialize registers. Better to have it like this
-        // than leaving something unconfigured
+       // initialize registers. Better to have it like this
+       // than leaving something unconfigured
        saa7146_write(dev, DD1_STREAM_B, 0);
        // port B VSYNC at rising edge
        saa7146_write(dev, DD1_INIT, 0x00000200);  // have this in budget-core too!
@@ -486,29 +486,29 @@ static int budget_patch_attach (struct saa7146_dev* dev, struct saa7146_pci_exte
        // debi config
        // saa7146_write(dev, DEBI_CONFIG, MASK_30|MASK_28|MASK_18);
 
-        // zero all HPS registers
-        saa7146_write(dev, HPS_H_PRESCALE, 0);                  // r68
-        saa7146_write(dev, HPS_H_SCALE, 0);                     // r6c
-        saa7146_write(dev, BCS_CTRL, 0);                        // r70
-        saa7146_write(dev, HPS_V_SCALE, 0);                     // r60
-        saa7146_write(dev, HPS_V_GAIN, 0);                      // r64
-        saa7146_write(dev, CHROMA_KEY_RANGE, 0);                // r74
-        saa7146_write(dev, CLIP_FORMAT_CTRL, 0);                // r78
-        // Set HPS prescaler for port B input
-        saa7146_write(dev, HPS_CTRL, (1<<30) | (0<<29) | (1<<28) | (0<<12) );
-        saa7146_write(dev, MC2,
-          0 * (MASK_08 | MASK_24)  |   // BRS control
-          0 * (MASK_09 | MASK_25)  |   // a
-          0 * (MASK_10 | MASK_26)  |   // b
-          1 * (MASK_06 | MASK_22)  |   // HPS_CTRL1
-          1 * (MASK_05 | MASK_21)  |   // HPS_CTRL2
-          0 * (MASK_01 | MASK_15)      // DEBI
-           );
+       // zero all HPS registers
+       saa7146_write(dev, HPS_H_PRESCALE, 0);                  // r68
+       saa7146_write(dev, HPS_H_SCALE, 0);                     // r6c
+       saa7146_write(dev, BCS_CTRL, 0);                        // r70
+       saa7146_write(dev, HPS_V_SCALE, 0);                     // r60
+       saa7146_write(dev, HPS_V_GAIN, 0);                      // r64
+       saa7146_write(dev, CHROMA_KEY_RANGE, 0);                // r74
+       saa7146_write(dev, CLIP_FORMAT_CTRL, 0);                // r78
+       // Set HPS prescaler for port B input
+       saa7146_write(dev, HPS_CTRL, (1<<30) | (0<<29) | (1<<28) | (0<<12) );
+       saa7146_write(dev, MC2,
+         0 * (MASK_08 | MASK_24)  |   // BRS control
+         0 * (MASK_09 | MASK_25)  |   // a
+         0 * (MASK_10 | MASK_26)  |   // b
+         1 * (MASK_06 | MASK_22)  |   // HPS_CTRL1
+         1 * (MASK_05 | MASK_21)  |   // HPS_CTRL2
+         0 * (MASK_01 | MASK_15)      // DEBI
+          );
 #endif
        // Disable RPS1 and RPS0
-        saa7146_write(dev, MC1, ( MASK_29 | MASK_28));
-        // RPS1 timeout disable
-        saa7146_write(dev, RPS_TOV1, 0);
+       saa7146_write(dev, MC1, ( MASK_29 | MASK_28));
+       // RPS1 timeout disable
+       saa7146_write(dev, RPS_TOV1, 0);
 
        // code for autodetection
        // will wait for VBI_B event (vertical blank at port B)
@@ -521,38 +521,38 @@ static int budget_patch_attach (struct saa7146_dev* dev, struct saa7146_pci_exte
        WRITE_RPS1(cpu_to_le32(CMD_UPLOAD |
          MASK_10 | MASK_09 | MASK_08 | MASK_06 | MASK_05 | MASK_04 | MASK_03 | MASK_02 ));
 #endif
-        WRITE_RPS1(cpu_to_le32(CMD_PAUSE | EVT_VBI_B));
-        WRITE_RPS1(cpu_to_le32(CMD_WR_REG_MASK | (GPIO_CTRL>>2)));
-        WRITE_RPS1(cpu_to_le32(GPIO3_MSK));
-        WRITE_RPS1(cpu_to_le32(SAA7146_GPIO_OUTLO<<24));
+       WRITE_RPS1(cpu_to_le32(CMD_PAUSE | EVT_VBI_B));
+       WRITE_RPS1(cpu_to_le32(CMD_WR_REG_MASK | (GPIO_CTRL>>2)));
+       WRITE_RPS1(cpu_to_le32(GPIO3_MSK));
+       WRITE_RPS1(cpu_to_le32(SAA7146_GPIO_OUTLO<<24));
 #if RPS_IRQ
-        // issue RPS1 interrupt to increment counter
-        WRITE_RPS1(cpu_to_le32(CMD_INTERRUPT));
-        // at least a NOP is neede between two interrupts
-        WRITE_RPS1(cpu_to_le32(CMD_NOP));
-        // interrupt again
-        WRITE_RPS1(cpu_to_le32(CMD_INTERRUPT));
+       // issue RPS1 interrupt to increment counter
+       WRITE_RPS1(cpu_to_le32(CMD_INTERRUPT));
+       // at least a NOP is neede between two interrupts
+       WRITE_RPS1(cpu_to_le32(CMD_NOP));
+       // interrupt again
+       WRITE_RPS1(cpu_to_le32(CMD_INTERRUPT));
 #endif
-        WRITE_RPS1(cpu_to_le32(CMD_STOP));
+       WRITE_RPS1(cpu_to_le32(CMD_STOP));
 
 #if RPS_IRQ
-        // set event counter 1 source as RPS1 interrupt (0x03)          (rE4 p53)
-        // use 0x03 to track RPS1 interrupts - increase by 1 every gpio3 is toggled
-        // use 0x15 to track VPE  interrupts - increase by 1 every vpeirq() is called
-        saa7146_write(dev, EC1SSR, (0x03<<2) | 3 );
-        // set event counter 1 treshold to maximum allowed value        (rEC p55)
-        saa7146_write(dev, ECT1R,  0x3fff );
+       // set event counter 1 source as RPS1 interrupt (0x03)          (rE4 p53)
+       // use 0x03 to track RPS1 interrupts - increase by 1 every gpio3 is toggled
+       // use 0x15 to track VPE  interrupts - increase by 1 every vpeirq() is called
+       saa7146_write(dev, EC1SSR, (0x03<<2) | 3 );
+       // set event counter 1 treshold to maximum allowed value        (rEC p55)
+       saa7146_write(dev, ECT1R,  0x3fff );
 #endif
-        // Fix VSYNC level
-        saa7146_setgpio(dev, 3, SAA7146_GPIO_OUTLO);
-        // Set RPS1 Address register to point to RPS code               (r108 p42)
-        saa7146_write(dev, RPS_ADDR1, dev->d_rps1.dma_handle);
-        // Enable RPS1,                                                 (rFC p33)
-        saa7146_write(dev, MC1, (MASK_13 | MASK_29 ));
+       // Fix VSYNC level
+       saa7146_setgpio(dev, 3, SAA7146_GPIO_OUTLO);
+       // Set RPS1 Address register to point to RPS code               (r108 p42)
+       saa7146_write(dev, RPS_ADDR1, dev->d_rps1.dma_handle);
+       // Enable RPS1,                                                 (rFC p33)
+       saa7146_write(dev, MC1, (MASK_13 | MASK_29 ));
 
 
-        mdelay(50);
-        saa7146_setgpio(dev, 3, SAA7146_GPIO_OUTHI);
+       mdelay(50);
+       saa7146_setgpio(dev, 3, SAA7146_GPIO_OUTHI);
        mdelay(150);
 
 
@@ -560,17 +560,17 @@ static int budget_patch_attach (struct saa7146_dev* dev, struct saa7146_pci_exte
                detected = 1;
 
 #if RPS_IRQ
-        printk("Event Counter 1 0x%04x\n", saa7146_read(dev, EC1R) & 0x3fff );
+       printk("Event Counter 1 0x%04x\n", saa7146_read(dev, EC1R) & 0x3fff );
 #endif
        // Disable RPS1
-        saa7146_write(dev, MC1, ( MASK_29 ));
+       saa7146_write(dev, MC1, ( MASK_29 ));
 
        if(detected == 0)
-                printk("budget-patch not detected or saa7146 in non-default state.\n"
-                       "try enabling ressetting of 7146 with MASK_31 in MC1 register\n");
+               printk("budget-patch not detected or saa7146 in non-default state.\n"
+                      "try enabling ressetting of 7146 with MASK_31 in MC1 register\n");
 
        else
-                printk("BUDGET-PATCH DETECTED.\n");
+               printk("BUDGET-PATCH DETECTED.\n");
 
 
 /*      OLD (Original design by Roberto Deza):
@@ -641,83 +641,83 @@ static int budget_patch_attach (struct saa7146_dev* dev, struct saa7146_pci_exte
 */
 
        // Setup RPS1 "program" (p35)
-        count = 0;
+       count = 0;
 
 
-        // Wait Source Line Counter Threshold                           (p36)
-        WRITE_RPS1(cpu_to_le32(CMD_PAUSE | EVT_HS));
-        // Set GPIO3=1                                                  (p42)
-        WRITE_RPS1(cpu_to_le32(CMD_WR_REG_MASK | (GPIO_CTRL>>2)));
-        WRITE_RPS1(cpu_to_le32(GPIO3_MSK));
-        WRITE_RPS1(cpu_to_le32(SAA7146_GPIO_OUTHI<<24));
+       // Wait Source Line Counter Threshold                           (p36)
+       WRITE_RPS1(cpu_to_le32(CMD_PAUSE | EVT_HS));
+       // Set GPIO3=1                                                  (p42)
+       WRITE_RPS1(cpu_to_le32(CMD_WR_REG_MASK | (GPIO_CTRL>>2)));
+       WRITE_RPS1(cpu_to_le32(GPIO3_MSK));
+       WRITE_RPS1(cpu_to_le32(SAA7146_GPIO_OUTHI<<24));
 #if RPS_IRQ
-        // issue RPS1 interrupt
-        WRITE_RPS1(cpu_to_le32(CMD_INTERRUPT));
+       // issue RPS1 interrupt
+       WRITE_RPS1(cpu_to_le32(CMD_INTERRUPT));
 #endif
-        // Wait reset Source Line Counter Threshold                     (p36)
-        WRITE_RPS1(cpu_to_le32(CMD_PAUSE | RPS_INV | EVT_HS));
-        // Set GPIO3=0                                                  (p42)
-        WRITE_RPS1(cpu_to_le32(CMD_WR_REG_MASK | (GPIO_CTRL>>2)));
-        WRITE_RPS1(cpu_to_le32(GPIO3_MSK));
-        WRITE_RPS1(cpu_to_le32(SAA7146_GPIO_OUTLO<<24));
+       // Wait reset Source Line Counter Threshold                     (p36)
+       WRITE_RPS1(cpu_to_le32(CMD_PAUSE | RPS_INV | EVT_HS));
+       // Set GPIO3=0                                                  (p42)
+       WRITE_RPS1(cpu_to_le32(CMD_WR_REG_MASK | (GPIO_CTRL>>2)));
+       WRITE_RPS1(cpu_to_le32(GPIO3_MSK));
+       WRITE_RPS1(cpu_to_le32(SAA7146_GPIO_OUTLO<<24));
 #if RPS_IRQ
-        // issue RPS1 interrupt
-        WRITE_RPS1(cpu_to_le32(CMD_INTERRUPT));
+       // issue RPS1 interrupt
+       WRITE_RPS1(cpu_to_le32(CMD_INTERRUPT));
 #endif
-        // Jump to begin of RPS program                                 (p37)
-        WRITE_RPS1(cpu_to_le32(CMD_JUMP));
-        WRITE_RPS1(cpu_to_le32(dev->d_rps1.dma_handle));
-
-        // Fix VSYNC level
-        saa7146_setgpio(dev, 3, SAA7146_GPIO_OUTLO);
-        // Set RPS1 Address register to point to RPS code               (r108 p42)
-        saa7146_write(dev, RPS_ADDR1, dev->d_rps1.dma_handle);
-        // Set Source Line Counter Threshold, using BRS                 (rCC p43)
-        // It generates HS event every TS_HEIGHT lines
-        // this is related to TS_WIDTH set in register
-        // NUM_LINE_BYTE3 in budget-core.c. If NUM_LINE_BYTE
-        // low 16 bits are set to TS_WIDTH bytes (TS_WIDTH=2*188
-        //,then RPS_THRESH1
-        // should be set to trigger every TS_HEIGHT (512) lines.
-        //
-        saa7146_write(dev, RPS_THRESH1, (TS_HEIGHT*1) | MASK_12 );
+       // Jump to begin of RPS program                                 (p37)
+       WRITE_RPS1(cpu_to_le32(CMD_JUMP));
+       WRITE_RPS1(cpu_to_le32(dev->d_rps1.dma_handle));
 
-        // saa7146_write(dev, RPS_THRESH0, ((TS_HEIGHT/2)<<16) |MASK_28| (TS_HEIGHT/2) |MASK_12 );
-        // Enable RPS1                                                  (rFC p33)
-        saa7146_write(dev, MC1, (MASK_13 | MASK_29));
-
-
-        if (!(budget = kmalloc (sizeof(struct budget_patch), GFP_KERNEL)))
-                return -ENOMEM;
+       // Fix VSYNC level
+       saa7146_setgpio(dev, 3, SAA7146_GPIO_OUTLO);
+       // Set RPS1 Address register to point to RPS code               (r108 p42)
+       saa7146_write(dev, RPS_ADDR1, dev->d_rps1.dma_handle);
+       // Set Source Line Counter Threshold, using BRS                 (rCC p43)
+       // It generates HS event every TS_HEIGHT lines
+       // this is related to TS_WIDTH set in register
+       // NUM_LINE_BYTE3 in budget-core.c. If NUM_LINE_BYTE
+       // low 16 bits are set to TS_WIDTH bytes (TS_WIDTH=2*188
+       //,then RPS_THRESH1
+       // should be set to trigger every TS_HEIGHT (512) lines.
+       //
+       saa7146_write(dev, RPS_THRESH1, (TS_HEIGHT*1) | MASK_12 );
+
+       // saa7146_write(dev, RPS_THRESH0, ((TS_HEIGHT/2)<<16) |MASK_28| (TS_HEIGHT/2) |MASK_12 );
+       // Enable RPS1                                                  (rFC p33)
+       saa7146_write(dev, MC1, (MASK_13 | MASK_29));
+
+
+       if (!(budget = kmalloc (sizeof(struct budget_patch), GFP_KERNEL)))
+               return -ENOMEM;
 
-        dprintk(2, "budget: %p\n", budget);
+       dprintk(2, "budget: %p\n", budget);
 
-        if ((err = ttpci_budget_init (budget, dev, info, THIS_MODULE))) {
-                kfree (budget);
-                return err;
-        }
+       if ((err = ttpci_budget_init (budget, dev, info, THIS_MODULE))) {
+               kfree (budget);
+               return err;
+       }
 
 
-        dev->ext_priv = budget;
+       dev->ext_priv = budget;
 
        budget->dvb_adapter.priv = budget;
        frontend_init(budget);
 
-        return 0;
+       return 0;
 }
 
 static int budget_patch_detach (struct saa7146_dev* dev)
 {
-        struct budget_patch *budget = (struct budget_patch*) dev->ext_priv;
-        int err;
+       struct budget_patch *budget = (struct budget_patch*) dev->ext_priv;
+       int err;
 
        if (budget->dvb_frontend) dvb_unregister_frontend(budget->dvb_frontend);
 
-        err = ttpci_budget_deinit (budget);
+       err = ttpci_budget_deinit (budget);
 
-        kfree (budget);
+       kfree (budget);
 
-        return err;
+       return err;
 }
 
 static int __init budget_patch_init(void)
@@ -727,20 +727,20 @@ static int __init budget_patch_init(void)
 
 static void __exit budget_patch_exit(void)
 {
-        saa7146_unregister_extension(&budget_extension);
+       saa7146_unregister_extension(&budget_extension);
 }
 
 static struct saa7146_extension budget_extension = {
-        .name           = "budget_patch dvb\0",
-        .flags          = 0,
+       .name           = "budget_patch dvb\0",
+       .flags          = 0,
 
-        .module         = THIS_MODULE,
-        .pci_tbl        = pci_tbl,
-        .attach         = budget_patch_attach,
-        .detach         = budget_patch_detach,
+       .module         = THIS_MODULE,
+       .pci_tbl        = pci_tbl,
+       .attach         = budget_patch_attach,
+       .detach         = budget_patch_detach,
 
-        .irq_mask       = MASK_10,
-        .irq_func       = ttpci_budget_irq10_handler,
+       .irq_mask       = MASK_10,
+       .irq_func       = ttpci_budget_irq10_handler,
 };
 
 module_init(budget_patch_init);
@@ -749,4 +749,4 @@ module_exit(budget_patch_exit);
 MODULE_LICENSE("GPL");
 MODULE_AUTHOR("Emard, Roberto Deza, Holger Waechtler, Michael Hunold, others");
 MODULE_DESCRIPTION("Driver for full TS modified DVB-S SAA7146+AV7110 "
-                   "based so-called Budget Patch cards");
+                  "based so-called Budget Patch cards");
index bc4ce7559cbe93ee301b3fcd006a264357c46a68..fafe6407b3d0d3deb7ba658ea440321de1da44ee 100644 (file)
@@ -256,7 +256,7 @@ static int alps_bsrv2_pll_set(struct dvb_frontend* fe, struct dvb_frontend_param
        buf[2] = ((div & 0x18000) >> 10) | 0x95;
        buf[3] = (pwr << 6) | 0x30;
 
-        // NOTE: since we're using a prescaler of 2, we set the
+       // NOTE: since we're using a prescaler of 2, we set the
        // divisor frequency to 62.5kHz and divide by 125 above
 
        if (i2c_transfer (&budget->i2c_adap, &msg, 1) != 1) return -EIO;
@@ -565,7 +565,7 @@ static u8 read_pwm(struct budget* budget)
        struct i2c_msg msg[] = { { .addr = 0x50,.flags = 0,.buf = &b,.len = 1 },
                                 { .addr = 0x50,.flags = I2C_M_RD,.buf = &pwm,.len = 1} };
 
-        if ((i2c_transfer(&budget->i2c_adap, msg, 2) != 2) || (pwm == 0xff))
+       if ((i2c_transfer(&budget->i2c_adap, msg, 2) != 2) || (pwm == 0xff))
                pwm = 0x48;
 
        return pwm;
@@ -593,7 +593,7 @@ static void frontend_init(struct budget *budget)
                budget->dvb_frontend = ves1x93_attach(&alps_bsrv2_config, &budget->i2c_adap);
                if (budget->dvb_frontend) {
                        budget->dvb_frontend->ops->diseqc_send_master_cmd = budget_diseqc_send_master_cmd;
-                       budget->dvb_frontend->ops->diseqc_send_burst = budget_diseqc_send_burst;
+                       budget->dvb_frontend->ops->diseqc_send_burst = budget_diseqc_send_burst;
                        budget->dvb_frontend->ops->set_tone = budget_set_tone;
                        break;
                }
index c6ef496ba70a069874cbee3443462f8755cb6691..fdaa3318ad3aef2d773f7e0d9aa783b382c47a97 100644 (file)
@@ -19,7 +19,7 @@ extern int budget_debug;
 #endif
 
 #define dprintk(level,args...) \
-            do { if ((budget_debug & level)) { printk("%s: %s(): ",__stringify(KBUILD_MODNAME), __FUNCTION__); printk(args); } } while (0)
+           do { if ((budget_debug & level)) { printk("%s: %s(): ",__stringify(KBUILD_MODNAME), __FUNCTION__); printk(args); } } while (0)
 
 struct budget_info {
        char *name;
index 0b478db3e7449fe90d4f3d24ad199f99484150f7..c90001d35e7dafcf575db0b6f470bc8d2ee8ec02 100644 (file)
@@ -36,7 +36,7 @@ int main(int argc, char **argv)
     }
 
     fprintf(fd_out, "\n};\n\n");
-    
+
     fclose(fd_in);
     fclose(fd_out);
 
index ac79ef178c0555452dfdb78b5fb818e6ab636e7f..18aa22b5478d654d15e37cddd7712c57bd09e609 100644 (file)
@@ -13,7 +13,7 @@
     Holger Waechtler   Convergence
 
     Copyright (C) 2002-2003 Ralph Metzler <rjkm@metzlerbros.de>
-                            Metzler Brothers Systementwicklung GbR
+                           Metzler Brothers Systementwicklung GbR
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
 
 static int check_mac_tt(u8 *buf)
 {
-        int i;
-        u16 tmp = 0xffff;
-
-        for (i = 0; i < 8; i++) {
-                tmp  = (tmp << 8) | ((tmp >> 8) ^ buf[i]);
-                tmp ^= (tmp >> 4) & 0x0f;
-                tmp ^= (tmp << 12) ^ ((tmp & 0xff) << 5);
-        }
-        tmp ^= 0xffff;
-        return (((tmp >> 8) ^ buf[8]) | ((tmp & 0xff) ^ buf[9]));
+       int i;
+       u16 tmp = 0xffff;
+
+       for (i = 0; i < 8; i++) {
+               tmp  = (tmp << 8) | ((tmp >> 8) ^ buf[i]);
+               tmp ^= (tmp >> 4) & 0x0f;
+               tmp ^= (tmp << 12) ^ ((tmp & 0xff) << 5);
+       }
+       tmp ^= 0xffff;
+       return (((tmp >> 8) ^ buf[8]) | ((tmp & 0xff) ^ buf[9]));
 }
 
 static int getmac_tt(u8 * decodedMAC, u8 * encodedMAC)
 {
-        u8 xor[20] = { 0x72, 0x23, 0x68, 0x19, 0x5c, 0xa8, 0x71, 0x2c,
+       u8 xor[20] = { 0x72, 0x23, 0x68, 0x19, 0x5c, 0xa8, 0x71, 0x2c,
                       0x54, 0xd3, 0x7b, 0xf1, 0x9E, 0x23, 0x16, 0xf6,
                       0x1d, 0x36, 0x64, 0x78};
-        u8 data[20];
-        int i;
+       u8 data[20];
+       int i;
 
        /* In case there is a sig check failure have the orig contents available */
        memcpy(data, encodedMAC, 20);
 
        for (i = 0; i < 20; i++)
-                data[i] ^= xor[i];
-        for (i = 0; i < 10; i++)
-                data[i] = ((data[2 * i + 1] << 8) | data[2 * i])
+               data[i] ^= xor[i];
+       for (i = 0; i < 10; i++)
+               data[i] = ((data[2 * i + 1] << 8) | data[2 * i])
                        >> ((data[2 * i + 1] >> 6) & 3);
 
-        if (check_mac_tt(data))
-                return -ENODEV;
+       if (check_mac_tt(data))
+               return -ENODEV;
 
        decodedMAC[0] = data[2]; decodedMAC[1] = data[1]; decodedMAC[2] = data[0];
        decodedMAC[3] = data[6]; decodedMAC[4] = data[5]; decodedMAC[5] = data[4];
-        return 0;
+       return 0;
 }
 
 static int ttpci_eeprom_read_encodedMAC(struct i2c_adapter *adapter, u8 * encodedMAC)
index fd53d6010502fa54d108769b06ea01060da92772..104df610dbe1d59b81b5488f92a65e500a6e7986 100644 (file)
@@ -225,8 +225,8 @@ static int ttusb_i2c_msg(struct ttusb *ttusb,
 
        err = ttusb_result(ttusb, b, 0x20);
 
-        /* check if the i2c transaction was successful */
-        if ((snd_len != b[5]) || (rcv_len != b[6])) return -EREMOTEIO;
+       /* check if the i2c transaction was successful */
+       if ((snd_len != b[5]) || (rcv_len != b[6])) return -EREMOTEIO;
 
        if (rcv_len > 0) {
 
@@ -489,27 +489,27 @@ static int ttusb_send_diseqc(struct dvb_frontend* fe,
 
 static int lnbp21_set_voltage(struct dvb_frontend* fe, fe_sec_voltage_t voltage)
 {
-        struct  ttusb* ttusb = (struct ttusb*)  fe->dvb->priv;
-        int ret;
-        u8 data[1];
-        struct i2c_msg msg = { .addr = 0x08, .flags = 0, .buf = data, .len = sizeof(data) };
-
-        switch(voltage) {
-        case SEC_VOLTAGE_OFF:
-                data[0] = 0x00;
-                break;
-        case SEC_VOLTAGE_13:
-                data[0] = 0x44;
-                break;
-        case SEC_VOLTAGE_18:
-                data[0] = 0x4c;
-                break;
-        default:
-                return -EINVAL;
-        };
-
-        ret = i2c_transfer(&ttusb->i2c_adap, &msg, 1);
-        return (ret != 1) ? -EIO : 0;
+       struct  ttusb* ttusb = (struct ttusb*)  fe->dvb->priv;
+       int ret;
+       u8 data[1];
+       struct i2c_msg msg = { .addr = 0x08, .flags = 0, .buf = data, .len = sizeof(data) };
+
+       switch(voltage) {
+       case SEC_VOLTAGE_OFF:
+               data[0] = 0x00;
+               break;
+       case SEC_VOLTAGE_13:
+               data[0] = 0x44;
+               break;
+       case SEC_VOLTAGE_18:
+               data[0] = 0x4c;
+               break;
+       default:
+               return -EINVAL;
+       };
+
+       ret = i2c_transfer(&ttusb->i2c_adap, &msg, 1);
+       return (ret != 1) ? -EIO : 0;
 }
 
 static int ttusb_update_lnb(struct ttusb *ttusb)
@@ -1184,45 +1184,45 @@ static struct tda1004x_config philips_tdm1316l_config = {
 };
 
 static u8 alps_bsbe1_inittab[] = {
-        0x01, 0x15,
-        0x02, 0x30,
-        0x03, 0x00,
-        0x04, 0x7d,             /* F22FR = 0x7d, F22 = f_VCO / 128 / 0x7d = 22 kHz */
-        0x05, 0x35,             /* I2CT = 0, SCLT = 1, SDAT = 1 */
-        0x06, 0x40,             /* DAC not used, set to high impendance mode */
-        0x07, 0x00,             /* DAC LSB */
-        0x08, 0x40,             /* DiSEqC off, LNB power on OP2/LOCK pin on */
-        0x09, 0x00,             /* FIFO */
-        0x0c, 0x51,             /* OP1 ctl = Normal, OP1 val = 1 (LNB Power ON) */
-        0x0d, 0x82,             /* DC offset compensation = ON, beta_agc1 = 2 */
-        0x0e, 0x23,             /* alpha_tmg = 2, beta_tmg = 3 */
-        0x10, 0x3f,             // AGC2  0x3d
-        0x11, 0x84,
-        0x12, 0xb9,
-        0x15, 0xc9,             // lock detector threshold
-        0x16, 0x00,
-        0x17, 0x00,
-        0x18, 0x00,
-        0x19, 0x00,
-        0x1a, 0x00,
-        0x1f, 0x50,
-        0x20, 0x00,
-        0x21, 0x00,
-        0x22, 0x00,
-        0x23, 0x00,
-        0x28, 0x00,             // out imp: normal  out type: parallel FEC mode:0
-        0x29, 0x1e,             // 1/2 threshold
-        0x2a, 0x14,             // 2/3 threshold
-        0x2b, 0x0f,             // 3/4 threshold
-        0x2c, 0x09,             // 5/6 threshold
-        0x2d, 0x05,             // 7/8 threshold
-        0x2e, 0x01,
-        0x31, 0x1f,             // test all FECs
-        0x32, 0x19,             // viterbi and synchro search
-        0x33, 0xfc,             // rs control
-        0x34, 0x93,             // error control
-        0x0f, 0x92,
-        0xff, 0xff
+       0x01, 0x15,
+       0x02, 0x30,
+       0x03, 0x00,
+       0x04, 0x7d,             /* F22FR = 0x7d, F22 = f_VCO / 128 / 0x7d = 22 kHz */
+       0x05, 0x35,             /* I2CT = 0, SCLT = 1, SDAT = 1 */
+       0x06, 0x40,             /* DAC not used, set to high impendance mode */
+       0x07, 0x00,             /* DAC LSB */
+       0x08, 0x40,             /* DiSEqC off, LNB power on OP2/LOCK pin on */
+       0x09, 0x00,             /* FIFO */
+       0x0c, 0x51,             /* OP1 ctl = Normal, OP1 val = 1 (LNB Power ON) */
+       0x0d, 0x82,             /* DC offset compensation = ON, beta_agc1 = 2 */
+       0x0e, 0x23,             /* alpha_tmg = 2, beta_tmg = 3 */
+       0x10, 0x3f,             // AGC2  0x3d
+       0x11, 0x84,
+       0x12, 0xb9,
+       0x15, 0xc9,             // lock detector threshold
+       0x16, 0x00,
+       0x17, 0x00,
+       0x18, 0x00,
+       0x19, 0x00,
+       0x1a, 0x00,
+       0x1f, 0x50,
+       0x20, 0x00,
+       0x21, 0x00,
+       0x22, 0x00,
+       0x23, 0x00,
+       0x28, 0x00,             // out imp: normal  out type: parallel FEC mode:0
+       0x29, 0x1e,             // 1/2 threshold
+       0x2a, 0x14,             // 2/3 threshold
+       0x2b, 0x0f,             // 3/4 threshold
+       0x2c, 0x09,             // 5/6 threshold
+       0x2d, 0x05,             // 7/8 threshold
+       0x2e, 0x01,
+       0x31, 0x1f,             // test all FECs
+       0x32, 0x19,             // viterbi and synchro search
+       0x33, 0xfc,             // rs control
+       0x34, 0x93,             // error control
+       0x0f, 0x92,
+       0xff, 0xff
 };
 
 static u8 alps_bsru6_inittab[] = {
@@ -1350,7 +1350,7 @@ static int ttusb_novas_grundig_29504_491_pll_set(struct dvb_frontend *fe, struct
        u32 div;
        struct i2c_msg msg = {.addr = 0x61,.flags = 0,.buf = buf,.len = sizeof(buf) };
 
-        div = params->frequency / 125;
+       div = params->frequency / 125;
 
        buf[0] = (div >> 8) & 0x7f;
        buf[1] = div & 0xff;
@@ -1487,7 +1487,7 @@ static int ttusb_probe(struct usb_interface *intf, const struct usb_device_id *i
 
        udev = interface_to_usbdev(intf);
 
-        if (intf->altsetting->desc.bInterfaceNumber != 1) return -ENODEV;
+       if (intf->altsetting->desc.bInterfaceNumber != 1) return -ENODEV;
 
        if (!(ttusb = kmalloc(sizeof(struct ttusb), GFP_KERNEL)))
                return -ENOMEM;
index 95ee7995455ef5b65f14360a756a5cec625d1f68..8c3cd545e8f416f07d24aec0b38628aa265d27ff 100644 (file)
 #include <asm/types.h>
 
 static u8 dsp_bootcode [] = {
-       0x08, 0xaa, 0x00, 0x18, 0x00, 0x03, 0x08, 0x00, 
-       0x00, 0x10, 0x00, 0x00, 0x01, 0x80, 0x18, 0x5f, 
-       0x00, 0x00, 0x01, 0x80, 0x77, 0x18, 0x2a, 0xeb, 
-       0x6b, 0xf8, 0x00, 0x18, 0x03, 0xff, 0x68, 0xf8, 
-       0x00, 0x18, 0xff, 0xfe, 0xf7, 0xb8, 0xf7, 0xbe, 
-       0xf6, 0xb9, 0xf4, 0xa0, 0xf6, 0xb7, 0xf6, 0xb5, 
-       0xf6, 0xb6, 0xf0, 0x20, 0x19, 0xdf, 0xf1, 0x00, 
-       0x00, 0x01, 0xf8, 0x4d, 0x01, 0xab, 0xf6, 0xb8, 
-       0xf0, 0x20, 0x19, 0xdf, 0xf0, 0x73, 0x01, 0xa5, 
-       0x7e, 0xf8, 0x00, 0x12, 0xf0, 0x00, 0x00, 0x01, 
-       0x47, 0xf8, 0x00, 0x11, 0x7e, 0x92, 0x00, 0xf8, 
-       0x00, 0x11, 0xf0, 0x00, 0x00, 0x01, 0x7e, 0xf8, 
-       0x00, 0x11, 0xf0, 0x00, 0x00, 0x01, 0x6c, 0x89, 
-       0x01, 0x9a, 0xf7, 0xb8, 0xee, 0xfc, 0xf0, 0x20, 
-       0xff, 0xff, 0xf1, 0x00, 0x00, 0x01, 0xf8, 0x4d, 
-       0x01, 0xbf, 0xf2, 0x73, 0x01, 0xb9, 0x4e, 0x02, 
-       0xf4, 0x95, 0xf5, 0xe3, 0x56, 0x02, 0x7e, 0x00, 
-       0x11, 0x00, 0xfa, 0x4c, 0x01, 0xb7, 0x6b, 0x03, 
-       0x00, 0x01, 0xf6, 0xb8, 0xee, 0x04, 0xf0, 0x74, 
-       0x0d, 0xa7, 0xf0, 0x74, 0x01, 0xc5, 0x4a, 0x11, 
-       0x4a, 0x16, 0x72, 0x11, 0x2a, 0xe6, 0x10, 0xf8, 
-       0x00, 0x11, 0xfa, 0x45, 0x01, 0xdb, 0xf4, 0x95, 
-       0xee, 0xff, 0x48, 0x11, 0xf0, 0x00, 0x2a, 0xc6, 
-       0x88, 0x16, 0xf4, 0x95, 0xf4, 0x95, 0x10, 0xee, 
-       0xff, 0xff, 0xf4, 0xe3, 0x6c, 0xe9, 0xff, 0xff, 
-       0x01, 0xd5, 0x10, 0xf8, 0x2a, 0xe7, 0xf8, 0x45, 
-       0x01, 0xe2, 0x10, 0xf8, 0x2a, 0xe7, 0xf4, 0xe3, 
-       0xf0, 0x74, 0x01, 0xff, 0xee, 0x01, 0x8a, 0x16, 
-       0x8a, 0x11, 0xfc, 0x00, 0xf7, 0xb8, 0xe9, 0x20, 
-       0x4a, 0x11, 0x09, 0xf8, 0x2a, 0xe6, 0xf8, 0x4e, 
-       0x01, 0xf3, 0xf2, 0x73, 0x01, 0xfd, 0xf4, 0x95, 
-       0xe8, 0x01, 0x72, 0x11, 0x2a, 0xe6, 0x49, 0x11, 
-       0x80, 0xe1, 0x2a, 0xc6, 0xf3, 0x00, 0x00, 0x01, 
-       0xe8, 0x00, 0x81, 0xf8, 0x2a, 0xe6, 0x8a, 0x11, 
-       0xfc, 0x00, 0xf4, 0x95, 0xf0, 0x73, 0x02, 0x00, 
-       0x10, 0xf8, 0x2a, 0x0f, 0xfc, 0x00, 0x4a, 0x11, 
-       0xf0, 0x74, 0x02, 0x02, 0x80, 0xf8, 0x2a, 0x10, 
-       0x73, 0x08, 0x00, 0x09, 0x40, 0xf8, 0x2a, 0x15, 
-       0x82, 0xf8, 0x00, 0x11, 0xf4, 0x95, 0x77, 0x10, 
-       0x03, 0xe8, 0xf5, 0xa9, 0xf8, 0x30, 0x02, 0x21, 
-       0x71, 0xf8, 0x2a, 0x10, 0x2a, 0x15, 0x56, 0xf8, 
-       0x2a, 0x0c, 0xf0, 0xe3, 0x4e, 0xf8, 0x2a, 0x16, 
-       0xe8, 0x00, 0x4e, 0xf8, 0x2a, 0x0c, 0x8a, 0x11, 
-       0xfc, 0x00, 0x4a, 0x06, 0x4a, 0x07, 0x4a, 0x1d, 
-       0x68, 0xf8, 0x00, 0x07, 0x7d, 0x3f, 0x69, 0xf8, 
-       0x00, 0x07, 0x40, 0x00, 0x68, 0xf8, 0x00, 0x1d, 
-       0xff, 0xfc, 0x6b, 0xf8, 0x2a, 0x0f, 0x00, 0x01, 
-       0x8a, 0x1d, 0x8a, 0x07, 0x8a, 0x06, 0xf4, 0xeb, 
-       0xee, 0xfd, 0x76, 0xf8, 0x2a, 0x0f, 0x00, 0x00, 
-       0x76, 0x00, 0x00, 0x00, 0xfb, 0x80, 0x19, 0x4c, 
-       0xf4, 0x95, 0xe8, 0x00, 0x80, 0xf8, 0x2a, 0x11, 
-       0xf9, 0x80, 0x19, 0x07, 0x80, 0xf8, 0x2a, 0x0e, 
-       0xf9, 0x80, 0x16, 0x66, 0x76, 0x00, 0x2a, 0x12, 
-       0x10, 0xf8, 0x2a, 0x11, 0xf9, 0x80, 0x18, 0xe3, 
-       0x10, 0xf8, 0x2a, 0x0e, 0xf9, 0x80, 0x16, 0x66, 
-       0x10, 0xf8, 0x2a, 0x0e, 0xf9, 0x80, 0x16, 0x87, 
-       0xee, 0x03, 0xfc, 0x00, 0x4a, 0x11, 0xf6, 0xb8, 
-       0xf4, 0x95, 0xf0, 0x20, 0x80, 0x00, 0x11, 0xf8, 
-       0x2a, 0x5a, 0xf8, 0x4d, 0x02, 0x93, 0x11, 0xf8, 
-       0x2a, 0x9f, 0xf8, 0x4c, 0x02, 0x7c, 0x77, 0x12, 
-       0x2a, 0x39, 0x49, 0x12, 0x01, 0xf8, 0x2a, 0x9f, 
-       0x89, 0x11, 0xf4, 0x95, 0xf4, 0x95, 0x71, 0x81, 
-       0x00, 0x11, 0x6c, 0xe1, 0xff, 0xab, 0x02, 0x93, 
-       0x6b, 0xf8, 0x2a, 0x9f, 0x00, 0x01, 0xe9, 0x05, 
-       0x01, 0xe2, 0x00, 0x03, 0x81, 0xf8, 0x2a, 0xa0, 
-       0xf0, 0x73, 0x02, 0x95, 0x72, 0x11, 0x2a, 0x9f, 
-       0xf4, 0x95, 0x10, 0xe1, 0x2a, 0x39, 0x6b, 0xf8, 
-       0x2a, 0x9f, 0x00, 0x01, 0x11, 0xf8, 0x2a, 0x9f, 
-       0x09, 0xf8, 0x2a, 0xa0, 0xf8, 0x4c, 0x02, 0x93, 
-       0x76, 0xf8, 0x2a, 0x5a, 0x00, 0x00, 0x76, 0xf8, 
-       0x2a, 0x9f, 0x00, 0x00, 0x76, 0xf8, 0x2a, 0xa0, 
-       0x00, 0x00, 0x88, 0x11, 0xf4, 0x95, 0x48, 0x11, 
-       0x8a, 0x11, 0xfc, 0x00, 0x4a, 0x11, 0xee, 0xfe, 
-       0x10, 0xf8, 0x2a, 0x5a, 0xf8, 0x44, 0x02, 0xb2, 
-       0x76, 0xf8, 0x2a, 0x5a, 0x00, 0x01, 0xf0, 0x74, 
-       0x02, 0x58, 0x88, 0x11, 0xf4, 0x95, 0x77, 0x10, 
-       0x80, 0x00, 0xf4, 0xa9, 0xf8, 0x30, 0x02, 0xb2, 
-       0x48, 0x11, 0xf0, 0x30, 0x00, 0xff, 0x80, 0x00, 
-       0x10, 0xf8, 0x2a, 0x5b, 0xf9, 0x80, 0x18, 0xd6, 
-       0xee, 0x02, 0x8a, 0x11, 0xfc, 0x00, 0xf4, 0x95, 
-       0x4a, 0x08, 0x4a, 0x09, 0x4a, 0x0a, 0x4a, 0x0b, 
-       0x4a, 0x0c, 0x4a, 0x0d, 0x4a, 0x10, 0x4a, 0x11, 
-       0x4a, 0x12, 0x4a, 0x13, 0x4a, 0x14, 0x4a, 0x15, 
-       0x4a, 0x16, 0x4a, 0x17, 0x4a, 0x17, 0x4a, 0x19, 
-       0x4a, 0x0e, 0x4a, 0x06, 0x4a, 0x07, 0x4a, 0x1a, 
-       0x4a, 0x1d, 0x4a, 0x1b, 0x4a, 0x1c, 0x68, 0xf8, 
-       0x00, 0x07, 0x7d, 0x3f, 0x69, 0xf8, 0x00, 0x07, 
-       0x40, 0x00, 0x68, 0xf8, 0x00, 0x1d, 0xff, 0xfc, 
-       0x48, 0x18, 0x68, 0xf8, 0x00, 0x18, 0xff, 0xfe, 
-       0xf4, 0x95, 0xf4, 0x95, 0x4a, 0x08, 0xee, 0xfd, 
-       0xf0, 0x74, 0x02, 0x58, 0x88, 0x11, 0xf4, 0x95, 
-       0x77, 0x10, 0x80, 0x00, 0xf4, 0xa9, 0xf8, 0x30, 
-       0x02, 0xef, 0x48, 0x11, 0xf0, 0x30, 0x00, 0xff, 
-       0x80, 0x00, 0x10, 0xf8, 0x2a, 0x5b, 0xf9, 0x80, 
-       0x18, 0xd6, 0xee, 0x03, 0x8a, 0x18, 0xf4, 0x95, 
-       0x8a, 0x1c, 0x8a, 0x1b, 0x8a, 0x1d, 0x8a, 0x1a, 
-       0x8a, 0x07, 0x8a, 0x06, 0x8a, 0x0e, 0x8a, 0x19, 
-       0x8a, 0x17, 0x8a, 0x17, 0x8a, 0x16, 0x8a, 0x15, 
-       0x8a, 0x14, 0x8a, 0x13, 0x8a, 0x12, 0x8a, 0x11, 
-       0x8a, 0x10, 0x8a, 0x0d, 0x8a, 0x0c, 0x8a, 0x0b, 
-       0x8a, 0x0a, 0x8a, 0x09, 0x8a, 0x08, 0xf4, 0xeb, 
-       0x4a, 0x11, 0x77, 0x11, 0x2a, 0x39, 0x76, 0x81, 
-       0x00, 0x55, 0x77, 0x12, 0x2a, 0x18, 0x10, 0xe2, 
-       0x00, 0x01, 0x80, 0xe1, 0x00, 0x01, 0x10, 0xe2, 
-       0x00, 0x02, 0x80, 0xe1, 0x00, 0x02, 0x76, 0xe1, 
-       0x00, 0x03, 0x00, 0x00, 0x76, 0xe1, 0x00, 0x04, 
-       0x00, 0xaa, 0xf0, 0x74, 0x02, 0x98, 0x8a, 0x11, 
-       0xfc, 0x00, 0x4a, 0x11, 0x88, 0x11, 0xf4, 0x95, 
-       0xf4, 0x95, 0x10, 0x81, 0x6f, 0xf8, 0x2a, 0x9e, 
-       0x0c, 0x88, 0xe8, 0xff, 0x18, 0xe1, 0x00, 0x01, 
-       0x1a, 0xf8, 0x2a, 0x9e, 0xf0, 0x30, 0x1f, 0xff, 
-       0x80, 0xf8, 0x2a, 0x9e, 0x8a, 0x11, 0xfc, 0x00, 
-       0x4a, 0x11, 0x77, 0x11, 0x2a, 0x39, 0x76, 0x81, 
-       0x00, 0x55, 0x77, 0x12, 0x2a, 0x18, 0x11, 0xe2, 
-       0x00, 0x01, 0x81, 0xe1, 0x00, 0x01, 0x11, 0xe2, 
-       0x00, 0x02, 0x81, 0xe1, 0x00, 0x02, 0x76, 0xe1, 
-       0x00, 0x03, 0x00, 0x02, 0x48, 0x08, 0x6f, 0xe1, 
-       0x00, 0x04, 0x0c, 0x98, 0xf0, 0x30, 0x00, 0xff, 
-       0x80, 0xe1, 0x00, 0x05, 0x76, 0xe1, 0x00, 0x06, 
-       0x00, 0xaa, 0xf0, 0x74, 0x02, 0x98, 0x8a, 0x11, 
-       0xfc, 0x00, 0x4a, 0x11, 0x77, 0x11, 0x2a, 0x39, 
-       0x76, 0x81, 0x00, 0x55, 0x77, 0x12, 0x2a, 0x18, 
-       0x10, 0xe2, 0x00, 0x01, 0x80, 0xe1, 0x00, 0x01, 
-       0x10, 0xe2, 0x00, 0x02, 0x80, 0xe1, 0x00, 0x02, 
-       0x76, 0xe1, 0x00, 0x03, 0x00, 0x04, 0x48, 0x11, 
-       0xf0, 0x00, 0x00, 0x04, 0x88, 0x12, 0xf4, 0x95, 
-       0x77, 0x13, 0x2a, 0x76, 0xe9, 0x00, 0xe5, 0x98, 
-       0xf3, 0x00, 0x00, 0x01, 0xf6, 0xb8, 0x48, 0x0b, 
-       0x08, 0xf8, 0x2a, 0x3c, 0xf8, 0x43, 0x03, 0x71, 
-       0x76, 0x82, 0x00, 0xaa, 0xf0, 0x74, 0x02, 0x98, 
-       0x8a, 0x11, 0xfc, 0x00, 0x4a, 0x11, 0xee, 0xf0, 
-       0x88, 0x11, 0xf4, 0x95, 0xf4, 0x95, 0x71, 0x81, 
-       0x00, 0x14, 0x71, 0xe1, 0x00, 0x01, 0x00, 0x15, 
-       0x49, 0x11, 0xf3, 0x00, 0x00, 0x02, 0x89, 0x11, 
-       0xe7, 0x82, 0x6d, 0xea, 0x00, 0x04, 0xe7, 0x83, 
-       0x6d, 0xeb, 0x00, 0x0a, 0x77, 0x1a, 0x00, 0x05, 
-       0xf0, 0x72, 0x03, 0xaa, 0x11, 0x81, 0xf2, 0xe8, 
-       0x80, 0x82, 0xe9, 0xff, 0x19, 0xe1, 0x00, 0x01, 
-       0xf1, 0xa0, 0x81, 0x92, 0x11, 0xe1, 0x00, 0x0c, 
-       0xf2, 0xe8, 0x80, 0x83, 0xe9, 0xff, 0x19, 0xe1, 
-       0x00, 0x0d, 0xf1, 0xa0, 0x81, 0x93, 0x6d, 0xe9, 
-       0x00, 0x02, 0x48, 0x18, 0x49, 0x18, 0x70, 0x00, 
-       0x00, 0x15, 0xf0, 0x00, 0x00, 0x04, 0xf3, 0x00, 
-       0x00, 0x0a, 0x80, 0x01, 0x81, 0x02, 0xf2, 0x74, 
-       0x0e, 0x54, 0xf4, 0x95, 0x48, 0x14, 0xee, 0x10, 
-       0x8a, 0x11, 0xfc, 0x00, 0x4a, 0x11, 0xf0, 0x74, 
-       0x0c, 0x5e, 0x80, 0xf8, 0x2a, 0x5c, 0x77, 0x12, 
-       0x2a, 0x39, 0x76, 0x82, 0x00, 0x55, 0x77, 0x11, 
-       0x2a, 0x18, 0x10, 0xe1, 0x00, 0x01, 0x80, 0xe2, 
-       0x00, 0x01, 0x10, 0xe1, 0x00, 0x02, 0x80, 0xe2, 
-       0x00, 0x02, 0x76, 0xe2, 0x00, 0x03, 0x00, 0x1c, 
-       0xf6, 0xb8, 0x56, 0xf8, 0x2a, 0x16, 0xf0, 0xf0, 
-       0xf0, 0xf8, 0x80, 0xe2, 0x00, 0x07, 0x56, 0xf8, 
-       0x2a, 0x16, 0xf1, 0xf0, 0xe8, 0xff, 0xf2, 0x80, 
-       0x80, 0xe2, 0x00, 0x06, 0x56, 0xf8, 0x2a, 0x16, 
-       0xf1, 0xf8, 0xe8, 0xff, 0xf2, 0x80, 0x80, 0xe2, 
-       0x00, 0x05, 0x57, 0xf8, 0x2a, 0x16, 0xe8, 0xff, 
-       0xf2, 0x80, 0x80, 0xe2, 0x00, 0x04, 0x56, 0xf8, 
-       0x27, 0x6c, 0xf0, 0xf0, 0xf0, 0xf8, 0x80, 0xe2, 
-       0x00, 0x0b, 0x56, 0xf8, 0x27, 0x6c, 0xf1, 0xf0, 
-       0xe8, 0xff, 0xf2, 0x80, 0x80, 0xe2, 0x00, 0x0a, 
-       0x56, 0xf8, 0x27, 0x6c, 0xf1, 0xf8, 0xe8, 0xff, 
-       0xf2, 0x80, 0x80, 0xe2, 0x00, 0x09, 0xe8, 0xff, 
-       0x57, 0xf8, 0x27, 0x6c, 0xf2, 0x80, 0x80, 0xe2, 
-       0x00, 0x08, 0x56, 0xf8, 0x27, 0x6a, 0xf0, 0xf0, 
-       0xf0, 0xf8, 0x80, 0xe2, 0x00, 0x0f, 0x56, 0xf8, 
-       0x27, 0x6a, 0xf1, 0xf0, 0xe8, 0xff, 0xf2, 0x80, 
-       0x80, 0xe2, 0x00, 0x0e, 0x56, 0xf8, 0x27, 0x6a, 
-       0xf1, 0xf8, 0xe8, 0xff, 0xf2, 0x80, 0x80, 0xe2, 
-       0x00, 0x0d, 0x57, 0xf8, 0x27, 0x6a, 0xe8, 0xff, 
-       0xf2, 0x80, 0x80, 0xe2, 0x00, 0x0c, 0x76, 0xe2, 
-       0x00, 0x13, 0x00, 0x00, 0x76, 0xe2, 0x00, 0x12, 
-       0x00, 0x00, 0x6f, 0xf8, 0x2a, 0x5c, 0x0c, 0x58, 
-       0x80, 0xe2, 0x00, 0x11, 0xe8, 0xff, 0x18, 0xf8, 
-       0x2a, 0x5c, 0x80, 0xe2, 0x00, 0x10, 0x76, 0xe2, 
-       0x00, 0x17, 0x00, 0x00, 0x76, 0xe2, 0x00, 0x16, 
-       0x00, 0x00, 0x6f, 0xf8, 0x2a, 0x9e, 0x0c, 0x58, 
-       0x80, 0xe2, 0x00, 0x15, 0xe8, 0xff, 0x18, 0xf8, 
-       0x2a, 0x9e, 0x80, 0xe2, 0x00, 0x14, 0x76, 0xe2, 
-       0x00, 0x1b, 0x00, 0x00, 0x76, 0xe2, 0x00, 0x1a, 
-       0x00, 0x00, 0x76, 0xe2, 0x00, 0x19, 0x00, 0x00, 
-       0x70, 0xe2, 0x00, 0x18, 0x27, 0x6e, 0x76, 0xe2, 
-       0x00, 0x1f, 0x00, 0x00, 0x76, 0xe2, 0x00, 0x1e, 
-       0x00, 0x00, 0x76, 0xe2, 0x00, 0x1d, 0x00, 0x00, 
-       0x76, 0xe2, 0x00, 0x1c, 0x00, 0x00, 0x76, 0xe2, 
-       0x00, 0x20, 0x00, 0xaa, 0xf0, 0x74, 0x02, 0x98, 
-       0x8a, 0x11, 0xfc, 0x00, 0x4a, 0x11, 0xee, 0xfe, 
-       0x10, 0xf8, 0x2a, 0x38, 0xf8, 0x45, 0x04, 0xed, 
-       0x77, 0x12, 0x2a, 0x18, 0x10, 0xe2, 0x00, 0x02, 
-       0x88, 0x11, 0xf4, 0x95, 0x77, 0x10, 0x00, 0x08, 
-       0x6d, 0xe9, 0xff, 0xdf, 0xf6, 0xa9, 0xf8, 0x20, 
-       0x04, 0x75, 0xf0, 0x73, 0x04, 0x7d, 0xf0, 0x10, 
-       0x00, 0x21, 0xf0, 0x00, 0x1a, 0x83, 0x48, 0x08, 
-       0x7e, 0xf8, 0x00, 0x08, 0xf4, 0xe2, 0xf0, 0x74, 
-       0x03, 0x0a, 0xf0, 0x73, 0x04, 0xea, 0x48, 0x12, 
-       0xf2, 0x74, 0x03, 0x23, 0xf0, 0x00, 0x00, 0x04, 
-       0xf2, 0x74, 0x03, 0x36, 0xf4, 0x95, 0xe8, 0x00, 
-       0xf0, 0x73, 0x04, 0xea, 0x77, 0x11, 0x2a, 0x18, 
-       0xe8, 0xff, 0x6f, 0xe1, 0x00, 0x04, 0x0d, 0x48, 
-       0x18, 0xe1, 0x00, 0x05, 0xf2, 0x74, 0x09, 0x69, 
-       0xf4, 0x95, 0xf2, 0xa0, 0xf0, 0x74, 0x03, 0x36, 
-       0xf0, 0x73, 0x04, 0xea, 0x77, 0x11, 0x2a, 0x18, 
-       0xe8, 0xff, 0x6f, 0xe1, 0x00, 0x04, 0x0d, 0x48, 
-       0x18, 0xe1, 0x00, 0x05, 0xf2, 0x74, 0x09, 0x41, 
-       0xf4, 0x95, 0xf2, 0xa0, 0xf0, 0x74, 0x03, 0x36, 
-       0xf0, 0x73, 0x04, 0xea, 0xf0, 0x74, 0x03, 0x57, 
-       0xf0, 0x73, 0x04, 0xea, 0x10, 0xf8, 0x2a, 0x1c, 
-       0xf0, 0x74, 0x12, 0xa4, 0xf2, 0x74, 0x03, 0x36, 
-       0xf4, 0x95, 0xe8, 0x00, 0xf0, 0x73, 0x04, 0xea, 
-       0x48, 0x12, 0xf2, 0x74, 0x03, 0x80, 0xf0, 0x00, 
-       0x00, 0x04, 0xf2, 0x74, 0x03, 0x36, 0xf4, 0x95, 
-       0xe8, 0x00, 0xf0, 0x73, 0x04, 0xea, 0x10, 0xf8, 
-       0x2a, 0x1c, 0xf0, 0x74, 0x12, 0xc5, 0xf2, 0x74, 
-       0x03, 0x36, 0xf4, 0x95, 0xe8, 0x00, 0xf0, 0x73, 
-       0x04, 0xea, 0x77, 0x11, 0x2a, 0x18, 0xe8, 0xff, 
-       0x6f, 0xe1, 0x00, 0x06, 0x0d, 0x48, 0x18, 0xe1, 
-       0x00, 0x07, 0x71, 0xe1, 0x00, 0x05, 0x00, 0x12, 
-       0xf2, 0xa0, 0x70, 0x00, 0x00, 0x12, 0x80, 0x01, 
-       0x10, 0xe1, 0x00, 0x04, 0xf0, 0x74, 0x0e, 0x7a, 
-       0xf2, 0x74, 0x03, 0x36, 0xf4, 0x95, 0xe8, 0x00, 
-       0xf0, 0x73, 0x04, 0xea, 0xf0, 0x74, 0x03, 0xbc, 
-       0x76, 0xf8, 0x2a, 0x38, 0x00, 0x00, 0xee, 0x02, 
-       0x8a, 0x11, 0xfc, 0x00, 0x4a, 0x11, 0x77, 0x11, 
-       0x2a, 0x39, 0x76, 0x81, 0x00, 0x55, 0x77, 0x12, 
-       0x2a, 0x18, 0x10, 0xe2, 0x00, 0x01, 0x80, 0xe1, 
-       0x00, 0x01, 0x10, 0xe2, 0x00, 0x02, 0x80, 0xe1, 
-       0x00, 0x02, 0x76, 0xe1, 0x00, 0x03, 0x00, 0x09, 
-       0x48, 0x11, 0xf0, 0x00, 0x00, 0x04, 0x88, 0x12, 
-       0xf4, 0x95, 0x77, 0x13, 0x2a, 0x86, 0xe9, 0x00, 
-       0xe5, 0x98, 0xf3, 0x00, 0x00, 0x01, 0xf6, 0xb8, 
-       0x48, 0x0b, 0x08, 0xf8, 0x2a, 0x3c, 0xf8, 0x43, 
-       0x05, 0x0a, 0x76, 0x82, 0x00, 0xaa, 0xf0, 0x74, 
-       0x02, 0x98, 0x8a, 0x11, 0xfc, 0x00, 0x4a, 0x11, 
-       0x77, 0x11, 0x2a, 0x39, 0x76, 0x81, 0x00, 0x55, 
-       0x77, 0x13, 0x2a, 0x18, 0x10, 0xe3, 0x00, 0x01, 
-       0x80, 0xe1, 0x00, 0x01, 0x10, 0xe3, 0x00, 0x02, 
-       0x80, 0xe1, 0x00, 0x02, 0x13, 0xe3, 0x00, 0x03, 
-       0x81, 0xe1, 0x00, 0x03, 0x48, 0x11, 0x77, 0x11, 
-       0x00, 0x00, 0xf8, 0x4d, 0x05, 0x44, 0xf0, 0x00, 
-       0x00, 0x04, 0x88, 0x12, 0x48, 0x13, 0xf0, 0x00, 
-       0x00, 0x04, 0x88, 0x13, 0xf4, 0x95, 0xf4, 0x95, 
-       0xe5, 0x98, 0x6d, 0x91, 0xf6, 0xb8, 0x48, 0x11, 
-       0x08, 0xf8, 0x2a, 0x3c, 0xf8, 0x43, 0x05, 0x3a, 
-       0xf0, 0x20, 0x2a, 0x39, 0x49, 0x11, 0xf5, 0x00, 
-       0x89, 0x11, 0xf4, 0x95, 0xf4, 0x95, 0x76, 0xe1, 
-       0x00, 0x04, 0x00, 0xaa, 0xf0, 0x74, 0x02, 0x98, 
-       0x8a, 0x11, 0xfc, 0x00, 0x4a, 0x11, 0x77, 0x11, 
-       0x2a, 0x39, 0x76, 0x81, 0x00, 0x55, 0x77, 0x12, 
-       0x2a, 0x18, 0x10, 0xe2, 0x00, 0x01, 0x80, 0xe1, 
-       0x00, 0x01, 0x10, 0xe2, 0x00, 0x02, 0x80, 0xe1, 
-       0x00, 0x02, 0x76, 0xe1, 0x00, 0x03, 0x00, 0x0c, 
-       0x48, 0x11, 0xf0, 0x00, 0x00, 0x04, 0x88, 0x12, 
-       0xf4, 0x95, 0x77, 0x13, 0x2a, 0x7a, 0xe9, 0x00, 
-       0xe5, 0x98, 0xf3, 0x00, 0x00, 0x01, 0xf6, 0xb8, 
-       0x48, 0x0b, 0x08, 0xf8, 0x2a, 0x3c, 0xf8, 0x43, 
-       0x05, 0x6a, 0x76, 0x82, 0x00, 0xaa, 0xf0, 0x74, 
-       0x02, 0x98, 0x8a, 0x11, 0xfc, 0x00, 0x4a, 0x11, 
-       0x77, 0x11, 0x2a, 0x39, 0x76, 0x81, 0x00, 0x55, 
-       0x77, 0x12, 0x2a, 0x18, 0x10, 0xe2, 0x00, 0x01, 
-       0x80, 0xe1, 0x00, 0x01, 0x10, 0xe2, 0x00, 0x02, 
-       0x80, 0xe1, 0x00, 0x02, 0x76, 0xe1, 0x00, 0x03, 
-       0x00, 0x19, 0x48, 0x11, 0xf0, 0x00, 0x00, 0x04, 
-       0x88, 0x12, 0xf4, 0x95, 0x77, 0x13, 0x2a, 0x5d, 
-       0xe9, 0x00, 0xe5, 0x98, 0xf3, 0x00, 0x00, 0x01, 
-       0xf6, 0xb8, 0x48, 0x0b, 0x08, 0xf8, 0x2a, 0x3c, 
-       0xf8, 0x43, 0x05, 0x93, 0x76, 0x82, 0x00, 0xaa, 
-       0xf0, 0x74, 0x02, 0x98, 0x8a, 0x11, 0xfc, 0x00, 
-       0x4a, 0x11, 0x88, 0x11, 0x10, 0xf8, 0x2a, 0x38, 
-       0xf8, 0x44, 0x05, 0xe3, 0x10, 0xf8, 0x2a, 0xa1, 
-       0xf8, 0x44, 0x05, 0xba, 0x6c, 0xe1, 0xff, 0x56, 
-       0x05, 0xe3, 0x72, 0x12, 0x2a, 0xa1, 0xf4, 0x95, 
-       0x70, 0xe2, 0x2a, 0x18, 0x00, 0x11, 0x6b, 0xf8, 
-       0x2a, 0xa1, 0x00, 0x01, 0xf0, 0x73, 0x05, 0xe3, 
-       0x72, 0x12, 0x2a, 0xa1, 0xf4, 0x95, 0x70, 0xe2, 
-       0x2a, 0x18, 0x00, 0x11, 0x10, 0xf8, 0x2a, 0xa1, 
-       0xf0, 0x00, 0x00, 0x01, 0x88, 0x12, 0xf4, 0x95, 
-       0xf4, 0x95, 0x6e, 0xe2, 0xff, 0xfc, 0x05, 0xd1, 
-       0x73, 0x12, 0x2a, 0xa1, 0x48, 0x11, 0xf0, 0x00, 
-       0x00, 0x05, 0x80, 0xf8, 0x2a, 0xa2, 0x10, 0xf8, 
-       0x2a, 0xa1, 0x08, 0xf8, 0x2a, 0xa2, 0xf8, 0x44, 
-       0x05, 0xe3, 0x6c, 0xe1, 0xff, 0xab, 0x05, 0xdd, 
-       0x76, 0xf8, 0x2a, 0x38, 0x00, 0x01, 0x76, 0xf8, 
-       0x2a, 0xa1, 0x00, 0x00, 0x76, 0xf8, 0x2a, 0xa2, 
-       0x00, 0x00, 0x8a, 0x11, 0xfc, 0x00, 0xf4, 0x95, 
-       0x4a, 0x08, 0x4a, 0x09, 0x4a, 0x0a, 0x4a, 0x0b, 
-       0x4a, 0x0c, 0x4a, 0x0d, 0x4a, 0x10, 0x4a, 0x11, 
-       0x4a, 0x12, 0x4a, 0x13, 0x4a, 0x14, 0x4a, 0x15, 
-       0x4a, 0x16, 0x4a, 0x17, 0x4a, 0x17, 0x4a, 0x19, 
-       0x4a, 0x0e, 0x4a, 0x06, 0x4a, 0x07, 0x4a, 0x1a, 
-       0x4a, 0x1d, 0x4a, 0x1b, 0x4a, 0x1c, 0x68, 0xf8, 
-       0x00, 0x07, 0x7d, 0x3f, 0x69, 0xf8, 0x00, 0x07, 
-       0x40, 0x00, 0x68, 0xf8, 0x00, 0x1d, 0xff, 0xfc, 
-       0x48, 0x18, 0x68, 0xf8, 0x00, 0x18, 0xff, 0xfe, 
-       0xf4, 0x95, 0xf4, 0x95, 0x4a, 0x08, 0xee, 0xff, 
-       0x10, 0xf8, 0x2a, 0x5b, 0xf9, 0x80, 0x18, 0x04, 
-       0xf0, 0x74, 0x05, 0xa2, 0xee, 0x01, 0x8a, 0x18, 
-       0xf4, 0x95, 0x8a, 0x1c, 0x8a, 0x1b, 0x8a, 0x1d, 
-       0x8a, 0x1a, 0x8a, 0x07, 0x8a, 0x06, 0x8a, 0x0e, 
-       0x8a, 0x19, 0x8a, 0x17, 0x8a, 0x17, 0x8a, 0x16, 
-       0x8a, 0x15, 0x8a, 0x14, 0x8a, 0x13, 0x8a, 0x12, 
-       0x8a, 0x11, 0x8a, 0x10, 0x8a, 0x0d, 0x8a, 0x0c, 
-       0x8a, 0x0b, 0x8a, 0x0a, 0x8a, 0x09, 0x8a, 0x08, 
-       0xf4, 0xeb, 0xee, 0xfd, 0x76, 0xf8, 0x2a, 0x38, 
-       0x00, 0x00, 0x76, 0xf8, 0x2a, 0x5a, 0x00, 0x00, 
-       0xe8, 0x01, 0x4e, 0x00, 0xfb, 0x80, 0x17, 0xd6, 
-       0xf4, 0x95, 0xe8, 0x01, 0x80, 0xf8, 0x2a, 0x5b, 
-       0x76, 0x00, 0x2a, 0x8f, 0xf9, 0x80, 0x16, 0xaa, 
-       0x10, 0xf8, 0x2a, 0x5b, 0xf9, 0x80, 0x17, 0x5c, 
-       0x10, 0xf8, 0x2a, 0x5b, 0xf9, 0x80, 0x17, 0x6f, 
-       0xfb, 0x80, 0x16, 0x66, 0xf4, 0x95, 0xe8, 0x1a, 
-       0xfb, 0x80, 0x16, 0x87, 0xf4, 0x95, 0xe8, 0x1a, 
-       0xfb, 0x80, 0x16, 0x66, 0xf4, 0x95, 0xe8, 0x1b, 
-       0xfb, 0x80, 0x16, 0x87, 0xf4, 0x95, 0xe8, 0x1b, 
-       0xee, 0x03, 0xfc, 0x00, 0x4a, 0x11, 0xf4, 0x95, 
-       0x13, 0x02, 0x88, 0x11, 0xe8, 0x00, 0xf8, 0x4d, 
-       0x06, 0x6a, 0xf3, 0x10, 0x00, 0x01, 0x89, 0x1a, 
-       0xf4, 0x95, 0xf0, 0x72, 0x06, 0x69, 0x1c, 0x91, 
-       0x8a, 0x11, 0xfc, 0x00, 0x4a, 0x11, 0x88, 0x11, 
-       0x12, 0x03, 0x11, 0x02, 0xf8, 0x45, 0x06, 0x79, 
-       0xf0, 0x10, 0x00, 0x01, 0x88, 0x1a, 0xf4, 0x95, 
-       0xf0, 0x72, 0x06, 0x78, 0x81, 0x91, 0x8a, 0x11, 
-       0xfc, 0x00, 0x4a, 0x11, 0xf4, 0x95, 0x71, 0x02, 
-       0x00, 0x11, 0x11, 0x03, 0x61, 0xf8, 0x00, 0x11, 
-       0x00, 0x01, 0xf8, 0x30, 0x06, 0x91, 0xf6, 0xb8, 
-       0x6f, 0xf8, 0x00, 0x11, 0x0c, 0x1f, 0x88, 0x11, 
-       0xf3, 0xe8, 0xe8, 0xff, 0x18, 0x81, 0xf1, 0xa0, 
-       0x81, 0x81, 0xf0, 0x73, 0x06, 0x9d, 0xf6, 0xb8, 
-       0x6f, 0xf8, 0x00, 0x11, 0x0c, 0x1f, 0x88, 0x11, 
-       0xf3, 0x30, 0x00, 0xff, 0xf0, 0x20, 0xff, 0x00, 
-       0x18, 0x81, 0xf1, 0xa0, 0x81, 0x81, 0x8a, 0x11, 
-       0xfc, 0x00, 0x4a, 0x11, 0xf4, 0x95, 0x11, 0x02, 
-       0x61, 0xf8, 0x00, 0x0b, 0x00, 0x01, 0xf8, 0x20, 
-       0x06, 0xb1, 0x49, 0x0b, 0xf6, 0x1f, 0x88, 0x11, 
-       0xf4, 0x95, 0xf4, 0x95, 0x10, 0x81, 0xf2, 0x73, 
-       0x06, 0xb8, 0xf0, 0x30, 0x00, 0xff, 0x49, 0x0b, 
-       0xf6, 0x1f, 0x88, 0x11, 0xf4, 0x95, 0xf4, 0x95, 
-       0x12, 0x81, 0xf4, 0x78, 0x8a, 0x11, 0xfc, 0x00, 
-       0x4a, 0x11, 0xf4, 0x95, 0x71, 0x02, 0x00, 0x12, 
-       0x13, 0x03, 0x88, 0x11, 0xe8, 0x00, 0xf8, 0x4d, 
-       0x06, 0xcc, 0xf3, 0x10, 0x00, 0x01, 0x89, 0x1a, 
-       0xf4, 0x95, 0xf0, 0x72, 0x06, 0xcb, 0x11, 0x92, 
-       0xf2, 0xc0, 0x81, 0x91, 0x8a, 0x11, 0xfc, 0x00, 
-       0x88, 0x12, 0x12, 0x02, 0x71, 0x01, 0x00, 0x13, 
-       0xf8, 0x45, 0x06, 0xdb, 0xf0, 0x10, 0x00, 0x01, 
-       0x88, 0x1a, 0xf4, 0x95, 0xf0, 0x72, 0x06, 0xda, 
-       0xe5, 0x98, 0xfc, 0x00, 0x4a, 0x11, 0xee, 0xfe, 
-       0x88, 0x11, 0x11, 0x04, 0x10, 0x06, 0x71, 0x05, 
-       0x00, 0x12, 0x61, 0xf8, 0x00, 0x12, 0x00, 0x01, 
-       0xf8, 0x20, 0x06, 0xea, 0xf0, 0x00, 0x00, 0x01, 
-       0xf6, 0xb8, 0xf0, 0x00, 0x00, 0x01, 0x6f, 0xf8, 
-       0x00, 0x12, 0x0f, 0x1f, 0x48, 0x08, 0x81, 0x00, 
-       0xf4, 0x7f, 0x80, 0x01, 0xf2, 0x74, 0x06, 0xba, 
-       0xf4, 0x95, 0x48, 0x11, 0xee, 0x02, 0x8a, 0x11, 
-       0xfc, 0x00, 0x4a, 0x11, 0xee, 0xfe, 0x88, 0x12, 
-       0x11, 0x04, 0x10, 0x06, 0x71, 0x05, 0x00, 0x13, 
-       0x61, 0xf8, 0x00, 0x13, 0x00, 0x01, 0xf8, 0x20, 
-       0x07, 0x09, 0xf0, 0x00, 0x00, 0x01, 0xf0, 0x00, 
-       0x00, 0x01, 0x88, 0x11, 0xf6, 0xb8, 0x6f, 0xf8, 
-       0x00, 0x13, 0x0f, 0x1f, 0x81, 0x00, 0x48, 0x11, 
-       0xf4, 0x7f, 0x80, 0x01, 0xf2, 0x74, 0x06, 0xce, 
-       0xf4, 0x95, 0x48, 0x12, 0x48, 0x11, 0xf0, 0x30, 
-       0xff, 0xfe, 0xee, 0x02, 0x8a, 0x11, 0xfc, 0x00, 
-       0x4a, 0x11, 0x4a, 0x16, 0x4a, 0x17, 0xee, 0xfc, 
-       0xf4, 0x95, 0x80, 0x02, 0x71, 0x08, 0x00, 0x16, 
-       0x10, 0x09, 0x71, 0x0b, 0x00, 0x17, 0x80, 0x03, 
-       0x71, 0x0a, 0x00, 0x11, 0x48, 0x17, 0xf8, 0x45, 
-       0x07, 0x3f, 0x70, 0x00, 0x00, 0x11, 0x10, 0x03, 
-       0xf0, 0x74, 0x06, 0x9f, 0x80, 0x01, 0x70, 0x00, 
-       0x00, 0x16, 0x10, 0x02, 0xf0, 0x74, 0x06, 0x7b, 
-       0x6d, 0x91, 0x6d, 0x96, 0x6c, 0xef, 0xff, 0xff, 
-       0x07, 0x2f, 0xee, 0x04, 0x8a, 0x17, 0x8a, 0x16, 
-       0x8a, 0x11, 0xfc, 0x00, 0x4a, 0x11, 0xee, 0xfe, 
-       0x10, 0xf8, 0x2a, 0xe8, 0x08, 0xf8, 0x2a, 0xe9, 
-       0xf8, 0x45, 0x07, 0x64, 0x76, 0x00, 0x00, 0x01, 
-       0x62, 0xf8, 0x2a, 0xe9, 0x00, 0x5e, 0xf2, 0x74, 
-       0x12, 0x0b, 0xf0, 0x00, 0x30, 0x40, 0x72, 0x11, 
-       0x2a, 0xe9, 0x77, 0x10, 0x00, 0x0f, 0xf5, 0xa9, 
-       0xf8, 0x20, 0x07, 0x61, 0x6b, 0xf8, 0x2a, 0xe9, 
-       0x00, 0x01, 0xf0, 0x73, 0x07, 0x64, 0x76, 0xf8, 
-       0x2a, 0xe9, 0x00, 0x00, 0xee, 0x02, 0x8a, 0x11, 
-       0xfc, 0x00, 0x4a, 0x11, 0x88, 0x11, 0xe8, 0x00, 
-       0x75, 0xf8, 0x00, 0x08, 0x00, 0x08, 0xe8, 0x00, 
-       0x75, 0xf8, 0x00, 0x08, 0x00, 0x09, 0xf6, 0xb8, 
-       0xf4, 0x95, 0xf0, 0x20, 0xfc, 0x3f, 0x75, 0xf8, 
-       0x00, 0x08, 0x00, 0x0d, 0xf0, 0x20, 0x0c, 0x30, 
-       0x75, 0xf8, 0x00, 0x08, 0x00, 0x0c, 0x76, 0xf8, 
-       0x2a, 0xe8, 0x00, 0x00, 0x76, 0xf8, 0x2a, 0xe9, 
-       0x00, 0x00, 0x6c, 0x81, 0x07, 0x92, 0x76, 0xf8, 
-       0x2a, 0xea, 0x00, 0x00, 0xfb, 0x80, 0x16, 0x76, 
-       0xf4, 0x95, 0xe8, 0x10, 0xe8, 0x00, 0x75, 0xf8, 
-       0x00, 0x08, 0x00, 0x00, 0xf0, 0x73, 0x07, 0xa8, 
-       0x76, 0xf8, 0x2a, 0xea, 0x00, 0x01, 0xfb, 0x80, 
-       0x16, 0x66, 0xf4, 0x95, 0xe8, 0x10, 0xfb, 0x80, 
-       0x16, 0x87, 0xf4, 0x95, 0xe8, 0x10, 0xe8, 0x00, 
-       0x75, 0xf8, 0x00, 0x08, 0x00, 0x00, 0xf6, 0xb8, 
-       0xf4, 0x95, 0xf0, 0x20, 0xff, 0xff, 0x75, 0xf8, 
-       0x00, 0x08, 0x00, 0x00, 0x8a, 0x11, 0xfc, 0x00, 
-       0xf4, 0x95, 0x4a, 0x08, 0x4a, 0x09, 0x4a, 0x0a, 
-       0x4a, 0x06, 0x4a, 0x07, 0x4a, 0x1d, 0x68, 0xf8, 
-       0x00, 0x07, 0x7d, 0x3f, 0x69, 0xf8, 0x00, 0x07, 
-       0x40, 0x00, 0x68, 0xf8, 0x00, 0x1d, 0xff, 0xfc, 
-       0x10, 0xf8, 0x2a, 0xea, 0xf8, 0x45, 0x07, 0xe1, 
-       0x10, 0xf8, 0x2a, 0xe8, 0xf0, 0x00, 0x00, 0x01, 
-       0xf0, 0x30, 0x00, 0x0f, 0x80, 0xf8, 0x2a, 0xe8, 
-       0x10, 0xf8, 0x2a, 0xe8, 0xf8, 0x44, 0x07, 0xd6, 
-       0xf6, 0xb8, 0xf4, 0x95, 0xf0, 0x20, 0xfc, 0x3f, 
-       0x75, 0xf8, 0x00, 0x08, 0x00, 0x0d, 0xf0, 0x20, 
-       0x0c, 0x30, 0x75, 0xf8, 0x00, 0x08, 0x00, 0x0c, 
-       0xe8, 0x00, 0x75, 0xf8, 0x00, 0x08, 0x00, 0x00, 
-       0xf6, 0xb8, 0xf4, 0x95, 0xf0, 0x20, 0xff, 0xff, 
-       0x75, 0xf8, 0x00, 0x08, 0x00, 0x00, 0x8a, 0x1d, 
-       0x8a, 0x07, 0x8a, 0x06, 0x8a, 0x0a, 0x8a, 0x09, 
-       0x8a, 0x08, 0xf4, 0xeb, 0xee, 0xff, 0xf2, 0x74, 
-       0x07, 0x67, 0xf4, 0x95, 0xe8, 0x01, 0xee, 0x01, 
-       0xfc, 0x00, 0x4a, 0x07, 0x4a, 0x1d, 0x68, 0xf8, 
-       0x00, 0x07, 0x7d, 0x3f, 0x69, 0xf8, 0x00, 0x07, 
-       0x40, 0x00, 0x68, 0xf8, 0x00, 0x1d, 0xff, 0xfc, 
-       0x8a, 0x1d, 0x8a, 0x07, 0xf4, 0xeb, 0x4a, 0x11, 
-       0x77, 0x11, 0x00, 0x28, 0x76, 0x81, 0x24, 0x00, 
-       0xe8, 0x00, 0x75, 0xf8, 0x00, 0x08, 0x00, 0x01, 
-       0xf2, 0x74, 0x07, 0x67, 0xf4, 0x95, 0xe8, 0x00, 
-       0x77, 0x11, 0x00, 0x1d, 0x68, 0x81, 0x00, 0x7f, 
-       0xf6, 0xb8, 0xf4, 0x95, 0xf0, 0x20, 0xff, 0x80, 
-       0x77, 0x11, 0x00, 0x1d, 0xf0, 0x30, 0x01, 0x00, 
-       0x1a, 0x81, 0x80, 0x81, 0xf0, 0x74, 0x0a, 0x33, 
-       0xf0, 0x74, 0x11, 0xac, 0xf9, 0x80, 0x13, 0x25, 
-       0xf9, 0x80, 0x16, 0x53, 0xf9, 0x80, 0x17, 0x82, 
-       0xf0, 0x74, 0x06, 0x2f, 0xf9, 0x80, 0x14, 0xb2, 
-       0xf9, 0x80, 0x19, 0x10, 0xf0, 0x74, 0x0d, 0xe3, 
-       0xf0, 0x74, 0x07, 0xe8, 0xf0, 0x74, 0x02, 0x36, 
-       0x8a, 0x11, 0xfc, 0x00, 0x4a, 0x11, 0x60, 0xf8, 
-       0x27, 0x7b, 0xff, 0xff, 0xf8, 0x30, 0x08, 0x39, 
-       0x71, 0xf8, 0x27, 0x7b, 0x27, 0x79, 0x60, 0xf8, 
-       0x27, 0x79, 0xff, 0xff, 0xf8, 0x30, 0x08, 0xb2, 
-       0x10, 0xf8, 0x29, 0x86, 0x08, 0xf8, 0x27, 0x79, 
-       0xf0, 0x30, 0x7f, 0xff, 0x88, 0x11, 0xf4, 0x95, 
-       0x77, 0x10, 0x40, 0x00, 0xf6, 0xa9, 0xf8, 0x30, 
-       0x08, 0x58, 0x10, 0xf8, 0x27, 0x79, 0x08, 0xf8, 
-       0x27, 0x7a, 0xf0, 0x30, 0x7f, 0xff, 0x88, 0x11, 
-       0xf4, 0x95, 0x77, 0x10, 0x40, 0x00, 0xf6, 0xa9, 
-       0xf8, 0x20, 0x08, 0x63, 0x76, 0xf8, 0x27, 0x79, 
-       0xff, 0xff, 0x76, 0xf8, 0x27, 0x7b, 0xff, 0xff, 
-       0xf7, 0xb8, 0xf2, 0x73, 0x08, 0xd9, 0xf0, 0x20, 
-       0xff, 0xff, 0xf6, 0xb8, 0x56, 0xf8, 0x27, 0x74, 
-       0xf0, 0xf9, 0x88, 0x11, 0x56, 0xf8, 0x27, 0x72, 
-       0xf0, 0xf9, 0x88, 0x12, 0xf4, 0x95, 0xf4, 0x95, 
-       0xe7, 0x20, 0xf4, 0xa9, 0xf8, 0x30, 0x08, 0x8f, 
-       0xf1, 0x20, 0x27, 0x7c, 0x48, 0x11, 0xf6, 0x00, 
-       0x88, 0x13, 0xf4, 0x95, 0xf4, 0x95, 0x10, 0x83, 
-       0x08, 0xf8, 0x27, 0x79, 0xf0, 0x30, 0x7f, 0xff, 
-       0x88, 0x13, 0xf4, 0x95, 0x77, 0x10, 0x40, 0x00, 
-       0xf5, 0xab, 0xf8, 0x30, 0x08, 0x8f, 0x6d, 0x91, 
-       0x48, 0x11, 0xf0, 0x30, 0x01, 0xff, 0x88, 0x11, 
-       0xf4, 0x95, 0xe7, 0x20, 0xf7, 0xa9, 0xf8, 0x30, 
-       0x08, 0x74, 0x6d, 0x89, 0x48, 0x11, 0xf0, 0x30, 
-       0x01, 0xff, 0xf0, 0xe7, 0xf4, 0x95, 0x48, 0x08, 
-       0x4e, 0xf8, 0x27, 0x74, 0x48, 0x08, 0xf1, 0xf9, 
-       0x89, 0x11, 0xf4, 0x95, 0xf4, 0x95, 0x71, 0xe1, 
-       0x27, 0x7c, 0x27, 0x7a, 0x60, 0xf8, 0x27, 0x7b, 
-       0xff, 0xff, 0xf8, 0x30, 0x08, 0xab, 0x48, 0x08, 
-       0x4e, 0xf8, 0x27, 0x72, 0x76, 0xf8, 0x27, 0x7b, 
-       0xff, 0xff, 0x76, 0xf8, 0x27, 0x79, 0xff, 0xff, 
-       0xf2, 0x73, 0x08, 0xd9, 0xf4, 0x95, 0xe8, 0x00, 
-       0x44, 0xf8, 0x27, 0x73, 0x40, 0xf8, 0x27, 0x75, 
-       0x82, 0xf8, 0x00, 0x11, 0xf4, 0x95, 0x77, 0x10, 
-       0x80, 0x00, 0xf6, 0xa9, 0xf8, 0x20, 0x08, 0xd8, 
-       0xf6, 0xb8, 0x10, 0xf8, 0x27, 0x73, 0xf0, 0x00, 
-       0x80, 0x00, 0x48, 0x08, 0x4e, 0xf8, 0x27, 0x74, 
-       0x48, 0x08, 0xf0, 0xf9, 0x88, 0x11, 0xf4, 0x95, 
-       0xf4, 0x95, 0x71, 0xe1, 0x27, 0x7c, 0x27, 0x7a, 
-       0xf7, 0xb8, 0x57, 0xf8, 0x27, 0x74, 0xf0, 0x62, 
-       0xff, 0xff, 0xf0, 0x40, 0xff, 0x80, 0xf2, 0x80, 
-       0x4e, 0xf8, 0x27, 0x74, 0xe8, 0x00, 0x8a, 0x11, 
-       0xfc, 0x00, 0x4a, 0x11, 0x4a, 0x16, 0xee, 0xfb, 
-       0x11, 0xf8, 0x27, 0x71, 0x09, 0xf8, 0x27, 0x73, 
-       0x89, 0x11, 0x88, 0x10, 0xf4, 0x95, 0xf4, 0x95, 
-       0xf6, 0xa9, 0xf8, 0x20, 0x08, 0xed, 0xf2, 0x73, 
-       0x09, 0x0e, 0xf4, 0x95, 0xe8, 0x00, 0xf6, 0x20, 
-       0x76, 0x00, 0x00, 0x41, 0xf0, 0x74, 0x12, 0xee, 
-       0x88, 0x16, 0xf4, 0x95, 0xf7, 0xb8, 0x6d, 0x96, 
-       0x10, 0xf8, 0x00, 0x16, 0xf8, 0x47, 0x09, 0x0a, 
-       0xe7, 0x61, 0x76, 0x00, 0x00, 0x00, 0x76, 0x01, 
-       0x00, 0x80, 0x76, 0x02, 0x00, 0xff, 0x76, 0x03, 
-       0x00, 0x00, 0xf2, 0x74, 0x0c, 0xb9, 0xf4, 0x95, 
-       0xe8, 0x00, 0x6c, 0xe9, 0xff, 0xff, 0x08, 0xfb, 
-       0x73, 0x16, 0x00, 0x0e, 0xf0, 0x66, 0x00, 0x41, 
-       0xee, 0x05, 0x8a, 0x16, 0x8a, 0x11, 0xfc, 0x00, 
-       0x4a, 0x11, 0xf4, 0x95, 0x71, 0x02, 0x00, 0x13, 
-       0xf6, 0xb8, 0x77, 0x11, 0x7f, 0xff, 0x57, 0xf8, 
-       0x27, 0x72, 0x48, 0x11, 0xf2, 0x80, 0xf0, 0x00, 
-       0x80, 0x00, 0x88, 0x11, 0xf6, 0x40, 0xf0, 0xe0, 
-       0xf1, 0xf1, 0xe8, 0x01, 0xf2, 0x80, 0x80, 0xf8, 
-       0x27, 0x78, 0x77, 0x12, 0x80, 0x00, 0x57, 0xf8, 
-       0x27, 0x72, 0x48, 0x12, 0xf2, 0x80, 0x88, 0x12, 
-       0xf4, 0x95, 0xf4, 0x95, 0x6c, 0x82, 0x09, 0x38, 
-       0xe8, 0x00, 0x75, 0xf8, 0x00, 0x08, 0x00, 0x01, 
-       0xf0, 0x73, 0x09, 0x3d, 0xf0, 0x20, 0x80, 0x01, 
-       0x75, 0xf8, 0x00, 0x08, 0x00, 0x01, 0x70, 0x81, 
-       0x00, 0x13, 0x8a, 0x11, 0xfc, 0x00, 0x4a, 0x11, 
-       0xf0, 0x30, 0x7f, 0xff, 0x11, 0xf8, 0x29, 0x86, 
-       0xf5, 0x20, 0xf3, 0x30, 0x7f, 0xff, 0x89, 0x11, 
-       0xf4, 0x95, 0x77, 0x10, 0x40, 0x00, 0xf6, 0xa9, 
-       0xf8, 0x20, 0x09, 0x54, 0xf2, 0x73, 0x09, 0x67, 
-       0xf4, 0x95, 0xe8, 0x02, 0x6f, 0xf8, 0x27, 0x7a, 
-       0x0d, 0x20, 0xf3, 0x30, 0x7f, 0xff, 0x89, 0x11, 
-       0xf4, 0x95, 0x77, 0x10, 0x40, 0x00, 0xf6, 0xa9, 
-       0xf8, 0x20, 0x09, 0x64, 0xf2, 0x73, 0x09, 0x67, 
-       0xf4, 0x95, 0xe8, 0x01, 0x80, 0xf8, 0x27, 0x7b, 
-       0xe8, 0x00, 0x8a, 0x11, 0xfc, 0x00, 0x4a, 0x11, 
-       0x11, 0xf8, 0x29, 0x86, 0xf5, 0x20, 0xf3, 0x30, 
-       0x7f, 0xff, 0x89, 0x11, 0xf4, 0x95, 0x77, 0x10, 
-       0x40, 0x00, 0xf6, 0xa9, 0xf8, 0x20, 0x09, 0x7a, 
-       0xf2, 0x73, 0x09, 0x8d, 0xf4, 0x95, 0xe8, 0x02, 
-       0x6f, 0xf8, 0x27, 0x7a, 0x0d, 0x20, 0xf3, 0x30, 
-       0x7f, 0xff, 0x89, 0x11, 0xf4, 0x95, 0x77, 0x10, 
-       0x40, 0x00, 0xf6, 0xa9, 0xf8, 0x20, 0x09, 0x8a, 
-       0xf2, 0x73, 0x09, 0x8d, 0xf4, 0x95, 0xe8, 0x01, 
-       0x80, 0xf8, 0x27, 0x79, 0xe8, 0x00, 0x8a, 0x11, 
-       0xfc, 0x00, 0x4a, 0x11, 0xf4, 0x95, 0x71, 0x02, 
-       0x00, 0x12, 0x88, 0x11, 0xf6, 0xb8, 0x57, 0xf8, 
-       0x27, 0x72, 0xf0, 0x20, 0x7f, 0xff, 0xf2, 0x80, 
-       0xf0, 0x00, 0x80, 0x00, 0x80, 0x81, 0x57, 0xf8, 
-       0x27, 0x72, 0xe8, 0x01, 0xf3, 0xf1, 0xf2, 0x80, 
-       0x80, 0xf8, 0x27, 0x78, 0x77, 0x11, 0x80, 0x00, 
-       0x48, 0x11, 0x57, 0xf8, 0x27, 0x72, 0xf2, 0x80, 
-       0x88, 0x11, 0xf4, 0x95, 0xf4, 0x95, 0x6c, 0x81, 
-       0x09, 0xb5, 0xe8, 0x00, 0x75, 0xf8, 0x00, 0x08, 
-       0x00, 0x01, 0xf0, 0x73, 0x09, 0xba, 0xf0, 0x20, 
-       0x80, 0x01, 0x75, 0xf8, 0x00, 0x08, 0x00, 0x01, 
-       0x45, 0xf8, 0x27, 0x71, 0x43, 0xf8, 0x27, 0x73, 
-       0x83, 0xf8, 0x00, 0x11, 0xf4, 0x95, 0xe7, 0x20, 
-       0xf6, 0xa9, 0xf8, 0x30, 0x09, 0xc9, 0xf2, 0x73, 
-       0x09, 0xe4, 0x77, 0x12, 0x00, 0x00, 0x57, 0xf8, 
-       0x27, 0x72, 0xf0, 0x20, 0x7f, 0xff, 0xf2, 0x80, 
-       0x49, 0x12, 0xf5, 0x00, 0xf3, 0x00, 0x80, 0x00, 
-       0x61, 0xf8, 0x00, 0x0b, 0x80, 0x00, 0xf8, 0x30, 
-       0x09, 0xdc, 0xf1, 0x20, 0x80, 0x00, 0xf5, 0x20, 
-       0x89, 0x12, 0xf4, 0x95, 0x48, 0x12, 0x6f, 0xf8, 
-       0x27, 0x73, 0x0d, 0x00, 0xf4, 0x95, 0x49, 0x0b, 
-       0x4f, 0xf8, 0x27, 0x72, 0x8a, 0x11, 0xfe, 0x00, 
-       0x48, 0x12, 0xf4, 0x95, 0x4a, 0x11, 0x4a, 0x16, 
-       0x4a, 0x17, 0xee, 0xfc, 0xf4, 0x95, 0x71, 0x08, 
-       0x00, 0x16, 0x88, 0x17, 0xf0, 0x74, 0x08, 0x30, 
-       0x48, 0x18, 0x70, 0x00, 0x00, 0x16, 0xf2, 0x74, 
-       0x09, 0x8f, 0xf0, 0x00, 0x00, 0x02, 0x88, 0x11, 
-       0xf4, 0x95, 0xf4, 0x95, 0x6c, 0x81, 0x0a, 0x0a, 
-       0xf2, 0x74, 0x08, 0xdb, 0xf4, 0x95, 0x48, 0x16, 
-       0x48, 0x18, 0x70, 0x00, 0x00, 0x16, 0xf2, 0x74, 
-       0x09, 0x8f, 0xf0, 0x00, 0x00, 0x02, 0x88, 0x11, 
-       0x10, 0x02, 0x70, 0x01, 0x00, 0x11, 0x80, 0x00, 
-       0xf2, 0x74, 0x06, 0xce, 0xf4, 0x95, 0x48, 0x17, 
-       0x49, 0x11, 0x48, 0x17, 0xf6, 0x00, 0x88, 0x17, 
-       0xe7, 0x60, 0xf5, 0xa9, 0xf8, 0x20, 0x0a, 0x2d, 
-       0x48, 0x16, 0xf6, 0x20, 0x88, 0x11, 0x48, 0x18, 
-       0x70, 0x00, 0x00, 0x11, 0xf2, 0x74, 0x09, 0x8f, 
-       0xf0, 0x00, 0x00, 0x02, 0x88, 0x11, 0x70, 0x01, 
-       0x00, 0x11, 0x10, 0x02, 0x80, 0x00, 0xf2, 0x74, 
-       0x06, 0xce, 0xf4, 0x95, 0x48, 0x17, 0xee, 0x04, 
-       0x48, 0x16, 0x8a, 0x17, 0x8a, 0x16, 0x8a, 0x11, 
-       0xfc, 0x00, 0xee, 0xfd, 0xe8, 0x00, 0x4e, 0xf8, 
-       0x27, 0x70, 0xe8, 0x00, 0x4e, 0xf8, 0x27, 0x72, 
-       0xe8, 0x00, 0x4e, 0xf8, 0x27, 0x74, 0xe8, 0x00, 
-       0x4e, 0xf8, 0x27, 0x76, 0x76, 0xf8, 0x27, 0x79, 
-       0xff, 0xff, 0x76, 0xf8, 0x27, 0x7a, 0x00, 0x00, 
-       0x76, 0xf8, 0x27, 0x7b, 0xff, 0xff, 0x76, 0xf8, 
-       0x27, 0x78, 0x00, 0x00, 0xe8, 0x00, 0x75, 0xf8, 
-       0x00, 0x08, 0x00, 0x01, 0x76, 0x00, 0x00, 0x00, 
-       0x76, 0x01, 0x02, 0x00, 0xf2, 0x74, 0x12, 0xdc, 
-       0xf0, 0x20, 0x27, 0x7c, 0xee, 0x03, 0xfc, 0x00, 
-       0x4a, 0x11, 0xee, 0xfc, 0xf4, 0x95, 0x4e, 0x00, 
-       0x77, 0x12, 0x7f, 0xff, 0xf6, 0xb8, 0x49, 0x12, 
-       0xf1, 0x80, 0xf3, 0x00, 0x80, 0x00, 0x89, 0x12, 
-       0xf0, 0xe0, 0xf1, 0xf1, 0x4f, 0x02, 0xe9, 0x01, 
-       0xf4, 0x95, 0x48, 0x0b, 0xf5, 0x40, 0x56, 0x02, 
-       0xf1, 0x80, 0x81, 0xf8, 0x27, 0x78, 0x77, 0x11, 
-       0x80, 0x00, 0x56, 0x00, 0x49, 0x11, 0xf1, 0x80, 
-       0x89, 0x11, 0xf4, 0x95, 0xf4, 0x95, 0x6c, 0x81, 
-       0x0a, 0x81, 0xe8, 0x00, 0x75, 0xf8, 0x00, 0x08, 
-       0x00, 0x01, 0xf0, 0x73, 0x0a, 0x86, 0xf0, 0x20, 
-       0x80, 0x01, 0x75, 0xf8, 0x00, 0x08, 0x00, 0x01, 
-       0x10, 0x82, 0xee, 0x04, 0x8a, 0x11, 0xfc, 0x00, 
-       0x4a, 0x11, 0xee, 0xfe, 0xf4, 0x95, 0x4e, 0x00, 
-       0x77, 0x11, 0x7f, 0xff, 0xf6, 0xb8, 0x49, 0x11, 
-       0xf1, 0x80, 0xf3, 0x00, 0x80, 0x00, 0x89, 0x11, 
-       0xf0, 0xe0, 0xf1, 0xf1, 0xe8, 0x01, 0xf2, 0x80, 
-       0x80, 0xf8, 0x27, 0x78, 0x56, 0x00, 0xf1, 0x20, 
-       0x80, 0x00, 0xf1, 0x80, 0xf4, 0x95, 0x49, 0x0b, 
-       0xf8, 0x4d, 0x0a, 0xab, 0xf0, 0x20, 0x80, 0x01, 
-       0x75, 0xf8, 0x00, 0x08, 0x00, 0x01, 0xf0, 0x73, 
-       0x0a, 0xaf, 0xe8, 0x00, 0x75, 0xf8, 0x00, 0x08, 
-       0x00, 0x01, 0xee, 0x02, 0x48, 0x11, 0x8a, 0x11, 
-       0xfc, 0x00, 0x4a, 0x11, 0x88, 0x12, 0x13, 0x02, 
-       0x77, 0x11, 0x00, 0x00, 0xf8, 0x4d, 0x0a, 0xcb, 
-       0xf3, 0x10, 0x00, 0x01, 0x89, 0x1a, 0xf4, 0x95, 
-       0xf0, 0x72, 0x0a, 0xca, 0x48, 0x11, 0x1c, 0xf8, 
-       0x29, 0x7e, 0x88, 0x11, 0x11, 0xf8, 0x29, 0x7e, 
-       0xf2, 0x00, 0x00, 0x01, 0x80, 0xf8, 0x29, 0x7e, 
-       0x81, 0x92, 0x48, 0x11, 0x8a, 0x11, 0xfc, 0x00, 
-       0x4a, 0x11, 0xf4, 0x95, 0x71, 0x02, 0x00, 0x11, 
-       0x88, 0x12, 0xf6, 0xb8, 0xf0, 0x20, 0x7f, 0xff, 
-       0x57, 0xf8, 0x27, 0x70, 0xf2, 0x80, 0xf0, 0x00, 
-       0x80, 0x00, 0x80, 0x82, 0x57, 0xf8, 0x27, 0x70, 
-       0xe8, 0x01, 0xf3, 0xf1, 0xf2, 0x80, 0x80, 0xf8, 
-       0x27, 0x78, 0x77, 0x12, 0x80, 0x00, 0x48, 0x12, 
-       0x57, 0xf8, 0x27, 0x70, 0xf2, 0x80, 0x88, 0x12, 
-       0xf4, 0x95, 0xf4, 0x95, 0x6c, 0x82, 0x0a, 0xf4, 
-       0xe8, 0x00, 0x75, 0xf8, 0x00, 0x08, 0x00, 0x01, 
-       0xf0, 0x73, 0x0a, 0xf9, 0xf0, 0x20, 0x80, 0x01, 
-       0x75, 0xf8, 0x00, 0x08, 0x00, 0x01, 0x45, 0xf8, 
-       0x27, 0x75, 0xe7, 0x10, 0x43, 0xf8, 0x27, 0x71, 
-       0x83, 0xf8, 0x00, 0x12, 0x6d, 0xe8, 0x00, 0x04, 
-       0x6d, 0x8a, 0xf6, 0xaa, 0xf8, 0x30, 0x0b, 0x0a, 
-       0xf2, 0x73, 0x0b, 0x25, 0x77, 0x11, 0x00, 0x00, 
-       0x57, 0xf8, 0x27, 0x70, 0xf0, 0x20, 0x7f, 0xff, 
-       0xf2, 0x80, 0x49, 0x11, 0xf5, 0x00, 0xf3, 0x00, 
-       0x80, 0x00, 0x61, 0xf8, 0x00, 0x0b, 0x80, 0x00, 
-       0xf8, 0x30, 0x0b, 0x1d, 0xf1, 0x20, 0x80, 0x00, 
-       0xf5, 0x20, 0x89, 0x11, 0xf4, 0x95, 0x48, 0x11, 
-       0x6f, 0xf8, 0x27, 0x71, 0x0d, 0x00, 0xf4, 0x95, 
-       0x49, 0x0b, 0x4f, 0xf8, 0x27, 0x70, 0x48, 0x11, 
-       0x8a, 0x11, 0xfc, 0x00, 0x4a, 0x11, 0x4a, 0x16, 
-       0x4a, 0x17, 0xee, 0xf0, 0x88, 0x17, 0x10, 0x17, 
-       0x80, 0x05, 0x10, 0x16, 0x80, 0x06, 0x10, 0x15, 
-       0x80, 0x07, 0x71, 0x14, 0x00, 0x11, 0x10, 0x05, 
-       0xf0, 0x30, 0x00, 0x01, 0x88, 0x10, 0x10, 0x06, 
-       0xf0, 0x30, 0x00, 0x01, 0x80, 0x08, 0x49, 0x11, 
-       0x10, 0x05, 0xf6, 0x01, 0x80, 0x09, 0x10, 0x06, 
-       0x61, 0xf8, 0x00, 0x08, 0x00, 0x01, 0xf8, 0x20, 
-       0x0b, 0x4b, 0x10, 0x09, 0xf0, 0x00, 0x00, 0x01, 
-       0x80, 0x09, 0x71, 0x08, 0x00, 0x12, 0xf4, 0xaa, 
-       0xf8, 0x30, 0x0b, 0x54, 0x10, 0x09, 0xf0, 0x00, 
-       0x00, 0x01, 0x80, 0x09, 0x12, 0x09, 0x49, 0x11, 
-       0xf4, 0x7f, 0x80, 0x09, 0xf6, 0x20, 0x80, 0x0a, 
-       0x56, 0xf8, 0x27, 0x70, 0x4e, 0x0c, 0x10, 0x09, 
-       0x80, 0x00, 0x48, 0x18, 0xf2, 0x74, 0x0a, 0xce, 
-       0xf0, 0x00, 0x00, 0x04, 0x88, 0x16, 0xf4, 0x95, 
-       0xf4, 0x95, 0x6c, 0x86, 0x0b, 0x6d, 0xf2, 0x73, 
-       0x0c, 0x59, 0xf4, 0x95, 0xe8, 0x00, 0xf6, 0xb8, 
-       0xf4, 0x95, 0x56, 0x0c, 0xf0, 0xf9, 0x88, 0x12, 
-       0xf4, 0x95, 0xf4, 0x95, 0x70, 0xe2, 0x27, 0x7c, 
-       0x29, 0x86, 0xe8, 0x00, 0x80, 0x0e, 0x48, 0x11, 
-       0xf8, 0x45, 0x0b, 0xcc, 0x77, 0x10, 0x00, 0x01, 
-       0xf4, 0xa9, 0xf8, 0x30, 0x0b, 0x89, 0x6c, 0xe1, 
-       0xff, 0xfd, 0x0b, 0x8b, 0x10, 0xe7, 0x00, 0x02, 
-       0x80, 0x0e, 0xf0, 0x73, 0x0b, 0x8b, 0x10, 0x87, 
-       0x80, 0x0e, 0xe7, 0x10, 0xf5, 0xae, 0xf8, 0x20, 
-       0x0b, 0xb2, 0x70, 0x00, 0x00, 0x17, 0x70, 0x01, 
-       0x00, 0x16, 0x10, 0x04, 0xf0, 0x74, 0x06, 0xce, 
-       0x48, 0x17, 0x49, 0x16, 0xf6, 0x00, 0x88, 0x17, 
-       0x48, 0x11, 0xf6, 0x20, 0x88, 0x11, 0x10, 0x09, 
-       0xf6, 0x20, 0x80, 0x00, 0x48, 0x18, 0xf2, 0x74, 
-       0x0a, 0xce, 0xf0, 0x00, 0x00, 0x04, 0x88, 0x16, 
-       0x10, 0x04, 0x70, 0x00, 0x00, 0x17, 0x70, 0x01, 
-       0x00, 0x11, 0xf0, 0x74, 0x06, 0xce, 0x48, 0x11, 
-       0x00, 0x04, 0x80, 0x04, 0xf0, 0x73, 0x0b, 0xbc, 
-       0x70, 0x00, 0x00, 0x17, 0x70, 0x01, 0x00, 0x11, 
-       0x10, 0x04, 0xf0, 0x74, 0x06, 0xce, 0x48, 0x11, 
-       0x00, 0x04, 0x80, 0x04, 0x49, 0x11, 0x48, 0x16, 
-       0xf6, 0x20, 0x88, 0x16, 0xf4, 0x95, 0xf4, 0x95, 
-       0x6c, 0x86, 0x0b, 0xcc, 0x10, 0x0a, 0x80, 0x00, 
-       0x48, 0x18, 0xf2, 0x74, 0x0a, 0xce, 0xf0, 0x00, 
-       0x00, 0x04, 0x88, 0x16, 0x12, 0x0a, 0xf8, 0x45, 
-       0x0c, 0x33, 0x71, 0x0a, 0x00, 0x10, 0xf4, 0xae, 
-       0xf8, 0x30, 0x0c, 0x1c, 0x48, 0x16, 0xf0, 0xe1, 
-       0x88, 0x11, 0x12, 0x08, 0xf8, 0x45, 0x0b, 0xdb, 
-       0x6d, 0x89, 0x12, 0x07, 0xf8, 0x45, 0x0b, 0xe9, 
-       0x10, 0x07, 0x80, 0x00, 0x70, 0x02, 0x00, 0x11, 
-       0x10, 0x06, 0x80, 0x01, 0x10, 0x04, 0xf0, 0x74, 
-       0x06, 0xdc, 0xf0, 0x73, 0x0b, 0xef, 0x48, 0x11, 
-       0x6f, 0x00, 0x0c, 0x9f, 0x10, 0x04, 0xf0, 0x74, 
-       0x0a, 0xb3, 0x11, 0x0e, 0xf1, 0xc0, 0x81, 0x0e, 
-       0x10, 0x06, 0x49, 0x11, 0xf6, 0x00, 0x80, 0x06, 
-       0x10, 0x05, 0xf6, 0x20, 0x88, 0x11, 0xf0, 0x00, 
-       0x00, 0x01, 0x48, 0x08, 0x6f, 0x00, 0x0c, 0x9f, 
-       0x48, 0x18, 0xf2, 0x74, 0x0a, 0xce, 0xf0, 0x00, 
-       0x00, 0x04, 0x12, 0x07, 0xf8, 0x45, 0x0c, 0x11, 
-       0x10, 0x07, 0x80, 0x00, 0x70, 0x02, 0x00, 0x11, 
-       0x10, 0x06, 0x80, 0x01, 0x10, 0x04, 0xf0, 0x74, 
-       0x06, 0xdc, 0xf0, 0x73, 0x0c, 0x17, 0x48, 0x11, 
-       0x6f, 0x00, 0x0c, 0x9f, 0x10, 0x04, 0xf0, 0x74, 
-       0x0a, 0xb3, 0x11, 0x0e, 0xf1, 0xc0, 0x81, 0x0e, 
-       0xf0, 0x73, 0x0c, 0x33, 0x12, 0x07, 0xf8, 0x45, 
-       0x0c, 0x2a, 0x10, 0x07, 0x80, 0x00, 0x10, 0x06, 
-       0x80, 0x01, 0x10, 0x05, 0x80, 0x02, 0x10, 0x04, 
-       0xf0, 0x74, 0x06, 0xdc, 0xf0, 0x73, 0x0c, 0x30, 
-       0x12, 0x05, 0x6f, 0x00, 0x0c, 0x9f, 0x10, 0x04, 
-       0xf0, 0x74, 0x0a, 0xb3, 0x11, 0x0e, 0xf1, 0xc0, 
-       0x81, 0x0e, 0x76, 0x00, 0x00, 0x01, 0x48, 0x18, 
-       0xf2, 0x74, 0x0a, 0xce, 0xf0, 0x00, 0x00, 0x04, 
-       0x71, 0x04, 0x00, 0x11, 0x70, 0x81, 0x29, 0x86, 
-       0x10, 0x0e, 0x1c, 0xf8, 0x29, 0x86, 0x80, 0x0e, 
-       0x76, 0x00, 0x00, 0x01, 0x48, 0x18, 0xf2, 0x74, 
-       0x0a, 0xce, 0xf0, 0x00, 0x00, 0x04, 0x10, 0x0e, 
-       0x71, 0x04, 0x00, 0x11, 0x80, 0x81, 0x10, 0xf8, 
-       0x29, 0x86, 0xf0, 0x00, 0x00, 0x01, 0xf0, 0x30, 
-       0x7f, 0xff, 0x80, 0xf8, 0x29, 0x86, 0x10, 0x09, 
-       0xf0, 0x00, 0x00, 0x02, 0x80, 0x09, 0xee, 0x10, 
-       0x8a, 0x17, 0x8a, 0x16, 0x8a, 0x11, 0xfc, 0x00, 
-       0x10, 0xf8, 0x27, 0x75, 0x08, 0xf8, 0x27, 0x71, 
-       0xf0, 0x10, 0x00, 0x01, 0x48, 0x08, 0xfc, 0x00, 
-       0x4a, 0x11, 0x4a, 0x16, 0xee, 0xff, 0xf4, 0x95, 
-       0x71, 0x04, 0x00, 0x16, 0xf0, 0x00, 0x00, 0x01, 
-       0x48, 0x08, 0x4e, 0xf8, 0x29, 0x7c, 0x6d, 0xee, 
-       0xff, 0xfd, 0x48, 0x16, 0xf8, 0x45, 0x0c, 0x99, 
-       0x56, 0xf8, 0x29, 0x7c, 0xf0, 0x74, 0x0a, 0x5a, 
-       0x88, 0x11, 0x10, 0xf8, 0x29, 0x7d, 0xf0, 0x00, 
-       0x00, 0x01, 0x48, 0x08, 0x4e, 0xf8, 0x29, 0x7c, 
-       0x10, 0xf8, 0x29, 0x82, 0xf0, 0x00, 0x00, 0x01, 
-       0x88, 0x10, 0xf4, 0x95, 0xf4, 0x95, 0xf4, 0xa9, 
-       0xfa, 0x30, 0x0c, 0x96, 0x80, 0xf8, 0x29, 0x82, 
-       0x56, 0xf8, 0x29, 0x80, 0xf0, 0x00, 0x00, 0x01, 
-       0x4e, 0xf8, 0x29, 0x80, 0x73, 0x11, 0x29, 0x82, 
-       0x6c, 0xee, 0xff, 0xff, 0x0c, 0x76, 0xee, 0x01, 
-       0x8a, 0x16, 0x8a, 0x11, 0xfc, 0x00, 0x4a, 0x11, 
-       0x76, 0xf8, 0x29, 0x84, 0x00, 0x00, 0x76, 0xf8, 
-       0x29, 0x85, 0x00, 0x01, 0xe8, 0x00, 0x4e, 0xf8, 
-       0x2a, 0x0c, 0x76, 0xf8, 0x29, 0x86, 0x00, 0x00, 
-       0x76, 0xf8, 0x29, 0x87, 0x00, 0x00, 0x77, 0x11, 
-       0x29, 0x88, 0x76, 0x81, 0xaa, 0xaa, 0x76, 0xe1, 
-       0x00, 0x01, 0xaa, 0xaa, 0x76, 0xe1, 0x00, 0x02, 
-       0x00, 0x00, 0x8a, 0x11, 0xfc, 0x00, 0x4a, 0x11, 
-       0xee, 0xfc, 0xf4, 0x95, 0x71, 0x06, 0x00, 0x14, 
-       0x71, 0x07, 0x00, 0x13, 0x71, 0x08, 0x00, 0x12, 
-       0x71, 0x09, 0x00, 0x15, 0x77, 0x10, 0x00, 0xff, 
-       0xf4, 0xaa, 0xf8, 0x30, 0x0d, 0x44, 0x49, 0x13, 
-       0x53, 0xf8, 0x2a, 0x0c, 0x4f, 0xf8, 0x2a, 0x0c, 
-       0x73, 0x12, 0x00, 0x0e, 0xf1, 0x66, 0x00, 0x0d, 
-       0x89, 0x11, 0xf4, 0x95, 0x77, 0x10, 0x00, 0x01, 
-       0x71, 0xe1, 0x24, 0x00, 0x00, 0x11, 0xf4, 0xa9, 
-       0xf8, 0x30, 0x0d, 0x17, 0x77, 0x10, 0x00, 0x02, 
-       0xf4, 0xa9, 0xf8, 0x30, 0x0c, 0xec, 0x77, 0x11, 
-       0x29, 0x8a, 0x76, 0x81, 0x00, 0x00, 0xe8, 0x00, 
-       0x77, 0x14, 0x00, 0x00, 0x77, 0x13, 0x00, 0x00, 
-       0xf0, 0x73, 0x0d, 0x48, 0x6c, 0x83, 0x0c, 0xfa, 
-       0x77, 0x11, 0x29, 0x8a, 0x48, 0x12, 0xf0, 0xe8, 
-       0xf0, 0x40, 0x80, 0x00, 0x80, 0x81, 0xe8, 0x00, 
-       0x77, 0x14, 0x00, 0x00, 0xf0, 0x73, 0x0d, 0x48, 
-       0x49, 0x13, 0xf3, 0x40, 0x80, 0x00, 0x81, 0xf8, 
-       0x29, 0x8a, 0x61, 0xf8, 0x00, 0x15, 0x00, 0x01, 
-       0xf8, 0x20, 0x0d, 0x07, 0x69, 0xf8, 0x29, 0x8a, 
-       0x40, 0x00, 0x61, 0xf8, 0x00, 0x14, 0x00, 0x01, 
-       0xf8, 0x20, 0x0d, 0x0f, 0x69, 0xf8, 0x29, 0x8a, 
-       0x20, 0x00, 0x77, 0x11, 0x29, 0x8a, 0x49, 0x12, 
-       0xf3, 0xe8, 0x1b, 0x81, 0x81, 0x81, 0xf0, 0x73, 
-       0x0d, 0x48, 0x11, 0xf8, 0x29, 0x84, 0xf8, 0x4c, 
-       0x0d, 0x37, 0x77, 0x11, 0x29, 0x88, 0x76, 0x81, 
-       0xaa, 0xaa, 0x11, 0xf8, 0x29, 0x85, 0xf3, 0x10, 
-       0x00, 0x01, 0xf3, 0x40, 0xaa, 0x00, 0x81, 0xe1, 
-       0x00, 0x01, 0x76, 0x00, 0x00, 0x02, 0x80, 0x01, 
-       0x70, 0x02, 0x00, 0x14, 0x70, 0x03, 0x00, 0x13, 
-       0xf2, 0x74, 0x0b, 0x28, 0xf4, 0x95, 0x48, 0x11, 
-       0x71, 0xf8, 0x29, 0x85, 0x29, 0x84, 0xf0, 0x73, 
-       0x0d, 0x73, 0x76, 0x00, 0x00, 0x00, 0x80, 0x01, 
-       0x76, 0x02, 0x00, 0x00, 0x70, 0x03, 0x00, 0x13, 
-       0xf2, 0x74, 0x0b, 0x28, 0xf4, 0x95, 0xe8, 0x00, 
-       0xf0, 0x73, 0x0d, 0x73, 0x77, 0x11, 0x29, 0x8a, 
-       0x70, 0x81, 0x00, 0x13, 0x11, 0xf8, 0x29, 0x84, 
-       0xf8, 0x4c, 0x0d, 0x68, 0x77, 0x11, 0x29, 0x88, 
-       0x76, 0x81, 0xaa, 0xaa, 0x11, 0xf8, 0x29, 0x85, 
-       0xf3, 0x10, 0x00, 0x01, 0xf3, 0x40, 0xaa, 0x00, 
-       0x81, 0xe1, 0x00, 0x01, 0x76, 0x00, 0x00, 0x03, 
-       0x80, 0x01, 0x70, 0x02, 0x00, 0x14, 0x70, 0x03, 
-       0x00, 0x13, 0xf2, 0x74, 0x0b, 0x28, 0xf4, 0x95, 
-       0x48, 0x11, 0x71, 0xf8, 0x29, 0x85, 0x29, 0x84, 
-       0xf0, 0x73, 0x0d, 0x73, 0x76, 0x00, 0x00, 0x01, 
-       0x80, 0x01, 0x70, 0x02, 0x00, 0x14, 0x70, 0x03, 
-       0x00, 0x13, 0xf2, 0x74, 0x0b, 0x28, 0xf4, 0x95, 
-       0x48, 0x11, 0x6b, 0xf8, 0x29, 0x84, 0xff, 0xff, 
-       0xee, 0x04, 0x8a, 0x11, 0xfc, 0x00, 0x4a, 0x11, 
-       0xf5, 0x40, 0xf4, 0x95, 0x48, 0x0b, 0xf4, 0x78, 
-       0x88, 0x11, 0xf4, 0x95, 0xf4, 0x95, 0x6c, 0xe1, 
-       0xff, 0xb9, 0x0d, 0x88, 0xf2, 0x73, 0x0d, 0xa5, 
-       0xf4, 0x95, 0xe8, 0x60, 0xf2, 0x00, 0x00, 0x06, 
-       0x61, 0xf8, 0x00, 0x11, 0x00, 0x20, 0xf8, 0x30, 
-       0x0d, 0x98, 0x61, 0xf8, 0x00, 0x0b, 0x00, 0x01, 
-       0xf8, 0x20, 0x0d, 0xa3, 0xf2, 0x00, 0x00, 0x07, 
-       0xf0, 0x73, 0x0d, 0xa3, 0x61, 0xf8, 0x00, 0x0b, 
-       0x00, 0x01, 0xf8, 0x20, 0x0d, 0xa1, 0xf2, 0x73, 
-       0x0d, 0xa3, 0xf0, 0x00, 0x00, 0x01, 0xf0, 0x00, 
-       0x00, 0x02, 0x48, 0x08, 0xf4, 0x7f, 0x8a, 0x11, 
-       0xfc, 0x00, 0xee, 0xff, 0xf0, 0x74, 0x07, 0xfd, 
-       0xf0, 0x74, 0x07, 0x44, 0xf0, 0x74, 0x0d, 0xb4, 
-       0xf0, 0x74, 0x02, 0x05, 0xf0, 0x74, 0x04, 0x60, 
-       0xf0, 0x73, 0x0d, 0xaa, 0xee, 0xfd, 0x10, 0xf8, 
-       0x2a, 0xa3, 0xf8, 0x44, 0x0d, 0xcb, 0x10, 0xf8, 
-       0x2a, 0xa4, 0xf8, 0x45, 0x0d, 0xd7, 0x76, 0x00, 
-       0x02, 0x00, 0xf2, 0x74, 0x09, 0xe8, 0xf0, 0x20, 
-       0x22, 0x00, 0x76, 0xf8, 0x2a, 0xa4, 0x00, 0x00, 
-       0x76, 0xf8, 0x2a, 0xa7, 0x00, 0x00, 0xf0, 0x73, 
-       0x0d, 0xd7, 0x76, 0x00, 0x02, 0x00, 0xf2, 0x74, 
-       0x09, 0xe8, 0xf0, 0x20, 0x20, 0x00, 0x76, 0xf8, 
-       0x2a, 0xa3, 0x00, 0x00, 0x76, 0xf8, 0x2a, 0xa7, 
-       0x00, 0x01, 0xf0, 0x74, 0x0c, 0x5e, 0xf0, 0xe0, 
-       0xf0, 0x10, 0x3a, 0x98, 0xf8, 0x47, 0x0d, 0xe1, 
-       0x76, 0xf8, 0x27, 0x6e, 0x00, 0x00, 0xee, 0x03, 
-       0xfc, 0x00, 0x4a, 0x11, 0xee, 0xfe, 0x77, 0x11, 
-       0x20, 0x00, 0x76, 0x00, 0xaa, 0xaa, 0x76, 0x01, 
-       0x02, 0x00, 0xf2, 0x74, 0x06, 0x6c, 0xf4, 0x95, 
-       0x48, 0x11, 0x76, 0x00, 0x55, 0x55, 0x76, 0x01, 
-       0x02, 0x00, 0x48, 0x11, 0xf2, 0x74, 0x06, 0x6c, 
-       0xf0, 0x00, 0x02, 0x00, 0x76, 0xf8, 0x2a, 0xa3, 
-       0x00, 0x00, 0x76, 0xf8, 0x2a, 0xa4, 0x00, 0x00, 
-       0xe8, 0x00, 0x4e, 0x00, 0xfb, 0x80, 0x15, 0x3e, 
-       0xf4, 0x95, 0xe8, 0x04, 0x80, 0xf8, 0x2a, 0xa5, 
-       0x76, 0x00, 0x2a, 0xa8, 0xf9, 0x80, 0x14, 0x87, 
-       0x76, 0x00, 0x2a, 0xad, 0xfb, 0x80, 0x13, 0x62, 
-       0xf4, 0x95, 0xe8, 0x02, 0x10, 0xf8, 0x2a, 0xa5, 
-       0xf9, 0x80, 0x14, 0x63, 0xfb, 0x80, 0x16, 0x66, 
-       0xf4, 0x95, 0xe8, 0x1c, 0xfb, 0x80, 0x16, 0x87, 
-       0xf4, 0x95, 0xe8, 0x1c, 0xe8, 0x01, 0x4e, 0x00, 
-       0xfb, 0x80, 0x17, 0xd6, 0xf4, 0x95, 0xe8, 0x00, 
-       0x80, 0xf8, 0x2a, 0xa6, 0x76, 0x00, 0x2a, 0xb7, 
-       0xf9, 0x80, 0x16, 0xaa, 0x10, 0xf8, 0x2a, 0xa6, 
-       0xf9, 0x80, 0x17, 0x5c, 0x10, 0xf8, 0x2a, 0xa6, 
-       0xf9, 0x80, 0x17, 0x6f, 0xee, 0x02, 0x8a, 0x11, 
-       0xfc, 0x00, 0xf4, 0x95, 0x4a, 0x08, 0x4a, 0x09, 
-       0x4a, 0x0a, 0x4a, 0x07, 0x4a, 0x1d, 0x68, 0xf8, 
-       0x00, 0x07, 0x7d, 0x3f, 0x69, 0xf8, 0x00, 0x07, 
-       0x40, 0x00, 0x68, 0xf8, 0x00, 0x1d, 0xff, 0xfc, 
-       0x10, 0xf8, 0x2a, 0xa7, 0xf8, 0x44, 0x0e, 0x4b, 
-       0x76, 0xf8, 0x2a, 0xa3, 0x00, 0x01, 0xf0, 0x73, 
-       0x0e, 0x4e, 0x76, 0xf8, 0x2a, 0xa4, 0x00, 0x01, 
-       0x8a, 0x1d, 0x8a, 0x07, 0x8a, 0x0a, 0x8a, 0x09, 
-       0x8a, 0x08, 0xf4, 0xeb, 0x4a, 0x11, 0x4a, 0x16, 
-       0x4a, 0x17, 0xee, 0xfe, 0x88, 0x0e, 0x71, 0x08, 
-       0x00, 0x16, 0x71, 0x06, 0x00, 0x17, 0x11, 0x07, 
-       0xf0, 0x66, 0x00, 0x0d, 0xf0, 0x00, 0x25, 0xa0, 
-       0x88, 0x11, 0x76, 0x01, 0x00, 0x06, 0x81, 0x00, 
-       0xf2, 0x74, 0x06, 0xce, 0xf0, 0x00, 0x00, 0x01, 
-       0x76, 0x01, 0x00, 0x06, 0x70, 0x00, 0x00, 0x16, 
-       0x48, 0x11, 0xf2, 0x74, 0x06, 0xce, 0xf0, 0x00, 
-       0x00, 0x07, 0x70, 0x81, 0x00, 0x17, 0xee, 0x02, 
-       0x8a, 0x17, 0x8a, 0x16, 0x8a, 0x11, 0xfc, 0x00, 
-       0x4a, 0x11, 0x88, 0x0e, 0x71, 0x02, 0x00, 0x12, 
-       0x11, 0x03, 0xf0, 0x66, 0x00, 0x0d, 0xf0, 0x00, 
-       0x24, 0x00, 0x88, 0x11, 0xf4, 0x95, 0x70, 0x81, 
-       0x00, 0x12, 0x6e, 0xe2, 0xff, 0xfe, 0x0e, 0x8d, 
-       0xf4, 0x95, 0xe8, 0x00, 0xe8, 0x01, 0x80, 0xe1, 
-       0x00, 0x02, 0x76, 0xe1, 0x00, 0x03, 0x00, 0xff, 
-       0x76, 0xe1, 0x00, 0x04, 0x00, 0x00, 0x76, 0xe1, 
-       0x00, 0x0b, 0x00, 0x00, 0x76, 0xe1, 0x00, 0x0c, 
-       0x00, 0x00, 0x81, 0xe1, 0x00, 0x01, 0x8a, 0x11, 
-       0xfc, 0x00, 0x4a, 0x11, 0xee, 0xfc, 0x88, 0x0e, 
-       0xf4, 0x95, 0xf1, 0x66, 0x00, 0x0d, 0xf3, 0x00, 
-       0x24, 0x00, 0x89, 0x11, 0xf4, 0x95, 0xf4, 0x95, 
-       0x76, 0xe1, 0x00, 0x0c, 0x00, 0x00, 0x76, 0xe1, 
-       0x00, 0x0b, 0x00, 0x00, 0x76, 0xe1, 0x00, 0x02, 
-       0x00, 0x01, 0x76, 0x00, 0x00, 0x00, 0x76, 0x01, 
-       0x00, 0x00, 0x80, 0x02, 0x76, 0x03, 0x00, 0x00, 
-       0xf2, 0x74, 0x0c, 0xb9, 0xf4, 0x95, 0xe8, 0x00, 
-       0xee, 0x04, 0x8a, 0x11, 0xfc, 0x00, 0x4a, 0x11, 
-       0x88, 0x19, 0xf4, 0x95, 0x73, 0x19, 0x00, 0x0e, 
-       0xf1, 0x66, 0x00, 0x0d, 0xf2, 0x00, 0x24, 0x00, 
-       0x77, 0x15, 0x25, 0xa0, 0x77, 0x14, 0x00, 0x00, 
-       0x77, 0x1a, 0x00, 0x1f, 0xf0, 0x72, 0x0f, 0x14, 
-       0xf6, 0xb8, 0x49, 0x19, 0x09, 0x85, 0xf8, 0x4c, 
-       0x0f, 0x13, 0xf1, 0x00, 0x00, 0x05, 0x89, 0x11, 
-       0x49, 0x15, 0xf3, 0x00, 0x00, 0x01, 0x89, 0x13, 
-       0x49, 0x15, 0xf3, 0x00, 0x00, 0x07, 0x89, 0x12, 
-       0x11, 0x93, 0x1d, 0x91, 0x19, 0x92, 0x89, 0x10, 
-       0xf4, 0x95, 0xf4, 0x95, 0x6c, 0x80, 0x0f, 0x13, 
-       0x11, 0x93, 0x1d, 0x91, 0x19, 0x92, 0x89, 0x10, 
-       0xf4, 0x95, 0xf4, 0x95, 0x6c, 0x80, 0x0f, 0x13, 
-       0x11, 0x93, 0x1d, 0x91, 0x19, 0x92, 0x89, 0x10, 
-       0xf4, 0x95, 0xf4, 0x95, 0x6c, 0x80, 0x0f, 0x13, 
-       0x11, 0x93, 0x1d, 0x91, 0x19, 0x92, 0x89, 0x10, 
-       0xf4, 0x95, 0xf4, 0x95, 0x6c, 0x80, 0x0f, 0x13, 
-       0x11, 0x93, 0x1d, 0x91, 0x19, 0x92, 0x89, 0x10, 
-       0xf4, 0x95, 0xf4, 0x95, 0x6c, 0x80, 0x0f, 0x13, 
-       0x11, 0x93, 0x1d, 0x91, 0x19, 0x92, 0x89, 0x11, 
-       0xf4, 0x95, 0xf4, 0x95, 0x6c, 0x81, 0x0f, 0x13, 
-       0x6d, 0x94, 0x6d, 0xed, 0x00, 0x0d, 0x48, 0x14, 
-       0x8a, 0x11, 0xfc, 0x00, 0x4a, 0x11, 0x4a, 0x16, 
-       0x4a, 0x17, 0xee, 0xf8, 0x88, 0x17, 0x10, 0x0d, 
-       0x80, 0x04, 0x10, 0x0c, 0x80, 0x05, 0x71, 0x0e, 
-       0x00, 0x16, 0x73, 0x17, 0x00, 0x0e, 0xf0, 0x66, 
-       0x00, 0x0d, 0xf0, 0x00, 0x24, 0x00, 0x88, 0x11, 
-       0x10, 0xf8, 0x27, 0x63, 0xf8, 0x45, 0x0f, 0x32, 
-       0xf2, 0x74, 0x0e, 0x9f, 0xf4, 0x95, 0x48, 0x17, 
-       0x10, 0xf8, 0x27, 0x60, 0xf8, 0x44, 0x0f, 0x3d, 
-       0x60, 0xe1, 0x00, 0x02, 0x00, 0x01, 0xf8, 0x20, 
-       0x0f, 0x6d, 0xf0, 0x73, 0x11, 0x33, 0x10, 0x04, 
-       0x80, 0x00, 0x10, 0x05, 0xf0, 0x74, 0x06, 0x9f, 
-       0x11, 0x04, 0xf3, 0x00, 0x00, 0x01, 0x81, 0x04, 
-       0x6d, 0x8e, 0x77, 0x10, 0x00, 0x01, 0x71, 0xe1, 
-       0x00, 0x02, 0x00, 0x12, 0xf4, 0xaa, 0xf8, 0x30, 
-       0x0f, 0x62, 0x77, 0x10, 0x00, 0x02, 0xf4, 0xaa, 
-       0xf8, 0x30, 0x0f, 0x6d, 0x45, 0xe1, 0x00, 0x0b, 
-       0x88, 0x10, 0x43, 0xe1, 0x00, 0x0c, 0x83, 0xf8, 
-       0x00, 0x12, 0xf4, 0x95, 0xf4, 0x95, 0xf4, 0xaa, 
-       0xf8, 0x30, 0x0f, 0x6d, 0xf0, 0x73, 0x0f, 0x96, 
-       0xf5, 0x00, 0x81, 0x04, 0x49, 0x16, 0xf5, 0x20, 
-       0x89, 0x16, 0x76, 0xe1, 0x00, 0x0c, 0x00, 0x00, 
-       0x76, 0xe1, 0x00, 0x04, 0x00, 0x00, 0x48, 0x16, 
-       0xf8, 0x45, 0x11, 0x33, 0xf7, 0xb8, 0x71, 0xe1, 
-       0x00, 0x02, 0x00, 0x12, 0x10, 0xf8, 0x00, 0x12, 
-       0xf0, 0x10, 0x00, 0x03, 0xf8, 0x46, 0x0f, 0x8c, 
-       0x10, 0xf8, 0x00, 0x12, 0xf0, 0x10, 0x00, 0x03, 
-       0xf8, 0x45, 0x10, 0x16, 0x77, 0x10, 0x00, 0x01, 
-       0xf4, 0xaa, 0xf8, 0x30, 0x0f, 0x9c, 0x77, 0x10, 
-       0x00, 0x02, 0xf4, 0xaa, 0xf8, 0x30, 0x0f, 0xa8, 
-       0xf0, 0x73, 0x0f, 0x96, 0x77, 0x10, 0x00, 0x04, 
-       0xf4, 0xaa, 0xf8, 0x30, 0x10, 0xb7, 0x77, 0x10, 
-       0x00, 0x05, 0xf4, 0xaa, 0xf8, 0x30, 0x10, 0xbc, 
-       0xf2, 0x74, 0x0e, 0x9f, 0xf4, 0x95, 0x48, 0x17, 
-       0xf0, 0x73, 0x11, 0x31, 0x76, 0xe1, 0x00, 0x0c, 
-       0x00, 0x00, 0x76, 0xe1, 0x00, 0x0b, 0x00, 0x00, 
-       0x76, 0xe1, 0x00, 0x04, 0x00, 0x00, 0x76, 0xe1, 
-       0x00, 0x02, 0x00, 0x02, 0x11, 0xe1, 0x00, 0x0c, 
-       0xe8, 0x03, 0xf6, 0x20, 0x89, 0x12, 0xf4, 0x95, 
-       0x77, 0x10, 0x00, 0x03, 0xf5, 0xaa, 0xf8, 0x30, 
-       0x0f, 0xb6, 0x6b, 0xf8, 0x27, 0x6f, 0x00, 0x01, 
-       0x88, 0x10, 0xf4, 0x95, 0xf4, 0x95, 0xf5, 0xae, 
-       0xf8, 0x20, 0x0f, 0xbd, 0x48, 0x16, 0x80, 0x06, 
-       0x88, 0x13, 0xf4, 0x95, 0x77, 0x10, 0x00, 0x03, 
-       0xf6, 0xab, 0xf8, 0x20, 0x0f, 0xc8, 0x6b, 0xf8, 
-       0x27, 0x6f, 0x00, 0x01, 0x12, 0x06, 0xf8, 0x45, 
-       0x10, 0x00, 0x10, 0xe1, 0x00, 0x04, 0x80, 0x00, 
-       0x10, 0x05, 0x80, 0x01, 0x10, 0x04, 0x80, 0x02, 
-       0x10, 0x06, 0x80, 0x03, 0x48, 0x11, 0xf2, 0x74, 
-       0x07, 0x1e, 0xf0, 0x00, 0x00, 0x05, 0x10, 0x06, 
-       0x00, 0xe1, 0x00, 0x04, 0x80, 0xe1, 0x00, 0x04, 
-       0x10, 0x06, 0x00, 0xe1, 0x00, 0x0c, 0x80, 0xe1, 
-       0x00, 0x0c, 0x88, 0x12, 0x11, 0x06, 0x10, 0x04, 
-       0xf6, 0x00, 0x80, 0x04, 0x48, 0x16, 0xf6, 0x20, 
-       0x88, 0x16, 0x89, 0x13, 0xf4, 0x95, 0x77, 0x10, 
-       0x00, 0x03, 0xf6, 0xab, 0xf8, 0x20, 0x0f, 0xf5, 
-       0x6b, 0xf8, 0x27, 0x6f, 0x00, 0x01, 0x77, 0x10, 
-       0x00, 0x0c, 0x71, 0xe1, 0x00, 0x04, 0x00, 0x13, 
-       0xf6, 0xab, 0xf8, 0x20, 0x10, 0x00, 0x6b, 0xf8, 
-       0x27, 0x6f, 0x00, 0x01, 0x6c, 0xe2, 0xff, 0xfd, 
-       0x11, 0x31, 0xf6, 0xb8, 0x6f, 0xe1, 0x00, 0x05, 
-       0x0c, 0x48, 0x6f, 0xe1, 0x00, 0x06, 0x0c, 0x18, 
-       0xf0, 0x30, 0x0f, 0xff, 0xf0, 0x00, 0x00, 0x03, 
-       0x80, 0xe1, 0x00, 0x0b, 0x76, 0xe1, 0x00, 0x02, 
-       0x00, 0x03, 0x48, 0x16, 0xf8, 0x45, 0x11, 0x33, 
-       0x71, 0xe1, 0x00, 0x0c, 0x00, 0x12, 0x10, 0xe1, 
-       0x00, 0x0b, 0x49, 0x12, 0xf6, 0x20, 0x88, 0x13, 
-       0xe8, 0x0c, 0xf6, 0x20, 0x88, 0x10, 0xf4, 0x95, 
-       0xf4, 0x95, 0xf5, 0xab, 0xf8, 0x20, 0x10, 0x27, 
-       0x48, 0x13, 0x80, 0x06, 0x88, 0x10, 0xf4, 0x95, 
-       0xf4, 0x95, 0xf5, 0xae, 0xf8, 0x20, 0x10, 0x30, 
-       0x70, 0x06, 0x00, 0x16, 0x12, 0x06, 0xf8, 0x45, 
-       0x10, 0x5f, 0x10, 0xe1, 0x00, 0x04, 0x80, 0x00, 
-       0x10, 0x05, 0x80, 0x01, 0x10, 0x04, 0x80, 0x02, 
-       0x10, 0x06, 0x80, 0x03, 0x48, 0x11, 0xf2, 0x74, 
-       0x07, 0x1e, 0xf0, 0x00, 0x00, 0x05, 0x10, 0x06, 
-       0x00, 0xe1, 0x00, 0x04, 0x80, 0xe1, 0x00, 0x04, 
-       0x10, 0x06, 0x00, 0xe1, 0x00, 0x0c, 0x80, 0xe1, 
-       0x00, 0x0c, 0x88, 0x12, 0x11, 0x06, 0x10, 0x04, 
-       0xf6, 0x00, 0x80, 0x04, 0x48, 0x16, 0xf6, 0x20, 
-       0x88, 0x16, 0xf4, 0x95, 0x77, 0x10, 0x00, 0x0c, 
-       0x71, 0xe1, 0x00, 0x04, 0x00, 0x13, 0xf6, 0xab, 
-       0xf8, 0x20, 0x10, 0x5f, 0x6b, 0xf8, 0x27, 0x6f, 
-       0x00, 0x01, 0x77, 0x10, 0x00, 0x0c, 0xf6, 0xaa, 
-       0xf8, 0x20, 0x10, 0x6b, 0xf2, 0x74, 0x0e, 0x9f, 
-       0xf4, 0x95, 0x48, 0x17, 0x71, 0xe1, 0x00, 0x0c, 
-       0x00, 0x12, 0x77, 0x10, 0x00, 0x0c, 0xf4, 0xaa, 
-       0xf8, 0x30, 0x10, 0x7c, 0x77, 0x10, 0x00, 0x0c, 
-       0x71, 0xe1, 0x00, 0x0b, 0x00, 0x13, 0xf6, 0xab, 
-       0xf8, 0x30, 0x10, 0xb4, 0xe7, 0x30, 0xf7, 0xaa, 
-       0xf8, 0x30, 0x10, 0xb4, 0xf2, 0x74, 0x0e, 0xc1, 
-       0xf4, 0x95, 0x48, 0x17, 0x88, 0x12, 0xf4, 0x95, 
-       0xf4, 0x95, 0x6c, 0x82, 0x10, 0x8d, 0x76, 0xe1, 
-       0x00, 0x04, 0x00, 0x00, 0x76, 0xe1, 0x00, 0x02, 
-       0x00, 0x05, 0xf0, 0x73, 0x10, 0xb4, 0x76, 0xe1, 
-       0x00, 0x02, 0x00, 0x04, 0x77, 0x10, 0x00, 0x0c, 
-       0x71, 0xe1, 0x00, 0x0b, 0x00, 0x12, 0xf5, 0xaa, 
-       0xf8, 0x20, 0x10, 0x9a, 0xf0, 0x73, 0x10, 0x9c, 
-       0x77, 0x12, 0x00, 0x0c, 0x76, 0x00, 0x00, 0x00, 
-       0x70, 0x01, 0x00, 0x12, 0x70, 0x02, 0x00, 0x17, 
-       0x76, 0x03, 0x00, 0x01, 0x48, 0x11, 0xf2, 0x74, 
-       0x0c, 0xb9, 0xf0, 0x00, 0x00, 0x05, 0x76, 0xe1, 
-       0x00, 0x04, 0x00, 0x00, 0x77, 0x10, 0x00, 0x0c, 
-       0x71, 0xe1, 0x00, 0x0b, 0x00, 0x12, 0xf6, 0xaa, 
-       0xf8, 0x20, 0x11, 0x1c, 0x48, 0x16, 0xf8, 0x45, 
-       0x11, 0x33, 0x60, 0xe1, 0x00, 0x02, 0x00, 0x05, 
-       0xf8, 0x20, 0x10, 0xdf, 0x10, 0xe1, 0x00, 0x0b, 
-       0x08, 0xe1, 0x00, 0x0c, 0x11, 0xe1, 0x00, 0x04, 
-       0xf8, 0x4d, 0x10, 0xc7, 0x6b, 0xf8, 0x27, 0x6f, 
-       0x00, 0x01, 0x88, 0x10, 0xf4, 0x95, 0xf4, 0x95, 
-       0xf5, 0xae, 0xf8, 0x20, 0x10, 0xcf, 0x48, 0x16, 
-       0xf4, 0x95, 0x48, 0x08, 0xf8, 0x45, 0x11, 0x16, 
-       0x6f, 0xe1, 0x00, 0x0c, 0x0d, 0x00, 0x81, 0xe1, 
-       0x00, 0x0c, 0x11, 0x04, 0xf5, 0x00, 0x81, 0x04, 
-       0x49, 0x16, 0xf5, 0x20, 0x89, 0x16, 0xf0, 0x73, 
-       0x11, 0x0e, 0x10, 0xe1, 0x00, 0x0b, 0x71, 0xe1, 
-       0x00, 0x0c, 0x00, 0x12, 0x88, 0x10, 0xf4, 0x95, 
-       0xf4, 0x95, 0xf6, 0xaa, 0xf8, 0x30, 0x11, 0x16, 
-       0x49, 0x12, 0xf6, 0x20, 0x88, 0x10, 0xf4, 0x95, 
-       0xf4, 0x95, 0xf5, 0xae, 0xf8, 0x20, 0x10, 0xf3, 
-       0x48, 0x16, 0x80, 0x06, 0x48, 0x08, 0xf8, 0x45, 
-       0x11, 0x16, 0x10, 0x04, 0x70, 0x02, 0x00, 0x17, 
-       0x80, 0x00, 0x76, 0x03, 0x00, 0x00, 0x10, 0x06, 
-       0x80, 0x01, 0x10, 0x05, 0xf0, 0x74, 0x0c, 0xb9, 
-       0x10, 0x06, 0x00, 0xe1, 0x00, 0x0c, 0x80, 0xe1, 
-       0x00, 0x0c, 0x11, 0x06, 0x10, 0x04, 0xf6, 0x00, 
-       0x80, 0x04, 0x48, 0x16, 0xf6, 0x20, 0x88, 0x16, 
-       0x10, 0xe1, 0x00, 0x0c, 0x08, 0xe1, 0x00, 0x0b, 
-       0xf8, 0x45, 0x11, 0x1c, 0xf0, 0x73, 0x11, 0x31, 
-       0xf2, 0x74, 0x0e, 0x9f, 0xf4, 0x95, 0x48, 0x17, 
-       0xf0, 0x73, 0x11, 0x33, 0x76, 0xe1, 0x00, 0x0c, 
-       0x00, 0x00, 0x76, 0xe1, 0x00, 0x0b, 0x00, 0x00, 
-       0x76, 0xe1, 0x00, 0x02, 0x00, 0x01, 0x10, 0x04, 
-       0x80, 0x00, 0x10, 0x05, 0xf0, 0x74, 0x06, 0x9f, 
-       0x88, 0x12, 0xf4, 0x95, 0x77, 0x10, 0x00, 0xff, 
-       0xf4, 0xaa, 0xf8, 0x30, 0x11, 0x33, 0x6c, 0x86, 
-       0x0f, 0x70, 0xee, 0x08, 0x8a, 0x17, 0x8a, 0x16, 
-       0x8a, 0x11, 0xfc, 0x00, 0x4a, 0x11, 0xee, 0xfc, 
-       0xf4, 0x95, 0x71, 0x06, 0x00, 0x12, 0x88, 0x11, 
-       0x73, 0x12, 0x00, 0x0e, 0xf1, 0x66, 0x00, 0x0d, 
-       0xf3, 0x00, 0x24, 0x00, 0x89, 0x14, 0x13, 0x81, 
-       0xf7, 0x7a, 0xf3, 0x30, 0x00, 0x01, 0x81, 0xf8, 
-       0x27, 0x60, 0x13, 0xe1, 0x00, 0x01, 0xf7, 0x7c, 
-       0xf3, 0x30, 0x00, 0x03, 0x81, 0xf8, 0x27, 0x61, 
-       0xe9, 0x0f, 0x19, 0xe1, 0x00, 0x01, 0x81, 0xf8, 
-       0x27, 0x62, 0x71, 0xe4, 0x00, 0x03, 0x00, 0x13, 
-       0xf6, 0xb8, 0x49, 0x13, 0xf3, 0x00, 0x00, 0x01, 
-       0xf3, 0x30, 0x00, 0x0f, 0x49, 0x0b, 0x09, 0xf8, 
-       0x27, 0x62, 0xf8, 0x4d, 0x11, 0x75, 0x77, 0x10, 
-       0x00, 0xff, 0xf4, 0xab, 0xf8, 0x30, 0x11, 0x75, 
-       0x57, 0xf8, 0x27, 0x6c, 0xf3, 0x00, 0x00, 0x01, 
-       0x4f, 0xf8, 0x27, 0x6c, 0x76, 0xf8, 0x27, 0x63, 
-       0x00, 0x01, 0xf0, 0x73, 0x11, 0x78, 0x76, 0xf8, 
-       0x27, 0x63, 0x00, 0x00, 0x70, 0xe4, 0x00, 0x03, 
-       0x27, 0x62, 0x76, 0xf8, 0x27, 0x64, 0x00, 0x00, 
-       0x11, 0xf8, 0x27, 0x61, 0x61, 0xf8, 0x00, 0x0b, 
-       0x00, 0x02, 0xf8, 0x20, 0x11, 0x8d, 0xe9, 0x01, 
-       0x6f, 0xe1, 0x00, 0x02, 0x0f, 0x18, 0x81, 0xf8, 
-       0x27, 0x64, 0x11, 0xf8, 0x27, 0x61, 0x61, 0xf8, 
-       0x00, 0x0b, 0x00, 0x01, 0xf8, 0x20, 0x11, 0xa9, 
-       0x10, 0xf8, 0x27, 0x64, 0xf1, 0x00, 0x00, 0x04, 
-       0x89, 0x13, 0xe9, 0xb8, 0xf5, 0x20, 0x81, 0xf8, 
-       0x27, 0x65, 0x60, 0x84, 0x00, 0x02, 0xf8, 0x20, 
-       0x11, 0xa9, 0x70, 0x00, 0x00, 0x11, 0x70, 0x01, 
-       0x00, 0x13, 0x70, 0x02, 0x27, 0x65, 0xf2, 0x74, 
-       0x0f, 0x18, 0xf4, 0x95, 0x48, 0x12, 0xee, 0x04, 
-       0x8a, 0x11, 0xfc, 0x00, 0x4a, 0x11, 0x4a, 0x16, 
-       0x4a, 0x17, 0xee, 0xfc, 0xe8, 0x00, 0x4e, 0xf8, 
-       0x27, 0x66, 0xe8, 0x00, 0x4e, 0xf8, 0x27, 0x68, 
-       0xe8, 0x00, 0x4e, 0xf8, 0x27, 0x6c, 0xe8, 0x00, 
-       0x4e, 0xf8, 0x27, 0x6a, 0x77, 0x12, 0x27, 0x40, 
-       0x77, 0x11, 0x24, 0x00, 0x77, 0x1a, 0x00, 0x1f, 
-       0xf0, 0x72, 0x11, 0xdb, 0x70, 0x92, 0x00, 0x11, 
-       0x76, 0xe1, 0x00, 0x01, 0xff, 0xff, 0x76, 0x81, 
-       0x00, 0x00, 0x76, 0xe1, 0x00, 0x02, 0x00, 0x00, 
-       0x76, 0xe1, 0x00, 0x03, 0x00, 0xff, 0x76, 0xe1, 
-       0x00, 0x0c, 0x00, 0x00, 0x76, 0xe1, 0x00, 0x0b, 
-       0x00, 0x00, 0x76, 0xe1, 0x00, 0x04, 0x00, 0x00, 
-       0x6d, 0xe9, 0x00, 0x0d, 0xf0, 0x20, 0x25, 0xa0, 
-       0xf1, 0x00, 0x00, 0x07, 0x89, 0x11, 0xf1, 0x00, 
-       0x00, 0x01, 0x81, 0x02, 0x88, 0x16, 0xf4, 0x95, 
-       0x77, 0x17, 0x00, 0x20, 0x76, 0x86, 0x00, 0xff, 
-       0x76, 0x00, 0x00, 0x00, 0x76, 0x01, 0x00, 0x06, 
-       0x10, 0x02, 0xf0, 0x74, 0x06, 0x6c, 0x76, 0x00, 
-       0x00, 0x00, 0x76, 0x01, 0x00, 0x06, 0xf2, 0x74, 
-       0x06, 0x6c, 0xf4, 0x95, 0x48, 0x11, 0x10, 0x02, 
-       0xf0, 0x00, 0x00, 0x0d, 0x80, 0x02, 0x6d, 0xe9, 
-       0x00, 0x0d, 0x6d, 0xee, 0x00, 0x0d, 0x6c, 0xef, 
-       0xff, 0xff, 0x11, 0xe8, 0xf0, 0x74, 0x0c, 0x9d, 
-       0xee, 0x04, 0x8a, 0x17, 0x8a, 0x16, 0x8a, 0x11, 
-       0xfc, 0x00, 0x4a, 0x11, 0x4a, 0x16, 0x4a, 0x17, 
-       0xee, 0xfa, 0x88, 0x11, 0x10, 0x0a, 0x49, 0x11, 
-       0xf8, 0x4d, 0x12, 0x9f, 0x48, 0x08, 0xf8, 0x45, 
-       0x12, 0x9f, 0x80, 0x04, 0x12, 0x81, 0xf5, 0x78, 
-       0x89, 0x12, 0xf4, 0x95, 0xf4, 0x95, 0x6c, 0xe2, 
-       0xff, 0xb9, 0x12, 0x8a, 0x61, 0xf8, 0x00, 0x08, 
-       0x00, 0x80, 0xf8, 0x30, 0x12, 0x8a, 0x13, 0xe1, 
-       0x00, 0x01, 0xf0, 0xe8, 0xf7, 0x78, 0xf1, 0xa0, 
-       0xf2, 0x30, 0x1f, 0xff, 0x88, 0x17, 0xf4, 0x95, 
-       0x77, 0x12, 0x24, 0x00, 0x77, 0x16, 0x00, 0x00, 
-       0x77, 0x13, 0x00, 0x20, 0xf6, 0xb8, 0x48, 0x17, 
-       0x08, 0xe2, 0x00, 0x01, 0xf8, 0x45, 0x12, 0x42, 
-       0x6d, 0xea, 0x00, 0x0d, 0x6d, 0x96, 0x6c, 0xeb, 
-       0xff, 0xff, 0x12, 0x34, 0xf0, 0x73, 0x12, 0x90, 
-       0x56, 0xf8, 0x27, 0x6a, 0xf0, 0x00, 0x00, 0x01, 
-       0x4e, 0xf8, 0x27, 0x6a, 0x60, 0x82, 0x00, 0x01, 
-       0xf8, 0x30, 0x12, 0x54, 0x70, 0x00, 0x00, 0x16, 
-       0xf2, 0x74, 0x11, 0x38, 0xf4, 0x95, 0x48, 0x11, 
-       0xf0, 0x73, 0x12, 0x90, 0x70, 0x00, 0x00, 0x16, 
-       0xf2, 0x74, 0x11, 0x38, 0xf4, 0x95, 0x48, 0x11, 
-       0x72, 0x10, 0x2a, 0x9e, 0xf4, 0x95, 0xf4, 0xaf, 
-       0xf8, 0x30, 0x12, 0x6e, 0x76, 0x00, 0x00, 0x00, 
-       0x76, 0x01, 0x00, 0xbc, 0x70, 0x02, 0x00, 0x16, 
-       0x76, 0x03, 0x00, 0x00, 0xf2, 0x74, 0x0c, 0xb9, 
-       0xf4, 0x95, 0x48, 0x11, 0xf0, 0x73, 0x12, 0x90, 
-       0x10, 0xf8, 0x27, 0x6e, 0xf8, 0x44, 0x12, 0x90, 
-       0x76, 0x00, 0x00, 0x00, 0x76, 0x01, 0x00, 0xbc, 
-       0x70, 0x02, 0x00, 0x16, 0x76, 0x03, 0x00, 0x00, 
-       0xf2, 0x74, 0x0c, 0xb9, 0xf4, 0x95, 0x48, 0x11, 
-       0xf0, 0x74, 0x0c, 0x5e, 0xf0, 0xe0, 0xf0, 0x10, 
-       0x13, 0x88, 0xf8, 0x42, 0x12, 0x90, 0x76, 0xf8, 
-       0x27, 0x6e, 0x00, 0x01, 0xf0, 0x73, 0x12, 0x90, 
-       0x56, 0xf8, 0x27, 0x66, 0xf0, 0x00, 0x00, 0x01, 
-       0x4e, 0xf8, 0x27, 0x66, 0x6d, 0xe9, 0x00, 0x5e, 
-       0x56, 0xf8, 0x27, 0x68, 0xf0, 0x00, 0x00, 0x01, 
-       0x4e, 0xf8, 0x27, 0x68, 0x71, 0x04, 0x00, 0x12, 
-       0x6e, 0xea, 0xff, 0xff, 0x12, 0x18, 0x70, 0x04, 
-       0x00, 0x12, 0xee, 0x06, 0x8a, 0x17, 0x8a, 0x16, 
-       0x8a, 0x11, 0xfc, 0x00, 0x4a, 0x11, 0xee, 0xfe, 
-       0x88, 0x0e, 0xf4, 0x95, 0xf0, 0x66, 0x00, 0x0d, 
-       0xf0, 0x00, 0x25, 0xa0, 0x88, 0x11, 0xf4, 0x95, 
-       0xf4, 0x95, 0x76, 0x81, 0x00, 0xff, 0x76, 0x00, 
-       0x00, 0x00, 0x76, 0x01, 0x00, 0x06, 0xf2, 0x74, 
-       0x06, 0x6c, 0xf0, 0x00, 0x00, 0x01, 0x76, 0x00, 
-       0x00, 0x00, 0x76, 0x01, 0x00, 0x06, 0x48, 0x11, 
-       0xf2, 0x74, 0x06, 0x6c, 0xf0, 0x00, 0x00, 0x07, 
-       0xee, 0x02, 0x8a, 0x11, 0xfc, 0x00, 0x4a, 0x11, 
-       0x88, 0x0e, 0xf4, 0x95, 0xf0, 0x66, 0x00, 0x0d, 
-       0xf0, 0x00, 0x24, 0x00, 0x88, 0x11, 0xf4, 0x95, 
-       0xf4, 0x95, 0x76, 0xe1, 0x00, 0x01, 0xff, 0xff, 
-       0x76, 0x81, 0x00, 0x00, 0x76, 0xe1, 0x00, 0x02, 
-       0x00, 0x00, 0x76, 0xe1, 0x00, 0x03, 0x00, 0xff, 
-       0x8a, 0x11, 0xfc, 0x00, 0x4a, 0x11, 0xf4, 0x95, 
-       0x13, 0x03, 0x88, 0x11, 0xfa, 0x4d, 0x12, 0xec, 
-       0x71, 0x02, 0x00, 0x12, 0xf3, 0x10, 0x00, 0x01, 
-       0x89, 0x1a, 0xf4, 0x95, 0xf0, 0x72, 0x12, 0xeb, 
-       0x70, 0x91, 0x00, 0x12, 0x8a, 0x11, 0xfc, 0x00, 
-       0xf4, 0x95, 0x4a, 0x0b, 0x4a, 0x0c, 0x4a, 0x0d, 
-       0xf7, 0xb8, 0xee, 0xfe, 0x10, 0xf8, 0x00, 0x08, 
-       0x11, 0x06, 0xf1, 0xc0, 0x83, 0x00, 0xf4, 0x85, 
-       0x11, 0x06, 0xf7, 0x85, 0x81, 0x06, 0xf6, 0xb8, 
-       0xec, 0x0f, 0x1e, 0x06, 0x61, 0x00, 0x80, 0x00, 
-       0xf8, 0x20, 0x13, 0x05, 0xf4, 0x84, 0xee, 0x02, 
-       0x8a, 0x0d, 0x8a, 0x0c, 0x8a, 0x0b, 0xfc, 0x00, 
-       0xf4, 0x95, 0x4a, 0x0b, 0x4a, 0x0c, 0x4a, 0x0d, 
-       0xee, 0xfe, 0xf7, 0xb8, 0x80, 0x00, 0x10, 0xf8, 
-       0x00, 0x08, 0xf4, 0x85, 0x11, 0x06, 0xf7, 0x85, 
-       0x81, 0x06, 0xf6, 0xb8, 0xec, 0x0f, 0x1e, 0x06, 
-       0xf0, 0xf0, 0x61, 0x00, 0x80, 0x00, 0xf8, 0x20, 
-       0x13, 0x20, 0xf4, 0x84, 0xee, 0x02, 0x8a, 0x0d, 
-       0x8a, 0x0c, 0x8a, 0x0b, 0xfc, 0x00, 0x4a, 0x11, 
-       0x77, 0x11, 0x00, 0x7b, 0x76, 0x81, 0x2e, 0xec, 
-       0x77, 0x11, 0x00, 0x7b, 0xee, 0xff, 0x71, 0x81, 
-       0x00, 0x11, 0xee, 0x01, 0x76, 0xe1, 0x00, 0x01, 
-       0x00, 0x00, 0x76, 0xe1, 0x00, 0x04, 0x00, 0x00, 
-       0x76, 0xe1, 0x00, 0x06, 0x00, 0x00, 0x76, 0xe1, 
-       0x00, 0x62, 0x00, 0x00, 0x76, 0xe1, 0x00, 0x76, 
-       0x00, 0x00, 0x76, 0xe1, 0x00, 0x92, 0x00, 0x00, 
-       0x76, 0xe1, 0x00, 0x94, 0x00, 0x00, 0x76, 0xe1, 
-       0x00, 0xb0, 0x00, 0x00, 0x76, 0xe1, 0x00, 0xb3, 
-       0x00, 0x00, 0x76, 0xe1, 0x00, 0xbe, 0x00, 0x00, 
-       0x76, 0xe1, 0x00, 0xbf, 0x00, 0x00, 0x76, 0xe1, 
-       0x00, 0xc1, 0x00, 0x00, 0x76, 0xe1, 0x00, 0xc3, 
-       0x00, 0x00, 0x76, 0xe1, 0x00, 0xc5, 0x00, 0x00, 
-       0x76, 0xe1, 0x00, 0xc7, 0x00, 0x00, 0x76, 0x81, 
-       0x00, 0x00, 0x8a, 0x11, 0xf4, 0x95, 0xf4, 0xe4, 
-       0x4a, 0x11, 0x4a, 0x16, 0x4a, 0x17, 0xee, 0xff, 
-       0xf4, 0x95, 0x71, 0x06, 0x00, 0x16, 0xfb, 0x80, 
-       0x16, 0xa2, 0x88, 0x17, 0xf4, 0x95, 0xf7, 0xb8, 
-       0x10, 0xf8, 0x00, 0x17, 0xf0, 0x10, 0x00, 0x02, 
-       0xfa, 0x46, 0x13, 0x88, 0x77, 0x11, 0x00, 0x00, 
-       0x10, 0xf8, 0x00, 0x17, 0xf0, 0x10, 0x00, 0x02, 
-       0xf8, 0x45, 0x13, 0xf9, 0x10, 0xf8, 0x00, 0x17, 
-       0xf8, 0x45, 0x14, 0x39, 0x10, 0xf8, 0x00, 0x17, 
-       0xf0, 0x10, 0x00, 0x01, 0xf8, 0x45, 0x14, 0x1f, 
-       0xf0, 0x73, 0x14, 0x52, 0x10, 0xf8, 0x00, 0x17, 
-       0xf0, 0x10, 0x00, 0x03, 0xf8, 0x45, 0x13, 0xd3, 
-       0x10, 0xf8, 0x00, 0x17, 0xf0, 0x10, 0x00, 0x06, 
-       0xf8, 0x44, 0x14, 0x52, 0x77, 0x12, 0x00, 0x7b, 
-       0x71, 0x82, 0x00, 0x14, 0x61, 0xe4, 0x00, 0x07, 
-       0x00, 0x40, 0xf8, 0x30, 0x14, 0x52, 0x49, 0x14, 
-       0x48, 0x17, 0xf6, 0x00, 0x88, 0x12, 0xf4, 0x95, 
-       0x77, 0x13, 0x00, 0x55, 0x77, 0x11, 0x00, 0x57, 
-       0x6d, 0xea, 0x00, 0x3b, 0xe5, 0x01, 0x10, 0xe6, 
-       0x00, 0x06, 0x80, 0x81, 0x48, 0x14, 0x00, 0xf8, 
-       0x00, 0x17, 0x88, 0x12, 0xf4, 0x95, 0x77, 0x11, 
-       0x00, 0x55, 0x10, 0xe2, 0x00, 0x40, 0x80, 0x81, 
-       0x77, 0x11, 0x00, 0x57, 0x10, 0xe6, 0x00, 0x07, 
-       0x80, 0x81, 0x77, 0x11, 0x00, 0x55, 0x10, 0xe2, 
-       0x00, 0x45, 0x80, 0x81, 0x10, 0xe6, 0x00, 0x08, 
-       0x77, 0x11, 0x00, 0x57, 0x80, 0x81, 0x77, 0x11, 
-       0x00, 0x55, 0x10, 0xe2, 0x00, 0x4a, 0x80, 0x81, 
-       0x77, 0x11, 0x00, 0x57, 0x10, 0xe6, 0x00, 0x09, 
-       0x80, 0x81, 0xf2, 0x73, 0x14, 0x52, 0x77, 0x11, 
-       0x03, 0xc0, 0x77, 0x12, 0x00, 0x7b, 0x10, 0x82, 
-       0xf0, 0x00, 0x00, 0x07, 0x88, 0x13, 0xf4, 0x95, 
-       0xf4, 0x95, 0x96, 0x1b, 0xf8, 0x30, 0x14, 0x52, 
-       0x10, 0xe3, 0x00, 0x35, 0x77, 0x12, 0x00, 0x55, 
-       0x80, 0x82, 0x77, 0x12, 0x00, 0x57, 0x10, 0xe6, 
-       0x00, 0x04, 0x80, 0x82, 0x77, 0x12, 0x00, 0x55, 
-       0x10, 0xe3, 0x00, 0x37, 0x80, 0x82, 0x77, 0x12, 
-       0x00, 0x57, 0x10, 0xe6, 0x00, 0x05, 0x80, 0x82, 
-       0x48, 0x11, 0xf0, 0x40, 0x00, 0x10, 0xf2, 0x73, 
-       0x14, 0x50, 0xf0, 0x40, 0x00, 0x20, 0x77, 0x12, 
-       0x00, 0x7b, 0x10, 0x82, 0xf0, 0x00, 0x00, 0x07, 
-       0x88, 0x12, 0xf4, 0x95, 0xf4, 0x95, 0x96, 0x0d, 
-       0xf8, 0x30, 0x14, 0x52, 0x10, 0xe2, 0x00, 0x34, 
-       0x77, 0x13, 0x00, 0x55, 0x80, 0x83, 0x77, 0x13, 
-       0x00, 0x57, 0x10, 0xe6, 0x00, 0x02, 0x80, 0x83, 
-       0x10, 0xe2, 0x00, 0x36, 0x77, 0x12, 0x00, 0x55, 
-       0x80, 0x82, 0x77, 0x12, 0x00, 0x57, 0x10, 0xe6, 
-       0x00, 0x03, 0x80, 0x82, 0x48, 0x11, 0xf0, 0x40, 
-       0x00, 0x04, 0xf2, 0x73, 0x14, 0x50, 0xf0, 0x40, 
-       0x00, 0x08, 0x77, 0x12, 0x00, 0x7b, 0x10, 0x82, 
-       0xf0, 0x00, 0x00, 0x07, 0x88, 0x12, 0xf4, 0x95, 
-       0xf4, 0x95, 0x96, 0x0e, 0xf8, 0x30, 0x14, 0x52, 
-       0x10, 0xe2, 0x00, 0x33, 0x77, 0x12, 0x00, 0x55, 
-       0x80, 0x82, 0x77, 0x12, 0x00, 0x57, 0x10, 0xe6, 
-       0x00, 0x01, 0x80, 0x82, 0x48, 0x11, 0xf2, 0x73, 
-       0x14, 0x50, 0xf0, 0x40, 0x00, 0x02, 0x77, 0x12, 
-       0x00, 0x7b, 0x10, 0x82, 0xf0, 0x00, 0x00, 0x07, 
-       0x88, 0x12, 0xf4, 0x95, 0xf4, 0x95, 0x96, 0x0f, 
-       0xf8, 0x30, 0x14, 0x52, 0x10, 0xe2, 0x00, 0x32, 
-       0x77, 0x12, 0x00, 0x55, 0x77, 0x13, 0x00, 0x57, 
-       0x80, 0x82, 0x48, 0x11, 0xe7, 0x62, 0xf0, 0x40, 
-       0x00, 0x01, 0xe5, 0x01, 0x88, 0x11, 0xf4, 0x95, 
-       0x77, 0x12, 0x00, 0x7b, 0x48, 0x11, 0x71, 0x82, 
-       0x00, 0x12, 0x1a, 0xe2, 0x00, 0x07, 0x80, 0xe2, 
-       0x00, 0x07, 0xf9, 0x80, 0x16, 0x9a, 0xee, 0x01, 
-       0x8a, 0x17, 0x48, 0x11, 0x8a, 0x16, 0x8a, 0x11, 
-       0xf4, 0xe4, 0x4a, 0x11, 0x88, 0x11, 0x77, 0x0e, 
-       0x00, 0x05, 0x77, 0x12, 0x00, 0x55, 0xe8, 0x04, 
-       0xf6, 0xb8, 0x28, 0xe1, 0x00, 0x02, 0xee, 0xff, 
-       0x80, 0x82, 0x77, 0x12, 0x00, 0x57, 0xf0, 0x20, 
-       0x80, 0x00, 0xee, 0x01, 0x1a, 0x82, 0x77, 0x12, 
-       0x00, 0x57, 0x80, 0x82, 0xe8, 0x01, 0x32, 0xe1, 
-       0x00, 0x02, 0xf5, 0x82, 0x77, 0x11, 0x00, 0x54, 
-       0xf6, 0x93, 0x18, 0x81, 0x77, 0x11, 0x00, 0x54, 
-       0xf2, 0xa0, 0x80, 0x81, 0x8a, 0x11, 0xf4, 0x95, 
-       0xf4, 0xe4, 0x4a, 0x11, 0x4a, 0x16, 0xf4, 0x95, 
-       0x71, 0x04, 0x00, 0x11, 0xfb, 0x80, 0x16, 0xa2, 
-       0x88, 0x16, 0xf4, 0x95, 0x77, 0x12, 0x00, 0x55, 
-       0x10, 0xe6, 0x00, 0x03, 0x80, 0x82, 0x77, 0x12, 
-       0x00, 0x56, 0x10, 0xe1, 0x00, 0x02, 0x77, 0x13, 
-       0x00, 0x56, 0x80, 0x82, 0x77, 0x12, 0x00, 0x56, 
-       0x10, 0xe1, 0x00, 0x03, 0x80, 0x82, 0x10, 0xe1, 
-       0x00, 0x04, 0x77, 0x12, 0x00, 0x56, 0x80, 0x82, 
-       0x77, 0x12, 0x00, 0x56, 0x10, 0xe1, 0x00, 0x01, 
-       0x80, 0x82, 0xe7, 0x12, 0xe5, 0x01, 0xf9, 0x80, 
-       0x16, 0x9a, 0x8a, 0x16, 0x8a, 0x11, 0xf4, 0xe4, 
-       0x4a, 0x11, 0x4a, 0x16, 0x4a, 0x17, 0xee, 0xf9, 
-       0x77, 0x11, 0x00, 0x7b, 0x76, 0x00, 0x00, 0x16, 
-       0x76, 0x01, 0x00, 0x17, 0x76, 0x02, 0x00, 0x1a, 
-       0x76, 0x03, 0x00, 0x1b, 0x76, 0x04, 0x00, 0x1c, 
-       0x76, 0x05, 0x00, 0x1d, 0x71, 0x81, 0x00, 0x17, 
-       0x71, 0xe7, 0x00, 0x06, 0x00, 0x11, 0x10, 0x81, 
-       0xf8, 0x44, 0x14, 0xdf, 0xf9, 0x80, 0x16, 0x53, 
-       0xf6, 0xb8, 0xfb, 0x80, 0x15, 0x85, 0xf0, 0x20, 
-       0xff, 0xff, 0xf6, 0xb8, 0xfb, 0x80, 0x16, 0x08, 
-       0xf0, 0x20, 0xff, 0xff, 0x77, 0x11, 0x00, 0x7b, 
-       0x71, 0x81, 0x00, 0x17, 0x76, 0xe7, 0x00, 0x06, 
-       0x00, 0x01, 0x48, 0x17, 0x77, 0x16, 0x00, 0x00, 
-       0x77, 0x10, 0x00, 0x04, 0x77, 0x15, 0x00, 0x03, 
-       0x77, 0x14, 0x00, 0x02, 0x77, 0x13, 0x00, 0x01, 
-       0xf0, 0x00, 0x00, 0x39, 0x76, 0xe7, 0x00, 0x08, 
-       0x00, 0x1f, 0x76, 0xe7, 0x00, 0x07, 0x00, 0x00, 
-       0x88, 0x0e, 0x77, 0x1a, 0x00, 0x05, 0x48, 0x17, 
-       0xf0, 0x00, 0x00, 0x09, 0x88, 0x12, 0x48, 0x18, 
-       0x88, 0x19, 0xe8, 0x00, 0xf0, 0x72, 0x15, 0x2c, 
-       0x73, 0x19, 0x00, 0x11, 0x76, 0x82, 0x00, 0x00, 
-       0x11, 0x91, 0x73, 0x11, 0x00, 0x19, 0x70, 0xe2, 
-       0x00, 0x03, 0x00, 0x16, 0x70, 0xe2, 0x00, 0x04, 
-       0x00, 0x13, 0x70, 0xe2, 0x00, 0x05, 0x00, 0x14, 
-       0x81, 0xe2, 0x00, 0x01, 0x70, 0xe2, 0x00, 0x06, 
-       0x00, 0x15, 0x70, 0xe2, 0x00, 0x07, 0x00, 0x10, 
-       0x80, 0xe2, 0x00, 0x02, 0x73, 0x0e, 0x00, 0x11, 
-       0xf1, 0x00, 0x00, 0x1e, 0x6d, 0xee, 0x00, 0x05, 
-       0x6d, 0xeb, 0x00, 0x05, 0x6d, 0xec, 0x00, 0x05, 
-       0x6d, 0xed, 0x00, 0x05, 0x6d, 0xe8, 0x00, 0x05, 
-       0xf0, 0x00, 0x00, 0x01, 0x81, 0x91, 0x6d, 0xea, 
-       0x00, 0x08, 0x73, 0x11, 0x00, 0x0e, 0xee, 0x07, 
-       0x76, 0xe7, 0x00, 0x41, 0x00, 0x24, 0x76, 0xe7, 
-       0x00, 0x46, 0x00, 0x25, 0x76, 0xe7, 0x00, 0x4b, 
-       0x00, 0x26, 0x76, 0xe7, 0x00, 0x50, 0x00, 0x27, 
-       0x8a, 0x17, 0x8a, 0x16, 0x8a, 0x11, 0xf4, 0xe4, 
-       0x4a, 0x11, 0x4a, 0x16, 0xee, 0xfe, 0x88, 0x11, 
-       0x56, 0x06, 0x4e, 0x00, 0xf9, 0x80, 0x16, 0xa2, 
-       0xf7, 0xb8, 0x10, 0xf8, 0x00, 0x11, 0xf0, 0x10, 
-       0xff, 0xff, 0xfa, 0x45, 0x15, 0x60, 0x77, 0x16, 
-       0xff, 0xff, 0x77, 0x12, 0x00, 0x7b, 0x49, 0x11, 
-       0x10, 0x82, 0xf6, 0x03, 0xf0, 0x00, 0x00, 0x09, 
-       0x88, 0x11, 0xf4, 0x95, 0xf4, 0x95, 0x10, 0x81, 
-       0xf8, 0x44, 0x15, 0x71, 0xf2, 0x73, 0x15, 0x71, 
-       0xf4, 0x95, 0xe7, 0x16, 0x77, 0x11, 0x00, 0x7b, 
-       0x10, 0x81, 0xf0, 0x00, 0x00, 0x09, 0x88, 0x11, 
-       0xf4, 0x95, 0x77, 0x12, 0x00, 0x06, 0x10, 0x81, 
-       0xf8, 0x45, 0x15, 0x5c, 0x6e, 0xea, 0xff, 0xff, 
-       0x15, 0x69, 0x6d, 0xe9, 0x00, 0x08, 0x76, 0x86, 
-       0x00, 0x01, 0xe9, 0x01, 0x56, 0x00, 0xf1, 0x80, 
-       0x10, 0xf8, 0x00, 0x0b, 0xf8, 0x45, 0x15, 0x7e, 
-       0xfb, 0x80, 0x15, 0x85, 0xf4, 0x95, 0x48, 0x16, 
-       0xf9, 0x80, 0x16, 0x9a, 0xee, 0x02, 0x48, 0x16, 
-       0x8a, 0x16, 0x8a, 0x11, 0xf4, 0xe4, 0x4a, 0x11, 
-       0xee, 0xff, 0xfb, 0x80, 0x16, 0xa2, 0x88, 0x11, 
-       0xf4, 0x95, 0x77, 0x10, 0xff, 0xff, 0xf4, 0xa9, 
-       0xf8, 0x30, 0x15, 0xc4, 0x10, 0xe1, 0x00, 0x03, 
-       0x77, 0x12, 0x00, 0x55, 0x80, 0x82, 0x77, 0x12, 
-       0x00, 0x56, 0x76, 0x82, 0x00, 0x00, 0x77, 0x12, 
-       0x00, 0x56, 0x76, 0x82, 0x00, 0x00, 0x77, 0x12, 
-       0x00, 0x56, 0x76, 0x82, 0x00, 0x00, 0x77, 0x12, 
-       0x00, 0x56, 0x76, 0x82, 0x00, 0x00, 0x77, 0x12, 
-       0x00, 0x56, 0x76, 0x82, 0x00, 0x00, 0x10, 0xe1, 
-       0x00, 0x02, 0xf0, 0x00, 0x00, 0x08, 0x32, 0xf8, 
-       0x00, 0x08, 0x77, 0x12, 0x00, 0x54, 0xe8, 0x01, 
-       0xf4, 0x82, 0xf4, 0x93, 0x18, 0x82, 0x77, 0x12, 
-       0x00, 0x54, 0xf0, 0x40, 0x00, 0x00, 0x80, 0x82, 
-       0x10, 0xe1, 0x00, 0x01, 0xf9, 0x80, 0x16, 0x76, 
-       0x10, 0xe1, 0x00, 0x01, 0xf9, 0x80, 0x16, 0x66, 
-       0xf0, 0x73, 0x16, 0x03, 0x77, 0x11, 0x00, 0x7b, 
-       0x71, 0x81, 0x00, 0x11, 0x71, 0xe1, 0x00, 0x07, 
-       0x00, 0x12, 0x76, 0x82, 0x00, 0x00, 0x10, 0xe1, 
-       0x00, 0x09, 0xf9, 0x80, 0x15, 0x85, 0x77, 0x11, 
-       0x00, 0x7b, 0x71, 0x81, 0x00, 0x11, 0x10, 0xe1, 
-       0x00, 0x09, 0xfb, 0x80, 0x15, 0x85, 0xf0, 0x00, 
-       0x00, 0x08, 0x77, 0x11, 0x00, 0x7b, 0x71, 0x81, 
-       0x00, 0x11, 0x10, 0xe1, 0x00, 0x09, 0xfb, 0x80, 
-       0x15, 0x85, 0xf0, 0x00, 0x00, 0x10, 0x77, 0x11, 
-       0x00, 0x7b, 0x71, 0x81, 0x00, 0x11, 0x10, 0xe1, 
-       0x00, 0x09, 0xfb, 0x80, 0x15, 0x85, 0xf0, 0x00, 
-       0x00, 0x18, 0x77, 0x11, 0x00, 0x7b, 0x71, 0x81, 
-       0x00, 0x11, 0x10, 0xe1, 0x00, 0x09, 0xfb, 0x80, 
-       0x15, 0x85, 0xf0, 0x00, 0x00, 0x20, 0x77, 0x11, 
-       0x00, 0x7b, 0x71, 0x81, 0x00, 0x11, 0x10, 0xe1, 
-       0x00, 0x09, 0xfb, 0x80, 0x15, 0x85, 0xf0, 0x00, 
-       0x00, 0x28, 0xf9, 0x80, 0x16, 0x9a, 0xee, 0x01, 
-       0x8a, 0x11, 0xf4, 0xe4, 0x4a, 0x11, 0xee, 0xff, 
-       0xfb, 0x80, 0x16, 0xa2, 0x88, 0x11, 0xf4, 0x95, 
-       0x77, 0x10, 0xff, 0xff, 0xf4, 0xa9, 0xf8, 0x30, 
-       0x16, 0x41, 0x77, 0x11, 0x00, 0x55, 0x76, 0x81, 
-       0x00, 0x1e, 0x77, 0x11, 0x00, 0x56, 0x76, 0x81, 
-       0x00, 0x00, 0x77, 0x11, 0x00, 0x56, 0x76, 0x81, 
-       0x00, 0x00, 0x77, 0x11, 0x00, 0x56, 0x76, 0x81, 
-       0x00, 0x00, 0x77, 0x11, 0x00, 0x56, 0x76, 0x81, 
-       0x00, 0x00, 0x77, 0x11, 0x00, 0x56, 0x76, 0x81, 
-       0x00, 0x00, 0x77, 0x11, 0x00, 0x56, 0x76, 0x81, 
-       0x00, 0x00, 0x77, 0x11, 0x00, 0x56, 0x76, 0x81, 
-       0x00, 0x00, 0x77, 0x11, 0x00, 0x56, 0x76, 0x81, 
-       0x00, 0x00, 0x77, 0x11, 0x00, 0x56, 0x76, 0x81, 
-       0x00, 0x00, 0x77, 0x11, 0x00, 0x56, 0xf2, 0x73, 
-       0x16, 0x4e, 0x76, 0x81, 0x00, 0x00, 0x77, 0x11, 
-       0x00, 0x7b, 0x71, 0x81, 0x00, 0x11, 0x71, 0xe1, 
-       0x00, 0x07, 0x00, 0x12, 0x76, 0x82, 0x00, 0x00, 
-       0x10, 0xe1, 0x00, 0x39, 0xf9, 0x80, 0x16, 0x08, 
-       0xf9, 0x80, 0x16, 0x9a, 0xee, 0x01, 0x8a, 0x11, 
-       0xf4, 0xe4, 0x4a, 0x11, 0x77, 0x11, 0x00, 0x7b, 
-       0x10, 0x81, 0xf0, 0x00, 0x00, 0x04, 0x88, 0x11, 
-       0xf4, 0x95, 0xf4, 0x95, 0x10, 0x81, 0xfa, 0x44, 
-       0x16, 0x63, 0xf4, 0x95, 0xee, 0xff, 0x76, 0x81, 
-       0x00, 0x01, 0xee, 0x01, 0x8a, 0x11, 0xf4, 0xe4, 
-       0xf0, 0x10, 0x00, 0x10, 0x4a, 0x11, 0x32, 0xf8, 
-       0x00, 0x08, 0xee, 0xff, 0x77, 0x11, 0x00, 0x01, 
-       0xe8, 0x01, 0xee, 0x01, 0xf4, 0x82, 0x1a, 0x81, 
-       0x80, 0x81, 0x8a, 0x11, 0xf4, 0x95, 0xf4, 0xe4, 
-       0xf0, 0x10, 0x00, 0x10, 0x4a, 0x11, 0x32, 0xf8, 
-       0x00, 0x08, 0xee, 0xff, 0xe8, 0x01, 0x77, 0x11, 
-       0x00, 0x00, 0xf4, 0x82, 0xee, 0x01, 0xf4, 0x93, 
-       0x18, 0x81, 0x80, 0x81, 0x8a, 0x11, 0xf4, 0x95, 
-       0xf4, 0xe4, 0x4a, 0x11, 0xf0, 0x10, 0x00, 0x10, 
-       0x77, 0x11, 0x00, 0x00, 0x32, 0xf8, 0x00, 0x08, 
-       0xee, 0xff, 0x11, 0x81, 0xe8, 0x01, 0xee, 0x01, 
-       0x77, 0x11, 0x00, 0x00, 0xf4, 0x82, 0xf2, 0xa0, 
-       0x80, 0x81, 0x8a, 0x11, 0xf4, 0x95, 0xf4, 0xe4, 
-       0xf2, 0x73, 0x16, 0x9e, 0xf6, 0xbb, 0xf4, 0x95, 
-       0xf4, 0x95, 0xf4, 0x95, 0xf4, 0x95, 0xf4, 0xe4, 
-       0xf2, 0x73, 0x16, 0xa6, 0xf7, 0xbb, 0xf4, 0x95, 
-       0xf4, 0x95, 0xf4, 0x95, 0xf4, 0x95, 0xf4, 0xe4, 
-       0x4a, 0x11, 0x4a, 0x16, 0xf4, 0x95, 0x71, 0x04, 
-       0x00, 0x16, 0xfb, 0x80, 0x16, 0xa2, 0x88, 0x11, 
-       0xf4, 0x95, 0x71, 0xe1, 0x00, 0x05, 0x00, 0x12, 
-       0x76, 0x82, 0x00, 0x0e, 0x10, 0xe6, 0x00, 0x0e, 
-       0x71, 0xe1, 0x00, 0x06, 0x00, 0x12, 0x80, 0x82, 
-       0x71, 0xe1, 0x00, 0x05, 0x00, 0x12, 0x76, 0x82, 
-       0x00, 0x0d, 0x71, 0xe1, 0x00, 0x06, 0x00, 0x12, 
-       0x10, 0xe6, 0x00, 0x0d, 0x80, 0x82, 0x71, 0xe1, 
-       0x00, 0x05, 0x00, 0x12, 0x76, 0x82, 0x00, 0x0c, 
-       0x10, 0xe6, 0x00, 0x0c, 0x71, 0xe1, 0x00, 0x06, 
-       0x00, 0x12, 0x80, 0x82, 0x71, 0xe1, 0x00, 0x05, 
-       0x00, 0x12, 0x76, 0x82, 0x00, 0x0b, 0x10, 0xe6, 
-       0x00, 0x0b, 0x71, 0xe1, 0x00, 0x06, 0x00, 0x12, 
-       0x80, 0x82, 0x71, 0xe1, 0x00, 0x05, 0x00, 0x12, 
-       0x76, 0x82, 0x00, 0x0a, 0x71, 0xe1, 0x00, 0x06, 
-       0x00, 0x12, 0x10, 0xe6, 0x00, 0x0a, 0x80, 0x82, 
-       0x71, 0xe1, 0x00, 0x05, 0x00, 0x12, 0x76, 0x82, 
-       0x00, 0x09, 0x10, 0xe6, 0x00, 0x09, 0x71, 0xe1, 
-       0x00, 0x06, 0x00, 0x12, 0x80, 0x82, 0x71, 0xe1, 
-       0x00, 0x05, 0x00, 0x12, 0x76, 0x82, 0x00, 0x08, 
-       0x71, 0xe1, 0x00, 0x06, 0x00, 0x12, 0x10, 0xe6, 
-       0x00, 0x08, 0x80, 0x82, 0x71, 0xe1, 0x00, 0x05, 
-       0x00, 0x12, 0x76, 0x82, 0x00, 0x07, 0x10, 0xe6, 
-       0x00, 0x07, 0x71, 0xe1, 0x00, 0x06, 0x00, 0x12, 
-       0x80, 0x82, 0x71, 0xe1, 0x00, 0x05, 0x00, 0x12, 
-       0x76, 0x82, 0x00, 0x06, 0x71, 0xe1, 0x00, 0x06, 
-       0x00, 0x12, 0x10, 0xe6, 0x00, 0x06, 0x80, 0x82, 
-       0x71, 0xe1, 0x00, 0x05, 0x00, 0x12, 0x76, 0x82, 
-       0x00, 0x05, 0x71, 0xe1, 0x00, 0x06, 0x00, 0x12, 
-       0x10, 0xe6, 0x00, 0x05, 0x80, 0x82, 0x71, 0xe1, 
-       0x00, 0x05, 0x00, 0x12, 0x76, 0x82, 0x00, 0x04, 
-       0x71, 0xe1, 0x00, 0x06, 0x00, 0x12, 0x10, 0xe6, 
-       0x00, 0x04, 0x80, 0x82, 0x71, 0xe1, 0x00, 0x05, 
-       0x00, 0x12, 0x76, 0x82, 0x00, 0x03, 0x71, 0xe1, 
-       0x00, 0x06, 0x00, 0x12, 0x10, 0xe6, 0x00, 0x03, 
-       0x80, 0x82, 0x71, 0xe1, 0x00, 0x05, 0x00, 0x12, 
-       0x76, 0x82, 0x00, 0x02, 0x10, 0xe6, 0x00, 0x02, 
-       0x71, 0xe1, 0x00, 0x06, 0x00, 0x12, 0x80, 0x82, 
-       0x71, 0xe1, 0x00, 0x05, 0x00, 0x12, 0x76, 0x82, 
-       0x00, 0x01, 0x10, 0xe6, 0x00, 0x01, 0x71, 0xe1, 
-       0x00, 0x06, 0x00, 0x12, 0x80, 0x82, 0x71, 0xe1, 
-       0x00, 0x05, 0x00, 0x12, 0x76, 0x82, 0x00, 0x00, 
-       0x71, 0xe1, 0x00, 0x06, 0x00, 0x13, 0xe7, 0x62, 
-       0xe5, 0x01, 0xf9, 0x80, 0x16, 0x9a, 0x8a, 0x16, 
-       0x8a, 0x11, 0xf4, 0xe4, 0x4a, 0x11, 0x88, 0x11, 
-       0xf4, 0x95, 0xf4, 0x95, 0x71, 0xe1, 0x00, 0x05, 
-       0x00, 0x12, 0xee, 0xff, 0x76, 0x82, 0x00, 0x00, 
-       0xee, 0x01, 0x71, 0xe1, 0x00, 0x06, 0x00, 0x11, 
-       0x69, 0x81, 0x00, 0x01, 0x8a, 0x11, 0xf4, 0x95, 
-       0xf4, 0xe4, 0x4a, 0x11, 0x88, 0x11, 0xf4, 0x95, 
-       0xf4, 0x95, 0x71, 0xe1, 0x00, 0x05, 0x00, 0x12, 
-       0xee, 0xff, 0x76, 0x82, 0x00, 0x01, 0xee, 0x01, 
-       0x71, 0xe1, 0x00, 0x06, 0x00, 0x11, 0x69, 0x81, 
-       0x00, 0x01, 0x8a, 0x11, 0xf4, 0x95, 0xf4, 0xe4, 
-       0x4a, 0x11, 0x77, 0x11, 0x00, 0x7b, 0x10, 0x81, 
-       0xf0, 0x00, 0x00, 0x94, 0x88, 0x11, 0xf4, 0x95, 
-       0xf4, 0x95, 0x10, 0x81, 0xfa, 0x44, 0x17, 0x9c, 
-       0xf4, 0x95, 0xee, 0xff, 0xf9, 0x80, 0x16, 0x53, 
-       0x77, 0x11, 0x00, 0x7b, 0x10, 0x81, 0xf0, 0x00, 
-       0x00, 0x94, 0x88, 0x11, 0xf4, 0x95, 0xf4, 0x95, 
-       0x76, 0x81, 0x00, 0x01, 0xee, 0x01, 0x76, 0xe1, 
-       0x00, 0x01, 0x00, 0x00, 0x76, 0xe1, 0x00, 0x02, 
-       0x00, 0x21, 0x76, 0xe1, 0x00, 0x03, 0x00, 0x20, 
-       0x76, 0xe1, 0x00, 0x04, 0x00, 0x23, 0x76, 0xe1, 
-       0x00, 0x05, 0x00, 0x22, 0x76, 0xe1, 0x00, 0x06, 
-       0x00, 0x38, 0x76, 0xe1, 0x00, 0x07, 0x00, 0x39, 
-       0x76, 0xe1, 0x00, 0x08, 0x00, 0x15, 0x76, 0xe1, 
-       0x00, 0x09, 0x00, 0x14, 0x76, 0xe1, 0x00, 0x0a, 
-       0x00, 0x00, 0x76, 0xe1, 0x00, 0x0b, 0x00, 0x41, 
-       0x76, 0xe1, 0x00, 0x0c, 0x00, 0x40, 0x76, 0xe1, 
-       0x00, 0x0d, 0x00, 0x43, 0x76, 0xe1, 0x00, 0x0e, 
-       0x00, 0x42, 0x76, 0xe1, 0x00, 0x0f, 0x00, 0x48, 
-       0x76, 0xe1, 0x00, 0x10, 0x00, 0x49, 0x76, 0xe1, 
-       0x00, 0x11, 0x00, 0x1b, 0x76, 0xe1, 0x00, 0x12, 
-       0x00, 0x1a, 0x8a, 0x11, 0xf4, 0x95, 0xf4, 0xe4, 
-       0x4a, 0x11, 0xee, 0xfd, 0x88, 0x11, 0x56, 0x06, 
-       0x4e, 0x00, 0xf9, 0x80, 0x16, 0xa2, 0x77, 0x12, 
-       0x00, 0x7b, 0x77, 0x0e, 0x00, 0x09, 0x10, 0x82, 
-       0x28, 0xf8, 0x00, 0x11, 0xf0, 0x00, 0x00, 0x95, 
-       0x88, 0x11, 0xf4, 0x95, 0xf4, 0x95, 0x10, 0x81, 
-       0xf8, 0x45, 0x17, 0xf0, 0xf2, 0x73, 0x17, 0xfd, 
-       0x77, 0x11, 0xff, 0xff, 0x76, 0x81, 0x00, 0x01, 
-       0xe9, 0x01, 0x56, 0x00, 0xf1, 0x80, 0x10, 0xf8, 
-       0x00, 0x0b, 0xf8, 0x45, 0x17, 0xfd, 0xfb, 0x80, 
-       0x18, 0x10, 0xf4, 0x95, 0x48, 0x11, 0xf9, 0x80, 
-       0x16, 0x9a, 0xee, 0x03, 0x48, 0x11, 0x8a, 0x11, 
-       0xf4, 0x95, 0xf4, 0xe4, 0x4a, 0x11, 0x88, 0x11, 
-       0xf4, 0x95, 0xee, 0xff, 0x71, 0xe1, 0x00, 0x01, 
-       0x00, 0x11, 0xee, 0x01, 0x10, 0x81, 0x8a, 0x11, 
-       0xf4, 0x95, 0xf4, 0xe4, 0x4a, 0x11, 0xee, 0xff, 
-       0xfb, 0x80, 0x16, 0xa2, 0x88, 0x11, 0xf4, 0x95, 
-       0x77, 0x10, 0xff, 0xff, 0xf4, 0xa9, 0xf8, 0x30, 
-       0x18, 0xc3, 0x71, 0xe1, 0x00, 0x05, 0x00, 0x12, 
-       0x76, 0x82, 0x00, 0x00, 0x71, 0xe1, 0x00, 0x06, 
-       0x00, 0x12, 0x76, 0x82, 0x00, 0x00, 0x71, 0xe1, 
-       0x00, 0x05, 0x00, 0x12, 0x76, 0x82, 0x00, 0x01, 
-       0x71, 0xe1, 0x00, 0x06, 0x00, 0x12, 0x76, 0x82, 
-       0x00, 0x00, 0x71, 0xe1, 0x00, 0x05, 0x00, 0x12, 
-       0x76, 0x82, 0x00, 0x02, 0x71, 0xe1, 0x00, 0x06, 
-       0x00, 0x12, 0x76, 0x82, 0x00, 0x00, 0x71, 0xe1, 
-       0x00, 0x05, 0x00, 0x12, 0x76, 0x82, 0x00, 0x03, 
-       0x71, 0xe1, 0x00, 0x06, 0x00, 0x12, 0x76, 0x82, 
-       0x00, 0x00, 0x71, 0xe1, 0x00, 0x05, 0x00, 0x12, 
-       0x76, 0x82, 0x00, 0x04, 0x71, 0xe1, 0x00, 0x06, 
-       0x00, 0x12, 0x76, 0x82, 0x00, 0x00, 0x71, 0xe1, 
-       0x00, 0x05, 0x00, 0x12, 0x76, 0x82, 0x00, 0x05, 
-       0x71, 0xe1, 0x00, 0x06, 0x00, 0x12, 0x76, 0x82, 
-       0x00, 0x00, 0x71, 0xe1, 0x00, 0x05, 0x00, 0x12, 
-       0x76, 0x82, 0x00, 0x06, 0x71, 0xe1, 0x00, 0x06, 
-       0x00, 0x12, 0x76, 0x82, 0x00, 0x01, 0x71, 0xe1, 
-       0x00, 0x05, 0x00, 0x12, 0x76, 0x82, 0x00, 0x07, 
-       0x71, 0xe1, 0x00, 0x06, 0x00, 0x12, 0x76, 0x82, 
-       0x20, 0x00, 0x71, 0xe1, 0x00, 0x05, 0x00, 0x12, 
-       0x76, 0x82, 0x00, 0x08, 0x71, 0xe1, 0x00, 0x06, 
-       0x00, 0x12, 0x76, 0x82, 0x00, 0x00, 0x71, 0xe1, 
-       0x00, 0x05, 0x00, 0x12, 0x76, 0x82, 0x00, 0x09, 
-       0x71, 0xe1, 0x00, 0x06, 0x00, 0x12, 0x76, 0x82, 
-       0x00, 0x00, 0x71, 0xe1, 0x00, 0x05, 0x00, 0x12, 
-       0x76, 0x82, 0x00, 0x0a, 0x71, 0xe1, 0x00, 0x06, 
-       0x00, 0x12, 0x76, 0x82, 0x00, 0x00, 0x71, 0xe1, 
-       0x00, 0x05, 0x00, 0x12, 0x76, 0x82, 0x00, 0x0b, 
-       0x71, 0xe1, 0x00, 0x06, 0x00, 0x12, 0x76, 0x82, 
-       0x00, 0x00, 0x71, 0xe1, 0x00, 0x05, 0x00, 0x12, 
-       0x76, 0x82, 0x00, 0x0c, 0x71, 0xe1, 0x00, 0x06, 
-       0x00, 0x12, 0x76, 0x82, 0x00, 0x00, 0x71, 0xe1, 
-       0x00, 0x05, 0x00, 0x12, 0x76, 0x82, 0x00, 0x0d, 
-       0x71, 0xe1, 0x00, 0x06, 0x00, 0x12, 0x76, 0x82, 
-       0x00, 0x00, 0x71, 0xe1, 0x00, 0x05, 0x00, 0x12, 
-       0x76, 0x82, 0x00, 0x0e, 0x71, 0xe1, 0x00, 0x06, 
-       0x00, 0x12, 0x76, 0x82, 0x00, 0x00, 0x10, 0xe1, 
-       0x00, 0x07, 0xf9, 0x80, 0x16, 0x76, 0x10, 0xe1, 
-       0x00, 0x08, 0xf9, 0x80, 0x16, 0x76, 0x10, 0xe1, 
-       0x00, 0x07, 0xf9, 0x80, 0x16, 0x66, 0x10, 0xe1, 
-       0x00, 0x08, 0xf9, 0x80, 0x16, 0x66, 0xf0, 0x73, 
-       0x18, 0xd1, 0x77, 0x11, 0x00, 0x7b, 0x10, 0x81, 
-       0xfb, 0x80, 0x18, 0x10, 0xf0, 0x00, 0x00, 0x95, 
-       0x77, 0x11, 0x00, 0x7b, 0x10, 0x81, 0xfb, 0x80, 
-       0x18, 0x10, 0xf0, 0x00, 0x00, 0x9e, 0xf9, 0x80, 
-       0x16, 0x9a, 0xee, 0x01, 0x8a, 0x11, 0xf4, 0xe4, 
-       0x4a, 0x11, 0x88, 0x11, 0xee, 0xff, 0xf4, 0x95, 
-       0x10, 0x04, 0x71, 0xe1, 0x00, 0x03, 0x00, 0x11, 
-       0xee, 0x01, 0x80, 0x81, 0x8a, 0x11, 0xf4, 0x95, 
-       0xf4, 0xe4, 0x4a, 0x11, 0x4a, 0x16, 0xf4, 0x95, 
-       0x71, 0x04, 0x00, 0x16, 0xfb, 0x80, 0x16, 0xa2, 
-       0x88, 0x11, 0xf4, 0x95, 0x71, 0xe1, 0x00, 0x02, 
-       0x00, 0x12, 0x76, 0x82, 0x00, 0x10, 0x10, 0xe6, 
-       0x00, 0x01, 0x71, 0xe1, 0x00, 0x03, 0x00, 0x12, 
-       0x80, 0x82, 0x71, 0xe1, 0x00, 0x04, 0x00, 0x12, 
-       0x10, 0xe6, 0x00, 0x02, 0x80, 0x82, 0xe7, 0x62, 
-       0x71, 0xe1, 0x00, 0x02, 0x00, 0x13, 0xe5, 0x01, 
-       0xf9, 0x80, 0x16, 0x9a, 0x8a, 0x16, 0x8a, 0x11, 
-       0xf4, 0xe4, 0x4a, 0x11, 0x88, 0x11, 0xee, 0xff, 
-       0xee, 0x01, 0x10, 0xe1, 0x00, 0x01, 0x8a, 0x11, 
-       0xf4, 0x95, 0xf4, 0xe4, 0x4a, 0x11, 0x77, 0x11, 
-       0x00, 0x7b, 0x10, 0x81, 0xf0, 0x00, 0x00, 0xb3, 
-       0x88, 0x11, 0xf4, 0x95, 0xf4, 0x95, 0x10, 0x81, 
-       0xfa, 0x44, 0x19, 0x2a, 0xf4, 0x95, 0xee, 0xff, 
-       0xf9, 0x80, 0x16, 0x53, 0x77, 0x11, 0x00, 0x7b, 
-       0x10, 0x81, 0xf0, 0x00, 0x00, 0xb3, 0x88, 0x11, 
-       0xf4, 0x95, 0xf4, 0x95, 0x76, 0x81, 0x00, 0x01, 
-       0xee, 0x01, 0x76, 0xe1, 0x00, 0x01, 0x00, 0x00, 
-       0x76, 0xe1, 0x00, 0x02, 0x00, 0x13, 0x76, 0xe1, 
-       0x00, 0x03, 0x00, 0x26, 0x76, 0xe1, 0x00, 0x04, 
-       0x00, 0x25, 0x76, 0xe1, 0x00, 0x05, 0x00, 0x24, 
-       0x76, 0xe1, 0x00, 0x06, 0x00, 0x00, 0x76, 0xe1, 
-       0x00, 0x07, 0x00, 0x17, 0x76, 0xe1, 0x00, 0x08, 
-       0x00, 0x32, 0x76, 0xe1, 0x00, 0x09, 0x00, 0x31, 
-       0x76, 0xe1, 0x00, 0x0a, 0x00, 0x30, 0x8a, 0x11, 
-       0xf4, 0x95, 0xf4, 0xe4, 0x4a, 0x11, 0x4a, 0x16, 
-       0x4a, 0x17, 0xee, 0xff, 0xf4, 0x95, 0x71, 0x06, 
-       0x00, 0x17, 0xfb, 0x80, 0x16, 0xa2, 0x88, 0x11, 
-       0xf4, 0x95, 0xf7, 0xb8, 0x10, 0xf8, 0x00, 0x11, 
-       0xf0, 0x10, 0xff, 0xff, 0xfa, 0x45, 0x19, 0x73, 
-       0x77, 0x16, 0xff, 0xff, 0x77, 0x12, 0x00, 0x7b, 
-       0x77, 0x0e, 0x00, 0x05, 0x10, 0x82, 0x28, 0xf8, 
-       0x00, 0x11, 0xf0, 0x00, 0x00, 0xb4, 0x88, 0x11, 
-       0xf4, 0x95, 0xf4, 0x95, 0x10, 0x81, 0xf8, 0x44, 
-       0x19, 0x84, 0xf2, 0x73, 0x19, 0x84, 0xf4, 0x95, 
-       0xe7, 0x16, 0x77, 0x11, 0x00, 0x7b, 0x10, 0x81, 
-       0xf0, 0x00, 0x00, 0xb4, 0x88, 0x11, 0xf4, 0x95, 
-       0x77, 0x12, 0x00, 0x02, 0x10, 0x81, 0xf8, 0x45, 
-       0x19, 0x6f, 0x6e, 0xea, 0xff, 0xff, 0x19, 0x7c, 
-       0x6d, 0xe9, 0x00, 0x05, 0x61, 0xf8, 0x00, 0x17, 
-       0x00, 0x01, 0xfa, 0x20, 0x19, 0x8f, 0x76, 0x86, 
-       0x00, 0x01, 0xfb, 0x80, 0x19, 0x97, 0xf4, 0x95, 
-       0x48, 0x16, 0xf9, 0x80, 0x16, 0x9a, 0xee, 0x01, 
-       0x8a, 0x17, 0x48, 0x16, 0x8a, 0x16, 0x8a, 0x11, 
-       0xf4, 0xe4, 0x4a, 0x11, 0xee, 0xff, 0xfb, 0x80, 
-       0x16, 0xa2, 0x88, 0x11, 0xf4, 0x95, 0x77, 0x10, 
-       0xff, 0xff, 0xf4, 0xa9, 0xf8, 0x30, 0x19, 0xcc, 
-       0x71, 0xe1, 0x00, 0x02, 0x00, 0x12, 0x69, 0x82, 
-       0x00, 0x10, 0x71, 0xe1, 0x00, 0x02, 0x00, 0x12, 
-       0x68, 0x82, 0xf7, 0xff, 0x71, 0xe1, 0x00, 0x02, 
-       0x00, 0x12, 0x68, 0x82, 0xfb, 0xff, 0x71, 0xe1, 
-       0x00, 0x02, 0x00, 0x12, 0x68, 0x82, 0xff, 0xf0, 
-       0x71, 0xe1, 0x00, 0x03, 0x00, 0x12, 0x76, 0x82, 
-       0xff, 0xff, 0x71, 0xe1, 0x00, 0x04, 0x00, 0x12, 
-       0x76, 0x82, 0xff, 0xff, 0x71, 0xe1, 0x00, 0x02, 
-       0x00, 0x12, 0x69, 0x82, 0x00, 0x20, 0x71, 0xe1, 
-       0x00, 0x02, 0x00, 0x11, 0xf2, 0x73, 0x19, 0xda, 
-       0x68, 0x81, 0xff, 0xef, 0x77, 0x11, 0x00, 0x7b, 
-       0x10, 0x81, 0xfb, 0x80, 0x19, 0x97, 0xf0, 0x00, 
-       0x00, 0xb4, 0x77, 0x11, 0x00, 0x7b, 0x10, 0x81, 
-       0xfb, 0x80, 0x19, 0x97, 0xf0, 0x00, 0x00, 0xb9, 
-       0xf9, 0x80, 0x16, 0x9a, 0xee, 0x01, 0x8a, 0x11, 
-       0xf4, 0xe4, 0x00, 0xa4, 0x00, 0x00, 0x19, 0xdf, 
-       0x00, 0x01, 0x2a, 0xe6, 0x00, 0x00, 0x00, 0x01, 
-       0x2a, 0xe7, 0x00, 0x00, 0x00, 0x03, 0x2a, 0x12, 
-       0x0c, 0x01, 0xc3, 0x4f, 0x00, 0x00, 0x00, 0x01, 
-       0x2a, 0x15, 0x00, 0x00, 0x00, 0x02, 0x2a, 0x16, 
-       0x00, 0x00, 0x00, 0x00, 0x00, 0x19, 0x2a, 0x5d, 
-       0x00, 0x43, 0x00, 0x6f, 0x00, 0x70, 0x00, 0x79, 
-       0x00, 0x72, 0x00, 0x69, 0x00, 0x67, 0x00, 0x68, 
-       0x00, 0x74, 0x00, 0x20, 0x00, 0x54, 0x00, 0x65, 
-       0x00, 0x63, 0x00, 0x68, 0x00, 0x6e, 0x00, 0x6f, 
-       0x00, 0x54, 0x00, 0x72, 0x00, 0x65, 0x00, 0x6e, 
-       0x00, 0x64, 0x00, 0x20, 0x00, 0x41, 0x00, 0x47, 
-       0x00, 0x00, 0x00, 0x04, 0x2a, 0x76, 0x00, 0x30, 
-       0x00, 0x2e, 0x00, 0x30, 0x00, 0x00, 0x00, 0x0c, 
-       0x2a, 0x7a, 0x00, 0x46, 0x00, 0x65, 0x00, 0x62, 
-       0x00, 0x20, 0x00, 0x32, 0x00, 0x37, 0x00, 0x20, 
-       0x00, 0x32, 0x00, 0x30, 0x00, 0x30, 0x00, 0x31, 
-       0x00, 0x00, 0x00, 0x09, 0x2a, 0x86, 0x00, 0x31, 
-       0x00, 0x34, 0x00, 0x3a, 0x00, 0x33, 0x00, 0x35, 
-       0x00, 0x3a, 0x00, 0x33, 0x00, 0x33, 0x00, 0x00, 
-       0x00, 0x0f, 0x2a, 0x8f, 0x00, 0x00, 0x00, 0x00, 
-       0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 
-       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-       0x00, 0x00, 0x00, 0x01, 0x2a, 0x9e, 0x00, 0x00, 
-       0x00, 0x01, 0x2a, 0x9f, 0x00, 0x00, 0x00, 0x01, 
-       0x2a, 0xa0, 0x00, 0x00, 0x00, 0x01, 0x2a, 0xa1, 
-       0x00, 0x00, 0x00, 0x01, 0x2a, 0xa2, 0x00, 0x00, 
-       0x00, 0x01, 0x29, 0x7e, 0x00, 0x00, 0x00, 0x02, 
-       0x29, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 
-       0x29, 0x82, 0xff, 0xff, 0x00, 0x01, 0x2a, 0xa7, 
-       0x00, 0x00, 0x00, 0x05, 0x2a, 0xa8, 0x71, 0x41, 
-       0x20, 0x00, 0x20, 0x00, 0x00, 0x23, 0x04, 0x00, 
-       0x00, 0x0a, 0x2a, 0xad, 0x00, 0x00, 0x00, 0x00, 
-       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-       0x00, 0x0f, 0x2a, 0xb7, 0x00, 0x00, 0x00, 0x00, 
-       0x00, 0x00, 0x00, 0x40, 0x00, 0xa0, 0x82, 0x40, 
-       0x00, 0x08, 0x30, 0x7f, 0x00, 0x80, 0x01, 0x80, 
-       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-       0x00, 0x00, 0x00, 0x01, 0x27, 0x6e, 0x00, 0x00, 
-       0x00, 0x01, 0x27, 0x6f, 0x00, 0x00, 0x00, 0x00, 
-       0x00, 0x09, 0x00, 0x00, 0x1a, 0x83, 0x04, 0xe8, 
-       0x04, 0xcf, 0x04, 0xc5, 0x04, 0xba, 0x04, 0xb0, 
-       0x04, 0xac, 0x04, 0x9c, 0x04, 0x8c, 0x04, 0x81, 
-       0x00, 0x78, 0x00, 0x00, 0x01, 0x00, 0xf2, 0x73, 
-       0x07, 0xef, 0xf4, 0x95, 0xf4, 0x95, 0xf2, 0x73, 
-       0x07, 0xef, 0xf4, 0x95, 0xf4, 0x95, 0xf2, 0x73, 
-       0x07, 0xef, 0xf4, 0x95, 0xf4, 0x95, 0xf2, 0x73, 
-       0x07, 0xef, 0xf4, 0x95, 0xf4, 0x95, 0xf2, 0x73, 
-       0x07, 0xef, 0xf4, 0x95, 0xf4, 0x95, 0xf2, 0x73, 
-       0x07, 0xef, 0xf4, 0x95, 0xf4, 0x95, 0xf2, 0x73, 
-       0x07, 0xef, 0xf4, 0x95, 0xf4, 0x95, 0xf2, 0x73, 
-       0x07, 0xef, 0xf4, 0x95, 0xf4, 0x95, 0xf2, 0x73, 
-       0x07, 0xef, 0xf4, 0x95, 0xf4, 0x95, 0xf2, 0x73, 
-       0x07, 0xef, 0xf4, 0x95, 0xf4, 0x95, 0xf2, 0x73, 
-       0x07, 0xef, 0xf4, 0x95, 0xf4, 0x95, 0xf2, 0x73, 
-       0x07, 0xef, 0xf4, 0x95, 0xf4, 0x95, 0xf2, 0x73, 
-       0x07, 0xef, 0xf4, 0x95, 0xf4, 0x95, 0xf2, 0x73, 
-       0x07, 0xef, 0xf4, 0x95, 0xf4, 0x95, 0xf2, 0x73, 
-       0x07, 0xef, 0xf4, 0x95, 0xf4, 0x95, 0xf2, 0x73, 
-       0x07, 0xef, 0xf4, 0x95, 0xf4, 0x95, 0xf2, 0x73, 
-       0x07, 0xaa, 0xf4, 0x95, 0xf4, 0x95, 0xf2, 0x73, 
-       0x07, 0xef, 0xf4, 0x95, 0xf4, 0x95, 0xf2, 0x73, 
-       0x07, 0xef, 0xf4, 0x95, 0xf4, 0x95, 0xf2, 0x73, 
-       0x02, 0x23, 0xf4, 0x95, 0xf4, 0x95, 0xf2, 0x73, 
-       0x07, 0xef, 0xf4, 0x95, 0xf4, 0x95, 0xf2, 0x73, 
-       0x07, 0xef, 0xf4, 0x95, 0xf4, 0x95, 0xf2, 0x73, 
-       0x07, 0xef, 0xf4, 0x95, 0xf4, 0x95, 0xf2, 0x73, 
-       0x07, 0xef, 0xf4, 0x95, 0xf4, 0x95, 0xf2, 0x73, 
-       0x07, 0xef, 0xf4, 0x95, 0xf4, 0x95, 0xf2, 0x73, 
-       0x07, 0xef, 0xf4, 0x95, 0xf4, 0x95, 0xf2, 0x73, 
-       0x05, 0xe5, 0xf4, 0x95, 0xf4, 0x95, 0xf2, 0x73, 
-       0x02, 0xb5, 0xf4, 0x95, 0xf4, 0x95, 0xf2, 0x73, 
-       0x0e, 0x33, 0xf4, 0x95, 0xf4, 0x95, 0xf2, 0x73, 
-       0x07, 0xef, 0xf4, 0x95, 0xf4, 0x95, 0x00, 0x00, 
+       0x08, 0xaa, 0x00, 0x18, 0x00, 0x03, 0x08, 0x00,
+       0x00, 0x10, 0x00, 0x00, 0x01, 0x80, 0x18, 0x5f,
+       0x00, 0x00, 0x01, 0x80, 0x77, 0x18, 0x2a, 0xeb,
+       0x6b, 0xf8, 0x00, 0x18, 0x03, 0xff, 0x68, 0xf8,
+       0x00, 0x18, 0xff, 0xfe, 0xf7, 0xb8, 0xf7, 0xbe,
+       0xf6, 0xb9, 0xf4, 0xa0, 0xf6, 0xb7, 0xf6, 0xb5,
+       0xf6, 0xb6, 0xf0, 0x20, 0x19, 0xdf, 0xf1, 0x00,
+       0x00, 0x01, 0xf8, 0x4d, 0x01, 0xab, 0xf6, 0xb8,
+       0xf0, 0x20, 0x19, 0xdf, 0xf0, 0x73, 0x01, 0xa5,
+       0x7e, 0xf8, 0x00, 0x12, 0xf0, 0x00, 0x00, 0x01,
+       0x47, 0xf8, 0x00, 0x11, 0x7e, 0x92, 0x00, 0xf8,
+       0x00, 0x11, 0xf0, 0x00, 0x00, 0x01, 0x7e, 0xf8,
+       0x00, 0x11, 0xf0, 0x00, 0x00, 0x01, 0x6c, 0x89,
+       0x01, 0x9a, 0xf7, 0xb8, 0xee, 0xfc, 0xf0, 0x20,
+       0xff, 0xff, 0xf1, 0x00, 0x00, 0x01, 0xf8, 0x4d,
+       0x01, 0xbf, 0xf2, 0x73, 0x01, 0xb9, 0x4e, 0x02,
+       0xf4, 0x95, 0xf5, 0xe3, 0x56, 0x02, 0x7e, 0x00,
+       0x11, 0x00, 0xfa, 0x4c, 0x01, 0xb7, 0x6b, 0x03,
+       0x00, 0x01, 0xf6, 0xb8, 0xee, 0x04, 0xf0, 0x74,
+       0x0d, 0xa7, 0xf0, 0x74, 0x01, 0xc5, 0x4a, 0x11,
+       0x4a, 0x16, 0x72, 0x11, 0x2a, 0xe6, 0x10, 0xf8,
+       0x00, 0x11, 0xfa, 0x45, 0x01, 0xdb, 0xf4, 0x95,
+       0xee, 0xff, 0x48, 0x11, 0xf0, 0x00, 0x2a, 0xc6,
+       0x88, 0x16, 0xf4, 0x95, 0xf4, 0x95, 0x10, 0xee,
+       0xff, 0xff, 0xf4, 0xe3, 0x6c, 0xe9, 0xff, 0xff,
+       0x01, 0xd5, 0x10, 0xf8, 0x2a, 0xe7, 0xf8, 0x45,
+       0x01, 0xe2, 0x10, 0xf8, 0x2a, 0xe7, 0xf4, 0xe3,
+       0xf0, 0x74, 0x01, 0xff, 0xee, 0x01, 0x8a, 0x16,
+       0x8a, 0x11, 0xfc, 0x00, 0xf7, 0xb8, 0xe9, 0x20,
+       0x4a, 0x11, 0x09, 0xf8, 0x2a, 0xe6, 0xf8, 0x4e,
+       0x01, 0xf3, 0xf2, 0x73, 0x01, 0xfd, 0xf4, 0x95,
+       0xe8, 0x01, 0x72, 0x11, 0x2a, 0xe6, 0x49, 0x11,
+       0x80, 0xe1, 0x2a, 0xc6, 0xf3, 0x00, 0x00, 0x01,
+       0xe8, 0x00, 0x81, 0xf8, 0x2a, 0xe6, 0x8a, 0x11,
+       0xfc, 0x00, 0xf4, 0x95, 0xf0, 0x73, 0x02, 0x00,
+       0x10, 0xf8, 0x2a, 0x0f, 0xfc, 0x00, 0x4a, 0x11,
+       0xf0, 0x74, 0x02, 0x02, 0x80, 0xf8, 0x2a, 0x10,
+       0x73, 0x08, 0x00, 0x09, 0x40, 0xf8, 0x2a, 0x15,
+       0x82, 0xf8, 0x00, 0x11, 0xf4, 0x95, 0x77, 0x10,
+       0x03, 0xe8, 0xf5, 0xa9, 0xf8, 0x30, 0x02, 0x21,
+       0x71, 0xf8, 0x2a, 0x10, 0x2a, 0x15, 0x56, 0xf8,
+       0x2a, 0x0c, 0xf0, 0xe3, 0x4e, 0xf8, 0x2a, 0x16,
+       0xe8, 0x00, 0x4e, 0xf8, 0x2a, 0x0c, 0x8a, 0x11,
+       0xfc, 0x00, 0x4a, 0x06, 0x4a, 0x07, 0x4a, 0x1d,
+       0x68, 0xf8, 0x00, 0x07, 0x7d, 0x3f, 0x69, 0xf8,
+       0x00, 0x07, 0x40, 0x00, 0x68, 0xf8, 0x00, 0x1d,
+       0xff, 0xfc, 0x6b, 0xf8, 0x2a, 0x0f, 0x00, 0x01,
+       0x8a, 0x1d, 0x8a, 0x07, 0x8a, 0x06, 0xf4, 0xeb,
+       0xee, 0xfd, 0x76, 0xf8, 0x2a, 0x0f, 0x00, 0x00,
+       0x76, 0x00, 0x00, 0x00, 0xfb, 0x80, 0x19, 0x4c,
+       0xf4, 0x95, 0xe8, 0x00, 0x80, 0xf8, 0x2a, 0x11,
+       0xf9, 0x80, 0x19, 0x07, 0x80, 0xf8, 0x2a, 0x0e,
+       0xf9, 0x80, 0x16, 0x66, 0x76, 0x00, 0x2a, 0x12,
+       0x10, 0xf8, 0x2a, 0x11, 0xf9, 0x80, 0x18, 0xe3,
+       0x10, 0xf8, 0x2a, 0x0e, 0xf9, 0x80, 0x16, 0x66,
+       0x10, 0xf8, 0x2a, 0x0e, 0xf9, 0x80, 0x16, 0x87,
+       0xee, 0x03, 0xfc, 0x00, 0x4a, 0x11, 0xf6, 0xb8,
+       0xf4, 0x95, 0xf0, 0x20, 0x80, 0x00, 0x11, 0xf8,
+       0x2a, 0x5a, 0xf8, 0x4d, 0x02, 0x93, 0x11, 0xf8,
+       0x2a, 0x9f, 0xf8, 0x4c, 0x02, 0x7c, 0x77, 0x12,
+       0x2a, 0x39, 0x49, 0x12, 0x01, 0xf8, 0x2a, 0x9f,
+       0x89, 0x11, 0xf4, 0x95, 0xf4, 0x95, 0x71, 0x81,
+       0x00, 0x11, 0x6c, 0xe1, 0xff, 0xab, 0x02, 0x93,
+       0x6b, 0xf8, 0x2a, 0x9f, 0x00, 0x01, 0xe9, 0x05,
+       0x01, 0xe2, 0x00, 0x03, 0x81, 0xf8, 0x2a, 0xa0,
+       0xf0, 0x73, 0x02, 0x95, 0x72, 0x11, 0x2a, 0x9f,
+       0xf4, 0x95, 0x10, 0xe1, 0x2a, 0x39, 0x6b, 0xf8,
+       0x2a, 0x9f, 0x00, 0x01, 0x11, 0xf8, 0x2a, 0x9f,
+       0x09, 0xf8, 0x2a, 0xa0, 0xf8, 0x4c, 0x02, 0x93,
+       0x76, 0xf8, 0x2a, 0x5a, 0x00, 0x00, 0x76, 0xf8,
+       0x2a, 0x9f, 0x00, 0x00, 0x76, 0xf8, 0x2a, 0xa0,
+       0x00, 0x00, 0x88, 0x11, 0xf4, 0x95, 0x48, 0x11,
+       0x8a, 0x11, 0xfc, 0x00, 0x4a, 0x11, 0xee, 0xfe,
+       0x10, 0xf8, 0x2a, 0x5a, 0xf8, 0x44, 0x02, 0xb2,
+       0x76, 0xf8, 0x2a, 0x5a, 0x00, 0x01, 0xf0, 0x74,
+       0x02, 0x58, 0x88, 0x11, 0xf4, 0x95, 0x77, 0x10,
+       0x80, 0x00, 0xf4, 0xa9, 0xf8, 0x30, 0x02, 0xb2,
+       0x48, 0x11, 0xf0, 0x30, 0x00, 0xff, 0x80, 0x00,
+       0x10, 0xf8, 0x2a, 0x5b, 0xf9, 0x80, 0x18, 0xd6,
+       0xee, 0x02, 0x8a, 0x11, 0xfc, 0x00, 0xf4, 0x95,
+       0x4a, 0x08, 0x4a, 0x09, 0x4a, 0x0a, 0x4a, 0x0b,
+       0x4a, 0x0c, 0x4a, 0x0d, 0x4a, 0x10, 0x4a, 0x11,
+       0x4a, 0x12, 0x4a, 0x13, 0x4a, 0x14, 0x4a, 0x15,
+       0x4a, 0x16, 0x4a, 0x17, 0x4a, 0x17, 0x4a, 0x19,
+       0x4a, 0x0e, 0x4a, 0x06, 0x4a, 0x07, 0x4a, 0x1a,
+       0x4a, 0x1d, 0x4a, 0x1b, 0x4a, 0x1c, 0x68, 0xf8,
+       0x00, 0x07, 0x7d, 0x3f, 0x69, 0xf8, 0x00, 0x07,
+       0x40, 0x00, 0x68, 0xf8, 0x00, 0x1d, 0xff, 0xfc,
+       0x48, 0x18, 0x68, 0xf8, 0x00, 0x18, 0xff, 0xfe,
+       0xf4, 0x95, 0xf4, 0x95, 0x4a, 0x08, 0xee, 0xfd,
+       0xf0, 0x74, 0x02, 0x58, 0x88, 0x11, 0xf4, 0x95,
+       0x77, 0x10, 0x80, 0x00, 0xf4, 0xa9, 0xf8, 0x30,
+       0x02, 0xef, 0x48, 0x11, 0xf0, 0x30, 0x00, 0xff,
+       0x80, 0x00, 0x10, 0xf8, 0x2a, 0x5b, 0xf9, 0x80,
+       0x18, 0xd6, 0xee, 0x03, 0x8a, 0x18, 0xf4, 0x95,
+       0x8a, 0x1c, 0x8a, 0x1b, 0x8a, 0x1d, 0x8a, 0x1a,
+       0x8a, 0x07, 0x8a, 0x06, 0x8a, 0x0e, 0x8a, 0x19,
+       0x8a, 0x17, 0x8a, 0x17, 0x8a, 0x16, 0x8a, 0x15,
+       0x8a, 0x14, 0x8a, 0x13, 0x8a, 0x12, 0x8a, 0x11,
+       0x8a, 0x10, 0x8a, 0x0d, 0x8a, 0x0c, 0x8a, 0x0b,
+       0x8a, 0x0a, 0x8a, 0x09, 0x8a, 0x08, 0xf4, 0xeb,
+       0x4a, 0x11, 0x77, 0x11, 0x2a, 0x39, 0x76, 0x81,
+       0x00, 0x55, 0x77, 0x12, 0x2a, 0x18, 0x10, 0xe2,
+       0x00, 0x01, 0x80, 0xe1, 0x00, 0x01, 0x10, 0xe2,
+       0x00, 0x02, 0x80, 0xe1, 0x00, 0x02, 0x76, 0xe1,
+       0x00, 0x03, 0x00, 0x00, 0x76, 0xe1, 0x00, 0x04,
+       0x00, 0xaa, 0xf0, 0x74, 0x02, 0x98, 0x8a, 0x11,
+       0xfc, 0x00, 0x4a, 0x11, 0x88, 0x11, 0xf4, 0x95,
+       0xf4, 0x95, 0x10, 0x81, 0x6f, 0xf8, 0x2a, 0x9e,
+       0x0c, 0x88, 0xe8, 0xff, 0x18, 0xe1, 0x00, 0x01,
+       0x1a, 0xf8, 0x2a, 0x9e, 0xf0, 0x30, 0x1f, 0xff,
+       0x80, 0xf8, 0x2a, 0x9e, 0x8a, 0x11, 0xfc, 0x00,
+       0x4a, 0x11, 0x77, 0x11, 0x2a, 0x39, 0x76, 0x81,
+       0x00, 0x55, 0x77, 0x12, 0x2a, 0x18, 0x11, 0xe2,
+       0x00, 0x01, 0x81, 0xe1, 0x00, 0x01, 0x11, 0xe2,
+       0x00, 0x02, 0x81, 0xe1, 0x00, 0x02, 0x76, 0xe1,
+       0x00, 0x03, 0x00, 0x02, 0x48, 0x08, 0x6f, 0xe1,
+       0x00, 0x04, 0x0c, 0x98, 0xf0, 0x30, 0x00, 0xff,
+       0x80, 0xe1, 0x00, 0x05, 0x76, 0xe1, 0x00, 0x06,
+       0x00, 0xaa, 0xf0, 0x74, 0x02, 0x98, 0x8a, 0x11,
+       0xfc, 0x00, 0x4a, 0x11, 0x77, 0x11, 0x2a, 0x39,
+       0x76, 0x81, 0x00, 0x55, 0x77, 0x12, 0x2a, 0x18,
+       0x10, 0xe2, 0x00, 0x01, 0x80, 0xe1, 0x00, 0x01,
+       0x10, 0xe2, 0x00, 0x02, 0x80, 0xe1, 0x00, 0x02,
+       0x76, 0xe1, 0x00, 0x03, 0x00, 0x04, 0x48, 0x11,
+       0xf0, 0x00, 0x00, 0x04, 0x88, 0x12, 0xf4, 0x95,
+       0x77, 0x13, 0x2a, 0x76, 0xe9, 0x00, 0xe5, 0x98,
+       0xf3, 0x00, 0x00, 0x01, 0xf6, 0xb8, 0x48, 0x0b,
+       0x08, 0xf8, 0x2a, 0x3c, 0xf8, 0x43, 0x03, 0x71,
+       0x76, 0x82, 0x00, 0xaa, 0xf0, 0x74, 0x02, 0x98,
+       0x8a, 0x11, 0xfc, 0x00, 0x4a, 0x11, 0xee, 0xf0,
+       0x88, 0x11, 0xf4, 0x95, 0xf4, 0x95, 0x71, 0x81,
+       0x00, 0x14, 0x71, 0xe1, 0x00, 0x01, 0x00, 0x15,
+       0x49, 0x11, 0xf3, 0x00, 0x00, 0x02, 0x89, 0x11,
+       0xe7, 0x82, 0x6d, 0xea, 0x00, 0x04, 0xe7, 0x83,
+       0x6d, 0xeb, 0x00, 0x0a, 0x77, 0x1a, 0x00, 0x05,
+       0xf0, 0x72, 0x03, 0xaa, 0x11, 0x81, 0xf2, 0xe8,
+       0x80, 0x82, 0xe9, 0xff, 0x19, 0xe1, 0x00, 0x01,
+       0xf1, 0xa0, 0x81, 0x92, 0x11, 0xe1, 0x00, 0x0c,
+       0xf2, 0xe8, 0x80, 0x83, 0xe9, 0xff, 0x19, 0xe1,
+       0x00, 0x0d, 0xf1, 0xa0, 0x81, 0x93, 0x6d, 0xe9,
+       0x00, 0x02, 0x48, 0x18, 0x49, 0x18, 0x70, 0x00,
+       0x00, 0x15, 0xf0, 0x00, 0x00, 0x04, 0xf3, 0x00,
+       0x00, 0x0a, 0x80, 0x01, 0x81, 0x02, 0xf2, 0x74,
+       0x0e, 0x54, 0xf4, 0x95, 0x48, 0x14, 0xee, 0x10,
+       0x8a, 0x11, 0xfc, 0x00, 0x4a, 0x11, 0xf0, 0x74,
+       0x0c, 0x5e, 0x80, 0xf8, 0x2a, 0x5c, 0x77, 0x12,
+       0x2a, 0x39, 0x76, 0x82, 0x00, 0x55, 0x77, 0x11,
+       0x2a, 0x18, 0x10, 0xe1, 0x00, 0x01, 0x80, 0xe2,
+       0x00, 0x01, 0x10, 0xe1, 0x00, 0x02, 0x80, 0xe2,
+       0x00, 0x02, 0x76, 0xe2, 0x00, 0x03, 0x00, 0x1c,
+       0xf6, 0xb8, 0x56, 0xf8, 0x2a, 0x16, 0xf0, 0xf0,
+       0xf0, 0xf8, 0x80, 0xe2, 0x00, 0x07, 0x56, 0xf8,
+       0x2a, 0x16, 0xf1, 0xf0, 0xe8, 0xff, 0xf2, 0x80,
+       0x80, 0xe2, 0x00, 0x06, 0x56, 0xf8, 0x2a, 0x16,
+       0xf1, 0xf8, 0xe8, 0xff, 0xf2, 0x80, 0x80, 0xe2,
+       0x00, 0x05, 0x57, 0xf8, 0x2a, 0x16, 0xe8, 0xff,
+       0xf2, 0x80, 0x80, 0xe2, 0x00, 0x04, 0x56, 0xf8,
+       0x27, 0x6c, 0xf0, 0xf0, 0xf0, 0xf8, 0x80, 0xe2,
+       0x00, 0x0b, 0x56, 0xf8, 0x27, 0x6c, 0xf1, 0xf0,
+       0xe8, 0xff, 0xf2, 0x80, 0x80, 0xe2, 0x00, 0x0a,
+       0x56, 0xf8, 0x27, 0x6c, 0xf1, 0xf8, 0xe8, 0xff,
+       0xf2, 0x80, 0x80, 0xe2, 0x00, 0x09, 0xe8, 0xff,
+       0x57, 0xf8, 0x27, 0x6c, 0xf2, 0x80, 0x80, 0xe2,
+       0x00, 0x08, 0x56, 0xf8, 0x27, 0x6a, 0xf0, 0xf0,
+       0xf0, 0xf8, 0x80, 0xe2, 0x00, 0x0f, 0x56, 0xf8,
+       0x27, 0x6a, 0xf1, 0xf0, 0xe8, 0xff, 0xf2, 0x80,
+       0x80, 0xe2, 0x00, 0x0e, 0x56, 0xf8, 0x27, 0x6a,
+       0xf1, 0xf8, 0xe8, 0xff, 0xf2, 0x80, 0x80, 0xe2,
+       0x00, 0x0d, 0x57, 0xf8, 0x27, 0x6a, 0xe8, 0xff,
+       0xf2, 0x80, 0x80, 0xe2, 0x00, 0x0c, 0x76, 0xe2,
+       0x00, 0x13, 0x00, 0x00, 0x76, 0xe2, 0x00, 0x12,
+       0x00, 0x00, 0x6f, 0xf8, 0x2a, 0x5c, 0x0c, 0x58,
+       0x80, 0xe2, 0x00, 0x11, 0xe8, 0xff, 0x18, 0xf8,
+       0x2a, 0x5c, 0x80, 0xe2, 0x00, 0x10, 0x76, 0xe2,
+       0x00, 0x17, 0x00, 0x00, 0x76, 0xe2, 0x00, 0x16,
+       0x00, 0x00, 0x6f, 0xf8, 0x2a, 0x9e, 0x0c, 0x58,
+       0x80, 0xe2, 0x00, 0x15, 0xe8, 0xff, 0x18, 0xf8,
+       0x2a, 0x9e, 0x80, 0xe2, 0x00, 0x14, 0x76, 0xe2,
+       0x00, 0x1b, 0x00, 0x00, 0x76, 0xe2, 0x00, 0x1a,
+       0x00, 0x00, 0x76, 0xe2, 0x00, 0x19, 0x00, 0x00,
+       0x70, 0xe2, 0x00, 0x18, 0x27, 0x6e, 0x76, 0xe2,
+       0x00, 0x1f, 0x00, 0x00, 0x76, 0xe2, 0x00, 0x1e,
+       0x00, 0x00, 0x76, 0xe2, 0x00, 0x1d, 0x00, 0x00,
+       0x76, 0xe2, 0x00, 0x1c, 0x00, 0x00, 0x76, 0xe2,
+       0x00, 0x20, 0x00, 0xaa, 0xf0, 0x74, 0x02, 0x98,
+       0x8a, 0x11, 0xfc, 0x00, 0x4a, 0x11, 0xee, 0xfe,
+       0x10, 0xf8, 0x2a, 0x38, 0xf8, 0x45, 0x04, 0xed,
+       0x77, 0x12, 0x2a, 0x18, 0x10, 0xe2, 0x00, 0x02,
+       0x88, 0x11, 0xf4, 0x95, 0x77, 0x10, 0x00, 0x08,
+       0x6d, 0xe9, 0xff, 0xdf, 0xf6, 0xa9, 0xf8, 0x20,
+       0x04, 0x75, 0xf0, 0x73, 0x04, 0x7d, 0xf0, 0x10,
+       0x00, 0x21, 0xf0, 0x00, 0x1a, 0x83, 0x48, 0x08,
+       0x7e, 0xf8, 0x00, 0x08, 0xf4, 0xe2, 0xf0, 0x74,
+       0x03, 0x0a, 0xf0, 0x73, 0x04, 0xea, 0x48, 0x12,
+       0xf2, 0x74, 0x03, 0x23, 0xf0, 0x00, 0x00, 0x04,
+       0xf2, 0x74, 0x03, 0x36, 0xf4, 0x95, 0xe8, 0x00,
+       0xf0, 0x73, 0x04, 0xea, 0x77, 0x11, 0x2a, 0x18,
+       0xe8, 0xff, 0x6f, 0xe1, 0x00, 0x04, 0x0d, 0x48,
+       0x18, 0xe1, 0x00, 0x05, 0xf2, 0x74, 0x09, 0x69,
+       0xf4, 0x95, 0xf2, 0xa0, 0xf0, 0x74, 0x03, 0x36,
+       0xf0, 0x73, 0x04, 0xea, 0x77, 0x11, 0x2a, 0x18,
+       0xe8, 0xff, 0x6f, 0xe1, 0x00, 0x04, 0x0d, 0x48,
+       0x18, 0xe1, 0x00, 0x05, 0xf2, 0x74, 0x09, 0x41,
+       0xf4, 0x95, 0xf2, 0xa0, 0xf0, 0x74, 0x03, 0x36,
+       0xf0, 0x73, 0x04, 0xea, 0xf0, 0x74, 0x03, 0x57,
+       0xf0, 0x73, 0x04, 0xea, 0x10, 0xf8, 0x2a, 0x1c,
+       0xf0, 0x74, 0x12, 0xa4, 0xf2, 0x74, 0x03, 0x36,
+       0xf4, 0x95, 0xe8, 0x00, 0xf0, 0x73, 0x04, 0xea,
+       0x48, 0x12, 0xf2, 0x74, 0x03, 0x80, 0xf0, 0x00,
+       0x00, 0x04, 0xf2, 0x74, 0x03, 0x36, 0xf4, 0x95,
+       0xe8, 0x00, 0xf0, 0x73, 0x04, 0xea, 0x10, 0xf8,
+       0x2a, 0x1c, 0xf0, 0x74, 0x12, 0xc5, 0xf2, 0x74,
+       0x03, 0x36, 0xf4, 0x95, 0xe8, 0x00, 0xf0, 0x73,
+       0x04, 0xea, 0x77, 0x11, 0x2a, 0x18, 0xe8, 0xff,
+       0x6f, 0xe1, 0x00, 0x06, 0x0d, 0x48, 0x18, 0xe1,
+       0x00, 0x07, 0x71, 0xe1, 0x00, 0x05, 0x00, 0x12,
+       0xf2, 0xa0, 0x70, 0x00, 0x00, 0x12, 0x80, 0x01,
+       0x10, 0xe1, 0x00, 0x04, 0xf0, 0x74, 0x0e, 0x7a,
+       0xf2, 0x74, 0x03, 0x36, 0xf4, 0x95, 0xe8, 0x00,
+       0xf0, 0x73, 0x04, 0xea, 0xf0, 0x74, 0x03, 0xbc,
+       0x76, 0xf8, 0x2a, 0x38, 0x00, 0x00, 0xee, 0x02,
+       0x8a, 0x11, 0xfc, 0x00, 0x4a, 0x11, 0x77, 0x11,
+       0x2a, 0x39, 0x76, 0x81, 0x00, 0x55, 0x77, 0x12,
+       0x2a, 0x18, 0x10, 0xe2, 0x00, 0x01, 0x80, 0xe1,
+       0x00, 0x01, 0x10, 0xe2, 0x00, 0x02, 0x80, 0xe1,
+       0x00, 0x02, 0x76, 0xe1, 0x00, 0x03, 0x00, 0x09,
+       0x48, 0x11, 0xf0, 0x00, 0x00, 0x04, 0x88, 0x12,
+       0xf4, 0x95, 0x77, 0x13, 0x2a, 0x86, 0xe9, 0x00,
+       0xe5, 0x98, 0xf3, 0x00, 0x00, 0x01, 0xf6, 0xb8,
+       0x48, 0x0b, 0x08, 0xf8, 0x2a, 0x3c, 0xf8, 0x43,
+       0x05, 0x0a, 0x76, 0x82, 0x00, 0xaa, 0xf0, 0x74,
+       0x02, 0x98, 0x8a, 0x11, 0xfc, 0x00, 0x4a, 0x11,
+       0x77, 0x11, 0x2a, 0x39, 0x76, 0x81, 0x00, 0x55,
+       0x77, 0x13, 0x2a, 0x18, 0x10, 0xe3, 0x00, 0x01,
+       0x80, 0xe1, 0x00, 0x01, 0x10, 0xe3, 0x00, 0x02,
+       0x80, 0xe1, 0x00, 0x02, 0x13, 0xe3, 0x00, 0x03,
+       0x81, 0xe1, 0x00, 0x03, 0x48, 0x11, 0x77, 0x11,
+       0x00, 0x00, 0xf8, 0x4d, 0x05, 0x44, 0xf0, 0x00,
+       0x00, 0x04, 0x88, 0x12, 0x48, 0x13, 0xf0, 0x00,
+       0x00, 0x04, 0x88, 0x13, 0xf4, 0x95, 0xf4, 0x95,
+       0xe5, 0x98, 0x6d, 0x91, 0xf6, 0xb8, 0x48, 0x11,
+       0x08, 0xf8, 0x2a, 0x3c, 0xf8, 0x43, 0x05, 0x3a,
+       0xf0, 0x20, 0x2a, 0x39, 0x49, 0x11, 0xf5, 0x00,
+       0x89, 0x11, 0xf4, 0x95, 0xf4, 0x95, 0x76, 0xe1,
+       0x00, 0x04, 0x00, 0xaa, 0xf0, 0x74, 0x02, 0x98,
+       0x8a, 0x11, 0xfc, 0x00, 0x4a, 0x11, 0x77, 0x11,
+       0x2a, 0x39, 0x76, 0x81, 0x00, 0x55, 0x77, 0x12,
+       0x2a, 0x18, 0x10, 0xe2, 0x00, 0x01, 0x80, 0xe1,
+       0x00, 0x01, 0x10, 0xe2, 0x00, 0x02, 0x80, 0xe1,
+       0x00, 0x02, 0x76, 0xe1, 0x00, 0x03, 0x00, 0x0c,
+       0x48, 0x11, 0xf0, 0x00, 0x00, 0x04, 0x88, 0x12,
+       0xf4, 0x95, 0x77, 0x13, 0x2a, 0x7a, 0xe9, 0x00,
+       0xe5, 0x98, 0xf3, 0x00, 0x00, 0x01, 0xf6, 0xb8,
+       0x48, 0x0b, 0x08, 0xf8, 0x2a, 0x3c, 0xf8, 0x43,
+       0x05, 0x6a, 0x76, 0x82, 0x00, 0xaa, 0xf0, 0x74,
+       0x02, 0x98, 0x8a, 0x11, 0xfc, 0x00, 0x4a, 0x11,
+       0x77, 0x11, 0x2a, 0x39, 0x76, 0x81, 0x00, 0x55,
+       0x77, 0x12, 0x2a, 0x18, 0x10, 0xe2, 0x00, 0x01,
+       0x80, 0xe1, 0x00, 0x01, 0x10, 0xe2, 0x00, 0x02,
+       0x80, 0xe1, 0x00, 0x02, 0x76, 0xe1, 0x00, 0x03,
+       0x00, 0x19, 0x48, 0x11, 0xf0, 0x00, 0x00, 0x04,
+       0x88, 0x12, 0xf4, 0x95, 0x77, 0x13, 0x2a, 0x5d,
+       0xe9, 0x00, 0xe5, 0x98, 0xf3, 0x00, 0x00, 0x01,
+       0xf6, 0xb8, 0x48, 0x0b, 0x08, 0xf8, 0x2a, 0x3c,
+       0xf8, 0x43, 0x05, 0x93, 0x76, 0x82, 0x00, 0xaa,
+       0xf0, 0x74, 0x02, 0x98, 0x8a, 0x11, 0xfc, 0x00,
+       0x4a, 0x11, 0x88, 0x11, 0x10, 0xf8, 0x2a, 0x38,
+       0xf8, 0x44, 0x05, 0xe3, 0x10, 0xf8, 0x2a, 0xa1,
+       0xf8, 0x44, 0x05, 0xba, 0x6c, 0xe1, 0xff, 0x56,
+       0x05, 0xe3, 0x72, 0x12, 0x2a, 0xa1, 0xf4, 0x95,
+       0x70, 0xe2, 0x2a, 0x18, 0x00, 0x11, 0x6b, 0xf8,
+       0x2a, 0xa1, 0x00, 0x01, 0xf0, 0x73, 0x05, 0xe3,
+       0x72, 0x12, 0x2a, 0xa1, 0xf4, 0x95, 0x70, 0xe2,
+       0x2a, 0x18, 0x00, 0x11, 0x10, 0xf8, 0x2a, 0xa1,
+       0xf0, 0x00, 0x00, 0x01, 0x88, 0x12, 0xf4, 0x95,
+       0xf4, 0x95, 0x6e, 0xe2, 0xff, 0xfc, 0x05, 0xd1,
+       0x73, 0x12, 0x2a, 0xa1, 0x48, 0x11, 0xf0, 0x00,
+       0x00, 0x05, 0x80, 0xf8, 0x2a, 0xa2, 0x10, 0xf8,
+       0x2a, 0xa1, 0x08, 0xf8, 0x2a, 0xa2, 0xf8, 0x44,
+       0x05, 0xe3, 0x6c, 0xe1, 0xff, 0xab, 0x05, 0xdd,
+       0x76, 0xf8, 0x2a, 0x38, 0x00, 0x01, 0x76, 0xf8,
+       0x2a, 0xa1, 0x00, 0x00, 0x76, 0xf8, 0x2a, 0xa2,
+       0x00, 0x00, 0x8a, 0x11, 0xfc, 0x00, 0xf4, 0x95,
+       0x4a, 0x08, 0x4a, 0x09, 0x4a, 0x0a, 0x4a, 0x0b,
+       0x4a, 0x0c, 0x4a, 0x0d, 0x4a, 0x10, 0x4a, 0x11,
+       0x4a, 0x12, 0x4a, 0x13, 0x4a, 0x14, 0x4a, 0x15,
+       0x4a, 0x16, 0x4a, 0x17, 0x4a, 0x17, 0x4a, 0x19,
+       0x4a, 0x0e, 0x4a, 0x06, 0x4a, 0x07, 0x4a, 0x1a,
+       0x4a, 0x1d, 0x4a, 0x1b, 0x4a, 0x1c, 0x68, 0xf8,
+       0x00, 0x07, 0x7d, 0x3f, 0x69, 0xf8, 0x00, 0x07,
+       0x40, 0x00, 0x68, 0xf8, 0x00, 0x1d, 0xff, 0xfc,
+       0x48, 0x18, 0x68, 0xf8, 0x00, 0x18, 0xff, 0xfe,
+       0xf4, 0x95, 0xf4, 0x95, 0x4a, 0x08, 0xee, 0xff,
+       0x10, 0xf8, 0x2a, 0x5b, 0xf9, 0x80, 0x18, 0x04,
+       0xf0, 0x74, 0x05, 0xa2, 0xee, 0x01, 0x8a, 0x18,
+       0xf4, 0x95, 0x8a, 0x1c, 0x8a, 0x1b, 0x8a, 0x1d,
+       0x8a, 0x1a, 0x8a, 0x07, 0x8a, 0x06, 0x8a, 0x0e,
+       0x8a, 0x19, 0x8a, 0x17, 0x8a, 0x17, 0x8a, 0x16,
+       0x8a, 0x15, 0x8a, 0x14, 0x8a, 0x13, 0x8a, 0x12,
+       0x8a, 0x11, 0x8a, 0x10, 0x8a, 0x0d, 0x8a, 0x0c,
+       0x8a, 0x0b, 0x8a, 0x0a, 0x8a, 0x09, 0x8a, 0x08,
+       0xf4, 0xeb, 0xee, 0xfd, 0x76, 0xf8, 0x2a, 0x38,
+       0x00, 0x00, 0x76, 0xf8, 0x2a, 0x5a, 0x00, 0x00,
+       0xe8, 0x01, 0x4e, 0x00, 0xfb, 0x80, 0x17, 0xd6,
+       0xf4, 0x95, 0xe8, 0x01, 0x80, 0xf8, 0x2a, 0x5b,
+       0x76, 0x00, 0x2a, 0x8f, 0xf9, 0x80, 0x16, 0xaa,
+       0x10, 0xf8, 0x2a, 0x5b, 0xf9, 0x80, 0x17, 0x5c,
+       0x10, 0xf8, 0x2a, 0x5b, 0xf9, 0x80, 0x17, 0x6f,
+       0xfb, 0x80, 0x16, 0x66, 0xf4, 0x95, 0xe8, 0x1a,
+       0xfb, 0x80, 0x16, 0x87, 0xf4, 0x95, 0xe8, 0x1a,
+       0xfb, 0x80, 0x16, 0x66, 0xf4, 0x95, 0xe8, 0x1b,
+       0xfb, 0x80, 0x16, 0x87, 0xf4, 0x95, 0xe8, 0x1b,
+       0xee, 0x03, 0xfc, 0x00, 0x4a, 0x11, 0xf4, 0x95,
+       0x13, 0x02, 0x88, 0x11, 0xe8, 0x00, 0xf8, 0x4d,
+       0x06, 0x6a, 0xf3, 0x10, 0x00, 0x01, 0x89, 0x1a,
+       0xf4, 0x95, 0xf0, 0x72, 0x06, 0x69, 0x1c, 0x91,
+       0x8a, 0x11, 0xfc, 0x00, 0x4a, 0x11, 0x88, 0x11,
+       0x12, 0x03, 0x11, 0x02, 0xf8, 0x45, 0x06, 0x79,
+       0xf0, 0x10, 0x00, 0x01, 0x88, 0x1a, 0xf4, 0x95,
+       0xf0, 0x72, 0x06, 0x78, 0x81, 0x91, 0x8a, 0x11,
+       0xfc, 0x00, 0x4a, 0x11, 0xf4, 0x95, 0x71, 0x02,
+       0x00, 0x11, 0x11, 0x03, 0x61, 0xf8, 0x00, 0x11,
+       0x00, 0x01, 0xf8, 0x30, 0x06, 0x91, 0xf6, 0xb8,
+       0x6f, 0xf8, 0x00, 0x11, 0x0c, 0x1f, 0x88, 0x11,
+       0xf3, 0xe8, 0xe8, 0xff, 0x18, 0x81, 0xf1, 0xa0,
+       0x81, 0x81, 0xf0, 0x73, 0x06, 0x9d, 0xf6, 0xb8,
+       0x6f, 0xf8, 0x00, 0x11, 0x0c, 0x1f, 0x88, 0x11,
+       0xf3, 0x30, 0x00, 0xff, 0xf0, 0x20, 0xff, 0x00,
+       0x18, 0x81, 0xf1, 0xa0, 0x81, 0x81, 0x8a, 0x11,
+       0xfc, 0x00, 0x4a, 0x11, 0xf4, 0x95, 0x11, 0x02,
+       0x61, 0xf8, 0x00, 0x0b, 0x00, 0x01, 0xf8, 0x20,
+       0x06, 0xb1, 0x49, 0x0b, 0xf6, 0x1f, 0x88, 0x11,
+       0xf4, 0x95, 0xf4, 0x95, 0x10, 0x81, 0xf2, 0x73,
+       0x06, 0xb8, 0xf0, 0x30, 0x00, 0xff, 0x49, 0x0b,
+       0xf6, 0x1f, 0x88, 0x11, 0xf4, 0x95, 0xf4, 0x95,
+       0x12, 0x81, 0xf4, 0x78, 0x8a, 0x11, 0xfc, 0x00,
+       0x4a, 0x11, 0xf4, 0x95, 0x71, 0x02, 0x00, 0x12,
+       0x13, 0x03, 0x88, 0x11, 0xe8, 0x00, 0xf8, 0x4d,
+       0x06, 0xcc, 0xf3, 0x10, 0x00, 0x01, 0x89, 0x1a,
+       0xf4, 0x95, 0xf0, 0x72, 0x06, 0xcb, 0x11, 0x92,
+       0xf2, 0xc0, 0x81, 0x91, 0x8a, 0x11, 0xfc, 0x00,
+       0x88, 0x12, 0x12, 0x02, 0x71, 0x01, 0x00, 0x13,
+       0xf8, 0x45, 0x06, 0xdb, 0xf0, 0x10, 0x00, 0x01,
+       0x88, 0x1a, 0xf4, 0x95, 0xf0, 0x72, 0x06, 0xda,
+       0xe5, 0x98, 0xfc, 0x00, 0x4a, 0x11, 0xee, 0xfe,
+       0x88, 0x11, 0x11, 0x04, 0x10, 0x06, 0x71, 0x05,
+       0x00, 0x12, 0x61, 0xf8, 0x00, 0x12, 0x00, 0x01,
+       0xf8, 0x20, 0x06, 0xea, 0xf0, 0x00, 0x00, 0x01,
+       0xf6, 0xb8, 0xf0, 0x00, 0x00, 0x01, 0x6f, 0xf8,
+       0x00, 0x12, 0x0f, 0x1f, 0x48, 0x08, 0x81, 0x00,
+       0xf4, 0x7f, 0x80, 0x01, 0xf2, 0x74, 0x06, 0xba,
+       0xf4, 0x95, 0x48, 0x11, 0xee, 0x02, 0x8a, 0x11,
+       0xfc, 0x00, 0x4a, 0x11, 0xee, 0xfe, 0x88, 0x12,
+       0x11, 0x04, 0x10, 0x06, 0x71, 0x05, 0x00, 0x13,
+       0x61, 0xf8, 0x00, 0x13, 0x00, 0x01, 0xf8, 0x20,
+       0x07, 0x09, 0xf0, 0x00, 0x00, 0x01, 0xf0, 0x00,
+       0x00, 0x01, 0x88, 0x11, 0xf6, 0xb8, 0x6f, 0xf8,
+       0x00, 0x13, 0x0f, 0x1f, 0x81, 0x00, 0x48, 0x11,
+       0xf4, 0x7f, 0x80, 0x01, 0xf2, 0x74, 0x06, 0xce,
+       0xf4, 0x95, 0x48, 0x12, 0x48, 0x11, 0xf0, 0x30,
+       0xff, 0xfe, 0xee, 0x02, 0x8a, 0x11, 0xfc, 0x00,
+       0x4a, 0x11, 0x4a, 0x16, 0x4a, 0x17, 0xee, 0xfc,
+       0xf4, 0x95, 0x80, 0x02, 0x71, 0x08, 0x00, 0x16,
+       0x10, 0x09, 0x71, 0x0b, 0x00, 0x17, 0x80, 0x03,
+       0x71, 0x0a, 0x00, 0x11, 0x48, 0x17, 0xf8, 0x45,
+       0x07, 0x3f, 0x70, 0x00, 0x00, 0x11, 0x10, 0x03,
+       0xf0, 0x74, 0x06, 0x9f, 0x80, 0x01, 0x70, 0x00,
+       0x00, 0x16, 0x10, 0x02, 0xf0, 0x74, 0x06, 0x7b,
+       0x6d, 0x91, 0x6d, 0x96, 0x6c, 0xef, 0xff, 0xff,
+       0x07, 0x2f, 0xee, 0x04, 0x8a, 0x17, 0x8a, 0x16,
+       0x8a, 0x11, 0xfc, 0x00, 0x4a, 0x11, 0xee, 0xfe,
+       0x10, 0xf8, 0x2a, 0xe8, 0x08, 0xf8, 0x2a, 0xe9,
+       0xf8, 0x45, 0x07, 0x64, 0x76, 0x00, 0x00, 0x01,
+       0x62, 0xf8, 0x2a, 0xe9, 0x00, 0x5e, 0xf2, 0x74,
+       0x12, 0x0b, 0xf0, 0x00, 0x30, 0x40, 0x72, 0x11,
+       0x2a, 0xe9, 0x77, 0x10, 0x00, 0x0f, 0xf5, 0xa9,
+       0xf8, 0x20, 0x07, 0x61, 0x6b, 0xf8, 0x2a, 0xe9,
+       0x00, 0x01, 0xf0, 0x73, 0x07, 0x64, 0x76, 0xf8,
+       0x2a, 0xe9, 0x00, 0x00, 0xee, 0x02, 0x8a, 0x11,
+       0xfc, 0x00, 0x4a, 0x11, 0x88, 0x11, 0xe8, 0x00,
+       0x75, 0xf8, 0x00, 0x08, 0x00, 0x08, 0xe8, 0x00,
+       0x75, 0xf8, 0x00, 0x08, 0x00, 0x09, 0xf6, 0xb8,
+       0xf4, 0x95, 0xf0, 0x20, 0xfc, 0x3f, 0x75, 0xf8,
+       0x00, 0x08, 0x00, 0x0d, 0xf0, 0x20, 0x0c, 0x30,
+       0x75, 0xf8, 0x00, 0x08, 0x00, 0x0c, 0x76, 0xf8,
+       0x2a, 0xe8, 0x00, 0x00, 0x76, 0xf8, 0x2a, 0xe9,
+       0x00, 0x00, 0x6c, 0x81, 0x07, 0x92, 0x76, 0xf8,
+       0x2a, 0xea, 0x00, 0x00, 0xfb, 0x80, 0x16, 0x76,
+       0xf4, 0x95, 0xe8, 0x10, 0xe8, 0x00, 0x75, 0xf8,
+       0x00, 0x08, 0x00, 0x00, 0xf0, 0x73, 0x07, 0xa8,
+       0x76, 0xf8, 0x2a, 0xea, 0x00, 0x01, 0xfb, 0x80,
+       0x16, 0x66, 0xf4, 0x95, 0xe8, 0x10, 0xfb, 0x80,
+       0x16, 0x87, 0xf4, 0x95, 0xe8, 0x10, 0xe8, 0x00,
+       0x75, 0xf8, 0x00, 0x08, 0x00, 0x00, 0xf6, 0xb8,
+       0xf4, 0x95, 0xf0, 0x20, 0xff, 0xff, 0x75, 0xf8,
+       0x00, 0x08, 0x00, 0x00, 0x8a, 0x11, 0xfc, 0x00,
+       0xf4, 0x95, 0x4a, 0x08, 0x4a, 0x09, 0x4a, 0x0a,
+       0x4a, 0x06, 0x4a, 0x07, 0x4a, 0x1d, 0x68, 0xf8,
+       0x00, 0x07, 0x7d, 0x3f, 0x69, 0xf8, 0x00, 0x07,
+       0x40, 0x00, 0x68, 0xf8, 0x00, 0x1d, 0xff, 0xfc,
+       0x10, 0xf8, 0x2a, 0xea, 0xf8, 0x45, 0x07, 0xe1,
+       0x10, 0xf8, 0x2a, 0xe8, 0xf0, 0x00, 0x00, 0x01,
+       0xf0, 0x30, 0x00, 0x0f, 0x80, 0xf8, 0x2a, 0xe8,
+       0x10, 0xf8, 0x2a, 0xe8, 0xf8, 0x44, 0x07, 0xd6,
+       0xf6, 0xb8, 0xf4, 0x95, 0xf0, 0x20, 0xfc, 0x3f,
+       0x75, 0xf8, 0x00, 0x08, 0x00, 0x0d, 0xf0, 0x20,
+       0x0c, 0x30, 0x75, 0xf8, 0x00, 0x08, 0x00, 0x0c,
+       0xe8, 0x00, 0x75, 0xf8, 0x00, 0x08, 0x00, 0x00,
+       0xf6, 0xb8, 0xf4, 0x95, 0xf0, 0x20, 0xff, 0xff,
+       0x75, 0xf8, 0x00, 0x08, 0x00, 0x00, 0x8a, 0x1d,
+       0x8a, 0x07, 0x8a, 0x06, 0x8a, 0x0a, 0x8a, 0x09,
+       0x8a, 0x08, 0xf4, 0xeb, 0xee, 0xff, 0xf2, 0x74,
+       0x07, 0x67, 0xf4, 0x95, 0xe8, 0x01, 0xee, 0x01,
+       0xfc, 0x00, 0x4a, 0x07, 0x4a, 0x1d, 0x68, 0xf8,
+       0x00, 0x07, 0x7d, 0x3f, 0x69, 0xf8, 0x00, 0x07,
+       0x40, 0x00, 0x68, 0xf8, 0x00, 0x1d, 0xff, 0xfc,
+       0x8a, 0x1d, 0x8a, 0x07, 0xf4, 0xeb, 0x4a, 0x11,
+       0x77, 0x11, 0x00, 0x28, 0x76, 0x81, 0x24, 0x00,
+       0xe8, 0x00, 0x75, 0xf8, 0x00, 0x08, 0x00, 0x01,
+       0xf2, 0x74, 0x07, 0x67, 0xf4, 0x95, 0xe8, 0x00,
+       0x77, 0x11, 0x00, 0x1d, 0x68, 0x81, 0x00, 0x7f,
+       0xf6, 0xb8, 0xf4, 0x95, 0xf0, 0x20, 0xff, 0x80,
+       0x77, 0x11, 0x00, 0x1d, 0xf0, 0x30, 0x01, 0x00,
+       0x1a, 0x81, 0x80, 0x81, 0xf0, 0x74, 0x0a, 0x33,
+       0xf0, 0x74, 0x11, 0xac, 0xf9, 0x80, 0x13, 0x25,
+       0xf9, 0x80, 0x16, 0x53, 0xf9, 0x80, 0x17, 0x82,
+       0xf0, 0x74, 0x06, 0x2f, 0xf9, 0x80, 0x14, 0xb2,
+       0xf9, 0x80, 0x19, 0x10, 0xf0, 0x74, 0x0d, 0xe3,
+       0xf0, 0x74, 0x07, 0xe8, 0xf0, 0x74, 0x02, 0x36,
+       0x8a, 0x11, 0xfc, 0x00, 0x4a, 0x11, 0x60, 0xf8,
+       0x27, 0x7b, 0xff, 0xff, 0xf8, 0x30, 0x08, 0x39,
+       0x71, 0xf8, 0x27, 0x7b, 0x27, 0x79, 0x60, 0xf8,
+       0x27, 0x79, 0xff, 0xff, 0xf8, 0x30, 0x08, 0xb2,
+       0x10, 0xf8, 0x29, 0x86, 0x08, 0xf8, 0x27, 0x79,
+       0xf0, 0x30, 0x7f, 0xff, 0x88, 0x11, 0xf4, 0x95,
+       0x77, 0x10, 0x40, 0x00, 0xf6, 0xa9, 0xf8, 0x30,
+       0x08, 0x58, 0x10, 0xf8, 0x27, 0x79, 0x08, 0xf8,
+       0x27, 0x7a, 0xf0, 0x30, 0x7f, 0xff, 0x88, 0x11,
+       0xf4, 0x95, 0x77, 0x10, 0x40, 0x00, 0xf6, 0xa9,
+       0xf8, 0x20, 0x08, 0x63, 0x76, 0xf8, 0x27, 0x79,
+       0xff, 0xff, 0x76, 0xf8, 0x27, 0x7b, 0xff, 0xff,
+       0xf7, 0xb8, 0xf2, 0x73, 0x08, 0xd9, 0xf0, 0x20,
+       0xff, 0xff, 0xf6, 0xb8, 0x56, 0xf8, 0x27, 0x74,
+       0xf0, 0xf9, 0x88, 0x11, 0x56, 0xf8, 0x27, 0x72,
+       0xf0, 0xf9, 0x88, 0x12, 0xf4, 0x95, 0xf4, 0x95,
+       0xe7, 0x20, 0xf4, 0xa9, 0xf8, 0x30, 0x08, 0x8f,
+       0xf1, 0x20, 0x27, 0x7c, 0x48, 0x11, 0xf6, 0x00,
+       0x88, 0x13, 0xf4, 0x95, 0xf4, 0x95, 0x10, 0x83,
+       0x08, 0xf8, 0x27, 0x79, 0xf0, 0x30, 0x7f, 0xff,
+       0x88, 0x13, 0xf4, 0x95, 0x77, 0x10, 0x40, 0x00,
+       0xf5, 0xab, 0xf8, 0x30, 0x08, 0x8f, 0x6d, 0x91,
+       0x48, 0x11, 0xf0, 0x30, 0x01, 0xff, 0x88, 0x11,
+       0xf4, 0x95, 0xe7, 0x20, 0xf7, 0xa9, 0xf8, 0x30,
+       0x08, 0x74, 0x6d, 0x89, 0x48, 0x11, 0xf0, 0x30,
+       0x01, 0xff, 0xf0, 0xe7, 0xf4, 0x95, 0x48, 0x08,
+       0x4e, 0xf8, 0x27, 0x74, 0x48, 0x08, 0xf1, 0xf9,
+       0x89, 0x11, 0xf4, 0x95, 0xf4, 0x95, 0x71, 0xe1,
+       0x27, 0x7c, 0x27, 0x7a, 0x60, 0xf8, 0x27, 0x7b,
+       0xff, 0xff, 0xf8, 0x30, 0x08, 0xab, 0x48, 0x08,
+       0x4e, 0xf8, 0x27, 0x72, 0x76, 0xf8, 0x27, 0x7b,
+       0xff, 0xff, 0x76, 0xf8, 0x27, 0x79, 0xff, 0xff,
+       0xf2, 0x73, 0x08, 0xd9, 0xf4, 0x95, 0xe8, 0x00,
+       0x44, 0xf8, 0x27, 0x73, 0x40, 0xf8, 0x27, 0x75,
+       0x82, 0xf8, 0x00, 0x11, 0xf4, 0x95, 0x77, 0x10,
+       0x80, 0x00, 0xf6, 0xa9, 0xf8, 0x20, 0x08, 0xd8,
+       0xf6, 0xb8, 0x10, 0xf8, 0x27, 0x73, 0xf0, 0x00,
+       0x80, 0x00, 0x48, 0x08, 0x4e, 0xf8, 0x27, 0x74,
+       0x48, 0x08, 0xf0, 0xf9, 0x88, 0x11, 0xf4, 0x95,
+       0xf4, 0x95, 0x71, 0xe1, 0x27, 0x7c, 0x27, 0x7a,
+       0xf7, 0xb8, 0x57, 0xf8, 0x27, 0x74, 0xf0, 0x62,
+       0xff, 0xff, 0xf0, 0x40, 0xff, 0x80, 0xf2, 0x80,
+       0x4e, 0xf8, 0x27, 0x74, 0xe8, 0x00, 0x8a, 0x11,
+       0xfc, 0x00, 0x4a, 0x11, 0x4a, 0x16, 0xee, 0xfb,
+       0x11, 0xf8, 0x27, 0x71, 0x09, 0xf8, 0x27, 0x73,
+       0x89, 0x11, 0x88, 0x10, 0xf4, 0x95, 0xf4, 0x95,
+       0xf6, 0xa9, 0xf8, 0x20, 0x08, 0xed, 0xf2, 0x73,
+       0x09, 0x0e, 0xf4, 0x95, 0xe8, 0x00, 0xf6, 0x20,
+       0x76, 0x00, 0x00, 0x41, 0xf0, 0x74, 0x12, 0xee,
+       0x88, 0x16, 0xf4, 0x95, 0xf7, 0xb8, 0x6d, 0x96,
+       0x10, 0xf8, 0x00, 0x16, 0xf8, 0x47, 0x09, 0x0a,
+       0xe7, 0x61, 0x76, 0x00, 0x00, 0x00, 0x76, 0x01,
+       0x00, 0x80, 0x76, 0x02, 0x00, 0xff, 0x76, 0x03,
+       0x00, 0x00, 0xf2, 0x74, 0x0c, 0xb9, 0xf4, 0x95,
+       0xe8, 0x00, 0x6c, 0xe9, 0xff, 0xff, 0x08, 0xfb,
+       0x73, 0x16, 0x00, 0x0e, 0xf0, 0x66, 0x00, 0x41,
+       0xee, 0x05, 0x8a, 0x16, 0x8a, 0x11, 0xfc, 0x00,
+       0x4a, 0x11, 0xf4, 0x95, 0x71, 0x02, 0x00, 0x13,
+       0xf6, 0xb8, 0x77, 0x11, 0x7f, 0xff, 0x57, 0xf8,
+       0x27, 0x72, 0x48, 0x11, 0xf2, 0x80, 0xf0, 0x00,
+       0x80, 0x00, 0x88, 0x11, 0xf6, 0x40, 0xf0, 0xe0,
+       0xf1, 0xf1, 0xe8, 0x01, 0xf2, 0x80, 0x80, 0xf8,
+       0x27, 0x78, 0x77, 0x12, 0x80, 0x00, 0x57, 0xf8,
+       0x27, 0x72, 0x48, 0x12, 0xf2, 0x80, 0x88, 0x12,
+       0xf4, 0x95, 0xf4, 0x95, 0x6c, 0x82, 0x09, 0x38,
+       0xe8, 0x00, 0x75, 0xf8, 0x00, 0x08, 0x00, 0x01,
+       0xf0, 0x73, 0x09, 0x3d, 0xf0, 0x20, 0x80, 0x01,
+       0x75, 0xf8, 0x00, 0x08, 0x00, 0x01, 0x70, 0x81,
+       0x00, 0x13, 0x8a, 0x11, 0xfc, 0x00, 0x4a, 0x11,
+       0xf0, 0x30, 0x7f, 0xff, 0x11, 0xf8, 0x29, 0x86,
+       0xf5, 0x20, 0xf3, 0x30, 0x7f, 0xff, 0x89, 0x11,
+       0xf4, 0x95, 0x77, 0x10, 0x40, 0x00, 0xf6, 0xa9,
+       0xf8, 0x20, 0x09, 0x54, 0xf2, 0x73, 0x09, 0x67,
+       0xf4, 0x95, 0xe8, 0x02, 0x6f, 0xf8, 0x27, 0x7a,
+       0x0d, 0x20, 0xf3, 0x30, 0x7f, 0xff, 0x89, 0x11,
+       0xf4, 0x95, 0x77, 0x10, 0x40, 0x00, 0xf6, 0xa9,
+       0xf8, 0x20, 0x09, 0x64, 0xf2, 0x73, 0x09, 0x67,
+       0xf4, 0x95, 0xe8, 0x01, 0x80, 0xf8, 0x27, 0x7b,
+       0xe8, 0x00, 0x8a, 0x11, 0xfc, 0x00, 0x4a, 0x11,
+       0x11, 0xf8, 0x29, 0x86, 0xf5, 0x20, 0xf3, 0x30,
+       0x7f, 0xff, 0x89, 0x11, 0xf4, 0x95, 0x77, 0x10,
+       0x40, 0x00, 0xf6, 0xa9, 0xf8, 0x20, 0x09, 0x7a,
+       0xf2, 0x73, 0x09, 0x8d, 0xf4, 0x95, 0xe8, 0x02,
+       0x6f, 0xf8, 0x27, 0x7a, 0x0d, 0x20, 0xf3, 0x30,
+       0x7f, 0xff, 0x89, 0x11, 0xf4, 0x95, 0x77, 0x10,
+       0x40, 0x00, 0xf6, 0xa9, 0xf8, 0x20, 0x09, 0x8a,
+       0xf2, 0x73, 0x09, 0x8d, 0xf4, 0x95, 0xe8, 0x01,
+       0x80, 0xf8, 0x27, 0x79, 0xe8, 0x00, 0x8a, 0x11,
+       0xfc, 0x00, 0x4a, 0x11, 0xf4, 0x95, 0x71, 0x02,
+       0x00, 0x12, 0x88, 0x11, 0xf6, 0xb8, 0x57, 0xf8,
+       0x27, 0x72, 0xf0, 0x20, 0x7f, 0xff, 0xf2, 0x80,
+       0xf0, 0x00, 0x80, 0x00, 0x80, 0x81, 0x57, 0xf8,
+       0x27, 0x72, 0xe8, 0x01, 0xf3, 0xf1, 0xf2, 0x80,
+       0x80, 0xf8, 0x27, 0x78, 0x77, 0x11, 0x80, 0x00,
+       0x48, 0x11, 0x57, 0xf8, 0x27, 0x72, 0xf2, 0x80,
+       0x88, 0x11, 0xf4, 0x95, 0xf4, 0x95, 0x6c, 0x81,
+       0x09, 0xb5, 0xe8, 0x00, 0x75, 0xf8, 0x00, 0x08,
+       0x00, 0x01, 0xf0, 0x73, 0x09, 0xba, 0xf0, 0x20,
+       0x80, 0x01, 0x75, 0xf8, 0x00, 0x08, 0x00, 0x01,
+       0x45, 0xf8, 0x27, 0x71, 0x43, 0xf8, 0x27, 0x73,
+       0x83, 0xf8, 0x00, 0x11, 0xf4, 0x95, 0xe7, 0x20,
+       0xf6, 0xa9, 0xf8, 0x30, 0x09, 0xc9, 0xf2, 0x73,
+       0x09, 0xe4, 0x77, 0x12, 0x00, 0x00, 0x57, 0xf8,
+       0x27, 0x72, 0xf0, 0x20, 0x7f, 0xff, 0xf2, 0x80,
+       0x49, 0x12, 0xf5, 0x00, 0xf3, 0x00, 0x80, 0x00,
+       0x61, 0xf8, 0x00, 0x0b, 0x80, 0x00, 0xf8, 0x30,
+       0x09, 0xdc, 0xf1, 0x20, 0x80, 0x00, 0xf5, 0x20,
+       0x89, 0x12, 0xf4, 0x95, 0x48, 0x12, 0x6f, 0xf8,
+       0x27, 0x73, 0x0d, 0x00, 0xf4, 0x95, 0x49, 0x0b,
+       0x4f, 0xf8, 0x27, 0x72, 0x8a, 0x11, 0xfe, 0x00,
+       0x48, 0x12, 0xf4, 0x95, 0x4a, 0x11, 0x4a, 0x16,
+       0x4a, 0x17, 0xee, 0xfc, 0xf4, 0x95, 0x71, 0x08,
+       0x00, 0x16, 0x88, 0x17, 0xf0, 0x74, 0x08, 0x30,
+       0x48, 0x18, 0x70, 0x00, 0x00, 0x16, 0xf2, 0x74,
+       0x09, 0x8f, 0xf0, 0x00, 0x00, 0x02, 0x88, 0x11,
+       0xf4, 0x95, 0xf4, 0x95, 0x6c, 0x81, 0x0a, 0x0a,
+       0xf2, 0x74, 0x08, 0xdb, 0xf4, 0x95, 0x48, 0x16,
+       0x48, 0x18, 0x70, 0x00, 0x00, 0x16, 0xf2, 0x74,
+       0x09, 0x8f, 0xf0, 0x00, 0x00, 0x02, 0x88, 0x11,
+       0x10, 0x02, 0x70, 0x01, 0x00, 0x11, 0x80, 0x00,
+       0xf2, 0x74, 0x06, 0xce, 0xf4, 0x95, 0x48, 0x17,
+       0x49, 0x11, 0x48, 0x17, 0xf6, 0x00, 0x88, 0x17,
+       0xe7, 0x60, 0xf5, 0xa9, 0xf8, 0x20, 0x0a, 0x2d,
+       0x48, 0x16, 0xf6, 0x20, 0x88, 0x11, 0x48, 0x18,
+       0x70, 0x00, 0x00, 0x11, 0xf2, 0x74, 0x09, 0x8f,
+       0xf0, 0x00, 0x00, 0x02, 0x88, 0x11, 0x70, 0x01,
+       0x00, 0x11, 0x10, 0x02, 0x80, 0x00, 0xf2, 0x74,
+       0x06, 0xce, 0xf4, 0x95, 0x48, 0x17, 0xee, 0x04,
+       0x48, 0x16, 0x8a, 0x17, 0x8a, 0x16, 0x8a, 0x11,
+       0xfc, 0x00, 0xee, 0xfd, 0xe8, 0x00, 0x4e, 0xf8,
+       0x27, 0x70, 0xe8, 0x00, 0x4e, 0xf8, 0x27, 0x72,
+       0xe8, 0x00, 0x4e, 0xf8, 0x27, 0x74, 0xe8, 0x00,
+       0x4e, 0xf8, 0x27, 0x76, 0x76, 0xf8, 0x27, 0x79,
+       0xff, 0xff, 0x76, 0xf8, 0x27, 0x7a, 0x00, 0x00,
+       0x76, 0xf8, 0x27, 0x7b, 0xff, 0xff, 0x76, 0xf8,
+       0x27, 0x78, 0x00, 0x00, 0xe8, 0x00, 0x75, 0xf8,
+       0x00, 0x08, 0x00, 0x01, 0x76, 0x00, 0x00, 0x00,
+       0x76, 0x01, 0x02, 0x00, 0xf2, 0x74, 0x12, 0xdc,
+       0xf0, 0x20, 0x27, 0x7c, 0xee, 0x03, 0xfc, 0x00,
+       0x4a, 0x11, 0xee, 0xfc, 0xf4, 0x95, 0x4e, 0x00,
+       0x77, 0x12, 0x7f, 0xff, 0xf6, 0xb8, 0x49, 0x12,
+       0xf1, 0x80, 0xf3, 0x00, 0x80, 0x00, 0x89, 0x12,
+       0xf0, 0xe0, 0xf1, 0xf1, 0x4f, 0x02, 0xe9, 0x01,
+       0xf4, 0x95, 0x48, 0x0b, 0xf5, 0x40, 0x56, 0x02,
+       0xf1, 0x80, 0x81, 0xf8, 0x27, 0x78, 0x77, 0x11,
+       0x80, 0x00, 0x56, 0x00, 0x49, 0x11, 0xf1, 0x80,
+       0x89, 0x11, 0xf4, 0x95, 0xf4, 0x95, 0x6c, 0x81,
+       0x0a, 0x81, 0xe8, 0x00, 0x75, 0xf8, 0x00, 0x08,
+       0x00, 0x01, 0xf0, 0x73, 0x0a, 0x86, 0xf0, 0x20,
+       0x80, 0x01, 0x75, 0xf8, 0x00, 0x08, 0x00, 0x01,
+       0x10, 0x82, 0xee, 0x04, 0x8a, 0x11, 0xfc, 0x00,
+       0x4a, 0x11, 0xee, 0xfe, 0xf4, 0x95, 0x4e, 0x00,
+       0x77, 0x11, 0x7f, 0xff, 0xf6, 0xb8, 0x49, 0x11,
+       0xf1, 0x80, 0xf3, 0x00, 0x80, 0x00, 0x89, 0x11,
+       0xf0, 0xe0, 0xf1, 0xf1, 0xe8, 0x01, 0xf2, 0x80,
+       0x80, 0xf8, 0x27, 0x78, 0x56, 0x00, 0xf1, 0x20,
+       0x80, 0x00, 0xf1, 0x80, 0xf4, 0x95, 0x49, 0x0b,
+       0xf8, 0x4d, 0x0a, 0xab, 0xf0, 0x20, 0x80, 0x01,
+       0x75, 0xf8, 0x00, 0x08, 0x00, 0x01, 0xf0, 0x73,
+       0x0a, 0xaf, 0xe8, 0x00, 0x75, 0xf8, 0x00, 0x08,
+       0x00, 0x01, 0xee, 0x02, 0x48, 0x11, 0x8a, 0x11,
+       0xfc, 0x00, 0x4a, 0x11, 0x88, 0x12, 0x13, 0x02,
+       0x77, 0x11, 0x00, 0x00, 0xf8, 0x4d, 0x0a, 0xcb,
+       0xf3, 0x10, 0x00, 0x01, 0x89, 0x1a, 0xf4, 0x95,
+       0xf0, 0x72, 0x0a, 0xca, 0x48, 0x11, 0x1c, 0xf8,
+       0x29, 0x7e, 0x88, 0x11, 0x11, 0xf8, 0x29, 0x7e,
+       0xf2, 0x00, 0x00, 0x01, 0x80, 0xf8, 0x29, 0x7e,
+       0x81, 0x92, 0x48, 0x11, 0x8a, 0x11, 0xfc, 0x00,
+       0x4a, 0x11, 0xf4, 0x95, 0x71, 0x02, 0x00, 0x11,
+       0x88, 0x12, 0xf6, 0xb8, 0xf0, 0x20, 0x7f, 0xff,
+       0x57, 0xf8, 0x27, 0x70, 0xf2, 0x80, 0xf0, 0x00,
+       0x80, 0x00, 0x80, 0x82, 0x57, 0xf8, 0x27, 0x70,
+       0xe8, 0x01, 0xf3, 0xf1, 0xf2, 0x80, 0x80, 0xf8,
+       0x27, 0x78, 0x77, 0x12, 0x80, 0x00, 0x48, 0x12,
+       0x57, 0xf8, 0x27, 0x70, 0xf2, 0x80, 0x88, 0x12,
+       0xf4, 0x95, 0xf4, 0x95, 0x6c, 0x82, 0x0a, 0xf4,
+       0xe8, 0x00, 0x75, 0xf8, 0x00, 0x08, 0x00, 0x01,
+       0xf0, 0x73, 0x0a, 0xf9, 0xf0, 0x20, 0x80, 0x01,
+       0x75, 0xf8, 0x00, 0x08, 0x00, 0x01, 0x45, 0xf8,
+       0x27, 0x75, 0xe7, 0x10, 0x43, 0xf8, 0x27, 0x71,
+       0x83, 0xf8, 0x00, 0x12, 0x6d, 0xe8, 0x00, 0x04,
+       0x6d, 0x8a, 0xf6, 0xaa, 0xf8, 0x30, 0x0b, 0x0a,
+       0xf2, 0x73, 0x0b, 0x25, 0x77, 0x11, 0x00, 0x00,
+       0x57, 0xf8, 0x27, 0x70, 0xf0, 0x20, 0x7f, 0xff,
+       0xf2, 0x80, 0x49, 0x11, 0xf5, 0x00, 0xf3, 0x00,
+       0x80, 0x00, 0x61, 0xf8, 0x00, 0x0b, 0x80, 0x00,
+       0xf8, 0x30, 0x0b, 0x1d, 0xf1, 0x20, 0x80, 0x00,
+       0xf5, 0x20, 0x89, 0x11, 0xf4, 0x95, 0x48, 0x11,
+       0x6f, 0xf8, 0x27, 0x71, 0x0d, 0x00, 0xf4, 0x95,
+       0x49, 0x0b, 0x4f, 0xf8, 0x27, 0x70, 0x48, 0x11,
+       0x8a, 0x11, 0xfc, 0x00, 0x4a, 0x11, 0x4a, 0x16,
+       0x4a, 0x17, 0xee, 0xf0, 0x88, 0x17, 0x10, 0x17,
+       0x80, 0x05, 0x10, 0x16, 0x80, 0x06, 0x10, 0x15,
+       0x80, 0x07, 0x71, 0x14, 0x00, 0x11, 0x10, 0x05,
+       0xf0, 0x30, 0x00, 0x01, 0x88, 0x10, 0x10, 0x06,
+       0xf0, 0x30, 0x00, 0x01, 0x80, 0x08, 0x49, 0x11,
+       0x10, 0x05, 0xf6, 0x01, 0x80, 0x09, 0x10, 0x06,
+       0x61, 0xf8, 0x00, 0x08, 0x00, 0x01, 0xf8, 0x20,
+       0x0b, 0x4b, 0x10, 0x09, 0xf0, 0x00, 0x00, 0x01,
+       0x80, 0x09, 0x71, 0x08, 0x00, 0x12, 0xf4, 0xaa,
+       0xf8, 0x30, 0x0b, 0x54, 0x10, 0x09, 0xf0, 0x00,
+       0x00, 0x01, 0x80, 0x09, 0x12, 0x09, 0x49, 0x11,
+       0xf4, 0x7f, 0x80, 0x09, 0xf6, 0x20, 0x80, 0x0a,
+       0x56, 0xf8, 0x27, 0x70, 0x4e, 0x0c, 0x10, 0x09,
+       0x80, 0x00, 0x48, 0x18, 0xf2, 0x74, 0x0a, 0xce,
+       0xf0, 0x00, 0x00, 0x04, 0x88, 0x16, 0xf4, 0x95,
+       0xf4, 0x95, 0x6c, 0x86, 0x0b, 0x6d, 0xf2, 0x73,
+       0x0c, 0x59, 0xf4, 0x95, 0xe8, 0x00, 0xf6, 0xb8,
+       0xf4, 0x95, 0x56, 0x0c, 0xf0, 0xf9, 0x88, 0x12,
+       0xf4, 0x95, 0xf4, 0x95, 0x70, 0xe2, 0x27, 0x7c,
+       0x29, 0x86, 0xe8, 0x00, 0x80, 0x0e, 0x48, 0x11,
+       0xf8, 0x45, 0x0b, 0xcc, 0x77, 0x10, 0x00, 0x01,
+       0xf4, 0xa9, 0xf8, 0x30, 0x0b, 0x89, 0x6c, 0xe1,
+       0xff, 0xfd, 0x0b, 0x8b, 0x10, 0xe7, 0x00, 0x02,
+       0x80, 0x0e, 0xf0, 0x73, 0x0b, 0x8b, 0x10, 0x87,
+       0x80, 0x0e, 0xe7, 0x10, 0xf5, 0xae, 0xf8, 0x20,
+       0x0b, 0xb2, 0x70, 0x00, 0x00, 0x17, 0x70, 0x01,
+       0x00, 0x16, 0x10, 0x04, 0xf0, 0x74, 0x06, 0xce,
+       0x48, 0x17, 0x49, 0x16, 0xf6, 0x00, 0x88, 0x17,
+       0x48, 0x11, 0xf6, 0x20, 0x88, 0x11, 0x10, 0x09,
+       0xf6, 0x20, 0x80, 0x00, 0x48, 0x18, 0xf2, 0x74,
+       0x0a, 0xce, 0xf0, 0x00, 0x00, 0x04, 0x88, 0x16,
+       0x10, 0x04, 0x70, 0x00, 0x00, 0x17, 0x70, 0x01,
+       0x00, 0x11, 0xf0, 0x74, 0x06, 0xce, 0x48, 0x11,
+       0x00, 0x04, 0x80, 0x04, 0xf0, 0x73, 0x0b, 0xbc,
+       0x70, 0x00, 0x00, 0x17, 0x70, 0x01, 0x00, 0x11,
+       0x10, 0x04, 0xf0, 0x74, 0x06, 0xce, 0x48, 0x11,
+       0x00, 0x04, 0x80, 0x04, 0x49, 0x11, 0x48, 0x16,
+       0xf6, 0x20, 0x88, 0x16, 0xf4, 0x95, 0xf4, 0x95,
+       0x6c, 0x86, 0x0b, 0xcc, 0x10, 0x0a, 0x80, 0x00,
+       0x48, 0x18, 0xf2, 0x74, 0x0a, 0xce, 0xf0, 0x00,
+       0x00, 0x04, 0x88, 0x16, 0x12, 0x0a, 0xf8, 0x45,
+       0x0c, 0x33, 0x71, 0x0a, 0x00, 0x10, 0xf4, 0xae,
+       0xf8, 0x30, 0x0c, 0x1c, 0x48, 0x16, 0xf0, 0xe1,
+       0x88, 0x11, 0x12, 0x08, 0xf8, 0x45, 0x0b, 0xdb,
+       0x6d, 0x89, 0x12, 0x07, 0xf8, 0x45, 0x0b, 0xe9,
+       0x10, 0x07, 0x80, 0x00, 0x70, 0x02, 0x00, 0x11,
+       0x10, 0x06, 0x80, 0x01, 0x10, 0x04, 0xf0, 0x74,
+       0x06, 0xdc, 0xf0, 0x73, 0x0b, 0xef, 0x48, 0x11,
+       0x6f, 0x00, 0x0c, 0x9f, 0x10, 0x04, 0xf0, 0x74,
+       0x0a, 0xb3, 0x11, 0x0e, 0xf1, 0xc0, 0x81, 0x0e,
+       0x10, 0x06, 0x49, 0x11, 0xf6, 0x00, 0x80, 0x06,
+       0x10, 0x05, 0xf6, 0x20, 0x88, 0x11, 0xf0, 0x00,
+       0x00, 0x01, 0x48, 0x08, 0x6f, 0x00, 0x0c, 0x9f,
+       0x48, 0x18, 0xf2, 0x74, 0x0a, 0xce, 0xf0, 0x00,
+       0x00, 0x04, 0x12, 0x07, 0xf8, 0x45, 0x0c, 0x11,
+       0x10, 0x07, 0x80, 0x00, 0x70, 0x02, 0x00, 0x11,
+       0x10, 0x06, 0x80, 0x01, 0x10, 0x04, 0xf0, 0x74,
+       0x06, 0xdc, 0xf0, 0x73, 0x0c, 0x17, 0x48, 0x11,
+       0x6f, 0x00, 0x0c, 0x9f, 0x10, 0x04, 0xf0, 0x74,
+       0x0a, 0xb3, 0x11, 0x0e, 0xf1, 0xc0, 0x81, 0x0e,
+       0xf0, 0x73, 0x0c, 0x33, 0x12, 0x07, 0xf8, 0x45,
+       0x0c, 0x2a, 0x10, 0x07, 0x80, 0x00, 0x10, 0x06,
+       0x80, 0x01, 0x10, 0x05, 0x80, 0x02, 0x10, 0x04,
+       0xf0, 0x74, 0x06, 0xdc, 0xf0, 0x73, 0x0c, 0x30,
+       0x12, 0x05, 0x6f, 0x00, 0x0c, 0x9f, 0x10, 0x04,
+       0xf0, 0x74, 0x0a, 0xb3, 0x11, 0x0e, 0xf1, 0xc0,
+       0x81, 0x0e, 0x76, 0x00, 0x00, 0x01, 0x48, 0x18,
+       0xf2, 0x74, 0x0a, 0xce, 0xf0, 0x00, 0x00, 0x04,
+       0x71, 0x04, 0x00, 0x11, 0x70, 0x81, 0x29, 0x86,
+       0x10, 0x0e, 0x1c, 0xf8, 0x29, 0x86, 0x80, 0x0e,
+       0x76, 0x00, 0x00, 0x01, 0x48, 0x18, 0xf2, 0x74,
+       0x0a, 0xce, 0xf0, 0x00, 0x00, 0x04, 0x10, 0x0e,
+       0x71, 0x04, 0x00, 0x11, 0x80, 0x81, 0x10, 0xf8,
+       0x29, 0x86, 0xf0, 0x00, 0x00, 0x01, 0xf0, 0x30,
+       0x7f, 0xff, 0x80, 0xf8, 0x29, 0x86, 0x10, 0x09,
+       0xf0, 0x00, 0x00, 0x02, 0x80, 0x09, 0xee, 0x10,
+       0x8a, 0x17, 0x8a, 0x16, 0x8a, 0x11, 0xfc, 0x00,
+       0x10, 0xf8, 0x27, 0x75, 0x08, 0xf8, 0x27, 0x71,
+       0xf0, 0x10, 0x00, 0x01, 0x48, 0x08, 0xfc, 0x00,
+       0x4a, 0x11, 0x4a, 0x16, 0xee, 0xff, 0xf4, 0x95,
+       0x71, 0x04, 0x00, 0x16, 0xf0, 0x00, 0x00, 0x01,
+       0x48, 0x08, 0x4e, 0xf8, 0x29, 0x7c, 0x6d, 0xee,
+       0xff, 0xfd, 0x48, 0x16, 0xf8, 0x45, 0x0c, 0x99,
+       0x56, 0xf8, 0x29, 0x7c, 0xf0, 0x74, 0x0a, 0x5a,
+       0x88, 0x11, 0x10, 0xf8, 0x29, 0x7d, 0xf0, 0x00,
+       0x00, 0x01, 0x48, 0x08, 0x4e, 0xf8, 0x29, 0x7c,
+       0x10, 0xf8, 0x29, 0x82, 0xf0, 0x00, 0x00, 0x01,
+       0x88, 0x10, 0xf4, 0x95, 0xf4, 0x95, 0xf4, 0xa9,
+       0xfa, 0x30, 0x0c, 0x96, 0x80, 0xf8, 0x29, 0x82,
+       0x56, 0xf8, 0x29, 0x80, 0xf0, 0x00, 0x00, 0x01,
+       0x4e, 0xf8, 0x29, 0x80, 0x73, 0x11, 0x29, 0x82,
+       0x6c, 0xee, 0xff, 0xff, 0x0c, 0x76, 0xee, 0x01,
+       0x8a, 0x16, 0x8a, 0x11, 0xfc, 0x00, 0x4a, 0x11,
+       0x76, 0xf8, 0x29, 0x84, 0x00, 0x00, 0x76, 0xf8,
+       0x29, 0x85, 0x00, 0x01, 0xe8, 0x00, 0x4e, 0xf8,
+       0x2a, 0x0c, 0x76, 0xf8, 0x29, 0x86, 0x00, 0x00,
+       0x76, 0xf8, 0x29, 0x87, 0x00, 0x00, 0x77, 0x11,
+       0x29, 0x88, 0x76, 0x81, 0xaa, 0xaa, 0x76, 0xe1,
+       0x00, 0x01, 0xaa, 0xaa, 0x76, 0xe1, 0x00, 0x02,
+       0x00, 0x00, 0x8a, 0x11, 0xfc, 0x00, 0x4a, 0x11,
+       0xee, 0xfc, 0xf4, 0x95, 0x71, 0x06, 0x00, 0x14,
+       0x71, 0x07, 0x00, 0x13, 0x71, 0x08, 0x00, 0x12,
+       0x71, 0x09, 0x00, 0x15, 0x77, 0x10, 0x00, 0xff,
+       0xf4, 0xaa, 0xf8, 0x30, 0x0d, 0x44, 0x49, 0x13,
+       0x53, 0xf8, 0x2a, 0x0c, 0x4f, 0xf8, 0x2a, 0x0c,
+       0x73, 0x12, 0x00, 0x0e, 0xf1, 0x66, 0x00, 0x0d,
+       0x89, 0x11, 0xf4, 0x95, 0x77, 0x10, 0x00, 0x01,
+       0x71, 0xe1, 0x24, 0x00, 0x00, 0x11, 0xf4, 0xa9,
+       0xf8, 0x30, 0x0d, 0x17, 0x77, 0x10, 0x00, 0x02,
+       0xf4, 0xa9, 0xf8, 0x30, 0x0c, 0xec, 0x77, 0x11,
+       0x29, 0x8a, 0x76, 0x81, 0x00, 0x00, 0xe8, 0x00,
+       0x77, 0x14, 0x00, 0x00, 0x77, 0x13, 0x00, 0x00,
+       0xf0, 0x73, 0x0d, 0x48, 0x6c, 0x83, 0x0c, 0xfa,
+       0x77, 0x11, 0x29, 0x8a, 0x48, 0x12, 0xf0, 0xe8,
+       0xf0, 0x40, 0x80, 0x00, 0x80, 0x81, 0xe8, 0x00,
+       0x77, 0x14, 0x00, 0x00, 0xf0, 0x73, 0x0d, 0x48,
+       0x49, 0x13, 0xf3, 0x40, 0x80, 0x00, 0x81, 0xf8,
+       0x29, 0x8a, 0x61, 0xf8, 0x00, 0x15, 0x00, 0x01,
+       0xf8, 0x20, 0x0d, 0x07, 0x69, 0xf8, 0x29, 0x8a,
+       0x40, 0x00, 0x61, 0xf8, 0x00, 0x14, 0x00, 0x01,
+       0xf8, 0x20, 0x0d, 0x0f, 0x69, 0xf8, 0x29, 0x8a,
+       0x20, 0x00, 0x77, 0x11, 0x29, 0x8a, 0x49, 0x12,
+       0xf3, 0xe8, 0x1b, 0x81, 0x81, 0x81, 0xf0, 0x73,
+       0x0d, 0x48, 0x11, 0xf8, 0x29, 0x84, 0xf8, 0x4c,
+       0x0d, 0x37, 0x77, 0x11, 0x29, 0x88, 0x76, 0x81,
+       0xaa, 0xaa, 0x11, 0xf8, 0x29, 0x85, 0xf3, 0x10,
+       0x00, 0x01, 0xf3, 0x40, 0xaa, 0x00, 0x81, 0xe1,
+       0x00, 0x01, 0x76, 0x00, 0x00, 0x02, 0x80, 0x01,
+       0x70, 0x02, 0x00, 0x14, 0x70, 0x03, 0x00, 0x13,
+       0xf2, 0x74, 0x0b, 0x28, 0xf4, 0x95, 0x48, 0x11,
+       0x71, 0xf8, 0x29, 0x85, 0x29, 0x84, 0xf0, 0x73,
+       0x0d, 0x73, 0x76, 0x00, 0x00, 0x00, 0x80, 0x01,
+       0x76, 0x02, 0x00, 0x00, 0x70, 0x03, 0x00, 0x13,
+       0xf2, 0x74, 0x0b, 0x28, 0xf4, 0x95, 0xe8, 0x00,
+       0xf0, 0x73, 0x0d, 0x73, 0x77, 0x11, 0x29, 0x8a,
+       0x70, 0x81, 0x00, 0x13, 0x11, 0xf8, 0x29, 0x84,
+       0xf8, 0x4c, 0x0d, 0x68, 0x77, 0x11, 0x29, 0x88,
+       0x76, 0x81, 0xaa, 0xaa, 0x11, 0xf8, 0x29, 0x85,
+       0xf3, 0x10, 0x00, 0x01, 0xf3, 0x40, 0xaa, 0x00,
+       0x81, 0xe1, 0x00, 0x01, 0x76, 0x00, 0x00, 0x03,
+       0x80, 0x01, 0x70, 0x02, 0x00, 0x14, 0x70, 0x03,
+       0x00, 0x13, 0xf2, 0x74, 0x0b, 0x28, 0xf4, 0x95,
+       0x48, 0x11, 0x71, 0xf8, 0x29, 0x85, 0x29, 0x84,
+       0xf0, 0x73, 0x0d, 0x73, 0x76, 0x00, 0x00, 0x01,
+       0x80, 0x01, 0x70, 0x02, 0x00, 0x14, 0x70, 0x03,
+       0x00, 0x13, 0xf2, 0x74, 0x0b, 0x28, 0xf4, 0x95,
+       0x48, 0x11, 0x6b, 0xf8, 0x29, 0x84, 0xff, 0xff,
+       0xee, 0x04, 0x8a, 0x11, 0xfc, 0x00, 0x4a, 0x11,
+       0xf5, 0x40, 0xf4, 0x95, 0x48, 0x0b, 0xf4, 0x78,
+       0x88, 0x11, 0xf4, 0x95, 0xf4, 0x95, 0x6c, 0xe1,
+       0xff, 0xb9, 0x0d, 0x88, 0xf2, 0x73, 0x0d, 0xa5,
+       0xf4, 0x95, 0xe8, 0x60, 0xf2, 0x00, 0x00, 0x06,
+       0x61, 0xf8, 0x00, 0x11, 0x00, 0x20, 0xf8, 0x30,
+       0x0d, 0x98, 0x61, 0xf8, 0x00, 0x0b, 0x00, 0x01,
+       0xf8, 0x20, 0x0d, 0xa3, 0xf2, 0x00, 0x00, 0x07,
+       0xf0, 0x73, 0x0d, 0xa3, 0x61, 0xf8, 0x00, 0x0b,
+       0x00, 0x01, 0xf8, 0x20, 0x0d, 0xa1, 0xf2, 0x73,
+       0x0d, 0xa3, 0xf0, 0x00, 0x00, 0x01, 0xf0, 0x00,
+       0x00, 0x02, 0x48, 0x08, 0xf4, 0x7f, 0x8a, 0x11,
+       0xfc, 0x00, 0xee, 0xff, 0xf0, 0x74, 0x07, 0xfd,
+       0xf0, 0x74, 0x07, 0x44, 0xf0, 0x74, 0x0d, 0xb4,
+       0xf0, 0x74, 0x02, 0x05, 0xf0, 0x74, 0x04, 0x60,
+       0xf0, 0x73, 0x0d, 0xaa, 0xee, 0xfd, 0x10, 0xf8,
+       0x2a, 0xa3, 0xf8, 0x44, 0x0d, 0xcb, 0x10, 0xf8,
+       0x2a, 0xa4, 0xf8, 0x45, 0x0d, 0xd7, 0x76, 0x00,
+       0x02, 0x00, 0xf2, 0x74, 0x09, 0xe8, 0xf0, 0x20,
+       0x22, 0x00, 0x76, 0xf8, 0x2a, 0xa4, 0x00, 0x00,
+       0x76, 0xf8, 0x2a, 0xa7, 0x00, 0x00, 0xf0, 0x73,
+       0x0d, 0xd7, 0x76, 0x00, 0x02, 0x00, 0xf2, 0x74,
+       0x09, 0xe8, 0xf0, 0x20, 0x20, 0x00, 0x76, 0xf8,
+       0x2a, 0xa3, 0x00, 0x00, 0x76, 0xf8, 0x2a, 0xa7,
+       0x00, 0x01, 0xf0, 0x74, 0x0c, 0x5e, 0xf0, 0xe0,
+       0xf0, 0x10, 0x3a, 0x98, 0xf8, 0x47, 0x0d, 0xe1,
+       0x76, 0xf8, 0x27, 0x6e, 0x00, 0x00, 0xee, 0x03,
+       0xfc, 0x00, 0x4a, 0x11, 0xee, 0xfe, 0x77, 0x11,
+       0x20, 0x00, 0x76, 0x00, 0xaa, 0xaa, 0x76, 0x01,
+       0x02, 0x00, 0xf2, 0x74, 0x06, 0x6c, 0xf4, 0x95,
+       0x48, 0x11, 0x76, 0x00, 0x55, 0x55, 0x76, 0x01,
+       0x02, 0x00, 0x48, 0x11, 0xf2, 0x74, 0x06, 0x6c,
+       0xf0, 0x00, 0x02, 0x00, 0x76, 0xf8, 0x2a, 0xa3,
+       0x00, 0x00, 0x76, 0xf8, 0x2a, 0xa4, 0x00, 0x00,
+       0xe8, 0x00, 0x4e, 0x00, 0xfb, 0x80, 0x15, 0x3e,
+       0xf4, 0x95, 0xe8, 0x04, 0x80, 0xf8, 0x2a, 0xa5,
+       0x76, 0x00, 0x2a, 0xa8, 0xf9, 0x80, 0x14, 0x87,
+       0x76, 0x00, 0x2a, 0xad, 0xfb, 0x80, 0x13, 0x62,
+       0xf4, 0x95, 0xe8, 0x02, 0x10, 0xf8, 0x2a, 0xa5,
+       0xf9, 0x80, 0x14, 0x63, 0xfb, 0x80, 0x16, 0x66,
+       0xf4, 0x95, 0xe8, 0x1c, 0xfb, 0x80, 0x16, 0x87,
+       0xf4, 0x95, 0xe8, 0x1c, 0xe8, 0x01, 0x4e, 0x00,
+       0xfb, 0x80, 0x17, 0xd6, 0xf4, 0x95, 0xe8, 0x00,
+       0x80, 0xf8, 0x2a, 0xa6, 0x76, 0x00, 0x2a, 0xb7,
+       0xf9, 0x80, 0x16, 0xaa, 0x10, 0xf8, 0x2a, 0xa6,
+       0xf9, 0x80, 0x17, 0x5c, 0x10, 0xf8, 0x2a, 0xa6,
+       0xf9, 0x80, 0x17, 0x6f, 0xee, 0x02, 0x8a, 0x11,
+       0xfc, 0x00, 0xf4, 0x95, 0x4a, 0x08, 0x4a, 0x09,
+       0x4a, 0x0a, 0x4a, 0x07, 0x4a, 0x1d, 0x68, 0xf8,
+       0x00, 0x07, 0x7d, 0x3f, 0x69, 0xf8, 0x00, 0x07,
+       0x40, 0x00, 0x68, 0xf8, 0x00, 0x1d, 0xff, 0xfc,
+       0x10, 0xf8, 0x2a, 0xa7, 0xf8, 0x44, 0x0e, 0x4b,
+       0x76, 0xf8, 0x2a, 0xa3, 0x00, 0x01, 0xf0, 0x73,
+       0x0e, 0x4e, 0x76, 0xf8, 0x2a, 0xa4, 0x00, 0x01,
+       0x8a, 0x1d, 0x8a, 0x07, 0x8a, 0x0a, 0x8a, 0x09,
+       0x8a, 0x08, 0xf4, 0xeb, 0x4a, 0x11, 0x4a, 0x16,
+       0x4a, 0x17, 0xee, 0xfe, 0x88, 0x0e, 0x71, 0x08,
+       0x00, 0x16, 0x71, 0x06, 0x00, 0x17, 0x11, 0x07,
+       0xf0, 0x66, 0x00, 0x0d, 0xf0, 0x00, 0x25, 0xa0,
+       0x88, 0x11, 0x76, 0x01, 0x00, 0x06, 0x81, 0x00,
+       0xf2, 0x74, 0x06, 0xce, 0xf0, 0x00, 0x00, 0x01,
+       0x76, 0x01, 0x00, 0x06, 0x70, 0x00, 0x00, 0x16,
+       0x48, 0x11, 0xf2, 0x74, 0x06, 0xce, 0xf0, 0x00,
+       0x00, 0x07, 0x70, 0x81, 0x00, 0x17, 0xee, 0x02,
+       0x8a, 0x17, 0x8a, 0x16, 0x8a, 0x11, 0xfc, 0x00,
+       0x4a, 0x11, 0x88, 0x0e, 0x71, 0x02, 0x00, 0x12,
+       0x11, 0x03, 0xf0, 0x66, 0x00, 0x0d, 0xf0, 0x00,
+       0x24, 0x00, 0x88, 0x11, 0xf4, 0x95, 0x70, 0x81,
+       0x00, 0x12, 0x6e, 0xe2, 0xff, 0xfe, 0x0e, 0x8d,
+       0xf4, 0x95, 0xe8, 0x00, 0xe8, 0x01, 0x80, 0xe1,
+       0x00, 0x02, 0x76, 0xe1, 0x00, 0x03, 0x00, 0xff,
+       0x76, 0xe1, 0x00, 0x04, 0x00, 0x00, 0x76, 0xe1,
+       0x00, 0x0b, 0x00, 0x00, 0x76, 0xe1, 0x00, 0x0c,
+       0x00, 0x00, 0x81, 0xe1, 0x00, 0x01, 0x8a, 0x11,
+       0xfc, 0x00, 0x4a, 0x11, 0xee, 0xfc, 0x88, 0x0e,
+       0xf4, 0x95, 0xf1, 0x66, 0x00, 0x0d, 0xf3, 0x00,
+       0x24, 0x00, 0x89, 0x11, 0xf4, 0x95, 0xf4, 0x95,
+       0x76, 0xe1, 0x00, 0x0c, 0x00, 0x00, 0x76, 0xe1,
+       0x00, 0x0b, 0x00, 0x00, 0x76, 0xe1, 0x00, 0x02,
+       0x00, 0x01, 0x76, 0x00, 0x00, 0x00, 0x76, 0x01,
+       0x00, 0x00, 0x80, 0x02, 0x76, 0x03, 0x00, 0x00,
+       0xf2, 0x74, 0x0c, 0xb9, 0xf4, 0x95, 0xe8, 0x00,
+       0xee, 0x04, 0x8a, 0x11, 0xfc, 0x00, 0x4a, 0x11,
+       0x88, 0x19, 0xf4, 0x95, 0x73, 0x19, 0x00, 0x0e,
+       0xf1, 0x66, 0x00, 0x0d, 0xf2, 0x00, 0x24, 0x00,
+       0x77, 0x15, 0x25, 0xa0, 0x77, 0x14, 0x00, 0x00,
+       0x77, 0x1a, 0x00, 0x1f, 0xf0, 0x72, 0x0f, 0x14,
+       0xf6, 0xb8, 0x49, 0x19, 0x09, 0x85, 0xf8, 0x4c,
+       0x0f, 0x13, 0xf1, 0x00, 0x00, 0x05, 0x89, 0x11,
+       0x49, 0x15, 0xf3, 0x00, 0x00, 0x01, 0x89, 0x13,
+       0x49, 0x15, 0xf3, 0x00, 0x00, 0x07, 0x89, 0x12,
+       0x11, 0x93, 0x1d, 0x91, 0x19, 0x92, 0x89, 0x10,
+       0xf4, 0x95, 0xf4, 0x95, 0x6c, 0x80, 0x0f, 0x13,
+       0x11, 0x93, 0x1d, 0x91, 0x19, 0x92, 0x89, 0x10,
+       0xf4, 0x95, 0xf4, 0x95, 0x6c, 0x80, 0x0f, 0x13,
+       0x11, 0x93, 0x1d, 0x91, 0x19, 0x92, 0x89, 0x10,
+       0xf4, 0x95, 0xf4, 0x95, 0x6c, 0x80, 0x0f, 0x13,
+       0x11, 0x93, 0x1d, 0x91, 0x19, 0x92, 0x89, 0x10,
+       0xf4, 0x95, 0xf4, 0x95, 0x6c, 0x80, 0x0f, 0x13,
+       0x11, 0x93, 0x1d, 0x91, 0x19, 0x92, 0x89, 0x10,
+       0xf4, 0x95, 0xf4, 0x95, 0x6c, 0x80, 0x0f, 0x13,
+       0x11, 0x93, 0x1d, 0x91, 0x19, 0x92, 0x89, 0x11,
+       0xf4, 0x95, 0xf4, 0x95, 0x6c, 0x81, 0x0f, 0x13,
+       0x6d, 0x94, 0x6d, 0xed, 0x00, 0x0d, 0x48, 0x14,
+       0x8a, 0x11, 0xfc, 0x00, 0x4a, 0x11, 0x4a, 0x16,
+       0x4a, 0x17, 0xee, 0xf8, 0x88, 0x17, 0x10, 0x0d,
+       0x80, 0x04, 0x10, 0x0c, 0x80, 0x05, 0x71, 0x0e,
+       0x00, 0x16, 0x73, 0x17, 0x00, 0x0e, 0xf0, 0x66,
+       0x00, 0x0d, 0xf0, 0x00, 0x24, 0x00, 0x88, 0x11,
+       0x10, 0xf8, 0x27, 0x63, 0xf8, 0x45, 0x0f, 0x32,
+       0xf2, 0x74, 0x0e, 0x9f, 0xf4, 0x95, 0x48, 0x17,
+       0x10, 0xf8, 0x27, 0x60, 0xf8, 0x44, 0x0f, 0x3d,
+       0x60, 0xe1, 0x00, 0x02, 0x00, 0x01, 0xf8, 0x20,
+       0x0f, 0x6d, 0xf0, 0x73, 0x11, 0x33, 0x10, 0x04,
+       0x80, 0x00, 0x10, 0x05, 0xf0, 0x74, 0x06, 0x9f,
+       0x11, 0x04, 0xf3, 0x00, 0x00, 0x01, 0x81, 0x04,
+       0x6d, 0x8e, 0x77, 0x10, 0x00, 0x01, 0x71, 0xe1,
+       0x00, 0x02, 0x00, 0x12, 0xf4, 0xaa, 0xf8, 0x30,
+       0x0f, 0x62, 0x77, 0x10, 0x00, 0x02, 0xf4, 0xaa,
+       0xf8, 0x30, 0x0f, 0x6d, 0x45, 0xe1, 0x00, 0x0b,
+       0x88, 0x10, 0x43, 0xe1, 0x00, 0x0c, 0x83, 0xf8,
+       0x00, 0x12, 0xf4, 0x95, 0xf4, 0x95, 0xf4, 0xaa,
+       0xf8, 0x30, 0x0f, 0x6d, 0xf0, 0x73, 0x0f, 0x96,
+       0xf5, 0x00, 0x81, 0x04, 0x49, 0x16, 0xf5, 0x20,
+       0x89, 0x16, 0x76, 0xe1, 0x00, 0x0c, 0x00, 0x00,
+       0x76, 0xe1, 0x00, 0x04, 0x00, 0x00, 0x48, 0x16,
+       0xf8, 0x45, 0x11, 0x33, 0xf7, 0xb8, 0x71, 0xe1,
+       0x00, 0x02, 0x00, 0x12, 0x10, 0xf8, 0x00, 0x12,
+       0xf0, 0x10, 0x00, 0x03, 0xf8, 0x46, 0x0f, 0x8c,
+       0x10, 0xf8, 0x00, 0x12, 0xf0, 0x10, 0x00, 0x03,
+       0xf8, 0x45, 0x10, 0x16, 0x77, 0x10, 0x00, 0x01,
+       0xf4, 0xaa, 0xf8, 0x30, 0x0f, 0x9c, 0x77, 0x10,
+       0x00, 0x02, 0xf4, 0xaa, 0xf8, 0x30, 0x0f, 0xa8,
+       0xf0, 0x73, 0x0f, 0x96, 0x77, 0x10, 0x00, 0x04,
+       0xf4, 0xaa, 0xf8, 0x30, 0x10, 0xb7, 0x77, 0x10,
+       0x00, 0x05, 0xf4, 0xaa, 0xf8, 0x30, 0x10, 0xbc,
+       0xf2, 0x74, 0x0e, 0x9f, 0xf4, 0x95, 0x48, 0x17,
+       0xf0, 0x73, 0x11, 0x31, 0x76, 0xe1, 0x00, 0x0c,
+       0x00, 0x00, 0x76, 0xe1, 0x00, 0x0b, 0x00, 0x00,
+       0x76, 0xe1, 0x00, 0x04, 0x00, 0x00, 0x76, 0xe1,
+       0x00, 0x02, 0x00, 0x02, 0x11, 0xe1, 0x00, 0x0c,
+       0xe8, 0x03, 0xf6, 0x20, 0x89, 0x12, 0xf4, 0x95,
+       0x77, 0x10, 0x00, 0x03, 0xf5, 0xaa, 0xf8, 0x30,
+       0x0f, 0xb6, 0x6b, 0xf8, 0x27, 0x6f, 0x00, 0x01,
+       0x88, 0x10, 0xf4, 0x95, 0xf4, 0x95, 0xf5, 0xae,
+       0xf8, 0x20, 0x0f, 0xbd, 0x48, 0x16, 0x80, 0x06,
+       0x88, 0x13, 0xf4, 0x95, 0x77, 0x10, 0x00, 0x03,
+       0xf6, 0xab, 0xf8, 0x20, 0x0f, 0xc8, 0x6b, 0xf8,
+       0x27, 0x6f, 0x00, 0x01, 0x12, 0x06, 0xf8, 0x45,
+       0x10, 0x00, 0x10, 0xe1, 0x00, 0x04, 0x80, 0x00,
+       0x10, 0x05, 0x80, 0x01, 0x10, 0x04, 0x80, 0x02,
+       0x10, 0x06, 0x80, 0x03, 0x48, 0x11, 0xf2, 0x74,
+       0x07, 0x1e, 0xf0, 0x00, 0x00, 0x05, 0x10, 0x06,
+       0x00, 0xe1, 0x00, 0x04, 0x80, 0xe1, 0x00, 0x04,
+       0x10, 0x06, 0x00, 0xe1, 0x00, 0x0c, 0x80, 0xe1,
+       0x00, 0x0c, 0x88, 0x12, 0x11, 0x06, 0x10, 0x04,
+       0xf6, 0x00, 0x80, 0x04, 0x48, 0x16, 0xf6, 0x20,
+       0x88, 0x16, 0x89, 0x13, 0xf4, 0x95, 0x77, 0x10,
+       0x00, 0x03, 0xf6, 0xab, 0xf8, 0x20, 0x0f, 0xf5,
+       0x6b, 0xf8, 0x27, 0x6f, 0x00, 0x01, 0x77, 0x10,
+       0x00, 0x0c, 0x71, 0xe1, 0x00, 0x04, 0x00, 0x13,
+       0xf6, 0xab, 0xf8, 0x20, 0x10, 0x00, 0x6b, 0xf8,
+       0x27, 0x6f, 0x00, 0x01, 0x6c, 0xe2, 0xff, 0xfd,
+       0x11, 0x31, 0xf6, 0xb8, 0x6f, 0xe1, 0x00, 0x05,
+       0x0c, 0x48, 0x6f, 0xe1, 0x00, 0x06, 0x0c, 0x18,
+       0xf0, 0x30, 0x0f, 0xff, 0xf0, 0x00, 0x00, 0x03,
+       0x80, 0xe1, 0x00, 0x0b, 0x76, 0xe1, 0x00, 0x02,
+       0x00, 0x03, 0x48, 0x16, 0xf8, 0x45, 0x11, 0x33,
+       0x71, 0xe1, 0x00, 0x0c, 0x00, 0x12, 0x10, 0xe1,
+       0x00, 0x0b, 0x49, 0x12, 0xf6, 0x20, 0x88, 0x13,
+       0xe8, 0x0c, 0xf6, 0x20, 0x88, 0x10, 0xf4, 0x95,
+       0xf4, 0x95, 0xf5, 0xab, 0xf8, 0x20, 0x10, 0x27,
+       0x48, 0x13, 0x80, 0x06, 0x88, 0x10, 0xf4, 0x95,
+       0xf4, 0x95, 0xf5, 0xae, 0xf8, 0x20, 0x10, 0x30,
+       0x70, 0x06, 0x00, 0x16, 0x12, 0x06, 0xf8, 0x45,
+       0x10, 0x5f, 0x10, 0xe1, 0x00, 0x04, 0x80, 0x00,
+       0x10, 0x05, 0x80, 0x01, 0x10, 0x04, 0x80, 0x02,
+       0x10, 0x06, 0x80, 0x03, 0x48, 0x11, 0xf2, 0x74,
+       0x07, 0x1e, 0xf0, 0x00, 0x00, 0x05, 0x10, 0x06,
+       0x00, 0xe1, 0x00, 0x04, 0x80, 0xe1, 0x00, 0x04,
+       0x10, 0x06, 0x00, 0xe1, 0x00, 0x0c, 0x80, 0xe1,
+       0x00, 0x0c, 0x88, 0x12, 0x11, 0x06, 0x10, 0x04,
+       0xf6, 0x00, 0x80, 0x04, 0x48, 0x16, 0xf6, 0x20,
+       0x88, 0x16, 0xf4, 0x95, 0x77, 0x10, 0x00, 0x0c,
+       0x71, 0xe1, 0x00, 0x04, 0x00, 0x13, 0xf6, 0xab,
+       0xf8, 0x20, 0x10, 0x5f, 0x6b, 0xf8, 0x27, 0x6f,
+       0x00, 0x01, 0x77, 0x10, 0x00, 0x0c, 0xf6, 0xaa,
+       0xf8, 0x20, 0x10, 0x6b, 0xf2, 0x74, 0x0e, 0x9f,
+       0xf4, 0x95, 0x48, 0x17, 0x71, 0xe1, 0x00, 0x0c,
+       0x00, 0x12, 0x77, 0x10, 0x00, 0x0c, 0xf4, 0xaa,
+       0xf8, 0x30, 0x10, 0x7c, 0x77, 0x10, 0x00, 0x0c,
+       0x71, 0xe1, 0x00, 0x0b, 0x00, 0x13, 0xf6, 0xab,
+       0xf8, 0x30, 0x10, 0xb4, 0xe7, 0x30, 0xf7, 0xaa,
+       0xf8, 0x30, 0x10, 0xb4, 0xf2, 0x74, 0x0e, 0xc1,
+       0xf4, 0x95, 0x48, 0x17, 0x88, 0x12, 0xf4, 0x95,
+       0xf4, 0x95, 0x6c, 0x82, 0x10, 0x8d, 0x76, 0xe1,
+       0x00, 0x04, 0x00, 0x00, 0x76, 0xe1, 0x00, 0x02,
+       0x00, 0x05, 0xf0, 0x73, 0x10, 0xb4, 0x76, 0xe1,
+       0x00, 0x02, 0x00, 0x04, 0x77, 0x10, 0x00, 0x0c,
+       0x71, 0xe1, 0x00, 0x0b, 0x00, 0x12, 0xf5, 0xaa,
+       0xf8, 0x20, 0x10, 0x9a, 0xf0, 0x73, 0x10, 0x9c,
+       0x77, 0x12, 0x00, 0x0c, 0x76, 0x00, 0x00, 0x00,
+       0x70, 0x01, 0x00, 0x12, 0x70, 0x02, 0x00, 0x17,
+       0x76, 0x03, 0x00, 0x01, 0x48, 0x11, 0xf2, 0x74,
+       0x0c, 0xb9, 0xf0, 0x00, 0x00, 0x05, 0x76, 0xe1,
+       0x00, 0x04, 0x00, 0x00, 0x77, 0x10, 0x00, 0x0c,
+       0x71, 0xe1, 0x00, 0x0b, 0x00, 0x12, 0xf6, 0xaa,
+       0xf8, 0x20, 0x11, 0x1c, 0x48, 0x16, 0xf8, 0x45,
+       0x11, 0x33, 0x60, 0xe1, 0x00, 0x02, 0x00, 0x05,
+       0xf8, 0x20, 0x10, 0xdf, 0x10, 0xe1, 0x00, 0x0b,
+       0x08, 0xe1, 0x00, 0x0c, 0x11, 0xe1, 0x00, 0x04,
+       0xf8, 0x4d, 0x10, 0xc7, 0x6b, 0xf8, 0x27, 0x6f,
+       0x00, 0x01, 0x88, 0x10, 0xf4, 0x95, 0xf4, 0x95,
+       0xf5, 0xae, 0xf8, 0x20, 0x10, 0xcf, 0x48, 0x16,
+       0xf4, 0x95, 0x48, 0x08, 0xf8, 0x45, 0x11, 0x16,
+       0x6f, 0xe1, 0x00, 0x0c, 0x0d, 0x00, 0x81, 0xe1,
+       0x00, 0x0c, 0x11, 0x04, 0xf5, 0x00, 0x81, 0x04,
+       0x49, 0x16, 0xf5, 0x20, 0x89, 0x16, 0xf0, 0x73,
+       0x11, 0x0e, 0x10, 0xe1, 0x00, 0x0b, 0x71, 0xe1,
+       0x00, 0x0c, 0x00, 0x12, 0x88, 0x10, 0xf4, 0x95,
+       0xf4, 0x95, 0xf6, 0xaa, 0xf8, 0x30, 0x11, 0x16,
+       0x49, 0x12, 0xf6, 0x20, 0x88, 0x10, 0xf4, 0x95,
+       0xf4, 0x95, 0xf5, 0xae, 0xf8, 0x20, 0x10, 0xf3,
+       0x48, 0x16, 0x80, 0x06, 0x48, 0x08, 0xf8, 0x45,
+       0x11, 0x16, 0x10, 0x04, 0x70, 0x02, 0x00, 0x17,
+       0x80, 0x00, 0x76, 0x03, 0x00, 0x00, 0x10, 0x06,
+       0x80, 0x01, 0x10, 0x05, 0xf0, 0x74, 0x0c, 0xb9,
+       0x10, 0x06, 0x00, 0xe1, 0x00, 0x0c, 0x80, 0xe1,
+       0x00, 0x0c, 0x11, 0x06, 0x10, 0x04, 0xf6, 0x00,
+       0x80, 0x04, 0x48, 0x16, 0xf6, 0x20, 0x88, 0x16,
+       0x10, 0xe1, 0x00, 0x0c, 0x08, 0xe1, 0x00, 0x0b,
+       0xf8, 0x45, 0x11, 0x1c, 0xf0, 0x73, 0x11, 0x31,
+       0xf2, 0x74, 0x0e, 0x9f, 0xf4, 0x95, 0x48, 0x17,
+       0xf0, 0x73, 0x11, 0x33, 0x76, 0xe1, 0x00, 0x0c,
+       0x00, 0x00, 0x76, 0xe1, 0x00, 0x0b, 0x00, 0x00,
+       0x76, 0xe1, 0x00, 0x02, 0x00, 0x01, 0x10, 0x04,
+       0x80, 0x00, 0x10, 0x05, 0xf0, 0x74, 0x06, 0x9f,
+       0x88, 0x12, 0xf4, 0x95, 0x77, 0x10, 0x00, 0xff,
+       0xf4, 0xaa, 0xf8, 0x30, 0x11, 0x33, 0x6c, 0x86,
+       0x0f, 0x70, 0xee, 0x08, 0x8a, 0x17, 0x8a, 0x16,
+       0x8a, 0x11, 0xfc, 0x00, 0x4a, 0x11, 0xee, 0xfc,
+       0xf4, 0x95, 0x71, 0x06, 0x00, 0x12, 0x88, 0x11,
+       0x73, 0x12, 0x00, 0x0e, 0xf1, 0x66, 0x00, 0x0d,
+       0xf3, 0x00, 0x24, 0x00, 0x89, 0x14, 0x13, 0x81,
+       0xf7, 0x7a, 0xf3, 0x30, 0x00, 0x01, 0x81, 0xf8,
+       0x27, 0x60, 0x13, 0xe1, 0x00, 0x01, 0xf7, 0x7c,
+       0xf3, 0x30, 0x00, 0x03, 0x81, 0xf8, 0x27, 0x61,
+       0xe9, 0x0f, 0x19, 0xe1, 0x00, 0x01, 0x81, 0xf8,
+       0x27, 0x62, 0x71, 0xe4, 0x00, 0x03, 0x00, 0x13,
+       0xf6, 0xb8, 0x49, 0x13, 0xf3, 0x00, 0x00, 0x01,
+       0xf3, 0x30, 0x00, 0x0f, 0x49, 0x0b, 0x09, 0xf8,
+       0x27, 0x62, 0xf8, 0x4d, 0x11, 0x75, 0x77, 0x10,
+       0x00, 0xff, 0xf4, 0xab, 0xf8, 0x30, 0x11, 0x75,
+       0x57, 0xf8, 0x27, 0x6c, 0xf3, 0x00, 0x00, 0x01,
+       0x4f, 0xf8, 0x27, 0x6c, 0x76, 0xf8, 0x27, 0x63,
+       0x00, 0x01, 0xf0, 0x73, 0x11, 0x78, 0x76, 0xf8,
+       0x27, 0x63, 0x00, 0x00, 0x70, 0xe4, 0x00, 0x03,
+       0x27, 0x62, 0x76, 0xf8, 0x27, 0x64, 0x00, 0x00,
+       0x11, 0xf8, 0x27, 0x61, 0x61, 0xf8, 0x00, 0x0b,
+       0x00, 0x02, 0xf8, 0x20, 0x11, 0x8d, 0xe9, 0x01,
+       0x6f, 0xe1, 0x00, 0x02, 0x0f, 0x18, 0x81, 0xf8,
+       0x27, 0x64, 0x11, 0xf8, 0x27, 0x61, 0x61, 0xf8,
+       0x00, 0x0b, 0x00, 0x01, 0xf8, 0x20, 0x11, 0xa9,
+       0x10, 0xf8, 0x27, 0x64, 0xf1, 0x00, 0x00, 0x04,
+       0x89, 0x13, 0xe9, 0xb8, 0xf5, 0x20, 0x81, 0xf8,
+       0x27, 0x65, 0x60, 0x84, 0x00, 0x02, 0xf8, 0x20,
+       0x11, 0xa9, 0x70, 0x00, 0x00, 0x11, 0x70, 0x01,
+       0x00, 0x13, 0x70, 0x02, 0x27, 0x65, 0xf2, 0x74,
+       0x0f, 0x18, 0xf4, 0x95, 0x48, 0x12, 0xee, 0x04,
+       0x8a, 0x11, 0xfc, 0x00, 0x4a, 0x11, 0x4a, 0x16,
+       0x4a, 0x17, 0xee, 0xfc, 0xe8, 0x00, 0x4e, 0xf8,
+       0x27, 0x66, 0xe8, 0x00, 0x4e, 0xf8, 0x27, 0x68,
+       0xe8, 0x00, 0x4e, 0xf8, 0x27, 0x6c, 0xe8, 0x00,
+       0x4e, 0xf8, 0x27, 0x6a, 0x77, 0x12, 0x27, 0x40,
+       0x77, 0x11, 0x24, 0x00, 0x77, 0x1a, 0x00, 0x1f,
+       0xf0, 0x72, 0x11, 0xdb, 0x70, 0x92, 0x00, 0x11,
+       0x76, 0xe1, 0x00, 0x01, 0xff, 0xff, 0x76, 0x81,
+       0x00, 0x00, 0x76, 0xe1, 0x00, 0x02, 0x00, 0x00,
+       0x76, 0xe1, 0x00, 0x03, 0x00, 0xff, 0x76, 0xe1,
+       0x00, 0x0c, 0x00, 0x00, 0x76, 0xe1, 0x00, 0x0b,
+       0x00, 0x00, 0x76, 0xe1, 0x00, 0x04, 0x00, 0x00,
+       0x6d, 0xe9, 0x00, 0x0d, 0xf0, 0x20, 0x25, 0xa0,
+       0xf1, 0x00, 0x00, 0x07, 0x89, 0x11, 0xf1, 0x00,
+       0x00, 0x01, 0x81, 0x02, 0x88, 0x16, 0xf4, 0x95,
+       0x77, 0x17, 0x00, 0x20, 0x76, 0x86, 0x00, 0xff,
+       0x76, 0x00, 0x00, 0x00, 0x76, 0x01, 0x00, 0x06,
+       0x10, 0x02, 0xf0, 0x74, 0x06, 0x6c, 0x76, 0x00,
+       0x00, 0x00, 0x76, 0x01, 0x00, 0x06, 0xf2, 0x74,
+       0x06, 0x6c, 0xf4, 0x95, 0x48, 0x11, 0x10, 0x02,
+       0xf0, 0x00, 0x00, 0x0d, 0x80, 0x02, 0x6d, 0xe9,
+       0x00, 0x0d, 0x6d, 0xee, 0x00, 0x0d, 0x6c, 0xef,
+       0xff, 0xff, 0x11, 0xe8, 0xf0, 0x74, 0x0c, 0x9d,
+       0xee, 0x04, 0x8a, 0x17, 0x8a, 0x16, 0x8a, 0x11,
+       0xfc, 0x00, 0x4a, 0x11, 0x4a, 0x16, 0x4a, 0x17,
+       0xee, 0xfa, 0x88, 0x11, 0x10, 0x0a, 0x49, 0x11,
+       0xf8, 0x4d, 0x12, 0x9f, 0x48, 0x08, 0xf8, 0x45,
+       0x12, 0x9f, 0x80, 0x04, 0x12, 0x81, 0xf5, 0x78,
+       0x89, 0x12, 0xf4, 0x95, 0xf4, 0x95, 0x6c, 0xe2,
+       0xff, 0xb9, 0x12, 0x8a, 0x61, 0xf8, 0x00, 0x08,
+       0x00, 0x80, 0xf8, 0x30, 0x12, 0x8a, 0x13, 0xe1,
+       0x00, 0x01, 0xf0, 0xe8, 0xf7, 0x78, 0xf1, 0xa0,
+       0xf2, 0x30, 0x1f, 0xff, 0x88, 0x17, 0xf4, 0x95,
+       0x77, 0x12, 0x24, 0x00, 0x77, 0x16, 0x00, 0x00,
+       0x77, 0x13, 0x00, 0x20, 0xf6, 0xb8, 0x48, 0x17,
+       0x08, 0xe2, 0x00, 0x01, 0xf8, 0x45, 0x12, 0x42,
+       0x6d, 0xea, 0x00, 0x0d, 0x6d, 0x96, 0x6c, 0xeb,
+       0xff, 0xff, 0x12, 0x34, 0xf0, 0x73, 0x12, 0x90,
+       0x56, 0xf8, 0x27, 0x6a, 0xf0, 0x00, 0x00, 0x01,
+       0x4e, 0xf8, 0x27, 0x6a, 0x60, 0x82, 0x00, 0x01,
+       0xf8, 0x30, 0x12, 0x54, 0x70, 0x00, 0x00, 0x16,
+       0xf2, 0x74, 0x11, 0x38, 0xf4, 0x95, 0x48, 0x11,
+       0xf0, 0x73, 0x12, 0x90, 0x70, 0x00, 0x00, 0x16,
+       0xf2, 0x74, 0x11, 0x38, 0xf4, 0x95, 0x48, 0x11,
+       0x72, 0x10, 0x2a, 0x9e, 0xf4, 0x95, 0xf4, 0xaf,
+       0xf8, 0x30, 0x12, 0x6e, 0x76, 0x00, 0x00, 0x00,
+       0x76, 0x01, 0x00, 0xbc, 0x70, 0x02, 0x00, 0x16,
+       0x76, 0x03, 0x00, 0x00, 0xf2, 0x74, 0x0c, 0xb9,
+       0xf4, 0x95, 0x48, 0x11, 0xf0, 0x73, 0x12, 0x90,
+       0x10, 0xf8, 0x27, 0x6e, 0xf8, 0x44, 0x12, 0x90,
+       0x76, 0x00, 0x00, 0x00, 0x76, 0x01, 0x00, 0xbc,
+       0x70, 0x02, 0x00, 0x16, 0x76, 0x03, 0x00, 0x00,
+       0xf2, 0x74, 0x0c, 0xb9, 0xf4, 0x95, 0x48, 0x11,
+       0xf0, 0x74, 0x0c, 0x5e, 0xf0, 0xe0, 0xf0, 0x10,
+       0x13, 0x88, 0xf8, 0x42, 0x12, 0x90, 0x76, 0xf8,
+       0x27, 0x6e, 0x00, 0x01, 0xf0, 0x73, 0x12, 0x90,
+       0x56, 0xf8, 0x27, 0x66, 0xf0, 0x00, 0x00, 0x01,
+       0x4e, 0xf8, 0x27, 0x66, 0x6d, 0xe9, 0x00, 0x5e,
+       0x56, 0xf8, 0x27, 0x68, 0xf0, 0x00, 0x00, 0x01,
+       0x4e, 0xf8, 0x27, 0x68, 0x71, 0x04, 0x00, 0x12,
+       0x6e, 0xea, 0xff, 0xff, 0x12, 0x18, 0x70, 0x04,
+       0x00, 0x12, 0xee, 0x06, 0x8a, 0x17, 0x8a, 0x16,
+       0x8a, 0x11, 0xfc, 0x00, 0x4a, 0x11, 0xee, 0xfe,
+       0x88, 0x0e, 0xf4, 0x95, 0xf0, 0x66, 0x00, 0x0d,
+       0xf0, 0x00, 0x25, 0xa0, 0x88, 0x11, 0xf4, 0x95,
+       0xf4, 0x95, 0x76, 0x81, 0x00, 0xff, 0x76, 0x00,
+       0x00, 0x00, 0x76, 0x01, 0x00, 0x06, 0xf2, 0x74,
+       0x06, 0x6c, 0xf0, 0x00, 0x00, 0x01, 0x76, 0x00,
+       0x00, 0x00, 0x76, 0x01, 0x00, 0x06, 0x48, 0x11,
+       0xf2, 0x74, 0x06, 0x6c, 0xf0, 0x00, 0x00, 0x07,
+       0xee, 0x02, 0x8a, 0x11, 0xfc, 0x00, 0x4a, 0x11,
+       0x88, 0x0e, 0xf4, 0x95, 0xf0, 0x66, 0x00, 0x0d,
+       0xf0, 0x00, 0x24, 0x00, 0x88, 0x11, 0xf4, 0x95,
+       0xf4, 0x95, 0x76, 0xe1, 0x00, 0x01, 0xff, 0xff,
+       0x76, 0x81, 0x00, 0x00, 0x76, 0xe1, 0x00, 0x02,
+       0x00, 0x00, 0x76, 0xe1, 0x00, 0x03, 0x00, 0xff,
+       0x8a, 0x11, 0xfc, 0x00, 0x4a, 0x11, 0xf4, 0x95,
+       0x13, 0x03, 0x88, 0x11, 0xfa, 0x4d, 0x12, 0xec,
+       0x71, 0x02, 0x00, 0x12, 0xf3, 0x10, 0x00, 0x01,
+       0x89, 0x1a, 0xf4, 0x95, 0xf0, 0x72, 0x12, 0xeb,
+       0x70, 0x91, 0x00, 0x12, 0x8a, 0x11, 0xfc, 0x00,
+       0xf4, 0x95, 0x4a, 0x0b, 0x4a, 0x0c, 0x4a, 0x0d,
+       0xf7, 0xb8, 0xee, 0xfe, 0x10, 0xf8, 0x00, 0x08,
+       0x11, 0x06, 0xf1, 0xc0, 0x83, 0x00, 0xf4, 0x85,
+       0x11, 0x06, 0xf7, 0x85, 0x81, 0x06, 0xf6, 0xb8,
+       0xec, 0x0f, 0x1e, 0x06, 0x61, 0x00, 0x80, 0x00,
+       0xf8, 0x20, 0x13, 0x05, 0xf4, 0x84, 0xee, 0x02,
+       0x8a, 0x0d, 0x8a, 0x0c, 0x8a, 0x0b, 0xfc, 0x00,
+       0xf4, 0x95, 0x4a, 0x0b, 0x4a, 0x0c, 0x4a, 0x0d,
+       0xee, 0xfe, 0xf7, 0xb8, 0x80, 0x00, 0x10, 0xf8,
+       0x00, 0x08, 0xf4, 0x85, 0x11, 0x06, 0xf7, 0x85,
+       0x81, 0x06, 0xf6, 0xb8, 0xec, 0x0f, 0x1e, 0x06,
+       0xf0, 0xf0, 0x61, 0x00, 0x80, 0x00, 0xf8, 0x20,
+       0x13, 0x20, 0xf4, 0x84, 0xee, 0x02, 0x8a, 0x0d,
+       0x8a, 0x0c, 0x8a, 0x0b, 0xfc, 0x00, 0x4a, 0x11,
+       0x77, 0x11, 0x00, 0x7b, 0x76, 0x81, 0x2e, 0xec,
+       0x77, 0x11, 0x00, 0x7b, 0xee, 0xff, 0x71, 0x81,
+       0x00, 0x11, 0xee, 0x01, 0x76, 0xe1, 0x00, 0x01,
+       0x00, 0x00, 0x76, 0xe1, 0x00, 0x04, 0x00, 0x00,
+       0x76, 0xe1, 0x00, 0x06, 0x00, 0x00, 0x76, 0xe1,
+       0x00, 0x62, 0x00, 0x00, 0x76, 0xe1, 0x00, 0x76,
+       0x00, 0x00, 0x76, 0xe1, 0x00, 0x92, 0x00, 0x00,
+       0x76, 0xe1, 0x00, 0x94, 0x00, 0x00, 0x76, 0xe1,
+       0x00, 0xb0, 0x00, 0x00, 0x76, 0xe1, 0x00, 0xb3,
+       0x00, 0x00, 0x76, 0xe1, 0x00, 0xbe, 0x00, 0x00,
+       0x76, 0xe1, 0x00, 0xbf, 0x00, 0x00, 0x76, 0xe1,
+       0x00, 0xc1, 0x00, 0x00, 0x76, 0xe1, 0x00, 0xc3,
+       0x00, 0x00, 0x76, 0xe1, 0x00, 0xc5, 0x00, 0x00,
+       0x76, 0xe1, 0x00, 0xc7, 0x00, 0x00, 0x76, 0x81,
+       0x00, 0x00, 0x8a, 0x11, 0xf4, 0x95, 0xf4, 0xe4,
+       0x4a, 0x11, 0x4a, 0x16, 0x4a, 0x17, 0xee, 0xff,
+       0xf4, 0x95, 0x71, 0x06, 0x00, 0x16, 0xfb, 0x80,
+       0x16, 0xa2, 0x88, 0x17, 0xf4, 0x95, 0xf7, 0xb8,
+       0x10, 0xf8, 0x00, 0x17, 0xf0, 0x10, 0x00, 0x02,
+       0xfa, 0x46, 0x13, 0x88, 0x77, 0x11, 0x00, 0x00,
+       0x10, 0xf8, 0x00, 0x17, 0xf0, 0x10, 0x00, 0x02,
+       0xf8, 0x45, 0x13, 0xf9, 0x10, 0xf8, 0x00, 0x17,
+       0xf8, 0x45, 0x14, 0x39, 0x10, 0xf8, 0x00, 0x17,
+       0xf0, 0x10, 0x00, 0x01, 0xf8, 0x45, 0x14, 0x1f,
+       0xf0, 0x73, 0x14, 0x52, 0x10, 0xf8, 0x00, 0x17,
+       0xf0, 0x10, 0x00, 0x03, 0xf8, 0x45, 0x13, 0xd3,
+       0x10, 0xf8, 0x00, 0x17, 0xf0, 0x10, 0x00, 0x06,
+       0xf8, 0x44, 0x14, 0x52, 0x77, 0x12, 0x00, 0x7b,
+       0x71, 0x82, 0x00, 0x14, 0x61, 0xe4, 0x00, 0x07,
+       0x00, 0x40, 0xf8, 0x30, 0x14, 0x52, 0x49, 0x14,
+       0x48, 0x17, 0xf6, 0x00, 0x88, 0x12, 0xf4, 0x95,
+       0x77, 0x13, 0x00, 0x55, 0x77, 0x11, 0x00, 0x57,
+       0x6d, 0xea, 0x00, 0x3b, 0xe5, 0x01, 0x10, 0xe6,
+       0x00, 0x06, 0x80, 0x81, 0x48, 0x14, 0x00, 0xf8,
+       0x00, 0x17, 0x88, 0x12, 0xf4, 0x95, 0x77, 0x11,
+       0x00, 0x55, 0x10, 0xe2, 0x00, 0x40, 0x80, 0x81,
+       0x77, 0x11, 0x00, 0x57, 0x10, 0xe6, 0x00, 0x07,
+       0x80, 0x81, 0x77, 0x11, 0x00, 0x55, 0x10, 0xe2,
+       0x00, 0x45, 0x80, 0x81, 0x10, 0xe6, 0x00, 0x08,
+       0x77, 0x11, 0x00, 0x57, 0x80, 0x81, 0x77, 0x11,
+       0x00, 0x55, 0x10, 0xe2, 0x00, 0x4a, 0x80, 0x81,
+       0x77, 0x11, 0x00, 0x57, 0x10, 0xe6, 0x00, 0x09,
+       0x80, 0x81, 0xf2, 0x73, 0x14, 0x52, 0x77, 0x11,
+       0x03, 0xc0, 0x77, 0x12, 0x00, 0x7b, 0x10, 0x82,
+       0xf0, 0x00, 0x00, 0x07, 0x88, 0x13, 0xf4, 0x95,
+       0xf4, 0x95, 0x96, 0x1b, 0xf8, 0x30, 0x14, 0x52,
+       0x10, 0xe3, 0x00, 0x35, 0x77, 0x12, 0x00, 0x55,
+       0x80, 0x82, 0x77, 0x12, 0x00, 0x57, 0x10, 0xe6,
+       0x00, 0x04, 0x80, 0x82, 0x77, 0x12, 0x00, 0x55,
+       0x10, 0xe3, 0x00, 0x37, 0x80, 0x82, 0x77, 0x12,
+       0x00, 0x57, 0x10, 0xe6, 0x00, 0x05, 0x80, 0x82,
+       0x48, 0x11, 0xf0, 0x40, 0x00, 0x10, 0xf2, 0x73,
+       0x14, 0x50, 0xf0, 0x40, 0x00, 0x20, 0x77, 0x12,
+       0x00, 0x7b, 0x10, 0x82, 0xf0, 0x00, 0x00, 0x07,
+       0x88, 0x12, 0xf4, 0x95, 0xf4, 0x95, 0x96, 0x0d,
+       0xf8, 0x30, 0x14, 0x52, 0x10, 0xe2, 0x00, 0x34,
+       0x77, 0x13, 0x00, 0x55, 0x80, 0x83, 0x77, 0x13,
+       0x00, 0x57, 0x10, 0xe6, 0x00, 0x02, 0x80, 0x83,
+       0x10, 0xe2, 0x00, 0x36, 0x77, 0x12, 0x00, 0x55,
+       0x80, 0x82, 0x77, 0x12, 0x00, 0x57, 0x10, 0xe6,
+       0x00, 0x03, 0x80, 0x82, 0x48, 0x11, 0xf0, 0x40,
+       0x00, 0x04, 0xf2, 0x73, 0x14, 0x50, 0xf0, 0x40,
+       0x00, 0x08, 0x77, 0x12, 0x00, 0x7b, 0x10, 0x82,
+       0xf0, 0x00, 0x00, 0x07, 0x88, 0x12, 0xf4, 0x95,
+       0xf4, 0x95, 0x96, 0x0e, 0xf8, 0x30, 0x14, 0x52,
+       0x10, 0xe2, 0x00, 0x33, 0x77, 0x12, 0x00, 0x55,
+       0x80, 0x82, 0x77, 0x12, 0x00, 0x57, 0x10, 0xe6,
+       0x00, 0x01, 0x80, 0x82, 0x48, 0x11, 0xf2, 0x73,
+       0x14, 0x50, 0xf0, 0x40, 0x00, 0x02, 0x77, 0x12,
+       0x00, 0x7b, 0x10, 0x82, 0xf0, 0x00, 0x00, 0x07,
+       0x88, 0x12, 0xf4, 0x95, 0xf4, 0x95, 0x96, 0x0f,
+       0xf8, 0x30, 0x14, 0x52, 0x10, 0xe2, 0x00, 0x32,
+       0x77, 0x12, 0x00, 0x55, 0x77, 0x13, 0x00, 0x57,
+       0x80, 0x82, 0x48, 0x11, 0xe7, 0x62, 0xf0, 0x40,
+       0x00, 0x01, 0xe5, 0x01, 0x88, 0x11, 0xf4, 0x95,
+       0x77, 0x12, 0x00, 0x7b, 0x48, 0x11, 0x71, 0x82,
+       0x00, 0x12, 0x1a, 0xe2, 0x00, 0x07, 0x80, 0xe2,
+       0x00, 0x07, 0xf9, 0x80, 0x16, 0x9a, 0xee, 0x01,
+       0x8a, 0x17, 0x48, 0x11, 0x8a, 0x16, 0x8a, 0x11,
+       0xf4, 0xe4, 0x4a, 0x11, 0x88, 0x11, 0x77, 0x0e,
+       0x00, 0x05, 0x77, 0x12, 0x00, 0x55, 0xe8, 0x04,
+       0xf6, 0xb8, 0x28, 0xe1, 0x00, 0x02, 0xee, 0xff,
+       0x80, 0x82, 0x77, 0x12, 0x00, 0x57, 0xf0, 0x20,
+       0x80, 0x00, 0xee, 0x01, 0x1a, 0x82, 0x77, 0x12,
+       0x00, 0x57, 0x80, 0x82, 0xe8, 0x01, 0x32, 0xe1,
+       0x00, 0x02, 0xf5, 0x82, 0x77, 0x11, 0x00, 0x54,
+       0xf6, 0x93, 0x18, 0x81, 0x77, 0x11, 0x00, 0x54,
+       0xf2, 0xa0, 0x80, 0x81, 0x8a, 0x11, 0xf4, 0x95,
+       0xf4, 0xe4, 0x4a, 0x11, 0x4a, 0x16, 0xf4, 0x95,
+       0x71, 0x04, 0x00, 0x11, 0xfb, 0x80, 0x16, 0xa2,
+       0x88, 0x16, 0xf4, 0x95, 0x77, 0x12, 0x00, 0x55,
+       0x10, 0xe6, 0x00, 0x03, 0x80, 0x82, 0x77, 0x12,
+       0x00, 0x56, 0x10, 0xe1, 0x00, 0x02, 0x77, 0x13,
+       0x00, 0x56, 0x80, 0x82, 0x77, 0x12, 0x00, 0x56,
+       0x10, 0xe1, 0x00, 0x03, 0x80, 0x82, 0x10, 0xe1,
+       0x00, 0x04, 0x77, 0x12, 0x00, 0x56, 0x80, 0x82,
+       0x77, 0x12, 0x00, 0x56, 0x10, 0xe1, 0x00, 0x01,
+       0x80, 0x82, 0xe7, 0x12, 0xe5, 0x01, 0xf9, 0x80,
+       0x16, 0x9a, 0x8a, 0x16, 0x8a, 0x11, 0xf4, 0xe4,
+       0x4a, 0x11, 0x4a, 0x16, 0x4a, 0x17, 0xee, 0xf9,
+       0x77, 0x11, 0x00, 0x7b, 0x76, 0x00, 0x00, 0x16,
+       0x76, 0x01, 0x00, 0x17, 0x76, 0x02, 0x00, 0x1a,
+       0x76, 0x03, 0x00, 0x1b, 0x76, 0x04, 0x00, 0x1c,
+       0x76, 0x05, 0x00, 0x1d, 0x71, 0x81, 0x00, 0x17,
+       0x71, 0xe7, 0x00, 0x06, 0x00, 0x11, 0x10, 0x81,
+       0xf8, 0x44, 0x14, 0xdf, 0xf9, 0x80, 0x16, 0x53,
+       0xf6, 0xb8, 0xfb, 0x80, 0x15, 0x85, 0xf0, 0x20,
+       0xff, 0xff, 0xf6, 0xb8, 0xfb, 0x80, 0x16, 0x08,
+       0xf0, 0x20, 0xff, 0xff, 0x77, 0x11, 0x00, 0x7b,
+       0x71, 0x81, 0x00, 0x17, 0x76, 0xe7, 0x00, 0x06,
+       0x00, 0x01, 0x48, 0x17, 0x77, 0x16, 0x00, 0x00,
+       0x77, 0x10, 0x00, 0x04, 0x77, 0x15, 0x00, 0x03,
+       0x77, 0x14, 0x00, 0x02, 0x77, 0x13, 0x00, 0x01,
+       0xf0, 0x00, 0x00, 0x39, 0x76, 0xe7, 0x00, 0x08,
+       0x00, 0x1f, 0x76, 0xe7, 0x00, 0x07, 0x00, 0x00,
+       0x88, 0x0e, 0x77, 0x1a, 0x00, 0x05, 0x48, 0x17,
+       0xf0, 0x00, 0x00, 0x09, 0x88, 0x12, 0x48, 0x18,
+       0x88, 0x19, 0xe8, 0x00, 0xf0, 0x72, 0x15, 0x2c,
+       0x73, 0x19, 0x00, 0x11, 0x76, 0x82, 0x00, 0x00,
+       0x11, 0x91, 0x73, 0x11, 0x00, 0x19, 0x70, 0xe2,
+       0x00, 0x03, 0x00, 0x16, 0x70, 0xe2, 0x00, 0x04,
+       0x00, 0x13, 0x70, 0xe2, 0x00, 0x05, 0x00, 0x14,
+       0x81, 0xe2, 0x00, 0x01, 0x70, 0xe2, 0x00, 0x06,
+       0x00, 0x15, 0x70, 0xe2, 0x00, 0x07, 0x00, 0x10,
+       0x80, 0xe2, 0x00, 0x02, 0x73, 0x0e, 0x00, 0x11,
+       0xf1, 0x00, 0x00, 0x1e, 0x6d, 0xee, 0x00, 0x05,
+       0x6d, 0xeb, 0x00, 0x05, 0x6d, 0xec, 0x00, 0x05,
+       0x6d, 0xed, 0x00, 0x05, 0x6d, 0xe8, 0x00, 0x05,
+       0xf0, 0x00, 0x00, 0x01, 0x81, 0x91, 0x6d, 0xea,
+       0x00, 0x08, 0x73, 0x11, 0x00, 0x0e, 0xee, 0x07,
+       0x76, 0xe7, 0x00, 0x41, 0x00, 0x24, 0x76, 0xe7,
+       0x00, 0x46, 0x00, 0x25, 0x76, 0xe7, 0x00, 0x4b,
+       0x00, 0x26, 0x76, 0xe7, 0x00, 0x50, 0x00, 0x27,
+       0x8a, 0x17, 0x8a, 0x16, 0x8a, 0x11, 0xf4, 0xe4,
+       0x4a, 0x11, 0x4a, 0x16, 0xee, 0xfe, 0x88, 0x11,
+       0x56, 0x06, 0x4e, 0x00, 0xf9, 0x80, 0x16, 0xa2,
+       0xf7, 0xb8, 0x10, 0xf8, 0x00, 0x11, 0xf0, 0x10,
+       0xff, 0xff, 0xfa, 0x45, 0x15, 0x60, 0x77, 0x16,
+       0xff, 0xff, 0x77, 0x12, 0x00, 0x7b, 0x49, 0x11,
+       0x10, 0x82, 0xf6, 0x03, 0xf0, 0x00, 0x00, 0x09,
+       0x88, 0x11, 0xf4, 0x95, 0xf4, 0x95, 0x10, 0x81,
+       0xf8, 0x44, 0x15, 0x71, 0xf2, 0x73, 0x15, 0x71,
+       0xf4, 0x95, 0xe7, 0x16, 0x77, 0x11, 0x00, 0x7b,
+       0x10, 0x81, 0xf0, 0x00, 0x00, 0x09, 0x88, 0x11,
+       0xf4, 0x95, 0x77, 0x12, 0x00, 0x06, 0x10, 0x81,
+       0xf8, 0x45, 0x15, 0x5c, 0x6e, 0xea, 0xff, 0xff,
+       0x15, 0x69, 0x6d, 0xe9, 0x00, 0x08, 0x76, 0x86,
+       0x00, 0x01, 0xe9, 0x01, 0x56, 0x00, 0xf1, 0x80,
+       0x10, 0xf8, 0x00, 0x0b, 0xf8, 0x45, 0x15, 0x7e,
+       0xfb, 0x80, 0x15, 0x85, 0xf4, 0x95, 0x48, 0x16,
+       0xf9, 0x80, 0x16, 0x9a, 0xee, 0x02, 0x48, 0x16,
+       0x8a, 0x16, 0x8a, 0x11, 0xf4, 0xe4, 0x4a, 0x11,
+       0xee, 0xff, 0xfb, 0x80, 0x16, 0xa2, 0x88, 0x11,
+       0xf4, 0x95, 0x77, 0x10, 0xff, 0xff, 0xf4, 0xa9,
+       0xf8, 0x30, 0x15, 0xc4, 0x10, 0xe1, 0x00, 0x03,
+       0x77, 0x12, 0x00, 0x55, 0x80, 0x82, 0x77, 0x12,
+       0x00, 0x56, 0x76, 0x82, 0x00, 0x00, 0x77, 0x12,
+       0x00, 0x56, 0x76, 0x82, 0x00, 0x00, 0x77, 0x12,
+       0x00, 0x56, 0x76, 0x82, 0x00, 0x00, 0x77, 0x12,
+       0x00, 0x56, 0x76, 0x82, 0x00, 0x00, 0x77, 0x12,
+       0x00, 0x56, 0x76, 0x82, 0x00, 0x00, 0x10, 0xe1,
+       0x00, 0x02, 0xf0, 0x00, 0x00, 0x08, 0x32, 0xf8,
+       0x00, 0x08, 0x77, 0x12, 0x00, 0x54, 0xe8, 0x01,
+       0xf4, 0x82, 0xf4, 0x93, 0x18, 0x82, 0x77, 0x12,
+       0x00, 0x54, 0xf0, 0x40, 0x00, 0x00, 0x80, 0x82,
+       0x10, 0xe1, 0x00, 0x01, 0xf9, 0x80, 0x16, 0x76,
+       0x10, 0xe1, 0x00, 0x01, 0xf9, 0x80, 0x16, 0x66,
+       0xf0, 0x73, 0x16, 0x03, 0x77, 0x11, 0x00, 0x7b,
+       0x71, 0x81, 0x00, 0x11, 0x71, 0xe1, 0x00, 0x07,
+       0x00, 0x12, 0x76, 0x82, 0x00, 0x00, 0x10, 0xe1,
+       0x00, 0x09, 0xf9, 0x80, 0x15, 0x85, 0x77, 0x11,
+       0x00, 0x7b, 0x71, 0x81, 0x00, 0x11, 0x10, 0xe1,
+       0x00, 0x09, 0xfb, 0x80, 0x15, 0x85, 0xf0, 0x00,
+       0x00, 0x08, 0x77, 0x11, 0x00, 0x7b, 0x71, 0x81,
+       0x00, 0x11, 0x10, 0xe1, 0x00, 0x09, 0xfb, 0x80,
+       0x15, 0x85, 0xf0, 0x00, 0x00, 0x10, 0x77, 0x11,
+       0x00, 0x7b, 0x71, 0x81, 0x00, 0x11, 0x10, 0xe1,
+       0x00, 0x09, 0xfb, 0x80, 0x15, 0x85, 0xf0, 0x00,
+       0x00, 0x18, 0x77, 0x11, 0x00, 0x7b, 0x71, 0x81,
+       0x00, 0x11, 0x10, 0xe1, 0x00, 0x09, 0xfb, 0x80,
+       0x15, 0x85, 0xf0, 0x00, 0x00, 0x20, 0x77, 0x11,
+       0x00, 0x7b, 0x71, 0x81, 0x00, 0x11, 0x10, 0xe1,
+       0x00, 0x09, 0xfb, 0x80, 0x15, 0x85, 0xf0, 0x00,
+       0x00, 0x28, 0xf9, 0x80, 0x16, 0x9a, 0xee, 0x01,
+       0x8a, 0x11, 0xf4, 0xe4, 0x4a, 0x11, 0xee, 0xff,
+       0xfb, 0x80, 0x16, 0xa2, 0x88, 0x11, 0xf4, 0x95,
+       0x77, 0x10, 0xff, 0xff, 0xf4, 0xa9, 0xf8, 0x30,
+       0x16, 0x41, 0x77, 0x11, 0x00, 0x55, 0x76, 0x81,
+       0x00, 0x1e, 0x77, 0x11, 0x00, 0x56, 0x76, 0x81,
+       0x00, 0x00, 0x77, 0x11, 0x00, 0x56, 0x76, 0x81,
+       0x00, 0x00, 0x77, 0x11, 0x00, 0x56, 0x76, 0x81,
+       0x00, 0x00, 0x77, 0x11, 0x00, 0x56, 0x76, 0x81,
+       0x00, 0x00, 0x77, 0x11, 0x00, 0x56, 0x76, 0x81,
+       0x00, 0x00, 0x77, 0x11, 0x00, 0x56, 0x76, 0x81,
+       0x00, 0x00, 0x77, 0x11, 0x00, 0x56, 0x76, 0x81,
+       0x00, 0x00, 0x77, 0x11, 0x00, 0x56, 0x76, 0x81,
+       0x00, 0x00, 0x77, 0x11, 0x00, 0x56, 0x76, 0x81,
+       0x00, 0x00, 0x77, 0x11, 0x00, 0x56, 0xf2, 0x73,
+       0x16, 0x4e, 0x76, 0x81, 0x00, 0x00, 0x77, 0x11,
+       0x00, 0x7b, 0x71, 0x81, 0x00, 0x11, 0x71, 0xe1,
+       0x00, 0x07, 0x00, 0x12, 0x76, 0x82, 0x00, 0x00,
+       0x10, 0xe1, 0x00, 0x39, 0xf9, 0x80, 0x16, 0x08,
+       0xf9, 0x80, 0x16, 0x9a, 0xee, 0x01, 0x8a, 0x11,
+       0xf4, 0xe4, 0x4a, 0x11, 0x77, 0x11, 0x00, 0x7b,
+       0x10, 0x81, 0xf0, 0x00, 0x00, 0x04, 0x88, 0x11,
+       0xf4, 0x95, 0xf4, 0x95, 0x10, 0x81, 0xfa, 0x44,
+       0x16, 0x63, 0xf4, 0x95, 0xee, 0xff, 0x76, 0x81,
+       0x00, 0x01, 0xee, 0x01, 0x8a, 0x11, 0xf4, 0xe4,
+       0xf0, 0x10, 0x00, 0x10, 0x4a, 0x11, 0x32, 0xf8,
+       0x00, 0x08, 0xee, 0xff, 0x77, 0x11, 0x00, 0x01,
+       0xe8, 0x01, 0xee, 0x01, 0xf4, 0x82, 0x1a, 0x81,
+       0x80, 0x81, 0x8a, 0x11, 0xf4, 0x95, 0xf4, 0xe4,
+       0xf0, 0x10, 0x00, 0x10, 0x4a, 0x11, 0x32, 0xf8,
+       0x00, 0x08, 0xee, 0xff, 0xe8, 0x01, 0x77, 0x11,
+       0x00, 0x00, 0xf4, 0x82, 0xee, 0x01, 0xf4, 0x93,
+       0x18, 0x81, 0x80, 0x81, 0x8a, 0x11, 0xf4, 0x95,
+       0xf4, 0xe4, 0x4a, 0x11, 0xf0, 0x10, 0x00, 0x10,
+       0x77, 0x11, 0x00, 0x00, 0x32, 0xf8, 0x00, 0x08,
+       0xee, 0xff, 0x11, 0x81, 0xe8, 0x01, 0xee, 0x01,
+       0x77, 0x11, 0x00, 0x00, 0xf4, 0x82, 0xf2, 0xa0,
+       0x80, 0x81, 0x8a, 0x11, 0xf4, 0x95, 0xf4, 0xe4,
+       0xf2, 0x73, 0x16, 0x9e, 0xf6, 0xbb, 0xf4, 0x95,
+       0xf4, 0x95, 0xf4, 0x95, 0xf4, 0x95, 0xf4, 0xe4,
+       0xf2, 0x73, 0x16, 0xa6, 0xf7, 0xbb, 0xf4, 0x95,
+       0xf4, 0x95, 0xf4, 0x95, 0xf4, 0x95, 0xf4, 0xe4,
+       0x4a, 0x11, 0x4a, 0x16, 0xf4, 0x95, 0x71, 0x04,
+       0x00, 0x16, 0xfb, 0x80, 0x16, 0xa2, 0x88, 0x11,
+       0xf4, 0x95, 0x71, 0xe1, 0x00, 0x05, 0x00, 0x12,
+       0x76, 0x82, 0x00, 0x0e, 0x10, 0xe6, 0x00, 0x0e,
+       0x71, 0xe1, 0x00, 0x06, 0x00, 0x12, 0x80, 0x82,
+       0x71, 0xe1, 0x00, 0x05, 0x00, 0x12, 0x76, 0x82,
+       0x00, 0x0d, 0x71, 0xe1, 0x00, 0x06, 0x00, 0x12,
+       0x10, 0xe6, 0x00, 0x0d, 0x80, 0x82, 0x71, 0xe1,
+       0x00, 0x05, 0x00, 0x12, 0x76, 0x82, 0x00, 0x0c,
+       0x10, 0xe6, 0x00, 0x0c, 0x71, 0xe1, 0x00, 0x06,
+       0x00, 0x12, 0x80, 0x82, 0x71, 0xe1, 0x00, 0x05,
+       0x00, 0x12, 0x76, 0x82, 0x00, 0x0b, 0x10, 0xe6,
+       0x00, 0x0b, 0x71, 0xe1, 0x00, 0x06, 0x00, 0x12,
+       0x80, 0x82, 0x71, 0xe1, 0x00, 0x05, 0x00, 0x12,
+       0x76, 0x82, 0x00, 0x0a, 0x71, 0xe1, 0x00, 0x06,
+       0x00, 0x12, 0x10, 0xe6, 0x00, 0x0a, 0x80, 0x82,
+       0x71, 0xe1, 0x00, 0x05, 0x00, 0x12, 0x76, 0x82,
+       0x00, 0x09, 0x10, 0xe6, 0x00, 0x09, 0x71, 0xe1,
+       0x00, 0x06, 0x00, 0x12, 0x80, 0x82, 0x71, 0xe1,
+       0x00, 0x05, 0x00, 0x12, 0x76, 0x82, 0x00, 0x08,
+       0x71, 0xe1, 0x00, 0x06, 0x00, 0x12, 0x10, 0xe6,
+       0x00, 0x08, 0x80, 0x82, 0x71, 0xe1, 0x00, 0x05,
+       0x00, 0x12, 0x76, 0x82, 0x00, 0x07, 0x10, 0xe6,
+       0x00, 0x07, 0x71, 0xe1, 0x00, 0x06, 0x00, 0x12,
+       0x80, 0x82, 0x71, 0xe1, 0x00, 0x05, 0x00, 0x12,
+       0x76, 0x82, 0x00, 0x06, 0x71, 0xe1, 0x00, 0x06,
+       0x00, 0x12, 0x10, 0xe6, 0x00, 0x06, 0x80, 0x82,
+       0x71, 0xe1, 0x00, 0x05, 0x00, 0x12, 0x76, 0x82,
+       0x00, 0x05, 0x71, 0xe1, 0x00, 0x06, 0x00, 0x12,
+       0x10, 0xe6, 0x00, 0x05, 0x80, 0x82, 0x71, 0xe1,
+       0x00, 0x05, 0x00, 0x12, 0x76, 0x82, 0x00, 0x04,
+       0x71, 0xe1, 0x00, 0x06, 0x00, 0x12, 0x10, 0xe6,
+       0x00, 0x04, 0x80, 0x82, 0x71, 0xe1, 0x00, 0x05,
+       0x00, 0x12, 0x76, 0x82, 0x00, 0x03, 0x71, 0xe1,
+       0x00, 0x06, 0x00, 0x12, 0x10, 0xe6, 0x00, 0x03,
+       0x80, 0x82, 0x71, 0xe1, 0x00, 0x05, 0x00, 0x12,
+       0x76, 0x82, 0x00, 0x02, 0x10, 0xe6, 0x00, 0x02,
+       0x71, 0xe1, 0x00, 0x06, 0x00, 0x12, 0x80, 0x82,
+       0x71, 0xe1, 0x00, 0x05, 0x00, 0x12, 0x76, 0x82,
+       0x00, 0x01, 0x10, 0xe6, 0x00, 0x01, 0x71, 0xe1,
+       0x00, 0x06, 0x00, 0x12, 0x80, 0x82, 0x71, 0xe1,
+       0x00, 0x05, 0x00, 0x12, 0x76, 0x82, 0x00, 0x00,
+       0x71, 0xe1, 0x00, 0x06, 0x00, 0x13, 0xe7, 0x62,
+       0xe5, 0x01, 0xf9, 0x80, 0x16, 0x9a, 0x8a, 0x16,
+       0x8a, 0x11, 0xf4, 0xe4, 0x4a, 0x11, 0x88, 0x11,
+       0xf4, 0x95, 0xf4, 0x95, 0x71, 0xe1, 0x00, 0x05,
+       0x00, 0x12, 0xee, 0xff, 0x76, 0x82, 0x00, 0x00,
+       0xee, 0x01, 0x71, 0xe1, 0x00, 0x06, 0x00, 0x11,
+       0x69, 0x81, 0x00, 0x01, 0x8a, 0x11, 0xf4, 0x95,
+       0xf4, 0xe4, 0x4a, 0x11, 0x88, 0x11, 0xf4, 0x95,
+       0xf4, 0x95, 0x71, 0xe1, 0x00, 0x05, 0x00, 0x12,
+       0xee, 0xff, 0x76, 0x82, 0x00, 0x01, 0xee, 0x01,
+       0x71, 0xe1, 0x00, 0x06, 0x00, 0x11, 0x69, 0x81,
+       0x00, 0x01, 0x8a, 0x11, 0xf4, 0x95, 0xf4, 0xe4,
+       0x4a, 0x11, 0x77, 0x11, 0x00, 0x7b, 0x10, 0x81,
+       0xf0, 0x00, 0x00, 0x94, 0x88, 0x11, 0xf4, 0x95,
+       0xf4, 0x95, 0x10, 0x81, 0xfa, 0x44, 0x17, 0x9c,
+       0xf4, 0x95, 0xee, 0xff, 0xf9, 0x80, 0x16, 0x53,
+       0x77, 0x11, 0x00, 0x7b, 0x10, 0x81, 0xf0, 0x00,
+       0x00, 0x94, 0x88, 0x11, 0xf4, 0x95, 0xf4, 0x95,
+       0x76, 0x81, 0x00, 0x01, 0xee, 0x01, 0x76, 0xe1,
+       0x00, 0x01, 0x00, 0x00, 0x76, 0xe1, 0x00, 0x02,
+       0x00, 0x21, 0x76, 0xe1, 0x00, 0x03, 0x00, 0x20,
+       0x76, 0xe1, 0x00, 0x04, 0x00, 0x23, 0x76, 0xe1,
+       0x00, 0x05, 0x00, 0x22, 0x76, 0xe1, 0x00, 0x06,
+       0x00, 0x38, 0x76, 0xe1, 0x00, 0x07, 0x00, 0x39,
+       0x76, 0xe1, 0x00, 0x08, 0x00, 0x15, 0x76, 0xe1,
+       0x00, 0x09, 0x00, 0x14, 0x76, 0xe1, 0x00, 0x0a,
+       0x00, 0x00, 0x76, 0xe1, 0x00, 0x0b, 0x00, 0x41,
+       0x76, 0xe1, 0x00, 0x0c, 0x00, 0x40, 0x76, 0xe1,
+       0x00, 0x0d, 0x00, 0x43, 0x76, 0xe1, 0x00, 0x0e,
+       0x00, 0x42, 0x76, 0xe1, 0x00, 0x0f, 0x00, 0x48,
+       0x76, 0xe1, 0x00, 0x10, 0x00, 0x49, 0x76, 0xe1,
+       0x00, 0x11, 0x00, 0x1b, 0x76, 0xe1, 0x00, 0x12,
+       0x00, 0x1a, 0x8a, 0x11, 0xf4, 0x95, 0xf4, 0xe4,
+       0x4a, 0x11, 0xee, 0xfd, 0x88, 0x11, 0x56, 0x06,
+       0x4e, 0x00, 0xf9, 0x80, 0x16, 0xa2, 0x77, 0x12,
+       0x00, 0x7b, 0x77, 0x0e, 0x00, 0x09, 0x10, 0x82,
+       0x28, 0xf8, 0x00, 0x11, 0xf0, 0x00, 0x00, 0x95,
+       0x88, 0x11, 0xf4, 0x95, 0xf4, 0x95, 0x10, 0x81,
+       0xf8, 0x45, 0x17, 0xf0, 0xf2, 0x73, 0x17, 0xfd,
+       0x77, 0x11, 0xff, 0xff, 0x76, 0x81, 0x00, 0x01,
+       0xe9, 0x01, 0x56, 0x00, 0xf1, 0x80, 0x10, 0xf8,
+       0x00, 0x0b, 0xf8, 0x45, 0x17, 0xfd, 0xfb, 0x80,
+       0x18, 0x10, 0xf4, 0x95, 0x48, 0x11, 0xf9, 0x80,
+       0x16, 0x9a, 0xee, 0x03, 0x48, 0x11, 0x8a, 0x11,
+       0xf4, 0x95, 0xf4, 0xe4, 0x4a, 0x11, 0x88, 0x11,
+       0xf4, 0x95, 0xee, 0xff, 0x71, 0xe1, 0x00, 0x01,
+       0x00, 0x11, 0xee, 0x01, 0x10, 0x81, 0x8a, 0x11,
+       0xf4, 0x95, 0xf4, 0xe4, 0x4a, 0x11, 0xee, 0xff,
+       0xfb, 0x80, 0x16, 0xa2, 0x88, 0x11, 0xf4, 0x95,
+       0x77, 0x10, 0xff, 0xff, 0xf4, 0xa9, 0xf8, 0x30,
+       0x18, 0xc3, 0x71, 0xe1, 0x00, 0x05, 0x00, 0x12,
+       0x76, 0x82, 0x00, 0x00, 0x71, 0xe1, 0x00, 0x06,
+       0x00, 0x12, 0x76, 0x82, 0x00, 0x00, 0x71, 0xe1,
+       0x00, 0x05, 0x00, 0x12, 0x76, 0x82, 0x00, 0x01,
+       0x71, 0xe1, 0x00, 0x06, 0x00, 0x12, 0x76, 0x82,
+       0x00, 0x00, 0x71, 0xe1, 0x00, 0x05, 0x00, 0x12,
+       0x76, 0x82, 0x00, 0x02, 0x71, 0xe1, 0x00, 0x06,
+       0x00, 0x12, 0x76, 0x82, 0x00, 0x00, 0x71, 0xe1,
+       0x00, 0x05, 0x00, 0x12, 0x76, 0x82, 0x00, 0x03,
+       0x71, 0xe1, 0x00, 0x06, 0x00, 0x12, 0x76, 0x82,
+       0x00, 0x00, 0x71, 0xe1, 0x00, 0x05, 0x00, 0x12,
+       0x76, 0x82, 0x00, 0x04, 0x71, 0xe1, 0x00, 0x06,
+       0x00, 0x12, 0x76, 0x82, 0x00, 0x00, 0x71, 0xe1,
+       0x00, 0x05, 0x00, 0x12, 0x76, 0x82, 0x00, 0x05,
+       0x71, 0xe1, 0x00, 0x06, 0x00, 0x12, 0x76, 0x82,
+       0x00, 0x00, 0x71, 0xe1, 0x00, 0x05, 0x00, 0x12,
+       0x76, 0x82, 0x00, 0x06, 0x71, 0xe1, 0x00, 0x06,
+       0x00, 0x12, 0x76, 0x82, 0x00, 0x01, 0x71, 0xe1,
+       0x00, 0x05, 0x00, 0x12, 0x76, 0x82, 0x00, 0x07,
+       0x71, 0xe1, 0x00, 0x06, 0x00, 0x12, 0x76, 0x82,
+       0x20, 0x00, 0x71, 0xe1, 0x00, 0x05, 0x00, 0x12,
+       0x76, 0x82, 0x00, 0x08, 0x71, 0xe1, 0x00, 0x06,
+       0x00, 0x12, 0x76, 0x82, 0x00, 0x00, 0x71, 0xe1,
+       0x00, 0x05, 0x00, 0x12, 0x76, 0x82, 0x00, 0x09,
+       0x71, 0xe1, 0x00, 0x06, 0x00, 0x12, 0x76, 0x82,
+       0x00, 0x00, 0x71, 0xe1, 0x00, 0x05, 0x00, 0x12,
+       0x76, 0x82, 0x00, 0x0a, 0x71, 0xe1, 0x00, 0x06,
+       0x00, 0x12, 0x76, 0x82, 0x00, 0x00, 0x71, 0xe1,
+       0x00, 0x05, 0x00, 0x12, 0x76, 0x82, 0x00, 0x0b,
+       0x71, 0xe1, 0x00, 0x06, 0x00, 0x12, 0x76, 0x82,
+       0x00, 0x00, 0x71, 0xe1, 0x00, 0x05, 0x00, 0x12,
+       0x76, 0x82, 0x00, 0x0c, 0x71, 0xe1, 0x00, 0x06,
+       0x00, 0x12, 0x76, 0x82, 0x00, 0x00, 0x71, 0xe1,
+       0x00, 0x05, 0x00, 0x12, 0x76, 0x82, 0x00, 0x0d,
+       0x71, 0xe1, 0x00, 0x06, 0x00, 0x12, 0x76, 0x82,
+       0x00, 0x00, 0x71, 0xe1, 0x00, 0x05, 0x00, 0x12,
+       0x76, 0x82, 0x00, 0x0e, 0x71, 0xe1, 0x00, 0x06,
+       0x00, 0x12, 0x76, 0x82, 0x00, 0x00, 0x10, 0xe1,
+       0x00, 0x07, 0xf9, 0x80, 0x16, 0x76, 0x10, 0xe1,
+       0x00, 0x08, 0xf9, 0x80, 0x16, 0x76, 0x10, 0xe1,
+       0x00, 0x07, 0xf9, 0x80, 0x16, 0x66, 0x10, 0xe1,
+       0x00, 0x08, 0xf9, 0x80, 0x16, 0x66, 0xf0, 0x73,
+       0x18, 0xd1, 0x77, 0x11, 0x00, 0x7b, 0x10, 0x81,
+       0xfb, 0x80, 0x18, 0x10, 0xf0, 0x00, 0x00, 0x95,
+       0x77, 0x11, 0x00, 0x7b, 0x10, 0x81, 0xfb, 0x80,
+       0x18, 0x10, 0xf0, 0x00, 0x00, 0x9e, 0xf9, 0x80,
+       0x16, 0x9a, 0xee, 0x01, 0x8a, 0x11, 0xf4, 0xe4,
+       0x4a, 0x11, 0x88, 0x11, 0xee, 0xff, 0xf4, 0x95,
+       0x10, 0x04, 0x71, 0xe1, 0x00, 0x03, 0x00, 0x11,
+       0xee, 0x01, 0x80, 0x81, 0x8a, 0x11, 0xf4, 0x95,
+       0xf4, 0xe4, 0x4a, 0x11, 0x4a, 0x16, 0xf4, 0x95,
+       0x71, 0x04, 0x00, 0x16, 0xfb, 0x80, 0x16, 0xa2,
+       0x88, 0x11, 0xf4, 0x95, 0x71, 0xe1, 0x00, 0x02,
+       0x00, 0x12, 0x76, 0x82, 0x00, 0x10, 0x10, 0xe6,
+       0x00, 0x01, 0x71, 0xe1, 0x00, 0x03, 0x00, 0x12,
+       0x80, 0x82, 0x71, 0xe1, 0x00, 0x04, 0x00, 0x12,
+       0x10, 0xe6, 0x00, 0x02, 0x80, 0x82, 0xe7, 0x62,
+       0x71, 0xe1, 0x00, 0x02, 0x00, 0x13, 0xe5, 0x01,
+       0xf9, 0x80, 0x16, 0x9a, 0x8a, 0x16, 0x8a, 0x11,
+       0xf4, 0xe4, 0x4a, 0x11, 0x88, 0x11, 0xee, 0xff,
+       0xee, 0x01, 0x10, 0xe1, 0x00, 0x01, 0x8a, 0x11,
+       0xf4, 0x95, 0xf4, 0xe4, 0x4a, 0x11, 0x77, 0x11,
+       0x00, 0x7b, 0x10, 0x81, 0xf0, 0x00, 0x00, 0xb3,
+       0x88, 0x11, 0xf4, 0x95, 0xf4, 0x95, 0x10, 0x81,
+       0xfa, 0x44, 0x19, 0x2a, 0xf4, 0x95, 0xee, 0xff,
+       0xf9, 0x80, 0x16, 0x53, 0x77, 0x11, 0x00, 0x7b,
+       0x10, 0x81, 0xf0, 0x00, 0x00, 0xb3, 0x88, 0x11,
+       0xf4, 0x95, 0xf4, 0x95, 0x76, 0x81, 0x00, 0x01,
+       0xee, 0x01, 0x76, 0xe1, 0x00, 0x01, 0x00, 0x00,
+       0x76, 0xe1, 0x00, 0x02, 0x00, 0x13, 0x76, 0xe1,
+       0x00, 0x03, 0x00, 0x26, 0x76, 0xe1, 0x00, 0x04,
+       0x00, 0x25, 0x76, 0xe1, 0x00, 0x05, 0x00, 0x24,
+       0x76, 0xe1, 0x00, 0x06, 0x00, 0x00, 0x76, 0xe1,
+       0x00, 0x07, 0x00, 0x17, 0x76, 0xe1, 0x00, 0x08,
+       0x00, 0x32, 0x76, 0xe1, 0x00, 0x09, 0x00, 0x31,
+       0x76, 0xe1, 0x00, 0x0a, 0x00, 0x30, 0x8a, 0x11,
+       0xf4, 0x95, 0xf4, 0xe4, 0x4a, 0x11, 0x4a, 0x16,
+       0x4a, 0x17, 0xee, 0xff, 0xf4, 0x95, 0x71, 0x06,
+       0x00, 0x17, 0xfb, 0x80, 0x16, 0xa2, 0x88, 0x11,
+       0xf4, 0x95, 0xf7, 0xb8, 0x10, 0xf8, 0x00, 0x11,
+       0xf0, 0x10, 0xff, 0xff, 0xfa, 0x45, 0x19, 0x73,
+       0x77, 0x16, 0xff, 0xff, 0x77, 0x12, 0x00, 0x7b,
+       0x77, 0x0e, 0x00, 0x05, 0x10, 0x82, 0x28, 0xf8,
+       0x00, 0x11, 0xf0, 0x00, 0x00, 0xb4, 0x88, 0x11,
+       0xf4, 0x95, 0xf4, 0x95, 0x10, 0x81, 0xf8, 0x44,
+       0x19, 0x84, 0xf2, 0x73, 0x19, 0x84, 0xf4, 0x95,
+       0xe7, 0x16, 0x77, 0x11, 0x00, 0x7b, 0x10, 0x81,
+       0xf0, 0x00, 0x00, 0xb4, 0x88, 0x11, 0xf4, 0x95,
+       0x77, 0x12, 0x00, 0x02, 0x10, 0x81, 0xf8, 0x45,
+       0x19, 0x6f, 0x6e, 0xea, 0xff, 0xff, 0x19, 0x7c,
+       0x6d, 0xe9, 0x00, 0x05, 0x61, 0xf8, 0x00, 0x17,
+       0x00, 0x01, 0xfa, 0x20, 0x19, 0x8f, 0x76, 0x86,
+       0x00, 0x01, 0xfb, 0x80, 0x19, 0x97, 0xf4, 0x95,
+       0x48, 0x16, 0xf9, 0x80, 0x16, 0x9a, 0xee, 0x01,
+       0x8a, 0x17, 0x48, 0x16, 0x8a, 0x16, 0x8a, 0x11,
+       0xf4, 0xe4, 0x4a, 0x11, 0xee, 0xff, 0xfb, 0x80,
+       0x16, 0xa2, 0x88, 0x11, 0xf4, 0x95, 0x77, 0x10,
+       0xff, 0xff, 0xf4, 0xa9, 0xf8, 0x30, 0x19, 0xcc,
+       0x71, 0xe1, 0x00, 0x02, 0x00, 0x12, 0x69, 0x82,
+       0x00, 0x10, 0x71, 0xe1, 0x00, 0x02, 0x00, 0x12,
+       0x68, 0x82, 0xf7, 0xff, 0x71, 0xe1, 0x00, 0x02,
+       0x00, 0x12, 0x68, 0x82, 0xfb, 0xff, 0x71, 0xe1,
+       0x00, 0x02, 0x00, 0x12, 0x68, 0x82, 0xff, 0xf0,
+       0x71, 0xe1, 0x00, 0x03, 0x00, 0x12, 0x76, 0x82,
+       0xff, 0xff, 0x71, 0xe1, 0x00, 0x04, 0x00, 0x12,
+       0x76, 0x82, 0xff, 0xff, 0x71, 0xe1, 0x00, 0x02,
+       0x00, 0x12, 0x69, 0x82, 0x00, 0x20, 0x71, 0xe1,
+       0x00, 0x02, 0x00, 0x11, 0xf2, 0x73, 0x19, 0xda,
+       0x68, 0x81, 0xff, 0xef, 0x77, 0x11, 0x00, 0x7b,
+       0x10, 0x81, 0xfb, 0x80, 0x19, 0x97, 0xf0, 0x00,
+       0x00, 0xb4, 0x77, 0x11, 0x00, 0x7b, 0x10, 0x81,
+       0xfb, 0x80, 0x19, 0x97, 0xf0, 0x00, 0x00, 0xb9,
+       0xf9, 0x80, 0x16, 0x9a, 0xee, 0x01, 0x8a, 0x11,
+       0xf4, 0xe4, 0x00, 0xa4, 0x00, 0x00, 0x19, 0xdf,
+       0x00, 0x01, 0x2a, 0xe6, 0x00, 0x00, 0x00, 0x01,
+       0x2a, 0xe7, 0x00, 0x00, 0x00, 0x03, 0x2a, 0x12,
+       0x0c, 0x01, 0xc3, 0x4f, 0x00, 0x00, 0x00, 0x01,
+       0x2a, 0x15, 0x00, 0x00, 0x00, 0x02, 0x2a, 0x16,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x19, 0x2a, 0x5d,
+       0x00, 0x43, 0x00, 0x6f, 0x00, 0x70, 0x00, 0x79,
+       0x00, 0x72, 0x00, 0x69, 0x00, 0x67, 0x00, 0x68,
+       0x00, 0x74, 0x00, 0x20, 0x00, 0x54, 0x00, 0x65,
+       0x00, 0x63, 0x00, 0x68, 0x00, 0x6e, 0x00, 0x6f,
+       0x00, 0x54, 0x00, 0x72, 0x00, 0x65, 0x00, 0x6e,
+       0x00, 0x64, 0x00, 0x20, 0x00, 0x41, 0x00, 0x47,
+       0x00, 0x00, 0x00, 0x04, 0x2a, 0x76, 0x00, 0x30,
+       0x00, 0x2e, 0x00, 0x30, 0x00, 0x00, 0x00, 0x0c,
+       0x2a, 0x7a, 0x00, 0x46, 0x00, 0x65, 0x00, 0x62,
+       0x00, 0x20, 0x00, 0x32, 0x00, 0x37, 0x00, 0x20,
+       0x00, 0x32, 0x00, 0x30, 0x00, 0x30, 0x00, 0x31,
+       0x00, 0x00, 0x00, 0x09, 0x2a, 0x86, 0x00, 0x31,
+       0x00, 0x34, 0x00, 0x3a, 0x00, 0x33, 0x00, 0x35,
+       0x00, 0x3a, 0x00, 0x33, 0x00, 0x33, 0x00, 0x00,
+       0x00, 0x0f, 0x2a, 0x8f, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x01, 0x2a, 0x9e, 0x00, 0x00,
+       0x00, 0x01, 0x2a, 0x9f, 0x00, 0x00, 0x00, 0x01,
+       0x2a, 0xa0, 0x00, 0x00, 0x00, 0x01, 0x2a, 0xa1,
+       0x00, 0x00, 0x00, 0x01, 0x2a, 0xa2, 0x00, 0x00,
+       0x00, 0x01, 0x29, 0x7e, 0x00, 0x00, 0x00, 0x02,
+       0x29, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01,
+       0x29, 0x82, 0xff, 0xff, 0x00, 0x01, 0x2a, 0xa7,
+       0x00, 0x00, 0x00, 0x05, 0x2a, 0xa8, 0x71, 0x41,
+       0x20, 0x00, 0x20, 0x00, 0x00, 0x23, 0x04, 0x00,
+       0x00, 0x0a, 0x2a, 0xad, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x0f, 0x2a, 0xb7, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x40, 0x00, 0xa0, 0x82, 0x40,
+       0x00, 0x08, 0x30, 0x7f, 0x00, 0x80, 0x01, 0x80,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x01, 0x27, 0x6e, 0x00, 0x00,
+       0x00, 0x01, 0x27, 0x6f, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x09, 0x00, 0x00, 0x1a, 0x83, 0x04, 0xe8,
+       0x04, 0xcf, 0x04, 0xc5, 0x04, 0xba, 0x04, 0xb0,
+       0x04, 0xac, 0x04, 0x9c, 0x04, 0x8c, 0x04, 0x81,
+       0x00, 0x78, 0x00, 0x00, 0x01, 0x00, 0xf2, 0x73,
+       0x07, 0xef, 0xf4, 0x95, 0xf4, 0x95, 0xf2, 0x73,
+       0x07, 0xef, 0xf4, 0x95, 0xf4, 0x95, 0xf2, 0x73,
+       0x07, 0xef, 0xf4, 0x95, 0xf4, 0x95, 0xf2, 0x73,
+       0x07, 0xef, 0xf4, 0x95, 0xf4, 0x95, 0xf2, 0x73,
+       0x07, 0xef, 0xf4, 0x95, 0xf4, 0x95, 0xf2, 0x73,
+       0x07, 0xef, 0xf4, 0x95, 0xf4, 0x95, 0xf2, 0x73,
+       0x07, 0xef, 0xf4, 0x95, 0xf4, 0x95, 0xf2, 0x73,
+       0x07, 0xef, 0xf4, 0x95, 0xf4, 0x95, 0xf2, 0x73,
+       0x07, 0xef, 0xf4, 0x95, 0xf4, 0x95, 0xf2, 0x73,
+       0x07, 0xef, 0xf4, 0x95, 0xf4, 0x95, 0xf2, 0x73,
+       0x07, 0xef, 0xf4, 0x95, 0xf4, 0x95, 0xf2, 0x73,
+       0x07, 0xef, 0xf4, 0x95, 0xf4, 0x95, 0xf2, 0x73,
+       0x07, 0xef, 0xf4, 0x95, 0xf4, 0x95, 0xf2, 0x73,
+       0x07, 0xef, 0xf4, 0x95, 0xf4, 0x95, 0xf2, 0x73,
+       0x07, 0xef, 0xf4, 0x95, 0xf4, 0x95, 0xf2, 0x73,
+       0x07, 0xef, 0xf4, 0x95, 0xf4, 0x95, 0xf2, 0x73,
+       0x07, 0xaa, 0xf4, 0x95, 0xf4, 0x95, 0xf2, 0x73,
+       0x07, 0xef, 0xf4, 0x95, 0xf4, 0x95, 0xf2, 0x73,
+       0x07, 0xef, 0xf4, 0x95, 0xf4, 0x95, 0xf2, 0x73,
+       0x02, 0x23, 0xf4, 0x95, 0xf4, 0x95, 0xf2, 0x73,
+       0x07, 0xef, 0xf4, 0x95, 0xf4, 0x95, 0xf2, 0x73,
+       0x07, 0xef, 0xf4, 0x95, 0xf4, 0x95, 0xf2, 0x73,
+       0x07, 0xef, 0xf4, 0x95, 0xf4, 0x95, 0xf2, 0x73,
+       0x07, 0xef, 0xf4, 0x95, 0xf4, 0x95, 0xf2, 0x73,
+       0x07, 0xef, 0xf4, 0x95, 0xf4, 0x95, 0xf2, 0x73,
+       0x07, 0xef, 0xf4, 0x95, 0xf4, 0x95, 0xf2, 0x73,
+       0x05, 0xe5, 0xf4, 0x95, 0xf4, 0x95, 0xf2, 0x73,
+       0x02, 0xb5, 0xf4, 0x95, 0xf4, 0x95, 0xf2, 0x73,
+       0x0e, 0x33, 0xf4, 0x95, 0xf4, 0x95, 0xf2, 0x73,
+       0x07, 0xef, 0xf4, 0x95, 0xf4, 0x95, 0x00, 0x00,
 };
 
index 832d179f26fa417e541d1cf4701256d7aa2e20ea..8abc21890129f18867a12ed07a5dc6b9b478440e 100644 (file)
@@ -1203,7 +1203,7 @@ static int ttusb_init_rc(struct ttusb_dec *dec)
        input_dev->keycode = rc_keys;
 
        for (i = 0; i < ARRAY_SIZE(rc_keys); i++)
-                set_bit(rc_keys[i], input_dev->keybit);
+               set_bit(rc_keys[i], input_dev->keybit);
 
        input_register_device(input_dev);
 
@@ -1529,7 +1529,7 @@ static void ttusb_dec_exit_rc(struct ttusb_dec *dec)
        usb_free_urb(dec->irq_urb);
 
        usb_buffer_free(dec->udev,IRQ_PACKET_SIZE,
-                          dec->irq_buffer, dec->irq_dma_handle);
+                          dec->irq_buffer, dec->irq_dma_handle);
 
        if (dec->rc_input_dev) {
                input_unregister_device(dec->rc_input_dev);
index cc4a723e24db25970fa29f75c07a2235d84881a2..fc87efc5049c0c64ef3e660393ef042840e84a8a 100644 (file)
@@ -188,7 +188,7 @@ config VIDEO_ZORAN
 
          To compile this driver as a module, choose M here: the
          module will be called zr36067.
+
 config VIDEO_ZORAN_BUZ
        tristate "Iomega Buz support"
        depends on VIDEO_ZORAN
@@ -204,8 +204,8 @@ config VIDEO_ZORAN_DC10
 
 config VIDEO_ZORAN_DC30
        tristate "Pinnacle/Miro DC30(+) support"
-       depends on VIDEO_ZORAN
-       help
+       depends on VIDEO_ZORAN
+       help
          Support for the Pinnacle/Miro DC30(+) MJPEG capture/playback
          card. This also supports really old DC10 cards based on the
          zr36050 MJPEG codec and zr36016 VFE.
@@ -260,7 +260,7 @@ config VIDEO_MXB
        ---help---
          This is a video4linux driver for the 'Multimedia eXtension Board'
          TV card by Siemens-Nixdorf.
-         
+
          To compile this driver as a module, choose M here: the
          module will be called mxb.
 
@@ -274,7 +274,7 @@ config VIDEO_DPC
          for SAA7146 bases boards, so if you have some unsupported
          saa7146 based, analog video card, chances are good that it
          will work with this skeleton driver.
-         
+
          To compile this driver as a module, choose M here: the
          module will be called dpc7146.
 
@@ -285,7 +285,7 @@ config VIDEO_HEXIUM_ORION
        ---help---
          This is a video4linux driver for the Hexium HV-PCI6 and
          Orion frame grabber cards by Hexium.
-         
+
          To compile this driver as a module, choose M here: the
          module will be called hexium_orion.
 
@@ -297,7 +297,7 @@ config VIDEO_HEXIUM_GEMINI
          This is a video4linux driver for the Hexium Gemini frame
          grabber card by Hexium. Please note that the Gemini Dual
          card is *not* fully supported.
-         
+
          To compile this driver as a module, choose M here: the
          module will be called hexium_gemini.
 
index e4063950ae57d7782ac7ce8d6d71f862acf55372..3ca1d768bfd3b4bb4da818725caa5bf9fa0970a8 100644 (file)
@@ -231,18 +231,18 @@ bt832_command(struct i2c_client *client, unsigned int cmd, void *arg)
 
 static struct i2c_driver driver = {
        .owner          = THIS_MODULE,
-        .name           = "i2c bt832 driver",
-        .id             = -1, /* FIXME */
-        .flags          = I2C_DF_NOTIFY,
-        .attach_adapter = bt832_probe,
-        .detach_client  = bt832_detach,
-        .command        = bt832_command,
+       .name           = "i2c bt832 driver",
+       .id             = -1, /* FIXME */
+       .flags          = I2C_DF_NOTIFY,
+       .attach_adapter = bt832_probe,
+       .detach_client  = bt832_detach,
+       .command        = bt832_command,
 };
 static struct i2c_client client_template =
 {
        .name       = "bt832",
        .flags      = I2C_CLIENT_ALLOW_USE,
-        .driver     = &driver,
+       .driver     = &driver,
 };
 
 
index 3c58a2a68906003498703f9e3eac1cae92643799..1ddf9ba613ef96c3e8b142dd41d322c02391cb3c 100644 (file)
@@ -727,71 +727,71 @@ void free_btres(struct bttv *btv, struct bttv_fh *fh, int bits)
 
 static void set_pll_freq(struct bttv *btv, unsigned int fin, unsigned int fout)
 {
-        unsigned char fl, fh, fi;
+       unsigned char fl, fh, fi;
 
-        /* prevent overflows */
-        fin/=4;
-        fout/=4;
+       /* prevent overflows */
+       fin/=4;
+       fout/=4;
 
-        fout*=12;
-        fi=fout/fin;
+       fout*=12;
+       fi=fout/fin;
 
-        fout=(fout%fin)*256;
-        fh=fout/fin;
+       fout=(fout%fin)*256;
+       fh=fout/fin;
 
-        fout=(fout%fin)*256;
-        fl=fout/fin;
+       fout=(fout%fin)*256;
+       fl=fout/fin;
 
-        btwrite(fl, BT848_PLL_F_LO);
-        btwrite(fh, BT848_PLL_F_HI);
-        btwrite(fi|BT848_PLL_X, BT848_PLL_XCI);
+       btwrite(fl, BT848_PLL_F_LO);
+       btwrite(fh, BT848_PLL_F_HI);
+       btwrite(fi|BT848_PLL_X, BT848_PLL_XCI);
 }
 
 static void set_pll(struct bttv *btv)
 {
-        int i;
+       int i;
 
-        if (!btv->pll.pll_crystal)
-                return;
+       if (!btv->pll.pll_crystal)
+               return;
 
        if (btv->pll.pll_ofreq == btv->pll.pll_current) {
                dprintk("bttv%d: PLL: no change required\n",btv->c.nr);
-                return;
-        }
+               return;
+       }
 
-        if (btv->pll.pll_ifreq == btv->pll.pll_ofreq) {
-                /* no PLL needed */
-                if (btv->pll.pll_current == 0)
-                        return;
+       if (btv->pll.pll_ifreq == btv->pll.pll_ofreq) {
+               /* no PLL needed */
+               if (btv->pll.pll_current == 0)
+                       return;
                bttv_printk(KERN_INFO "bttv%d: PLL can sleep, using XTAL (%d).\n",
-                           btv->c.nr,btv->pll.pll_ifreq);
-                btwrite(0x00,BT848_TGCTRL);
-                btwrite(0x00,BT848_PLL_XCI);
-                btv->pll.pll_current = 0;
-                return;
-        }
+                       btv->c.nr,btv->pll.pll_ifreq);
+               btwrite(0x00,BT848_TGCTRL);
+               btwrite(0x00,BT848_PLL_XCI);
+               btv->pll.pll_current = 0;
+               return;
+       }
 
        bttv_printk(KERN_INFO "bttv%d: PLL: %d => %d ",btv->c.nr,
-                   btv->pll.pll_ifreq, btv->pll.pll_ofreq);
+               btv->pll.pll_ifreq, btv->pll.pll_ofreq);
        set_pll_freq(btv, btv->pll.pll_ifreq, btv->pll.pll_ofreq);
 
-        for (i=0; i<10; i++) {
+       for (i=0; i<10; i++) {
                /*  Let other people run while the PLL stabilizes */
                bttv_printk(".");
                msleep(10);
 
-                if (btread(BT848_DSTATUS) & BT848_DSTATUS_PLOCK) {
+               if (btread(BT848_DSTATUS) & BT848_DSTATUS_PLOCK) {
                        btwrite(0,BT848_DSTATUS);
-                } else {
-                        btwrite(0x08,BT848_TGCTRL);
-                        btv->pll.pll_current = btv->pll.pll_ofreq;
+               } else {
+                       btwrite(0x08,BT848_TGCTRL);
+                       btv->pll.pll_current = btv->pll.pll_ofreq;
                        bttv_printk(" ok\n");
-                        return;
-                }
-        }
-        btv->pll.pll_current = -1;
+                       return;
+               }
+       }
+       btv->pll.pll_current = -1;
        bttv_printk("failed\n");
-        return;
+       return;
 }
 
 /* used to switch between the bt848's analog/digital video capture modes */
@@ -1964,7 +1964,7 @@ static int setup_window(struct bttv_fh *fh, struct bttv *btv,
        }
 
        down(&fh->cap.lock);
-       kfree(fh->ov.clips);
+               kfree(fh->ov.clips);
        fh->ov.clips    = clips;
        fh->ov.nclips   = n;
 
@@ -2758,7 +2758,7 @@ static int bttv_do_ioctl(struct inode *inode, struct file *file,
                        fh->ov.w.height = fb->fmt.height;
                        btv->init.ov.w.width  = fb->fmt.width;
                        btv->init.ov.w.height = fb->fmt.height;
-                       kfree(fh->ov.clips);
+                               kfree(fh->ov.clips);
                        fh->ov.clips = NULL;
                        fh->ov.nclips = 0;
 
index 3aa9c6e4fc33b678dd0997cd58d63a8d0dcd7a49..1e6a5632c3c71a48ca479d69efdc4514376608d0 100644 (file)
@@ -45,6 +45,7 @@
 #include <media/tveeprom.h>
 #include <media/ir-common.h>
 
+
 #include "bt848.h"
 #include "bttv.h"
 #include "btcx-risc.h"
index 4ae3f78cccf2f7fdc512eb38779e25ab003753e5..74e57a53116ff58d5b5bbecc9ad7f9ef3f977db8 100644 (file)
@@ -616,6 +616,8 @@ static int blackbird_load_firmware(struct cx8802_dev *dev)
 
        retval = request_firmware(&firmware, BLACKBIRD_FIRM_ENC_FILENAME,
                                  &dev->pci->dev);
+
+
        if (retval != 0) {
                dprintk(0, "ERROR: Hotplug firmware request failed (%s).\n",
                        BLACKBIRD_FIRM_ENC_FILENAME);
index 24651661630abe64f9bc990a5c535774f047302c..951709aa88ba37e77fe63f901162736f0306d300 100644 (file)
@@ -567,6 +567,7 @@ struct cx88_board cx88_boards[] = {
                .radio_type     = UNSET,
                .tuner_addr     = ADDR_UNSET,
                .radio_addr     = ADDR_UNSET,
+               .tda9887_conf   = TDA9887_PRESENT,
                .input          = {{
                        .type   = CX88_VMUX_TELEVISION,
                        .vmux   = 0,
@@ -711,6 +712,7 @@ struct cx88_board cx88_boards[] = {
                .radio_type     = UNSET,
                .tuner_addr     = ADDR_UNSET,
                .radio_addr     = ADDR_UNSET,
+               .tda9887_conf   = TDA9887_PRESENT,
                .input          = {{
                        .type   = CX88_VMUX_TELEVISION,
                        .vmux   = 0,
index 38b12ebaa49e0d4ac51e0a5ce2c3e997584d9c79..461019dca90101262f502c6dc44dcfea45882b27 100644 (file)
@@ -453,7 +453,6 @@ int cx88_ir_init(struct cx88_core *core, struct pci_dev *pci)
                input_dev->id.product = pci->device;
        }
        input_dev->cdev.dev = &pci->dev;
-
        /* record handles to ourself */
        ir->core = core;
        core->ir = ir;
@@ -586,7 +585,6 @@ void cx88_ir_irq(struct cx88_core *core)
 MODULE_AUTHOR("Gerd Knorr, Pavel Machek, Chris Pascoe");
 MODULE_DESCRIPTION("input driver for cx88 GPIO-based IR remote controls");
 MODULE_LICENSE("GPL");
-
 /*
  * Local variables:
  * c-basic-offset: 8
index 27fb080fd7aaa61a999e3ed1a485a5979b8046d4..77beafc5c32764c81d67f89bdf3cfd784935a842 100644 (file)
@@ -411,7 +411,6 @@ struct cx8802_dev {
        struct videobuf_dvb        dvb;
        void*                      fe_handle;
        int                        (*fe_release)(void *handle);
-
        /* for switching modulation types */
        unsigned char              ts_gen_cntrl;
 
index 9f6e5e5355a11bb5b58dbfbea5f3801516533d84..e8a1c224756731173e68c5eef407a283e53e5f2e 100644 (file)
@@ -39,7 +39,7 @@ MODULE_PARM_DESC(core_debug,"enable debug messages [core]");
 #define em28xx_coredbg(fmt, arg...) do {\
        if (core_debug) \
                printk(KERN_INFO "%s %s :"fmt, \
-                        dev->name, __FUNCTION__ , ##arg); } while (0)
+                        dev->name, __FUNCTION__, ##arg); } while (0)
 
 static unsigned int reg_debug;
 module_param(reg_debug,int,0644);
@@ -48,7 +48,7 @@ MODULE_PARM_DESC(reg_debug,"enable debug messages [URB reg]");
 #define em28xx_regdbg(fmt, arg...) do {\
        if (reg_debug) \
                printk(KERN_INFO "%s %s :"fmt, \
-                        dev->name, __FUNCTION__ , ##arg); } while (0)
+                        dev->name, __FUNCTION__, ##arg); } while (0)
 
 static unsigned int isoc_debug;
 module_param(isoc_debug,int,0644);
@@ -57,7 +57,7 @@ MODULE_PARM_DESC(isoc_debug,"enable debug messages [isoc transfers]");
 #define em28xx_isocdbg(fmt, arg...) do {\
        if (isoc_debug) \
                printk(KERN_INFO "%s %s :"fmt, \
-                        dev->name, __FUNCTION__ , ##arg); } while (0)
+                        dev->name, __FUNCTION__, ##arg); } while (0)
 
 static int alt = EM28XX_PINOUT;
 module_param(alt, int, 0644);
@@ -116,47 +116,6 @@ void em28xx_print_ioctl(char *name, unsigned int cmd)
        }
 }
 
-static void *rvmalloc(size_t size)
-{
-       void *mem;
-       unsigned long adr;
-
-       size = PAGE_ALIGN(size);
-
-       mem = vmalloc_32((unsigned long)size);
-       if (!mem)
-               return NULL;
-
-       memset(mem, 0, size);
-
-       adr = (unsigned long)mem;
-       while (size > 0) {
-               SetPageReserved(vmalloc_to_page((void *)adr));
-               adr += PAGE_SIZE;
-               size -= PAGE_SIZE;
-       }
-
-       return mem;
-}
-
-static void rvfree(void *mem, size_t size)
-{
-       unsigned long adr;
-
-       if (!mem)
-               return;
-
-       size = PAGE_ALIGN(size);
-
-       adr = (unsigned long)mem;
-       while (size > 0) {
-               ClearPageReserved(vmalloc_to_page((void *)adr));
-               adr += PAGE_SIZE;
-               size -= PAGE_SIZE;
-       }
-
-       vfree(mem);
-}
 
 /*
  * em28xx_request_buffers()
@@ -173,8 +132,10 @@ u32 em28xx_request_buffers(struct em28xx *dev, u32 count)
 
        dev->num_frames = count;
        while (dev->num_frames > 0) {
-               if ((buff = rvmalloc(dev->num_frames * imagesize)))
+               if ((buff = vmalloc_32(dev->num_frames * imagesize))) {
+                       memset(buff, 0, dev->num_frames * imagesize);
                        break;
+               }
                dev->num_frames--;
        }
 
@@ -217,8 +178,7 @@ void em28xx_queue_unusedframes(struct em28xx *dev)
 void em28xx_release_buffers(struct em28xx *dev)
 {
        if (dev->num_frames) {
-               rvfree(dev->frame[0].bufmem,
-                      dev->num_frames * PAGE_ALIGN(dev->frame[0].buf.length));
+               vfree(dev->frame[0].bufmem);
                dev->num_frames = 0;
        }
 }
index b32d9852f34c556b97d961b1c20a36b907edb24c..29e21ad187cc420fcb9f4c16df4173901e67a669 100644 (file)
@@ -41,10 +41,10 @@ module_param(i2c_debug, int, 0644);
 MODULE_PARM_DESC(i2c_debug, "enable debug messages [i2c]");
 
 #define dprintk1(lvl,fmt, args...) if (i2c_debug>=lvl) do {\
-                       printk(fmt , ##args); } while (0)
+                       printk(fmt, ##args); } while (0)
 #define dprintk2(lvl,fmt, args...) if (i2c_debug>=lvl) do{ \
                        printk(KERN_DEBUG "%s at %s: " fmt, \
-                       dev->name, __FUNCTION__ , ##args); } while (0)
+                       dev->name, __FUNCTION__, ##args); } while (0)
 
 /*
  * em2800_i2c_send_max4()
index abec32c175aa0007839f43d60c10926c7949fc4c..8ecaa0803e08e6e78937dee53a54b945d491cf7e 100644 (file)
@@ -45,7 +45,7 @@
 #define em28xx_videodbg(fmt, arg...) do {\
        if (video_debug) \
                printk(KERN_INFO "%s %s :"fmt, \
-                        dev->name, __FUNCTION__ , ##arg); } while (0)
+                        dev->name, __FUNCTION__, ##arg); } while (0)
 
 MODULE_AUTHOR(DRIVER_AUTHOR);
 MODULE_DESCRIPTION(DRIVER_DESC);
@@ -189,16 +189,6 @@ static DECLARE_RWSEM(em28xx_disconnect);
 
 /*********************  v4l2 interface  ******************************************/
 
-static inline unsigned long kvirt_to_pa(unsigned long adr)
-{
-       unsigned long kva, ret;
-
-       kva = (unsigned long)page_address(vmalloc_to_page((void *)adr));
-       kva |= adr & (PAGE_SIZE - 1);
-       ret = __pa(kva);
-       return ret;
-}
-
 /*
  * em28xx_config()
  * inits registers with sane defaults
@@ -616,7 +606,8 @@ static struct vm_operations_struct em28xx_vm_ops = {
 static int em28xx_v4l2_mmap(struct file *filp, struct vm_area_struct *vma)
 {
        unsigned long size = vma->vm_end - vma->vm_start,
-           start = vma->vm_start, pos, page;
+           start = vma->vm_start;
+       void *pos;
        u32 i;
 
        struct em28xx *dev = filp->private_data;
@@ -657,12 +648,10 @@ static int em28xx_v4l2_mmap(struct file *filp, struct vm_area_struct *vma)
        vma->vm_flags |= VM_IO;
        vma->vm_flags |= VM_RESERVED;   /* avoid to swap out this VMA */
 
-       pos = (unsigned long)dev->frame[i].bufmem;
+       pos = dev->frame[i].bufmem;
        while (size > 0) {      /* size is page-aligned */
-               page = vmalloc_to_pfn((void *)pos);
-               if (remap_pfn_range(vma, start, page, PAGE_SIZE,
-                                   vma->vm_page_prot)) {
-                       em28xx_videodbg("mmap: rename page map failed\n");
+               if (vm_insert_page(vma, start, vmalloc_to_page(pos))) {
+                       em28xx_videodbg("mmap: vm_insert_page failed\n");
                        up(&dev->fileop_lock);
                        return -EAGAIN;
                }
index 5c7a41ce69f37c69daaa441134a4c0fab301f304..1e2ee43db394a4ff6a038a77a6d11580aeed46e3 100644 (file)
@@ -392,18 +392,18 @@ extern const unsigned int em28xx_bcount;
 /* printk macros */
 
 #define em28xx_err(fmt, arg...) do {\
-       printk(KERN_ERR fmt , ##arg); } while (0)
+       printk(KERN_ERR fmt, ##arg); } while (0)
 
 #define em28xx_errdev(fmt, arg...) do {\
        printk(KERN_ERR "%s: "fmt,\
-                       dev->name , ##arg); } while (0)
+                       dev->name, ##arg); } while (0)
 
 #define em28xx_info(fmt, arg...) do {\
        printk(KERN_INFO "%s: "fmt,\
-                       dev->name , ##arg); } while (0)
+                       dev->name, ##arg); } while (0)
 #define em28xx_warn(fmt, arg...) do {\
        printk(KERN_WARNING "%s: "fmt,\
-                       dev->name , ##arg); } while (0)
+                       dev->name, ##arg); } while (0)
 
 inline static int em28xx_audio_source(struct em28xx *dev, int input)
 {
index 6345e29e4951c2bb717a9ced1d19b3fdd89c7e52..de1385e5d05ecce6871247c9cffe648a7a1bf0e3 100644 (file)
@@ -291,13 +291,12 @@ struct IR {
        u32                     mask_keycode;
        u32                     mask_keydown;
        u32                     mask_keyup;
-       u32                     polling;
+       u32                     polling;
        u32                     last_gpio;
        struct work_struct      work;
        struct timer_list       timer;
 
        /* RC5 gpio */
-
        u32 rc5_gpio;
        struct timer_list timer_end;    /* timer_end for code completion */
        struct timer_list timer_keyup;  /* timer_end for key release */
@@ -647,7 +646,7 @@ static int ir_probe(struct device *dev)
                driver.any_irq = ir_rc5_irq;
                driver.gpio_irq = NULL;
                ir->rc5_gpio = 1;
-                break;
+               break;
        }
        if (NULL == ir_codes) {
                kfree(ir);
@@ -657,7 +656,7 @@ static int ir_probe(struct device *dev)
 
        if (ir->rc5_gpio) {
                u32 gpio;
-               /* enable remote irq */
+               /* enable remote irq */
                bttv_gpio_inout(sub->core, (1 << 4), 1 << 4);
                gpio = bttv_gpio_read(sub->core);
                bttv_gpio_write(sub->core, gpio & ~(1 << 4));
@@ -726,6 +725,7 @@ static int ir_remove(struct device *dev)
                del_timer(&ir->timer);
                flush_scheduled_work();
        }
+
        if (ir->rc5_gpio) {
                u32 gpio;
 
index 124c502ea1f3ee5f51e73a6446358679a80fa541..740e543311af8c1930c8161332cc6a98395d8b59 100644 (file)
@@ -40,6 +40,7 @@
 #include <linux/i2c.h>
 #include <linux/workqueue.h>
 #include <asm/semaphore.h>
+
 #include <media/ir-common.h>
 #include <media/ir-kbd-i2c.h>
 
@@ -278,7 +279,7 @@ static int ir_probe(struct i2c_adapter *adap);
 
 static struct i2c_driver driver = {
        .name           = "ir remote kbd driver",
-       .id             = I2C_DRIVERID_I2C_IR,
+       .id             = I2C_DRIVERID_INFRARED,
        .flags          = I2C_DF_NOTIFY,
        .attach_adapter = ir_probe,
        .detach_client  = ir_detach,
@@ -296,15 +297,15 @@ static int ir_attach(struct i2c_adapter *adap, int addr,
        IR_KEYTAB_TYPE *ir_codes = NULL;
        char *name;
        int ir_type;
-        struct IR_i2c *ir;
+       struct IR_i2c *ir;
        struct input_dev *input_dev;
 
-       ir = kzalloc(sizeof(struct IR_i2c), GFP_KERNEL);
+       ir = kzalloc(sizeof(struct IR_i2c),GFP_KERNEL);
        input_dev = input_allocate_device();
        if (!ir || !input_dev) {
                kfree(ir);
                input_free_device(input_dev);
-                return -ENOMEM;
+               return -ENOMEM;
        }
 
        ir->c = client_template;
@@ -360,7 +361,7 @@ static int ir_attach(struct i2c_adapter *adap, int addr,
        /* register i2c device
         * At device register, IR codes may be changed to be
         * board dependent.
-       */
+        */
        i2c_attach_client(&ir->c);
 
        /* If IR not supported or disabled, unregisters driver */
index a23fb0338986c553aa70ababe45d0bbc5051825f..d86f8e92e53413f60e0e64e575d33b0b87d9011f 100644 (file)
@@ -134,7 +134,7 @@ struct msp3400c {
        int rxsubchans;
 
        int muted;
-       int left, right;        /* volume */
+       int left, right;        /* volume */
        int bass, treble;
 
        /* shadow register set */
@@ -882,6 +882,7 @@ static void watch_stereo(struct i2c_client *client)
                msp->watch_stereo = 0;
 }
 
+
 static int msp3400c_thread(void *data)
 {
        struct i2c_client *client = data;
@@ -889,6 +890,7 @@ static int msp3400c_thread(void *data)
        struct CARRIER_DETECT *cd;
        int count, max1,max2,val1,val2, val,this;
 
+
        msp3400_info("msp3400 daemon started\n");
        for (;;) {
                msp3400_dbg_mediumvol("msp3400 thread: sleep\n");
@@ -1162,6 +1164,7 @@ static int msp3410d_thread(void *data)
        int mode,val,i,std;
 
        msp3400_info("msp3410 daemon started\n");
+
        for (;;) {
                msp3400_dbg_mediumvol("msp3410 thread: sleep\n");
                msp34xx_sleep(msp,-1);
@@ -1384,6 +1387,7 @@ static int msp34xxg_thread(void *data)
        int val, std, i;
 
        msp3400_info("msp34xxg daemon started\n");
+
        msp->source = 1; /* default */
        for (;;) {
                msp3400_dbg_mediumvol("msp34xxg thread: sleep\n");
@@ -1559,11 +1563,11 @@ static void msp_wake_thread(struct i2c_client *client);
 static struct i2c_driver driver = {
        .owner          = THIS_MODULE,
        .name           = "msp3400",
-        .id             = I2C_DRIVERID_MSP3400,
-        .flags          = I2C_DF_NOTIFY,
-        .attach_adapter = msp_probe,
-        .detach_client  = msp_detach,
-        .command        = msp_command,
+       .id             = I2C_DRIVERID_MSP3400,
+       .flags          = I2C_DF_NOTIFY,
+       .attach_adapter = msp_probe,
+       .detach_client  = msp_detach,
+       .command        = msp_command,
        .driver = {
                .suspend = msp_suspend,
                .resume  = msp_resume,
@@ -1574,7 +1578,7 @@ static struct i2c_client client_template =
 {
        .name      = "(unset)",
        .flags     = I2C_CLIENT_ALLOW_USE,
-        .driver    = &driver,
+       .driver    = &driver,
 };
 
 static int msp_attach(struct i2c_adapter *adap, int addr, int kind)
index dca3ddfd510fa0aa92170cbe788985fc2d5e08c0..923322503e8fb5441ea5f94d55448ba3cfa88f57 100644 (file)
@@ -422,7 +422,6 @@ static int saa6588_attach(struct i2c_adapter *adap, int addr, int kind)
        s->timer.function = saa6588_timer;
        s->timer.data = (unsigned long)s;
        schedule_work(&s->work);
-
        return 0;
 }
 
index 59e13fdea7804381cd9fc35cef3aa4229aa7db8d..31f7b950b01cef303553dbaf5bf45f9e3019e566 100644 (file)
@@ -59,7 +59,7 @@ MODULE_PARM_DESC(debug, " Set the default Debug level.  Default: 0 (Off) - (0-1)
 #define dprintk(num, format, args...) \
        do { \
                if (debug >= num) \
-                       printk(format , ##args); \
+                       printk(format, ##args); \
        } while (0)
 
 /* ----------------------------------------------------------------------- */
index cdd1ed9c80658d358ebcad24de73fdb79112b0c4..a61d24f588f7007b7173bd6965cd57fa9decda7a 100644 (file)
@@ -523,7 +523,8 @@ static int saa6752hs_attach(struct i2c_adapter *adap, int addr, int kind)
        h->standard = 0;
 
        i2c_set_clientdata(&h->client, h);
-        i2c_attach_client(&h->client);
+       i2c_attach_client(&h->client);
+
        return 0;
 }
 
@@ -597,19 +598,19 @@ saa6752hs_command(struct i2c_client *client, unsigned int cmd, void *arg)
 
 static struct i2c_driver driver = {
        .owner          = THIS_MODULE,
-        .name           = "i2c saa6752hs MPEG encoder",
-        .id             = I2C_DRIVERID_SAA6752HS,
-        .flags          = I2C_DF_NOTIFY,
-        .attach_adapter = saa6752hs_probe,
-        .detach_client  = saa6752hs_detach,
-        .command        = saa6752hs_command,
+       .name           = "i2c saa6752hs MPEG encoder",
+       .id             = I2C_DRIVERID_SAA6752HS,
+       .flags          = I2C_DF_NOTIFY,
+       .attach_adapter = saa6752hs_probe,
+       .detach_client  = saa6752hs_detach,
+       .command        = saa6752hs_command,
 };
 
 static struct i2c_client client_template =
 {
        .name       = "saa6752hs",
        .flags      = I2C_CLIENT_ALLOW_USE,
-        .driver     = &driver,
+       .driver     = &driver,
 };
 
 static int __init saa6752hs_init_module(void)
index 263c6e2e3e8ec16a63e9ad571b8104d9128517e3..b24a26b065c2fdc237d2c9e6e94cefb48a64c70c 100644 (file)
@@ -51,6 +51,7 @@ MODULE_PARM_DESC(debug,"enable debug messages [alsa]");
 #define MIXER_ADDR_LINE2       2
 #define MIXER_ADDR_LAST                2
 
+
 static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX;     /* Index 0-MAX */
 static char *id[SNDRV_CARDS] = SNDRV_DEFAULT_STR;      /* ID for this card */
 static int enable[SNDRV_CARDS] = {1, [1 ... (SNDRV_CARDS - 1)] = 0};
@@ -59,11 +60,14 @@ module_param_array(index, int, NULL, 0444);
 MODULE_PARM_DESC(index, "Index value for SAA7134 capture interface(s).");
 
 #define dprintk(fmt, arg...)    if (debug) \
-        printk(KERN_DEBUG "%s/alsa: " fmt, dev->name , ## arg)
+       printk(KERN_DEBUG "%s/alsa: " fmt, dev->name, ## arg)
+
+
 
 /*
  * Main chip structure
  */
+
 typedef struct snd_card_saa7134 {
        snd_card_t *card;
        spinlock_t mixer_lock;
@@ -208,8 +212,8 @@ static void saa7134_irq_alsa_done(struct saa7134_dev *dev,
 
 static irqreturn_t saa7134_alsa_irq(int irq, void *dev_id, struct pt_regs *regs)
 {
-        struct saa7134_dmasound *dmasound = dev_id;
-        struct saa7134_dev *dev = dmasound->priv_data;
+       struct saa7134_dmasound *dmasound = dev_id;
+       struct saa7134_dev *dev = dmasound->priv_data;
 
        unsigned long report, status;
        int loop, handled = 0;
@@ -985,7 +989,7 @@ static int saa7134_alsa_init(void)
        struct saa7134_dev *dev = NULL;
        struct list_head *list;
 
-        printk(KERN_INFO "saa7134 ALSA driver for DMA sound loaded\n");
+       printk(KERN_INFO "saa7134 ALSA driver for DMA sound loaded\n");
 
        list_for_each(list,&saa7134_devlist) {
                dev = list_entry(list, struct saa7134_dev, devlist);
@@ -1004,6 +1008,7 @@ static int saa7134_alsa_init(void)
                printk(KERN_INFO "saa7134 ALSA: no saa7134 cards found\n");
 
        return 0;
+
 }
 
 /*
@@ -1027,3 +1032,6 @@ module_init(saa7134_alsa_init);
 module_exit(saa7134_alsa_exit);
 MODULE_LICENSE("GPL");
 MODULE_AUTHOR("Ricardo Cerqueira");
+
+
+
index 75abc20b0ccdbdabd0fa69474df09eaaf69adf61..672fb205959f8b21be1f6dc45c4635b8e6907d9e 100644 (file)
@@ -976,7 +976,7 @@ struct saa7134_board saa7134_boards[] = {
                .radio_type     = UNSET,
                .tuner_addr     = ADDR_UNSET,
                .radio_addr     = ADDR_UNSET,
-               .tda9887_conf   = TDA9887_PRESENT | TDA9887_INTERCARRIER,
+               .tda9887_conf   = TDA9887_PRESENT | TDA9887_INTERCARRIER | TDA9887_PORT2_ACTIVE,
                .inputs         = {{
                        .name = name_tv,
                        .vmux = 3,
index 1a093bf176f325869d607e02b993e09ff1fc6df7..23d8747338edee3e11dfb0d8d37ea04645f21cb9 100644 (file)
@@ -71,6 +71,7 @@ static unsigned int radio_nr[] = {[0 ... (SAA7134_MAXBOARDS - 1)] = UNSET };
 static unsigned int tuner[]    = {[0 ... (SAA7134_MAXBOARDS - 1)] = UNSET };
 static unsigned int card[]     = {[0 ... (SAA7134_MAXBOARDS - 1)] = UNSET };
 
+
 module_param_array(video_nr, int, NULL, 0444);
 module_param_array(vbi_nr,   int, NULL, 0444);
 module_param_array(radio_nr, int, NULL, 0444);
index e9ec69efb4c92052f4cc90f8ad8ff152324b38e6..575f3e835f91e102aaba4a9719191f4c6cbd1ca8 100644 (file)
@@ -36,6 +36,7 @@ MODULE_AUTHOR("Gerd Knorr <kraxel@bytesex.org> [SuSE Labs]");
 MODULE_LICENSE("GPL");
 
 static unsigned int empress_nr[] = {[0 ... (SAA7134_MAXBOARDS - 1)] = UNSET };
+
 module_param_array(empress_nr, int, NULL, 0444);
 MODULE_PARM_DESC(empress_nr,"ts device number");
 
index 7575043f0874985c6a38f00c2b9c85c2891098b6..df9dd36721e0a633a56122c89f5471d8dda6599e 100644 (file)
@@ -333,7 +333,7 @@ static int attach_inform(struct i2c_client *client)
        struct tuner_setup tun_setup;
 
        d1printk( "%s i2c attach [addr=0x%x,client=%s]\n",
-                client->driver->name, client->addr, client->name);
+               client->driver->name, client->addr, client->name);
 
        /* Am I an i2c remote control? */
 
index 5a579194e455af8677ebc0a4b8aa16794d19cf46..513a699a6df2a300c7c22bd3ea842509f4306441 100644 (file)
@@ -782,36 +782,36 @@ struct file_operations saa7134_mixer_fops = {
 
 static irqreturn_t saa7134_oss_irq(int irq, void *dev_id, struct pt_regs *regs)
 {
-        struct saa7134_dmasound *dmasound = dev_id;
-        struct saa7134_dev *dev = dmasound->priv_data;
-        unsigned long report, status;
-        int loop, handled = 0;
-
-        for (loop = 0; loop < 10; loop++) {
-                report = saa_readl(SAA7134_IRQ_REPORT);
-                status = saa_readl(SAA7134_IRQ_STATUS);
-
-                if (report & SAA7134_IRQ_REPORT_DONE_RA3) {
-                        handled = 1;
-                        saa_writel(SAA7134_IRQ_REPORT,report);
-                        saa7134_irq_oss_done(dev, status);
-                } else {
-                        goto out;
-                }
-        }
-
-        if (loop == 10) {
-                dprintk("error! looping IRQ!");
-        }
+       struct saa7134_dmasound *dmasound = dev_id;
+       struct saa7134_dev *dev = dmasound->priv_data;
+       unsigned long report, status;
+       int loop, handled = 0;
+
+       for (loop = 0; loop < 10; loop++) {
+               report = saa_readl(SAA7134_IRQ_REPORT);
+               status = saa_readl(SAA7134_IRQ_STATUS);
+
+               if (report & SAA7134_IRQ_REPORT_DONE_RA3) {
+                       handled = 1;
+                       saa_writel(SAA7134_IRQ_REPORT,report);
+                       saa7134_irq_oss_done(dev, status);
+               } else {
+                       goto out;
+               }
+       }
+
+       if (loop == 10) {
+               dprintk("error! looping IRQ!");
+       }
 out:
-        return IRQ_RETVAL(handled);
+       return IRQ_RETVAL(handled);
 }
 
 int saa7134_oss_init1(struct saa7134_dev *dev)
 {
 
-        if ((request_irq(dev->pci->irq, saa7134_oss_irq,
-                         SA_SHIRQ | SA_INTERRUPT, dev->name,
+       if ((request_irq(dev->pci->irq, saa7134_oss_irq,
+                        SA_SHIRQ | SA_INTERRUPT, dev->name,
                        (void*) &dev->dmasound)) < 0)
                return -1;
 
@@ -905,25 +905,25 @@ static int saa7134_dsp_create(struct saa7134_dev *dev)
 
        err = dev->dmasound.minor_dsp =
                register_sound_dsp(&saa7134_dsp_fops,
-                                       dsp_nr[dev->nr]);
+                                  dsp_nr[dev->nr]);
        if (err < 0) {
                goto fail;
        }
        printk(KERN_INFO "%s: registered device dsp%d\n",
-               dev->name,dev->dmasound.minor_dsp >> 4);
+              dev->name,dev->dmasound.minor_dsp >> 4);
 
        err = dev->dmasound.minor_mixer =
                register_sound_mixer(&saa7134_mixer_fops,
-                                       mixer_nr[dev->nr]);
+                                    mixer_nr[dev->nr]);
        if (err < 0)
                goto fail;
        printk(KERN_INFO "%s: registered device mixer%d\n",
-               dev->name,dev->dmasound.minor_mixer >> 4);
+              dev->name,dev->dmasound.minor_mixer >> 4);
 
        return 0;
 
 fail:
-        unregister_sound_dsp(dev->dmasound.minor_dsp);
+       unregister_sound_dsp(dev->dmasound.minor_dsp);
        return 0;
 
 
@@ -956,49 +956,50 @@ static int oss_device_exit(struct saa7134_dev *dev)
 
 static int saa7134_oss_init(void)
 {
-        struct saa7134_dev *dev = NULL;
-        struct list_head *list;
+       struct saa7134_dev *dev = NULL;
+       struct list_head *list;
 
-        printk(KERN_INFO "saa7134 OSS driver for DMA sound loaded\n");
+       printk(KERN_INFO "saa7134 OSS driver for DMA sound loaded\n");
 
-        list_for_each(list,&saa7134_devlist) {
-                dev = list_entry(list, struct saa7134_dev, devlist);
+       list_for_each(list,&saa7134_devlist) {
+               dev = list_entry(list, struct saa7134_dev, devlist);
                if (dev->dmasound.priv_data == NULL) {
                        oss_device_init(dev);
                } else {
-                       printk(KERN_ERR "saa7134 OSS: DMA sound is being handled by ALSA, ignoring %s\n",dev->name);
+                       printk(KERN_ERR "saa7134 OSS: DMA sound is being handled by ALSA, ignoring %s\n",dev->name);
                        return -EBUSY;
                }
-        }
+       }
 
-        if (dev == NULL)
-                printk(KERN_INFO "saa7134 OSS: no saa7134 cards found\n");
+       if (dev == NULL)
+               printk(KERN_INFO "saa7134 OSS: no saa7134 cards found\n");
 
        dmasound_init = oss_device_init;
        dmasound_exit = oss_device_exit;
 
-        return 0;
+       return 0;
 
 }
 
 static void saa7134_oss_exit(void)
 {
-        struct saa7134_dev *dev = NULL;
-        struct list_head *list;
+       struct saa7134_dev *dev = NULL;
+       struct list_head *list;
 
-        list_for_each(list,&saa7134_devlist) {
-                dev = list_entry(list, struct saa7134_dev, devlist);
+       list_for_each(list,&saa7134_devlist) {
+               dev = list_entry(list, struct saa7134_dev, devlist);
 
                /* Device isn't registered by OSS, probably ALSA's */
                if (!dev->dmasound.minor_dsp)
                        continue;
 
                oss_device_exit(dev);
-        }
 
-        printk(KERN_INFO "saa7134 OSS driver for DMA sound unloaded\n");
+       }
+
+       printk(KERN_INFO "saa7134 OSS driver for DMA sound unloaded\n");
 
-        return;
+       return;
 }
 
 module_init(saa7134_oss_init);
index 4249127c0a1d67c3b144f63f31888caa0609ed05..2f2414e90e8bbe4bb47c22d803355e2ffacde92e 100644 (file)
@@ -12,6 +12,7 @@
 #include <media/audiochip.h>
 #include <media/tuner.h>
 
+
 /* Chips:
    TDA9885 (PAL, NTSC)
    TDA9886 (PAL, SECAM, NTSC)
@@ -819,12 +820,12 @@ static int tda9887_resume(struct device * dev)
 
 static struct i2c_driver driver = {
        .owner          = THIS_MODULE,
-        .name           = "i2c tda9887 driver",
-        .id             = -1, /* FIXME */
-        .flags          = I2C_DF_NOTIFY,
-        .attach_adapter = tda9887_probe,
-        .detach_client  = tda9887_detach,
-        .command        = tda9887_command,
+       .name           = "i2c tda9887 driver",
+       .id             = -1, /* FIXME */
+       .flags          = I2C_DF_NOTIFY,
+       .attach_adapter = tda9887_probe,
+       .detach_client  = tda9887_detach,
+       .command        = tda9887_command,
        .driver = {
                .suspend = tda9887_suspend,
                .resume  = tda9887_resume,
@@ -834,7 +835,7 @@ static struct i2c_client client_template =
 {
        .name      = "tda9887",
        .flags     = I2C_CLIENT_ALLOW_USE,
-        .driver    = &driver,
+       .driver    = &driver,
 };
 
 static int __init tda9887_init_module(void)
index c31bf28b73fe707bb4154639545cc24731a3aa15..5b20e8177cad4942cb21d47d956570d46735c5ed 100644 (file)
@@ -188,7 +188,7 @@ static int chip_write(struct CHIPSTATE *chip, int subaddr, int val)
                buffer[1] = val;
                if (2 != i2c_master_send(&chip->c,buffer,2)) {
                        tvaudio_warn("%s: I/O error (write reg%d=0x%x)\n",
-                                               chip->c.name, subaddr, val);
+                       chip->c.name, subaddr, val);
                        return -1;
                }
        }
@@ -216,7 +216,7 @@ static int chip_read(struct CHIPSTATE *chip)
                chip->c.name);
                return -1;
        }
-       tvaudio_dbg("%s: chip_read: 0x%x\n",chip->c.name,buffer);
+       tvaudio_dbg("%s: chip_read: 0x%x\n",chip->c.name, buffer);
        return buffer;
 }
 
@@ -235,7 +235,7 @@ static int chip_read2(struct CHIPSTATE *chip, int subaddr)
                return -1;
        }
        tvaudio_dbg("%s: chip_read2: reg%d=0x%x\n",
-                       chip->c.name,subaddr,read[0]);
+               chip->c.name, subaddr,read[0]);
        return read[0];
 }
 
@@ -248,7 +248,7 @@ static int chip_cmd(struct CHIPSTATE *chip, char *name, audiocmd *cmd)
 
        /* update our shadow register set; print bytes if (debug > 0) */
        tvaudio_dbg("%s: chip_cmd(%s): reg=%d, data:",
-               chip->c.name,name,cmd->bytes[0]);
+               chip->c.name, name,cmd->bytes[0]);
        for (i = 1; i < cmd->count; i++) {
                if (debug)
                        printk(" 0x%x",cmd->bytes[i]);
@@ -322,7 +322,7 @@ static void generic_checkmode(struct CHIPSTATE *chip)
        int mode = desc->getmode(chip);
 
        if (mode == chip->prevmode)
-               return;
+       return;
 
        tvaudio_dbg("%s: thread checkmode\n", chip->c.name);
        chip->prevmode = mode;
@@ -1506,18 +1506,18 @@ static int chip_attach(struct i2c_adapter *adap, int addr, int kind)
                return -EIO;
        }
        tvaudio_info("%s found @ 0x%x (%s)\n", desc->name, addr<<1, adap->name);
-        if (desc->flags) {
-                tvaudio_dbg("matches:%s%s%s.\n",
-                        (desc->flags & CHIP_HAS_VOLUME)     ? " volume"      : "",
-                        (desc->flags & CHIP_HAS_BASSTREBLE) ? " bass/treble" : "",
-                        (desc->flags & CHIP_HAS_INPUTSEL)   ? " audiomux"    : "");
-        }
+       if (desc->flags) {
+               tvaudio_dbg("matches:%s%s%s.\n",
+                       (desc->flags & CHIP_HAS_VOLUME)     ? " volume"      : "",
+                       (desc->flags & CHIP_HAS_BASSTREBLE) ? " bass/treble" : "",
+                       (desc->flags & CHIP_HAS_INPUTSEL)   ? " audiomux"    : "");
+       }
 
        /* fill required data structures */
-       strcpy(chip->c.name,desc->name);
+       strcpy(chip->c.name, desc->name);
        chip->type = desc-chiplist;
        chip->shadow.count = desc->registers+1;
-        chip->prevmode = -1;
+       chip->prevmode = -1;
        /* register */
        i2c_attach_client(&chip->c);
 
@@ -1604,7 +1604,7 @@ static int chip_command(struct i2c_client *client,
        struct CHIPSTATE *chip = i2c_get_clientdata(client);
        struct CHIPDESC  *desc = chiplist + chip->type;
 
-       tvaudio_dbg("%s: chip_command 0x%x\n",chip->c.name,cmd);
+       tvaudio_dbg("%s: chip_command 0x%x\n", chip->c.name, cmd);
 
        switch (cmd) {
        case AUDC_SET_INPUT:
@@ -1624,7 +1624,7 @@ static int chip_command(struct i2c_client *client,
 
        /* --- v4l ioctls --- */
        /* take care: bttv does userspace copying, we'll get a
-                                       kernel pointer here... */
+       kernel pointer here... */
        case VIDIOCGAUDIO:
        {
                struct video_audio *va = arg;
index d95aecebbda318b14278056d5e56478093428928..cd7cf1bd12b424cb34ca97b00f3c2ab204abeb45 100644 (file)
@@ -753,7 +753,8 @@ tveeprom_detect_client(struct i2c_adapter *adapter,
        client->driver = &i2c_driver_tveeprom;
        client->flags = I2C_CLIENT_ALLOW_USE;
        snprintf(client->name, sizeof(client->name), "tveeprom");
-        i2c_attach_client(client);
+       i2c_attach_client(client);
+
        return 0;
 }
 
index 81e6d4494e7dc95bff0ad37d29e81aac8e28194d..97431e26d22905707be2fae0216d3ab30af06e82 100644 (file)
@@ -31,7 +31,7 @@ MODULE_PARM_DESC(debug, "Debug level (0-1)");
 #define dprintk(num, format, args...) \
        do { \
                if (debug >= num) \
-                       printk(format , ##args); \
+                       printk(format, ##args); \
        } while (0)
 
 /* supported controls */
@@ -770,7 +770,6 @@ static int tvp5150_detect_client(struct i2c_adapter *adapter,
 
        if (debug > 1)
                dump_reg(client);
-
        return 0;
 }
 
index 55f129e964eb6d91716c681ab845f892c4d1a45a..0a4004a4393c7cf3af7c4f4c013c64b9cdb96633 100644 (file)
@@ -13,6 +13,7 @@
  * (at your option) any later version.
  */
 
+
 #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/device.h>
@@ -247,3 +248,4 @@ EXPORT_SYMBOL(videobuf_dvb_unregister);
  * compile-command: "make DVB=1"
  * End:
  */
+
index a984c0efabf0e39837ef40816b1c79c26eb20c57..551061c2eadfea93be0743d02528c51a9047b00c 100644 (file)
@@ -59,16 +59,18 @@ static int adcsync;
 
 static inline void ucb1x00_ts_evt_add(struct ucb1x00_ts *ts, u16 pressure, u16 x, u16 y)
 {
-       input_report_abs(ts->idev, ABS_X, x);
-       input_report_abs(ts->idev, ABS_Y, y);
-       input_report_abs(ts->idev, ABS_PRESSURE, pressure);
-       input_sync(ts->idev);
+       struct input_dev *idev = ts->idev;
+       input_report_abs(idev, ABS_X, x);
+       input_report_abs(idev, ABS_Y, y);
+       input_report_abs(idev, ABS_PRESSURE, pressure);
+       input_sync(idev);
 }
 
 static inline void ucb1x00_ts_event_release(struct ucb1x00_ts *ts)
 {
-       input_report_abs(ts->idev, ABS_PRESSURE, 0);
-       input_sync(ts->idev);
+       struct input_dev *idev = ts->idev;
+       input_report_abs(idev, ABS_PRESSURE, 0);
+       input_sync(idev);
 }
 
 /*
@@ -297,7 +299,7 @@ static void ucb1x00_ts_irq(int idx, void *id)
 
 static int ucb1x00_ts_open(struct input_dev *idev)
 {
-       struct ucb1x00_ts *ts = (struct ucb1x00_ts *)idev;
+       struct ucb1x00_ts *ts = idev->private;
        int ret = 0;
 
        BUG_ON(ts->rtask);
@@ -334,7 +336,7 @@ static int ucb1x00_ts_open(struct input_dev *idev)
  */
 static void ucb1x00_ts_close(struct input_dev *idev)
 {
-       struct ucb1x00_ts *ts = (struct ucb1x00_ts *)idev;
+       struct ucb1x00_ts *ts = idev->private;
 
        if (ts->rtask)
                kthread_stop(ts->rtask);
@@ -386,6 +388,7 @@ static int ucb1x00_ts_add(struct ucb1x00_dev *dev)
        ts->ucb = dev->ucb;
        ts->adcsync = adcsync ? UCB_SYNC : UCB_NOSYNC;
 
+       ts->idev->private = ts;
        ts->idev->name       = "Touchscreen panel";
        ts->idev->id.product = ts->ucb->id;
        ts->idev->open       = ucb1x00_ts_open;
index f9db52f6bf00f40156ece013ffd6f37e60769aee..04f864d238db20dace05912914d10d4347c9068a 100644 (file)
@@ -113,7 +113,7 @@ static int bi_write_complete(struct bio *bio, unsigned int bytes_done, int error
                        ClearPageUptodate(page);
                        SetPageError(page);
                }
-               ClearPageDirty(page);
+               clear_page_dirty(page);
                unlock_page(page);
                page_cache_release(page);
        } while (bvec >= bio->bi_io_vec);
@@ -289,7 +289,7 @@ static int write_pages(struct blkmtd_dev *dev, const u_char *buf, loff_t to,
                        BUG();
                }
                memcpy(page_address(page)+offset, buf, start_len);
-               SetPageDirty(page);
+               set_page_dirty(page);
                SetPageUptodate(page);
                buf += start_len;
                thislen = start_len;
@@ -336,7 +336,7 @@ static int write_pages(struct blkmtd_dev *dev, const u_char *buf, loff_t to,
                        }
                        pagenr++;
                        pagecnt--;
-                       SetPageDirty(page);
+                       set_page_dirty(page);
                        SetPageUptodate(page);
                        pagesc--;
                        thislen += PAGE_SIZE;
@@ -357,7 +357,7 @@ static int write_pages(struct blkmtd_dev *dev, const u_char *buf, loff_t to,
                        BUG();
                }
                memcpy(page_address(page), buf, end_len);
-               SetPageDirty(page);
+               set_page_dirty(page);
                SetPageUptodate(page);
                DEBUG(3, "blkmtd: write: writing out partial end\n");
                thislen += end_len;
index 30bee11c48bd2d8364ac8f8e93abe47c5467593e..d2102a27d3071492dd4c3cd686e286c6dffaf8f4 100644 (file)
@@ -586,16 +586,16 @@ struct rtl8139_private {
        dma_addr_t tx_bufs_dma;
        signed char phys[4];            /* MII device addresses. */
        char twistie, twist_row, twist_col;     /* Twister tune state. */
-       unsigned int default_port:4;    /* Last dev->if_port value. */
+       unsigned int default_port : 4;  /* Last dev->if_port value. */
+       unsigned int have_thread : 1;
        spinlock_t lock;
        spinlock_t rx_lock;
        chip_t chipset;
-       pid_t thr_pid;
-       wait_queue_head_t thr_wait;
-       struct completion thr_exited;
        u32 rx_config;
        struct rtl_extra_stats xstats;
-       int time_to_die;
+
+       struct work_struct thread;
+
        struct mii_if_info mii;
        unsigned int regs_len;
        unsigned long fifo_copy_timeout;
@@ -620,7 +620,7 @@ static int rtl8139_open (struct net_device *dev);
 static int mdio_read (struct net_device *dev, int phy_id, int location);
 static void mdio_write (struct net_device *dev, int phy_id, int location,
                        int val);
-static void rtl8139_start_thread(struct net_device *dev);
+static void rtl8139_start_thread(struct rtl8139_private *tp);
 static void rtl8139_tx_timeout (struct net_device *dev);
 static void rtl8139_init_ring (struct net_device *dev);
 static int rtl8139_start_xmit (struct sk_buff *skb,
@@ -637,6 +637,7 @@ static struct net_device_stats *rtl8139_get_stats (struct net_device *dev);
 static void rtl8139_set_rx_mode (struct net_device *dev);
 static void __set_rx_mode (struct net_device *dev);
 static void rtl8139_hw_start (struct net_device *dev);
+static void rtl8139_thread (void *_data);
 static struct ethtool_ops rtl8139_ethtool_ops;
 
 /* write MMIO register, with flush */
@@ -1007,8 +1008,7 @@ static int __devinit rtl8139_init_one (struct pci_dev *pdev,
                (debug < 0 ? RTL8139_DEF_MSG_ENABLE : ((1 << debug) - 1));
        spin_lock_init (&tp->lock);
        spin_lock_init (&tp->rx_lock);
-       init_waitqueue_head (&tp->thr_wait);
-       init_completion (&tp->thr_exited);
+       INIT_WORK(&tp->thread, rtl8139_thread, dev);
        tp->mii.dev = dev;
        tp->mii.mdio_read = mdio_read;
        tp->mii.mdio_write = mdio_write;
@@ -1345,7 +1345,7 @@ static int rtl8139_open (struct net_device *dev)
                        dev->irq, RTL_R8 (MediaStatus),
                        tp->mii.full_duplex ? "full" : "half");
 
-       rtl8139_start_thread(dev);
+       rtl8139_start_thread(tp);
 
        return 0;
 }
@@ -1594,55 +1594,43 @@ static inline void rtl8139_thread_iter (struct net_device *dev,
                 RTL_R8 (Config1));
 }
 
-static int rtl8139_thread (void *data)
+static void rtl8139_thread (void *_data)
 {
-       struct net_device *dev = data;
+       struct net_device *dev = _data;
        struct rtl8139_private *tp = netdev_priv(dev);
-       unsigned long timeout;
-
-       daemonize("%s", dev->name);
-       allow_signal(SIGTERM);
-
-       while (1) {
-               timeout = next_tick;
-               do {
-                       timeout = interruptible_sleep_on_timeout (&tp->thr_wait, timeout);
-                       /* make swsusp happy with our thread */
-                       try_to_freeze();
-               } while (!signal_pending (current) && (timeout > 0));
-
-               if (signal_pending (current)) {
-                       flush_signals(current);
-               }
+       unsigned long thr_delay;
 
-               if (tp->time_to_die)
-                       break;
-
-               if (rtnl_lock_interruptible ())
-                       break;
+       if (rtnl_shlock_nowait() == 0) {
                rtl8139_thread_iter (dev, tp, tp->mmio_addr);
                rtnl_unlock ();
+
+               thr_delay = next_tick;
+       } else {
+               /* unlikely race.  mitigate with fast poll. */
+               thr_delay = HZ / 2;
        }
 
-       complete_and_exit (&tp->thr_exited, 0);
+       schedule_delayed_work(&tp->thread, thr_delay);
 }
 
-static void rtl8139_start_thread(struct net_device *dev)
+static void rtl8139_start_thread(struct rtl8139_private *tp)
 {
-       struct rtl8139_private *tp = netdev_priv(dev);
-
-       tp->thr_pid = -1;
        tp->twistie = 0;
-       tp->time_to_die = 0;
        if (tp->chipset == CH_8139_K)
                tp->twistie = 1;
        else if (tp->drv_flags & HAS_LNK_CHNG)
                return;
 
-       tp->thr_pid = kernel_thread(rtl8139_thread, dev, CLONE_FS|CLONE_FILES);
-       if (tp->thr_pid < 0) {
-               printk (KERN_WARNING "%s: unable to start kernel thread\n",
-                       dev->name);
+       tp->have_thread = 1;
+
+       schedule_delayed_work(&tp->thread, next_tick);
+}
+
+static void rtl8139_stop_thread(struct rtl8139_private *tp)
+{
+       if (tp->have_thread) {
+               cancel_rearming_delayed_work(&tp->thread);
+               tp->have_thread = 0;
        }
 }
 
@@ -2224,22 +2212,12 @@ static int rtl8139_close (struct net_device *dev)
 {
        struct rtl8139_private *tp = netdev_priv(dev);
        void __iomem *ioaddr = tp->mmio_addr;
-       int ret = 0;
        unsigned long flags;
 
        netif_stop_queue (dev);
 
-       if (tp->thr_pid >= 0) {
-               tp->time_to_die = 1;
-               wmb();
-               ret = kill_proc (tp->thr_pid, SIGTERM, 1);
-               if (ret) {
-                       printk (KERN_ERR "%s: unable to signal thread\n", dev->name);
-                       return ret;
-               }
-               wait_for_completion (&tp->thr_exited);
-       }
-       
+       rtl8139_stop_thread(tp);
+
        if (netif_msg_ifdown(tp))
                printk(KERN_DEBUG "%s: Shutting down ethercard, status was 0x%4.4x.\n",
                        dev->name, RTL_R16 (IntrStatus));
index ebd7313d7fc1c1652d26c37e9c984b92c57bcbe7..0f2e4c11f80fde62bf72f8f8f72de6e8c52b18d3 100644 (file)
@@ -1901,6 +1901,8 @@ config E1000_NAPI
 
          If in doubt, say N.
 
+source "drivers/net/ixp2000/Kconfig"
+
 config MYRI_SBUS
        tristate "MyriCOM Gigabit Ethernet support"
        depends on SBUS
@@ -2008,7 +2010,18 @@ config SKGE
 
          It does not support the link failover and network management 
          features that "portable" vendor supplied sk98lin driver does.
-       
+
+
+config SKY2
+       tristate "SysKonnect Yukon2 support (EXPERIMENTAL)"
+       depends on PCI && EXPERIMENTAL
+       select CRC32
+       ---help---
+         This driver support the Marvell Yukon 2 Gigabit Ethernet adapter.
+
+         To compile this driver as a module, choose M here: the module
+         will be called sky2.  This is recommended.
+
 config SK98LIN
        tristate "Marvell Yukon Chipset / SysKonnect SK-98xx Support"
        depends on PCI
index 4cffd34442aafaddc00865df86c26f410ccd61a2..b74a7cb5bae6e163c518199e28eb6269b5dc15d5 100644 (file)
@@ -13,7 +13,10 @@ obj-$(CONFIG_CHELSIO_T1) += chelsio/
 obj-$(CONFIG_BONDING) += bonding/
 obj-$(CONFIG_GIANFAR) += gianfar_driver.o
 
-gianfar_driver-objs := gianfar.o gianfar_ethtool.o gianfar_mii.o
+gianfar_driver-objs := gianfar.o \
+               gianfar_ethtool.o \
+               gianfar_mii.o \
+               gianfar_sysfs.o
 
 #
 # link order important here
@@ -59,6 +62,7 @@ spidernet-y += spider_net.o spider_net_ethtool.o sungem_phy.o
 obj-$(CONFIG_SPIDER_NET) += spidernet.o
 obj-$(CONFIG_TC35815) += tc35815.o
 obj-$(CONFIG_SKGE) += skge.o
+obj-$(CONFIG_SKY2) += sky2.o
 obj-$(CONFIG_SK98LIN) += sk98lin/
 obj-$(CONFIG_SKFP) += skfp/
 obj-$(CONFIG_VIA_RHINE) += via-rhine.o
@@ -202,6 +206,7 @@ obj-$(CONFIG_NET_TULIP) += tulip/
 obj-$(CONFIG_HAMRADIO) += hamradio/
 obj-$(CONFIG_IRDA) += irda/
 obj-$(CONFIG_ETRAX_ETHERNET) += cris/
+obj-$(CONFIG_ENP2611_MSF_NET) += ixp2000/
 
 obj-$(CONFIG_NETCONSOLE) += netconsole.o
 
index cf50384b469e9c83f8e3ed81c4258f706176e017..5cdae2bc055a9c27d679af0793d97bce459c0fd1 100644 (file)
@@ -4,5 +4,5 @@
 
 obj-$(CONFIG_BONDING) += bonding.o
 
-bonding-objs := bond_main.o bond_3ad.o bond_alb.o
+bonding-objs := bond_main.o bond_3ad.o bond_alb.o bond_sysfs.o
 
index d2f34d5a80835c786122a4ba359164d524b5bde6..f3f5825469d63c43b58df4851e8c56754ba7e800 100644 (file)
  * The full GNU General Public License is included in this distribution in the
  * file called LICENSE.
  *
- *
- * Changes:
- *
- * 2003/05/01 - Tsippy Mendelson <tsippy.mendelson at intel dot com> and
- *             Amir Noam <amir.noam at intel dot com>
- *     - Added support for lacp_rate module param.
- *
- * 2003/05/01 - Shmulik Hen <shmulik.hen at intel dot com>
- *     - Based on discussion on mailing list, changed locking scheme
- *       to use lock/unlock or lock_bh/unlock_bh appropriately instead
- *       of lock_irqsave/unlock_irqrestore. The new scheme helps exposing
- *       hidden bugs and solves system hangs that occurred due to the fact
- *       that holding lock_irqsave doesn't prevent softirqs from running.
- *       This also increases total throughput since interrupts are not
- *       blocked on each transmitted packets or monitor timeout.
- *
- * 2003/05/01 - Shmulik Hen <shmulik.hen at intel dot com>
- *     - Renamed bond_3ad_link_status_changed() to
- *       bond_3ad_handle_link_change() for compatibility with TLB.
- *
- * 2003/05/20 - Amir Noam <amir.noam at intel dot com>
- *     - Fix long fail over time when releasing last slave of an active
- *       aggregator - send LACPDU on unbind of slave to tell partner this
- *       port is no longer aggregatable.
- *
- * 2003/06/25 - Tsippy Mendelson <tsippy.mendelson at intel dot com>
- *     - Send LACPDU as highest priority packet to further fix the above
- *       problem on very high Tx traffic load where packets may get dropped
- *       by the slave.
- *
- * 2003/12/01 - Shmulik Hen <shmulik.hen at intel dot com>
- *     - Code cleanup and style changes
  */
 
 //#define BONDING_DEBUG 1
@@ -1198,10 +1166,10 @@ static void ad_rx_machine(struct lacpdu *lacpdu, struct port *port)
                        // detect loopback situation
                        if (!MAC_ADDRESS_COMPARE(&(lacpdu->actor_system), &(port->actor_system))) {
                                // INFO_RECEIVED_LOOPBACK_FRAMES
-                               printk(KERN_ERR DRV_NAME ": An illegal loopback occurred on adapter (%s)\n",
-                                               port->slave->dev->name);
-                               printk(KERN_ERR "Check the configuration to verify that all Adapters "
-                                               "are connected to 802.3ad compliant switch ports\n");
+                               printk(KERN_ERR DRV_NAME ": %s: An illegal loopback occurred on "
+                                      "adapter (%s). Check the configuration to verify that all "
+                                      "Adapters are connected to 802.3ad compliant switch ports\n",
+                                      port->slave->dev->master->name, port->slave->dev->name);
                                __release_rx_machine_lock(port);
                                return;
                        }
@@ -1378,8 +1346,9 @@ static void ad_port_selection_logic(struct port *port)
                        }
                }
                if (!curr_port) { // meaning: the port was related to an aggregator but was not on the aggregator port list
-                       printk(KERN_WARNING DRV_NAME ": Warning: Port %d (on %s) was "
+                       printk(KERN_WARNING DRV_NAME ": %s: Warning: Port %d (on %s) was "
                               "related to aggregator %d but was not on its port list\n",
+                              port->slave->dev->master->name,
                               port->actor_port_number, port->slave->dev->name,
                               port->aggregator->aggregator_identifier);
                }
@@ -1450,7 +1419,8 @@ static void ad_port_selection_logic(struct port *port)
 
                        dprintk("Port %d joined LAG %d(new LAG)\n", port->actor_port_number, port->aggregator->aggregator_identifier);
                } else {
-                       printk(KERN_ERR DRV_NAME ": Port %d (on %s) did not find a suitable aggregator\n",
+                       printk(KERN_ERR DRV_NAME ": %s: Port %d (on %s) did not find a suitable aggregator\n",
+                              port->slave->dev->master->name,
                               port->actor_port_number, port->slave->dev->name);
                }
        }
@@ -1582,8 +1552,9 @@ static void ad_agg_selection_logic(struct aggregator *aggregator)
 
                // check if any partner replys
                if (best_aggregator->is_individual) {
-                       printk(KERN_WARNING DRV_NAME ": Warning: No 802.3ad response from the link partner "
-                                       "for any adapters in the bond\n");
+                       printk(KERN_WARNING DRV_NAME ": %s: Warning: No 802.3ad response from "
+                              "the link partner for any adapters in the bond\n",
+                              best_aggregator->slave->dev->master->name);
                }
 
                // check if there are more than one aggregator
@@ -1915,7 +1886,8 @@ int bond_3ad_bind_slave(struct slave *slave)
        struct aggregator *aggregator;
 
        if (bond == NULL) {
-               printk(KERN_ERR "The slave %s is not attached to its bond\n", slave->dev->name);
+               printk(KERN_ERR DRV_NAME ": %s: The slave %s is not attached to its bond\n",
+                      slave->dev->master->name, slave->dev->name);
                return -1;
        }
 
@@ -1990,7 +1962,9 @@ void bond_3ad_unbind_slave(struct slave *slave)
 
        // if slave is null, the whole port is not initialized
        if (!port->slave) {
-               printk(KERN_WARNING DRV_NAME ": Trying to unbind an uninitialized port on %s\n", slave->dev->name);
+               printk(KERN_WARNING DRV_NAME ": Warning: %s: Trying to "
+                      "unbind an uninitialized port on %s\n",
+                      slave->dev->master->name, slave->dev->name);
                return;
        }
 
@@ -2021,7 +1995,8 @@ void bond_3ad_unbind_slave(struct slave *slave)
                                dprintk("Some port(s) related to LAG %d - replaceing with LAG %d\n", aggregator->aggregator_identifier, new_aggregator->aggregator_identifier);
 
                                if ((new_aggregator->lag_ports == port) && new_aggregator->is_active) {
-                                       printk(KERN_INFO DRV_NAME ": Removing an active aggregator\n");
+                                       printk(KERN_INFO DRV_NAME ": %s: Removing an active aggregator\n",
+                                              aggregator->slave->dev->master->name);
                                        // select new active aggregator
                                         select_new_active_agg = 1;
                                }
@@ -2051,15 +2026,17 @@ void bond_3ad_unbind_slave(struct slave *slave)
                                        ad_agg_selection_logic(__get_first_agg(port));
                                }
                        } else {
-                               printk(KERN_WARNING DRV_NAME ": Warning: unbinding aggregator, "
-                                      "and could not find a new aggregator for its ports\n");
+                               printk(KERN_WARNING DRV_NAME ": %s: Warning: unbinding aggregator, "
+                                      "and could not find a new aggregator for its ports\n",
+                                      slave->dev->master->name);
                        }
                } else { // in case that the only port related to this aggregator is the one we want to remove
                        select_new_active_agg = aggregator->is_active;
                        // clear the aggregator
                        ad_clear_agg(aggregator);
                        if (select_new_active_agg) {
-                               printk(KERN_INFO "Removing an active aggregator\n");
+                               printk(KERN_INFO DRV_NAME ": %s: Removing an active aggregator\n",
+                                      slave->dev->master->name);
                                // select new active aggregator
                                ad_agg_selection_logic(__get_first_agg(port));
                        }
@@ -2085,7 +2062,8 @@ void bond_3ad_unbind_slave(struct slave *slave)
                                        // clear the aggregator
                                        ad_clear_agg(temp_aggregator);
                                        if (select_new_active_agg) {
-                                               printk(KERN_INFO "Removing an active aggregator\n");
+                                               printk(KERN_INFO DRV_NAME ": %s: Removing an active aggregator\n",
+                                                      slave->dev->master->name);
                                                // select new active aggregator
                                                ad_agg_selection_logic(__get_first_agg(port));
                                        }
@@ -2131,7 +2109,8 @@ void bond_3ad_state_machine_handler(struct bonding *bond)
                // select the active aggregator for the bond
                if ((port = __get_first_port(bond))) {
                        if (!port->slave) {
-                               printk(KERN_WARNING DRV_NAME ": Warning: bond's first port is uninitialized\n");
+                               printk(KERN_WARNING DRV_NAME ": %s: Warning: bond's first port is "
+                                      "uninitialized\n", bond->dev->name);
                                goto re_arm;
                        }
 
@@ -2143,7 +2122,8 @@ void bond_3ad_state_machine_handler(struct bonding *bond)
        // for each port run the state machines
        for (port = __get_first_port(bond); port; port = __get_next_port(port)) {
                if (!port->slave) {
-                       printk(KERN_WARNING DRV_NAME ": Warning: Found an uninitialized port\n");
+                       printk(KERN_WARNING DRV_NAME ": %s: Warning: Found an uninitialized "
+                              "port\n", bond->dev->name);
                        goto re_arm;
                }
 
@@ -2184,7 +2164,8 @@ static void bond_3ad_rx_indication(struct lacpdu *lacpdu, struct slave *slave, u
                port = &(SLAVE_AD_INFO(slave).port);
 
                if (!port->slave) {
-                       printk(KERN_WARNING DRV_NAME ": Warning: port of slave %s is uninitialized\n", slave->dev->name);
+                       printk(KERN_WARNING DRV_NAME ": %s: Warning: port of slave %s is "
+                              "uninitialized\n", slave->dev->name, slave->dev->master->name);
                        return;
                }
 
@@ -2230,8 +2211,9 @@ void bond_3ad_adapter_speed_changed(struct slave *slave)
 
        // if slave is null, the whole port is not initialized
        if (!port->slave) {
-               printk(KERN_WARNING DRV_NAME ": Warning: speed changed for uninitialized port on %s\n",
-                      slave->dev->name);
+               printk(KERN_WARNING DRV_NAME ": Warning: %s: speed "
+                      "changed for uninitialized port on %s\n",
+                      slave->dev->master->name, slave->dev->name);
                return;
        }
 
@@ -2257,8 +2239,9 @@ void bond_3ad_adapter_duplex_changed(struct slave *slave)
 
        // if slave is null, the whole port is not initialized
        if (!port->slave) {
-               printk(KERN_WARNING DRV_NAME ": Warning: duplex changed for uninitialized port on %s\n",
-                      slave->dev->name);
+               printk(KERN_WARNING DRV_NAME ": %s: Warning: duplex changed "
+                      "for uninitialized port on %s\n",
+                      slave->dev->master->name, slave->dev->name);
                return;
        }
 
@@ -2285,8 +2268,9 @@ void bond_3ad_handle_link_change(struct slave *slave, char link)
 
        // if slave is null, the whole port is not initialized
        if (!port->slave) {
-               printk(KERN_WARNING DRV_NAME ": Warning: link status changed for uninitialized port on %s\n",
-                       slave->dev->name);
+               printk(KERN_WARNING DRV_NAME ": Warning: %s: link status changed for "
+                      "uninitialized port on %s\n",
+                       slave->dev->master->name, slave->dev->name);
                return;
        }
 
@@ -2363,7 +2347,8 @@ int bond_3ad_xmit_xor(struct sk_buff *skb, struct net_device *dev)
        }
 
        if (bond_3ad_get_active_agg_info(bond, &ad_info)) {
-               printk(KERN_DEBUG "ERROR: bond_3ad_get_active_agg_info failed\n");
+               printk(KERN_DEBUG DRV_NAME ": %s: Error: "
+                      "bond_3ad_get_active_agg_info failed\n", dev->name);
                goto out;
        }
 
@@ -2372,7 +2357,9 @@ int bond_3ad_xmit_xor(struct sk_buff *skb, struct net_device *dev)
 
        if (slaves_in_agg == 0) {
                /*the aggregator is empty*/
-               printk(KERN_DEBUG "ERROR: active aggregator is empty\n");
+               printk(KERN_DEBUG DRV_NAME ": %s: Error: active "
+                      "aggregator is empty\n",
+                      dev->name);
                goto out;
        }
 
@@ -2390,7 +2377,8 @@ int bond_3ad_xmit_xor(struct sk_buff *skb, struct net_device *dev)
        }
 
        if (slave_agg_no >= 0) {
-               printk(KERN_ERR DRV_NAME ": Error: Couldn't find a slave to tx on for aggregator ID %d\n", agg_id);
+               printk(KERN_ERR DRV_NAME ": %s: Error: Couldn't find a slave to tx on "
+                      "for aggregator ID %d\n", dev->name, agg_id);
                goto out;
        }
 
index 673a30af5660f58a096f1253c34fb10bd40bcbec..5ee2cef5b037f9d5f0b41ff2015a34c3067af2a0 100644 (file)
  * The full GNU General Public License is included in this distribution in the
  * file called LICENSE.
  *
- *
- * Changes:
- *
- * 2003/05/01 - Tsippy Mendelson <tsippy.mendelson at intel dot com> and
- *             Amir Noam <amir.noam at intel dot com>
- *     - Added support for lacp_rate module param.
- *
- * 2003/05/01 - Shmulik Hen <shmulik.hen at intel dot com>
- *     - Renamed bond_3ad_link_status_changed() to
- *       bond_3ad_handle_link_change() for compatibility with TLB.
- *
- * 2003/12/01 - Shmulik Hen <shmulik.hen at intel dot com>
- *     - Code cleanup and style changes
  */
 
 #ifndef __BOND_3AD_H__
index f8fce39611972f18fefdd8524368955425d84466..854ddfb90da19139bfcdbbe47810117772c4f8ef 100644 (file)
  * The full GNU General Public License is included in this distribution in the
  * file called LICENSE.
  *
- *
- * Changes:
- *
- * 2003/06/25 - Shmulik Hen <shmulik.hen at intel dot com>
- *     - Fixed signed/unsigned calculation errors that caused load sharing
- *       to collapse to one slave under very heavy UDP Tx stress.
- *
- * 2003/08/06 - Amir Noam <amir.noam at intel dot com>
- *     - Add support for setting bond's MAC address with special
- *       handling required for ALB/TLB.
- *
- * 2003/12/01 - Shmulik Hen <shmulik.hen at intel dot com>
- *     - Code cleanup and style changes
- *
- * 2003/12/30 - Amir Noam <amir.noam at intel dot com>
- *     - Fixed: Cannot remove and re-enslave the original active slave.
- *
- * 2004/01/14 - Shmulik Hen <shmulik.hen at intel dot com>
- *     - Add capability to tag self generated packets in ALB/TLB modes.
  */
 
 //#define BONDING_DEBUG 1
@@ -198,20 +179,21 @@ static int tlb_initialize(struct bonding *bond)
 {
        struct alb_bond_info *bond_info = &(BOND_ALB_INFO(bond));
        int size = TLB_HASH_TABLE_SIZE * sizeof(struct tlb_client_info);
+       struct tlb_client_info *new_hashtbl;
        int i;
 
        spin_lock_init(&(bond_info->tx_hashtbl_lock));
 
-       _lock_tx_hashtbl(bond);
-
-       bond_info->tx_hashtbl = kmalloc(size, GFP_KERNEL);
-       if (!bond_info->tx_hashtbl) {
+       new_hashtbl = kmalloc(size, GFP_KERNEL);
+       if (!new_hashtbl) {
                printk(KERN_ERR DRV_NAME
-                      ": Error: %s: Failed to allocate TLB hash table\n",
+                      ": %s: Error: Failed to allocate TLB hash table\n",
                       bond->dev->name);
-               _unlock_tx_hashtbl(bond);
                return -1;
        }
+       _lock_tx_hashtbl(bond);
+
+       bond_info->tx_hashtbl = new_hashtbl;
 
        memset(bond_info->tx_hashtbl, 0, size);
 
@@ -513,7 +495,8 @@ static void rlb_update_client(struct rlb_client_info *client_info)
                                 client_info->mac_dst);
                if (!skb) {
                        printk(KERN_ERR DRV_NAME
-                              ": Error: failed to create an ARP packet\n");
+                              ": %s: Error: failed to create an ARP packet\n",
+                              client_info->slave->dev->master->name);
                        continue;
                }
 
@@ -523,7 +506,8 @@ static void rlb_update_client(struct rlb_client_info *client_info)
                        skb = vlan_put_tag(skb, client_info->vlan_id);
                        if (!skb) {
                                printk(KERN_ERR DRV_NAME
-                                      ": Error: failed to insert VLAN tag\n");
+                                      ": %s: Error: failed to insert VLAN tag\n",
+                                      client_info->slave->dev->master->name);
                                continue;
                        }
                }
@@ -606,8 +590,9 @@ static void rlb_req_update_subnet_clients(struct bonding *bond, u32 src_ip)
 
                if (!client_info->slave) {
                        printk(KERN_ERR DRV_NAME
-                              ": Error: found a client with no channel in "
-                              "the client's hash table\n");
+                              ": %s: Error: found a client with no channel in "
+                              "the client's hash table\n",
+                              bond->dev->name);
                        continue;
                }
                /*update all clients using this src_ip, that are not assigned
@@ -797,21 +782,22 @@ static int rlb_initialize(struct bonding *bond)
 {
        struct alb_bond_info *bond_info = &(BOND_ALB_INFO(bond));
        struct packet_type *pk_type = &(BOND_ALB_INFO(bond).rlb_pkt_type);
+       struct rlb_client_info  *new_hashtbl;
        int size = RLB_HASH_TABLE_SIZE * sizeof(struct rlb_client_info);
        int i;
 
        spin_lock_init(&(bond_info->rx_hashtbl_lock));
 
-       _lock_rx_hashtbl(bond);
-
-       bond_info->rx_hashtbl = kmalloc(size, GFP_KERNEL);
-       if (!bond_info->rx_hashtbl) {
+       new_hashtbl = kmalloc(size, GFP_KERNEL);
+       if (!new_hashtbl) {
                printk(KERN_ERR DRV_NAME
-                      ": Error: %s: Failed to allocate RLB hash table\n",
+                      ": %s: Error: Failed to allocate RLB hash table\n",
                       bond->dev->name);
-               _unlock_rx_hashtbl(bond);
                return -1;
        }
+       _lock_rx_hashtbl(bond);
+
+       bond_info->rx_hashtbl = new_hashtbl;
 
        bond_info->rx_hashtbl_head = RLB_NULL_INDEX;
 
@@ -927,7 +913,8 @@ static void alb_send_learning_packets(struct slave *slave, u8 mac_addr[])
                        skb = vlan_put_tag(skb, vlan->vlan_id);
                        if (!skb) {
                                printk(KERN_ERR DRV_NAME
-                                      ": Error: failed to insert VLAN tag\n");
+                                      ": %s: Error: failed to insert VLAN tag\n",
+                                      bond->dev->name);
                                continue;
                        }
                }
@@ -956,11 +943,11 @@ static int alb_set_slave_mac_addr(struct slave *slave, u8 addr[], int hw)
        s_addr.sa_family = dev->type;
        if (dev_set_mac_address(dev, &s_addr)) {
                printk(KERN_ERR DRV_NAME
-                      ": Error: dev_set_mac_address of dev %s failed! ALB "
+                      ": %s: Error: dev_set_mac_address of dev %s failed! ALB "
                       "mode requires that the base driver support setting "
                       "the hw address also when the network device's "
                       "interface is open\n",
-                      dev->name);
+                      dev->master->name, dev->name);
                return -EOPNOTSUPP;
        }
        return 0;
@@ -1153,16 +1140,16 @@ static int alb_handle_addr_collision_on_attach(struct bonding *bond, struct slav
                                       bond->alb_info.rlb_enabled);
 
                printk(KERN_WARNING DRV_NAME
-                      ": Warning: the hw address of slave %s is in use by "
+                      ": %s: Warning: the hw address of slave %s is in use by "
                       "the bond; giving it the hw address of %s\n",
-                      slave->dev->name, free_mac_slave->dev->name);
+                      bond->dev->name, slave->dev->name, free_mac_slave->dev->name);
 
        } else if (has_bond_addr) {
                printk(KERN_ERR DRV_NAME
-                      ": Error: the hw address of slave %s is in use by the "
+                      ": %s: Error: the hw address of slave %s is in use by the "
                       "bond; couldn't find a slave with a free hw address to "
                       "give it (this should not have happened)\n",
-                      slave->dev->name);
+                      bond->dev->name, slave->dev->name);
                return -EFAULT;
        }
 
@@ -1250,6 +1237,8 @@ int bond_alb_initialize(struct bonding *bond, int rlb_enabled)
                        tlb_deinitialize(bond);
                        return res;
                }
+       } else {
+               bond->alb_info.rlb_enabled = 0;
        }
 
        return 0;
@@ -1409,7 +1398,7 @@ void bond_alb_monitor(struct bonding *bond)
                read_lock(&bond->curr_slave_lock);
 
                bond_for_each_slave(bond, slave, i) {
-                       alb_send_learning_packets(slave,slave->dev->dev_addr);
+                       alb_send_learning_packets(slave, slave->dev->dev_addr);
                }
 
                read_unlock(&bond->curr_slave_lock);
index e4091cd8d6547e6474c622f71283f794c8557f5e..28f2a2fd1b5a956cb896561d2646690ed49bf230 100644 (file)
  * The full GNU General Public License is included in this distribution in the
  * file called LICENSE.
  *
- *
- * Changes:
- *
- * 2003/08/06 - Amir Noam <amir.noam at intel dot com>
- *     - Add support for setting bond's MAC address with special
- *       handling required for ALB/TLB.
- *
- * 2003/12/01 - Shmulik Hen <shmulik.hen at intel dot com>
- *     - Code cleanup and style changes
  */
 
 #ifndef __BOND_ALB_H__
index 94cec3cf2a1304b994b8279daf0cd01cbf7c2dbc..2582d98ef5c3308c16214b75f520ec1abb1b97e4 100644 (file)
  *     b: if a hw mac address already is there, eth0's hw mac address
  *        will then be set from bond0.
  *
- * v0.1 - first working version.
- * v0.2 - changed stats to be calculated by summing slaves stats.
- *
- * Changes:
- * Arnaldo Carvalho de Melo <acme@conectiva.com.br>
- * - fix leaks on failure at bond_init
- *
- * 2000/09/30 - Willy Tarreau <willy at meta-x.org>
- *     - added trivial code to release a slave device.
- *     - fixed security bug (CAP_NET_ADMIN not checked)
- *     - implemented MII link monitoring to disable dead links :
- *       All MII capable slaves are checked every <miimon> milliseconds
- *       (100 ms seems good). This value can be changed by passing it to
- *       insmod. A value of zero disables the monitoring (default).
- *     - fixed an infinite loop in bond_xmit_roundrobin() when there's no
- *       good slave.
- *     - made the code hopefully SMP safe
- *
- * 2000/10/03 - Willy Tarreau <willy at meta-x.org>
- *     - optimized slave lists based on relevant suggestions from Thomas Davis
- *     - implemented active-backup method to obtain HA with two switches:
- *       stay as long as possible on the same active interface, while we
- *       also monitor the backup one (MII link status) because we want to know
- *       if we are able to switch at any time. ( pass "mode=1" to insmod )
- *     - lots of stress testings because we need it to be more robust than the
- *       wires ! :->
- *
- * 2000/10/09 - Willy Tarreau <willy at meta-x.org>
- *     - added up and down delays after link state change.
- *     - optimized the slaves chaining so that when we run forward, we never
- *       repass through the bond itself, but we can find it by searching
- *       backwards. Renders the deletion more difficult, but accelerates the
- *       scan.
- *     - smarter enslaving and releasing.
- *     - finer and more robust SMP locking
- *
- * 2000/10/17 - Willy Tarreau <willy at meta-x.org>
- *     - fixed two potential SMP race conditions
- *
- * 2000/10/18 - Willy Tarreau <willy at meta-x.org>
- *     - small fixes to the monitoring FSM in case of zero delays
- * 2000/11/01 - Willy Tarreau <willy at meta-x.org>
- *     - fixed first slave not automatically used in trunk mode.
- * 2000/11/10 : spelling of "EtherChannel" corrected.
- * 2000/11/13 : fixed a race condition in case of concurrent accesses to ioctl().
- * 2000/12/16 : fixed improper usage of rtnl_exlock_nowait().
- *
- * 2001/1/3 - Chad N. Tindel <ctindel at ieee dot org>
- *     - The bonding driver now simulates MII status monitoring, just like
- *       a normal network device.  It will show that the link is down iff
- *       every slave in the bond shows that their links are down.  If at least
- *       one slave is up, the bond's MII status will appear as up.
- *
- * 2001/2/7 - Chad N. Tindel <ctindel at ieee dot org>
- *     - Applications can now query the bond from user space to get
- *       information which may be useful.  They do this by calling
- *       the BOND_INFO_QUERY ioctl.  Once the app knows how many slaves
- *       are in the bond, it can call the BOND_SLAVE_INFO_QUERY ioctl to
- *       get slave specific information (# link failures, etc).  See
- *       <linux/if_bonding.h> for more details.  The structs of interest
- *       are ifbond and ifslave.
- *
- * 2001/4/5 - Chad N. Tindel <ctindel at ieee dot org>
- *     - Ported to 2.4 Kernel
- *
- * 2001/5/2 - Jeffrey E. Mast <jeff at mastfamily dot com>
- *     - When a device is detached from a bond, the slave device is no longer
- *       left thinking that is has a master.
- *
- * 2001/5/16 - Jeffrey E. Mast <jeff at mastfamily dot com>
- *     - memset did not appropriately initialized the bond rw_locks. Used
- *       rwlock_init to initialize to unlocked state to prevent deadlock when
- *       first attempting a lock
- *     - Called SET_MODULE_OWNER for bond device
- *
- * 2001/5/17 - Tim Anderson <tsa at mvista.com>
- *     - 2 paths for releasing for slave release; 1 through ioctl
- *       and 2) through close. Both paths need to release the same way.
- *     - the free slave in bond release is changing slave status before
- *       the free. The netdev_set_master() is intended to change slave state
- *       so it should not be done as part of the release process.
- *     - Simple rule for slave state at release: only the active in A/B and
- *       only one in the trunked case.
- *
- * 2001/6/01 - Tim Anderson <tsa at mvista.com>
- *     - Now call dev_close when releasing a slave so it doesn't screw up
- *       out routing table.
- *
- * 2001/6/01 - Chad N. Tindel <ctindel at ieee dot org>
- *     - Added /proc support for getting bond and slave information.
- *       Information is in /proc/net/<bond device>/info.
- *     - Changed the locking when calling bond_close to prevent deadlock.
- *
- * 2001/8/05 - Janice Girouard <girouard at us.ibm.com>
- *     - correct problem where refcnt of slave is not incremented in bond_ioctl
- *       so the system hangs when halting.
- *     - correct locking problem when unable to malloc in bond_enslave.
- *     - adding bond_xmit_xor logic.
- *     - adding multiple bond device support.
- *
- * 2001/8/13 - Erik Habbinga <erik_habbinga at hp dot com>
- *     - correct locking problem with rtnl_exlock_nowait
- *
- * 2001/8/23 - Janice Girouard <girouard at us.ibm.com>
- *     - bzero initial dev_bonds, to correct oops
- *     - convert SIOCDEVPRIVATE to new MII ioctl calls
- *
- * 2001/9/13 - Takao Indoh <indou dot takao at jp dot fujitsu dot com>
- *     - Add the BOND_CHANGE_ACTIVE ioctl implementation
- *
- * 2001/9/14 - Mark Huth <mhuth at mvista dot com>
- *     - Change MII_LINK_READY to not check for end of auto-negotiation,
- *       but only for an up link.
- *
- * 2001/9/20 - Chad N. Tindel <ctindel at ieee dot org>
- *     - Add the device field to bonding_t.  Previously the net_device
- *       corresponding to a bond wasn't available from the bonding_t
- *       structure.
- *
- * 2001/9/25 - Janice Girouard <girouard at us.ibm.com>
- *     - add arp_monitor for active backup mode
- *
- * 2001/10/23 - Takao Indoh <indou dot takao at jp dot fujitsu dot com>
- *     - Various memory leak fixes
- *
- * 2001/11/5 - Mark Huth <mark dot huth at mvista dot com>
- *     - Don't take rtnl lock in bond_mii_monitor as it deadlocks under
- *       certain hotswap conditions.
- *       Note:  this same change may be required in bond_arp_monitor ???
- *     - Remove possibility of calling bond_sethwaddr with NULL slave_dev ptr
- *     - Handle hot swap ethernet interface deregistration events to remove
- *       kernel oops following hot swap of enslaved interface
- *
- * 2002/1/2 - Chad N. Tindel <ctindel at ieee dot org>
- *     - Restore original slave flags at release time.
- *
- * 2002/02/18 - Erik Habbinga <erik_habbinga at hp dot com>
- *     - bond_release(): calling kfree on our_slave after call to
- *       bond_restore_slave_flags, not before
- *     - bond_enslave(): saving slave flags into original_flags before
- *       call to netdev_set_master, so the IFF_SLAVE flag doesn't end
- *       up in original_flags
- *
- * 2002/04/05 - Mark Smith <mark.smith at comdev dot cc> and
- *              Steve Mead <steve.mead at comdev dot cc>
- *     - Port Gleb Natapov's multicast support patchs from 2.4.12
- *       to 2.4.18 adding support for multicast.
- *
- * 2002/06/10 - Tony Cureington <tony.cureington * hp_com>
- *     - corrected uninitialized pointer (ifr.ifr_data) in bond_check_dev_link;
- *       actually changed function to use MIIPHY, then MIIREG, and finally
- *       ETHTOOL to determine the link status
- *     - fixed bad ifr_data pointer assignments in bond_ioctl
- *     - corrected mode 1 being reported as active-backup in bond_get_info;
- *       also added text to distinguish type of load balancing (rr or xor)
- *     - change arp_ip_target module param from "1-12s" (array of 12 ptrs)
- *       to "s" (a single ptr)
- *
- * 2002/08/30 - Jay Vosburgh <fubar at us dot ibm dot com>
- *     - Removed acquisition of xmit_lock in set_multicast_list; caused
- *       deadlock on SMP (lock is held by caller).
- *     - Revamped SIOCGMIIPHY, SIOCGMIIREG portion of bond_check_dev_link().
- *
- * 2002/09/18 - Jay Vosburgh <fubar at us dot ibm dot com>
- *     - Fixed up bond_check_dev_link() (and callers): removed some magic
- *      numbers, banished local MII_ defines, wrapped ioctl calls to
- *      prevent EFAULT errors
- *
- * 2002/9/30 - Jay Vosburgh <fubar at us dot ibm dot com>
- *     - make sure the ip target matches the arp_target before saving the
- *      hw address.
- *
- * 2002/9/30 - Dan Eisner <eisner at 2robots dot com>
- *     - make sure my_ip is set before taking down the link, since
- *      not all switches respond if the source ip is not set.
- *
- * 2002/10/8 - Janice Girouard <girouard at us dot ibm dot com>
- *     - read in the local ip address when enslaving a device
- *     - add primary support
- *     - make sure 2*arp_interval has passed when a new device
- *       is brought on-line before taking it down.
- *
- * 2002/09/11 - Philippe De Muyter <phdm at macqel dot be>
- *     - Added bond_xmit_broadcast logic.
- *     - Added bond_mode() support function.
- *
- * 2002/10/26 - Laurent Deniel <laurent.deniel at free.fr>
- *     - allow to register multicast addresses only on active slave
- *       (useful in active-backup mode)
- *     - add multicast module parameter
- *     - fix deletion of multicast groups after unloading module
- *
- * 2002/11/06 - Kameshwara Rayaprolu <kameshwara.rao * wipro_com>
- *     - Changes to prevent panic from closing the device twice; if we close
- *       the device in bond_release, we must set the original_flags to down
- *       so it won't be closed again by the network layer.
- *
- * 2002/11/07 - Tony Cureington <tony.cureington * hp_com>
- *     - Fix arp_target_hw_addr memory leak
- *     - Created activebackup_arp_monitor function to handle arp monitoring
- *       in active backup mode - the bond_arp_monitor had several problems...
- *       such as allowing slaves to tx arps sequentially without any delay
- *       for a response
- *     - Renamed bond_arp_monitor to loadbalance_arp_monitor and re-wrote
- *       this function to just handle arp monitoring in load-balancing mode;
- *       it is a lot more compact now
- *     - Changes to ensure one and only one slave transmits in active-backup
- *       mode
- *     - Robustesize parameters; warn users about bad combinations of
- *       parameters; also if miimon is specified and a network driver does
- *       not support MII or ETHTOOL, inform the user of this
- *     - Changes to support link_failure_count when in arp monitoring mode
- *     - Fix up/down delay reported in /proc
- *     - Added version; log version; make version available from "modinfo -d"
- *     - Fixed problem in bond_check_dev_link - if the first IOCTL (SIOCGMIIPH)
- *      failed, the ETHTOOL ioctl never got a chance
- *
- * 2002/11/16 - Laurent Deniel <laurent.deniel at free.fr>
- *     - fix multicast handling in activebackup_arp_monitor
- *     - remove one unnecessary and confusing curr_active_slave == slave test
- *      in activebackup_arp_monitor
- *
- *  2002/11/17 - Laurent Deniel <laurent.deniel at free.fr>
- *     - fix bond_slave_info_query when slave_id = num_slaves
- *
- *  2002/11/19 - Janice Girouard <girouard at us dot ibm dot com>
- *     - correct ifr_data reference.  Update ifr_data reference
- *       to mii_ioctl_data struct values to avoid confusion.
- *
- *  2002/11/22 - Bert Barbe <bert.barbe at oracle dot com>
- *      - Add support for multiple arp_ip_target
- *
- *  2002/12/13 - Jay Vosburgh <fubar at us dot ibm dot com>
- *     - Changed to allow text strings for mode and multicast, e.g.,
- *       insmod bonding mode=active-backup.  The numbers still work.
- *       One change: an invalid choice will cause module load failure,
- *       rather than the previous behavior of just picking one.
- *     - Minor cleanups; got rid of dup ctype stuff, atoi function
- *
- * 2003/02/07 - Jay Vosburgh <fubar at us dot ibm dot com>
- *     - Added use_carrier module parameter that causes miimon to
- *       use netif_carrier_ok() test instead of MII/ETHTOOL ioctls.
- *     - Minor cleanups; consolidated ioctl calls to one function.
- *
- * 2003/02/07 - Tony Cureington <tony.cureington * hp_com>
- *     - Fix bond_mii_monitor() logic error that could result in
- *       bonding round-robin mode ignoring links after failover/recovery
- *
- * 2003/03/17 - Jay Vosburgh <fubar at us dot ibm dot com>
- *     - kmalloc fix (GFP_KERNEL to GFP_ATOMIC) reported by
- *       Shmulik dot Hen at intel.com.
- *     - Based on discussion on mailing list, changed use of
- *       update_slave_cnt(), created wrapper functions for adding/removing
- *       slaves, changed bond_xmit_xor() to check slave_cnt instead of
- *       checking slave and slave->dev (which only worked by accident).
- *     - Misc code cleanup: get arp_send() prototype from header file,
- *       add max_bonds to bonding.txt.
- *
- * 2003/03/18 - Tsippy Mendelson <tsippy.mendelson at intel dot com> and
- *             Shmulik Hen <shmulik.hen at intel dot com>
- *     - Make sure only bond_attach_slave() and bond_detach_slave() can
- *       manipulate the slave list, including slave_cnt, even when in
- *       bond_release_all().
- *     - Fixed hang in bond_release() with traffic running:
- *       netdev_set_master() must not be called from within the bond lock.
- *
- * 2003/03/18 - Tsippy Mendelson <tsippy.mendelson at intel dot com> and
- *             Shmulik Hen <shmulik.hen at intel dot com>
- *     - Fixed hang in bond_enslave() with traffic running:
- *       netdev_set_master() must not be called from within the bond lock.
- *
- * 2003/03/18 - Amir Noam <amir.noam at intel dot com>
- *     - Added support for getting slave's speed and duplex via ethtool.
- *       Needed for 802.3ad and other future modes.
- *
- * 2003/03/18 - Tsippy Mendelson <tsippy.mendelson at intel dot com> and
- *             Shmulik Hen <shmulik.hen at intel dot com>
- *     - Enable support of modes that need to use the unique mac address of
- *       each slave.
- *       * bond_enslave(): Moved setting the slave's mac address, and
- *         openning it, from the application to the driver. This breaks
- *         backward comaptibility with old versions of ifenslave that open
- *          the slave before enalsving it !!!.
- *       * bond_release(): The driver also takes care of closing the slave
- *         and restoring its original mac address.
- *     - Removed the code that restores all base driver's flags.
- *       Flags are automatically restored once all undo stages are done
- *       properly.
- *     - Block possibility of enslaving before the master is up. This
- *       prevents putting the system in an unstable state.
- *
- * 2003/03/18 - Amir Noam <amir.noam at intel dot com>,
- *             Tsippy Mendelson <tsippy.mendelson at intel dot com> and
- *             Shmulik Hen <shmulik.hen at intel dot com>
- *     - Added support for IEEE 802.3ad Dynamic link aggregation mode.
- *
- * 2003/05/01 - Amir Noam <amir.noam at intel dot com>
- *     - Added ABI version control to restore compatibility between
- *       new/old ifenslave and new/old bonding.
- *
- * 2003/05/01 - Shmulik Hen <shmulik.hen at intel dot com>
- *     - Fixed bug in bond_release_all(): save old value of curr_active_slave
- *       before setting it to NULL.
- *     - Changed driver versioning scheme to include version number instead
- *       of release date (that is already in another field). There are 3
- *       fields X.Y.Z where:
- *             X - Major version - big behavior changes
- *             Y - Minor version - addition of features
- *             Z - Extra version - minor changes and bug fixes
- *       The current version is 1.0.0 as a base line.
- *
- * 2003/05/01 - Tsippy Mendelson <tsippy.mendelson at intel dot com> and
- *             Amir Noam <amir.noam at intel dot com>
- *     - Added support for lacp_rate module param.
- *     - Code beautification and style changes (mainly in comments).
- *       new version - 1.0.1
- *
- * 2003/05/01 - Shmulik Hen <shmulik.hen at intel dot com>
- *     - Based on discussion on mailing list, changed locking scheme
- *       to use lock/unlock or lock_bh/unlock_bh appropriately instead
- *       of lock_irqsave/unlock_irqrestore. The new scheme helps exposing
- *       hidden bugs and solves system hangs that occurred due to the fact
- *       that holding lock_irqsave doesn't prevent softirqs from running.
- *       This also increases total throughput since interrupts are not
- *       blocked on each transmitted packets or monitor timeout.
- *       new version - 2.0.0
- *
- * 2003/05/01 - Shmulik Hen <shmulik.hen at intel dot com>
- *     - Added support for Transmit load balancing mode.
- *     - Concentrate all assignments of curr_active_slave to a single point
- *       so specific modes can take actions when the primary adapter is
- *       changed.
- *     - Take the updelay parameter into consideration during bond_enslave
- *       since some adapters loose their link during setting the device.
- *     - Renamed bond_3ad_link_status_changed() to
- *       bond_3ad_handle_link_change() for compatibility with TLB.
- *       new version - 2.1.0
- *
- * 2003/05/01 - Tsippy Mendelson <tsippy.mendelson at intel dot com>
- *     - Added support for Adaptive load balancing mode which is
- *       equivalent to Transmit load balancing + Receive load balancing.
- *       new version - 2.2.0
- *
- * 2003/05/15 - Jay Vosburgh <fubar at us dot ibm dot com>
- *     - Applied fix to activebackup_arp_monitor posted to bonding-devel
- *       by Tony Cureington <tony.cureington * hp_com>.  Fixes ARP
- *       monitor endless failover bug.  Version to 2.2.10
- *
- * 2003/05/20 - Amir Noam <amir.noam at intel dot com>
- *     - Fixed bug in ABI version control - Don't commit to a specific
- *       ABI version if receiving unsupported ioctl commands.
- *
- * 2003/05/22 - Jay Vosburgh <fubar at us dot ibm dot com>
- *     - Fix ifenslave -c causing bond to loose existing routes;
- *       added bond_set_mac_address() that doesn't require the
- *       bond to be down.
- *     - In conjunction with fix for ifenslave -c, in
- *       bond_change_active(), changing to the already active slave
- *       is no longer an error (it successfully does nothing).
- *
- * 2003/06/30 - Amir Noam <amir.noam at intel dot com>
- *     - Fixed bond_change_active() for ALB/TLB modes.
- *       Version to 2.2.14.
- *
- * 2003/07/29 - Amir Noam <amir.noam at intel dot com>
- *     - Fixed ARP monitoring bug.
- *       Version to 2.2.15.
- *
- * 2003/07/31 - Willy Tarreau <willy at ods dot org>
- *     - Fixed kernel panic when using ARP monitoring without
- *       setting bond's IP address.
- *       Version to 2.2.16.
- *
- * 2003/08/06 - Amir Noam <amir.noam at intel dot com>
- *     - Back port from 2.6: use alloc_netdev(); fix /proc handling;
- *       made stats a part of bond struct so no need to allocate
- *       and free it separately; use standard list operations instead
- *       of pre-allocated array of bonds.
- *       Version to 2.3.0.
- *
- * 2003/08/07 - Jay Vosburgh <fubar at us dot ibm dot com>,
- *            Amir Noam <amir.noam at intel dot com> and
- *            Shmulik Hen <shmulik.hen at intel dot com>
- *     - Propagating master's settings: Distinguish between modes that
- *       use a primary slave from those that don't, and propagate settings
- *       accordingly; Consolidate change_active opeartions and add
- *       reselect_active and find_best opeartions; Decouple promiscuous
- *       handling from the multicast mode setting; Add support for changing
- *       HW address and MTU with proper unwind; Consolidate procfs code,
- *       add CHANGENAME handler; Enhance netdev notification handling.
- *       Version to 2.4.0.
- *
- * 2003/09/15 - Stephen Hemminger <shemminger at osdl dot org>,
- *            Amir Noam <amir.noam at intel dot com>
- *     - Convert /proc to seq_file interface.
- *       Change /proc/net/bondX/info to /proc/net/bonding/bondX.
- *       Set version to 2.4.1.
- *
- * 2003/11/20 - Amir Noam <amir.noam at intel dot com>
- *     - Fix /proc creation/destruction.
- *
- * 2003/12/01 - Shmulik Hen <shmulik.hen at intel dot com>
- *     - Massive cleanup - Set version to 2.5.0
- *       Code changes:
- *       o Consolidate format of prints and debug prints.
- *       o Remove bonding_t/slave_t typedefs and consolidate all casts.
- *       o Remove dead code and unnecessary checks.
- *       o Consolidate starting/stopping timers.
- *       o Consolidate handling of primary module param throughout the code.
- *       o Removed multicast module param support - all settings are done
- *         according to mode.
- *       o Slave list iteration - bond is no longer part of the list,
- *         added cyclic list iteration macros.
- *       o Consolidate error handling in all xmit functions.
- *       Style changes:
- *       o Consolidate function naming and declarations.
- *       o Consolidate function params and local variables names.
- *       o Consolidate return values.
- *       o Consolidate curly braces.
- *       o Consolidate conditionals format.
- *       o Change struct member names and types.
- *       o Chomp trailing spaces, remove empty lines, fix indentations.
- *       o Re-organize code according to context.
- *
- * 2003/12/30 - Amir Noam <amir.noam at intel dot com>
- *     - Fixed: Cannot remove and re-enslave the original active slave.
- *     - Fixed: Releasing the original active slave causes mac address
- *              duplication.
- *     - Add support for slaves that use ethtool_ops.
- *       Set version to 2.5.3.
- *
- * 2004/01/05 - Amir Noam <amir.noam at intel dot com>
- *     - Save bonding parameters per bond instead of using the global values.
- *       Set version to 2.5.4.
- *
- * 2004/01/14 - Shmulik Hen <shmulik.hen at intel dot com>
- *     - Enhance VLAN support:
- *       * Add support for VLAN hardware acceleration capable slaves.
- *       * Add capability to tag self generated packets in ALB/TLB modes.
- *       Set version to 2.6.0.
- * 2004/10/29 - Mitch Williams <mitch.a.williams at intel dot com>
- *      - Fixed bug when unloading module while using 802.3ad.  If
- *        spinlock debugging is turned on, this causes a stack dump.
- *        Solution is to move call to dev_remove_pack outside of the
- *        spinlock.
- *        Set version to 2.6.1.
- * 2005/06/05 - Jay Vosburgh <fubar@us.ibm.com>
- *     - Support for generating gratuitous ARPs in active-backup mode.
- *       Includes support for VLAN tagging all bonding-generated ARPs
- *       as needed.  Set version to 2.6.2.
- * 2005/06/08 - Jason Gabler <jygabler at lbl dot gov>
- *     - alternate hashing policy support for mode 2
- *       * Added kernel parameter "xmit_hash_policy" to allow the selection
- *         of different hashing policies for mode 2.  The original mode 2
- *         policy is the default, now found in xmit_hash_policy_layer2().
- *       * Added xmit_hash_policy_layer34()
- *     - Modified by Jay Vosburgh <fubar@us.ibm.com> to also support mode 4.
- *       Set version to 2.6.3.
- * 2005/09/26 - Jay Vosburgh <fubar@us.ibm.com>
- *     - Removed backwards compatibility for old ifenslaves.  Version 2.6.4.
  */
 
 //#define BONDING_DEBUG 1
@@ -557,6 +97,7 @@ static char *lacp_rate       = NULL;
 static char *xmit_hash_policy = NULL;
 static int arp_interval = BOND_LINK_ARP_INTERV;
 static char *arp_ip_target[BOND_MAX_ARP_TARGETS] = { NULL, };
+struct bond_params bonding_defaults;
 
 module_param(max_bonds, int, 0);
 MODULE_PARM_DESC(max_bonds, "Max number of bonded devices");
@@ -565,17 +106,24 @@ MODULE_PARM_DESC(miimon, "Link check interval in milliseconds");
 module_param(updelay, int, 0);
 MODULE_PARM_DESC(updelay, "Delay before considering link up, in milliseconds");
 module_param(downdelay, int, 0);
-MODULE_PARM_DESC(downdelay, "Delay before considering link down, in milliseconds");
+MODULE_PARM_DESC(downdelay, "Delay before considering link down, "
+                           "in milliseconds");
 module_param(use_carrier, int, 0);
-MODULE_PARM_DESC(use_carrier, "Use netif_carrier_ok (vs MII ioctls) in miimon; 0 for off, 1 for on (default)");
+MODULE_PARM_DESC(use_carrier, "Use netif_carrier_ok (vs MII ioctls) in miimon; "
+                             "0 for off, 1 for on (default)");
 module_param(mode, charp, 0);
-MODULE_PARM_DESC(mode, "Mode of operation : 0 for round robin, 1 for active-backup, 2 for xor");
+MODULE_PARM_DESC(mode, "Mode of operation : 0 for balance-rr, "
+                      "1 for active-backup, 2 for balance-xor, "
+                      "3 for broadcast, 4 for 802.3ad, 5 for balance-tlb, "
+                      "6 for balance-alb");
 module_param(primary, charp, 0);
 MODULE_PARM_DESC(primary, "Primary network device to use");
 module_param(lacp_rate, charp, 0);
-MODULE_PARM_DESC(lacp_rate, "LACPDU tx rate to request from 802.3ad partner (slow/fast)");
+MODULE_PARM_DESC(lacp_rate, "LACPDU tx rate to request from 802.3ad partner "
+                           "(slow/fast)");
 module_param(xmit_hash_policy, charp, 0);
-MODULE_PARM_DESC(xmit_hash_policy, "XOR hashing method : 0 for layer 2 (default), 1 for layer 3+4");
+MODULE_PARM_DESC(xmit_hash_policy, "XOR hashing method: 0 for layer 2 (default)"
+                                  ", 1 for layer 3+4");
 module_param(arp_interval, int, 0);
 MODULE_PARM_DESC(arp_interval, "arp interval in milliseconds");
 module_param_array(arp_ip_target, charp, NULL, 0);
@@ -586,30 +134,27 @@ MODULE_PARM_DESC(arp_ip_target, "arp targets in n.n.n.n form");
 static const char *version =
        DRV_DESCRIPTION ": v" DRV_VERSION " (" DRV_RELDATE ")\n";
 
-static LIST_HEAD(bond_dev_list);
+LIST_HEAD(bond_dev_list);
 
 #ifdef CONFIG_PROC_FS
 static struct proc_dir_entry *bond_proc_dir = NULL;
 #endif
 
+extern struct rw_semaphore bonding_rwsem;
 static u32 arp_target[BOND_MAX_ARP_TARGETS] = { 0, } ;
 static int arp_ip_count        = 0;
 static int bond_mode   = BOND_MODE_ROUNDROBIN;
 static int xmit_hashtype= BOND_XMIT_POLICY_LAYER2;
 static int lacp_fast   = 0;
 
-struct bond_parm_tbl {
-       char *modename;
-       int mode;
-};
 
-static struct bond_parm_tbl bond_lacp_tbl[] = {
+struct bond_parm_tbl bond_lacp_tbl[] = {
 {      "slow",         AD_LACP_SLOW},
 {      "fast",         AD_LACP_FAST},
 {      NULL,           -1},
 };
 
-static struct bond_parm_tbl bond_mode_tbl[] = {
+struct bond_parm_tbl bond_mode_tbl[] = {
 {      "balance-rr",           BOND_MODE_ROUNDROBIN},
 {      "active-backup",        BOND_MODE_ACTIVEBACKUP},
 {      "balance-xor",          BOND_MODE_XOR},
@@ -620,7 +165,7 @@ static struct bond_parm_tbl bond_mode_tbl[] = {
 {      NULL,                   -1},
 };
 
-static struct bond_parm_tbl xmit_hashtype_tbl[] = {
+struct bond_parm_tbl xmit_hashtype_tbl[] = {
 {      "layer2",               BOND_XMIT_POLICY_LAYER2},
 {      "layer3+4",             BOND_XMIT_POLICY_LAYER34},
 {      NULL,                   -1},
@@ -628,12 +173,11 @@ static struct bond_parm_tbl xmit_hashtype_tbl[] = {
 
 /*-------------------------- Forward declarations ---------------------------*/
 
-static inline void bond_set_mode_ops(struct bonding *bond, int mode);
 static void bond_send_gratuitous_arp(struct bonding *bond);
 
 /*---------------------------- General routines -----------------------------*/
 
-static const char *bond_mode_name(int mode)
+const char *bond_mode_name(int mode)
 {
        switch (mode) {
        case BOND_MODE_ROUNDROBIN :
@@ -910,7 +454,7 @@ static void bond_vlan_rx_add_vid(struct net_device *bond_dev, uint16_t vid)
        res = bond_add_vlan(bond, vid);
        if (res) {
                printk(KERN_ERR DRV_NAME
-                      ": %s: Failed to add vlan id %d\n",
+                      ": %s: Error: Failed to add vlan id %d\n",
                       bond_dev->name, vid);
        }
 }
@@ -944,7 +488,7 @@ static void bond_vlan_rx_kill_vid(struct net_device *bond_dev, uint16_t vid)
        res = bond_del_vlan(bond, vid);
        if (res) {
                printk(KERN_ERR DRV_NAME
-                      ": %s: Failed to remove vlan id %d\n",
+                      ": %s: Error: Failed to remove vlan id %d\n",
                       bond_dev->name, vid);
        }
 }
@@ -1449,7 +993,7 @@ static struct slave *bond_find_best_slave(struct bonding *bond)
  *
  * Warning: Caller must hold curr_slave_lock for writing.
  */
-static void bond_change_active_slave(struct bonding *bond, struct slave *new_active)
+void bond_change_active_slave(struct bonding *bond, struct slave *new_active)
 {
        struct slave *old_active = bond->curr_active_slave;
 
@@ -1523,7 +1067,7 @@ static void bond_change_active_slave(struct bonding *bond, struct slave *new_act
  *
  * Warning: Caller must hold curr_slave_lock for writing.
  */
-static void bond_select_active_slave(struct bonding *bond)
+void bond_select_active_slave(struct bonding *bond)
 {
        struct slave *best_slave;
 
@@ -1591,7 +1135,7 @@ static void bond_detach_slave(struct bonding *bond, struct slave *slave)
 
 /*---------------------------------- IOCTL ----------------------------------*/
 
-static int bond_sethwaddr(struct net_device *bond_dev, struct net_device *slave_dev)
+int bond_sethwaddr(struct net_device *bond_dev, struct net_device *slave_dev)
 {
        dprintk("bond_dev=%p\n", bond_dev);
        dprintk("slave_dev=%p\n", slave_dev);
@@ -1631,7 +1175,7 @@ static int bond_compute_features(struct bonding *bond)
 }
 
 /* enslave device <slave> to bond device <master> */
-static int bond_enslave(struct net_device *bond_dev, struct net_device *slave_dev)
+int bond_enslave(struct net_device *bond_dev, struct net_device *slave_dev)
 {
        struct bonding *bond = bond_dev->priv;
        struct slave *new_slave = NULL;
@@ -1644,8 +1188,8 @@ static int bond_enslave(struct net_device *bond_dev, struct net_device *slave_de
        if (!bond->params.use_carrier && slave_dev->ethtool_ops == NULL &&
                slave_dev->do_ioctl == NULL) {
                printk(KERN_WARNING DRV_NAME
-                      ": Warning : no link monitoring support for %s\n",
-                      slave_dev->name);
+                      ": %s: Warning: no link monitoring support for %s\n",
+                      bond_dev->name, slave_dev->name);
        }
 
        /* bond must be initialized by bond_open() before enslaving */
@@ -1666,17 +1210,17 @@ static int bond_enslave(struct net_device *bond_dev, struct net_device *slave_de
                dprintk("%s: NETIF_F_VLAN_CHALLENGED\n", slave_dev->name);
                if (!list_empty(&bond->vlan_list)) {
                        printk(KERN_ERR DRV_NAME
-                              ": Error: cannot enslave VLAN "
+                              ": %s: Error: cannot enslave VLAN "
                               "challenged slave %s on VLAN enabled "
-                              "bond %s\n", slave_dev->name,
+                              "bond %s\n", bond_dev->name, slave_dev->name,
                               bond_dev->name);
                        return -EPERM;
                } else {
                        printk(KERN_WARNING DRV_NAME
-                              ": Warning: enslaved VLAN challenged "
+                              ": %s: Warning: enslaved VLAN challenged "
                               "slave %s. Adding VLANs will be blocked as "
                               "long as %s is part of bond %s\n",
-                              slave_dev->name, slave_dev->name,
+                              bond_dev->name, slave_dev->name, slave_dev->name,
                               bond_dev->name);
                        bond_dev->features |= NETIF_F_VLAN_CHALLENGED;
                }
@@ -1706,12 +1250,11 @@ static int bond_enslave(struct net_device *bond_dev, struct net_device *slave_de
 
        if (slave_dev->set_mac_address == NULL) {
                printk(KERN_ERR DRV_NAME
-                      ": Error: The slave device you specified does "
-                      "not support setting the MAC address.\n");
-               printk(KERN_ERR
-                      "Your kernel likely does not support slave devices.\n");
-
-               res = -EOPNOTSUPP;
+                       ": %s: Error: The slave device you specified does "
+                       "not support setting the MAC address. "
+                       "Your kernel likely does not support slave "
+                       "devices.\n", bond_dev->name);
+               res = -EOPNOTSUPP;
                goto err_undo_flags;
        }
 
@@ -1827,21 +1370,21 @@ static int bond_enslave(struct net_device *bond_dev, struct net_device *slave_de
                         * the messages for netif_carrier.
                         */
                        printk(KERN_WARNING DRV_NAME
-                              ": Warning: MII and ETHTOOL support not "
+                              ": %s: Warning: MII and ETHTOOL support not "
                               "available for interface %s, and "
                               "arp_interval/arp_ip_target module parameters "
                               "not specified, thus bonding will not detect "
                               "link failures! see bonding.txt for details.\n",
-                              slave_dev->name);
+                              bond_dev->name, slave_dev->name);
                } else if (link_reporting == -1) {
                        /* unable get link status using mii/ethtool */
                        printk(KERN_WARNING DRV_NAME
-                              ": Warning: can't get link status from "
+                              ": %s: Warning: can't get link status from "
                               "interface %s; the network driver associated "
                               "with this interface does not support MII or "
                               "ETHTOOL link status reporting, thus miimon "
                               "has no effect on this interface.\n",
-                              slave_dev->name);
+                              bond_dev->name, slave_dev->name);
                }
        }
 
@@ -1868,15 +1411,15 @@ static int bond_enslave(struct net_device *bond_dev, struct net_device *slave_de
        if (bond_update_speed_duplex(new_slave) &&
            (new_slave->link != BOND_LINK_DOWN)) {
                printk(KERN_WARNING DRV_NAME
-                      ": Warning: failed to get speed and duplex from %s, "
+                      ": %s: Warning: failed to get speed and duplex from %s, "
                       "assumed to be 100Mb/sec and Full.\n",
-                      new_slave->dev->name);
+                      bond_dev->name, new_slave->dev->name);
 
                if (bond->params.mode == BOND_MODE_8023AD) {
-                       printk(KERN_WARNING
-                              "Operation of 802.3ad mode requires ETHTOOL "
+                       printk(KERN_WARNING DRV_NAME
+                              ": %s: Warning: Operation of 802.3ad mode requires ETHTOOL "
                               "support in base driver for proper aggregator "
-                              "selection.\n");
+                              "selection.\n", bond_dev->name);
                }
        }
 
@@ -1958,6 +1501,10 @@ static int bond_enslave(struct net_device *bond_dev, struct net_device *slave_de
 
        write_unlock_bh(&bond->lock);
 
+       res = bond_create_slave_symlinks(bond_dev, slave_dev);
+       if (res)
+               goto err_unset_master;
+
        printk(KERN_INFO DRV_NAME
               ": %s: enslaving %s as a%s interface with a%s link.\n",
               bond_dev->name, slave_dev->name,
@@ -1999,7 +1546,7 @@ err_undo_flags:
  *   for Bonded connections:
  *     The first up interface should be left on and all others downed.
  */
-static int bond_release(struct net_device *bond_dev, struct net_device *slave_dev)
+int bond_release(struct net_device *bond_dev, struct net_device *slave_dev)
 {
        struct bonding *bond = bond_dev->priv;
        struct slave *slave, *oldcurrent;
@@ -2010,7 +1557,7 @@ static int bond_release(struct net_device *bond_dev, struct net_device *slave_de
        if (!(slave_dev->flags & IFF_SLAVE) ||
            (slave_dev->master != bond_dev)) {
                printk(KERN_ERR DRV_NAME
-                      ": Error: %s: cannot release %s.\n",
+                      ": %s: Error: cannot release %s.\n",
                       bond_dev->name, slave_dev->name);
                return -EINVAL;
        }
@@ -2031,11 +1578,12 @@ static int bond_release(struct net_device *bond_dev, struct net_device *slave_de
                                 ETH_ALEN);
        if (!mac_addr_differ && (bond->slave_cnt > 1)) {
                printk(KERN_WARNING DRV_NAME
-                      ": Warning: the permanent HWaddr of %s "
+                      ": %s: Warning: the permanent HWaddr of %s "
                       "- %02X:%02X:%02X:%02X:%02X:%02X - is "
                       "still in use by %s. Set the HWaddr of "
                       "%s to a different address to avoid "
                       "conflicts.\n",
+                      bond_dev->name,
                       slave_dev->name,
                       slave->perm_hwaddr[0],
                       slave->perm_hwaddr[1],
@@ -2111,24 +1659,28 @@ static int bond_release(struct net_device *bond_dev, struct net_device *slave_de
                        bond_dev->features |= NETIF_F_VLAN_CHALLENGED;
                } else {
                        printk(KERN_WARNING DRV_NAME
-                              ": Warning: clearing HW address of %s while it "
+                              ": %s: Warning: clearing HW address of %s while it "
                               "still has VLANs.\n",
-                              bond_dev->name);
+                              bond_dev->name, bond_dev->name);
                        printk(KERN_WARNING DRV_NAME
-                              ": When re-adding slaves, make sure the bond's "
-                              "HW address matches its VLANs'.\n");
+                              ": %s: When re-adding slaves, make sure the bond's "
+                              "HW address matches its VLANs'.\n",
+                              bond_dev->name);
                }
        } else if ((bond_dev->features & NETIF_F_VLAN_CHALLENGED) &&
                   !bond_has_challenged_slaves(bond)) {
                printk(KERN_INFO DRV_NAME
-                      ": last VLAN challenged slave %s "
+                      ": %s: last VLAN challenged slave %s "
                       "left bond %s. VLAN blocking is removed\n",
-                      slave_dev->name, bond_dev->name);
+                      bond_dev->name, slave_dev->name, bond_dev->name);
                bond_dev->features &= ~NETIF_F_VLAN_CHALLENGED;
        }
 
        write_unlock_bh(&bond->lock);
 
+       /* must do this from outside any spinlocks */
+       bond_destroy_slave_symlinks(bond_dev, slave_dev);
+
        bond_del_vlans_from_slave(bond, slave_dev);
 
        /* If the mode USES_PRIMARY, then we should only remove its
@@ -2220,6 +1772,7 @@ static int bond_release_all(struct net_device *bond_dev)
                 */
                write_unlock_bh(&bond->lock);
 
+               bond_destroy_slave_symlinks(bond_dev, slave_dev);
                bond_del_vlans_from_slave(bond, slave_dev);
 
                /* If the mode USES_PRIMARY, then we should only remove its
@@ -2274,12 +1827,13 @@ static int bond_release_all(struct net_device *bond_dev)
                bond_dev->features |= NETIF_F_VLAN_CHALLENGED;
        } else {
                printk(KERN_WARNING DRV_NAME
-                      ": Warning: clearing HW address of %s while it "
+                      ": %s: Warning: clearing HW address of %s while it "
                       "still has VLANs.\n",
-                      bond_dev->name);
+                      bond_dev->name, bond_dev->name);
                printk(KERN_WARNING DRV_NAME
-                      ": When re-adding slaves, make sure the bond's "
-                      "HW address matches its VLANs'.\n");
+                      ": %s: When re-adding slaves, make sure the bond's "
+                      "HW address matches its VLANs'.\n",
+                      bond_dev->name);
        }
 
        printk(KERN_INFO DRV_NAME
@@ -2397,7 +1951,7 @@ static int bond_slave_info_query(struct net_device *bond_dev, struct ifslave *in
 /*-------------------------------- Monitoring -------------------------------*/
 
 /* this function is called regularly to monitor each slave's link. */
-static void bond_mii_monitor(struct net_device *bond_dev)
+void bond_mii_monitor(struct net_device *bond_dev)
 {
        struct bonding *bond = bond_dev->priv;
        struct slave *slave, *oldcurrent;
@@ -2596,8 +2150,11 @@ static void bond_mii_monitor(struct net_device *bond_dev)
                        break;
                default:
                        /* Should not happen */
-                       printk(KERN_ERR "bonding: Error: %s  Illegal value (link=%d)\n",
-                              slave->dev->name, slave->link);
+                       printk(KERN_ERR DRV_NAME
+                              ": %s: Error: %s Illegal value (link=%d)\n",
+                              bond_dev->name,
+                              slave->dev->name,
+                              slave->link);
                        goto out;
                } /* end of switch (slave->link) */
 
@@ -2721,7 +2278,9 @@ static void bond_arp_send_all(struct bonding *bond, struct slave *slave)
        struct flowi fl;
        struct rtable *rt;
 
-       for (i = 0; (i < BOND_MAX_ARP_TARGETS) && targets[i]; i++) {
+       for (i = 0; (i < BOND_MAX_ARP_TARGETS); i++) {
+               if (!targets[i])
+                       continue;
                dprintk("basa: target %x\n", targets[i]);
                if (list_empty(&bond->vlan_list)) {
                        dprintk("basa: empty vlan: arp_send\n");
@@ -2825,7 +2384,7 @@ static void bond_send_gratuitous_arp(struct bonding *bond)
  * arp is transmitted to generate traffic. see activebackup_arp_monitor for
  * arp monitoring in active backup mode.
  */
-static void bond_loadbalance_arp_mon(struct net_device *bond_dev)
+void bond_loadbalance_arp_mon(struct net_device *bond_dev)
 {
        struct bonding *bond = bond_dev->priv;
        struct slave *slave, *oldcurrent;
@@ -2963,7 +2522,7 @@ out:
  * may have received.
  * see loadbalance_arp_monitor for arp monitoring in load balancing mode
  */
-static void bond_activebackup_arp_mon(struct net_device *bond_dev)
+void bond_activebackup_arp_mon(struct net_device *bond_dev)
 {
        struct bonding *bond = bond_dev->priv;
        struct slave *slave;
@@ -3249,6 +2808,8 @@ static void bond_info_show_master(struct seq_file *seq)
 {
        struct bonding *bond = seq->private;
        struct slave *curr;
+       int i;
+       u32 target;
 
        read_lock(&bond->curr_slave_lock);
        curr = bond->curr_active_slave;
@@ -3257,10 +2818,17 @@ static void bond_info_show_master(struct seq_file *seq)
        seq_printf(seq, "Bonding Mode: %s\n",
                   bond_mode_name(bond->params.mode));
 
+       if (bond->params.mode == BOND_MODE_XOR ||
+               bond->params.mode == BOND_MODE_8023AD) {
+               seq_printf(seq, "Transmit Hash Policy: %s (%d)\n",
+                       xmit_hashtype_tbl[bond->params.xmit_policy].modename,
+                       bond->params.xmit_policy);
+       }
+
        if (USES_PRIMARY(bond->params.mode)) {
                seq_printf(seq, "Primary Slave: %s\n",
-                          (bond->params.primary[0]) ?
-                               bond->params.primary : "None");
+                          (bond->primary_slave) ?
+                          bond->primary_slave->dev->name : "None");
 
                seq_printf(seq, "Currently Active Slave: %s\n",
                           (curr) ? curr->dev->name : "None");
@@ -3273,6 +2841,27 @@ static void bond_info_show_master(struct seq_file *seq)
        seq_printf(seq, "Down Delay (ms): %d\n",
                   bond->params.downdelay * bond->params.miimon);
 
+
+       /* ARP information */
+       if(bond->params.arp_interval > 0) {
+               int printed=0;
+               seq_printf(seq, "ARP Polling Interval (ms): %d\n",
+                               bond->params.arp_interval);
+
+               seq_printf(seq, "ARP IP target/s (n.n.n.n form):");
+
+               for(i = 0; (i < BOND_MAX_ARP_TARGETS) ;i++) {
+                       if (!bond->params.arp_targets[i])
+                               continue;
+                       if (printed)
+                               seq_printf(seq, ",");
+                       target = ntohl(bond->params.arp_targets[i]);
+                       seq_printf(seq, " %d.%d.%d.%d", HIPQUAD(target));
+                       printed = 1;
+               }
+               seq_printf(seq, "\n");
+       }
+
        if (bond->params.mode == BOND_MODE_8023AD) {
                struct ad_info ad_info;
 
@@ -3478,7 +3067,10 @@ static int bond_event_changename(struct bonding *bond)
        bond_remove_proc_entry(bond);
        bond_create_proc_entry(bond);
 #endif
-
+       down_write(&(bonding_rwsem));
+        bond_destroy_sysfs_entry(bond);
+        bond_create_sysfs_entry(bond);
+       up_write(&(bonding_rwsem));
        return NOTIFY_DONE;
 }
 
@@ -3955,6 +3547,7 @@ static int bond_do_ioctl(struct net_device *bond_dev, struct ifreq *ifr, int cmd
                return -EPERM;
        }
 
+       down_write(&(bonding_rwsem));
        slave_dev = dev_get_by_name(ifr->ifr_slave);
 
        dprintk("slave_dev=%p: \n", slave_dev);
@@ -3987,6 +3580,7 @@ static int bond_do_ioctl(struct net_device *bond_dev, struct ifreq *ifr, int cmd
                dev_put(slave_dev);
        }
 
+       up_write(&(bonding_rwsem));
        return res;
 }
 
@@ -4071,6 +3665,7 @@ static int bond_change_mtu(struct net_device *bond_dev, int new_mtu)
        bond_for_each_slave(bond, slave, i) {
                dprintk("s %p s->p %p c_m %p\n", slave,
                        slave->prev, slave->dev->change_mtu);
+
                res = dev_set_mtu(slave->dev, new_mtu);
 
                if (res) {
@@ -4397,8 +3992,9 @@ static int bond_xmit_broadcast(struct sk_buff *skb, struct net_device *bond_dev)
                                struct sk_buff *skb2 = skb_clone(skb, GFP_ATOMIC);
                                if (!skb2) {
                                        printk(KERN_ERR DRV_NAME
-                                              ": Error: bond_xmit_broadcast(): "
-                                              "skb_clone() failed\n");
+                                              ": %s: Error: bond_xmit_broadcast(): "
+                                              "skb_clone() failed\n",
+                                              bond_dev->name);
                                        continue;
                                }
 
@@ -4431,7 +4027,7 @@ out:
 /*
  * set bond mode specific net device operations
  */
-static inline void bond_set_mode_ops(struct bonding *bond, int mode)
+void bond_set_mode_ops(struct bonding *bond, int mode)
 {
        struct net_device *bond_dev = bond->dev;
 
@@ -4467,7 +4063,8 @@ static inline void bond_set_mode_ops(struct bonding *bond, int mode)
        default:
                /* Should never happen, mode already checked */
                printk(KERN_ERR DRV_NAME
-                      ": Error: Unknown bonding mode %d\n",
+                      ": %s: Error: Unknown bonding mode %d\n",
+                      bond_dev->name,
                       mode);
                break;
        }
@@ -4491,7 +4088,7 @@ static struct ethtool_ops bond_ethtool_ops = {
  * Does not allocate but creates a /proc entry.
  * Allowed to fail.
  */
-static int __init bond_init(struct net_device *bond_dev, struct bond_params *params)
+static int bond_init(struct net_device *bond_dev, struct bond_params *params)
 {
        struct bonding *bond = bond_dev->priv;
 
@@ -4565,7 +4162,7 @@ static int __init bond_init(struct net_device *bond_dev, struct bond_params *par
 /* De-initialize device specific data.
  * Caller must hold rtnl_lock.
  */
-static inline void bond_deinit(struct net_device *bond_dev)
+void bond_deinit(struct net_device *bond_dev)
 {
        struct bonding *bond = bond_dev->priv;
 
@@ -4601,7 +4198,7 @@ static void bond_free_all(void)
  * Convert string input module parms.  Accept either the
  * number of the mode or its string name.
  */
-static inline int bond_parse_parm(char *mode_arg, struct bond_parm_tbl *tbl)
+int bond_parse_parm(char *mode_arg, struct bond_parm_tbl *tbl)
 {
        int i;
 
@@ -4670,7 +4267,7 @@ static int bond_check_params(struct bond_params *params)
        if (max_bonds < 1 || max_bonds > INT_MAX) {
                printk(KERN_WARNING DRV_NAME
                       ": Warning: max_bonds (%d) not in range %d-%d, so it "
-                      "was reset to BOND_DEFAULT_MAX_BONDS (%d)",
+                      "was reset to BOND_DEFAULT_MAX_BONDS (%d)\n",
                       max_bonds, 1, INT_MAX, BOND_DEFAULT_MAX_BONDS);
                max_bonds = BOND_DEFAULT_MAX_BONDS;
        }
@@ -4881,81 +4478,96 @@ static int bond_check_params(struct bond_params *params)
        return 0;
 }
 
+/* Create a new bond based on the specified name and bonding parameters.
+ * Caller must NOT hold rtnl_lock; we need to release it here before we
+ * set up our sysfs entries.
+ */
+int bond_create(char *name, struct bond_params *params, struct bonding **newbond)
+{
+       struct net_device *bond_dev;
+       int res;
+
+       rtnl_lock();
+       bond_dev = alloc_netdev(sizeof(struct bonding), name, ether_setup);
+       if (!bond_dev) {
+               printk(KERN_ERR DRV_NAME
+                      ": %s: eek! can't alloc netdev!\n",
+                      name);
+               res = -ENOMEM;
+               goto out_rtnl;
+       }
+
+       /* bond_init() must be called after dev_alloc_name() (for the
+        * /proc files), but before register_netdevice(), because we
+        * need to set function pointers.
+        */
+
+       res = bond_init(bond_dev, params);
+       if (res < 0) {
+               goto out_netdev;
+       }
+
+       SET_MODULE_OWNER(bond_dev);
+
+       res = register_netdevice(bond_dev);
+       if (res < 0) {
+               goto out_bond;
+       }
+       if (newbond)
+               *newbond = bond_dev->priv;
+
+       rtnl_unlock(); /* allows sysfs registration of net device */
+       res = bond_create_sysfs_entry(bond_dev->priv);
+       goto done;
+out_bond:
+       bond_deinit(bond_dev);
+out_netdev:
+       free_netdev(bond_dev);
+out_rtnl:
+       rtnl_unlock();
+done:
+       return res;
+}
+
 static int __init bonding_init(void)
 {
-       struct bond_params params;
        int i;
        int res;
+       char new_bond_name[8];  /* Enough room for 999 bonds at init. */
 
        printk(KERN_INFO "%s", version);
 
-       res = bond_check_params(&params);
+       res = bond_check_params(&bonding_defaults);
        if (res) {
-               return res;
+               goto out;
        }
 
-       rtnl_lock();
-
 #ifdef CONFIG_PROC_FS
        bond_create_proc_dir();
 #endif
-
        for (i = 0; i < max_bonds; i++) {
-               struct net_device *bond_dev;
-
-               bond_dev = alloc_netdev(sizeof(struct bonding), "", ether_setup);
-               if (!bond_dev) {
-                       res = -ENOMEM;
-                       goto out_err;
-               }
-
-               res = dev_alloc_name(bond_dev, "bond%d");
-               if (res < 0) {
-                       free_netdev(bond_dev);
-                       goto out_err;
-               }
-
-               /* bond_init() must be called after dev_alloc_name() (for the
-                * /proc files), but before register_netdevice(), because we
-                * need to set function pointers.
-                */
-               res = bond_init(bond_dev, &params);
-               if (res < 0) {
-                       free_netdev(bond_dev);
-                       goto out_err;
-               }
-
-               SET_MODULE_OWNER(bond_dev);
-
-               res = register_netdevice(bond_dev);
-               if (res < 0) {
-                       bond_deinit(bond_dev);
-                       free_netdev(bond_dev);
-                       goto out_err;
-               }
+               sprintf(new_bond_name, "bond%d",i);
+               res = bond_create(new_bond_name,&bonding_defaults, NULL);
+               if (res)
+                       goto err;
        }
 
-       rtnl_unlock();
+       res = bond_create_sysfs();
+       if (res)
+               goto err;
+
        register_netdevice_notifier(&bond_netdev_notifier);
        register_inetaddr_notifier(&bond_inetaddr_notifier);
 
-       return 0;
-
-out_err:
-       /*
-        * rtnl_unlock() will run netdev_run_todo(), putting the
-        * thus-far-registered bonding devices into a state which
-        * unregigister_netdevice() will accept
-        */
-       rtnl_unlock();
+       goto out;
+err:
        rtnl_lock();
-
-       /* free and unregister all bonds that were successfully added */
        bond_free_all();
-
+       bond_destroy_sysfs();
        rtnl_unlock();
-
+out:
        return res;
+
 }
 
 static void __exit bonding_exit(void)
@@ -4965,6 +4577,7 @@ static void __exit bonding_exit(void)
 
        rtnl_lock();
        bond_free_all();
+       bond_destroy_sysfs();
        rtnl_unlock();
 }
 
diff --git a/drivers/net/bonding/bond_sysfs.c b/drivers/net/bonding/bond_sysfs.c
new file mode 100644 (file)
index 0000000..32d13da
--- /dev/null
@@ -0,0 +1,1358 @@
+
+/*
+ * Copyright(c) 2004-2005 Intel Corporation. All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ *
+ * The full GNU General Public License is included in this distribution in the
+ * file called LICENSE.
+ *
+ */
+#include <linux/config.h>
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/sched.h>
+#include <linux/device.h>
+#include <linux/sysdev.h>
+#include <linux/fs.h>
+#include <linux/types.h>
+#include <linux/string.h>
+#include <linux/netdevice.h>
+#include <linux/inetdevice.h>
+#include <linux/in.h>
+#include <linux/sysfs.h>
+#include <linux/string.h>
+#include <linux/ctype.h>
+#include <linux/inet.h>
+#include <linux/rtnetlink.h>
+
+/* #define BONDING_DEBUG 1 */
+#include "bonding.h"
+#define to_class_dev(obj) container_of(obj,struct class_device,kobj)
+#define to_net_dev(class) container_of(class, struct net_device, class_dev)
+#define to_bond(cd)    ((struct bonding *)(to_net_dev(cd)->priv))
+
+/*---------------------------- Declarations -------------------------------*/
+
+
+extern struct list_head bond_dev_list;
+extern struct bond_params bonding_defaults;
+extern struct bond_parm_tbl bond_mode_tbl[];
+extern struct bond_parm_tbl bond_lacp_tbl[];
+extern struct bond_parm_tbl xmit_hashtype_tbl[];
+
+static int expected_refcount = -1;
+static struct class *netdev_class;
+/*--------------------------- Data Structures -----------------------------*/
+
+/* Bonding sysfs lock.  Why can't we just use the subsytem lock?
+ * Because kobject_register tries to acquire the subsystem lock.  If
+ * we already hold the lock (which we would if the user was creating
+ * a new bond through the sysfs interface), we deadlock.
+ * This lock is only needed when deleting a bond - we need to make sure
+ * that we don't collide with an ongoing ioctl.
+ */
+
+struct rw_semaphore bonding_rwsem;
+
+
+
+
+/*------------------------------ Functions --------------------------------*/
+
+/*
+ * "show" function for the bond_masters attribute.
+ * The class parameter is ignored.
+ */
+static ssize_t bonding_show_bonds(struct class *cls, char *buffer)
+{
+       int res = 0;
+       struct bonding *bond;
+
+       down_read(&(bonding_rwsem));
+
+       list_for_each_entry(bond, &bond_dev_list, bond_list) {
+               if (res > (PAGE_SIZE - IFNAMSIZ)) {
+                       /* not enough space for another interface name */
+                       if ((PAGE_SIZE - res) > 10)
+                               res = PAGE_SIZE - 10;
+                       res += sprintf(buffer + res, "++more++");
+                       break;
+               }
+               res += sprintf(buffer + res, "%s ",
+                              bond->dev->name);
+       }
+       res += sprintf(buffer + res, "\n");
+       res++;
+       up_read(&(bonding_rwsem));
+       return res;
+}
+
+/*
+ * "store" function for the bond_masters attribute.  This is what
+ * creates and deletes entire bonds.
+ *
+ * The class parameter is ignored.
+ *
+ */
+
+static ssize_t bonding_store_bonds(struct class *cls, const char *buffer, size_t count)
+{
+       char command[IFNAMSIZ + 1] = {0, };
+       char *ifname;
+       int res = count;
+       struct bonding *bond;
+       struct bonding *nxt;
+
+       down_write(&(bonding_rwsem));
+       sscanf(buffer, "%16s", command); /* IFNAMSIZ*/
+       ifname = command + 1;
+       if ((strlen(command) <= 1) ||
+           !dev_valid_name(ifname))
+               goto err_no_cmd;
+
+       if (command[0] == '+') {
+
+               /* Check to see if the bond already exists. */
+               list_for_each_entry_safe(bond, nxt, &bond_dev_list, bond_list)
+                       if (strnicmp(bond->dev->name, ifname, IFNAMSIZ) == 0) {
+                               printk(KERN_ERR DRV_NAME
+                                       ": cannot add bond %s; it already exists\n",
+                                       ifname);
+                               res = -EPERM;
+                               goto out;
+                       }
+
+               printk(KERN_INFO DRV_NAME
+                       ": %s is being created...\n", ifname);
+               if (bond_create(ifname, &bonding_defaults, &bond)) {
+                       printk(KERN_INFO DRV_NAME
+                       ": %s interface already exists. Bond creation failed.\n",
+                       ifname);
+                       res = -EPERM;
+               }
+               goto out;
+       }
+
+       if (command[0] == '-') {
+               list_for_each_entry_safe(bond, nxt, &bond_dev_list, bond_list)
+                       if (strnicmp(bond->dev->name, ifname, IFNAMSIZ) == 0) {
+                               rtnl_lock();
+                               /* check the ref count on the bond's kobject.
+                                * If it's > expected, then there's a file open,
+                                * and we have to fail.
+                                */
+                               if (atomic_read(&bond->dev->class_dev.kobj.kref.refcount)
+                                                       > expected_refcount){
+                                       rtnl_unlock();
+                                       printk(KERN_INFO DRV_NAME
+                                               ": Unable remove bond %s due to open references.\n",
+                                               ifname);
+                                       res = -EPERM;
+                                       goto out;
+                               }
+                               printk(KERN_INFO DRV_NAME
+                                       ": %s is being deleted...\n",
+                                       bond->dev->name);
+                               unregister_netdevice(bond->dev);
+                               bond_deinit(bond->dev);
+                               bond_destroy_sysfs_entry(bond);
+                               rtnl_unlock();
+                               goto out;
+                       }
+
+               printk(KERN_ERR DRV_NAME
+                       ": unable to delete non-existent bond %s\n", ifname);
+               res = -ENODEV;
+               goto out;
+       }
+
+err_no_cmd:
+       printk(KERN_ERR DRV_NAME
+               ": no command found in bonding_masters. Use +ifname or -ifname.\n");
+       res = -EPERM;
+
+       /* Always return either count or an error.  If you return 0, you'll
+        * get called forever, which is bad.
+        */
+out:
+       up_write(&(bonding_rwsem));
+       return res;
+}
+/* class attribute for bond_masters file.  This ends up in /sys/class/net */
+static CLASS_ATTR(bonding_masters,  S_IWUSR | S_IRUGO,
+                 bonding_show_bonds, bonding_store_bonds);
+
+int bond_create_slave_symlinks(struct net_device *master, struct net_device *slave)
+{
+       char linkname[IFNAMSIZ+7];
+       int ret = 0;
+
+       /* first, create a link from the slave back to the master */
+       ret = sysfs_create_link(&(slave->class_dev.kobj), &(master->class_dev.kobj),
+                               "master");
+       if (ret)
+               return ret;
+       /* next, create a link from the master to the slave */
+       sprintf(linkname,"slave_%s",slave->name);
+       ret = sysfs_create_link(&(master->class_dev.kobj), &(slave->class_dev.kobj),
+                               linkname);
+       return ret;
+
+}
+
+void bond_destroy_slave_symlinks(struct net_device *master, struct net_device *slave)
+{
+       char linkname[IFNAMSIZ+7];
+
+       sysfs_remove_link(&(slave->class_dev.kobj), "master");
+       sprintf(linkname,"slave_%s",slave->name);
+       sysfs_remove_link(&(master->class_dev.kobj), linkname);
+}
+
+
+/*
+ * Show the slaves in the current bond.
+ */
+static ssize_t bonding_show_slaves(struct class_device *cd, char *buf)
+{
+       struct slave *slave;
+       int i, res = 0;
+       struct bonding *bond = to_bond(cd);
+
+       read_lock_bh(&bond->lock);
+       bond_for_each_slave(bond, slave, i) {
+               if (res > (PAGE_SIZE - IFNAMSIZ)) {
+                       /* not enough space for another interface name */
+                       if ((PAGE_SIZE - res) > 10)
+                               res = PAGE_SIZE - 10;
+                       res += sprintf(buf + res, "++more++");
+                       break;
+               }
+               res += sprintf(buf + res, "%s ", slave->dev->name);
+       }
+       read_unlock_bh(&bond->lock);
+       res += sprintf(buf + res, "\n");
+       res++;
+       return res;
+}
+
+/*
+ * Set the slaves in the current bond.  The bond interface must be
+ * up for this to succeed.
+ * This function is largely the same flow as bonding_update_bonds().
+ */
+static ssize_t bonding_store_slaves(struct class_device *cd, const char *buffer, size_t count)
+{
+       char command[IFNAMSIZ + 1] = { 0, };
+       char *ifname;
+       int i, res, found, ret = count;
+       struct slave *slave;
+       struct net_device *dev = 0;
+       struct bonding *bond = to_bond(cd);
+
+       /* Quick sanity check -- is the bond interface up? */
+       if (!(bond->dev->flags & IFF_UP)) {
+               printk(KERN_ERR DRV_NAME
+                      ": %s: Unable to update slaves because interface is down.\n",
+                      bond->dev->name);
+               ret = -EPERM;
+               goto out;
+       }
+
+       /* Note:  We can't hold bond->lock here, as bond_create grabs it. */
+
+       sscanf(buffer, "%16s", command); /* IFNAMSIZ*/
+       ifname = command + 1;
+       if ((strlen(command) <= 1) ||
+           !dev_valid_name(ifname))
+               goto err_no_cmd;
+
+       if (command[0] == '+') {
+
+               /* Got a slave name in ifname.  Is it already in the list? */
+               found = 0;
+               read_lock_bh(&bond->lock);
+               bond_for_each_slave(bond, slave, i)
+                       if (strnicmp(slave->dev->name, ifname, IFNAMSIZ) == 0) {
+                               printk(KERN_ERR DRV_NAME
+                                      ": %s: Interface %s is already enslaved!\n",
+                                      bond->dev->name, ifname);
+                               ret = -EPERM;
+                               read_unlock_bh(&bond->lock);
+                               goto out;
+                       }
+
+               read_unlock_bh(&bond->lock);
+               printk(KERN_INFO DRV_NAME ": %s: Adding slave %s.\n",
+                      bond->dev->name, ifname);
+               dev = dev_get_by_name(ifname);
+               if (!dev) {
+                       printk(KERN_INFO DRV_NAME
+                              ": %s: Interface %s does not exist!\n",
+                              bond->dev->name, ifname);
+                       ret = -EPERM;
+                       goto out;
+               }
+               else
+                       dev_put(dev);
+
+               if (dev->flags & IFF_UP) {
+                       printk(KERN_ERR DRV_NAME
+                              ": %s: Error: Unable to enslave %s "
+                              "because it is already up.\n",
+                              bond->dev->name, dev->name);
+                       ret = -EPERM;
+                       goto out;
+               }
+               /* If this is the first slave, then we need to set
+                  the master's hardware address to be the same as the
+                  slave's. */
+               if (!(*((u32 *) & (bond->dev->dev_addr[0])))) {
+                       memcpy(bond->dev->dev_addr, dev->dev_addr,
+                              dev->addr_len);
+               }
+
+               /* Set the slave's MTU to match the bond */
+               if (dev->mtu != bond->dev->mtu) {
+                       if (dev->change_mtu) {
+                               res = dev->change_mtu(dev,
+                                                     bond->dev->mtu);
+                               if (res) {
+                                       ret = res;
+                                       goto out;
+                               }
+                       } else {
+                               dev->mtu = bond->dev->mtu;
+                       }
+               }
+               rtnl_lock();
+               res = bond_enslave(bond->dev, dev);
+               rtnl_unlock();
+               if (res) {
+                       ret = res;
+               }
+               goto out;
+       }
+
+       if (command[0] == '-') {
+               dev = NULL;
+               bond_for_each_slave(bond, slave, i)
+                       if (strnicmp(slave->dev->name, ifname, IFNAMSIZ) == 0) {
+                               dev = slave->dev;
+                               break;
+                       }
+               if (dev) {
+                       printk(KERN_INFO DRV_NAME ": %s: Removing slave %s\n",
+                               bond->dev->name, dev->name);
+                       rtnl_lock();
+                       res = bond_release(bond->dev, dev);
+                       rtnl_unlock();
+                       if (res) {
+                               ret = res;
+                               goto out;
+                       }
+                       /* set the slave MTU to the default */
+                       if (dev->change_mtu) {
+                               dev->change_mtu(dev, 1500);
+                       } else {
+                               dev->mtu = 1500;
+                       }
+               }
+               else {
+                       printk(KERN_ERR DRV_NAME ": unable to remove non-existent slave %s for bond %s.\n",
+                               ifname, bond->dev->name);
+                       ret = -ENODEV;
+               }
+               goto out;
+       }
+
+err_no_cmd:
+       printk(KERN_ERR DRV_NAME ": no command found in slaves file for bond %s. Use +ifname or -ifname.\n", bond->dev->name);
+       ret = -EPERM;
+
+out:
+       return ret;
+}
+
+static CLASS_DEVICE_ATTR(slaves, S_IRUGO | S_IWUSR, bonding_show_slaves, bonding_store_slaves);
+
+/*
+ * Show and set the bonding mode.  The bond interface must be down to
+ * change the mode.
+ */
+static ssize_t bonding_show_mode(struct class_device *cd, char *buf)
+{
+       struct bonding *bond = to_bond(cd);
+
+       return sprintf(buf, "%s %d\n",
+                       bond_mode_tbl[bond->params.mode].modename,
+                       bond->params.mode) + 1;
+}
+
+static ssize_t bonding_store_mode(struct class_device *cd, const char *buf, size_t count)
+{
+       int new_value, ret = count;
+       struct bonding *bond = to_bond(cd);
+
+       if (bond->dev->flags & IFF_UP) {
+               printk(KERN_ERR DRV_NAME
+                      ": unable to update mode of %s because interface is up.\n",
+                      bond->dev->name);
+               ret = -EPERM;
+               goto out;
+       }
+
+       new_value = bond_parse_parm((char *)buf, bond_mode_tbl);
+       if (new_value < 0)  {
+               printk(KERN_ERR DRV_NAME
+                      ": %s: Ignoring invalid mode value %.*s.\n",
+                      bond->dev->name,
+                      (int)strlen(buf) - 1, buf);
+               ret = -EINVAL;
+               goto out;
+       } else {
+               bond->params.mode = new_value;
+               bond_set_mode_ops(bond, bond->params.mode);
+               printk(KERN_INFO DRV_NAME ": %s: setting mode to %s (%d).\n",
+                       bond->dev->name, bond_mode_tbl[new_value].modename, new_value);
+       }
+out:
+       return ret;
+}
+static CLASS_DEVICE_ATTR(mode, S_IRUGO | S_IWUSR, bonding_show_mode, bonding_store_mode);
+
+/*
+ * Show and set the bonding transmit hash method.  The bond interface must be down to
+ * change the xmit hash policy.
+ */
+static ssize_t bonding_show_xmit_hash(struct class_device *cd, char *buf)
+{
+       int count;
+       struct bonding *bond = to_bond(cd);
+
+       if ((bond->params.mode != BOND_MODE_XOR) &&
+           (bond->params.mode != BOND_MODE_8023AD)) {
+               // Not Applicable
+               count = sprintf(buf, "NA\n") + 1;
+       } else {
+               count = sprintf(buf, "%s %d\n",
+                       xmit_hashtype_tbl[bond->params.xmit_policy].modename,
+                       bond->params.xmit_policy) + 1;
+       }
+
+       return count;
+}
+
+static ssize_t bonding_store_xmit_hash(struct class_device *cd, const char *buf, size_t count)
+{
+       int new_value, ret = count;
+       struct bonding *bond = to_bond(cd);
+
+       if (bond->dev->flags & IFF_UP) {
+               printk(KERN_ERR DRV_NAME
+                      "%s: Interface is up. Unable to update xmit policy.\n",
+                      bond->dev->name);
+               ret = -EPERM;
+               goto out;
+       }
+
+       if ((bond->params.mode != BOND_MODE_XOR) &&
+           (bond->params.mode != BOND_MODE_8023AD)) {
+               printk(KERN_ERR DRV_NAME
+                      "%s: Transmit hash policy is irrelevant in this mode.\n",
+                      bond->dev->name);
+               ret = -EPERM;
+               goto out;
+       }
+
+       new_value = bond_parse_parm((char *)buf, xmit_hashtype_tbl);
+       if (new_value < 0)  {
+               printk(KERN_ERR DRV_NAME
+                      ": %s: Ignoring invalid xmit hash policy value %.*s.\n",
+                      bond->dev->name,
+                      (int)strlen(buf) - 1, buf);
+               ret = -EINVAL;
+               goto out;
+       } else {
+               bond->params.xmit_policy = new_value;
+               bond_set_mode_ops(bond, bond->params.mode);
+               printk(KERN_INFO DRV_NAME ": %s: setting xmit hash policy to %s (%d).\n",
+                       bond->dev->name, xmit_hashtype_tbl[new_value].modename, new_value);
+       }
+out:
+       return ret;
+}
+static CLASS_DEVICE_ATTR(xmit_hash_policy, S_IRUGO | S_IWUSR, bonding_show_xmit_hash, bonding_store_xmit_hash);
+
+/*
+ * Show and set the arp timer interval.  There are two tricky bits
+ * here.  First, if ARP monitoring is activated, then we must disable
+ * MII monitoring.  Second, if the ARP timer isn't running, we must
+ * start it.
+ */
+static ssize_t bonding_show_arp_interval(struct class_device *cd, char *buf)
+{
+       struct bonding *bond = to_bond(cd);
+
+       return sprintf(buf, "%d\n", bond->params.arp_interval) + 1;
+}
+
+static ssize_t bonding_store_arp_interval(struct class_device *cd, const char *buf, size_t count)
+{
+       int new_value, ret = count;
+       struct bonding *bond = to_bond(cd);
+
+       if (sscanf(buf, "%d", &new_value) != 1) {
+               printk(KERN_ERR DRV_NAME
+                      ": %s: no arp_interval value specified.\n",
+                      bond->dev->name);
+               ret = -EINVAL;
+               goto out;
+       }
+       if (new_value < 0) {
+               printk(KERN_ERR DRV_NAME
+                      ": %s: Invalid arp_interval value %d not in range 1-%d; rejected.\n",
+                      bond->dev->name, new_value, INT_MAX);
+               ret = -EINVAL;
+               goto out;
+       }
+
+       printk(KERN_INFO DRV_NAME
+              ": %s: Setting ARP monitoring interval to %d.\n",
+              bond->dev->name, new_value);
+       bond->params.arp_interval = new_value;
+       if (bond->params.miimon) {
+               printk(KERN_INFO DRV_NAME
+                      ": %s: ARP monitoring cannot be used with MII monitoring. "
+                      "%s Disabling MII monitoring.\n",
+                      bond->dev->name, bond->dev->name);
+               bond->params.miimon = 0;
+               /* Kill MII timer, else it brings bond's link down */
+               if (bond->arp_timer.function) {
+                       printk(KERN_INFO DRV_NAME
+                       ": %s: Kill MII timer, else it brings bond's link down...\n",
+                      bond->dev->name);
+                       del_timer_sync(&bond->mii_timer);
+               }
+       }
+       if (!bond->params.arp_targets[0]) {
+               printk(KERN_INFO DRV_NAME
+                      ": %s: ARP monitoring has been set up, "
+                      "but no ARP targets have been specified.\n",
+                      bond->dev->name);
+       }
+       if (bond->dev->flags & IFF_UP) {
+               /* If the interface is up, we may need to fire off
+                * the ARP timer.  If the interface is down, the
+                * timer will get fired off when the open function
+                * is called.
+                */
+               if (bond->arp_timer.function) {
+                       /* The timer's already set up, so fire it off */
+                       mod_timer(&bond->arp_timer, jiffies + 1);
+               } else {
+                       /* Set up the timer. */
+                       init_timer(&bond->arp_timer);
+                       bond->arp_timer.expires = jiffies + 1;
+                       bond->arp_timer.data =
+                               (unsigned long) bond->dev;
+                       if (bond->params.mode == BOND_MODE_ACTIVEBACKUP) {
+                               bond->arp_timer.function =
+                                       (void *)
+                                       &bond_activebackup_arp_mon;
+                       } else {
+                               bond->arp_timer.function =
+                                       (void *)
+                                       &bond_loadbalance_arp_mon;
+                       }
+                       add_timer(&bond->arp_timer);
+               }
+       }
+
+out:
+       return ret;
+}
+static CLASS_DEVICE_ATTR(arp_interval, S_IRUGO | S_IWUSR , bonding_show_arp_interval, bonding_store_arp_interval);
+
+/*
+ * Show and set the arp targets.
+ */
+static ssize_t bonding_show_arp_targets(struct class_device *cd, char *buf)
+{
+       int i, res = 0;
+       struct bonding *bond = to_bond(cd);
+
+       for (i = 0; i < BOND_MAX_ARP_TARGETS; i++) {
+               if (bond->params.arp_targets[i])
+                       res += sprintf(buf + res, "%u.%u.%u.%u ",
+                              NIPQUAD(bond->params.arp_targets[i]));
+       }
+       if (res)
+               res--;  /* eat the leftover space */
+       res += sprintf(buf + res, "\n");
+       res++;
+       return res;
+}
+
+static ssize_t bonding_store_arp_targets(struct class_device *cd, const char *buf, size_t count)
+{
+       u32 newtarget;
+       int i = 0, done = 0, ret = count;
+       struct bonding *bond = to_bond(cd);
+       u32 *targets;
+
+       targets = bond->params.arp_targets;
+       newtarget = in_aton(buf + 1);
+       /* look for adds */
+       if (buf[0] == '+') {
+               if ((newtarget == 0) || (newtarget == INADDR_BROADCAST)) {
+                       printk(KERN_ERR DRV_NAME
+                              ": %s: invalid ARP target %u.%u.%u.%u specified for addition\n",
+                              bond->dev->name, NIPQUAD(newtarget));
+                       ret = -EINVAL;
+                       goto out;
+               }
+               /* look for an empty slot to put the target in, and check for dupes */
+               for (i = 0; (i < BOND_MAX_ARP_TARGETS); i++) {
+                       if (targets[i] == newtarget) { /* duplicate */
+                               printk(KERN_ERR DRV_NAME
+                                      ": %s: ARP target %u.%u.%u.%u is already present\n",
+                                      bond->dev->name, NIPQUAD(newtarget));
+                               if (done)
+                                       targets[i] = 0;
+                               ret = -EINVAL;
+                               goto out;
+                       }
+                       if (targets[i] == 0 && !done) {
+                               printk(KERN_INFO DRV_NAME
+                                      ": %s: adding ARP target %d.%d.%d.%d.\n",
+                                      bond->dev->name, NIPQUAD(newtarget));
+                               done = 1;
+                               targets[i] = newtarget;
+                       }
+               }
+               if (!done) {
+                       printk(KERN_ERR DRV_NAME
+                              ": %s: ARP target table is full!\n",
+                              bond->dev->name);
+                       ret = -EINVAL;
+                       goto out;
+               }
+
+       }
+       else if (buf[0] == '-') {
+               if ((newtarget == 0) || (newtarget == INADDR_BROADCAST)) {
+                       printk(KERN_ERR DRV_NAME
+                              ": %s: invalid ARP target %d.%d.%d.%d specified for removal\n",
+                              bond->dev->name, NIPQUAD(newtarget));
+                       ret = -EINVAL;
+                       goto out;
+               }
+
+               for (i = 0; (i < BOND_MAX_ARP_TARGETS); i++) {
+                       if (targets[i] == newtarget) {
+                               printk(KERN_INFO DRV_NAME
+                                      ": %s: removing ARP target %d.%d.%d.%d.\n",
+                                      bond->dev->name, NIPQUAD(newtarget));
+                               targets[i] = 0;
+                               done = 1;
+                       }
+               }
+               if (!done) {
+                       printk(KERN_INFO DRV_NAME
+                              ": %s: unable to remove nonexistent ARP target %d.%d.%d.%d.\n",
+                              bond->dev->name, NIPQUAD(newtarget));
+                       ret = -EINVAL;
+                       goto out;
+               }
+       }
+       else {
+               printk(KERN_ERR DRV_NAME ": no command found in arp_ip_targets file for bond %s. Use +<addr> or -<addr>.\n",
+                       bond->dev->name);
+               ret = -EPERM;
+               goto out;
+       }
+
+out:
+       return ret;
+}
+static CLASS_DEVICE_ATTR(arp_ip_target, S_IRUGO | S_IWUSR , bonding_show_arp_targets, bonding_store_arp_targets);
+
+/*
+ * Show and set the up and down delays.  These must be multiples of the
+ * MII monitoring value, and are stored internally as the multiplier.
+ * Thus, we must translate to MS for the real world.
+ */
+static ssize_t bonding_show_downdelay(struct class_device *cd, char *buf)
+{
+       struct bonding *bond = to_bond(cd);
+
+       return sprintf(buf, "%d\n", bond->params.downdelay * bond->params.miimon) + 1;
+}
+
+static ssize_t bonding_store_downdelay(struct class_device *cd, const char *buf, size_t count)
+{
+       int new_value, ret = count;
+       struct bonding *bond = to_bond(cd);
+
+       if (!(bond->params.miimon)) {
+               printk(KERN_ERR DRV_NAME
+                      ": %s: Unable to set down delay as MII monitoring is disabled\n",
+                      bond->dev->name);
+               ret = -EPERM;
+               goto out;
+       }
+
+       if (sscanf(buf, "%d", &new_value) != 1) {
+               printk(KERN_ERR DRV_NAME
+                      ": %s: no down delay value specified.\n",
+                      bond->dev->name);
+               ret = -EINVAL;
+               goto out;
+       }
+       if (new_value < 0) {
+               printk(KERN_ERR DRV_NAME
+                      ": %s: Invalid down delay value %d not in range %d-%d; rejected.\n",
+                      bond->dev->name, new_value, 1, INT_MAX);
+               ret = -EINVAL;
+               goto out;
+       } else {
+               if ((new_value % bond->params.miimon) != 0) {
+                       printk(KERN_WARNING DRV_NAME
+                              ": %s: Warning: down delay (%d) is not a multiple "
+                              "of miimon (%d), delay rounded to %d ms\n",
+                              bond->dev->name, new_value, bond->params.miimon,
+                              (new_value / bond->params.miimon) *
+                              bond->params.miimon);
+               }
+               bond->params.downdelay = new_value / bond->params.miimon;
+               printk(KERN_INFO DRV_NAME ": %s: Setting down delay to %d.\n",
+                      bond->dev->name, bond->params.downdelay * bond->params.miimon);
+
+       }
+
+out:
+       return ret;
+}
+static CLASS_DEVICE_ATTR(downdelay, S_IRUGO | S_IWUSR , bonding_show_downdelay, bonding_store_downdelay);
+
+static ssize_t bonding_show_updelay(struct class_device *cd, char *buf)
+{
+       struct bonding *bond = to_bond(cd);
+
+       return sprintf(buf, "%d\n", bond->params.updelay * bond->params.miimon) + 1;
+
+}
+
+static ssize_t bonding_store_updelay(struct class_device *cd, const char *buf, size_t count)
+{
+       int new_value, ret = count;
+       struct bonding *bond = to_bond(cd);
+
+       if (!(bond->params.miimon)) {
+               printk(KERN_ERR DRV_NAME
+                      ": %s: Unable to set up delay as MII monitoring is disabled\n",
+                      bond->dev->name);
+               ret = -EPERM;
+               goto out;
+       }
+
+       if (sscanf(buf, "%d", &new_value) != 1) {
+               printk(KERN_ERR DRV_NAME
+                      ": %s: no up delay value specified.\n",
+                      bond->dev->name);
+               ret = -EINVAL;
+               goto out;
+       }
+       if (new_value < 0) {
+               printk(KERN_ERR DRV_NAME
+                      ": %s: Invalid down delay value %d not in range %d-%d; rejected.\n",
+                      bond->dev->name, new_value, 1, INT_MAX);
+               ret = -EINVAL;
+               goto out;
+       } else {
+               if ((new_value % bond->params.miimon) != 0) {
+                       printk(KERN_WARNING DRV_NAME
+                              ": %s: Warning: up delay (%d) is not a multiple "
+                              "of miimon (%d), updelay rounded to %d ms\n",
+                              bond->dev->name, new_value, bond->params.miimon,
+                              (new_value / bond->params.miimon) *
+                              bond->params.miimon);
+               }
+               bond->params.updelay = new_value / bond->params.miimon;
+               printk(KERN_INFO DRV_NAME ": %s: Setting up delay to %d.\n",
+                      bond->dev->name, bond->params.updelay * bond->params.miimon);
+
+       }
+
+out:
+       return ret;
+}
+static CLASS_DEVICE_ATTR(updelay, S_IRUGO | S_IWUSR , bonding_show_updelay, bonding_store_updelay);
+
+/*
+ * Show and set the LACP interval.  Interface must be down, and the mode
+ * must be set to 802.3ad mode.
+ */
+static ssize_t bonding_show_lacp(struct class_device *cd, char *buf)
+{
+       struct bonding *bond = to_bond(cd);
+
+       return sprintf(buf, "%s %d\n",
+               bond_lacp_tbl[bond->params.lacp_fast].modename,
+               bond->params.lacp_fast) + 1;
+}
+
+static ssize_t bonding_store_lacp(struct class_device *cd, const char *buf, size_t count)
+{
+       int new_value, ret = count;
+       struct bonding *bond = to_bond(cd);
+
+       if (bond->dev->flags & IFF_UP) {
+               printk(KERN_ERR DRV_NAME
+                      ": %s: Unable to update LACP rate because interface is up.\n",
+                      bond->dev->name);
+               ret = -EPERM;
+               goto out;
+       }
+
+       if (bond->params.mode != BOND_MODE_8023AD) {
+               printk(KERN_ERR DRV_NAME
+                      ": %s: Unable to update LACP rate because bond is not in 802.3ad mode.\n",
+                      bond->dev->name);
+               ret = -EPERM;
+               goto out;
+       }
+
+       new_value = bond_parse_parm((char *)buf, bond_lacp_tbl);
+
+       if ((new_value == 1) || (new_value == 0)) {
+               bond->params.lacp_fast = new_value;
+               printk(KERN_INFO DRV_NAME
+                      ": %s: Setting LACP rate to %s (%d).\n",
+                      bond->dev->name, bond_lacp_tbl[new_value].modename, new_value);
+       } else {
+               printk(KERN_ERR DRV_NAME
+                      ": %s: Ignoring invalid LACP rate value %.*s.\n",
+                       bond->dev->name, (int)strlen(buf) - 1, buf);
+               ret = -EINVAL;
+       }
+out:
+       return ret;
+}
+static CLASS_DEVICE_ATTR(lacp_rate, S_IRUGO | S_IWUSR, bonding_show_lacp, bonding_store_lacp);
+
+/*
+ * Show and set the MII monitor interval.  There are two tricky bits
+ * here.  First, if MII monitoring is activated, then we must disable
+ * ARP monitoring.  Second, if the timer isn't running, we must
+ * start it.
+ */
+static ssize_t bonding_show_miimon(struct class_device *cd, char *buf)
+{
+       struct bonding *bond = to_bond(cd);
+
+       return sprintf(buf, "%d\n", bond->params.miimon) + 1;
+}
+
+static ssize_t bonding_store_miimon(struct class_device *cd, const char *buf, size_t count)
+{
+       int new_value, ret = count;
+       struct bonding *bond = to_bond(cd);
+
+       if (sscanf(buf, "%d", &new_value) != 1) {
+               printk(KERN_ERR DRV_NAME
+                      ": %s: no miimon value specified.\n",
+                      bond->dev->name);
+               ret = -EINVAL;
+               goto out;
+       }
+       if (new_value < 0) {
+               printk(KERN_ERR DRV_NAME
+                      ": %s: Invalid miimon value %d not in range %d-%d; rejected.\n",
+                      bond->dev->name, new_value, 1, INT_MAX);
+               ret = -EINVAL;
+               goto out;
+       } else {
+               printk(KERN_INFO DRV_NAME
+                      ": %s: Setting MII monitoring interval to %d.\n",
+                      bond->dev->name, new_value);
+               bond->params.miimon = new_value;
+               if(bond->params.updelay)
+                       printk(KERN_INFO DRV_NAME
+                             ": %s: Note: Updating updelay (to %d) "
+                             "since it is a multiple of the miimon value.\n",
+                             bond->dev->name,
+                             bond->params.updelay * bond->params.miimon);
+               if(bond->params.downdelay)
+                       printk(KERN_INFO DRV_NAME
+                             ": %s: Note: Updating downdelay (to %d) "
+                             "since it is a multiple of the miimon value.\n",
+                             bond->dev->name,
+                             bond->params.downdelay * bond->params.miimon);
+               if (bond->params.arp_interval) {
+                       printk(KERN_INFO DRV_NAME
+                              ": %s: MII monitoring cannot be used with "
+                              "ARP monitoring. Disabling ARP monitoring...\n",
+                              bond->dev->name);
+                       bond->params.arp_interval = 0;
+                       /* Kill ARP timer, else it brings bond's link down */
+                       if (bond->mii_timer.function) {
+                               printk(KERN_INFO DRV_NAME
+                               ": %s: Kill ARP timer, else it brings bond's link down...\n",
+                              bond->dev->name);
+                               del_timer_sync(&bond->arp_timer);
+                       }
+               }
+
+               if (bond->dev->flags & IFF_UP) {
+                       /* If the interface is up, we may need to fire off
+                        * the MII timer. If the interface is down, the
+                        * timer will get fired off when the open function
+                        * is called.
+                        */
+                       if (bond->mii_timer.function) {
+                               /* The timer's already set up, so fire it off */
+                               mod_timer(&bond->mii_timer, jiffies + 1);
+                       } else {
+                               /* Set up the timer. */
+                               init_timer(&bond->mii_timer);
+                               bond->mii_timer.expires = jiffies + 1;
+                               bond->mii_timer.data =
+                                       (unsigned long) bond->dev;
+                               bond->mii_timer.function =
+                                       (void *) &bond_mii_monitor;
+                               add_timer(&bond->mii_timer);
+                       }
+               }
+       }
+out:
+       return ret;
+}
+static CLASS_DEVICE_ATTR(miimon, S_IRUGO | S_IWUSR, bonding_show_miimon, bonding_store_miimon);
+
+/*
+ * Show and set the primary slave.  The store function is much
+ * simpler than bonding_store_slaves function because it only needs to
+ * handle one interface name.
+ * The bond must be a mode that supports a primary for this be
+ * set.
+ */
+static ssize_t bonding_show_primary(struct class_device *cd, char *buf)
+{
+       int count = 0;
+       struct bonding *bond = to_bond(cd);
+
+       if (bond->primary_slave)
+               count = sprintf(buf, "%s\n", bond->primary_slave->dev->name) + 1;
+       else
+               count = sprintf(buf, "\n") + 1;
+
+       return count;
+}
+
+static ssize_t bonding_store_primary(struct class_device *cd, const char *buf, size_t count)
+{
+       int i;
+       struct slave *slave;
+       struct bonding *bond = to_bond(cd);
+
+       write_lock_bh(&bond->lock);
+       if (!USES_PRIMARY(bond->params.mode)) {
+               printk(KERN_INFO DRV_NAME
+                      ": %s: Unable to set primary slave; %s is in mode %d\n",
+                      bond->dev->name, bond->dev->name, bond->params.mode);
+       } else {
+               bond_for_each_slave(bond, slave, i) {
+                       if (strnicmp
+                           (slave->dev->name, buf,
+                            strlen(slave->dev->name)) == 0) {
+                               printk(KERN_INFO DRV_NAME
+                                      ": %s: Setting %s as primary slave.\n",
+                                      bond->dev->name, slave->dev->name);
+                               bond->primary_slave = slave;
+                               bond_select_active_slave(bond);
+                               goto out;
+                       }
+               }
+
+               /* if we got here, then we didn't match the name of any slave */
+
+               if (strlen(buf) == 0 || buf[0] == '\n') {
+                       printk(KERN_INFO DRV_NAME
+                              ": %s: Setting primary slave to None.\n",
+                              bond->dev->name);
+                       bond->primary_slave = 0;
+                               bond_select_active_slave(bond);
+               } else {
+                       printk(KERN_INFO DRV_NAME
+                              ": %s: Unable to set %.*s as primary slave as it is not a slave.\n",
+                              bond->dev->name, (int)strlen(buf) - 1, buf);
+               }
+       }
+out:
+       write_unlock_bh(&bond->lock);
+       return count;
+}
+static CLASS_DEVICE_ATTR(primary, S_IRUGO | S_IWUSR, bonding_show_primary, bonding_store_primary);
+
+/*
+ * Show and set the use_carrier flag.
+ */
+static ssize_t bonding_show_carrier(struct class_device *cd, char *buf)
+{
+       struct bonding *bond = to_bond(cd);
+
+       return sprintf(buf, "%d\n", bond->params.use_carrier) + 1;
+}
+
+static ssize_t bonding_store_carrier(struct class_device *cd, const char *buf, size_t count)
+{
+       int new_value, ret = count;
+       struct bonding *bond = to_bond(cd);
+
+
+       if (sscanf(buf, "%d", &new_value) != 1) {
+               printk(KERN_ERR DRV_NAME
+                      ": %s: no use_carrier value specified.\n",
+                      bond->dev->name);
+               ret = -EINVAL;
+               goto out;
+       }
+       if ((new_value == 0) || (new_value == 1)) {
+               bond->params.use_carrier = new_value;
+               printk(KERN_INFO DRV_NAME ": %s: Setting use_carrier to %d.\n",
+                      bond->dev->name, new_value);
+       } else {
+               printk(KERN_INFO DRV_NAME
+                      ": %s: Ignoring invalid use_carrier value %d.\n",
+                      bond->dev->name, new_value);
+       }
+out:
+       return count;
+}
+static CLASS_DEVICE_ATTR(use_carrier, S_IRUGO | S_IWUSR, bonding_show_carrier, bonding_store_carrier);
+
+
+/*
+ * Show and set currently active_slave.
+ */
+static ssize_t bonding_show_active_slave(struct class_device *cd, char *buf)
+{
+       struct slave *curr;
+       struct bonding *bond = to_bond(cd);
+       int count;
+
+
+       read_lock(&bond->curr_slave_lock);
+       curr = bond->curr_active_slave;
+       read_unlock(&bond->curr_slave_lock);
+
+       if (USES_PRIMARY(bond->params.mode) && curr)
+               count = sprintf(buf, "%s\n", curr->dev->name) + 1;
+       else
+               count = sprintf(buf, "\n") + 1;
+       return count;
+}
+
+static ssize_t bonding_store_active_slave(struct class_device *cd, const char *buf, size_t count)
+{
+       int i;
+       struct slave *slave;
+        struct slave *old_active = NULL;
+        struct slave *new_active = NULL;
+       struct bonding *bond = to_bond(cd);
+
+       write_lock_bh(&bond->lock);
+       if (!USES_PRIMARY(bond->params.mode)) {
+               printk(KERN_INFO DRV_NAME
+                      ": %s: Unable to change active slave; %s is in mode %d\n",
+                      bond->dev->name, bond->dev->name, bond->params.mode);
+       } else {
+               bond_for_each_slave(bond, slave, i) {
+                       if (strnicmp
+                           (slave->dev->name, buf,
+                            strlen(slave->dev->name)) == 0) {
+                               old_active = bond->curr_active_slave;
+                               new_active = slave;
+                               if (new_active && (new_active == old_active)) {
+                                       /* do nothing */
+                                       printk(KERN_INFO DRV_NAME
+                                              ": %s: %s is already the current active slave.\n",
+                                              bond->dev->name, slave->dev->name);
+                                       goto out;
+                               }
+                               else {
+                                       if ((new_active) &&
+                                           (old_active) &&
+                                           (new_active->link == BOND_LINK_UP) &&
+                                           IS_UP(new_active->dev)) {
+                                               printk(KERN_INFO DRV_NAME
+                                                     ": %s: Setting %s as active slave.\n",
+                                                     bond->dev->name, slave->dev->name);
+                                               bond_change_active_slave(bond, new_active);
+                                       }
+                                       else {
+                                               printk(KERN_INFO DRV_NAME
+                                                     ": %s: Could not set %s as active slave; "
+                                                     "either %s is down or the link is down.\n",
+                                                     bond->dev->name, slave->dev->name,
+                                                     slave->dev->name);
+                                       }
+                                       goto out;
+                               }
+                       }
+               }
+
+               /* if we got here, then we didn't match the name of any slave */
+
+               if (strlen(buf) == 0 || buf[0] == '\n') {
+                       printk(KERN_INFO DRV_NAME
+                              ": %s: Setting active slave to None.\n",
+                              bond->dev->name);
+                       bond->primary_slave = 0;
+                               bond_select_active_slave(bond);
+               } else {
+                       printk(KERN_INFO DRV_NAME
+                              ": %s: Unable to set %.*s as active slave as it is not a slave.\n",
+                              bond->dev->name, (int)strlen(buf) - 1, buf);
+               }
+       }
+out:
+       write_unlock_bh(&bond->lock);
+       return count;
+
+}
+static CLASS_DEVICE_ATTR(active_slave, S_IRUGO | S_IWUSR, bonding_show_active_slave, bonding_store_active_slave);
+
+
+/*
+ * Show link status of the bond interface.
+ */
+static ssize_t bonding_show_mii_status(struct class_device *cd, char *buf)
+{
+       struct slave *curr;
+       struct bonding *bond = to_bond(cd);
+
+       read_lock(&bond->curr_slave_lock);
+       curr = bond->curr_active_slave;
+       read_unlock(&bond->curr_slave_lock);
+
+       return sprintf(buf, "%s\n", (curr) ? "up" : "down") + 1;
+}
+static CLASS_DEVICE_ATTR(mii_status, S_IRUGO, bonding_show_mii_status, NULL);
+
+
+/*
+ * Show current 802.3ad aggregator ID.
+ */
+static ssize_t bonding_show_ad_aggregator(struct class_device *cd, char *buf)
+{
+       int count = 0;
+       struct bonding *bond = to_bond(cd);
+
+       if (bond->params.mode == BOND_MODE_8023AD) {
+               struct ad_info ad_info;
+               count = sprintf(buf, "%d\n", (bond_3ad_get_active_agg_info(bond, &ad_info)) ?  0 : ad_info.aggregator_id) + 1;
+       }
+       else
+               count = sprintf(buf, "\n") + 1;
+
+       return count;
+}
+static CLASS_DEVICE_ATTR(ad_aggregator, S_IRUGO, bonding_show_ad_aggregator, NULL);
+
+
+/*
+ * Show number of active 802.3ad ports.
+ */
+static ssize_t bonding_show_ad_num_ports(struct class_device *cd, char *buf)
+{
+       int count = 0;
+       struct bonding *bond = to_bond(cd);
+
+       if (bond->params.mode == BOND_MODE_8023AD) {
+               struct ad_info ad_info;
+               count = sprintf(buf, "%d\n", (bond_3ad_get_active_agg_info(bond, &ad_info)) ?  0: ad_info.ports) + 1;
+       }
+       else
+               count = sprintf(buf, "\n") + 1;
+
+       return count;
+}
+static CLASS_DEVICE_ATTR(ad_num_ports, S_IRUGO, bonding_show_ad_num_ports, NULL);
+
+
+/*
+ * Show current 802.3ad actor key.
+ */
+static ssize_t bonding_show_ad_actor_key(struct class_device *cd, char *buf)
+{
+       int count = 0;
+       struct bonding *bond = to_bond(cd);
+
+       if (bond->params.mode == BOND_MODE_8023AD) {
+               struct ad_info ad_info;
+               count = sprintf(buf, "%d\n", (bond_3ad_get_active_agg_info(bond, &ad_info)) ?  0 : ad_info.actor_key) + 1;
+       }
+       else
+               count = sprintf(buf, "\n") + 1;
+
+       return count;
+}
+static CLASS_DEVICE_ATTR(ad_actor_key, S_IRUGO, bonding_show_ad_actor_key, NULL);
+
+
+/*
+ * Show current 802.3ad partner key.
+ */
+static ssize_t bonding_show_ad_partner_key(struct class_device *cd, char *buf)
+{
+       int count = 0;
+       struct bonding *bond = to_bond(cd);
+
+       if (bond->params.mode == BOND_MODE_8023AD) {
+               struct ad_info ad_info;
+               count = sprintf(buf, "%d\n", (bond_3ad_get_active_agg_info(bond, &ad_info)) ?  0 : ad_info.partner_key) + 1;
+       }
+       else
+               count = sprintf(buf, "\n") + 1;
+
+       return count;
+}
+static CLASS_DEVICE_ATTR(ad_partner_key, S_IRUGO, bonding_show_ad_partner_key, NULL);
+
+
+/*
+ * Show current 802.3ad partner mac.
+ */
+static ssize_t bonding_show_ad_partner_mac(struct class_device *cd, char *buf)
+{
+       int count = 0;
+       struct bonding *bond = to_bond(cd);
+
+       if (bond->params.mode == BOND_MODE_8023AD) {
+               struct ad_info ad_info;
+               if (!bond_3ad_get_active_agg_info(bond, &ad_info)) {
+                       count = sprintf(buf,"%02x:%02x:%02x:%02x:%02x:%02x\n",
+                                      ad_info.partner_system[0],
+                                      ad_info.partner_system[1],
+                                      ad_info.partner_system[2],
+                                      ad_info.partner_system[3],
+                                      ad_info.partner_system[4],
+                                      ad_info.partner_system[5]) + 1;
+               }
+       }
+       else
+               count = sprintf(buf, "\n") + 1;
+
+       return count;
+}
+static CLASS_DEVICE_ATTR(ad_partner_mac, S_IRUGO, bonding_show_ad_partner_mac, NULL);
+
+
+
+static struct attribute *per_bond_attrs[] = {
+       &class_device_attr_slaves.attr,
+       &class_device_attr_mode.attr,
+       &class_device_attr_arp_interval.attr,
+       &class_device_attr_arp_ip_target.attr,
+       &class_device_attr_downdelay.attr,
+       &class_device_attr_updelay.attr,
+       &class_device_attr_lacp_rate.attr,
+       &class_device_attr_xmit_hash_policy.attr,
+       &class_device_attr_miimon.attr,
+       &class_device_attr_primary.attr,
+       &class_device_attr_use_carrier.attr,
+       &class_device_attr_active_slave.attr,
+       &class_device_attr_mii_status.attr,
+       &class_device_attr_ad_aggregator.attr,
+       &class_device_attr_ad_num_ports.attr,
+       &class_device_attr_ad_actor_key.attr,
+       &class_device_attr_ad_partner_key.attr,
+       &class_device_attr_ad_partner_mac.attr,
+       NULL,
+};
+
+static struct attribute_group bonding_group = {
+       .name = "bonding",
+       .attrs = per_bond_attrs,
+};
+
+/*
+ * Initialize sysfs.  This sets up the bonding_masters file in
+ * /sys/class/net.
+ */
+int bond_create_sysfs(void)
+{
+       int ret = 0;
+       struct bonding *firstbond;
+
+       init_rwsem(&bonding_rwsem);
+
+       /* get the netdev class pointer */
+       firstbond = container_of(bond_dev_list.next, struct bonding, bond_list);
+       if (!firstbond)
+               return -ENODEV;
+
+       netdev_class = firstbond->dev->class_dev.class;
+       if (!netdev_class)
+               return -ENODEV;
+
+       ret = class_create_file(netdev_class, &class_attr_bonding_masters);
+
+       return ret;
+
+}
+
+/*
+ * Remove /sys/class/net/bonding_masters.
+ */
+void bond_destroy_sysfs(void)
+{
+       if (netdev_class)
+               class_remove_file(netdev_class, &class_attr_bonding_masters);
+}
+
+/*
+ * Initialize sysfs for each bond.  This sets up and registers
+ * the 'bondctl' directory for each individual bond under /sys/class/net.
+ */
+int bond_create_sysfs_entry(struct bonding *bond)
+{
+       struct net_device *dev = bond->dev;
+       int err;
+
+       err = sysfs_create_group(&(dev->class_dev.kobj), &bonding_group);
+       if (err) {
+               printk(KERN_EMERG "eek! didn't create group!\n");
+       }
+
+       if (expected_refcount < 1)
+               expected_refcount = atomic_read(&bond->dev->class_dev.kobj.kref.refcount);
+
+       return err;
+}
+/*
+ * Remove sysfs entries for each bond.
+ */
+void bond_destroy_sysfs_entry(struct bonding *bond)
+{
+       struct net_device *dev = bond->dev;
+
+       sysfs_remove_group(&(dev->class_dev.kobj), &bonding_group);
+}
+
index 1433e91db0f7fb12b3fcec07c83288192202e4c5..015c7f1d1bc0843e3be52454505a8d99ad068fc9 100644 (file)
  *     This software may be used and distributed according to the terms
  *     of the GNU Public License, incorporated herein by reference.
  *
- *
- * 2003/03/18 - Amir Noam <amir.noam at intel dot com>,
- *             Tsippy Mendelson <tsippy.mendelson at intel dot com> and
- *             Shmulik Hen <shmulik.hen at intel dot com>
- *     - Added support for IEEE 802.3ad Dynamic link aggregation mode.
- *
- * 2003/05/01 - Tsippy Mendelson <tsippy.mendelson at intel dot com> and
- *             Amir Noam <amir.noam at intel dot com>
- *     - Code beautification and style changes (mainly in comments).
- *
- * 2003/05/01 - Shmulik Hen <shmulik.hen at intel dot com>
- *     - Added support for Transmit load balancing mode.
- *
- * 2003/12/01 - Shmulik Hen <shmulik.hen at intel dot com>
- *     - Code cleanup and style changes
- *
- * 2005/05/05 - Jason Gabler <jygabler at lbl dot gov>
- *      - added "xmit_policy" kernel parameter for alternate hashing policy
- *       support for mode 2
  */
 
 #ifndef _LINUX_BONDING_H
 #include <linux/timer.h>
 #include <linux/proc_fs.h>
 #include <linux/if_bonding.h>
+#include <linux/kobject.h>
 #include "bond_3ad.h"
 #include "bond_alb.h"
 
-#define DRV_VERSION    "2.6.5"
-#define DRV_RELDATE    "November 4, 2005"
+#define DRV_VERSION    "3.0.0"
+#define DRV_RELDATE    "November 8, 2005"
 #define DRV_NAME       "bonding"
 #define DRV_DESCRIPTION        "Ethernet Channel Bonding Driver"
 
@@ -152,6 +134,11 @@ struct bond_params {
        u32 arp_targets[BOND_MAX_ARP_TARGETS];
 };
 
+struct bond_parm_tbl {
+       char *modename;
+       int mode;
+};
+
 struct vlan_entry {
        struct list_head vlan_list;
        u32 vlan_ip;
@@ -159,7 +146,7 @@ struct vlan_entry {
 };
 
 struct slave {
-       struct net_device *dev; /* first - usefull for panic debug */
+       struct net_device *dev; /* first - useful for panic debug */
        struct slave *next;
        struct slave *prev;
        s16    delay;
@@ -185,7 +172,7 @@ struct slave {
  *    beforehand.
  */
 struct bonding {
-       struct   net_device *dev; /* first - usefull for panic debug */
+       struct   net_device *dev; /* first - useful for panic debug */
        struct   slave *first_slave;
        struct   slave *curr_active_slave;
        struct   slave *current_arp_slave;
@@ -255,6 +242,25 @@ extern inline void bond_set_slave_active_flags(struct slave *slave)
 
 struct vlan_entry *bond_next_vlan(struct bonding *bond, struct vlan_entry *curr);
 int bond_dev_queue_xmit(struct bonding *bond, struct sk_buff *skb, struct net_device *slave_dev);
+int bond_create(char *name, struct bond_params *params, struct bonding **newbond);
+void bond_deinit(struct net_device *bond_dev);
+int bond_create_sysfs(void);
+void bond_destroy_sysfs(void);
+void bond_destroy_sysfs_entry(struct bonding *bond);
+int bond_create_sysfs_entry(struct bonding *bond);
+int bond_create_slave_symlinks(struct net_device *master, struct net_device *slave);
+void bond_destroy_slave_symlinks(struct net_device *master, struct net_device *slave);
+int bond_enslave(struct net_device *bond_dev, struct net_device *slave_dev);
+int bond_release(struct net_device *bond_dev, struct net_device *slave_dev);
+int bond_sethwaddr(struct net_device *bond_dev, struct net_device *slave_dev);
+void bond_mii_monitor(struct net_device *bond_dev);
+void bond_loadbalance_arp_mon(struct net_device *bond_dev);
+void bond_activebackup_arp_mon(struct net_device *bond_dev);
+void bond_set_mode_ops(struct bonding *bond, int mode);
+int bond_parse_parm(char *mode_arg, struct bond_parm_tbl *tbl);
+const char *bond_mode_name(int mode);
+void bond_select_active_slave(struct bonding *bond);
+void bond_change_active_slave(struct bonding *bond, struct slave *new_active);
 
 #endif /* _LINUX_BONDING_H */
 
index 0f030b73cbb328b246e170d85e9401182659d860..146f9513aea57f89e04cea2b5f201730590dfc1d 100644 (file)
@@ -2,7 +2,8 @@
  * drivers/net/gianfar.c
  *
  * Gianfar Ethernet Driver
- * Driver for FEC on MPC8540 and TSEC on MPC8540/MPC8560
+ * This driver is designed for the non-CPM ethernet controllers
+ * on the 85xx and 83xx family of integrated processors
  * Based on 8260_io/fcc_enet.c
  *
  * Author: Andy Fleming
@@ -22,8 +23,6 @@
  *  B-V +1.62
  *
  *  Theory of operation
- *  This driver is designed for the non-CPM ethernet controllers
- *  on the 85xx and 83xx family of integrated processors
  *
  *  The driver is initialized through platform_device.  Structures which
  *  define the configuration needed by the board are defined in a
 #endif
 
 const char gfar_driver_name[] = "Gianfar Ethernet";
-const char gfar_driver_version[] = "1.2";
+const char gfar_driver_version[] = "1.3";
 
 static int gfar_enet_open(struct net_device *dev);
 static int gfar_start_xmit(struct sk_buff *skb, struct net_device *dev);
@@ -139,6 +138,10 @@ static int gfar_process_frame(struct net_device *dev, struct sk_buff *skb, int l
 static void gfar_vlan_rx_register(struct net_device *netdev,
                                struct vlan_group *grp);
 static void gfar_vlan_rx_kill_vid(struct net_device *netdev, uint16_t vid);
+void gfar_halt(struct net_device *dev);
+void gfar_start(struct net_device *dev);
+static void gfar_clear_exact_match(struct net_device *dev);
+static void gfar_set_mac_for_addr(struct net_device *dev, int num, u8 *addr);
 
 extern struct ethtool_ops gfar_ethtool_ops;
 
@@ -146,12 +149,10 @@ MODULE_AUTHOR("Freescale Semiconductor, Inc");
 MODULE_DESCRIPTION("Gianfar Ethernet Driver");
 MODULE_LICENSE("GPL");
 
-int gfar_uses_fcb(struct gfar_private *priv)
+/* Returns 1 if incoming frames use an FCB */
+static inline int gfar_uses_fcb(struct gfar_private *priv)
 {
-       if (priv->vlan_enable || priv->rx_csum_enable)
-               return 1;
-       else
-               return 0;
+       return (priv->vlan_enable || priv->rx_csum_enable);
 }
 
 /* Set up the ethernet device structure, private data,
@@ -320,15 +321,10 @@ static int gfar_probe(struct platform_device *pdev)
        else
                priv->padding = 0;
 
-       dev->hard_header_len += priv->padding;
-
        if (dev->features & NETIF_F_IP_CSUM)
                dev->hard_header_len += GMAC_FCB_LEN;
 
        priv->rx_buffer_size = DEFAULT_RX_BUFFER_SIZE;
-#ifdef CONFIG_GFAR_BUFSTASH
-       priv->rx_stash_size = STASH_LENGTH;
-#endif
        priv->tx_ring_size = DEFAULT_TX_RING_SIZE;
        priv->rx_ring_size = DEFAULT_RX_RING_SIZE;
 
@@ -350,6 +346,9 @@ static int gfar_probe(struct platform_device *pdev)
                goto register_fail;
        }
 
+       /* Create all the sysfs files */
+       gfar_init_sysfs(dev);
+
        /* Print out the device info */
        printk(KERN_INFO DEVICE_NAME, dev->name);
        for (idx = 0; idx < 6; idx++)
@@ -357,8 +356,7 @@ static int gfar_probe(struct platform_device *pdev)
        printk("\n");
 
        /* Even more device info helps when determining which kernel */
-       /* provided which set of benchmarks.  Since this is global for all */
-       /* devices, we only print it once */
+       /* provided which set of benchmarks. */
 #ifdef CONFIG_GFAR_NAPI
        printk(KERN_INFO "%s: Running with NAPI enabled\n", dev->name);
 #else
@@ -463,19 +461,9 @@ static void init_registers(struct net_device *dev)
        /* Initialize the max receive buffer length */
        gfar_write(&priv->regs->mrblr, priv->rx_buffer_size);
 
-#ifdef CONFIG_GFAR_BUFSTASH
-       /* If we are stashing buffers, we need to set the
-        * extraction length to the size of the buffer */
-       gfar_write(&priv->regs->attreli, priv->rx_stash_size << 16);
-#endif
-
        /* Initialize the Minimum Frame Length Register */
        gfar_write(&priv->regs->minflr, MINFLR_INIT_SETTINGS);
 
-       /* Setup Attributes so that snooping is on for rx */
-       gfar_write(&priv->regs->attr, ATTR_INIT_SETTINGS);
-       gfar_write(&priv->regs->attreli, ATTRELI_INIT_SETTINGS);
-
        /* Assign the TBI an address which won't conflict with the PHYs */
        gfar_write(&priv->regs->tbipa, TBIPA_VALUE);
 }
@@ -577,8 +565,7 @@ static void free_skb_resources(struct gfar_private *priv)
                for (i = 0; i < priv->rx_ring_size; i++) {
                        if (priv->rx_skbuff[i]) {
                                dma_unmap_single(NULL, rxbdp->bufPtr,
-                                               priv->rx_buffer_size
-                                               + RXBUF_ALIGNMENT,
+                                               priv->rx_buffer_size,
                                                DMA_FROM_DEVICE);
 
                                dev_kfree_skb_any(priv->rx_skbuff[i]);
@@ -636,6 +623,7 @@ int startup_gfar(struct net_device *dev)
        struct gfar *regs = priv->regs;
        int err = 0;
        u32 rctrl = 0;
+       u32 attrs = 0;
 
        gfar_write(&regs->imask, IMASK_INIT_CLEAR);
 
@@ -795,18 +783,50 @@ int startup_gfar(struct net_device *dev)
        if (priv->rx_csum_enable)
                rctrl |= RCTRL_CHECKSUMMING;
 
-       if (priv->extended_hash)
+       if (priv->extended_hash) {
                rctrl |= RCTRL_EXTHASH;
 
+               gfar_clear_exact_match(dev);
+               rctrl |= RCTRL_EMEN;
+       }
+
        if (priv->vlan_enable)
                rctrl |= RCTRL_VLAN;
 
+       if (priv->padding) {
+               rctrl &= ~RCTRL_PAL_MASK;
+               rctrl |= RCTRL_PADDING(priv->padding);
+       }
+
        /* Init rctrl based on our settings */
        gfar_write(&priv->regs->rctrl, rctrl);
 
        if (dev->features & NETIF_F_IP_CSUM)
                gfar_write(&priv->regs->tctrl, TCTRL_INIT_CSUM);
 
+       /* Set the extraction length and index */
+       attrs = ATTRELI_EL(priv->rx_stash_size) |
+               ATTRELI_EI(priv->rx_stash_index);
+
+       gfar_write(&priv->regs->attreli, attrs);
+
+       /* Start with defaults, and add stashing or locking
+        * depending on the approprate variables */
+       attrs = ATTR_INIT_SETTINGS;
+
+       if (priv->bd_stash_en)
+               attrs |= ATTR_BDSTASH;
+
+       if (priv->rx_stash_size != 0)
+               attrs |= ATTR_BUFSTASH;
+
+       gfar_write(&priv->regs->attr, attrs);
+
+       gfar_write(&priv->regs->fifo_tx_thr, priv->fifo_threshold);
+       gfar_write(&priv->regs->fifo_tx_starve, priv->fifo_starve);
+       gfar_write(&priv->regs->fifo_tx_starve_shutoff, priv->fifo_starve_off);
+
+       /* Start the controller */
        gfar_start(dev);
 
        return 0;
@@ -851,34 +871,32 @@ static int gfar_enet_open(struct net_device *dev)
        return err;
 }
 
-static struct txfcb *gfar_add_fcb(struct sk_buff *skb, struct txbd8 *bdp)
+static inline struct txfcb *gfar_add_fcb(struct sk_buff *skb, struct txbd8 *bdp)
 {
        struct txfcb *fcb = (struct txfcb *)skb_push (skb, GMAC_FCB_LEN);
 
        memset(fcb, 0, GMAC_FCB_LEN);
 
-       /* Flag the bd so the controller looks for the FCB */
-       bdp->status |= TXBD_TOE;
-
        return fcb;
 }
 
 static inline void gfar_tx_checksum(struct sk_buff *skb, struct txfcb *fcb)
 {
-       int len;
+       u8 flags = 0;
 
        /* If we're here, it's a IP packet with a TCP or UDP
         * payload.  We set it to checksum, using a pseudo-header
         * we provide
         */
-       fcb->ip = 1;
-       fcb->tup = 1;
-       fcb->ctu = 1;
-       fcb->nph = 1;
+       flags = TXFCB_DEFAULT;
 
-       /* Notify the controller what the protocol is */
-       if (skb->nh.iph->protocol == IPPROTO_UDP)
-               fcb->udp = 1;
+       /* Tell the controller what the protocol is */
+       /* And provide the already calculated phcs */
+       if (skb->nh.iph->protocol == IPPROTO_UDP) {
+               flags |= TXFCB_UDP;
+               fcb->phcs = skb->h.uh->check;
+       } else
+               fcb->phcs = skb->h.th->check;
 
        /* l3os is the distance between the start of the
         * frame (skb->data) and the start of the IP hdr.
@@ -887,17 +905,12 @@ static inline void gfar_tx_checksum(struct sk_buff *skb, struct txfcb *fcb)
        fcb->l3os = (u16)(skb->nh.raw - skb->data - GMAC_FCB_LEN);
        fcb->l4os = (u16)(skb->h.raw - skb->nh.raw);
 
-       len = skb->nh.iph->tot_len - fcb->l4os;
-
-       /* Provide the pseudoheader csum */
-       fcb->phcs = ~csum_tcpudp_magic(skb->nh.iph->saddr,
-                       skb->nh.iph->daddr, len,
-                       skb->nh.iph->protocol, 0);
+       fcb->flags = flags;
 }
 
-void gfar_tx_vlan(struct sk_buff *skb, struct txfcb *fcb)
+void inline gfar_tx_vlan(struct sk_buff *skb, struct txfcb *fcb)
 {
-       fcb->vln = 1;
+       fcb->flags |= TXFCB_VLN;
        fcb->vlctl = vlan_tx_tag_get(skb);
 }
 
@@ -908,6 +921,7 @@ static int gfar_start_xmit(struct sk_buff *skb, struct net_device *dev)
        struct gfar_private *priv = netdev_priv(dev);
        struct txfcb *fcb = NULL;
        struct txbd8 *txbdp;
+       u16 status;
 
        /* Update transmit stats */
        priv->stats.tx_bytes += skb->len;
@@ -919,19 +933,22 @@ static int gfar_start_xmit(struct sk_buff *skb, struct net_device *dev)
        txbdp = priv->cur_tx;
 
        /* Clear all but the WRAP status flags */
-       txbdp->status &= TXBD_WRAP;
+       status = txbdp->status & TXBD_WRAP;
 
        /* Set up checksumming */
-       if ((dev->features & NETIF_F_IP_CSUM)
-                       && (CHECKSUM_HW == skb->ip_summed)) {
+       if (likely((dev->features & NETIF_F_IP_CSUM)
+                       && (CHECKSUM_HW == skb->ip_summed))) {
                fcb = gfar_add_fcb(skb, txbdp);
+               status |= TXBD_TOE;
                gfar_tx_checksum(skb, fcb);
        }
 
        if (priv->vlan_enable &&
                        unlikely(priv->vlgrp && vlan_tx_tag_present(skb))) {
-               if (NULL == fcb)
+               if (unlikely(NULL == fcb)) {
                        fcb = gfar_add_fcb(skb, txbdp);
+                       status |= TXBD_TOE;
+               }
 
                gfar_tx_vlan(skb, fcb);
        }
@@ -949,14 +966,16 @@ static int gfar_start_xmit(struct sk_buff *skb, struct net_device *dev)
            (priv->skb_curtx + 1) & TX_RING_MOD_MASK(priv->tx_ring_size);
 
        /* Flag the BD as interrupt-causing */
-       txbdp->status |= TXBD_INTERRUPT;
+       status |= TXBD_INTERRUPT;
 
        /* Flag the BD as ready to go, last in frame, and  */
        /* in need of CRC */
-       txbdp->status |= (TXBD_READY | TXBD_LAST | TXBD_CRC);
+       status |= (TXBD_READY | TXBD_LAST | TXBD_CRC);
 
        dev->trans_start = jiffies;
 
+       txbdp->status = status;
+
        /* If this was the last BD in the ring, the next one */
        /* is at the beginning of the ring */
        if (txbdp->status & TXBD_WRAP)
@@ -1010,21 +1029,7 @@ static struct net_device_stats * gfar_get_stats(struct net_device *dev)
 /* Changes the mac address if the controller is not running. */
 int gfar_set_mac_address(struct net_device *dev)
 {
-       struct gfar_private *priv = netdev_priv(dev);
-       int i;
-       char tmpbuf[MAC_ADDR_LEN];
-       u32 tempval;
-
-       /* Now copy it into the mac registers backwards, cuz */
-       /* little endian is silly */
-       for (i = 0; i < MAC_ADDR_LEN; i++)
-               tmpbuf[MAC_ADDR_LEN - 1 - i] = dev->dev_addr[i];
-
-       gfar_write(&priv->regs->macstnaddr1, *((u32 *) (tmpbuf)));
-
-       tempval = *((u32 *) (tmpbuf + 4));
-
-       gfar_write(&priv->regs->macstnaddr2, tempval);
+       gfar_set_mac_for_addr(dev, 0, dev->dev_addr);
 
        return 0;
 }
@@ -1110,7 +1115,7 @@ static int gfar_change_mtu(struct net_device *dev, int new_mtu)
            INCREMENTAL_BUFFER_SIZE;
 
        /* Only stop and start the controller if it isn't already
-        * stopped */
+        * stopped, and we changed something */
        if ((oldsize != tempsize) && (dev->flags & IFF_UP))
                stop_gfar(dev);
 
@@ -1220,6 +1225,7 @@ static irqreturn_t gfar_transmit(int irq, void *dev_id, struct pt_regs *regs)
 
 struct sk_buff * gfar_new_skb(struct net_device *dev, struct rxbd8 *bdp)
 {
+       unsigned int alignamount;
        struct gfar_private *priv = netdev_priv(dev);
        struct sk_buff *skb = NULL;
        unsigned int timeout = SKB_ALLOC_TIMEOUT;
@@ -1231,18 +1237,18 @@ struct sk_buff * gfar_new_skb(struct net_device *dev, struct rxbd8 *bdp)
        if (NULL == skb)
                return NULL;
 
+       alignamount = RXBUF_ALIGNMENT -
+               (((unsigned) skb->data) & (RXBUF_ALIGNMENT - 1));
+
        /* We need the data buffer to be aligned properly.  We will reserve
         * as many bytes as needed to align the data properly
         */
-       skb_reserve(skb,
-                   RXBUF_ALIGNMENT -
-                   (((unsigned) skb->data) & (RXBUF_ALIGNMENT - 1)));
+       skb_reserve(skb, alignamount);
 
        skb->dev = dev;
 
        bdp->bufPtr = dma_map_single(NULL, skb->data,
-                       priv->rx_buffer_size + RXBUF_ALIGNMENT,
-                       DMA_FROM_DEVICE);
+                       priv->rx_buffer_size, DMA_FROM_DEVICE);
 
        bdp->length = 0;
 
@@ -1350,7 +1356,7 @@ static inline void gfar_rx_checksum(struct sk_buff *skb, struct rxfcb *fcb)
        /* If valid headers were found, and valid sums
         * were verified, then we tell the kernel that no
         * checksumming is necessary.  Otherwise, it is */
-       if (fcb->cip && !fcb->eip && fcb->ctu && !fcb->etu)
+       if ((fcb->flags & RXFCB_CSUM_MASK) == (RXFCB_CIP | RXFCB_CTU))
                skb->ip_summed = CHECKSUM_UNNECESSARY;
        else
                skb->ip_summed = CHECKSUM_NONE;
@@ -1401,7 +1407,7 @@ static int gfar_process_frame(struct net_device *dev, struct sk_buff *skb,
                skb->protocol = eth_type_trans(skb, dev);
 
                /* Send the packet up the stack */
-               if (unlikely(priv->vlgrp && fcb->vln))
+               if (unlikely(priv->vlgrp && (fcb->flags & RXFCB_VLN)))
                        ret = gfar_rx_vlan(skb, priv->vlgrp, fcb->vlctl);
                else
                        ret = RECEIVE(skb);
@@ -1620,6 +1626,7 @@ static void adjust_link(struct net_device *dev)
        spin_lock_irqsave(&priv->lock, flags);
        if (phydev->link) {
                u32 tempval = gfar_read(&regs->maccfg2);
+               u32 ecntrl = gfar_read(&regs->ecntrl);
 
                /* Now we make sure that we can be in full duplex mode.
                 * If not, we operate in half-duplex mode. */
@@ -1644,6 +1651,13 @@ static void adjust_link(struct net_device *dev)
                        case 10:
                                tempval =
                                    ((tempval & ~(MACCFG2_IF)) | MACCFG2_MII);
+
+                               /* Reduced mode distinguishes
+                                * between 10 and 100 */
+                               if (phydev->speed == SPEED_100)
+                                       ecntrl |= ECNTRL_R100;
+                               else
+                                       ecntrl &= ~(ECNTRL_R100);
                                break;
                        default:
                                if (netif_msg_link(priv))
@@ -1657,6 +1671,7 @@ static void adjust_link(struct net_device *dev)
                }
 
                gfar_write(&regs->maccfg2, tempval);
+               gfar_write(&regs->ecntrl, ecntrl);
 
                if (!priv->oldlink) {
                        new_state = 1;
@@ -1721,6 +1736,9 @@ static void gfar_set_multi(struct net_device *dev)
                gfar_write(&regs->gaddr6, 0xffffffff);
                gfar_write(&regs->gaddr7, 0xffffffff);
        } else {
+               int em_num;
+               int idx;
+
                /* zero out the hash */
                gfar_write(&regs->igaddr0, 0x0);
                gfar_write(&regs->igaddr1, 0x0);
@@ -1739,18 +1757,47 @@ static void gfar_set_multi(struct net_device *dev)
                gfar_write(&regs->gaddr6, 0x0);
                gfar_write(&regs->gaddr7, 0x0);
 
+               /* If we have extended hash tables, we need to
+                * clear the exact match registers to prepare for
+                * setting them */
+               if (priv->extended_hash) {
+                       em_num = GFAR_EM_NUM + 1;
+                       gfar_clear_exact_match(dev);
+                       idx = 1;
+               } else {
+                       idx = 0;
+                       em_num = 0;
+               }
+
                if(dev->mc_count == 0)
                        return;
 
                /* Parse the list, and set the appropriate bits */
                for(mc_ptr = dev->mc_list; mc_ptr; mc_ptr = mc_ptr->next) {
-                       gfar_set_hash_for_addr(dev, mc_ptr->dmi_addr);
+                       if (idx < em_num) {
+                               gfar_set_mac_for_addr(dev, idx,
+                                               mc_ptr->dmi_addr);
+                               idx++;
+                       } else
+                               gfar_set_hash_for_addr(dev, mc_ptr->dmi_addr);
                }
        }
 
        return;
 }
 
+
+/* Clears each of the exact match registers to zero, so they
+ * don't interfere with normal reception */
+static void gfar_clear_exact_match(struct net_device *dev)
+{
+       int idx;
+       u8 zero_arr[MAC_ADDR_LEN] = {0,0,0,0,0,0};
+
+       for(idx = 1;idx < GFAR_EM_NUM + 1;idx++)
+               gfar_set_mac_for_addr(dev, idx, (u8 *)zero_arr);
+}
+
 /* Set the appropriate hash bit for the given addr */
 /* The algorithm works like so:
  * 1) Take the Destination Address (ie the multicast address), and
@@ -1781,6 +1828,32 @@ static void gfar_set_hash_for_addr(struct net_device *dev, u8 *addr)
        return;
 }
 
+
+/* There are multiple MAC Address register pairs on some controllers
+ * This function sets the numth pair to a given address
+ */
+static void gfar_set_mac_for_addr(struct net_device *dev, int num, u8 *addr)
+{
+       struct gfar_private *priv = netdev_priv(dev);
+       int idx;
+       char tmpbuf[MAC_ADDR_LEN];
+       u32 tempval;
+       u32 *macptr = &priv->regs->macstnaddr1;
+
+       macptr += num*2;
+
+       /* Now copy it into the mac registers backwards, cuz */
+       /* little endian is silly */
+       for (idx = 0; idx < MAC_ADDR_LEN; idx++)
+               tmpbuf[MAC_ADDR_LEN - 1 - idx] = addr[idx];
+
+       gfar_write(macptr, *((u32 *) (tmpbuf)));
+
+       tempval = *((u32 *) (tmpbuf + 4));
+
+       gfar_write(macptr+1, tempval);
+}
+
 /* GFAR error interrupt handler */
 static irqreturn_t gfar_error(int irq, void *dev_id, struct pt_regs *regs)
 {
index 5065ba82cb7608324d7b8d6f1a2a37a2b5b3fff2..94a91da84fbb7ac5abe74cd6e63332c48ca9afa5 100644 (file)
@@ -90,12 +90,26 @@ extern const char gfar_driver_version[];
 #define GFAR_RX_MAX_RING_SIZE   256
 #define GFAR_TX_MAX_RING_SIZE   256
 
+#define GFAR_MAX_FIFO_THRESHOLD 511
+#define GFAR_MAX_FIFO_STARVE   511
+#define GFAR_MAX_FIFO_STARVE_OFF 511
+
 #define DEFAULT_RX_BUFFER_SIZE  1536
 #define TX_RING_MOD_MASK(size) (size-1)
 #define RX_RING_MOD_MASK(size) (size-1)
 #define JUMBO_BUFFER_SIZE 9728
 #define JUMBO_FRAME_SIZE 9600
 
+#define DEFAULT_FIFO_TX_THR 0x100
+#define DEFAULT_FIFO_TX_STARVE 0x40
+#define DEFAULT_FIFO_TX_STARVE_OFF 0x80
+#define DEFAULT_BD_STASH 1
+#define DEFAULT_STASH_LENGTH   64
+#define DEFAULT_STASH_INDEX    0
+
+/* The number of Exact Match registers */
+#define GFAR_EM_NUM    15
+
 /* Latency of interface clock in nanoseconds */
 /* Interface clock latency , in this case, means the
  * time described by a value of 1 in the interrupt
@@ -112,11 +126,11 @@ extern const char gfar_driver_version[];
 
 #define DEFAULT_TX_COALESCE 1
 #define DEFAULT_TXCOUNT        16
-#define DEFAULT_TXTIME 400
+#define DEFAULT_TXTIME 4
 
 #define DEFAULT_RX_COALESCE 1
 #define DEFAULT_RXCOUNT        16
-#define DEFAULT_RXTIME 400
+#define DEFAULT_RXTIME 4
 
 #define TBIPA_VALUE            0x1f
 #define MIIMCFG_INIT_VALUE     0x00000007
@@ -147,6 +161,7 @@ extern const char gfar_driver_version[];
 
 #define ECNTRL_INIT_SETTINGS   0x00001000
 #define ECNTRL_TBI_MODE         0x00000020
+#define ECNTRL_R100            0x00000008
 
 #define MRBLR_INIT_SETTINGS    DEFAULT_RX_BUFFER_SIZE
 
@@ -181,10 +196,12 @@ extern const char gfar_driver_version[];
 #define RCTRL_PRSDEP_MASK      0x000000c0
 #define RCTRL_PRSDEP_INIT      0x000000c0
 #define RCTRL_PROM             0x00000008
+#define RCTRL_EMEN             0x00000002
 #define RCTRL_CHECKSUMMING     (RCTRL_IPCSEN \
                | RCTRL_TUCSEN | RCTRL_PRSDEP_INIT)
 #define RCTRL_EXTHASH          (RCTRL_GHTX)
 #define RCTRL_VLAN             (RCTRL_PRSDEP_INIT)
+#define RCTRL_PADDING(x)       ((x << 16) & RCTRL_PAL_MASK)
 
 
 #define RSTAT_CLEAR_RHALT       0x00800000
@@ -251,28 +268,26 @@ extern const char gfar_driver_version[];
                IMASK_XFUN | IMASK_RXC | IMASK_BABT | IMASK_DPE \
                | IMASK_PERR)
 
+/* Fifo management */
+#define FIFO_TX_THR_MASK       0x01ff
+#define FIFO_TX_STARVE_MASK    0x01ff
+#define FIFO_TX_STARVE_OFF_MASK        0x01ff
 
 /* Attribute fields */
 
 /* This enables rx snooping for buffers and descriptors */
-#ifdef CONFIG_GFAR_BDSTASH
 #define ATTR_BDSTASH           0x00000800
-#else
-#define ATTR_BDSTASH           0x00000000
-#endif
 
-#ifdef CONFIG_GFAR_BUFSTASH
 #define ATTR_BUFSTASH          0x00004000
-#define STASH_LENGTH           64
-#else
-#define ATTR_BUFSTASH          0x00000000
-#endif
 
 #define ATTR_SNOOPING          0x000000c0
-#define ATTR_INIT_SETTINGS      (ATTR_SNOOPING \
-               | ATTR_BDSTASH | ATTR_BUFSTASH)
+#define ATTR_INIT_SETTINGS      ATTR_SNOOPING
 
 #define ATTRELI_INIT_SETTINGS   0x0
+#define ATTRELI_EL_MASK                0x3fff0000
+#define ATTRELI_EL(x) (x << 16)
+#define ATTRELI_EI_MASK                0x00003fff
+#define ATTRELI_EI(x) (x)
 
 
 /* TxBD status field bits */
@@ -328,6 +343,7 @@ extern const char gfar_driver_version[];
 #define RXFCB_CTU              0x0400
 #define RXFCB_EIP              0x0200
 #define RXFCB_ETU              0x0100
+#define RXFCB_CSUM_MASK                0x0f00
 #define RXFCB_PERR_MASK                0x000c
 #define RXFCB_PERR_BADL3       0x0008
 
@@ -339,14 +355,7 @@ struct txbd8
 };
 
 struct txfcb {
-       u8      vln:1,
-               ip:1,
-               ip6:1,
-               tup:1,
-               udp:1,
-               cip:1,
-               ctu:1,
-               nph:1;
+       u8      flags;
        u8      reserved;
        u8      l4os;   /* Level 4 Header Offset */
        u8      l3os;   /* Level 3 Header Offset */
@@ -362,14 +371,7 @@ struct rxbd8
 };
 
 struct rxfcb {
-       u16     vln:1,
-               ip:1,
-               ip6:1,
-               tup:1,
-               cip:1,
-               ctu:1,
-               eip:1,
-               etu:1;
+       u16     flags;
        u8      rq;     /* Receive Queue index */
        u8      pro;    /* Layer 4 Protocol */
        u16     reserved;
@@ -688,12 +690,17 @@ struct gfar_private {
        spinlock_t lock;
        unsigned int rx_buffer_size;
        unsigned int rx_stash_size;
+       unsigned int rx_stash_index;
        unsigned int tx_ring_size;
        unsigned int rx_ring_size;
+       unsigned int fifo_threshold;
+       unsigned int fifo_starve;
+       unsigned int fifo_starve_off;
 
        unsigned char vlan_enable:1,
                rx_csum_enable:1,
-               extended_hash:1;
+               extended_hash:1,
+               bd_stash_en:1;
        unsigned short padding;
        struct vlan_group *vlgrp;
        /* Info structure initialized by board setup code */
@@ -731,6 +738,6 @@ extern void stop_gfar(struct net_device *dev);
 extern void gfar_halt(struct net_device *dev);
 extern void gfar_phy_test(struct mii_bus *bus, struct phy_device *phydev,
                int enable, u32 regnum, u32 read);
-void gfar_setup_stashing(struct net_device *dev);
+void gfar_init_sysfs(struct net_device *dev);
 
 #endif /* __GIANFAR_H */
index cfa3cd7c91a0a9c777851379e1c63d9eeae217a9..765e810620fe95f68834e7fede0019190609a494 100644 (file)
@@ -125,7 +125,7 @@ static char stat_gstrings[][ETH_GSTRING_LEN] = {
 static void gfar_gstrings(struct net_device *dev, u32 stringset, u8 * buf)
 {
        struct gfar_private *priv = netdev_priv(dev);
-       
+
        if (priv->einfo->device_flags & FSL_GIANFAR_DEV_HAS_RMON)
                memcpy(buf, stat_gstrings, GFAR_STATS_LEN * ETH_GSTRING_LEN);
        else
index e85eb216fb5be40464e1dfdf0402f77059bfeafb..d527cf2f9c1d7f47398eaac003b361e79428b38b 100644 (file)
@@ -24,6 +24,7 @@
 #define MII_READ_COMMAND       0x00000001
 
 #define GFAR_SUPPORTED (SUPPORTED_10baseT_Half \
+               | SUPPORTED_10baseT_Full \
                | SUPPORTED_100baseT_Half \
                | SUPPORTED_100baseT_Full \
                | SUPPORTED_Autoneg \
diff --git a/drivers/net/gianfar_sysfs.c b/drivers/net/gianfar_sysfs.c
new file mode 100644 (file)
index 0000000..10d34cb
--- /dev/null
@@ -0,0 +1,311 @@
+/*
+ * drivers/net/gianfar_sysfs.c
+ *
+ * Gianfar Ethernet Driver
+ * This driver is designed for the non-CPM ethernet controllers
+ * on the 85xx and 83xx family of integrated processors
+ * Based on 8260_io/fcc_enet.c
+ *
+ * Author: Andy Fleming
+ * Maintainer: Kumar Gala (kumar.gala@freescale.com)
+ *
+ * Copyright (c) 2002-2005 Freescale Semiconductor, Inc.
+ *
+ * This program is free software; you can redistribute  it and/or modify it
+ * under  the terms of  the GNU General  Public License as published by the
+ * Free Software Foundation;  either version 2 of the  License, or (at your
+ * option) any later version.
+ *
+ * Sysfs file creation and management
+ */
+
+#include <linux/config.h>
+#include <linux/kernel.h>
+#include <linux/sched.h>
+#include <linux/string.h>
+#include <linux/errno.h>
+#include <linux/unistd.h>
+#include <linux/slab.h>
+#include <linux/init.h>
+#include <linux/delay.h>
+#include <linux/etherdevice.h>
+#include <linux/spinlock.h>
+#include <linux/mm.h>
+#include <linux/device.h>
+
+#include <asm/uaccess.h>
+#include <linux/module.h>
+#include <linux/version.h>
+
+#include "gianfar.h"
+
+#define GFAR_ATTR(_name) \
+static ssize_t gfar_show_##_name(struct class_device *cdev, char *buf); \
+static ssize_t gfar_set_##_name(struct class_device *cdev, \
+               const char *buf, size_t count); \
+static CLASS_DEVICE_ATTR(_name, 0644, gfar_show_##_name, gfar_set_##_name)
+
+#define GFAR_CREATE_FILE(_dev, _name) \
+       class_device_create_file(&_dev->class_dev, &class_device_attr_##_name)
+
+GFAR_ATTR(bd_stash);
+GFAR_ATTR(rx_stash_size);
+GFAR_ATTR(rx_stash_index);
+GFAR_ATTR(fifo_threshold);
+GFAR_ATTR(fifo_starve);
+GFAR_ATTR(fifo_starve_off);
+
+#define to_net_dev(cd) container_of(cd, struct net_device, class_dev)
+
+static ssize_t gfar_show_bd_stash(struct class_device *cdev, char *buf)
+{
+       struct net_device *dev = to_net_dev(cdev);
+       struct gfar_private *priv = netdev_priv(dev);
+
+       return sprintf(buf, "%s\n", priv->bd_stash_en? "on" : "off");
+}
+
+static ssize_t gfar_set_bd_stash(struct class_device *cdev,
+               const char *buf, size_t count)
+{
+       struct net_device *dev = to_net_dev(cdev);
+       struct gfar_private *priv = netdev_priv(dev);
+       int new_setting = 0;
+       u32 temp;
+       unsigned long flags;
+
+       /* Find out the new setting */
+       if (!strncmp("on", buf, count-1) || !strncmp("1", buf, count-1))
+               new_setting = 1;
+       else if (!strncmp("off", buf, count-1) || !strncmp("0", buf, count-1))
+               new_setting = 0;
+       else
+               return count;
+
+       spin_lock_irqsave(&priv->lock, flags);
+
+       /* Set the new stashing value */
+       priv->bd_stash_en = new_setting;
+
+       temp = gfar_read(&priv->regs->attr);
+       
+       if (new_setting)
+               temp |= ATTR_BDSTASH;
+       else
+               temp &= ~(ATTR_BDSTASH);
+
+       gfar_write(&priv->regs->attr, temp);
+
+       spin_unlock_irqrestore(&priv->lock, flags);
+
+       return count;
+}
+
+static ssize_t gfar_show_rx_stash_size(struct class_device *cdev, char *buf)
+{
+       struct net_device *dev = to_net_dev(cdev);
+       struct gfar_private *priv = netdev_priv(dev);
+
+       return sprintf(buf, "%d\n", priv->rx_stash_size);
+}
+
+static ssize_t gfar_set_rx_stash_size(struct class_device *cdev,
+               const char *buf, size_t count)
+{
+       struct net_device *dev = to_net_dev(cdev);
+       struct gfar_private *priv = netdev_priv(dev);
+       unsigned int length = simple_strtoul(buf, NULL, 0);
+       u32 temp;
+       unsigned long flags;
+
+       spin_lock_irqsave(&priv->lock, flags);
+       if (length > priv->rx_buffer_size)
+               return count;
+
+       if (length == priv->rx_stash_size)
+               return count;
+
+       priv->rx_stash_size = length;
+
+       temp = gfar_read(&priv->regs->attreli);
+       temp &= ~ATTRELI_EL_MASK;
+       temp |= ATTRELI_EL(length);
+       gfar_write(&priv->regs->attreli, temp);
+
+       /* Turn stashing on/off as appropriate */
+       temp = gfar_read(&priv->regs->attr);
+
+       if (length)
+               temp |= ATTR_BUFSTASH;
+       else
+               temp &= ~(ATTR_BUFSTASH);
+
+       gfar_write(&priv->regs->attr, temp);
+
+       spin_unlock_irqrestore(&priv->lock, flags);
+
+       return count;
+}
+
+
+/* Stashing will only be enabled when rx_stash_size != 0 */
+static ssize_t gfar_show_rx_stash_index(struct class_device *cdev, char *buf)
+{
+       struct net_device *dev = to_net_dev(cdev);
+       struct gfar_private *priv = netdev_priv(dev);
+
+       return sprintf(buf, "%d\n", priv->rx_stash_index);
+}
+
+static ssize_t gfar_set_rx_stash_index(struct class_device *cdev,
+               const char *buf, size_t count)
+{
+       struct net_device *dev = to_net_dev(cdev);
+       struct gfar_private *priv = netdev_priv(dev);
+       unsigned short index = simple_strtoul(buf, NULL, 0);
+       u32 temp;
+       unsigned long flags;
+
+       spin_lock_irqsave(&priv->lock, flags);
+       if (index > priv->rx_stash_size)
+               return count;
+
+       if (index == priv->rx_stash_index)
+               return count;
+
+       priv->rx_stash_index = index;
+
+       temp = gfar_read(&priv->regs->attreli);
+       temp &= ~ATTRELI_EI_MASK;
+       temp |= ATTRELI_EI(index);
+       gfar_write(&priv->regs->attreli, flags);
+
+       spin_unlock_irqrestore(&priv->lock, flags);
+
+       return count;
+}
+
+static ssize_t gfar_show_fifo_threshold(struct class_device *cdev, char *buf)
+{
+       struct net_device *dev = to_net_dev(cdev);
+       struct gfar_private *priv = netdev_priv(dev);
+
+       return sprintf(buf, "%d\n", priv->fifo_threshold);
+}
+
+static ssize_t gfar_set_fifo_threshold(struct class_device *cdev,
+               const char *buf, size_t count)
+{
+       struct net_device *dev = to_net_dev(cdev);
+       struct gfar_private *priv = netdev_priv(dev);
+       unsigned int length = simple_strtoul(buf, NULL, 0);
+       u32 temp;
+       unsigned long flags;
+
+       if (length > GFAR_MAX_FIFO_THRESHOLD)
+               return count;
+
+       spin_lock_irqsave(&priv->lock, flags);
+
+       priv->fifo_threshold = length;
+
+       temp = gfar_read(&priv->regs->fifo_tx_thr);
+       temp &= ~FIFO_TX_THR_MASK;
+       temp |= length;
+       gfar_write(&priv->regs->fifo_tx_thr, temp);
+
+       spin_unlock_irqrestore(&priv->lock, flags);
+
+       return count;
+}
+
+static ssize_t gfar_show_fifo_starve(struct class_device *cdev, char *buf)
+{
+       struct net_device *dev = to_net_dev(cdev);
+       struct gfar_private *priv = netdev_priv(dev);
+
+       return sprintf(buf, "%d\n", priv->fifo_starve);
+}
+
+
+static ssize_t gfar_set_fifo_starve(struct class_device *cdev,
+               const char *buf, size_t count)
+{
+       struct net_device *dev = to_net_dev(cdev);
+       struct gfar_private *priv = netdev_priv(dev);
+       unsigned int num = simple_strtoul(buf, NULL, 0);
+       u32 temp;
+       unsigned long flags;
+
+       if (num > GFAR_MAX_FIFO_STARVE)
+               return count;
+
+       spin_lock_irqsave(&priv->lock, flags);
+
+       priv->fifo_starve = num;
+
+       temp = gfar_read(&priv->regs->fifo_tx_starve);
+       temp &= ~FIFO_TX_STARVE_MASK;
+       temp |= num;
+       gfar_write(&priv->regs->fifo_tx_starve, temp);
+
+       spin_unlock_irqrestore(&priv->lock, flags);
+
+       return count;
+}
+
+static ssize_t gfar_show_fifo_starve_off(struct class_device *cdev, char *buf)
+{
+       struct net_device *dev = to_net_dev(cdev);
+       struct gfar_private *priv = netdev_priv(dev);
+
+       return sprintf(buf, "%d\n", priv->fifo_starve_off);
+}
+
+static ssize_t gfar_set_fifo_starve_off(struct class_device *cdev,
+               const char *buf, size_t count)
+{
+       struct net_device *dev = to_net_dev(cdev);
+       struct gfar_private *priv = netdev_priv(dev);
+       unsigned int num = simple_strtoul(buf, NULL, 0);
+       u32 temp;
+       unsigned long flags;
+
+       if (num > GFAR_MAX_FIFO_STARVE_OFF)
+               return count;
+
+       spin_lock_irqsave(&priv->lock, flags);
+
+       priv->fifo_starve_off = num;
+
+       temp = gfar_read(&priv->regs->fifo_tx_starve_shutoff);
+       temp &= ~FIFO_TX_STARVE_OFF_MASK;
+       temp |= num;
+       gfar_write(&priv->regs->fifo_tx_starve_shutoff, temp);
+
+       spin_unlock_irqrestore(&priv->lock, flags);
+
+       return count;
+}
+
+void gfar_init_sysfs(struct net_device *dev)
+{
+       struct gfar_private *priv = netdev_priv(dev);
+
+       /* Initialize the default values */
+       priv->rx_stash_size = DEFAULT_STASH_LENGTH;
+       priv->rx_stash_index = DEFAULT_STASH_INDEX;
+       priv->fifo_threshold = DEFAULT_FIFO_TX_THR;
+       priv->fifo_starve = DEFAULT_FIFO_TX_STARVE;
+       priv->fifo_starve_off = DEFAULT_FIFO_TX_STARVE_OFF;
+       priv->bd_stash_en = DEFAULT_BD_STASH;
+
+       /* Create our sysfs files */
+       GFAR_CREATE_FILE(dev, bd_stash);
+       GFAR_CREATE_FILE(dev, rx_stash_size);
+       GFAR_CREATE_FILE(dev, rx_stash_index);
+       GFAR_CREATE_FILE(dev, fifo_threshold);
+       GFAR_CREATE_FILE(dev, fifo_starve);
+       GFAR_CREATE_FILE(dev, fifo_starve_off);
+
+}
diff --git a/drivers/net/ixp2000/Kconfig b/drivers/net/ixp2000/Kconfig
new file mode 100644 (file)
index 0000000..2fec241
--- /dev/null
@@ -0,0 +1,6 @@
+config ENP2611_MSF_NET
+       tristate "Radisys ENP2611 MSF network interface support"
+       depends on ARCH_ENP2611
+       help
+         This is a driver for the MSF network interface unit in
+         the IXP2400 on the Radisys ENP2611 platform.
diff --git a/drivers/net/ixp2000/Makefile b/drivers/net/ixp2000/Makefile
new file mode 100644 (file)
index 0000000..fd38351
--- /dev/null
@@ -0,0 +1,3 @@
+obj-$(CONFIG_ENP2611_MSF_NET) += enp2611_mod.o
+
+enp2611_mod-objs := caleb.o enp2611.o ixp2400-msf.o ixpdev.o pm3386.o
diff --git a/drivers/net/ixp2000/caleb.c b/drivers/net/ixp2000/caleb.c
new file mode 100644 (file)
index 0000000..3595e10
--- /dev/null
@@ -0,0 +1,137 @@
+/*
+ * Helper functions for the SPI-3 bridge FPGA on the Radisys ENP2611
+ * Copyright (C) 2004, 2005 Lennert Buytenhek <buytenh@wantstofly.org>
+ * Dedicated to Marija Kulikova.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ */
+
+#include <linux/config.h>
+#include <linux/module.h>
+#include <linux/delay.h>
+#include <asm/io.h>
+#include "caleb.h"
+
+#define CALEB_IDLO             0x00
+#define CALEB_IDHI             0x01
+#define CALEB_RID              0x02
+#define CALEB_RESET            0x03
+#define CALEB_INTREN0          0x04
+#define CALEB_INTREN1          0x05
+#define CALEB_INTRSTAT0                0x06
+#define CALEB_INTRSTAT1                0x07
+#define CALEB_PORTEN           0x08
+#define CALEB_BURST            0x09
+#define CALEB_PORTPAUS         0x0A
+#define CALEB_PORTPAUSD                0x0B
+#define CALEB_PHY0RX           0x10
+#define CALEB_PHY1RX           0x11
+#define CALEB_PHY0TX           0x12
+#define CALEB_PHY1TX           0x13
+#define CALEB_IXPRX_HI_CNTR    0x15
+#define CALEB_PHY0RX_HI_CNTR   0x16
+#define CALEB_PHY1RX_HI_CNTR   0x17
+#define CALEB_IXPRX_CNTR       0x18
+#define CALEB_PHY0RX_CNTR      0x19
+#define CALEB_PHY1RX_CNTR      0x1A
+#define CALEB_IXPTX_CNTR       0x1B
+#define CALEB_PHY0TX_CNTR      0x1C
+#define CALEB_PHY1TX_CNTR      0x1D
+#define CALEB_DEBUG0           0x1E
+#define CALEB_DEBUG1           0x1F
+
+
+static u8 caleb_reg_read(int reg)
+{
+       u8 value;
+
+       value = *((volatile u8 *)(ENP2611_CALEB_VIRT_BASE + reg));
+
+//     printk(KERN_INFO "caleb_reg_read(%d) = %.2x\n", reg, value);
+
+       return value;
+}
+
+static void caleb_reg_write(int reg, u8 value)
+{
+       u8 dummy;
+
+//     printk(KERN_INFO "caleb_reg_write(%d, %.2x)\n", reg, value);
+
+       *((volatile u8 *)(ENP2611_CALEB_VIRT_BASE + reg)) = value;
+
+       dummy = *((volatile u8 *)ENP2611_CALEB_VIRT_BASE);
+       __asm__ __volatile__("mov %0, %0" : "+r" (dummy));
+}
+
+
+void caleb_reset(void)
+{
+       /*
+        * Perform a chip reset.
+        */
+       caleb_reg_write(CALEB_RESET, 0x02);
+       udelay(1);
+
+       /*
+        * Enable all interrupt sources.  This is needed to get
+        * meaningful results out of the status bits (register 6
+        * and 7.)
+        */
+       caleb_reg_write(CALEB_INTREN0, 0xff);
+       caleb_reg_write(CALEB_INTREN1, 0x07);
+
+       /*
+        * Set RX and TX FIFO thresholds to 1.5kb.
+        */
+       caleb_reg_write(CALEB_PHY0RX, 0x11);
+       caleb_reg_write(CALEB_PHY1RX, 0x11);
+       caleb_reg_write(CALEB_PHY0TX, 0x11);
+       caleb_reg_write(CALEB_PHY1TX, 0x11);
+
+       /*
+        * Program SPI-3 burst size.
+        */
+       caleb_reg_write(CALEB_BURST, 0);        // 64-byte RBUF mpackets
+//     caleb_reg_write(CALEB_BURST, 1);        // 128-byte RBUF mpackets
+//     caleb_reg_write(CALEB_BURST, 2);        // 256-byte RBUF mpackets
+}
+
+void caleb_enable_rx(int port)
+{
+       u8 temp;
+
+       temp = caleb_reg_read(CALEB_PORTEN);
+       temp |= 1 << port;
+       caleb_reg_write(CALEB_PORTEN, temp);
+}
+
+void caleb_disable_rx(int port)
+{
+       u8 temp;
+
+       temp = caleb_reg_read(CALEB_PORTEN);
+       temp &= ~(1 << port);
+       caleb_reg_write(CALEB_PORTEN, temp);
+}
+
+void caleb_enable_tx(int port)
+{
+       u8 temp;
+
+       temp = caleb_reg_read(CALEB_PORTEN);
+       temp |= 1 << (port + 4);
+       caleb_reg_write(CALEB_PORTEN, temp);
+}
+
+void caleb_disable_tx(int port)
+{
+       u8 temp;
+
+       temp = caleb_reg_read(CALEB_PORTEN);
+       temp &= ~(1 << (port + 4));
+       caleb_reg_write(CALEB_PORTEN, temp);
+}
diff --git a/drivers/net/ixp2000/caleb.h b/drivers/net/ixp2000/caleb.h
new file mode 100644 (file)
index 0000000..e93a1ef
--- /dev/null
@@ -0,0 +1,22 @@
+/*
+ * Helper functions for the SPI-3 bridge FPGA on the Radisys ENP2611
+ * Copyright (C) 2004, 2005 Lennert Buytenhek <buytenh@wantstofly.org>
+ * Dedicated to Marija Kulikova.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ */
+
+#ifndef __CALEB_H
+#define __CALEB_H
+
+void caleb_reset(void);
+void caleb_enable_rx(int port);
+void caleb_disable_rx(int port);
+void caleb_enable_tx(int port);
+void caleb_disable_tx(int port);
+
+
+#endif
diff --git a/drivers/net/ixp2000/enp2611.c b/drivers/net/ixp2000/enp2611.c
new file mode 100644 (file)
index 0000000..d82651a
--- /dev/null
@@ -0,0 +1,245 @@
+/*
+ * IXP2400 MSF network device driver for the Radisys ENP2611
+ * Copyright (C) 2004, 2005 Lennert Buytenhek <buytenh@wantstofly.org>
+ * Dedicated to Marija Kulikova.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ */
+
+#include <linux/config.h>
+#include <linux/module.h>
+#include <linux/kernel.h>
+#include <linux/netdevice.h>
+#include <linux/etherdevice.h>
+#include <linux/init.h>
+#include <linux/moduleparam.h>
+#include <asm/arch/uengine.h>
+#include <asm/mach-types.h>
+#include <asm/io.h>
+#include "ixpdev.h"
+#include "caleb.h"
+#include "ixp2400-msf.h"
+#include "pm3386.h"
+
+/***********************************************************************
+ * The Radisys ENP2611 is a PCI form factor board with three SFP GBIC
+ * slots, connected via two PMC/Sierra 3386s and an SPI-3 bridge FPGA
+ * to the IXP2400.
+ *
+ *                +-------------+
+ * SFP GBIC #0 ---+             |       +---------+
+ *                |  PM3386 #0  +-------+         |
+ * SFP GBIC #1 ---+             |       | "Caleb" |         +---------+
+ *                +-------------+       |         |         |         |
+ *                                      | SPI-3   +---------+ IXP2400 |
+ *                +-------------+       | bridge  |         |         |
+ * SFP GBIC #2 ---+             |       | FPGA    |         +---------+
+ *                |  PM3386 #1  +-------+         |
+ *                |             |       +---------+
+ *                +-------------+
+ *              ^                   ^                  ^
+ *              | 1.25Gbaud         | 104MHz           | 104MHz
+ *              | SERDES ea.        | SPI-3 ea.        | SPI-3
+ *
+ ***********************************************************************/
+static struct ixp2400_msf_parameters enp2611_msf_parameters =
+{
+       .rx_mode =              IXP2400_RX_MODE_UTOPIA_POS |
+                               IXP2400_RX_MODE_1x32 |
+                               IXP2400_RX_MODE_MPHY |
+                               IXP2400_RX_MODE_MPHY_32 |
+                               IXP2400_RX_MODE_MPHY_POLLED_STATUS |
+                               IXP2400_RX_MODE_MPHY_LEVEL3 |
+                               IXP2400_RX_MODE_RBUF_SIZE_64,
+
+       .rxclk01_multiplier =   IXP2400_PLL_MULTIPLIER_16,
+
+       .rx_poll_ports =        3,
+
+       .rx_channel_mode = {
+               IXP2400_PORT_RX_MODE_MASTER |
+               IXP2400_PORT_RX_MODE_POS_PHY |
+               IXP2400_PORT_RX_MODE_POS_PHY_L3 |
+               IXP2400_PORT_RX_MODE_ODD_PARITY |
+               IXP2400_PORT_RX_MODE_2_CYCLE_DECODE,
+
+               IXP2400_PORT_RX_MODE_MASTER |
+               IXP2400_PORT_RX_MODE_POS_PHY |
+               IXP2400_PORT_RX_MODE_POS_PHY_L3 |
+               IXP2400_PORT_RX_MODE_ODD_PARITY |
+               IXP2400_PORT_RX_MODE_2_CYCLE_DECODE,
+
+               IXP2400_PORT_RX_MODE_MASTER |
+               IXP2400_PORT_RX_MODE_POS_PHY |
+               IXP2400_PORT_RX_MODE_POS_PHY_L3 |
+               IXP2400_PORT_RX_MODE_ODD_PARITY |
+               IXP2400_PORT_RX_MODE_2_CYCLE_DECODE,
+
+               IXP2400_PORT_RX_MODE_MASTER |
+               IXP2400_PORT_RX_MODE_POS_PHY |
+               IXP2400_PORT_RX_MODE_POS_PHY_L3 |
+               IXP2400_PORT_RX_MODE_ODD_PARITY |
+               IXP2400_PORT_RX_MODE_2_CYCLE_DECODE
+       },
+
+       .tx_mode =              IXP2400_TX_MODE_UTOPIA_POS |
+                               IXP2400_TX_MODE_1x32 |
+                               IXP2400_TX_MODE_MPHY |
+                               IXP2400_TX_MODE_MPHY_32 |
+                               IXP2400_TX_MODE_MPHY_POLLED_STATUS |
+                               IXP2400_TX_MODE_MPHY_LEVEL3 |
+                               IXP2400_TX_MODE_TBUF_SIZE_64,
+
+       .txclk01_multiplier =   IXP2400_PLL_MULTIPLIER_16,
+
+       .tx_poll_ports =        3,
+
+       .tx_channel_mode = {
+               IXP2400_PORT_TX_MODE_MASTER |
+               IXP2400_PORT_TX_MODE_POS_PHY |
+               IXP2400_PORT_TX_MODE_ODD_PARITY |
+               IXP2400_PORT_TX_MODE_2_CYCLE_DECODE,
+
+               IXP2400_PORT_TX_MODE_MASTER |
+               IXP2400_PORT_TX_MODE_POS_PHY |
+               IXP2400_PORT_TX_MODE_ODD_PARITY |
+               IXP2400_PORT_TX_MODE_2_CYCLE_DECODE,
+
+               IXP2400_PORT_TX_MODE_MASTER |
+               IXP2400_PORT_TX_MODE_POS_PHY |
+               IXP2400_PORT_TX_MODE_ODD_PARITY |
+               IXP2400_PORT_TX_MODE_2_CYCLE_DECODE,
+
+               IXP2400_PORT_TX_MODE_MASTER |
+               IXP2400_PORT_TX_MODE_POS_PHY |
+               IXP2400_PORT_TX_MODE_ODD_PARITY |
+               IXP2400_PORT_TX_MODE_2_CYCLE_DECODE
+       }
+};
+
+struct enp2611_ixpdev_priv
+{
+       struct ixpdev_priv              ixpdev_priv;
+       struct net_device_stats         stats;
+};
+
+static struct net_device *nds[3];
+static struct timer_list link_check_timer;
+
+static struct net_device_stats *enp2611_get_stats(struct net_device *dev)
+{
+       struct enp2611_ixpdev_priv *ip = netdev_priv(dev);
+
+       pm3386_get_stats(ip->ixpdev_priv.channel, &(ip->stats));
+
+       return &(ip->stats);
+}
+
+/* @@@ Poll the SFP moddef0 line too.  */
+/* @@@ Try to use the pm3386 DOOL interrupt as well.  */
+static void enp2611_check_link_status(unsigned long __dummy)
+{
+       int i;
+
+       for (i = 0; i < 3; i++) {
+               struct net_device *dev;
+               int status;
+
+               dev = nds[i];
+
+               status = pm3386_is_link_up(i);
+               if (status && !netif_carrier_ok(dev)) {
+                       /* @@@ Should report autonegotiation status.  */
+                       printk(KERN_INFO "%s: NIC Link is Up\n", dev->name);
+
+                       pm3386_enable_tx(i);
+                       caleb_enable_tx(i);
+                       netif_carrier_on(dev);
+               } else if (!status && netif_carrier_ok(dev)) {
+                       printk(KERN_INFO "%s: NIC Link is Down\n", dev->name);
+
+                       netif_carrier_off(dev);
+                       caleb_disable_tx(i);
+                       pm3386_disable_tx(i);
+               }
+       }
+
+       link_check_timer.expires = jiffies + HZ / 10;
+       add_timer(&link_check_timer);
+}
+
+static void enp2611_set_port_admin_status(int port, int up)
+{
+       if (up) {
+               caleb_enable_rx(port);
+
+               pm3386_set_carrier(port, 1);
+               pm3386_enable_rx(port);
+       } else {
+               caleb_disable_tx(port);
+               pm3386_disable_tx(port);
+               /* @@@ Flush out pending packets.  */
+               pm3386_set_carrier(port, 0);
+
+               pm3386_disable_rx(port);
+               caleb_disable_rx(port);
+       }
+}
+
+static int __init enp2611_init_module(void)
+{ 
+       int i;
+
+       if (!machine_is_enp2611())
+               return -ENODEV;
+
+       caleb_reset();
+       pm3386_reset();
+
+       for (i = 0; i < 3; i++) {
+               nds[i] = ixpdev_alloc(i, sizeof(struct enp2611_ixpdev_priv));
+               if (nds[i] == NULL) {
+                       while (--i >= 0)
+                               free_netdev(nds[i]);
+                       return -ENOMEM;
+               }
+
+               SET_MODULE_OWNER(nds[i]);
+               nds[i]->get_stats = enp2611_get_stats;
+               pm3386_init_port(i);
+               pm3386_get_mac(i, nds[i]->dev_addr);
+       }
+
+       ixp2400_msf_init(&enp2611_msf_parameters);
+
+       if (ixpdev_init(3, nds, enp2611_set_port_admin_status)) {
+               for (i = 0; i < 3; i++)
+                       free_netdev(nds[i]);
+               return -EINVAL;
+       }
+
+       init_timer(&link_check_timer);
+       link_check_timer.function = enp2611_check_link_status;
+       link_check_timer.expires = jiffies;
+       add_timer(&link_check_timer);
+
+       return 0;
+}
+
+static void __exit enp2611_cleanup_module(void)
+{
+       int i;
+
+       del_timer_sync(&link_check_timer);
+
+       ixpdev_deinit();
+       for (i = 0; i < 3; i++)
+               free_netdev(nds[i]);
+}
+
+module_init(enp2611_init_module);
+module_exit(enp2611_cleanup_module);
+MODULE_LICENSE("GPL");
diff --git a/drivers/net/ixp2000/ixp2400-msf.c b/drivers/net/ixp2000/ixp2400-msf.c
new file mode 100644 (file)
index 0000000..48a3a89
--- /dev/null
@@ -0,0 +1,213 @@
+/*
+ * Generic library functions for the MSF (Media and Switch Fabric) unit
+ * found on the Intel IXP2400 network processor.
+ *
+ * Copyright (C) 2004, 2005 Lennert Buytenhek <buytenh@wantstofly.org>
+ * Dedicated to Marija Kulikova.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of the
+ * License, or (at your option) any later version.
+ */
+
+#include <linux/config.h>
+#include <linux/kernel.h>
+#include <linux/init.h>
+#include <asm/hardware.h>
+#include <asm/arch/ixp2000-regs.h>
+#include <asm/delay.h>
+#include <asm/io.h>
+#include "ixp2400-msf.h"
+
+/*
+ * This is the Intel recommended PLL init procedure as described on
+ * page 340 of the IXP2400/IXP2800 Programmer's Reference Manual.
+ */
+static void ixp2400_pll_init(struct ixp2400_msf_parameters *mp)
+{
+       int rx_dual_clock;
+       int tx_dual_clock;
+       u32 value;
+
+       /*
+        * If the RX mode is not 1x32, we have to enable both RX PLLs
+        * (#0 and #1.)  The same thing for the TX direction.
+        */
+       rx_dual_clock = !!(mp->rx_mode & IXP2400_RX_MODE_WIDTH_MASK);
+       tx_dual_clock = !!(mp->tx_mode & IXP2400_TX_MODE_WIDTH_MASK);
+
+       /*
+        * Read initial value.
+        */
+       value = ixp2000_reg_read(IXP2000_MSF_CLK_CNTRL);
+
+       /*
+        * Put PLLs in powerdown and bypass mode.
+        */
+       value |= 0x0000f0f0;
+       ixp2000_reg_write(IXP2000_MSF_CLK_CNTRL, value);
+
+       /*
+        * Set single or dual clock mode bits.
+        */
+       value &= ~0x03000000;
+       value |= (rx_dual_clock << 24) | (tx_dual_clock << 25);
+
+       /*
+        * Set multipliers.
+        */
+       value &= ~0x00ff0000;
+       value |= mp->rxclk01_multiplier << 16;
+       value |= mp->rxclk23_multiplier << 18;
+       value |= mp->txclk01_multiplier << 20;
+       value |= mp->txclk23_multiplier << 22;
+
+       /*
+        * And write value.
+        */
+       ixp2000_reg_write(IXP2000_MSF_CLK_CNTRL, value);
+
+       /*
+        * Disable PLL bypass mode.
+        */
+       value &= ~(0x00005000 | rx_dual_clock << 13 | tx_dual_clock << 15);
+       ixp2000_reg_write(IXP2000_MSF_CLK_CNTRL, value);
+
+       /*
+        * Turn on PLLs.
+        */
+       value &= ~(0x00000050 | rx_dual_clock << 5 | tx_dual_clock << 7);
+       ixp2000_reg_write(IXP2000_MSF_CLK_CNTRL, value);
+
+       /*
+        * Wait for PLLs to lock.  There are lock status bits, but IXP2400
+        * erratum #65 says that these lock bits should not be relied upon
+        * as they might not accurately reflect the true state of the PLLs.
+        */
+       udelay(100);
+}
+
+/*
+ * Needed according to p480 of Programmer's Reference Manual.
+ */
+static void ixp2400_msf_free_rbuf_entries(struct ixp2400_msf_parameters *mp)
+{
+       int size_bits;
+       int i;
+
+       /*
+        * Work around IXP2400 erratum #69 (silent RBUF-to-DRAM transfer
+        * corruption) in the Intel-recommended way: do not add the RBUF
+        * elements susceptible to corruption to the freelist.
+        */
+       size_bits = mp->rx_mode & IXP2400_RX_MODE_RBUF_SIZE_MASK;
+       if (size_bits == IXP2400_RX_MODE_RBUF_SIZE_64) {
+               for (i = 1; i < 128; i++) {
+                       if (i == 9 || i == 18 || i == 27)
+                               continue;
+                       ixp2000_reg_write(IXP2000_MSF_RBUF_ELEMENT_DONE, i);
+               }
+       } else if (size_bits == IXP2400_RX_MODE_RBUF_SIZE_128) {
+               for (i = 1; i < 64; i++) {
+                       if (i == 4 || i == 9 || i == 13)
+                               continue;
+                       ixp2000_reg_write(IXP2000_MSF_RBUF_ELEMENT_DONE, i);
+               }
+       } else if (size_bits == IXP2400_RX_MODE_RBUF_SIZE_256) {
+               for (i = 1; i < 32; i++) {
+                       if (i == 2 || i == 4 || i == 6)
+                               continue;
+                       ixp2000_reg_write(IXP2000_MSF_RBUF_ELEMENT_DONE, i);
+               }
+       }
+}
+
+static u32 ixp2400_msf_valid_channels(u32 reg)
+{
+       u32 channels;
+
+       channels = 0;
+       switch (reg & IXP2400_RX_MODE_WIDTH_MASK) {
+       case IXP2400_RX_MODE_1x32:
+               channels = 0x1;
+               if (reg & IXP2400_RX_MODE_MPHY &&
+                   !(reg & IXP2400_RX_MODE_MPHY_32))
+                       channels = 0xf;
+               break;
+
+       case IXP2400_RX_MODE_2x16:
+               channels = 0x5;
+               break;
+
+       case IXP2400_RX_MODE_4x8:
+               channels = 0xf;
+               break;
+
+       case IXP2400_RX_MODE_1x16_2x8:
+               channels = 0xd;
+               break;
+       }
+
+       return channels;
+}
+
+static void ixp2400_msf_enable_rx(struct ixp2400_msf_parameters *mp)
+{
+       u32 value;
+
+       value = ixp2000_reg_read(IXP2000_MSF_RX_CONTROL) & 0x0fffffff;
+       value |= ixp2400_msf_valid_channels(mp->rx_mode) << 28;
+       ixp2000_reg_write(IXP2000_MSF_RX_CONTROL, value);
+}
+
+static void ixp2400_msf_enable_tx(struct ixp2400_msf_parameters *mp)
+{
+       u32 value;
+
+       value = ixp2000_reg_read(IXP2000_MSF_TX_CONTROL) & 0x0fffffff;
+       value |= ixp2400_msf_valid_channels(mp->tx_mode) << 28;
+       ixp2000_reg_write(IXP2000_MSF_TX_CONTROL, value);
+}
+
+
+void ixp2400_msf_init(struct ixp2400_msf_parameters *mp)
+{
+       u32 value;
+       int i;
+
+       /*
+        * Init the RX/TX PLLs based on the passed parameter block.
+        */
+       ixp2400_pll_init(mp);
+
+       /*
+        * Reset MSF.  Bit 7 in IXP_RESET_0 resets the MSF.
+        */
+       value = ixp2000_reg_read(IXP2000_RESET0);
+       ixp2000_reg_write(IXP2000_RESET0, value | 0x80);
+       ixp2000_reg_write(IXP2000_RESET0, value & ~0x80);
+
+       /*
+        * Initialise the RX section.
+        */
+       ixp2000_reg_write(IXP2000_MSF_RX_MPHY_POLL_LIMIT, mp->rx_poll_ports - 1);
+       ixp2000_reg_write(IXP2000_MSF_RX_CONTROL, mp->rx_mode);
+       for (i = 0; i < 4; i++) {
+               ixp2000_reg_write(IXP2000_MSF_RX_UP_CONTROL_0 + i,
+                                               mp->rx_channel_mode[i]);
+       }
+       ixp2400_msf_free_rbuf_entries(mp);
+       ixp2400_msf_enable_rx(mp);
+
+       /*
+        * Initialise the TX section.
+        */
+       ixp2000_reg_write(IXP2000_MSF_TX_MPHY_POLL_LIMIT, mp->tx_poll_ports - 1);
+       ixp2000_reg_write(IXP2000_MSF_TX_CONTROL, mp->tx_mode);
+       for (i = 0; i < 4; i++) {
+               ixp2000_reg_write(IXP2000_MSF_TX_UP_CONTROL_0 + i,
+                                               mp->tx_channel_mode[i]);
+       }
+       ixp2400_msf_enable_tx(mp);
+}
diff --git a/drivers/net/ixp2000/ixp2400-msf.h b/drivers/net/ixp2000/ixp2400-msf.h
new file mode 100644 (file)
index 0000000..3ac1af2
--- /dev/null
@@ -0,0 +1,115 @@
+/*
+ * Generic library functions for the MSF (Media and Switch Fabric) unit
+ * found on the Intel IXP2400 network processor.
+ *
+ * Copyright (C) 2004, 2005 Lennert Buytenhek <buytenh@wantstofly.org>
+ * Dedicated to Marija Kulikova.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of the
+ * License, or (at your option) any later version.
+ */
+
+#ifndef __IXP2400_MSF_H
+#define __IXP2400_MSF_H
+
+struct ixp2400_msf_parameters
+{
+       u32                             rx_mode;
+       unsigned                        rxclk01_multiplier:2;
+       unsigned                        rxclk23_multiplier:2;
+       unsigned                        rx_poll_ports:6;
+       u32                             rx_channel_mode[4];
+
+       u32                             tx_mode;
+       unsigned                        txclk01_multiplier:2;
+       unsigned                        txclk23_multiplier:2;
+       unsigned                        tx_poll_ports:6;
+       u32                             tx_channel_mode[4];
+};
+
+void ixp2400_msf_init(struct ixp2400_msf_parameters *mp);
+
+#define IXP2400_PLL_MULTIPLIER_48              0x00
+#define IXP2400_PLL_MULTIPLIER_24              0x01
+#define IXP2400_PLL_MULTIPLIER_16              0x02
+#define IXP2400_PLL_MULTIPLIER_12              0x03
+
+#define IXP2400_RX_MODE_CSIX                   0x00400000
+#define IXP2400_RX_MODE_UTOPIA_POS             0x00000000
+#define IXP2400_RX_MODE_WIDTH_MASK             0x00300000
+#define IXP2400_RX_MODE_1x16_2x8               0x00300000
+#define IXP2400_RX_MODE_4x8                    0x00200000
+#define IXP2400_RX_MODE_2x16                   0x00100000
+#define IXP2400_RX_MODE_1x32                   0x00000000
+#define IXP2400_RX_MODE_MPHY                   0x00080000
+#define IXP2400_RX_MODE_SPHY                   0x00000000
+#define IXP2400_RX_MODE_MPHY_32                        0x00040000
+#define IXP2400_RX_MODE_MPHY_4                 0x00000000
+#define IXP2400_RX_MODE_MPHY_POLLED_STATUS     0x00020000
+#define IXP2400_RX_MODE_MPHY_DIRECT_STATUS     0x00000000
+#define IXP2400_RX_MODE_CBUS_FULL_DUPLEX       0x00010000
+#define IXP2400_RX_MODE_CBUS_SIMPLEX           0x00000000
+#define IXP2400_RX_MODE_MPHY_LEVEL2            0x00004000
+#define IXP2400_RX_MODE_MPHY_LEVEL3            0x00000000
+#define IXP2400_RX_MODE_CBUS_8BIT              0x00002000
+#define IXP2400_RX_MODE_CBUS_4BIT              0x00000000
+#define IXP2400_RX_MODE_CSIX_SINGLE_FREELIST   0x00000200
+#define IXP2400_RX_MODE_CSIX_SPLIT_FREELISTS   0x00000000
+#define IXP2400_RX_MODE_RBUF_SIZE_MASK         0x0000000c
+#define IXP2400_RX_MODE_RBUF_SIZE_256          0x00000008
+#define IXP2400_RX_MODE_RBUF_SIZE_128          0x00000004
+#define IXP2400_RX_MODE_RBUF_SIZE_64           0x00000000
+
+#define IXP2400_PORT_RX_MODE_SLAVE             0x00000040
+#define IXP2400_PORT_RX_MODE_MASTER            0x00000000
+#define IXP2400_PORT_RX_MODE_POS_PHY_L3                0x00000020
+#define IXP2400_PORT_RX_MODE_POS_PHY_L2                0x00000000
+#define IXP2400_PORT_RX_MODE_POS_PHY           0x00000010
+#define IXP2400_PORT_RX_MODE_UTOPIA            0x00000000
+#define IXP2400_PORT_RX_MODE_EVEN_PARITY       0x0000000c
+#define IXP2400_PORT_RX_MODE_ODD_PARITY                0x00000008
+#define IXP2400_PORT_RX_MODE_NO_PARITY         0x00000000
+#define IXP2400_PORT_RX_MODE_UTOPIA_BIG_CELLS  0x00000002
+#define IXP2400_PORT_RX_MODE_UTOPIA_NORMAL_CELLS       0x00000000
+#define IXP2400_PORT_RX_MODE_2_CYCLE_DECODE    0x00000001
+#define IXP2400_PORT_RX_MODE_1_CYCLE_DECODE    0x00000000
+
+#define IXP2400_TX_MODE_CSIX                   0x00400000
+#define IXP2400_TX_MODE_UTOPIA_POS             0x00000000
+#define IXP2400_TX_MODE_WIDTH_MASK             0x00300000
+#define IXP2400_TX_MODE_1x16_2x8               0x00300000
+#define IXP2400_TX_MODE_4x8                    0x00200000
+#define IXP2400_TX_MODE_2x16                   0x00100000
+#define IXP2400_TX_MODE_1x32                   0x00000000
+#define IXP2400_TX_MODE_MPHY                   0x00080000
+#define IXP2400_TX_MODE_SPHY                   0x00000000
+#define IXP2400_TX_MODE_MPHY_32                        0x00040000
+#define IXP2400_TX_MODE_MPHY_4                 0x00000000
+#define IXP2400_TX_MODE_MPHY_POLLED_STATUS     0x00020000
+#define IXP2400_TX_MODE_MPHY_DIRECT_STATUS     0x00000000
+#define IXP2400_TX_MODE_CBUS_FULL_DUPLEX       0x00010000
+#define IXP2400_TX_MODE_CBUS_SIMPLEX           0x00000000
+#define IXP2400_TX_MODE_MPHY_LEVEL2            0x00004000
+#define IXP2400_TX_MODE_MPHY_LEVEL3            0x00000000
+#define IXP2400_TX_MODE_CBUS_8BIT              0x00002000
+#define IXP2400_TX_MODE_CBUS_4BIT              0x00000000
+#define IXP2400_TX_MODE_TBUF_SIZE_MASK         0x0000000c
+#define IXP2400_TX_MODE_TBUF_SIZE_256          0x00000008
+#define IXP2400_TX_MODE_TBUF_SIZE_128          0x00000004
+#define IXP2400_TX_MODE_TBUF_SIZE_64           0x00000000
+
+#define IXP2400_PORT_TX_MODE_SLAVE             0x00000040
+#define IXP2400_PORT_TX_MODE_MASTER            0x00000000
+#define IXP2400_PORT_TX_MODE_POS_PHY           0x00000010
+#define IXP2400_PORT_TX_MODE_UTOPIA            0x00000000
+#define IXP2400_PORT_TX_MODE_EVEN_PARITY       0x0000000c
+#define IXP2400_PORT_TX_MODE_ODD_PARITY                0x00000008
+#define IXP2400_PORT_TX_MODE_NO_PARITY         0x00000000
+#define IXP2400_PORT_TX_MODE_UTOPIA_BIG_CELLS  0x00000002
+#define IXP2400_PORT_TX_MODE_2_CYCLE_DECODE    0x00000001
+#define IXP2400_PORT_TX_MODE_1_CYCLE_DECODE    0x00000000
+
+
+#endif
diff --git a/drivers/net/ixp2000/ixp2400_rx.uc b/drivers/net/ixp2000/ixp2400_rx.uc
new file mode 100644 (file)
index 0000000..42a73e3
--- /dev/null
@@ -0,0 +1,408 @@
+/*
+ * RX ucode for the Intel IXP2400 in POS-PHY mode.
+ * Copyright (C) 2004, 2005 Lennert Buytenhek
+ * Dedicated to Marija Kulikova.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * Assumptions made in this code:
+ * - The IXP2400 MSF is configured for POS-PHY mode, in a mode where
+ *   only one full element list is used.  This includes, for example,
+ *   1x32 SPHY and 1x32 MPHY32, but not 4x8 SPHY or 1x32 MPHY4.  (This
+ *   is not an exhaustive list.)
+ * - The RBUF uses 64-byte mpackets.
+ * - RX descriptors reside in SRAM, and have the following format:
+ *     struct rx_desc
+ *     {
+ *     // to uengine
+ *             u32     buf_phys_addr;
+ *             u32     buf_length;
+ *
+ *     // from uengine
+ *             u32     channel;
+ *             u32     pkt_length;
+ *     };
+ * - Packet data resides in DRAM.
+ * - Packet buffer addresses are 8-byte aligned.
+ * - Scratch ring 0 is rx_pending.
+ * - Scratch ring 1 is rx_done, and has status condition 'full'.
+ * - The host triggers rx_done flush and rx_pending refill on seeing INTA.
+ * - This code is run on all eight threads of the microengine it runs on.
+ *
+ * Local memory is used for per-channel RX state.
+ */
+
+#define RX_THREAD_FREELIST_0           0x0030
+#define RBUF_ELEMENT_DONE              0x0044
+
+#define CHANNEL_FLAGS                  *l$index0[0]
+#define CHANNEL_FLAG_RECEIVING         1
+#define PACKET_LENGTH                  *l$index0[1]
+#define PACKET_CHECKSUM                        *l$index0[2]
+#define BUFFER_HANDLE                  *l$index0[3]
+#define BUFFER_START                   *l$index0[4]
+#define BUFFER_LENGTH                  *l$index0[5]
+
+#define CHANNEL_STATE_SIZE             24      // in bytes
+#define CHANNEL_STATE_SHIFT            5       // ceil(log2(state size))
+
+
+       .sig volatile sig1
+       .sig volatile sig2
+       .sig volatile sig3
+
+       .sig mpacket_arrived
+       .reg add_to_rx_freelist
+       .reg read $rsw0, $rsw1
+       .xfer_order $rsw0 $rsw1
+
+       .reg zero
+
+       /*
+        * Initialise add_to_rx_freelist.
+        */
+       .begin
+               .reg temp
+               .reg temp2
+
+               immed[add_to_rx_freelist, RX_THREAD_FREELIST_0]
+               immed_w1[add_to_rx_freelist, (&$rsw0 | (&mpacket_arrived << 12))]
+
+               local_csr_rd[ACTIVE_CTX_STS]
+               immed[temp, 0]
+               alu[temp2, temp, and, 0x1f]
+               alu_shf[add_to_rx_freelist, add_to_rx_freelist, or, temp2, <<20]
+               alu[temp2, temp, and, 0x80]
+               alu_shf[add_to_rx_freelist, add_to_rx_freelist, or, temp2, <<18]
+       .end
+
+       immed[zero, 0]
+
+       /*
+        * Skip context 0 initialisation?
+        */
+       .begin
+               br!=ctx[0, mpacket_receive_loop#]
+       .end
+
+       /*
+        * Initialise local memory.
+        */
+       .begin
+               .reg addr
+               .reg temp
+
+               immed[temp, 0]
+       init_local_mem_loop#:
+               alu_shf[addr, --, b, temp, <<CHANNEL_STATE_SHIFT]
+               local_csr_wr[ACTIVE_LM_ADDR_0, addr]
+               nop
+               nop
+               nop
+
+               immed[CHANNEL_FLAGS, 0]
+
+               alu[temp, temp, +, 1]
+               alu[--, temp, and, 0x20]
+               beq[init_local_mem_loop#]
+       .end
+
+       /*
+        * Initialise signal pipeline.
+        */
+       .begin
+               local_csr_wr[SAME_ME_SIGNAL, (&sig1 << 3)]
+               .set_sig sig1
+
+               local_csr_wr[SAME_ME_SIGNAL, (&sig2 << 3)]
+               .set_sig sig2
+
+               local_csr_wr[SAME_ME_SIGNAL, (&sig3 << 3)]
+               .set_sig sig3
+       .end
+
+mpacket_receive_loop#:
+       /*
+        * Synchronise and wait for mpacket.
+        */
+       .begin
+               ctx_arb[sig1]
+               local_csr_wr[SAME_ME_SIGNAL, (0x80 | (&sig1 << 3))]
+
+               msf[fast_wr, --, add_to_rx_freelist, 0]
+               .set_sig mpacket_arrived
+               ctx_arb[mpacket_arrived]
+               .set $rsw0 $rsw1
+       .end
+
+       /*
+        * We halt if we see {inbparerr,parerr,null,soperror}.
+        */
+       .begin
+               alu_shf[--, 0x1b, and, $rsw0, >>8]
+               bne[abort_rswerr#]
+       .end
+
+       /*
+        * Point local memory pointer to this channel's state area.
+        */
+       .begin
+               .reg chanaddr
+
+               alu[chanaddr, $rsw0, and, 0x1f]
+               alu_shf[chanaddr, --, b, chanaddr, <<CHANNEL_STATE_SHIFT]
+               local_csr_wr[ACTIVE_LM_ADDR_0, chanaddr]
+               nop
+               nop
+               nop
+       .end
+
+       /*
+        * Check whether we received a SOP mpacket while we were already
+        * working on a packet, or a non-SOP mpacket while there was no
+        * packet pending.  (SOP == RECEIVING -> abort)  If everything's
+        * okay, update the RECEIVING flag to reflect our new state.
+        */
+       .begin
+               .reg temp
+               .reg eop
+
+               #if CHANNEL_FLAG_RECEIVING != 1
+               #error CHANNEL_FLAG_RECEIVING is not 1
+               #endif
+
+               alu_shf[temp, 1, and, $rsw0, >>15]
+               alu[temp, temp, xor, CHANNEL_FLAGS]
+               alu[--, temp, and, CHANNEL_FLAG_RECEIVING]
+               beq[abort_proterr#]
+
+               alu_shf[eop, 1, and, $rsw0, >>14]
+               alu[CHANNEL_FLAGS, temp, xor, eop]
+       .end
+
+       /*
+        * Copy the mpacket into the right spot, and in case of EOP,
+        * write back the descriptor and pass the packet on.
+        */
+       .begin
+               .reg buffer_offset
+               .reg _packet_length
+               .reg _packet_checksum
+               .reg _buffer_handle
+               .reg _buffer_start
+               .reg _buffer_length
+
+               /*
+                * Determine buffer_offset, _packet_length and
+                * _packet_checksum.
+                */
+               .begin
+                       .reg temp
+
+                       alu[--, 1, and, $rsw0, >>15]
+                       beq[not_sop#]
+
+                       immed[PACKET_LENGTH, 0]
+                       immed[PACKET_CHECKSUM, 0]
+
+               not_sop#:
+                       alu[buffer_offset, --, b, PACKET_LENGTH]
+                       alu_shf[temp, 0xff, and, $rsw0, >>16]
+                       alu[_packet_length, buffer_offset, +, temp]
+                       alu[PACKET_LENGTH, --, b, _packet_length]
+
+                       immed[temp, 0xffff]
+                       alu[temp, $rsw1, and, temp]
+                       alu[_packet_checksum, PACKET_CHECKSUM, +, temp]
+                       alu[PACKET_CHECKSUM, --, b, _packet_checksum]
+               .end
+
+               /*
+                * Allocate buffer in case of SOP.
+                */
+               .begin
+                       .reg temp
+
+                       alu[temp, 1, and, $rsw0, >>15]
+                       beq[skip_buffer_alloc#]
+
+                       .begin
+                               .sig zzz
+                               .reg read $stemp $stemp2
+                               .xfer_order $stemp $stemp2
+
+                       rx_nobufs#:
+                               scratch[get, $stemp, zero, 0, 1], ctx_swap[zzz]
+                               alu[_buffer_handle, --, b, $stemp]
+                               beq[rx_nobufs#]
+
+                               sram[read, $stemp, _buffer_handle, 0, 2],
+                                                               ctx_swap[zzz]
+                               alu[_buffer_start, --, b, $stemp]
+                               alu[_buffer_length, --, b, $stemp2]
+                       .end
+
+               skip_buffer_alloc#:
+               .end
+
+               /*
+                * Resynchronise.
+                */
+               .begin
+                       ctx_arb[sig2]
+                       local_csr_wr[SAME_ME_SIGNAL, (0x80 | (&sig2 << 3))]
+               .end
+
+               /*
+                * Synchronise buffer state.
+                */
+               .begin
+                       .reg temp
+
+                       alu[temp, 1, and, $rsw0, >>15]
+                       beq[copy_from_local_mem#]
+
+                       alu[BUFFER_HANDLE, --, b, _buffer_handle]
+                       alu[BUFFER_START, --, b, _buffer_start]
+                       alu[BUFFER_LENGTH, --, b, _buffer_length]
+                       br[sync_state_done#]
+
+               copy_from_local_mem#:
+                       alu[_buffer_handle, --, b, BUFFER_HANDLE]
+                       alu[_buffer_start, --, b, BUFFER_START]
+                       alu[_buffer_length, --, b, BUFFER_LENGTH]
+
+               sync_state_done#:
+               .end
+
+#if 0
+               /*
+                * Debug buffer state management.
+                */
+               .begin
+                       .reg temp
+
+                       alu[temp, 1, and, $rsw0, >>14]
+                       beq[no_poison#]
+                       immed[BUFFER_HANDLE, 0xdead]
+                       immed[BUFFER_START, 0xdead]
+                       immed[BUFFER_LENGTH, 0xdead]
+               no_poison#:
+
+                       immed[temp, 0xdead]
+                       alu[--, _buffer_handle, -, temp]
+                       beq[state_corrupted#]
+                       alu[--, _buffer_start, -, temp]
+                       beq[state_corrupted#]
+                       alu[--, _buffer_length, -, temp]
+                       beq[state_corrupted#]
+               .end
+#endif
+
+               /*
+                * Check buffer length.
+                */
+               .begin
+                       alu[--, _buffer_length, -, _packet_length]
+                       blo[buffer_overflow#]
+               .end
+
+               /*
+                * Copy the mpacket and give back the RBUF element.
+                */
+               .begin
+                       .reg element
+                       .reg xfer_size
+                       .reg temp
+                       .sig copy_sig
+
+                       alu_shf[element, 0x7f, and, $rsw0, >>24]
+                       alu_shf[xfer_size, 0xff, and, $rsw0, >>16]
+
+                       alu[xfer_size, xfer_size, -, 1]
+                       alu_shf[xfer_size, 0x10, or, xfer_size, >>3]
+                       alu_shf[temp, 0x10, or, xfer_size, <<21]
+                       alu_shf[temp, temp, or, element, <<11]
+                       alu_shf[--, temp, or, 1, <<18]
+
+                       dram[rbuf_rd, --, _buffer_start, buffer_offset, max_8],
+                                               indirect_ref, sig_done[copy_sig]
+                       ctx_arb[copy_sig]
+
+                       alu[temp, RBUF_ELEMENT_DONE, or, element, <<16]
+                       msf[fast_wr, --, temp, 0]
+               .end
+
+               /*
+                * If EOP, write back the packet descriptor.
+                */
+               .begin
+                       .reg write $stemp $stemp2
+                       .xfer_order $stemp $stemp2
+                       .sig zzz
+
+                       alu_shf[--, 1, and, $rsw0, >>14]
+                       beq[no_writeback#]
+
+                       alu[$stemp, $rsw0, and, 0x1f]
+                       alu[$stemp2, --, b, _packet_length]
+                       sram[write, $stemp, _buffer_handle, 8, 2], ctx_swap[zzz]
+
+               no_writeback#:
+               .end
+
+               /*
+                * Resynchronise.
+                */
+               .begin
+                       ctx_arb[sig3]
+                       local_csr_wr[SAME_ME_SIGNAL, (0x80 | (&sig3 << 3))]
+               .end
+
+               /*
+                * If EOP, put the buffer back onto the scratch ring.
+                */
+               .begin
+                       .reg write $stemp
+                       .sig zzz
+
+                       br_inp_state[SCR_Ring1_Status, rx_done_ring_overflow#]
+
+                       alu_shf[--, 1, and, $rsw0, >>14]
+                       beq[mpacket_receive_loop#]
+
+                       alu[--, 1, and, $rsw0, >>10]
+                       bne[rxerr#]
+
+                       alu[$stemp, --, b, _buffer_handle]
+                       scratch[put, $stemp, zero, 4, 1], ctx_swap[zzz]
+                       cap[fast_wr, 0, XSCALE_INT_A]
+                       br[mpacket_receive_loop#]
+
+               rxerr#:
+                       alu[$stemp, --, b, _buffer_handle]
+                       scratch[put, $stemp, zero, 0, 1], ctx_swap[zzz]
+                       br[mpacket_receive_loop#]
+               .end
+       .end
+
+
+abort_rswerr#:
+       halt
+
+abort_proterr#:
+       halt
+
+state_corrupted#:
+       halt
+
+buffer_overflow#:
+       halt
+
+rx_done_ring_overflow#:
+       halt
+
+
diff --git a/drivers/net/ixp2000/ixp2400_rx.ucode b/drivers/net/ixp2000/ixp2400_rx.ucode
new file mode 100644 (file)
index 0000000..e8aee2f
--- /dev/null
@@ -0,0 +1,130 @@
+static struct ixp2000_uengine_code ixp2400_rx =
+{
+       .cpu_model_bitmask      = 0x000003fe,
+       .cpu_min_revision       = 0,
+       .cpu_max_revision       = 255,
+
+       .uengine_parameters     = IXP2000_UENGINE_8_CONTEXTS |
+                                 IXP2000_UENGINE_PRN_UPDATE_EVERY |
+                                 IXP2000_UENGINE_NN_FROM_PREVIOUS |
+                                 IXP2000_UENGINE_ASSERT_EMPTY_AT_0 |
+                                 IXP2000_UENGINE_LM_ADDR1_PER_CONTEXT |
+                                 IXP2000_UENGINE_LM_ADDR0_PER_CONTEXT,
+
+       .initial_reg_values     = (struct ixp2000_reg_value []) {
+               { -1, -1 }
+       },
+
+       .num_insns              = 109,
+       .insns                  = (u8 []) {
+               0xf0, 0x00, 0x0c, 0xc0, 0x05,
+               0xf4, 0x44, 0x0c, 0x00, 0x05,
+               0xfc, 0x04, 0x4c, 0x00, 0x00,
+               0xf0, 0x00, 0x00, 0x3b, 0x00,
+               0xb4, 0x40, 0xf0, 0x3b, 0x1f,
+               0x8a, 0xc0, 0x50, 0x3e, 0x05,
+               0xb4, 0x40, 0xf0, 0x3b, 0x80,
+               0x9a, 0xe0, 0x00, 0x3e, 0x05,
+               0xf0, 0x00, 0x00, 0x07, 0x00,
+               0xd8, 0x05, 0xc0, 0x00, 0x11,
+               0xf0, 0x00, 0x00, 0x0f, 0x00,
+               0x91, 0xb0, 0x20, 0x0e, 0x00,
+               0xfc, 0x06, 0x60, 0x0b, 0x00,
+               0xf0, 0x00, 0x0c, 0x03, 0x00,
+               0xf0, 0x00, 0x0c, 0x03, 0x00,
+               0xf0, 0x00, 0x0c, 0x03, 0x00,
+               0xf0, 0x00, 0x0c, 0x02, 0x00,
+               0xb0, 0xc0, 0x30, 0x0f, 0x01,
+               0xa4, 0x70, 0x00, 0x0f, 0x20,
+               0xd8, 0x02, 0xc0, 0x01, 0x00,
+               0xfc, 0x10, 0xac, 0x23, 0x08,
+               0xfc, 0x10, 0xac, 0x43, 0x10,
+               0xfc, 0x10, 0xac, 0x63, 0x18,
+               0xe0, 0x00, 0x00, 0x00, 0x02,
+               0xfc, 0x10, 0xae, 0x23, 0x88,
+               0x3d, 0x00, 0x04, 0x03, 0x20,
+               0xe0, 0x00, 0x00, 0x00, 0x10,
+               0x84, 0x82, 0x02, 0x01, 0x3b,
+               0xd8, 0x1a, 0x00, 0x01, 0x01,
+               0xb4, 0x00, 0x8c, 0x7d, 0x80,
+               0x91, 0xb0, 0x80, 0x22, 0x00,
+               0xfc, 0x06, 0x60, 0x23, 0x00,
+               0xf0, 0x00, 0x0c, 0x03, 0x00,
+               0xf0, 0x00, 0x0c, 0x03, 0x00,
+               0xf0, 0x00, 0x0c, 0x03, 0x00,
+               0x94, 0xf0, 0x92, 0x01, 0x21,
+               0xac, 0x40, 0x60, 0x26, 0x00,
+               0xa4, 0x30, 0x0c, 0x04, 0x06,
+               0xd8, 0x1a, 0x40, 0x01, 0x00,
+               0x94, 0xe0, 0xa2, 0x01, 0x21,
+               0xac, 0x20, 0x00, 0x28, 0x06,
+               0x84, 0xf2, 0x02, 0x01, 0x21,
+               0xd8, 0x0b, 0x40, 0x01, 0x00,
+               0xf0, 0x00, 0x0c, 0x02, 0x01,
+               0xf0, 0x00, 0x0c, 0x02, 0x02,
+               0xa0, 0x00, 0x08, 0x04, 0x00,
+               0x95, 0x00, 0xc6, 0x01, 0xff,
+               0xa0, 0x80, 0x10, 0x30, 0x00,
+               0xa0, 0x60, 0x1c, 0x00, 0x01,
+               0xf0, 0x0f, 0xf0, 0x33, 0xff,
+               0xb4, 0x00, 0xc0, 0x31, 0x81,
+               0xb0, 0x80, 0xb0, 0x32, 0x02,
+               0xa0, 0x20, 0x20, 0x2c, 0x00,
+               0x94, 0xf0, 0xd2, 0x01, 0x21,
+               0xd8, 0x0f, 0x40, 0x01, 0x00,
+               0x19, 0x40, 0x10, 0x04, 0x20,
+               0xa0, 0x00, 0x26, 0x04, 0x00,
+               0xd8, 0x0d, 0xc0, 0x01, 0x00,
+               0x00, 0x42, 0x10, 0x80, 0x02,
+               0xb0, 0x00, 0x46, 0x04, 0x00,
+               0xb0, 0x00, 0x56, 0x08, 0x00,
+               0xe0, 0x00, 0x00, 0x00, 0x04,
+               0xfc, 0x10, 0xae, 0x43, 0x90,
+               0x84, 0xf0, 0x32, 0x01, 0x21,
+               0xd8, 0x11, 0x40, 0x01, 0x00,
+               0xa0, 0x60, 0x3c, 0x00, 0x02,
+               0xa0, 0x20, 0x40, 0x10, 0x00,
+               0xa0, 0x20, 0x50, 0x14, 0x00,
+               0xd8, 0x12, 0x00, 0x00, 0x18,
+               0xa0, 0x00, 0x28, 0x0c, 0x00,
+               0xb0, 0x00, 0x48, 0x10, 0x00,
+               0xb0, 0x00, 0x58, 0x14, 0x00,
+               0xaa, 0xf0, 0x00, 0x14, 0x01,
+               0xd8, 0x1a, 0xc0, 0x01, 0x05,
+               0x85, 0x80, 0x42, 0x01, 0xff,
+               0x95, 0x00, 0x66, 0x01, 0xff,
+               0xba, 0xc0, 0x60, 0x1b, 0x01,
+               0x9a, 0x30, 0x60, 0x19, 0x30,
+               0x9a, 0xb0, 0x70, 0x1a, 0x30,
+               0x9b, 0x50, 0x78, 0x1e, 0x04,
+               0x8a, 0xe2, 0x08, 0x1e, 0x21,
+               0x6a, 0x4e, 0x00, 0x13, 0x00,
+               0xe0, 0x00, 0x00, 0x00, 0x30,
+               0x9b, 0x00, 0x7a, 0x92, 0x04,
+               0x3d, 0x00, 0x04, 0x1f, 0x20,
+               0x84, 0xe2, 0x02, 0x01, 0x21,
+               0xd8, 0x16, 0x80, 0x01, 0x00,
+               0xa4, 0x18, 0x0c, 0x7d, 0x80,
+               0xa0, 0x58, 0x1c, 0x00, 0x01,
+               0x01, 0x42, 0x00, 0xa0, 0x02,
+               0xe0, 0x00, 0x00, 0x00, 0x08,
+               0xfc, 0x10, 0xae, 0x63, 0x98,
+               0xd8, 0x1b, 0x00, 0xc2, 0x14,
+               0x84, 0xe2, 0x02, 0x01, 0x21,
+               0xd8, 0x05, 0xc0, 0x01, 0x00,
+               0x84, 0xa2, 0x02, 0x01, 0x21,
+               0xd8, 0x19, 0x40, 0x01, 0x01,
+               0xa0, 0x58, 0x0c, 0x00, 0x02,
+               0x1a, 0x40, 0x00, 0x04, 0x24,
+               0x33, 0x00, 0x01, 0x2f, 0x20,
+               0xd8, 0x05, 0xc0, 0x00, 0x18,
+               0xa0, 0x58, 0x0c, 0x00, 0x02,
+               0x1a, 0x40, 0x00, 0x04, 0x20,
+               0xd8, 0x05, 0xc0, 0x00, 0x18,
+               0xe0, 0x00, 0x02, 0x00, 0x00,
+               0xe0, 0x00, 0x02, 0x00, 0x00,
+               0xe0, 0x00, 0x02, 0x00, 0x00,
+               0xe0, 0x00, 0x02, 0x00, 0x00,
+               0xe0, 0x00, 0x02, 0x00, 0x00,
+       }
+};
diff --git a/drivers/net/ixp2000/ixp2400_tx.uc b/drivers/net/ixp2000/ixp2400_tx.uc
new file mode 100644 (file)
index 0000000..d090d18
--- /dev/null
@@ -0,0 +1,272 @@
+/*
+ * TX ucode for the Intel IXP2400 in POS-PHY mode.
+ * Copyright (C) 2004, 2005 Lennert Buytenhek
+ * Dedicated to Marija Kulikova.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * Assumptions made in this code:
+ * - The IXP2400 MSF is configured for POS-PHY mode, in a mode where
+ *   only one TBUF partition is used.  This includes, for example,
+ *   1x32 SPHY and 1x32 MPHY32, but not 4x8 SPHY or 1x32 MPHY4. (This
+ *   is not an exhaustive list.)
+ * - The TBUF uses 64-byte mpackets.
+ * - TX descriptors reside in SRAM, and have the following format:
+ *     struct tx_desc
+ *     {
+ *     // to uengine
+ *             u32     buf_phys_addr;
+ *             u32     pkt_length;
+ *             u32     channel;
+ *     };
+ * - Packet data resides in DRAM.
+ * - Packet buffer addresses are 8-byte aligned.
+ * - Scratch ring 2 is tx_pending.
+ * - Scratch ring 3 is tx_done, and has status condition 'full'.
+ * - This code is run on all eight threads of the microengine it runs on.
+ */
+
+#define TX_SEQUENCE_0          0x0060
+#define TBUF_CTRL              0x1800
+
+#define PARTITION_SIZE         128
+#define PARTITION_THRESH       96
+
+
+       .sig volatile sig1
+       .sig volatile sig2
+       .sig volatile sig3
+
+       .reg @old_tx_seq_0
+       .reg @mpkts_in_flight
+       .reg @next_tbuf_mpacket
+
+       .reg @buffer_handle
+       .reg @buffer_start
+       .reg @packet_length
+       .reg @channel
+       .reg @packet_offset
+
+       .reg zero
+
+       immed[zero, 0]
+
+       /*
+        * Skip context 0 initialisation?
+        */
+       .begin
+               br!=ctx[0, mpacket_tx_loop#]
+       .end
+
+       /*
+        * Wait until all pending TBUF elements have been transmitted.
+        */
+       .begin
+               .reg read $tx
+               .sig zzz
+
+       loop_empty#:
+               msf[read, $tx, zero, TX_SEQUENCE_0, 1], ctx_swap[zzz]
+               alu_shf[--, --, b, $tx, >>31]
+               beq[loop_empty#]
+
+               alu[@old_tx_seq_0, --, b, $tx]
+       .end
+
+       immed[@mpkts_in_flight, 0]
+       alu[@next_tbuf_mpacket, @old_tx_seq_0, and, (PARTITION_SIZE - 1)]
+
+       immed[@buffer_handle, 0]
+
+       /*
+        * Initialise signal pipeline.
+        */
+       .begin
+               local_csr_wr[SAME_ME_SIGNAL, (&sig1 << 3)]
+               .set_sig sig1
+
+               local_csr_wr[SAME_ME_SIGNAL, (&sig2 << 3)]
+               .set_sig sig2
+
+               local_csr_wr[SAME_ME_SIGNAL, (&sig3 << 3)]
+               .set_sig sig3
+       .end
+
+mpacket_tx_loop#:
+       .begin
+               .reg tbuf_element_index
+               .reg buffer_handle
+               .reg sop_eop
+               .reg packet_data
+               .reg channel
+               .reg mpacket_size
+
+               /*
+                * If there is no packet currently being transmitted,
+                * dequeue the next TX descriptor, and fetch the buffer
+                * address, packet length and destination channel number.
+                */
+               .begin
+                       .reg read $stemp $stemp2 $stemp3
+                       .xfer_order $stemp $stemp2 $stemp3
+                       .sig zzz
+
+                       ctx_arb[sig1]
+
+                       alu[--, --, b, @buffer_handle]
+                       bne[already_got_packet#]
+
+               tx_nobufs#:
+                       scratch[get, $stemp, zero, 8, 1], ctx_swap[zzz]
+                       alu[@buffer_handle, --, b, $stemp]
+                       beq[tx_nobufs#]
+
+                       sram[read, $stemp, $stemp, 0, 3], ctx_swap[zzz]
+                       alu[@buffer_start, --, b, $stemp]
+                       alu[@packet_length, --, b, $stemp2]
+                       beq[zero_byte_packet#]
+                       alu[@channel, --, b, $stemp3]
+                       immed[@packet_offset, 0]
+
+               already_got_packet#:
+                       local_csr_wr[SAME_ME_SIGNAL, (0x80 | (&sig1 << 3))]
+               .end
+
+               /*
+                * Determine tbuf element index, SOP/EOP flags, mpacket
+                * offset and mpacket size and cache buffer_handle and
+                * channel number.
+                */
+               .begin
+                       alu[tbuf_element_index, --, b, @next_tbuf_mpacket]
+                       alu[@next_tbuf_mpacket, @next_tbuf_mpacket, +, 1]
+                       alu[@next_tbuf_mpacket, @next_tbuf_mpacket, and,
+                                                       (PARTITION_SIZE - 1)]
+
+                       alu[buffer_handle, --, b, @buffer_handle]
+                       immed[@buffer_handle, 0]
+
+                       immed[sop_eop, 1]
+
+                       alu[packet_data, --, b, @packet_offset]
+                       bne[no_sop#]
+                       alu[sop_eop, sop_eop, or, 2]
+               no_sop#:
+                       alu[packet_data, packet_data, +, @buffer_start]
+
+                       alu[channel, --, b, @channel]
+
+                       alu[mpacket_size, @packet_length, -, @packet_offset]
+                       alu[--, 64, -, mpacket_size]
+                       bhs[eop#]
+                       alu[@buffer_handle, --, b, buffer_handle]
+                       immed[mpacket_size, 64]
+                       alu[sop_eop, sop_eop, and, 2]
+               eop#:
+
+                       alu[@packet_offset, @packet_offset, +, mpacket_size]
+               .end
+
+               /*
+                * Wait until there's enough space in the TBUF.
+                */
+               .begin
+                       .reg read $tx
+                       .reg temp
+                       .sig zzz
+
+                       ctx_arb[sig2]
+
+                       br[test_space#]
+
+               loop_space#:
+                       msf[read, $tx, zero, TX_SEQUENCE_0, 1], ctx_swap[zzz]
+
+                       alu[temp, $tx, -, @old_tx_seq_0]
+                       alu[temp, temp, and, 0xff]
+                       alu[@mpkts_in_flight, @mpkts_in_flight, -, temp]
+
+                       alu[@old_tx_seq_0, --, b, $tx]
+
+               test_space#:
+                       alu[--, PARTITION_THRESH, -, @mpkts_in_flight]
+                       blo[loop_space#]
+
+                       alu[@mpkts_in_flight, @mpkts_in_flight, +, 1]
+
+                       local_csr_wr[SAME_ME_SIGNAL, (0x80 | (&sig2 << 3))]
+               .end
+
+               /*
+                * Copy the packet data to the TBUF.
+                */
+               .begin
+                       .reg temp
+                       .sig copy_sig
+
+                       alu[temp, mpacket_size, -, 1]
+                       alu_shf[temp, 0x10, or, temp, >>3]
+                       alu_shf[temp, 0x10, or, temp, <<21]
+                       alu_shf[temp, temp, or, tbuf_element_index, <<11]
+                       alu_shf[--, temp, or, 1, <<18]
+
+                       dram[tbuf_wr, --, packet_data, 0, max_8],
+                                       indirect_ref, sig_done[copy_sig]
+                       ctx_arb[copy_sig]
+               .end
+
+               /*
+                * Mark TBUF element as ready-to-be-transmitted.
+                */
+               .begin
+                       .reg write $tsw $tsw2
+                       .xfer_order $tsw $tsw2
+                       .reg temp
+                       .sig zzz
+
+                       alu_shf[temp, channel, or, mpacket_size, <<24]
+                       alu_shf[$tsw, temp, or, sop_eop, <<8]
+                       immed[$tsw2, 0]
+
+                       immed[temp, TBUF_CTRL]
+                       alu_shf[temp, temp, or, tbuf_element_index, <<3]
+                       msf[write, $tsw, temp, 0, 2], ctx_swap[zzz]
+               .end
+
+               /*
+                * Resynchronise.
+                */
+               .begin
+                       ctx_arb[sig3]
+                       local_csr_wr[SAME_ME_SIGNAL, (0x80 | (&sig3 << 3))]
+               .end
+
+               /*
+                * If this was an EOP mpacket, recycle the TX buffer
+                * and signal the host.
+                */
+               .begin
+                       .reg write $stemp
+                       .sig zzz
+
+                       alu[--, sop_eop, and, 1]
+                       beq[mpacket_tx_loop#]
+
+               tx_done_ring_full#:
+                       br_inp_state[SCR_Ring3_Status, tx_done_ring_full#]
+
+                       alu[$stemp, --, b, buffer_handle]
+                       scratch[put, $stemp, zero, 12, 1], ctx_swap[zzz]
+                       cap[fast_wr, 0, XSCALE_INT_A]
+                       br[mpacket_tx_loop#]
+               .end
+       .end
+
+
+zero_byte_packet#:
+       halt
+
+
diff --git a/drivers/net/ixp2000/ixp2400_tx.ucode b/drivers/net/ixp2000/ixp2400_tx.ucode
new file mode 100644 (file)
index 0000000..a433e24
--- /dev/null
@@ -0,0 +1,98 @@
+static struct ixp2000_uengine_code ixp2400_tx =
+{
+       .cpu_model_bitmask      = 0x000003fe,
+       .cpu_min_revision       = 0,
+       .cpu_max_revision       = 255,
+
+       .uengine_parameters     = IXP2000_UENGINE_8_CONTEXTS |
+                                 IXP2000_UENGINE_PRN_UPDATE_EVERY |
+                                 IXP2000_UENGINE_NN_FROM_PREVIOUS |
+                                 IXP2000_UENGINE_ASSERT_EMPTY_AT_0 |
+                                 IXP2000_UENGINE_LM_ADDR1_PER_CONTEXT |
+                                 IXP2000_UENGINE_LM_ADDR0_PER_CONTEXT,
+
+       .initial_reg_values     = (struct ixp2000_reg_value []) {
+               { -1, -1 }
+       },
+
+       .num_insns              = 77,
+       .insns                  = (u8 []) {
+               0xf0, 0x00, 0x00, 0x07, 0x00,
+               0xd8, 0x03, 0x00, 0x00, 0x11,
+               0x3c, 0x40, 0x00, 0x04, 0xe0,
+               0x81, 0xf2, 0x02, 0x01, 0x00,
+               0xd8, 0x00, 0x80, 0x01, 0x00,
+               0xb0, 0x08, 0x06, 0x00, 0x00,
+               0xf0, 0x00, 0x0c, 0x00, 0x80,
+               0xb4, 0x49, 0x02, 0x03, 0x7f,
+               0xf0, 0x00, 0x02, 0x83, 0x00,
+               0xfc, 0x10, 0xac, 0x23, 0x08,
+               0xfc, 0x10, 0xac, 0x43, 0x10,
+               0xfc, 0x10, 0xac, 0x63, 0x18,
+               0xe0, 0x00, 0x00, 0x00, 0x02,
+               0xa0, 0x30, 0x02, 0x80, 0x00,
+               0xd8, 0x06, 0x00, 0x01, 0x01,
+               0x19, 0x40, 0x00, 0x04, 0x28,
+               0xb0, 0x0a, 0x06, 0x00, 0x00,
+               0xd8, 0x03, 0xc0, 0x01, 0x00,
+               0x00, 0x44, 0x00, 0x80, 0x80,
+               0xa0, 0x09, 0x06, 0x00, 0x00,
+               0xb0, 0x0b, 0x06, 0x04, 0x00,
+               0xd8, 0x13, 0x00, 0x01, 0x00,
+               0xb0, 0x0c, 0x06, 0x08, 0x00,
+               0xf0, 0x00, 0x0c, 0x00, 0xa0,
+               0xfc, 0x10, 0xae, 0x23, 0x88,
+               0xa0, 0x00, 0x12, 0x40, 0x00,
+               0xb0, 0xc9, 0x02, 0x43, 0x01,
+               0xb4, 0x49, 0x02, 0x43, 0x7f,
+               0xb0, 0x00, 0x22, 0x80, 0x00,
+               0xf0, 0x00, 0x02, 0x83, 0x00,
+               0xf0, 0x00, 0x0c, 0x04, 0x02,
+               0xb0, 0x40, 0x6c, 0x00, 0xa0,
+               0xd8, 0x08, 0x80, 0x01, 0x01,
+               0xaa, 0x00, 0x2c, 0x08, 0x02,
+               0xa0, 0xc0, 0x30, 0x18, 0x90,
+               0xa0, 0x00, 0x43, 0x00, 0x00,
+               0xba, 0xc0, 0x32, 0xc0, 0xa0,
+               0xaa, 0xb0, 0x00, 0x0f, 0x40,
+               0xd8, 0x0a, 0x80, 0x01, 0x04,
+               0xb0, 0x0a, 0x00, 0x08, 0x00,
+               0xf0, 0x00, 0x00, 0x0f, 0x40,
+               0xa4, 0x00, 0x2c, 0x08, 0x02,
+               0xa0, 0x8a, 0x00, 0x0c, 0xa0,
+               0xe0, 0x00, 0x00, 0x00, 0x04,
+               0xd8, 0x0c, 0x80, 0x00, 0x18,
+               0x3c, 0x40, 0x00, 0x04, 0xe0,
+               0xba, 0x80, 0x42, 0x01, 0x80,
+               0xb4, 0x40, 0x40, 0x13, 0xff,
+               0xaa, 0x88, 0x00, 0x10, 0x80,
+               0xb0, 0x08, 0x06, 0x00, 0x00,
+               0xaa, 0xf0, 0x0d, 0x80, 0x80,
+               0xd8, 0x0b, 0x40, 0x01, 0x05,
+               0xa0, 0x88, 0x0c, 0x04, 0x80,
+               0xfc, 0x10, 0xae, 0x43, 0x90,
+               0xba, 0xc0, 0x50, 0x0f, 0x01,
+               0x9a, 0x30, 0x50, 0x15, 0x30,
+               0x9a, 0xb0, 0x50, 0x16, 0x30,
+               0x9b, 0x50, 0x58, 0x16, 0x01,
+               0x8a, 0xe2, 0x08, 0x16, 0x21,
+               0x6b, 0x4e, 0x00, 0x83, 0x03,
+               0xe0, 0x00, 0x00, 0x00, 0x30,
+               0x9a, 0x80, 0x70, 0x0e, 0x04,
+               0x8b, 0x88, 0x08, 0x1e, 0x02,
+               0xf0, 0x00, 0x0c, 0x01, 0x81,
+               0xf0, 0x01, 0x80, 0x1f, 0x00,
+               0x9b, 0xd0, 0x78, 0x1e, 0x01,
+               0x3d, 0x42, 0x00, 0x1c, 0x20,
+               0xe0, 0x00, 0x00, 0x00, 0x08,
+               0xfc, 0x10, 0xae, 0x63, 0x98,
+               0xa4, 0x30, 0x0c, 0x04, 0x02,
+               0xd8, 0x03, 0x00, 0x01, 0x00,
+               0xd8, 0x11, 0xc1, 0x42, 0x14,
+               0xa0, 0x18, 0x00, 0x08, 0x00,
+               0x1a, 0x40, 0x00, 0x04, 0x2c,
+               0x33, 0x00, 0x01, 0x2f, 0x20,
+               0xd8, 0x03, 0x00, 0x00, 0x18,
+               0xe0, 0x00, 0x02, 0x00, 0x00,
+       }
+};
diff --git a/drivers/net/ixp2000/ixpdev.c b/drivers/net/ixp2000/ixpdev.c
new file mode 100644 (file)
index 0000000..09f03f4
--- /dev/null
@@ -0,0 +1,421 @@
+/*
+ * IXP2000 MSF network device driver
+ * Copyright (C) 2004, 2005 Lennert Buytenhek <buytenh@wantstofly.org>
+ * Dedicated to Marija Kulikova.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ */
+
+#include <linux/config.h>
+#include <linux/module.h>
+#include <linux/kernel.h>
+#include <linux/netdevice.h>
+#include <linux/etherdevice.h>
+#include <linux/init.h>
+#include <linux/moduleparam.h>
+#include <asm/arch/uengine.h>
+#include <asm/mach-types.h>
+#include <asm/io.h>
+#include "ixp2400_rx.ucode"
+#include "ixp2400_tx.ucode"
+#include "ixpdev_priv.h"
+#include "ixpdev.h"
+
+#define DRV_MODULE_VERSION     "0.2"
+
+static int nds_count;
+static struct net_device **nds;
+static int nds_open;
+static void (*set_port_admin_status)(int port, int up);
+
+static struct ixpdev_rx_desc * const rx_desc =
+       (struct ixpdev_rx_desc *)(IXP2000_SRAM0_VIRT_BASE + RX_BUF_DESC_BASE);
+static struct ixpdev_tx_desc * const tx_desc =
+       (struct ixpdev_tx_desc *)(IXP2000_SRAM0_VIRT_BASE + TX_BUF_DESC_BASE);
+static int tx_pointer;
+
+
+static int ixpdev_xmit(struct sk_buff *skb, struct net_device *dev)
+{
+       struct ixpdev_priv *ip = netdev_priv(dev);
+       struct ixpdev_tx_desc *desc;
+       int entry;
+
+       if (unlikely(skb->len > PAGE_SIZE)) {
+               /* @@@ Count drops.  */
+               dev_kfree_skb(skb);
+               return 0;
+       }
+
+       entry = tx_pointer;
+       tx_pointer = (tx_pointer + 1) % TX_BUF_COUNT;
+
+       desc = tx_desc + entry;
+       desc->pkt_length = skb->len;
+       desc->channel = ip->channel;
+
+       skb_copy_and_csum_dev(skb, phys_to_virt(desc->buf_addr));
+       dev_kfree_skb(skb);
+
+       ixp2000_reg_write(RING_TX_PENDING,
+               TX_BUF_DESC_BASE + (entry * sizeof(struct ixpdev_tx_desc)));
+
+       dev->trans_start = jiffies;
+
+       local_irq_disable();
+       ip->tx_queue_entries++;
+       if (ip->tx_queue_entries == TX_BUF_COUNT_PER_CHAN)
+               netif_stop_queue(dev);
+       local_irq_enable();
+
+       return 0;
+}
+
+
+static int ixpdev_rx(struct net_device *dev, int *budget)
+{
+       while (*budget > 0) {
+               struct ixpdev_rx_desc *desc;
+               struct sk_buff *skb;
+               void *buf;
+               u32 _desc;
+
+               _desc = ixp2000_reg_read(RING_RX_DONE);
+               if (_desc == 0)
+                       return 0;
+
+               desc = rx_desc +
+                       ((_desc - RX_BUF_DESC_BASE) / sizeof(struct ixpdev_rx_desc));
+               buf = phys_to_virt(desc->buf_addr);
+
+               if (desc->pkt_length < 4 || desc->pkt_length > PAGE_SIZE) {
+                       printk(KERN_ERR "ixp2000: rx err, length %d\n",
+                                       desc->pkt_length);
+                       goto err;
+               }
+
+               if (desc->channel < 0 || desc->channel >= nds_count) {
+                       printk(KERN_ERR "ixp2000: rx err, channel %d\n",
+                                       desc->channel);
+                       goto err;
+               }
+
+               /* @@@ Make FCS stripping configurable.  */
+               desc->pkt_length -= 4;
+
+               if (unlikely(!netif_running(nds[desc->channel])))
+                       goto err;
+
+               skb = dev_alloc_skb(desc->pkt_length + 2);
+               if (likely(skb != NULL)) {
+                       skb->dev = nds[desc->channel];
+                       skb_reserve(skb, 2);
+                       eth_copy_and_sum(skb, buf, desc->pkt_length, 0);
+                       skb_put(skb, desc->pkt_length);
+                       skb->protocol = eth_type_trans(skb, skb->dev);
+
+                       skb->dev->last_rx = jiffies;
+
+                       netif_receive_skb(skb);
+               }
+
+err:
+               ixp2000_reg_write(RING_RX_PENDING, _desc);
+               dev->quota--;
+               (*budget)--;
+       }
+
+       return 1;
+}
+
+/* dev always points to nds[0].  */
+static int ixpdev_poll(struct net_device *dev, int *budget)
+{
+       /* @@@ Have to stop polling when nds[0] is administratively
+        * downed while we are polling.  */
+       do {
+               ixp2000_reg_write(IXP2000_IRQ_THD_RAW_STATUS_A_0, 0x00ff);
+
+               if (ixpdev_rx(dev, budget))
+                       return 1;
+       } while (ixp2000_reg_read(IXP2000_IRQ_THD_RAW_STATUS_A_0) & 0x00ff);
+
+       netif_rx_complete(dev);
+       ixp2000_reg_write(IXP2000_IRQ_THD_ENABLE_SET_A_0, 0x00ff);
+
+       return 0;
+}
+
+static void ixpdev_tx_complete(void)
+{
+       int channel;
+       u32 wake;
+
+       wake = 0;
+       while (1) {
+               struct ixpdev_priv *ip;
+               u32 desc;
+               int entry;
+
+               desc = ixp2000_reg_read(RING_TX_DONE);
+               if (desc == 0)
+                       break;
+
+               /* @@@ Check whether entries come back in order.  */
+               entry = (desc - TX_BUF_DESC_BASE) / sizeof(struct ixpdev_tx_desc);
+               channel = tx_desc[entry].channel;
+
+               if (channel < 0 || channel >= nds_count) {
+                       printk(KERN_ERR "ixp2000: txcomp channel index "
+                                       "out of bounds (%d, %.8i, %d)\n",
+                                       channel, (unsigned int)desc, entry);
+                       continue;
+               }
+
+               ip = netdev_priv(nds[channel]);
+               if (ip->tx_queue_entries == TX_BUF_COUNT_PER_CHAN)
+                       wake |= 1 << channel;
+               ip->tx_queue_entries--;
+       }
+
+       for (channel = 0; wake != 0; channel++) {
+               if (wake & (1 << channel)) {
+                       netif_wake_queue(nds[channel]);
+                       wake &= ~(1 << channel);
+               }
+       }
+}
+
+static irqreturn_t ixpdev_interrupt(int irq, void *dev_id, struct pt_regs *regs)
+{
+       u32 status;
+
+       status = ixp2000_reg_read(IXP2000_IRQ_THD_STATUS_A_0);
+       if (status == 0)
+               return IRQ_NONE;
+
+       /*
+        * Any of the eight receive units signaled RX?
+        */
+       if (status & 0x00ff) {
+               ixp2000_reg_wrb(IXP2000_IRQ_THD_ENABLE_CLEAR_A_0, 0x00ff);
+               if (likely(__netif_rx_schedule_prep(nds[0]))) {
+                       __netif_rx_schedule(nds[0]);
+               } else {
+                       printk(KERN_CRIT "ixp2000: irq while polling!!\n");
+               }
+       }
+
+       /*
+        * Any of the eight transmit units signaled TXdone?
+        */
+       if (status & 0xff00) {
+               ixp2000_reg_wrb(IXP2000_IRQ_THD_RAW_STATUS_A_0, 0xff00);
+               ixpdev_tx_complete();
+       }
+
+       return IRQ_HANDLED;
+}
+
+#ifdef CONFIG_NET_POLL_CONTROLLER
+static void ixpdev_poll_controller(struct net_device *dev)
+{
+       disable_irq(IRQ_IXP2000_THDA0);
+       ixpdev_interrupt(IRQ_IXP2000_THDA0, dev, NULL);
+       enable_irq(IRQ_IXP2000_THDA0);
+}
+#endif
+
+static int ixpdev_open(struct net_device *dev)
+{
+       struct ixpdev_priv *ip = netdev_priv(dev);
+       int err;
+
+       if (!nds_open++) {
+               err = request_irq(IRQ_IXP2000_THDA0, ixpdev_interrupt,
+                                       SA_SHIRQ, "ixp2000_eth", nds);
+               if (err) {
+                       nds_open--;
+                       return err;
+               }
+
+               ixp2000_reg_write(IXP2000_IRQ_THD_ENABLE_SET_A_0, 0xffff);
+       }
+
+       set_port_admin_status(ip->channel, 1);
+       netif_start_queue(dev);
+
+       return 0;
+}
+
+static int ixpdev_close(struct net_device *dev)
+{
+       struct ixpdev_priv *ip = netdev_priv(dev);
+
+       netif_stop_queue(dev);
+       set_port_admin_status(ip->channel, 0);
+
+       if (!--nds_open) {
+               ixp2000_reg_write(IXP2000_IRQ_THD_ENABLE_CLEAR_A_0, 0xffff);
+               free_irq(IRQ_IXP2000_THDA0, nds);
+       }
+
+       return 0;
+}
+
+struct net_device *ixpdev_alloc(int channel, int sizeof_priv)
+{
+       struct net_device *dev;
+       struct ixpdev_priv *ip;
+
+       dev = alloc_etherdev(sizeof_priv);
+       if (dev == NULL)
+               return NULL;
+
+       dev->hard_start_xmit = ixpdev_xmit;
+       dev->poll = ixpdev_poll;
+       dev->open = ixpdev_open;
+       dev->stop = ixpdev_close;
+#ifdef CONFIG_NET_POLL_CONTROLLER
+       dev->poll_controller = ixpdev_poll_controller;
+#endif
+
+       dev->features |= NETIF_F_SG | NETIF_F_HW_CSUM;
+       dev->weight = 64;
+
+       ip = netdev_priv(dev);
+       ip->channel = channel;
+       ip->tx_queue_entries = 0;
+
+       return dev;
+}
+
+int ixpdev_init(int __nds_count, struct net_device **__nds,
+               void (*__set_port_admin_status)(int port, int up))
+{
+       int i;
+       int err;
+
+       if (RX_BUF_COUNT > 192 || TX_BUF_COUNT > 192) {
+               static void __too_many_rx_or_tx_buffers(void);
+               __too_many_rx_or_tx_buffers();
+       }
+
+       printk(KERN_INFO "IXP2000 MSF ethernet driver %s\n", DRV_MODULE_VERSION);
+
+       nds_count = __nds_count;
+       nds = __nds;
+       set_port_admin_status = __set_port_admin_status;
+
+       for (i = 0; i < RX_BUF_COUNT; i++) {
+               void *buf;
+
+               buf = (void *)get_zeroed_page(GFP_KERNEL);
+               if (buf == NULL) {
+                       err = -ENOMEM;
+                       while (--i >= 0)
+                               free_page((unsigned long)phys_to_virt(rx_desc[i].buf_addr));
+                       goto err_out;
+               }
+               rx_desc[i].buf_addr = virt_to_phys(buf);
+               rx_desc[i].buf_length = PAGE_SIZE;
+       }
+
+       /* @@@ Maybe we shouldn't be preallocating TX buffers.  */
+       for (i = 0; i < TX_BUF_COUNT; i++) {
+               void *buf;
+
+               buf = (void *)get_zeroed_page(GFP_KERNEL);
+               if (buf == NULL) {
+                       err = -ENOMEM;
+                       while (--i >= 0)
+                               free_page((unsigned long)phys_to_virt(tx_desc[i].buf_addr));
+                       goto err_free_rx;
+               }
+               tx_desc[i].buf_addr = virt_to_phys(buf);
+       }
+
+       /* 256 entries, ring status set means 'empty', base address 0x0000.  */
+       ixp2000_reg_write(RING_RX_PENDING_BASE, 0x44000000);
+       ixp2000_reg_write(RING_RX_PENDING_HEAD, 0x00000000);
+       ixp2000_reg_write(RING_RX_PENDING_TAIL, 0x00000000);
+
+       /* 256 entries, ring status set means 'full', base address 0x0400.  */
+       ixp2000_reg_write(RING_RX_DONE_BASE, 0x40000400);
+       ixp2000_reg_write(RING_RX_DONE_HEAD, 0x00000000);
+       ixp2000_reg_write(RING_RX_DONE_TAIL, 0x00000000);
+
+       for (i = 0; i < RX_BUF_COUNT; i++) {
+               ixp2000_reg_write(RING_RX_PENDING,
+                       RX_BUF_DESC_BASE + (i * sizeof(struct ixpdev_rx_desc)));
+       }
+
+       ixp2000_uengine_load(0, &ixp2400_rx);
+       ixp2000_uengine_start_contexts(0, 0xff);
+
+       /* 256 entries, ring status set means 'empty', base address 0x0800.  */
+       ixp2000_reg_write(RING_TX_PENDING_BASE, 0x44000800);
+       ixp2000_reg_write(RING_TX_PENDING_HEAD, 0x00000000);
+       ixp2000_reg_write(RING_TX_PENDING_TAIL, 0x00000000);
+
+       /* 256 entries, ring status set means 'full', base address 0x0c00.  */
+       ixp2000_reg_write(RING_TX_DONE_BASE, 0x40000c00);
+       ixp2000_reg_write(RING_TX_DONE_HEAD, 0x00000000);
+       ixp2000_reg_write(RING_TX_DONE_TAIL, 0x00000000);
+
+       ixp2000_uengine_load(1, &ixp2400_tx);
+       ixp2000_uengine_start_contexts(1, 0xff);
+
+       for (i = 0; i < nds_count; i++) {
+               err = register_netdev(nds[i]);
+               if (err) {
+                       while (--i >= 0)
+                               unregister_netdev(nds[i]);
+                       goto err_free_tx;
+               }
+       }
+
+       for (i = 0; i < nds_count; i++) {
+               printk(KERN_INFO "%s: IXP2000 MSF ethernet (port %d), "
+                       "%.2x:%.2x:%.2x:%.2x:%.2x:%.2x.\n", nds[i]->name, i,
+                       nds[i]->dev_addr[0], nds[i]->dev_addr[1],
+                       nds[i]->dev_addr[2], nds[i]->dev_addr[3],
+                       nds[i]->dev_addr[4], nds[i]->dev_addr[5]);
+       }
+
+       return 0;
+
+err_free_tx:
+       for (i = 0; i < TX_BUF_COUNT; i++)
+               free_page((unsigned long)phys_to_virt(tx_desc[i].buf_addr));
+
+err_free_rx:
+       for (i = 0; i < RX_BUF_COUNT; i++)
+               free_page((unsigned long)phys_to_virt(rx_desc[i].buf_addr));
+
+err_out:
+       return err;
+} 
+
+void ixpdev_deinit(void)
+{
+       int i;
+
+       /* @@@ Flush out pending packets.  */
+
+       for (i = 0; i < nds_count; i++)
+               unregister_netdev(nds[i]);
+
+       ixp2000_uengine_stop_contexts(1, 0xff);
+       ixp2000_uengine_stop_contexts(0, 0xff);
+       ixp2000_uengine_reset(0x3);
+
+       for (i = 0; i < TX_BUF_COUNT; i++)
+               free_page((unsigned long)phys_to_virt(tx_desc[i].buf_addr));
+
+       for (i = 0; i < RX_BUF_COUNT; i++)
+               free_page((unsigned long)phys_to_virt(rx_desc[i].buf_addr));
+}
diff --git a/drivers/net/ixp2000/ixpdev.h b/drivers/net/ixp2000/ixpdev.h
new file mode 100644 (file)
index 0000000..bd686cb
--- /dev/null
@@ -0,0 +1,27 @@
+/*
+ * IXP2000 MSF network device driver
+ * Copyright (C) 2004, 2005 Lennert Buytenhek <buytenh@wantstofly.org>
+ * Dedicated to Marija Kulikova.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ */
+
+#ifndef __IXPDEV_H
+#define __IXPDEV_H
+
+struct ixpdev_priv
+{
+       int     channel;
+       int     tx_queue_entries;
+};
+
+struct net_device *ixpdev_alloc(int channel, int sizeof_priv);
+int ixpdev_init(int num_ports, struct net_device **nds,
+               void (*set_port_admin_status)(int port, int up));
+void ixpdev_deinit(void);
+
+
+#endif
diff --git a/drivers/net/ixp2000/ixpdev_priv.h b/drivers/net/ixp2000/ixpdev_priv.h
new file mode 100644 (file)
index 0000000..86aa08e
--- /dev/null
@@ -0,0 +1,57 @@
+/*
+ * IXP2000 MSF network device driver
+ * Copyright (C) 2004, 2005 Lennert Buytenhek <buytenh@wantstofly.org>
+ * Dedicated to Marija Kulikova.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ */
+
+#ifndef __IXPDEV_PRIV_H
+#define __IXPDEV_PRIV_H
+
+#define RX_BUF_DESC_BASE       0x00001000
+#define RX_BUF_COUNT           ((3 * PAGE_SIZE) / (4 * sizeof(struct ixpdev_rx_desc)))
+#define TX_BUF_DESC_BASE       0x00002000
+#define TX_BUF_COUNT           ((3 * PAGE_SIZE) / (4 * sizeof(struct ixpdev_tx_desc)))
+#define TX_BUF_COUNT_PER_CHAN  (TX_BUF_COUNT / 4)
+
+#define RING_RX_PENDING                ((u32 *)IXP2000_SCRATCH_RING_VIRT_BASE)
+#define RING_RX_DONE           ((u32 *)(IXP2000_SCRATCH_RING_VIRT_BASE + 4))
+#define RING_TX_PENDING                ((u32 *)(IXP2000_SCRATCH_RING_VIRT_BASE + 8))
+#define RING_TX_DONE           ((u32 *)(IXP2000_SCRATCH_RING_VIRT_BASE + 12))
+
+#define SCRATCH_REG(x)         ((u32 *)(IXP2000_GLOBAL_REG_VIRT_BASE | 0x0800 | (x)))
+#define RING_RX_PENDING_BASE   SCRATCH_REG(0x00)
+#define RING_RX_PENDING_HEAD   SCRATCH_REG(0x04)
+#define RING_RX_PENDING_TAIL   SCRATCH_REG(0x08)
+#define RING_RX_DONE_BASE      SCRATCH_REG(0x10)
+#define RING_RX_DONE_HEAD      SCRATCH_REG(0x14)
+#define RING_RX_DONE_TAIL      SCRATCH_REG(0x18)
+#define RING_TX_PENDING_BASE   SCRATCH_REG(0x20)
+#define RING_TX_PENDING_HEAD   SCRATCH_REG(0x24)
+#define RING_TX_PENDING_TAIL   SCRATCH_REG(0x28)
+#define RING_TX_DONE_BASE      SCRATCH_REG(0x30)
+#define RING_TX_DONE_HEAD      SCRATCH_REG(0x34)
+#define RING_TX_DONE_TAIL      SCRATCH_REG(0x38)
+
+struct ixpdev_rx_desc
+{
+       u32     buf_addr;
+       u32     buf_length;
+       u32     channel;
+       u32     pkt_length;
+};
+
+struct ixpdev_tx_desc
+{
+       u32     buf_addr;
+       u32     pkt_length;
+       u32     channel;
+       u32     unused;
+};
+
+
+#endif
diff --git a/drivers/net/ixp2000/pm3386.c b/drivers/net/ixp2000/pm3386.c
new file mode 100644 (file)
index 0000000..5c7ab75
--- /dev/null
@@ -0,0 +1,334 @@
+/*
+ * Helper functions for the PM3386s on the Radisys ENP2611
+ * Copyright (C) 2004, 2005 Lennert Buytenhek <buytenh@wantstofly.org>
+ * Dedicated to Marija Kulikova.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ */
+
+#include <linux/config.h>
+#include <linux/module.h>
+#include <linux/delay.h>
+#include <linux/netdevice.h>
+#include <asm/io.h>
+#include "pm3386.h"
+
+/*
+ * Read from register 'reg' of PM3386 device 'pm'.
+ */
+static u16 pm3386_reg_read(int pm, int reg)
+{
+       void *_reg;
+       u16 value;
+
+       _reg = (void *)ENP2611_PM3386_0_VIRT_BASE;
+       if (pm == 1)
+               _reg = (void *)ENP2611_PM3386_1_VIRT_BASE;
+
+       value = *((volatile u16 *)(_reg + (reg << 1)));
+
+//     printk(KERN_INFO "pm3386_reg_read(%d, %.3x) = %.8x\n", pm, reg, value);
+
+       return value;
+}
+
+/*
+ * Write to register 'reg' of PM3386 device 'pm', and perform
+ * a readback from the identification register.
+ */
+static void pm3386_reg_write(int pm, int reg, u16 value)
+{
+       void *_reg;
+       u16 dummy;
+
+//     printk(KERN_INFO "pm3386_reg_write(%d, %.3x, %.8x)\n", pm, reg, value);
+
+       _reg = (void *)ENP2611_PM3386_0_VIRT_BASE;
+       if (pm == 1)
+               _reg = (void *)ENP2611_PM3386_1_VIRT_BASE;
+
+       *((volatile u16 *)(_reg + (reg << 1))) = value;
+
+       dummy = *((volatile u16 *)_reg);
+       __asm__ __volatile__("mov %0, %0" : "+r" (dummy));
+}
+
+/*
+ * Read from port 'port' register 'reg', where the registers
+ * for the different ports are 'spacing' registers apart.
+ */
+static u16 pm3386_port_reg_read(int port, int _reg, int spacing)
+{
+       int reg;
+
+       reg = _reg;
+       if (port & 1)
+               reg += spacing;
+
+       return pm3386_reg_read(port >> 1, reg);
+}
+
+/*
+ * Write to port 'port' register 'reg', where the registers
+ * for the different ports are 'spacing' registers apart.
+ */
+static void pm3386_port_reg_write(int port, int _reg, int spacing, u16 value)
+{
+       int reg;
+
+       reg = _reg;
+       if (port & 1)
+               reg += spacing;
+
+       pm3386_reg_write(port >> 1, reg, value);
+}
+
+
+void pm3386_reset(void)
+{
+       u8 mac[3][6];
+
+       /* Save programmed MAC addresses.  */
+       pm3386_get_mac(0, mac[0]);
+       pm3386_get_mac(1, mac[1]);
+       pm3386_get_mac(2, mac[2]);
+
+       /* Assert analog and digital reset.  */
+       pm3386_reg_write(0, 0x002, 0x0060);
+       pm3386_reg_write(1, 0x002, 0x0060);
+       mdelay(1);
+
+       /* Deassert analog reset.  */
+       pm3386_reg_write(0, 0x002, 0x0062);
+       pm3386_reg_write(1, 0x002, 0x0062);
+       mdelay(10);
+
+       /* Deassert digital reset.  */
+       pm3386_reg_write(0, 0x002, 0x0063);
+       pm3386_reg_write(1, 0x002, 0x0063);
+       mdelay(10);
+
+       /* Restore programmed MAC addresses.  */
+       pm3386_set_mac(0, mac[0]);
+       pm3386_set_mac(1, mac[1]);
+       pm3386_set_mac(2, mac[2]);
+
+       /* Disable carrier on all ports.  */
+       pm3386_set_carrier(0, 0);
+       pm3386_set_carrier(1, 0);
+       pm3386_set_carrier(2, 0);
+}
+
+static u16 swaph(u16 x)
+{
+       return ((x << 8) | (x >> 8)) & 0xffff;
+}
+
+void pm3386_init_port(int port)
+{
+       int pm = port >> 1;
+
+       /*
+        * Work around ENP2611 bootloader programming MAC address
+        * in reverse.
+        */
+       if (pm3386_port_reg_read(port, 0x30a, 0x100) == 0x0000 &&
+           (pm3386_port_reg_read(port, 0x309, 0x100) & 0xff00) == 0x5000) {
+               u16 temp[3];
+
+               temp[0] = pm3386_port_reg_read(port, 0x308, 0x100);
+               temp[1] = pm3386_port_reg_read(port, 0x309, 0x100);
+               temp[2] = pm3386_port_reg_read(port, 0x30a, 0x100);
+               pm3386_port_reg_write(port, 0x308, 0x100, swaph(temp[2]));
+               pm3386_port_reg_write(port, 0x309, 0x100, swaph(temp[1]));
+               pm3386_port_reg_write(port, 0x30a, 0x100, swaph(temp[0]));
+       }
+
+       /*
+        * Initialise narrowbanding mode.  See application note 2010486
+        * for more information.  (@@@ We also need to issue a reset
+        * when ROOL or DOOL are detected.)
+        */
+       pm3386_port_reg_write(port, 0x708, 0x10, 0xd055);
+       udelay(500);
+       pm3386_port_reg_write(port, 0x708, 0x10, 0x5055);
+
+       /*
+        * SPI-3 ingress block.  Set 64 bytes SPI-3 burst size
+        * towards SPI-3 bridge.
+        */
+       pm3386_port_reg_write(port, 0x122, 0x20, 0x0002);
+
+       /*
+        * Enable ingress protocol checking, and soft reset the
+        * SPI-3 ingress block.
+        */
+       pm3386_reg_write(pm, 0x103, 0x0003);
+       while (!(pm3386_reg_read(pm, 0x103) & 0x80))
+               ;
+
+       /*
+        * SPI-3 egress block.  Gather 12288 bytes of the current
+        * packet in the TX fifo before initiating transmit on the
+        * SERDES interface.  (Prevents TX underflows.)
+        */
+       pm3386_port_reg_write(port, 0x221, 0x20, 0x0007);
+
+       /*
+        * Enforce odd parity from the SPI-3 bridge, and soft reset
+        * the SPI-3 egress block.
+        */
+       pm3386_reg_write(pm, 0x203, 0x000d & ~(4 << (port & 1)));
+       while ((pm3386_reg_read(pm, 0x203) & 0x000c) != 0x000c)
+               ;
+
+       /*
+        * EGMAC block.  Set this channels to reject long preambles,
+        * not send or transmit PAUSE frames, enable preamble checking,
+        * disable frame length checking, enable FCS appending, enable
+        * TX frame padding.
+        */
+       pm3386_port_reg_write(port, 0x302, 0x100, 0x0113);
+
+       /*
+        * Soft reset the EGMAC block.
+        */
+       pm3386_port_reg_write(port, 0x301, 0x100, 0x8000);
+       pm3386_port_reg_write(port, 0x301, 0x100, 0x0000);
+
+       /*
+        * Auto-sense autonegotiation status.
+        */
+       pm3386_port_reg_write(port, 0x306, 0x100, 0x0100);
+
+       /*
+        * Allow reception of jumbo frames.
+        */
+       pm3386_port_reg_write(port, 0x310, 0x100, 9018);
+
+       /*
+        * Allow transmission of jumbo frames.
+        */
+       pm3386_port_reg_write(port, 0x336, 0x100, 9018);
+
+       /* @@@ Should set 0x337/0x437 (RX forwarding threshold.)  */
+
+       /*
+        * Set autonegotiation parameters to 'no PAUSE, full duplex.'
+        */
+       pm3386_port_reg_write(port, 0x31c, 0x100, 0x0020);
+
+       /*
+        * Enable and restart autonegotiation.
+        */
+       pm3386_port_reg_write(port, 0x318, 0x100, 0x0003);
+       pm3386_port_reg_write(port, 0x318, 0x100, 0x0002);
+}
+
+void pm3386_get_mac(int port, u8 *mac)
+{
+       u16 temp;
+
+       temp = pm3386_port_reg_read(port, 0x308, 0x100);
+       mac[0] = temp & 0xff;
+       mac[1] = (temp >> 8) & 0xff;
+
+       temp = pm3386_port_reg_read(port, 0x309, 0x100);
+       mac[2] = temp & 0xff;
+       mac[3] = (temp >> 8) & 0xff;
+
+       temp = pm3386_port_reg_read(port, 0x30a, 0x100);
+       mac[4] = temp & 0xff;
+       mac[5] = (temp >> 8) & 0xff;
+}
+
+void pm3386_set_mac(int port, u8 *mac)
+{
+       pm3386_port_reg_write(port, 0x308, 0x100, (mac[1] << 8) | mac[0]);
+       pm3386_port_reg_write(port, 0x309, 0x100, (mac[3] << 8) | mac[2]);
+       pm3386_port_reg_write(port, 0x30a, 0x100, (mac[5] << 8) | mac[4]);
+}
+
+static u32 pm3386_get_stat(int port, u16 base)
+{
+       u32 value;
+
+       value = pm3386_port_reg_read(port, base, 0x100);
+       value |= pm3386_port_reg_read(port, base + 1, 0x100) << 16;
+
+       return value;
+}
+
+void pm3386_get_stats(int port, struct net_device_stats *stats)
+{
+       /*
+        * Snapshot statistics counters.
+        */
+       pm3386_port_reg_write(port, 0x500, 0x100, 0x0001);
+       while (pm3386_port_reg_read(port, 0x500, 0x100) & 0x0001)
+               ;
+
+       memset(stats, 0, sizeof(*stats));
+
+       stats->rx_packets = pm3386_get_stat(port, 0x510);
+       stats->tx_packets = pm3386_get_stat(port, 0x590);
+       stats->rx_bytes = pm3386_get_stat(port, 0x514);
+       stats->tx_bytes = pm3386_get_stat(port, 0x594);
+       /* @@@ Add other stats.  */
+}
+
+void pm3386_set_carrier(int port, int state)
+{
+       pm3386_port_reg_write(port, 0x703, 0x10, state ? 0x1001 : 0x0000);
+}
+
+int pm3386_is_link_up(int port)
+{
+       u16 temp;
+
+       temp = pm3386_port_reg_read(port, 0x31a, 0x100);
+       temp = pm3386_port_reg_read(port, 0x31a, 0x100);
+
+       return !!(temp & 0x0002);
+}
+
+void pm3386_enable_rx(int port)
+{
+       u16 temp;
+
+       temp = pm3386_port_reg_read(port, 0x303, 0x100);
+       temp |= 0x1000;
+       pm3386_port_reg_write(port, 0x303, 0x100, temp);
+}
+
+void pm3386_disable_rx(int port)
+{
+       u16 temp;
+
+       temp = pm3386_port_reg_read(port, 0x303, 0x100);
+       temp &= 0xefff;
+       pm3386_port_reg_write(port, 0x303, 0x100, temp);
+}
+
+void pm3386_enable_tx(int port)
+{
+       u16 temp;
+
+       temp = pm3386_port_reg_read(port, 0x303, 0x100);
+       temp |= 0x4000;
+       pm3386_port_reg_write(port, 0x303, 0x100, temp);
+}
+
+void pm3386_disable_tx(int port)
+{
+       u16 temp;
+
+       temp = pm3386_port_reg_read(port, 0x303, 0x100);
+       temp &= 0xbfff;
+       pm3386_port_reg_write(port, 0x303, 0x100, temp);
+}
+
+MODULE_LICENSE("GPL");
diff --git a/drivers/net/ixp2000/pm3386.h b/drivers/net/ixp2000/pm3386.h
new file mode 100644 (file)
index 0000000..fe92bb0
--- /dev/null
@@ -0,0 +1,28 @@
+/*
+ * Helper functions for the PM3386s on the Radisys ENP2611
+ * Copyright (C) 2004, 2005 Lennert Buytenhek <buytenh@wantstofly.org>
+ * Dedicated to Marija Kulikova.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ */
+
+#ifndef __PM3386_H
+#define __PM3386_H
+
+void pm3386_reset(void);
+void pm3386_init_port(int port);
+void pm3386_get_mac(int port, u8 *mac);
+void pm3386_set_mac(int port, u8 *mac);
+void pm3386_get_stats(int port, struct net_device_stats *stats);
+void pm3386_set_carrier(int port, int state);
+int pm3386_is_link_up(int port);
+void pm3386_enable_rx(int port);
+void pm3386_disable_rx(int port);
+void pm3386_enable_tx(int port);
+void pm3386_disable_tx(int port);
+
+
+#endif
index e57df8dfe6b4ec29b0c81b2f71d9c5809b1fa228..5303a96b4327e97fdd238ed58f9f703c9f2c700a 100644 (file)
@@ -66,7 +66,7 @@
 #include "s2io.h"
 #include "s2io-regs.h"
 
-#define DRV_VERSION "Version 2.0.9.3"
+#define DRV_VERSION "Version 2.0.9.4"
 
 /* S2io Driver name & version. */
 static char s2io_driver_name[] = "Neterion";
@@ -412,7 +412,7 @@ static int init_shared_mem(struct s2io_nic *nic)
                    config->tx_cfg[i].fifo_len - 1;
                mac_control->fifos[i].fifo_no = i;
                mac_control->fifos[i].nic = nic;
-               mac_control->fifos[i].max_txds = MAX_SKB_FRAGS + 1;
+               mac_control->fifos[i].max_txds = MAX_SKB_FRAGS + 2;
 
                for (j = 0; j < page_num; j++) {
                        int k = 0;
@@ -459,6 +459,10 @@ static int init_shared_mem(struct s2io_nic *nic)
                }
        }
 
+       nic->ufo_in_band_v = kmalloc((sizeof(u64) * size), GFP_KERNEL);
+       if (!nic->ufo_in_band_v)
+               return -ENOMEM;
+
        /* Allocation and initialization of RXDs in Rings */
        size = 0;
        for (i = 0; i < config->rx_ring_num; i++) {
@@ -731,6 +735,8 @@ static void free_shared_mem(struct s2io_nic *nic)
                                    mac_control->stats_mem,
                                    mac_control->stats_mem_phy);
        }
+       if (nic->ufo_in_band_v)
+               kfree(nic->ufo_in_band_v);
 }
 
 /**
@@ -2003,6 +2009,49 @@ static int start_nic(struct s2io_nic *nic)
 
        return SUCCESS;
 }
+/**
+ * s2io_txdl_getskb - Get the skb from txdl, unmap and return skb
+ */
+static struct sk_buff *s2io_txdl_getskb(fifo_info_t *fifo_data, TxD_t *txdlp, int get_off)
+{
+       nic_t *nic = fifo_data->nic;
+       struct sk_buff *skb;
+       TxD_t *txds;
+       u16 j, frg_cnt;
+
+       txds = txdlp;
+       if (txds->Host_Control == (u64) nic->ufo_in_band_v) {
+               pci_unmap_single(nic->pdev, (dma_addr_t)
+                       txds->Buffer_Pointer, sizeof(u64),
+                       PCI_DMA_TODEVICE);
+               txds++;
+       }
+
+       skb = (struct sk_buff *) ((unsigned long)
+                       txds->Host_Control);
+       if (!skb) {
+               memset(txdlp, 0, (sizeof(TxD_t) * fifo_data->max_txds));
+               return NULL;
+       }
+       pci_unmap_single(nic->pdev, (dma_addr_t)
+                        txds->Buffer_Pointer,
+                        skb->len - skb->data_len,
+                        PCI_DMA_TODEVICE);
+       frg_cnt = skb_shinfo(skb)->nr_frags;
+       if (frg_cnt) {
+               txds++;
+               for (j = 0; j < frg_cnt; j++, txds++) {
+                       skb_frag_t *frag = &skb_shinfo(skb)->frags[j];
+                       if (!txds->Buffer_Pointer)
+                               break;
+                       pci_unmap_page(nic->pdev, (dma_addr_t) 
+                                       txds->Buffer_Pointer,
+                                      frag->size, PCI_DMA_TODEVICE);
+               }
+       }
+       txdlp->Host_Control = 0;
+       return(skb);
+}
 
 /**
  *  free_tx_buffers - Free all queued Tx buffers
@@ -2020,7 +2069,7 @@ static void free_tx_buffers(struct s2io_nic *nic)
        int i, j;
        mac_info_t *mac_control;
        struct config_param *config;
-       int cnt = 0, frg_cnt;
+       int cnt = 0;
 
        mac_control = &nic->mac_control;
        config = &nic->config;
@@ -2029,38 +2078,11 @@ static void free_tx_buffers(struct s2io_nic *nic)
                for (j = 0; j < config->tx_cfg[i].fifo_len - 1; j++) {
                        txdp = (TxD_t *) mac_control->fifos[i].list_info[j].
                            list_virt_addr;
-                       skb =
-                           (struct sk_buff *) ((unsigned long) txdp->
-                                               Host_Control);
-                       if (skb == NULL) {
-                               memset(txdp, 0, sizeof(TxD_t) *
-                                      config->max_txds);
-                               continue;
-                       }
-                       frg_cnt = skb_shinfo(skb)->nr_frags;
-                       pci_unmap_single(nic->pdev, (dma_addr_t)
-                                        txdp->Buffer_Pointer,
-                                        skb->len - skb->data_len,
-                                        PCI_DMA_TODEVICE);
-                       if (frg_cnt) {
-                               TxD_t *temp;
-                               temp = txdp;
-                               txdp++;
-                               for (j = 0; j < frg_cnt; j++, txdp++) {
-                                       skb_frag_t *frag =
-                                           &skb_shinfo(skb)->frags[j];
-                                       pci_unmap_page(nic->pdev,
-                                                      (dma_addr_t)
-                                                      txdp->
-                                                      Buffer_Pointer,
-                                                      frag->size,
-                                                      PCI_DMA_TODEVICE);
-                               }
-                               txdp = temp;
+                       skb = s2io_txdl_getskb(&mac_control->fifos[i], txdp, j);
+                       if (skb) {
+                               dev_kfree_skb(skb);
+                               cnt++;
                        }
-                       dev_kfree_skb(skb);
-                       memset(txdp, 0, sizeof(TxD_t) * config->max_txds);
-                       cnt++;
                }
                DBG_PRINT(INTR_DBG,
                          "%s:forcibly freeing %d skbs on FIFO%d\n",
@@ -2661,7 +2683,6 @@ static void tx_intr_handler(fifo_info_t *fifo_data)
        tx_curr_get_info_t get_info, put_info;
        struct sk_buff *skb;
        TxD_t *txdlp;
-       u16 j, frg_cnt;
 
        get_info = fifo_data->tx_curr_get_info;
        put_info = fifo_data->tx_curr_put_info;
@@ -2684,8 +2705,7 @@ to loss of link\n");
                        }
                }
 
-               skb = (struct sk_buff *) ((unsigned long)
-                               txdlp->Host_Control);
+               skb = s2io_txdl_getskb(fifo_data, txdlp, get_info.offset);
                if (skb == NULL) {
                        DBG_PRINT(ERR_DBG, "%s: Null skb ",
                        __FUNCTION__);
@@ -2693,34 +2713,6 @@ to loss of link\n");
                        return;
                }
 
-               frg_cnt = skb_shinfo(skb)->nr_frags;
-               nic->tx_pkt_count++;
-
-               pci_unmap_single(nic->pdev, (dma_addr_t)
-                                txdlp->Buffer_Pointer,
-                                skb->len - skb->data_len,
-                                PCI_DMA_TODEVICE);
-               if (frg_cnt) {
-                       TxD_t *temp;
-                       temp = txdlp;
-                       txdlp++;
-                       for (j = 0; j < frg_cnt; j++, txdlp++) {
-                               skb_frag_t *frag =
-                                   &skb_shinfo(skb)->frags[j];
-                               if (!txdlp->Buffer_Pointer)
-                                       break;
-                               pci_unmap_page(nic->pdev,
-                                              (dma_addr_t)
-                                              txdlp->
-                                              Buffer_Pointer,
-                                              frag->size,
-                                              PCI_DMA_TODEVICE);
-                       }
-                       txdlp = temp;
-               }
-               memset(txdlp, 0,
-                      (sizeof(TxD_t) * fifo_data->max_txds));
-
                /* Updating the statistics block */
                nic->stats.tx_bytes += skb->len;
                dev_kfree_skb_irq(skb);
@@ -3527,6 +3519,8 @@ static int s2io_xmit(struct sk_buff *skb, struct net_device *dev)
                return 0;
        }
 
+       txdp->Control_1 = 0;
+       txdp->Control_2 = 0;
 #ifdef NETIF_F_TSO
        mss = skb_shinfo(skb)->tso_size;
        if (mss) {
@@ -3534,19 +3528,13 @@ static int s2io_xmit(struct sk_buff *skb, struct net_device *dev)
                txdp->Control_1 |= TXD_TCP_LSO_MSS(mss);
        }
 #endif
-
-       frg_cnt = skb_shinfo(skb)->nr_frags;
-       frg_len = skb->len - skb->data_len;
-
-       txdp->Buffer_Pointer = pci_map_single
-           (sp->pdev, skb->data, frg_len, PCI_DMA_TODEVICE);
-       txdp->Host_Control = (unsigned long) skb;
        if (skb->ip_summed == CHECKSUM_HW) {
                txdp->Control_2 |=
                    (TXD_TX_CKO_IPV4_EN | TXD_TX_CKO_TCP_EN |
                     TXD_TX_CKO_UDP_EN);
        }
-
+       txdp->Control_1 |= TXD_GATHER_CODE_FIRST;
+       txdp->Control_1 |= TXD_LIST_OWN_XENA;
        txdp->Control_2 |= config->tx_intr_type;
 
        if (sp->vlgrp && vlan_tx_tag_present(skb)) {
@@ -3554,10 +3542,40 @@ static int s2io_xmit(struct sk_buff *skb, struct net_device *dev)
                txdp->Control_2 |= TXD_VLAN_TAG(vlan_tag);
        }
 
-       txdp->Control_1 |= (TXD_BUFFER0_SIZE(frg_len) |
-                           TXD_GATHER_CODE_FIRST);
-       txdp->Control_1 |= TXD_LIST_OWN_XENA;
+       frg_len = skb->len - skb->data_len;
+       if (skb_shinfo(skb)->ufo_size) {
+               int ufo_size;
+
+               ufo_size = skb_shinfo(skb)->ufo_size;
+               ufo_size &= ~7;
+               txdp->Control_1 |= TXD_UFO_EN;
+               txdp->Control_1 |= TXD_UFO_MSS(ufo_size);
+               txdp->Control_1 |= TXD_BUFFER0_SIZE(8);
+#ifdef __BIG_ENDIAN
+               sp->ufo_in_band_v[put_off] =
+                               (u64)skb_shinfo(skb)->ip6_frag_id;
+#else
+               sp->ufo_in_band_v[put_off] =
+                               (u64)skb_shinfo(skb)->ip6_frag_id << 32;
+#endif
+               txdp->Host_Control = (unsigned long)sp->ufo_in_band_v;
+               txdp->Buffer_Pointer = pci_map_single(sp->pdev,
+                                       sp->ufo_in_band_v,
+                                       sizeof(u64), PCI_DMA_TODEVICE);
+               txdp++;
+               txdp->Control_1 = 0;
+               txdp->Control_2 = 0;
+       }
+
+       txdp->Buffer_Pointer = pci_map_single
+           (sp->pdev, skb->data, frg_len, PCI_DMA_TODEVICE);
+       txdp->Host_Control = (unsigned long) skb;
+       txdp->Control_1 |= TXD_BUFFER0_SIZE(frg_len);
 
+       if (skb_shinfo(skb)->ufo_size)
+               txdp->Control_1 |= TXD_UFO_EN;
+
+       frg_cnt = skb_shinfo(skb)->nr_frags;
        /* For fragmented SKB. */
        for (i = 0; i < frg_cnt; i++) {
                skb_frag_t *frag = &skb_shinfo(skb)->frags[i];
@@ -3569,9 +3587,14 @@ static int s2io_xmit(struct sk_buff *skb, struct net_device *dev)
                    (sp->pdev, frag->page, frag->page_offset,
                     frag->size, PCI_DMA_TODEVICE);
                txdp->Control_1 |= TXD_BUFFER0_SIZE(frag->size);
+               if (skb_shinfo(skb)->ufo_size)
+                       txdp->Control_1 |= TXD_UFO_EN;
        }
        txdp->Control_1 |= TXD_GATHER_CODE_LAST;
 
+       if (skb_shinfo(skb)->ufo_size)
+               frg_cnt++; /* as Txd0 was used for inband header */
+
        tx_fifo = mac_control->tx_FIFO_start[queue];
        val64 = mac_control->fifos[queue].list_info[put_off].list_phy_addr;
        writeq(val64, &tx_fifo->TxDL_Pointer);
@@ -3583,6 +3606,8 @@ static int s2io_xmit(struct sk_buff *skb, struct net_device *dev)
        if (mss)
                val64 |= TX_FIFO_SPECIAL_FUNC;
 #endif
+       if (skb_shinfo(skb)->ufo_size)
+               val64 |= TX_FIFO_SPECIAL_FUNC;
        writeq(val64, &tx_fifo->List_Control);
 
        mmiowb();
@@ -5190,6 +5215,8 @@ static struct ethtool_ops netdev_ethtool_ops = {
        .get_tso = ethtool_op_get_tso,
        .set_tso = ethtool_op_set_tso,
 #endif
+       .get_ufo = ethtool_op_get_ufo,
+       .set_ufo = ethtool_op_set_ufo,
        .self_test_count = s2io_ethtool_self_test_count,
        .self_test = s2io_ethtool_test,
        .get_strings = s2io_ethtool_get_strings,
@@ -5941,7 +5968,8 @@ Defaulting to INTA\n");
                        break;
                }
        }
-       config->max_txds = MAX_SKB_FRAGS + 1;
+       /* + 2 because one Txd for skb->data and one Txd for UFO */
+       config->max_txds = MAX_SKB_FRAGS + 2;
 
        /* Rx side parameters. */
        if (rx_ring_sz[0] == 0)
@@ -6035,6 +6063,10 @@ Defaulting to INTA\n");
 #ifdef NETIF_F_TSO
        dev->features |= NETIF_F_TSO;
 #endif
+       if (sp->device_type & XFRAME_II_DEVICE) {
+               dev->features |= NETIF_F_UFO;
+               dev->features |= NETIF_F_HW_CSUM;
+       }
 
        dev->tx_timeout = &s2io_tx_watchdog;
        dev->watchdog_timeo = WATCH_DOG_TIMEOUT;
index 419aad7f10e7c357c469904ca56cea95295daf3b..852a6a899d07cd5d1d9a79b7b724ce447daf5991 100644 (file)
@@ -393,7 +393,9 @@ typedef struct _TxD {
 #define TXD_GATHER_CODE_LAST    BIT(23)
 #define TXD_TCP_LSO_EN          BIT(30)
 #define TXD_UDP_COF_EN          BIT(31)
+#define TXD_UFO_EN             BIT(31) | BIT(30)
 #define TXD_TCP_LSO_MSS(val)    vBIT(val,34,14)
+#define TXD_UFO_MSS(val)       vBIT(val,34,14)
 #define TXD_BUFFER0_SIZE(val)   vBIT(val,48,16)
 
        u64 Control_2;
@@ -789,6 +791,7 @@ struct s2io_nic {
 
        spinlock_t      rx_lock;
        atomic_t        isr_cnt;
+       u64 *ufo_in_band_v;
 };
 
 #define RESET_ERROR 1;
index 1d4d88680db197cb1caa0660360db9001c140090..3d95fa20cd883e969cb3b138f8edb0a07a06c815 100644 (file)
@@ -1,6 +1,6 @@
 /* sis900.c: A SiS 900/7016 PCI Fast Ethernet driver for Linux.
    Copyright 1999 Silicon Integrated System Corporation 
-   Revision:   1.08.08 Jan. 22 2005
+   Revision:   1.08.09 Sep. 19 2005
    
    Modified from the driver which is originally written by Donald Becker.
    
@@ -17,6 +17,7 @@
    SiS 7014 Single Chip 100BASE-TX/10BASE-T Physical Layer Solution,
    preliminary Rev. 1.0 Jan. 18, 1998
 
+   Rev 1.08.09 Sep. 19 2005 Daniele Venzano add Wake on LAN support
    Rev 1.08.08 Jan. 22 2005 Daniele Venzano use netif_msg for debugging messages
    Rev 1.08.07 Nov.  2 2003 Daniele Venzano <webvenza@libero.it> add suspend/resume support
    Rev 1.08.06 Sep. 24 2002 Mufasa Yang bug fix for Tx timeout & add SiS963 support
@@ -76,7 +77,7 @@
 #include "sis900.h"
 
 #define SIS900_MODULE_NAME "sis900"
-#define SIS900_DRV_VERSION "v1.08.08 Jan. 22 2005"
+#define SIS900_DRV_VERSION "v1.08.09 Sep. 19 2005"
 
 static char version[] __devinitdata =
 KERN_INFO "sis900.c: " SIS900_DRV_VERSION "\n";
@@ -538,6 +539,11 @@ static int __devinit sis900_probe(struct pci_dev *pci_dev,
                printk("%2.2x:", (u8)net_dev->dev_addr[i]);
        printk("%2.2x.\n", net_dev->dev_addr[i]);
 
+       /* Detect Wake on Lan support */
+       ret = inl(CFGPMC & PMESP);
+       if (netif_msg_probe(sis_priv) && (ret & PME_D3C) == 0)
+               printk(KERN_INFO "%s: Wake on LAN only available from suspend to RAM.", net_dev->name);
+
        return 0;
 
  err_unmap_rx:
@@ -2015,6 +2021,67 @@ static int sis900_nway_reset(struct net_device *net_dev)
        return mii_nway_restart(&sis_priv->mii_info);
 }
 
+/**
+ *     sis900_set_wol - Set up Wake on Lan registers
+ *     @net_dev: the net device to probe
+ *     @wol: container for info passed to the driver
+ *
+ *     Process ethtool command "wol" to setup wake on lan features.
+ *     SiS900 supports sending WoL events if a correct packet is received,
+ *     but there is no simple way to filter them to only a subset (broadcast,
+ *     multicast, unicast or arp).
+ */
+static int sis900_set_wol(struct net_device *net_dev, struct ethtool_wolinfo *wol)
+{
+       struct sis900_private *sis_priv = net_dev->priv;
+       long pmctrl_addr = net_dev->base_addr + pmctrl;
+       u32 cfgpmcsr = 0, pmctrl_bits = 0;
+
+       if (wol->wolopts == 0) {
+               pci_read_config_dword(sis_priv->pci_dev, CFGPMCSR, &cfgpmcsr);
+               cfgpmcsr |= ~PME_EN;
+               pci_write_config_dword(sis_priv->pci_dev, CFGPMCSR, cfgpmcsr);
+               outl(pmctrl_bits, pmctrl_addr);
+               if (netif_msg_wol(sis_priv))
+                       printk(KERN_DEBUG "%s: Wake on LAN disabled\n", net_dev->name);
+               return 0;
+       }
+
+       if (wol->wolopts & (WAKE_MAGICSECURE | WAKE_UCAST | WAKE_MCAST
+                               | WAKE_BCAST | WAKE_ARP))
+               return -EINVAL;
+
+       if (wol->wolopts & WAKE_MAGIC)
+               pmctrl_bits |= MAGICPKT;
+       if (wol->wolopts & WAKE_PHY)
+               pmctrl_bits |= LINKON;
+       
+       outl(pmctrl_bits, pmctrl_addr);
+
+       pci_read_config_dword(sis_priv->pci_dev, CFGPMCSR, &cfgpmcsr);
+       cfgpmcsr |= PME_EN;
+       pci_write_config_dword(sis_priv->pci_dev, CFGPMCSR, cfgpmcsr);
+       if (netif_msg_wol(sis_priv))
+               printk(KERN_DEBUG "%s: Wake on LAN enabled\n", net_dev->name);
+
+       return 0;
+}
+
+static void sis900_get_wol(struct net_device *net_dev, struct ethtool_wolinfo *wol)
+{
+       long pmctrl_addr = net_dev->base_addr + pmctrl;
+       u32 pmctrl_bits;
+
+       pmctrl_bits = inl(pmctrl_addr);
+       if (pmctrl_bits & MAGICPKT)
+               wol->wolopts |= WAKE_MAGIC;
+       if (pmctrl_bits & LINKON)
+               wol->wolopts |= WAKE_PHY;
+
+       wol->supported = (WAKE_PHY | WAKE_MAGIC);
+}
+
 static struct ethtool_ops sis900_ethtool_ops = {
        .get_drvinfo    = sis900_get_drvinfo,
        .get_msglevel   = sis900_get_msglevel,
@@ -2023,6 +2090,8 @@ static struct ethtool_ops sis900_ethtool_ops = {
        .get_settings   = sis900_get_settings,
        .set_settings   = sis900_set_settings,
        .nway_reset     = sis900_nway_reset,
+       .get_wol        = sis900_get_wol,
+       .set_wol        = sis900_set_wol
 };
 
 /**
index de3c06735d15eab202779adcd714473b5e4844f7..4233ea55670f53e05f9bcc7fd4f2f1e6fba88e6f 100644 (file)
@@ -33,6 +33,7 @@ enum sis900_registers {
         rxcfg=0x34,             //Receive Configuration Register
         flctrl=0x38,            //Flow Control Register
         rxlen=0x3c,             //Receive Packet Length Register
+        cfgpmcsr=0x44,          //Configuration Power Management Control/Status Register
         rfcr=0x48,              //Receive Filter Control Register
         rfdr=0x4C,              //Receive Filter Data Register
         pmctrl=0xB0,            //Power Management Control Register
@@ -140,6 +141,50 @@ enum sis96x_eeprom_command {
        EEREQ = 0x00000400, EEDONE = 0x00000200, EEGNT = 0x00000100
 };
 
+/* PCI Registers */
+enum sis900_pci_registers {
+       CFGPMC   = 0x40,
+       CFGPMCSR = 0x44
+};
+
+/* Power management capabilities bits */
+enum sis900_cfgpmc_register_bits {
+       PMVER   = 0x00070000, 
+       DSI     = 0x00100000,
+       PMESP   = 0xf8000000
+};
+
+enum sis900_pmesp_bits {
+       PME_D0 = 0x1,
+       PME_D1 = 0x2,
+       PME_D2 = 0x4,
+       PME_D3H = 0x8,
+       PME_D3C = 0x10
+};
+
+/* Power management control/status bits */
+enum sis900_cfgpmcsr_register_bits {
+       PMESTS = 0x00004000,
+       PME_EN = 0x00000100, // Power management enable
+       PWR_STA = 0x00000003 // Current power state
+};
+
+/* Wake-on-LAN support. */
+enum sis900_power_management_control_register_bits {
+       LINKLOSS  = 0x00000001,
+       LINKON    = 0x00000002,
+       MAGICPKT  = 0x00000400,
+       ALGORITHM = 0x00000800,
+       FRM1EN    = 0x00100000,
+       FRM2EN    = 0x00200000,
+       FRM3EN    = 0x00400000,
+       FRM1ACS   = 0x01000000,
+       FRM2ACS   = 0x02000000,
+       FRM3ACS   = 0x04000000,
+       WAKEALL   = 0x40000000,
+       GATECLK   = 0x80000000
+};
+
 /* Management Data I/O (mdio) frame */
 #define MIIread         0x6000
 #define MIIwrite        0x5002
index 7653d6e33aa28dc0b0e71f5c9b4cd321eda1c5cd..afd900d5d730e81d32353ecd5882415ab6047d48 100644 (file)
@@ -26,8 +26,7 @@ sk98lin-objs    :=    \
                skrlmt.o        \
                sktimer.o       \
                skvpd.o         \
-               skxmac2.o       \
-               skproc.o
+               skxmac2.o
 
 # DBGDEF =  \
 # -DDEBUG
index 2dc5728e3ef67ab2937387744ab627224c0e69f3..778d9e618ebd545b3349fffca86369b99c65a36d 100644 (file)
@@ -60,7 +60,6 @@ extern SK_U64         SkOsGetTime(SK_AC*);
 extern int             SkPciReadCfgDWord(SK_AC*, int, SK_U32*);
 extern int             SkPciReadCfgWord(SK_AC*, int, SK_U16*);
 extern int             SkPciReadCfgByte(SK_AC*, int, SK_U8*);
-extern int             SkPciWriteCfgDWord(SK_AC*, int, SK_U32);
 extern int             SkPciWriteCfgWord(SK_AC*, int, SK_U16);
 extern int             SkPciWriteCfgByte(SK_AC*, int, SK_U8);
 extern int             SkDrvEvent(SK_AC*, SK_IOC IoC, SK_U32, SK_EVPARA);
@@ -268,8 +267,6 @@ typedef struct s_DevNet DEV_NET;
 struct s_DevNet {
        int             PortNr;
        int             NetNr;
-       int             Mtu;
-       int             Up;
        SK_AC   *pAC;
 };  
 
@@ -298,6 +295,7 @@ struct s_RxPort {
        RXD             *pRxdRingTail;  /* Tail of Rx rings */
        RXD             *pRxdRingPrev;  /* descriptor given to BMU previously */
        int             RxdRingFree;    /* # of free entrys */
+       int             RxCsum;         /* use receive checksum hardware */
        spinlock_t      RxDesRingLock;  /* serialize descriptor accesses */
        int             RxFillLimit;    /* limit for buffers in ring */
        SK_IOC          HwAddr;         /* bmu registers address */
@@ -390,12 +388,10 @@ struct s_AC  {
        
        SK_IOC          IoBase;         /* register set of adapter */
        int             BoardLevel;     /* level of active hw init (0-2) */
-       char            DeviceStr[80];  /* adapter string from vpd */
+
        SK_U32          AllocFlag;      /* flag allocation of resources */
        struct pci_dev  *PciDev;        /* for access to pci config space */
-       SK_U32          PciDevId;       /* pci device id */
        struct SK_NET_DEVICE    *dev[2];        /* pointer to device struct */
-       char            Name[30];       /* driver name */
 
        int             RxBufSize;      /* length of receive buffers */
         struct net_device_stats stats; /* linux 'netstat -i' statistics */
@@ -430,7 +426,6 @@ struct s_AC  {
        DIM_INFO        DynIrqModInfo;  /* all data related to DIM */
 
        /* Only for tests */
-       int             PortUp;
        int             PortDown;
        int             ChipsetType;    /*  Chipset family type 
                                         *  0 == Genesis family support
index bdc1a5eaaae9610533bcbffaffeecd83a01f425d..daa9a8d154fca28f3c23ae824a24c10415094093 100644 (file)
@@ -130,14 +130,12 @@ typedef   struct s_vpd_key {
 #ifndef VPD_DO_IO
 #define VPD_OUT8(pAC,IoC,Addr,Val)     (void)SkPciWriteCfgByte(pAC,Addr,Val)
 #define VPD_OUT16(pAC,IoC,Addr,Val)    (void)SkPciWriteCfgWord(pAC,Addr,Val)
-#define VPD_OUT32(pAC,IoC,Addr,Val)    (void)SkPciWriteCfgDWord(pAC,Addr,Val)
 #define VPD_IN8(pAC,IoC,Addr,pVal)     (void)SkPciReadCfgByte(pAC,Addr,pVal)
 #define VPD_IN16(pAC,IoC,Addr,pVal)    (void)SkPciReadCfgWord(pAC,Addr,pVal)
 #define VPD_IN32(pAC,IoC,Addr,pVal)    (void)SkPciReadCfgDWord(pAC,Addr,pVal)
 #else  /* VPD_DO_IO */
 #define VPD_OUT8(pAC,IoC,Addr,Val)     SK_OUT8(IoC,PCI_C(Addr),Val)
 #define VPD_OUT16(pAC,IoC,Addr,Val)    SK_OUT16(IoC,PCI_C(Addr),Val)
-#define VPD_OUT32(pAC,IoC,Addr,Val)    SK_OUT32(IoC,PCI_C(Addr),Val)
 #define VPD_IN8(pAC,IoC,Addr,pVal)     SK_IN8(IoC,PCI_C(Addr),pVal)
 #define VPD_IN16(pAC,IoC,Addr,pVal)    SK_IN16(IoC,PCI_C(Addr),pVal)
 #define VPD_IN32(pAC,IoC,Addr,pVal)    SK_IN32(IoC,PCI_C(Addr),pVal)
@@ -155,12 +153,6 @@ typedef    struct s_vpd_key {
                else                                            \
                        SK_OUT16(pAC,PCI_C(Addr),Val);          \
                }
-#define VPD_OUT32(pAC,Ioc,Addr,Val) {                  \
-               if ((pAC)->DgT.DgUseCfgCycle)                   \
-                       SkPciWriteCfgDWord(pAC,Addr,Val);       \
-               else                                            \
-                       SK_OUT32(pAC,PCI_C(Addr),Val);          \
-               }
 #define VPD_IN8(pAC,Ioc,Addr,pVal) {                   \
                if ((pAC)->DgT.DgUseCfgCycle)                   \
                        SkPciReadCfgByte(pAC,Addr,pVal);        \
index b71769ae4603ac3a0f89c07aefd626f63795438e..4265ed91a9c4800eee83f7ed2f53ae2a63f1459f 100644 (file)
@@ -539,6 +539,48 @@ static int setPauseParams(struct net_device *dev , struct ethtool_pauseparam *ep
         return ret ? -EIO : 0;
 }
 
+/* Only Yukon supports checksum offload. */
+static int setScatterGather(struct net_device *dev, u32 data)
+{
+       DEV_NET *pNet = netdev_priv(dev);
+       SK_AC *pAC = pNet->pAC;
+
+       if (pAC->GIni.GIChipId == CHIP_ID_GENESIS)
+               return -EOPNOTSUPP;
+       return ethtool_op_set_sg(dev, data);
+}
+
+static int setTxCsum(struct net_device *dev, u32 data)
+{
+       DEV_NET *pNet = netdev_priv(dev);
+       SK_AC *pAC = pNet->pAC;
+
+       if (pAC->GIni.GIChipId == CHIP_ID_GENESIS)
+               return -EOPNOTSUPP;
+
+       return ethtool_op_set_tx_csum(dev, data);
+}
+
+static u32 getRxCsum(struct net_device *dev)
+{
+       DEV_NET *pNet = netdev_priv(dev);
+       SK_AC *pAC = pNet->pAC;
+
+       return pAC->RxPort[pNet->PortNr].RxCsum;
+}
+
+static int setRxCsum(struct net_device *dev, u32 data)
+{
+       DEV_NET *pNet = netdev_priv(dev);
+       SK_AC *pAC = pNet->pAC;
+
+       if (pAC->GIni.GIChipId == CHIP_ID_GENESIS)
+               return -EOPNOTSUPP;
+
+       pAC->RxPort[pNet->PortNr].RxCsum = data != 0;
+       return 0;
+}
+
 struct ethtool_ops SkGeEthtoolOps = {
        .get_settings           = getSettings,
        .set_settings           = setSettings,
@@ -551,4 +593,10 @@ struct ethtool_ops SkGeEthtoolOps = {
        .set_pauseparam         = setPauseParams,
        .get_link               = ethtool_op_get_link,
        .get_perm_addr          = ethtool_op_get_perm_addr,
+       .get_sg                 = ethtool_op_get_sg,
+       .set_sg                 = setScatterGather,
+       .get_tx_csum            = ethtool_op_get_tx_csum,
+       .set_tx_csum            = setTxCsum,
+       .get_rx_csum            = getRxCsum,
+       .set_rx_csum            = setRxCsum,
 };
index 00c5d7f04c68547acfde46204d5b4041098db6bf..e3bdb58360011f853a10f3747de2ce89a7eca14e 100644 (file)
 #include       <linux/module.h>
 #include       <linux/moduleparam.h>
 #include       <linux/init.h>
-#include       <linux/proc_fs.h>
 #include       <linux/dma-mapping.h>
 #include       <linux/ip.h>
 
@@ -206,7 +205,6 @@ static void SkGeSetRxMode(struct SK_NET_DEVICE *dev);
 static struct  net_device_stats *SkGeStats(struct SK_NET_DEVICE *dev);
 static int     SkGeIoctl(struct SK_NET_DEVICE *dev, struct ifreq *rq, int cmd);
 static void    GetConfiguration(SK_AC*);
-static void    ProductStr(SK_AC*);
 static int     XmitFrame(SK_AC*, TX_PORT*, struct sk_buff*);
 static void    FreeTxDescriptors(SK_AC*pAC, TX_PORT*);
 static void    FillRxRing(SK_AC*, RX_PORT*);
@@ -235,28 +233,6 @@ static int      SkDrvDeInitAdapter(SK_AC *pAC, int devNbr);
  * Extern Function Prototypes
  *
  ******************************************************************************/
-static const char      SKRootName[] = "net/sk98lin";
-static struct          proc_dir_entry *pSkRootDir;
-extern struct  file_operations sk_proc_fops;
-
-static inline void SkGeProcCreate(struct net_device *dev)
-{
-       struct proc_dir_entry *pe;
-
-       if (pSkRootDir && 
-           (pe = create_proc_entry(dev->name, S_IRUGO, pSkRootDir))) {
-               pe->proc_fops = &sk_proc_fops;
-               pe->data = dev;
-               pe->owner = THIS_MODULE;
-       }
-}
-static inline void SkGeProcRemove(struct net_device *dev)
-{
-       if (pSkRootDir)
-               remove_proc_entry(dev->name, pSkRootDir);
-}
-
 extern void SkDimEnableModerationIfNeeded(SK_AC *pAC); 
 extern void SkDimDisplayModerationSettings(SK_AC *pAC);
 extern void SkDimStartModerationTimer(SK_AC *pAC);
@@ -277,6 +253,27 @@ extern  struct ethtool_ops SkGeEthtoolOps;
 static uintptr_t TxQueueAddr[SK_MAX_MACS][2] = {{0x680, 0x600},{0x780, 0x700}};
 static uintptr_t RxQueueAddr[SK_MAX_MACS] = {0x400, 0x480};
 
+/*****************************************************************************
+ *
+ *     SkPciWriteCfgDWord - write a 32 bit value to pci config space
+ *
+ * Description:
+ *     This routine writes a 32 bit value to the pci configuration
+ *     space.
+ *
+ * Returns:
+ *     0 - indicate everything worked ok.
+ *     != 0 - error indication
+ */
+static inline int SkPciWriteCfgDWord(
+SK_AC *pAC,    /* Adapter Control structure pointer */
+int PciAddr,           /* PCI register address */
+SK_U32 Val)            /* pointer to store the read value */
+{
+       pci_write_config_dword(pAC->PciDev, PciAddr, Val);
+       return(0);
+} /* SkPciWriteCfgDWord */
+
 /*****************************************************************************
  *
  *     SkGeInitPCI - Init the PCI resources
@@ -300,7 +297,7 @@ int SkGeInitPCI(SK_AC *pAC)
        dev->mem_start = pci_resource_start (pdev, 0);
        pci_set_master(pdev);
 
-       if (pci_request_regions(pdev, pAC->Name) != 0) {
+       if (pci_request_regions(pdev, "sk98lin") != 0) {
                retval = 2;
                goto out_disable;
        }
@@ -578,10 +575,10 @@ SK_BOOL   DualNet;
        spin_unlock_irqrestore(&pAC->SlowPathLock, Flags);
 
        if (pAC->GIni.GIMacsFound == 2) {
-                Ret = request_irq(dev->irq, SkGeIsr, SA_SHIRQ, pAC->Name, dev);
+                Ret = request_irq(dev->irq, SkGeIsr, SA_SHIRQ, "sk98lin", dev);
        } else if (pAC->GIni.GIMacsFound == 1) {
                Ret = request_irq(dev->irq, SkGeIsrOnePort, SA_SHIRQ,
-                       pAC->Name, dev);
+                       "sk98lin", dev);
        } else {
                printk(KERN_WARNING "sk98lin: Illegal number of ports: %d\n",
                       pAC->GIni.GIMacsFound);
@@ -1265,7 +1262,6 @@ struct SK_NET_DEVICE      *dev)
        spin_unlock_irqrestore(&pAC->SlowPathLock, Flags);
 
        pAC->MaxPorts++;
-       pNet->Up = 1;
 
 
        SK_DBG_MSG(NULL, SK_DBGMOD_DRV, SK_DBGCAT_DRV_ENTRY,
@@ -1395,7 +1391,6 @@ struct SK_NET_DEVICE      *dev)
                        sizeof(SK_PNMI_STRUCT_DATA));
 
        pAC->MaxPorts--;
-       pNet->Up = 0;
 
        return (0);
 } /* SkGeClose */
@@ -2168,13 +2163,10 @@ rx_start:
                        skb_put(pMsg, FrameLength);
                } /* frame > SK_COPY_TRESHOLD */
 
-#ifdef USE_SK_RX_CHECKSUM
-               pMsg->csum = pRxd->TcpSums;
-               pMsg->ip_summed = CHECKSUM_HW;
-#else
-               pMsg->ip_summed = CHECKSUM_NONE;
-#endif
-
+               if (pRxPort->RxCsum) {
+                       pMsg->csum = pRxd->TcpSums;
+                       pMsg->ip_summed = CHECKSUM_HW;
+               }
 
                SK_DBG_MSG(NULL, SK_DBGMOD_DRV, 1,("V"));
                ForRlmt = SK_RLMT_RX_PROTOCOL;
@@ -2550,7 +2542,7 @@ unsigned long             Flags;
 static int SkGeChangeMtu(struct SK_NET_DEVICE *dev, int NewMtu)
 {
 DEV_NET                *pNet;
-DEV_NET                *pOtherNet;
+struct net_device *pOtherDev;
 SK_AC          *pAC;
 unsigned long  Flags;
 int            i;
@@ -2580,11 +2572,11 @@ SK_EVPARA       EvPara;
        }
 #endif
 
-       pNet->Mtu = NewMtu;
-       pOtherNet = netdev_priv(pAC->dev[1 - pNet->NetNr]);
-       if ((pOtherNet->Mtu>1500) && (NewMtu<=1500) && (pOtherNet->Up==1)) {
-               return(0);
-       }
+       pOtherDev = pAC->dev[1 - pNet->NetNr];
+
+       if ( netif_running(pOtherDev) && (pOtherDev->mtu > 1500)
+            && (NewMtu <= 1500))
+               return 0;
 
        pAC->RxBufSize = NewMtu + 32;
        dev->mtu = NewMtu;
@@ -2746,7 +2738,8 @@ SK_EVPARA         EvPara;
                EvPara.Para32[1] = -1;
                SkEventQueue(pAC, SKGE_RLMT, SK_RLMT_START, EvPara);
                        
-               if (pOtherNet->Up) {
+               if (netif_running(pOtherDev)) {
+                       DEV_NET *pOtherNet = netdev_priv(pOtherDev);
                        EvPara.Para32[0] = pOtherNet->PortNr;
                        SkEventQueue(pAC, SKGE_RLMT, SK_RLMT_START, EvPara);
                }
@@ -2820,7 +2813,7 @@ unsigned long     Flags;                  /* for spin lock */
        pAC->stats.rx_bytes = (SK_U32) pPnmiStruct->RxOctetsDeliveredCts;
        pAC->stats.tx_bytes = (SK_U32) pPnmiStat->StatTxOctetsOkCts;
        
-        if (pNet->Mtu <= 1500) {
+        if (dev->mtu <= 1500) {
                 pAC->stats.rx_errors = (SK_U32) pPnmiStruct->InErrorsCts & 0xFFFFFFFF;
         } else {
                 pAC->stats.rx_errors = (SK_U32) ((pPnmiStruct->InErrorsCts -
@@ -3771,25 +3764,21 @@ int     Capabilities[3][3] =
  *
  * Returns: N/A
  */
-static void ProductStr(
-SK_AC  *pAC            /* pointer to adapter context */
+static inline int ProductStr(
+       SK_AC   *pAC,           /* pointer to adapter context */
+       char    *DeviceStr,     /* result string */
+       int      StrLen         /* length of the string */
 )
 {
-int    StrLen = 80;            /* length of the string, defined in SK_AC */
 char   Keyword[] = VPD_NAME;   /* vpd productname identifier */
 int    ReturnCode;             /* return code from vpd_read */
 unsigned long Flags;
 
        spin_lock_irqsave(&pAC->SlowPathLock, Flags);
-       ReturnCode = VpdRead(pAC, pAC->IoBase, Keyword, pAC->DeviceStr,
-               &StrLen);
+       ReturnCode = VpdRead(pAC, pAC->IoBase, Keyword, DeviceStr, &StrLen);
        spin_unlock_irqrestore(&pAC->SlowPathLock, Flags);
-       if (ReturnCode != 0) {
-               /* there was an error reading the vpd data */
-               SK_DBG_MSG(NULL, SK_DBGMOD_DRV, SK_DBGCAT_DRV_ERROR,
-                       ("Error reading VPD data: %d\n", ReturnCode));
-               pAC->DeviceStr[0] = '\0';
-       }
+
+       return ReturnCode;
 } /* ProductStr */
 
 /*****************************************************************************
@@ -3990,28 +3979,6 @@ SK_U8 *pVal)             /* pointer to store the read value */
 } /* SkPciReadCfgByte */
 
 
-/*****************************************************************************
- *
- *     SkPciWriteCfgDWord - write a 32 bit value to pci config space
- *
- * Description:
- *     This routine writes a 32 bit value to the pci configuration
- *     space.
- *
- * Returns:
- *     0 - indicate everything worked ok.
- *     != 0 - error indication
- */
-int SkPciWriteCfgDWord(
-SK_AC *pAC,    /* Adapter Control structure pointer */
-int PciAddr,           /* PCI register address */
-SK_U32 Val)            /* pointer to store the read value */
-{
-       pci_write_config_dword(pAC->PciDev, PciAddr, Val);
-       return(0);
-} /* SkPciWriteCfgDWord */
-
-
 /*****************************************************************************
  *
  *     SkPciWriteCfgWord - write a 16 bit value to pci config space
@@ -4150,6 +4117,7 @@ SK_BOOL           DualNet;
                        Flags);
                break;
        case SK_DRV_NET_UP:      /* SK_U32 PortIdx */
+       {       struct net_device *dev = pAC->dev[Param.Para32[0]];
                /* action list 5 */
                FromPort = Param.Para32[0];
                SK_DBG_MSG(NULL, SK_DBGMOD_DRV, SK_DBGCAT_DRV_EVENT,
@@ -4233,22 +4201,12 @@ SK_BOOL         DualNet;
                        printk("    irq moderation:  disabled\n");
 
 
-#ifdef SK_ZEROCOPY
-               if (pAC->ChipsetType)
-#ifdef USE_SK_TX_CHECKSUM
-                       printk("    scatter-gather:  enabled\n");
-#else
-                       printk("    tx-checksum:     disabled\n");
-#endif
-               else
-                       printk("    scatter-gather:  disabled\n");
-#else
-                       printk("    scatter-gather:  disabled\n");
-#endif
-
-#ifndef USE_SK_RX_CHECKSUM
-                       printk("    rx-checksum:     disabled\n");
-#endif
+               printk("    scatter-gather:  %s\n",
+                      (dev->features & NETIF_F_SG) ? "enabled" : "disabled");
+               printk("    tx-checksum:     %s\n",
+                      (dev->features & NETIF_F_IP_CSUM) ? "enabled" : "disabled");
+               printk("    rx-checksum:     %s\n",
+                      pAC->RxPort[Param.Para32[0]].RxCsum ? "enabled" : "disabled");
 
                } else {
                         DoPrintInterfaceChange = SK_TRUE;
@@ -4263,9 +4221,9 @@ SK_BOOL           DualNet;
                }
 
                /* Inform the world that link protocol is up. */
-               netif_carrier_on(pAC->dev[Param.Para32[0]]);
-
+               netif_carrier_on(dev);
                break;
+       }
        case SK_DRV_NET_DOWN:    /* SK_U32 Reason */
                /* action list 7 */
                SK_DBG_MSG(NULL, SK_DBGMOD_DRV, SK_DBGCAT_DRV_EVENT,
@@ -4479,7 +4437,7 @@ SK_AC   *pAc)   /* pointer to adapter context */
 
        pAC->DiagModeActive = DIAG_ACTIVE;
        if (pAC->BoardLevel > SK_INIT_DATA) {
-               if (pNet->Up) {
+               if (netif_running(pAC->dev[0])) {
                        pAC->WasIfUp[0] = SK_TRUE;
                        pAC->DiagFlowCtrl = SK_TRUE; /* for SkGeClose      */
                        DoPrintInterfaceChange = SK_FALSE;
@@ -4489,7 +4447,7 @@ SK_AC   *pAc)   /* pointer to adapter context */
                }
                if (pNet != netdev_priv(pAC->dev[1])) {
                        pNet = netdev_priv(pAC->dev[1]);
-                       if (pNet->Up) {
+                       if (netif_running(pAC->dev[1])) {
                                pAC->WasIfUp[1] = SK_TRUE;
                                pAC->DiagFlowCtrl = SK_TRUE; /* for SkGeClose */
                                DoPrintInterfaceChange = SK_FALSE;
@@ -4815,6 +4773,7 @@ static int __devinit skge_probe_one(struct pci_dev *pdev,
        struct net_device       *dev = NULL;
        static int boards_found = 0;
        int error = -ENODEV;
+       char DeviceStr[80];
 
        if (pci_enable_device(pdev))
                goto out;
@@ -4842,14 +4801,11 @@ static int __devinit skge_probe_one(struct pci_dev *pdev,
        memset(pNet->pAC, 0, sizeof(SK_AC));
        pAC = pNet->pAC;
        pAC->PciDev = pdev;
-       pAC->PciDevId = pdev->device;
+
        pAC->dev[0] = dev;
        pAC->dev[1] = dev;
-       sprintf(pAC->Name, "SysKonnect SK-98xx");
        pAC->CheckQueue = SK_FALSE;
 
-       pNet->Mtu = 1500;
-       pNet->Up = 0;
        dev->irq = pdev->irq;
        error = SkGeInitPCI(pAC);
        if (error) {
@@ -4872,21 +4828,30 @@ static int __devinit skge_probe_one(struct pci_dev *pdev,
        SET_NETDEV_DEV(dev, &pdev->dev);
        SET_ETHTOOL_OPS(dev, &SkGeEthtoolOps);
 
-#ifdef SK_ZEROCOPY
-#ifdef USE_SK_TX_CHECKSUM
+       /* Use only if yukon hardware */
        if (pAC->ChipsetType) {
-               /* Use only if yukon hardware */
-               /* SK and ZEROCOPY - fly baby... */
-               dev->features |= NETIF_F_SG | NETIF_F_IP_CSUM;
-       }
+#ifdef USE_SK_TX_CHECKSUM
+               dev->features |= NETIF_F_IP_CSUM;
 #endif
+#ifdef SK_ZEROCOPY
+               dev->features |= NETIF_F_SG;
+#endif
+#ifdef USE_SK_RX_CHECKSUM
+               pAC->RxPort[0].RxCsum = 1;
 #endif
+       }
 
        pAC->Index = boards_found++;
 
        if (SkGeBoardInit(dev, pAC))
                goto out_free_netdev;
 
+       /* Read Adapter name from VPD */
+       if (ProductStr(pAC, DeviceStr, sizeof(DeviceStr)) != 0) {
+               printk(KERN_ERR "sk98lin: Could not read VPD data.\n");
+               goto out_free_resources;
+       }
+
        /* Register net device */
        if (register_netdev(dev)) {
                printk(KERN_ERR "sk98lin: Could not register device.\n");
@@ -4894,8 +4859,7 @@ static int __devinit skge_probe_one(struct pci_dev *pdev,
        }
 
        /* Print adapter specific string from vpd */
-       ProductStr(pAC);
-       printk("%s: %s\n", dev->name, pAC->DeviceStr);
+       printk("%s: %s\n", dev->name, DeviceStr);
 
        /* Print configuration settings */
        printk("      PrefPort:%c  RlmtMode:%s\n",
@@ -4911,8 +4875,6 @@ static int __devinit skge_probe_one(struct pci_dev *pdev,
        memcpy(&dev->dev_addr, &pAC->Addr.Net[0].CurrentMacAddress, 6);
        memcpy(dev->perm_addr, dev->dev_addr, dev->addr_len);
 
-       SkGeProcCreate(dev);
-
        pNet->PortNr = 0;
        pNet->NetNr  = 0;
 
@@ -4931,8 +4893,6 @@ static int __devinit skge_probe_one(struct pci_dev *pdev,
                pNet->PortNr  = 1;
                pNet->NetNr   = 1;
                pNet->pAC     = pAC;
-               pNet->Mtu     = 1500;
-               pNet->Up      = 0;
 
                dev->open               = &SkGeOpen;
                dev->stop               = &SkGeClose;
@@ -4945,26 +4905,28 @@ static int __devinit skge_probe_one(struct pci_dev *pdev,
                SET_NETDEV_DEV(dev, &pdev->dev);
                SET_ETHTOOL_OPS(dev, &SkGeEthtoolOps);
 
-#ifdef SK_ZEROCOPY
-#ifdef USE_SK_TX_CHECKSUM
                if (pAC->ChipsetType) {
-                       /* SG and ZEROCOPY - fly baby... */
-                       dev->features |= NETIF_F_SG | NETIF_F_IP_CSUM;
-               }
+#ifdef USE_SK_TX_CHECKSUM
+                       dev->features |= NETIF_F_IP_CSUM;
 #endif
+#ifdef SK_ZEROCOPY
+                       dev->features |= NETIF_F_SG;
+#endif
+#ifdef USE_SK_RX_CHECKSUM
+                       pAC->RxPort[1].RxCsum = 1;
 #endif
+               }
 
                if (register_netdev(dev)) {
                        printk(KERN_ERR "sk98lin: Could not register device for seconf port.\n");
                        free_netdev(dev);
                        pAC->dev[1] = pAC->dev[0];
                } else {
-                       SkGeProcCreate(dev);
                        memcpy(&dev->dev_addr,
                                        &pAC->Addr.Net[1].CurrentMacAddress, 6);
                        memcpy(dev->perm_addr, dev->dev_addr, dev->addr_len);
        
-                       printk("%s: %s\n", dev->name, pAC->DeviceStr);
+                       printk("%s: %s\n", dev->name, DeviceStr);
                        printk("      PrefPort:B  RlmtMode:Dual Check Link State\n");
                }
        }
@@ -5000,10 +4962,7 @@ static void __devexit skge_remove_one(struct pci_dev *pdev)
        SK_AC *pAC = pNet->pAC;
        struct net_device *otherdev = pAC->dev[1];
 
-       SkGeProcRemove(dev);
        unregister_netdev(dev);
-       if (otherdev != dev)
-               SkGeProcRemove(otherdev);
 
        SkGeYellowLED(pAC, pAC->IoBase, 0);
 
@@ -5088,9 +5047,9 @@ static int skge_resume(struct pci_dev *pdev)
        pci_enable_device(pdev);
        pci_set_master(pdev);
        if (pAC->GIni.GIMacsFound == 2)
-               ret = request_irq(dev->irq, SkGeIsr, SA_SHIRQ, pAC->Name, dev);
+               ret = request_irq(dev->irq, SkGeIsr, SA_SHIRQ, "sk98lin", dev);
        else
-               ret = request_irq(dev->irq, SkGeIsrOnePort, SA_SHIRQ, pAC->Name, dev);
+               ret = request_irq(dev->irq, SkGeIsrOnePort, SA_SHIRQ, "sk98lin", dev);
        if (ret) {
                printk(KERN_WARNING "sk98lin: unable to acquire IRQ %d\n", dev->irq);
                pAC->AllocFlag &= ~SK_ALLOC_IRQ;
@@ -5148,23 +5107,12 @@ static struct pci_driver skge_driver = {
 
 static int __init skge_init(void)
 {
-       int error;
-
-       pSkRootDir = proc_mkdir(SKRootName, NULL);
-       if (pSkRootDir) 
-               pSkRootDir->owner = THIS_MODULE;
-       
-       error = pci_register_driver(&skge_driver);
-       if (error)
-               remove_proc_entry(SKRootName, NULL);
-       return error;
+       return pci_module_init(&skge_driver);
 }
 
 static void __exit skge_exit(void)
 {
        pci_unregister_driver(&skge_driver);
-       remove_proc_entry(SKRootName, NULL);
-
 }
 
 module_init(skge_init);
diff --git a/drivers/net/sk98lin/skproc.c b/drivers/net/sk98lin/skproc.c
deleted file mode 100644 (file)
index 5cece25..0000000
+++ /dev/null
@@ -1,265 +0,0 @@
-/******************************************************************************
- *
- * Name:       skproc.c
- * Project:    GEnesis, PCI Gigabit Ethernet Adapter
- * Version:    $Revision: 1.11 $
- * Date:       $Date: 2003/12/11 16:03:57 $
- * Purpose:    Funktions to display statictic data
- *
- ******************************************************************************/
-/******************************************************************************
- *
- *     (C)Copyright 1998-2002 SysKonnect GmbH.
- *     (C)Copyright 2002-2003 Marvell.
- *
- *     This program is free software; you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
- *     the Free Software Foundation; either version 2 of the License, or
- *     (at your option) any later version.
- *
- *     Created 22-Nov-2000
- *     Author: Mirko Lindner (mlindner@syskonnect.de)
- *
- *     The information in this file is provided "AS IS" without warranty.
- *
- ******************************************************************************/
-#include <linux/proc_fs.h>
-#include <linux/seq_file.h>
-
-#include "h/skdrv1st.h"
-#include "h/skdrv2nd.h"
-#include "h/skversion.h"
-
-static int sk_seq_show(struct seq_file *seq, void *v);
-static int sk_proc_open(struct inode *inode, struct file *file);
-
-struct file_operations sk_proc_fops = {
-       .owner          = THIS_MODULE,
-       .open           = sk_proc_open,
-       .read           = seq_read,
-       .llseek         = seq_lseek,
-       .release        = single_release,
-};
-
-
-/*****************************************************************************
- *
- *      sk_seq_show - show proc information of a particular adapter
- *
- * Description:
- *  This function fills the proc entry with statistic data about 
- *  the ethernet device. It invokes the generic sk_gen_browse() to
- *  print out all items one per one.
- *  
- * Returns: 0
- *      
- */
-static int sk_seq_show(struct seq_file *seq, void *v)
-{
-       struct net_device *dev = seq->private;
-       DEV_NET                 *pNet = netdev_priv(dev);
-       SK_AC                   *pAC = pNet->pAC;
-       SK_PNMI_STRUCT_DATA     *pPnmiStruct = &pAC->PnmiStruct;
-       unsigned long           Flags;  
-       unsigned int            Size;
-       char                    sens_msg[50];
-       int                     t;
-       int                     i;
-
-       /* NetIndex in GetStruct is now required, zero is only dummy */
-       for (t=pAC->GIni.GIMacsFound; t > 0; t--) {
-               if ((pAC->GIni.GIMacsFound == 2) && pAC->RlmtNets == 1)
-                       t--;
-
-               spin_lock_irqsave(&pAC->SlowPathLock, Flags);
-               Size = SK_PNMI_STRUCT_SIZE;
-#ifdef SK_DIAG_SUPPORT
-               if (pAC->BoardLevel == SK_INIT_DATA) {
-                       SK_MEMCPY(&(pAC->PnmiStruct), &(pAC->PnmiBackup), sizeof(SK_PNMI_STRUCT_DATA));
-                       if (pAC->DiagModeActive == DIAG_NOTACTIVE) {
-                               pAC->Pnmi.DiagAttached = SK_DIAG_IDLE;
-                       }
-               } else {
-                       SkPnmiGetStruct(pAC, pAC->IoBase, pPnmiStruct, &Size, t-1);
-               }
-#else
-               SkPnmiGetStruct(pAC, pAC->IoBase, 
-                               pPnmiStruct, &Size, t-1);
-#endif
-               spin_unlock_irqrestore(&pAC->SlowPathLock, Flags);
-       
-               if (pAC->dev[t-1] == dev) {
-                       SK_PNMI_STAT    *pPnmiStat = &pPnmiStruct->Stat[0];
-
-                       seq_printf(seq, "\nDetailed statistic for device %s\n",
-                                     pAC->dev[t-1]->name);
-                       seq_printf(seq, "=======================================\n");
-       
-                       /* Board statistics */
-                       seq_printf(seq, "\nBoard statistics\n\n");
-                       seq_printf(seq, "Active Port                    %c\n",
-                                     'A' + pAC->Rlmt.Net[t-1].Port[pAC->Rlmt.
-                                                                   Net[t-1].PrefPort]->PortNumber);
-                       seq_printf(seq, "Preferred Port                 %c\n",
-                                     'A' + pAC->Rlmt.Net[t-1].Port[pAC->Rlmt.
-                                                                   Net[t-1].PrefPort]->PortNumber);
-
-                       seq_printf(seq, "Bus speed (MHz)                %d\n",
-                                     pPnmiStruct->BusSpeed);
-
-                       seq_printf(seq, "Bus width (Bit)                %d\n",
-                                     pPnmiStruct->BusWidth);
-                       seq_printf(seq, "Driver version                 %s\n",
-                                     VER_STRING);
-                       seq_printf(seq, "Hardware revision              v%d.%d\n",
-                                     (pAC->GIni.GIPciHwRev >> 4) & 0x0F,
-                                     pAC->GIni.GIPciHwRev & 0x0F);
-
-                       /* Print sensor informations */
-                       for (i=0; i < pAC->I2c.MaxSens; i ++) {
-                               /* Check type */
-                               switch (pAC->I2c.SenTable[i].SenType) {
-                               case 1:
-                                       strcpy(sens_msg, pAC->I2c.SenTable[i].SenDesc);
-                                       strcat(sens_msg, " (C)");
-                                       seq_printf(seq, "%-25s      %d.%02d\n",
-                                                     sens_msg,
-                                                     pAC->I2c.SenTable[i].SenValue / 10,
-                                                     pAC->I2c.SenTable[i].SenValue % 10);
-
-                                       strcpy(sens_msg, pAC->I2c.SenTable[i].SenDesc);
-                                       strcat(sens_msg, " (F)");
-                                       seq_printf(seq, "%-25s      %d.%02d\n",
-                                                     sens_msg,
-                                                     ((((pAC->I2c.SenTable[i].SenValue)
-                                                        *10)*9)/5 + 3200)/100,
-                                                     ((((pAC->I2c.SenTable[i].SenValue)
-                                                        *10)*9)/5 + 3200) % 10);
-                                       break;
-                               case 2:
-                                       strcpy(sens_msg, pAC->I2c.SenTable[i].SenDesc);
-                                       strcat(sens_msg, " (V)");
-                                       seq_printf(seq, "%-25s      %d.%03d\n",
-                                                     sens_msg,
-                                                     pAC->I2c.SenTable[i].SenValue / 1000,
-                                                     pAC->I2c.SenTable[i].SenValue % 1000);
-                                       break;
-                               case 3:
-                                       strcpy(sens_msg, pAC->I2c.SenTable[i].SenDesc);
-                                       strcat(sens_msg, " (rpm)");
-                                       seq_printf(seq, "%-25s      %d\n",
-                                                     sens_msg,
-                                                     pAC->I2c.SenTable[i].SenValue);
-                                       break;
-                               default:
-                                       break;
-                               }
-                       }
-                               
-                       /*Receive statistics */
-                       seq_printf(seq, "\nReceive statistics\n\n");
-
-                       seq_printf(seq, "Received bytes                 %Lu\n",
-                                     (unsigned long long) pPnmiStat->StatRxOctetsOkCts);
-                       seq_printf(seq, "Received packets               %Lu\n",
-                                     (unsigned long long) pPnmiStat->StatRxOkCts);
-#if 0
-                       if (pAC->GIni.GP[0].PhyType == SK_PHY_XMAC && 
-                           pAC->HWRevision < 12) {
-                               pPnmiStruct->InErrorsCts = pPnmiStruct->InErrorsCts - 
-                                       pPnmiStat->StatRxShortsCts;
-                               pPnmiStat->StatRxShortsCts = 0;
-                       }
-#endif
-                       if (dev->mtu > 1500)
-                               pPnmiStruct->InErrorsCts = pPnmiStruct->InErrorsCts -
-                                       pPnmiStat->StatRxTooLongCts;
-
-                       seq_printf(seq, "Receive errors                 %Lu\n",
-                                     (unsigned long long) pPnmiStruct->InErrorsCts);
-                       seq_printf(seq, "Receive dropped                %Lu\n",
-                                     (unsigned long long) pPnmiStruct->RxNoBufCts);
-                       seq_printf(seq, "Received multicast             %Lu\n",
-                                     (unsigned long long) pPnmiStat->StatRxMulticastOkCts);
-                       seq_printf(seq, "Receive error types\n");
-                       seq_printf(seq, "   length                      %Lu\n",
-                                     (unsigned long long) pPnmiStat->StatRxRuntCts);
-                       seq_printf(seq, "   buffer overflow             %Lu\n",
-                                     (unsigned long long) pPnmiStat->StatRxFifoOverflowCts);
-                       seq_printf(seq, "   bad crc                     %Lu\n",
-                                     (unsigned long long) pPnmiStat->StatRxFcsCts);
-                       seq_printf(seq, "   framing                     %Lu\n",
-                                     (unsigned long long) pPnmiStat->StatRxFramingCts);
-                       seq_printf(seq, "   missed frames               %Lu\n",
-                                     (unsigned long long) pPnmiStat->StatRxMissedCts);
-
-                       if (dev->mtu > 1500)
-                               pPnmiStat->StatRxTooLongCts = 0;
-
-                       seq_printf(seq, "   too long                    %Lu\n",
-                                     (unsigned long long) pPnmiStat->StatRxTooLongCts);                                        
-                       seq_printf(seq, "   carrier extension           %Lu\n",
-                                     (unsigned long long) pPnmiStat->StatRxCextCts);                           
-                       seq_printf(seq, "   too short                   %Lu\n",
-                                     (unsigned long long) pPnmiStat->StatRxShortsCts);                         
-                       seq_printf(seq, "   symbol                      %Lu\n",
-                                     (unsigned long long) pPnmiStat->StatRxSymbolCts);                         
-                       seq_printf(seq, "   LLC MAC size                %Lu\n",
-                                     (unsigned long long) pPnmiStat->StatRxIRLengthCts);                               
-                       seq_printf(seq, "   carrier event               %Lu\n",
-                                     (unsigned long long) pPnmiStat->StatRxCarrierCts);                                
-                       seq_printf(seq, "   jabber                      %Lu\n",
-                                     (unsigned long long) pPnmiStat->StatRxJabberCts);                         
-
-
-                       /*Transmit statistics */
-                       seq_printf(seq, "\nTransmit statistics\n\n");
-                               
-                       seq_printf(seq, "Transmited bytes               %Lu\n",
-                                     (unsigned long long) pPnmiStat->StatTxOctetsOkCts);
-                       seq_printf(seq, "Transmited packets             %Lu\n",
-                                     (unsigned long long) pPnmiStat->StatTxOkCts);
-                       seq_printf(seq, "Transmit errors                %Lu\n",
-                                     (unsigned long long) pPnmiStat->StatTxSingleCollisionCts);
-                       seq_printf(seq, "Transmit dropped               %Lu\n",
-                                     (unsigned long long) pPnmiStruct->TxNoBufCts);
-                       seq_printf(seq, "Transmit collisions            %Lu\n",
-                                     (unsigned long long) pPnmiStat->StatTxSingleCollisionCts);
-                       seq_printf(seq, "Transmit error types\n");
-                       seq_printf(seq, "   excessive collision         %ld\n",
-                                     pAC->stats.tx_aborted_errors);
-                       seq_printf(seq, "   carrier                     %Lu\n",
-                                     (unsigned long long) pPnmiStat->StatTxCarrierCts);
-                       seq_printf(seq, "   fifo underrun               %Lu\n",
-                                     (unsigned long long) pPnmiStat->StatTxFifoUnderrunCts);
-                       seq_printf(seq, "   heartbeat                   %Lu\n",
-                                     (unsigned long long) pPnmiStat->StatTxCarrierCts);
-                       seq_printf(seq, "   window                      %ld\n",
-                                     pAC->stats.tx_window_errors);
-                               
-               }
-       }
-       return 0;
-}
-
-/*****************************************************************************
- *
- *      sk_proc_open - register the show function when proc is open'ed
- *  
- * Description:
- *  This function is called whenever a sk98lin proc file is queried.
- *  
- * Returns: the return value of single_open()
- *      
- */
-static int sk_proc_open(struct inode *inode, struct file *file)
-{
-    return single_open(file, sk_seq_show, PDE(inode)->data);
-}
-
-/*******************************************************************************
- *
- * End of file
- *
- ******************************************************************************/
diff --git a/drivers/net/sky2.c b/drivers/net/sky2.c
new file mode 100644 (file)
index 0000000..7af72cd
--- /dev/null
@@ -0,0 +1,3233 @@
+/*
+ * New driver for Marvell Yukon 2 chipset.
+ * Based on earlier sk98lin, and skge driver.
+ *
+ * This driver intentionally does not support all the features
+ * of the original driver such as link fail-over and link management because
+ * those should be done at higher levels.
+ *
+ * Copyright (C) 2005 Stephen Hemminger <shemminger@osdl.org>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+/*
+ * TOTEST
+ *     - speed setting
+ *     - suspend/resume
+ */
+
+#include <linux/config.h>
+#include <linux/crc32.h>
+#include <linux/kernel.h>
+#include <linux/version.h>
+#include <linux/module.h>
+#include <linux/netdevice.h>
+#include <linux/dma-mapping.h>
+#include <linux/etherdevice.h>
+#include <linux/ethtool.h>
+#include <linux/pci.h>
+#include <linux/ip.h>
+#include <linux/tcp.h>
+#include <linux/in.h>
+#include <linux/delay.h>
+#include <linux/workqueue.h>
+#include <linux/if_vlan.h>
+#include <linux/prefetch.h>
+#include <linux/mii.h>
+
+#include <asm/irq.h>
+
+#if defined(CONFIG_VLAN_8021Q) || defined(CONFIG_VLAN_8021Q_MODULE)
+#define SKY2_VLAN_TAG_USED 1
+#endif
+
+#include "sky2.h"
+
+#define DRV_NAME               "sky2"
+#define DRV_VERSION            "0.10"
+#define PFX                    DRV_NAME " "
+
+/*
+ * The Yukon II chipset takes 64 bit command blocks (called list elements)
+ * that are organized into three (receive, transmit, status) different rings
+ * similar to Tigon3. A transmit can require several elements;
+ * a receive requires one (or two if using 64 bit dma).
+ */
+
+#define is_ec_a1(hw) \
+       unlikely((hw)->chip_id == CHIP_ID_YUKON_EC && \
+                (hw)->chip_rev == CHIP_REV_YU_EC_A1)
+
+#define RX_LE_SIZE             512
+#define RX_LE_BYTES            (RX_LE_SIZE*sizeof(struct sky2_rx_le))
+#define RX_MAX_PENDING         (RX_LE_SIZE/2 - 2)
+#define RX_DEF_PENDING         RX_MAX_PENDING
+
+#define TX_RING_SIZE           512
+#define TX_DEF_PENDING         (TX_RING_SIZE - 1)
+#define TX_MIN_PENDING         64
+#define MAX_SKB_TX_LE          (4 + 2*MAX_SKB_FRAGS)
+
+#define STATUS_RING_SIZE       2048    /* 2 ports * (TX + 2*RX) */
+#define STATUS_LE_BYTES                (STATUS_RING_SIZE*sizeof(struct sky2_status_le))
+#define ETH_JUMBO_MTU          9000
+#define TX_WATCHDOG            (5 * HZ)
+#define NAPI_WEIGHT            64
+#define PHY_RETRIES            1000
+
+static const u32 default_msg =
+    NETIF_MSG_DRV | NETIF_MSG_PROBE | NETIF_MSG_LINK
+    | NETIF_MSG_TIMER | NETIF_MSG_TX_ERR | NETIF_MSG_RX_ERR
+    | NETIF_MSG_IFUP | NETIF_MSG_IFDOWN | NETIF_MSG_INTR;
+
+static int debug = -1;         /* defaults above */
+module_param(debug, int, 0);
+MODULE_PARM_DESC(debug, "Debug level (0=none,...,16=all)");
+
+static int copybreak __read_mostly = 256;
+module_param(copybreak, int, 0);
+MODULE_PARM_DESC(copybreak, "Receive copy threshold");
+
+static const struct pci_device_id sky2_id_table[] = {
+       { PCI_DEVICE(PCI_VENDOR_ID_SYSKONNECT, 0x9000) },
+       { PCI_DEVICE(PCI_VENDOR_ID_SYSKONNECT, 0x9E00) },
+       { PCI_DEVICE(PCI_VENDOR_ID_DLINK, 0x4b00) },
+       { PCI_DEVICE(PCI_VENDOR_ID_DLINK, 0x4b01) },
+       { PCI_DEVICE(PCI_VENDOR_ID_MARVELL, 0x4340) },
+       { PCI_DEVICE(PCI_VENDOR_ID_MARVELL, 0x4341) },
+       { PCI_DEVICE(PCI_VENDOR_ID_MARVELL, 0x4342) },
+       { PCI_DEVICE(PCI_VENDOR_ID_MARVELL, 0x4343) },
+       { PCI_DEVICE(PCI_VENDOR_ID_MARVELL, 0x4344) },
+       { PCI_DEVICE(PCI_VENDOR_ID_MARVELL, 0x4345) },
+       { PCI_DEVICE(PCI_VENDOR_ID_MARVELL, 0x4346) },
+       { PCI_DEVICE(PCI_VENDOR_ID_MARVELL, 0x4347) },
+       { PCI_DEVICE(PCI_VENDOR_ID_MARVELL, 0x4350) },
+       { PCI_DEVICE(PCI_VENDOR_ID_MARVELL, 0x4351) },
+       { PCI_DEVICE(PCI_VENDOR_ID_MARVELL, 0x4352) },
+       { PCI_DEVICE(PCI_VENDOR_ID_MARVELL, 0x4360) },
+       { PCI_DEVICE(PCI_VENDOR_ID_MARVELL, 0x4361) },
+       { PCI_DEVICE(PCI_VENDOR_ID_MARVELL, 0x4362) },
+       { PCI_DEVICE(PCI_VENDOR_ID_MARVELL, 0x4363) },
+       { 0 }
+};
+
+MODULE_DEVICE_TABLE(pci, sky2_id_table);
+
+/* Avoid conditionals by using array */
+static const unsigned txqaddr[] = { Q_XA1, Q_XA2 };
+static const unsigned rxqaddr[] = { Q_R1, Q_R2 };
+
+/* This driver supports yukon2 chipset only */
+static const char *yukon2_name[] = {
+       "XL",           /* 0xb3 */
+       "EC Ultra",     /* 0xb4 */
+       "UNKNOWN",      /* 0xb5 */
+       "EC",           /* 0xb6 */
+       "FE",           /* 0xb7 */
+};
+
+/* Access to external PHY */
+static int gm_phy_write(struct sky2_hw *hw, unsigned port, u16 reg, u16 val)
+{
+       int i;
+
+       gma_write16(hw, port, GM_SMI_DATA, val);
+       gma_write16(hw, port, GM_SMI_CTRL,
+                   GM_SMI_CT_PHY_AD(PHY_ADDR_MARV) | GM_SMI_CT_REG_AD(reg));
+
+       for (i = 0; i < PHY_RETRIES; i++) {
+               if (!(gma_read16(hw, port, GM_SMI_CTRL) & GM_SMI_CT_BUSY))
+                       return 0;
+               udelay(1);
+       }
+
+       printk(KERN_WARNING PFX "%s: phy write timeout\n", hw->dev[port]->name);
+       return -ETIMEDOUT;
+}
+
+static int __gm_phy_read(struct sky2_hw *hw, unsigned port, u16 reg, u16 *val)
+{
+       int i;
+
+       gma_write16(hw, port, GM_SMI_CTRL, GM_SMI_CT_PHY_AD(PHY_ADDR_MARV)
+                   | GM_SMI_CT_REG_AD(reg) | GM_SMI_CT_OP_RD);
+
+       for (i = 0; i < PHY_RETRIES; i++) {
+               if (gma_read16(hw, port, GM_SMI_CTRL) & GM_SMI_CT_RD_VAL) {
+                       *val = gma_read16(hw, port, GM_SMI_DATA);
+                       return 0;
+               }
+
+               udelay(1);
+       }
+
+       return -ETIMEDOUT;
+}
+
+static u16 gm_phy_read(struct sky2_hw *hw, unsigned port, u16 reg)
+{
+       u16 v;
+
+       if (__gm_phy_read(hw, port, reg, &v) != 0)
+               printk(KERN_WARNING PFX "%s: phy read timeout\n", hw->dev[port]->name);
+       return v;
+}
+
+static int sky2_set_power_state(struct sky2_hw *hw, pci_power_t state)
+{
+       u16 power_control;
+       u32 reg1;
+       int vaux;
+       int ret = 0;
+
+       pr_debug("sky2_set_power_state %d\n", state);
+       sky2_write8(hw, B2_TST_CTRL1, TST_CFG_WRITE_ON);
+
+       pci_read_config_word(hw->pdev, hw->pm_cap + PCI_PM_PMC, &power_control);
+       vaux = (sky2_read8(hw, B0_CTST) & Y2_VAUX_AVAIL) &&
+               (power_control & PCI_PM_CAP_PME_D3cold);
+
+       pci_read_config_word(hw->pdev, hw->pm_cap + PCI_PM_CTRL, &power_control);
+
+       power_control |= PCI_PM_CTRL_PME_STATUS;
+       power_control &= ~(PCI_PM_CTRL_STATE_MASK);
+
+       switch (state) {
+       case PCI_D0:
+               /* switch power to VCC (WA for VAUX problem) */
+               sky2_write8(hw, B0_POWER_CTRL,
+                           PC_VAUX_ENA | PC_VCC_ENA | PC_VAUX_OFF | PC_VCC_ON);
+
+               /* disable Core Clock Division, */
+               sky2_write32(hw, B2_Y2_CLK_CTRL, Y2_CLK_DIV_DIS);
+
+               if (hw->chip_id == CHIP_ID_YUKON_XL && hw->chip_rev > 1)
+                       /* enable bits are inverted */
+                       sky2_write8(hw, B2_Y2_CLK_GATE,
+                                   Y2_PCI_CLK_LNK1_DIS | Y2_COR_CLK_LNK1_DIS |
+                                   Y2_CLK_GAT_LNK1_DIS | Y2_PCI_CLK_LNK2_DIS |
+                                   Y2_COR_CLK_LNK2_DIS | Y2_CLK_GAT_LNK2_DIS);
+               else
+                       sky2_write8(hw, B2_Y2_CLK_GATE, 0);
+
+               /* Turn off phy power saving */
+               pci_read_config_dword(hw->pdev, PCI_DEV_REG1, &reg1);
+               reg1 &= ~(PCI_Y2_PHY1_POWD | PCI_Y2_PHY2_POWD);
+
+               /* looks like this XL is back asswards .. */
+               if (hw->chip_id == CHIP_ID_YUKON_XL && hw->chip_rev > 1) {
+                       reg1 |= PCI_Y2_PHY1_COMA;
+                       if (hw->ports > 1)
+                               reg1 |= PCI_Y2_PHY2_COMA;
+               }
+               pci_write_config_dword(hw->pdev, PCI_DEV_REG1, reg1);
+               break;
+
+       case PCI_D3hot:
+       case PCI_D3cold:
+               /* Turn on phy power saving */
+               pci_read_config_dword(hw->pdev, PCI_DEV_REG1, &reg1);
+               if (hw->chip_id == CHIP_ID_YUKON_XL && hw->chip_rev > 1)
+                       reg1 &= ~(PCI_Y2_PHY1_POWD | PCI_Y2_PHY2_POWD);
+               else
+                       reg1 |= (PCI_Y2_PHY1_POWD | PCI_Y2_PHY2_POWD);
+               pci_write_config_dword(hw->pdev, PCI_DEV_REG1, reg1);
+
+               if (hw->chip_id == CHIP_ID_YUKON_XL && hw->chip_rev > 1)
+                       sky2_write8(hw, B2_Y2_CLK_GATE, 0);
+               else
+                       /* enable bits are inverted */
+                       sky2_write8(hw, B2_Y2_CLK_GATE,
+                                   Y2_PCI_CLK_LNK1_DIS | Y2_COR_CLK_LNK1_DIS |
+                                   Y2_CLK_GAT_LNK1_DIS | Y2_PCI_CLK_LNK2_DIS |
+                                   Y2_COR_CLK_LNK2_DIS | Y2_CLK_GAT_LNK2_DIS);
+
+               /* switch power to VAUX */
+               if (vaux && state != PCI_D3cold)
+                       sky2_write8(hw, B0_POWER_CTRL,
+                                   (PC_VAUX_ENA | PC_VCC_ENA |
+                                    PC_VAUX_ON | PC_VCC_OFF));
+               break;
+       default:
+               printk(KERN_ERR PFX "Unknown power state %d\n", state);
+               ret = -1;
+       }
+
+       pci_write_config_byte(hw->pdev, hw->pm_cap + PCI_PM_CTRL, power_control);
+       sky2_write8(hw, B2_TST_CTRL1, TST_CFG_WRITE_OFF);
+       return ret;
+}
+
+static void sky2_phy_reset(struct sky2_hw *hw, unsigned port)
+{
+       u16 reg;
+
+       /* disable all GMAC IRQ's */
+       sky2_write8(hw, SK_REG(port, GMAC_IRQ_MSK), 0);
+       /* disable PHY IRQs */
+       gm_phy_write(hw, port, PHY_MARV_INT_MASK, 0);
+
+       gma_write16(hw, port, GM_MC_ADDR_H1, 0);        /* clear MC hash */
+       gma_write16(hw, port, GM_MC_ADDR_H2, 0);
+       gma_write16(hw, port, GM_MC_ADDR_H3, 0);
+       gma_write16(hw, port, GM_MC_ADDR_H4, 0);
+
+       reg = gma_read16(hw, port, GM_RX_CTRL);
+       reg |= GM_RXCR_UCF_ENA | GM_RXCR_MCF_ENA;
+       gma_write16(hw, port, GM_RX_CTRL, reg);
+}
+
+static void sky2_phy_init(struct sky2_hw *hw, unsigned port)
+{
+       struct sky2_port *sky2 = netdev_priv(hw->dev[port]);
+       u16 ctrl, ct1000, adv, pg, ledctrl, ledover;
+
+       if (sky2->autoneg == AUTONEG_ENABLE && hw->chip_id != CHIP_ID_YUKON_XL) {
+               u16 ectrl = gm_phy_read(hw, port, PHY_MARV_EXT_CTRL);
+
+               ectrl &= ~(PHY_M_EC_M_DSC_MSK | PHY_M_EC_S_DSC_MSK |
+                          PHY_M_EC_MAC_S_MSK);
+               ectrl |= PHY_M_EC_MAC_S(MAC_TX_CLK_25_MHZ);
+
+               if (hw->chip_id == CHIP_ID_YUKON_EC)
+                       ectrl |= PHY_M_EC_DSC_2(2) | PHY_M_EC_DOWN_S_ENA;
+               else
+                       ectrl |= PHY_M_EC_M_DSC(2) | PHY_M_EC_S_DSC(3);
+
+               gm_phy_write(hw, port, PHY_MARV_EXT_CTRL, ectrl);
+       }
+
+       ctrl = gm_phy_read(hw, port, PHY_MARV_PHY_CTRL);
+       if (hw->copper) {
+               if (hw->chip_id == CHIP_ID_YUKON_FE) {
+                       /* enable automatic crossover */
+                       ctrl |= PHY_M_PC_MDI_XMODE(PHY_M_PC_ENA_AUTO) >> 1;
+               } else {
+                       /* disable energy detect */
+                       ctrl &= ~PHY_M_PC_EN_DET_MSK;
+
+                       /* enable automatic crossover */
+                       ctrl |= PHY_M_PC_MDI_XMODE(PHY_M_PC_ENA_AUTO);
+
+                       if (sky2->autoneg == AUTONEG_ENABLE &&
+                           hw->chip_id == CHIP_ID_YUKON_XL) {
+                               ctrl &= ~PHY_M_PC_DSC_MSK;
+                               ctrl |= PHY_M_PC_DSC(2) | PHY_M_PC_DOWN_S_ENA;
+                       }
+               }
+               gm_phy_write(hw, port, PHY_MARV_PHY_CTRL, ctrl);
+       } else {
+               /* workaround for deviation #4.88 (CRC errors) */
+               /* disable Automatic Crossover */
+
+               ctrl &= ~PHY_M_PC_MDIX_MSK;
+               gm_phy_write(hw, port, PHY_MARV_PHY_CTRL, ctrl);
+
+               if (hw->chip_id == CHIP_ID_YUKON_XL) {
+                       /* Fiber: select 1000BASE-X only mode MAC Specific Ctrl Reg. */
+                       gm_phy_write(hw, port, PHY_MARV_EXT_ADR, 2);
+                       ctrl = gm_phy_read(hw, port, PHY_MARV_PHY_CTRL);
+                       ctrl &= ~PHY_M_MAC_MD_MSK;
+                       ctrl |= PHY_M_MAC_MODE_SEL(PHY_M_MAC_MD_1000BX);
+                       gm_phy_write(hw, port, PHY_MARV_PHY_CTRL, ctrl);
+
+                       /* select page 1 to access Fiber registers */
+                       gm_phy_write(hw, port, PHY_MARV_EXT_ADR, 1);
+               }
+       }
+
+       ctrl = gm_phy_read(hw, port, PHY_MARV_CTRL);
+       if (sky2->autoneg == AUTONEG_DISABLE)
+               ctrl &= ~PHY_CT_ANE;
+       else
+               ctrl |= PHY_CT_ANE;
+
+       ctrl |= PHY_CT_RESET;
+       gm_phy_write(hw, port, PHY_MARV_CTRL, ctrl);
+
+       ctrl = 0;
+       ct1000 = 0;
+       adv = PHY_AN_CSMA;
+
+       if (sky2->autoneg == AUTONEG_ENABLE) {
+               if (hw->copper) {
+                       if (sky2->advertising & ADVERTISED_1000baseT_Full)
+                               ct1000 |= PHY_M_1000C_AFD;
+                       if (sky2->advertising & ADVERTISED_1000baseT_Half)
+                               ct1000 |= PHY_M_1000C_AHD;
+                       if (sky2->advertising & ADVERTISED_100baseT_Full)
+                               adv |= PHY_M_AN_100_FD;
+                       if (sky2->advertising & ADVERTISED_100baseT_Half)
+                               adv |= PHY_M_AN_100_HD;
+                       if (sky2->advertising & ADVERTISED_10baseT_Full)
+                               adv |= PHY_M_AN_10_FD;
+                       if (sky2->advertising & ADVERTISED_10baseT_Half)
+                               adv |= PHY_M_AN_10_HD;
+               } else          /* special defines for FIBER (88E1011S only) */
+                       adv |= PHY_M_AN_1000X_AHD | PHY_M_AN_1000X_AFD;
+
+               /* Set Flow-control capabilities */
+               if (sky2->tx_pause && sky2->rx_pause)
+                       adv |= PHY_AN_PAUSE_CAP;        /* symmetric */
+               else if (sky2->rx_pause && !sky2->tx_pause)
+                       adv |= PHY_AN_PAUSE_ASYM | PHY_AN_PAUSE_CAP;
+               else if (!sky2->rx_pause && sky2->tx_pause)
+                       adv |= PHY_AN_PAUSE_ASYM;       /* local */
+
+               /* Restart Auto-negotiation */
+               ctrl |= PHY_CT_ANE | PHY_CT_RE_CFG;
+       } else {
+               /* forced speed/duplex settings */
+               ct1000 = PHY_M_1000C_MSE;
+
+               if (sky2->duplex == DUPLEX_FULL)
+                       ctrl |= PHY_CT_DUP_MD;
+
+               switch (sky2->speed) {
+               case SPEED_1000:
+                       ctrl |= PHY_CT_SP1000;
+                       break;
+               case SPEED_100:
+                       ctrl |= PHY_CT_SP100;
+                       break;
+               }
+
+               ctrl |= PHY_CT_RESET;
+       }
+
+       if (hw->chip_id != CHIP_ID_YUKON_FE)
+               gm_phy_write(hw, port, PHY_MARV_1000T_CTRL, ct1000);
+
+       gm_phy_write(hw, port, PHY_MARV_AUNE_ADV, adv);
+       gm_phy_write(hw, port, PHY_MARV_CTRL, ctrl);
+
+       /* Setup Phy LED's */
+       ledctrl = PHY_M_LED_PULS_DUR(PULS_170MS);
+       ledover = 0;
+
+       switch (hw->chip_id) {
+       case CHIP_ID_YUKON_FE:
+               /* on 88E3082 these bits are at 11..9 (shifted left) */
+               ledctrl |= PHY_M_LED_BLINK_RT(BLINK_84MS) << 1;
+
+               ctrl = gm_phy_read(hw, port, PHY_MARV_FE_LED_PAR);
+
+               /* delete ACT LED control bits */
+               ctrl &= ~PHY_M_FELP_LED1_MSK;
+               /* change ACT LED control to blink mode */
+               ctrl |= PHY_M_FELP_LED1_CTRL(LED_PAR_CTRL_ACT_BL);
+               gm_phy_write(hw, port, PHY_MARV_FE_LED_PAR, ctrl);
+               break;
+
+       case CHIP_ID_YUKON_XL:
+               pg = gm_phy_read(hw, port, PHY_MARV_EXT_ADR);
+
+               /* select page 3 to access LED control register */
+               gm_phy_write(hw, port, PHY_MARV_EXT_ADR, 3);
+
+               /* set LED Function Control register */
+               gm_phy_write(hw, port, PHY_MARV_PHY_CTRL, (PHY_M_LEDC_LOS_CTRL(1) |     /* LINK/ACT */
+                                                          PHY_M_LEDC_INIT_CTRL(7) |    /* 10 Mbps */
+                                                          PHY_M_LEDC_STA1_CTRL(7) |    /* 100 Mbps */
+                                                          PHY_M_LEDC_STA0_CTRL(7)));   /* 1000 Mbps */
+
+               /* set Polarity Control register */
+               gm_phy_write(hw, port, PHY_MARV_PHY_STAT,
+                            (PHY_M_POLC_LS1_P_MIX(4) |
+                             PHY_M_POLC_IS0_P_MIX(4) |
+                             PHY_M_POLC_LOS_CTRL(2) |
+                             PHY_M_POLC_INIT_CTRL(2) |
+                             PHY_M_POLC_STA1_CTRL(2) |
+                             PHY_M_POLC_STA0_CTRL(2)));
+
+               /* restore page register */
+               gm_phy_write(hw, port, PHY_MARV_EXT_ADR, pg);
+               break;
+
+       default:
+               /* set Tx LED (LED_TX) to blink mode on Rx OR Tx activity */
+               ledctrl |= PHY_M_LED_BLINK_RT(BLINK_84MS) | PHY_M_LEDC_TX_CTRL;
+               /* turn off the Rx LED (LED_RX) */
+               ledover |= PHY_M_LED_MO_RX(MO_LED_OFF);
+       }
+
+       gm_phy_write(hw, port, PHY_MARV_LED_CTRL, ledctrl);
+
+       if (sky2->autoneg == AUTONEG_DISABLE || sky2->speed == SPEED_100) {
+               /* turn on 100 Mbps LED (LED_LINK100) */
+               ledover |= PHY_M_LED_MO_100(MO_LED_ON);
+       }
+
+       if (ledover)
+               gm_phy_write(hw, port, PHY_MARV_LED_OVER, ledover);
+
+       /* Enable phy interrupt on auto-negotiation complete (or link up) */
+       if (sky2->autoneg == AUTONEG_ENABLE)
+               gm_phy_write(hw, port, PHY_MARV_INT_MASK, PHY_M_IS_AN_COMPL);
+       else
+               gm_phy_write(hw, port, PHY_MARV_INT_MASK, PHY_M_DEF_MSK);
+}
+
+static void sky2_mac_init(struct sky2_hw *hw, unsigned port)
+{
+       struct sky2_port *sky2 = netdev_priv(hw->dev[port]);
+       u16 reg;
+       int i;
+       const u8 *addr = hw->dev[port]->dev_addr;
+
+       sky2_write32(hw, SK_REG(port, GPHY_CTRL), GPC_RST_SET);
+       sky2_write32(hw, SK_REG(port, GPHY_CTRL), GPC_RST_CLR|GPC_ENA_PAUSE);
+
+       sky2_write8(hw, SK_REG(port, GMAC_CTRL), GMC_RST_CLR);
+
+       if (hw->chip_id == CHIP_ID_YUKON_XL && hw->chip_rev == 0 && port == 1) {
+               /* WA DEV_472 -- looks like crossed wires on port 2 */
+               /* clear GMAC 1 Control reset */
+               sky2_write8(hw, SK_REG(0, GMAC_CTRL), GMC_RST_CLR);
+               do {
+                       sky2_write8(hw, SK_REG(1, GMAC_CTRL), GMC_RST_SET);
+                       sky2_write8(hw, SK_REG(1, GMAC_CTRL), GMC_RST_CLR);
+               } while (gm_phy_read(hw, 1, PHY_MARV_ID0) != PHY_MARV_ID0_VAL ||
+                        gm_phy_read(hw, 1, PHY_MARV_ID1) != PHY_MARV_ID1_Y2 ||
+                        gm_phy_read(hw, 1, PHY_MARV_INT_MASK) != 0);
+       }
+
+       if (sky2->autoneg == AUTONEG_DISABLE) {
+               reg = gma_read16(hw, port, GM_GP_CTRL);
+               reg |= GM_GPCR_AU_ALL_DIS;
+               gma_write16(hw, port, GM_GP_CTRL, reg);
+               gma_read16(hw, port, GM_GP_CTRL);
+
+               switch (sky2->speed) {
+               case SPEED_1000:
+                       reg |= GM_GPCR_SPEED_1000;
+                       /* fallthru */
+               case SPEED_100:
+                       reg |= GM_GPCR_SPEED_100;
+               }
+
+               if (sky2->duplex == DUPLEX_FULL)
+                       reg |= GM_GPCR_DUP_FULL;
+       } else
+               reg = GM_GPCR_SPEED_1000 | GM_GPCR_SPEED_100 | GM_GPCR_DUP_FULL;
+
+       if (!sky2->tx_pause && !sky2->rx_pause) {
+               sky2_write32(hw, SK_REG(port, GMAC_CTRL), GMC_PAUSE_OFF);
+               reg |=
+                   GM_GPCR_FC_TX_DIS | GM_GPCR_FC_RX_DIS | GM_GPCR_AU_FCT_DIS;
+       } else if (sky2->tx_pause && !sky2->rx_pause) {
+               /* disable Rx flow-control */
+               reg |= GM_GPCR_FC_RX_DIS | GM_GPCR_AU_FCT_DIS;
+       }
+
+       gma_write16(hw, port, GM_GP_CTRL, reg);
+
+       sky2_read16(hw, SK_REG(port, GMAC_IRQ_SRC));
+
+       down(&sky2->phy_sema);
+       sky2_phy_init(hw, port);
+       up(&sky2->phy_sema);
+
+       /* MIB clear */
+       reg = gma_read16(hw, port, GM_PHY_ADDR);
+       gma_write16(hw, port, GM_PHY_ADDR, reg | GM_PAR_MIB_CLR);
+
+       for (i = 0; i < GM_MIB_CNT_SIZE; i++)
+               gma_read16(hw, port, GM_MIB_CNT_BASE + 8 * i);
+       gma_write16(hw, port, GM_PHY_ADDR, reg);
+
+       /* transmit control */
+       gma_write16(hw, port, GM_TX_CTRL, TX_COL_THR(TX_COL_DEF));
+
+       /* receive control reg: unicast + multicast + no FCS  */
+       gma_write16(hw, port, GM_RX_CTRL,
+                   GM_RXCR_UCF_ENA | GM_RXCR_CRC_DIS | GM_RXCR_MCF_ENA);
+
+       /* transmit flow control */
+       gma_write16(hw, port, GM_TX_FLOW_CTRL, 0xffff);
+
+       /* transmit parameter */
+       gma_write16(hw, port, GM_TX_PARAM,
+                   TX_JAM_LEN_VAL(TX_JAM_LEN_DEF) |
+                   TX_JAM_IPG_VAL(TX_JAM_IPG_DEF) |
+                   TX_IPG_JAM_DATA(TX_IPG_JAM_DEF) |
+                   TX_BACK_OFF_LIM(TX_BOF_LIM_DEF));
+
+       /* serial mode register */
+       reg = DATA_BLIND_VAL(DATA_BLIND_DEF) |
+               GM_SMOD_VLAN_ENA | IPG_DATA_VAL(IPG_DATA_DEF);
+
+       if (hw->dev[port]->mtu > ETH_DATA_LEN)
+               reg |= GM_SMOD_JUMBO_ENA;
+
+       gma_write16(hw, port, GM_SERIAL_MODE, reg);
+
+       /* virtual address for data */
+       gma_set_addr(hw, port, GM_SRC_ADDR_2L, addr);
+
+       /* physical address: used for pause frames */
+       gma_set_addr(hw, port, GM_SRC_ADDR_1L, addr);
+
+       /* ignore counter overflows */
+       gma_write16(hw, port, GM_TX_IRQ_MSK, 0);
+       gma_write16(hw, port, GM_RX_IRQ_MSK, 0);
+       gma_write16(hw, port, GM_TR_IRQ_MSK, 0);
+
+       /* Configure Rx MAC FIFO */
+       sky2_write8(hw, SK_REG(port, RX_GMF_CTRL_T), GMF_RST_CLR);
+       sky2_write16(hw, SK_REG(port, RX_GMF_CTRL_T),
+                    GMF_RX_CTRL_DEF);
+
+       /* Flush Rx MAC FIFO on any flow control or error */
+       sky2_write16(hw, SK_REG(port, RX_GMF_FL_MSK), GMR_FS_ANY_ERR);
+
+       /* Set threshold to 0xa (64 bytes)
+        *  ASF disabled so no need to do WA dev #4.30
+        */
+       sky2_write16(hw, SK_REG(port, RX_GMF_FL_THR), RX_GMF_FL_THR_DEF);
+
+       /* Configure Tx MAC FIFO */
+       sky2_write8(hw, SK_REG(port, TX_GMF_CTRL_T), GMF_RST_CLR);
+       sky2_write16(hw, SK_REG(port, TX_GMF_CTRL_T), GMF_OPER_ON);
+
+       if (hw->chip_id == CHIP_ID_YUKON_EC_U) {
+               sky2_write8(hw, SK_REG(port, RX_GMF_LP_THR), 768/8);
+               sky2_write8(hw, SK_REG(port, RX_GMF_UP_THR), 1024/8);
+               if (hw->dev[port]->mtu > ETH_DATA_LEN) {
+                       /* set Tx GMAC FIFO Almost Empty Threshold */
+                       sky2_write32(hw, SK_REG(port, TX_GMF_AE_THR), 0x180);
+                       /* Disable Store & Forward mode for TX */
+                       sky2_write32(hw, SK_REG(port, TX_GMF_CTRL_T), TX_STFW_DIS);
+               }
+       }
+
+}
+
+static void sky2_ramset(struct sky2_hw *hw, u16 q, u32 start, size_t len)
+{
+       u32 end;
+
+       start /= 8;
+       len /= 8;
+       end = start + len - 1;
+
+       sky2_write8(hw, RB_ADDR(q, RB_CTRL), RB_RST_CLR);
+       sky2_write32(hw, RB_ADDR(q, RB_START), start);
+       sky2_write32(hw, RB_ADDR(q, RB_END), end);
+       sky2_write32(hw, RB_ADDR(q, RB_WP), start);
+       sky2_write32(hw, RB_ADDR(q, RB_RP), start);
+
+       if (q == Q_R1 || q == Q_R2) {
+               u32 rxup, rxlo;
+
+               rxlo = len/2;
+               rxup = rxlo + len/4;
+
+               /* Set thresholds on receive queue's */
+               sky2_write32(hw, RB_ADDR(q, RB_RX_UTPP), rxup);
+               sky2_write32(hw, RB_ADDR(q, RB_RX_LTPP), rxlo);
+       } else {
+               /* Enable store & forward on Tx queue's because
+                * Tx FIFO is only 1K on Yukon
+                */
+               sky2_write8(hw, RB_ADDR(q, RB_CTRL), RB_ENA_STFWD);
+       }
+
+       sky2_write8(hw, RB_ADDR(q, RB_CTRL), RB_ENA_OP_MD);
+       sky2_read8(hw, RB_ADDR(q, RB_CTRL));
+}
+
+/* Setup Bus Memory Interface */
+static void sky2_qset(struct sky2_hw *hw, u16 q)
+{
+       sky2_write32(hw, Q_ADDR(q, Q_CSR), BMU_CLR_RESET);
+       sky2_write32(hw, Q_ADDR(q, Q_CSR), BMU_OPER_INIT);
+       sky2_write32(hw, Q_ADDR(q, Q_CSR), BMU_FIFO_OP_ON);
+       sky2_write32(hw, Q_ADDR(q, Q_WM),  BMU_WM_DEFAULT);
+}
+
+/* Setup prefetch unit registers. This is the interface between
+ * hardware and driver list elements
+ */
+static void sky2_prefetch_init(struct sky2_hw *hw, u32 qaddr,
+                                     u64 addr, u32 last)
+{
+       sky2_write32(hw, Y2_QADDR(qaddr, PREF_UNIT_CTRL), PREF_UNIT_RST_SET);
+       sky2_write32(hw, Y2_QADDR(qaddr, PREF_UNIT_CTRL), PREF_UNIT_RST_CLR);
+       sky2_write32(hw, Y2_QADDR(qaddr, PREF_UNIT_ADDR_HI), addr >> 32);
+       sky2_write32(hw, Y2_QADDR(qaddr, PREF_UNIT_ADDR_LO), (u32) addr);
+       sky2_write16(hw, Y2_QADDR(qaddr, PREF_UNIT_LAST_IDX), last);
+       sky2_write32(hw, Y2_QADDR(qaddr, PREF_UNIT_CTRL), PREF_UNIT_OP_ON);
+
+       sky2_read32(hw, Y2_QADDR(qaddr, PREF_UNIT_CTRL));
+}
+
+static inline struct sky2_tx_le *get_tx_le(struct sky2_port *sky2)
+{
+       struct sky2_tx_le *le = sky2->tx_le + sky2->tx_prod;
+
+       sky2->tx_prod = (sky2->tx_prod + 1) % TX_RING_SIZE;
+       return le;
+}
+
+/*
+ * This is a workaround code taken from SysKonnect sk98lin driver
+ * to deal with chip bug on Yukon EC rev 0 in the wraparound case.
+ */
+static inline void sky2_put_idx(struct sky2_hw *hw, unsigned q,
+                               u16 idx, u16 *last, u16 size)
+{
+       if (is_ec_a1(hw) && idx < *last) {
+               u16 hwget = sky2_read16(hw, Y2_QADDR(q, PREF_UNIT_GET_IDX));
+
+               if (hwget == 0) {
+                       /* Start prefetching again */
+                       sky2_write8(hw, Y2_QADDR(q, PREF_UNIT_FIFO_WM), 0xe0);
+                       goto setnew;
+               }
+
+               if (hwget == size - 1) {
+                       /* set watermark to one list element */
+                       sky2_write8(hw, Y2_QADDR(q, PREF_UNIT_FIFO_WM), 8);
+
+                       /* set put index to first list element */
+                       sky2_write16(hw, Y2_QADDR(q, PREF_UNIT_PUT_IDX), 0);
+               } else          /* have hardware go to end of list */
+                       sky2_write16(hw, Y2_QADDR(q, PREF_UNIT_PUT_IDX),
+                                    size - 1);
+       } else {
+setnew:
+               sky2_write16(hw, Y2_QADDR(q, PREF_UNIT_PUT_IDX), idx);
+       }
+       *last = idx;
+}
+
+
+static inline struct sky2_rx_le *sky2_next_rx(struct sky2_port *sky2)
+{
+       struct sky2_rx_le *le = sky2->rx_le + sky2->rx_put;
+       sky2->rx_put = (sky2->rx_put + 1) % RX_LE_SIZE;
+       return le;
+}
+
+/* Return high part of DMA address (could be 32 or 64 bit) */
+static inline u32 high32(dma_addr_t a)
+{
+       return (a >> 16) >> 16;
+}
+
+/* Build description to hardware about buffer */
+static inline void sky2_rx_add(struct sky2_port *sky2, dma_addr_t map)
+{
+       struct sky2_rx_le *le;
+       u32 hi = high32(map);
+       u16 len = sky2->rx_bufsize;
+
+       if (sky2->rx_addr64 != hi) {
+               le = sky2_next_rx(sky2);
+               le->addr = cpu_to_le32(hi);
+               le->ctrl = 0;
+               le->opcode = OP_ADDR64 | HW_OWNER;
+               sky2->rx_addr64 = high32(map + len);
+       }
+
+       le = sky2_next_rx(sky2);
+       le->addr = cpu_to_le32((u32) map);
+       le->length = cpu_to_le16(len);
+       le->ctrl = 0;
+       le->opcode = OP_PACKET | HW_OWNER;
+}
+
+
+/* Tell chip where to start receive checksum.
+ * Actually has two checksums, but set both same to avoid possible byte
+ * order problems.
+ */
+static void rx_set_checksum(struct sky2_port *sky2)
+{
+       struct sky2_rx_le *le;
+
+       le = sky2_next_rx(sky2);
+       le->addr = (ETH_HLEN << 16) | ETH_HLEN;
+       le->ctrl = 0;
+       le->opcode = OP_TCPSTART | HW_OWNER;
+
+       sky2_write32(sky2->hw,
+                    Q_ADDR(rxqaddr[sky2->port], Q_CSR),
+                    sky2->rx_csum ? BMU_ENA_RX_CHKSUM : BMU_DIS_RX_CHKSUM);
+
+}
+
+/*
+ * The RX Stop command will not work for Yukon-2 if the BMU does not
+ * reach the end of packet and since we can't make sure that we have
+ * incoming data, we must reset the BMU while it is not doing a DMA
+ * transfer. Since it is possible that the RX path is still active,
+ * the RX RAM buffer will be stopped first, so any possible incoming
+ * data will not trigger a DMA. After the RAM buffer is stopped, the
+ * BMU is polled until any DMA in progress is ended and only then it
+ * will be reset.
+ */
+static void sky2_rx_stop(struct sky2_port *sky2)
+{
+       struct sky2_hw *hw = sky2->hw;
+       unsigned rxq = rxqaddr[sky2->port];
+       int i;
+
+       /* disable the RAM Buffer receive queue */
+       sky2_write8(hw, RB_ADDR(rxq, RB_CTRL), RB_DIS_OP_MD);
+
+       for (i = 0; i < 0xffff; i++)
+               if (sky2_read8(hw, RB_ADDR(rxq, Q_RSL))
+                   == sky2_read8(hw, RB_ADDR(rxq, Q_RL)))
+                       goto stopped;
+
+       printk(KERN_WARNING PFX "%s: receiver stop failed\n",
+              sky2->netdev->name);
+stopped:
+       sky2_write32(hw, Q_ADDR(rxq, Q_CSR), BMU_RST_SET | BMU_FIFO_RST);
+
+       /* reset the Rx prefetch unit */
+       sky2_write32(hw, Y2_QADDR(rxq, PREF_UNIT_CTRL), PREF_UNIT_RST_SET);
+}
+
+/* Clean out receive buffer area, assumes receiver hardware stopped */
+static void sky2_rx_clean(struct sky2_port *sky2)
+{
+       unsigned i;
+
+       memset(sky2->rx_le, 0, RX_LE_BYTES);
+       for (i = 0; i < sky2->rx_pending; i++) {
+               struct ring_info *re = sky2->rx_ring + i;
+
+               if (re->skb) {
+                       pci_unmap_single(sky2->hw->pdev,
+                                        re->mapaddr, sky2->rx_bufsize,
+                                        PCI_DMA_FROMDEVICE);
+                       kfree_skb(re->skb);
+                       re->skb = NULL;
+               }
+       }
+}
+
+/* Basic MII support */
+static int sky2_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
+{
+       struct mii_ioctl_data *data = if_mii(ifr);
+       struct sky2_port *sky2 = netdev_priv(dev);
+       struct sky2_hw *hw = sky2->hw;
+       int err = -EOPNOTSUPP;
+
+       if (!netif_running(dev))
+               return -ENODEV; /* Phy still in reset */
+
+       switch(cmd) {
+       case SIOCGMIIPHY:
+               data->phy_id = PHY_ADDR_MARV;
+
+               /* fallthru */
+       case SIOCGMIIREG: {
+               u16 val = 0;
+
+               down(&sky2->phy_sema);
+               err = __gm_phy_read(hw, sky2->port, data->reg_num & 0x1f, &val);
+               up(&sky2->phy_sema);
+
+               data->val_out = val;
+               break;
+       }
+
+       case SIOCSMIIREG:
+               if (!capable(CAP_NET_ADMIN))
+                       return -EPERM;
+
+               down(&sky2->phy_sema);
+               err = gm_phy_write(hw, sky2->port, data->reg_num & 0x1f,
+                                  data->val_in);
+               up(&sky2->phy_sema);
+               break;
+       }
+       return err;
+}
+
+#ifdef SKY2_VLAN_TAG_USED
+static void sky2_vlan_rx_register(struct net_device *dev, struct vlan_group *grp)
+{
+       struct sky2_port *sky2 = netdev_priv(dev);
+       struct sky2_hw *hw = sky2->hw;
+       u16 port = sky2->port;
+
+       spin_lock(&sky2->tx_lock);
+
+       sky2_write32(hw, SK_REG(port, RX_GMF_CTRL_T), RX_VLAN_STRIP_ON);
+       sky2_write32(hw, SK_REG(port, TX_GMF_CTRL_T), TX_VLAN_TAG_ON);
+       sky2->vlgrp = grp;
+
+       spin_unlock(&sky2->tx_lock);
+}
+
+static void sky2_vlan_rx_kill_vid(struct net_device *dev, unsigned short vid)
+{
+       struct sky2_port *sky2 = netdev_priv(dev);
+       struct sky2_hw *hw = sky2->hw;
+       u16 port = sky2->port;
+
+       spin_lock(&sky2->tx_lock);
+
+       sky2_write32(hw, SK_REG(port, RX_GMF_CTRL_T), RX_VLAN_STRIP_OFF);
+       sky2_write32(hw, SK_REG(port, TX_GMF_CTRL_T), TX_VLAN_TAG_OFF);
+       if (sky2->vlgrp)
+               sky2->vlgrp->vlan_devices[vid] = NULL;
+
+       spin_unlock(&sky2->tx_lock);
+}
+#endif
+
+/*
+ * Allocate and setup receiver buffer pool.
+ * In case of 64 bit dma, there are 2X as many list elements
+ * available as ring entries
+ * and need to reserve one list element so we don't wrap around.
+ *
+ * It appears the hardware has a bug in the FIFO logic that
+ * cause it to hang if the FIFO gets overrun and the receive buffer
+ * is not aligned.  This means we can't use skb_reserve to align
+ * the IP header.
+ */
+static int sky2_rx_start(struct sky2_port *sky2)
+{
+       struct sky2_hw *hw = sky2->hw;
+       unsigned rxq = rxqaddr[sky2->port];
+       int i;
+
+       sky2->rx_put = sky2->rx_next = 0;
+       sky2_qset(hw, rxq);
+       sky2_prefetch_init(hw, rxq, sky2->rx_le_map, RX_LE_SIZE - 1);
+
+       rx_set_checksum(sky2);
+       for (i = 0; i < sky2->rx_pending; i++) {
+               struct ring_info *re = sky2->rx_ring + i;
+
+               re->skb = dev_alloc_skb(sky2->rx_bufsize);
+               if (!re->skb)
+                       goto nomem;
+
+               re->mapaddr = pci_map_single(hw->pdev, re->skb->data,
+                                            sky2->rx_bufsize, PCI_DMA_FROMDEVICE);
+               sky2_rx_add(sky2, re->mapaddr);
+       }
+
+       /* Tell chip about available buffers */
+       sky2_write16(hw, Y2_QADDR(rxq, PREF_UNIT_PUT_IDX), sky2->rx_put);
+       sky2->rx_last_put = sky2_read16(hw, Y2_QADDR(rxq, PREF_UNIT_PUT_IDX));
+       return 0;
+nomem:
+       sky2_rx_clean(sky2);
+       return -ENOMEM;
+}
+
+/* Bring up network interface. */
+static int sky2_up(struct net_device *dev)
+{
+       struct sky2_port *sky2 = netdev_priv(dev);
+       struct sky2_hw *hw = sky2->hw;
+       unsigned port = sky2->port;
+       u32 ramsize, rxspace;
+       int err = -ENOMEM;
+
+       if (netif_msg_ifup(sky2))
+               printk(KERN_INFO PFX "%s: enabling interface\n", dev->name);
+
+       /* must be power of 2 */
+       sky2->tx_le = pci_alloc_consistent(hw->pdev,
+                                          TX_RING_SIZE *
+                                          sizeof(struct sky2_tx_le),
+                                          &sky2->tx_le_map);
+       if (!sky2->tx_le)
+               goto err_out;
+
+       sky2->tx_ring = kcalloc(TX_RING_SIZE, sizeof(struct tx_ring_info),
+                               GFP_KERNEL);
+       if (!sky2->tx_ring)
+               goto err_out;
+       sky2->tx_prod = sky2->tx_cons = 0;
+
+       sky2->rx_le = pci_alloc_consistent(hw->pdev, RX_LE_BYTES,
+                                          &sky2->rx_le_map);
+       if (!sky2->rx_le)
+               goto err_out;
+       memset(sky2->rx_le, 0, RX_LE_BYTES);
+
+       sky2->rx_ring = kcalloc(sky2->rx_pending, sizeof(struct ring_info),
+                               GFP_KERNEL);
+       if (!sky2->rx_ring)
+               goto err_out;
+
+       sky2_mac_init(hw, port);
+
+       /* Configure RAM buffers */
+       if (hw->chip_id == CHIP_ID_YUKON_FE ||
+           (hw->chip_id == CHIP_ID_YUKON_EC && hw->chip_rev == 2))
+               ramsize = 4096;
+       else {
+               u8 e0 = sky2_read8(hw, B2_E_0);
+               ramsize = (e0 == 0) ? (128 * 1024) : (e0 * 4096);
+       }
+
+       /* 2/3 for Rx */
+       rxspace = (2 * ramsize) / 3;
+       sky2_ramset(hw, rxqaddr[port], 0, rxspace);
+       sky2_ramset(hw, txqaddr[port], rxspace, ramsize - rxspace);
+
+       /* Make sure SyncQ is disabled */
+       sky2_write8(hw, RB_ADDR(port == 0 ? Q_XS1 : Q_XS2, RB_CTRL),
+                   RB_RST_SET);
+
+       sky2_qset(hw, txqaddr[port]);
+       if (hw->chip_id == CHIP_ID_YUKON_EC_U)
+               sky2_write16(hw, Q_ADDR(txqaddr[port], Q_AL), 0x1a0);
+
+
+       sky2_prefetch_init(hw, txqaddr[port], sky2->tx_le_map,
+                          TX_RING_SIZE - 1);
+
+       err = sky2_rx_start(sky2);
+       if (err)
+               goto err_out;
+
+       /* Enable interrupts from phy/mac for port */
+       hw->intr_mask |= (port == 0) ? Y2_IS_PORT_1 : Y2_IS_PORT_2;
+       sky2_write32(hw, B0_IMSK, hw->intr_mask);
+       return 0;
+
+err_out:
+       if (sky2->rx_le)
+               pci_free_consistent(hw->pdev, RX_LE_BYTES,
+                                   sky2->rx_le, sky2->rx_le_map);
+       if (sky2->tx_le)
+               pci_free_consistent(hw->pdev,
+                                   TX_RING_SIZE * sizeof(struct sky2_tx_le),
+                                   sky2->tx_le, sky2->tx_le_map);
+       if (sky2->tx_ring)
+               kfree(sky2->tx_ring);
+       if (sky2->rx_ring)
+               kfree(sky2->rx_ring);
+
+       return err;
+}
+
+/* Modular subtraction in ring */
+static inline int tx_dist(unsigned tail, unsigned head)
+{
+       return (head - tail) % TX_RING_SIZE;
+}
+
+/* Number of list elements available for next tx */
+static inline int tx_avail(const struct sky2_port *sky2)
+{
+       return sky2->tx_pending - tx_dist(sky2->tx_cons, sky2->tx_prod);
+}
+
+/* Estimate of number of transmit list elements required */
+static inline unsigned tx_le_req(const struct sk_buff *skb)
+{
+       unsigned count;
+
+       count = sizeof(dma_addr_t) / sizeof(u32);
+       count += skb_shinfo(skb)->nr_frags * count;
+
+       if (skb_shinfo(skb)->tso_size)
+               ++count;
+
+       if (skb->ip_summed == CHECKSUM_HW)
+               ++count;
+
+       return count;
+}
+
+/*
+ * Put one packet in ring for transmit.
+ * A single packet can generate multiple list elements, and
+ * the number of ring elements will probably be less than the number
+ * of list elements used.
+ *
+ * No BH disabling for tx_lock here (like tg3)
+ */
+static int sky2_xmit_frame(struct sk_buff *skb, struct net_device *dev)
+{
+       struct sky2_port *sky2 = netdev_priv(dev);
+       struct sky2_hw *hw = sky2->hw;
+       struct sky2_tx_le *le = NULL;
+       struct tx_ring_info *re;
+       unsigned i, len;
+       dma_addr_t mapping;
+       u32 addr64;
+       u16 mss;
+       u8 ctrl;
+
+       if (!spin_trylock(&sky2->tx_lock))
+               return NETDEV_TX_LOCKED;
+
+       if (unlikely(tx_avail(sky2) < tx_le_req(skb))) {
+               /* There is a known but harmless race with lockless tx
+                * and netif_stop_queue.
+                */
+               if (!netif_queue_stopped(dev)) {
+                       netif_stop_queue(dev);
+                       printk(KERN_WARNING PFX "%s: ring full when queue awake!\n",
+                              dev->name);
+               }
+               spin_unlock(&sky2->tx_lock);
+
+               return NETDEV_TX_BUSY;
+       }
+
+       if (unlikely(netif_msg_tx_queued(sky2)))
+               printk(KERN_DEBUG "%s: tx queued, slot %u, len %d\n",
+                      dev->name, sky2->tx_prod, skb->len);
+
+       len = skb_headlen(skb);
+       mapping = pci_map_single(hw->pdev, skb->data, len, PCI_DMA_TODEVICE);
+       addr64 = high32(mapping);
+
+       re = sky2->tx_ring + sky2->tx_prod;
+
+       /* Send high bits if changed or crosses boundary */
+       if (addr64 != sky2->tx_addr64 || high32(mapping + len) != sky2->tx_addr64) {
+               le = get_tx_le(sky2);
+               le->tx.addr = cpu_to_le32(addr64);
+               le->ctrl = 0;
+               le->opcode = OP_ADDR64 | HW_OWNER;
+               sky2->tx_addr64 = high32(mapping + len);
+       }
+
+       /* Check for TCP Segmentation Offload */
+       mss = skb_shinfo(skb)->tso_size;
+       if (mss != 0) {
+               /* just drop the packet if non-linear expansion fails */
+               if (skb_header_cloned(skb) &&
+                   pskb_expand_head(skb, 0, 0, GFP_ATOMIC)) {
+                       dev_kfree_skb_any(skb);
+                       goto out_unlock;
+               }
+
+               mss += ((skb->h.th->doff - 5) * 4);     /* TCP options */
+               mss += (skb->nh.iph->ihl * 4) + sizeof(struct tcphdr);
+               mss += ETH_HLEN;
+       }
+
+       if (mss != sky2->tx_last_mss) {
+               le = get_tx_le(sky2);
+               le->tx.tso.size = cpu_to_le16(mss);
+               le->tx.tso.rsvd = 0;
+               le->opcode = OP_LRGLEN | HW_OWNER;
+               le->ctrl = 0;
+               sky2->tx_last_mss = mss;
+       }
+
+       ctrl = 0;
+#ifdef SKY2_VLAN_TAG_USED
+       /* Add VLAN tag, can piggyback on LRGLEN or ADDR64 */
+       if (sky2->vlgrp && vlan_tx_tag_present(skb)) {
+               if (!le) {
+                       le = get_tx_le(sky2);
+                       le->tx.addr = 0;
+                       le->opcode = OP_VLAN|HW_OWNER;
+                       le->ctrl = 0;
+               } else
+                       le->opcode |= OP_VLAN;
+               le->length = cpu_to_be16(vlan_tx_tag_get(skb));
+               ctrl |= INS_VLAN;
+       }
+#endif
+
+       /* Handle TCP checksum offload */
+       if (skb->ip_summed == CHECKSUM_HW) {
+               u16 hdr = skb->h.raw - skb->data;
+               u16 offset = hdr + skb->csum;
+
+               ctrl = CALSUM | WR_SUM | INIT_SUM | LOCK_SUM;
+               if (skb->nh.iph->protocol == IPPROTO_UDP)
+                       ctrl |= UDPTCP;
+
+               le = get_tx_le(sky2);
+               le->tx.csum.start = cpu_to_le16(hdr);
+               le->tx.csum.offset = cpu_to_le16(offset);
+               le->length = 0; /* initial checksum value */
+               le->ctrl = 1;   /* one packet */
+               le->opcode = OP_TCPLISW | HW_OWNER;
+       }
+
+       le = get_tx_le(sky2);
+       le->tx.addr = cpu_to_le32((u32) mapping);
+       le->length = cpu_to_le16(len);
+       le->ctrl = ctrl;
+       le->opcode = mss ? (OP_LARGESEND | HW_OWNER) : (OP_PACKET | HW_OWNER);
+
+       /* Record the transmit mapping info */
+       re->skb = skb;
+       pci_unmap_addr_set(re, mapaddr, mapping);
+
+       for (i = 0; i < skb_shinfo(skb)->nr_frags; i++) {
+               skb_frag_t *frag = &skb_shinfo(skb)->frags[i];
+               struct tx_ring_info *fre;
+
+               mapping = pci_map_page(hw->pdev, frag->page, frag->page_offset,
+                                      frag->size, PCI_DMA_TODEVICE);
+               addr64 = (mapping >> 16) >> 16;
+               if (addr64 != sky2->tx_addr64) {
+                       le = get_tx_le(sky2);
+                       le->tx.addr = cpu_to_le32(addr64);
+                       le->ctrl = 0;
+                       le->opcode = OP_ADDR64 | HW_OWNER;
+                       sky2->tx_addr64 = addr64;
+               }
+
+               le = get_tx_le(sky2);
+               le->tx.addr = cpu_to_le32((u32) mapping);
+               le->length = cpu_to_le16(frag->size);
+               le->ctrl = ctrl;
+               le->opcode = OP_BUFFER | HW_OWNER;
+
+               fre = sky2->tx_ring
+                   + ((re - sky2->tx_ring) + i + 1) % TX_RING_SIZE;
+               pci_unmap_addr_set(fre, mapaddr, mapping);
+       }
+
+       re->idx = sky2->tx_prod;
+       le->ctrl |= EOP;
+
+       sky2_put_idx(hw, txqaddr[sky2->port], sky2->tx_prod,
+                    &sky2->tx_last_put, TX_RING_SIZE);
+
+       if (tx_avail(sky2) <= MAX_SKB_TX_LE)
+               netif_stop_queue(dev);
+
+out_unlock:
+       mmiowb();
+       spin_unlock(&sky2->tx_lock);
+
+       dev->trans_start = jiffies;
+       return NETDEV_TX_OK;
+}
+
+/*
+ * Free ring elements from starting at tx_cons until "done"
+ *
+ * NB: the hardware will tell us about partial completion of multi-part
+ *     buffers; these are deferred until completion.
+ */
+static void sky2_tx_complete(struct sky2_port *sky2, u16 done)
+{
+       struct net_device *dev = sky2->netdev;
+       struct pci_dev *pdev = sky2->hw->pdev;
+       u16 nxt, put;
+       unsigned i;
+
+       BUG_ON(done >= TX_RING_SIZE);
+
+       if (unlikely(netif_msg_tx_done(sky2)))
+               printk(KERN_DEBUG "%s: tx done, up to %u\n",
+                      dev->name, done);
+
+       for (put = sky2->tx_cons; put != done; put = nxt) {
+               struct tx_ring_info *re = sky2->tx_ring + put;
+               struct sk_buff *skb = re->skb;
+
+               nxt = re->idx;
+               BUG_ON(nxt >= TX_RING_SIZE);
+               prefetch(sky2->tx_ring + nxt);
+
+               /* Check for partial status */
+               if (tx_dist(put, done) < tx_dist(put, nxt))
+                       break;
+
+               skb = re->skb;
+               pci_unmap_single(pdev, pci_unmap_addr(re, mapaddr),
+                                skb_headlen(skb), PCI_DMA_TODEVICE);
+
+               for (i = 0; i < skb_shinfo(skb)->nr_frags; i++) {
+                       struct tx_ring_info *fre;
+                       fre = sky2->tx_ring + (put + i + 1) % TX_RING_SIZE;
+                       pci_unmap_page(pdev, pci_unmap_addr(fre, mapaddr),
+                                      skb_shinfo(skb)->frags[i].size,
+                                      PCI_DMA_TODEVICE);
+               }
+
+               dev_kfree_skb_any(skb);
+       }
+
+       spin_lock(&sky2->tx_lock);
+       sky2->tx_cons = put;
+       if (netif_queue_stopped(dev) && tx_avail(sky2) > MAX_SKB_TX_LE)
+               netif_wake_queue(dev);
+       spin_unlock(&sky2->tx_lock);
+}
+
+/* Cleanup all untransmitted buffers, assume transmitter not running */
+static void sky2_tx_clean(struct sky2_port *sky2)
+{
+       sky2_tx_complete(sky2, sky2->tx_prod);
+}
+
+/* Network shutdown */
+static int sky2_down(struct net_device *dev)
+{
+       struct sky2_port *sky2 = netdev_priv(dev);
+       struct sky2_hw *hw = sky2->hw;
+       unsigned port = sky2->port;
+       u16 ctrl;
+
+       if (netif_msg_ifdown(sky2))
+               printk(KERN_INFO PFX "%s: disabling interface\n", dev->name);
+
+       /* Stop more packets from being queued */
+       netif_stop_queue(dev);
+
+       /* Disable port IRQ */
+       local_irq_disable();
+       hw->intr_mask &= ~((sky2->port == 0) ? Y2_IS_IRQ_PHY1 : Y2_IS_IRQ_PHY2);
+       sky2_write32(hw, B0_IMSK, hw->intr_mask);
+       local_irq_enable();
+
+       flush_scheduled_work();
+
+       sky2_phy_reset(hw, port);
+
+       /* Stop transmitter */
+       sky2_write32(hw, Q_ADDR(txqaddr[port], Q_CSR), BMU_STOP);
+       sky2_read32(hw, Q_ADDR(txqaddr[port], Q_CSR));
+
+       sky2_write32(hw, RB_ADDR(txqaddr[port], RB_CTRL),
+                    RB_RST_SET | RB_DIS_OP_MD);
+
+       ctrl = gma_read16(hw, port, GM_GP_CTRL);
+       ctrl &= ~(GM_GPCR_TX_ENA | GM_GPCR_RX_ENA);
+       gma_write16(hw, port, GM_GP_CTRL, ctrl);
+
+       sky2_write8(hw, SK_REG(port, GPHY_CTRL), GPC_RST_SET);
+
+       /* Workaround shared GMAC reset */
+       if (!(hw->chip_id == CHIP_ID_YUKON_XL && hw->chip_rev == 0
+             && port == 0 && hw->dev[1] && netif_running(hw->dev[1])))
+               sky2_write8(hw, SK_REG(port, GMAC_CTRL), GMC_RST_SET);
+
+       /* Disable Force Sync bit and Enable Alloc bit */
+       sky2_write8(hw, SK_REG(port, TXA_CTRL),
+                   TXA_DIS_FSYNC | TXA_DIS_ALLOC | TXA_STOP_RC);
+
+       /* Stop Interval Timer and Limit Counter of Tx Arbiter */
+       sky2_write32(hw, SK_REG(port, TXA_ITI_INI), 0L);
+       sky2_write32(hw, SK_REG(port, TXA_LIM_INI), 0L);
+
+       /* Reset the PCI FIFO of the async Tx queue */
+       sky2_write32(hw, Q_ADDR(txqaddr[port], Q_CSR),
+                    BMU_RST_SET | BMU_FIFO_RST);
+
+       /* Reset the Tx prefetch units */
+       sky2_write32(hw, Y2_QADDR(txqaddr[port], PREF_UNIT_CTRL),
+                    PREF_UNIT_RST_SET);
+
+       sky2_write32(hw, RB_ADDR(txqaddr[port], RB_CTRL), RB_RST_SET);
+
+       sky2_rx_stop(sky2);
+
+       sky2_write8(hw, SK_REG(port, RX_GMF_CTRL_T), GMF_RST_SET);
+       sky2_write8(hw, SK_REG(port, TX_GMF_CTRL_T), GMF_RST_SET);
+
+       /* turn off LED's */
+       sky2_write16(hw, B0_Y2LED, LED_STAT_OFF);
+
+       synchronize_irq(hw->pdev->irq);
+
+       sky2_tx_clean(sky2);
+       sky2_rx_clean(sky2);
+
+       pci_free_consistent(hw->pdev, RX_LE_BYTES,
+                           sky2->rx_le, sky2->rx_le_map);
+       kfree(sky2->rx_ring);
+
+       pci_free_consistent(hw->pdev,
+                           TX_RING_SIZE * sizeof(struct sky2_tx_le),
+                           sky2->tx_le, sky2->tx_le_map);
+       kfree(sky2->tx_ring);
+
+       return 0;
+}
+
+static u16 sky2_phy_speed(const struct sky2_hw *hw, u16 aux)
+{
+       if (!hw->copper)
+               return SPEED_1000;
+
+       if (hw->chip_id == CHIP_ID_YUKON_FE)
+               return (aux & PHY_M_PS_SPEED_100) ? SPEED_100 : SPEED_10;
+
+       switch (aux & PHY_M_PS_SPEED_MSK) {
+       case PHY_M_PS_SPEED_1000:
+               return SPEED_1000;
+       case PHY_M_PS_SPEED_100:
+               return SPEED_100;
+       default:
+               return SPEED_10;
+       }
+}
+
+static void sky2_link_up(struct sky2_port *sky2)
+{
+       struct sky2_hw *hw = sky2->hw;
+       unsigned port = sky2->port;
+       u16 reg;
+
+       /* Enable Transmit FIFO Underrun */
+       sky2_write8(hw, SK_REG(port, GMAC_IRQ_MSK), GMAC_DEF_MSK);
+
+       reg = gma_read16(hw, port, GM_GP_CTRL);
+       if (sky2->duplex == DUPLEX_FULL || sky2->autoneg == AUTONEG_ENABLE)
+               reg |= GM_GPCR_DUP_FULL;
+
+       /* enable Rx/Tx */
+       reg |= GM_GPCR_RX_ENA | GM_GPCR_TX_ENA;
+       gma_write16(hw, port, GM_GP_CTRL, reg);
+       gma_read16(hw, port, GM_GP_CTRL);
+
+       gm_phy_write(hw, port, PHY_MARV_INT_MASK, PHY_M_DEF_MSK);
+
+       netif_carrier_on(sky2->netdev);
+       netif_wake_queue(sky2->netdev);
+
+       /* Turn on link LED */
+       sky2_write8(hw, SK_REG(port, LNK_LED_REG),
+                   LINKLED_ON | LINKLED_BLINK_OFF | LINKLED_LINKSYNC_OFF);
+
+       if (hw->chip_id == CHIP_ID_YUKON_XL) {
+               u16 pg = gm_phy_read(hw, port, PHY_MARV_EXT_ADR);
+
+               gm_phy_write(hw, port, PHY_MARV_EXT_ADR, 3);
+               gm_phy_write(hw, port, PHY_MARV_PHY_CTRL, PHY_M_LEDC_LOS_CTRL(1) |      /* LINK/ACT */
+                            PHY_M_LEDC_INIT_CTRL(sky2->speed ==
+                                                 SPEED_10 ? 7 : 0) |
+                            PHY_M_LEDC_STA1_CTRL(sky2->speed ==
+                                                 SPEED_100 ? 7 : 0) |
+                            PHY_M_LEDC_STA0_CTRL(sky2->speed ==
+                                                 SPEED_1000 ? 7 : 0));
+               gm_phy_write(hw, port, PHY_MARV_EXT_ADR, pg);
+       }
+
+       if (netif_msg_link(sky2))
+               printk(KERN_INFO PFX
+                      "%s: Link is up at %d Mbps, %s duplex, flow control %s\n",
+                      sky2->netdev->name, sky2->speed,
+                      sky2->duplex == DUPLEX_FULL ? "full" : "half",
+                      (sky2->tx_pause && sky2->rx_pause) ? "both" :
+                      sky2->tx_pause ? "tx" : sky2->rx_pause ? "rx" : "none");
+}
+
+static void sky2_link_down(struct sky2_port *sky2)
+{
+       struct sky2_hw *hw = sky2->hw;
+       unsigned port = sky2->port;
+       u16 reg;
+
+       gm_phy_write(hw, port, PHY_MARV_INT_MASK, 0);
+
+       reg = gma_read16(hw, port, GM_GP_CTRL);
+       reg &= ~(GM_GPCR_RX_ENA | GM_GPCR_TX_ENA);
+       gma_write16(hw, port, GM_GP_CTRL, reg);
+       gma_read16(hw, port, GM_GP_CTRL);       /* PCI post */
+
+       if (sky2->rx_pause && !sky2->tx_pause) {
+               /* restore Asymmetric Pause bit */
+               gm_phy_write(hw, port, PHY_MARV_AUNE_ADV,
+                            gm_phy_read(hw, port, PHY_MARV_AUNE_ADV)
+                            | PHY_M_AN_ASP);
+       }
+
+       sky2_phy_reset(hw, port);
+
+       netif_carrier_off(sky2->netdev);
+       netif_stop_queue(sky2->netdev);
+
+       /* Turn on link LED */
+       sky2_write8(hw, SK_REG(port, LNK_LED_REG), LINKLED_OFF);
+
+       if (netif_msg_link(sky2))
+               printk(KERN_INFO PFX "%s: Link is down.\n", sky2->netdev->name);
+       sky2_phy_init(hw, port);
+}
+
+static int sky2_autoneg_done(struct sky2_port *sky2, u16 aux)
+{
+       struct sky2_hw *hw = sky2->hw;
+       unsigned port = sky2->port;
+       u16 lpa;
+
+       lpa = gm_phy_read(hw, port, PHY_MARV_AUNE_LP);
+
+       if (lpa & PHY_M_AN_RF) {
+               printk(KERN_ERR PFX "%s: remote fault", sky2->netdev->name);
+               return -1;
+       }
+
+       if (hw->chip_id != CHIP_ID_YUKON_FE &&
+           gm_phy_read(hw, port, PHY_MARV_1000T_STAT) & PHY_B_1000S_MSF) {
+               printk(KERN_ERR PFX "%s: master/slave fault",
+                      sky2->netdev->name);
+               return -1;
+       }
+
+       if (!(aux & PHY_M_PS_SPDUP_RES)) {
+               printk(KERN_ERR PFX "%s: speed/duplex mismatch",
+                      sky2->netdev->name);
+               return -1;
+       }
+
+       sky2->duplex = (aux & PHY_M_PS_FULL_DUP) ? DUPLEX_FULL : DUPLEX_HALF;
+
+       sky2->speed = sky2_phy_speed(hw, aux);
+
+       /* Pause bits are offset (9..8) */
+       if (hw->chip_id == CHIP_ID_YUKON_XL)
+               aux >>= 6;
+
+       sky2->rx_pause = (aux & PHY_M_PS_RX_P_EN) != 0;
+       sky2->tx_pause = (aux & PHY_M_PS_TX_P_EN) != 0;
+
+       if ((sky2->tx_pause || sky2->rx_pause)
+           && !(sky2->speed < SPEED_1000 && sky2->duplex == DUPLEX_HALF))
+               sky2_write8(hw, SK_REG(port, GMAC_CTRL), GMC_PAUSE_ON);
+       else
+               sky2_write8(hw, SK_REG(port, GMAC_CTRL), GMC_PAUSE_OFF);
+
+       return 0;
+}
+
+/*
+ * Interrupt from PHY are handled outside of interrupt context
+ * because accessing phy registers requires spin wait which might
+ * cause excess interrupt latency.
+ */
+static void sky2_phy_task(void *arg)
+{
+       struct sky2_port *sky2 = arg;
+       struct sky2_hw *hw = sky2->hw;
+       u16 istatus, phystat;
+
+       down(&sky2->phy_sema);
+       istatus = gm_phy_read(hw, sky2->port, PHY_MARV_INT_STAT);
+       phystat = gm_phy_read(hw, sky2->port, PHY_MARV_PHY_STAT);
+
+       if (netif_msg_intr(sky2))
+               printk(KERN_INFO PFX "%s: phy interrupt status 0x%x 0x%x\n",
+                      sky2->netdev->name, istatus, phystat);
+
+       if (istatus & PHY_M_IS_AN_COMPL) {
+               if (sky2_autoneg_done(sky2, phystat) == 0)
+                       sky2_link_up(sky2);
+               goto out;
+       }
+
+       if (istatus & PHY_M_IS_LSP_CHANGE)
+               sky2->speed = sky2_phy_speed(hw, phystat);
+
+       if (istatus & PHY_M_IS_DUP_CHANGE)
+               sky2->duplex =
+                   (phystat & PHY_M_PS_FULL_DUP) ? DUPLEX_FULL : DUPLEX_HALF;
+
+       if (istatus & PHY_M_IS_LST_CHANGE) {
+               if (phystat & PHY_M_PS_LINK_UP)
+                       sky2_link_up(sky2);
+               else
+                       sky2_link_down(sky2);
+       }
+out:
+       up(&sky2->phy_sema);
+
+       local_irq_disable();
+       hw->intr_mask |= (sky2->port == 0) ? Y2_IS_IRQ_PHY1 : Y2_IS_IRQ_PHY2;
+       sky2_write32(hw, B0_IMSK, hw->intr_mask);
+       local_irq_enable();
+}
+
+static void sky2_tx_timeout(struct net_device *dev)
+{
+       struct sky2_port *sky2 = netdev_priv(dev);
+       struct sky2_hw *hw = sky2->hw;
+       unsigned txq = txqaddr[sky2->port];
+
+       if (netif_msg_timer(sky2))
+               printk(KERN_ERR PFX "%s: tx timeout\n", dev->name);
+
+       netif_stop_queue(dev);
+
+       sky2_write32(hw, Q_ADDR(txq, Q_CSR), BMU_STOP);
+       sky2_read32(hw, Q_ADDR(txq, Q_CSR));
+
+       sky2_write32(hw, Y2_QADDR(txq, PREF_UNIT_CTRL), PREF_UNIT_RST_SET);
+
+       sky2_tx_clean(sky2);
+
+       sky2_qset(hw, txq);
+       sky2_prefetch_init(hw, txq, sky2->tx_le_map, TX_RING_SIZE - 1);
+
+       netif_wake_queue(dev);
+}
+
+
+#define roundup(x, y)   ((((x)+((y)-1))/(y))*(y))
+/* Want receive buffer size to be multiple of 64 bits, and incl room for vlan */
+static inline unsigned sky2_buf_size(int mtu)
+{
+       return roundup(mtu + ETH_HLEN + 4, 8);
+}
+
+static int sky2_change_mtu(struct net_device *dev, int new_mtu)
+{
+       struct sky2_port *sky2 = netdev_priv(dev);
+       struct sky2_hw *hw = sky2->hw;
+       int err;
+       u16 ctl, mode;
+
+       if (new_mtu < ETH_ZLEN || new_mtu > ETH_JUMBO_MTU)
+               return -EINVAL;
+
+       if (hw->chip_id == CHIP_ID_YUKON_EC_U && new_mtu > ETH_DATA_LEN)
+               return -EINVAL;
+
+       if (!netif_running(dev)) {
+               dev->mtu = new_mtu;
+               return 0;
+       }
+
+       sky2_write32(hw, B0_IMSK, 0);
+
+       dev->trans_start = jiffies;     /* prevent tx timeout */
+       netif_stop_queue(dev);
+       netif_poll_disable(hw->dev[0]);
+
+       ctl = gma_read16(hw, sky2->port, GM_GP_CTRL);
+       gma_write16(hw, sky2->port, GM_GP_CTRL, ctl & ~GM_GPCR_RX_ENA);
+       sky2_rx_stop(sky2);
+       sky2_rx_clean(sky2);
+
+       dev->mtu = new_mtu;
+       sky2->rx_bufsize = sky2_buf_size(new_mtu);
+       mode = DATA_BLIND_VAL(DATA_BLIND_DEF) |
+               GM_SMOD_VLAN_ENA | IPG_DATA_VAL(IPG_DATA_DEF);
+
+       if (dev->mtu > ETH_DATA_LEN)
+               mode |= GM_SMOD_JUMBO_ENA;
+
+       gma_write16(hw, sky2->port, GM_SERIAL_MODE, mode);
+
+       sky2_write8(hw, RB_ADDR(rxqaddr[sky2->port], RB_CTRL), RB_ENA_OP_MD);
+
+       err = sky2_rx_start(sky2);
+       gma_write16(hw, sky2->port, GM_GP_CTRL, ctl);
+
+       netif_poll_disable(hw->dev[0]);
+       netif_wake_queue(dev);
+       sky2_write32(hw, B0_IMSK, hw->intr_mask);
+
+       return err;
+}
+
+/*
+ * Receive one packet.
+ * For small packets or errors, just reuse existing skb.
+ * For larger packets, get new buffer.
+ */
+static struct sk_buff *sky2_receive(struct sky2_port *sky2,
+                                   u16 length, u32 status)
+{
+       struct ring_info *re = sky2->rx_ring + sky2->rx_next;
+       struct sk_buff *skb = NULL;
+
+       if (unlikely(netif_msg_rx_status(sky2)))
+               printk(KERN_DEBUG PFX "%s: rx slot %u status 0x%x len %d\n",
+                      sky2->netdev->name, sky2->rx_next, status, length);
+
+       sky2->rx_next = (sky2->rx_next + 1) % sky2->rx_pending;
+       prefetch(sky2->rx_ring + sky2->rx_next);
+
+       if (status & GMR_FS_ANY_ERR)
+               goto error;
+
+       if (!(status & GMR_FS_RX_OK))
+               goto resubmit;
+
+       if (length < copybreak) {
+               skb = alloc_skb(length + 2, GFP_ATOMIC);
+               if (!skb)
+                       goto resubmit;
+
+               skb_reserve(skb, 2);
+               pci_dma_sync_single_for_cpu(sky2->hw->pdev, re->mapaddr,
+                                           length, PCI_DMA_FROMDEVICE);
+               memcpy(skb->data, re->skb->data, length);
+               skb->ip_summed = re->skb->ip_summed;
+               skb->csum = re->skb->csum;
+               pci_dma_sync_single_for_device(sky2->hw->pdev, re->mapaddr,
+                                              length, PCI_DMA_FROMDEVICE);
+       } else {
+               struct sk_buff *nskb;
+
+               nskb = dev_alloc_skb(sky2->rx_bufsize);
+               if (!nskb)
+                       goto resubmit;
+
+               skb = re->skb;
+               re->skb = nskb;
+               pci_unmap_single(sky2->hw->pdev, re->mapaddr,
+                                sky2->rx_bufsize, PCI_DMA_FROMDEVICE);
+               prefetch(skb->data);
+
+               re->mapaddr = pci_map_single(sky2->hw->pdev, nskb->data,
+                                            sky2->rx_bufsize, PCI_DMA_FROMDEVICE);
+       }
+
+       skb_put(skb, length);
+resubmit:
+       re->skb->ip_summed = CHECKSUM_NONE;
+       sky2_rx_add(sky2, re->mapaddr);
+
+       /* Tell receiver about new buffers. */
+       sky2_put_idx(sky2->hw, rxqaddr[sky2->port], sky2->rx_put,
+                    &sky2->rx_last_put, RX_LE_SIZE);
+
+       return skb;
+
+error:
+       if (netif_msg_rx_err(sky2))
+               printk(KERN_INFO PFX "%s: rx error, status 0x%x length %d\n",
+                      sky2->netdev->name, status, length);
+
+       if (status & (GMR_FS_LONG_ERR | GMR_FS_UN_SIZE))
+               sky2->net_stats.rx_length_errors++;
+       if (status & GMR_FS_FRAGMENT)
+               sky2->net_stats.rx_frame_errors++;
+       if (status & GMR_FS_CRC_ERR)
+               sky2->net_stats.rx_crc_errors++;
+       if (status & GMR_FS_RX_FF_OV)
+               sky2->net_stats.rx_fifo_errors++;
+
+       goto resubmit;
+}
+
+/*
+ * Check for transmit complete
+ */
+#define TX_NO_STATUS   0xffff
+
+static inline void sky2_tx_check(struct sky2_hw *hw, int port, u16 last)
+{
+       if (last != TX_NO_STATUS) {
+               struct net_device *dev = hw->dev[port];
+               if (dev && netif_running(dev)) {
+                       struct sky2_port *sky2 = netdev_priv(dev);
+                       sky2_tx_complete(sky2, last);
+               }
+       }
+}
+
+/*
+ * Both ports share the same status interrupt, therefore there is only
+ * one poll routine.
+ */
+static int sky2_poll(struct net_device *dev0, int *budget)
+{
+       struct sky2_hw *hw = ((struct sky2_port *) netdev_priv(dev0))->hw;
+       unsigned int to_do = min(dev0->quota, *budget);
+       unsigned int work_done = 0;
+       u16 hwidx;
+       u16 tx_done[2] = { TX_NO_STATUS, TX_NO_STATUS };
+
+       hwidx = sky2_read16(hw, STAT_PUT_IDX);
+       BUG_ON(hwidx >= STATUS_RING_SIZE);
+       rmb();
+
+       while (hwidx != hw->st_idx) {
+               struct sky2_status_le *le  = hw->st_le + hw->st_idx;
+               struct net_device *dev;
+               struct sky2_port *sky2;
+               struct sk_buff *skb;
+               u32 status;
+               u16 length;
+               u8 op;
+
+               le = hw->st_le + hw->st_idx;
+               hw->st_idx = (hw->st_idx + 1) % STATUS_RING_SIZE;
+               prefetch(hw->st_le + hw->st_idx);
+
+               BUG_ON(le->link >= 2);
+               dev = hw->dev[le->link];
+               if (dev == NULL || !netif_running(dev))
+                       continue;
+
+               sky2 = netdev_priv(dev);
+               status = le32_to_cpu(le->status);
+               length = le16_to_cpu(le->length);
+               op = le->opcode & ~HW_OWNER;
+               le->opcode = 0;
+
+               switch (op) {
+               case OP_RXSTAT:
+                       skb = sky2_receive(sky2, length, status);
+                       if (!skb)
+                               break;
+
+                       skb->dev = dev;
+                       skb->protocol = eth_type_trans(skb, dev);
+                       dev->last_rx = jiffies;
+
+#ifdef SKY2_VLAN_TAG_USED
+                       if (sky2->vlgrp && (status & GMR_FS_VLAN)) {
+                               vlan_hwaccel_receive_skb(skb,
+                                                        sky2->vlgrp,
+                                                        be16_to_cpu(sky2->rx_tag));
+                       } else
+#endif
+                               netif_receive_skb(skb);
+
+                       if (++work_done >= to_do)
+                               goto exit_loop;
+                       break;
+
+#ifdef SKY2_VLAN_TAG_USED
+               case OP_RXVLAN:
+                       sky2->rx_tag = length;
+                       break;
+
+               case OP_RXCHKSVLAN:
+                       sky2->rx_tag = length;
+                       /* fall through */
+#endif
+               case OP_RXCHKS:
+                       skb = sky2->rx_ring[sky2->rx_next].skb;
+                       skb->ip_summed = CHECKSUM_HW;
+                       skb->csum = le16_to_cpu(status);
+                       break;
+
+               case OP_TXINDEXLE:
+                       /* TX index reports status for both ports */
+                       tx_done[0] = status & 0xffff;
+                       tx_done[1] = ((status >> 24) & 0xff)
+                               | (u16)(length & 0xf) << 8;
+                       break;
+
+               default:
+                       if (net_ratelimit())
+                               printk(KERN_WARNING PFX
+                                      "unknown status opcode 0x%x\n", op);
+                       break;
+               }
+       }
+
+exit_loop:
+       sky2_write32(hw, STAT_CTRL, SC_STAT_CLR_IRQ);
+       mmiowb();
+
+       sky2_tx_check(hw, 0, tx_done[0]);
+       sky2_tx_check(hw, 1, tx_done[1]);
+
+       if (sky2_read16(hw, STAT_PUT_IDX) == hw->st_idx) {
+               /* need to restart TX timer */
+               if (is_ec_a1(hw)) {
+                       sky2_write8(hw, STAT_TX_TIMER_CTRL, TIM_STOP);
+                       sky2_write8(hw, STAT_TX_TIMER_CTRL, TIM_START);
+               }
+
+               netif_rx_complete(dev0);
+               hw->intr_mask |= Y2_IS_STAT_BMU;
+               sky2_write32(hw, B0_IMSK, hw->intr_mask);
+               mmiowb();
+               return 0;
+       } else {
+               *budget -= work_done;
+               dev0->quota -= work_done;
+               return 1;
+       }
+}
+
+static void sky2_hw_error(struct sky2_hw *hw, unsigned port, u32 status)
+{
+       struct net_device *dev = hw->dev[port];
+
+       printk(KERN_INFO PFX "%s: hw error interrupt status 0x%x\n",
+              dev->name, status);
+
+       if (status & Y2_IS_PAR_RD1) {
+               printk(KERN_ERR PFX "%s: ram data read parity error\n",
+                      dev->name);
+               /* Clear IRQ */
+               sky2_write16(hw, RAM_BUFFER(port, B3_RI_CTRL), RI_CLR_RD_PERR);
+       }
+
+       if (status & Y2_IS_PAR_WR1) {
+               printk(KERN_ERR PFX "%s: ram data write parity error\n",
+                      dev->name);
+
+               sky2_write16(hw, RAM_BUFFER(port, B3_RI_CTRL), RI_CLR_WR_PERR);
+       }
+
+       if (status & Y2_IS_PAR_MAC1) {
+               printk(KERN_ERR PFX "%s: MAC parity error\n", dev->name);
+               sky2_write8(hw, SK_REG(port, TX_GMF_CTRL_T), GMF_CLI_TX_PE);
+       }
+
+       if (status & Y2_IS_PAR_RX1) {
+               printk(KERN_ERR PFX "%s: RX parity error\n", dev->name);
+               sky2_write32(hw, Q_ADDR(rxqaddr[port], Q_CSR), BMU_CLR_IRQ_PAR);
+       }
+
+       if (status & Y2_IS_TCP_TXA1) {
+               printk(KERN_ERR PFX "%s: TCP segmentation error\n", dev->name);
+               sky2_write32(hw, Q_ADDR(txqaddr[port], Q_CSR), BMU_CLR_IRQ_TCP);
+       }
+}
+
+static void sky2_hw_intr(struct sky2_hw *hw)
+{
+       u32 status = sky2_read32(hw, B0_HWE_ISRC);
+
+       if (status & Y2_IS_TIST_OV)
+               sky2_write8(hw, GMAC_TI_ST_CTRL, GMT_ST_CLR_IRQ);
+
+       if (status & (Y2_IS_MST_ERR | Y2_IS_IRQ_STAT)) {
+               u16 pci_err;
+
+               pci_read_config_word(hw->pdev, PCI_STATUS, &pci_err);
+               printk(KERN_ERR PFX "%s: pci hw error (0x%x)\n",
+                      pci_name(hw->pdev), pci_err);
+
+               sky2_write8(hw, B2_TST_CTRL1, TST_CFG_WRITE_ON);
+               pci_write_config_word(hw->pdev, PCI_STATUS,
+                                     pci_err | PCI_STATUS_ERROR_BITS);
+               sky2_write8(hw, B2_TST_CTRL1, TST_CFG_WRITE_OFF);
+       }
+
+       if (status & Y2_IS_PCI_EXP) {
+               /* PCI-Express uncorrectable Error occurred */
+               u32 pex_err;
+
+               pci_read_config_dword(hw->pdev, PEX_UNC_ERR_STAT, &pex_err);
+
+               printk(KERN_ERR PFX "%s: pci express error (0x%x)\n",
+                      pci_name(hw->pdev), pex_err);
+
+               /* clear the interrupt */
+               sky2_write32(hw, B2_TST_CTRL1, TST_CFG_WRITE_ON);
+               pci_write_config_dword(hw->pdev, PEX_UNC_ERR_STAT,
+                                      0xffffffffUL);
+               sky2_write32(hw, B2_TST_CTRL1, TST_CFG_WRITE_OFF);
+
+               if (pex_err & PEX_FATAL_ERRORS) {
+                       u32 hwmsk = sky2_read32(hw, B0_HWE_IMSK);
+                       hwmsk &= ~Y2_IS_PCI_EXP;
+                       sky2_write32(hw, B0_HWE_IMSK, hwmsk);
+               }
+       }
+
+       if (status & Y2_HWE_L1_MASK)
+               sky2_hw_error(hw, 0, status);
+       status >>= 8;
+       if (status & Y2_HWE_L1_MASK)
+               sky2_hw_error(hw, 1, status);
+}
+
+static void sky2_mac_intr(struct sky2_hw *hw, unsigned port)
+{
+       struct net_device *dev = hw->dev[port];
+       struct sky2_port *sky2 = netdev_priv(dev);
+       u8 status = sky2_read8(hw, SK_REG(port, GMAC_IRQ_SRC));
+
+       if (netif_msg_intr(sky2))
+               printk(KERN_INFO PFX "%s: mac interrupt status 0x%x\n",
+                      dev->name, status);
+
+       if (status & GM_IS_RX_FF_OR) {
+               ++sky2->net_stats.rx_fifo_errors;
+               sky2_write8(hw, SK_REG(port, RX_GMF_CTRL_T), GMF_CLI_RX_FO);
+       }
+
+       if (status & GM_IS_TX_FF_UR) {
+               ++sky2->net_stats.tx_fifo_errors;
+               sky2_write8(hw, SK_REG(port, TX_GMF_CTRL_T), GMF_CLI_TX_FU);
+       }
+}
+
+static void sky2_phy_intr(struct sky2_hw *hw, unsigned port)
+{
+       struct net_device *dev = hw->dev[port];
+       struct sky2_port *sky2 = netdev_priv(dev);
+
+       hw->intr_mask &= ~(port == 0 ? Y2_IS_IRQ_PHY1 : Y2_IS_IRQ_PHY2);
+       sky2_write32(hw, B0_IMSK, hw->intr_mask);
+       schedule_work(&sky2->phy_task);
+}
+
+static irqreturn_t sky2_intr(int irq, void *dev_id, struct pt_regs *regs)
+{
+       struct sky2_hw *hw = dev_id;
+       struct net_device *dev0 = hw->dev[0];
+       u32 status;
+
+       status = sky2_read32(hw, B0_Y2_SP_ISRC2);
+       if (status == 0 || status == ~0)
+               return IRQ_NONE;
+
+       if (status & Y2_IS_HW_ERR)
+               sky2_hw_intr(hw);
+
+       /* Do NAPI for Rx and Tx status */
+       if (status & Y2_IS_STAT_BMU) {
+               hw->intr_mask &= ~Y2_IS_STAT_BMU;
+               sky2_write32(hw, B0_IMSK, hw->intr_mask);
+
+               if (likely(__netif_rx_schedule_prep(dev0))) {
+                       prefetch(&hw->st_le[hw->st_idx]);
+                       __netif_rx_schedule(dev0);
+               }
+       }
+
+       if (status & Y2_IS_IRQ_PHY1)
+               sky2_phy_intr(hw, 0);
+
+       if (status & Y2_IS_IRQ_PHY2)
+               sky2_phy_intr(hw, 1);
+
+       if (status & Y2_IS_IRQ_MAC1)
+               sky2_mac_intr(hw, 0);
+
+       if (status & Y2_IS_IRQ_MAC2)
+               sky2_mac_intr(hw, 1);
+
+       sky2_write32(hw, B0_Y2_SP_ICR, 2);
+
+       sky2_read32(hw, B0_IMSK);
+
+       return IRQ_HANDLED;
+}
+
+#ifdef CONFIG_NET_POLL_CONTROLLER
+static void sky2_netpoll(struct net_device *dev)
+{
+       struct sky2_port *sky2 = netdev_priv(dev);
+
+       sky2_intr(sky2->hw->pdev->irq, sky2->hw, NULL);
+}
+#endif
+
+/* Chip internal frequency for clock calculations */
+static inline u32 sky2_mhz(const struct sky2_hw *hw)
+{
+       switch (hw->chip_id) {
+       case CHIP_ID_YUKON_EC:
+       case CHIP_ID_YUKON_EC_U:
+               return 125;     /* 125 Mhz */
+       case CHIP_ID_YUKON_FE:
+               return 100;     /* 100 Mhz */
+       default:                /* YUKON_XL */
+               return 156;     /* 156 Mhz */
+       }
+}
+
+static inline u32 sky2_us2clk(const struct sky2_hw *hw, u32 us)
+{
+       return sky2_mhz(hw) * us;
+}
+
+static inline u32 sky2_clk2us(const struct sky2_hw *hw, u32 clk)
+{
+       return clk / sky2_mhz(hw);
+}
+
+
+static int sky2_reset(struct sky2_hw *hw)
+{
+       u32 ctst;
+       u16 status;
+       u8 t8, pmd_type;
+       int i;
+
+       ctst = sky2_read32(hw, B0_CTST);
+
+       sky2_write8(hw, B0_CTST, CS_RST_CLR);
+       hw->chip_id = sky2_read8(hw, B2_CHIP_ID);
+       if (hw->chip_id < CHIP_ID_YUKON_XL || hw->chip_id > CHIP_ID_YUKON_FE) {
+               printk(KERN_ERR PFX "%s: unsupported chip type 0x%x\n",
+                      pci_name(hw->pdev), hw->chip_id);
+               return -EOPNOTSUPP;
+       }
+
+       /* ring for status responses */
+       hw->st_le = pci_alloc_consistent(hw->pdev, STATUS_LE_BYTES,
+                                        &hw->st_dma);
+       if (!hw->st_le)
+               return -ENOMEM;
+
+       /* disable ASF */
+       if (hw->chip_id <= CHIP_ID_YUKON_EC) {
+               sky2_write8(hw, B28_Y2_ASF_STAT_CMD, Y2_ASF_RESET);
+               sky2_write16(hw, B0_CTST, Y2_ASF_DISABLE);
+       }
+
+       /* do a SW reset */
+       sky2_write8(hw, B0_CTST, CS_RST_SET);
+       sky2_write8(hw, B0_CTST, CS_RST_CLR);
+
+       /* clear PCI errors, if any */
+       pci_read_config_word(hw->pdev, PCI_STATUS, &status);
+       sky2_write8(hw, B2_TST_CTRL1, TST_CFG_WRITE_ON);
+       pci_write_config_word(hw->pdev, PCI_STATUS,
+                             status | PCI_STATUS_ERROR_BITS);
+
+       sky2_write8(hw, B0_CTST, CS_MRST_CLR);
+
+       /* clear any PEX errors */
+       if (is_pciex(hw)) {
+               u16 lstat;
+               pci_write_config_dword(hw->pdev, PEX_UNC_ERR_STAT,
+                                      0xffffffffUL);
+               pci_read_config_word(hw->pdev, PEX_LNK_STAT, &lstat);
+       }
+
+       pmd_type = sky2_read8(hw, B2_PMD_TYP);
+       hw->copper = !(pmd_type == 'L' || pmd_type == 'S');
+
+       hw->ports = 1;
+       t8 = sky2_read8(hw, B2_Y2_HW_RES);
+       if ((t8 & CFG_DUAL_MAC_MSK) == CFG_DUAL_MAC_MSK) {
+               if (!(sky2_read8(hw, B2_Y2_CLK_GATE) & Y2_STATUS_LNK2_INAC))
+                       ++hw->ports;
+       }
+       hw->chip_rev = (sky2_read8(hw, B2_MAC_CFG) & CFG_CHIP_R_MSK) >> 4;
+
+       sky2_set_power_state(hw, PCI_D0);
+
+       for (i = 0; i < hw->ports; i++) {
+               sky2_write8(hw, SK_REG(i, GMAC_LINK_CTRL), GMLC_RST_SET);
+               sky2_write8(hw, SK_REG(i, GMAC_LINK_CTRL), GMLC_RST_CLR);
+       }
+
+       sky2_write8(hw, B2_TST_CTRL1, TST_CFG_WRITE_OFF);
+
+       /* Clear I2C IRQ noise */
+       sky2_write32(hw, B2_I2C_IRQ, 1);
+
+       /* turn off hardware timer (unused) */
+       sky2_write8(hw, B2_TI_CTRL, TIM_STOP);
+       sky2_write8(hw, B2_TI_CTRL, TIM_CLR_IRQ);
+
+       sky2_write8(hw, B0_Y2LED, LED_STAT_ON);
+
+       /* Turn off descriptor polling */
+       sky2_write32(hw, B28_DPT_CTRL, DPT_STOP);
+
+       /* Turn off receive timestamp */
+       sky2_write8(hw, GMAC_TI_ST_CTRL, GMT_ST_STOP);
+       sky2_write8(hw, GMAC_TI_ST_CTRL, GMT_ST_CLR_IRQ);
+
+       /* enable the Tx Arbiters */
+       for (i = 0; i < hw->ports; i++)
+               sky2_write8(hw, SK_REG(i, TXA_CTRL), TXA_ENA_ARB);
+
+       /* Initialize ram interface */
+       for (i = 0; i < hw->ports; i++) {
+               sky2_write8(hw, RAM_BUFFER(i, B3_RI_CTRL), RI_RST_CLR);
+
+               sky2_write8(hw, RAM_BUFFER(i, B3_RI_WTO_R1), SK_RI_TO_53);
+               sky2_write8(hw, RAM_BUFFER(i, B3_RI_WTO_XA1), SK_RI_TO_53);
+               sky2_write8(hw, RAM_BUFFER(i, B3_RI_WTO_XS1), SK_RI_TO_53);
+               sky2_write8(hw, RAM_BUFFER(i, B3_RI_RTO_R1), SK_RI_TO_53);
+               sky2_write8(hw, RAM_BUFFER(i, B3_RI_RTO_XA1), SK_RI_TO_53);
+               sky2_write8(hw, RAM_BUFFER(i, B3_RI_RTO_XS1), SK_RI_TO_53);
+               sky2_write8(hw, RAM_BUFFER(i, B3_RI_WTO_R2), SK_RI_TO_53);
+               sky2_write8(hw, RAM_BUFFER(i, B3_RI_WTO_XA2), SK_RI_TO_53);
+               sky2_write8(hw, RAM_BUFFER(i, B3_RI_WTO_XS2), SK_RI_TO_53);
+               sky2_write8(hw, RAM_BUFFER(i, B3_RI_RTO_R2), SK_RI_TO_53);
+               sky2_write8(hw, RAM_BUFFER(i, B3_RI_RTO_XA2), SK_RI_TO_53);
+               sky2_write8(hw, RAM_BUFFER(i, B3_RI_RTO_XS2), SK_RI_TO_53);
+       }
+
+       sky2_write32(hw, B0_HWE_IMSK, Y2_HWE_ALL_MASK);
+
+       for (i = 0; i < hw->ports; i++)
+               sky2_phy_reset(hw, i);
+
+       memset(hw->st_le, 0, STATUS_LE_BYTES);
+       hw->st_idx = 0;
+
+       sky2_write32(hw, STAT_CTRL, SC_STAT_RST_SET);
+       sky2_write32(hw, STAT_CTRL, SC_STAT_RST_CLR);
+
+       sky2_write32(hw, STAT_LIST_ADDR_LO, hw->st_dma);
+       sky2_write32(hw, STAT_LIST_ADDR_HI, (u64) hw->st_dma >> 32);
+
+       /* Set the list last index */
+       sky2_write16(hw, STAT_LAST_IDX, STATUS_RING_SIZE - 1);
+
+       /* These status setup values are copied from SysKonnect's driver */
+       if (is_ec_a1(hw)) {
+               /* WA for dev. #4.3 */
+               sky2_write16(hw, STAT_TX_IDX_TH, 0xfff);        /* Tx Threshold */
+
+               /* set Status-FIFO watermark */
+               sky2_write8(hw, STAT_FIFO_WM, 0x21);    /* WA for dev. #4.18 */
+
+               /* set Status-FIFO ISR watermark */
+               sky2_write8(hw, STAT_FIFO_ISR_WM, 0x07);        /* WA for dev. #4.18 */
+               sky2_write32(hw, STAT_TX_TIMER_INI, sky2_us2clk(hw, 10000));
+       } else {
+               sky2_write16(hw, STAT_TX_IDX_TH, 10);
+               sky2_write8(hw, STAT_FIFO_WM, 16);
+
+               /* set Status-FIFO ISR watermark */
+               if (hw->chip_id == CHIP_ID_YUKON_XL && hw->chip_rev == 0)
+                       sky2_write8(hw, STAT_FIFO_ISR_WM, 4);
+               else
+                       sky2_write8(hw, STAT_FIFO_ISR_WM, 16);
+
+               sky2_write32(hw, STAT_TX_TIMER_INI, sky2_us2clk(hw, 1000));
+               sky2_write32(hw, STAT_LEV_TIMER_INI, sky2_us2clk(hw, 100));
+               sky2_write32(hw, STAT_ISR_TIMER_INI, sky2_us2clk(hw, 20));
+       }
+
+       /* enable status unit */
+       sky2_write32(hw, STAT_CTRL, SC_STAT_OP_ON);
+
+       sky2_write8(hw, STAT_TX_TIMER_CTRL, TIM_START);
+       sky2_write8(hw, STAT_LEV_TIMER_CTRL, TIM_START);
+       sky2_write8(hw, STAT_ISR_TIMER_CTRL, TIM_START);
+
+       return 0;
+}
+
+static inline u32 sky2_supported_modes(const struct sky2_hw *hw)
+{
+       u32 modes;
+       if (hw->copper) {
+               modes = SUPPORTED_10baseT_Half
+                   | SUPPORTED_10baseT_Full
+                   | SUPPORTED_100baseT_Half
+                   | SUPPORTED_100baseT_Full
+                   | SUPPORTED_Autoneg | SUPPORTED_TP;
+
+               if (hw->chip_id != CHIP_ID_YUKON_FE)
+                       modes |= SUPPORTED_1000baseT_Half
+                           | SUPPORTED_1000baseT_Full;
+       } else
+               modes = SUPPORTED_1000baseT_Full | SUPPORTED_FIBRE
+                   | SUPPORTED_Autoneg;
+       return modes;
+}
+
+static int sky2_get_settings(struct net_device *dev, struct ethtool_cmd *ecmd)
+{
+       struct sky2_port *sky2 = netdev_priv(dev);
+       struct sky2_hw *hw = sky2->hw;
+
+       ecmd->transceiver = XCVR_INTERNAL;
+       ecmd->supported = sky2_supported_modes(hw);
+       ecmd->phy_address = PHY_ADDR_MARV;
+       if (hw->copper) {
+               ecmd->supported = SUPPORTED_10baseT_Half
+                   | SUPPORTED_10baseT_Full
+                   | SUPPORTED_100baseT_Half
+                   | SUPPORTED_100baseT_Full
+                   | SUPPORTED_1000baseT_Half
+                   | SUPPORTED_1000baseT_Full
+                   | SUPPORTED_Autoneg | SUPPORTED_TP;
+               ecmd->port = PORT_TP;
+       } else
+               ecmd->port = PORT_FIBRE;
+
+       ecmd->advertising = sky2->advertising;
+       ecmd->autoneg = sky2->autoneg;
+       ecmd->speed = sky2->speed;
+       ecmd->duplex = sky2->duplex;
+       return 0;
+}
+
+static int sky2_set_settings(struct net_device *dev, struct ethtool_cmd *ecmd)
+{
+       struct sky2_port *sky2 = netdev_priv(dev);
+       const struct sky2_hw *hw = sky2->hw;
+       u32 supported = sky2_supported_modes(hw);
+
+       if (ecmd->autoneg == AUTONEG_ENABLE) {
+               ecmd->advertising = supported;
+               sky2->duplex = -1;
+               sky2->speed = -1;
+       } else {
+               u32 setting;
+
+               switch (ecmd->speed) {
+               case SPEED_1000:
+                       if (ecmd->duplex == DUPLEX_FULL)
+                               setting = SUPPORTED_1000baseT_Full;
+                       else if (ecmd->duplex == DUPLEX_HALF)
+                               setting = SUPPORTED_1000baseT_Half;
+                       else
+                               return -EINVAL;
+                       break;
+               case SPEED_100:
+                       if (ecmd->duplex == DUPLEX_FULL)
+                               setting = SUPPORTED_100baseT_Full;
+                       else if (ecmd->duplex == DUPLEX_HALF)
+                               setting = SUPPORTED_100baseT_Half;
+                       else
+                               return -EINVAL;
+                       break;
+
+               case SPEED_10:
+                       if (ecmd->duplex == DUPLEX_FULL)
+                               setting = SUPPORTED_10baseT_Full;
+                       else if (ecmd->duplex == DUPLEX_HALF)
+                               setting = SUPPORTED_10baseT_Half;
+                       else
+                               return -EINVAL;
+                       break;
+               default:
+                       return -EINVAL;
+               }
+
+               if ((setting & supported) == 0)
+                       return -EINVAL;
+
+               sky2->speed = ecmd->speed;
+               sky2->duplex = ecmd->duplex;
+       }
+
+       sky2->autoneg = ecmd->autoneg;
+       sky2->advertising = ecmd->advertising;
+
+       if (netif_running(dev)) {
+               sky2_down(dev);
+               sky2_up(dev);
+       }
+
+       return 0;
+}
+
+static void sky2_get_drvinfo(struct net_device *dev,
+                            struct ethtool_drvinfo *info)
+{
+       struct sky2_port *sky2 = netdev_priv(dev);
+
+       strcpy(info->driver, DRV_NAME);
+       strcpy(info->version, DRV_VERSION);
+       strcpy(info->fw_version, "N/A");
+       strcpy(info->bus_info, pci_name(sky2->hw->pdev));
+}
+
+static const struct sky2_stat {
+       char name[ETH_GSTRING_LEN];
+       u16 offset;
+} sky2_stats[] = {
+       { "tx_bytes",      GM_TXO_OK_HI },
+       { "rx_bytes",      GM_RXO_OK_HI },
+       { "tx_broadcast",  GM_TXF_BC_OK },
+       { "rx_broadcast",  GM_RXF_BC_OK },
+       { "tx_multicast",  GM_TXF_MC_OK },
+       { "rx_multicast",  GM_RXF_MC_OK },
+       { "tx_unicast",    GM_TXF_UC_OK },
+       { "rx_unicast",    GM_RXF_UC_OK },
+       { "tx_mac_pause",  GM_TXF_MPAUSE },
+       { "rx_mac_pause",  GM_RXF_MPAUSE },
+       { "collisions",    GM_TXF_SNG_COL },
+       { "late_collision",GM_TXF_LAT_COL },
+       { "aborted",       GM_TXF_ABO_COL },
+       { "multi_collisions", GM_TXF_MUL_COL },
+       { "fifo_underrun", GM_TXE_FIFO_UR },
+       { "fifo_overflow", GM_RXE_FIFO_OV },
+       { "rx_toolong",    GM_RXF_LNG_ERR },
+       { "rx_jabber",     GM_RXF_JAB_PKT },
+       { "rx_runt",       GM_RXE_FRAG },
+       { "rx_too_long",   GM_RXF_LNG_ERR },
+       { "rx_fcs_error",   GM_RXF_FCS_ERR },
+};
+
+static u32 sky2_get_rx_csum(struct net_device *dev)
+{
+       struct sky2_port *sky2 = netdev_priv(dev);
+
+       return sky2->rx_csum;
+}
+
+static int sky2_set_rx_csum(struct net_device *dev, u32 data)
+{
+       struct sky2_port *sky2 = netdev_priv(dev);
+
+       sky2->rx_csum = data;
+
+       sky2_write32(sky2->hw, Q_ADDR(rxqaddr[sky2->port], Q_CSR),
+                    data ? BMU_ENA_RX_CHKSUM : BMU_DIS_RX_CHKSUM);
+
+       return 0;
+}
+
+static u32 sky2_get_msglevel(struct net_device *netdev)
+{
+       struct sky2_port *sky2 = netdev_priv(netdev);
+       return sky2->msg_enable;
+}
+
+static int sky2_nway_reset(struct net_device *dev)
+{
+       struct sky2_port *sky2 = netdev_priv(dev);
+       struct sky2_hw *hw = sky2->hw;
+
+       if (sky2->autoneg != AUTONEG_ENABLE)
+               return -EINVAL;
+
+       netif_stop_queue(dev);
+
+       down(&sky2->phy_sema);
+       sky2_phy_reset(hw, sky2->port);
+       sky2_phy_init(hw, sky2->port);
+       up(&sky2->phy_sema);
+
+       return 0;
+}
+
+static void sky2_phy_stats(struct sky2_port *sky2, u64 * data, unsigned count)
+{
+       struct sky2_hw *hw = sky2->hw;
+       unsigned port = sky2->port;
+       int i;
+
+       data[0] = (u64) gma_read32(hw, port, GM_TXO_OK_HI) << 32
+           | (u64) gma_read32(hw, port, GM_TXO_OK_LO);
+       data[1] = (u64) gma_read32(hw, port, GM_RXO_OK_HI) << 32
+           | (u64) gma_read32(hw, port, GM_RXO_OK_LO);
+
+       for (i = 2; i < count; i++)
+               data[i] = (u64) gma_read32(hw, port, sky2_stats[i].offset);
+}
+
+static void sky2_set_msglevel(struct net_device *netdev, u32 value)
+{
+       struct sky2_port *sky2 = netdev_priv(netdev);
+       sky2->msg_enable = value;
+}
+
+static int sky2_get_stats_count(struct net_device *dev)
+{
+       return ARRAY_SIZE(sky2_stats);
+}
+
+static void sky2_get_ethtool_stats(struct net_device *dev,
+                                  struct ethtool_stats *stats, u64 * data)
+{
+       struct sky2_port *sky2 = netdev_priv(dev);
+
+       sky2_phy_stats(sky2, data, ARRAY_SIZE(sky2_stats));
+}
+
+static void sky2_get_strings(struct net_device *dev, u32 stringset, u8 * data)
+{
+       int i;
+
+       switch (stringset) {
+       case ETH_SS_STATS:
+               for (i = 0; i < ARRAY_SIZE(sky2_stats); i++)
+                       memcpy(data + i * ETH_GSTRING_LEN,
+                              sky2_stats[i].name, ETH_GSTRING_LEN);
+               break;
+       }
+}
+
+/* Use hardware MIB variables for critical path statistics and
+ * transmit feedback not reported at interrupt.
+ * Other errors are accounted for in interrupt handler.
+ */
+static struct net_device_stats *sky2_get_stats(struct net_device *dev)
+{
+       struct sky2_port *sky2 = netdev_priv(dev);
+       u64 data[13];
+
+       sky2_phy_stats(sky2, data, ARRAY_SIZE(data));
+
+       sky2->net_stats.tx_bytes = data[0];
+       sky2->net_stats.rx_bytes = data[1];
+       sky2->net_stats.tx_packets = data[2] + data[4] + data[6];
+       sky2->net_stats.rx_packets = data[3] + data[5] + data[7];
+       sky2->net_stats.multicast = data[5] + data[7];
+       sky2->net_stats.collisions = data[10];
+       sky2->net_stats.tx_aborted_errors = data[12];
+
+       return &sky2->net_stats;
+}
+
+static int sky2_set_mac_address(struct net_device *dev, void *p)
+{
+       struct sky2_port *sky2 = netdev_priv(dev);
+       struct sockaddr *addr = p;
+       int err = 0;
+
+       if (!is_valid_ether_addr(addr->sa_data))
+               return -EADDRNOTAVAIL;
+
+       sky2_down(dev);
+       memcpy(dev->dev_addr, addr->sa_data, ETH_ALEN);
+       memcpy_toio(sky2->hw->regs + B2_MAC_1 + sky2->port * 8,
+                   dev->dev_addr, ETH_ALEN);
+       memcpy_toio(sky2->hw->regs + B2_MAC_2 + sky2->port * 8,
+                   dev->dev_addr, ETH_ALEN);
+       if (dev->flags & IFF_UP)
+               err = sky2_up(dev);
+       return err;
+}
+
+static void sky2_set_multicast(struct net_device *dev)
+{
+       struct sky2_port *sky2 = netdev_priv(dev);
+       struct sky2_hw *hw = sky2->hw;
+       unsigned port = sky2->port;
+       struct dev_mc_list *list = dev->mc_list;
+       u16 reg;
+       u8 filter[8];
+
+       memset(filter, 0, sizeof(filter));
+
+       reg = gma_read16(hw, port, GM_RX_CTRL);
+       reg |= GM_RXCR_UCF_ENA;
+
+       if (dev->flags & IFF_PROMISC)   /* promiscuous */
+               reg &= ~(GM_RXCR_UCF_ENA | GM_RXCR_MCF_ENA);
+       else if ((dev->flags & IFF_ALLMULTI) || dev->mc_count > 16)     /* all multicast */
+               memset(filter, 0xff, sizeof(filter));
+       else if (dev->mc_count == 0)    /* no multicast */
+               reg &= ~GM_RXCR_MCF_ENA;
+       else {
+               int i;
+               reg |= GM_RXCR_MCF_ENA;
+
+               for (i = 0; list && i < dev->mc_count; i++, list = list->next) {
+                       u32 bit = ether_crc(ETH_ALEN, list->dmi_addr) & 0x3f;
+                       filter[bit / 8] |= 1 << (bit % 8);
+               }
+       }
+
+       gma_write16(hw, port, GM_MC_ADDR_H1,
+                   (u16) filter[0] | ((u16) filter[1] << 8));
+       gma_write16(hw, port, GM_MC_ADDR_H2,
+                   (u16) filter[2] | ((u16) filter[3] << 8));
+       gma_write16(hw, port, GM_MC_ADDR_H3,
+                   (u16) filter[4] | ((u16) filter[5] << 8));
+       gma_write16(hw, port, GM_MC_ADDR_H4,
+                   (u16) filter[6] | ((u16) filter[7] << 8));
+
+       gma_write16(hw, port, GM_RX_CTRL, reg);
+}
+
+/* Can have one global because blinking is controlled by
+ * ethtool and that is always under RTNL mutex
+ */
+static void sky2_led(struct sky2_hw *hw, unsigned port, int on)
+{
+       u16 pg;
+
+       switch (hw->chip_id) {
+       case CHIP_ID_YUKON_XL:
+               pg = gm_phy_read(hw, port, PHY_MARV_EXT_ADR);
+               gm_phy_write(hw, port, PHY_MARV_EXT_ADR, 3);
+               gm_phy_write(hw, port, PHY_MARV_PHY_CTRL,
+                            on ? (PHY_M_LEDC_LOS_CTRL(1) |
+                                  PHY_M_LEDC_INIT_CTRL(7) |
+                                  PHY_M_LEDC_STA1_CTRL(7) |
+                                  PHY_M_LEDC_STA0_CTRL(7))
+                            : 0);
+
+               gm_phy_write(hw, port, PHY_MARV_EXT_ADR, pg);
+               break;
+
+       default:
+               gm_phy_write(hw, port, PHY_MARV_LED_CTRL, 0);
+               gm_phy_write(hw, port, PHY_MARV_LED_OVER,
+                            on ? PHY_M_LED_MO_DUP(MO_LED_ON) |
+                            PHY_M_LED_MO_10(MO_LED_ON) |
+                            PHY_M_LED_MO_100(MO_LED_ON) |
+                            PHY_M_LED_MO_1000(MO_LED_ON) |
+                            PHY_M_LED_MO_RX(MO_LED_ON)
+                            : PHY_M_LED_MO_DUP(MO_LED_OFF) |
+                            PHY_M_LED_MO_10(MO_LED_OFF) |
+                            PHY_M_LED_MO_100(MO_LED_OFF) |
+                            PHY_M_LED_MO_1000(MO_LED_OFF) |
+                            PHY_M_LED_MO_RX(MO_LED_OFF));
+
+       }
+}
+
+/* blink LED's for finding board */
+static int sky2_phys_id(struct net_device *dev, u32 data)
+{
+       struct sky2_port *sky2 = netdev_priv(dev);
+       struct sky2_hw *hw = sky2->hw;
+       unsigned port = sky2->port;
+       u16 ledctrl, ledover = 0;
+       long ms;
+       int interrupted;
+       int onoff = 1;
+
+       if (!data || data > (u32) (MAX_SCHEDULE_TIMEOUT / HZ))
+               ms = jiffies_to_msecs(MAX_SCHEDULE_TIMEOUT);
+       else
+               ms = data * 1000;
+
+       /* save initial values */
+       down(&sky2->phy_sema);
+       if (hw->chip_id == CHIP_ID_YUKON_XL) {
+               u16 pg = gm_phy_read(hw, port, PHY_MARV_EXT_ADR);
+               gm_phy_write(hw, port, PHY_MARV_EXT_ADR, 3);
+               ledctrl = gm_phy_read(hw, port, PHY_MARV_PHY_CTRL);
+               gm_phy_write(hw, port, PHY_MARV_EXT_ADR, pg);
+       } else {
+               ledctrl = gm_phy_read(hw, port, PHY_MARV_LED_CTRL);
+               ledover = gm_phy_read(hw, port, PHY_MARV_LED_OVER);
+       }
+
+       interrupted = 0;
+       while (!interrupted && ms > 0) {
+               sky2_led(hw, port, onoff);
+               onoff = !onoff;
+
+               up(&sky2->phy_sema);
+               interrupted = msleep_interruptible(250);
+               down(&sky2->phy_sema);
+
+               ms -= 250;
+       }
+
+       /* resume regularly scheduled programming */
+       if (hw->chip_id == CHIP_ID_YUKON_XL) {
+               u16 pg = gm_phy_read(hw, port, PHY_MARV_EXT_ADR);
+               gm_phy_write(hw, port, PHY_MARV_EXT_ADR, 3);
+               gm_phy_write(hw, port, PHY_MARV_PHY_CTRL, ledctrl);
+               gm_phy_write(hw, port, PHY_MARV_EXT_ADR, pg);
+       } else {
+               gm_phy_write(hw, port, PHY_MARV_LED_CTRL, ledctrl);
+               gm_phy_write(hw, port, PHY_MARV_LED_OVER, ledover);
+       }
+       up(&sky2->phy_sema);
+
+       return 0;
+}
+
+static void sky2_get_pauseparam(struct net_device *dev,
+                               struct ethtool_pauseparam *ecmd)
+{
+       struct sky2_port *sky2 = netdev_priv(dev);
+
+       ecmd->tx_pause = sky2->tx_pause;
+       ecmd->rx_pause = sky2->rx_pause;
+       ecmd->autoneg = sky2->autoneg;
+}
+
+static int sky2_set_pauseparam(struct net_device *dev,
+                              struct ethtool_pauseparam *ecmd)
+{
+       struct sky2_port *sky2 = netdev_priv(dev);
+       int err = 0;
+
+       sky2->autoneg = ecmd->autoneg;
+       sky2->tx_pause = ecmd->tx_pause != 0;
+       sky2->rx_pause = ecmd->rx_pause != 0;
+
+       if (netif_running(dev)) {
+               sky2_down(dev);
+               err = sky2_up(dev);
+       }
+
+       return err;
+}
+
+#ifdef CONFIG_PM
+static void sky2_get_wol(struct net_device *dev, struct ethtool_wolinfo *wol)
+{
+       struct sky2_port *sky2 = netdev_priv(dev);
+
+       wol->supported = WAKE_MAGIC;
+       wol->wolopts = sky2->wol ? WAKE_MAGIC : 0;
+}
+
+static int sky2_set_wol(struct net_device *dev, struct ethtool_wolinfo *wol)
+{
+       struct sky2_port *sky2 = netdev_priv(dev);
+       struct sky2_hw *hw = sky2->hw;
+
+       if (wol->wolopts != WAKE_MAGIC && wol->wolopts != 0)
+               return -EOPNOTSUPP;
+
+       sky2->wol = wol->wolopts == WAKE_MAGIC;
+
+       if (sky2->wol) {
+               memcpy_toio(hw->regs + WOL_MAC_ADDR, dev->dev_addr, ETH_ALEN);
+
+               sky2_write16(hw, WOL_CTRL_STAT,
+                            WOL_CTL_ENA_PME_ON_MAGIC_PKT |
+                            WOL_CTL_ENA_MAGIC_PKT_UNIT);
+       } else
+               sky2_write16(hw, WOL_CTRL_STAT, WOL_CTL_DEFAULT);
+
+       return 0;
+}
+#endif
+
+static int sky2_get_coalesce(struct net_device *dev,
+                            struct ethtool_coalesce *ecmd)
+{
+       struct sky2_port *sky2 = netdev_priv(dev);
+       struct sky2_hw *hw = sky2->hw;
+
+       if (sky2_read8(hw, STAT_TX_TIMER_CTRL) == TIM_STOP)
+               ecmd->tx_coalesce_usecs = 0;
+       else {
+               u32 clks = sky2_read32(hw, STAT_TX_TIMER_INI);
+               ecmd->tx_coalesce_usecs = sky2_clk2us(hw, clks);
+       }
+       ecmd->tx_max_coalesced_frames = sky2_read16(hw, STAT_TX_IDX_TH);
+
+       if (sky2_read8(hw, STAT_LEV_TIMER_CTRL) == TIM_STOP)
+               ecmd->rx_coalesce_usecs = 0;
+       else {
+               u32 clks = sky2_read32(hw, STAT_LEV_TIMER_INI);
+               ecmd->rx_coalesce_usecs = sky2_clk2us(hw, clks);
+       }
+       ecmd->rx_max_coalesced_frames = sky2_read8(hw, STAT_FIFO_WM);
+
+       if (sky2_read8(hw, STAT_ISR_TIMER_CTRL) == TIM_STOP)
+               ecmd->rx_coalesce_usecs_irq = 0;
+       else {
+               u32 clks = sky2_read32(hw, STAT_ISR_TIMER_INI);
+               ecmd->rx_coalesce_usecs_irq = sky2_clk2us(hw, clks);
+       }
+
+       ecmd->rx_max_coalesced_frames_irq = sky2_read8(hw, STAT_FIFO_ISR_WM);
+
+       return 0;
+}
+
+/* Note: this affect both ports */
+static int sky2_set_coalesce(struct net_device *dev,
+                            struct ethtool_coalesce *ecmd)
+{
+       struct sky2_port *sky2 = netdev_priv(dev);
+       struct sky2_hw *hw = sky2->hw;
+       const u32 tmin = sky2_clk2us(hw, 1);
+       const u32 tmax = 5000;
+
+       if (ecmd->tx_coalesce_usecs != 0 &&
+           (ecmd->tx_coalesce_usecs < tmin || ecmd->tx_coalesce_usecs > tmax))
+               return -EINVAL;
+
+       if (ecmd->rx_coalesce_usecs != 0 &&
+           (ecmd->rx_coalesce_usecs < tmin || ecmd->rx_coalesce_usecs > tmax))
+               return -EINVAL;
+
+       if (ecmd->rx_coalesce_usecs_irq != 0 &&
+           (ecmd->rx_coalesce_usecs_irq < tmin || ecmd->rx_coalesce_usecs_irq > tmax))
+               return -EINVAL;
+
+       if (ecmd->tx_max_coalesced_frames > 0xffff)
+               return -EINVAL;
+       if (ecmd->rx_max_coalesced_frames > 0xff)
+               return -EINVAL;
+       if (ecmd->rx_max_coalesced_frames_irq > 0xff)
+               return -EINVAL;
+
+       if (ecmd->tx_coalesce_usecs == 0)
+               sky2_write8(hw, STAT_TX_TIMER_CTRL, TIM_STOP);
+       else {
+               sky2_write32(hw, STAT_TX_TIMER_INI,
+                            sky2_us2clk(hw, ecmd->tx_coalesce_usecs));
+               sky2_write8(hw, STAT_TX_TIMER_CTRL, TIM_START);
+       }
+       sky2_write16(hw, STAT_TX_IDX_TH, ecmd->tx_max_coalesced_frames);
+
+       if (ecmd->rx_coalesce_usecs == 0)
+               sky2_write8(hw, STAT_LEV_TIMER_CTRL, TIM_STOP);
+       else {
+               sky2_write32(hw, STAT_LEV_TIMER_INI,
+                            sky2_us2clk(hw, ecmd->rx_coalesce_usecs));
+               sky2_write8(hw, STAT_LEV_TIMER_CTRL, TIM_START);
+       }
+       sky2_write8(hw, STAT_FIFO_WM, ecmd->rx_max_coalesced_frames);
+
+       if (ecmd->rx_coalesce_usecs_irq == 0)
+               sky2_write8(hw, STAT_ISR_TIMER_CTRL, TIM_STOP);
+       else {
+               sky2_write32(hw, STAT_TX_TIMER_INI,
+                            sky2_us2clk(hw, ecmd->rx_coalesce_usecs_irq));
+               sky2_write8(hw, STAT_ISR_TIMER_CTRL, TIM_START);
+       }
+       sky2_write8(hw, STAT_FIFO_ISR_WM, ecmd->rx_max_coalesced_frames_irq);
+       return 0;
+}
+
+static void sky2_get_ringparam(struct net_device *dev,
+                              struct ethtool_ringparam *ering)
+{
+       struct sky2_port *sky2 = netdev_priv(dev);
+
+       ering->rx_max_pending = RX_MAX_PENDING;
+       ering->rx_mini_max_pending = 0;
+       ering->rx_jumbo_max_pending = 0;
+       ering->tx_max_pending = TX_RING_SIZE - 1;
+
+       ering->rx_pending = sky2->rx_pending;
+       ering->rx_mini_pending = 0;
+       ering->rx_jumbo_pending = 0;
+       ering->tx_pending = sky2->tx_pending;
+}
+
+static int sky2_set_ringparam(struct net_device *dev,
+                             struct ethtool_ringparam *ering)
+{
+       struct sky2_port *sky2 = netdev_priv(dev);
+       int err = 0;
+
+       if (ering->rx_pending > RX_MAX_PENDING ||
+           ering->rx_pending < 8 ||
+           ering->tx_pending < MAX_SKB_TX_LE ||
+           ering->tx_pending > TX_RING_SIZE - 1)
+               return -EINVAL;
+
+       if (netif_running(dev))
+               sky2_down(dev);
+
+       sky2->rx_pending = ering->rx_pending;
+       sky2->tx_pending = ering->tx_pending;
+
+       if (netif_running(dev))
+               err = sky2_up(dev);
+
+       return err;
+}
+
+static int sky2_get_regs_len(struct net_device *dev)
+{
+       return 0x4000;
+}
+
+/*
+ * Returns copy of control register region
+ * Note: access to the RAM address register set will cause timeouts.
+ */
+static void sky2_get_regs(struct net_device *dev, struct ethtool_regs *regs,
+                         void *p)
+{
+       const struct sky2_port *sky2 = netdev_priv(dev);
+       const void __iomem *io = sky2->hw->regs;
+
+       BUG_ON(regs->len < B3_RI_WTO_R1);
+       regs->version = 1;
+       memset(p, 0, regs->len);
+
+       memcpy_fromio(p, io, B3_RAM_ADDR);
+
+       memcpy_fromio(p + B3_RI_WTO_R1,
+                     io + B3_RI_WTO_R1,
+                     regs->len - B3_RI_WTO_R1);
+}
+
+static struct ethtool_ops sky2_ethtool_ops = {
+       .get_settings = sky2_get_settings,
+       .set_settings = sky2_set_settings,
+       .get_drvinfo = sky2_get_drvinfo,
+       .get_msglevel = sky2_get_msglevel,
+       .set_msglevel = sky2_set_msglevel,
+       .nway_reset   = sky2_nway_reset,
+       .get_regs_len = sky2_get_regs_len,
+       .get_regs = sky2_get_regs,
+       .get_link = ethtool_op_get_link,
+       .get_sg = ethtool_op_get_sg,
+       .set_sg = ethtool_op_set_sg,
+       .get_tx_csum = ethtool_op_get_tx_csum,
+       .set_tx_csum = ethtool_op_set_tx_csum,
+       .get_tso = ethtool_op_get_tso,
+       .set_tso = ethtool_op_set_tso,
+       .get_rx_csum = sky2_get_rx_csum,
+       .set_rx_csum = sky2_set_rx_csum,
+       .get_strings = sky2_get_strings,
+       .get_coalesce = sky2_get_coalesce,
+       .set_coalesce = sky2_set_coalesce,
+       .get_ringparam = sky2_get_ringparam,
+       .set_ringparam = sky2_set_ringparam,
+       .get_pauseparam = sky2_get_pauseparam,
+       .set_pauseparam = sky2_set_pauseparam,
+#ifdef CONFIG_PM
+       .get_wol = sky2_get_wol,
+       .set_wol = sky2_set_wol,
+#endif
+       .phys_id = sky2_phys_id,
+       .get_stats_count = sky2_get_stats_count,
+       .get_ethtool_stats = sky2_get_ethtool_stats,
+       .get_perm_addr  = ethtool_op_get_perm_addr,
+};
+
+/* Initialize network device */
+static __devinit struct net_device *sky2_init_netdev(struct sky2_hw *hw,
+                                                    unsigned port, int highmem)
+{
+       struct sky2_port *sky2;
+       struct net_device *dev = alloc_etherdev(sizeof(*sky2));
+
+       if (!dev) {
+               printk(KERN_ERR "sky2 etherdev alloc failed");
+               return NULL;
+       }
+
+       SET_MODULE_OWNER(dev);
+       SET_NETDEV_DEV(dev, &hw->pdev->dev);
+       dev->irq = hw->pdev->irq;
+       dev->open = sky2_up;
+       dev->stop = sky2_down;
+       dev->do_ioctl = sky2_ioctl;
+       dev->hard_start_xmit = sky2_xmit_frame;
+       dev->get_stats = sky2_get_stats;
+       dev->set_multicast_list = sky2_set_multicast;
+       dev->set_mac_address = sky2_set_mac_address;
+       dev->change_mtu = sky2_change_mtu;
+       SET_ETHTOOL_OPS(dev, &sky2_ethtool_ops);
+       dev->tx_timeout = sky2_tx_timeout;
+       dev->watchdog_timeo = TX_WATCHDOG;
+       if (port == 0)
+               dev->poll = sky2_poll;
+       dev->weight = NAPI_WEIGHT;
+#ifdef CONFIG_NET_POLL_CONTROLLER
+       dev->poll_controller = sky2_netpoll;
+#endif
+
+       sky2 = netdev_priv(dev);
+       sky2->netdev = dev;
+       sky2->hw = hw;
+       sky2->msg_enable = netif_msg_init(debug, default_msg);
+
+       spin_lock_init(&sky2->tx_lock);
+       /* Auto speed and flow control */
+       sky2->autoneg = AUTONEG_ENABLE;
+       sky2->tx_pause = 1;
+       sky2->rx_pause = 1;
+       sky2->duplex = -1;
+       sky2->speed = -1;
+       sky2->advertising = sky2_supported_modes(hw);
+
+       /* Receive checksum disabled for Yukon XL
+        * because of observed problems with incorrect
+        * values when multiple packets are received in one interrupt
+        */
+       sky2->rx_csum = (hw->chip_id != CHIP_ID_YUKON_XL);
+
+       INIT_WORK(&sky2->phy_task, sky2_phy_task, sky2);
+       init_MUTEX(&sky2->phy_sema);
+       sky2->tx_pending = TX_DEF_PENDING;
+       sky2->rx_pending = is_ec_a1(hw) ? 8 : RX_DEF_PENDING;
+       sky2->rx_bufsize = sky2_buf_size(ETH_DATA_LEN);
+
+       hw->dev[port] = dev;
+
+       sky2->port = port;
+
+       dev->features |= NETIF_F_LLTX;
+       if (hw->chip_id != CHIP_ID_YUKON_EC_U)
+               dev->features |= NETIF_F_TSO;
+       if (highmem)
+               dev->features |= NETIF_F_HIGHDMA;
+       dev->features |= NETIF_F_IP_CSUM | NETIF_F_SG;
+
+#ifdef SKY2_VLAN_TAG_USED
+       dev->features |= NETIF_F_HW_VLAN_TX | NETIF_F_HW_VLAN_RX;
+       dev->vlan_rx_register = sky2_vlan_rx_register;
+       dev->vlan_rx_kill_vid = sky2_vlan_rx_kill_vid;
+#endif
+
+       /* read the mac address */
+       memcpy_fromio(dev->dev_addr, hw->regs + B2_MAC_1 + port * 8, ETH_ALEN);
+       memcpy(dev->perm_addr, dev->dev_addr, dev->addr_len);
+
+       /* device is off until link detection */
+       netif_carrier_off(dev);
+       netif_stop_queue(dev);
+
+       return dev;
+}
+
+static inline void sky2_show_addr(struct net_device *dev)
+{
+       const struct sky2_port *sky2 = netdev_priv(dev);
+
+       if (netif_msg_probe(sky2))
+               printk(KERN_INFO PFX "%s: addr %02x:%02x:%02x:%02x:%02x:%02x\n",
+                      dev->name,
+                      dev->dev_addr[0], dev->dev_addr[1], dev->dev_addr[2],
+                      dev->dev_addr[3], dev->dev_addr[4], dev->dev_addr[5]);
+}
+
+static int __devinit sky2_probe(struct pci_dev *pdev,
+                               const struct pci_device_id *ent)
+{
+       struct net_device *dev, *dev1 = NULL;
+       struct sky2_hw *hw;
+       int err, pm_cap, using_dac = 0;
+
+       err = pci_enable_device(pdev);
+       if (err) {
+               printk(KERN_ERR PFX "%s cannot enable PCI device\n",
+                      pci_name(pdev));
+               goto err_out;
+       }
+
+       err = pci_request_regions(pdev, DRV_NAME);
+       if (err) {
+               printk(KERN_ERR PFX "%s cannot obtain PCI resources\n",
+                      pci_name(pdev));
+               goto err_out;
+       }
+
+       pci_set_master(pdev);
+
+       /* Find power-management capability. */
+       pm_cap = pci_find_capability(pdev, PCI_CAP_ID_PM);
+       if (pm_cap == 0) {
+               printk(KERN_ERR PFX "Cannot find PowerManagement capability, "
+                      "aborting.\n");
+               err = -EIO;
+               goto err_out_free_regions;
+       }
+
+       if (sizeof(dma_addr_t) > sizeof(u32)) {
+               err = pci_set_dma_mask(pdev, DMA_64BIT_MASK);
+               if (!err)
+                       using_dac = 1;
+       }
+
+       if (!using_dac) {
+               err = pci_set_dma_mask(pdev, DMA_32BIT_MASK);
+               if (err) {
+                       printk(KERN_ERR PFX "%s no usable DMA configuration\n",
+                              pci_name(pdev));
+                       goto err_out_free_regions;
+               }
+       }
+#ifdef __BIG_ENDIAN
+       /* byte swap descriptors in hardware */
+       {
+               u32 reg;
+
+               pci_read_config_dword(pdev, PCI_DEV_REG2, &reg);
+               reg |= PCI_REV_DESC;
+               pci_write_config_dword(pdev, PCI_DEV_REG2, reg);
+       }
+#endif
+
+       err = -ENOMEM;
+       hw = kmalloc(sizeof(*hw), GFP_KERNEL);
+       if (!hw) {
+               printk(KERN_ERR PFX "%s: cannot allocate hardware struct\n",
+                      pci_name(pdev));
+               goto err_out_free_regions;
+       }
+
+       memset(hw, 0, sizeof(*hw));
+       hw->pdev = pdev;
+
+       hw->regs = ioremap_nocache(pci_resource_start(pdev, 0), 0x4000);
+       if (!hw->regs) {
+               printk(KERN_ERR PFX "%s: cannot map device registers\n",
+                      pci_name(pdev));
+               goto err_out_free_hw;
+       }
+       hw->pm_cap = pm_cap;
+
+       err = sky2_reset(hw);
+       if (err)
+               goto err_out_iounmap;
+
+       printk(KERN_INFO PFX "v%s addr 0x%lx irq %d Yukon-%s (0x%x) rev %d\n",
+              DRV_VERSION, pci_resource_start(pdev, 0), pdev->irq,
+              yukon2_name[hw->chip_id - CHIP_ID_YUKON_XL],
+              hw->chip_id, hw->chip_rev);
+
+       dev = sky2_init_netdev(hw, 0, using_dac);
+       if (!dev)
+               goto err_out_free_pci;
+
+       err = register_netdev(dev);
+       if (err) {
+               printk(KERN_ERR PFX "%s: cannot register net device\n",
+                      pci_name(pdev));
+               goto err_out_free_netdev;
+       }
+
+       sky2_show_addr(dev);
+
+       if (hw->ports > 1 && (dev1 = sky2_init_netdev(hw, 1, using_dac))) {
+               if (register_netdev(dev1) == 0)
+                       sky2_show_addr(dev1);
+               else {
+                       /* Failure to register second port need not be fatal */
+                       printk(KERN_WARNING PFX
+                              "register of second port failed\n");
+                       hw->dev[1] = NULL;
+                       free_netdev(dev1);
+               }
+       }
+
+       err = request_irq(pdev->irq, sky2_intr, SA_SHIRQ, DRV_NAME, hw);
+       if (err) {
+               printk(KERN_ERR PFX "%s: cannot assign irq %d\n",
+                      pci_name(pdev), pdev->irq);
+               goto err_out_unregister;
+       }
+
+       hw->intr_mask = Y2_IS_BASE;
+       sky2_write32(hw, B0_IMSK, hw->intr_mask);
+
+       pci_set_drvdata(pdev, hw);
+
+       return 0;
+
+err_out_unregister:
+       if (dev1) {
+               unregister_netdev(dev1);
+               free_netdev(dev1);
+       }
+       unregister_netdev(dev);
+err_out_free_netdev:
+       free_netdev(dev);
+err_out_free_pci:
+       sky2_write8(hw, B0_CTST, CS_RST_SET);
+       pci_free_consistent(hw->pdev, STATUS_LE_BYTES, hw->st_le, hw->st_dma);
+err_out_iounmap:
+       iounmap(hw->regs);
+err_out_free_hw:
+       kfree(hw);
+err_out_free_regions:
+       pci_release_regions(pdev);
+       pci_disable_device(pdev);
+err_out:
+       return err;
+}
+
+static void __devexit sky2_remove(struct pci_dev *pdev)
+{
+       struct sky2_hw *hw = pci_get_drvdata(pdev);
+       struct net_device *dev0, *dev1;
+
+       if (!hw)
+               return;
+
+       dev0 = hw->dev[0];
+       dev1 = hw->dev[1];
+       if (dev1)
+               unregister_netdev(dev1);
+       unregister_netdev(dev0);
+
+       sky2_write32(hw, B0_IMSK, 0);
+       sky2_set_power_state(hw, PCI_D3hot);
+       sky2_write16(hw, B0_Y2LED, LED_STAT_OFF);
+       sky2_write8(hw, B0_CTST, CS_RST_SET);
+       sky2_read8(hw, B0_CTST);
+
+       free_irq(pdev->irq, hw);
+       pci_free_consistent(pdev, STATUS_LE_BYTES, hw->st_le, hw->st_dma);
+       pci_release_regions(pdev);
+       pci_disable_device(pdev);
+
+       if (dev1)
+               free_netdev(dev1);
+       free_netdev(dev0);
+       iounmap(hw->regs);
+       kfree(hw);
+
+       pci_set_drvdata(pdev, NULL);
+}
+
+#ifdef CONFIG_PM
+static int sky2_suspend(struct pci_dev *pdev, pm_message_t state)
+{
+       struct sky2_hw *hw = pci_get_drvdata(pdev);
+       int i;
+
+       for (i = 0; i < 2; i++) {
+               struct net_device *dev = hw->dev[i];
+
+               if (dev) {
+                       if (!netif_running(dev))
+                               continue;
+
+                       sky2_down(dev);
+                       netif_device_detach(dev);
+               }
+       }
+
+       return sky2_set_power_state(hw, pci_choose_state(pdev, state));
+}
+
+static int sky2_resume(struct pci_dev *pdev)
+{
+       struct sky2_hw *hw = pci_get_drvdata(pdev);
+       int i;
+
+       pci_restore_state(pdev);
+       pci_enable_wake(pdev, PCI_D0, 0);
+       sky2_set_power_state(hw, PCI_D0);
+
+       sky2_reset(hw);
+
+       for (i = 0; i < 2; i++) {
+               struct net_device *dev = hw->dev[i];
+               if (dev) {
+                       if (netif_running(dev)) {
+                               netif_device_attach(dev);
+                               sky2_up(dev);
+                       }
+               }
+       }
+       return 0;
+}
+#endif
+
+static struct pci_driver sky2_driver = {
+       .name = DRV_NAME,
+       .id_table = sky2_id_table,
+       .probe = sky2_probe,
+       .remove = __devexit_p(sky2_remove),
+#ifdef CONFIG_PM
+       .suspend = sky2_suspend,
+       .resume = sky2_resume,
+#endif
+};
+
+static int __init sky2_init_module(void)
+{
+       return pci_register_driver(&sky2_driver);
+}
+
+static void __exit sky2_cleanup_module(void)
+{
+       pci_unregister_driver(&sky2_driver);
+}
+
+module_init(sky2_init_module);
+module_exit(sky2_cleanup_module);
+
+MODULE_DESCRIPTION("Marvell Yukon 2 Gigabit Ethernet driver");
+MODULE_AUTHOR("Stephen Hemminger <shemminger@osdl.org>");
+MODULE_LICENSE("GPL");
+MODULE_VERSION(DRV_VERSION);
diff --git a/drivers/net/sky2.h b/drivers/net/sky2.h
new file mode 100644 (file)
index 0000000..9551892
--- /dev/null
@@ -0,0 +1,1922 @@
+/*
+ * Definitions for the new Marvell Yukon 2 driver.
+ */
+#ifndef _SKY2_H
+#define _SKY2_H
+
+/* PCI config registers */
+#define PCI_DEV_REG1   0x40
+#define PCI_DEV_REG2   0x44
+#define PCI_DEV_STATUS  0x7c
+#define PCI_OS_PCI_X    (1<<26)
+
+#define PEX_LNK_STAT   0xf2
+#define PEX_UNC_ERR_STAT 0x104
+#define PEX_DEV_CTRL   0xe8
+
+/* Yukon-2 */
+enum pci_dev_reg_1 {
+       PCI_Y2_PIG_ENA   = 1<<31, /* Enable Plug-in-Go (YUKON-2) */
+       PCI_Y2_DLL_DIS   = 1<<30, /* Disable PCI DLL (YUKON-2) */
+       PCI_Y2_PHY2_COMA = 1<<29, /* Set PHY 2 to Coma Mode (YUKON-2) */
+       PCI_Y2_PHY1_COMA = 1<<28, /* Set PHY 1 to Coma Mode (YUKON-2) */
+       PCI_Y2_PHY2_POWD = 1<<27, /* Set PHY 2 to Power Down (YUKON-2) */
+       PCI_Y2_PHY1_POWD = 1<<26, /* Set PHY 1 to Power Down (YUKON-2) */
+};
+
+enum pci_dev_reg_2 {
+       PCI_VPD_WR_THR  = 0xffL<<24,    /* Bit 31..24:  VPD Write Threshold */
+       PCI_DEV_SEL     = 0x7fL<<17,    /* Bit 23..17:  EEPROM Device Select */
+       PCI_VPD_ROM_SZ  = 7L<<14,       /* Bit 16..14:  VPD ROM Size    */
+
+       PCI_PATCH_DIR   = 0xfL<<8,      /* Bit 11.. 8:  Ext Patches dir 3..0 */
+       PCI_EXT_PATCHS  = 0xfL<<4,      /* Bit  7.. 4:  Extended Patches 3..0 */
+       PCI_EN_DUMMY_RD = 1<<3,         /* Enable Dummy Read */
+       PCI_REV_DESC    = 1<<2,         /* Reverse Desc. Bytes */
+
+       PCI_USEDATA64   = 1<<0,         /* Use 64Bit Data bus ext */
+};
+
+
+#define PCI_STATUS_ERROR_BITS (PCI_STATUS_DETECTED_PARITY | \
+                              PCI_STATUS_SIG_SYSTEM_ERROR | \
+                              PCI_STATUS_REC_MASTER_ABORT | \
+                              PCI_STATUS_REC_TARGET_ABORT | \
+                              PCI_STATUS_PARITY)
+
+enum pex_dev_ctrl {
+       PEX_DC_MAX_RRS_MSK      = 7<<12, /* Bit 14..12: Max. Read Request Size */
+       PEX_DC_EN_NO_SNOOP      = 1<<11,/* Enable No Snoop */
+       PEX_DC_EN_AUX_POW       = 1<<10,/* Enable AUX Power */
+       PEX_DC_EN_PHANTOM       = 1<<9, /* Enable Phantom Functions */
+       PEX_DC_EN_EXT_TAG       = 1<<8, /* Enable Extended Tag Field */
+       PEX_DC_MAX_PLS_MSK      = 7<<5, /* Bit  7.. 5:  Max. Payload Size Mask */
+       PEX_DC_EN_REL_ORD       = 1<<4, /* Enable Relaxed Ordering */
+       PEX_DC_EN_UNS_RQ_RP     = 1<<3, /* Enable Unsupported Request Reporting */
+       PEX_DC_EN_FAT_ER_RP     = 1<<2, /* Enable Fatal Error Reporting */
+       PEX_DC_EN_NFA_ER_RP     = 1<<1, /* Enable Non-Fatal Error Reporting */
+       PEX_DC_EN_COR_ER_RP     = 1<<0, /* Enable Correctable Error Reporting */
+};
+#define  PEX_DC_MAX_RD_RQ_SIZE(x) (((x)<<12) & PEX_DC_MAX_RRS_MSK)
+
+/* PEX_UNC_ERR_STAT     PEX Uncorrectable Errors Status Register (Yukon-2) */
+enum pex_err {
+       PEX_UNSUP_REQ   = 1<<20, /* Unsupported Request Error */
+
+       PEX_MALFOR_TLP  = 1<<18, /* Malformed TLP */
+
+       PEX_UNEXP_COMP  = 1<<16, /* Unexpected Completion */
+
+       PEX_COMP_TO     = 1<<14, /* Completion Timeout */
+       PEX_FLOW_CTRL_P = 1<<13, /* Flow Control Protocol Error */
+       PEX_POIS_TLP    = 1<<12, /* Poisoned TLP */
+
+       PEX_DATA_LINK_P = 1<<4, /* Data Link Protocol Error */
+       PEX_FATAL_ERRORS= (PEX_MALFOR_TLP | PEX_FLOW_CTRL_P | PEX_DATA_LINK_P),
+};
+
+
+enum csr_regs {
+       B0_RAP          = 0x0000,
+       B0_CTST         = 0x0004,
+       B0_Y2LED        = 0x0005,
+       B0_POWER_CTRL   = 0x0007,
+       B0_ISRC         = 0x0008,
+       B0_IMSK         = 0x000c,
+       B0_HWE_ISRC     = 0x0010,
+       B0_HWE_IMSK     = 0x0014,
+
+       /* Special ISR registers (Yukon-2 only) */
+       B0_Y2_SP_ISRC2  = 0x001c,
+       B0_Y2_SP_ISRC3  = 0x0020,
+       B0_Y2_SP_EISR   = 0x0024,
+       B0_Y2_SP_LISR   = 0x0028,
+       B0_Y2_SP_ICR    = 0x002c,
+
+       B2_MAC_1        = 0x0100,
+       B2_MAC_2        = 0x0108,
+       B2_MAC_3        = 0x0110,
+       B2_CONN_TYP     = 0x0118,
+       B2_PMD_TYP      = 0x0119,
+       B2_MAC_CFG      = 0x011a,
+       B2_CHIP_ID      = 0x011b,
+       B2_E_0          = 0x011c,
+
+       B2_Y2_CLK_GATE  = 0x011d,
+       B2_Y2_HW_RES    = 0x011e,
+       B2_E_3          = 0x011f,
+       B2_Y2_CLK_CTRL  = 0x0120,
+
+       B2_TI_INI       = 0x0130,
+       B2_TI_VAL       = 0x0134,
+       B2_TI_CTRL      = 0x0138,
+       B2_TI_TEST      = 0x0139,
+
+       B2_TST_CTRL1    = 0x0158,
+       B2_TST_CTRL2    = 0x0159,
+       B2_GP_IO        = 0x015c,
+
+       B2_I2C_CTRL     = 0x0160,
+       B2_I2C_DATA     = 0x0164,
+       B2_I2C_IRQ      = 0x0168,
+       B2_I2C_SW       = 0x016c,
+
+       B3_RAM_ADDR     = 0x0180,
+       B3_RAM_DATA_LO  = 0x0184,
+       B3_RAM_DATA_HI  = 0x0188,
+
+/* RAM Interface Registers */
+/* Yukon-2: use RAM_BUFFER() to access the RAM buffer */
+/*
+ * The HW-Spec. calls this registers Timeout Value 0..11. But this names are
+ * not usable in SW. Please notice these are NOT real timeouts, these are
+ * the number of qWords transferred continuously.
+ */
+#define RAM_BUFFER(port, reg)  (reg | (port <<6))
+
+       B3_RI_WTO_R1    = 0x0190,
+       B3_RI_WTO_XA1   = 0x0191,
+       B3_RI_WTO_XS1   = 0x0192,
+       B3_RI_RTO_R1    = 0x0193,
+       B3_RI_RTO_XA1   = 0x0194,
+       B3_RI_RTO_XS1   = 0x0195,
+       B3_RI_WTO_R2    = 0x0196,
+       B3_RI_WTO_XA2   = 0x0197,
+       B3_RI_WTO_XS2   = 0x0198,
+       B3_RI_RTO_R2    = 0x0199,
+       B3_RI_RTO_XA2   = 0x019a,
+       B3_RI_RTO_XS2   = 0x019b,
+       B3_RI_TO_VAL    = 0x019c,
+       B3_RI_CTRL      = 0x01a0,
+       B3_RI_TEST      = 0x01a2,
+       B3_MA_TOINI_RX1 = 0x01b0,
+       B3_MA_TOINI_RX2 = 0x01b1,
+       B3_MA_TOINI_TX1 = 0x01b2,
+       B3_MA_TOINI_TX2 = 0x01b3,
+       B3_MA_TOVAL_RX1 = 0x01b4,
+       B3_MA_TOVAL_RX2 = 0x01b5,
+       B3_MA_TOVAL_TX1 = 0x01b6,
+       B3_MA_TOVAL_TX2 = 0x01b7,
+       B3_MA_TO_CTRL   = 0x01b8,
+       B3_MA_TO_TEST   = 0x01ba,
+       B3_MA_RCINI_RX1 = 0x01c0,
+       B3_MA_RCINI_RX2 = 0x01c1,
+       B3_MA_RCINI_TX1 = 0x01c2,
+       B3_MA_RCINI_TX2 = 0x01c3,
+       B3_MA_RCVAL_RX1 = 0x01c4,
+       B3_MA_RCVAL_RX2 = 0x01c5,
+       B3_MA_RCVAL_TX1 = 0x01c6,
+       B3_MA_RCVAL_TX2 = 0x01c7,
+       B3_MA_RC_CTRL   = 0x01c8,
+       B3_MA_RC_TEST   = 0x01ca,
+       B3_PA_TOINI_RX1 = 0x01d0,
+       B3_PA_TOINI_RX2 = 0x01d4,
+       B3_PA_TOINI_TX1 = 0x01d8,
+       B3_PA_TOINI_TX2 = 0x01dc,
+       B3_PA_TOVAL_RX1 = 0x01e0,
+       B3_PA_TOVAL_RX2 = 0x01e4,
+       B3_PA_TOVAL_TX1 = 0x01e8,
+       B3_PA_TOVAL_TX2 = 0x01ec,
+       B3_PA_CTRL      = 0x01f0,
+       B3_PA_TEST      = 0x01f2,
+
+       Y2_CFG_SPC      = 0x1c00,
+};
+
+/*     B0_CTST                 16 bit  Control/Status register */
+enum {
+       Y2_VMAIN_AVAIL  = 1<<17,/* VMAIN available (YUKON-2 only) */
+       Y2_VAUX_AVAIL   = 1<<16,/* VAUX available (YUKON-2 only) */
+       Y2_ASF_ENABLE   = 1<<13,/* ASF Unit Enable (YUKON-2 only) */
+       Y2_ASF_DISABLE  = 1<<12,/* ASF Unit Disable (YUKON-2 only) */
+       Y2_CLK_RUN_ENA  = 1<<11,/* CLK_RUN Enable  (YUKON-2 only) */
+       Y2_CLK_RUN_DIS  = 1<<10,/* CLK_RUN Disable (YUKON-2 only) */
+       Y2_LED_STAT_ON  = 1<<9, /* Status LED On  (YUKON-2 only) */
+       Y2_LED_STAT_OFF = 1<<8, /* Status LED Off (YUKON-2 only) */
+
+       CS_ST_SW_IRQ    = 1<<7, /* Set IRQ SW Request */
+       CS_CL_SW_IRQ    = 1<<6, /* Clear IRQ SW Request */
+       CS_STOP_DONE    = 1<<5, /* Stop Master is finished */
+       CS_STOP_MAST    = 1<<4, /* Command Bit to stop the master */
+       CS_MRST_CLR     = 1<<3, /* Clear Master reset   */
+       CS_MRST_SET     = 1<<2, /* Set Master reset     */
+       CS_RST_CLR      = 1<<1, /* Clear Software reset */
+       CS_RST_SET      = 1,    /* Set   Software reset */
+};
+
+/*     B0_LED                   8 Bit  LED register */
+enum {
+/* Bit  7.. 2: reserved */
+       LED_STAT_ON     = 1<<1, /* Status LED on        */
+       LED_STAT_OFF    = 1,    /* Status LED off       */
+};
+
+/*     B0_POWER_CTRL    8 Bit  Power Control reg (YUKON only) */
+enum {
+       PC_VAUX_ENA     = 1<<7, /* Switch VAUX Enable  */
+       PC_VAUX_DIS     = 1<<6, /* Switch VAUX Disable */
+       PC_VCC_ENA      = 1<<5, /* Switch VCC Enable  */
+       PC_VCC_DIS      = 1<<4, /* Switch VCC Disable */
+       PC_VAUX_ON      = 1<<3, /* Switch VAUX On  */
+       PC_VAUX_OFF     = 1<<2, /* Switch VAUX Off */
+       PC_VCC_ON       = 1<<1, /* Switch VCC On  */
+       PC_VCC_OFF      = 1<<0, /* Switch VCC Off */
+};
+
+/*     B2_IRQM_MSK     32 bit  IRQ Moderation Mask */
+
+/*     B0_Y2_SP_ISRC2  32 bit  Special Interrupt Source Reg 2 */
+/*     B0_Y2_SP_ISRC3  32 bit  Special Interrupt Source Reg 3 */
+/*     B0_Y2_SP_EISR   32 bit  Enter ISR Reg */
+/*     B0_Y2_SP_LISR   32 bit  Leave ISR Reg */
+enum {
+       Y2_IS_HW_ERR    = 1<<31,        /* Interrupt HW Error */
+       Y2_IS_STAT_BMU  = 1<<30,        /* Status BMU Interrupt */
+       Y2_IS_ASF       = 1<<29,        /* ASF subsystem Interrupt */
+
+       Y2_IS_POLL_CHK  = 1<<27,        /* Check IRQ from polling unit */
+       Y2_IS_TWSI_RDY  = 1<<26,        /* IRQ on end of TWSI Tx */
+       Y2_IS_IRQ_SW    = 1<<25,        /* SW forced IRQ        */
+       Y2_IS_TIMINT    = 1<<24,        /* IRQ from Timer       */
+
+       Y2_IS_IRQ_PHY2  = 1<<12,        /* Interrupt from PHY 2 */
+       Y2_IS_IRQ_MAC2  = 1<<11,        /* Interrupt from MAC 2 */
+       Y2_IS_CHK_RX2   = 1<<10,        /* Descriptor error Rx 2 */
+       Y2_IS_CHK_TXS2  = 1<<9,         /* Descriptor error TXS 2 */
+       Y2_IS_CHK_TXA2  = 1<<8,         /* Descriptor error TXA 2 */
+
+       Y2_IS_IRQ_PHY1  = 1<<4,         /* Interrupt from PHY 1 */
+       Y2_IS_IRQ_MAC1  = 1<<3,         /* Interrupt from MAC 1 */
+       Y2_IS_CHK_RX1   = 1<<2,         /* Descriptor error Rx 1 */
+       Y2_IS_CHK_TXS1  = 1<<1,         /* Descriptor error TXS 1 */
+       Y2_IS_CHK_TXA1  = 1<<0,         /* Descriptor error TXA 1 */
+
+       Y2_IS_BASE      = Y2_IS_HW_ERR | Y2_IS_STAT_BMU |
+                         Y2_IS_POLL_CHK | Y2_IS_TWSI_RDY |
+                         Y2_IS_IRQ_SW | Y2_IS_TIMINT,
+       Y2_IS_PORT_1    = Y2_IS_IRQ_PHY1 | Y2_IS_IRQ_MAC1 |
+                         Y2_IS_CHK_RX1 | Y2_IS_CHK_TXA1 | Y2_IS_CHK_TXS1,
+       Y2_IS_PORT_2    = Y2_IS_IRQ_PHY2 | Y2_IS_IRQ_MAC2 |
+                         Y2_IS_CHK_RX2 | Y2_IS_CHK_TXA2 | Y2_IS_CHK_TXS2,
+};
+
+/*     B2_IRQM_HWE_MSK 32 bit  IRQ Moderation HW Error Mask */
+enum {
+       IS_ERR_MSK      = 0x00003fff,/*                 All Error bits */
+
+       IS_IRQ_TIST_OV  = 1<<13, /* Time Stamp Timer Overflow (YUKON only) */
+       IS_IRQ_SENSOR   = 1<<12, /* IRQ from Sensor (YUKON only) */
+       IS_IRQ_MST_ERR  = 1<<11, /* IRQ master error detected */
+       IS_IRQ_STAT     = 1<<10, /* IRQ status exception */
+       IS_NO_STAT_M1   = 1<<9, /* No Rx Status from MAC 1 */
+       IS_NO_STAT_M2   = 1<<8, /* No Rx Status from MAC 2 */
+       IS_NO_TIST_M1   = 1<<7, /* No Time Stamp from MAC 1 */
+       IS_NO_TIST_M2   = 1<<6, /* No Time Stamp from MAC 2 */
+       IS_RAM_RD_PAR   = 1<<5, /* RAM Read  Parity Error */
+       IS_RAM_WR_PAR   = 1<<4, /* RAM Write Parity Error */
+       IS_M1_PAR_ERR   = 1<<3, /* MAC 1 Parity Error */
+       IS_M2_PAR_ERR   = 1<<2, /* MAC 2 Parity Error */
+       IS_R1_PAR_ERR   = 1<<1, /* Queue R1 Parity Error */
+       IS_R2_PAR_ERR   = 1<<0, /* Queue R2 Parity Error */
+};
+
+/* Hardware error interrupt mask for Yukon 2 */
+enum {
+       Y2_IS_TIST_OV   = 1<<29,/* Time Stamp Timer overflow interrupt */
+       Y2_IS_SENSOR    = 1<<28, /* Sensor interrupt */
+       Y2_IS_MST_ERR   = 1<<27, /* Master error interrupt */
+       Y2_IS_IRQ_STAT  = 1<<26, /* Status exception interrupt */
+       Y2_IS_PCI_EXP   = 1<<25, /* PCI-Express interrupt */
+       Y2_IS_PCI_NEXP  = 1<<24, /* PCI-Express error similar to PCI error */
+                                               /* Link 2 */
+       Y2_IS_PAR_RD2   = 1<<13, /* Read RAM parity error interrupt */
+       Y2_IS_PAR_WR2   = 1<<12, /* Write RAM parity error interrupt */
+       Y2_IS_PAR_MAC2  = 1<<11, /* MAC hardware fault interrupt */
+       Y2_IS_PAR_RX2   = 1<<10, /* Parity Error Rx Queue 2 */
+       Y2_IS_TCP_TXS2  = 1<<9, /* TCP length mismatch sync Tx queue IRQ */
+       Y2_IS_TCP_TXA2  = 1<<8, /* TCP length mismatch async Tx queue IRQ */
+                                               /* Link 1 */
+       Y2_IS_PAR_RD1   = 1<<5, /* Read RAM parity error interrupt */
+       Y2_IS_PAR_WR1   = 1<<4, /* Write RAM parity error interrupt */
+       Y2_IS_PAR_MAC1  = 1<<3, /* MAC hardware fault interrupt */
+       Y2_IS_PAR_RX1   = 1<<2, /* Parity Error Rx Queue 1 */
+       Y2_IS_TCP_TXS1  = 1<<1, /* TCP length mismatch sync Tx queue IRQ */
+       Y2_IS_TCP_TXA1  = 1<<0, /* TCP length mismatch async Tx queue IRQ */
+
+       Y2_HWE_L1_MASK  = Y2_IS_PAR_RD1 | Y2_IS_PAR_WR1 | Y2_IS_PAR_MAC1 |
+                         Y2_IS_PAR_RX1 | Y2_IS_TCP_TXS1| Y2_IS_TCP_TXA1,
+       Y2_HWE_L2_MASK  = Y2_IS_PAR_RD2 | Y2_IS_PAR_WR2 | Y2_IS_PAR_MAC2 |
+                         Y2_IS_PAR_RX2 | Y2_IS_TCP_TXS2| Y2_IS_TCP_TXA2,
+
+       Y2_HWE_ALL_MASK = Y2_IS_TIST_OV | Y2_IS_MST_ERR | Y2_IS_IRQ_STAT |
+                         Y2_IS_PCI_EXP |
+                         Y2_HWE_L1_MASK | Y2_HWE_L2_MASK,
+};
+
+/*     B28_DPT_CTRL     8 bit  Descriptor Poll Timer Ctrl Reg */
+enum {
+       DPT_START       = 1<<1,
+       DPT_STOP        = 1<<0,
+};
+
+/*     B2_TST_CTRL1     8 bit  Test Control Register 1 */
+enum {
+       TST_FRC_DPERR_MR = 1<<7, /* force DATAPERR on MST RD */
+       TST_FRC_DPERR_MW = 1<<6, /* force DATAPERR on MST WR */
+       TST_FRC_DPERR_TR = 1<<5, /* force DATAPERR on TRG RD */
+       TST_FRC_DPERR_TW = 1<<4, /* force DATAPERR on TRG WR */
+       TST_FRC_APERR_M  = 1<<3, /* force ADDRPERR on MST */
+       TST_FRC_APERR_T  = 1<<2, /* force ADDRPERR on TRG */
+       TST_CFG_WRITE_ON = 1<<1, /* Enable  Config Reg WR */
+       TST_CFG_WRITE_OFF= 1<<0, /* Disable Config Reg WR */
+};
+
+/*     B2_MAC_CFG               8 bit  MAC Configuration / Chip Revision */
+enum {
+       CFG_CHIP_R_MSK    = 0xf<<4,     /* Bit 7.. 4: Chip Revision */
+                                       /* Bit 3.. 2:   reserved */
+       CFG_DIS_M2_CLK    = 1<<1,       /* Disable Clock for 2nd MAC */
+       CFG_SNG_MAC       = 1<<0,       /* MAC Config: 0=2 MACs / 1=1 MAC*/
+};
+
+/*     B2_CHIP_ID               8 bit  Chip Identification Number */
+enum {
+       CHIP_ID_GENESIS    = 0x0a, /* Chip ID for GENESIS */
+       CHIP_ID_YUKON      = 0xb0, /* Chip ID for YUKON */
+       CHIP_ID_YUKON_LITE = 0xb1, /* Chip ID for YUKON-Lite (Rev. A1-A3) */
+       CHIP_ID_YUKON_LP   = 0xb2, /* Chip ID for YUKON-LP */
+       CHIP_ID_YUKON_XL   = 0xb3, /* Chip ID for YUKON-2 XL */
+       CHIP_ID_YUKON_EC_U = 0xb4, /* Chip ID for YUKON-2 EC Ultra */
+       CHIP_ID_YUKON_EC   = 0xb6, /* Chip ID for YUKON-2 EC */
+       CHIP_ID_YUKON_FE   = 0xb7, /* Chip ID for YUKON-2 FE */
+
+       CHIP_REV_YU_EC_A1    = 0,  /* Chip Rev. for Yukon-EC A1/A0 */
+       CHIP_REV_YU_EC_A2    = 1,  /* Chip Rev. for Yukon-EC A2 */
+       CHIP_REV_YU_EC_A3    = 2,  /* Chip Rev. for Yukon-EC A3 */
+};
+
+/*     B2_Y2_CLK_GATE   8 bit  Clock Gating (Yukon-2 only) */
+enum {
+       Y2_STATUS_LNK2_INAC     = 1<<7, /* Status Link 2 inactive (0 = active) */
+       Y2_CLK_GAT_LNK2_DIS     = 1<<6, /* Disable clock gating Link 2 */
+       Y2_COR_CLK_LNK2_DIS     = 1<<5, /* Disable Core clock Link 2 */
+       Y2_PCI_CLK_LNK2_DIS     = 1<<4, /* Disable PCI clock Link 2 */
+       Y2_STATUS_LNK1_INAC     = 1<<3, /* Status Link 1 inactive (0 = active) */
+       Y2_CLK_GAT_LNK1_DIS     = 1<<2, /* Disable clock gating Link 1 */
+       Y2_COR_CLK_LNK1_DIS     = 1<<1, /* Disable Core clock Link 1 */
+       Y2_PCI_CLK_LNK1_DIS     = 1<<0, /* Disable PCI clock Link 1 */
+};
+
+/*     B2_Y2_HW_RES    8 bit   HW Resources (Yukon-2 only) */
+enum {
+       CFG_LED_MODE_MSK        = 7<<2, /* Bit  4.. 2:  LED Mode Mask */
+       CFG_LINK_2_AVAIL        = 1<<1, /* Link 2 available */
+       CFG_LINK_1_AVAIL        = 1<<0, /* Link 1 available */
+};
+#define CFG_LED_MODE(x)                (((x) & CFG_LED_MODE_MSK) >> 2)
+#define CFG_DUAL_MAC_MSK       (CFG_LINK_2_AVAIL | CFG_LINK_1_AVAIL)
+
+
+/* B2_Y2_CLK_CTRL      32 bit  Clock Frequency Control Register (Yukon-2/EC) */
+enum {
+       Y2_CLK_DIV_VAL_MSK      = 0xff<<16,/* Bit 23..16: Clock Divisor Value */
+#define        Y2_CLK_DIV_VAL(x)       (((x)<<16) & Y2_CLK_DIV_VAL_MSK)
+       Y2_CLK_DIV_VAL2_MSK     = 7<<21,   /* Bit 23..21: Clock Divisor Value */
+       Y2_CLK_SELECT2_MSK      = 0x1f<<16,/* Bit 20..16: Clock Select */
+#define Y2_CLK_DIV_VAL_2(x)    (((x)<<21) & Y2_CLK_DIV_VAL2_MSK)
+#define Y2_CLK_SEL_VAL_2(x)    (((x)<<16) & Y2_CLK_SELECT2_MSK)
+       Y2_CLK_DIV_ENA          = 1<<1, /* Enable  Core Clock Division */
+       Y2_CLK_DIV_DIS          = 1<<0, /* Disable Core Clock Division */
+};
+
+/*     B2_TI_CTRL               8 bit  Timer control */
+/*     B2_IRQM_CTRL     8 bit  IRQ Moderation Timer Control */
+enum {
+       TIM_START       = 1<<2, /* Start Timer */
+       TIM_STOP        = 1<<1, /* Stop  Timer */
+       TIM_CLR_IRQ     = 1<<0, /* Clear Timer IRQ (!IRQM) */
+};
+
+/*     B2_TI_TEST               8 Bit  Timer Test */
+/*     B2_IRQM_TEST     8 bit  IRQ Moderation Timer Test */
+/*     B28_DPT_TST              8 bit  Descriptor Poll Timer Test Reg */
+enum {
+       TIM_T_ON        = 1<<2, /* Test mode on */
+       TIM_T_OFF       = 1<<1, /* Test mode off */
+       TIM_T_STEP      = 1<<0, /* Test step */
+};
+
+/*     B3_RAM_ADDR             32 bit  RAM Address, to read or write */
+                                       /* Bit 31..19:  reserved */
+#define RAM_ADR_RAN    0x0007ffffL     /* Bit 18.. 0:  RAM Address Range */
+/* RAM Interface Registers */
+
+/*     B3_RI_CTRL              16 bit  RAM Interface Control Register */
+enum {
+       RI_CLR_RD_PERR  = 1<<9, /* Clear IRQ RAM Read Parity Err */
+       RI_CLR_WR_PERR  = 1<<8, /* Clear IRQ RAM Write Parity Err*/
+
+       RI_RST_CLR      = 1<<1, /* Clear RAM Interface Reset */
+       RI_RST_SET      = 1<<0, /* Set   RAM Interface Reset */
+};
+
+#define SK_RI_TO_53    36              /* RAM interface timeout */
+
+
+/* Port related registers FIFO, and Arbiter */
+#define SK_REG(port,reg)       (((port)<<7)+(reg))
+
+/* Transmit Arbiter Registers MAC 1 and 2, use SK_REG() to access */
+/*     TXA_ITI_INI             32 bit  Tx Arb Interval Timer Init Val */
+/*     TXA_ITI_VAL             32 bit  Tx Arb Interval Timer Value */
+/*     TXA_LIM_INI             32 bit  Tx Arb Limit Counter Init Val */
+/*     TXA_LIM_VAL             32 bit  Tx Arb Limit Counter Value */
+
+#define TXA_MAX_VAL    0x00ffffffUL    /* Bit 23.. 0:  Max TXA Timer/Cnt Val */
+
+/*     TXA_CTRL                 8 bit  Tx Arbiter Control Register */
+enum {
+       TXA_ENA_FSYNC   = 1<<7, /* Enable  force of sync Tx queue */
+       TXA_DIS_FSYNC   = 1<<6, /* Disable force of sync Tx queue */
+       TXA_ENA_ALLOC   = 1<<5, /* Enable  alloc of free bandwidth */
+       TXA_DIS_ALLOC   = 1<<4, /* Disable alloc of free bandwidth */
+       TXA_START_RC    = 1<<3, /* Start sync Rate Control */
+       TXA_STOP_RC     = 1<<2, /* Stop  sync Rate Control */
+       TXA_ENA_ARB     = 1<<1, /* Enable  Tx Arbiter */
+       TXA_DIS_ARB     = 1<<0, /* Disable Tx Arbiter */
+};
+
+/*
+ *     Bank 4 - 5
+ */
+/* Transmit Arbiter Registers MAC 1 and 2, use SK_REG() to access */
+enum {
+       TXA_ITI_INI     = 0x0200,/* 32 bit      Tx Arb Interval Timer Init Val*/
+       TXA_ITI_VAL     = 0x0204,/* 32 bit      Tx Arb Interval Timer Value */
+       TXA_LIM_INI     = 0x0208,/* 32 bit      Tx Arb Limit Counter Init Val */
+       TXA_LIM_VAL     = 0x020c,/* 32 bit      Tx Arb Limit Counter Value */
+       TXA_CTRL        = 0x0210,/*  8 bit      Tx Arbiter Control Register */
+       TXA_TEST        = 0x0211,/*  8 bit      Tx Arbiter Test Register */
+       TXA_STAT        = 0x0212,/*  8 bit      Tx Arbiter Status Register */
+};
+
+
+enum {
+       B6_EXT_REG      = 0x0300,/* External registers (GENESIS only) */
+       B7_CFG_SPC      = 0x0380,/* copy of the Configuration register */
+       B8_RQ1_REGS     = 0x0400,/* Receive Queue 1 */
+       B8_RQ2_REGS     = 0x0480,/* Receive Queue 2 */
+       B8_TS1_REGS     = 0x0600,/* Transmit sync queue 1 */
+       B8_TA1_REGS     = 0x0680,/* Transmit async queue 1 */
+       B8_TS2_REGS     = 0x0700,/* Transmit sync queue 2 */
+       B8_TA2_REGS     = 0x0780,/* Transmit sync queue 2 */
+       B16_RAM_REGS    = 0x0800,/* RAM Buffer Registers */
+};
+
+/* Queue Register Offsets, use Q_ADDR() to access */
+enum {
+       B8_Q_REGS = 0x0400, /* base of Queue registers */
+       Q_D     = 0x00, /* 8*32 bit     Current Descriptor */
+       Q_DA_L  = 0x20, /* 32 bit       Current Descriptor Address Low dWord */
+       Q_DA_H  = 0x24, /* 32 bit       Current Descriptor Address High dWord */
+       Q_AC_L  = 0x28, /* 32 bit       Current Address Counter Low dWord */
+       Q_AC_H  = 0x2c, /* 32 bit       Current Address Counter High dWord */
+       Q_BC    = 0x30, /* 32 bit       Current Byte Counter */
+       Q_CSR   = 0x34, /* 32 bit       BMU Control/Status Register */
+       Q_F     = 0x38, /* 32 bit       Flag Register */
+       Q_T1    = 0x3c, /* 32 bit       Test Register 1 */
+       Q_T1_TR = 0x3c, /*  8 bit       Test Register 1 Transfer SM */
+       Q_T1_WR = 0x3d, /*  8 bit       Test Register 1 Write Descriptor SM */
+       Q_T1_RD = 0x3e, /*  8 bit       Test Register 1 Read Descriptor SM */
+       Q_T1_SV = 0x3f, /*  8 bit       Test Register 1 Supervisor SM */
+       Q_T2    = 0x40, /* 32 bit       Test Register 2 */
+       Q_T3    = 0x44, /* 32 bit       Test Register 3 */
+
+/* Yukon-2 */
+       Q_DONE  = 0x24, /* 16 bit       Done Index              (Yukon-2 only) */
+       Q_WM    = 0x40, /* 16 bit       FIFO Watermark */
+       Q_AL    = 0x42, /*  8 bit       FIFO Alignment */
+       Q_RSP   = 0x44, /* 16 bit       FIFO Read Shadow Pointer */
+       Q_RSL   = 0x46, /*  8 bit       FIFO Read Shadow Level */
+       Q_RP    = 0x48, /*  8 bit       FIFO Read Pointer */
+       Q_RL    = 0x4a, /*  8 bit       FIFO Read Level */
+       Q_WP    = 0x4c, /*  8 bit       FIFO Write Pointer */
+       Q_WSP   = 0x4d, /*  8 bit       FIFO Write Shadow Pointer */
+       Q_WL    = 0x4e, /*  8 bit       FIFO Write Level */
+       Q_WSL   = 0x4f, /*  8 bit       FIFO Write Shadow Level */
+};
+#define Q_ADDR(reg, offs) (B8_Q_REGS + (reg) + (offs))
+
+
+/* Queue Prefetch Unit Offsets, use Y2_QADDR() to address (Yukon-2 only)*/
+enum {
+       Y2_B8_PREF_REGS         = 0x0450,
+
+       PREF_UNIT_CTRL          = 0x00, /* 32 bit       Control register */
+       PREF_UNIT_LAST_IDX      = 0x04, /* 16 bit       Last Index */
+       PREF_UNIT_ADDR_LO       = 0x08, /* 32 bit       List start addr, low part */
+       PREF_UNIT_ADDR_HI       = 0x0c, /* 32 bit       List start addr, high part*/
+       PREF_UNIT_GET_IDX       = 0x10, /* 16 bit       Get Index */
+       PREF_UNIT_PUT_IDX       = 0x14, /* 16 bit       Put Index */
+       PREF_UNIT_FIFO_WP       = 0x20, /*  8 bit       FIFO write pointer */
+       PREF_UNIT_FIFO_RP       = 0x24, /*  8 bit       FIFO read pointer */
+       PREF_UNIT_FIFO_WM       = 0x28, /*  8 bit       FIFO watermark */
+       PREF_UNIT_FIFO_LEV      = 0x2c, /*  8 bit       FIFO level */
+
+       PREF_UNIT_MASK_IDX      = 0x0fff,
+};
+#define Y2_QADDR(q,reg)                (Y2_B8_PREF_REGS + (q) + (reg))
+
+/* RAM Buffer Register Offsets */
+enum {
+
+       RB_START        = 0x00,/* 32 bit        RAM Buffer Start Address */
+       RB_END  = 0x04,/* 32 bit        RAM Buffer End Address */
+       RB_WP   = 0x08,/* 32 bit        RAM Buffer Write Pointer */
+       RB_RP   = 0x0c,/* 32 bit        RAM Buffer Read Pointer */
+       RB_RX_UTPP      = 0x10,/* 32 bit        Rx Upper Threshold, Pause Packet */
+       RB_RX_LTPP      = 0x14,/* 32 bit        Rx Lower Threshold, Pause Packet */
+       RB_RX_UTHP      = 0x18,/* 32 bit        Rx Upper Threshold, High Prio */
+       RB_RX_LTHP      = 0x1c,/* 32 bit        Rx Lower Threshold, High Prio */
+       /* 0x10 - 0x1f: reserved at Tx RAM Buffer Registers */
+       RB_PC   = 0x20,/* 32 bit        RAM Buffer Packet Counter */
+       RB_LEV  = 0x24,/* 32 bit        RAM Buffer Level Register */
+       RB_CTRL = 0x28,/* 32 bit        RAM Buffer Control Register */
+       RB_TST1 = 0x29,/*  8 bit        RAM Buffer Test Register 1 */
+       RB_TST2 = 0x2a,/*  8 bit        RAM Buffer Test Register 2 */
+};
+
+/* Receive and Transmit Queues */
+enum {
+       Q_R1    = 0x0000,       /* Receive Queue 1 */
+       Q_R2    = 0x0080,       /* Receive Queue 2 */
+       Q_XS1   = 0x0200,       /* Synchronous Transmit Queue 1 */
+       Q_XA1   = 0x0280,       /* Asynchronous Transmit Queue 1 */
+       Q_XS2   = 0x0300,       /* Synchronous Transmit Queue 2 */
+       Q_XA2   = 0x0380,       /* Asynchronous Transmit Queue 2 */
+};
+
+/* Different PHY Types */
+enum {
+       PHY_ADDR_MARV   = 0,
+};
+
+#define RB_ADDR(offs, queue) (B16_RAM_REGS + (queue) + (offs))
+
+
+enum {
+       LNK_SYNC_INI    = 0x0c30,/* 32 bit      Link Sync Cnt Init Value */
+       LNK_SYNC_VAL    = 0x0c34,/* 32 bit      Link Sync Cnt Current Value */
+       LNK_SYNC_CTRL   = 0x0c38,/*  8 bit      Link Sync Cnt Control Register */
+       LNK_SYNC_TST    = 0x0c39,/*  8 bit      Link Sync Cnt Test Register */
+
+       LNK_LED_REG     = 0x0c3c,/*  8 bit      Link LED Register */
+
+/* Receive GMAC FIFO (YUKON and Yukon-2) */
+
+       RX_GMF_EA       = 0x0c40,/* 32 bit      Rx GMAC FIFO End Address */
+       RX_GMF_AF_THR   = 0x0c44,/* 32 bit      Rx GMAC FIFO Almost Full Thresh. */
+       RX_GMF_CTRL_T   = 0x0c48,/* 32 bit      Rx GMAC FIFO Control/Test */
+       RX_GMF_FL_MSK   = 0x0c4c,/* 32 bit      Rx GMAC FIFO Flush Mask */
+       RX_GMF_FL_THR   = 0x0c50,/* 32 bit      Rx GMAC FIFO Flush Threshold */
+       RX_GMF_TR_THR   = 0x0c54,/* 32 bit      Rx Truncation Threshold (Yukon-2) */
+       RX_GMF_UP_THR   = 0x0c58,/*  8 bit      Rx Upper Pause Thr (Yukon-EC_U) */
+       RX_GMF_LP_THR   = 0x0c5a,/*  8 bit      Rx Lower Pause Thr (Yukon-EC_U) */
+       RX_GMF_VLAN     = 0x0c5c,/* 32 bit      Rx VLAN Type Register (Yukon-2) */
+       RX_GMF_WP       = 0x0c60,/* 32 bit      Rx GMAC FIFO Write Pointer */
+
+       RX_GMF_WLEV     = 0x0c68,/* 32 bit      Rx GMAC FIFO Write Level */
+
+       RX_GMF_RP       = 0x0c70,/* 32 bit      Rx GMAC FIFO Read Pointer */
+
+       RX_GMF_RLEV     = 0x0c78,/* 32 bit      Rx GMAC FIFO Read Level */
+};
+
+
+/*     Q_BC                    32 bit  Current Byte Counter */
+
+/* BMU Control Status Registers */
+/*     B0_R1_CSR               32 bit  BMU Ctrl/Stat Rx Queue 1 */
+/*     B0_R2_CSR               32 bit  BMU Ctrl/Stat Rx Queue 2 */
+/*     B0_XA1_CSR              32 bit  BMU Ctrl/Stat Sync Tx Queue 1 */
+/*     B0_XS1_CSR              32 bit  BMU Ctrl/Stat Async Tx Queue 1 */
+/*     B0_XA2_CSR              32 bit  BMU Ctrl/Stat Sync Tx Queue 2 */
+/*     B0_XS2_CSR              32 bit  BMU Ctrl/Stat Async Tx Queue 2 */
+/*     Q_CSR                   32 bit  BMU Control/Status Register */
+
+/* Rx BMU Control / Status Registers (Yukon-2) */
+enum {
+       BMU_IDLE        = 1<<31, /* BMU Idle State */
+       BMU_RX_TCP_PKT  = 1<<30, /* Rx TCP Packet (when RSS Hash enabled) */
+       BMU_RX_IP_PKT   = 1<<29, /* Rx IP  Packet (when RSS Hash enabled) */
+
+       BMU_ENA_RX_RSS_HASH = 1<<15, /* Enable  Rx RSS Hash */
+       BMU_DIS_RX_RSS_HASH = 1<<14, /* Disable Rx RSS Hash */
+       BMU_ENA_RX_CHKSUM = 1<<13, /* Enable  Rx TCP/IP Checksum Check */
+       BMU_DIS_RX_CHKSUM = 1<<12, /* Disable Rx TCP/IP Checksum Check */
+       BMU_CLR_IRQ_PAR = 1<<11, /* Clear IRQ on Parity errors (Rx) */
+       BMU_CLR_IRQ_TCP = 1<<11, /* Clear IRQ on TCP segment. error (Tx) */
+       BMU_CLR_IRQ_CHK = 1<<10, /* Clear IRQ Check */
+       BMU_STOP        = 1<<9, /* Stop  Rx/Tx Queue */
+       BMU_START       = 1<<8, /* Start Rx/Tx Queue */
+       BMU_FIFO_OP_ON  = 1<<7, /* FIFO Operational On */
+       BMU_FIFO_OP_OFF = 1<<6, /* FIFO Operational Off */
+       BMU_FIFO_ENA    = 1<<5, /* Enable FIFO */
+       BMU_FIFO_RST    = 1<<4, /* Reset  FIFO */
+       BMU_OP_ON       = 1<<3, /* BMU Operational On */
+       BMU_OP_OFF      = 1<<2, /* BMU Operational Off */
+       BMU_RST_CLR     = 1<<1, /* Clear BMU Reset (Enable) */
+       BMU_RST_SET     = 1<<0, /* Set   BMU Reset */
+
+       BMU_CLR_RESET   = BMU_FIFO_RST | BMU_OP_OFF | BMU_RST_CLR,
+       BMU_OPER_INIT   = BMU_CLR_IRQ_PAR | BMU_CLR_IRQ_CHK | BMU_START |
+                         BMU_FIFO_ENA | BMU_OP_ON,
+
+       BMU_WM_DEFAULT = 0x600,
+};
+
+/* Tx BMU Control / Status Registers (Yukon-2) */
+                                                               /* Bit 31: same as for Rx */
+enum {
+       BMU_TX_IPIDINCR_ON      = 1<<13, /* Enable  IP ID Increment */
+       BMU_TX_IPIDINCR_OFF     = 1<<12, /* Disable IP ID Increment */
+       BMU_TX_CLR_IRQ_TCP      = 1<<11, /* Clear IRQ on TCP segment length mismatch */
+};
+
+/* Queue Prefetch Unit Offsets, use Y2_QADDR() to address (Yukon-2 only)*/
+/* PREF_UNIT_CTRL      32 bit  Prefetch Control register */
+enum {
+       PREF_UNIT_OP_ON         = 1<<3, /* prefetch unit operational */
+       PREF_UNIT_OP_OFF        = 1<<2, /* prefetch unit not operational */
+       PREF_UNIT_RST_CLR       = 1<<1, /* Clear Prefetch Unit Reset */
+       PREF_UNIT_RST_SET       = 1<<0, /* Set   Prefetch Unit Reset */
+};
+
+/* RAM Buffer Register Offsets, use RB_ADDR(Queue, Offs) to access */
+/*     RB_START                32 bit  RAM Buffer Start Address */
+/*     RB_END                  32 bit  RAM Buffer End Address */
+/*     RB_WP                   32 bit  RAM Buffer Write Pointer */
+/*     RB_RP                   32 bit  RAM Buffer Read Pointer */
+/*     RB_RX_UTPP              32 bit  Rx Upper Threshold, Pause Pack */
+/*     RB_RX_LTPP              32 bit  Rx Lower Threshold, Pause Pack */
+/*     RB_RX_UTHP              32 bit  Rx Upper Threshold, High Prio */
+/*     RB_RX_LTHP              32 bit  Rx Lower Threshold, High Prio */
+/*     RB_PC                   32 bit  RAM Buffer Packet Counter */
+/*     RB_LEV                  32 bit  RAM Buffer Level Register */
+
+#define RB_MSK 0x0007ffff      /* Bit 18.. 0:  RAM Buffer Pointer Bits */
+/*     RB_TST2                  8 bit  RAM Buffer Test Register 2 */
+/*     RB_TST1                  8 bit  RAM Buffer Test Register 1 */
+
+/*     RB_CTRL                  8 bit  RAM Buffer Control Register */
+enum {
+       RB_ENA_STFWD    = 1<<5, /* Enable  Store & Forward */
+       RB_DIS_STFWD    = 1<<4, /* Disable Store & Forward */
+       RB_ENA_OP_MD    = 1<<3, /* Enable  Operation Mode */
+       RB_DIS_OP_MD    = 1<<2, /* Disable Operation Mode */
+       RB_RST_CLR      = 1<<1, /* Clear RAM Buf STM Reset */
+       RB_RST_SET      = 1<<0, /* Set   RAM Buf STM Reset */
+};
+
+
+/* Transmit GMAC FIFO (YUKON only) */
+enum {
+       TX_GMF_EA       = 0x0d40,/* 32 bit      Tx GMAC FIFO End Address */
+       TX_GMF_AE_THR   = 0x0d44,/* 32 bit      Tx GMAC FIFO Almost Empty Thresh.*/
+       TX_GMF_CTRL_T   = 0x0d48,/* 32 bit      Tx GMAC FIFO Control/Test */
+
+       TX_GMF_WP       = 0x0d60,/* 32 bit      Tx GMAC FIFO Write Pointer */
+       TX_GMF_WSP      = 0x0d64,/* 32 bit      Tx GMAC FIFO Write Shadow Ptr. */
+       TX_GMF_WLEV     = 0x0d68,/* 32 bit      Tx GMAC FIFO Write Level */
+
+       TX_GMF_RP       = 0x0d70,/* 32 bit      Tx GMAC FIFO Read Pointer */
+       TX_GMF_RSTP     = 0x0d74,/* 32 bit      Tx GMAC FIFO Restart Pointer */
+       TX_GMF_RLEV     = 0x0d78,/* 32 bit      Tx GMAC FIFO Read Level */
+};
+
+/* Descriptor Poll Timer Registers */
+enum {
+       B28_DPT_INI     = 0x0e00,/* 24 bit      Descriptor Poll Timer Init Val */
+       B28_DPT_VAL     = 0x0e04,/* 24 bit      Descriptor Poll Timer Curr Val */
+       B28_DPT_CTRL    = 0x0e08,/*  8 bit      Descriptor Poll Timer Ctrl Reg */
+
+       B28_DPT_TST     = 0x0e0a,/*  8 bit      Descriptor Poll Timer Test Reg */
+};
+
+/* Time Stamp Timer Registers (YUKON only) */
+enum {
+       GMAC_TI_ST_VAL  = 0x0e14,/* 32 bit      Time Stamp Timer Curr Val */
+       GMAC_TI_ST_CTRL = 0x0e18,/*  8 bit      Time Stamp Timer Ctrl Reg */
+       GMAC_TI_ST_TST  = 0x0e1a,/*  8 bit      Time Stamp Timer Test Reg */
+};
+
+/* Polling Unit Registers (Yukon-2 only) */
+enum {
+       POLL_CTRL       = 0x0e20, /* 32 bit     Polling Unit Control Reg */
+       POLL_LAST_IDX   = 0x0e24,/* 16 bit      Polling Unit List Last Index */
+
+       POLL_LIST_ADDR_LO= 0x0e28,/* 32 bit     Poll. List Start Addr (low) */
+       POLL_LIST_ADDR_HI= 0x0e2c,/* 32 bit     Poll. List Start Addr (high) */
+};
+
+/* ASF Subsystem Registers (Yukon-2 only) */
+enum {
+       B28_Y2_SMB_CONFIG  = 0x0e40,/* 32 bit   ASF SMBus Config Register */
+       B28_Y2_SMB_CSD_REG = 0x0e44,/* 32 bit   ASF SMB Control/Status/Data */
+       B28_Y2_ASF_IRQ_V_BASE=0x0e60,/* 32 bit  ASF IRQ Vector Base */
+
+       B28_Y2_ASF_STAT_CMD= 0x0e68,/* 32 bit   ASF Status and Command Reg */
+       B28_Y2_ASF_HOST_COM= 0x0e6c,/* 32 bit   ASF Host Communication Reg */
+       B28_Y2_DATA_REG_1  = 0x0e70,/* 32 bit   ASF/Host Data Register 1 */
+       B28_Y2_DATA_REG_2  = 0x0e74,/* 32 bit   ASF/Host Data Register 2 */
+       B28_Y2_DATA_REG_3  = 0x0e78,/* 32 bit   ASF/Host Data Register 3 */
+       B28_Y2_DATA_REG_4  = 0x0e7c,/* 32 bit   ASF/Host Data Register 4 */
+};
+
+/* Status BMU Registers (Yukon-2 only)*/
+enum {
+       STAT_CTRL       = 0x0e80,/* 32 bit      Status BMU Control Reg */
+       STAT_LAST_IDX   = 0x0e84,/* 16 bit      Status BMU Last Index */
+
+       STAT_LIST_ADDR_LO= 0x0e88,/* 32 bit     Status List Start Addr (low) */
+       STAT_LIST_ADDR_HI= 0x0e8c,/* 32 bit     Status List Start Addr (high) */
+       STAT_TXA1_RIDX  = 0x0e90,/* 16 bit      Status TxA1 Report Index Reg */
+       STAT_TXS1_RIDX  = 0x0e92,/* 16 bit      Status TxS1 Report Index Reg */
+       STAT_TXA2_RIDX  = 0x0e94,/* 16 bit      Status TxA2 Report Index Reg */
+       STAT_TXS2_RIDX  = 0x0e96,/* 16 bit      Status TxS2 Report Index Reg */
+       STAT_TX_IDX_TH  = 0x0e98,/* 16 bit      Status Tx Index Threshold Reg */
+       STAT_PUT_IDX    = 0x0e9c,/* 16 bit      Status Put Index Reg */
+
+/* FIFO Control/Status Registers (Yukon-2 only)*/
+       STAT_FIFO_WP    = 0x0ea0,/*  8 bit      Status FIFO Write Pointer Reg */
+       STAT_FIFO_RP    = 0x0ea4,/*  8 bit      Status FIFO Read Pointer Reg */
+       STAT_FIFO_RSP   = 0x0ea6,/*  8 bit      Status FIFO Read Shadow Ptr */
+       STAT_FIFO_LEVEL = 0x0ea8,/*  8 bit      Status FIFO Level Reg */
+       STAT_FIFO_SHLVL = 0x0eaa,/*  8 bit      Status FIFO Shadow Level Reg */
+       STAT_FIFO_WM    = 0x0eac,/*  8 bit      Status FIFO Watermark Reg */
+       STAT_FIFO_ISR_WM= 0x0ead,/*  8 bit      Status FIFO ISR Watermark Reg */
+
+/* Level and ISR Timer Registers (Yukon-2 only)*/
+       STAT_LEV_TIMER_INI= 0x0eb0,/* 32 bit    Level Timer Init. Value Reg */
+       STAT_LEV_TIMER_CNT= 0x0eb4,/* 32 bit    Level Timer Counter Reg */
+       STAT_LEV_TIMER_CTRL= 0x0eb8,/*  8 bit   Level Timer Control Reg */
+       STAT_LEV_TIMER_TEST= 0x0eb9,/*  8 bit   Level Timer Test Reg */
+       STAT_TX_TIMER_INI  = 0x0ec0,/* 32 bit   Tx Timer Init. Value Reg */
+       STAT_TX_TIMER_CNT  = 0x0ec4,/* 32 bit   Tx Timer Counter Reg */
+       STAT_TX_TIMER_CTRL = 0x0ec8,/*  8 bit   Tx Timer Control Reg */
+       STAT_TX_TIMER_TEST = 0x0ec9,/*  8 bit   Tx Timer Test Reg */
+       STAT_ISR_TIMER_INI = 0x0ed0,/* 32 bit   ISR Timer Init. Value Reg */
+       STAT_ISR_TIMER_CNT = 0x0ed4,/* 32 bit   ISR Timer Counter Reg */
+       STAT_ISR_TIMER_CTRL= 0x0ed8,/*  8 bit   ISR Timer Control Reg */
+       STAT_ISR_TIMER_TEST= 0x0ed9,/*  8 bit   ISR Timer Test Reg */
+};
+
+enum {
+       LINKLED_OFF          = 0x01,
+       LINKLED_ON           = 0x02,
+       LINKLED_LINKSYNC_OFF = 0x04,
+       LINKLED_LINKSYNC_ON  = 0x08,
+       LINKLED_BLINK_OFF    = 0x10,
+       LINKLED_BLINK_ON     = 0x20,
+};
+
+/* GMAC and GPHY Control Registers (YUKON only) */
+enum {
+       GMAC_CTRL       = 0x0f00,/* 32 bit      GMAC Control Reg */
+       GPHY_CTRL       = 0x0f04,/* 32 bit      GPHY Control Reg */
+       GMAC_IRQ_SRC    = 0x0f08,/*  8 bit      GMAC Interrupt Source Reg */
+       GMAC_IRQ_MSK    = 0x0f0c,/*  8 bit      GMAC Interrupt Mask Reg */
+       GMAC_LINK_CTRL  = 0x0f10,/* 16 bit      Link Control Reg */
+
+/* Wake-up Frame Pattern Match Control Registers (YUKON only) */
+
+       WOL_REG_OFFS    = 0x20,/* HW-Bug: Address is + 0x20 against spec. */
+
+       WOL_CTRL_STAT   = 0x0f20,/* 16 bit      WOL Control/Status Reg */
+       WOL_MATCH_CTL   = 0x0f22,/*  8 bit      WOL Match Control Reg */
+       WOL_MATCH_RES   = 0x0f23,/*  8 bit      WOL Match Result Reg */
+       WOL_MAC_ADDR    = 0x0f24,/* 32 bit      WOL MAC Address */
+       WOL_PATT_PME    = 0x0f2a,/*  8 bit      WOL PME Match Enable (Yukon-2) */
+       WOL_PATT_ASFM   = 0x0f2b,/*  8 bit      WOL ASF Match Enable (Yukon-2) */
+       WOL_PATT_RPTR   = 0x0f2c,/*  8 bit      WOL Pattern Read Pointer */
+
+/* WOL Pattern Length Registers (YUKON only) */
+
+       WOL_PATT_LEN_LO = 0x0f30,/* 32 bit      WOL Pattern Length 3..0 */
+       WOL_PATT_LEN_HI = 0x0f34,/* 24 bit      WOL Pattern Length 6..4 */
+
+/* WOL Pattern Counter Registers (YUKON only) */
+
+
+       WOL_PATT_CNT_0  = 0x0f38,/* 32 bit      WOL Pattern Counter 3..0 */
+       WOL_PATT_CNT_4  = 0x0f3c,/* 24 bit      WOL Pattern Counter 6..4 */
+};
+
+enum {
+       WOL_PATT_RAM_1  = 0x1000,/*  WOL Pattern RAM Link 1 */
+       WOL_PATT_RAM_2  = 0x1400,/*  WOL Pattern RAM Link 2 */
+};
+
+enum {
+       BASE_GMAC_1     = 0x2800,/* GMAC 1 registers */
+       BASE_GMAC_2     = 0x3800,/* GMAC 2 registers */
+};
+
+/*
+ * Marvel-PHY Registers, indirect addressed over GMAC
+ */
+enum {
+       PHY_MARV_CTRL           = 0x00,/* 16 bit r/w    PHY Control Register */
+       PHY_MARV_STAT           = 0x01,/* 16 bit r/o    PHY Status Register */
+       PHY_MARV_ID0            = 0x02,/* 16 bit r/o    PHY ID0 Register */
+       PHY_MARV_ID1            = 0x03,/* 16 bit r/o    PHY ID1 Register */
+       PHY_MARV_AUNE_ADV       = 0x04,/* 16 bit r/w    Auto-Neg. Advertisement */
+       PHY_MARV_AUNE_LP        = 0x05,/* 16 bit r/o    Link Part Ability Reg */
+       PHY_MARV_AUNE_EXP       = 0x06,/* 16 bit r/o    Auto-Neg. Expansion Reg */
+       PHY_MARV_NEPG           = 0x07,/* 16 bit r/w    Next Page Register */
+       PHY_MARV_NEPG_LP        = 0x08,/* 16 bit r/o    Next Page Link Partner */
+       /* Marvel-specific registers */
+       PHY_MARV_1000T_CTRL     = 0x09,/* 16 bit r/w    1000Base-T Control Reg */
+       PHY_MARV_1000T_STAT     = 0x0a,/* 16 bit r/o    1000Base-T Status Reg */
+       PHY_MARV_EXT_STAT       = 0x0f,/* 16 bit r/o    Extended Status Reg */
+       PHY_MARV_PHY_CTRL       = 0x10,/* 16 bit r/w    PHY Specific Ctrl Reg */
+       PHY_MARV_PHY_STAT       = 0x11,/* 16 bit r/o    PHY Specific Stat Reg */
+       PHY_MARV_INT_MASK       = 0x12,/* 16 bit r/w    Interrupt Mask Reg */
+       PHY_MARV_INT_STAT       = 0x13,/* 16 bit r/o    Interrupt Status Reg */
+       PHY_MARV_EXT_CTRL       = 0x14,/* 16 bit r/w    Ext. PHY Specific Ctrl */
+       PHY_MARV_RXE_CNT        = 0x15,/* 16 bit r/w    Receive Error Counter */
+       PHY_MARV_EXT_ADR        = 0x16,/* 16 bit r/w    Ext. Ad. for Cable Diag. */
+       PHY_MARV_PORT_IRQ       = 0x17,/* 16 bit r/o    Port 0 IRQ (88E1111 only) */
+       PHY_MARV_LED_CTRL       = 0x18,/* 16 bit r/w    LED Control Reg */
+       PHY_MARV_LED_OVER       = 0x19,/* 16 bit r/w    Manual LED Override Reg */
+       PHY_MARV_EXT_CTRL_2     = 0x1a,/* 16 bit r/w    Ext. PHY Specific Ctrl 2 */
+       PHY_MARV_EXT_P_STAT     = 0x1b,/* 16 bit r/w    Ext. PHY Spec. Stat Reg */
+       PHY_MARV_CABLE_DIAG     = 0x1c,/* 16 bit r/o    Cable Diagnostic Reg */
+       PHY_MARV_PAGE_ADDR      = 0x1d,/* 16 bit r/w    Extended Page Address Reg */
+       PHY_MARV_PAGE_DATA      = 0x1e,/* 16 bit r/w    Extended Page Data Reg */
+
+/* for 10/100 Fast Ethernet PHY (88E3082 only) */
+       PHY_MARV_FE_LED_PAR     = 0x16,/* 16 bit r/w    LED Parallel Select Reg. */
+       PHY_MARV_FE_LED_SER     = 0x17,/* 16 bit r/w    LED Stream Select S. LED */
+       PHY_MARV_FE_VCT_TX      = 0x1a,/* 16 bit r/w    VCT Reg. for TXP/N Pins */
+       PHY_MARV_FE_VCT_RX      = 0x1b,/* 16 bit r/o    VCT Reg. for RXP/N Pins */
+       PHY_MARV_FE_SPEC_2      = 0x1c,/* 16 bit r/w    Specific Control Reg. 2 */
+};
+
+enum {
+       PHY_CT_RESET    = 1<<15, /* Bit 15: (sc)        clear all PHY related regs */
+       PHY_CT_LOOP     = 1<<14, /* Bit 14:     enable Loopback over PHY */
+       PHY_CT_SPS_LSB  = 1<<13, /* Bit 13:     Speed select, lower bit */
+       PHY_CT_ANE      = 1<<12, /* Bit 12:     Auto-Negotiation Enabled */
+       PHY_CT_PDOWN    = 1<<11, /* Bit 11:     Power Down Mode */
+       PHY_CT_ISOL     = 1<<10, /* Bit 10:     Isolate Mode */
+       PHY_CT_RE_CFG   = 1<<9, /* Bit  9:      (sc) Restart Auto-Negotiation */
+       PHY_CT_DUP_MD   = 1<<8, /* Bit  8:      Duplex Mode */
+       PHY_CT_COL_TST  = 1<<7, /* Bit  7:      Collision Test enabled */
+       PHY_CT_SPS_MSB  = 1<<6, /* Bit  6:      Speed select, upper bit */
+};
+
+enum {
+       PHY_CT_SP1000   = PHY_CT_SPS_MSB, /* enable speed of 1000 Mbps */
+       PHY_CT_SP100    = PHY_CT_SPS_LSB, /* enable speed of  100 Mbps */
+       PHY_CT_SP10     = 0,              /* enable speed of   10 Mbps */
+};
+
+enum {
+       PHY_ST_EXT_ST   = 1<<8, /* Bit  8:      Extended Status Present */
+
+       PHY_ST_PRE_SUP  = 1<<6, /* Bit  6:      Preamble Suppression */
+       PHY_ST_AN_OVER  = 1<<5, /* Bit  5:      Auto-Negotiation Over */
+       PHY_ST_REM_FLT  = 1<<4, /* Bit  4:      Remote Fault Condition Occured */
+       PHY_ST_AN_CAP   = 1<<3, /* Bit  3:      Auto-Negotiation Capability */
+       PHY_ST_LSYNC    = 1<<2, /* Bit  2:      Link Synchronized */
+       PHY_ST_JAB_DET  = 1<<1, /* Bit  1:      Jabber Detected */
+       PHY_ST_EXT_REG  = 1<<0, /* Bit  0:      Extended Register available */
+};
+
+enum {
+       PHY_I1_OUI_MSK  = 0x3f<<10, /* Bit 15..10:      Organization Unique ID */
+       PHY_I1_MOD_NUM  = 0x3f<<4, /* Bit  9.. 4:       Model Number */
+       PHY_I1_REV_MSK  = 0xf, /* Bit  3.. 0:   Revision Number */
+};
+
+/* different Marvell PHY Ids */
+enum {
+       PHY_MARV_ID0_VAL= 0x0141, /* Marvell Unique Identifier */
+
+       PHY_BCOM_ID1_A1 = 0x6041,
+       PHY_BCOM_ID1_B2 = 0x6043,
+       PHY_BCOM_ID1_C0 = 0x6044,
+       PHY_BCOM_ID1_C5 = 0x6047,
+
+       PHY_MARV_ID1_B0 = 0x0C23, /* Yukon (PHY 88E1011) */
+       PHY_MARV_ID1_B2 = 0x0C25, /* Yukon-Plus (PHY 88E1011) */
+       PHY_MARV_ID1_C2 = 0x0CC2, /* Yukon-EC (PHY 88E1111) */
+       PHY_MARV_ID1_Y2 = 0x0C91, /* Yukon-2 (PHY 88E1112) */
+};
+
+/* Advertisement register bits */
+enum {
+       PHY_AN_NXT_PG   = 1<<15, /* Bit 15:     Request Next Page */
+       PHY_AN_ACK      = 1<<14, /* Bit 14:     (ro) Acknowledge Received */
+       PHY_AN_RF       = 1<<13, /* Bit 13:     Remote Fault Bits */
+
+       PHY_AN_PAUSE_ASYM = 1<<11,/* Bit 11:    Try for asymmetric */
+       PHY_AN_PAUSE_CAP = 1<<10, /* Bit 10:    Try for pause */
+       PHY_AN_100BASE4 = 1<<9, /* Bit 9:       Try for 100mbps 4k packets */
+       PHY_AN_100FULL  = 1<<8, /* Bit 8:       Try for 100mbps full-duplex */
+       PHY_AN_100HALF  = 1<<7, /* Bit 7:       Try for 100mbps half-duplex */
+       PHY_AN_10FULL   = 1<<6, /* Bit 6:       Try for 10mbps full-duplex */
+       PHY_AN_10HALF   = 1<<5, /* Bit 5:       Try for 10mbps half-duplex */
+       PHY_AN_CSMA     = 1<<0, /* Bit 0:       Only selector supported */
+       PHY_AN_SEL      = 0x1f, /* Bit 4..0:    Selector Field, 00001=Ethernet*/
+       PHY_AN_FULL     = PHY_AN_100FULL | PHY_AN_10FULL | PHY_AN_CSMA,
+       PHY_AN_ALL      = PHY_AN_10HALF | PHY_AN_10FULL |
+                         PHY_AN_100HALF | PHY_AN_100FULL,
+};
+
+/*****  PHY_BCOM_1000T_STAT    16 bit r/o      1000Base-T Status Reg *****/
+/*****  PHY_MARV_1000T_STAT    16 bit r/o      1000Base-T Status Reg *****/
+enum {
+       PHY_B_1000S_MSF = 1<<15, /* Bit 15:     Master/Slave Fault */
+       PHY_B_1000S_MSR = 1<<14, /* Bit 14:     Master/Slave Result */
+       PHY_B_1000S_LRS = 1<<13, /* Bit 13:     Local Receiver Status */
+       PHY_B_1000S_RRS = 1<<12, /* Bit 12:     Remote Receiver Status */
+       PHY_B_1000S_LP_FD       = 1<<11, /* Bit 11:     Link Partner can FD */
+       PHY_B_1000S_LP_HD       = 1<<10, /* Bit 10:     Link Partner can HD */
+                                                                       /* Bit  9..8:   reserved */
+       PHY_B_1000S_IEC = 0xff, /* Bit  7..0:   Idle Error Count */
+};
+
+/** Marvell-Specific */
+enum {
+       PHY_M_AN_NXT_PG = 1<<15, /* Request Next Page */
+       PHY_M_AN_ACK    = 1<<14, /* (ro)        Acknowledge Received */
+       PHY_M_AN_RF     = 1<<13, /* Remote Fault */
+
+       PHY_M_AN_ASP    = 1<<11, /* Asymmetric Pause */
+       PHY_M_AN_PC     = 1<<10, /* MAC Pause implemented */
+       PHY_M_AN_100_T4 = 1<<9, /* Not cap. 100Base-T4 (always 0) */
+       PHY_M_AN_100_FD = 1<<8, /* Advertise 100Base-TX Full Duplex */
+       PHY_M_AN_100_HD = 1<<7, /* Advertise 100Base-TX Half Duplex */
+       PHY_M_AN_10_FD  = 1<<6, /* Advertise 10Base-TX Full Duplex */
+       PHY_M_AN_10_HD  = 1<<5, /* Advertise 10Base-TX Half Duplex */
+       PHY_M_AN_SEL_MSK =0x1f<<4,      /* Bit  4.. 0: Selector Field Mask */
+};
+
+/* special defines for FIBER (88E1011S only) */
+enum {
+       PHY_M_AN_ASP_X  = 1<<8, /* Asymmetric Pause */
+       PHY_M_AN_PC_X   = 1<<7, /* MAC Pause implemented */
+       PHY_M_AN_1000X_AHD      = 1<<6, /* Advertise 10000Base-X Half Duplex */
+       PHY_M_AN_1000X_AFD      = 1<<5, /* Advertise 10000Base-X Full Duplex */
+};
+
+/* Pause Bits (PHY_M_AN_ASP_X and PHY_M_AN_PC_X) encoding */
+enum {
+       PHY_M_P_NO_PAUSE_X      = 0<<7,/* Bit  8.. 7:   no Pause Mode */
+       PHY_M_P_SYM_MD_X        = 1<<7, /* Bit  8.. 7:  symmetric Pause Mode */
+       PHY_M_P_ASYM_MD_X       = 2<<7,/* Bit  8.. 7:   asymmetric Pause Mode */
+       PHY_M_P_BOTH_MD_X       = 3<<7,/* Bit  8.. 7:   both Pause Mode */
+};
+
+/*****  PHY_MARV_1000T_CTRL    16 bit r/w      1000Base-T Control Reg *****/
+enum {
+       PHY_M_1000C_TEST        = 7<<13,/* Bit 15..13:  Test Modes */
+       PHY_M_1000C_MSE = 1<<12, /* Manual Master/Slave Enable */
+       PHY_M_1000C_MSC = 1<<11, /* M/S Configuration (1=Master) */
+       PHY_M_1000C_MPD = 1<<10, /* Multi-Port Device */
+       PHY_M_1000C_AFD = 1<<9, /* Advertise Full Duplex */
+       PHY_M_1000C_AHD = 1<<8, /* Advertise Half Duplex */
+};
+
+/*****  PHY_MARV_PHY_CTRL      16 bit r/w      PHY Specific Ctrl Reg *****/
+enum {
+       PHY_M_PC_TX_FFD_MSK     = 3<<14,/* Bit 15..14: Tx FIFO Depth Mask */
+       PHY_M_PC_RX_FFD_MSK     = 3<<12,/* Bit 13..12: Rx FIFO Depth Mask */
+       PHY_M_PC_ASS_CRS_TX     = 1<<11, /* Assert CRS on Transmit */
+       PHY_M_PC_FL_GOOD        = 1<<10, /* Force Link Good */
+       PHY_M_PC_EN_DET_MSK     = 3<<8,/* Bit  9.. 8: Energy Detect Mask */
+       PHY_M_PC_ENA_EXT_D      = 1<<7, /* Enable Ext. Distance (10BT) */
+       PHY_M_PC_MDIX_MSK       = 3<<5,/* Bit  6.. 5: MDI/MDIX Config. Mask */
+       PHY_M_PC_DIS_125CLK     = 1<<4, /* Disable 125 CLK */
+       PHY_M_PC_MAC_POW_UP     = 1<<3, /* MAC Power up */
+       PHY_M_PC_SQE_T_ENA      = 1<<2, /* SQE Test Enabled */
+       PHY_M_PC_POL_R_DIS      = 1<<1, /* Polarity Reversal Disabled */
+       PHY_M_PC_DIS_JABBER     = 1<<0, /* Disable Jabber */
+};
+
+enum {
+       PHY_M_PC_EN_DET         = 2<<8, /* Energy Detect (Mode 1) */
+       PHY_M_PC_EN_DET_PLUS    = 3<<8, /* Energy Detect Plus (Mode 2) */
+};
+
+#define PHY_M_PC_MDI_XMODE(x)  (((x)<<5) & PHY_M_PC_MDIX_MSK)
+
+enum {
+       PHY_M_PC_MAN_MDI        = 0, /* 00 = Manual MDI configuration */
+       PHY_M_PC_MAN_MDIX       = 1, /* 01 = Manual MDIX configuration */
+       PHY_M_PC_ENA_AUTO       = 3, /* 11 = Enable Automatic Crossover */
+};
+
+/* for 10/100 Fast Ethernet PHY (88E3082 only) */
+enum {
+       PHY_M_PC_ENA_DTE_DT     = 1<<15, /* Enable Data Terminal Equ. (DTE) Detect */
+       PHY_M_PC_ENA_ENE_DT     = 1<<14, /* Enable Energy Detect (sense & pulse) */
+       PHY_M_PC_DIS_NLP_CK     = 1<<13, /* Disable Normal Link Puls (NLP) Check */
+       PHY_M_PC_ENA_LIP_NP     = 1<<12, /* Enable Link Partner Next Page Reg. */
+       PHY_M_PC_DIS_NLP_GN     = 1<<11, /* Disable Normal Link Puls Generation */
+
+       PHY_M_PC_DIS_SCRAMB     = 1<<9, /* Disable Scrambler */
+       PHY_M_PC_DIS_FEFI       = 1<<8, /* Disable Far End Fault Indic. (FEFI) */
+
+       PHY_M_PC_SH_TP_SEL      = 1<<6, /* Shielded Twisted Pair Select */
+       PHY_M_PC_RX_FD_MSK      = 3<<2,/* Bit  3.. 2: Rx FIFO Depth Mask */
+};
+
+/*****  PHY_MARV_PHY_STAT      16 bit r/o      PHY Specific Status Reg *****/
+enum {
+       PHY_M_PS_SPEED_MSK      = 3<<14, /* Bit 15..14: Speed Mask */
+       PHY_M_PS_SPEED_1000     = 1<<15, /*             10 = 1000 Mbps */
+       PHY_M_PS_SPEED_100      = 1<<14, /*             01 =  100 Mbps */
+       PHY_M_PS_SPEED_10       = 0,     /*             00 =   10 Mbps */
+       PHY_M_PS_FULL_DUP       = 1<<13, /* Full Duplex */
+       PHY_M_PS_PAGE_REC       = 1<<12, /* Page Received */
+       PHY_M_PS_SPDUP_RES      = 1<<11, /* Speed & Duplex Resolved */
+       PHY_M_PS_LINK_UP        = 1<<10, /* Link Up */
+       PHY_M_PS_CABLE_MSK      = 7<<7,  /* Bit  9.. 7: Cable Length Mask */
+       PHY_M_PS_MDI_X_STAT     = 1<<6,  /* MDI Crossover Stat (1=MDIX) */
+       PHY_M_PS_DOWNS_STAT     = 1<<5,  /* Downshift Status (1=downsh.) */
+       PHY_M_PS_ENDET_STAT     = 1<<4,  /* Energy Detect Status (1=act) */
+       PHY_M_PS_TX_P_EN        = 1<<3,  /* Tx Pause Enabled */
+       PHY_M_PS_RX_P_EN        = 1<<2,  /* Rx Pause Enabled */
+       PHY_M_PS_POL_REV        = 1<<1,  /* Polarity Reversed */
+       PHY_M_PS_JABBER         = 1<<0,  /* Jabber */
+};
+
+#define PHY_M_PS_PAUSE_MSK     (PHY_M_PS_TX_P_EN | PHY_M_PS_RX_P_EN)
+
+/* for 10/100 Fast Ethernet PHY (88E3082 only) */
+enum {
+       PHY_M_PS_DTE_DETECT     = 1<<15, /* Data Terminal Equipment (DTE) Detected */
+       PHY_M_PS_RES_SPEED      = 1<<14, /* Resolved Speed (1=100 Mbps, 0=10 Mbps */
+};
+
+enum {
+       PHY_M_IS_AN_ERROR       = 1<<15, /* Auto-Negotiation Error */
+       PHY_M_IS_LSP_CHANGE     = 1<<14, /* Link Speed Changed */
+       PHY_M_IS_DUP_CHANGE     = 1<<13, /* Duplex Mode Changed */
+       PHY_M_IS_AN_PR          = 1<<12, /* Page Received */
+       PHY_M_IS_AN_COMPL       = 1<<11, /* Auto-Negotiation Completed */
+       PHY_M_IS_LST_CHANGE     = 1<<10, /* Link Status Changed */
+       PHY_M_IS_SYMB_ERROR     = 1<<9, /* Symbol Error */
+       PHY_M_IS_FALSE_CARR     = 1<<8, /* False Carrier */
+       PHY_M_IS_FIFO_ERROR     = 1<<7, /* FIFO Overflow/Underrun Error */
+       PHY_M_IS_MDI_CHANGE     = 1<<6, /* MDI Crossover Changed */
+       PHY_M_IS_DOWNSH_DET     = 1<<5, /* Downshift Detected */
+       PHY_M_IS_END_CHANGE     = 1<<4, /* Energy Detect Changed */
+
+       PHY_M_IS_DTE_CHANGE     = 1<<2, /* DTE Power Det. Status Changed */
+       PHY_M_IS_POL_CHANGE     = 1<<1, /* Polarity Changed */
+       PHY_M_IS_JABBER         = 1<<0, /* Jabber */
+
+       PHY_M_DEF_MSK           = PHY_M_IS_LSP_CHANGE | PHY_M_IS_LST_CHANGE
+                                | PHY_M_IS_FIFO_ERROR,
+       PHY_M_AN_MSK           = PHY_M_IS_AN_ERROR | PHY_M_IS_AN_COMPL,
+};
+
+
+/*****  PHY_MARV_EXT_CTRL      16 bit r/w      Ext. PHY Specific Ctrl *****/
+enum {
+       PHY_M_EC_ENA_BC_EXT = 1<<15, /* Enable Block Carr. Ext. (88E1111 only) */
+       PHY_M_EC_ENA_LIN_LB = 1<<14, /* Enable Line Loopback (88E1111 only) */
+
+       PHY_M_EC_DIS_LINK_P = 1<<12, /* Disable Link Pulses (88E1111 only) */
+       PHY_M_EC_M_DSC_MSK  = 3<<10, /* Bit 11..10:     Master Downshift Counter */
+                                       /* (88E1011 only) */
+       PHY_M_EC_S_DSC_MSK  = 3<<8,/* Bit  9.. 8:       Slave  Downshift Counter */
+                                      /* (88E1011 only) */
+       PHY_M_EC_M_DSC_MSK2 = 7<<9,/* Bit 11.. 9:       Master Downshift Counter */
+                                       /* (88E1111 only) */
+       PHY_M_EC_DOWN_S_ENA = 1<<8, /* Downshift Enable (88E1111 only) */
+                                       /* !!! Errata in spec. (1 = disable) */
+       PHY_M_EC_RX_TIM_CT  = 1<<7, /* RGMII Rx Timing Control*/
+       PHY_M_EC_MAC_S_MSK  = 7<<4,/* Bit  6.. 4:       Def. MAC interface speed */
+       PHY_M_EC_FIB_AN_ENA = 1<<3, /* Fiber Auto-Neg. Enable (88E1011S only) */
+       PHY_M_EC_DTE_D_ENA  = 1<<2, /* DTE Detect Enable (88E1111 only) */
+       PHY_M_EC_TX_TIM_CT  = 1<<1, /* RGMII Tx Timing Control */
+       PHY_M_EC_TRANS_DIS  = 1<<0, /* Transmitter Disable (88E1111 only) */};
+
+#define PHY_M_EC_M_DSC(x)      ((x)<<10 & PHY_M_EC_M_DSC_MSK)
+                                       /* 00=1x; 01=2x; 10=3x; 11=4x */
+#define PHY_M_EC_S_DSC(x)      ((x)<<8 & PHY_M_EC_S_DSC_MSK)
+                                       /* 00=dis; 01=1x; 10=2x; 11=3x */
+#define PHY_M_EC_DSC_2(x)      ((x)<<9 & PHY_M_EC_M_DSC_MSK2)
+                                       /* 000=1x; 001=2x; 010=3x; 011=4x */
+#define PHY_M_EC_MAC_S(x)      ((x)<<4 & PHY_M_EC_MAC_S_MSK)
+                                       /* 01X=0; 110=2.5; 111=25 (MHz) */
+
+/* for Yukon-2 Gigabit Ethernet PHY (88E1112 only) */
+enum {
+       PHY_M_PC_DIS_LINK_Pa    = 1<<15,/* Disable Link Pulses */
+       PHY_M_PC_DSC_MSK        = 7<<12,/* Bit 14..12:  Downshift Counter */
+       PHY_M_PC_DOWN_S_ENA     = 1<<11,/* Downshift Enable */
+};
+/* !!! Errata in spec. (1 = disable) */
+
+#define PHY_M_PC_DSC(x)                        (((x)<<12) & PHY_M_PC_DSC_MSK)
+                                                                                       /* 100=5x; 101=6x; 110=7x; 111=8x */
+enum {
+       MAC_TX_CLK_0_MHZ        = 2,
+       MAC_TX_CLK_2_5_MHZ      = 6,
+       MAC_TX_CLK_25_MHZ       = 7,
+};
+
+/*****  PHY_MARV_LED_CTRL      16 bit r/w      LED Control Reg *****/
+enum {
+       PHY_M_LEDC_DIS_LED      = 1<<15, /* Disable LED */
+       PHY_M_LEDC_PULS_MSK     = 7<<12,/* Bit 14..12: Pulse Stretch Mask */
+       PHY_M_LEDC_F_INT        = 1<<11, /* Force Interrupt */
+       PHY_M_LEDC_BL_R_MSK     = 7<<8,/* Bit 10.. 8: Blink Rate Mask */
+       PHY_M_LEDC_DP_C_LSB     = 1<<7, /* Duplex Control (LSB, 88E1111 only) */
+       PHY_M_LEDC_TX_C_LSB     = 1<<6, /* Tx Control (LSB, 88E1111 only) */
+       PHY_M_LEDC_LK_C_MSK     = 7<<3,/* Bit  5.. 3: Link Control Mask */
+                                       /* (88E1111 only) */
+};
+
+enum {
+       PHY_M_LEDC_LINK_MSK     = 3<<3,/* Bit  4.. 3: Link Control Mask */
+                                                                       /* (88E1011 only) */
+       PHY_M_LEDC_DP_CTRL      = 1<<2, /* Duplex Control */
+       PHY_M_LEDC_DP_C_MSB     = 1<<2, /* Duplex Control (MSB, 88E1111 only) */
+       PHY_M_LEDC_RX_CTRL      = 1<<1, /* Rx Activity / Link */
+       PHY_M_LEDC_TX_CTRL      = 1<<0, /* Tx Activity / Link */
+       PHY_M_LEDC_TX_C_MSB     = 1<<0, /* Tx Control (MSB, 88E1111 only) */
+};
+
+#define PHY_M_LED_PULS_DUR(x)  (((x)<<12) & PHY_M_LEDC_PULS_MSK)
+
+/*****  PHY_MARV_PHY_STAT (page 3)16 bit r/w   Polarity Control Reg. *****/
+enum {
+       PHY_M_POLC_LS1M_MSK     = 0xf<<12, /* Bit 15..12: LOS,STAT1 Mix % Mask */
+       PHY_M_POLC_IS0M_MSK     = 0xf<<8,  /* Bit 11.. 8: INIT,STAT0 Mix % Mask */
+       PHY_M_POLC_LOS_MSK      = 0x3<<6,  /* Bit  7.. 6: LOS Pol. Ctrl. Mask */
+       PHY_M_POLC_INIT_MSK     = 0x3<<4,  /* Bit  5.. 4: INIT Pol. Ctrl. Mask */
+       PHY_M_POLC_STA1_MSK     = 0x3<<2,  /* Bit  3.. 2: STAT1 Pol. Ctrl. Mask */
+       PHY_M_POLC_STA0_MSK     = 0x3,     /* Bit  1.. 0: STAT0 Pol. Ctrl. Mask */
+};
+
+#define PHY_M_POLC_LS1_P_MIX(x)        (((x)<<12) & PHY_M_POLC_LS1M_MSK)
+#define PHY_M_POLC_IS0_P_MIX(x)        (((x)<<8) & PHY_M_POLC_IS0M_MSK)
+#define PHY_M_POLC_LOS_CTRL(x) (((x)<<6) & PHY_M_POLC_LOS_MSK)
+#define PHY_M_POLC_INIT_CTRL(x)        (((x)<<4) & PHY_M_POLC_INIT_MSK)
+#define PHY_M_POLC_STA1_CTRL(x)        (((x)<<2) & PHY_M_POLC_STA1_MSK)
+#define PHY_M_POLC_STA0_CTRL(x)        (((x)<<0) & PHY_M_POLC_STA0_MSK)
+
+enum {
+       PULS_NO_STR     = 0,/* no pulse stretching */
+       PULS_21MS       = 1,/* 21 ms to 42 ms */
+       PULS_42MS       = 2,/* 42 ms to 84 ms */
+       PULS_84MS       = 3,/* 84 ms to 170 ms */
+       PULS_170MS      = 4,/* 170 ms to 340 ms */
+       PULS_340MS      = 5,/* 340 ms to 670 ms */
+       PULS_670MS      = 6,/* 670 ms to 1.3 s */
+       PULS_1300MS     = 7,/* 1.3 s to 2.7 s */
+};
+
+#define PHY_M_LED_BLINK_RT(x)  (((x)<<8) & PHY_M_LEDC_BL_R_MSK)
+
+enum {
+       BLINK_42MS      = 0,/* 42 ms */
+       BLINK_84MS      = 1,/* 84 ms */
+       BLINK_170MS     = 2,/* 170 ms */
+       BLINK_340MS     = 3,/* 340 ms */
+       BLINK_670MS     = 4,/* 670 ms */
+};
+
+/*****  PHY_MARV_LED_OVER      16 bit r/w      Manual LED Override Reg *****/
+#define PHY_M_LED_MO_SGMII(x)  ((x)<<14) /* Bit 15..14:  SGMII AN Timer */
+                                                                               /* Bit 13..12:  reserved */
+#define PHY_M_LED_MO_DUP(x)    ((x)<<10) /* Bit 11..10:  Duplex */
+#define PHY_M_LED_MO_10(x)     ((x)<<8) /* Bit  9.. 8:  Link 10 */
+#define PHY_M_LED_MO_100(x)    ((x)<<6) /* Bit  7.. 6:  Link 100 */
+#define PHY_M_LED_MO_1000(x)   ((x)<<4) /* Bit  5.. 4:  Link 1000 */
+#define PHY_M_LED_MO_RX(x)     ((x)<<2) /* Bit  3.. 2:  Rx */
+#define PHY_M_LED_MO_TX(x)     ((x)<<0) /* Bit  1.. 0:  Tx */
+
+enum {
+       MO_LED_NORM     = 0,
+       MO_LED_BLINK    = 1,
+       MO_LED_OFF      = 2,
+       MO_LED_ON       = 3,
+};
+
+/*****  PHY_MARV_EXT_CTRL_2    16 bit r/w      Ext. PHY Specific Ctrl 2 *****/
+enum {
+       PHY_M_EC2_FI_IMPED      = 1<<6, /* Fiber Input  Impedance */
+       PHY_M_EC2_FO_IMPED      = 1<<5, /* Fiber Output Impedance */
+       PHY_M_EC2_FO_M_CLK      = 1<<4, /* Fiber Mode Clock Enable */
+       PHY_M_EC2_FO_BOOST      = 1<<3, /* Fiber Output Boost */
+       PHY_M_EC2_FO_AM_MSK     = 7,/* Bit  2.. 0:      Fiber Output Amplitude */
+};
+
+/*****  PHY_MARV_EXT_P_STAT 16 bit r/w Ext. PHY Specific Status *****/
+enum {
+       PHY_M_FC_AUTO_SEL       = 1<<15, /* Fiber/Copper Auto Sel. Dis. */
+       PHY_M_FC_AN_REG_ACC     = 1<<14, /* Fiber/Copper AN Reg. Access */
+       PHY_M_FC_RESOLUTION     = 1<<13, /* Fiber/Copper Resolution */
+       PHY_M_SER_IF_AN_BP      = 1<<12, /* Ser. IF AN Bypass Enable */
+       PHY_M_SER_IF_BP_ST      = 1<<11, /* Ser. IF AN Bypass Status */
+       PHY_M_IRQ_POLARITY      = 1<<10, /* IRQ polarity */
+       PHY_M_DIS_AUT_MED       = 1<<9, /* Disable Aut. Medium Reg. Selection */
+       /* (88E1111 only) */
+
+       PHY_M_UNDOC1            = 1<<7, /* undocumented bit !! */
+       PHY_M_DTE_POW_STAT      = 1<<4, /* DTE Power Status (88E1111 only) */
+       PHY_M_MODE_MASK = 0xf, /* Bit  3.. 0: copy of HWCFG MODE[3:0] */
+};
+
+/* for 10/100 Fast Ethernet PHY (88E3082 only) */
+/*****  PHY_MARV_FE_LED_PAR            16 bit r/w      LED Parallel Select Reg. *****/
+                                                                       /* Bit 15..12: reserved (used internally) */
+enum {
+       PHY_M_FELP_LED2_MSK = 0xf<<8,   /* Bit 11.. 8: LED2 Mask (LINK) */
+       PHY_M_FELP_LED1_MSK = 0xf<<4,   /* Bit  7.. 4: LED1 Mask (ACT) */
+       PHY_M_FELP_LED0_MSK = 0xf, /* Bit  3.. 0: LED0 Mask (SPEED) */
+};
+
+#define PHY_M_FELP_LED2_CTRL(x)        (((x)<<8) & PHY_M_FELP_LED2_MSK)
+#define PHY_M_FELP_LED1_CTRL(x)        (((x)<<4) & PHY_M_FELP_LED1_MSK)
+#define PHY_M_FELP_LED0_CTRL(x)        (((x)<<0) & PHY_M_FELP_LED0_MSK)
+
+enum {
+       LED_PAR_CTRL_COLX       = 0x00,
+       LED_PAR_CTRL_ERROR      = 0x01,
+       LED_PAR_CTRL_DUPLEX     = 0x02,
+       LED_PAR_CTRL_DP_COL     = 0x03,
+       LED_PAR_CTRL_SPEED      = 0x04,
+       LED_PAR_CTRL_LINK       = 0x05,
+       LED_PAR_CTRL_TX         = 0x06,
+       LED_PAR_CTRL_RX         = 0x07,
+       LED_PAR_CTRL_ACT        = 0x08,
+       LED_PAR_CTRL_LNK_RX     = 0x09,
+       LED_PAR_CTRL_LNK_AC     = 0x0a,
+       LED_PAR_CTRL_ACT_BL     = 0x0b,
+       LED_PAR_CTRL_TX_BL      = 0x0c,
+       LED_PAR_CTRL_RX_BL      = 0x0d,
+       LED_PAR_CTRL_COL_BL     = 0x0e,
+       LED_PAR_CTRL_INACT      = 0x0f
+};
+
+/*****,PHY_MARV_FE_SPEC_2              16 bit r/w      Specific Control Reg. 2 *****/
+enum {
+       PHY_M_FESC_DIS_WAIT     = 1<<2, /* Disable TDR Waiting Period */
+       PHY_M_FESC_ENA_MCLK     = 1<<1, /* Enable MAC Rx Clock in sleep mode */
+       PHY_M_FESC_SEL_CL_A     = 1<<0, /* Select Class A driver (100B-TX) */
+};
+
+/* for Yukon-2 Gigabit Ethernet PHY (88E1112 only) */
+/*****  PHY_MARV_PHY_CTRL (page 2)             16 bit r/w      MAC Specific Ctrl *****/
+enum {
+       PHY_M_MAC_MD_MSK        = 7<<7, /* Bit  9.. 7: Mode Select Mask */
+       PHY_M_MAC_MD_AUTO       = 3,/* Auto Copper/1000Base-X */
+       PHY_M_MAC_MD_COPPER     = 5,/* Copper only */
+       PHY_M_MAC_MD_1000BX     = 7,/* 1000Base-X only */
+};
+#define PHY_M_MAC_MODE_SEL(x)  (((x)<<7) & PHY_M_MAC_MD_MSK)
+
+/*****  PHY_MARV_PHY_CTRL (page 3)             16 bit r/w      LED Control Reg. *****/
+enum {
+       PHY_M_LEDC_LOS_MSK      = 0xf<<12,/* Bit 15..12: LOS LED Ctrl. Mask */
+       PHY_M_LEDC_INIT_MSK     = 0xf<<8, /* Bit 11.. 8: INIT LED Ctrl. Mask */
+       PHY_M_LEDC_STA1_MSK     = 0xf<<4,/* Bit  7.. 4: STAT1 LED Ctrl. Mask */
+       PHY_M_LEDC_STA0_MSK     = 0xf, /* Bit  3.. 0: STAT0 LED Ctrl. Mask */
+};
+
+#define PHY_M_LEDC_LOS_CTRL(x) (((x)<<12) & PHY_M_LEDC_LOS_MSK)
+#define PHY_M_LEDC_INIT_CTRL(x)        (((x)<<8) & PHY_M_LEDC_INIT_MSK)
+#define PHY_M_LEDC_STA1_CTRL(x)        (((x)<<4) & PHY_M_LEDC_STA1_MSK)
+#define PHY_M_LEDC_STA0_CTRL(x)        (((x)<<0) & PHY_M_LEDC_STA0_MSK)
+
+/* GMAC registers  */
+/* Port Registers */
+enum {
+       GM_GP_STAT      = 0x0000,       /* 16 bit r/o   General Purpose Status */
+       GM_GP_CTRL      = 0x0004,       /* 16 bit r/w   General Purpose Control */
+       GM_TX_CTRL      = 0x0008,       /* 16 bit r/w   Transmit Control Reg. */
+       GM_RX_CTRL      = 0x000c,       /* 16 bit r/w   Receive Control Reg. */
+       GM_TX_FLOW_CTRL = 0x0010,       /* 16 bit r/w   Transmit Flow-Control */
+       GM_TX_PARAM     = 0x0014,       /* 16 bit r/w   Transmit Parameter Reg. */
+       GM_SERIAL_MODE  = 0x0018,       /* 16 bit r/w   Serial Mode Register */
+/* Source Address Registers */
+       GM_SRC_ADDR_1L  = 0x001c,       /* 16 bit r/w   Source Address 1 (low) */
+       GM_SRC_ADDR_1M  = 0x0020,       /* 16 bit r/w   Source Address 1 (middle) */
+       GM_SRC_ADDR_1H  = 0x0024,       /* 16 bit r/w   Source Address 1 (high) */
+       GM_SRC_ADDR_2L  = 0x0028,       /* 16 bit r/w   Source Address 2 (low) */
+       GM_SRC_ADDR_2M  = 0x002c,       /* 16 bit r/w   Source Address 2 (middle) */
+       GM_SRC_ADDR_2H  = 0x0030,       /* 16 bit r/w   Source Address 2 (high) */
+
+/* Multicast Address Hash Registers */
+       GM_MC_ADDR_H1   = 0x0034,       /* 16 bit r/w   Multicast Address Hash 1 */
+       GM_MC_ADDR_H2   = 0x0038,       /* 16 bit r/w   Multicast Address Hash 2 */
+       GM_MC_ADDR_H3   = 0x003c,       /* 16 bit r/w   Multicast Address Hash 3 */
+       GM_MC_ADDR_H4   = 0x0040,       /* 16 bit r/w   Multicast Address Hash 4 */
+
+/* Interrupt Source Registers */
+       GM_TX_IRQ_SRC   = 0x0044,       /* 16 bit r/o   Tx Overflow IRQ Source */
+       GM_RX_IRQ_SRC   = 0x0048,       /* 16 bit r/o   Rx Overflow IRQ Source */
+       GM_TR_IRQ_SRC   = 0x004c,       /* 16 bit r/o   Tx/Rx Over. IRQ Source */
+
+/* Interrupt Mask Registers */
+       GM_TX_IRQ_MSK   = 0x0050,       /* 16 bit r/w   Tx Overflow IRQ Mask */
+       GM_RX_IRQ_MSK   = 0x0054,       /* 16 bit r/w   Rx Overflow IRQ Mask */
+       GM_TR_IRQ_MSK   = 0x0058,       /* 16 bit r/w   Tx/Rx Over. IRQ Mask */
+
+/* Serial Management Interface (SMI) Registers */
+       GM_SMI_CTRL     = 0x0080,       /* 16 bit r/w   SMI Control Register */
+       GM_SMI_DATA     = 0x0084,       /* 16 bit r/w   SMI Data Register */
+       GM_PHY_ADDR     = 0x0088,       /* 16 bit r/w   GPHY Address Register */
+};
+
+/* MIB Counters */
+#define GM_MIB_CNT_BASE        0x0100          /* Base Address of MIB Counters */
+#define GM_MIB_CNT_SIZE        44              /* Number of MIB Counters */
+
+/*
+ * MIB Counters base address definitions (low word) -
+ * use offset 4 for access to high word        (32 bit r/o)
+ */
+enum {
+       GM_RXF_UC_OK  = GM_MIB_CNT_BASE + 0,    /* Unicast Frames Received OK */
+       GM_RXF_BC_OK    = GM_MIB_CNT_BASE + 8,  /* Broadcast Frames Received OK */
+       GM_RXF_MPAUSE   = GM_MIB_CNT_BASE + 16, /* Pause MAC Ctrl Frames Received */
+       GM_RXF_MC_OK    = GM_MIB_CNT_BASE + 24, /* Multicast Frames Received OK */
+       GM_RXF_FCS_ERR  = GM_MIB_CNT_BASE + 32, /* Rx Frame Check Seq. Error */
+       /* GM_MIB_CNT_BASE + 40:        reserved */
+       GM_RXO_OK_LO    = GM_MIB_CNT_BASE + 48, /* Octets Received OK Low */
+       GM_RXO_OK_HI    = GM_MIB_CNT_BASE + 56, /* Octets Received OK High */
+       GM_RXO_ERR_LO   = GM_MIB_CNT_BASE + 64, /* Octets Received Invalid Low */
+       GM_RXO_ERR_HI   = GM_MIB_CNT_BASE + 72, /* Octets Received Invalid High */
+       GM_RXF_SHT      = GM_MIB_CNT_BASE + 80, /* Frames <64 Byte Received OK */
+       GM_RXE_FRAG     = GM_MIB_CNT_BASE + 88, /* Frames <64 Byte Received with FCS Err */
+       GM_RXF_64B      = GM_MIB_CNT_BASE + 96, /* 64 Byte Rx Frame */
+       GM_RXF_127B     = GM_MIB_CNT_BASE + 104,        /* 65-127 Byte Rx Frame */
+       GM_RXF_255B     = GM_MIB_CNT_BASE + 112,        /* 128-255 Byte Rx Frame */
+       GM_RXF_511B     = GM_MIB_CNT_BASE + 120,        /* 256-511 Byte Rx Frame */
+       GM_RXF_1023B    = GM_MIB_CNT_BASE + 128,        /* 512-1023 Byte Rx Frame */
+       GM_RXF_1518B    = GM_MIB_CNT_BASE + 136,        /* 1024-1518 Byte Rx Frame */
+       GM_RXF_MAX_SZ   = GM_MIB_CNT_BASE + 144,        /* 1519-MaxSize Byte Rx Frame */
+       GM_RXF_LNG_ERR  = GM_MIB_CNT_BASE + 152,        /* Rx Frame too Long Error */
+       GM_RXF_JAB_PKT  = GM_MIB_CNT_BASE + 160,        /* Rx Jabber Packet Frame */
+       /* GM_MIB_CNT_BASE + 168:       reserved */
+       GM_RXE_FIFO_OV  = GM_MIB_CNT_BASE + 176,        /* Rx FIFO overflow Event */
+       /* GM_MIB_CNT_BASE + 184:       reserved */
+       GM_TXF_UC_OK    = GM_MIB_CNT_BASE + 192,        /* Unicast Frames Xmitted OK */
+       GM_TXF_BC_OK    = GM_MIB_CNT_BASE + 200,        /* Broadcast Frames Xmitted OK */
+       GM_TXF_MPAUSE   = GM_MIB_CNT_BASE + 208,        /* Pause MAC Ctrl Frames Xmitted */
+       GM_TXF_MC_OK    = GM_MIB_CNT_BASE + 216,        /* Multicast Frames Xmitted OK */
+       GM_TXO_OK_LO    = GM_MIB_CNT_BASE + 224,        /* Octets Transmitted OK Low */
+       GM_TXO_OK_HI    = GM_MIB_CNT_BASE + 232,        /* Octets Transmitted OK High */
+       GM_TXF_64B      = GM_MIB_CNT_BASE + 240,        /* 64 Byte Tx Frame */
+       GM_TXF_127B     = GM_MIB_CNT_BASE + 248,        /* 65-127 Byte Tx Frame */
+       GM_TXF_255B     = GM_MIB_CNT_BASE + 256,        /* 128-255 Byte Tx Frame */
+       GM_TXF_511B     = GM_MIB_CNT_BASE + 264,        /* 256-511 Byte Tx Frame */
+       GM_TXF_1023B    = GM_MIB_CNT_BASE + 272,        /* 512-1023 Byte Tx Frame */
+       GM_TXF_1518B    = GM_MIB_CNT_BASE + 280,        /* 1024-1518 Byte Tx Frame */
+       GM_TXF_MAX_SZ   = GM_MIB_CNT_BASE + 288,        /* 1519-MaxSize Byte Tx Frame */
+
+       GM_TXF_COL      = GM_MIB_CNT_BASE + 304,        /* Tx Collision */
+       GM_TXF_LAT_COL  = GM_MIB_CNT_BASE + 312,        /* Tx Late Collision */
+       GM_TXF_ABO_COL  = GM_MIB_CNT_BASE + 320,        /* Tx aborted due to Exces. Col. */
+       GM_TXF_MUL_COL  = GM_MIB_CNT_BASE + 328,        /* Tx Multiple Collision */
+       GM_TXF_SNG_COL  = GM_MIB_CNT_BASE + 336,        /* Tx Single Collision */
+       GM_TXE_FIFO_UR  = GM_MIB_CNT_BASE + 344,        /* Tx FIFO Underrun Event */
+};
+
+/* GMAC Bit Definitions */
+/*     GM_GP_STAT      16 bit r/o      General Purpose Status Register */
+enum {
+       GM_GPSR_SPEED           = 1<<15, /* Bit 15:     Port Speed (1 = 100 Mbps) */
+       GM_GPSR_DUPLEX          = 1<<14, /* Bit 14:     Duplex Mode (1 = Full) */
+       GM_GPSR_FC_TX_DIS       = 1<<13, /* Bit 13:     Tx Flow-Control Mode Disabled */
+       GM_GPSR_LINK_UP         = 1<<12, /* Bit 12:     Link Up Status */
+       GM_GPSR_PAUSE           = 1<<11, /* Bit 11:     Pause State */
+       GM_GPSR_TX_ACTIVE       = 1<<10, /* Bit 10:     Tx in Progress */
+       GM_GPSR_EXC_COL         = 1<<9, /* Bit  9:      Excessive Collisions Occured */
+       GM_GPSR_LAT_COL         = 1<<8, /* Bit  8:      Late Collisions Occured */
+
+       GM_GPSR_PHY_ST_CH       = 1<<5, /* Bit  5:      PHY Status Change */
+       GM_GPSR_GIG_SPEED       = 1<<4, /* Bit  4:      Gigabit Speed (1 = 1000 Mbps) */
+       GM_GPSR_PART_MODE       = 1<<3, /* Bit  3:      Partition mode */
+       GM_GPSR_FC_RX_DIS       = 1<<2, /* Bit  2:      Rx Flow-Control Mode Disabled */
+       GM_GPSR_PROM_EN         = 1<<1, /* Bit  1:      Promiscuous Mode Enabled */
+};
+
+/*     GM_GP_CTRL      16 bit r/w      General Purpose Control Register */
+enum {
+       GM_GPCR_PROM_ENA        = 1<<14,        /* Bit 14:      Enable Promiscuous Mode */
+       GM_GPCR_FC_TX_DIS       = 1<<13, /* Bit 13:     Disable Tx Flow-Control Mode */
+       GM_GPCR_TX_ENA          = 1<<12, /* Bit 12:     Enable Transmit */
+       GM_GPCR_RX_ENA          = 1<<11, /* Bit 11:     Enable Receive */
+       GM_GPCR_BURST_ENA       = 1<<10, /* Bit 10:     Enable Burst Mode */
+       GM_GPCR_LOOP_ENA        = 1<<9, /* Bit  9:      Enable MAC Loopback Mode */
+       GM_GPCR_PART_ENA        = 1<<8, /* Bit  8:      Enable Partition Mode */
+       GM_GPCR_GIGS_ENA        = 1<<7, /* Bit  7:      Gigabit Speed (1000 Mbps) */
+       GM_GPCR_FL_PASS         = 1<<6, /* Bit  6:      Force Link Pass */
+       GM_GPCR_DUP_FULL        = 1<<5, /* Bit  5:      Full Duplex Mode */
+       GM_GPCR_FC_RX_DIS       = 1<<4, /* Bit  4:      Disable Rx Flow-Control Mode */
+       GM_GPCR_SPEED_100       = 1<<3,   /* Bit  3:    Port Speed 100 Mbps */
+       GM_GPCR_AU_DUP_DIS      = 1<<2, /* Bit  2:      Disable Auto-Update Duplex */
+       GM_GPCR_AU_FCT_DIS      = 1<<1, /* Bit  1:      Disable Auto-Update Flow-C. */
+       GM_GPCR_AU_SPD_DIS      = 1<<0, /* Bit  0:      Disable Auto-Update Speed */
+};
+
+#define GM_GPCR_SPEED_1000     (GM_GPCR_GIGS_ENA | GM_GPCR_SPEED_100)
+#define GM_GPCR_AU_ALL_DIS     (GM_GPCR_AU_DUP_DIS | GM_GPCR_AU_FCT_DIS|GM_GPCR_AU_SPD_DIS)
+
+/*     GM_TX_CTRL                      16 bit r/w      Transmit Control Register */
+enum {
+       GM_TXCR_FORCE_JAM       = 1<<15, /* Bit 15:     Force Jam / Flow-Control */
+       GM_TXCR_CRC_DIS         = 1<<14, /* Bit 14:     Disable insertion of CRC */
+       GM_TXCR_PAD_DIS         = 1<<13, /* Bit 13:     Disable padding of packets */
+       GM_TXCR_COL_THR_MSK     = 1<<10, /* Bit 12..10: Collision Threshold */
+};
+
+#define TX_COL_THR(x)          (((x)<<10) & GM_TXCR_COL_THR_MSK)
+#define TX_COL_DEF             0x04
+
+/*     GM_RX_CTRL                      16 bit r/w      Receive Control Register */
+enum {
+       GM_RXCR_UCF_ENA = 1<<15, /* Bit 15:     Enable Unicast filtering */
+       GM_RXCR_MCF_ENA = 1<<14, /* Bit 14:     Enable Multicast filtering */
+       GM_RXCR_CRC_DIS = 1<<13, /* Bit 13:     Remove 4-byte CRC */
+       GM_RXCR_PASS_FC = 1<<12, /* Bit 12:     Pass FC packets to FIFO */
+};
+
+/*     GM_TX_PARAM             16 bit r/w      Transmit Parameter Register */
+enum {
+       GM_TXPA_JAMLEN_MSK      = 0x03<<14,     /* Bit 15..14:  Jam Length */
+       GM_TXPA_JAMIPG_MSK      = 0x1f<<9,      /* Bit 13..9:   Jam IPG */
+       GM_TXPA_JAMDAT_MSK      = 0x1f<<4,      /* Bit  8..4:   IPG Jam to Data */
+       GM_TXPA_BO_LIM_MSK      = 0x0f,         /* Bit  3.. 0: Backoff Limit Mask */
+
+       TX_JAM_LEN_DEF          = 0x03,
+       TX_JAM_IPG_DEF          = 0x0b,
+       TX_IPG_JAM_DEF          = 0x1c,
+       TX_BOF_LIM_DEF          = 0x04,
+};
+
+#define TX_JAM_LEN_VAL(x)      (((x)<<14) & GM_TXPA_JAMLEN_MSK)
+#define TX_JAM_IPG_VAL(x)      (((x)<<9)  & GM_TXPA_JAMIPG_MSK)
+#define TX_IPG_JAM_DATA(x)     (((x)<<4)  & GM_TXPA_JAMDAT_MSK)
+#define TX_BACK_OFF_LIM(x)     ((x) & GM_TXPA_BO_LIM_MSK)
+
+
+/*     GM_SERIAL_MODE                  16 bit r/w      Serial Mode Register */
+enum {
+       GM_SMOD_DATABL_MSK      = 0x1f<<11, /* Bit 15..11:      Data Blinder (r/o) */
+       GM_SMOD_LIMIT_4         = 1<<10, /* Bit 10:     4 consecutive Tx trials */
+       GM_SMOD_VLAN_ENA        = 1<<9, /* Bit  9:      Enable VLAN  (Max. Frame Len) */
+       GM_SMOD_JUMBO_ENA       = 1<<8, /* Bit  8:      Enable Jumbo (Max. Frame Len) */
+        GM_SMOD_IPG_MSK        = 0x1f  /* Bit 4..0:    Inter-Packet Gap (IPG) */
+};
+
+#define DATA_BLIND_VAL(x)      (((x)<<11) & GM_SMOD_DATABL_MSK)
+#define DATA_BLIND_DEF         0x04
+
+#define IPG_DATA_VAL(x)                (x & GM_SMOD_IPG_MSK)
+#define IPG_DATA_DEF           0x1e
+
+/*     GM_SMI_CTRL                     16 bit r/w      SMI Control Register */
+enum {
+       GM_SMI_CT_PHY_A_MSK     = 0x1f<<11,/* Bit 15..11:       PHY Device Address */
+       GM_SMI_CT_REG_A_MSK     = 0x1f<<6,/* Bit 10.. 6:        PHY Register Address */
+       GM_SMI_CT_OP_RD         = 1<<5, /* Bit  5:      OpCode Read (0=Write)*/
+       GM_SMI_CT_RD_VAL        = 1<<4, /* Bit  4:      Read Valid (Read completed) */
+       GM_SMI_CT_BUSY          = 1<<3, /* Bit  3:      Busy (Operation in progress) */
+};
+
+#define GM_SMI_CT_PHY_AD(x)    (((x)<<11) & GM_SMI_CT_PHY_A_MSK)
+#define GM_SMI_CT_REG_AD(x)    (((x)<<6) & GM_SMI_CT_REG_A_MSK)
+
+/*     GM_PHY_ADDR                             16 bit r/w      GPHY Address Register */
+enum {
+       GM_PAR_MIB_CLR  = 1<<5, /* Bit  5:      Set MIB Clear Counter Mode */
+       GM_PAR_MIB_TST  = 1<<4, /* Bit  4:      MIB Load Counter (Test Mode) */
+};
+
+/* Receive Frame Status Encoding */
+enum {
+       GMR_FS_LEN      = 0xffff<<16, /* Bit 31..16:    Rx Frame Length */
+       GMR_FS_VLAN     = 1<<13, /* VLAN Packet */
+       GMR_FS_JABBER   = 1<<12, /* Jabber Packet */
+       GMR_FS_UN_SIZE  = 1<<11, /* Undersize Packet */
+       GMR_FS_MC       = 1<<10, /* Multicast Packet */
+       GMR_FS_BC       = 1<<9,  /* Broadcast Packet */
+       GMR_FS_RX_OK    = 1<<8,  /* Receive OK (Good Packet) */
+       GMR_FS_GOOD_FC  = 1<<7,  /* Good Flow-Control Packet */
+       GMR_FS_BAD_FC   = 1<<6,  /* Bad  Flow-Control Packet */
+       GMR_FS_MII_ERR  = 1<<5,  /* MII Error */
+       GMR_FS_LONG_ERR = 1<<4,  /* Too Long Packet */
+       GMR_FS_FRAGMENT = 1<<3,  /* Fragment */
+
+       GMR_FS_CRC_ERR  = 1<<1,  /* CRC Error */
+       GMR_FS_RX_FF_OV = 1<<0,  /* Rx FIFO Overflow */
+
+       GMR_FS_ANY_ERR  = GMR_FS_RX_FF_OV | GMR_FS_CRC_ERR |
+                         GMR_FS_FRAGMENT | GMR_FS_LONG_ERR |
+                         GMR_FS_MII_ERR | GMR_FS_BAD_FC | GMR_FS_GOOD_FC |
+                         GMR_FS_UN_SIZE | GMR_FS_JABBER,
+};
+
+/*     RX_GMF_CTRL_T   32 bit  Rx GMAC FIFO Control/Test */
+enum {
+       RX_TRUNC_ON     = 1<<27,        /* enable  packet truncation */
+       RX_TRUNC_OFF    = 1<<26,        /* disable packet truncation */
+       RX_VLAN_STRIP_ON = 1<<25,       /* enable  VLAN stripping */
+       RX_VLAN_STRIP_OFF = 1<<24,      /* disable VLAN stripping */
+
+       GMF_WP_TST_ON   = 1<<14,        /* Write Pointer Test On */
+       GMF_WP_TST_OFF  = 1<<13,        /* Write Pointer Test Off */
+       GMF_WP_STEP     = 1<<12,        /* Write Pointer Step/Increment */
+
+       GMF_RP_TST_ON   = 1<<10,        /* Read Pointer Test On */
+       GMF_RP_TST_OFF  = 1<<9,         /* Read Pointer Test Off */
+       GMF_RP_STEP     = 1<<8,         /* Read Pointer Step/Increment */
+       GMF_RX_F_FL_ON  = 1<<7,         /* Rx FIFO Flush Mode On */
+       GMF_RX_F_FL_OFF = 1<<6,         /* Rx FIFO Flush Mode Off */
+       GMF_CLI_RX_FO   = 1<<5,         /* Clear IRQ Rx FIFO Overrun */
+       GMF_CLI_RX_C    = 1<<4,         /* Clear IRQ Rx Frame Complete */
+
+       GMF_OPER_ON     = 1<<3,         /* Operational Mode On */
+       GMF_OPER_OFF    = 1<<2,         /* Operational Mode Off */
+       GMF_RST_CLR     = 1<<1,         /* Clear GMAC FIFO Reset */
+       GMF_RST_SET     = 1<<0,         /* Set   GMAC FIFO Reset */
+
+       RX_GMF_FL_THR_DEF = 0xa,        /* flush threshold (default) */
+
+       GMF_RX_CTRL_DEF = GMF_OPER_ON | GMF_RX_F_FL_ON,
+};
+
+
+/*     TX_GMF_CTRL_T   32 bit  Tx GMAC FIFO Control/Test */
+enum {
+       TX_STFW_DIS     = 1<<31,/* Disable Store & Forward (Yukon-EC Ultra) */
+       TX_STFW_ENA     = 1<<30,/* Enable  Store & Forward (Yukon-EC Ultra) */
+
+       TX_VLAN_TAG_ON  = 1<<25,/* enable  VLAN tagging */
+       TX_VLAN_TAG_OFF = 1<<24,/* disable VLAN tagging */
+
+       GMF_WSP_TST_ON  = 1<<18,/* Write Shadow Pointer Test On */
+       GMF_WSP_TST_OFF = 1<<17,/* Write Shadow Pointer Test Off */
+       GMF_WSP_STEP    = 1<<16,/* Write Shadow Pointer Step/Increment */
+
+       GMF_CLI_TX_FU   = 1<<6, /* Clear IRQ Tx FIFO Underrun */
+       GMF_CLI_TX_FC   = 1<<5, /* Clear IRQ Tx Frame Complete */
+       GMF_CLI_TX_PE   = 1<<4, /* Clear IRQ Tx Parity Error */
+};
+
+/*     GMAC_TI_ST_CTRL  8 bit  Time Stamp Timer Ctrl Reg (YUKON only) */
+enum {
+       GMT_ST_START    = 1<<2, /* Start Time Stamp Timer */
+       GMT_ST_STOP     = 1<<1, /* Stop  Time Stamp Timer */
+       GMT_ST_CLR_IRQ  = 1<<0, /* Clear Time Stamp Timer IRQ */
+};
+
+/* B28_Y2_ASF_STAT_CMD         32 bit  ASF Status and Command Reg */
+enum {
+       Y2_ASF_OS_PRES  = 1<<4, /* ASF operation system present */
+       Y2_ASF_RESET    = 1<<3, /* ASF system in reset state */
+       Y2_ASF_RUNNING  = 1<<2, /* ASF system operational */
+       Y2_ASF_CLR_HSTI = 1<<1, /* Clear ASF IRQ */
+       Y2_ASF_IRQ      = 1<<0, /* Issue an IRQ to ASF system */
+
+       Y2_ASF_UC_STATE = 3<<2, /* ASF uC State */
+       Y2_ASF_CLK_HALT = 0,    /* ASF system clock stopped */
+};
+
+/* B28_Y2_ASF_HOST_COM 32 bit  ASF Host Communication Reg */
+enum {
+       Y2_ASF_CLR_ASFI = 1<<1, /* Clear host IRQ */
+       Y2_ASF_HOST_IRQ = 1<<0, /* Issue an IRQ to HOST system */
+};
+
+/*     STAT_CTRL               32 bit  Status BMU control register (Yukon-2 only) */
+enum {
+       SC_STAT_CLR_IRQ = 1<<4, /* Status Burst IRQ clear */
+       SC_STAT_OP_ON   = 1<<3, /* Operational Mode On */
+       SC_STAT_OP_OFF  = 1<<2, /* Operational Mode Off */
+       SC_STAT_RST_CLR = 1<<1, /* Clear Status Unit Reset (Enable) */
+       SC_STAT_RST_SET = 1<<0, /* Set   Status Unit Reset */
+};
+
+/*     GMAC_CTRL               32 bit  GMAC Control Reg (YUKON only) */
+enum {
+       GMC_H_BURST_ON  = 1<<7, /* Half Duplex Burst Mode On */
+       GMC_H_BURST_OFF = 1<<6, /* Half Duplex Burst Mode Off */
+       GMC_F_LOOPB_ON  = 1<<5, /* FIFO Loopback On */
+       GMC_F_LOOPB_OFF = 1<<4, /* FIFO Loopback Off */
+       GMC_PAUSE_ON    = 1<<3, /* Pause On */
+       GMC_PAUSE_OFF   = 1<<2, /* Pause Off */
+       GMC_RST_CLR     = 1<<1, /* Clear GMAC Reset */
+       GMC_RST_SET     = 1<<0, /* Set   GMAC Reset */
+};
+
+/*     GPHY_CTRL               32 bit  GPHY Control Reg (YUKON only) */
+enum {
+       GPC_SEL_BDT     = 1<<28, /* Select Bi-Dir. Transfer for MDC/MDIO */
+       GPC_INT_POL_HI  = 1<<27, /* IRQ Polarity is Active HIGH */
+       GPC_75_OHM      = 1<<26, /* Use 75 Ohm Termination instead of 50 */
+       GPC_DIS_FC      = 1<<25, /* Disable Automatic Fiber/Copper Detection */
+       GPC_DIS_SLEEP   = 1<<24, /* Disable Energy Detect */
+       GPC_HWCFG_M_3   = 1<<23, /* HWCFG_MODE[3] */
+       GPC_HWCFG_M_2   = 1<<22, /* HWCFG_MODE[2] */
+       GPC_HWCFG_M_1   = 1<<21, /* HWCFG_MODE[1] */
+       GPC_HWCFG_M_0   = 1<<20, /* HWCFG_MODE[0] */
+       GPC_ANEG_0      = 1<<19, /* ANEG[0] */
+       GPC_ENA_XC      = 1<<18, /* Enable MDI crossover */
+       GPC_DIS_125     = 1<<17, /* Disable 125 MHz clock */
+       GPC_ANEG_3      = 1<<16, /* ANEG[3] */
+       GPC_ANEG_2      = 1<<15, /* ANEG[2] */
+       GPC_ANEG_1      = 1<<14, /* ANEG[1] */
+       GPC_ENA_PAUSE   = 1<<13, /* Enable Pause (SYM_OR_REM) */
+       GPC_PHYADDR_4   = 1<<12, /* Bit 4 of Phy Addr */
+       GPC_PHYADDR_3   = 1<<11, /* Bit 3 of Phy Addr */
+       GPC_PHYADDR_2   = 1<<10, /* Bit 2 of Phy Addr */
+       GPC_PHYADDR_1   = 1<<9,  /* Bit 1 of Phy Addr */
+       GPC_PHYADDR_0   = 1<<8,  /* Bit 0 of Phy Addr */
+                                               /* Bits  7..2:  reserved */
+       GPC_RST_CLR     = 1<<1, /* Clear GPHY Reset */
+       GPC_RST_SET     = 1<<0, /* Set   GPHY Reset */
+};
+
+/*     GMAC_IRQ_SRC     8 bit  GMAC Interrupt Source Reg (YUKON only) */
+/*     GMAC_IRQ_MSK     8 bit  GMAC Interrupt Mask   Reg (YUKON only) */
+enum {
+       GM_IS_TX_CO_OV  = 1<<5, /* Transmit Counter Overflow IRQ */
+       GM_IS_RX_CO_OV  = 1<<4, /* Receive Counter Overflow IRQ */
+       GM_IS_TX_FF_UR  = 1<<3, /* Transmit FIFO Underrun */
+       GM_IS_TX_COMPL  = 1<<2, /* Frame Transmission Complete */
+       GM_IS_RX_FF_OR  = 1<<1, /* Receive FIFO Overrun */
+       GM_IS_RX_COMPL  = 1<<0, /* Frame Reception Complete */
+
+#define GMAC_DEF_MSK     GM_IS_TX_FF_UR
+
+/*     GMAC_LINK_CTRL  16 bit  GMAC Link Control Reg (YUKON only) */
+                                               /* Bits 15.. 2: reserved */
+       GMLC_RST_CLR    = 1<<1, /* Clear GMAC Link Reset */
+       GMLC_RST_SET    = 1<<0, /* Set   GMAC Link Reset */
+
+
+/*     WOL_CTRL_STAT   16 bit  WOL Control/Status Reg */
+       WOL_CTL_LINK_CHG_OCC            = 1<<15,
+       WOL_CTL_MAGIC_PKT_OCC           = 1<<14,
+       WOL_CTL_PATTERN_OCC             = 1<<13,
+       WOL_CTL_CLEAR_RESULT            = 1<<12,
+       WOL_CTL_ENA_PME_ON_LINK_CHG     = 1<<11,
+       WOL_CTL_DIS_PME_ON_LINK_CHG     = 1<<10,
+       WOL_CTL_ENA_PME_ON_MAGIC_PKT    = 1<<9,
+       WOL_CTL_DIS_PME_ON_MAGIC_PKT    = 1<<8,
+       WOL_CTL_ENA_PME_ON_PATTERN      = 1<<7,
+       WOL_CTL_DIS_PME_ON_PATTERN      = 1<<6,
+       WOL_CTL_ENA_LINK_CHG_UNIT       = 1<<5,
+       WOL_CTL_DIS_LINK_CHG_UNIT       = 1<<4,
+       WOL_CTL_ENA_MAGIC_PKT_UNIT      = 1<<3,
+       WOL_CTL_DIS_MAGIC_PKT_UNIT      = 1<<2,
+       WOL_CTL_ENA_PATTERN_UNIT        = 1<<1,
+       WOL_CTL_DIS_PATTERN_UNIT        = 1<<0,
+};
+
+#define WOL_CTL_DEFAULT                                \
+       (WOL_CTL_DIS_PME_ON_LINK_CHG |  \
+       WOL_CTL_DIS_PME_ON_PATTERN |    \
+       WOL_CTL_DIS_PME_ON_MAGIC_PKT |  \
+       WOL_CTL_DIS_LINK_CHG_UNIT |             \
+       WOL_CTL_DIS_PATTERN_UNIT |              \
+       WOL_CTL_DIS_MAGIC_PKT_UNIT)
+
+/*     WOL_MATCH_CTL    8 bit  WOL Match Control Reg */
+#define WOL_CTL_PATT_ENA(x)    (1 << (x))
+
+
+/* Control flags */
+enum {
+       UDPTCP  = 1<<0,
+       CALSUM  = 1<<1,
+       WR_SUM  = 1<<2,
+       INIT_SUM= 1<<3,
+       LOCK_SUM= 1<<4,
+       INS_VLAN= 1<<5,
+       FRC_STAT= 1<<6,
+       EOP     = 1<<7,
+};
+
+enum {
+       HW_OWNER        = 1<<7,
+       OP_TCPWRITE     = 0x11,
+       OP_TCPSTART     = 0x12,
+       OP_TCPINIT      = 0x14,
+       OP_TCPLCK       = 0x18,
+       OP_TCPCHKSUM    = OP_TCPSTART,
+       OP_TCPIS        = OP_TCPINIT | OP_TCPSTART,
+       OP_TCPLW        = OP_TCPLCK | OP_TCPWRITE,
+       OP_TCPLSW       = OP_TCPLCK | OP_TCPSTART | OP_TCPWRITE,
+       OP_TCPLISW      = OP_TCPLCK | OP_TCPINIT | OP_TCPSTART | OP_TCPWRITE,
+
+       OP_ADDR64       = 0x21,
+       OP_VLAN         = 0x22,
+       OP_ADDR64VLAN   = OP_ADDR64 | OP_VLAN,
+       OP_LRGLEN       = 0x24,
+       OP_LRGLENVLAN   = OP_LRGLEN | OP_VLAN,
+       OP_BUFFER       = 0x40,
+       OP_PACKET       = 0x41,
+       OP_LARGESEND    = 0x43,
+
+/* YUKON-2 STATUS opcodes defines */
+       OP_RXSTAT       = 0x60,
+       OP_RXTIMESTAMP  = 0x61,
+       OP_RXVLAN       = 0x62,
+       OP_RXCHKS       = 0x64,
+       OP_RXCHKSVLAN   = OP_RXCHKS | OP_RXVLAN,
+       OP_RXTIMEVLAN   = OP_RXTIMESTAMP | OP_RXVLAN,
+       OP_RSS_HASH     = 0x65,
+       OP_TXINDEXLE    = 0x68,
+};
+
+/* Yukon 2 hardware interface
+ * Not tested on big endian
+ */
+struct sky2_tx_le {
+       union {
+               __le32  addr;
+               struct {
+                       __le16  offset;
+                       __le16  start;
+               } csum  __attribute((packed));
+               struct {
+                       __le16  size;
+                       __le16  rsvd;
+               } tso  __attribute((packed));
+       } tx;
+       __le16  length; /* also vlan tag or checksum start */
+       u8      ctrl;
+       u8      opcode;
+} __attribute((packed));
+
+struct sky2_rx_le {
+       __le32  addr;
+       __le16  length;
+       u8      ctrl;
+       u8      opcode;
+} __attribute((packed));;
+
+struct sky2_status_le {
+       __le32  status; /* also checksum */
+       __le16  length; /* also vlan tag */
+       u8      link;
+       u8      opcode;
+} __attribute((packed));
+
+struct tx_ring_info {
+       struct sk_buff  *skb;
+       DECLARE_PCI_UNMAP_ADDR(mapaddr);
+       u16             idx;
+};
+
+struct ring_info {
+       struct sk_buff  *skb;
+       dma_addr_t      mapaddr;
+};
+
+struct sky2_port {
+       struct sky2_hw       *hw;
+       struct net_device    *netdev;
+       unsigned             port;
+       u32                  msg_enable;
+
+       spinlock_t           tx_lock  ____cacheline_aligned_in_smp;
+       struct tx_ring_info  *tx_ring;
+       struct sky2_tx_le    *tx_le;
+       u16                  tx_cons;           /* next le to check */
+       u16                  tx_prod;           /* next le to use */
+       u32                  tx_addr64;
+       u16                  tx_pending;
+       u16                  tx_last_put;
+       u16                  tx_last_mss;
+
+       struct ring_info     *rx_ring ____cacheline_aligned_in_smp;
+       struct sky2_rx_le    *rx_le;
+       u32                  rx_addr64;
+       u16                  rx_next;           /* next re to check */
+       u16                  rx_put;            /* next le index to use */
+       u16                  rx_pending;
+       u16                  rx_last_put;
+       u16                  rx_bufsize;
+#ifdef SKY2_VLAN_TAG_USED
+       u16                  rx_tag;
+       struct vlan_group    *vlgrp;
+#endif
+
+       dma_addr_t           rx_le_map;
+       dma_addr_t           tx_le_map;
+       u32                  advertising;       /* ADVERTISED_ bits */
+       u16                  speed;     /* SPEED_1000, SPEED_100, ... */
+       u8                   autoneg;   /* AUTONEG_ENABLE, AUTONEG_DISABLE */
+       u8                   duplex;    /* DUPLEX_HALF, DUPLEX_FULL */
+       u8                   rx_pause;
+       u8                   tx_pause;
+       u8                   rx_csum;
+       u8                   wol;
+
+       struct net_device_stats net_stats;
+
+       struct work_struct   phy_task;
+       struct semaphore     phy_sema;
+};
+
+struct sky2_hw {
+       void __iomem         *regs;
+       struct pci_dev       *pdev;
+       u32                  intr_mask;
+       struct net_device    *dev[2];
+
+       int                  pm_cap;
+       u8                   chip_id;
+       u8                   chip_rev;
+       u8                   copper;
+       u8                   ports;
+
+       struct sky2_status_le *st_le;
+       u32                  st_idx;
+       dma_addr_t           st_dma;
+};
+
+/* Register accessor for memory mapped device */
+static inline u32 sky2_read32(const struct sky2_hw *hw, unsigned reg)
+{
+       return readl(hw->regs + reg);
+}
+
+static inline u16 sky2_read16(const struct sky2_hw *hw, unsigned reg)
+{
+       return readw(hw->regs + reg);
+}
+
+static inline u8 sky2_read8(const struct sky2_hw *hw, unsigned reg)
+{
+       return readb(hw->regs + reg);
+}
+
+/* This should probably go away, bus based tweeks suck */
+static inline int is_pciex(const struct sky2_hw *hw)
+{
+       u32 status;
+       pci_read_config_dword(hw->pdev, PCI_DEV_STATUS, &status);
+       return (status & PCI_OS_PCI_X) == 0;
+}
+
+static inline void sky2_write32(const struct sky2_hw *hw, unsigned reg, u32 val)
+{
+       writel(val, hw->regs + reg);
+}
+
+static inline void sky2_write16(const struct sky2_hw *hw, unsigned reg, u16 val)
+{
+       writew(val, hw->regs + reg);
+}
+
+static inline void sky2_write8(const struct sky2_hw *hw, unsigned reg, u8 val)
+{
+       writeb(val, hw->regs + reg);
+}
+
+/* Yukon PHY related registers */
+#define SK_GMAC_REG(port,reg) \
+       (BASE_GMAC_1 + (port) * (BASE_GMAC_2-BASE_GMAC_1) + (reg))
+#define GM_PHY_RETRIES 100
+
+static inline u16 gma_read16(const struct sky2_hw *hw, unsigned port, unsigned reg)
+{
+       return sky2_read16(hw, SK_GMAC_REG(port,reg));
+}
+
+static inline u32 gma_read32(struct sky2_hw *hw, unsigned port, unsigned reg)
+{
+       unsigned base = SK_GMAC_REG(port, reg);
+       return (u32) sky2_read16(hw, base)
+               | (u32) sky2_read16(hw, base+4) << 16;
+}
+
+static inline void gma_write16(const struct sky2_hw *hw, unsigned port, int r, u16 v)
+{
+       sky2_write16(hw, SK_GMAC_REG(port,r), v);
+}
+
+static inline void gma_set_addr(struct sky2_hw *hw, unsigned port, unsigned reg,
+                                   const u8 *addr)
+{
+       gma_write16(hw, port, reg,  (u16) addr[0] | ((u16) addr[1] << 8));
+       gma_write16(hw, port, reg+4,(u16) addr[2] | ((u16) addr[3] << 8));
+       gma_write16(hw, port, reg+8,(u16) addr[4] | ((u16) addr[5] << 8));
+}
+#endif
index 1828a6bf845829267475b6e8e0bacee6f735dbd4..47bd4a39442099bfa5640b79781b4438afeb7563 100644 (file)
@@ -68,8 +68,8 @@
 
 #define DRV_MODULE_NAME                "tg3"
 #define PFX DRV_MODULE_NAME    ": "
-#define DRV_MODULE_VERSION     "3.43"
-#define DRV_MODULE_RELDATE     "Oct 24, 2005"
+#define DRV_MODULE_VERSION     "3.44"
+#define DRV_MODULE_RELDATE     "Dec 6, 2005"
 
 #define TG3_DEF_MAC_MODE       0
 #define TG3_DEF_RX_MODE                0
@@ -3565,12 +3565,15 @@ static int tg3_start_xmit(struct sk_buff *skb, struct net_device *dev)
        if (!spin_trylock(&tp->tx_lock))
                return NETDEV_TX_LOCKED; 
 
-       /* This is a hard error, log it. */
        if (unlikely(TX_BUFFS_AVAIL(tp) <= (skb_shinfo(skb)->nr_frags + 1))) {
-               netif_stop_queue(dev);
+               if (!netif_queue_stopped(dev)) {
+                       netif_stop_queue(dev);
+
+                       /* This is a hard error, log it. */
+                       printk(KERN_ERR PFX "%s: BUG! Tx Ring full when "
+                              "queue awake!\n", dev->name);
+               }
                spin_unlock(&tp->tx_lock);
-               printk(KERN_ERR PFX "%s: BUG! Tx Ring full when queue awake!\n",
-                      dev->name);
                return NETDEV_TX_BUSY;
        }
 
diff --git a/drivers/net/wan/lmc/lmc_prot.h b/drivers/net/wan/lmc/lmc_prot.h
deleted file mode 100644 (file)
index f3b1df9..0000000
+++ /dev/null
@@ -1,15 +0,0 @@
-#ifndef _LMC_PROTO_H_
-#define _LMC_PROTO_H_
-
-void lmc_proto_init(lmc_softc_t * const)
-void lmc_proto_attach(lmc_softc_t *sc const)
-void lmc_proto_detach(lmc_softc *sc const)
-void lmc_proto_reopen(lmc_softc_t *sc const)
-int lmc_proto_ioctl(lmc_softc_t *sc const, struct ifreq *ifr, int cmd)
-void lmc_proto_open(lmc_softc_t *sc const)
-void lmc_proto_close(lmc_softc_t *sc const)
-unsigned short lmc_proto_type(lmc_softc_t *sc const, struct skbuff *skb)
-
-
-#endif
-
index 00e55165b760506fe7e1f21c3aaf4197e3e3a3b8..24f7967aab67218f8f68fd1cdeae19a47183b3e1 100644 (file)
@@ -173,7 +173,7 @@ config IPW2100_MONITOR
          promiscuous mode via the Wireless Tool's Monitor mode.  While in this
          mode, no packets can be sent.
 
-config IPW_DEBUG
+config IPW2100_DEBUG
        bool "Enable full debugging output in IPW2100 module."
        depends on IPW2100
        ---help---
@@ -192,7 +192,7 @@ config IPW_DEBUG
 
 config IPW2200
        tristate "Intel PRO/Wireless 2200BG and 2915ABG Network Connection"
-       depends on IEEE80211 && PCI
+       depends on NET_RADIO && IEEE80211 && PCI
        select FW_LOADER
        ---help---
           A driver for the Intel PRO/Wireless 2200BG and 2915ABG Network
@@ -217,7 +217,7 @@ config IPW2200
           say M here and read <file:Documentation/modules.txt>.  The module
           will be called ipw2200.ko.
 
-config IPW_DEBUG
+config IPW2200_DEBUG
        bool "Enable full debugging output in IPW2200 module."
        depends on IPW2200
        ---help---
index 7a92b1cbd6aadf80f8aaef65df9e930df82da984..ee866fd6957de2cf9ed0f3b75a9ca37971c4534b 100644 (file)
@@ -4037,7 +4037,7 @@ static int PC4500_writerid(struct airo_info *ai, u16 rid,
                Cmd cmd;
                Resp rsp;
 
-               if (test_bit(FLAG_ENABLED, &ai->flags))
+               if (test_bit(FLAG_ENABLED, &ai->flags) && (RID_WEP_TEMP != rid))
                        printk(KERN_ERR
                                "%s: MAC should be disabled (rid=%04x)\n",
                                __FUNCTION__, rid);
@@ -5093,9 +5093,9 @@ static int set_wep_key(struct airo_info *ai, u16 index,
                printk(KERN_INFO "Setting key %d\n", index);
        }
 
-       disable_MAC(ai, lock);
+       if (perm) disable_MAC(ai, lock);
        writeWepKeyRid(ai, &wkr, perm, lock);
-       enable_MAC(ai, &rsp, lock);
+       if (perm) enable_MAC(ai, &rsp, lock);
        return 0;
 }
 
@@ -6170,6 +6170,8 @@ static int airo_set_encode(struct net_device *dev,
 {
        struct airo_info *local = dev->priv;
        CapabilityRid cap_rid;          /* Card capability info */
+       int perm = ( dwrq->flags & IW_ENCODE_TEMP ? 0 : 1 );
+       u16 currentAuthType = local->config.authType;
 
        /* Is WEP supported ? */
        readCapabilityRid(local, &cap_rid, 1);
@@ -6212,7 +6214,7 @@ static int airo_set_encode(struct net_device *dev,
                        /* Copy the key in the driver */
                        memcpy(key.key, extra, dwrq->length);
                        /* Send the key to the card */
-                       set_wep_key(local, index, key.key, key.len, 1, 1);
+                       set_wep_key(local, index, key.key, key.len, perm, 1);
                }
                /* WE specify that if a valid key is set, encryption
                 * should be enabled (user may turn it off later)
@@ -6220,13 +6222,12 @@ static int airo_set_encode(struct net_device *dev,
                if((index == current_index) && (key.len > 0) &&
                   (local->config.authType == AUTH_OPEN)) {
                        local->config.authType = AUTH_ENCRYPT;
-                       set_bit (FLAG_COMMIT, &local->flags);
                }
        } else {
                /* Do we want to just set the transmit key index ? */
                int index = (dwrq->flags & IW_ENCODE_INDEX) - 1;
                if ((index >= 0) && (index < ((cap_rid.softCap & 0x80)?4:1))) {
-                       set_wep_key(local, index, NULL, 0, 1, 1);
+                       set_wep_key(local, index, NULL, 0, perm, 1);
                } else
                        /* Don't complain if only change the mode */
                        if(!dwrq->flags & IW_ENCODE_MODE) {
@@ -6241,7 +6242,7 @@ static int airo_set_encode(struct net_device *dev,
        if(dwrq->flags & IW_ENCODE_OPEN)
                local->config.authType = AUTH_ENCRYPT;  // Only Wep
        /* Commit the changes to flags if needed */
-       if(dwrq->flags & IW_ENCODE_MODE)
+       if (local->config.authType != currentAuthType)
                set_bit (FLAG_COMMIT, &local->flags);
        return -EINPROGRESS;            /* Call commit handler */
 }
index 5e53c5258a33e82933f92e2fe8e04a6698eb2465..e4729ddf29fd652b023601d1f523affd6aa88e53 100644 (file)
@@ -5,9 +5,9 @@
         Copyright 2000-2001 ATMEL Corporation.
         Copyright 2003-2004 Simon Kelley.
 
-    This code was developed from version 2.1.1 of the Atmel drivers, 
-    released by Atmel corp. under the GPL in December 2002. It also 
-    includes code from the Linux aironet drivers (C) Benjamin Reed, 
+    This code was developed from version 2.1.1 of the Atmel drivers,
+    released by Atmel corp. under the GPL in December 2002. It also
+    includes code from the Linux aironet drivers (C) Benjamin Reed,
     and the Linux PCMCIA package, (C) David Hinds and the Linux wireless
     extensions, (C) Jean Tourrilhes.
 
@@ -31,7 +31,7 @@
     along with Atmel wireless lan drivers; if not, write to the Free Software
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
-    For all queries about this code, please contact the current author, 
+    For all queries about this code, please contact the current author,
     Simon Kelley <simon@thekelleys.org.uk> and not Atmel Corporation.
 
     Credit is due to HP UK and Cambridge Online Systems Ltd for supplying
@@ -79,13 +79,13 @@ MODULE_DESCRIPTION("Support for Atmel at76c50x 802.11 wireless ethernet cards.")
 MODULE_LICENSE("GPL");
 MODULE_SUPPORTED_DEVICE("Atmel at76c50x wireless cards");
 
-/* The name of the firmware file to be loaded 
+/* The name of the firmware file to be loaded
    over-rides any automatic selection */
 static char *firmware = NULL;
 module_param(firmware, charp, 0);
 
 /* table of firmware file names */
-static struct { 
+static struct {
        AtmelFWType fw_type;
        const char *fw_file;
        const char *fw_file_ext;
@@ -104,17 +104,17 @@ static struct {
 #define MAX_SSID_LENGTH 32
 #define MGMT_JIFFIES (256 * HZ / 100)
 
-#define MAX_BSS_ENTRIES        64      
+#define MAX_BSS_ENTRIES        64
 
 /* registers */
-#define GCR  0x00    //      (SIR0)  General Configuration Register        
-#define BSR  0x02    //      (SIR1)  Bank Switching Select Register 
+#define GCR  0x00    //      (SIR0)  General Configuration Register
+#define BSR  0x02    //      (SIR1)  Bank Switching Select Register
 #define AR   0x04
 #define DR   0x08
-#define MR1  0x12    //      Mirror Register 1                  
-#define MR2  0x14    //      Mirror Register 2  
-#define MR3  0x16    //      Mirror Register 3  
-#define MR4  0x18    //      Mirror Register 4   
+#define MR1  0x12    //      Mirror Register 1
+#define MR2  0x14    //      Mirror Register 2
+#define MR3  0x16    //      Mirror Register 3
+#define MR4  0x18    //      Mirror Register 4
 
 #define GPR1                            0x0c
 #define GPR2                            0x0e
@@ -123,9 +123,9 @@ static struct {
 // Constants for the GCR register.
 //
 #define GCR_REMAP     0x0400          // Remap internal SRAM to 0
-#define GCR_SWRES     0x0080          // BIU reset (ARM and PAI are NOT reset) 
+#define GCR_SWRES     0x0080          // BIU reset (ARM and PAI are NOT reset)
 #define GCR_CORES     0x0060          // Core Reset (ARM and PAI are reset)
-#define GCR_ENINT     0x0002          // Enable Interrupts    
+#define GCR_ENINT     0x0002          // Enable Interrupts
 #define GCR_ACKINT    0x0008          // Acknowledge Interrupts
 
 #define BSS_SRAM      0x0200          // AMBA module selection --> SRAM
@@ -190,7 +190,7 @@ struct rx_desc {
         u32          Next;
         u16          MsduPos;
         u16          MsduSize;
-       
+
         u8           State;
         u8           Status;
         u8           Rate;
@@ -199,7 +199,6 @@ struct rx_desc {
         u8           PreambleType;
         u16          Duration;
         u32          RxTime;
-
 };
 
 #define RX_DESC_FLAG_VALID       0x80
@@ -218,16 +217,15 @@ struct rx_desc {
 #define RX_DESC_DURATION_OFFSET      14
 #define RX_DESC_RX_TIME_OFFSET       16
 
-
 struct tx_desc {
        u32       NextDescriptor;
        u16       TxStartOfFrame;
        u16       TxLength;
-       
+
        u8        TxState;
        u8        TxStatus;
        u8        RetryCount;
-       
+
        u8        TxRate;
 
        u8        KeyIndex;
@@ -238,10 +236,8 @@ struct tx_desc {
        u8        Reserved;
        u8        PacketType;
        u16       HostTxLength;
-       
 };
 
-
 #define TX_DESC_NEXT_OFFSET          0
 #define TX_DESC_POS_OFFSET           4
 #define TX_DESC_SIZE_OFFSET          6
@@ -255,8 +251,6 @@ struct tx_desc {
 #define TX_DESC_PACKET_TYPE_OFFSET   17
 #define TX_DESC_HOST_LENGTH_OFFSET   18
 
-
-
 ///////////////////////////////////////////////////////
 // Host-MAC interface
 ///////////////////////////////////////////////////////
@@ -266,7 +260,6 @@ struct tx_desc {
 #define TX_FIRM_OWN             0x80
 #define TX_DONE                 0x40
 
-
 #define TX_ERROR                0x01
 
 #define TX_PACKET_TYPE_DATA     0x01
@@ -280,8 +273,7 @@ struct tx_desc {
 #define ISR_COMMAND_COMPLETE    0x10        // command completed
 #define ISR_OUT_OF_RANGE        0x20        // command completed
 #define ISR_IBSS_MERGE          0x40        // (4.1.2.30): IBSS merge
-#define ISR_GENERIC_IRQ         0x80                
-
+#define ISR_GENERIC_IRQ         0x80
 
 #define Local_Mib_Type          0x01
 #define Mac_Address_Mib_Type    0x02
@@ -317,7 +309,6 @@ struct tx_desc {
 #define LOCAL_MIB_PREAMBLE_TYPE               9
 #define MAC_ADDR_MIB_MAC_ADDR_POS             0
 
-
 #define         CMD_Set_MIB_Vars              0x01
 #define         CMD_Get_MIB_Vars              0x02
 #define         CMD_Scan                      0x03
@@ -338,7 +329,6 @@ struct tx_desc {
 #define         CMD_STATUS_HOST_ERROR             0xFF
 #define         CMD_STATUS_BUSY                   0xFE
 
-
 #define CMD_BLOCK_COMMAND_OFFSET        0
 #define CMD_BLOCK_STATUS_OFFSET         1
 #define CMD_BLOCK_PARAMETERS_OFFSET     4
@@ -347,15 +337,15 @@ struct tx_desc {
 
 #define MGMT_FRAME_BODY_OFFSET         24
 #define MAX_AUTHENTICATION_RETRIES     3
-#define MAX_ASSOCIATION_RETRIES        3
+#define MAX_ASSOCIATION_RETRIES                3
 
 #define AUTHENTICATION_RESPONSE_TIME_OUT  1000
 
 #define MAX_WIRELESS_BODY  2316 /* mtu is 2312, CRC is 4 */
 #define LOOP_RETRY_LIMIT   500000
 
-#define ACTIVE_MODE    1
-#define PS_MODE        2
+#define ACTIVE_MODE    1
+#define PS_MODE                2
 
 #define MAX_ENCRYPTION_KEYS 4
 #define MAX_ENCRYPTION_KEY_SIZE 40
@@ -377,7 +367,7 @@ struct tx_desc {
 #define REG_DOMAIN_MKK1                0x41    //Channel       1-14    Japan(MKK1)
 #define REG_DOMAIN_ISRAEL      0x50    //Channel       3-9     ISRAEL
 
-#define BSS_TYPE_AD_HOC        1
+#define BSS_TYPE_AD_HOC                1
 #define BSS_TYPE_INFRASTRUCTURE 2
 
 #define SCAN_TYPE_ACTIVE       0
@@ -389,7 +379,7 @@ struct tx_desc {
 
 #define DATA_FRAME_WS_HEADER_SIZE   30
 
-/* promiscuous mode control */ 
+/* promiscuous mode control */
 #define PROM_MODE_OFF                  0x0
 #define PROM_MODE_UNKNOWN              0x1
 #define PROM_MODE_CRC_FAILED           0x2
@@ -398,8 +388,7 @@ struct tx_desc {
 #define PROM_MODE_CTRL                 0x10
 #define PROM_MODE_BAD_PROTOCOL         0x20
 
-
-#define IFACE_INT_STATUS_OFFSET        0
+#define IFACE_INT_STATUS_OFFSET                0
 #define IFACE_INT_MASK_OFFSET          1
 #define IFACE_LOCKOUT_HOST_OFFSET      2
 #define IFACE_LOCKOUT_MAC_OFFSET       3
@@ -407,7 +396,7 @@ struct tx_desc {
 #define IFACE_MAC_STAT_OFFSET          30
 #define IFACE_GENERIC_INT_TYPE_OFFSET  32
 
-#define CIPHER_SUITE_NONE     0 
+#define CIPHER_SUITE_NONE     0
 #define CIPHER_SUITE_WEP_64   1
 #define CIPHER_SUITE_TKIP     2
 #define CIPHER_SUITE_AES      3
@@ -419,11 +408,11 @@ struct tx_desc {
 //
 //
 
-// FuncCtrl field: 
+// FuncCtrl field:
 //
 #define FUNC_CTRL_TxENABLE             0x10
 #define FUNC_CTRL_RxENABLE             0x20
-#define FUNC_CTRL_INIT_COMPLETE        0x01
+#define FUNC_CTRL_INIT_COMPLETE                0x01
 
 /* A stub firmware image which reads the MAC address from NVRAM on the card.
    For copyright information and source see the end of this file. */
@@ -486,10 +475,10 @@ struct atmel_private {
        struct net_device_stats stats;  // device stats
        spinlock_t irqlock, timerlock;  // spinlocks
        enum { BUS_TYPE_PCCARD, BUS_TYPE_PCI } bus_type;
-       enum { 
-               CARD_TYPE_PARALLEL_FLASH, 
+       enum {
+               CARD_TYPE_PARALLEL_FLASH,
                CARD_TYPE_SPI_FLASH,
-               CARD_TYPE_EEPROM 
+               CARD_TYPE_EEPROM
        } card_type;
        int do_rx_crc; /* If we need to CRC incoming packets */
        int probe_crc; /* set if we don't yet know */
@@ -497,18 +486,18 @@ struct atmel_private {
        u16 rx_desc_head;
        u16 tx_desc_free, tx_desc_head, tx_desc_tail, tx_desc_previous;
        u16 tx_free_mem, tx_buff_head, tx_buff_tail;
-       
+
        u16 frag_seq, frag_len, frag_no;
-       u8 frag_source[6]; 
-       
+       u8 frag_source[6];
+
        u8 wep_is_on, default_key, exclude_unencrypted, encryption_level;
        u8 group_cipher_suite, pairwise_cipher_suite;
        u8 wep_keys[MAX_ENCRYPTION_KEYS][MAX_ENCRYPTION_KEY_SIZE];
-       int wep_key_len[MAX_ENCRYPTION_KEYS]; 
+       int wep_key_len[MAX_ENCRYPTION_KEYS];
        int use_wpa, radio_on_broken; /* firmware dependent stuff. */
 
        u16 host_info_base;
-       struct host_info_struct { 
+       struct host_info_struct {
                /* NB this is matched to the hardware, don't change. */
                u8 volatile int_status;
                u8 volatile int_mask;
@@ -524,20 +513,20 @@ struct atmel_private {
                u16 rx_buff_size;
                u16 rx_desc_pos;
                u16 rx_desc_count;
-               
+
                u16 build_version;
-               u16 command_pos;        
-               
+               u16 command_pos;
+
                u16 major_version;
                u16 minor_version;
-               
+
                u16 func_ctrl;
                u16 mac_status;
                u16 generic_IRQ_type;
                u8  reserved[2];
        } host_info;
 
-       enum { 
+       enum {
                STATION_STATE_SCANNING,
                STATION_STATE_JOINNING,
                STATION_STATE_AUTHENTICATING,
@@ -547,7 +536,7 @@ struct atmel_private {
                STATION_STATE_DOWN,
                STATION_STATE_MGMT_ERROR
        } station_state;
-       
+
        int operating_mode, power_mode;
        time_t last_qual;
        int beacons_this_sec;
@@ -560,18 +549,18 @@ struct atmel_private {
        int long_retry, short_retry;
        int preamble;
        int default_beacon_period, beacon_period, listen_interval;
-       int CurrentAuthentTransactionSeqNum, ExpectedAuthentTransactionSeqNum;  
+       int CurrentAuthentTransactionSeqNum, ExpectedAuthentTransactionSeqNum;
        int AuthenticationRequestRetryCnt, AssociationRequestRetryCnt, ReAssociationRequestRetryCnt;
        enum {
                SITE_SURVEY_IDLE,
                SITE_SURVEY_IN_PROGRESS,
-               SITE_SURVEY_COMPLETED 
+               SITE_SURVEY_COMPLETED
        } site_survey_state;
        time_t last_survey;
 
        int station_was_associated, station_is_associated;
        int fast_scan;
-                               
+
        struct bss_info {
                int channel;
                int SSIDsize;
@@ -584,13 +573,12 @@ struct atmel_private {
                u8 SSID[MAX_SSID_LENGTH];
        } BSSinfo[MAX_BSS_ENTRIES];
        int BSS_list_entries, current_BSS;
-       int connect_to_any_BSS; 
+       int connect_to_any_BSS;
        int SSID_size, new_SSID_size;
        u8 CurrentBSSID[6], BSSID[6];
        u8 SSID[MAX_SSID_LENGTH], new_SSID[MAX_SSID_LENGTH];
        u64 last_beacon_timestamp;
        u8 rx_buf[MAX_WIRELESS_BODY];
-       
 };
 
 static u8 atmel_basic_rates[4] = {0x82,0x84,0x0b,0x16};
@@ -598,39 +586,49 @@ static u8 atmel_basic_rates[4] = {0x82,0x84,0x0b,0x16};
 static const struct {
        int reg_domain;
        int min, max;
-       char *name; 
+       char *name;
 } channel_table[] = { { REG_DOMAIN_FCC, 1, 11, "USA" },
                      { REG_DOMAIN_DOC, 1, 11, "Canada" },
                      { REG_DOMAIN_ETSI, 1, 13, "Europe" },
                      { REG_DOMAIN_SPAIN, 10, 11, "Spain" },
-                     { REG_DOMAIN_FRANCE, 10, 13, "France" }, 
+                     { REG_DOMAIN_FRANCE, 10, 13, "France" },
                      { REG_DOMAIN_MKK, 14, 14, "MKK" },
                      { REG_DOMAIN_MKK1, 1, 14, "MKK1" },
                      { REG_DOMAIN_ISRAEL, 3, 9, "Israel"} };
 
 static void build_wpa_mib(struct atmel_private *priv);
 static int atmel_ioctl(struct net_device *dev, struct ifreq *rq, int cmd);
-static void atmel_copy_to_card(struct net_device *dev, u16 dest, unsigned char *src, u16 len);
-static void atmel_copy_to_host(struct net_device *dev, unsigned char *dest, u16 src, u16 len);
+static void atmel_copy_to_card(struct net_device *dev, u16 dest,
+                              unsigned char *src, u16 len);
+static void atmel_copy_to_host(struct net_device *dev, unsigned char *dest,
+                              u16 src, u16 len);
 static void atmel_set_gcr(struct net_device *dev, u16 mask);
 static void atmel_clear_gcr(struct net_device *dev, u16 mask);
 static int atmel_lock_mac(struct atmel_private *priv);
 static void atmel_wmem32(struct atmel_private *priv, u16 pos, u32 data);
 static void atmel_command_irq(struct atmel_private *priv);
 static int atmel_validate_channel(struct atmel_private *priv, int channel);
-static void atmel_management_frame(struct atmel_private *priv, struct ieee80211_hdr_4addr *header, 
+static void atmel_management_frame(struct atmel_private *priv,
+                                  struct ieee80211_hdr_4addr *header,
                                   u16 frame_len, u8 rssi);
 static void atmel_management_timer(u_long a);
-static void atmel_send_command(struct atmel_private *priv, int command, void *cmd, int cmd_size);
-static int atmel_send_command_wait(struct atmel_private *priv, int command, void *cmd, int cmd_size);
-static void atmel_transmit_management_frame(struct atmel_private *priv, struct ieee80211_hdr_4addr *header,
+static void atmel_send_command(struct atmel_private *priv, int command,
+                              void *cmd, int cmd_size);
+static int atmel_send_command_wait(struct atmel_private *priv, int command,
+                                  void *cmd, int cmd_size);
+static void atmel_transmit_management_frame(struct atmel_private *priv,
+                                           struct ieee80211_hdr_4addr *header,
                                            u8 *body, int body_len);
 
 static u8 atmel_get_mib8(struct atmel_private *priv, u8 type, u8 index);
-static void atmel_set_mib8(struct atmel_private *priv, u8 type, u8 index, u8 data);
-static void atmel_set_mib16(struct atmel_private *priv, u8 type, u8 index, u16 data);
-static void atmel_set_mib(struct atmel_private *priv, u8 type, u8 index, u8 *data, int data_len);
-static void atmel_get_mib(struct atmel_private *priv, u8 type, u8 index, u8 *data, int data_len);
+static void atmel_set_mib8(struct atmel_private *priv, u8 type, u8 index,
+                          u8 data);
+static void atmel_set_mib16(struct atmel_private *priv, u8 type, u8 index,
+                           u16 data);
+static void atmel_set_mib(struct atmel_private *priv, u8 type, u8 index,
+                         u8 *data, int data_len);
+static void atmel_get_mib(struct atmel_private *priv, u8 type, u8 index,
+                         u8 *data, int data_len);
 static void atmel_scan(struct atmel_private *priv, int specific_ssid);
 static void atmel_join_bss(struct atmel_private *priv, int bss_index);
 static void atmel_smooth_qual(struct atmel_private *priv);
@@ -650,12 +648,12 @@ static inline u16 atmel_co(struct atmel_private *priv, u16 offset)
        return priv->host_info.command_pos + offset;
 }
 
-static inline u16 atmel_rx(struct atmel_private *priv, u16 offset, u16  desc)
+static inline u16 atmel_rx(struct atmel_private *priv, u16 offset, u16 desc)
 {
        return priv->host_info.rx_desc_pos + (sizeof(struct rx_desc) * desc) + offset;
 }
 
-static inline u16 atmel_tx(struct atmel_private *priv, u16 offset, u16  desc)
+static inline u16 atmel_tx(struct atmel_private *priv, u16 offset, u16 desc)
 {
        return priv->host_info.tx_desc_pos + (sizeof(struct tx_desc) * desc) + offset;
 }
@@ -682,25 +680,25 @@ static inline void atmel_write16(struct net_device *dev, u16 offset, u16 data)
 
 static inline u8 atmel_rmem8(struct atmel_private *priv, u16 pos)
 {
-       atmel_writeAR(priv->dev, pos);  
+       atmel_writeAR(priv->dev, pos);
        return atmel_read8(priv->dev, DR);
 }
 
 static inline void atmel_wmem8(struct atmel_private *priv, u16 pos, u16 data)
 {
-       atmel_writeAR(priv->dev, pos);  
+       atmel_writeAR(priv->dev, pos);
        atmel_write8(priv->dev, DR, data);
 }
 
 static inline u16 atmel_rmem16(struct atmel_private *priv, u16 pos)
 {
-               atmel_writeAR(priv->dev, pos);  
+       atmel_writeAR(priv->dev, pos);
        return atmel_read16(priv->dev, DR);
 }
 
 static inline void atmel_wmem16(struct atmel_private *priv, u16 pos, u16 data)
 {
-               atmel_writeAR(priv->dev, pos);  
+       atmel_writeAR(priv->dev, pos);
        atmel_write16(priv->dev, DR, data);
 }
 
@@ -710,11 +708,10 @@ static void tx_done_irq(struct atmel_private *priv)
 {
        int i;
 
-       for (i = 0; 
+       for (i = 0;
             atmel_rmem8(priv, atmel_tx(priv, TX_DESC_FLAGS_OFFSET, priv->tx_desc_head)) == TX_DONE &&
                     i < priv->host_info.tx_desc_count;
             i++) {
-               
                u8 status = atmel_rmem8(priv, atmel_tx(priv, TX_DESC_STATUS_OFFSET, priv->tx_desc_head));
                u16 msdu_size = atmel_rmem16(priv, atmel_tx(priv, TX_DESC_SIZE_OFFSET, priv->tx_desc_head));
                u8 type = atmel_rmem8(priv, atmel_tx(priv, TX_DESC_PACKET_TYPE_OFFSET, priv->tx_desc_head));
@@ -728,16 +725,16 @@ static void tx_done_irq(struct atmel_private *priv)
                        priv->tx_buff_head = 0;
                else
                        priv->tx_buff_head += msdu_size;
-                       
+
                if (priv->tx_desc_head < (priv->host_info.tx_desc_count - 1))
-                       priv->tx_desc_head++ ;                                  
+                       priv->tx_desc_head++ ;
                else
                        priv->tx_desc_head = 0;
-               
+
                if (type == TX_PACKET_TYPE_DATA) {
                        if (status == TX_STATUS_SUCCESS)
                                priv->stats.tx_packets++;
-                       else 
+                       else
                                priv->stats.tx_errors++;
                        netif_wake_queue(priv->dev);
                }
@@ -748,21 +745,22 @@ static u16 find_tx_buff(struct atmel_private *priv, u16 len)
 {
        u16 bottom_free = priv->host_info.tx_buff_size - priv->tx_buff_tail;
 
-       if (priv->tx_desc_free == 3 || priv->tx_free_mem < len) 
+       if (priv->tx_desc_free == 3 || priv->tx_free_mem < len)
                return 0;
-       
+
        if (bottom_free >= len)
                return priv->host_info.tx_buff_pos + priv->tx_buff_tail;
-       
+
        if (priv->tx_free_mem - bottom_free >= len) {
                priv->tx_buff_tail = 0;
                return priv->host_info.tx_buff_pos;
        }
-       
+
        return 0;
 }
 
-static void tx_update_descriptor(struct atmel_private *priv, int is_bcast, u16 len, u16 buff, u8 type)
+static void tx_update_descriptor(struct atmel_private *priv, int is_bcast,
+                                u16 len, u16 buff, u8 type)
 {
        atmel_wmem16(priv, atmel_tx(priv, TX_DESC_POS_OFFSET, priv->tx_desc_tail), buff);
        atmel_wmem16(priv, atmel_tx(priv, TX_DESC_SIZE_OFFSET, priv->tx_desc_tail), len);
@@ -775,8 +773,8 @@ static void tx_update_descriptor(struct atmel_private *priv, int is_bcast, u16 l
                int cipher_type, cipher_length;
                if (is_bcast) {
                        cipher_type = priv->group_cipher_suite;
-                       if (cipher_type == CIPHER_SUITE_WEP_64 || 
-                           cipher_type == CIPHER_SUITE_WEP_128 )
+                       if (cipher_type == CIPHER_SUITE_WEP_64 ||
+                           cipher_type == CIPHER_SUITE_WEP_128)
                                cipher_length = 8;
                        else if (cipher_type == CIPHER_SUITE_TKIP)
                                cipher_length = 12;
@@ -790,8 +788,8 @@ static void tx_update_descriptor(struct atmel_private *priv, int is_bcast, u16 l
                        }
                } else {
                        cipher_type = priv->pairwise_cipher_suite;
-                       if (cipher_type == CIPHER_SUITE_WEP_64 || 
-                           cipher_type == CIPHER_SUITE_WEP_128 )
+                       if (cipher_type == CIPHER_SUITE_WEP_64 ||
+                           cipher_type == CIPHER_SUITE_WEP_128)
                                cipher_length = 8;
                        else if (cipher_type == CIPHER_SUITE_TKIP)
                                cipher_length = 12;
@@ -804,9 +802,9 @@ static void tx_update_descriptor(struct atmel_private *priv, int is_bcast, u16 l
                                cipher_length = 0;
                        }
                }
-               
+
                atmel_wmem8(priv, atmel_tx(priv, TX_DESC_CIPHER_TYPE_OFFSET, priv->tx_desc_tail),
-                           cipher_type);       
+                           cipher_type);
                atmel_wmem8(priv, atmel_tx(priv, TX_DESC_CIPHER_LENGTH_OFFSET, priv->tx_desc_tail),
                            cipher_length);
        }
@@ -815,46 +813,46 @@ static void tx_update_descriptor(struct atmel_private *priv, int is_bcast, u16 l
        if (priv->tx_desc_previous != priv->tx_desc_tail)
                atmel_wmem32(priv, atmel_tx(priv, TX_DESC_NEXT_OFFSET, priv->tx_desc_previous), 0);
        priv->tx_desc_previous = priv->tx_desc_tail;
-       if (priv->tx_desc_tail < (priv->host_info.tx_desc_count -))
+       if (priv->tx_desc_tail < (priv->host_info.tx_desc_count - 1))
                priv->tx_desc_tail++;
        else
                priv->tx_desc_tail = 0;
        priv->tx_desc_free--;
        priv->tx_free_mem -= len;
-
 }
 
-static int start_tx (struct sk_buff *skb, struct net_device *dev)
+static int start_tx(struct sk_buff *skb, struct net_device *dev)
 {
        struct atmel_private *priv = netdev_priv(dev);
        struct ieee80211_hdr_4addr header;
        unsigned long flags;
        u16 buff, frame_ctl, len = (ETH_ZLEN < skb->len) ? skb->len : ETH_ZLEN;
        u8 SNAP_RFC1024[6] = {0xaa, 0xaa, 0x03, 0x00, 0x00, 0x00};
-       if (priv->card && priv->present_callback && 
+
+       if (priv->card && priv->present_callback &&
            !(*priv->present_callback)(priv->card)) {
                priv->stats.tx_errors++;
                dev_kfree_skb(skb);
                return 0;
        }
-       
+
        if (priv->station_state != STATION_STATE_READY) {
                priv->stats.tx_errors++;
                dev_kfree_skb(skb);
                return 0;
        }
-       
+
        /* first ensure the timer func cannot run */
-       spin_lock_bh(&priv->timerlock); 
+       spin_lock_bh(&priv->timerlock);
        /* then stop the hardware ISR */
-       spin_lock_irqsave(&priv->irqlock, flags); 
+       spin_lock_irqsave(&priv->irqlock, flags);
        /* nb doing the above in the opposite order will deadlock */
-       
+
        /* The Wireless Header is 30 bytes. In the Ethernet packet we "cut" the
-          12 first bytes (containing DA/SA) and put them in the appropriate fields of
-          the Wireless Header. Thus the packet length is then the initial + 18 (+30-12) */
-       
+          12 first bytes (containing DA/SA) and put them in the appropriate
+          fields of the Wireless Header. Thus the packet length is then the
+          initial + 18 (+30-12) */
+
        if (!(buff = find_tx_buff(priv, len + 18))) {
                priv->stats.tx_dropped++;
                spin_unlock_irqrestore(&priv->irqlock, flags);
@@ -862,7 +860,7 @@ static int start_tx (struct sk_buff *skb, struct net_device *dev)
                netif_stop_queue(dev);
                return 1;
        }
-       
+
        frame_ctl = IEEE80211_FTYPE_DATA;
        header.duration_id = 0;
        header.seq_ctl = 0;
@@ -878,7 +876,7 @@ static int start_tx (struct sk_buff *skb, struct net_device *dev)
                memcpy(&header.addr2, dev->dev_addr, 6);
                memcpy(&header.addr3, skb->data, 6);
        }
-       
+
        if (priv->use_wpa)
                memcpy(&header.addr4, SNAP_RFC1024, 6);
 
@@ -888,27 +886,27 @@ static int start_tx (struct sk_buff *skb, struct net_device *dev)
        /* Copy the packet sans its 802.3 header addresses which have been replaced */
        atmel_copy_to_card(dev, buff + DATA_FRAME_WS_HEADER_SIZE, skb->data + 12, len - 12);
        priv->tx_buff_tail += len - 12 + DATA_FRAME_WS_HEADER_SIZE;
-       
+
        /* low bit of first byte of destination tells us if broadcast */
        tx_update_descriptor(priv, *(skb->data) & 0x01, len + 18, buff, TX_PACKET_TYPE_DATA);
        dev->trans_start = jiffies;
        priv->stats.tx_bytes += len;
-       
+
        spin_unlock_irqrestore(&priv->irqlock, flags);
        spin_unlock_bh(&priv->timerlock);
        dev_kfree_skb(skb);
-       
-       return 0;       
+
+       return 0;
 }
 
-static void atmel_transmit_management_frame(struct atmel_private *priv, 
+static void atmel_transmit_management_frame(struct atmel_private *priv,
                                            struct ieee80211_hdr_4addr *header,
                                            u8 *body, int body_len)
 {
        u16 buff;
-       int len =  MGMT_FRAME_BODY_OFFSET + body_len;
-       
-       if (!(buff = find_tx_buff(priv, len))) 
+       int len = MGMT_FRAME_BODY_OFFSET + body_len;
+
+       if (!(buff = find_tx_buff(priv, len)))
                return;
 
        atmel_copy_to_card(priv->dev, buff, (u8 *)header, MGMT_FRAME_BODY_OFFSET);
@@ -916,24 +914,25 @@ static void atmel_transmit_management_frame(struct atmel_private *priv,
        priv->tx_buff_tail += len;
        tx_update_descriptor(priv, header->addr1[0] & 0x01, len, buff, TX_PACKET_TYPE_MGMT);
 }
-       
-static void fast_rx_path(struct atmel_private *priv, struct ieee80211_hdr_4addr *header, 
+
+static void fast_rx_path(struct atmel_private *priv,
+                        struct ieee80211_hdr_4addr *header,
                         u16 msdu_size, u16 rx_packet_loc, u32 crc)
 {
        /* fast path: unfragmented packet copy directly into skbuf */
-       u8 mac4[6]; 
-       struct sk_buff  *skb;
+       u8 mac4[6];
+       struct sk_buff  *skb;
        unsigned char *skbp;
-       
+
        /* get the final, mac 4 header field, this tells us encapsulation */
        atmel_copy_to_host(priv->dev, mac4, rx_packet_loc + 24, 6);
        msdu_size -= 6;
-       
+
        if (priv->do_rx_crc) {
                crc = crc32_le(crc, mac4, 6);
                msdu_size -= 4;
        }
-       
+
        if (!(skb = dev_alloc_skb(msdu_size + 14))) {
                priv->stats.rx_dropped++;
                return;
@@ -942,7 +941,7 @@ static void fast_rx_path(struct atmel_private *priv, struct ieee80211_hdr_4addr
        skb_reserve(skb, 2);
        skbp = skb_put(skb, msdu_size + 12);
        atmel_copy_to_host(priv->dev, skbp + 12, rx_packet_loc + 30, msdu_size);
-       
+
        if (priv->do_rx_crc) {
                u32 netcrc;
                crc = crc32_le(crc, skbp + 12, msdu_size);
@@ -953,24 +952,25 @@ static void fast_rx_path(struct atmel_private *priv, struct ieee80211_hdr_4addr
                        return;
                }
        }
-       
+
        memcpy(skbp, header->addr1, 6); /* destination address */
-       if (le16_to_cpu(header->frame_ctl) & IEEE80211_FCTL_FROMDS) 
+       if (le16_to_cpu(header->frame_ctl) & IEEE80211_FCTL_FROMDS)
                memcpy(&skbp[6], header->addr3, 6);
        else
                memcpy(&skbp[6], header->addr2, 6); /* source address */
-       
-       priv->dev->last_rx=jiffies;
+
+       priv->dev->last_rx = jiffies;
        skb->dev = priv->dev;
        skb->protocol = eth_type_trans(skb, priv->dev);
-       skb->ip_summed = CHECKSUM_NONE; 
+       skb->ip_summed = CHECKSUM_NONE;
        netif_rx(skb);
        priv->stats.rx_bytes += 12 + msdu_size;
        priv->stats.rx_packets++;
 }
 
 /* Test to see if the packet in card memory at packet_loc has a valid CRC
-   It doesn't matter that this is slow: it is only used to proble the first few packets. */
+   It doesn't matter that this is slow: it is only used to proble the first few
+   packets. */
 static int probe_crc(struct atmel_private *priv, u16 packet_loc, u16 msdu_size)
 {
        int i = msdu_size - 4;
@@ -980,7 +980,7 @@ static int probe_crc(struct atmel_private *priv, u16 packet_loc, u16 msdu_size)
                return 0;
 
        atmel_copy_to_host(priv->dev, (void *)&netcrc, packet_loc + i, 4);
-       
+
        atmel_writeAR(priv->dev, packet_loc);
        while (i--) {
                u8 octet = atmel_read8(priv->dev, DR);
@@ -990,20 +990,22 @@ static int probe_crc(struct atmel_private *priv, u16 packet_loc, u16 msdu_size)
        return (crc ^ 0xffffffff) == netcrc;
 }
 
-static void frag_rx_path(struct atmel_private *priv, struct ieee80211_hdr_4addr *header, 
-                        u16 msdu_size, u16 rx_packet_loc, u32 crc, u16 seq_no, u8 frag_no, int more_frags)
+static void frag_rx_path(struct atmel_private *priv,
+                        struct ieee80211_hdr_4addr *header,
+                        u16 msdu_size, u16 rx_packet_loc, u32 crc, u16 seq_no,
+                        u8 frag_no, int more_frags)
 {
-       u8 mac4[6]; 
+       u8 mac4[6];
        u8 source[6];
        struct sk_buff *skb;
 
-       if (le16_to_cpu(header->frame_ctl) & IEEE80211_FCTL_FROMDS) 
+       if (le16_to_cpu(header->frame_ctl) & IEEE80211_FCTL_FROMDS)
                memcpy(source, header->addr3, 6);
        else
-               memcpy(source, header->addr2, 6); 
-       
+               memcpy(source, header->addr2, 6);
+
        rx_packet_loc += 24; /* skip header */
-       
+
        if (priv->do_rx_crc)
                msdu_size -= 4;
 
@@ -1012,16 +1014,16 @@ static void frag_rx_path(struct atmel_private *priv, struct ieee80211_hdr_4addr
                msdu_size -= 6;
                rx_packet_loc += 6;
 
-               if (priv->do_rx_crc) 
+               if (priv->do_rx_crc)
                        crc = crc32_le(crc, mac4, 6);
-              
+
                priv->frag_seq = seq_no;
                priv->frag_no = 1;
                priv->frag_len = msdu_size;
-               memcpy(priv->frag_source, source, 6); 
+               memcpy(priv->frag_source, source, 6);
                memcpy(&priv->rx_buf[6], source, 6);
                memcpy(priv->rx_buf, header->addr1, 6);
-                               
+
                atmel_copy_to_host(priv->dev, &priv->rx_buf[12], rx_packet_loc, msdu_size);
 
                if (priv->do_rx_crc) {
@@ -1033,17 +1035,17 @@ static void frag_rx_path(struct atmel_private *priv, struct ieee80211_hdr_4addr
                                memset(priv->frag_source, 0xff, 6);
                        }
                }
-               
+
        } else if (priv->frag_no == frag_no &&
                   priv->frag_seq == seq_no &&
                   memcmp(priv->frag_source, source, 6) == 0) {
-               
-               atmel_copy_to_host(priv->dev, &priv->rx_buf[12 + priv->frag_len], 
+
+               atmel_copy_to_host(priv->dev, &priv->rx_buf[12 + priv->frag_len],
                                   rx_packet_loc, msdu_size);
                if (priv->do_rx_crc) {
                        u32 netcrc;
-                       crc = crc32_le(crc, 
-                                      &priv->rx_buf[12 + priv->frag_len], 
+                       crc = crc32_le(crc,
+                                      &priv->rx_buf[12 + priv->frag_len],
                                       msdu_size);
                        atmel_copy_to_host(priv->dev, (void *)&netcrc, rx_packet_loc + msdu_size, 4);
                        if ((crc ^ 0xffffffff) != netcrc) {
@@ -1052,7 +1054,7 @@ static void frag_rx_path(struct atmel_private *priv, struct ieee80211_hdr_4addr
                                more_frags = 1; /* don't send broken assembly */
                        }
                }
-               
+
                priv->frag_len += msdu_size;
                priv->frag_no++;
 
@@ -1062,60 +1064,60 @@ static void frag_rx_path(struct atmel_private *priv, struct ieee80211_hdr_4addr
                                priv->stats.rx_dropped++;
                        } else {
                                skb_reserve(skb, 2);
-                               memcpy(skb_put(skb, priv->frag_len + 12), 
+                               memcpy(skb_put(skb, priv->frag_len + 12),
                                       priv->rx_buf,
                                       priv->frag_len + 12);
                                priv->dev->last_rx = jiffies;
                                skb->dev = priv->dev;
                                skb->protocol = eth_type_trans(skb, priv->dev);
-                               skb->ip_summed = CHECKSUM_NONE; 
+                               skb->ip_summed = CHECKSUM_NONE;
                                netif_rx(skb);
                                priv->stats.rx_bytes += priv->frag_len + 12;
                                priv->stats.rx_packets++;
                        }
                }
-               
        } else
                priv->wstats.discard.fragment++;
 }
-               
+
 static void rx_done_irq(struct atmel_private *priv)
 {
        int i;
        struct ieee80211_hdr_4addr header;
-       
-       for (i = 0; 
+
+       for (i = 0;
             atmel_rmem8(priv, atmel_rx(priv, RX_DESC_FLAGS_OFFSET, priv->rx_desc_head)) == RX_DESC_FLAG_VALID &&
                     i < priv->host_info.rx_desc_count;
             i++) {
-                               
+
                u16 msdu_size, rx_packet_loc, frame_ctl, seq_control;
                u8 status = atmel_rmem8(priv, atmel_rx(priv, RX_DESC_STATUS_OFFSET, priv->rx_desc_head));
                u32 crc = 0xffffffff;
-               
+
                if (status != RX_STATUS_SUCCESS) {
                        if (status == 0xc1) /* determined by experiment */
                                priv->wstats.discard.nwid++;
                        else
-                               priv->stats.rx_errors++; 
+                               priv->stats.rx_errors++;
                        goto next;
                }
 
                msdu_size = atmel_rmem16(priv, atmel_rx(priv, RX_DESC_MSDU_SIZE_OFFSET, priv->rx_desc_head));
                rx_packet_loc = atmel_rmem16(priv, atmel_rx(priv, RX_DESC_MSDU_POS_OFFSET, priv->rx_desc_head));
-               
+
                if (msdu_size < 30) {
-                       priv->stats.rx_errors++; 
+                       priv->stats.rx_errors++;
                        goto next;
                }
-               
+
                /* Get header as far as end of seq_ctl */
                atmel_copy_to_host(priv->dev, (char *)&header, rx_packet_loc, 24);
                frame_ctl = le16_to_cpu(header.frame_ctl);
                seq_control = le16_to_cpu(header.seq_ctl);
 
-               /* probe for CRC use here if needed  once five packets have arrived with
-                  the same crc status, we assume we know what's happening and stop probing */
+               /* probe for CRC use here if needed  once five packets have
+                  arrived with the same crc status, we assume we know what's
+                  happening and stop probing */
                if (priv->probe_crc) {
                        if (!priv->wep_is_on || !(frame_ctl & IEEE80211_FCTL_PROTECTED)) {
                                priv->do_rx_crc = probe_crc(priv, rx_packet_loc, msdu_size);
@@ -1130,34 +1132,33 @@ static void rx_done_irq(struct atmel_private *priv)
                                        priv->probe_crc = 0;
                        }
                }
-                   
+
                /* don't CRC header when WEP in use */
                if (priv->do_rx_crc && (!priv->wep_is_on || !(frame_ctl & IEEE80211_FCTL_PROTECTED))) {
                        crc = crc32_le(0xffffffff, (unsigned char *)&header, 24);
                }
                msdu_size -= 24; /* header */
 
-               if ((frame_ctl & IEEE80211_FCTL_FTYPE) == IEEE80211_FTYPE_DATA) { 
-                       
+               if ((frame_ctl & IEEE80211_FCTL_FTYPE) == IEEE80211_FTYPE_DATA) {
                        int more_fragments = frame_ctl & IEEE80211_FCTL_MOREFRAGS;
                        u8 packet_fragment_no = seq_control & IEEE80211_SCTL_FRAG;
                        u16 packet_sequence_no = (seq_control & IEEE80211_SCTL_SEQ) >> 4;
-                       
-                       if (!more_fragments && packet_fragment_no == 0 ) {
+
+                       if (!more_fragments && packet_fragment_no == 0) {
                                fast_rx_path(priv, &header, msdu_size, rx_packet_loc, crc);
                        } else {
                                frag_rx_path(priv, &header, msdu_size, rx_packet_loc, crc,
                                             packet_sequence_no, packet_fragment_no, more_fragments);
                        }
                }
-               
+
                if ((frame_ctl & IEEE80211_FCTL_FTYPE) == IEEE80211_FTYPE_MGMT) {
                        /* copy rest of packet into buffer */
                        atmel_copy_to_host(priv->dev, (unsigned char *)&priv->rx_buf, rx_packet_loc + 24, msdu_size);
-                       
+
                        /* we use the same buffer for frag reassembly and control packets */
                        memset(priv->frag_source, 0xff, 6);
-                       
+
                        if (priv->do_rx_crc) {
                                /* last 4 octets is crc */
                                msdu_size -= 4;
@@ -1170,18 +1171,18 @@ static void rx_done_irq(struct atmel_private *priv)
 
                        atmel_management_frame(priv, &header, msdu_size,
                                               atmel_rmem8(priv, atmel_rx(priv, RX_DESC_RSSI_OFFSET, priv->rx_desc_head)));
-               } 
+               }
 
-       next:
+next:
                /* release descriptor */
-               atmel_wmem8(priv, atmel_rx(priv, RX_DESC_FLAGS_OFFSET, priv->rx_desc_head), RX_DESC_FLAG_CONSUMED);  
-               
+               atmel_wmem8(priv, atmel_rx(priv, RX_DESC_FLAGS_OFFSET, priv->rx_desc_head), RX_DESC_FLAG_CONSUMED);
+
                if (priv->rx_desc_head < (priv->host_info.rx_desc_count - 1))
-                       priv->rx_desc_head++;                                   
+                       priv->rx_desc_head++;
                else
                        priv->rx_desc_head = 0;
        }
-}      
+}
 
 static irqreturn_t service_interrupt(int irq, void *dev_id, struct pt_regs *regs)
 {
@@ -1189,7 +1190,7 @@ static irqreturn_t service_interrupt(int irq, void *dev_id, struct pt_regs *regs
        struct atmel_private *priv = netdev_priv(dev);
        u8 isr;
        int i = -1;
-       static u8 irq_order[] = { 
+       static u8 irq_order[] = {
                ISR_OUT_OF_RANGE,
                ISR_RxCOMPLETE,
                ISR_TxCOMPLETE,
@@ -1199,20 +1200,19 @@ static irqreturn_t service_interrupt(int irq, void *dev_id, struct pt_regs *regs
                ISR_IBSS_MERGE,
                ISR_GENERIC_IRQ
        };
-               
 
-       if (priv->card && priv->present_callback && 
+       if (priv->card && priv->present_callback &&
            !(*priv->present_callback)(priv->card))
                return IRQ_HANDLED;
 
        /* In this state upper-level code assumes it can mess with
           the card unhampered by interrupts which may change register state.
           Note that even though the card shouldn't generate interrupts
-          the inturrupt line may be shared. This allows card setup 
+          the inturrupt line may be shared. This allows card setup
           to go on without disabling interrupts for a long time. */
        if (priv->station_state == STATION_STATE_DOWN)
                return IRQ_NONE;
-       
+
        atmel_clear_gcr(dev, GCR_ENINT); /* disable interrupts */
 
        while (1) {
@@ -1221,36 +1221,36 @@ static irqreturn_t service_interrupt(int irq, void *dev_id, struct pt_regs *regs
                        printk(KERN_ALERT "%s: failed to contact MAC.\n", dev->name);
                        return IRQ_HANDLED;
                }
-               
+
                isr = atmel_rmem8(priv, atmel_hi(priv, IFACE_INT_STATUS_OFFSET));
                atmel_wmem8(priv, atmel_hi(priv, IFACE_LOCKOUT_MAC_OFFSET), 0);
-               
+
                if (!isr) {
                        atmel_set_gcr(dev, GCR_ENINT); /* enable interrupts */
                        return i == -1 ? IRQ_NONE : IRQ_HANDLED;
                }
-               
+
                atmel_set_gcr(dev, GCR_ACKINT); /* acknowledge interrupt */
-               
+
                for (i = 0; i < sizeof(irq_order)/sizeof(u8); i++)
                        if (isr & irq_order[i])
                                break;
-               
+
                if (!atmel_lock_mac(priv)) {
                        /* failed to contact card */
                        printk(KERN_ALERT "%s: failed to contact MAC.\n", dev->name);
                        return IRQ_HANDLED;
                }
-               
+
                isr = atmel_rmem8(priv, atmel_hi(priv, IFACE_INT_STATUS_OFFSET));
                isr ^= irq_order[i];
                atmel_wmem8(priv, atmel_hi(priv, IFACE_INT_STATUS_OFFSET), isr);
                atmel_wmem8(priv, atmel_hi(priv, IFACE_LOCKOUT_MAC_OFFSET), 0);
-               
+
                switch (irq_order[i]) {
-                       
-               case ISR_OUT_OF_RANGE: 
-                       if (priv->operating_mode == IW_MODE_INFRA && 
+
+               case ISR_OUT_OF_RANGE:
+                       if (priv->operating_mode == IW_MODE_INFRA &&
                            priv->station_state == STATION_STATE_READY) {
                                priv->station_is_associated = 0;
                                atmel_scan(priv, 1);
@@ -1261,24 +1261,24 @@ static irqreturn_t service_interrupt(int irq, void *dev_id, struct pt_regs *regs
                        priv->wstats.discard.misc++;
                        /* fall through */
                case ISR_RxCOMPLETE:
-                       rx_done_irq(priv); 
+                       rx_done_irq(priv);
                        break;
-                       
+
                case ISR_TxCOMPLETE:
-                       tx_done_irq(priv); 
+                       tx_done_irq(priv);
                        break;
-                       
+
                case ISR_FATAL_ERROR:
                        printk(KERN_ALERT "%s: *** FATAL error interrupt ***\n", dev->name);
                        atmel_enter_state(priv, STATION_STATE_MGMT_ERROR);
                        break;
-                       
-               case ISR_COMMAND_COMPLETE: 
+
+               case ISR_COMMAND_COMPLETE:
                        atmel_command_irq(priv);
                        break;
 
                case ISR_IBSS_MERGE:
-                       atmel_get_mib(priv, Mac_Mgmt_Mib_Type, MAC_MGMT_MIB_CUR_BSSID_POS, 
+                       atmel_get_mib(priv, Mac_Mgmt_Mib_Type, MAC_MGMT_MIB_CUR_BSSID_POS,
                                      priv->CurrentBSSID, 6);
                        /* The WPA stuff cares about the current AP address */
                        if (priv->use_wpa)
@@ -1288,24 +1288,23 @@ static irqreturn_t service_interrupt(int irq, void *dev_id, struct pt_regs *regs
                        printk(KERN_INFO "%s: Generic_irq received.\n", dev->name);
                        break;
                }
-       }       
+       }
 }
 
-
-static struct net_device_stats *atmel_get_stats (struct net_device *dev)
+static struct net_device_stats *atmel_get_stats(struct net_device *dev)
 {
        struct atmel_private *priv = netdev_priv(dev);
        return &priv->stats;
 }
 
-static struct iw_statistics *atmel_get_wireless_stats (struct net_device *dev)
+static struct iw_statistics *atmel_get_wireless_stats(struct net_device *dev)
 {
        struct atmel_private *priv = netdev_priv(dev);
 
-       /* update the link quality here in case we are seeing no beacons 
+       /* update the link quality here in case we are seeing no beacons
           at all to drive the process */
        atmel_smooth_qual(priv);
-       
+
        priv->wstats.status = priv->station_state;
 
        if (priv->operating_mode == IW_MODE_INFRA) {
@@ -1328,8 +1327,8 @@ static struct iw_statistics *atmel_get_wireless_stats (struct net_device *dev)
                                        | IW_QUAL_NOISE_INVALID;
                priv->wstats.miss.beacon = 0;
        }
-       
-       return (&priv->wstats);
+
+       return &priv->wstats;
 }
 
 static int atmel_change_mtu(struct net_device *dev, int new_mtu)
@@ -1343,21 +1342,21 @@ static int atmel_change_mtu(struct net_device *dev, int new_mtu)
 static int atmel_set_mac_address(struct net_device *dev, void *p)
 {
        struct sockaddr *addr = p;
-        
+
         memcpy (dev->dev_addr, addr->sa_data, dev->addr_len);
        return atmel_open(dev);
 }
 
 EXPORT_SYMBOL(atmel_open);
 
-int atmel_open (struct net_device *dev)
+int atmel_open(struct net_device *dev)
 {
        struct atmel_private *priv = netdev_priv(dev);
        int i, channel;
 
        /* any scheduled timer is no longer needed and might screw things up.. */
        del_timer_sync(&priv->management_timer);
-       
+
        /* Interrupts will not touch the card once in this state... */
        priv->station_state = STATION_STATE_DOWN;
 
@@ -1377,7 +1376,7 @@ int atmel_open (struct net_device *dev)
        priv->site_survey_state = SITE_SURVEY_IDLE;
        priv->station_is_associated = 0;
 
-       if (!reset_atmel_card(dev)) 
+       if (!reset_atmel_card(dev))
                return -EAGAIN;
 
        if (priv->config_reg_domain) {
@@ -1391,26 +1390,26 @@ int atmel_open (struct net_device *dev)
                if (i == sizeof(channel_table)/sizeof(channel_table[0])) {
                        priv->reg_domain = REG_DOMAIN_MKK1;
                        printk(KERN_ALERT "%s: failed to get regulatory domain: assuming MKK1.\n", dev->name);
-               } 
+               }
        }
-       
+
        if ((channel = atmel_validate_channel(priv, priv->channel)))
                priv->channel = channel;
 
-       /* this moves station_state on.... */ 
-       atmel_scan(priv, 1);    
+       /* this moves station_state on.... */
+       atmel_scan(priv, 1);
 
        atmel_set_gcr(priv->dev, GCR_ENINT); /* enable interrupts */
        return 0;
 }
 
-static int atmel_close (struct net_device *dev)
+static int atmel_close(struct net_device *dev)
 {
        struct atmel_private *priv = netdev_priv(dev);
-               
+
        atmel_enter_state(priv, STATION_STATE_DOWN);
-       
-       if (priv->bus_type == BUS_TYPE_PCCARD) 
+
+       if (priv->bus_type == BUS_TYPE_PCCARD)
                atmel_write16(dev, GCR, 0x0060);
        atmel_write16(dev, GCR, 0x0040);
        return 0;
@@ -1438,43 +1437,46 @@ static int atmel_proc_output (char *buf, struct atmel_private *priv)
        int i;
        char *p = buf;
        char *s, *r, *c;
-       
-       p += sprintf(p, "Driver version:\t\t%d.%d\n", DRIVER_MAJOR, DRIVER_MINOR);
-       
+
+       p += sprintf(p, "Driver version:\t\t%d.%d\n",
+                    DRIVER_MAJOR, DRIVER_MINOR);
+
        if (priv->station_state != STATION_STATE_DOWN) {
-               p += sprintf(p, "Firmware version:\t%d.%d build %d\nFirmware location:\t", 
+               p += sprintf(p, "Firmware version:\t%d.%d build %d\n"
+                               "Firmware location:\t",
                             priv->host_info.major_version,
                             priv->host_info.minor_version,
                             priv->host_info.build_version);
-               
-               if (priv->card_type != CARD_TYPE_EEPROM) 
+
+               if (priv->card_type != CARD_TYPE_EEPROM)
                        p += sprintf(p, "on card\n");
-               else if (priv->firmware) 
-                       p += sprintf(p, "%s loaded by host\n", priv->firmware_id);
+               else if (priv->firmware)
+                       p += sprintf(p, "%s loaded by host\n",
+                                    priv->firmware_id);
                else
-                       p += sprintf(p, "%s loaded by hotplug\n", priv->firmware_id);
-               
-               switch(priv->card_type) {
+                       p += sprintf(p, "%s loaded by hotplug\n",
+                                    priv->firmware_id);
+
+               switch (priv->card_type) {
                case CARD_TYPE_PARALLEL_FLASH: c = "Parallel flash"; break;
                case CARD_TYPE_SPI_FLASH: c = "SPI flash\n"; break;
                case CARD_TYPE_EEPROM: c = "EEPROM"; break;
                default: c = "<unknown>";
                }
 
-               
                r = "<unknown>";
                for (i = 0; i < sizeof(channel_table)/sizeof(channel_table[0]); i++)
                        if (priv->reg_domain == channel_table[i].reg_domain)
                                r = channel_table[i].name;
-               
+
                p += sprintf(p, "MAC memory type:\t%s\n", c);
                p += sprintf(p, "Regulatory domain:\t%s\n", r);
-               p += sprintf(p, "Host CRC checking:\t%s\n", 
+               p += sprintf(p, "Host CRC checking:\t%s\n",
                             priv->do_rx_crc ? "On" : "Off");
                p += sprintf(p, "WPA-capable firmware:\t%s\n",
                             priv->use_wpa ? "Yes" : "No");
        }
-       
+
        switch(priv->station_state) {
        case STATION_STATE_SCANNING: s = "Scanning"; break;
        case STATION_STATE_JOINNING: s = "Joining"; break;
@@ -1486,9 +1488,9 @@ static int atmel_proc_output (char *buf, struct atmel_private *priv)
        case STATION_STATE_DOWN: s = "Down"; break;
        default: s = "<unknown>";
        }
-      
+
        p += sprintf(p, "Current state:\t\t%s\n", s);
-       return  p - buf;
+       return p - buf;
 }
 
 static int atmel_read_proc(char *page, char **start, off_t off,
@@ -1504,9 +1506,12 @@ static int atmel_read_proc(char *page, char **start, off_t off,
         return len;
 }
 
-struct net_device *init_atmel_card( unsigned short irq, unsigned long port, const AtmelFWType fw_type,  
-                                   struct device *sys_dev, int (*card_present)(void *), void *card)
+struct net_device *init_atmel_card(unsigned short irq, unsigned long port,
+                                  const AtmelFWType fw_type,
+                                  struct device *sys_dev,
+                                  int (*card_present)(void *), void *card)
 {
+       struct proc_dir_entry *ent;
        struct net_device *dev;
        struct atmel_private *priv;
        int rc;
@@ -1514,11 +1519,11 @@ struct net_device *init_atmel_card( unsigned short irq, unsigned long port, cons
        /* Create the network device object. */
         dev = alloc_etherdev(sizeof(*priv));
         if (!dev) {
-               printk(KERN_ERR "atmel:  Couldn't alloc_etherdev\n");
+               printk(KERN_ERR "atmel: Couldn't alloc_etherdev\n");
                return NULL;
         }
        if (dev_alloc_name(dev, dev->name) < 0) {
-               printk(KERN_ERR "atmel:  Couldn't get name!\n");
+               printk(KERN_ERR "atmel: Couldn't get name!\n");
                goto err_out_free;
        }
 
@@ -1550,7 +1555,7 @@ struct net_device *init_atmel_card( unsigned short irq, unsigned long port, cons
        memset(priv->BSSID, 0, 6);
        priv->CurrentBSSID[0] = 0xFF; /* Initialize to something invalid.... */
        priv->station_was_associated = 0;
-       
+
        priv->last_survey = jiffies;
        priv->preamble = LONG_PREAMBLE;
        priv->operating_mode = IW_MODE_INFRA;
@@ -1586,7 +1591,7 @@ struct net_device *init_atmel_card( unsigned short irq, unsigned long port, cons
        spin_lock_init(&priv->timerlock);
        priv->management_timer.function = atmel_management_timer;
        priv->management_timer.data = (unsigned long) dev;
-       
+
        dev->open = atmel_open;
        dev->stop = atmel_close;
        dev->change_mtu = atmel_change_mtu;
@@ -1597,44 +1602,46 @@ struct net_device *init_atmel_card( unsigned short irq, unsigned long port, cons
        dev->do_ioctl = atmel_ioctl;
        dev->irq = irq;
        dev->base_addr = port;
-       
+
        SET_NETDEV_DEV(dev, sys_dev);
-       
+
        if ((rc = request_irq(dev->irq, service_interrupt, SA_SHIRQ, dev->name, dev))) {
-               printk(KERN_ERR "%s: register interrupt %d failed, rc %d\n", dev->name, irq, rc );
+               printk(KERN_ERR "%s: register interrupt %d failed, rc %d\n", dev->name, irq, rc);
                goto err_out_free;
        }
 
-       if (!request_region(dev->base_addr, 32, 
+       if (!request_region(dev->base_addr, 32,
                            priv->bus_type == BUS_TYPE_PCCARD ?  "atmel_cs" : "atmel_pci")) {
                goto err_out_irq;
        }
-       
+
        if (register_netdev(dev))
                goto err_out_res;
-       
+
        if (!probe_atmel_card(dev)){
                unregister_netdev(dev);
                goto err_out_res;
        }
-       
+
        netif_carrier_off(dev);
-       
-       create_proc_read_entry ("driver/atmel", 0, NULL, atmel_read_proc, priv);        
-       
+
+       ent = create_proc_read_entry ("driver/atmel", 0, NULL, atmel_read_proc, priv);
+       if (!ent)
+               printk(KERN_WARNING "atmel: unable to create /proc entry.\n");
+
        printk(KERN_INFO "%s: Atmel at76c50x. Version %d.%d. MAC %.2x:%.2x:%.2x:%.2x:%.2x:%.2x\n",
               dev->name, DRIVER_MAJOR, DRIVER_MINOR,
               dev->dev_addr[0], dev->dev_addr[1], dev->dev_addr[2],
               dev->dev_addr[3], dev->dev_addr[4], dev->dev_addr[5] );
-       
+
        SET_MODULE_OWNER(dev);
        return dev;
-       
- err_out_res:
+
+err_out_res:
        release_region( dev->base_addr, 32);
- err_out_irq:
+err_out_irq:
        free_irq(dev->irq, dev);
- err_out_free:
+err_out_free:
        free_netdev(dev);
        return NULL;
 }
@@ -1644,12 +1651,12 @@ EXPORT_SYMBOL(init_atmel_card);
 void stop_atmel_card(struct net_device *dev)
 {
        struct atmel_private *priv = netdev_priv(dev);
-               
+
        /* put a brick on it... */
-       if (priv->bus_type == BUS_TYPE_PCCARD) 
+       if (priv->bus_type == BUS_TYPE_PCCARD)
                atmel_write16(dev, GCR, 0x0060);
        atmel_write16(dev, GCR, 0x0040);
-       
+
        del_timer_sync(&priv->management_timer);
        unregister_netdev(dev);
        remove_proc_entry("driver/atmel", NULL);
@@ -1675,13 +1682,13 @@ static int atmel_set_essid(struct net_device *dev,
                int index = (dwrq->flags & IW_ENCODE_INDEX) - 1;
 
                priv->connect_to_any_BSS = 0;
-               
+
                /* Check the size of the string */
                if (dwrq->length > MAX_SSID_LENGTH + 1)
-                        return -E2BIG ;
+                        return -E2BIG;
                if (index != 0)
                        return -EINVAL;
-               
+
                memcpy(priv->new_SSID, extra, dwrq->length - 1);
                priv->new_SSID_size = dwrq->length - 1;
        }
@@ -1706,7 +1713,7 @@ static int atmel_get_essid(struct net_device *dev,
                extra[priv->SSID_size] = '\0';
                dwrq->length = priv->SSID_size + 1;
        }
-       
+
        dwrq->flags = !priv->connect_to_any_BSS; /* active */
 
        return 0;
@@ -1768,7 +1775,7 @@ static int atmel_set_encode(struct net_device *dev,
                /* WE specify that if a valid key is set, encryption
                 * should be enabled (user may turn it off later)
                 * This is also how "iwconfig ethX key on" works */
-               if (index == current_index && 
+               if (index == current_index &&
                    priv->wep_key_len[index] > 0) {
                        priv->wep_is_on = 1;
                        priv->exclude_unencrypted = 1;
@@ -1783,18 +1790,18 @@ static int atmel_set_encode(struct net_device *dev,
        } else {
                /* Do we want to just set the transmit key index ? */
                int index = (dwrq->flags & IW_ENCODE_INDEX) - 1;
-               if ( index>=0 && index < 4 ) {
+               if (index >= 0 && index < 4) {
                        priv->default_key = index;
                } else
                        /* Don't complain if only change the mode */
-                       if(!dwrq->flags & IW_ENCODE_MODE) {
+                       if (!dwrq->flags & IW_ENCODE_MODE) {
                                return -EINVAL;
                        }
        }
        /* Read the flags */
-       if(dwrq->flags & IW_ENCODE_DISABLED) {
+       if (dwrq->flags & IW_ENCODE_DISABLED) {
                priv->wep_is_on = 0;
-               priv->encryption_level = 0;     
+               priv->encryption_level = 0;
                priv->pairwise_cipher_suite = CIPHER_SUITE_NONE;
        } else {
                priv->wep_is_on = 1;
@@ -1806,15 +1813,14 @@ static int atmel_set_encode(struct net_device *dev,
                        priv->encryption_level = 1;
                }
        }
-       if(dwrq->flags & IW_ENCODE_RESTRICTED)
+       if (dwrq->flags & IW_ENCODE_RESTRICTED)
                priv->exclude_unencrypted = 1;
-               if(dwrq->flags & IW_ENCODE_OPEN) 
+       if(dwrq->flags & IW_ENCODE_OPEN)
                priv->exclude_unencrypted = 0;
-       
+
        return -EINPROGRESS;            /* Call commit handler */
 }
 
-
 static int atmel_get_encode(struct net_device *dev,
                            struct iw_request_info *info,
                            struct iw_point *dwrq,
@@ -1822,7 +1828,7 @@ static int atmel_get_encode(struct net_device *dev,
 {
        struct atmel_private *priv = netdev_priv(dev);
        int index = (dwrq->flags & IW_ENCODE_INDEX) - 1;
-       
+
        if (!priv->wep_is_on)
                dwrq->flags = IW_ENCODE_DISABLED;
        else {
@@ -1843,7 +1849,7 @@ static int atmel_get_encode(struct net_device *dev,
                memset(extra, 0, 16);
                memcpy(extra, priv->wep_keys[index], dwrq->length);
        }
-       
+
        return 0;
 }
 
@@ -1862,17 +1868,17 @@ static int atmel_set_rate(struct net_device *dev,
                          char *extra)
 {
        struct atmel_private *priv = netdev_priv(dev);
-       
+
        if (vwrq->fixed == 0) {
                priv->tx_rate = 3;
                priv->auto_tx_rate = 1;
        } else {
                priv->auto_tx_rate = 0;
-               
+
                /* Which type of value ? */
-               if((vwrq->value < 4) && (vwrq->value >= 0)) {
+               if ((vwrq->value < 4) && (vwrq->value >= 0)) {
                        /* Setting by rate index */
-               priv->tx_rate = vwrq->value;
+                       priv->tx_rate = vwrq->value;
                } else {
                /* Setting by frequency value */
                        switch (vwrq->value) {
@@ -1899,7 +1905,7 @@ static int atmel_set_mode(struct net_device *dev,
                return -EINVAL;
 
        priv->operating_mode = *uwrq;
-       return -EINPROGRESS;  
+       return -EINPROGRESS;
 }
 
 static int atmel_get_mode(struct net_device *dev,
@@ -1908,7 +1914,7 @@ static int atmel_get_mode(struct net_device *dev,
                          char *extra)
 {
        struct atmel_private *priv = netdev_priv(dev);
-       
+
        *uwrq = priv->operating_mode;
        return 0;
 }
@@ -1962,9 +1968,9 @@ static int atmel_set_retry(struct net_device *dev,
                           char *extra)
 {
        struct atmel_private *priv = netdev_priv(dev);
-       
-       if(!vwrq->disabled && (vwrq->flags & IW_RETRY_LIMIT)) {
-               if(vwrq->flags & IW_RETRY_MAX)
+
+       if (!vwrq->disabled && (vwrq->flags & IW_RETRY_LIMIT)) {
+               if (vwrq->flags & IW_RETRY_MAX)
                        priv->long_retry = vwrq->value;
                else if (vwrq->flags & IW_RETRY_MIN)
                        priv->short_retry = vwrq->value;
@@ -1973,9 +1979,9 @@ static int atmel_set_retry(struct net_device *dev,
                        priv->long_retry = vwrq->value;
                        priv->short_retry = vwrq->value;
                }
-               return -EINPROGRESS;            
+               return -EINPROGRESS;
        }
-          
+
        return -EINVAL;
 }
 
@@ -1989,13 +1995,13 @@ static int atmel_get_retry(struct net_device *dev,
        vwrq->disabled = 0;      /* Can't be disabled */
 
        /* Note : by default, display the min retry number */
-       if((vwrq->flags & IW_RETRY_MAX)) {
+       if (vwrq->flags & IW_RETRY_MAX) {
                vwrq->flags = IW_RETRY_LIMIT | IW_RETRY_MAX;
                vwrq->value = priv->long_retry;
        } else {
                vwrq->flags = IW_RETRY_LIMIT;
                vwrq->value = priv->short_retry;
-               if(priv->long_retry != priv->short_retry)
+               if (priv->long_retry != priv->short_retry)
                        vwrq->flags |= IW_RETRY_MIN;
        }
 
@@ -2010,13 +2016,13 @@ static int atmel_set_rts(struct net_device *dev,
        struct atmel_private *priv = netdev_priv(dev);
        int rthr = vwrq->value;
 
-       if(vwrq->disabled)
+       if (vwrq->disabled)
                rthr = 2347;
-       if((rthr < 0) || (rthr > 2347)) {
+       if ((rthr < 0) || (rthr > 2347)) {
                return -EINVAL;
        }
        priv->rts_threshold = rthr;
-       
+
        return -EINPROGRESS;            /* Call commit handler */
 }
 
@@ -2026,7 +2032,7 @@ static int atmel_get_rts(struct net_device *dev,
                         char *extra)
 {
        struct atmel_private *priv = netdev_priv(dev);
-       
+
        vwrq->value = priv->rts_threshold;
        vwrq->disabled = (vwrq->value >= 2347);
        vwrq->fixed = 1;
@@ -2042,14 +2048,14 @@ static int atmel_set_frag(struct net_device *dev,
        struct atmel_private *priv = netdev_priv(dev);
        int fthr = vwrq->value;
 
-       if(vwrq->disabled)
+       if (vwrq->disabled)
                fthr = 2346;
-       if((fthr < 256) || (fthr > 2346)) {
+       if ((fthr < 256) || (fthr > 2346)) {
                return -EINVAL;
        }
        fthr &= ~0x1;   /* Get an even value - is it really needed ??? */
        priv->frag_threshold = fthr;
-       
+
        return -EINPROGRESS;            /* Call commit handler */
 }
 
@@ -2077,21 +2083,21 @@ static int atmel_set_freq(struct net_device *dev,
 {
        struct atmel_private *priv = netdev_priv(dev);
        int rc = -EINPROGRESS;          /* Call commit handler */
-       
+
        /* If setting by frequency, convert to a channel */
-       if((fwrq->e == 1) &&
-          (fwrq->m >= (int) 241200000) &&
-          (fwrq->m <= (int) 248700000)) {
+       if ((fwrq->e == 1) &&
+           (fwrq->m >= (int) 241200000) &&
+           (fwrq->m <= (int) 248700000)) {
                int f = fwrq->m / 100000;
                int c = 0;
-               while((c < 14) && (f != frequency_list[c]))
+               while ((c < 14) && (f != frequency_list[c]))
                        c++;
                /* Hack to fall through... */
                fwrq->e = 0;
                fwrq->m = c + 1;
        }
        /* Setting by channel number */
-       if((fwrq->m > 1000) || (fwrq->e > 0))
+       if ((fwrq->m > 1000) || (fwrq->e > 0))
                rc = -EOPNOTSUPP;
        else {
                int channel = fwrq->m;
@@ -2099,7 +2105,7 @@ static int atmel_set_freq(struct net_device *dev,
                        priv->channel = channel;
                } else {
                        rc = -EINVAL;
-               } 
+               }
        }
        return rc;
 }
@@ -2130,7 +2136,7 @@ static int atmel_set_scan(struct net_device *dev,
         * This is not an error, while the device perform scanning,
         * traffic doesn't flow, so it's a perfect DoS...
         * Jean II */
-       
+
        if (priv->station_state == STATION_STATE_DOWN)
                return -EAGAIN;
 
@@ -2142,15 +2148,15 @@ static int atmel_set_scan(struct net_device *dev,
        /* Initiate a scan command */
        if (priv->site_survey_state == SITE_SURVEY_IN_PROGRESS)
                return -EBUSY;
-               
+
        del_timer_sync(&priv->management_timer);
        spin_lock_irqsave(&priv->irqlock, flags);
-       
+
        priv->site_survey_state = SITE_SURVEY_IN_PROGRESS;
        priv->fast_scan = 0;
        atmel_scan(priv, 0);
        spin_unlock_irqrestore(&priv->irqlock, flags);
-       
+
        return 0;
 }
 
@@ -2163,11 +2169,11 @@ static int atmel_get_scan(struct net_device *dev,
        int i;
        char *current_ev = extra;
        struct iw_event iwe;
-       
+
        if (priv->site_survey_state != SITE_SURVEY_COMPLETED)
                return -EAGAIN;
-       
-       for(i=0; i<priv->BSS_list_entries; i++) { 
+
+       for (i = 0; i < priv->BSS_list_entries; i++) {
                iwe.cmd = SIOCGIWAP;
                iwe.u.ap_addr.sa_family = ARPHRD_ETHER;
                memcpy(iwe.u.ap_addr.sa_data, priv->BSSinfo[i].BSSID, 6);
@@ -2179,16 +2185,16 @@ static int atmel_get_scan(struct net_device *dev,
                iwe.cmd = SIOCGIWESSID;
                iwe.u.data.flags = 1;
                current_ev = iwe_stream_add_point(current_ev, extra + IW_SCAN_MAX_DATA, &iwe, priv->BSSinfo[i].SSID);
-               
+
                iwe.cmd = SIOCGIWMODE;
                iwe.u.mode = priv->BSSinfo[i].BSStype;
                current_ev = iwe_stream_add_event(current_ev, extra + IW_SCAN_MAX_DATA, &iwe, IW_EV_UINT_LEN);
-       
+
                iwe.cmd = SIOCGIWFREQ;
                iwe.u.freq.m = priv->BSSinfo[i].channel;
                iwe.u.freq.e = 0;
                current_ev = iwe_stream_add_event(current_ev, extra + IW_SCAN_MAX_DATA, &iwe, IW_EV_FREQ_LEN);
-               
+
                iwe.cmd = SIOCGIWENCODE;
                if (priv->BSSinfo[i].UsingWEP)
                        iwe.u.data.flags = IW_ENCODE_ENABLED | IW_ENCODE_NOKEY;
@@ -2196,13 +2202,12 @@ static int atmel_get_scan(struct net_device *dev,
                        iwe.u.data.flags = IW_ENCODE_DISABLED;
                iwe.u.data.length = 0;
                current_ev = iwe_stream_add_point(current_ev, extra + IW_SCAN_MAX_DATA, &iwe, NULL);
-               
        }
 
        /* Length of data */
        dwrq->length = (current_ev - extra);
-       dwrq->flags = 0;   
-       
+       dwrq->flags = 0;
+
        return 0;
 }
 
@@ -2213,7 +2218,7 @@ static int atmel_get_range(struct net_device *dev,
 {
        struct atmel_private *priv = netdev_priv(dev);
        struct iw_range *range = (struct iw_range *) extra;
-       int k,i,j;
+       int k, i, j;
 
        dwrq->length = sizeof(struct iw_range);
        memset(range, 0, sizeof(struct iw_range));
@@ -2226,14 +2231,14 @@ static int atmel_get_range(struct net_device *dev,
                        break;
                }
        if (range->num_channels != 0) {
-               for(k = 0, i = channel_table[j].min; i <= channel_table[j].max; i++) {
+               for (k = 0, i = channel_table[j].min; i <= channel_table[j].max; i++) {
                        range->freq[k].i = i; /* List index */
-                       range->freq[k].m = frequency_list[i-1] * 100000;
+                       range->freq[k].m = frequency_list[i - 1] * 100000;
                        range->freq[k++].e = 1; /* Values in table in MHz -> * 10^5 * 10 */
                }
                range->num_frequency = k;
        }
-       
+
        range->max_qual.qual = 100;
        range->max_qual.level = 100;
        range->max_qual.noise = 0;
@@ -2261,11 +2266,11 @@ static int atmel_get_range(struct net_device *dev,
        range->encoding_size[1] = 13;
        range->num_encoding_sizes = 2;
        range->max_encoding_tokens = 4;
-       
+
        range->pmp_flags = IW_POWER_ON;
        range->pmt_flags = IW_POWER_ON;
        range->pm_capa = 0;
-       
+
        range->we_version_source = WIRELESS_EXT;
        range->we_version_compiled = WIRELESS_EXT;
        range->retry_capa = IW_RETRY_LIMIT ;
@@ -2289,7 +2294,7 @@ static int atmel_set_wap(struct net_device *dev,
 
        if (awrq->sa_family != ARPHRD_ETHER)
                return -EINVAL;
-       
+
        if (memcmp(bcast, awrq->sa_data, 6) == 0) {
                del_timer_sync(&priv->management_timer);
                spin_lock_irqsave(&priv->irqlock, flags);
@@ -2297,8 +2302,8 @@ static int atmel_set_wap(struct net_device *dev,
                spin_unlock_irqrestore(&priv->irqlock, flags);
                return 0;
        }
-       
-       for(i=0; i<priv->BSS_list_entries; i++) {
+
+       for (i = 0; i < priv->BSS_list_entries; i++) {
                if (memcmp(priv->BSSinfo[i].BSSID, awrq->sa_data, 6) == 0) {
                        if (!priv->wep_is_on && priv->BSSinfo[i].UsingWEP) {
                                return -EINVAL;
@@ -2313,10 +2318,10 @@ static int atmel_set_wap(struct net_device *dev,
                        }
                }
        }
-               
+
        return -EINVAL;
 }
-       
+
 static int atmel_config_commit(struct net_device *dev,
                               struct iw_request_info *info,    /* NULL */
                               void *zwrq,                      /* NULL */
@@ -2325,18 +2330,18 @@ static int atmel_config_commit(struct net_device *dev,
        return atmel_open(dev);
 }
 
-static const iw_handler                atmel_handler[] =
+static const iw_handler atmel_handler[] =
 {
        (iw_handler) atmel_config_commit,       /* SIOCSIWCOMMIT */
-       (iw_handler) atmel_get_name,            /* SIOCGIWNAME */
+       (iw_handler) atmel_get_name,            /* SIOCGIWNAME */
        (iw_handler) NULL,                      /* SIOCSIWNWID */
        (iw_handler) NULL,                      /* SIOCGIWNWID */
        (iw_handler) atmel_set_freq,            /* SIOCSIWFREQ */
        (iw_handler) atmel_get_freq,            /* SIOCGIWFREQ */
        (iw_handler) atmel_set_mode,            /* SIOCSIWMODE */
        (iw_handler) atmel_get_mode,            /* SIOCGIWMODE */
-       (iw_handler) NULL,                      /* SIOCSIWSENS */
-       (iw_handler) NULL,                      /* SIOCGIWSENS */
+       (iw_handler) NULL,                      /* SIOCSIWSENS */
+       (iw_handler) NULL,                      /* SIOCGIWSENS */
        (iw_handler) NULL,                      /* SIOCSIWRANGE */
        (iw_handler) atmel_get_range,           /* SIOCGIWRANGE */
        (iw_handler) NULL,                      /* SIOCSIWPRIV */
@@ -2350,13 +2355,13 @@ static const iw_handler         atmel_handler[] =
        (iw_handler) atmel_set_wap,             /* SIOCSIWAP */
        (iw_handler) atmel_get_wap,             /* SIOCGIWAP */
        (iw_handler) NULL,                      /* -- hole -- */
-       (iw_handler) NULL,                      /* SIOCGIWAPLIST */
+       (iw_handler) NULL,                      /* SIOCGIWAPLIST */
        (iw_handler) atmel_set_scan,            /* SIOCSIWSCAN */
        (iw_handler) atmel_get_scan,            /* SIOCGIWSCAN */
        (iw_handler) atmel_set_essid,           /* SIOCSIWESSID */
        (iw_handler) atmel_get_essid,           /* SIOCGIWESSID */
-       (iw_handler) NULL,                      /* SIOCSIWNICKN */
-       (iw_handler) NULL,                      /* SIOCGIWNICKN */
+       (iw_handler) NULL,                      /* SIOCSIWNICKN */
+       (iw_handler) NULL,                      /* SIOCGIWNICKN */
        (iw_handler) NULL,                      /* -- hole -- */
        (iw_handler) NULL,                      /* -- hole -- */
        (iw_handler) atmel_set_rate,            /* SIOCSIWRATE */
@@ -2365,8 +2370,8 @@ static const iw_handler           atmel_handler[] =
        (iw_handler) atmel_get_rts,             /* SIOCGIWRTS */
        (iw_handler) atmel_set_frag,            /* SIOCSIWFRAG */
        (iw_handler) atmel_get_frag,            /* SIOCGIWFRAG */
-       (iw_handler) NULL,                      /* SIOCSIWTXPOW */
-       (iw_handler) NULL,                      /* SIOCGIWTXPOW */
+       (iw_handler) NULL,                      /* SIOCSIWTXPOW */
+       (iw_handler) NULL,                      /* SIOCGIWTXPOW */
        (iw_handler) atmel_set_retry,           /* SIOCSIWRETRY */
        (iw_handler) atmel_get_retry,           /* SIOCGIWRETRY */
        (iw_handler) atmel_set_encode,          /* SIOCSIWENCODE */
@@ -2375,39 +2380,51 @@ static const iw_handler         atmel_handler[] =
        (iw_handler) atmel_get_power,           /* SIOCGIWPOWER */
 };
 
-
-static const iw_handler                atmel_private_handler[] =
+static const iw_handler atmel_private_handler[] =
 {
        NULL,                           /* SIOCIWFIRSTPRIV */
 };
 
 typedef struct atmel_priv_ioctl {
        char id[32];
-       unsigned char __user *data;             
-       unsigned short len;             
+       unsigned char __user *data;
+       unsigned short len;
 } atmel_priv_ioctl;
 
-       
-#define ATMELFWL SIOCIWFIRSTPRIV
-#define ATMELIDIFC ATMELFWL + 1
-#define ATMELRD ATMELFWL + 2
-#define ATMELMAGIC 0x51807 
+#define ATMELFWL       SIOCIWFIRSTPRIV
+#define ATMELIDIFC     ATMELFWL + 1
+#define ATMELRD                ATMELFWL + 2
+#define ATMELMAGIC 0x51807
 #define REGDOMAINSZ 20
 
 static const struct iw_priv_args atmel_private_args[] = {
-/*{ cmd,         set_args,                            get_args, name } */
-  { ATMELFWL, IW_PRIV_TYPE_BYTE | IW_PRIV_SIZE_FIXED | sizeof (atmel_priv_ioctl), IW_PRIV_TYPE_NONE, "atmelfwl" },
-  { ATMELIDIFC, IW_PRIV_TYPE_NONE, IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, "atmelidifc" },
-  { ATMELRD, IW_PRIV_TYPE_CHAR | REGDOMAINSZ, IW_PRIV_TYPE_NONE, "regdomain" },
+       {
+               .cmd = ATMELFWL,
+               .set_args = IW_PRIV_TYPE_BYTE
+                               | IW_PRIV_SIZE_FIXED
+                               | sizeof (atmel_priv_ioctl),
+               .get_args = IW_PRIV_TYPE_NONE,
+               .name = "atmelfwl"
+       }, {
+               .cmd = ATMELIDIFC,
+               .set_args = IW_PRIV_TYPE_NONE,
+               .get_args = IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1,
+               .name = "atmelidifc"
+       }, {
+               .cmd = ATMELRD,
+               .set_args = IW_PRIV_TYPE_CHAR | REGDOMAINSZ,
+               .get_args = IW_PRIV_TYPE_NONE,
+               .name = "regdomain"
+       },
 };
 
-static const struct iw_handler_def     atmel_handler_def =
+static const struct iw_handler_def atmel_handler_def =
 {
        .num_standard   = sizeof(atmel_handler)/sizeof(iw_handler),
-       .num_private    = sizeof(atmel_private_handler)/sizeof(iw_handler), 
-       .num_private_args = sizeof(atmel_private_args)/sizeof(struct iw_priv_args), 
+       .num_private    = sizeof(atmel_private_handler)/sizeof(iw_handler),
+       .num_private_args = sizeof(atmel_private_args)/sizeof(struct iw_priv_args),
        .standard       = (iw_handler *) atmel_handler,
-       .private        = (iw_handler *) atmel_private_handler, 
+       .private        = (iw_handler *) atmel_private_handler,
        .private_args   = (struct iw_priv_args *) atmel_private_args,
        .get_wireless_stats = atmel_get_wireless_stats
 };
@@ -2419,13 +2436,13 @@ static int atmel_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
        atmel_priv_ioctl com;
        struct iwreq *wrq = (struct iwreq *) rq;
        unsigned char *new_firmware;
-       char domain[REGDOMAINSZ+1];
+       char domain[REGDOMAINSZ + 1];
 
        switch (cmd) {
        case ATMELIDIFC:
-               wrq->u.param.value = ATMELMAGIC;                
+               wrq->u.param.value = ATMELMAGIC;
                break;
-       
+
        case ATMELFWL:
                if (copy_from_user(&com, rq->ifr_data, sizeof(com))) {
                        rc = -EFAULT;
@@ -2449,7 +2466,7 @@ static int atmel_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
                }
 
                kfree(priv->firmware);
-               
+
                priv->firmware = new_firmware;
                priv->firmware_length = com.len;
                strncpy(priv->firmware_id, com.id, 31);
@@ -2461,7 +2478,7 @@ static int atmel_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
                        rc = -EFAULT;
                        break;
                }
-               
+
                if (!capable(CAP_NET_ADMIN)) {
                        rc = -EPERM;
                        break;
@@ -2484,15 +2501,15 @@ static int atmel_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
                                rc = 0;
                        }
                }
-               
+
                if (rc == 0 &&  priv->station_state != STATION_STATE_DOWN)
                        rc = atmel_open(dev);
                break;
-               
+
        default:
                rc = -EOPNOTSUPP;
        }
-       
+
        return rc;
 }
 
@@ -2503,17 +2520,17 @@ struct auth_body {
        u8 el_id;
        u8 chall_text_len;
        u8 chall_text[253];
-}; 
+};
 
 static void atmel_enter_state(struct atmel_private *priv, int new_state)
 {
        int old_state = priv->station_state;
-               
+
        if (new_state == old_state)
                return;
-       
+
        priv->station_state = new_state;
-               
+
        if (new_state == STATION_STATE_READY) {
                netif_start_queue(priv->dev);
                netif_carrier_on(priv->dev);
@@ -2540,7 +2557,7 @@ static void atmel_scan(struct atmel_private *priv, int specific_ssid)
                u8 options;
                u8 SSID_size;
        } cmd;
-       
+
        memset(cmd.BSSID, 0xff, 6);
 
        if (priv->fast_scan) {
@@ -2554,17 +2571,17 @@ static void atmel_scan(struct atmel_private *priv, int specific_ssid)
                cmd.min_channel_time = cpu_to_le16(10);
                cmd.max_channel_time = cpu_to_le16(120);
        }
-       
+
        cmd.options = 0;
-       
+
        if (!specific_ssid)
                cmd.options |= SCAN_OPTIONS_SITE_SURVEY;
-       
-       cmd.channel = (priv->channel & 0x7f); 
+
+       cmd.channel = (priv->channel & 0x7f);
        cmd.scan_type = SCAN_TYPE_ACTIVE;
-       cmd.BSS_type = cpu_to_le16(priv->operating_mode == IW_MODE_ADHOC ? 
+       cmd.BSS_type = cpu_to_le16(priv->operating_mode == IW_MODE_ADHOC ?
                BSS_TYPE_AD_HOC : BSS_TYPE_INFRASTRUCTURE);
-       
+
        atmel_send_command(priv, CMD_Scan, &cmd, sizeof(cmd));
 
        /* This must come after all hardware access to avoid being messed up
@@ -2591,16 +2608,15 @@ static void join(struct atmel_private *priv, int type)
        cmd.BSS_type = type;
        cmd.timeout = cpu_to_le16(2000);
 
-       atmel_send_command(priv, CMD_Join, &cmd, sizeof(cmd));
+       atmel_send_command(priv, CMD_Join, &cmd, sizeof(cmd));
 }
 
-
 static void start(struct atmel_private *priv, int type)
 {
        struct {
                u8 BSSID[6];
                u8 SSID[MAX_SSID_LENGTH];
-               u8 BSS_type;                                
+               u8 BSS_type;
                u8 channel;
                u8 SSID_size;
                u8 reserved[3];
@@ -2612,13 +2628,14 @@ static void start(struct atmel_private *priv, int type)
        cmd.BSS_type = type;
        cmd.channel = (priv->channel & 0x7f);
 
-       atmel_send_command(priv, CMD_Start, &cmd, sizeof(cmd)); 
+       atmel_send_command(priv, CMD_Start, &cmd, sizeof(cmd));
 }
 
-static void handle_beacon_probe(struct atmel_private *priv, u16 capability, u8 channel)
+static void handle_beacon_probe(struct atmel_private *priv, u16 capability,
+                               u8 channel)
 {
        int rejoin = 0;
-       int new = capability  & C80211_MGMT_CAPABILITY_ShortPreamble ? 
+       int new = capability  & C80211_MGMT_CAPABILITY_ShortPreamble ?
                SHORT_PREAMBLE : LONG_PREAMBLE;
 
        if (priv->preamble != new) {
@@ -2626,48 +2643,48 @@ static void handle_beacon_probe(struct atmel_private *priv, u16 capability, u8 c
                rejoin = 1;
                atmel_set_mib8(priv, Local_Mib_Type, LOCAL_MIB_PREAMBLE_TYPE, new);
        }
-               
+
        if (priv->channel != channel) {
                priv->channel = channel;
                rejoin = 1;
                atmel_set_mib8(priv, Phy_Mib_Type, PHY_MIB_CHANNEL_POS, channel);
        }
-       
+
        if (rejoin) {
                priv->station_is_associated = 0;
                atmel_enter_state(priv, STATION_STATE_JOINNING);
-               
+
                if (priv->operating_mode == IW_MODE_INFRA)
                        join(priv, BSS_TYPE_INFRASTRUCTURE);
-               else 
+               else
                        join(priv, BSS_TYPE_AD_HOC);
-       } 
+       }
 }
 
-
-static void send_authentication_request(struct atmel_private *priv, u16 system, u8 *challenge, int challenge_len)
+static void send_authentication_request(struct atmel_private *priv, u16 system,
+                                       u8 *challenge, int challenge_len)
 {
        struct ieee80211_hdr_4addr header;
        struct auth_body auth;
-       
-       header.frame_ctl = cpu_to_le16(IEEE80211_FTYPE_MGMT | IEEE80211_STYPE_AUTH); 
-       header.duration_id      = cpu_to_le16(0x8000);  
+
+       header.frame_ctl = cpu_to_le16(IEEE80211_FTYPE_MGMT | IEEE80211_STYPE_AUTH);
+       header.duration_id = cpu_to_le16(0x8000);
        header.seq_ctl = 0;
        memcpy(header.addr1, priv->CurrentBSSID, 6);
        memcpy(header.addr2, priv->dev->dev_addr, 6);
        memcpy(header.addr3, priv->CurrentBSSID, 6);
-       
-       if (priv->wep_is_on && priv->CurrentAuthentTransactionSeqNum != 1) 
+
+       if (priv->wep_is_on && priv->CurrentAuthentTransactionSeqNum != 1)
                /* no WEP for authentication frames with TrSeqNo 1 */
                 header.frame_ctl |=  cpu_to_le16(IEEE80211_FCTL_PROTECTED);
-       
-       auth.alg = cpu_to_le16(system); 
+
+       auth.alg = cpu_to_le16(system);
 
        auth.status = 0;
        auth.trans_seq = cpu_to_le16(priv->CurrentAuthentTransactionSeqNum);
-       priv->ExpectedAuthentTransactionSeqNum = priv->CurrentAuthentTransactionSeqNum+1; 
+       priv->ExpectedAuthentTransactionSeqNum = priv->CurrentAuthentTransactionSeqNum+1;
        priv->CurrentAuthentTransactionSeqNum += 2;
-       
+
        if (challenge_len != 0) {
                auth.el_id = 16; /* challenge_text */
                auth.chall_text_len = challenge_len;
@@ -2685,7 +2702,7 @@ static void send_association_request(struct atmel_private *priv, int is_reassoc)
        struct ieee80211_hdr_4addr header;
        struct ass_req_format {
                u16 capability;
-               u16 listen_interval; 
+               u16 listen_interval;
                u8 ap[6]; /* nothing after here directly accessible */
                u8 ssid_el_id;
                u8 ssid_len;
@@ -2694,15 +2711,15 @@ static void send_association_request(struct atmel_private *priv, int is_reassoc)
                u8 sup_rates_len;
                u8 rates[4];
        } body;
-               
-       header.frame_ctl = cpu_to_le16(IEEE80211_FTYPE_MGMT | 
+
+       header.frame_ctl = cpu_to_le16(IEEE80211_FTYPE_MGMT |
                (is_reassoc ? IEEE80211_STYPE_REASSOC_REQ : IEEE80211_STYPE_ASSOC_REQ));
        header.duration_id = cpu_to_le16(0x8000);
        header.seq_ctl = 0;
 
-       memcpy(header.addr1, priv->CurrentBSSID, 6); 
+       memcpy(header.addr1, priv->CurrentBSSID, 6);
        memcpy(header.addr2, priv->dev->dev_addr, 6);
-       memcpy(header.addr3, priv->CurrentBSSID, 6); 
+       memcpy(header.addr3, priv->CurrentBSSID, 6);
 
        body.capability = cpu_to_le16(C80211_MGMT_CAPABILITY_ESS);
        if (priv->wep_is_on)
@@ -2711,18 +2728,18 @@ static void send_association_request(struct atmel_private *priv, int is_reassoc)
                body.capability |= cpu_to_le16(C80211_MGMT_CAPABILITY_ShortPreamble);
 
        body.listen_interval = cpu_to_le16(priv->listen_interval * priv->beacon_period);
-       
+
        /* current AP address - only in reassoc frame */
        if (is_reassoc) {
-               memcpy(body.ap,  priv->CurrentBSSID, 6);
+               memcpy(body.ap, priv->CurrentBSSID, 6);
                ssid_el_p = (u8 *)&body.ssid_el_id;
                bodysize = 18 + priv->SSID_size;
        } else {
                ssid_el_p = (u8 *)&body.ap[0];
                bodysize = 12 + priv->SSID_size;
        }
-               
-       ssid_el_p[0]= C80211_MGMT_ElementID_SSID;
+
+       ssid_el_p[0] = C80211_MGMT_ElementID_SSID;
        ssid_el_p[1] = priv->SSID_size;
        memcpy(ssid_el_p + 2, priv->SSID, priv->SSID_size);
        ssid_el_p[2 + priv->SSID_size] = C80211_MGMT_ElementID_SupportedRates;
@@ -2732,7 +2749,8 @@ static void send_association_request(struct atmel_private *priv, int is_reassoc)
        atmel_transmit_management_frame(priv, &header, (void *)&body, bodysize);
 }
 
-static int is_frame_from_current_bss(struct atmel_private *priv, struct ieee80211_hdr_4addr *header)
+static int is_frame_from_current_bss(struct atmel_private *priv,
+                                    struct ieee80211_hdr_4addr *header)
 {
        if (le16_to_cpu(header->frame_ctl) & IEEE80211_FCTL_FROMDS)
                return memcmp(header->addr3, priv->CurrentBSSID, 6) == 0;
@@ -2745,29 +2763,29 @@ static int retrieve_bss(struct atmel_private *priv)
        int i;
        int max_rssi = -128;
        int max_index = -1;
-       
+
        if (priv->BSS_list_entries == 0)
                return -1;
-                       
+
        if (priv->connect_to_any_BSS) {
-               /* Select a BSS with the max-RSSI but of the same type and of the same WEP mode
-                  and that it is not marked as 'bad' (i.e. we had previously failed to connect to
-                  this BSS with the settings that we currently use) */
+               /* Select a BSS with the max-RSSI but of the same type and of
+                  the same WEP mode and that it is not marked as 'bad' (i.e.
+                  we had previously failed to connect to this BSS with the
+                  settings that we currently use) */
                priv->current_BSS = 0;
-               for(i=0; i<priv->BSS_list_entries; i++) { 
+               for (i = 0; i < priv->BSS_list_entries; i++) {
                        if (priv->operating_mode == priv->BSSinfo[i].BSStype &&
-                           ((!priv->wep_is_on && !priv->BSSinfo[i].UsingWEP) || 
+                           ((!priv->wep_is_on && !priv->BSSinfo[i].UsingWEP) ||
                             (priv->wep_is_on && priv->BSSinfo[i].UsingWEP)) &&
                            !(priv->BSSinfo[i].channel & 0x80)) {
                                max_rssi = priv->BSSinfo[i].RSSI;
                                priv->current_BSS = max_index = i;
                        }
-                       
                }
                return max_index;
        }
-               
-       for(i=0; i<priv->BSS_list_entries; i++) {
+
+       for (i = 0; i < priv->BSS_list_entries; i++) {
                if (priv->SSID_size == priv->BSSinfo[i].SSIDsize &&
                    memcmp(priv->SSID, priv->BSSinfo[i].SSID, priv->SSID_size) == 0 &&
                    priv->operating_mode == priv->BSSinfo[i].BSStype &&
@@ -2781,19 +2799,19 @@ static int retrieve_bss(struct atmel_private *priv)
        return max_index;
 }
 
-
-static void store_bss_info(struct atmel_private *priv, struct ieee80211_hdr_4addr *header,
-                          u16 capability, u16 beacon_period, u8 channel, u8 rssi, 
-                          u8 ssid_len, u8 *ssid, int is_beacon)
+static void store_bss_info(struct atmel_private *priv,
+                          struct ieee80211_hdr_4addr *header, u16 capability,
+                          u16 beacon_period, u8 channel, u8 rssi, u8 ssid_len,
+                          u8 *ssid, int is_beacon)
 {
        u8 *bss = capability & C80211_MGMT_CAPABILITY_ESS ? header->addr2 : header->addr3;
        int i, index;
-               
-       for (index = -1, i = 0; i < priv->BSS_list_entries; i++) 
-               if (memcmp(bss, priv->BSSinfo[i].BSSID, 6) == 0) 
+
+       for (index = -1, i = 0; i < priv->BSS_list_entries; i++)
+               if (memcmp(bss, priv->BSSinfo[i].BSSID, 6) == 0)
                        index = i;
 
-        /* If we process a probe and an entry from this BSS exists 
+        /* If we process a probe and an entry from this BSS exists
           we will update the BSS entry with the info from this BSS.
           If we process a beacon we will only update RSSI */
 
@@ -2820,8 +2838,8 @@ static void store_bss_info(struct atmel_private *priv, struct ieee80211_hdr_4add
                priv->BSSinfo[index].BSStype = IW_MODE_ADHOC;
        else if (capability & C80211_MGMT_CAPABILITY_ESS)
                priv->BSSinfo[index].BSStype =IW_MODE_INFRA;
-       
-       priv->BSSinfo[index].preamble = capability  & C80211_MGMT_CAPABILITY_ShortPreamble ? 
+
+       priv->BSSinfo[index].preamble = capability & C80211_MGMT_CAPABILITY_ShortPreamble ?
                SHORT_PREAMBLE : LONG_PREAMBLE;
 }
 
@@ -2831,8 +2849,8 @@ static void authenticate(struct atmel_private *priv, u16 frame_len)
        u16 status = le16_to_cpu(auth->status);
        u16 trans_seq_no = le16_to_cpu(auth->trans_seq);
        u16 system = le16_to_cpu(auth->alg);
-       
-       if (status == C80211_MGMT_SC_Success && !priv->wep_is_on) { 
+
+       if (status == C80211_MGMT_SC_Success && !priv->wep_is_on) {
                /* no WEP */
                if (priv->station_was_associated) {
                        atmel_enter_state(priv, STATION_STATE_REASSOCIATING);
@@ -2842,20 +2860,20 @@ static void authenticate(struct atmel_private *priv, u16 frame_len)
                        atmel_enter_state(priv, STATION_STATE_ASSOCIATING);
                        send_association_request(priv, 0);
                        return;
-               } 
+               }
        }
-               
-       if (status == C80211_MGMT_SC_Success && priv->wep_is_on) { 
+
+       if (status == C80211_MGMT_SC_Success && priv->wep_is_on) {
                /* WEP */
                if (trans_seq_no != priv->ExpectedAuthentTransactionSeqNum)
                        return;
-                               
+
                if (trans_seq_no == 0x0002 &&
                    auth->el_id == C80211_MGMT_ElementID_ChallengeText) {
                        send_authentication_request(priv, system, auth->chall_text, auth->chall_text_len);
                        return;
                }
-               
+
                if (trans_seq_no == 0x0004) {
                        if(priv->station_was_associated) {
                                atmel_enter_state(priv, STATION_STATE_REASSOCIATING);
@@ -2865,10 +2883,10 @@ static void authenticate(struct atmel_private *priv, u16 frame_len)
                                atmel_enter_state(priv, STATION_STATE_ASSOCIATING);
                                send_association_request(priv, 0);
                                return;
-                       } 
+                       }
                }
-       }                       
-       
+       }
+
        if (status == C80211_MGMT_SC_AuthAlgNotSupported) {
                /* Do opensystem first, then try sharedkey */
                if (system ==  C80211_MGMT_AAN_OPENSYSTEM) {
@@ -2876,17 +2894,16 @@ static void authenticate(struct atmel_private *priv, u16 frame_len)
                        send_authentication_request(priv, C80211_MGMT_AAN_SHAREDKEY, NULL, 0);
                } else if (priv->connect_to_any_BSS) {
                        int bss_index;
-                       
+
                        priv->BSSinfo[(int)(priv->current_BSS)].channel |= 0x80;
-                       
+
                        if ((bss_index  = retrieve_bss(priv)) != -1) {
                                atmel_join_bss(priv, bss_index);
                                return;
                        }
                }
        }
-       
-       
+
        priv->AuthenticationRequestRetryCnt = 0;
        atmel_enter_state(priv,  STATION_STATE_MGMT_ERROR);
        priv->station_is_associated = 0;
@@ -2902,38 +2919,44 @@ static void associate(struct atmel_private *priv, u16 frame_len, u16 subtype)
                u8 length;
                u8 rates[4];
        } *ass_resp = (struct ass_resp_format *)priv->rx_buf;
-       
-               u16 status = le16_to_cpu(ass_resp->status);
+
+       u16 status = le16_to_cpu(ass_resp->status);
        u16 ass_id = le16_to_cpu(ass_resp->ass_id);
-       u16 rates_len = ass_resp->length > 4 ? 4 : ass_resp->length;
-       
+       u16 rates_len = ass_resp->length > 4 ? 4 : ass_resp->length;
+
        if (frame_len < 8 + rates_len)
                return;
-       
+
        if (status == C80211_MGMT_SC_Success) {
                if (subtype == C80211_SUBTYPE_MGMT_ASS_RESPONSE)
                        priv->AssociationRequestRetryCnt = 0;
                else
                        priv->ReAssociationRequestRetryCnt = 0;
-               
-               atmel_set_mib16(priv, Mac_Mgmt_Mib_Type, MAC_MGMT_MIB_STATION_ID_POS, ass_id & 0x3fff);
-               atmel_set_mib(priv, Phy_Mib_Type, PHY_MIB_RATE_SET_POS, ass_resp->rates, rates_len);
+
+               atmel_set_mib16(priv, Mac_Mgmt_Mib_Type,
+                               MAC_MGMT_MIB_STATION_ID_POS, ass_id & 0x3fff);
+               atmel_set_mib(priv, Phy_Mib_Type,
+                             PHY_MIB_RATE_SET_POS, ass_resp->rates, rates_len);
                if (priv->power_mode == 0) {
                        priv->listen_interval = 1;
-                       atmel_set_mib8(priv, Mac_Mgmt_Mib_Type, MAC_MGMT_MIB_PS_MODE_POS,  ACTIVE_MODE);
-                       atmel_set_mib16(priv, Mac_Mgmt_Mib_Type, MAC_MGMT_MIB_LISTEN_INTERVAL_POS, 1);
+                       atmel_set_mib8(priv, Mac_Mgmt_Mib_Type,
+                                      MAC_MGMT_MIB_PS_MODE_POS, ACTIVE_MODE);
+                       atmel_set_mib16(priv, Mac_Mgmt_Mib_Type,
+                                       MAC_MGMT_MIB_LISTEN_INTERVAL_POS, 1);
                } else {
                        priv->listen_interval = 2;
-                       atmel_set_mib8(priv, Mac_Mgmt_Mib_Type, MAC_MGMT_MIB_PS_MODE_POS,  PS_MODE);
-                       atmel_set_mib16(priv, Mac_Mgmt_Mib_Type, MAC_MGMT_MIB_LISTEN_INTERVAL_POS, 2);
+                       atmel_set_mib8(priv, Mac_Mgmt_Mib_Type,
+                                      MAC_MGMT_MIB_PS_MODE_POS,  PS_MODE);
+                       atmel_set_mib16(priv, Mac_Mgmt_Mib_Type,
+                                       MAC_MGMT_MIB_LISTEN_INTERVAL_POS, 2);
                }
-               
+
                priv->station_is_associated = 1;
                priv->station_was_associated = 1;
                atmel_enter_state(priv, STATION_STATE_READY);
                return;
        }
-       
+
        if (subtype == C80211_SUBTYPE_MGMT_ASS_RESPONSE &&
            status != C80211_MGMT_SC_AssDeniedBSSRate &&
            status != C80211_MGMT_SC_SupportCapabilities &&
@@ -2943,7 +2966,7 @@ static void associate(struct atmel_private *priv, u16 frame_len, u16 subtype)
                send_association_request(priv, 0);
                return;
        }
-               
+
        if (subtype == C80211_SUBTYPE_MGMT_REASS_RESPONSE &&
            status != C80211_MGMT_SC_AssDeniedBSSRate &&
            status != C80211_MGMT_SC_SupportCapabilities &&
@@ -2953,17 +2976,16 @@ static void associate(struct atmel_private *priv, u16 frame_len, u16 subtype)
                send_association_request(priv, 1);
                return;
        }
-       
+
        atmel_enter_state(priv,  STATION_STATE_MGMT_ERROR);
        priv->station_is_associated = 0;
-       
-       if(priv->connect_to_any_BSS) {
+
+       if (priv->connect_to_any_BSS) {
                int bss_index;
                priv->BSSinfo[(int)(priv->current_BSS)].channel |= 0x80;
-               
-               if ((bss_index = retrieve_bss(priv)) != -1) 
+
+               if ((bss_index = retrieve_bss(priv)) != -1)
                        atmel_join_bss(priv, bss_index);
-               
        }
 }
 
@@ -2977,7 +2999,7 @@ void atmel_join_bss(struct atmel_private *priv, int bss_index)
        /* The WPA stuff cares about the current AP address */
        if (priv->use_wpa)
                build_wpa_mib(priv);
-       
+
        /* When switching to AdHoc turn OFF Power Save if needed */
 
        if (bss->BSStype == IW_MODE_ADHOC &&
@@ -2985,25 +3007,28 @@ void atmel_join_bss(struct atmel_private *priv, int bss_index)
            priv->power_mode) {
                priv->power_mode = 0;
                priv->listen_interval = 1;
-               atmel_set_mib8(priv, Mac_Mgmt_Mib_Type, MAC_MGMT_MIB_PS_MODE_POS,  ACTIVE_MODE);
-               atmel_set_mib16(priv, Mac_Mgmt_Mib_Type, MAC_MGMT_MIB_LISTEN_INTERVAL_POS, 1);
+               atmel_set_mib8(priv, Mac_Mgmt_Mib_Type,
+                              MAC_MGMT_MIB_PS_MODE_POS,  ACTIVE_MODE);
+               atmel_set_mib16(priv, Mac_Mgmt_Mib_Type,
+                               MAC_MGMT_MIB_LISTEN_INTERVAL_POS, 1);
        }
-               
+
        priv->operating_mode = bss->BSStype;
-       priv->channel = bss->channel & 0x7f;    
+       priv->channel = bss->channel & 0x7f;
        priv->beacon_period = bss->beacon_period;
-       
+
        if (priv->preamble != bss->preamble) {
                priv->preamble = bss->preamble;
-               atmel_set_mib8(priv, Local_Mib_Type, LOCAL_MIB_PREAMBLE_TYPE, bss->preamble);
+               atmel_set_mib8(priv, Local_Mib_Type,
+                              LOCAL_MIB_PREAMBLE_TYPE, bss->preamble);
        }
-       
+
        if (!priv->wep_is_on && bss->UsingWEP) {
                atmel_enter_state(priv, STATION_STATE_MGMT_ERROR);
                priv->station_is_associated = 0;
                return;
        }
-               
+
        if (priv->wep_is_on && !bss->UsingWEP) {
                atmel_enter_state(priv, STATION_STATE_MGMT_ERROR);
                priv->station_is_associated = 0;
@@ -3011,30 +3036,28 @@ void atmel_join_bss(struct atmel_private *priv, int bss_index)
        }
 
        atmel_enter_state(priv, STATION_STATE_JOINNING);
-       
+
        if (priv->operating_mode == IW_MODE_INFRA)
                join(priv, BSS_TYPE_INFRASTRUCTURE);
-       else 
+       else
                join(priv, BSS_TYPE_AD_HOC);
 }
 
-
 static void restart_search(struct atmel_private *priv)
 {
        int bss_index;
-       
+
        if (!priv->connect_to_any_BSS) {
                atmel_scan(priv, 1);
        } else {
                priv->BSSinfo[(int)(priv->current_BSS)].channel |= 0x80;
-               
-               if ((bss_index = retrieve_bss(priv)) != -1) 
+
+               if ((bss_index = retrieve_bss(priv)) != -1)
                        atmel_join_bss(priv, bss_index);
                else
                        atmel_scan(priv, 0);
-               
-       } 
-}      
+       }
+}
 
 static void smooth_rssi(struct atmel_private *priv, u8 rssi)
 {
@@ -3050,21 +3073,21 @@ static void smooth_rssi(struct atmel_private *priv, u8 rssi)
        }
 
        rssi = rssi * 100 / max_rssi;
-       if((rssi + old) % 2)
-               priv->wstats.qual.level =  ((rssi + old)/2) + 1;
+       if ((rssi + old) % 2)
+               priv->wstats.qual.level = (rssi + old) / 2 + 1;
        else
-               priv->wstats.qual.level =  ((rssi + old)/2);            
+               priv->wstats.qual.level = (rssi + old) / 2;
        priv->wstats.qual.updated |= IW_QUAL_LEVEL_UPDATED;
        priv->wstats.qual.updated &= ~IW_QUAL_LEVEL_INVALID;
 }
 
 static void atmel_smooth_qual(struct atmel_private *priv)
 {
-       unsigned long time_diff = (jiffies - priv->last_qual)/HZ;
+       unsigned long time_diff = (jiffies - priv->last_qual) / HZ;
        while (time_diff--) {
                priv->last_qual += HZ;
-               priv->wstats.qual.qual = priv->wstats.qual.qual/2;
-               priv->wstats.qual.qual += 
+               priv->wstats.qual.qual = priv->wstats.qual.qual / 2;
+               priv->wstats.qual.qual +=
                        priv->beacons_this_sec * priv->beacon_period * (priv->wstats.qual.level + 100) / 4000;
                priv->beacons_this_sec = 0;
        }
@@ -3073,15 +3096,17 @@ static void atmel_smooth_qual(struct atmel_private *priv)
 }
 
 /* deals with incoming managment frames. */
-static void atmel_management_frame(struct atmel_private *priv, struct ieee80211_hdr_4addr *header, 
-                     u16 frame_len, u8 rssi)
+static void atmel_management_frame(struct atmel_private *priv,
+                                  struct ieee80211_hdr_4addr *header,
+                                  u16 frame_len, u8 rssi)
 {
        u16 subtype;
-       
-       switch (subtype = le16_to_cpu(header->frame_ctl) & IEEE80211_FCTL_STYPE) {
-       case C80211_SUBTYPE_MGMT_BEACON :
+
+       subtype = le16_to_cpu(header->frame_ctl) & IEEE80211_FCTL_STYPE;
+       switch (subtype) {
+       case C80211_SUBTYPE_MGMT_BEACON:
        case C80211_SUBTYPE_MGMT_ProbeResponse:
-               
+
                /* beacon frame has multiple variable-length fields -
                   never let an engineer loose with a data structure design. */
                {
@@ -3099,7 +3124,7 @@ static void atmel_management_frame(struct atmel_private *priv, struct ieee80211_
                                u8 ds_length;
                                /* ds here */
                        } *beacon = (struct beacon_format *)priv->rx_buf;
-                       
+
                        u8 channel, rates_length, ssid_length;
                        u64 timestamp = le64_to_cpu(beacon->timestamp);
                        u16 beacon_interval = le16_to_cpu(beacon->interval);
@@ -3107,7 +3132,7 @@ static void atmel_management_frame(struct atmel_private *priv, struct ieee80211_
                        u8 *beaconp = priv->rx_buf;
                        ssid_length = beacon->ssid_length;
                        /* this blows chunks. */
-                       if (frame_len < 14 || frame_len < ssid_length + 15) 
+                       if (frame_len < 14 || frame_len < ssid_length + 15)
                                return;
                        rates_length = beaconp[beacon->ssid_length + 15];
                        if (frame_len < ssid_length + rates_length + 18)
@@ -3115,10 +3140,10 @@ static void atmel_management_frame(struct atmel_private *priv, struct ieee80211_
                        if (ssid_length >  MAX_SSID_LENGTH)
                                return;
                        channel = beaconp[ssid_length + rates_length + 18];
-                      
+
                        if (priv->station_state == STATION_STATE_READY) {
                                smooth_rssi(priv, rssi);
-                               if (is_frame_from_current_bss(priv, header)) { 
+                               if (is_frame_from_current_bss(priv, header)) {
                                        priv->beacons_this_sec++;
                                        atmel_smooth_qual(priv);
                                        if (priv->last_beacon_timestamp) {
@@ -3132,41 +3157,43 @@ static void atmel_management_frame(struct atmel_private *priv, struct ieee80211_
                                        handle_beacon_probe(priv, capability, channel);
                                }
                        }
-                       
-                       if (priv->station_state == STATION_STATE_SCANNING ) 
-                               store_bss_info(priv, header, capability, beacon_interval, channel,
-                                              rssi, ssid_length, &beacon->rates_el_id,
-                                              subtype == C80211_SUBTYPE_MGMT_BEACON) ;
+
+                       if (priv->station_state == STATION_STATE_SCANNING)
+                               store_bss_info(priv, header, capability,
+                                              beacon_interval, channel, rssi,
+                                              ssid_length,
+                                              &beacon->rates_el_id,
+                                              subtype == C80211_SUBTYPE_MGMT_BEACON);
                }
                break;
-               
+
        case C80211_SUBTYPE_MGMT_Authentication:
 
                if (priv->station_state == STATION_STATE_AUTHENTICATING)
                        authenticate(priv, frame_len);
-       
+
                break;
-               
+
        case C80211_SUBTYPE_MGMT_ASS_RESPONSE:
        case C80211_SUBTYPE_MGMT_REASS_RESPONSE:
-               
-               if (priv->station_state == STATION_STATE_ASSOCIATING || 
+
+               if (priv->station_state == STATION_STATE_ASSOCIATING ||
                    priv->station_state == STATION_STATE_REASSOCIATING)
                        associate(priv, frame_len, subtype);
-               
+
                break;
 
        case C80211_SUBTYPE_MGMT_DISASSOSIATION:
-               if (priv->station_is_associated && 
-                   priv->operating_mode == IW_MODE_INFRA && 
+               if (priv->station_is_associated &&
+                   priv->operating_mode == IW_MODE_INFRA &&
                    is_frame_from_current_bss(priv, header)) {
                        priv->station_was_associated = 0;
                        priv->station_is_associated = 0;
-                       
+
                        atmel_enter_state(priv, STATION_STATE_JOINNING);
                        join(priv, BSS_TYPE_INFRASTRUCTURE);
                }
-               
+
                break;
 
        case C80211_SUBTYPE_MGMT_Deauthentication:
@@ -3177,7 +3204,7 @@ static void atmel_management_frame(struct atmel_private *priv, struct ieee80211_
                        atmel_enter_state(priv, STATION_STATE_JOINNING);
                        join(priv, BSS_TYPE_INFRASTRUCTURE);
                }
-               
+
                break;
        }
 }
@@ -3185,76 +3212,73 @@ static void atmel_management_frame(struct atmel_private *priv, struct ieee80211_
 /* run when timer expires */
 static void atmel_management_timer(u_long a)
 {
-  struct net_device *dev = (struct net_device *) a;
-  struct atmel_private *priv = netdev_priv(dev);
-  unsigned long flags;
-  
-  /* Check if the card has been yanked. */
-  if (priv->card && priv->present_callback && 
-      !(*priv->present_callback)(priv->card))
-         return;
-  
-  spin_lock_irqsave(&priv->irqlock, flags);
-
-  switch (priv->station_state) {
-         
-  case STATION_STATE_AUTHENTICATING:
-         if (priv->AuthenticationRequestRetryCnt >= MAX_AUTHENTICATION_RETRIES) {
-                 atmel_enter_state(priv, STATION_STATE_MGMT_ERROR);
-                 priv->station_is_associated = 0;
-                 priv->AuthenticationRequestRetryCnt = 0;
-                 restart_search(priv);
-         } else {
-                 priv->AuthenticationRequestRetryCnt++;
-                 priv->CurrentAuthentTransactionSeqNum = 0x0001;
-                 mod_timer(&priv->management_timer, jiffies + MGMT_JIFFIES);
-                 send_authentication_request(priv, C80211_MGMT_AAN_OPENSYSTEM, NULL, 0);
-         }
-         
-         break;
+       struct net_device *dev = (struct net_device *) a;
+       struct atmel_private *priv = netdev_priv(dev);
+       unsigned long flags;
 
-  case STATION_STATE_ASSOCIATING:
-         if (priv->AssociationRequestRetryCnt == MAX_ASSOCIATION_RETRIES) {
-                 atmel_enter_state(priv, STATION_STATE_MGMT_ERROR);
-                 priv->station_is_associated = 0;
-                 priv->AssociationRequestRetryCnt = 0;
-                 restart_search(priv);
-         } else {
-                 priv->AssociationRequestRetryCnt++;
-                 mod_timer(&priv->management_timer, jiffies + MGMT_JIFFIES);
-                 send_association_request(priv, 0);
-         }
+       /* Check if the card has been yanked. */
+       if (priv->card && priv->present_callback &&
+               !(*priv->present_callback)(priv->card))
+               return;
 
-         break;
-                 
-  case STATION_STATE_REASSOCIATING:    
-         if (priv->ReAssociationRequestRetryCnt == MAX_ASSOCIATION_RETRIES) {
-                 atmel_enter_state(priv, STATION_STATE_MGMT_ERROR);
-                 priv->station_is_associated = 0;
-                 priv->ReAssociationRequestRetryCnt = 0;
-                 restart_search(priv);
-         } else {
-                 priv->ReAssociationRequestRetryCnt++;
-                 mod_timer(&priv->management_timer, jiffies + MGMT_JIFFIES);
-                 send_association_request(priv, 1);
-         }
+       spin_lock_irqsave(&priv->irqlock, flags);
+
+       switch (priv->station_state) {
 
+       case STATION_STATE_AUTHENTICATING:
+               if (priv->AuthenticationRequestRetryCnt >= MAX_AUTHENTICATION_RETRIES) {
+                       atmel_enter_state(priv, STATION_STATE_MGMT_ERROR);
+                       priv->station_is_associated = 0;
+                       priv->AuthenticationRequestRetryCnt = 0;
+                       restart_search(priv);
+               } else {
+                       priv->AuthenticationRequestRetryCnt++;
+                       priv->CurrentAuthentTransactionSeqNum = 0x0001;
+                       mod_timer(&priv->management_timer, jiffies + MGMT_JIFFIES);
+                       send_authentication_request(priv, C80211_MGMT_AAN_OPENSYSTEM, NULL, 0);
+         }
          break;
-  
-  default:
+
+       case STATION_STATE_ASSOCIATING:
+               if (priv->AssociationRequestRetryCnt == MAX_ASSOCIATION_RETRIES) {
+                       atmel_enter_state(priv, STATION_STATE_MGMT_ERROR);
+                       priv->station_is_associated = 0;
+                       priv->AssociationRequestRetryCnt = 0;
+                       restart_search(priv);
+               } else {
+                       priv->AssociationRequestRetryCnt++;
+                       mod_timer(&priv->management_timer, jiffies + MGMT_JIFFIES);
+                       send_association_request(priv, 0);
+               }
          break;
-  }
-  
-  spin_unlock_irqrestore(&priv->irqlock, flags);
+
+       case STATION_STATE_REASSOCIATING:
+               if (priv->ReAssociationRequestRetryCnt == MAX_ASSOCIATION_RETRIES) {
+                       atmel_enter_state(priv, STATION_STATE_MGMT_ERROR);
+                       priv->station_is_associated = 0;
+                       priv->ReAssociationRequestRetryCnt = 0;
+                       restart_search(priv);
+               } else {
+                       priv->ReAssociationRequestRetryCnt++;
+                       mod_timer(&priv->management_timer, jiffies + MGMT_JIFFIES);
+                       send_association_request(priv, 1);
+               }
+               break;
+
+       default:
+               break;
+       }
+
+       spin_unlock_irqrestore(&priv->irqlock, flags);
 }
-  
+
 static void atmel_command_irq(struct atmel_private *priv)
 {
        u8 status = atmel_rmem8(priv, atmel_co(priv, CMD_BLOCK_STATUS_OFFSET));
        u8 command = atmel_rmem8(priv, atmel_co(priv, CMD_BLOCK_COMMAND_OFFSET));
        int fast_scan;
-       
-       if (status == CMD_STATUS_IDLE || 
+
+       if (status == CMD_STATUS_IDLE ||
            status == CMD_STATUS_IN_PROGRESS)
                return;
 
@@ -3266,20 +3290,20 @@ static void atmel_command_irq(struct atmel_private *priv)
                        atmel_get_mib(priv, Mac_Mgmt_Mib_Type, MAC_MGMT_MIB_CUR_BSSID_POS,
                                      (u8 *)priv->CurrentBSSID, 6);
                        atmel_enter_state(priv, STATION_STATE_READY);
-               }                       
+               }
                break;
-               
+
        case CMD_Scan:
                fast_scan = priv->fast_scan;
                priv->fast_scan = 0;
-               
+
                if (status != CMD_STATUS_COMPLETE) {
                        atmel_scan(priv, 1);
                } else {
                        int bss_index = retrieve_bss(priv);
                        if (bss_index != -1) {
                                atmel_join_bss(priv, bss_index);
-                       } else if (priv->operating_mode == IW_MODE_ADHOC && 
+                       } else if (priv->operating_mode == IW_MODE_ADHOC &&
                                   priv->SSID_size != 0) {
                                start(priv, BSS_TYPE_AD_HOC);
                        } else {
@@ -3289,16 +3313,16 @@ static void atmel_command_irq(struct atmel_private *priv)
                        priv->site_survey_state = SITE_SURVEY_COMPLETED;
                }
                break;
-               
+
        case CMD_SiteSurvey:
                priv->fast_scan = 0;
-               
+
                if (status != CMD_STATUS_COMPLETE)
                        return;
-               
+
                priv->site_survey_state = SITE_SURVEY_COMPLETED;
                if (priv->station_is_associated) {
-                       atmel_enter_state(priv, STATION_STATE_READY);                           
+                       atmel_enter_state(priv, STATION_STATE_READY);
                } else {
                        atmel_scan(priv, 1);
                }
@@ -3312,16 +3336,15 @@ static void atmel_command_irq(struct atmel_private *priv)
                        } else {
                                priv->AuthenticationRequestRetryCnt = 0;
                                atmel_enter_state(priv, STATION_STATE_AUTHENTICATING);
-                               
+
                                mod_timer(&priv->management_timer, jiffies + MGMT_JIFFIES);
                                priv->CurrentAuthentTransactionSeqNum = 0x0001;
                                send_authentication_request(priv, C80211_MGMT_AAN_SHAREDKEY, NULL, 0);
                        }
                        return;
                }
-               
+
                atmel_scan(priv, 1);
-               
        }
 }
 
@@ -3333,20 +3356,20 @@ static int atmel_wakeup_firmware(struct atmel_private *priv)
 
        if (priv->card_type == CARD_TYPE_SPI_FLASH)
                atmel_set_gcr(priv->dev, GCR_REMAP);
-       
+
        /* wake up on-board processor */
        atmel_clear_gcr(priv->dev, 0x0040);
        atmel_write16(priv->dev, BSR, BSS_SRAM);
-       
+
        if (priv->card_type == CARD_TYPE_SPI_FLASH)
                mdelay(100);
 
        /* and wait for it */
-       for (i =  LOOP_RETRY_LIMIT; i; i--) {
+       for (i = LOOP_RETRY_LIMIT; i; i--) {
                mr1 = atmel_read16(priv->dev, MR1);
                mr3 = atmel_read16(priv->dev, MR3);
-               
-               if (mr3 & MAC_BOOT_COMPLETE) 
+
+               if (mr3 & MAC_BOOT_COMPLETE)
                        break;
                if (mr1 & MAC_BOOT_COMPLETE &&
                    priv->bus_type == BUS_TYPE_PCCARD)
@@ -3357,35 +3380,36 @@ static int atmel_wakeup_firmware(struct atmel_private *priv)
                printk(KERN_ALERT "%s: MAC failed to boot.\n", priv->dev->name);
                return 0;
        }
-               
+
        if ((priv->host_info_base = atmel_read16(priv->dev, MR2)) == 0xffff) {
                printk(KERN_ALERT "%s: card missing.\n", priv->dev->name);
                return 0;
        }
-       
-       /* now check for completion of MAC initialization through  
-          the FunCtrl field of the IFACE, poll MR1 to detect completion of       
-          MAC initialization, check completion status, set interrupt mask,  
-          enables interrupts and calls Tx and Rx initialization functions */  
-       
+
+       /* now check for completion of MAC initialization through
+          the FunCtrl field of the IFACE, poll MR1 to detect completion of
+          MAC initialization, check completion status, set interrupt mask,
+          enables interrupts and calls Tx and Rx initialization functions */
+
        atmel_wmem8(priv, atmel_hi(priv, IFACE_FUNC_CTRL_OFFSET), FUNC_CTRL_INIT_COMPLETE);
-       
-       for (i =  LOOP_RETRY_LIMIT; i; i--) {
+
+       for (i = LOOP_RETRY_LIMIT; i; i--) {
                mr1 = atmel_read16(priv->dev, MR1);
                mr3 = atmel_read16(priv->dev, MR3);
-               
-               if (mr3 & MAC_INIT_COMPLETE) 
+
+               if (mr3 & MAC_INIT_COMPLETE)
                        break;
                if (mr1 & MAC_INIT_COMPLETE &&
                    priv->bus_type == BUS_TYPE_PCCARD)
                        break;
        }
-       
+
        if (i == 0) {
-               printk(KERN_ALERT "%s: MAC failed to initialise.\n", priv->dev->name);
+               printk(KERN_ALERT "%s: MAC failed to initialise.\n",
+                               priv->dev->name);
                return 0;
        }
-       
+
        /* Check for MAC_INIT_OK only on the register that the MAC_INIT_OK was set */
        if ((mr3 & MAC_INIT_COMPLETE) &&
            !(atmel_read16(priv->dev, MR3) & MAC_INIT_OK)) {
@@ -3398,9 +3422,9 @@ static int atmel_wakeup_firmware(struct atmel_private *priv)
                return 0;
        }
 
-       atmel_copy_to_host(priv->dev, (unsigned char *)iface, 
+       atmel_copy_to_host(priv->dev, (unsigned char *)iface,
                           priv->host_info_base, sizeof(*iface));
-        
+
        iface->tx_buff_pos = le16_to_cpu(iface->tx_buff_pos);
        iface->tx_buff_size = le16_to_cpu(iface->tx_buff_size);
        iface->tx_desc_pos = le16_to_cpu(iface->tx_desc_pos);
@@ -3424,16 +3448,16 @@ static int probe_atmel_card(struct net_device *dev)
 {
        int rc = 0;
        struct atmel_private *priv = netdev_priv(dev);
-        
+
        /* reset pccard */
-       if (priv->bus_type == BUS_TYPE_PCCARD) 
+       if (priv->bus_type == BUS_TYPE_PCCARD)
                atmel_write16(dev, GCR, 0x0060);
-       
+
        atmel_write16(dev, GCR, 0x0040);
        mdelay(500);
-       
+
        if (atmel_read16(dev, MR2) == 0) {
-               /* No stored firmware so load a small stub which just 
+               /* No stored firmware so load a small stub which just
                   tells us the MAC address */
                int i;
                priv->card_type = CARD_TYPE_EEPROM;
@@ -3442,7 +3466,7 @@ static int probe_atmel_card(struct net_device *dev)
                atmel_set_gcr(dev, GCR_REMAP);
                atmel_clear_gcr(priv->dev, 0x0040);
                atmel_write16(dev, BSR, BSS_SRAM);
-               for (i =  LOOP_RETRY_LIMIT; i; i--) 
+               for (i = LOOP_RETRY_LIMIT; i; i--)
                        if (atmel_read16(dev, MR3) & MAC_BOOT_COMPLETE)
                                break;
                if (i == 0) {
@@ -3451,7 +3475,7 @@ static int probe_atmel_card(struct net_device *dev)
                        atmel_copy_to_host(dev, dev->dev_addr, atmel_read16(dev, MR2), 6);
                        /* got address, now squash it again until the network
                           interface is opened */
-                       if (priv->bus_type == BUS_TYPE_PCCARD) 
+                       if (priv->bus_type == BUS_TYPE_PCCARD)
                                atmel_write16(dev, GCR, 0x0060);
                        atmel_write16(dev, GCR, 0x0040);
                        rc = 1;
@@ -3459,7 +3483,7 @@ static int probe_atmel_card(struct net_device *dev)
        } else if (atmel_read16(dev, MR4) == 0) {
                /* Mac address easy in this case. */
                priv->card_type = CARD_TYPE_PARALLEL_FLASH;
-               atmel_write16(dev,  BSR, 1);    
+               atmel_write16(dev,  BSR, 1);
                atmel_copy_to_host(dev, dev->dev_addr, 0xc000, 6);
                atmel_write16(dev,  BSR, 0x200);
                rc = 1;
@@ -3469,16 +3493,16 @@ static int probe_atmel_card(struct net_device *dev)
                priv->card_type = CARD_TYPE_SPI_FLASH;
                if (atmel_wakeup_firmware(priv)) {
                        atmel_get_mib(priv, Mac_Address_Mib_Type, 0, dev->dev_addr, 6);
-                       
+
                        /* got address, now squash it again until the network
                           interface is opened */
-                       if (priv->bus_type == BUS_TYPE_PCCARD) 
+                       if (priv->bus_type == BUS_TYPE_PCCARD)
                                atmel_write16(dev, GCR, 0x0060);
                        atmel_write16(dev, GCR, 0x0040);
                        rc = 1;
                }
        }
-       
+
        if (rc) {
                if (dev->dev_addr[0] == 0xFF) {
                        u8 default_mac[] = {0x00,0x04, 0x25, 0x00, 0x00, 0x00};
@@ -3486,27 +3510,27 @@ static int probe_atmel_card(struct net_device *dev)
                        memcpy(dev->dev_addr, default_mac, 6);
                }
        }
-       
+
        return rc;
 }
 
-static void build_wep_mib(struct atmel_private *priv)
 /* Move the encyption information on the MIB structure.
    This routine is for the pre-WPA firmware: later firmware has
    a different format MIB and a different routine. */
+static void build_wep_mib(struct atmel_private *priv)
 {
        struct { /* NB this is matched to the hardware, don't change. */
-               u8 wep_is_on;                 
+               u8 wep_is_on;
                u8 default_key; /* 0..3 */
                u8 reserved;
                u8 exclude_unencrypted;
-               
+
                u32 WEPICV_error_count;
                u32 WEP_excluded_count;
-               
+
                u8 wep_keys[MAX_ENCRYPTION_KEYS][13];
-               u8 encryption_level; /* 0, 1, 2 */
-               u8 reserved2[3]; 
+               u8 encryption_level; /* 0, 1, 2 */
+               u8 reserved2[3];
        } mib;
        int i;
 
@@ -3515,54 +3539,55 @@ static void build_wep_mib(struct atmel_private *priv)
                if (priv->wep_key_len[priv->default_key] > 5)
                        mib.encryption_level = 2;
                else
-                       mib.encryption_level = 1;       
+                       mib.encryption_level = 1;
        } else {
                mib.encryption_level = 0;
        }
 
        mib.default_key = priv->default_key;
        mib.exclude_unencrypted = priv->exclude_unencrypted;
-       
-       for(i = 0; i < MAX_ENCRYPTION_KEYS;  i++)
+
+       for (i = 0; i < MAX_ENCRYPTION_KEYS; i++)
                memcpy(mib.wep_keys[i], priv->wep_keys[i], 13);
-               
+
        atmel_set_mib(priv, Mac_Wep_Mib_Type, 0, (u8 *)&mib, sizeof(mib));
 }
 
 static void build_wpa_mib(struct atmel_private *priv)
 {
-       /* This is for the later (WPA enabled) firmware. */        
+       /* This is for the later (WPA enabled) firmware. */
 
        struct { /* NB this is matched to the hardware, don't change. */
                u8 cipher_default_key_value[MAX_ENCRYPTION_KEYS][MAX_ENCRYPTION_KEY_SIZE];
                u8 receiver_address[6];
-               u8 wep_is_on;                 
+               u8 wep_is_on;
                u8 default_key; /* 0..3 */
                u8 group_key;
                u8 exclude_unencrypted;
                u8 encryption_type;
                u8 reserved;
-               
+
                u32 WEPICV_error_count;
                u32 WEP_excluded_count;
-               
+
                u8 key_RSC[4][8];
        } mib;
-       
+
        int i;
 
        mib.wep_is_on = priv->wep_is_on;
        mib.exclude_unencrypted = priv->exclude_unencrypted;
        memcpy(mib.receiver_address, priv->CurrentBSSID, 6);
-       
+
        /* zero all the keys before adding in valid ones. */
        memset(mib.cipher_default_key_value, 0, sizeof(mib.cipher_default_key_value));
-       
+
        if (priv->wep_is_on) {
-               /* There's a comment in the Atmel code to the effect that this is only valid
-                  when still using WEP, it may need to be set to something to use WPA */
+               /* There's a comment in the Atmel code to the effect that this
+                  is only valid when still using WEP, it may need to be set to
+                  something to use WPA */
                memset(mib.key_RSC, 0, sizeof(mib.key_RSC));
-               
+
                mib.default_key = mib.group_key = 255;
                for (i = 0; i < MAX_ENCRYPTION_KEYS; i++) {
                        if (priv->wep_key_len[i] > 0) {
@@ -3570,12 +3595,12 @@ static void build_wpa_mib(struct atmel_private *priv)
                                if (i == priv->default_key) {
                                        mib.default_key = i;
                                        mib.cipher_default_key_value[i][MAX_ENCRYPTION_KEY_SIZE-1] = 7;
-                                       mib.cipher_default_key_value[i][MAX_ENCRYPTION_KEY_SIZE-2] = priv->pairwise_cipher_suite; 
+                                       mib.cipher_default_key_value[i][MAX_ENCRYPTION_KEY_SIZE-2] = priv->pairwise_cipher_suite;
                                } else {
                                        mib.group_key = i;
                                        priv->group_cipher_suite = priv->pairwise_cipher_suite;
                                        mib.cipher_default_key_value[i][MAX_ENCRYPTION_KEY_SIZE-1] = 1;
-                                       mib.cipher_default_key_value[i][MAX_ENCRYPTION_KEY_SIZE-2] = priv->group_cipher_suite;  
+                                       mib.cipher_default_key_value[i][MAX_ENCRYPTION_KEY_SIZE-2] = priv->group_cipher_suite;
                                }
                        }
                }
@@ -3583,47 +3608,47 @@ static void build_wpa_mib(struct atmel_private *priv)
                        mib.default_key = mib.group_key != 255 ? mib.group_key : 0;
                if (mib.group_key == 255)
                        mib.group_key = mib.default_key;
-               
+
        }
-       
+
        atmel_set_mib(priv, Mac_Wep_Mib_Type, 0, (u8 *)&mib, sizeof(mib));
 }
-                                       
-static int reset_atmel_card(struct net_device *dev) 
+
+static int reset_atmel_card(struct net_device *dev)
 {
        /* do everything necessary to wake up the hardware, including
           waiting for the lightning strike and throwing the knife switch....
 
-          set all the Mib values which matter in the card to match 
+          set all the Mib values which matter in the card to match
           their settings in the atmel_private structure. Some of these
           can be altered on the fly, but many (WEP, infrastucture or ad-hoc)
           can only be changed by tearing down the world and coming back through
           here.
 
-          This routine is also responsible for initialising some 
-          hardware-specific fields in the atmel_private structure, 
+          This routine is also responsible for initialising some
+          hardware-specific fields in the atmel_private structure,
           including a copy of the firmware's hostinfo stucture
           which is the route into the rest of the firmare datastructures. */
 
        struct atmel_private *priv = netdev_priv(dev);
        u8 configuration;
-       
+
        /* data to add to the firmware names, in priority order
           this implemenents firmware versioning */
-       
+
        static char *firmware_modifier[] = {
                "-wpa",
                "",
                NULL
        };
-               
+
        /* reset pccard */
-       if (priv->bus_type == BUS_TYPE_PCCARD) 
+       if (priv->bus_type == BUS_TYPE_PCCARD)
                atmel_write16(priv->dev, GCR, 0x0060);
-               
+
        /* stop card , disable interrupts */
        atmel_write16(priv->dev, GCR, 0x0040);
-               
+
        if (priv->card_type == CARD_TYPE_EEPROM) {
                /* copy in firmware if needed */
                const struct firmware *fw_entry = NULL;
@@ -3636,13 +3661,13 @@ static int reset_atmel_card(struct net_device *dev)
                                               "%s: card type is unknown: assuming at76c502 firmware is OK.\n",
                                               dev->name);
                                        printk(KERN_INFO
-                                              "%s: if not, use the firmware= module parameter.\n", 
+                                              "%s: if not, use the firmware= module parameter.\n",
                                               dev->name);
                                        strcpy(priv->firmware_id, "atmel_at76c502.bin");
                                }
                                if (request_firmware(&fw_entry, priv->firmware_id, priv->sys_dev) != 0) {
-                                       printk(KERN_ALERT 
-                                              "%s: firmware %s is missing, cannot continue.\n", 
+                                       printk(KERN_ALERT
+                                              "%s: firmware %s is missing, cannot continue.\n",
                                               dev->name, priv->firmware_id);
                                        return 0;
                                }
@@ -3654,7 +3679,7 @@ static int reset_atmel_card(struct net_device *dev)
                                while (fw_table[fw_index].fw_type != priv->firmware_type
                                                && fw_table[fw_index].fw_type != ATMEL_FW_TYPE_NONE)
                                        fw_index++;
-                               
+
                                /* construct the actual firmware file name */
                                if (fw_table[fw_index].fw_type != ATMEL_FW_TYPE_NONE) {
                                        int i;
@@ -3669,24 +3694,24 @@ static int reset_atmel_card(struct net_device *dev)
                                        }
                                }
                                if (!success) {
-                                       printk(KERN_ALERT 
-                                              "%s: firmware %s is missing, cannot start.\n", 
+                                       printk(KERN_ALERT
+                                              "%s: firmware %s is missing, cannot start.\n",
                                               dev->name, priv->firmware_id);
                                        priv->firmware_id[0] = '\0';
-                                       return 0;       
+                                       return 0;
                                }
                        }
-                       
+
                        fw = fw_entry->data;
                        len = fw_entry->size;
                }
-               
+
                if (len <= 0x6000) {
                        atmel_write16(priv->dev, BSR, BSS_IRAM);
                        atmel_copy_to_card(priv->dev, 0, fw, len);
                        atmel_set_gcr(priv->dev, GCR_REMAP);
                } else {
-                       /* Remap */ 
+                       /* Remap */
                        atmel_set_gcr(priv->dev, GCR_REMAP);
                        atmel_write16(priv->dev, BSR, BSS_IRAM);
                        atmel_copy_to_card(priv->dev, 0, fw, 0x6000);
@@ -3708,45 +3733,45 @@ static int reset_atmel_card(struct net_device *dev)
           the 3com broken-ness filter. */
        priv->use_wpa = (priv->host_info.major_version == 4);
        priv->radio_on_broken = (priv->host_info.major_version == 5);
-       
+
         /* unmask all irq sources */
        atmel_wmem8(priv, atmel_hi(priv, IFACE_INT_MASK_OFFSET), 0xff);
-       
+
        /* int Tx system and enable Tx */
        atmel_wmem8(priv, atmel_tx(priv, TX_DESC_FLAGS_OFFSET, 0), 0);
        atmel_wmem32(priv, atmel_tx(priv, TX_DESC_NEXT_OFFSET, 0), 0x80000000L);
        atmel_wmem16(priv, atmel_tx(priv, TX_DESC_POS_OFFSET, 0), 0);
        atmel_wmem16(priv, atmel_tx(priv, TX_DESC_SIZE_OFFSET, 0), 0);
 
-       priv->tx_desc_free = priv->host_info.tx_desc_count;             
-       priv->tx_desc_head = 0;                                                                 
-       priv->tx_desc_tail = 0;                                                                 
+       priv->tx_desc_free = priv->host_info.tx_desc_count;
+       priv->tx_desc_head = 0;
+       priv->tx_desc_tail = 0;
        priv->tx_desc_previous = 0;
        priv->tx_free_mem = priv->host_info.tx_buff_size;
-       priv->tx_buff_head = 0; 
-       priv->tx_buff_tail = 0; 
-               
-       configuration = atmel_rmem8(priv, atmel_hi(priv, IFACE_FUNC_CTRL_OFFSET)); 
-       atmel_wmem8(priv, atmel_hi(priv, IFACE_FUNC_CTRL_OFFSET), 
+       priv->tx_buff_head = 0;
+       priv->tx_buff_tail = 0;
+
+       configuration = atmel_rmem8(priv, atmel_hi(priv, IFACE_FUNC_CTRL_OFFSET));
+       atmel_wmem8(priv, atmel_hi(priv, IFACE_FUNC_CTRL_OFFSET),
                                   configuration | FUNC_CTRL_TxENABLE);
 
        /* init Rx system and enable */
        priv->rx_desc_head = 0;
-       
-       configuration = atmel_rmem8(priv, atmel_hi(priv, IFACE_FUNC_CTRL_OFFSET)); 
-       atmel_wmem8(priv, atmel_hi(priv, IFACE_FUNC_CTRL_OFFSET), 
+
+       configuration = atmel_rmem8(priv, atmel_hi(priv, IFACE_FUNC_CTRL_OFFSET));
+       atmel_wmem8(priv, atmel_hi(priv, IFACE_FUNC_CTRL_OFFSET),
                                   configuration | FUNC_CTRL_RxENABLE);
-                       
+
        if (!priv->radio_on_broken) {
-               if (atmel_send_command_wait(priv, CMD_EnableRadio, NULL, 0) == 
+               if (atmel_send_command_wait(priv, CMD_EnableRadio, NULL, 0) ==
                    CMD_STATUS_REJECTED_RADIO_OFF) {
-                       printk(KERN_INFO 
+                       printk(KERN_INFO
                               "%s: cannot turn the radio on. (Hey radio, you're beautiful!)\n",
                               dev->name);
                         return 0;
                }
        }
-       
+
        /* set up enough MIB values to run. */
        atmel_set_mib8(priv, Local_Mib_Type, LOCAL_MIB_AUTO_TX_RATE_POS, priv->auto_tx_rate);
        atmel_set_mib8(priv, Local_Mib_Type,  LOCAL_MIB_TX_PROMISCUOUS_POS,  PROM_MODE_OFF);
@@ -3755,7 +3780,7 @@ static int reset_atmel_card(struct net_device *dev)
        atmel_set_mib8(priv, Mac_Mib_Type, MAC_MIB_SHORT_RETRY_POS, priv->short_retry);
        atmel_set_mib8(priv, Mac_Mib_Type, MAC_MIB_LONG_RETRY_POS, priv->long_retry);
        atmel_set_mib8(priv, Local_Mib_Type, LOCAL_MIB_PREAMBLE_TYPE, priv->preamble);
-       atmel_set_mib(priv, Mac_Address_Mib_Type, MAC_ADDR_MIB_MAC_ADDR_POS, 
+       atmel_set_mib(priv, Mac_Address_Mib_Type, MAC_ADDR_MIB_MAC_ADDR_POS,
                      priv->dev->dev_addr, 6);
        atmel_set_mib8(priv, Mac_Mgmt_Mib_Type, MAC_MGMT_MIB_PS_MODE_POS, ACTIVE_MODE);
        atmel_set_mib16(priv, Mac_Mgmt_Mib_Type, MAC_MGMT_MIB_LISTEN_INTERVAL_POS, 1);
@@ -3766,42 +3791,44 @@ static int reset_atmel_card(struct net_device *dev)
                build_wpa_mib(priv);
        else
                build_wep_mib(priv);
-       
+
        return 1;
 }
 
-static void atmel_send_command(struct atmel_private *priv, int command, void *cmd, int cmd_size)
+static void atmel_send_command(struct atmel_private *priv, int command,
+                              void *cmd, int cmd_size)
 {
        if (cmd)
-               atmel_copy_to_card(priv->dev, atmel_co(priv, CMD_BLOCK_PARAMETERS_OFFSET), 
+               atmel_copy_to_card(priv->dev, atmel_co(priv, CMD_BLOCK_PARAMETERS_OFFSET),
                                   cmd, cmd_size);
-       
+
        atmel_wmem8(priv, atmel_co(priv, CMD_BLOCK_COMMAND_OFFSET), command);
        atmel_wmem8(priv, atmel_co(priv, CMD_BLOCK_STATUS_OFFSET), 0);
 }
-       
-static int atmel_send_command_wait(struct atmel_private *priv, int command, void *cmd, int cmd_size)
+
+static int atmel_send_command_wait(struct atmel_private *priv, int command,
+                                  void *cmd, int cmd_size)
 {
        int i, status;
-       
+
        atmel_send_command(priv, command, cmd, cmd_size);
-       
+
        for (i = 5000; i; i--) {
                status = atmel_rmem8(priv, atmel_co(priv, CMD_BLOCK_STATUS_OFFSET));
-               if (status != CMD_STATUS_IDLE && 
+               if (status != CMD_STATUS_IDLE &&
                    status != CMD_STATUS_IN_PROGRESS)
                        break;
                udelay(20);
        }
-       
+
        if (i == 0) {
                printk(KERN_ALERT "%s: failed to contact MAC.\n", priv->dev->name);
                status =  CMD_STATUS_HOST_ERROR;
-       } else { 
+       } else {
                if (command != CMD_EnableRadio)
                        status = CMD_STATUS_COMPLETE;
        }
-       
+
        return status;
 }
 
@@ -3827,7 +3854,8 @@ static void atmel_set_mib8(struct atmel_private *priv, u8 type, u8 index, u8 dat
        atmel_send_command_wait(priv, CMD_Set_MIB_Vars, &m, MIB_HEADER_SIZE + 1);
 }
 
-static void atmel_set_mib16(struct atmel_private *priv, u8 type, u8 index, u16 data)
+static void atmel_set_mib16(struct atmel_private *priv, u8 type, u8 index,
+                           u16 data)
 {
        struct get_set_mib m;
        m.type = type;
@@ -3839,7 +3867,8 @@ static void atmel_set_mib16(struct atmel_private *priv, u8 type, u8 index, u16 d
        atmel_send_command_wait(priv, CMD_Set_MIB_Vars, &m, MIB_HEADER_SIZE + 2);
 }
 
-static void atmel_set_mib(struct atmel_private *priv, u8 type, u8 index, u8 *data, int data_len)
+static void atmel_set_mib(struct atmel_private *priv, u8 type, u8 index,
+                         u8 *data, int data_len)
 {
        struct get_set_mib m;
        m.type = type;
@@ -3848,23 +3877,24 @@ static void atmel_set_mib(struct atmel_private *priv, u8 type, u8 index, u8 *dat
 
        if (data_len > MIB_MAX_DATA_BYTES)
                printk(KERN_ALERT "%s: MIB buffer too small.\n", priv->dev->name);
-       
+
        memcpy(m.data, data, data_len);
        atmel_send_command_wait(priv, CMD_Set_MIB_Vars, &m, MIB_HEADER_SIZE + data_len);
 }
 
-static void atmel_get_mib(struct atmel_private *priv, u8 type, u8 index, u8 *data, int data_len)
+static void atmel_get_mib(struct atmel_private *priv, u8 type, u8 index,
+                         u8 *data, int data_len)
 {
        struct get_set_mib m;
        m.type = type;
        m.size = data_len;
        m.index = index;
-       
+
        if (data_len > MIB_MAX_DATA_BYTES)
                printk(KERN_ALERT "%s: MIB buffer too small.\n", priv->dev->name);
-       
+
        atmel_send_command_wait(priv, CMD_Get_MIB_Vars, &m, MIB_HEADER_SIZE + data_len);
-       atmel_copy_to_host(priv->dev, data, 
+       atmel_copy_to_host(priv->dev, data,
                           atmel_co(priv, CMD_BLOCK_PARAMETERS_OFFSET + MIB_HEADER_SIZE), data_len);
 }
 
@@ -3873,11 +3903,12 @@ static void atmel_writeAR(struct net_device *dev, u16 data)
        int i;
        outw(data, dev->base_addr + AR);
        /* Address register appears to need some convincing..... */
-       for (i = 0; data != inw(dev->base_addr + AR) && i<10; i++)
+       for (i = 0; data != inw(dev->base_addr + AR) && i < 10; i++)
                outw(data, dev->base_addr + AR);
 }
 
-static void atmel_copy_to_card(struct net_device *dev, u16 dest, unsigned char *src, u16 len)
+static void atmel_copy_to_card(struct net_device *dev, u16 dest,
+                              unsigned char *src, u16 len)
 {
        int i;
        atmel_writeAR(dev, dest);
@@ -3894,7 +3925,8 @@ static void atmel_copy_to_card(struct net_device *dev, u16 dest, unsigned char *
                atmel_write8(dev, DR, *src);
 }
 
-static void atmel_copy_to_host(struct net_device *dev, unsigned char *dest, u16 src, u16 len)
+static void atmel_copy_to_host(struct net_device *dev, unsigned char *dest,
+                              u16 src, u16 len)
 {
        int i;
        atmel_writeAR(dev, src);
@@ -3930,22 +3962,24 @@ static int atmel_lock_mac(struct atmel_private *priv)
                        break;
                udelay(20);
        }
-       
-       if (!i) return 0; /* timed out */
-       
+
+       if (!i)
+               return 0; /* timed out */
+
        atmel_wmem8(priv, atmel_hi(priv, IFACE_LOCKOUT_MAC_OFFSET), 1);
        if (atmel_rmem8(priv, atmel_hi(priv, IFACE_LOCKOUT_HOST_OFFSET))) {
                atmel_wmem8(priv, atmel_hi(priv, IFACE_LOCKOUT_MAC_OFFSET), 0);
-               if (!j--) return 0; /* timed out */
+               if (!j--)
+                       return 0; /* timed out */
                goto retry;
        }
-       
+
        return 1;
 }
 
 static void atmel_wmem32(struct atmel_private *priv, u16 pos, u32 data)
 {
-               atmel_writeAR(priv->dev, pos);  
+       atmel_writeAR(priv->dev, pos);
        atmel_write16(priv->dev, DR, data); /* card is little-endian */
        atmel_write16(priv->dev, DR, data >> 16);
 }
@@ -4017,9 +4051,9 @@ static void atmel_wmem32(struct atmel_private *priv, u16 pos, u32 data)
                                  serial output, since SO is normally high.  But it
                                  does cause 8 clock cycles and thus 8 bits to be
                                  clocked in to the chip.  See Atmel's SPI
-                                 controller (e.g. AT91M55800) timing and 4K 
+                                 controller (e.g. AT91M55800) timing and 4K
                                  SPI EEPROM manuals */
-                                
+
        .set NVRAM_SCRATCH, 0x02000100  /* arbitrary area for scratchpad memory */
        .set NVRAM_IMAGE, 0x02000200
        .set NVRAM_LENGTH, 0x0200
@@ -4032,24 +4066,24 @@ static void atmel_wmem32(struct atmel_private *priv, u16 pos, u32 data)
        .set MR4, 0xC
 RESET_VECTOR:
         b RESET_HANDLER
-UNDEF_VECTOR:  
+UNDEF_VECTOR:
         b HALT1
-SWI_VECTOR:            
+SWI_VECTOR:
         b HALT1
-IABORT_VECTOR: 
+IABORT_VECTOR:
         b HALT1
-DABORT_VECTOR:         
-RESERVED_VECTOR:    
+DABORT_VECTOR:
+RESERVED_VECTOR:
         b HALT1
-IRQ_VECTOR:    
+IRQ_VECTOR:
         b HALT1
-FIQ_VECTOR:    
+FIQ_VECTOR:
        b HALT1
 HALT1: b HALT1
 RESET_HANDLER:
        mov     r0, #CPSR_INITIAL
        msr     CPSR_c, r0      /* This is probably unnecessary */
-                       
+
 /* I'm guessing this is initializing clock generator electronics for SPI */
        ldr     r0, =SPI_CGEN_BASE
        mov     r1, #0
@@ -4061,7 +4095,7 @@ RESET_HANDLER:
        str     r1, [r0, #28]
        mov     r1, #1
        str     r1, [r0, #8]
-       
+
        ldr     r0, =MRBASE
        mov     r1, #0
        strh    r1, [r0, #MR1]
@@ -4094,7 +4128,7 @@ GET_WHOLE_NVRAM:
        ldmia   sp!, {lr}
        bx      lr
 .endfunc
-       
+
 .func Get_MAC_Addr, GET_MAC_ADDR
 GET_MAC_ADDR:
        stmdb   sp!, {lr}
@@ -4110,13 +4144,13 @@ GET_MAC_ADDR:
 .func Delay9, DELAY9
 DELAY9:
        adds    r0, r0, r0, LSL #3   /* r0 = r0 * 9 */
-DELAYLOOP:     
+DELAYLOOP:
        beq     DELAY9_done
        subs    r0, r0, #1
        b       DELAYLOOP
-DELAY9_done:   
+DELAY9_done:
        bx      lr
-.endfunc       
+.endfunc
 
 .func SP_Init, SP_INIT
 SP_INIT:
@@ -4145,26 +4179,26 @@ SP_INIT:
        ldr     r0, [r0, #SP_RDR]
        bx      lr
 .endfunc
-.func NVRAM_Init, NVRAM_INIT   
+.func NVRAM_Init, NVRAM_INIT
 NVRAM_INIT:
        ldr     r1, =SP_BASE
        ldr     r0, [r1, #SP_RDR]
        mov     r0, #NVRAM_CMD_RDSR
        str     r0, [r1, #SP_TDR]
-SP_loop1:      
+SP_loop1:
        ldr     r0, [r1, #SP_SR]
        tst     r0, #SP_TDRE
        beq     SP_loop1
 
        mov     r0, #SPI_8CLOCKS
-       str     r0, [r1, #SP_TDR] 
-SP_loop2:      
+       str     r0, [r1, #SP_TDR]
+SP_loop2:
        ldr     r0, [r1, #SP_SR]
        tst     r0, #SP_TDRE
        beq     SP_loop2
 
        ldr     r0, [r1, #SP_RDR]
-SP_loop3:      
+SP_loop3:
        ldr     r0, [r1, #SP_SR]
        tst     r0, #SP_RDRF
        beq     SP_loop3
@@ -4173,7 +4207,7 @@ SP_loop3:
        and     r0, r0, #255
        bx      lr
 .endfunc
-       
+
 .func NVRAM_Xfer, NVRAM_XFER
        /* r0 = dest address */
        /* r1 = not used */
@@ -4185,11 +4219,11 @@ NVRAM_XFER:
        mov     r4, r3          /* save r3 (length) */
        mov     r0, r2, LSR #5 /*  SPI memories put A8 in the command field */
        and     r0, r0, #8
-       add     r0, r0, #NVRAM_CMD_READ 
+       add     r0, r0, #NVRAM_CMD_READ
        ldr     r1, =NVRAM_SCRATCH
        strb    r0, [r1, #0]    /* save command in NVRAM_SCRATCH[0] */
        strb    r2, [r1, #1]    /* save low byte of source address in NVRAM_SCRATCH[1] */
-_local1:       
+_local1:
        bl      NVRAM_INIT
        tst     r0, #NVRAM_SR_RDY
        bne     _local1
@@ -4211,7 +4245,7 @@ NVRAM_XFER2:
        cmp     r0, #0
        bls     _local2
        ldr     r5, =NVRAM_SCRATCH
-_local4:       
+_local4:
        ldrb    r6, [r5, r3]
        str     r6, [r4, #SP_TDR]
 _local3:
@@ -4225,7 +4259,7 @@ _local2:
        mov     r3, #SPI_8CLOCKS
        str     r3, [r4, #SP_TDR]
        ldr     r0, [r4, #SP_RDR]
-_local5:       
+_local5:
        ldr     r0, [r4, #SP_SR]
        tst     r0, #SP_RDRF
        beq     _local5
@@ -4233,12 +4267,12 @@ _local5:
        mov     r0, #0
        cmp     r2, #0  /* r2 is # of bytes to copy in */
        bls     _local6
-_local7:       
+_local7:
        ldr     r5, [r4, #SP_SR]
        tst     r5, #SP_TDRE
        beq     _local7
        str     r3, [r4, #SP_TDR]  /* r3 has SPI_8CLOCKS */
-_local8:       
+_local8:
        ldr     r5, [r4, #SP_SR]
        tst     r5, #SP_RDRF
        beq     _local8
index fc62235bfc24c169c1a04f4e93926f7782e94dcc..353ccb93134b79e70e38bb4a349cd681018c9576 100644 (file)
@@ -1,3 +1,4 @@
+hostap-y := hostap_main.o
 obj-$(CONFIG_HOSTAP) += hostap.o
 
 obj-$(CONFIG_HOSTAP_CS) += hostap_cs.o
diff --git a/drivers/net/wireless/hostap/hostap.c b/drivers/net/wireless/hostap/hostap.c
deleted file mode 100644 (file)
index 3d2ea61..0000000
+++ /dev/null
@@ -1,1191 +0,0 @@
-/*
- * Host AP (software wireless LAN access point) driver for
- * Intersil Prism2/2.5/3 - hostap.o module, common routines
- *
- * Copyright (c) 2001-2002, SSH Communications Security Corp and Jouni Malinen
- * <jkmaline@cc.hut.fi>
- * Copyright (c) 2002-2005, Jouni Malinen <jkmaline@cc.hut.fi>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation. See README and COPYING for
- * more details.
- */
-
-#include <linux/config.h>
-#include <linux/module.h>
-#include <linux/init.h>
-#include <linux/slab.h>
-#include <linux/proc_fs.h>
-#include <linux/if_arp.h>
-#include <linux/delay.h>
-#include <linux/random.h>
-#include <linux/workqueue.h>
-#include <linux/kmod.h>
-#include <linux/rtnetlink.h>
-#include <linux/wireless.h>
-#include <net/iw_handler.h>
-#include <net/ieee80211.h>
-#include <net/ieee80211_crypt.h>
-#include <asm/uaccess.h>
-
-#include "hostap_wlan.h"
-#include "hostap_80211.h"
-#include "hostap_ap.h"
-#include "hostap.h"
-
-MODULE_AUTHOR("Jouni Malinen");
-MODULE_DESCRIPTION("Host AP common routines");
-MODULE_LICENSE("GPL");
-MODULE_VERSION(PRISM2_VERSION);
-
-#define TX_TIMEOUT (2 * HZ)
-
-#define PRISM2_MAX_FRAME_SIZE 2304
-#define PRISM2_MIN_MTU 256
-/* FIX: */
-#define PRISM2_MAX_MTU (PRISM2_MAX_FRAME_SIZE - (6 /* LLC */ + 8 /* WEP */))
-
-
-/* hostap.c */
-static int prism2_wds_add(local_info_t *local, u8 *remote_addr,
-                         int rtnl_locked);
-static int prism2_wds_del(local_info_t *local, u8 *remote_addr,
-                         int rtnl_locked, int do_not_remove);
-
-/* hostap_ap.c */
-static int prism2_ap_get_sta_qual(local_info_t *local, struct sockaddr addr[],
-                                 struct iw_quality qual[], int buf_size,
-                                 int aplist);
-static int prism2_ap_translate_scan(struct net_device *dev, char *buffer);
-static int prism2_hostapd(struct ap_data *ap,
-                         struct prism2_hostapd_param *param);
-static void * ap_crypt_get_ptrs(struct ap_data *ap, u8 *addr, int permanent,
-                               struct ieee80211_crypt_data ***crypt);
-static void ap_control_kickall(struct ap_data *ap);
-#ifndef PRISM2_NO_KERNEL_IEEE80211_MGMT
-static int ap_control_add_mac(struct mac_restrictions *mac_restrictions,
-                             u8 *mac);
-static int ap_control_del_mac(struct mac_restrictions *mac_restrictions,
-                             u8 *mac);
-static void ap_control_flush_macs(struct mac_restrictions *mac_restrictions);
-static int ap_control_kick_mac(struct ap_data *ap, struct net_device *dev,
-                              u8 *mac);
-#endif /* !PRISM2_NO_KERNEL_IEEE80211_MGMT */
-
-
-static const long freq_list[] = { 2412, 2417, 2422, 2427, 2432, 2437, 2442,
-                                 2447, 2452, 2457, 2462, 2467, 2472, 2484 };
-#define FREQ_COUNT (sizeof(freq_list) / sizeof(freq_list[0]))
-
-
-/* See IEEE 802.1H for LLC/SNAP encapsulation/decapsulation */
-/* Ethernet-II snap header (RFC1042 for most EtherTypes) */
-static unsigned char rfc1042_header[] =
-{ 0xaa, 0xaa, 0x03, 0x00, 0x00, 0x00 };
-/* Bridge-Tunnel header (for EtherTypes ETH_P_AARP and ETH_P_IPX) */
-static unsigned char bridge_tunnel_header[] =
-{ 0xaa, 0xaa, 0x03, 0x00, 0x00, 0xf8 };
-/* No encapsulation header if EtherType < 0x600 (=length) */
-
-
-/* FIX: these could be compiled separately and linked together to hostap.o */
-#include "hostap_ap.c"
-#include "hostap_info.c"
-#include "hostap_ioctl.c"
-#include "hostap_proc.c"
-#include "hostap_80211_rx.c"
-#include "hostap_80211_tx.c"
-
-
-struct net_device * hostap_add_interface(struct local_info *local,
-                                        int type, int rtnl_locked,
-                                        const char *prefix,
-                                        const char *name)
-{
-       struct net_device *dev, *mdev;
-       struct hostap_interface *iface;
-       int ret;
-
-       dev = alloc_etherdev(sizeof(struct hostap_interface));
-       if (dev == NULL)
-               return NULL;
-
-       iface = netdev_priv(dev);
-       iface->dev = dev;
-       iface->local = local;
-       iface->type = type;
-       list_add(&iface->list, &local->hostap_interfaces);
-
-       mdev = local->dev;
-       memcpy(dev->dev_addr, mdev->dev_addr, ETH_ALEN);
-       dev->base_addr = mdev->base_addr;
-       dev->irq = mdev->irq;
-       dev->mem_start = mdev->mem_start;
-       dev->mem_end = mdev->mem_end;
-
-       hostap_setup_dev(dev, local, 0);
-       dev->destructor = free_netdev;
-
-       sprintf(dev->name, "%s%s", prefix, name);
-       if (!rtnl_locked)
-               rtnl_lock();
-
-       ret = 0;
-       if (strchr(dev->name, '%'))
-               ret = dev_alloc_name(dev, dev->name);
-
-       SET_NETDEV_DEV(dev, mdev->class_dev.dev);
-       if (ret >= 0)
-               ret = register_netdevice(dev);
-
-       if (!rtnl_locked)
-               rtnl_unlock();
-
-       if (ret < 0) {
-               printk(KERN_WARNING "%s: failed to add new netdevice!\n",
-                      dev->name);
-               free_netdev(dev);
-               return NULL;
-       }
-
-       printk(KERN_DEBUG "%s: registered netdevice %s\n",
-              mdev->name, dev->name);
-
-       return dev;
-}
-
-
-void hostap_remove_interface(struct net_device *dev, int rtnl_locked,
-                            int remove_from_list)
-{
-       struct hostap_interface *iface;
-
-       if (!dev)
-               return;
-
-       iface = netdev_priv(dev);
-
-       if (remove_from_list) {
-               list_del(&iface->list);
-       }
-
-       if (dev == iface->local->ddev)
-               iface->local->ddev = NULL;
-       else if (dev == iface->local->apdev)
-               iface->local->apdev = NULL;
-       else if (dev == iface->local->stadev)
-               iface->local->stadev = NULL;
-
-       if (rtnl_locked)
-               unregister_netdevice(dev);
-       else
-               unregister_netdev(dev);
-
-       /* dev->destructor = free_netdev() will free the device data, including
-        * private data, when removing the device */
-}
-
-
-static inline int prism2_wds_special_addr(u8 *addr)
-{
-       if (addr[0] || addr[1] || addr[2] || addr[3] || addr[4] || addr[5])
-               return 0;
-
-       return 1;
-}
-
-
-static int prism2_wds_add(local_info_t *local, u8 *remote_addr,
-                         int rtnl_locked)
-{
-       struct net_device *dev;
-       struct list_head *ptr;
-       struct hostap_interface *iface, *empty, *match;
-
-       empty = match = NULL;
-       read_lock_bh(&local->iface_lock);
-       list_for_each(ptr, &local->hostap_interfaces) {
-               iface = list_entry(ptr, struct hostap_interface, list);
-               if (iface->type != HOSTAP_INTERFACE_WDS)
-                       continue;
-
-               if (prism2_wds_special_addr(iface->u.wds.remote_addr))
-                       empty = iface;
-               else if (memcmp(iface->u.wds.remote_addr, remote_addr,
-                               ETH_ALEN) == 0) {
-                       match = iface;
-                       break;
-               }
-       }
-       if (!match && empty && !prism2_wds_special_addr(remote_addr)) {
-               /* take pre-allocated entry into use */
-               memcpy(empty->u.wds.remote_addr, remote_addr, ETH_ALEN);
-               read_unlock_bh(&local->iface_lock);
-               printk(KERN_DEBUG "%s: using pre-allocated WDS netdevice %s\n",
-                      local->dev->name, empty->dev->name);
-               return 0;
-       }
-       read_unlock_bh(&local->iface_lock);
-
-       if (!prism2_wds_special_addr(remote_addr)) {
-               if (match)
-                       return -EEXIST;
-               hostap_add_sta(local->ap, remote_addr);
-       }
-
-       if (local->wds_connections >= local->wds_max_connections)
-               return -ENOBUFS;
-
-       /* verify that there is room for wds# postfix in the interface name */
-       if (strlen(local->dev->name) > IFNAMSIZ - 5) {
-               printk(KERN_DEBUG "'%s' too long base device name\n",
-                      local->dev->name);
-               return -EINVAL;
-       }
-
-       dev = hostap_add_interface(local, HOSTAP_INTERFACE_WDS, rtnl_locked,
-                                  local->ddev->name, "wds%d");
-       if (dev == NULL)
-               return -ENOMEM;
-
-       iface = netdev_priv(dev);
-       memcpy(iface->u.wds.remote_addr, remote_addr, ETH_ALEN);
-
-       local->wds_connections++;
-
-       return 0;
-}
-
-
-static int prism2_wds_del(local_info_t *local, u8 *remote_addr,
-                         int rtnl_locked, int do_not_remove)
-{
-       unsigned long flags;
-       struct list_head *ptr;
-       struct hostap_interface *iface, *selected = NULL;
-
-       write_lock_irqsave(&local->iface_lock, flags);
-       list_for_each(ptr, &local->hostap_interfaces) {
-               iface = list_entry(ptr, struct hostap_interface, list);
-               if (iface->type != HOSTAP_INTERFACE_WDS)
-                       continue;
-
-               if (memcmp(iface->u.wds.remote_addr, remote_addr,
-                          ETH_ALEN) == 0) {
-                       selected = iface;
-                       break;
-               }
-       }
-       if (selected && !do_not_remove)
-               list_del(&selected->list);
-       write_unlock_irqrestore(&local->iface_lock, flags);
-
-       if (selected) {
-               if (do_not_remove)
-                       memset(selected->u.wds.remote_addr, 0, ETH_ALEN);
-               else {
-                       hostap_remove_interface(selected->dev, rtnl_locked, 0);
-                       local->wds_connections--;
-               }
-       }
-
-       return selected ? 0 : -ENODEV;
-}
-
-
-u16 hostap_tx_callback_register(local_info_t *local,
-                               void (*func)(struct sk_buff *, int ok, void *),
-                               void *data)
-{
-       unsigned long flags;
-       struct hostap_tx_callback_info *entry;
-
-       entry = (struct hostap_tx_callback_info *) kmalloc(sizeof(*entry),
-                                                          GFP_ATOMIC);
-       if (entry == NULL)
-               return 0;
-
-       entry->func = func;
-       entry->data = data;
-
-       spin_lock_irqsave(&local->lock, flags);
-       entry->idx = local->tx_callback ? local->tx_callback->idx + 1 : 1;
-       entry->next = local->tx_callback;
-       local->tx_callback = entry;
-       spin_unlock_irqrestore(&local->lock, flags);
-
-       return entry->idx;
-}
-
-
-int hostap_tx_callback_unregister(local_info_t *local, u16 idx)
-{
-       unsigned long flags;
-       struct hostap_tx_callback_info *cb, *prev = NULL;
-
-       spin_lock_irqsave(&local->lock, flags);
-       cb = local->tx_callback;
-       while (cb != NULL && cb->idx != idx) {
-               prev = cb;
-               cb = cb->next;
-       }
-       if (cb) {
-               if (prev == NULL)
-                       local->tx_callback = cb->next;
-               else
-                       prev->next = cb->next;
-               kfree(cb);
-       }
-       spin_unlock_irqrestore(&local->lock, flags);
-
-       return cb ? 0 : -1;
-}
-
-
-/* val is in host byte order */
-int hostap_set_word(struct net_device *dev, int rid, u16 val)
-{
-       struct hostap_interface *iface;
-       u16 tmp = cpu_to_le16(val);
-       iface = netdev_priv(dev);
-       return iface->local->func->set_rid(dev, rid, &tmp, 2);
-}
-
-
-int hostap_set_string(struct net_device *dev, int rid, const char *val)
-{
-       struct hostap_interface *iface;
-       char buf[MAX_SSID_LEN + 2];
-       int len;
-
-       iface = netdev_priv(dev);
-       len = strlen(val);
-       if (len > MAX_SSID_LEN)
-               return -1;
-       memset(buf, 0, sizeof(buf));
-       buf[0] = len; /* little endian 16 bit word */
-       memcpy(buf + 2, val, len);
-
-       return iface->local->func->set_rid(dev, rid, &buf, MAX_SSID_LEN + 2);
-}
-
-
-u16 hostap_get_porttype(local_info_t *local)
-{
-       if (local->iw_mode == IW_MODE_ADHOC && local->pseudo_adhoc)
-               return HFA384X_PORTTYPE_PSEUDO_IBSS;
-       if (local->iw_mode == IW_MODE_ADHOC)
-               return HFA384X_PORTTYPE_IBSS;
-       if (local->iw_mode == IW_MODE_INFRA)
-               return HFA384X_PORTTYPE_BSS;
-       if (local->iw_mode == IW_MODE_REPEAT)
-               return HFA384X_PORTTYPE_WDS;
-       if (local->iw_mode == IW_MODE_MONITOR)
-               return HFA384X_PORTTYPE_PSEUDO_IBSS;
-       return HFA384X_PORTTYPE_HOSTAP;
-}
-
-
-int hostap_set_encryption(local_info_t *local)
-{
-       u16 val, old_val;
-       int i, keylen, len, idx;
-       char keybuf[WEP_KEY_LEN + 1];
-       enum { NONE, WEP, OTHER } encrypt_type;
-
-       idx = local->tx_keyidx;
-       if (local->crypt[idx] == NULL || local->crypt[idx]->ops == NULL)
-               encrypt_type = NONE;
-       else if (strcmp(local->crypt[idx]->ops->name, "WEP") == 0)
-               encrypt_type = WEP;
-       else
-               encrypt_type = OTHER;
-
-       if (local->func->get_rid(local->dev, HFA384X_RID_CNFWEPFLAGS, &val, 2,
-                                1) < 0) {
-               printk(KERN_DEBUG "Could not read current WEP flags.\n");
-               goto fail;
-       }
-       le16_to_cpus(&val);
-       old_val = val;
-
-       if (encrypt_type != NONE || local->privacy_invoked)
-               val |= HFA384X_WEPFLAGS_PRIVACYINVOKED;
-       else
-               val &= ~HFA384X_WEPFLAGS_PRIVACYINVOKED;
-
-       if (local->open_wep || encrypt_type == NONE ||
-           ((local->ieee_802_1x || local->wpa) && local->host_decrypt))
-               val &= ~HFA384X_WEPFLAGS_EXCLUDEUNENCRYPTED;
-       else
-               val |= HFA384X_WEPFLAGS_EXCLUDEUNENCRYPTED;
-
-       if ((encrypt_type != NONE || local->privacy_invoked) &&
-           (encrypt_type == OTHER || local->host_encrypt))
-               val |= HFA384X_WEPFLAGS_HOSTENCRYPT;
-       else
-               val &= ~HFA384X_WEPFLAGS_HOSTENCRYPT;
-       if ((encrypt_type != NONE || local->privacy_invoked) &&
-           (encrypt_type == OTHER || local->host_decrypt))
-               val |= HFA384X_WEPFLAGS_HOSTDECRYPT;
-       else
-               val &= ~HFA384X_WEPFLAGS_HOSTDECRYPT;
-
-       if (val != old_val &&
-           hostap_set_word(local->dev, HFA384X_RID_CNFWEPFLAGS, val)) {
-               printk(KERN_DEBUG "Could not write new WEP flags (0x%x)\n",
-                      val);
-               goto fail;
-       }
-
-       if (encrypt_type != WEP)
-               return 0;
-
-       /* 104-bit support seems to require that all the keys are set to the
-        * same keylen */
-       keylen = 6; /* first 5 octets */
-       len = local->crypt[idx]->ops->get_key(keybuf, sizeof(keybuf),
-                                             NULL, local->crypt[idx]->priv);
-       if (idx >= 0 && idx < WEP_KEYS && len > 5)
-               keylen = WEP_KEY_LEN + 1; /* first 13 octets */
-
-       for (i = 0; i < WEP_KEYS; i++) {
-               memset(keybuf, 0, sizeof(keybuf));
-               if (local->crypt[i]) {
-                       (void) local->crypt[i]->ops->get_key(
-                               keybuf, sizeof(keybuf),
-                               NULL, local->crypt[i]->priv);
-               }
-               if (local->func->set_rid(local->dev,
-                                        HFA384X_RID_CNFDEFAULTKEY0 + i,
-                                        keybuf, keylen)) {
-                       printk(KERN_DEBUG "Could not set key %d (len=%d)\n",
-                              i, keylen);
-                       goto fail;
-               }
-       }
-       if (hostap_set_word(local->dev, HFA384X_RID_CNFWEPDEFAULTKEYID, idx)) {
-               printk(KERN_DEBUG "Could not set default keyid %d\n", idx);
-               goto fail;
-       }
-
-       return 0;
-
- fail:
-       printk(KERN_DEBUG "%s: encryption setup failed\n", local->dev->name);
-       return -1;
-}
-
-
-int hostap_set_antsel(local_info_t *local)
-{
-       u16 val;
-       int ret = 0;
-
-       if (local->antsel_tx != HOSTAP_ANTSEL_DO_NOT_TOUCH &&
-           local->func->cmd(local->dev, HFA384X_CMDCODE_READMIF,
-                            HFA386X_CR_TX_CONFIGURE,
-                            NULL, &val) == 0) {
-               val &= ~(BIT(2) | BIT(1));
-               switch (local->antsel_tx) {
-               case HOSTAP_ANTSEL_DIVERSITY:
-                       val |= BIT(1);
-                       break;
-               case HOSTAP_ANTSEL_LOW:
-                       break;
-               case HOSTAP_ANTSEL_HIGH:
-                       val |= BIT(2);
-                       break;
-               }
-
-               if (local->func->cmd(local->dev, HFA384X_CMDCODE_WRITEMIF,
-                                    HFA386X_CR_TX_CONFIGURE, &val, NULL)) {
-                       printk(KERN_INFO "%s: setting TX AntSel failed\n",
-                              local->dev->name);
-                       ret = -1;
-               }
-       }
-
-       if (local->antsel_rx != HOSTAP_ANTSEL_DO_NOT_TOUCH &&
-           local->func->cmd(local->dev, HFA384X_CMDCODE_READMIF,
-                            HFA386X_CR_RX_CONFIGURE,
-                            NULL, &val) == 0) {
-               val &= ~(BIT(1) | BIT(0));
-               switch (local->antsel_rx) {
-               case HOSTAP_ANTSEL_DIVERSITY:
-                       break;
-               case HOSTAP_ANTSEL_LOW:
-                       val |= BIT(0);
-                       break;
-               case HOSTAP_ANTSEL_HIGH:
-                       val |= BIT(0) | BIT(1);
-                       break;
-               }
-
-               if (local->func->cmd(local->dev, HFA384X_CMDCODE_WRITEMIF,
-                                    HFA386X_CR_RX_CONFIGURE, &val, NULL)) {
-                       printk(KERN_INFO "%s: setting RX AntSel failed\n",
-                              local->dev->name);
-                       ret = -1;
-               }
-       }
-
-       return ret;
-}
-
-
-int hostap_set_roaming(local_info_t *local)
-{
-       u16 val;
-
-       switch (local->host_roaming) {
-       case 1:
-               val = HFA384X_ROAMING_HOST;
-               break;
-       case 2:
-               val = HFA384X_ROAMING_DISABLED;
-               break;
-       case 0:
-       default:
-               val = HFA384X_ROAMING_FIRMWARE;
-               break;
-       }
-
-       return hostap_set_word(local->dev, HFA384X_RID_CNFROAMINGMODE, val);
-}
-
-
-int hostap_set_auth_algs(local_info_t *local)
-{
-       int val = local->auth_algs;
-       /* At least STA f/w v0.6.2 seems to have issues with cnfAuthentication
-        * set to include both Open and Shared Key flags. It tries to use
-        * Shared Key authentication in that case even if WEP keys are not
-        * configured.. STA f/w v0.7.6 is able to handle such configuration,
-        * but it is unknown when this was fixed between 0.6.2 .. 0.7.6. */
-       if (local->sta_fw_ver < PRISM2_FW_VER(0,7,0) &&
-           val != PRISM2_AUTH_OPEN && val != PRISM2_AUTH_SHARED_KEY)
-               val = PRISM2_AUTH_OPEN;
-
-       if (hostap_set_word(local->dev, HFA384X_RID_CNFAUTHENTICATION, val)) {
-               printk(KERN_INFO "%s: cnfAuthentication setting to 0x%x "
-                      "failed\n", local->dev->name, local->auth_algs);
-               return -EINVAL;
-       }
-
-       return 0;
-}
-
-
-void hostap_dump_rx_header(const char *name, const struct hfa384x_rx_frame *rx)
-{
-       u16 status, fc;
-
-       status = __le16_to_cpu(rx->status);
-
-       printk(KERN_DEBUG "%s: RX status=0x%04x (port=%d, type=%d, "
-              "fcserr=%d) silence=%d signal=%d rate=%d rxflow=%d; "
-              "jiffies=%ld\n",
-              name, status, (status >> 8) & 0x07, status >> 13, status & 1,
-              rx->silence, rx->signal, rx->rate, rx->rxflow, jiffies);
-
-       fc = __le16_to_cpu(rx->frame_control);
-       printk(KERN_DEBUG "   FC=0x%04x (type=%d:%d) dur=0x%04x seq=0x%04x "
-              "data_len=%d%s%s\n",
-              fc, WLAN_FC_GET_TYPE(fc) >> 2, WLAN_FC_GET_STYPE(fc) >> 4,
-              __le16_to_cpu(rx->duration_id), __le16_to_cpu(rx->seq_ctrl),
-              __le16_to_cpu(rx->data_len),
-              fc & IEEE80211_FCTL_TODS ? " [ToDS]" : "",
-              fc & IEEE80211_FCTL_FROMDS ? " [FromDS]" : "");
-
-       printk(KERN_DEBUG "   A1=" MACSTR " A2=" MACSTR " A3=" MACSTR " A4="
-              MACSTR "\n",
-              MAC2STR(rx->addr1), MAC2STR(rx->addr2), MAC2STR(rx->addr3),
-              MAC2STR(rx->addr4));
-
-       printk(KERN_DEBUG "   dst=" MACSTR " src=" MACSTR " len=%d\n",
-              MAC2STR(rx->dst_addr), MAC2STR(rx->src_addr),
-              __be16_to_cpu(rx->len));
-}
-
-
-void hostap_dump_tx_header(const char *name, const struct hfa384x_tx_frame *tx)
-{
-       u16 fc;
-
-       printk(KERN_DEBUG "%s: TX status=0x%04x retry_count=%d tx_rate=%d "
-              "tx_control=0x%04x; jiffies=%ld\n",
-              name, __le16_to_cpu(tx->status), tx->retry_count, tx->tx_rate,
-              __le16_to_cpu(tx->tx_control), jiffies);
-
-       fc = __le16_to_cpu(tx->frame_control);
-       printk(KERN_DEBUG "   FC=0x%04x (type=%d:%d) dur=0x%04x seq=0x%04x "
-              "data_len=%d%s%s\n",
-              fc, WLAN_FC_GET_TYPE(fc) >> 2, WLAN_FC_GET_STYPE(fc) >> 4,
-              __le16_to_cpu(tx->duration_id), __le16_to_cpu(tx->seq_ctrl),
-              __le16_to_cpu(tx->data_len),
-              fc & IEEE80211_FCTL_TODS ? " [ToDS]" : "",
-              fc & IEEE80211_FCTL_FROMDS ? " [FromDS]" : "");
-
-       printk(KERN_DEBUG "   A1=" MACSTR " A2=" MACSTR " A3=" MACSTR " A4="
-              MACSTR "\n",
-              MAC2STR(tx->addr1), MAC2STR(tx->addr2), MAC2STR(tx->addr3),
-              MAC2STR(tx->addr4));
-
-       printk(KERN_DEBUG "   dst=" MACSTR " src=" MACSTR " len=%d\n",
-              MAC2STR(tx->dst_addr), MAC2STR(tx->src_addr),
-              __be16_to_cpu(tx->len));
-}
-
-
-int hostap_80211_header_parse(struct sk_buff *skb, unsigned char *haddr)
-{
-       memcpy(haddr, skb->mac.raw + 10, ETH_ALEN); /* addr2 */
-       return ETH_ALEN;
-}
-
-
-int hostap_80211_prism_header_parse(struct sk_buff *skb, unsigned char *haddr)
-{
-       if (*(u32 *)skb->mac.raw == LWNG_CAP_DID_BASE) {
-               memcpy(haddr, skb->mac.raw +
-                      sizeof(struct linux_wlan_ng_prism_hdr) + 10,
-                      ETH_ALEN); /* addr2 */
-       } else { /* (*(u32 *)skb->mac.raw == htonl(LWNG_CAPHDR_VERSION)) */
-               memcpy(haddr, skb->mac.raw +
-                      sizeof(struct linux_wlan_ng_cap_hdr) + 10,
-                      ETH_ALEN); /* addr2 */
-       }
-       return ETH_ALEN;
-}
-
-
-int hostap_80211_get_hdrlen(u16 fc)
-{
-       int hdrlen = 24;
-
-       switch (WLAN_FC_GET_TYPE(fc)) {
-       case IEEE80211_FTYPE_DATA:
-               if ((fc & IEEE80211_FCTL_FROMDS) && (fc & IEEE80211_FCTL_TODS))
-                       hdrlen = 30; /* Addr4 */
-               break;
-       case IEEE80211_FTYPE_CTL:
-               switch (WLAN_FC_GET_STYPE(fc)) {
-               case IEEE80211_STYPE_CTS:
-               case IEEE80211_STYPE_ACK:
-                       hdrlen = 10;
-                       break;
-               default:
-                       hdrlen = 16;
-                       break;
-               }
-               break;
-       }
-
-       return hdrlen;
-}
-
-
-struct net_device_stats *hostap_get_stats(struct net_device *dev)
-{
-       struct hostap_interface *iface;
-       iface = netdev_priv(dev);
-       return &iface->stats;
-}
-
-
-static int prism2_close(struct net_device *dev)
-{
-       struct hostap_interface *iface;
-       local_info_t *local;
-
-       PDEBUG(DEBUG_FLOW, "%s: prism2_close\n", dev->name);
-
-       iface = netdev_priv(dev);
-       local = iface->local;
-
-       if (dev == local->ddev) {
-               prism2_sta_deauth(local, WLAN_REASON_DEAUTH_LEAVING);
-       }
-#ifndef PRISM2_NO_KERNEL_IEEE80211_MGMT
-       if (!local->hostapd && dev == local->dev &&
-           (!local->func->card_present || local->func->card_present(local)) &&
-           local->hw_ready && local->ap && local->iw_mode == IW_MODE_MASTER)
-               hostap_deauth_all_stas(dev, local->ap, 1);
-#endif /* PRISM2_NO_KERNEL_IEEE80211_MGMT */
-
-       if (dev == local->dev) {
-               local->func->hw_shutdown(dev, HOSTAP_HW_ENABLE_CMDCOMPL);
-       }
-
-       if (netif_running(dev)) {
-               netif_stop_queue(dev);
-               netif_device_detach(dev);
-       }
-
-       flush_scheduled_work();
-
-       module_put(local->hw_module);
-
-       local->num_dev_open--;
-
-       if (dev != local->dev && local->dev->flags & IFF_UP &&
-           local->master_dev_auto_open && local->num_dev_open == 1) {
-               /* Close master radio interface automatically if it was also
-                * opened automatically and we are now closing the last
-                * remaining non-master device. */
-               dev_close(local->dev);
-       }
-
-       return 0;
-}
-
-
-static int prism2_open(struct net_device *dev)
-{
-       struct hostap_interface *iface;
-       local_info_t *local;
-
-       PDEBUG(DEBUG_FLOW, "%s: prism2_open\n", dev->name);
-
-       iface = netdev_priv(dev);
-       local = iface->local;
-
-       if (local->no_pri) {
-               printk(KERN_DEBUG "%s: could not set interface UP - no PRI "
-                      "f/w\n", dev->name);
-               return 1;
-       }
-
-       if ((local->func->card_present && !local->func->card_present(local)) ||
-           local->hw_downloading)
-               return -ENODEV;
-
-       if (!try_module_get(local->hw_module))
-               return -ENODEV;
-       local->num_dev_open++;
-
-       if (!local->dev_enabled && local->func->hw_enable(dev, 1)) {
-               printk(KERN_WARNING "%s: could not enable MAC port\n",
-                      dev->name);
-               prism2_close(dev);
-               return 1;
-       }
-       if (!local->dev_enabled)
-               prism2_callback(local, PRISM2_CALLBACK_ENABLE);
-       local->dev_enabled = 1;
-
-       if (dev != local->dev && !(local->dev->flags & IFF_UP)) {
-               /* Master radio interface is needed for all operation, so open
-                * it automatically when any virtual net_device is opened. */
-               local->master_dev_auto_open = 1;
-               dev_open(local->dev);
-       }
-
-       netif_device_attach(dev);
-       netif_start_queue(dev);
-
-       return 0;
-}
-
-
-static int prism2_set_mac_address(struct net_device *dev, void *p)
-{
-       struct hostap_interface *iface;
-       local_info_t *local;
-       struct list_head *ptr;
-       struct sockaddr *addr = p;
-
-       iface = netdev_priv(dev);
-       local = iface->local;
-
-       if (local->func->set_rid(dev, HFA384X_RID_CNFOWNMACADDR, addr->sa_data,
-                                ETH_ALEN) < 0 || local->func->reset_port(dev))
-               return -EINVAL;
-
-       read_lock_bh(&local->iface_lock);
-       list_for_each(ptr, &local->hostap_interfaces) {
-               iface = list_entry(ptr, struct hostap_interface, list);
-               memcpy(iface->dev->dev_addr, addr->sa_data, ETH_ALEN);
-       }
-       memcpy(local->dev->dev_addr, addr->sa_data, ETH_ALEN);
-       read_unlock_bh(&local->iface_lock);
-
-       return 0;
-}
-
-
-/* TODO: to be further implemented as soon as Prism2 fully supports
- *       GroupAddresses and correct documentation is available */
-void hostap_set_multicast_list_queue(void *data)
-{
-       struct net_device *dev = (struct net_device *) data;
-       struct hostap_interface *iface;
-       local_info_t *local;
-
-       iface = netdev_priv(dev);
-       local = iface->local;
-       if (hostap_set_word(dev, HFA384X_RID_PROMISCUOUSMODE,
-                           local->is_promisc)) {
-               printk(KERN_INFO "%s: %sabling promiscuous mode failed\n",
-                      dev->name, local->is_promisc ? "en" : "dis");
-       }
-}
-
-
-static void hostap_set_multicast_list(struct net_device *dev)
-{
-#if 0
-       /* FIX: promiscuous mode seems to be causing a lot of problems with
-        * some station firmware versions (FCSErr frames, invalid MACPort, etc.
-        * corrupted incoming frames). This code is now commented out while the
-        * problems are investigated. */
-       struct hostap_interface *iface;
-       local_info_t *local;
-
-       iface = netdev_priv(dev);
-       local = iface->local;
-       if ((dev->flags & IFF_ALLMULTI) || (dev->flags & IFF_PROMISC)) {
-               local->is_promisc = 1;
-       } else {
-               local->is_promisc = 0;
-       }
-
-       schedule_work(&local->set_multicast_list_queue);
-#endif
-}
-
-
-static int prism2_change_mtu(struct net_device *dev, int new_mtu)
-{
-       if (new_mtu < PRISM2_MIN_MTU || new_mtu > PRISM2_MAX_MTU)
-               return -EINVAL;
-
-       dev->mtu = new_mtu;
-       return 0;
-}
-
-
-static void prism2_tx_timeout(struct net_device *dev)
-{
-       struct hostap_interface *iface;
-       local_info_t *local;
-       struct hfa384x_regs regs;
-
-       iface = netdev_priv(dev);
-       local = iface->local;
-
-       printk(KERN_WARNING "%s Tx timed out! Resetting card\n", dev->name);
-       netif_stop_queue(local->dev);
-
-       local->func->read_regs(dev, &regs);
-       printk(KERN_DEBUG "%s: CMD=%04x EVSTAT=%04x "
-              "OFFSET0=%04x OFFSET1=%04x SWSUPPORT0=%04x\n",
-              dev->name, regs.cmd, regs.evstat, regs.offset0, regs.offset1,
-              regs.swsupport0);
-
-       local->func->schedule_reset(local);
-}
-
-
-void hostap_setup_dev(struct net_device *dev, local_info_t *local,
-                     int main_dev)
-{
-       struct hostap_interface *iface;
-
-       iface = netdev_priv(dev);
-       ether_setup(dev);
-
-       /* kernel callbacks */
-       dev->get_stats = hostap_get_stats;
-       if (iface) {
-               /* Currently, we point to the proper spy_data only on
-                * the main_dev. This could be fixed. Jean II */
-               iface->wireless_data.spy_data = &iface->spy_data;
-               dev->wireless_data = &iface->wireless_data;
-       }
-       dev->wireless_handlers =
-               (struct iw_handler_def *) &hostap_iw_handler_def;
-       dev->do_ioctl = hostap_ioctl;
-       dev->open = prism2_open;
-       dev->stop = prism2_close;
-       dev->hard_start_xmit = hostap_data_start_xmit;
-       dev->set_mac_address = prism2_set_mac_address;
-       dev->set_multicast_list = hostap_set_multicast_list;
-       dev->change_mtu = prism2_change_mtu;
-       dev->tx_timeout = prism2_tx_timeout;
-       dev->watchdog_timeo = TX_TIMEOUT;
-
-       dev->mtu = local->mtu;
-       if (!main_dev) {
-               /* use main radio device queue */
-               dev->tx_queue_len = 0;
-       }
-
-       SET_ETHTOOL_OPS(dev, &prism2_ethtool_ops);
-
-       netif_stop_queue(dev);
-}
-
-
-static int hostap_enable_hostapd(local_info_t *local, int rtnl_locked)
-{
-       struct net_device *dev = local->dev;
-
-       if (local->apdev)
-               return -EEXIST;
-
-       printk(KERN_DEBUG "%s: enabling hostapd mode\n", dev->name);
-
-       local->apdev = hostap_add_interface(local, HOSTAP_INTERFACE_AP,
-                                           rtnl_locked, local->ddev->name,
-                                           "ap");
-       if (local->apdev == NULL)
-               return -ENOMEM;
-
-       local->apdev->hard_start_xmit = hostap_mgmt_start_xmit;
-       local->apdev->type = ARPHRD_IEEE80211;
-       local->apdev->hard_header_parse = hostap_80211_header_parse;
-
-       return 0;
-}
-
-
-static int hostap_disable_hostapd(local_info_t *local, int rtnl_locked)
-{
-       struct net_device *dev = local->dev;
-
-       printk(KERN_DEBUG "%s: disabling hostapd mode\n", dev->name);
-
-       hostap_remove_interface(local->apdev, rtnl_locked, 1);
-       local->apdev = NULL;
-
-       return 0;
-}
-
-
-static int hostap_enable_hostapd_sta(local_info_t *local, int rtnl_locked)
-{
-       struct net_device *dev = local->dev;
-
-       if (local->stadev)
-               return -EEXIST;
-
-       printk(KERN_DEBUG "%s: enabling hostapd STA mode\n", dev->name);
-
-       local->stadev = hostap_add_interface(local, HOSTAP_INTERFACE_STA,
-                                            rtnl_locked, local->ddev->name,
-                                            "sta");
-       if (local->stadev == NULL)
-               return -ENOMEM;
-
-       return 0;
-}
-
-
-static int hostap_disable_hostapd_sta(local_info_t *local, int rtnl_locked)
-{
-       struct net_device *dev = local->dev;
-
-       printk(KERN_DEBUG "%s: disabling hostapd mode\n", dev->name);
-
-       hostap_remove_interface(local->stadev, rtnl_locked, 1);
-       local->stadev = NULL;
-
-       return 0;
-}
-
-
-int hostap_set_hostapd(local_info_t *local, int val, int rtnl_locked)
-{
-       int ret;
-
-       if (val < 0 || val > 1)
-               return -EINVAL;
-
-       if (local->hostapd == val)
-               return 0;
-
-       if (val) {
-               ret = hostap_enable_hostapd(local, rtnl_locked);
-               if (ret == 0)
-                       local->hostapd = 1;
-       } else {
-               local->hostapd = 0;
-               ret = hostap_disable_hostapd(local, rtnl_locked);
-               if (ret != 0)
-                       local->hostapd = 1;
-       }
-
-       return ret;
-}
-
-
-int hostap_set_hostapd_sta(local_info_t *local, int val, int rtnl_locked)
-{
-       int ret;
-
-       if (val < 0 || val > 1)
-               return -EINVAL;
-
-       if (local->hostapd_sta == val)
-               return 0;
-
-       if (val) {
-               ret = hostap_enable_hostapd_sta(local, rtnl_locked);
-               if (ret == 0)
-                       local->hostapd_sta = 1;
-       } else {
-               local->hostapd_sta = 0;
-               ret = hostap_disable_hostapd_sta(local, rtnl_locked);
-               if (ret != 0)
-                       local->hostapd_sta = 1;
-       }
-
-
-       return ret;
-}
-
-
-int prism2_update_comms_qual(struct net_device *dev)
-{
-       struct hostap_interface *iface;
-       local_info_t *local;
-       int ret = 0;
-       struct hfa384x_comms_quality sq;
-
-       iface = netdev_priv(dev);
-       local = iface->local;
-       if (!local->sta_fw_ver)
-               ret = -1;
-       else if (local->sta_fw_ver >= PRISM2_FW_VER(1,3,1)) {
-               if (local->func->get_rid(local->dev,
-                                        HFA384X_RID_DBMCOMMSQUALITY,
-                                        &sq, sizeof(sq), 1) >= 0) {
-                       local->comms_qual = (s16) le16_to_cpu(sq.comm_qual);
-                       local->avg_signal = (s16) le16_to_cpu(sq.signal_level);
-                       local->avg_noise = (s16) le16_to_cpu(sq.noise_level);
-                       local->last_comms_qual_update = jiffies;
-               } else
-                       ret = -1;
-       } else {
-               if (local->func->get_rid(local->dev, HFA384X_RID_COMMSQUALITY,
-                                        &sq, sizeof(sq), 1) >= 0) {
-                       local->comms_qual = le16_to_cpu(sq.comm_qual);
-                       local->avg_signal = HFA384X_LEVEL_TO_dBm(
-                               le16_to_cpu(sq.signal_level));
-                       local->avg_noise = HFA384X_LEVEL_TO_dBm(
-                               le16_to_cpu(sq.noise_level));
-                       local->last_comms_qual_update = jiffies;
-               } else
-                       ret = -1;
-       }
-
-       return ret;
-}
-
-
-int prism2_sta_send_mgmt(local_info_t *local, u8 *dst, u16 stype,
-                        u8 *body, size_t bodylen)
-{
-       struct sk_buff *skb;
-       struct hostap_ieee80211_mgmt *mgmt;
-       struct hostap_skb_tx_data *meta;
-       struct net_device *dev = local->dev;
-
-       skb = dev_alloc_skb(IEEE80211_MGMT_HDR_LEN + bodylen);
-       if (skb == NULL)
-               return -ENOMEM;
-
-       mgmt = (struct hostap_ieee80211_mgmt *)
-               skb_put(skb, IEEE80211_MGMT_HDR_LEN);
-       memset(mgmt, 0, IEEE80211_MGMT_HDR_LEN);
-       mgmt->frame_control = cpu_to_le16(IEEE80211_FTYPE_MGMT | stype);
-       memcpy(mgmt->da, dst, ETH_ALEN);
-       memcpy(mgmt->sa, dev->dev_addr, ETH_ALEN);
-       memcpy(mgmt->bssid, dst, ETH_ALEN);
-       if (body)
-               memcpy(skb_put(skb, bodylen), body, bodylen);
-
-       meta = (struct hostap_skb_tx_data *) skb->cb;
-       memset(meta, 0, sizeof(*meta));
-       meta->magic = HOSTAP_SKB_TX_DATA_MAGIC;
-       meta->iface = netdev_priv(dev);
-
-       skb->dev = dev;
-       skb->mac.raw = skb->nh.raw = skb->data;
-       dev_queue_xmit(skb);
-
-       return 0;
-}
-
-
-int prism2_sta_deauth(local_info_t *local, u16 reason)
-{
-       union iwreq_data wrqu;
-       int ret;
-
-       if (local->iw_mode != IW_MODE_INFRA ||
-           memcmp(local->bssid, "\x00\x00\x00\x00\x00\x00", ETH_ALEN) == 0 ||
-           memcmp(local->bssid, "\x44\x44\x44\x44\x44\x44", ETH_ALEN) == 0)
-               return 0;
-
-       reason = cpu_to_le16(reason);
-       ret = prism2_sta_send_mgmt(local, local->bssid, IEEE80211_STYPE_DEAUTH,
-                                  (u8 *) &reason, 2);
-       memset(wrqu.ap_addr.sa_data, 0, ETH_ALEN);
-       wireless_send_event(local->dev, SIOCGIWAP, &wrqu, NULL);
-       return ret;
-}
-
-
-struct proc_dir_entry *hostap_proc;
-
-static int __init hostap_init(void)
-{
-       if (proc_net != NULL) {
-               hostap_proc = proc_mkdir("hostap", proc_net);
-               if (!hostap_proc)
-                       printk(KERN_WARNING "Failed to mkdir "
-                              "/proc/net/hostap\n");
-       } else
-               hostap_proc = NULL;
-
-       return 0;
-}
-
-
-static void __exit hostap_exit(void)
-{
-       if (hostap_proc != NULL) {
-               hostap_proc = NULL;
-               remove_proc_entry("hostap", proc_net);
-       }
-}
-
-
-EXPORT_SYMBOL(hostap_set_word);
-EXPORT_SYMBOL(hostap_set_string);
-EXPORT_SYMBOL(hostap_get_porttype);
-EXPORT_SYMBOL(hostap_set_encryption);
-EXPORT_SYMBOL(hostap_set_antsel);
-EXPORT_SYMBOL(hostap_set_roaming);
-EXPORT_SYMBOL(hostap_set_auth_algs);
-EXPORT_SYMBOL(hostap_dump_rx_header);
-EXPORT_SYMBOL(hostap_dump_tx_header);
-EXPORT_SYMBOL(hostap_80211_header_parse);
-EXPORT_SYMBOL(hostap_80211_prism_header_parse);
-EXPORT_SYMBOL(hostap_80211_get_hdrlen);
-EXPORT_SYMBOL(hostap_get_stats);
-EXPORT_SYMBOL(hostap_setup_dev);
-EXPORT_SYMBOL(hostap_proc);
-EXPORT_SYMBOL(hostap_set_multicast_list_queue);
-EXPORT_SYMBOL(hostap_set_hostapd);
-EXPORT_SYMBOL(hostap_set_hostapd_sta);
-EXPORT_SYMBOL(hostap_add_interface);
-EXPORT_SYMBOL(hostap_remove_interface);
-EXPORT_SYMBOL(prism2_update_comms_qual);
-
-module_init(hostap_init);
-module_exit(hostap_exit);
diff --git a/drivers/net/wireless/hostap/hostap_main.c b/drivers/net/wireless/hostap/hostap_main.c
new file mode 100644 (file)
index 0000000..3d2ea61
--- /dev/null
@@ -0,0 +1,1191 @@
+/*
+ * Host AP (software wireless LAN access point) driver for
+ * Intersil Prism2/2.5/3 - hostap.o module, common routines
+ *
+ * Copyright (c) 2001-2002, SSH Communications Security Corp and Jouni Malinen
+ * <jkmaline@cc.hut.fi>
+ * Copyright (c) 2002-2005, Jouni Malinen <jkmaline@cc.hut.fi>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation. See README and COPYING for
+ * more details.
+ */
+
+#include <linux/config.h>
+#include <linux/module.h>
+#include <linux/init.h>
+#include <linux/slab.h>
+#include <linux/proc_fs.h>
+#include <linux/if_arp.h>
+#include <linux/delay.h>
+#include <linux/random.h>
+#include <linux/workqueue.h>
+#include <linux/kmod.h>
+#include <linux/rtnetlink.h>
+#include <linux/wireless.h>
+#include <net/iw_handler.h>
+#include <net/ieee80211.h>
+#include <net/ieee80211_crypt.h>
+#include <asm/uaccess.h>
+
+#include "hostap_wlan.h"
+#include "hostap_80211.h"
+#include "hostap_ap.h"
+#include "hostap.h"
+
+MODULE_AUTHOR("Jouni Malinen");
+MODULE_DESCRIPTION("Host AP common routines");
+MODULE_LICENSE("GPL");
+MODULE_VERSION(PRISM2_VERSION);
+
+#define TX_TIMEOUT (2 * HZ)
+
+#define PRISM2_MAX_FRAME_SIZE 2304
+#define PRISM2_MIN_MTU 256
+/* FIX: */
+#define PRISM2_MAX_MTU (PRISM2_MAX_FRAME_SIZE - (6 /* LLC */ + 8 /* WEP */))
+
+
+/* hostap.c */
+static int prism2_wds_add(local_info_t *local, u8 *remote_addr,
+                         int rtnl_locked);
+static int prism2_wds_del(local_info_t *local, u8 *remote_addr,
+                         int rtnl_locked, int do_not_remove);
+
+/* hostap_ap.c */
+static int prism2_ap_get_sta_qual(local_info_t *local, struct sockaddr addr[],
+                                 struct iw_quality qual[], int buf_size,
+                                 int aplist);
+static int prism2_ap_translate_scan(struct net_device *dev, char *buffer);
+static int prism2_hostapd(struct ap_data *ap,
+                         struct prism2_hostapd_param *param);
+static void * ap_crypt_get_ptrs(struct ap_data *ap, u8 *addr, int permanent,
+                               struct ieee80211_crypt_data ***crypt);
+static void ap_control_kickall(struct ap_data *ap);
+#ifndef PRISM2_NO_KERNEL_IEEE80211_MGMT
+static int ap_control_add_mac(struct mac_restrictions *mac_restrictions,
+                             u8 *mac);
+static int ap_control_del_mac(struct mac_restrictions *mac_restrictions,
+                             u8 *mac);
+static void ap_control_flush_macs(struct mac_restrictions *mac_restrictions);
+static int ap_control_kick_mac(struct ap_data *ap, struct net_device *dev,
+                              u8 *mac);
+#endif /* !PRISM2_NO_KERNEL_IEEE80211_MGMT */
+
+
+static const long freq_list[] = { 2412, 2417, 2422, 2427, 2432, 2437, 2442,
+                                 2447, 2452, 2457, 2462, 2467, 2472, 2484 };
+#define FREQ_COUNT (sizeof(freq_list) / sizeof(freq_list[0]))
+
+
+/* See IEEE 802.1H for LLC/SNAP encapsulation/decapsulation */
+/* Ethernet-II snap header (RFC1042 for most EtherTypes) */
+static unsigned char rfc1042_header[] =
+{ 0xaa, 0xaa, 0x03, 0x00, 0x00, 0x00 };
+/* Bridge-Tunnel header (for EtherTypes ETH_P_AARP and ETH_P_IPX) */
+static unsigned char bridge_tunnel_header[] =
+{ 0xaa, 0xaa, 0x03, 0x00, 0x00, 0xf8 };
+/* No encapsulation header if EtherType < 0x600 (=length) */
+
+
+/* FIX: these could be compiled separately and linked together to hostap.o */
+#include "hostap_ap.c"
+#include "hostap_info.c"
+#include "hostap_ioctl.c"
+#include "hostap_proc.c"
+#include "hostap_80211_rx.c"
+#include "hostap_80211_tx.c"
+
+
+struct net_device * hostap_add_interface(struct local_info *local,
+                                        int type, int rtnl_locked,
+                                        const char *prefix,
+                                        const char *name)
+{
+       struct net_device *dev, *mdev;
+       struct hostap_interface *iface;
+       int ret;
+
+       dev = alloc_etherdev(sizeof(struct hostap_interface));
+       if (dev == NULL)
+               return NULL;
+
+       iface = netdev_priv(dev);
+       iface->dev = dev;
+       iface->local = local;
+       iface->type = type;
+       list_add(&iface->list, &local->hostap_interfaces);
+
+       mdev = local->dev;
+       memcpy(dev->dev_addr, mdev->dev_addr, ETH_ALEN);
+       dev->base_addr = mdev->base_addr;
+       dev->irq = mdev->irq;
+       dev->mem_start = mdev->mem_start;
+       dev->mem_end = mdev->mem_end;
+
+       hostap_setup_dev(dev, local, 0);
+       dev->destructor = free_netdev;
+
+       sprintf(dev->name, "%s%s", prefix, name);
+       if (!rtnl_locked)
+               rtnl_lock();
+
+       ret = 0;
+       if (strchr(dev->name, '%'))
+               ret = dev_alloc_name(dev, dev->name);
+
+       SET_NETDEV_DEV(dev, mdev->class_dev.dev);
+       if (ret >= 0)
+               ret = register_netdevice(dev);
+
+       if (!rtnl_locked)
+               rtnl_unlock();
+
+       if (ret < 0) {
+               printk(KERN_WARNING "%s: failed to add new netdevice!\n",
+                      dev->name);
+               free_netdev(dev);
+               return NULL;
+       }
+
+       printk(KERN_DEBUG "%s: registered netdevice %s\n",
+              mdev->name, dev->name);
+
+       return dev;
+}
+
+
+void hostap_remove_interface(struct net_device *dev, int rtnl_locked,
+                            int remove_from_list)
+{
+       struct hostap_interface *iface;
+
+       if (!dev)
+               return;
+
+       iface = netdev_priv(dev);
+
+       if (remove_from_list) {
+               list_del(&iface->list);
+       }
+
+       if (dev == iface->local->ddev)
+               iface->local->ddev = NULL;
+       else if (dev == iface->local->apdev)
+               iface->local->apdev = NULL;
+       else if (dev == iface->local->stadev)
+               iface->local->stadev = NULL;
+
+       if (rtnl_locked)
+               unregister_netdevice(dev);
+       else
+               unregister_netdev(dev);
+
+       /* dev->destructor = free_netdev() will free the device data, including
+        * private data, when removing the device */
+}
+
+
+static inline int prism2_wds_special_addr(u8 *addr)
+{
+       if (addr[0] || addr[1] || addr[2] || addr[3] || addr[4] || addr[5])
+               return 0;
+
+       return 1;
+}
+
+
+static int prism2_wds_add(local_info_t *local, u8 *remote_addr,
+                         int rtnl_locked)
+{
+       struct net_device *dev;
+       struct list_head *ptr;
+       struct hostap_interface *iface, *empty, *match;
+
+       empty = match = NULL;
+       read_lock_bh(&local->iface_lock);
+       list_for_each(ptr, &local->hostap_interfaces) {
+               iface = list_entry(ptr, struct hostap_interface, list);
+               if (iface->type != HOSTAP_INTERFACE_WDS)
+                       continue;
+
+               if (prism2_wds_special_addr(iface->u.wds.remote_addr))
+                       empty = iface;
+               else if (memcmp(iface->u.wds.remote_addr, remote_addr,
+                               ETH_ALEN) == 0) {
+                       match = iface;
+                       break;
+               }
+       }
+       if (!match && empty && !prism2_wds_special_addr(remote_addr)) {
+               /* take pre-allocated entry into use */
+               memcpy(empty->u.wds.remote_addr, remote_addr, ETH_ALEN);
+               read_unlock_bh(&local->iface_lock);
+               printk(KERN_DEBUG "%s: using pre-allocated WDS netdevice %s\n",
+                      local->dev->name, empty->dev->name);
+               return 0;
+       }
+       read_unlock_bh(&local->iface_lock);
+
+       if (!prism2_wds_special_addr(remote_addr)) {
+               if (match)
+                       return -EEXIST;
+               hostap_add_sta(local->ap, remote_addr);
+       }
+
+       if (local->wds_connections >= local->wds_max_connections)
+               return -ENOBUFS;
+
+       /* verify that there is room for wds# postfix in the interface name */
+       if (strlen(local->dev->name) > IFNAMSIZ - 5) {
+               printk(KERN_DEBUG "'%s' too long base device name\n",
+                      local->dev->name);
+               return -EINVAL;
+       }
+
+       dev = hostap_add_interface(local, HOSTAP_INTERFACE_WDS, rtnl_locked,
+                                  local->ddev->name, "wds%d");
+       if (dev == NULL)
+               return -ENOMEM;
+
+       iface = netdev_priv(dev);
+       memcpy(iface->u.wds.remote_addr, remote_addr, ETH_ALEN);
+
+       local->wds_connections++;
+
+       return 0;
+}
+
+
+static int prism2_wds_del(local_info_t *local, u8 *remote_addr,
+                         int rtnl_locked, int do_not_remove)
+{
+       unsigned long flags;
+       struct list_head *ptr;
+       struct hostap_interface *iface, *selected = NULL;
+
+       write_lock_irqsave(&local->iface_lock, flags);
+       list_for_each(ptr, &local->hostap_interfaces) {
+               iface = list_entry(ptr, struct hostap_interface, list);
+               if (iface->type != HOSTAP_INTERFACE_WDS)
+                       continue;
+
+               if (memcmp(iface->u.wds.remote_addr, remote_addr,
+                          ETH_ALEN) == 0) {
+                       selected = iface;
+                       break;
+               }
+       }
+       if (selected && !do_not_remove)
+               list_del(&selected->list);
+       write_unlock_irqrestore(&local->iface_lock, flags);
+
+       if (selected) {
+               if (do_not_remove)
+                       memset(selected->u.wds.remote_addr, 0, ETH_ALEN);
+               else {
+                       hostap_remove_interface(selected->dev, rtnl_locked, 0);
+                       local->wds_connections--;
+               }
+       }
+
+       return selected ? 0 : -ENODEV;
+}
+
+
+u16 hostap_tx_callback_register(local_info_t *local,
+                               void (*func)(struct sk_buff *, int ok, void *),
+                               void *data)
+{
+       unsigned long flags;
+       struct hostap_tx_callback_info *entry;
+
+       entry = (struct hostap_tx_callback_info *) kmalloc(sizeof(*entry),
+                                                          GFP_ATOMIC);
+       if (entry == NULL)
+               return 0;
+
+       entry->func = func;
+       entry->data = data;
+
+       spin_lock_irqsave(&local->lock, flags);
+       entry->idx = local->tx_callback ? local->tx_callback->idx + 1 : 1;
+       entry->next = local->tx_callback;
+       local->tx_callback = entry;
+       spin_unlock_irqrestore(&local->lock, flags);
+
+       return entry->idx;
+}
+
+
+int hostap_tx_callback_unregister(local_info_t *local, u16 idx)
+{
+       unsigned long flags;
+       struct hostap_tx_callback_info *cb, *prev = NULL;
+
+       spin_lock_irqsave(&local->lock, flags);
+       cb = local->tx_callback;
+       while (cb != NULL && cb->idx != idx) {
+               prev = cb;
+               cb = cb->next;
+       }
+       if (cb) {
+               if (prev == NULL)
+                       local->tx_callback = cb->next;
+               else
+                       prev->next = cb->next;
+               kfree(cb);
+       }
+       spin_unlock_irqrestore(&local->lock, flags);
+
+       return cb ? 0 : -1;
+}
+
+
+/* val is in host byte order */
+int hostap_set_word(struct net_device *dev, int rid, u16 val)
+{
+       struct hostap_interface *iface;
+       u16 tmp = cpu_to_le16(val);
+       iface = netdev_priv(dev);
+       return iface->local->func->set_rid(dev, rid, &tmp, 2);
+}
+
+
+int hostap_set_string(struct net_device *dev, int rid, const char *val)
+{
+       struct hostap_interface *iface;
+       char buf[MAX_SSID_LEN + 2];
+       int len;
+
+       iface = netdev_priv(dev);
+       len = strlen(val);
+       if (len > MAX_SSID_LEN)
+               return -1;
+       memset(buf, 0, sizeof(buf));
+       buf[0] = len; /* little endian 16 bit word */
+       memcpy(buf + 2, val, len);
+
+       return iface->local->func->set_rid(dev, rid, &buf, MAX_SSID_LEN + 2);
+}
+
+
+u16 hostap_get_porttype(local_info_t *local)
+{
+       if (local->iw_mode == IW_MODE_ADHOC && local->pseudo_adhoc)
+               return HFA384X_PORTTYPE_PSEUDO_IBSS;
+       if (local->iw_mode == IW_MODE_ADHOC)
+               return HFA384X_PORTTYPE_IBSS;
+       if (local->iw_mode == IW_MODE_INFRA)
+               return HFA384X_PORTTYPE_BSS;
+       if (local->iw_mode == IW_MODE_REPEAT)
+               return HFA384X_PORTTYPE_WDS;
+       if (local->iw_mode == IW_MODE_MONITOR)
+               return HFA384X_PORTTYPE_PSEUDO_IBSS;
+       return HFA384X_PORTTYPE_HOSTAP;
+}
+
+
+int hostap_set_encryption(local_info_t *local)
+{
+       u16 val, old_val;
+       int i, keylen, len, idx;
+       char keybuf[WEP_KEY_LEN + 1];
+       enum { NONE, WEP, OTHER } encrypt_type;
+
+       idx = local->tx_keyidx;
+       if (local->crypt[idx] == NULL || local->crypt[idx]->ops == NULL)
+               encrypt_type = NONE;
+       else if (strcmp(local->crypt[idx]->ops->name, "WEP") == 0)
+               encrypt_type = WEP;
+       else
+               encrypt_type = OTHER;
+
+       if (local->func->get_rid(local->dev, HFA384X_RID_CNFWEPFLAGS, &val, 2,
+                                1) < 0) {
+               printk(KERN_DEBUG "Could not read current WEP flags.\n");
+               goto fail;
+       }
+       le16_to_cpus(&val);
+       old_val = val;
+
+       if (encrypt_type != NONE || local->privacy_invoked)
+               val |= HFA384X_WEPFLAGS_PRIVACYINVOKED;
+       else
+               val &= ~HFA384X_WEPFLAGS_PRIVACYINVOKED;
+
+       if (local->open_wep || encrypt_type == NONE ||
+           ((local->ieee_802_1x || local->wpa) && local->host_decrypt))
+               val &= ~HFA384X_WEPFLAGS_EXCLUDEUNENCRYPTED;
+       else
+               val |= HFA384X_WEPFLAGS_EXCLUDEUNENCRYPTED;
+
+       if ((encrypt_type != NONE || local->privacy_invoked) &&
+           (encrypt_type == OTHER || local->host_encrypt))
+               val |= HFA384X_WEPFLAGS_HOSTENCRYPT;
+       else
+               val &= ~HFA384X_WEPFLAGS_HOSTENCRYPT;
+       if ((encrypt_type != NONE || local->privacy_invoked) &&
+           (encrypt_type == OTHER || local->host_decrypt))
+               val |= HFA384X_WEPFLAGS_HOSTDECRYPT;
+       else
+               val &= ~HFA384X_WEPFLAGS_HOSTDECRYPT;
+
+       if (val != old_val &&
+           hostap_set_word(local->dev, HFA384X_RID_CNFWEPFLAGS, val)) {
+               printk(KERN_DEBUG "Could not write new WEP flags (0x%x)\n",
+                      val);
+               goto fail;
+       }
+
+       if (encrypt_type != WEP)
+               return 0;
+
+       /* 104-bit support seems to require that all the keys are set to the
+        * same keylen */
+       keylen = 6; /* first 5 octets */
+       len = local->crypt[idx]->ops->get_key(keybuf, sizeof(keybuf),
+                                             NULL, local->crypt[idx]->priv);
+       if (idx >= 0 && idx < WEP_KEYS && len > 5)
+               keylen = WEP_KEY_LEN + 1; /* first 13 octets */
+
+       for (i = 0; i < WEP_KEYS; i++) {
+               memset(keybuf, 0, sizeof(keybuf));
+               if (local->crypt[i]) {
+                       (void) local->crypt[i]->ops->get_key(
+                               keybuf, sizeof(keybuf),
+                               NULL, local->crypt[i]->priv);
+               }
+               if (local->func->set_rid(local->dev,
+                                        HFA384X_RID_CNFDEFAULTKEY0 + i,
+                                        keybuf, keylen)) {
+                       printk(KERN_DEBUG "Could not set key %d (len=%d)\n",
+                              i, keylen);
+                       goto fail;
+               }
+       }
+       if (hostap_set_word(local->dev, HFA384X_RID_CNFWEPDEFAULTKEYID, idx)) {
+               printk(KERN_DEBUG "Could not set default keyid %d\n", idx);
+               goto fail;
+       }
+
+       return 0;
+
+ fail:
+       printk(KERN_DEBUG "%s: encryption setup failed\n", local->dev->name);
+       return -1;
+}
+
+
+int hostap_set_antsel(local_info_t *local)
+{
+       u16 val;
+       int ret = 0;
+
+       if (local->antsel_tx != HOSTAP_ANTSEL_DO_NOT_TOUCH &&
+           local->func->cmd(local->dev, HFA384X_CMDCODE_READMIF,
+                            HFA386X_CR_TX_CONFIGURE,
+                            NULL, &val) == 0) {
+               val &= ~(BIT(2) | BIT(1));
+               switch (local->antsel_tx) {
+               case HOSTAP_ANTSEL_DIVERSITY:
+                       val |= BIT(1);
+                       break;
+               case HOSTAP_ANTSEL_LOW:
+                       break;
+               case HOSTAP_ANTSEL_HIGH:
+                       val |= BIT(2);
+                       break;
+               }
+
+               if (local->func->cmd(local->dev, HFA384X_CMDCODE_WRITEMIF,
+                                    HFA386X_CR_TX_CONFIGURE, &val, NULL)) {
+                       printk(KERN_INFO "%s: setting TX AntSel failed\n",
+                              local->dev->name);
+                       ret = -1;
+               }
+       }
+
+       if (local->antsel_rx != HOSTAP_ANTSEL_DO_NOT_TOUCH &&
+           local->func->cmd(local->dev, HFA384X_CMDCODE_READMIF,
+                            HFA386X_CR_RX_CONFIGURE,
+                            NULL, &val) == 0) {
+               val &= ~(BIT(1) | BIT(0));
+               switch (local->antsel_rx) {
+               case HOSTAP_ANTSEL_DIVERSITY:
+                       break;
+               case HOSTAP_ANTSEL_LOW:
+                       val |= BIT(0);
+                       break;
+               case HOSTAP_ANTSEL_HIGH:
+                       val |= BIT(0) | BIT(1);
+                       break;
+               }
+
+               if (local->func->cmd(local->dev, HFA384X_CMDCODE_WRITEMIF,
+                                    HFA386X_CR_RX_CONFIGURE, &val, NULL)) {
+                       printk(KERN_INFO "%s: setting RX AntSel failed\n",
+                              local->dev->name);
+                       ret = -1;
+               }
+       }
+
+       return ret;
+}
+
+
+int hostap_set_roaming(local_info_t *local)
+{
+       u16 val;
+
+       switch (local->host_roaming) {
+       case 1:
+               val = HFA384X_ROAMING_HOST;
+               break;
+       case 2:
+               val = HFA384X_ROAMING_DISABLED;
+               break;
+       case 0:
+       default:
+               val = HFA384X_ROAMING_FIRMWARE;
+               break;
+       }
+
+       return hostap_set_word(local->dev, HFA384X_RID_CNFROAMINGMODE, val);
+}
+
+
+int hostap_set_auth_algs(local_info_t *local)
+{
+       int val = local->auth_algs;
+       /* At least STA f/w v0.6.2 seems to have issues with cnfAuthentication
+        * set to include both Open and Shared Key flags. It tries to use
+        * Shared Key authentication in that case even if WEP keys are not
+        * configured.. STA f/w v0.7.6 is able to handle such configuration,
+        * but it is unknown when this was fixed between 0.6.2 .. 0.7.6. */
+       if (local->sta_fw_ver < PRISM2_FW_VER(0,7,0) &&
+           val != PRISM2_AUTH_OPEN && val != PRISM2_AUTH_SHARED_KEY)
+               val = PRISM2_AUTH_OPEN;
+
+       if (hostap_set_word(local->dev, HFA384X_RID_CNFAUTHENTICATION, val)) {
+               printk(KERN_INFO "%s: cnfAuthentication setting to 0x%x "
+                      "failed\n", local->dev->name, local->auth_algs);
+               return -EINVAL;
+       }
+
+       return 0;
+}
+
+
+void hostap_dump_rx_header(const char *name, const struct hfa384x_rx_frame *rx)
+{
+       u16 status, fc;
+
+       status = __le16_to_cpu(rx->status);
+
+       printk(KERN_DEBUG "%s: RX status=0x%04x (port=%d, type=%d, "
+              "fcserr=%d) silence=%d signal=%d rate=%d rxflow=%d; "
+              "jiffies=%ld\n",
+              name, status, (status >> 8) & 0x07, status >> 13, status & 1,
+              rx->silence, rx->signal, rx->rate, rx->rxflow, jiffies);
+
+       fc = __le16_to_cpu(rx->frame_control);
+       printk(KERN_DEBUG "   FC=0x%04x (type=%d:%d) dur=0x%04x seq=0x%04x "
+              "data_len=%d%s%s\n",
+              fc, WLAN_FC_GET_TYPE(fc) >> 2, WLAN_FC_GET_STYPE(fc) >> 4,
+              __le16_to_cpu(rx->duration_id), __le16_to_cpu(rx->seq_ctrl),
+              __le16_to_cpu(rx->data_len),
+              fc & IEEE80211_FCTL_TODS ? " [ToDS]" : "",
+              fc & IEEE80211_FCTL_FROMDS ? " [FromDS]" : "");
+
+       printk(KERN_DEBUG "   A1=" MACSTR " A2=" MACSTR " A3=" MACSTR " A4="
+              MACSTR "\n",
+              MAC2STR(rx->addr1), MAC2STR(rx->addr2), MAC2STR(rx->addr3),
+              MAC2STR(rx->addr4));
+
+       printk(KERN_DEBUG "   dst=" MACSTR " src=" MACSTR " len=%d\n",
+              MAC2STR(rx->dst_addr), MAC2STR(rx->src_addr),
+              __be16_to_cpu(rx->len));
+}
+
+
+void hostap_dump_tx_header(const char *name, const struct hfa384x_tx_frame *tx)
+{
+       u16 fc;
+
+       printk(KERN_DEBUG "%s: TX status=0x%04x retry_count=%d tx_rate=%d "
+              "tx_control=0x%04x; jiffies=%ld\n",
+              name, __le16_to_cpu(tx->status), tx->retry_count, tx->tx_rate,
+              __le16_to_cpu(tx->tx_control), jiffies);
+
+       fc = __le16_to_cpu(tx->frame_control);
+       printk(KERN_DEBUG "   FC=0x%04x (type=%d:%d) dur=0x%04x seq=0x%04x "
+              "data_len=%d%s%s\n",
+              fc, WLAN_FC_GET_TYPE(fc) >> 2, WLAN_FC_GET_STYPE(fc) >> 4,
+              __le16_to_cpu(tx->duration_id), __le16_to_cpu(tx->seq_ctrl),
+              __le16_to_cpu(tx->data_len),
+              fc & IEEE80211_FCTL_TODS ? " [ToDS]" : "",
+              fc & IEEE80211_FCTL_FROMDS ? " [FromDS]" : "");
+
+       printk(KERN_DEBUG "   A1=" MACSTR " A2=" MACSTR " A3=" MACSTR " A4="
+              MACSTR "\n",
+              MAC2STR(tx->addr1), MAC2STR(tx->addr2), MAC2STR(tx->addr3),
+              MAC2STR(tx->addr4));
+
+       printk(KERN_DEBUG "   dst=" MACSTR " src=" MACSTR " len=%d\n",
+              MAC2STR(tx->dst_addr), MAC2STR(tx->src_addr),
+              __be16_to_cpu(tx->len));
+}
+
+
+int hostap_80211_header_parse(struct sk_buff *skb, unsigned char *haddr)
+{
+       memcpy(haddr, skb->mac.raw + 10, ETH_ALEN); /* addr2 */
+       return ETH_ALEN;
+}
+
+
+int hostap_80211_prism_header_parse(struct sk_buff *skb, unsigned char *haddr)
+{
+       if (*(u32 *)skb->mac.raw == LWNG_CAP_DID_BASE) {
+               memcpy(haddr, skb->mac.raw +
+                      sizeof(struct linux_wlan_ng_prism_hdr) + 10,
+                      ETH_ALEN); /* addr2 */
+       } else { /* (*(u32 *)skb->mac.raw == htonl(LWNG_CAPHDR_VERSION)) */
+               memcpy(haddr, skb->mac.raw +
+                      sizeof(struct linux_wlan_ng_cap_hdr) + 10,
+                      ETH_ALEN); /* addr2 */
+       }
+       return ETH_ALEN;
+}
+
+
+int hostap_80211_get_hdrlen(u16 fc)
+{
+       int hdrlen = 24;
+
+       switch (WLAN_FC_GET_TYPE(fc)) {
+       case IEEE80211_FTYPE_DATA:
+               if ((fc & IEEE80211_FCTL_FROMDS) && (fc & IEEE80211_FCTL_TODS))
+                       hdrlen = 30; /* Addr4 */
+               break;
+       case IEEE80211_FTYPE_CTL:
+               switch (WLAN_FC_GET_STYPE(fc)) {
+               case IEEE80211_STYPE_CTS:
+               case IEEE80211_STYPE_ACK:
+                       hdrlen = 10;
+                       break;
+               default:
+                       hdrlen = 16;
+                       break;
+               }
+               break;
+       }
+
+       return hdrlen;
+}
+
+
+struct net_device_stats *hostap_get_stats(struct net_device *dev)
+{
+       struct hostap_interface *iface;
+       iface = netdev_priv(dev);
+       return &iface->stats;
+}
+
+
+static int prism2_close(struct net_device *dev)
+{
+       struct hostap_interface *iface;
+       local_info_t *local;
+
+       PDEBUG(DEBUG_FLOW, "%s: prism2_close\n", dev->name);
+
+       iface = netdev_priv(dev);
+       local = iface->local;
+
+       if (dev == local->ddev) {
+               prism2_sta_deauth(local, WLAN_REASON_DEAUTH_LEAVING);
+       }
+#ifndef PRISM2_NO_KERNEL_IEEE80211_MGMT
+       if (!local->hostapd && dev == local->dev &&
+           (!local->func->card_present || local->func->card_present(local)) &&
+           local->hw_ready && local->ap && local->iw_mode == IW_MODE_MASTER)
+               hostap_deauth_all_stas(dev, local->ap, 1);
+#endif /* PRISM2_NO_KERNEL_IEEE80211_MGMT */
+
+       if (dev == local->dev) {
+               local->func->hw_shutdown(dev, HOSTAP_HW_ENABLE_CMDCOMPL);
+       }
+
+       if (netif_running(dev)) {
+               netif_stop_queue(dev);
+               netif_device_detach(dev);
+       }
+
+       flush_scheduled_work();
+
+       module_put(local->hw_module);
+
+       local->num_dev_open--;
+
+       if (dev != local->dev && local->dev->flags & IFF_UP &&
+           local->master_dev_auto_open && local->num_dev_open == 1) {
+               /* Close master radio interface automatically if it was also
+                * opened automatically and we are now closing the last
+                * remaining non-master device. */
+               dev_close(local->dev);
+       }
+
+       return 0;
+}
+
+
+static int prism2_open(struct net_device *dev)
+{
+       struct hostap_interface *iface;
+       local_info_t *local;
+
+       PDEBUG(DEBUG_FLOW, "%s: prism2_open\n", dev->name);
+
+       iface = netdev_priv(dev);
+       local = iface->local;
+
+       if (local->no_pri) {
+               printk(KERN_DEBUG "%s: could not set interface UP - no PRI "
+                      "f/w\n", dev->name);
+               return 1;
+       }
+
+       if ((local->func->card_present && !local->func->card_present(local)) ||
+           local->hw_downloading)
+               return -ENODEV;
+
+       if (!try_module_get(local->hw_module))
+               return -ENODEV;
+       local->num_dev_open++;
+
+       if (!local->dev_enabled && local->func->hw_enable(dev, 1)) {
+               printk(KERN_WARNING "%s: could not enable MAC port\n",
+                      dev->name);
+               prism2_close(dev);
+               return 1;
+       }
+       if (!local->dev_enabled)
+               prism2_callback(local, PRISM2_CALLBACK_ENABLE);
+       local->dev_enabled = 1;
+
+       if (dev != local->dev && !(local->dev->flags & IFF_UP)) {
+               /* Master radio interface is needed for all operation, so open
+                * it automatically when any virtual net_device is opened. */
+               local->master_dev_auto_open = 1;
+               dev_open(local->dev);
+       }
+
+       netif_device_attach(dev);
+       netif_start_queue(dev);
+
+       return 0;
+}
+
+
+static int prism2_set_mac_address(struct net_device *dev, void *p)
+{
+       struct hostap_interface *iface;
+       local_info_t *local;
+       struct list_head *ptr;
+       struct sockaddr *addr = p;
+
+       iface = netdev_priv(dev);
+       local = iface->local;
+
+       if (local->func->set_rid(dev, HFA384X_RID_CNFOWNMACADDR, addr->sa_data,
+                                ETH_ALEN) < 0 || local->func->reset_port(dev))
+               return -EINVAL;
+
+       read_lock_bh(&local->iface_lock);
+       list_for_each(ptr, &local->hostap_interfaces) {
+               iface = list_entry(ptr, struct hostap_interface, list);
+               memcpy(iface->dev->dev_addr, addr->sa_data, ETH_ALEN);
+       }
+       memcpy(local->dev->dev_addr, addr->sa_data, ETH_ALEN);
+       read_unlock_bh(&local->iface_lock);
+
+       return 0;
+}
+
+
+/* TODO: to be further implemented as soon as Prism2 fully supports
+ *       GroupAddresses and correct documentation is available */
+void hostap_set_multicast_list_queue(void *data)
+{
+       struct net_device *dev = (struct net_device *) data;
+       struct hostap_interface *iface;
+       local_info_t *local;
+
+       iface = netdev_priv(dev);
+       local = iface->local;
+       if (hostap_set_word(dev, HFA384X_RID_PROMISCUOUSMODE,
+                           local->is_promisc)) {
+               printk(KERN_INFO "%s: %sabling promiscuous mode failed\n",
+                      dev->name, local->is_promisc ? "en" : "dis");
+       }
+}
+
+
+static void hostap_set_multicast_list(struct net_device *dev)
+{
+#if 0
+       /* FIX: promiscuous mode seems to be causing a lot of problems with
+        * some station firmware versions (FCSErr frames, invalid MACPort, etc.
+        * corrupted incoming frames). This code is now commented out while the
+        * problems are investigated. */
+       struct hostap_interface *iface;
+       local_info_t *local;
+
+       iface = netdev_priv(dev);
+       local = iface->local;
+       if ((dev->flags & IFF_ALLMULTI) || (dev->flags & IFF_PROMISC)) {
+               local->is_promisc = 1;
+       } else {
+               local->is_promisc = 0;
+       }
+
+       schedule_work(&local->set_multicast_list_queue);
+#endif
+}
+
+
+static int prism2_change_mtu(struct net_device *dev, int new_mtu)
+{
+       if (new_mtu < PRISM2_MIN_MTU || new_mtu > PRISM2_MAX_MTU)
+               return -EINVAL;
+
+       dev->mtu = new_mtu;
+       return 0;
+}
+
+
+static void prism2_tx_timeout(struct net_device *dev)
+{
+       struct hostap_interface *iface;
+       local_info_t *local;
+       struct hfa384x_regs regs;
+
+       iface = netdev_priv(dev);
+       local = iface->local;
+
+       printk(KERN_WARNING "%s Tx timed out! Resetting card\n", dev->name);
+       netif_stop_queue(local->dev);
+
+       local->func->read_regs(dev, &regs);
+       printk(KERN_DEBUG "%s: CMD=%04x EVSTAT=%04x "
+              "OFFSET0=%04x OFFSET1=%04x SWSUPPORT0=%04x\n",
+              dev->name, regs.cmd, regs.evstat, regs.offset0, regs.offset1,
+              regs.swsupport0);
+
+       local->func->schedule_reset(local);
+}
+
+
+void hostap_setup_dev(struct net_device *dev, local_info_t *local,
+                     int main_dev)
+{
+       struct hostap_interface *iface;
+
+       iface = netdev_priv(dev);
+       ether_setup(dev);
+
+       /* kernel callbacks */
+       dev->get_stats = hostap_get_stats;
+       if (iface) {
+               /* Currently, we point to the proper spy_data only on
+                * the main_dev. This could be fixed. Jean II */
+               iface->wireless_data.spy_data = &iface->spy_data;
+               dev->wireless_data = &iface->wireless_data;
+       }
+       dev->wireless_handlers =
+               (struct iw_handler_def *) &hostap_iw_handler_def;
+       dev->do_ioctl = hostap_ioctl;
+       dev->open = prism2_open;
+       dev->stop = prism2_close;
+       dev->hard_start_xmit = hostap_data_start_xmit;
+       dev->set_mac_address = prism2_set_mac_address;
+       dev->set_multicast_list = hostap_set_multicast_list;
+       dev->change_mtu = prism2_change_mtu;
+       dev->tx_timeout = prism2_tx_timeout;
+       dev->watchdog_timeo = TX_TIMEOUT;
+
+       dev->mtu = local->mtu;
+       if (!main_dev) {
+               /* use main radio device queue */
+               dev->tx_queue_len = 0;
+       }
+
+       SET_ETHTOOL_OPS(dev, &prism2_ethtool_ops);
+
+       netif_stop_queue(dev);
+}
+
+
+static int hostap_enable_hostapd(local_info_t *local, int rtnl_locked)
+{
+       struct net_device *dev = local->dev;
+
+       if (local->apdev)
+               return -EEXIST;
+
+       printk(KERN_DEBUG "%s: enabling hostapd mode\n", dev->name);
+
+       local->apdev = hostap_add_interface(local, HOSTAP_INTERFACE_AP,
+                                           rtnl_locked, local->ddev->name,
+                                           "ap");
+       if (local->apdev == NULL)
+               return -ENOMEM;
+
+       local->apdev->hard_start_xmit = hostap_mgmt_start_xmit;
+       local->apdev->type = ARPHRD_IEEE80211;
+       local->apdev->hard_header_parse = hostap_80211_header_parse;
+
+       return 0;
+}
+
+
+static int hostap_disable_hostapd(local_info_t *local, int rtnl_locked)
+{
+       struct net_device *dev = local->dev;
+
+       printk(KERN_DEBUG "%s: disabling hostapd mode\n", dev->name);
+
+       hostap_remove_interface(local->apdev, rtnl_locked, 1);
+       local->apdev = NULL;
+
+       return 0;
+}
+
+
+static int hostap_enable_hostapd_sta(local_info_t *local, int rtnl_locked)
+{
+       struct net_device *dev = local->dev;
+
+       if (local->stadev)
+               return -EEXIST;
+
+       printk(KERN_DEBUG "%s: enabling hostapd STA mode\n", dev->name);
+
+       local->stadev = hostap_add_interface(local, HOSTAP_INTERFACE_STA,
+                                            rtnl_locked, local->ddev->name,
+                                            "sta");
+       if (local->stadev == NULL)
+               return -ENOMEM;
+
+       return 0;
+}
+
+
+static int hostap_disable_hostapd_sta(local_info_t *local, int rtnl_locked)
+{
+       struct net_device *dev = local->dev;
+
+       printk(KERN_DEBUG "%s: disabling hostapd mode\n", dev->name);
+
+       hostap_remove_interface(local->stadev, rtnl_locked, 1);
+       local->stadev = NULL;
+
+       return 0;
+}
+
+
+int hostap_set_hostapd(local_info_t *local, int val, int rtnl_locked)
+{
+       int ret;
+
+       if (val < 0 || val > 1)
+               return -EINVAL;
+
+       if (local->hostapd == val)
+               return 0;
+
+       if (val) {
+               ret = hostap_enable_hostapd(local, rtnl_locked);
+               if (ret == 0)
+                       local->hostapd = 1;
+       } else {
+               local->hostapd = 0;
+               ret = hostap_disable_hostapd(local, rtnl_locked);
+               if (ret != 0)
+                       local->hostapd = 1;
+       }
+
+       return ret;
+}
+
+
+int hostap_set_hostapd_sta(local_info_t *local, int val, int rtnl_locked)
+{
+       int ret;
+
+       if (val < 0 || val > 1)
+               return -EINVAL;
+
+       if (local->hostapd_sta == val)
+               return 0;
+
+       if (val) {
+               ret = hostap_enable_hostapd_sta(local, rtnl_locked);
+               if (ret == 0)
+                       local->hostapd_sta = 1;
+       } else {
+               local->hostapd_sta = 0;
+               ret = hostap_disable_hostapd_sta(local, rtnl_locked);
+               if (ret != 0)
+                       local->hostapd_sta = 1;
+       }
+
+
+       return ret;
+}
+
+
+int prism2_update_comms_qual(struct net_device *dev)
+{
+       struct hostap_interface *iface;
+       local_info_t *local;
+       int ret = 0;
+       struct hfa384x_comms_quality sq;
+
+       iface = netdev_priv(dev);
+       local = iface->local;
+       if (!local->sta_fw_ver)
+               ret = -1;
+       else if (local->sta_fw_ver >= PRISM2_FW_VER(1,3,1)) {
+               if (local->func->get_rid(local->dev,
+                                        HFA384X_RID_DBMCOMMSQUALITY,
+                                        &sq, sizeof(sq), 1) >= 0) {
+                       local->comms_qual = (s16) le16_to_cpu(sq.comm_qual);
+                       local->avg_signal = (s16) le16_to_cpu(sq.signal_level);
+                       local->avg_noise = (s16) le16_to_cpu(sq.noise_level);
+                       local->last_comms_qual_update = jiffies;
+               } else
+                       ret = -1;
+       } else {
+               if (local->func->get_rid(local->dev, HFA384X_RID_COMMSQUALITY,
+                                        &sq, sizeof(sq), 1) >= 0) {
+                       local->comms_qual = le16_to_cpu(sq.comm_qual);
+                       local->avg_signal = HFA384X_LEVEL_TO_dBm(
+                               le16_to_cpu(sq.signal_level));
+                       local->avg_noise = HFA384X_LEVEL_TO_dBm(
+                               le16_to_cpu(sq.noise_level));
+                       local->last_comms_qual_update = jiffies;
+               } else
+                       ret = -1;
+       }
+
+       return ret;
+}
+
+
+int prism2_sta_send_mgmt(local_info_t *local, u8 *dst, u16 stype,
+                        u8 *body, size_t bodylen)
+{
+       struct sk_buff *skb;
+       struct hostap_ieee80211_mgmt *mgmt;
+       struct hostap_skb_tx_data *meta;
+       struct net_device *dev = local->dev;
+
+       skb = dev_alloc_skb(IEEE80211_MGMT_HDR_LEN + bodylen);
+       if (skb == NULL)
+               return -ENOMEM;
+
+       mgmt = (struct hostap_ieee80211_mgmt *)
+               skb_put(skb, IEEE80211_MGMT_HDR_LEN);
+       memset(mgmt, 0, IEEE80211_MGMT_HDR_LEN);
+       mgmt->frame_control = cpu_to_le16(IEEE80211_FTYPE_MGMT | stype);
+       memcpy(mgmt->da, dst, ETH_ALEN);
+       memcpy(mgmt->sa, dev->dev_addr, ETH_ALEN);
+       memcpy(mgmt->bssid, dst, ETH_ALEN);
+       if (body)
+               memcpy(skb_put(skb, bodylen), body, bodylen);
+
+       meta = (struct hostap_skb_tx_data *) skb->cb;
+       memset(meta, 0, sizeof(*meta));
+       meta->magic = HOSTAP_SKB_TX_DATA_MAGIC;
+       meta->iface = netdev_priv(dev);
+
+       skb->dev = dev;
+       skb->mac.raw = skb->nh.raw = skb->data;
+       dev_queue_xmit(skb);
+
+       return 0;
+}
+
+
+int prism2_sta_deauth(local_info_t *local, u16 reason)
+{
+       union iwreq_data wrqu;
+       int ret;
+
+       if (local->iw_mode != IW_MODE_INFRA ||
+           memcmp(local->bssid, "\x00\x00\x00\x00\x00\x00", ETH_ALEN) == 0 ||
+           memcmp(local->bssid, "\x44\x44\x44\x44\x44\x44", ETH_ALEN) == 0)
+               return 0;
+
+       reason = cpu_to_le16(reason);
+       ret = prism2_sta_send_mgmt(local, local->bssid, IEEE80211_STYPE_DEAUTH,
+                                  (u8 *) &reason, 2);
+       memset(wrqu.ap_addr.sa_data, 0, ETH_ALEN);
+       wireless_send_event(local->dev, SIOCGIWAP, &wrqu, NULL);
+       return ret;
+}
+
+
+struct proc_dir_entry *hostap_proc;
+
+static int __init hostap_init(void)
+{
+       if (proc_net != NULL) {
+               hostap_proc = proc_mkdir("hostap", proc_net);
+               if (!hostap_proc)
+                       printk(KERN_WARNING "Failed to mkdir "
+                              "/proc/net/hostap\n");
+       } else
+               hostap_proc = NULL;
+
+       return 0;
+}
+
+
+static void __exit hostap_exit(void)
+{
+       if (hostap_proc != NULL) {
+               hostap_proc = NULL;
+               remove_proc_entry("hostap", proc_net);
+       }
+}
+
+
+EXPORT_SYMBOL(hostap_set_word);
+EXPORT_SYMBOL(hostap_set_string);
+EXPORT_SYMBOL(hostap_get_porttype);
+EXPORT_SYMBOL(hostap_set_encryption);
+EXPORT_SYMBOL(hostap_set_antsel);
+EXPORT_SYMBOL(hostap_set_roaming);
+EXPORT_SYMBOL(hostap_set_auth_algs);
+EXPORT_SYMBOL(hostap_dump_rx_header);
+EXPORT_SYMBOL(hostap_dump_tx_header);
+EXPORT_SYMBOL(hostap_80211_header_parse);
+EXPORT_SYMBOL(hostap_80211_prism_header_parse);
+EXPORT_SYMBOL(hostap_80211_get_hdrlen);
+EXPORT_SYMBOL(hostap_get_stats);
+EXPORT_SYMBOL(hostap_setup_dev);
+EXPORT_SYMBOL(hostap_proc);
+EXPORT_SYMBOL(hostap_set_multicast_list_queue);
+EXPORT_SYMBOL(hostap_set_hostapd);
+EXPORT_SYMBOL(hostap_set_hostapd_sta);
+EXPORT_SYMBOL(hostap_add_interface);
+EXPORT_SYMBOL(hostap_remove_interface);
+EXPORT_SYMBOL(prism2_update_comms_qual);
+
+module_init(hostap_init);
+module_exit(hostap_exit);
index 77d2a21d4cd00f879abe206480f80ea75441aca7..44cd3fcd15720916d0cf9984a02bc8adb2afcb83 100644 (file)
@@ -175,7 +175,7 @@ that only one external action is invoked at a time.
 #define DRV_COPYRIGHT  "Copyright(c) 2003-2005 Intel Corporation"
 
 /* Debugging stuff */
-#ifdef CONFIG_IPW_DEBUG
+#ifdef CONFIG_IPW2100_DEBUG
 #define CONFIG_IPW2100_RX_DEBUG        /* Reception debugging */
 #endif
 
@@ -208,7 +208,7 @@ MODULE_PARM_DESC(disable, "manually disable the radio (default 0 [radio on])");
 
 static u32 ipw2100_debug_level = IPW_DL_NONE;
 
-#ifdef CONFIG_IPW_DEBUG
+#ifdef CONFIG_IPW2100_DEBUG
 #define IPW_DEBUG(level, message...) \
 do { \
        if (ipw2100_debug_level & (level)) { \
@@ -219,9 +219,9 @@ do { \
 } while (0)
 #else
 #define IPW_DEBUG(level, message...) do {} while (0)
-#endif                         /* CONFIG_IPW_DEBUG */
+#endif                         /* CONFIG_IPW2100_DEBUG */
 
-#ifdef CONFIG_IPW_DEBUG
+#ifdef CONFIG_IPW2100_DEBUG
 static const char *command_types[] = {
        "undefined",
        "unused",               /* HOST_ATTENTION */
@@ -2081,7 +2081,7 @@ static void isr_scan_complete(struct ipw2100_priv *priv, u32 status)
        priv->status &= ~STATUS_SCANNING;
 }
 
-#ifdef CONFIG_IPW_DEBUG
+#ifdef CONFIG_IPW2100_DEBUG
 #define IPW2100_HANDLER(v, f) { v, f, # v }
 struct ipw2100_status_indicator {
        int status;
@@ -2094,7 +2094,7 @@ struct ipw2100_status_indicator {
        int status;
        void (*cb) (struct ipw2100_priv * priv, u32 status);
 };
-#endif                         /* CONFIG_IPW_DEBUG */
+#endif                         /* CONFIG_IPW2100_DEBUG */
 
 static void isr_indicate_scanning(struct ipw2100_priv *priv, u32 status)
 {
@@ -2149,7 +2149,7 @@ static void isr_status_change(struct ipw2100_priv *priv, int status)
 static void isr_rx_complete_command(struct ipw2100_priv *priv,
                                    struct ipw2100_cmd_header *cmd)
 {
-#ifdef CONFIG_IPW_DEBUG
+#ifdef CONFIG_IPW2100_DEBUG
        if (cmd->host_command_reg < ARRAY_SIZE(command_types)) {
                IPW_DEBUG_HC("Command completed '%s (%d)'\n",
                             command_types[cmd->host_command_reg],
@@ -2167,7 +2167,7 @@ static void isr_rx_complete_command(struct ipw2100_priv *priv,
        wake_up_interruptible(&priv->wait_command_queue);
 }
 
-#ifdef CONFIG_IPW_DEBUG
+#ifdef CONFIG_IPW2100_DEBUG
 static const char *frame_types[] = {
        "COMMAND_STATUS_VAL",
        "STATUS_CHANGE_VAL",
@@ -2290,7 +2290,7 @@ static u8 packet_data[IPW_RX_NIC_BUFFER_LENGTH];
 
 static inline void ipw2100_corruption_detected(struct ipw2100_priv *priv, int i)
 {
-#ifdef CONFIG_IPW_DEBUG_C3
+#ifdef CONFIG_IPW2100_DEBUG_C3
        struct ipw2100_status *status = &priv->status_queue.drv[i];
        u32 match, reg;
        int j;
@@ -2312,7 +2312,7 @@ static inline void ipw2100_corruption_detected(struct ipw2100_priv *priv, int i)
        }
 #endif
 
-#ifdef CONFIG_IPW_DEBUG_C3
+#ifdef CONFIG_IPW2100_DEBUG_C3
        /* Halt the fimrware so we can get a good image */
        write_register(priv->net_dev, IPW_REG_RESET_REG,
                       IPW_AUX_HOST_RESET_REG_STOP_MASTER);
@@ -2716,7 +2716,7 @@ static inline int __ipw2100_tx_process(struct ipw2100_priv *priv)
        list_del(element);
        DEC_STAT(&priv->fw_pend_stat);
 
-#ifdef CONFIG_IPW_DEBUG
+#ifdef CONFIG_IPW2100_DEBUG
        {
                int i = txq->oldest;
                IPW_DEBUG_TX("TX%d V=%p P=%04X T=%04X L=%d\n", i,
@@ -2782,7 +2782,7 @@ static inline int __ipw2100_tx_process(struct ipw2100_priv *priv)
                               "something else: ids %d=%d.\n",
                               priv->net_dev->name, txq->oldest, packet->index);
 
-#ifdef CONFIG_IPW_DEBUG
+#ifdef CONFIG_IPW2100_DEBUG
                if (packet->info.c_struct.cmd->host_command_reg <
                    sizeof(command_types) / sizeof(*command_types))
                        IPW_DEBUG_TX("Command '%s (%d)' processed: %d.\n",
@@ -2975,7 +2975,7 @@ static void ipw2100_tx_send_data(struct ipw2100_priv *priv)
 
                IPW_DEBUG_TX("data header tbd TX%d P=%08x L=%d\n",
                             packet->index, tbd->host_addr, tbd->buf_length);
-#ifdef CONFIG_IPW_DEBUG
+#ifdef CONFIG_IPW2100_DEBUG
                if (packet->info.d_struct.txb->nr_frags > 1)
                        IPW_DEBUG_FRAG("fragment Tx: %d frames\n",
                                       packet->info.d_struct.txb->nr_frags);
@@ -3827,7 +3827,7 @@ static ssize_t show_stats(struct device *d, struct device_attribute *attr,
                       priv->rx_interrupts, priv->inta_other);
        out += sprintf(out, "firmware resets: %d\n", priv->resets);
        out += sprintf(out, "firmware hangs: %d\n", priv->hangs);
-#ifdef CONFIG_IPW_DEBUG
+#ifdef CONFIG_IPW2100_DEBUG
        out += sprintf(out, "packet mismatch image: %s\n",
                       priv->snapshot[0] ? "YES" : "NO");
 #endif
@@ -3982,7 +3982,7 @@ static ssize_t show_bssinfo(struct device *d, struct device_attribute *attr,
 
 static DEVICE_ATTR(bssinfo, S_IRUGO, show_bssinfo, NULL);
 
-#ifdef CONFIG_IPW_DEBUG
+#ifdef CONFIG_IPW2100_DEBUG
 static ssize_t show_debug_level(struct device_driver *d, char *buf)
 {
        return sprintf(buf, "0x%08X\n", ipw2100_debug_level);
@@ -4011,7 +4011,7 @@ static ssize_t store_debug_level(struct device_driver *d,
 
 static DRIVER_ATTR(debug_level, S_IWUSR | S_IRUGO, show_debug_level,
                   store_debug_level);
-#endif                         /* CONFIG_IPW_DEBUG */
+#endif                         /* CONFIG_IPW2100_DEBUG */
 
 static ssize_t show_fatal_error(struct device *d,
                                struct device_attribute *attr, char *buf)
@@ -4937,7 +4937,7 @@ static int ipw2100_set_mandatory_bssid(struct ipw2100_priv *priv, u8 * bssid,
        };
        int err;
 
-#ifdef CONFIG_IPW_DEBUG
+#ifdef CONFIG_IPW2100_DEBUG
        if (bssid != NULL)
                IPW_DEBUG_HC("MANDATORY_BSSID: %02X:%02X:%02X:%02X:%02X:%02X\n",
                             bssid[0], bssid[1], bssid[2], bssid[3], bssid[4],
@@ -6858,7 +6858,7 @@ static int __init ipw2100_init(void)
 
        ret = pci_module_init(&ipw2100_pci_driver);
 
-#ifdef CONFIG_IPW_DEBUG
+#ifdef CONFIG_IPW2100_DEBUG
        ipw2100_debug_level = debug;
        driver_create_file(&ipw2100_pci_driver.driver,
                           &driver_attr_debug_level);
@@ -6873,7 +6873,7 @@ static int __init ipw2100_init(void)
 static void __exit ipw2100_exit(void)
 {
        /* FIXME: IPG: check that we have no instances of the devices open */
-#ifdef CONFIG_IPW_DEBUG
+#ifdef CONFIG_IPW2100_DEBUG
        driver_remove_file(&ipw2100_pci_driver.driver,
                           &driver_attr_debug_level);
 #endif
@@ -8558,7 +8558,7 @@ static struct iw_statistics *ipw2100_wx_wireless_stats(struct net_device *dev)
 
                quality = min(beacon_qual, min(tx_qual, rssi_qual));
 
-#ifdef CONFIG_IPW_DEBUG
+#ifdef CONFIG_IPW2100_DEBUG
                if (beacon_qual == quality)
                        IPW_DEBUG_WX("Quality clamped by Missed Beacons\n");
                else if (tx_qual == quality)
index 7c65b10bb164d00b0d2a0fb393b4ec1e97cdd85b..f6c51441fa878a85baa868a9d23af18d69f7c207 100644 (file)
@@ -73,7 +73,7 @@ struct ipw2100_rx_packet;
  * you simply need to add your entry to the ipw2100_debug_levels array.
  *
  * If you do not see debug_level in /proc/net/ipw2100 then you do not have
- * CONFIG_IPW_DEBUG defined in your kernel configuration
+ * CONFIG_IPW2100_DEBUG defined in your kernel configuration
  *
  */
 
index 5e7c7e944c9deb8190d271486737041275f85dcf..cd034b79bc9ddc3f41087c2240752cb52abb78c9 100644 (file)
@@ -462,7 +462,7 @@ static inline void ipw_disable_interrupts(struct ipw_priv *priv)
        ipw_write32(priv, IPW_INTA_MASK_R, ~IPW_INTA_MASK_ALL);
 }
 
-#ifdef CONFIG_IPW_DEBUG
+#ifdef CONFIG_IPW2200_DEBUG
 static char *ipw_error_desc(u32 val)
 {
        switch (val) {
@@ -1235,7 +1235,7 @@ static ssize_t store_scan_age(struct device *d, struct device_attribute *attr,
                              const char *buf, size_t count)
 {
        struct ipw_priv *priv = dev_get_drvdata(d);
-#ifdef CONFIG_IPW_DEBUG
+#ifdef CONFIG_IPW2200_DEBUG
        struct net_device *dev = priv->net_dev;
 #endif
        char buffer[] = "00000000";
@@ -1754,7 +1754,7 @@ static void ipw_irq_tasklet(struct ipw_priv *priv)
                IPW_ERROR("Firmware error detected.  Restarting.\n");
                if (priv->error) {
                        IPW_ERROR("Sysfs 'error' log already exists.\n");
-#ifdef CONFIG_IPW_DEBUG
+#ifdef CONFIG_IPW2200_DEBUG
                        if (ipw_debug_level & IPW_DL_FW_ERRORS) {
                                struct ipw_fw_error *error =
                                    ipw_alloc_error_log(priv);
@@ -1770,7 +1770,7 @@ static void ipw_irq_tasklet(struct ipw_priv *priv)
                        else
                                IPW_ERROR("Error allocating sysfs 'error' "
                                          "log.\n");
-#ifdef CONFIG_IPW_DEBUG
+#ifdef CONFIG_IPW2200_DEBUG
                        if (ipw_debug_level & IPW_DL_FW_ERRORS)
                                ipw_dump_error_log(priv, priv->error);
 #endif
@@ -3778,7 +3778,7 @@ static const struct ipw_status_code ipw_status_codes[] = {
        {0x2E, "Cipher suite is rejected per security policy"},
 };
 
-#ifdef CONFIG_IPW_DEBUG
+#ifdef CONFIG_IPW2200_DEBUG
 static const char *ipw_get_status_code(u16 status)
 {
        int i;
@@ -4250,7 +4250,7 @@ static inline void ipw_rx_notification(struct ipw_priv *priv,
                                        if (priv->
                                            status & (STATUS_ASSOCIATED |
                                                      STATUS_AUTH)) {
-#ifdef CONFIG_IPW_DEBUG
+#ifdef CONFIG_IPW2200_DEBUG
                                                struct notif_authenticate *auth
                                                    = &notif->u.auth;
                                                IPW_DEBUG(IPW_DL_NOTIF |
@@ -4944,12 +4944,11 @@ static struct ipw_rx_queue *ipw_rx_queue_alloc(struct ipw_priv *priv)
        struct ipw_rx_queue *rxq;
        int i;
 
-       rxq = (struct ipw_rx_queue *)kmalloc(sizeof(*rxq), GFP_KERNEL);
+       rxq = kzalloc(sizeof(*rxq), GFP_KERNEL);
        if (unlikely(!rxq)) {
                IPW_ERROR("memory allocation failed\n");
                return NULL;
        }
-       memset(rxq, 0, sizeof(*rxq));
        spin_lock_init(&rxq->lock);
        INIT_LIST_HEAD(&rxq->rx_free);
        INIT_LIST_HEAD(&rxq->rx_used);
@@ -5828,7 +5827,7 @@ static void ipw_bg_adhoc_check(void *data)
        up(&priv->sem);
 }
 
-#ifdef CONFIG_IPW_DEBUG
+#ifdef CONFIG_IPW2200_DEBUG
 static void ipw_debug_config(struct ipw_priv *priv)
 {
        IPW_DEBUG_INFO("Scan completed, no valid APs matched "
@@ -7815,7 +7814,7 @@ static void ipw_rx(struct ipw_priv *priv)
 
        while (i != r) {
                rxb = priv->rxq->queue[i];
-#ifdef CONFIG_IPW_DEBUG
+#ifdef CONFIG_IPW2200_DEBUG
                if (unlikely(rxb == NULL)) {
                        printk(KERN_CRIT "Queue not allocated!\n");
                        break;
@@ -10956,7 +10955,7 @@ static int ipw_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
 
        priv->net_dev = net_dev;
        priv->pci_dev = pdev;
-#ifdef CONFIG_IPW_DEBUG
+#ifdef CONFIG_IPW2200_DEBUG
        ipw_debug_level = debug;
 #endif
        spin_lock_init(&priv->lock);
index 1c98db0652c9458a9c61079e8e91cd8a6edb4d39..e65620a4d79ea957d624be65f3e89cf12c54c099 100644 (file)
@@ -1301,14 +1301,14 @@ struct ipw_priv {
 
 /* debug macros */
 
-#ifdef CONFIG_IPW_DEBUG
+#ifdef CONFIG_IPW2200_DEBUG
 #define IPW_DEBUG(level, fmt, args...) \
 do { if (ipw_debug_level & (level)) \
   printk(KERN_DEBUG DRV_NAME": %c %s " fmt, \
          in_interrupt() ? 'I' : 'U', __FUNCTION__ , ## args); } while (0)
 #else
 #define IPW_DEBUG(level, fmt, args...) do {} while (0)
-#endif                         /* CONFIG_IPW_DEBUG */
+#endif                         /* CONFIG_IPW2200_DEBUG */
 
 /*
  * To use the debug system;
@@ -1332,7 +1332,7 @@ do { if (ipw_debug_level & (level)) \
  * you simply need to add your entry to the ipw_debug_levels array.
  *
  * If you do not see debug_level in /proc/net/ipw then you do not have
- * CONFIG_IPW_DEBUG defined in your kernel configuration
+ * CONFIG_IPW2200_DEBUG defined in your kernel configuration
  *
  */
 
index 4afef5cdcb17568c1380d3987d1e4c4661dc16e4..ce9d73a292e2a0f273992efd56e7cb7370f2bbc0 100644 (file)
@@ -542,10 +542,17 @@ static void scsi_requeue_command(struct request_queue *q, struct scsi_cmnd *cmd)
 
 void scsi_next_command(struct scsi_cmnd *cmd)
 {
-       struct request_queue *q = cmd->device->request_queue;
+       struct scsi_device *sdev = cmd->device;
+       struct request_queue *q = sdev->request_queue;
+
+       /* need to hold a reference on the device before we let go of the cmd */
+       get_device(&sdev->sdev_gendev);
 
        scsi_put_command(cmd);
        scsi_run_queue(q);
+
+       /* ok to remove device now */
+       put_device(&sdev->sdev_gendev);
 }
 
 void scsi_run_host_queues(struct Scsi_Host *shost)
index bf7ce1d2412bb43928b908527287668eb59fb90d..2fecb7af4a77d6316171f0e25a40fd9027a71647 100644 (file)
@@ -364,11 +364,12 @@ static int inotify_dev_get_wd(struct inotify_device *dev,
 /*
  * find_inode - resolve a user-given path to a specific inode and return a nd
  */
-static int find_inode(const char __user *dirname, struct nameidata *nd)
+static int find_inode(const char __user *dirname, struct nameidata *nd,
+                     unsigned flags)
 {
        int error;
 
-       error = __user_walk(dirname, LOOKUP_FOLLOW, nd);
+       error = __user_walk(dirname, flags, nd);
        if (error)
                return error;
        /* you can only watch an inode if you have read permissions on it */
@@ -933,6 +934,7 @@ asmlinkage long sys_inotify_add_watch(int fd, const char __user *path, u32 mask)
        struct file *filp;
        int ret, fput_needed;
        int mask_add = 0;
+       unsigned flags = 0;
 
        filp = fget_light(fd, &fput_needed);
        if (unlikely(!filp))
@@ -944,7 +946,12 @@ asmlinkage long sys_inotify_add_watch(int fd, const char __user *path, u32 mask)
                goto fput_and_out;
        }
 
-       ret = find_inode(path, &nd);
+       if (!(mask & IN_DONT_FOLLOW))
+               flags |= LOOKUP_FOLLOW;
+       if (mask & IN_ONLYDIR)
+               flags |= LOOKUP_DIRECTORY;
+
+       ret = find_inode(path, &nd, flags);
        if (unlikely(ret))
                goto fput_and_out;
 
index a9db225579983b4babe40ac4c47a9eef0a3250cb..bcc2156d4d2873d0c3a7b0841a4cdaf1fa456e22 100644 (file)
@@ -245,7 +245,7 @@ listxattr(struct dentry *d, char __user *list, size_t size)
                error = d->d_inode->i_op->listxattr(d, klist, size);
        } else {
                error = security_inode_listsecurity(d->d_inode, klist, size);
-               if (size && error >= size)
+               if (size && error > size)
                        error = -ERANGE;
        }
        if (error > 0) {
index c1b4bbabbe97f4816c26261ba9488c0acfac0ccb..29b0bb0086d3fc5f40e8848d82662c345d4a4a44 100644 (file)
@@ -220,7 +220,8 @@ extern int __hash_page_64K(unsigned long ea, unsigned long access,
                           unsigned int local);
 struct mm_struct;
 extern int hash_huge_page(struct mm_struct *mm, unsigned long access,
-                         unsigned long ea, unsigned long vsid, int local);
+                         unsigned long ea, unsigned long vsid, int local,
+                         unsigned long trap);
 
 extern void htab_finish_init(void);
 extern int htab_bolt_mapping(unsigned long vstart, unsigned long vend,
index c948f678e04efd548c92c3eaa8b3a6412effd26a..1417de93505788152005b978c85fce08b22f5c21 100644 (file)
@@ -26,6 +26,7 @@
 #define CN_PROC_H
 
 #include <linux/types.h>
+#include <linux/time.h>
 #include <linux/connector.h>
 
 /*
@@ -65,6 +66,7 @@ struct proc_event {
                PROC_EVENT_EXIT = 0x80000000
        } what;
        __u32 cpu;
+       struct timespec timestamp;
        union { /* must be last field of proc_event struct */
                struct {
                        __u32 err;
index cc314443f1c4e37d086ccbc66854274bbdfafa4f..2b8797084685fcaacbb219036e2a29dfcea2c85c 100644 (file)
 
 
 typedef enum {
-        AUDIO_SOURCE_DEMUX, /* Select the demux as the main source */
+       AUDIO_SOURCE_DEMUX, /* Select the demux as the main source */
        AUDIO_SOURCE_MEMORY /* Select internal memory as the main source */
 } audio_stream_source_t;
 
 
 typedef enum {
        AUDIO_STOPPED,      /* Device is stopped */
-        AUDIO_PLAYING,      /* Device is currently playing */
+       AUDIO_PLAYING,      /* Device is currently playing */
        AUDIO_PAUSED        /* Device is paused */
 } audio_play_state_t;
 
 
 typedef enum {
-        AUDIO_STEREO,
-        AUDIO_MONO_LEFT,
+       AUDIO_STEREO,
+       AUDIO_MONO_LEFT,
        AUDIO_MONO_RIGHT
 } audio_channel_select_t;
 
 
 typedef struct audio_mixer {
-        unsigned int volume_left;
-        unsigned int volume_right;
+       unsigned int volume_left;
+       unsigned int volume_right;
   // what else do we need? bass, pass-through, ...
 } audio_mixer_t;
 
 
 typedef struct audio_status {
-        int                    AV_sync_state;  /* sync audio and video? */
-        int                    mute_state;     /* audio is muted */
-        audio_play_state_t     play_state;     /* current playback state */
-        audio_stream_source_t  stream_source;  /* current stream source */
-        audio_channel_select_t channel_select; /* currently selected channel */
-        int                    bypass_mode;    /* pass on audio data to */
+       int                    AV_sync_state;  /* sync audio and video? */
+       int                    mute_state;     /* audio is muted */
+       audio_play_state_t     play_state;     /* current playback state */
+       audio_stream_source_t  stream_source;  /* current stream source */
+       audio_channel_select_t channel_select; /* currently selected channel */
+       int                    bypass_mode;    /* pass on audio data to */
        audio_mixer_t          mixer_state;    /* current mixer state */
 } audio_status_t;                              /* separate decoder hardware */
 
@@ -74,8 +74,8 @@ struct audio_karaoke{  /* if Vocal1 or Vocal2 are non-zero, they get mixed  */
        int vocal1;    /* into left and right t at 70% each */
        int vocal2;    /* if both, Vocal1 and Vocal2 are non-zero, Vocal1 gets*/
        int melody;    /* mixed into the left channel and */
-                       /* Vocal2 into the right channel at 100% each. */
-                       /* if Melody is non-zero, the melody channel gets mixed*/
+                      /* Vocal2 into the right channel at 100% each. */
+                      /* if Melody is non-zero, the melody channel gets mixed*/
 } audio_karaoke_t;     /* into left and right  */
 
 
index 558af0cc76927d7d764b7f4b43beaf373607e8ba..c18537f3e449bb219a1b48f1b9e46c1c3aa00820 100644 (file)
 /* slot interface types and info */
 
 typedef struct ca_slot_info {
-        int num;               /* slot number */
+       int num;               /* slot number */
 
-        int type;              /* CA interface this slot supports */
+       int type;              /* CA interface this slot supports */
 #define CA_CI            1     /* CI high level interface */
 #define CA_CI_LINK       2     /* CI link layer level interface */
 #define CA_CI_PHYS       4     /* CI physical layer level interface */
 #define CA_DESCR         8     /* built-in descrambler */
 #define CA_SC          128     /* simple smart card interface */
 
-        unsigned int flags;
+       unsigned int flags;
 #define CA_CI_MODULE_PRESENT 1 /* module (or card) inserted */
 #define CA_CI_MODULE_READY   2
 } ca_slot_info_t;
@@ -45,37 +45,37 @@ typedef struct ca_slot_info {
 /* descrambler types and info */
 
 typedef struct ca_descr_info {
-        unsigned int num;          /* number of available descramblers (keys) */
-        unsigned int type;         /* type of supported scrambling system */
+       unsigned int num;          /* number of available descramblers (keys) */
+       unsigned int type;         /* type of supported scrambling system */
 #define CA_ECD           1
 #define CA_NDS           2
 #define CA_DSS           4
 } ca_descr_info_t;
 
 typedef struct ca_caps {
-        unsigned int slot_num;     /* total number of CA card and module slots */
-        unsigned int slot_type;    /* OR of all supported types */
-        unsigned int descr_num;    /* total number of descrambler slots (keys) */
-        unsigned int descr_type;   /* OR of all supported types */
+       unsigned int slot_num;     /* total number of CA card and module slots */
+       unsigned int slot_type;    /* OR of all supported types */
+       unsigned int descr_num;    /* total number of descrambler slots (keys) */
+       unsigned int descr_type;   /* OR of all supported types */
 } ca_caps_t;
 
 /* a message to/from a CI-CAM */
 typedef struct ca_msg {
-        unsigned int index;
-        unsigned int type;
-        unsigned int length;
-        unsigned char msg[256];
+       unsigned int index;
+       unsigned int type;
+       unsigned int length;
+       unsigned char msg[256];
 } ca_msg_t;
 
 typedef struct ca_descr {
-        unsigned int index;
-        unsigned int parity;   /* 0 == even, 1 == odd */
-        unsigned char cw[8];
+       unsigned int index;
+       unsigned int parity;    /* 0 == even, 1 == odd */
+       unsigned char cw[8];
 } ca_descr_t;
 
 typedef struct ca_pid {
-        unsigned int pid;
-        int index;             /* -1 == disable*/
+       unsigned int pid;
+       int index;              /* -1 == disable*/
 } ca_pid_t;
 
 #define CA_RESET          _IO('o', 128)
index ce3f829da82cf5a7943fe7c218465cf10f3cdc01..2787b8a22ff1b772e2bc42cddeff33f6512de2fa 100644 (file)
@@ -1,4 +1,4 @@
-/* 
+/*
  * dmx.h
  *
  * Copyright (C) 2000 Marcus Metzler <marcus@convergence.de>
@@ -38,10 +38,10 @@ typedef enum
 {
        DMX_OUT_DECODER, /* Streaming directly to decoder. */
        DMX_OUT_TAP,     /* Output going to a memory buffer */
-                        /* (to be retrieved via the read command).*/
+                        /* (to be retrieved via the read command).*/
        DMX_OUT_TS_TAP   /* Output multiplexed into a new TS  */
-                        /* (to be retrieved by reading from the */
-                        /* logical DVR device).                 */
+                        /* (to be retrieved by reading from the */
+                        /* logical DVR device).                 */
 } dmx_output_t;
 
 
@@ -54,25 +54,25 @@ typedef enum
 
 typedef enum
 {
-        DMX_PES_AUDIO0,
+       DMX_PES_AUDIO0,
        DMX_PES_VIDEO0,
        DMX_PES_TELETEXT0,
        DMX_PES_SUBTITLE0,
        DMX_PES_PCR0,
 
-        DMX_PES_AUDIO1,
+       DMX_PES_AUDIO1,
        DMX_PES_VIDEO1,
        DMX_PES_TELETEXT1,
        DMX_PES_SUBTITLE1,
        DMX_PES_PCR1,
 
-        DMX_PES_AUDIO2,
+       DMX_PES_AUDIO2,
        DMX_PES_VIDEO2,
        DMX_PES_TELETEXT2,
        DMX_PES_SUBTITLE2,
        DMX_PES_PCR2,
 
-        DMX_PES_AUDIO3,
+       DMX_PES_AUDIO3,
        DMX_PES_VIDEO3,
        DMX_PES_TELETEXT3,
        DMX_PES_SUBTITLE3,
@@ -90,8 +90,8 @@ typedef enum
 
 typedef enum
 {
-        DMX_SCRAMBLING_EV,
-        DMX_FRONTEND_EV
+       DMX_SCRAMBLING_EV,
+       DMX_FRONTEND_EV
 } dmx_event_t;
 
 
index 0e1973d54a6b1e5e729b511fb3beca13d1b3dcf4..880e68435832b9040de2ba943c68a1f1af3cf837 100644 (file)
@@ -98,43 +98,43 @@ typedef enum {
 } OSD_Command;
 
 typedef struct osd_cmd_s {
-        OSD_Command cmd;
-        int x0;
-        int y0;
-        int x1;
-        int y1;
-        int color;
-        void __user *data;
+       OSD_Command cmd;
+       int x0;
+       int y0;
+       int x1;
+       int y1;
+       int color;
+       void __user *data;
 } osd_cmd_t;
 
 /* OSD_OpenRaw: set 'color' to desired window type */
 typedef enum {
-        OSD_BITMAP1,           /* 1 bit bitmap */
-        OSD_BITMAP2,           /* 2 bit bitmap */
-        OSD_BITMAP4,           /* 4 bit bitmap */
-        OSD_BITMAP8,           /* 8 bit bitmap */
-        OSD_BITMAP1HR,         /* 1 Bit bitmap half resolution */
-        OSD_BITMAP2HR,         /* 2 bit bitmap half resolution */
-        OSD_BITMAP4HR,         /* 4 bit bitmap half resolution */
-        OSD_BITMAP8HR,         /* 8 bit bitmap half resolution */
-        OSD_YCRCB422,          /* 4:2:2 YCRCB Graphic Display */
-        OSD_YCRCB444,          /* 4:4:4 YCRCB Graphic Display */
-        OSD_YCRCB444HR,        /* 4:4:4 YCRCB graphic half resolution */
-        OSD_VIDEOTSIZE,        /* True Size Normal MPEG Video Display */
-        OSD_VIDEOHSIZE,        /* MPEG Video Display Half Resolution */
-        OSD_VIDEOQSIZE,        /* MPEG Video Display Quarter Resolution */
-        OSD_VIDEODSIZE,        /* MPEG Video Display Double Resolution */
-        OSD_VIDEOTHSIZE,       /* True Size MPEG Video Display Half Resolution */
-        OSD_VIDEOTQSIZE,       /* True Size MPEG Video Display Quarter Resolution*/
-        OSD_VIDEOTDSIZE,       /* True Size MPEG Video Display Double Resolution */
-        OSD_VIDEONSIZE,        /* Full Size MPEG Video Display */
-        OSD_CURSOR             /* Cursor */
+       OSD_BITMAP1,           /* 1 bit bitmap */
+       OSD_BITMAP2,           /* 2 bit bitmap */
+       OSD_BITMAP4,           /* 4 bit bitmap */
+       OSD_BITMAP8,           /* 8 bit bitmap */
+       OSD_BITMAP1HR,         /* 1 Bit bitmap half resolution */
+       OSD_BITMAP2HR,         /* 2 bit bitmap half resolution */
+       OSD_BITMAP4HR,         /* 4 bit bitmap half resolution */
+       OSD_BITMAP8HR,         /* 8 bit bitmap half resolution */
+       OSD_YCRCB422,          /* 4:2:2 YCRCB Graphic Display */
+       OSD_YCRCB444,          /* 4:4:4 YCRCB Graphic Display */
+       OSD_YCRCB444HR,        /* 4:4:4 YCRCB graphic half resolution */
+       OSD_VIDEOTSIZE,        /* True Size Normal MPEG Video Display */
+       OSD_VIDEOHSIZE,        /* MPEG Video Display Half Resolution */
+       OSD_VIDEOQSIZE,        /* MPEG Video Display Quarter Resolution */
+       OSD_VIDEODSIZE,        /* MPEG Video Display Double Resolution */
+       OSD_VIDEOTHSIZE,       /* True Size MPEG Video Display Half Resolution */
+       OSD_VIDEOTQSIZE,       /* True Size MPEG Video Display Quarter Resolution*/
+       OSD_VIDEOTDSIZE,       /* True Size MPEG Video Display Double Resolution */
+       OSD_VIDEONSIZE,        /* Full Size MPEG Video Display */
+       OSD_CURSOR             /* Cursor */
 } osd_raw_window_t;
 
 typedef struct osd_cap_s {
-        int  cmd;
+       int  cmd;
 #define OSD_CAP_MEMSIZE         1  /* memory size */
-        long val;
+       long val;
 } osd_cap_t;
 
 
index 941045e9ab891fed47c1088d97f6cb64b30bb479..b1999bfeaa5621556e0f98cd86e1a4fa9b59d745 100644 (file)
@@ -36,7 +36,7 @@
 
 typedef enum {
        VIDEO_FORMAT_4_3,     /* Select 4:3 format */
-        VIDEO_FORMAT_16_9,    /* Select 16:9 format. */
+       VIDEO_FORMAT_16_9,    /* Select 16:9 format. */
        VIDEO_FORMAT_221_1    /* 2.21:1 */
 } video_format_t;
 
@@ -54,7 +54,7 @@ typedef enum {
 
 
 typedef enum {
-        VIDEO_PAN_SCAN,       /* use pan and scan format */
+       VIDEO_PAN_SCAN,       /* use pan and scan format */
        VIDEO_LETTER_BOX,     /* use letterbox format */
        VIDEO_CENTER_CUT_OUT  /* use center cut out format */
 } video_displayformat_t;
@@ -66,7 +66,7 @@ typedef struct {
 } video_size_t;
 
 typedef enum {
-        VIDEO_SOURCE_DEMUX, /* Select the demux as the main source */
+       VIDEO_SOURCE_DEMUX, /* Select the demux as the main source */
        VIDEO_SOURCE_MEMORY /* If this source is selected, the stream
                               comes from the user through the write
                               system call */
@@ -75,35 +75,35 @@ typedef enum {
 
 typedef enum {
        VIDEO_STOPPED, /* Video is stopped */
-        VIDEO_PLAYING, /* Video is currently playing */
+       VIDEO_PLAYING, /* Video is currently playing */
        VIDEO_FREEZED  /* Video is freezed */
 } video_play_state_t;
 
 
 struct video_event {
-        int32_t type;
+       int32_t type;
 #define VIDEO_EVENT_SIZE_CHANGED       1
 #define VIDEO_EVENT_FRAME_RATE_CHANGED 2
-        time_t timestamp;
+       time_t timestamp;
        union {
-               video_size_t size;
+               video_size_t size;
                unsigned int frame_rate;        /* in frames per 1000sec */
        } u;
 };
 
 
 struct video_status {
-        int                   video_blank;   /* blank video on freeze? */
-        video_play_state_t    play_state;    /* current state of playback */
-        video_stream_source_t stream_source; /* current source (demux/memory) */
-        video_format_t        video_format;  /* current aspect ratio of stream*/
-        video_displayformat_t display_format;/* selected cropping mode */
+       int                   video_blank;   /* blank video on freeze? */
+       video_play_state_t    play_state;    /* current state of playback */
+       video_stream_source_t stream_source; /* current source (demux/memory) */
+       video_format_t        video_format;  /* current aspect ratio of stream*/
+       video_displayformat_t display_format;/* selected cropping mode */
 };
 
 
 struct video_still_picture {
-        char __user *iFrame;        /* pointer to a single iframe in memory */
-        int32_t size;
+       char __user *iFrame;        /* pointer to a single iframe in memory */
+       int32_t size;
 };
 
 
@@ -111,19 +111,19 @@ typedef
 struct video_highlight {
        int     active;      /*    1=show highlight, 0=hide highlight */
        uint8_t contrast1;   /*    7- 4  Pattern pixel contrast */
-                             /*    3- 0  Background pixel contrast */
+                            /*    3- 0  Background pixel contrast */
        uint8_t contrast2;   /*    7- 4  Emphasis pixel-2 contrast */
-                             /*    3- 0  Emphasis pixel-1 contrast */
+                            /*    3- 0  Emphasis pixel-1 contrast */
        uint8_t color1;      /*    7- 4  Pattern pixel color */
-                             /*    3- 0  Background pixel color */
+                            /*    3- 0  Background pixel color */
        uint8_t color2;      /*    7- 4  Emphasis pixel-2 color */
-                             /*    3- 0  Emphasis pixel-1 color */
+                            /*    3- 0  Emphasis pixel-1 color */
        uint32_t ypos;       /*   23-22  auto action mode */
-                             /*   21-12  start y */
-                             /*    9- 0  end y */
+                            /*   21-12  start y */
+                            /*    9- 0  end y */
        uint32_t xpos;       /*   23-22  button color number */
-                             /*   21-12  start x */
-                             /*    9- 0  end x */
+                            /*   21-12  start x */
+                            /*    9- 0  end x */
 } video_highlight_t;
 
 
index ef3b5632e63a2d835e46e09520326c96dbb974b3..006c81ef4d506013c5272e5544abf99fc3df5cc2 100644 (file)
 #define I2C_DRIVERID_SAA7127   72      /* saa7124 video encoder        */
 #define I2C_DRIVERID_SAA711X   73      /* saa711x video encoders       */
 #define I2C_DRIVERID_AKITAIOEXP        74      /* IO Expander on Sharp SL-C1000 */
-#define I2C_DRIVERID_I2C_IR    75      /* I2C InfraRed on Video boards */
+#define I2C_DRIVERID_INFRARED  75      /* I2C InfraRed on Video boards */
 
 #define I2C_DRIVERID_EXP0      0xF0    /* experimental use id's        */
 #define I2C_DRIVERID_EXP1      0xF1
index ee5b239092edbb03dee1765dd7919246bf4a2400..267c88b5f742592b69dabf70bfcdfb2c471ec706 100644 (file)
@@ -47,6 +47,8 @@ struct inotify_event {
 #define IN_MOVE                        (IN_MOVED_FROM | IN_MOVED_TO) /* moves */
 
 /* special flags */
+#define IN_ONLYDIR             0x01000000      /* only watch the path if it is a directory */
+#define IN_DONT_FOLLOW         0x02000000      /* don't follow a sym link */
 #define IN_MASK_ADD            0x20000000      /* add to the mask of an already existing watch */
 #define IN_ISDIR               0x40000000      /* event occurred against dir */
 #define IN_ONESHOT             0x80000000      /* only send event once */
index e373c4a9de53601a3f6e85bf1623a2b1d896f36c..c03f2dc933de04a7503d75f2cacb9fa68963ca13 100644 (file)
@@ -37,6 +37,7 @@
 #include <linux/spinlock.h>
 #include <linux/rcupdate.h>
 
+#ifdef CONFIG_KPROBES
 #include <asm/kprobes.h>
 
 /* kprobe_status settings */
@@ -147,7 +148,6 @@ struct kretprobe_instance {
        struct task_struct *task;
 };
 
-#ifdef CONFIG_KPROBES
 extern spinlock_t kretprobe_lock;
 extern int arch_prepare_kprobe(struct kprobe *p);
 extern void arch_copy_kprobe(struct kprobe *p);
@@ -158,6 +158,7 @@ extern int arch_init_kprobes(void);
 extern void show_registers(struct pt_regs *regs);
 extern kprobe_opcode_t *get_insn_slot(void);
 extern void free_insn_slot(kprobe_opcode_t *slot);
+extern void kprobes_inc_nmissed_count(struct kprobe *p);
 
 /* Get the kprobe at this addr (if any) - called with preemption disabled */
 struct kprobe *get_kprobe(void *addr);
@@ -195,6 +196,11 @@ void add_rp_inst(struct kretprobe_instance *ri);
 void kprobe_flush_task(struct task_struct *tk);
 void recycle_rp_inst(struct kretprobe_instance *ri);
 #else /* CONFIG_KPROBES */
+
+#define __kprobes      /**/
+struct jprobe;
+struct kretprobe;
+
 static inline struct kprobe *kprobe_running(void)
 {
        return NULL;
index fbfca73355a3a6791a3f2afb20fa41823c5f6fc6..8e3388284530093dc71a1231c263d4436cf8a88d 100644 (file)
@@ -202,12 +202,15 @@ static inline void list_del_rcu(struct list_head *entry)
  *
  * The old entry will be replaced with the new entry atomically.
  */
-static inline void list_replace_rcu(struct list_head *old, struct list_head *new){
+static inline void list_replace_rcu(struct list_head *old,
+                               struct list_head *new)
+{
        new->next = old->next;
        new->prev = old->prev;
        smp_wmb();
        new->next->prev = new;
        new->prev->next = new;
+       old->prev = LIST_POISON2;
 }
 
 /**
@@ -578,6 +581,27 @@ static inline void hlist_del_init(struct hlist_node *n)
        }
 }
 
+/*
+ * hlist_replace_rcu - replace old entry by new one
+ * @old : the element to be replaced
+ * @new : the new element to insert
+ *
+ * The old entry will be replaced with the new entry atomically.
+ */
+static inline void hlist_replace_rcu(struct hlist_node *old,
+                                       struct hlist_node *new)
+{
+       struct hlist_node *next = old->next;
+
+       new->next = next;
+       new->pprev = old->pprev;
+       smp_wmb();
+       if (next)
+               new->next->pprev = &new->next;
+       *new->pprev = new;
+       old->pprev = LIST_POISON2;
+}
+
 static inline void hlist_add_head(struct hlist_node *n, struct hlist_head *h)
 {
        struct hlist_node *first = h->first;
index 29f02d8513f649fc74c3fcd3be1ade57fd4cf466..e5677f45674273b853be00e951f0045405fd1fb9 100644 (file)
@@ -163,7 +163,6 @@ extern unsigned int kobjsize(const void *objp);
 #define VM_HUGETLB     0x00400000      /* Huge TLB Page VM */
 #define VM_NONLINEAR   0x00800000      /* Is non-linear (remap_file_pages) */
 #define VM_MAPPED_COPY 0x01000000      /* T if mapped copy of data (nommu mmap) */
-#define VM_INCOMPLETE  0x02000000      /* Strange partial PFN mapping marker */
 
 #ifndef VM_STACK_DEFAULT_FLAGS         /* arch can override this */
 #define VM_STACK_DEFAULT_FLAGS VM_DATA_DEFAULT_FLAGS
index 936f8b76114ea95901ccb74190f2ebc96fc2a3a7..7fda03d338d1c40a76e2acd6d7a4c80d4910b198 100644 (file)
@@ -684,6 +684,7 @@ extern int          netif_rx(struct sk_buff *skb);
 extern int             netif_rx_ni(struct sk_buff *skb);
 #define HAVE_NETIF_RECEIVE_SKB 1
 extern int             netif_receive_skb(struct sk_buff *skb);
+extern int             dev_valid_name(const char *name);
 extern int             dev_ioctl(unsigned int cmd, void __user *);
 extern int             dev_ethtool(struct ifreq *);
 extern unsigned                dev_get_flags(const struct net_device *);
@@ -801,12 +802,16 @@ static inline u32 netif_msg_init(int debug_value, int default_msg_enable_bits)
        return (1 << debug_value) - 1;
 }
 
-/* Schedule rx intr now? */
+/* Test if receive needs to be scheduled */
+static inline int __netif_rx_schedule_prep(struct net_device *dev)
+{
+       return !test_and_set_bit(__LINK_STATE_RX_SCHED, &dev->state);
+}
 
+/* Test if receive needs to be scheduled but only if up */
 static inline int netif_rx_schedule_prep(struct net_device *dev)
 {
-       return netif_running(dev) &&
-               !test_and_set_bit(__LINK_STATE_RX_SCHED, &dev->state);
+       return netif_running(dev) && __netif_rx_schedule_prep(dev);
 }
 
 /* Add interface to tail of rx poll list. This assumes that _prep has
index 7825c76cbd00df635afb5bcef50775651b07e0cf..c6f7624708796434d74b0480cdb0c67646a86418 100644 (file)
@@ -86,7 +86,7 @@ extern __inline__ void dump_parport_state (char *str, struct parport *p)
        unsigned char dcr = inb (CONTROL (p));
        unsigned char dsr = inb (STATUS (p));
        static char *ecr_modes[] = {"SPP", "PS2", "PPFIFO", "ECP", "xXx", "yYy", "TST", "CFG"};
-       const struct parport_pc_private *priv = (parport_pc_private *)p->physport->private_data;
+       const struct parport_pc_private *priv = p->physport->private_data;
        int i;
 
        printk (KERN_DEBUG "*** parport state (%s): ecr=[%s", str, ecr_modes[(ecr & 0xe0) >> 5]);
index cce25591eec2076dae54c0d803e18298935d638a..a471f3bb713ee1045fb0cddb71d2dc9fcacb54ab 100644 (file)
@@ -100,6 +100,7 @@ struct rcu_data {
        struct rcu_head *donelist;
        struct rcu_head **donetail;
        int cpu;
+       struct rcu_head barrier;
 };
 
 DECLARE_PER_CPU(struct rcu_data, rcu_data);
@@ -285,6 +286,7 @@ extern void FASTCALL(call_rcu_bh(struct rcu_head *head,
 extern __deprecated_for_modules void synchronize_kernel(void);
 extern void synchronize_rcu(void);
 void synchronize_idle(void);
+extern void rcu_barrier(void);
 
 #endif /* __KERNEL__ */
 #endif /* __LINUX_RCUPDATE_H */
index 6bc03c911a83269d83c2692adff04a66c444fbe6..4be34ef8c2f714c56660e19d4f59845123e35750 100644 (file)
@@ -670,6 +670,9 @@ enum {
        NET_DECNET_DST_GC_INTERVAL = 9,
        NET_DECNET_CONF = 10,
        NET_DECNET_NO_FC_MAX_CWND = 11,
+       NET_DECNET_MEM = 12,
+       NET_DECNET_RMEM = 13,
+       NET_DECNET_WMEM = 14,
        NET_DECNET_DEBUG_LEVEL = 255
 };
 
index bfbe92d0767c62a61f09db17b5b59cb8e4a080a6..797ccd813bb004a1f02e52651f0c49260617254d 100644 (file)
@@ -95,6 +95,7 @@ struct itimerval;
 extern int do_setitimer(int which, struct itimerval *value, struct itimerval *ovalue);
 extern int do_getitimer(int which, struct itimerval *value);
 extern void getnstimeofday (struct timespec *tv);
+extern void getnstimestamp(struct timespec *ts);
 
 extern struct timespec timespec_trunc(struct timespec t, unsigned gran);
 
index 2a897c3a6a9af9fd2a483843f452ddb01ac91cdd..e5be2b9b846b9321bd5e3e316061ae57e29d9dd4 100644 (file)
@@ -14,7 +14,7 @@
 #include <linux/vmalloc.h>     /* for vmalloc() */
 #include <linux/mm.h>          /* for vmalloc_to_page() */
 
-#define SAA7146_VERSION_CODE 0x000500   /* 0.5.0 */
+#define SAA7146_VERSION_CODE 0x000500  /* 0.5.0 */
 
 #define saa7146_write(sxy,adr,dat)    writel((dat),(sxy->mem+(adr)))
 #define saa7146_read(sxy,adr)         readl(sxy->mem+(adr))
@@ -112,7 +112,7 @@ struct saa7146_dev
 
        /* different device locks */
        spinlock_t                      slock;
-        struct semaphore               lock;
+       struct semaphore                lock;
 
        unsigned char                   __iomem *mem;           /* pointer to mapped IO memory */
        int                             revision;       /* chip revision; needed for bug-workarounds*/
@@ -133,7 +133,7 @@ struct saa7146_dev
        void (*vv_callback)(struct saa7146_dev *dev, unsigned long status);
 
        /* i2c-stuff */
-        struct semaphore       i2c_lock;
+       struct semaphore        i2c_lock;
        u32                     i2c_bitrate;
        struct saa7146_dma      d_i2c;  /* pointer to i2c memory */
        wait_queue_head_t       i2c_wq;
index 64691753721edc1e82d38ff0cc9473273ddedede..16af9299315f3da06ba07a722fb9bdaa7627e520 100644 (file)
@@ -113,7 +113,7 @@ struct saa7146_vv
        /* vbi capture */
        struct saa7146_dmaqueue         vbi_q;
        /* vbi workaround interrupt queue */
-        wait_queue_head_t              vbi_wq;
+       wait_queue_head_t               vbi_wq;
        int                             vbi_fieldcount;
        struct saa7146_fh               *vbi_streaming;
 
@@ -181,10 +181,10 @@ struct saa7146_ext_vv
 };
 
 struct saa7146_use_ops  {
-        void (*init)(struct saa7146_dev *, struct saa7146_vv *);
-        int(*open)(struct saa7146_dev *, struct file *);
-        void (*release)(struct saa7146_dev *, struct file *);
-        void (*irq_done)(struct saa7146_dev *, unsigned long status);
+       void (*init)(struct saa7146_dev *, struct saa7146_vv *);
+       int(*open)(struct saa7146_dev *, struct file *);
+       void (*release)(struct saa7146_dev *, struct file *);
+       void (*irq_done)(struct saa7146_dev *, unsigned long status);
        ssize_t (*read)(struct file *, char __user *, size_t, loff_t *);
 };
 
index c1dbbd22279394863d3d7cb7d8b7ed948e8bcfa7..a4b6168e1e2571ac34f01aab561167275323ea4d 100644 (file)
@@ -234,4 +234,8 @@ extern int decnet_di_count;
 extern int decnet_dr_count;
 extern int decnet_no_fc_max_cwnd;
 
+extern int sysctl_decnet_mem[3];
+extern int sysctl_decnet_wmem[3];
+extern int sysctl_decnet_rmem[3];
+
 #endif /* _NET_DN_H */
index 0c56320d38dc38eac05fb4eb04b5d0e626352019..32fa03ad1984da1395386d99deee3b98e073648d 100644 (file)
@@ -291,8 +291,10 @@ int kauditd_thread(void *dummy)
                        set_current_state(TASK_INTERRUPTIBLE);
                        add_wait_queue(&kauditd_wait, &wait);
 
-                       if (!skb_queue_len(&audit_skb_queue))
+                       if (!skb_queue_len(&audit_skb_queue)) {
+                               try_to_freeze();
                                schedule();
+                       }
 
                        __set_current_state(TASK_RUNNING);
                        remove_wait_queue(&kauditd_wait, &wait);
index 5beda378cc7518b353dc5f0551c636d8dd81b02a..3bb71e63a37e0bfa47217c99b2b5e6dbe0a8f2d5 100644 (file)
@@ -246,6 +246,19 @@ static int __kprobes aggr_break_handler(struct kprobe *p, struct pt_regs *regs)
        return ret;
 }
 
+/* Walks the list and increments nmissed count for multiprobe case */
+void __kprobes kprobes_inc_nmissed_count(struct kprobe *p)
+{
+       struct kprobe *kp;
+       if (p->pre_handler != aggr_pre_handler) {
+               p->nmissed++;
+       } else {
+               list_for_each_entry_rcu(kp, &p->list, list)
+                       kp->nmissed++;
+       }
+       return;
+}
+
 /* Called with kretprobe_lock held */
 struct kretprobe_instance __kprobes *get_free_rp_inst(struct kretprobe *rp)
 {
@@ -399,10 +412,7 @@ static inline void add_aggr_kprobe(struct kprobe *ap, struct kprobe *p)
        INIT_LIST_HEAD(&ap->list);
        list_add_rcu(&p->list, &ap->list);
 
-       INIT_HLIST_NODE(&ap->hlist);
-       hlist_del_rcu(&p->hlist);
-       hlist_add_head_rcu(&ap->hlist,
-               &kprobe_table[hash_ptr(ap->addr, KPROBE_HASH_BITS)]);
+       hlist_replace_rcu(&p->hlist, &ap->hlist);
 }
 
 /*
@@ -462,9 +472,16 @@ int __kprobes register_kprobe(struct kprobe *p)
        int ret = 0;
        unsigned long flags = 0;
        struct kprobe *old_p;
+       struct module *mod;
+
+       if ((!kernel_text_address((unsigned long) p->addr)) ||
+               in_kprobes_functions((unsigned long) p->addr))
+               return -EINVAL;
+
+       if ((mod = module_text_address((unsigned long) p->addr)) &&
+                       (unlikely(!try_module_get(mod))))
+               return -EINVAL;
 
-       if ((ret = in_kprobes_functions((unsigned long) p->addr)) != 0)
-               return ret;
        if ((ret = arch_prepare_kprobe(p)) != 0)
                goto rm_kprobe;
 
@@ -488,6 +505,8 @@ out:
 rm_kprobe:
        if (ret == -EEXIST)
                arch_remove_kprobe(p);
+       if (ret && mod)
+               module_put(mod);
        return ret;
 }
 
@@ -495,6 +514,7 @@ void __kprobes unregister_kprobe(struct kprobe *p)
 {
        unsigned long flags;
        struct kprobe *old_p;
+       struct module *mod;
 
        spin_lock_irqsave(&kprobe_lock, flags);
        old_p = get_kprobe(p->addr);
@@ -506,6 +526,10 @@ void __kprobes unregister_kprobe(struct kprobe *p)
                        cleanup_kprobe(p, flags);
 
                synchronize_sched();
+
+               if ((mod = module_text_address((unsigned long)p->addr)))
+                       module_put(mod);
+
                if (old_p->pre_handler == aggr_pre_handler &&
                                list_empty(&old_p->list))
                        kfree(old_p);
index c4d159a21e042cc184a6d04e64b7b2273dfb5872..48d3bce465b88e38b0715a46a5b7fe8c95820c2d 100644 (file)
@@ -116,6 +116,10 @@ void fastcall call_rcu(struct rcu_head *head,
        local_irq_restore(flags);
 }
 
+static atomic_t rcu_barrier_cpu_count;
+static struct semaphore rcu_barrier_sema;
+static struct completion rcu_barrier_completion;
+
 /**
  * call_rcu_bh - Queue an RCU for invocation after a quicker grace period.
  * @head: structure to be used for queueing the RCU updates.
@@ -162,6 +166,42 @@ long rcu_batches_completed(void)
        return rcu_ctrlblk.completed;
 }
 
+static void rcu_barrier_callback(struct rcu_head *notused)
+{
+       if (atomic_dec_and_test(&rcu_barrier_cpu_count))
+               complete(&rcu_barrier_completion);
+}
+
+/*
+ * Called with preemption disabled, and from cross-cpu IRQ context.
+ */
+static void rcu_barrier_func(void *notused)
+{
+       int cpu = smp_processor_id();
+       struct rcu_data *rdp = &per_cpu(rcu_data, cpu);
+       struct rcu_head *head;
+
+       head = &rdp->barrier;
+       atomic_inc(&rcu_barrier_cpu_count);
+       call_rcu(head, rcu_barrier_callback);
+}
+
+/**
+ * rcu_barrier - Wait until all the in-flight RCUs are complete.
+ */
+void rcu_barrier(void)
+{
+       BUG_ON(in_interrupt());
+       /* Take cpucontrol semaphore to protect against CPU hotplug */
+       down(&rcu_barrier_sema);
+       init_completion(&rcu_barrier_completion);
+       atomic_set(&rcu_barrier_cpu_count, 0);
+       on_each_cpu(rcu_barrier_func, NULL, 0, 1);
+       wait_for_completion(&rcu_barrier_completion);
+       up(&rcu_barrier_sema);
+}
+EXPORT_SYMBOL_GPL(rcu_barrier);
+
 /*
  * Invoke the completed RCU callbacks. They are expected to be in
  * a per-cpu list.
@@ -217,15 +257,23 @@ static void rcu_start_batch(struct rcu_ctrlblk *rcp, struct rcu_state *rsp,
 
        if (rcp->next_pending &&
                        rcp->completed == rcp->cur) {
-               /* Can't change, since spin lock held. */
-               cpus_andnot(rsp->cpumask, cpu_online_map, nohz_cpu_mask);
-
                rcp->next_pending = 0;
-               /* next_pending == 0 must be visible in __rcu_process_callbacks()
-                * before it can see new value of cur.
+               /*
+                * next_pending == 0 must be visible in
+                * __rcu_process_callbacks() before it can see new value of cur.
                 */
                smp_wmb();
                rcp->cur++;
+
+               /*
+                * Accessing nohz_cpu_mask before incrementing rcp->cur needs a
+                * Barrier  Otherwise it can cause tickless idle CPUs to be
+                * included in rsp->cpumask, which will extend graceperiods
+                * unnecessarily.
+                */
+               smp_mb();
+               cpus_andnot(rsp->cpumask, cpu_online_map, nohz_cpu_mask);
+
        }
 }
 
@@ -457,6 +505,7 @@ static struct notifier_block __devinitdata rcu_nb = {
  */
 void __init rcu_init(void)
 {
+       sema_init(&rcu_barrier_sema, 1);
        rcu_cpu_notify(&rcu_nb, CPU_UP_PREPARE,
                        (void *)(long)smp_processor_id());
        /* Register notifier for non-boot CPUs */
index 88c28d476550d004fe3232ab284d54473f5885a9..49fbbeff201ce7c27c72e7077b2555c31f478040 100644 (file)
@@ -409,9 +409,8 @@ rcu_torture_cleanup(void)
        stats_task = NULL;
 
        /* Wait for all RCU callbacks to fire.  */
+       rcu_barrier();
 
-       for (i = 0; i < RCU_TORTURE_PIPE_LEN; i++)
-               synchronize_rcu();
        rcu_torture_stats_print();  /* -After- the stats thread is stopped! */
        printk(KERN_ALERT TORTURE_FLAG
               "--- End of test: %s\n",
index bce933ebb29f458908806101dae497332004b2e2..eecf84526afeca15c7e82894c5c3e898239fa062 100644 (file)
@@ -32,6 +32,7 @@
 
 #include <linux/compat.h>
 #include <linux/syscalls.h>
+#include <linux/kprobes.h>
 
 #include <asm/uaccess.h>
 #include <asm/io.h>
@@ -168,7 +169,7 @@ EXPORT_SYMBOL(notifier_chain_unregister);
  *     of the last notifier function called.
  */
  
-int notifier_call_chain(struct notifier_block **n, unsigned long val, void *v)
+int __kprobes notifier_call_chain(struct notifier_block **n, unsigned long val, void *v)
 {
        int ret=NOTIFY_DONE;
        struct notifier_block *nb = *n;
index 245d595a13cb9f566f67c2ac6ab6dfb8c0af1143..b94bfa8c03e0ce045c02195942dcdfc16172bdab 100644 (file)
@@ -561,6 +561,28 @@ void getnstimeofday(struct timespec *tv)
 EXPORT_SYMBOL_GPL(getnstimeofday);
 #endif
 
+void getnstimestamp(struct timespec *ts)
+{
+       unsigned int seq;
+       struct timespec wall2mono;
+
+       /* synchronize with settimeofday() changes */
+       do {
+               seq = read_seqbegin(&xtime_lock);
+               getnstimeofday(ts);
+               wall2mono = wall_to_monotonic;
+       } while(unlikely(read_seqretry(&xtime_lock, seq)));
+
+       /* adjust to monotonicaly-increasing values */
+       ts->tv_sec += wall2mono.tv_sec;
+       ts->tv_nsec += wall2mono.tv_nsec;
+       while (unlikely(ts->tv_nsec >= NSEC_PER_SEC)) {
+               ts->tv_nsec -= NSEC_PER_SEC;
+               ts->tv_sec++;
+       }
+}
+EXPORT_SYMBOL_GPL(getnstimestamp);
+
 #if (BITS_PER_LONG < 64)
 u64 get_jiffies_64(void)
 {
index e8c567177dcf83e0b8d7352c581c0565c400844c..16b9465eb4ebb385114558dcacdaf7af21678612 100644 (file)
@@ -204,6 +204,8 @@ restart_scan:
                unsigned long j;
                i = find_next_zero_bit(bdata->node_bootmem_map, eidx, i);
                i = ALIGN(i, incr);
+               if (i >= eidx)
+                       break;
                if (test_bit(i, bdata->node_bootmem_map))
                        continue;
                for (j = i + 1; j < i + areasize; ++j) {
index aa8af0e20269df2b59fe3d94e3833e470cce7de8..47c533eaa0721c558eddcc68dfa6c8de1f2844ef 100644 (file)
@@ -349,6 +349,11 @@ void print_bad_pte(struct vm_area_struct *vma, pte_t pte, unsigned long vaddr)
        dump_stack();
 }
 
+static inline int is_cow_mapping(unsigned int flags)
+{
+       return (flags & (VM_SHARED | VM_MAYWRITE)) == VM_MAYWRITE;
+}
+
 /*
  * This function gets the "struct page" associated with a pte.
  *
@@ -377,6 +382,8 @@ struct page *vm_normal_page(struct vm_area_struct *vma, unsigned long addr, pte_
                unsigned long off = (addr - vma->vm_start) >> PAGE_SHIFT;
                if (pfn == vma->vm_pgoff + off)
                        return NULL;
+               if (!is_cow_mapping(vma->vm_flags))
+                       return NULL;
        }
 
        /*
@@ -437,7 +444,7 @@ copy_one_pte(struct mm_struct *dst_mm, struct mm_struct *src_mm,
         * If it's a COW mapping, write protect it both
         * in the parent and the child
         */
-       if ((vm_flags & (VM_SHARED | VM_MAYWRITE)) == VM_MAYWRITE) {
+       if (is_cow_mapping(vm_flags)) {
                ptep_set_wrprotect(src_mm, addr, src_pte);
                pte = *src_pte;
        }
@@ -1225,50 +1232,6 @@ int vm_insert_page(struct vm_area_struct *vma, unsigned long addr, struct page *
 }
 EXPORT_SYMBOL(vm_insert_page);
 
-/*
- * Somebody does a pfn remapping that doesn't actually work as a vma.
- *
- * Do it as individual pages instead, and warn about it. It's bad form,
- * and very inefficient.
- */
-static int incomplete_pfn_remap(struct vm_area_struct *vma,
-               unsigned long start, unsigned long end,
-               unsigned long pfn, pgprot_t prot)
-{
-       static int warn = 10;
-       struct page *page;
-       int retval;
-
-       if (!(vma->vm_flags & VM_INCOMPLETE)) {
-               if (warn) {
-                       warn--;
-                       printk("%s does an incomplete pfn remapping", current->comm);
-                       dump_stack();
-               }
-       }
-       vma->vm_flags |= VM_INCOMPLETE | VM_IO | VM_RESERVED;
-
-       if (start < vma->vm_start || end > vma->vm_end)
-               return -EINVAL;
-
-       if (!pfn_valid(pfn))
-               return -EINVAL;
-
-       page = pfn_to_page(pfn);
-       if (!PageReserved(page))
-               return -EINVAL;
-
-       retval = 0;
-       while (start < end) {
-               retval = insert_page(vma->vm_mm, start, page, prot);
-               if (retval < 0)
-                       break;
-               start += PAGE_SIZE;
-               page++;
-       }
-       return retval;
-}
-
 /*
  * maps a range of physical memory into the requested pages. the old
  * mappings are removed. any references to nonexistent pages results
@@ -1343,9 +1306,6 @@ int remap_pfn_range(struct vm_area_struct *vma, unsigned long addr,
        struct mm_struct *mm = vma->vm_mm;
        int err;
 
-       if (addr != vma->vm_start || end != vma->vm_end)
-               return incomplete_pfn_remap(vma, addr, end, pfn, prot);
-
        /*
         * Physically remapped pages are special. Tell the
         * rest of the world about it:
@@ -1359,9 +1319,18 @@ int remap_pfn_range(struct vm_area_struct *vma, unsigned long addr,
         *   VM_PFNMAP tells the core MM that the base pages are just
         *      raw PFN mappings, and do not have a "struct page" associated
         *      with them.
+        *
+        * There's a horrible special case to handle copy-on-write
+        * behaviour that some programs depend on. We mark the "original"
+        * un-COW'ed pages by matching them up with "vma->vm_pgoff".
         */
+       if (is_cow_mapping(vma->vm_flags)) {
+               if (addr != vma->vm_start || end != vma->vm_end)
+                       return -EINVAL;
+               vma->vm_pgoff = pfn;
+       }
+
        vma->vm_flags |= VM_IO | VM_RESERVED | VM_PFNMAP;
-       vma->vm_pgoff = pfn;
 
        BUG_ON(addr >= end);
        pfn -= addr >> PAGE_SHIFT;
index 0b48e294aafec9e7f8c0f7d43212164652afabf6..1a59f2173f0a7f1f8b7b48ec91faffe62d39905f 100644 (file)
@@ -626,7 +626,7 @@ struct net_device * dev_get_by_flags(unsigned short if_flags, unsigned short mas
  *     Network device names need to be valid file names to
  *     to allow sysfs to work
  */
-static int dev_valid_name(const char *name)
+int dev_valid_name(const char *name)
 {
        return !(*name == '\0' 
                 || !strcmp(name, ".")
@@ -1113,7 +1113,8 @@ out:
 void netdev_rx_csum_fault(struct net_device *dev)
 {
        if (net_ratelimit()) {
-               printk(KERN_ERR "%s: hw csum failure.\n", dev->name);
+               printk(KERN_ERR "%s: hw csum failure.\n", 
+                       dev ? dev->name : "<unknown>");
                dump_stack();
        }
 }
@@ -3269,6 +3270,7 @@ EXPORT_SYMBOL(__dev_get_by_index);
 EXPORT_SYMBOL(__dev_get_by_name);
 EXPORT_SYMBOL(__dev_remove_pack);
 EXPORT_SYMBOL(__skb_linearize);
+EXPORT_SYMBOL(dev_valid_name);
 EXPORT_SYMBOL(dev_add_pack);
 EXPORT_SYMBOL(dev_alloc_name);
 EXPORT_SYMBOL(dev_close);
index b7d13a4fff48568df05b7bea20c94e31869761ce..83fee37de38ee7caa37f102eec58adc383e5a585 100644 (file)
@@ -1725,7 +1725,7 @@ unsigned int skb_find_text(struct sk_buff *skb, unsigned int from,
  * of the skb if any page alloc fails user this procedure returns  -ENOMEM
  */
 int skb_append_datato_frags(struct sock *sk, struct sk_buff *skb,
-                       int getfrag(void *from, char *to, int offset,
+                       int (*getfrag)(void *from, char *to, int offset,
                                        int len, int odd, struct sk_buff *skb),
                        void *from, int length)
 {
index 7b5970fc9e407f7886332cba4d95b8ee3cf2c011..587eb7787debf04561517a0e0f0a070d5bff84e3 100644 (file)
@@ -175,7 +175,7 @@ __u32 in_aton(const char *str)
                if (*str != '\0')
                {
                        val = 0;
-                       while (*str != '\0' && *str != '.')
+                       while (*str != '\0' && *str != '.' && *str != '\n')
                        {
                                val *= 10;
                                val += *str - '0';
index f89e55f814d9b8c1a23737d10db90fd5914502ec..d402e9020c684126bf9a1f418e7e7c9549a6e9dd 100644 (file)
@@ -153,6 +153,7 @@ static struct proto_ops dn_proto_ops;
 static DEFINE_RWLOCK(dn_hash_lock);
 static struct hlist_head dn_sk_hash[DN_SK_HASH_SIZE];
 static struct hlist_head dn_wild_sk;
+static atomic_t decnet_memory_allocated;
 
 static int __dn_setsockopt(struct socket *sock, int level, int optname, char __user *optval, int optlen, int flags);
 static int __dn_getsockopt(struct socket *sock, int level, int optname, char __user *optval, int __user *optlen, int flags);
@@ -446,10 +447,26 @@ static void dn_destruct(struct sock *sk)
        dst_release(xchg(&sk->sk_dst_cache, NULL));
 }
 
+static int dn_memory_pressure;
+
+static void dn_enter_memory_pressure(void)
+{
+       if (!dn_memory_pressure) {
+               dn_memory_pressure = 1;
+       }
+}
+
 static struct proto dn_proto = {
-       .name     = "DECNET",
-       .owner    = THIS_MODULE,
-       .obj_size = sizeof(struct dn_sock),
+       .name                   = "NSP",
+       .owner                  = THIS_MODULE,
+       .enter_memory_pressure  = dn_enter_memory_pressure,
+       .memory_pressure        = &dn_memory_pressure,
+       .memory_allocated       = &decnet_memory_allocated,
+       .sysctl_mem             = sysctl_decnet_mem,
+       .sysctl_wmem            = sysctl_decnet_wmem,
+       .sysctl_rmem            = sysctl_decnet_rmem,
+       .max_header             = DN_MAX_NSP_DATA_HEADER + 64,
+       .obj_size               = sizeof(struct dn_sock),
 };
 
 static struct sock *dn_alloc_sock(struct socket *sock, gfp_t gfp)
@@ -470,6 +487,8 @@ static struct sock *dn_alloc_sock(struct socket *sock, gfp_t gfp)
        sk->sk_family      = PF_DECnet;
        sk->sk_protocol    = 0;
        sk->sk_allocation  = gfp;
+       sk->sk_sndbuf      = sysctl_decnet_wmem[1];
+       sk->sk_rcvbuf      = sysctl_decnet_rmem[1];
 
        /* Initialization of DECnet Session Control Port                */
        scp = DN_SK(sk);
index 02bca49cb5084b60c4779b6d5badab8dde35ac93..0e9d2c5711655b37bd9f9f48f6f4baf2c9b21f53 100644 (file)
@@ -10,6 +10,7 @@
  *
  * Changes:
  * Steve Whitehouse - C99 changes and default device handling
+ * Steve Whitehouse - Memory buffer settings, like the tcp ones
  *
  */
 #include <linux/config.h>
@@ -37,6 +38,11 @@ int decnet_dr_count = 3;
 int decnet_log_martians = 1;
 int decnet_no_fc_max_cwnd = NSP_MIN_WINDOW;
 
+/* Reasonable defaults, I hope, based on tcp's defaults */
+int sysctl_decnet_mem[3] = { 768 << 3, 1024 << 3, 1536 << 3 };
+int sysctl_decnet_wmem[3] = { 4 * 1024, 16 * 1024, 128 * 1024 };
+int sysctl_decnet_rmem[3] = { 4 * 1024, 87380, 87380 * 2 };
+
 #ifdef CONFIG_SYSCTL
 extern int decnet_dst_gc_interval;
 static int min_decnet_time_wait[] = { 5 };
@@ -428,6 +434,33 @@ static ctl_table dn_table[] = {
                .extra1 = &min_decnet_no_fc_max_cwnd,
                .extra2 = &max_decnet_no_fc_max_cwnd
        },
+       {
+                .ctl_name = NET_DECNET_MEM,
+                .procname = "decnet_mem",
+                .data = &sysctl_decnet_mem,
+                .maxlen = sizeof(sysctl_decnet_mem),
+                .mode = 0644,
+                .proc_handler = &proc_dointvec,
+                .strategy = &sysctl_intvec,
+        },
+        {
+                .ctl_name = NET_DECNET_RMEM,
+                .procname = "decnet_rmem",
+                .data = &sysctl_decnet_rmem,
+                .maxlen = sizeof(sysctl_decnet_rmem),
+                .mode = 0644,
+                .proc_handler = &proc_dointvec,
+                .strategy = &sysctl_intvec,
+        },
+        {
+                .ctl_name = NET_DECNET_WMEM,
+                .procname = "decnet_wmem",
+                .data = &sysctl_decnet_wmem,
+                .maxlen = sizeof(sysctl_decnet_wmem),
+                .mode = 0644,
+                .proc_handler = &proc_dointvec,
+                .strategy = &sysctl_intvec,
+        },
        {
                .ctl_name = NET_DECNET_DEBUG_LEVEL,
                .procname = "debug",
index 0bc00528d888d1d26ba9727f250bc1d2ad0ebfe0..88a60650e6b8d795462c58e9f0a14159bbb96ee6 100644 (file)
@@ -56,8 +56,8 @@ config IP_NF_CONNTRACK_MARK
          instead of the individual packets.
        
 config IP_NF_CONNTRACK_EVENTS
-       bool "Connection tracking events"
-       depends on IP_NF_CONNTRACK
+       bool "Connection tracking events (EXPERIMENTAL)"
+       depends on EXPERIMENTAL && IP_NF_CONNTRACK
        help
          If this option is enabled, the connection tracking code will
          provide a notifier chain that can be used by other kernel code
@@ -66,8 +66,8 @@ config IP_NF_CONNTRACK_EVENTS
          IF unsure, say `N'.
 
 config IP_NF_CONNTRACK_NETLINK
-       tristate 'Connection tracking netlink interface'
-       depends on IP_NF_CONNTRACK && NETFILTER_NETLINK
+       tristate 'Connection tracking netlink interface (EXPERIMENTAL)'
+       depends on EXPERIMENTAL && IP_NF_CONNTRACK && NETFILTER_NETLINK
        depends on IP_NF_CONNTRACK!=y || NETFILTER_NETLINK!=m
        help
          This option enables support for a netlink-based userspace interface
index 7a4ecddd597b4ea1760d7f936eb2a90fb0d3a2fb..84c66dbfedaf83505434124e6bf39621bc84ec96 100644 (file)
@@ -1345,6 +1345,11 @@ static int kill_all(struct ip_conntrack *i, void *data)
        return 1;
 }
 
+void ip_conntrack_flush(void)
+{
+       ip_ct_iterate_cleanup(kill_all, NULL);
+}
+
 static void free_conntrack_hash(struct list_head *hash, int vmalloced,int size)
 {
        if (vmalloced)
@@ -1354,8 +1359,12 @@ static void free_conntrack_hash(struct list_head *hash, int vmalloced,int size)
                           get_order(sizeof(struct list_head) * size));
 }
 
-void ip_conntrack_flush(void)
+/* Mishearing the voices in his head, our hero wonders how he's
+   supposed to kill the mall. */
+void ip_conntrack_cleanup(void)
 {
+       ip_ct_attach = NULL;
+
        /* This makes sure all current packets have passed through
            netfilter framework.  Roll on, two-stage module
            delete... */
@@ -1363,7 +1372,7 @@ void ip_conntrack_flush(void)
 
        ip_ct_event_cache_flush();
  i_see_dead_people:
-       ip_ct_iterate_cleanup(kill_all, NULL);
+       ip_conntrack_flush();
        if (atomic_read(&ip_conntrack_count) != 0) {
                schedule();
                goto i_see_dead_people;
@@ -1371,14 +1380,7 @@ void ip_conntrack_flush(void)
        /* wait until all references to ip_conntrack_untracked are dropped */
        while (atomic_read(&ip_conntrack_untracked.ct_general.use) > 1)
                schedule();
-}
 
-/* Mishearing the voices in his head, our hero wonders how he's
-   supposed to kill the mall. */
-void ip_conntrack_cleanup(void)
-{
-       ip_ct_attach = NULL;
-       ip_conntrack_flush();
        kmem_cache_destroy(ip_conntrack_cachep);
        kmem_cache_destroy(ip_conntrack_expect_cachep);
        free_conntrack_hash(ip_conntrack_hash, ip_conntrack_vmalloc,
index 3fce91bcc0ba55f506e80d10b4785409715f73f0..91fe8f2e38ffe500a2f72c6b3c6f69c3a7e548c6 100644 (file)
@@ -503,7 +503,7 @@ ctnetlink_parse_tuple_ip(struct nfattr *attr, struct ip_conntrack_tuple *tuple)
 }
 
 static const size_t cta_min_proto[CTA_PROTO_MAX] = {
-       [CTA_PROTO_NUM-1]       = sizeof(u_int16_t),
+       [CTA_PROTO_NUM-1]       = sizeof(u_int8_t),
        [CTA_PROTO_SRC_PORT-1]  = sizeof(u_int16_t),
        [CTA_PROTO_DST_PORT-1]  = sizeof(u_int16_t),
        [CTA_PROTO_ICMP_TYPE-1] = sizeof(u_int8_t),
@@ -528,7 +528,7 @@ ctnetlink_parse_tuple_proto(struct nfattr *attr,
 
        if (!tb[CTA_PROTO_NUM-1])
                return -EINVAL;
-       tuple->dst.protonum = *(u_int16_t *)NFA_DATA(tb[CTA_PROTO_NUM-1]);
+       tuple->dst.protonum = *(u_int8_t *)NFA_DATA(tb[CTA_PROTO_NUM-1]);
 
        proto = ip_conntrack_proto_find_get(tuple->dst.protonum);
 
@@ -728,11 +728,9 @@ ctnetlink_del_conntrack(struct sock *ctnl, struct sk_buff *skb,
                        return -ENOENT;
                }
        }       
-       if (del_timer(&ct->timeout)) {
-               ip_conntrack_put(ct);
+       if (del_timer(&ct->timeout))
                ct->timeout.function((unsigned long)ct);
-               return 0;
-       }
+
        ip_conntrack_put(ct);
        DEBUGP("leaving\n");
 
@@ -877,7 +875,7 @@ ctnetlink_change_status(struct ip_conntrack *ct, struct nfattr *cda[])
                DEBUGP("NAT status: %lu\n", 
                       status & (IPS_NAT_MASK | IPS_NAT_DONE_MASK));
                
-               if (ip_nat_initialized(ct, hooknum))
+               if (ip_nat_initialized(ct, HOOK2MANIP(hooknum)))
                        return -EEXIST;
                ip_nat_setup_info(ct, &range, hooknum);
 
index aeb7353d4777312280da73363566964c45006fdc..e7fa29e576dc6688f88c9a48c3c5b4b1aa35c495 100644 (file)
@@ -341,9 +341,10 @@ static int tcp_print_conntrack(struct seq_file *s,
 static int tcp_to_nfattr(struct sk_buff *skb, struct nfattr *nfa,
                         const struct ip_conntrack *ct)
 {
-       struct nfattr *nest_parms = NFA_NEST(skb, CTA_PROTOINFO_TCP);
+       struct nfattr *nest_parms;
        
        read_lock_bh(&tcp_lock);
+       nest_parms = NFA_NEST(skb, CTA_PROTOINFO_TCP);
        NFA_PUT(skb, CTA_PROTOINFO_TCP_STATE, sizeof(u_int8_t),
                &ct->proto.tcp.state);
        read_unlock_bh(&tcp_lock);
index 029c70dfb585f74e74383faf40c1816b4e6d410d..b7325e0b406a8486fad7bc6da6b24f5ade426415 100644 (file)
@@ -262,122 +262,139 @@ static __inline__ u16 tcp_select_window(struct sock *sk)
  * We are working here with either a clone of the original
  * SKB, or a fresh unique copy made by the retransmit engine.
  */
-static int tcp_transmit_skb(struct sock *sk, struct sk_buff *skb)
+static int tcp_transmit_skb(struct sock *sk, struct sk_buff *skb, int clone_it, gfp_t gfp_mask)
 {
-       if (skb != NULL) {
-               const struct inet_connection_sock *icsk = inet_csk(sk);
-               struct inet_sock *inet = inet_sk(sk);
-               struct tcp_sock *tp = tcp_sk(sk);
-               struct tcp_skb_cb *tcb = TCP_SKB_CB(skb);
-               int tcp_header_size = tp->tcp_header_len;
-               struct tcphdr *th;
-               int sysctl_flags;
-               int err;
+       const struct inet_connection_sock *icsk = inet_csk(sk);
+       struct inet_sock *inet;
+       struct tcp_sock *tp;
+       struct tcp_skb_cb *tcb;
+       int tcp_header_size;
+       struct tcphdr *th;
+       int sysctl_flags;
+       int err;
+
+       BUG_ON(!skb || !tcp_skb_pcount(skb));
+
+       /* If congestion control is doing timestamping, we must
+        * take such a timestamp before we potentially clone/copy.
+        */
+       if (icsk->icsk_ca_ops->rtt_sample)
+               __net_timestamp(skb);
+
+       if (likely(clone_it)) {
+               if (unlikely(skb_cloned(skb)))
+                       skb = pskb_copy(skb, gfp_mask);
+               else
+                       skb = skb_clone(skb, gfp_mask);
+               if (unlikely(!skb))
+                       return -ENOBUFS;
+       }
 
-               BUG_ON(!tcp_skb_pcount(skb));
+       inet = inet_sk(sk);
+       tp = tcp_sk(sk);
+       tcb = TCP_SKB_CB(skb);
+       tcp_header_size = tp->tcp_header_len;
 
 #define SYSCTL_FLAG_TSTAMPS    0x1
 #define SYSCTL_FLAG_WSCALE     0x2
 #define SYSCTL_FLAG_SACK       0x4
 
-               /* If congestion control is doing timestamping */
-               if (icsk->icsk_ca_ops->rtt_sample)
-                       __net_timestamp(skb);
-
-               sysctl_flags = 0;
-               if (tcb->flags & TCPCB_FLAG_SYN) {
-                       tcp_header_size = sizeof(struct tcphdr) + TCPOLEN_MSS;
-                       if(sysctl_tcp_timestamps) {
-                               tcp_header_size += TCPOLEN_TSTAMP_ALIGNED;
-                               sysctl_flags |= SYSCTL_FLAG_TSTAMPS;
-                       }
-                       if(sysctl_tcp_window_scaling) {
-                               tcp_header_size += TCPOLEN_WSCALE_ALIGNED;
-                               sysctl_flags |= SYSCTL_FLAG_WSCALE;
-                       }
-                       if(sysctl_tcp_sack) {
-                               sysctl_flags |= SYSCTL_FLAG_SACK;
-                               if(!(sysctl_flags & SYSCTL_FLAG_TSTAMPS))
-                                       tcp_header_size += TCPOLEN_SACKPERM_ALIGNED;
-                       }
-               } else if (tp->rx_opt.eff_sacks) {
-                       /* A SACK is 2 pad bytes, a 2 byte header, plus
-                        * 2 32-bit sequence numbers for each SACK block.
-                        */
-                       tcp_header_size += (TCPOLEN_SACK_BASE_ALIGNED +
-                                           (tp->rx_opt.eff_sacks * TCPOLEN_SACK_PERBLOCK));
+       sysctl_flags = 0;
+       if (unlikely(tcb->flags & TCPCB_FLAG_SYN)) {
+               tcp_header_size = sizeof(struct tcphdr) + TCPOLEN_MSS;
+               if(sysctl_tcp_timestamps) {
+                       tcp_header_size += TCPOLEN_TSTAMP_ALIGNED;
+                       sysctl_flags |= SYSCTL_FLAG_TSTAMPS;
                }
-               
-               if (tcp_packets_in_flight(tp) == 0)
-                       tcp_ca_event(sk, CA_EVENT_TX_START);
-
-               th = (struct tcphdr *) skb_push(skb, tcp_header_size);
-               skb->h.th = th;
-               skb_set_owner_w(skb, sk);
-
-               /* Build TCP header and checksum it. */
-               th->source              = inet->sport;
-               th->dest                = inet->dport;
-               th->seq                 = htonl(tcb->seq);
-               th->ack_seq             = htonl(tp->rcv_nxt);
-               *(((__u16 *)th) + 6)    = htons(((tcp_header_size >> 2) << 12) | tcb->flags);
-               if (tcb->flags & TCPCB_FLAG_SYN) {
-                       /* RFC1323: The window in SYN & SYN/ACK segments
-                        * is never scaled.
-                        */
-                       th->window      = htons(tp->rcv_wnd);
-               } else {
-                       th->window      = htons(tcp_select_window(sk));
+               if (sysctl_tcp_window_scaling) {
+                       tcp_header_size += TCPOLEN_WSCALE_ALIGNED;
+                       sysctl_flags |= SYSCTL_FLAG_WSCALE;
                }
-               th->check               = 0;
-               th->urg_ptr             = 0;
-
-               if (tp->urg_mode &&
-                   between(tp->snd_up, tcb->seq+1, tcb->seq+0xFFFF)) {
-                       th->urg_ptr             = htons(tp->snd_up-tcb->seq);
-                       th->urg                 = 1;
+               if (sysctl_tcp_sack) {
+                       sysctl_flags |= SYSCTL_FLAG_SACK;
+                       if (!(sysctl_flags & SYSCTL_FLAG_TSTAMPS))
+                               tcp_header_size += TCPOLEN_SACKPERM_ALIGNED;
                }
+       } else if (unlikely(tp->rx_opt.eff_sacks)) {
+               /* A SACK is 2 pad bytes, a 2 byte header, plus
+                * 2 32-bit sequence numbers for each SACK block.
+                */
+               tcp_header_size += (TCPOLEN_SACK_BASE_ALIGNED +
+                                   (tp->rx_opt.eff_sacks *
+                                    TCPOLEN_SACK_PERBLOCK));
+       }
+               
+       if (tcp_packets_in_flight(tp) == 0)
+               tcp_ca_event(sk, CA_EVENT_TX_START);
+
+       th = (struct tcphdr *) skb_push(skb, tcp_header_size);
+       skb->h.th = th;
+       skb_set_owner_w(skb, sk);
+
+       /* Build TCP header and checksum it. */
+       th->source              = inet->sport;
+       th->dest                = inet->dport;
+       th->seq                 = htonl(tcb->seq);
+       th->ack_seq             = htonl(tp->rcv_nxt);
+       *(((__u16 *)th) + 6)    = htons(((tcp_header_size >> 2) << 12) |
+                                       tcb->flags);
+
+       if (unlikely(tcb->flags & TCPCB_FLAG_SYN)) {
+               /* RFC1323: The window in SYN & SYN/ACK segments
+                * is never scaled.
+                */
+               th->window      = htons(tp->rcv_wnd);
+       } else {
+               th->window      = htons(tcp_select_window(sk));
+       }
+       th->check               = 0;
+       th->urg_ptr             = 0;
 
-               if (tcb->flags & TCPCB_FLAG_SYN) {
-                       tcp_syn_build_options((__u32 *)(th + 1),
-                                             tcp_advertise_mss(sk),
-                                             (sysctl_flags & SYSCTL_FLAG_TSTAMPS),
-                                             (sysctl_flags & SYSCTL_FLAG_SACK),
-                                             (sysctl_flags & SYSCTL_FLAG_WSCALE),
-                                             tp->rx_opt.rcv_wscale,
-                                             tcb->when,
-                                             tp->rx_opt.ts_recent);
-               } else {
-                       tcp_build_and_update_options((__u32 *)(th + 1),
-                                                    tp, tcb->when);
+       if (unlikely(tp->urg_mode &&
+                    between(tp->snd_up, tcb->seq+1, tcb->seq+0xFFFF))) {
+               th->urg_ptr             = htons(tp->snd_up-tcb->seq);
+               th->urg                 = 1;
+       }
 
-                       TCP_ECN_send(sk, tp, skb, tcp_header_size);
-               }
-               tp->af_specific->send_check(sk, th, skb->len, skb);
+       if (unlikely(tcb->flags & TCPCB_FLAG_SYN)) {
+               tcp_syn_build_options((__u32 *)(th + 1),
+                                     tcp_advertise_mss(sk),
+                                     (sysctl_flags & SYSCTL_FLAG_TSTAMPS),
+                                     (sysctl_flags & SYSCTL_FLAG_SACK),
+                                     (sysctl_flags & SYSCTL_FLAG_WSCALE),
+                                     tp->rx_opt.rcv_wscale,
+                                     tcb->when,
+                                     tp->rx_opt.ts_recent);
+       } else {
+               tcp_build_and_update_options((__u32 *)(th + 1),
+                                            tp, tcb->when);
+               TCP_ECN_send(sk, tp, skb, tcp_header_size);
+       }
 
-               if (tcb->flags & TCPCB_FLAG_ACK)
-                       tcp_event_ack_sent(sk, tcp_skb_pcount(skb));
+       tp->af_specific->send_check(sk, th, skb->len, skb);
 
-               if (skb->len != tcp_header_size)
-                       tcp_event_data_sent(tp, skb, sk);
+       if (likely(tcb->flags & TCPCB_FLAG_ACK))
+               tcp_event_ack_sent(sk, tcp_skb_pcount(skb));
 
-               TCP_INC_STATS(TCP_MIB_OUTSEGS);
+       if (skb->len != tcp_header_size)
+               tcp_event_data_sent(tp, skb, sk);
 
-               err = tp->af_specific->queue_xmit(skb, 0);
-               if (err <= 0)
-                       return err;
+       TCP_INC_STATS(TCP_MIB_OUTSEGS);
 
-               tcp_enter_cwr(sk);
+       err = tp->af_specific->queue_xmit(skb, 0);
+       if (unlikely(err <= 0))
+               return err;
+
+       tcp_enter_cwr(sk);
+
+       /* NET_XMIT_CN is special. It does not guarantee,
+        * that this packet is lost. It tells that device
+        * is about to start to drop packets or already
+        * drops some packets of the same priority and
+        * invokes us to send less aggressively.
+        */
+       return err == NET_XMIT_CN ? 0 : err;
 
-               /* NET_XMIT_CN is special. It does not guarantee,
-                * that this packet is lost. It tells that device
-                * is about to start to drop packets or already
-                * drops some packets of the same priority and
-                * invokes us to send less aggressively.
-                */
-               return err == NET_XMIT_CN ? 0 : err;
-       }
-       return -ENOBUFS;
 #undef SYSCTL_FLAG_TSTAMPS
 #undef SYSCTL_FLAG_WSCALE
 #undef SYSCTL_FLAG_SACK
@@ -1036,7 +1053,7 @@ static int tcp_write_xmit(struct sock *sk, unsigned int mss_now, int nonagle)
 
                TCP_SKB_CB(skb)->when = tcp_time_stamp;
 
-               if (unlikely(tcp_transmit_skb(sk, skb_clone(skb, GFP_ATOMIC))))
+               if (unlikely(tcp_transmit_skb(sk, skb, 1, GFP_ATOMIC)))
                        break;
 
                /* Advance the send_head.  This one is sent out.
@@ -1109,7 +1126,7 @@ void tcp_push_one(struct sock *sk, unsigned int mss_now)
                /* Send it out now. */
                TCP_SKB_CB(skb)->when = tcp_time_stamp;
 
-               if (likely(!tcp_transmit_skb(sk, skb_clone(skb, sk->sk_allocation)))) {
+               if (likely(!tcp_transmit_skb(sk, skb, 1, sk->sk_allocation))) {
                        update_send_head(sk, tp, skb);
                        tcp_cwnd_validate(sk, tp);
                        return;
@@ -1429,9 +1446,7 @@ int tcp_retransmit_skb(struct sock *sk, struct sk_buff *skb)
         */
        TCP_SKB_CB(skb)->when = tcp_time_stamp;
 
-       err = tcp_transmit_skb(sk, (skb_cloned(skb) ?
-                                   pskb_copy(skb, GFP_ATOMIC):
-                                   skb_clone(skb, GFP_ATOMIC)));
+       err = tcp_transmit_skb(sk, skb, 1, GFP_ATOMIC);
 
        if (err == 0) {
                /* Update global TCP statistics. */
@@ -1665,7 +1680,7 @@ void tcp_send_active_reset(struct sock *sk, gfp_t priority)
        TCP_SKB_CB(skb)->seq = tcp_acceptable_seq(sk, tp);
        TCP_SKB_CB(skb)->end_seq = TCP_SKB_CB(skb)->seq;
        TCP_SKB_CB(skb)->when = tcp_time_stamp;
-       if (tcp_transmit_skb(sk, skb))
+       if (tcp_transmit_skb(sk, skb, 0, priority))
                NET_INC_STATS(LINUX_MIB_TCPABORTFAILED);
 }
 
@@ -1700,7 +1715,7 @@ int tcp_send_synack(struct sock *sk)
                TCP_ECN_send_synack(tcp_sk(sk), skb);
        }
        TCP_SKB_CB(skb)->when = tcp_time_stamp;
-       return tcp_transmit_skb(sk, skb_clone(skb, GFP_ATOMIC));
+       return tcp_transmit_skb(sk, skb, 1, GFP_ATOMIC);
 }
 
 /*
@@ -1861,7 +1876,7 @@ int tcp_connect(struct sock *sk)
        __skb_queue_tail(&sk->sk_write_queue, buff);
        sk_charge_skb(sk, buff);
        tp->packets_out += tcp_skb_pcount(buff);
-       tcp_transmit_skb(sk, skb_clone(buff, GFP_KERNEL));
+       tcp_transmit_skb(sk, buff, 1, GFP_KERNEL);
        TCP_INC_STATS(TCP_MIB_ACTIVEOPENS);
 
        /* Timer for repeating the SYN until an answer. */
@@ -1957,7 +1972,7 @@ void tcp_send_ack(struct sock *sk)
                /* Send it off, this clears delayed acks for us. */
                TCP_SKB_CB(buff)->seq = TCP_SKB_CB(buff)->end_seq = tcp_acceptable_seq(sk, tp);
                TCP_SKB_CB(buff)->when = tcp_time_stamp;
-               tcp_transmit_skb(sk, buff);
+               tcp_transmit_skb(sk, buff, 0, GFP_ATOMIC);
        }
 }
 
@@ -1997,7 +2012,7 @@ static int tcp_xmit_probe_skb(struct sock *sk, int urgent)
        TCP_SKB_CB(skb)->seq = urgent ? tp->snd_una : tp->snd_una - 1;
        TCP_SKB_CB(skb)->end_seq = TCP_SKB_CB(skb)->seq;
        TCP_SKB_CB(skb)->when = tcp_time_stamp;
-       return tcp_transmit_skb(sk, skb);
+       return tcp_transmit_skb(sk, skb, 0, GFP_ATOMIC);
 }
 
 int tcp_write_wakeup(struct sock *sk)
@@ -2030,7 +2045,7 @@ int tcp_write_wakeup(struct sock *sk)
 
                        TCP_SKB_CB(skb)->flags |= TCPCB_FLAG_PSH;
                        TCP_SKB_CB(skb)->when = tcp_time_stamp;
-                       err = tcp_transmit_skb(sk, skb_clone(skb, GFP_ATOMIC));
+                       err = tcp_transmit_skb(sk, skb, 1, GFP_ATOMIC);
                        if (!err) {
                                update_send_head(sk, tp, skb);
                        }
index b7d296a8ac6d2366e2470607d579ef1bac5cc3ab..13e7e6e8df161ef009250b58c520717dfdf153cc 100644 (file)
@@ -215,14 +215,6 @@ static void tcp_vegas_cong_avoid(struct sock *sk, u32 ack,
                vegas->beg_snd_nxt  = tp->snd_nxt;
                vegas->beg_snd_cwnd = tp->snd_cwnd;
 
-               /* Take into account the current RTT sample too, to
-                * decrease the impact of delayed acks. This double counts
-                * this sample since we count it for the next window as well,
-                * but that's not too awful, since we're taking the min,
-                * rather than averaging.
-                */
-               tcp_vegas_rtt_calc(sk, seq_rtt * 1000);
-
                /* We do the Vegas calculations only if we got enough RTT
                 * samples that we can be reasonably sure that we got
                 * at least one RTT sample that wasn't from a delayed ACK.
@@ -333,11 +325,11 @@ static void tcp_vegas_cong_avoid(struct sock *sk, u32 ack,
                        else if (tp->snd_cwnd > tp->snd_cwnd_clamp)
                                tp->snd_cwnd = tp->snd_cwnd_clamp;
                }
-       }
 
-       /* Wipe the slate clean for the next RTT. */
-       vegas->cntRTT = 0;
-       vegas->minRTT = 0x7fffffff;
+               /* Wipe the slate clean for the next RTT. */
+               vegas->cntRTT = 0;
+               vegas->minRTT = 0x7fffffff;
+       }
 }
 
 /* Extract info for Tcp socket info provided via netlink. */
index 40d9a1935ab5e5911e2922499fd571afe0005741..8bfbe9970793cba6ed493d103d37627517dec2bd 100644 (file)
@@ -248,7 +248,7 @@ static u32 esp6_get_max_size(struct xfrm_state *x, int mtu)
        if (esp->conf.padlen)
                mtu = ALIGN(mtu, esp->conf.padlen);
 
-       return mtu + x->props.header_len + esp->auth.icv_full_len;
+       return mtu + x->props.header_len + esp->auth.icv_trunc_len;
 }
 
 static void esp6_err(struct sk_buff *skb, struct inet6_skb_parm *opt,
index c0f1da5497a9cdb71e5b51d47c84f8ce8af2ddb5..a7e03cfacd06fc35b8b480cd3d04ac1210771fb0 100644 (file)
@@ -68,8 +68,8 @@ static int icmpv6_invert_tuple(struct nf_conntrack_tuple *tuple,
                [ICMPV6_NI_REPLY - 128]         = ICMPV6_NI_REPLY +1
        };
 
-       __u8 type = orig->dst.u.icmp.type - 128;
-       if (type >= sizeof(invmap) || !invmap[type])
+       int type = orig->dst.u.icmp.type - 128;
+       if (type < 0 || type >= sizeof(invmap) || !invmap[type])
                return 0;
 
        tuple->src.u.icmp.id   = orig->src.u.icmp.id;
@@ -129,12 +129,12 @@ static int icmpv6_new(struct nf_conn *conntrack,
                [ICMPV6_ECHO_REQUEST - 128] = 1,
                [ICMPV6_NI_QUERY - 128] = 1
        };
+       int type = conntrack->tuplehash[0].tuple.dst.u.icmp.type - 128;
 
-       if (conntrack->tuplehash[0].tuple.dst.u.icmp.type - 128 >= sizeof(valid_new)
-           || !valid_new[conntrack->tuplehash[0].tuple.dst.u.icmp.type - 128]) {
+       if (type < 0 || type >= sizeof(valid_new) || !valid_new[type]) {
                /* Can't create a new ICMPv6 `conn' with this. */
-               DEBUGP("icmp: can't create new conn with type %u\n",
-                      conntrack->tuplehash[0].tuple.dst.u.icmp.type);
+               DEBUGP("icmpv6: can't create new conn with type %u\n",
+                      type + 128);
                NF_CT_DUMP_TUPLE(&conntrack->tuplehash[0].tuple);
                return 0;
        }
index a84f9221e5f02d4e5d41640f010d0472346dd85f..794c41d19b28bb58896d2a42da5a2ffefc6629cb 100644 (file)
@@ -61,8 +61,8 @@ config NF_CONNTRACK_MARK
          instead of the individual packets.
 
 config NF_CONNTRACK_EVENTS
-       bool "Connection tracking events"
-       depends on NF_CONNTRACK
+       bool "Connection tracking events (EXPERIMENTAL)"
+       depends on EXPERIMENTAL && NF_CONNTRACK
        help
          If this option is enabled, the connection tracking code will
          provide a notifier chain that can be used by other kernel code
index 1da678303d78c5436c4e8bd6e1d76b5d95e43f43..a7c7b490cf226b99a376fdd8a98e25729fc8c9de 100644 (file)
@@ -1383,6 +1383,9 @@ void nf_conntrack_cleanup(void)
                schedule();
                goto i_see_dead_people;
        }
+       /* wait until all references to nf_conntrack_untracked are dropped */
+       while (atomic_read(&nf_conntrack_untracked.ct_general.use) > 1)
+               schedule();
 
        for (i = 0; i < NF_CT_F_NUM; i++) {
                if (nf_ct_cache[i].use == 0)
index a60c59b97631abbb51dda4268dc50fa000445fb4..95fdf04f1d88d239b37bdc26e8aeaeee79b0187f 100644 (file)
@@ -162,7 +162,7 @@ nfnetlink_check_attributes(struct nfnetlink_subsystem *subsys,
                return -EINVAL;
        }
 
-       min_len = NLMSG_ALIGN(sizeof(struct nfgenmsg));
+       min_len = NLMSG_SPACE(sizeof(struct nfgenmsg));
        if (unlikely(nlh->nlmsg_len < min_len))
                return -EINVAL;
 
@@ -236,8 +236,7 @@ static inline int nfnetlink_rcv_msg(struct sk_buff *skb,
        }
 
        /* All the messages must at least contain nfgenmsg */
-       if (nlh->nlmsg_len < 
-                       NLMSG_LENGTH(NLMSG_ALIGN(sizeof(struct nfgenmsg)))) {
+       if (nlh->nlmsg_len < NLMSG_SPACE(sizeof(struct nfgenmsg))) {
                DEBUGP("received message was too short\n");
                return 0;
        }
index 499ae3df4a440b42c0765d1e691bb647c2230050..3e2462760413ee5871cbd3061f57be83df6c1aa1 100644 (file)
@@ -1587,23 +1587,47 @@ static inline struct page *pg_vec_endpage(char *one_pg_vec, unsigned int order)
        return virt_to_page(one_pg_vec + (PAGE_SIZE << order) - 1);
 }
 
-static void free_pg_vec(char **pg_vec, unsigned order, unsigned len)
+static void free_pg_vec(char **pg_vec, unsigned int order, unsigned int len)
 {
        int i;
 
-       for (i=0; i<len; i++) {
-               if (pg_vec[i]) {
-                       struct page *page, *pend;
-
-                       pend = pg_vec_endpage(pg_vec[i], order);
-                       for (page = virt_to_page(pg_vec[i]); page <= pend; page++)
-                               ClearPageReserved(page);
-                       free_pages((unsigned long)pg_vec[i], order);
-               }
+       for (i = 0; i < len; i++) {
+               if (likely(pg_vec[i]))
+                       free_pages((unsigned long) pg_vec[i], order);
        }
        kfree(pg_vec);
 }
 
+static inline char *alloc_one_pg_vec_page(unsigned long order)
+{
+       return (char *) __get_free_pages(GFP_KERNEL | __GFP_COMP | __GFP_ZERO,
+                                        order);
+}
+
+static char **alloc_pg_vec(struct tpacket_req *req, int order)
+{
+       unsigned int block_nr = req->tp_block_nr;
+       char **pg_vec;
+       int i;
+
+       pg_vec = kzalloc(block_nr * sizeof(char *), GFP_KERNEL);
+       if (unlikely(!pg_vec))
+               goto out;
+
+       for (i = 0; i < block_nr; i++) {
+               pg_vec[i] = alloc_one_pg_vec_page(order);
+               if (unlikely(!pg_vec[i]))
+                       goto out_free_pgvec;
+       }
+
+out:
+       return pg_vec;
+
+out_free_pgvec:
+       free_pg_vec(pg_vec, order, block_nr);
+       pg_vec = NULL;
+       goto out;
+}
 
 static int packet_set_ring(struct sock *sk, struct tpacket_req *req, int closing)
 {
@@ -1617,64 +1641,46 @@ static int packet_set_ring(struct sock *sk, struct tpacket_req *req, int closing
 
                /* Sanity tests and some calculations */
 
-               if (po->pg_vec)
+               if (unlikely(po->pg_vec))
                        return -EBUSY;
 
-               if ((int)req->tp_block_size <= 0)
+               if (unlikely((int)req->tp_block_size <= 0))
                        return -EINVAL;
-               if (req->tp_block_size&(PAGE_SIZE-1))
+               if (unlikely(req->tp_block_size & (PAGE_SIZE - 1)))
                        return -EINVAL;
-               if (req->tp_frame_size < TPACKET_HDRLEN)
+               if (unlikely(req->tp_frame_size < TPACKET_HDRLEN))
                        return -EINVAL;
-               if (req->tp_frame_size&(TPACKET_ALIGNMENT-1))
+               if (unlikely(req->tp_frame_size & (TPACKET_ALIGNMENT - 1)))
                        return -EINVAL;
 
                po->frames_per_block = req->tp_block_size/req->tp_frame_size;
-               if (po->frames_per_block <= 0)
+               if (unlikely(po->frames_per_block <= 0))
                        return -EINVAL;
-               if (po->frames_per_block*req->tp_block_nr != req->tp_frame_nr)
+               if (unlikely((po->frames_per_block * req->tp_block_nr) !=
+                            req->tp_frame_nr))
                        return -EINVAL;
-               /* OK! */
-
-               /* Allocate page vector */
-               while ((PAGE_SIZE<<order) < req->tp_block_size)
-                       order++;
 
                err = -ENOMEM;
-
-               pg_vec = kmalloc(req->tp_block_nr*sizeof(char *), GFP_KERNEL);
-               if (pg_vec == NULL)
+               order = get_order(req->tp_block_size);
+               pg_vec = alloc_pg_vec(req, order);
+               if (unlikely(!pg_vec))
                        goto out;
-               memset(pg_vec, 0, req->tp_block_nr*sizeof(char **));
-
-               for (i=0; i<req->tp_block_nr; i++) {
-                       struct page *page, *pend;
-                       pg_vec[i] = (char *)__get_free_pages(GFP_KERNEL, order);
-                       if (!pg_vec[i])
-                               goto out_free_pgvec;
-
-                       pend = pg_vec_endpage(pg_vec[i], order);
-                       for (page = virt_to_page(pg_vec[i]); page <= pend; page++)
-                               SetPageReserved(page);
-               }
-               /* Page vector is allocated */
 
                l = 0;
-               for (i=0; i<req->tp_block_nr; i++) {
+               for (i = 0; i < req->tp_block_nr; i++) {
                        char *ptr = pg_vec[i];
                        struct tpacket_hdr *header;
                        int k;
 
-                       for (k=0; k<po->frames_per_block; k++) {
-                               
-                               header = (struct tpacket_hdr*)ptr;
+                       for (k = 0; k < po->frames_per_block; k++) {
+                               header = (struct tpacket_hdr *) ptr;
                                header->tp_status = TP_STATUS_KERNEL;
                                ptr += req->tp_frame_size;
                        }
                }
                /* Done */
        } else {
-               if (req->tp_frame_nr)
+               if (unlikely(req->tp_frame_nr))
                        return -EINVAL;
        }
 
@@ -1701,7 +1707,7 @@ static int packet_set_ring(struct sock *sk, struct tpacket_req *req, int closing
 
                spin_lock_bh(&sk->sk_receive_queue.lock);
                pg_vec = XC(po->pg_vec, pg_vec);
-               po->frame_max = req->tp_frame_nr-1;
+               po->frame_max = (req->tp_frame_nr - 1);
                po->head = 0;
                po->frame_size = req->tp_frame_size;
                spin_unlock_bh(&sk->sk_receive_queue.lock);
@@ -1728,7 +1734,6 @@ static int packet_set_ring(struct sock *sk, struct tpacket_req *req, int closing
 
        release_sock(sk);
 
-out_free_pgvec:
        if (pg_vec)
                free_pg_vec(pg_vec, order, req->tp_block_nr);
 out:
@@ -1755,17 +1760,19 @@ static int packet_mmap(struct file *file, struct socket *sock, struct vm_area_st
        if (size != po->pg_vec_len*po->pg_vec_pages*PAGE_SIZE)
                goto out;
 
-       atomic_inc(&po->mapped);
        start = vma->vm_start;
-       err = -EAGAIN;
-       for (i=0; i<po->pg_vec_len; i++) {
-               if (remap_pfn_range(vma, start,
-                                    __pa(po->pg_vec[i]) >> PAGE_SHIFT,
-                                    po->pg_vec_pages*PAGE_SIZE,
-                                    vma->vm_page_prot))
-                       goto out;
-               start += po->pg_vec_pages*PAGE_SIZE;
+       for (i = 0; i < po->pg_vec_len; i++) {
+               struct page *page = virt_to_page(po->pg_vec[i]);
+               int pg_num;
+
+               for (pg_num = 0; pg_num < po->pg_vec_pages; pg_num++, page++) {
+                       err = vm_insert_page(vma, start, page);
+                       if (unlikely(err))
+                               goto out;
+                       start += PAGE_SIZE;
+               }
        }
+       atomic_inc(&po->mapped);
        vma->vm_ops = &packet_mmap_ops;
        err = 0;
 
This page took 0.6004 seconds and 5 git commands to generate.