This commit was manufactured by cvs2svn to create tag fedora-2_6_7-1_492
authorPlanet-Lab Support <support@planet-lab.org>
Wed, 15 Sep 2004 17:11:55 +0000 (17:11 +0000)
committerPlanet-Lab Support <support@planet-lab.org>
Wed, 15 Sep 2004 17:11:55 +0000 (17:11 +0000)
'fedora-2_6_7-1_492'.

405 files changed:
Documentation/as-iosched.txt [deleted file]
Documentation/filesystems/relayfs.txt [deleted file]
Documentation/i2c/i2c-pport [deleted file]
Documentation/i2c/i2c-velleman [deleted file]
Documentation/powerpc/hvcs.txt [deleted file]
Documentation/powerpc/mpc52xx.txt [deleted file]
arch/arm/boot/compressed/head-ftvpci.S [deleted file]
arch/arm/common/platform.c [deleted file]
arch/arm/common/plx90x0.c [deleted file]
arch/arm/configs/adi_evb_defconfig [deleted file]
arch/arm/kernel/time-acorn.c [deleted file]
arch/arm/mach-adifcc/Makefile [deleted file]
arch/arm/mach-adifcc/arch.c [deleted file]
arch/arm/mach-adifcc/irq.c [deleted file]
arch/arm/mach-adifcc/mm.c [deleted file]
arch/arm/mach-ftvpci/Makefile [deleted file]
arch/arm/mach-ftvpci/core.c [deleted file]
arch/arm/mach-ftvpci/leds.c [deleted file]
arch/arm/mach-ftvpci/pci.c [deleted file]
arch/arm/mach-s3c2410/gpio.c [deleted file]
arch/arm/mach-tbox/Makefile [deleted file]
arch/arm/mach-tbox/core.c [deleted file]
arch/cris/kernel/hexify.c [deleted file]
arch/cris/kernel/ksyms.c [deleted file]
arch/i386/boot98/Makefile [deleted file]
arch/i386/boot98/bootsect.S [deleted file]
arch/i386/boot98/install.sh [deleted file]
arch/i386/boot98/mtools.conf.in [deleted file]
arch/i386/boot98/setup.S [deleted file]
arch/i386/boot98/video.S [deleted file]
arch/i386/crypto/Makefile [deleted file]
arch/i386/crypto/aes-i586-asm.S [deleted file]
arch/i386/crypto/aes.c [deleted file]
arch/i386/kernel/std_resources.c [deleted file]
arch/i386/mach-pc9800/Makefile [deleted file]
arch/i386/mach-pc9800/setup.c [deleted file]
arch/i386/mach-pc9800/std_resources.c [deleted file]
arch/i386/mach-pc9800/topology.c [deleted file]
arch/i386/mm/mmap.c [deleted file]
arch/mips/configs/eagle_defconfig [deleted file]
arch/mips/mm-32/Makefile [deleted file]
arch/mips/mm-32/tlbex-r4k.S [deleted file]
arch/mips/mm-64/Makefile [deleted file]
arch/mips/mm-64/tlb-dbg-r4k.c [deleted file]
arch/mips/mm-64/tlb-glue-r4k.S [deleted file]
arch/mips/mm-64/tlb-glue-sb1.S [deleted file]
arch/mips/mm-64/tlbex-r4k.S [deleted file]
arch/mips/mm/tlbex-r3k.S [deleted file]
arch/mips/momentum/ocelot_c/pci-irq.c [deleted file]
arch/mips/momentum/ocelot_g/gt64240.h [deleted file]
arch/mips/momentum/ocelot_g/gt64240_dep.h [deleted file]
arch/mips/momentum/ocelot_g/pci-irq.c [deleted file]
arch/mips/pci/fixup-eagle.c [deleted file]
arch/mips/pci/fixup-mv64340.c [deleted file]
arch/mips/pci/fixup-tb0229.c [deleted file]
arch/mips/pci/fixup-victor-mpc30x.c [deleted file]
arch/mips/pci/ops-mv64340.c [deleted file]
arch/mips/pci/ops-vrc4173.c [deleted file]
arch/mips/vr41xx/nec-eagle/Makefile [deleted file]
arch/mips/vr41xx/nec-eagle/irq.c [deleted file]
arch/mips/vr41xx/nec-eagle/setup.c [deleted file]
arch/mips/vr41xx/tanbac-tb0229/reboot.c [deleted file]
arch/parisc/configs/n4000_defconfig [deleted file]
arch/parisc/lib/debuglocks.c [deleted file]
arch/ppc/8260_io/commproc.c [deleted file]
arch/ppc/8260_io/uart.c [deleted file]
arch/ppc/boot/simple/misc-mv64x60.S [deleted file]
arch/ppc/boot/simple/mpc52xx_tty.c [deleted file]
arch/ppc/boot/simple/mv64x60_stub.c [deleted file]
arch/ppc/boot/simple/mv64x60_tty.c [deleted file]
arch/ppc/configs/lite5200_defconfig [deleted file]
arch/ppc/configs/rpx8260_defconfig [deleted file]
arch/ppc/platforms/85xx/mpc8555.c [deleted file]
arch/ppc/platforms/85xx/mpc8555_cds.h [deleted file]
arch/ppc/platforms/85xx/mpc8560_ads.c [deleted file]
arch/ppc/platforms/85xx/mpc8560_ads.h [deleted file]
arch/ppc/platforms/85xx/mpc85xx_cds_common.c [deleted file]
arch/ppc/platforms/85xx/mpc85xx_cds_common.h [deleted file]
arch/ppc/platforms/dmv182.c [deleted file]
arch/ppc/platforms/dmv182.h [deleted file]
arch/ppc/platforms/dmv182_serial.h [deleted file]
arch/ppc/platforms/ev64260.c [deleted file]
arch/ppc/platforms/lite5200.c [deleted file]
arch/ppc/platforms/lite5200.h [deleted file]
arch/ppc/platforms/mpc5200.c [deleted file]
arch/ppc/platforms/rpx8260.c [deleted file]
arch/ppc/platforms/rpx8260.h [deleted file]
arch/ppc/syslib/mpc52xx_pic.c [deleted file]
arch/ppc/syslib/mpc52xx_setup.c [deleted file]
arch/ppc/syslib/mv64360_pic.c [deleted file]
arch/ppc/syslib/mv64x60.c [deleted file]
arch/ppc/syslib/mv64x60_ocp.c [deleted file]
arch/ppc/syslib/ppc4xx_sgdma.c [deleted file]
arch/ppc/syslib/ppc8260_pic.c [deleted file]
arch/ppc/syslib/ppc8260_pic.h [deleted file]
arch/ppc64/kernel/hvcserver.c [deleted file]
arch/ppc64/mm/slb.c [deleted file]
arch/ppc64/mm/slb_low.S [deleted file]
arch/s390/lib/memset.S [deleted file]
arch/s390/lib/memset64.S [deleted file]
arch/s390/lib/strcmp.S [deleted file]
arch/s390/lib/strcmp64.S [deleted file]
arch/s390/lib/strcpy.S [deleted file]
arch/s390/lib/strcpy64.S [deleted file]
arch/s390/lib/strncpy.S [deleted file]
arch/s390/lib/strncpy64.S [deleted file]
arch/s390/mm/mmap.c [deleted file]
arch/sh/boards/systemh/Makefile [deleted file]
arch/sh/boards/systemh/io.c [deleted file]
arch/sh/boards/systemh/irq.c [deleted file]
arch/sh/boards/systemh/setup.c [deleted file]
arch/sparc64/lib/clear_page.S [deleted file]
arch/sparc64/lib/copy_page.S [deleted file]
arch/sparc64/mm/tlb.c [deleted file]
arch/um/drivers/cow.h [deleted file]
arch/um/drivers/cow_user.c [deleted file]
arch/um/include/aio.h [deleted file]
arch/um/include/irq_kern.h [deleted file]
arch/um/include/mem_kern.h [deleted file]
arch/um/include/skas_ptregs.h [deleted file]
arch/um/kernel/physmem.c [deleted file]
arch/um/kernel/skas/uaccess.c [deleted file]
arch/um/kernel/tt/uaccess.c [deleted file]
arch/um/os-Linux/aio.c [deleted file]
arch/um/os-Linux/user_syms.c [deleted file]
arch/x86_64/mm/mmap.c [deleted file]
configs/kernel-2.6.6-i586-smp.config [deleted file]
configs/kernel-2.6.6-i586.config [deleted file]
configs/kernel-2.6.6-i686-smp.config [deleted file]
configs/kernel-2.6.6-i686.config [deleted file]
crypto/khazad.c [deleted file]
drivers/block/carmel.c [deleted file]
drivers/block/floppy98.c [deleted file]
drivers/char/h8.c [deleted file]
drivers/char/h8.h [deleted file]
drivers/char/hvcs.c [deleted file]
drivers/char/lp_old98.c [deleted file]
drivers/char/upd4990a.c [deleted file]
drivers/char/watchdog/ixp2000_wdt.c [deleted file]
drivers/ide/ide-tcq.c [deleted file]
drivers/ide/legacy/hd98.c [deleted file]
drivers/ide/legacy/pc9800.c [deleted file]
drivers/ide/pci/alim15x3.h [deleted file]
drivers/ide/pci/amd74xx.h [deleted file]
drivers/ide/pci/cs5520.h [deleted file]
drivers/ide/pci/cs5530.h [deleted file]
drivers/ide/pci/ns87415.h [deleted file]
drivers/ide/pci/rz1000.h [deleted file]
drivers/ide/pci/sc1200.h [deleted file]
drivers/ide/pci/siimage.h [deleted file]
drivers/ide/pci/sis5513.h [deleted file]
drivers/ide/pci/sl82c105.h [deleted file]
drivers/ide/pci/slc90e66.h [deleted file]
drivers/ide/pci/triflex.h [deleted file]
drivers/ide/pci/trm290.h [deleted file]
drivers/ide/pci/via82cxxx.h [deleted file]
drivers/input/keyboard/98kbd.c [deleted file]
drivers/input/misc/98spkr.c [deleted file]
drivers/input/mouse/98busmouse.c [deleted file]
drivers/input/serio/98kbd-io.c [deleted file]
drivers/mtd/chips/cfi_util.c [deleted file]
drivers/mtd/devices/phram.c [deleted file]
drivers/mtd/maps/db1550-flash.c [deleted file]
drivers/mtd/maps/db1x00-flash.c [deleted file]
drivers/mtd/maps/dmv182.c [deleted file]
drivers/mtd/maps/ichxrom.c [deleted file]
drivers/mtd/maps/integrator-flash-v24.c [deleted file]
drivers/mtd/maps/mpc1211.c [deleted file]
drivers/mtd/maps/omap-toto-flash.c [deleted file]
drivers/mtd/maps/pb1550-flash.c [deleted file]
drivers/mtd/maps/sbc8240.c [deleted file]
drivers/mtd/nand/au1550nd.c [deleted file]
drivers/mtd/nand/diskonchip.c [deleted file]
drivers/mtd/nand/nand_base.c [deleted file]
drivers/mtd/nand/nand_bbt.c [deleted file]
drivers/mtd/nand/ppchameleonevb.c [deleted file]
drivers/mtd/nand/toto.c [deleted file]
drivers/mtd/nand/tx4925ndfmc.c [deleted file]
drivers/mtd/nand/tx4938ndfmc.c [deleted file]
drivers/net/arm/smc91x.c [deleted file]
drivers/net/arm/smc91x.h [deleted file]
drivers/net/gianfar.c [deleted file]
drivers/net/gianfar.h [deleted file]
drivers/net/gianfar_ethtool.c [deleted file]
drivers/net/gianfar_phy.c [deleted file]
drivers/net/gianfar_phy.h [deleted file]
drivers/net/ne2k_cbus.c [deleted file]
drivers/net/ne2k_cbus.h [deleted file]
drivers/net/wan/wanxlfw.inc [deleted file]
drivers/s390/cio/requestirq.c [deleted file]
drivers/scsi/pc980155.c [deleted file]
drivers/scsi/pc980155.h [deleted file]
drivers/scsi/qla2xxx/qla_os.h [deleted file]
drivers/scsi/scsi_pc98.c [deleted file]
drivers/serial/8250_hcdp.c [deleted file]
drivers/serial/8250_hcdp.h [deleted file]
drivers/serial/mpc52xx_uart.c [deleted file]
drivers/serial/mpsc/Makefile [deleted file]
drivers/serial/mpsc/mpsc.c [deleted file]
drivers/serial/mpsc/mpsc.h [deleted file]
drivers/serial/mpsc/mpsc_defs.h [deleted file]
drivers/serial/mpsc/mpsc_ppc32.c [deleted file]
drivers/serial/serial98.c [deleted file]
drivers/serial/sn_console.c [deleted file]
drivers/usb/media/w9968cf_externaldef.h [deleted file]
fs/ext3/resize.c [deleted file]
fs/hostfs/Makefile [deleted file]
fs/hostfs/hostfs.h [deleted file]
fs/hostfs/hostfs_kern.c [deleted file]
fs/hostfs/hostfs_user.c [deleted file]
fs/hppfs/Makefile [deleted file]
fs/hppfs/hppfs_kern.c [deleted file]
fs/jffs2/compr.h [deleted file]
fs/jffs2/proc.c [deleted file]
fs/partitions/nec98.c [deleted file]
fs/partitions/nec98.h [deleted file]
include/asm-alpha/cpumask.h [deleted file]
include/asm-alpha/init.h [deleted file]
include/asm-arm/arch-adifcc/adi_evb.h [deleted file]
include/asm-arm/arch-adifcc/dma.h [deleted file]
include/asm-arm/arch-adifcc/hardware.h [deleted file]
include/asm-arm/arch-adifcc/io.h [deleted file]
include/asm-arm/arch-adifcc/irqs.h [deleted file]
include/asm-arm/arch-adifcc/memory.h [deleted file]
include/asm-arm/arch-adifcc/param.h [deleted file]
include/asm-arm/arch-adifcc/serial.h [deleted file]
include/asm-arm/arch-adifcc/system.h [deleted file]
include/asm-arm/arch-adifcc/time.h [deleted file]
include/asm-arm/arch-adifcc/timex.h [deleted file]
include/asm-arm/arch-adifcc/uncompress.h [deleted file]
include/asm-arm/arch-adifcc/vmalloc.h [deleted file]
include/asm-arm/arch-cl7500/time.h [deleted file]
include/asm-arm/arch-ebsa110/time.h [deleted file]
include/asm-arm/arch-ebsa285/time.h [deleted file]
include/asm-arm/arch-epxa10db/time.h [deleted file]
include/asm-arm/arch-iop3xx/time.h [deleted file]
include/asm-arm/arch-ixp4xx/time.h [deleted file]
include/asm-arm/arch-lh7a40x/time.h [deleted file]
include/asm-arm/arch-nexuspci/dma.h [deleted file]
include/asm-arm/arch-nexuspci/hardware.h [deleted file]
include/asm-arm/arch-nexuspci/io.h [deleted file]
include/asm-arm/arch-nexuspci/irqs.h [deleted file]
include/asm-arm/arch-nexuspci/memory.h [deleted file]
include/asm-arm/arch-nexuspci/param.h [deleted file]
include/asm-arm/arch-nexuspci/system.h [deleted file]
include/asm-arm/arch-nexuspci/time.h [deleted file]
include/asm-arm/arch-nexuspci/timex.h [deleted file]
include/asm-arm/arch-nexuspci/uncompress.h [deleted file]
include/asm-arm/arch-nexuspci/vmalloc.h [deleted file]
include/asm-arm/arch-omap/omap-h2.h [deleted file]
include/asm-arm/arch-omap/omap-innovator.h [deleted file]
include/asm-arm/arch-omap/omap-perseus2.h [deleted file]
include/asm-arm/arch-omap/time.h [deleted file]
include/asm-arm/arch-pxa/time.h [deleted file]
include/asm-arm/arch-rpc/time.h [deleted file]
include/asm-arm/arch-s3c2410/time.h [deleted file]
include/asm-arm/arch-sa1100/time.h [deleted file]
include/asm-arm/arch-shark/time.h [deleted file]
include/asm-arm/arch-tbox/dma.h [deleted file]
include/asm-arm/arch-tbox/hardware.h [deleted file]
include/asm-arm/arch-tbox/io.h [deleted file]
include/asm-arm/arch-tbox/irqs.h [deleted file]
include/asm-arm/arch-tbox/memory.h [deleted file]
include/asm-arm/arch-tbox/param.h [deleted file]
include/asm-arm/arch-tbox/serial.h [deleted file]
include/asm-arm/arch-tbox/system.h [deleted file]
include/asm-arm/arch-tbox/time.h [deleted file]
include/asm-arm/arch-tbox/timex.h [deleted file]
include/asm-arm/arch-tbox/uncompress.h [deleted file]
include/asm-arm/arch-tbox/vmalloc.h [deleted file]
include/asm-arm/arch-versatile/time.h [deleted file]
include/asm-arm/cpumask.h [deleted file]
include/asm-arm26/cpumask.h [deleted file]
include/asm-cris/cpumask.h [deleted file]
include/asm-generic/cpumask.h [deleted file]
include/asm-generic/cpumask_arith.h [deleted file]
include/asm-generic/cpumask_array.h [deleted file]
include/asm-generic/cpumask_const_reference.h [deleted file]
include/asm-generic/cpumask_const_value.h [deleted file]
include/asm-generic/cpumask_up.h [deleted file]
include/asm-h8300/cpumask.h [deleted file]
include/asm-h8300/h8300_ne.h [deleted file]
include/asm-h8300/init.h [deleted file]
include/asm-i386/cpumask.h [deleted file]
include/asm-i386/init.h [deleted file]
include/asm-i386/mach-pc9800/apm.h [deleted file]
include/asm-i386/mach-pc9800/bios_ebda.h [deleted file]
include/asm-i386/mach-pc9800/do_timer.h [deleted file]
include/asm-i386/mach-pc9800/io_ports.h [deleted file]
include/asm-i386/mach-pc9800/irq_vectors.h [deleted file]
include/asm-i386/mach-pc9800/mach_reboot.h [deleted file]
include/asm-i386/mach-pc9800/mach_time.h [deleted file]
include/asm-i386/mach-pc9800/mach_timer.h [deleted file]
include/asm-i386/mach-pc9800/mach_traps.h [deleted file]
include/asm-i386/mach-pc9800/mach_wakecpu.h [deleted file]
include/asm-i386/mach-pc9800/pci-functions.h [deleted file]
include/asm-i386/mach-pc9800/setup_arch_post.h [deleted file]
include/asm-i386/mach-pc9800/setup_arch_pre.h [deleted file]
include/asm-i386/mach-pc9800/smpboot_hooks.h [deleted file]
include/asm-i386/pc9800.h [deleted file]
include/asm-i386/pc9800_sca.h [deleted file]
include/asm-i386/std_resources.h [deleted file]
include/asm-i386/upd4990a.h [deleted file]
include/asm-ia64/cpumask.h [deleted file]
include/asm-m68k/cpumask.h [deleted file]
include/asm-m68k/init.h [deleted file]
include/asm-m68knommu/cpumask.h [deleted file]
include/asm-m68knommu/init.h [deleted file]
include/asm-mips/cpumask.h [deleted file]
include/asm-mips/init.h [deleted file]
include/asm-mips/vr41xx/eagle.h [deleted file]
include/asm-mips/vr41xx/tb0229.h [deleted file]
include/asm-parisc/cpumask.h [deleted file]
include/asm-parisc/numnodes.h [deleted file]
include/asm-ppc/cpm_8260.h [deleted file]
include/asm-ppc/cpumask.h [deleted file]
include/asm-ppc/immap_8260.h [deleted file]
include/asm-ppc/mpc52xx.h [deleted file]
include/asm-ppc/mpc52xx_psc.h [deleted file]
include/asm-ppc/mv64x60.h [deleted file]
include/asm-ppc/mv64x60_defs.h [deleted file]
include/asm-ppc/ppc4xx_dma.h [deleted file]
include/asm-ppc64/cpumask.h [deleted file]
include/asm-ppc64/hvcserver.h [deleted file]
include/asm-ppc64/init.h [deleted file]
include/asm-s390/cpumask.h [deleted file]
include/asm-s390/init.h [deleted file]
include/asm-sh/cpumask.h [deleted file]
include/asm-sh/init.h [deleted file]
include/asm-sparc/cpumask.h [deleted file]
include/asm-sparc/init.h [deleted file]
include/asm-sparc64/cpumask.h [deleted file]
include/asm-sparc64/init.h [deleted file]
include/asm-um/cpufeature.h [deleted file]
include/asm-um/cpumask.h [deleted file]
include/asm-um/init.h [deleted file]
include/asm-um/local.h [deleted file]
include/asm-um/module-generic.h [deleted file]
include/asm-um/sections.h [deleted file]
include/asm-v850/cpumask.h [deleted file]
include/asm-x86_64/cpumask.h [deleted file]
include/asm-x86_64/init.h [deleted file]
include/linux/802_11.h [deleted file]
include/linux/acpi_serial.h [deleted file]
include/linux/adb_mouse.h [deleted file]
include/linux/atapi.h [deleted file]
include/linux/fsfilter.h [deleted file]
include/linux/in_systm.h [deleted file]
include/linux/isdn_lzscomp.h [deleted file]
include/linux/mpp.h [deleted file]
include/linux/mtd/physmap.h [deleted file]
include/linux/netbeui.h [deleted file]
include/linux/netfilter_ddp.h [deleted file]
include/linux/netfilter_ipx.h [deleted file]
include/linux/netfilter_x25.h [deleted file]
include/linux/snmp.h [deleted file]
include/linux/upd4990a.h [deleted file]
include/mtd/inftl-user.h [deleted file]
include/mtd/jffs2-user.h [deleted file]
include/mtd/mtd-abi.h [deleted file]
include/mtd/mtd-user.h [deleted file]
include/mtd/nftl-user.h [deleted file]
include/net/tux.h [deleted file]
include/net/tux_u.h [deleted file]
net/ipv4/datagram.c [deleted file]
net/ipv6/xfrm6_output.c [deleted file]
net/irda/crc.c [deleted file]
net/sched/sch_csz.c [deleted file]
net/sched/sch_delay.c [deleted file]
net/tux/Kconfig [deleted file]
net/tux/Makefile [deleted file]
net/tux/abuf.c [deleted file]
net/tux/accept.c [deleted file]
net/tux/cachemiss.c [deleted file]
net/tux/cgi.c [deleted file]
net/tux/directory.c [deleted file]
net/tux/extcgi.c [deleted file]
net/tux/gzip.c [deleted file]
net/tux/input.c [deleted file]
net/tux/logger.c [deleted file]
net/tux/main.c [deleted file]
net/tux/mod.c [deleted file]
net/tux/output.c [deleted file]
net/tux/parser.h [deleted file]
net/tux/postpone.c [deleted file]
net/tux/proc.c [deleted file]
net/tux/proto_ftp.c [deleted file]
net/tux/proto_http.c [deleted file]
net/tux/redirect.c [deleted file]
net/tux/times.c [deleted file]
net/tux/times.h [deleted file]
net/tux/userspace.c [deleted file]
net/xfrm/xfrm_output.c [deleted file]
scripts/mkmakefile [deleted file]
scripts/mkspec [deleted file]
scripts/mod/Makefile [deleted file]
scripts/mod/empty.c [deleted file]
scripts/mod/file2alias.c [deleted file]
scripts/mod/mk_elfconfig.c [deleted file]
scripts/mod/modpost.c [deleted file]
scripts/mod/modpost.h [deleted file]
scripts/mod/sumversion.c [deleted file]
sound/isa/cs423x/pc98.c [deleted file]
sound/isa/cs423x/pc9801_118_magic.h [deleted file]
sound/isa/cs423x/sound_pc9800.h [deleted file]

diff --git a/Documentation/as-iosched.txt b/Documentation/as-iosched.txt
deleted file mode 100644 (file)
index 0dba00d..0000000
+++ /dev/null
@@ -1,165 +0,0 @@
-Anticipatory IO scheduler
--------------------------
-Nick Piggin <piggin@cyberone.com.au>    13 Sep 2003
-
-Attention! Database servers, especially those using "TCQ" disks should
-investigate performance with the 'deadline' IO scheduler. Any system with high
-disk performance requirements should do so, in fact.
-
-If you see unusual performance characteristics of your disk systems, or you
-see big performance regressions versus the deadline scheduler, please email
-me. Database users don't bother unless you're willing to test a lot of patches
-from me ;) its a known issue.
-
-Also, users with hardware RAID controllers, doing striping, may find
-highly variable performance results with using the as-iosched. The
-as-iosched anticipatory implementation is based on the notion that a disk
-device has only one physical seeking head.  A striped RAID controller
-actually has a head for each physical device in the logical RAID device.
-
-However, setting the antic_expire (see tunable parameters below) produces
-very similar behavior to the deadline IO scheduler.
-
-
-Selecting IO schedulers
------------------------
-To choose IO schedulers at boot time, use the argument 'elevator=deadline'.
-'noop' and 'as' (the default) are also available. IO schedulers are assigned
-globally at boot time only presently.
-
-
-Anticipatory IO scheduler Policies
-----------------------------------
-The as-iosched implementation implements several layers of policies
-to determine when an IO request is dispatched to the disk controller.
-Here are the policies outlined, in order of application.
-
-1. one-way Elevator algorithm.
-
-The elevator algorithm is similar to that used in deadline scheduler, with
-the addition that it allows limited backward movement of the elevator
-(i.e. seeks backwards).  A seek backwards can occur when choosing between
-two IO requests where one is behind the elevator's current position, and
-the other is in front of the elevator's position. If the seek distance to
-the request in back of the elevator is less than half the seek distance to
-the request in front of the elevator, then the request in back can be chosen.
-Backward seeks are also limited to a maximum of MAXBACK (1024*1024) sectors.
-This favors forward movement of the elevator, while allowing opportunistic
-"short" backward seeks.
-
-2. FIFO expiration times for reads and for writes.
-
-This is again very similar to the deadline IO scheduler.  The expiration
-times for requests on these lists is tunable using the parameters read_expire
-and write_expire discussed below.  When a read or a write expires in this way,
-the IO scheduler will interrupt its current elevator sweep or read anticipation
-to service the expired request.
-
-3. Read and write request batching
-
-A batch is a collection of read requests or a collection of write
-requests.  The as scheduler alternates dispatching read and write batches
-to the driver.  In the case a read batch, the scheduler submits read
-requests to the driver as long as there are read requests to submit, and
-the read batch time limit has not been exceeded (read_batch_expire).
-The read batch time limit begins counting down only when there are
-competing write requests pending.
-
-In the case of a write batch, the scheduler submits write requests to
-the driver as long as there are write requests available, and the
-write batch time limit has not been exceeded (write_batch_expire).
-However, the length of write batches will be gradually shortened
-when read batches frequently exceed their time limit.
-
-When changing between batch types, the scheduler waits for all requests
-from the previous batch to complete before scheduling requests for the
-next batch.
-
-The read and write fifo expiration times described in policy 2 above
-are checked only when in scheduling IO of a batch for the corresponding
-(read/write) type.  So for example, the read FIFO timeout values are
-tested only during read batches.  Likewise, the write FIFO timeout
-values are tested only during write batches.  For this reason,
-it is generally not recommended for the read batch time
-to be longer than the write expiration time, nor for the write batch
-time to exceed the read expiration time (see tunable parameters below).
-
-When the IO scheduler changes from a read to a write batch,
-it begins the elevator from the request that is on the head of the
-write expiration FIFO.  Likewise, when changing from a write batch to
-a read batch, scheduler begins the elevator from the first entry
-on the read expiration FIFO.
-
-4. Read anticipation.
-
-Read anticipation occurs only when scheduling a read batch.
-This implementation of read anticipation allows only one read request
-to be dispatched to the disk controller at a time.  In
-contrast, many write requests may be dispatched to the disk controller
-at a time during a write batch.  It is this characteristic that can make
-the anticipatory scheduler perform anomalously with controllers supporting
-TCQ, or with hardware striped RAID devices. Setting the antic_expire
-queue paramter (see below) to zero disables this behavior, and the anticipatory
-scheduler behaves essentially like the deadline scheduler.
-
-When read anticipation is enabled (antic_expire is not zero), reads
-are dispatched to the disk controller one at a time.
-At the end of each read request, the IO scheduler examines its next
-candidate read request from its sorted read list.  If that next request
-is from the same process as the request that just completed,
-or if the next request in the queue is "very close" to the
-just completed request, it is dispatched immediately.  Otherwise,
-statistics (average think time, average seek distance) on the process
-that submitted the just completed request are examined.  If it seems
-likely that that process will submit another request soon, and that
-request is likely to be near the just completed request, then the IO
-scheduler will stop dispatching more read requests for up time (antic_expire)
-milliseconds, hoping that process will submit a new request near the one
-that just completed.  If such a request is made, then it is dispatched
-immediately.  If the antic_expire wait time expires, then the IO scheduler
-will dispatch the next read request from the sorted read queue.
-
-To decide whether an anticipatory wait is worthwhile, the scheduler
-maintains statistics for each process that can be used to compute
-mean "think time" (the time between read requests), and mean seek
-distance for that process.  One observation is that these statistics
-are associated with each process, but those statistics are not associated
-with a specific IO device.  So for example, if a process is doing IO
-on several file systems on separate devices, the statistics will be
-a combination of IO behavior from all those devices.
-
-
-Tuning the anticipatory IO scheduler
-------------------------------------
-When using 'as', the anticipatory IO scheduler there are 5 parameters under
-/sys/block/*/iosched/. All are units of milliseconds.
-
-The parameters are:
-* read_expire
-    Controls how long until a read request becomes "expired". It also controls the
-    interval between which expired requests are served, so set to 50, a request
-    might take anywhere < 100ms to be serviced _if_ it is the next on the
-    expired list. Obviously request expiration strategies won't make the disk
-    go faster. The result basically equates to the timeslice a single reader
-    gets in the presence of other IO. 100*((seek time / read_expire) + 1) is
-    very roughly the % streaming read efficiency your disk should get with
-    multiple readers.
-
-* read_batch_expire
-    Controls how much time a batch of reads is given before pending writes are
-    served. A higher value is more efficient. This might be set below read_expire
-    if writes are to be given higher priority than reads, but reads are to be
-    as efficient as possible when there are no writes. Generally though, it
-    should be some multiple of read_expire.
-   
-* write_expire, and
-* write_batch_expire are equivalent to the above, for writes.
-
-* antic_expire
-    Controls the maximum amount of time we can anticipate a good read (one
-    with a short seek distance from the most recently completed request) before
-    giving up. Many other factors may cause anticipation to be stopped early,
-    or some processes will not be "anticipated" at all. Should be a bit higher
-    for big seek time devices though not a linear correspondence - most
-    processes have only a few ms thinktime.
-
diff --git a/Documentation/filesystems/relayfs.txt b/Documentation/filesystems/relayfs.txt
deleted file mode 100644 (file)
index 7397bdb..0000000
+++ /dev/null
@@ -1,812 +0,0 @@
-
-relayfs - a high-speed data relay filesystem
-============================================
-
-relayfs is a filesystem designed to provide an efficient mechanism for
-tools and facilities to relay large amounts of data from kernel space
-to user space.
-
-The main idea behind relayfs is that every data flow is put into a
-separate "channel" and each channel is a file.  In practice, each
-channel is a separate memory buffer allocated from within kernel space
-upon channel instantiation. Software needing to relay data to user
-space would open a channel or a number of channels, depending on its
-needs, and would log data to that channel. All the buffering and
-locking mechanics are taken care of by relayfs.  The actual format and
-protocol used for each channel is up to relayfs' clients.
-
-relayfs makes no provisions for copying the same data to more than a
-single channel. This is for the clients of the relay to take care of,
-and so is any form of data filtering. The purpose is to keep relayfs
-as simple as possible.
-
-
-Usage
-=====
-
-In addition to the relayfs kernel API described below, relayfs
-implements basic file operations.  Here are the file operations that
-are available and some comments regarding their behavior:
-
-open()  enables user to open an _existing_ channel.  A channel can be
-        opened in blocking or non-blocking mode, and can be opened
-        for reading as well as for writing.  Readers will by default
-        be auto-consuming.
-
-mmap()  results in channel's memory buffer being mmapped into the
-        caller's memory space.
-
-read()  since we are dealing with circular buffers, the user is only
-        allowed to read forward.  Some apps may want to loop around
-        read() waiting for incoming data - if there is no data
-        available, read will put the reader on a wait queue until
-        data is available (blocking mode).  Non-blocking reads return
-        -EAGAIN if data is not available.
-
-
-write()         writing from user space operates exactly as relay_write() does
-        (described below).
-
-poll() POLLIN/POLLRDNORM/POLLOUT/POLLWRNORM/POLLERR supported.
-
-close()  decrements the channel's refcount.  When the refcount reaches
-        0 i.e. when no process or kernel client has the file open
-        (see relay_close() below), the channel buffer is freed.
-
-
-In order for a user application to make use of relayfs files, the
-relayfs filesystem must be mounted.  For example,
-
-       mount -t relayfs relayfs /mountpoint
-
-
-The relayfs kernel API
-======================
-
-relayfs channels are implemented as circular buffers subdivided into
-'sub-buffers'.  kernel clients write data into the channel using
-relay_write(), and are notified via a set of callbacks when
-significant events occur within the channel.  'Significant events'
-include:
-
-- a sub-buffer has been filled i.e. the current write won't fit into the
-  current sub-buffer, and a 'buffer-switch' is triggered, after which
-  the data is written into the next buffer (if the next buffer is
-  empty).  The client is notified of this condition via two callbacks,
-  one providing an opportunity to perform start-of-buffer tasks, the
-  other end-of-buffer tasks.
-
-- data is ready for the client to process.  The client can choose to
-  be notified either on a per-sub-buffer basis (bulk delivery) or
-  per-write basis (packet delivery).
-
-- data has been written to the channel from user space.  The client can
-  use this notification to accept and process 'commands' sent to the
-  channel via write(2).
-
-- the channel has been opened/closed/mapped/unmapped from user space.
-  The client can use this notification to trigger actions within the
-  kernel application, such as enabling/disabling logging to the
-  channel.  It can also return result codes from the callback,
-  indicating that the operation should fail e.g. in order to restrict
-  more than one user space open or mmap.
-
-- the channel needs resizing, or needs to update its
-  state based on the results of the resize.  Resizing the channel is
-  up to the kernel client to actually perform.  If the channel is
-  configured for resizing, the client is notified when the unread data
-  in the channel passes a preset threshold, giving it the opportunity
-  to allocate a new channel buffer and replace the old one.
-
-Reader objects
---------------
-
-Channel readers use an opaque rchan_reader object to read from
-channels.  For VFS readers (those using read(2) to read from a
-channel), these objects are automatically created and used internally;
-only kernel clients that need to directly read from channels, or whose
-userspace applications use mmap to access channel data, need to know
-anything about rchan_readers - others may skip this section.
-
-A relay channel can have any number of readers, each represented by an
-rchan_reader instance, which is used to encapsulate reader settings
-and state.  rchan_reader objects should be treated as opaque by kernel
-clients.  To create a reader object for directly accessing a channel
-from kernel space, call the add_rchan_reader() kernel API function:
-
-rchan_reader *add_rchan_reader(rchan_id, auto_consume)
-
-This function returns an rchan_reader instance if successful, which
-should then be passed to relay_read() when the kernel client is
-interested in reading from the channel.
-
-The auto_consume parameter indicates whether a read done by this
-reader will automatically 'consume' that portion of the unread channel
-buffer when relay_read() is called (see below for more details).
-
-To close the reader, call
-
-remove_rchan_reader(reader)
-
-which will remove the reader from the list of current readers.
-
-
-To create a reader object representing a userspace mmap reader in the
-kernel application, call the add_map_reader() kernel API function:
-
-rchan_reader *add_map_reader(rchan_id)
-
-This function returns an rchan_reader instance if successful, whose
-main purpose is as an argument to be passed into
-relay_buffers_consumed() when the kernel client becomes aware that
-data has been read by a user application using mmap to read from the
-channel buffer.  There is no auto_consume option in this case, since
-only the kernel client/user application knows when data has been read.
-
-To close the map reader, call
-
-remove_map_reader(reader)
-
-which will remove the reader from the list of current readers.
-
-Consumed count
---------------
-
-A relayfs channel is a circular buffer, which means that if there is
-no reader reading from it or a reader reading too slowly, at some
-point the channel writer will 'lap' the reader and data will be lost.
-In normal use, readers will always be able to keep up with writers and
-the buffer is thus never in danger of becoming full.  In many
-applications, it's sufficient to ensure that this is practically
-speaking always the case, by making the buffers large enough.  These
-types of applications can basically open the channel as
-RELAY_MODE_CONTINOUS (the default anyway) and not worry about the
-meaning of 'consume' and skip the rest of this section.
-
-If it's important for the application that a kernel client never allow
-writers to overwrite unread data, the channel should be opened using
-RELAY_MODE_NO_OVERWRITE and must be kept apprised of the count of
-bytes actually read by the (typically) user-space channel readers.
-This count is referred to as the 'consumed count'.  read(2) channel
-readers automatically update the channel's 'consumed count' as they
-read.  If the usage mode is to have only read(2) readers, which is
-typically the case, the kernel client doesn't need to worry about any
-of the relayfs functions having to do with 'bytes consumed' and can
-skip the rest of this section.  (Note that it is possible to have
-multiple read(2) or auto-consuming readers, but like having multiple
-readers on a pipe, these readers will race with each other i.e. it's
-supported, but doesn't make much sense).
-
-If the kernel client cannot rely on an auto-consuming reader to keep
-the 'consumed count' up-to-date, then it must do so manually, by
-making the appropriate calls to relay_buffers_consumed() or
-relay_bytes_consumed().  In most cases, this should only be necessary
-for bulk mmap clients - almost all packet clients should be covered by
-having auto-consuming read(2) readers.  For mmapped bulk clients, for
-instance, there are no auto-consuming VFS readers, so the kernel
-client needs to make the call to relay_buffers_consumed() after
-sub-buffers are read.
-
-Kernel API
-----------
-
-Here's a summary of the API relayfs provides to in-kernel clients:
-
-int    relay_open(channel_path, bufsize, nbufs, channel_flags,
-                 channel_callbacks, start_reserve, end_reserve,
-                 rchan_start_reserve, resize_min, resize_max, mode,
-                 init_buf, init_buf_size)
-int    relay_write(channel_id, *data_ptr, count, time_delta_offset, **wrote)
-rchan_reader *add_rchan_reader(channel_id, auto_consume)
-int    remove_rchan_reader(rchan_reader *reader)
-rchan_reader *add_map_reader(channel_id)
-int    remove_map_reader(rchan_reader *reader)
-int    relay_read(reader, buf, count, wait, *actual_read_offset)
-void   relay_buffers_consumed(reader, buffers_consumed)
-void   relay_bytes_consumed(reader, bytes_consumed, read_offset)
-int    relay_bytes_avail(reader)
-int    rchan_full(reader)
-int    rchan_empty(reader)
-int    relay_info(channel_id, *channel_info)
-int    relay_close(channel_id)
-int    relay_realloc_buffer(channel_id, nbufs, async)
-int    relay_replace_buffer(channel_id)
-int    relay_reset(int rchan_id)
-
-----------
-int relay_open(channel_path, bufsize, nbufs, 
-        channel_flags, channel_callbacks, start_reserve,
-        end_reserve, rchan_start_reserve, resize_min, resize_max, mode)
-
-relay_open() is used to create a new entry in relayfs.  This new entry
-is created according to channel_path.  channel_path contains the
-absolute path to the channel file on relayfs.  If, for example, the
-caller sets channel_path to "/xlog/9", a "xlog/9" entry will appear
-within relayfs automatically and the "xlog" directory will be created
-in the filesystem's root.  relayfs does not implement any policy on
-its content, except to disallow the opening of two channels using the
-same file. There are, nevertheless a set of guidelines for using
-relayfs. Basically, each facility using relayfs should use a top-level
-directory identifying it. The entry created above, for example,
-presumably belongs to the "xlog" software.
-
-The remaining parameters for relay_open() are as follows:
-
-- channel_flags - an ORed combination of attribute values controlling
-  common channel characteristics:
-
-       - logging scheme - relayfs use 2 mutually exclusive schemes
-         for logging data to a channel.  The 'lockless scheme'
-         reserves and writes data to a channel without the need of
-         any type of locking on the channel.  This is the preferred
-         scheme, but may not be available on a given architecture (it
-         relies on the presence of a cmpxchg instruction).  It's
-         specified by the RELAY_SCHEME_LOCKLESS flag.  The 'locking
-         scheme' either obtains a lock on the channel for writing or
-         disables interrupts, depending on whether the channel was
-         opened for SMP or global usage (see below).  It's specified
-         by the RELAY_SCHEME_LOCKING flag.  While a client may want
-         to explicitly specify a particular scheme to use, it's more
-         convenient to specify RELAY_SCHEME_ANY for this flag, which
-         will allow relayfs to choose the best available scheme i.e.
-         lockless if supported.
-
-       - overwrite mode (default is RELAY_MODE_CONTINUOUS) -
-        If RELAY_MODE_CONTINUOUS is specified, writes to the channel
-        will succeed regardless of whether there are up-to-date
-        consumers or not.  If RELAY_MODE_NO_OVERWRITE is specified,
-        the channel becomes 'full' when the total amount of buffer
-        space unconsumed by readers equals or exceeds the total
-        buffer size.  With the buffer in this state, writes to the
-        buffer will fail - clients need to check the return code from
-        relay_write() to determine if this is the case and act
-        accordingly - 0 or a negative value indicate the write failed.
-
-       - SMP usage - this applies only when the locking scheme is in
-        use.  If RELAY_USAGE_SMP is specified, it's assumed that the
-        channel will be used in a per-CPU fashion and consequently,
-        the only locking that will be done for writes is to disable
-        local irqs.  If RELAY_USAGE_GLOBAL is specified, it's assumed
-        that writes to the buffer can occur within any CPU context,
-        and spinlock_irq_save will be used to lock the buffer.
-
-       - delivery mode - if RELAY_DELIVERY_BULK is specified, the
-        client will be notified via its deliver() callback whenever a
-        sub-buffer has been filled.  Alternatively,
-        RELAY_DELIVERY_PACKET will cause delivery to occur after the
-        completion of each write.  See the description of the channel
-        callbacks below for more details.
-
-       - timestamping - if RELAY_TIMESTAMP_TSC is specified and the
-        architecture supports it, efficient TSC 'timestamps' can be
-        associated with each write, otherwise more expensive
-        gettimeofday() timestamping is used.  At the beginning of
-        each sub-buffer, a gettimeofday() timestamp and the current
-        TSC, if supported, are read, and are passed on to the client
-        via the buffer_start() callback.  This allows correlation of
-        the current time with the current TSC for subsequent writes.
-        Each subsequent write is associated with a 'time delta',
-        which is either the current TSC, if the channel is using
-        TSCs, or the difference between the buffer_start gettimeofday
-        timestamp and the gettimeofday time read for the current
-        write.  Note that relayfs never writes either a timestamp or
-        time delta into the buffer unless explicitly asked to (see
-        the description of relay_write() for details).
-- bufsize - the size of the 'sub-buffers' making up the circular channel
-  buffer.  For the lockless scheme, this must be a power of 2.
-
-- nbufs - the number of 'sub-buffers' making up the circular
-  channel buffer.  This must be a power of 2.
-
-  The total size of the channel buffer is bufsize * nbufs rounded up 
-  to the next kernel page size.  If the lockless scheme is used, both
-  bufsize and nbufs must be a power of 2.  If the locking scheme is
-  used, the bufsize can be anything and nbufs must be a power of 2.  If
-  RELAY_SCHEME_ANY is used, the bufsize and nbufs should be a power of 2.
-
-  NOTE: if nbufs is 1, relayfs will bypass the normal size
-  checks and will allocate an rvmalloced buffer of size bufsize.
-  This buffer will be freed when relay_close() is called, if the channel
-  isn't still being referenced.
-
-- callbacks - a table of callback functions called when events occur
-  within the data relay that clients need to know about:
-          
-         - int buffer_start(channel_id, current_write_pos, buffer_id,
-           start_time, start_tsc, using_tsc) -
-
-           called at the beginning of a new sub-buffer, the
-           buffer_start() callback gives the client an opportunity to
-           write data into space reserved at the beginning of a
-           sub-buffer.  The client should only write into the buffer
-           if it specified a value for start_reserve and/or
-           channel_start_reserve (see below) when the channel was
-           opened.  In the latter case, the client can determine
-           whether to write its one-time rchan_start_reserve data by
-           examining the value of buffer_id, which will be 0 for the
-           first sub-buffer.  The address that the client can write
-           to is contained in current_write_pos (the client by
-           definition knows how much it can write i.e. the value it
-           passed to relay_open() for start_reserve/
-           channel_start_reserve).  start_time contains the
-           gettimeofday() value for the start of the buffer and start
-           TSC contains the TSC read at the same time.  The using_tsc
-           param indicates whether or not start_tsc is valid (it
-           wouldn't be if TSC timestamping isn't being used).
-
-           The client should return the number of bytes it wrote to
-           the channel, 0 if none.
-
-         - int buffer_end(channel_id, current_write_pos, end_of_buffer,
-           end_time, end_tsc, using_tsc)
-
-           called at the end of a sub-buffer, the buffer_end()
-           callback gives the client an opportunity to perform
-           end-of-buffer processing.  Note that the current_write_pos
-           is the position where the next write would occur, but
-           since the current write wouldn't fit (which is the trigger
-           for the buffer_end event), the buffer is considered full
-           even though there may be unused space at the end.  The
-           end_of_buffer param pointer value can be used to determine
-           exactly the size of the unused space.  The client should
-           only write into the buffer if it specified a value for
-           end_reserve when the channel was opened.  If the client
-           doesn't write anything i.e. returns 0, the unused space at
-           the end of the sub-buffer is available via relay_info() -
-           this data may be needed by the client later if it needs to
-           process raw sub-buffers (an alternative would be to save
-           the unused bytes count value in end_reserve space at the
-           end of each sub-buffer during buffer_end processing and
-           read it when needed at a later time.  The other
-           alternative would be to use read(2), which makes the
-           unused count invisible to the caller).  end_time contains
-           the gettimeofday() value for the end of the buffer and end
-           TSC contains the TSC read at the same time.  The using_tsc
-           param indicates whether or not end_tsc is valid (it
-           wouldn't be if TSC timestamping isn't being used).
-
-           The client should return the number of bytes it wrote to
-           the channel, 0 if none.
-
-         - void deliver(channel_id, from, len)
-
-           called when data is ready for the client.  This callback
-           is used to notify a client when a sub-buffer is complete
-           (in the case of bulk delivery) or a single write is
-           complete (packet delivery).  A bulk delivery client might
-           wish to then signal a daemon that a sub-buffer is ready.
-           A packet delivery client might wish to process the packet
-           or send it elsewhere.  The from param is a pointer to the
-           delivered data and len specifies how many bytes are ready.
-
-         - void user_deliver(channel_id, from, len)
-
-           called when data has been written to the channel from user
-           space.  This callback is used to notify a client when a
-           successful write from userspace has occurred, independent
-           of whether bulk or packet delivery is in use.  This can be
-           used to allow userspace programs to communicate with the
-           kernel client through the channel via out-of-band write(2)
-           'commands' instead of via ioctls, for instance.  The from
-           param is a pointer to the delivered data and len specifies
-           how many bytes are ready.  Note that this callback occurs
-           after the bytes have been successfully written into the
-           channel, which means that channel readers must be able to
-           deal with the 'command' data which will appear in the
-           channel data stream just as any other userspace or
-           non-userspace write would.
-
-         - int needs_resize(channel_id, resize_type,
-                            suggested_buf_size, suggested_n_bufs)
-
-           called when a channel's buffers are in danger of becoming
-           full i.e. the number of unread bytes in the channel passes
-           a preset threshold, or when the current capacity of a
-           channel's buffer is no longer needed.  Also called to
-           notify the client when a channel's buffer has been
-           replaced.  If resize_type is RELAY_RESIZE_EXPAND or
-           RELAY_RESIZE_SHRINK, the kernel client should arrange to
-           call relay_realloc_buffer() with the suggested buffer size
-           and buffer count, which will allocate (but will not
-           replace the old one) a new buffer of the recommended size
-           for the channel.  When the allocation has completed,
-           needs_resize() is again called, this time with a
-           resize_type of RELAY_RESIZE_REPLACE.  The kernel client
-           should then arrange to call relay_replace_buffer() to
-           actually replace the old channel buffer with the newly
-           allocated buffer.  Finally, once the buffer replacement
-           has completed, needs_resize() is again called, this time
-           with a resize_type of RELAY_RESIZE_REPLACED, to inform the
-           client that the replacement is complete and additionally
-           confirming the current sub-buffer size and number of
-           sub-buffers.  Note that a resize can be canceled if
-           relay_realloc_buffer() is called with the async param
-           non-zero and the resize conditions no longer hold.  In
-           this case, the RELAY_RESIZE_REPLACED suggested number of
-           sub-buffers will be the same as the number of sub-buffers
-           that existed before the RELAY_RESIZE_SHRINK or EXPAND i.e.
-           values indicating that the resize didn't actually occur.
-
-         - int fileop_notify(channel_id, struct file *filp, enum relay_fileop)
-
-           called when a userspace file operation has occurred or
-           will occur on a relayfs channel file.  These notifications
-           can be used by the kernel client to trigger actions within
-           the kernel client when the corresponding event occurs,
-           such as enabling logging only when a userspace application
-           opens or mmaps a relayfs file and disabling it again when
-           the file is closed or unmapped.  The kernel client can
-           also return its own return value, which can affect the
-           outcome of file operation - returning 0 indicates that the
-           operation should succeed, and returning a negative value
-           indicates that the operation should be failed, and that
-           the returned value should be returned to the ultimate
-           caller e.g. returning -EPERM from the open fileop will
-           cause the open to fail with -EPERM.  Among other things,
-           the return value can be used to restrict a relayfs file
-           from being opened or mmap'ed more than once.  The currently
-           implemented fileops are:
-
-           RELAY_FILE_OPEN - a relayfs file is being opened.  Return
-                             0 to allow it to succeed, negative to
-                             have it fail.  A negative return value will
-                             be passed on unmodified to the open fileop.
-           RELAY_FILE_CLOSE- a relayfs file is being closed.  The return
-                             value is ignored.
-           RELAY_FILE_MAP - a relayfs file is being mmap'ed.  Return 0
-                            to allow it to succeed, negative to have
-                            it fail.  A negative return value will be
-                            passed on unmodified to the mmap fileop.
-           RELAY_FILE_UNMAP- a relayfs file is being unmapped.  The return
-                             value is ignored.
-
-         - void ioctl(rchan_id, cmd, arg)
-
-           called when an ioctl call is made using a relayfs file
-           descriptor.  The cmd and arg are passed along to this
-           callback unmodified for it to do as it wishes with.  The
-           return value from this callback is used as the return value
-           of the ioctl call.
-
-  If the callbacks param passed to relay_open() is NULL, a set of
-  default do-nothing callbacks will be defined for the channel.
-  Likewise, any NULL rchan_callback function contained in a non-NULL
-  callbacks struct will be filled in with a default callback function
-  that does nothing.
-
-- start_reserve - the number of bytes to be reserved at the start of
-  each sub-buffer.  The client can do what it wants with this number
-  of bytes when the buffer_start() callback is invoked.  Typically
-  clients would use this to write per-sub-buffer header data.
-
-- end_reserve - the number of bytes to be reserved at the end of each
-  sub-buffer.  The client can do what it wants with this number of
-  bytes when the buffer_end() callback is invoked.  Typically clients
-  would use this to write per-sub-buffer footer data.
-
-- channel_start_reserve - the number of bytes to be reserved, in
-  addition to start_reserve, at the beginning of the first sub-buffer
-  in the channel.  The client can do what it wants with this number of
-  bytes when the buffer_start() callback is invoked.  Typically
-  clients would use this to write per-channel header data.
-
-- resize_min - if set, this signifies that the channel is
-  auto-resizeable.  The value specifies the size that the channel will
-  try to maintain as a normal working size, and that it won't go
-  below.  The client makes use of the resizing callbacks and
-  relay_realloc_buffer() and relay_replace_buffer() to actually effect
-  the resize.
-
-- resize_max - if set, this signifies that the channel is
-  auto-resizeable.  The value specifies the maximum size the channel
-  can have as a result of resizing.
-
-- mode - if non-zero, specifies the file permissions that will be given
-  to the channel file.  If 0, the default rw user perms will be used.
-
-- init_buf - if non-NULL, rather than allocating the channel buffer,
-  this buffer will be used as the initial channel buffer.  The kernel
-  API function relay_discard_init_buf() can later be used to have
-  relayfs allocate a normal mmappable channel buffer and switch over
-  to using it after copying the init_buf contents into it.  Currently,
-  the size of init_buf must be exactly buf_size * n_bufs.  The caller
-  is responsible for managing the init_buf memory.  This feature is
-  typically used for init-time channel use and should normally be
-  specified as NULL.
-
-- init_buf_size - the total size of init_buf, if init_buf is specified
-  as non-NULL.  Currently, the size of init_buf must be exactly
-  buf_size * n_bufs.
-
-Upon successful completion, relay_open() returns a channel id
-to be used for all other operations with the relay. All buffers
-managed by the relay are allocated using rvmalloc/rvfree to allow
-for easy mmapping to user-space.
-
-----------
-int relay_write(channel_id, *data_ptr, count, time_delta_offset, **wrote_pos)
-
-relay_write() reserves space in the channel and writes count bytes of
-data pointed to by data_ptr to it.  Automatically performs any
-necessary locking, depending on the scheme and SMP usage in effect (no
-locking is done for the lockless scheme regardless of usage).  It
-returns the number of bytes written, or 0/negative on failure.  If
-time_delta_offset is >= 0, the internal time delta, the internal time
-delta calculated when the slot was reserved will be written at that
-offset.  This is the TSC or gettimeofday() delta between the current
-write and the beginning of the buffer, whichever method is being used
-by the channel.  Trying to write a count larger than the bufsize
-specified to relay_open() (taking into account the reserved
-start-of-buffer and end-of-buffer space as well) will fail.  If
-wrote_pos is non-NULL, it will receive the location the data was
-written to, which may be needed for some applications but is not
-normally interesting.  Most applications should pass in NULL for this
-param.
-
-----------
-struct rchan_reader *add_rchan_reader(int rchan_id, int auto_consume)
-
-add_rchan_reader creates and initializes a reader object for a
-channel.  An opaque rchan_reader object is returned on success, and is
-passed to relay_read() when reading the channel.  If the boolean
-auto_consume parameter is 1, the reader is defined to be
-auto-consuming.  auto-consuming reader objects are automatically
-created and used for VFS read(2) readers.
-
-----------
-void remove_rchan_reader(struct rchan_reader *reader)
-
-remove_rchan_reader finds and removes the given reader from the
-channel.  This function is used only by non-VFS read(2) readers.  VFS
-read(2) readers are automatically removed when the corresponding file
-object is closed.
-
-----------
-reader add_map_reader(int rchan_id)
-
-Creates and initializes an rchan_reader object for channel map
-readers, and is needed for updating relay_bytes/buffers_consumed()
-when kernel clients become aware of the need to do so by their mmap
-user clients.
-
-----------
-int remove_map_reader(reader)
-
-Finds and removes the given map reader from the channel.  This function
-is useful only for map readers.
-
-----------
-int relay_read(reader, buf, count, wait, *actual_read_offset)
-
-Reads count bytes from the channel, or as much as is available within
-the sub-buffer currently being read.  The read offset that will be
-read from is the position contained within the reader object.  If the
-wait flag is set, buf is non-NULL, and there is nothing available, it
-will wait until there is.  If the wait flag is 0 and there is nothing
-available, -EAGAIN is returned.  If buf is NULL, the value returned is
-the number of bytes that would have been read.  actual_read_offset is
-the value that should be passed as the read offset to
-relay_bytes_consumed, needed only if the reader is not auto-consuming
-and the channel is MODE_NO_OVERWRITE, but in any case, it must not be
-NULL.
-
----------- 
-
-int relay_bytes_avail(reader)
-
-Returns the number of bytes available relative to the reader's current
-read position within the corresponding sub-buffer, 0 if there is
-nothing available.  Note that this doesn't return the total bytes
-available in the channel buffer - this is enough though to know if
-anything is available, however, or how many bytes might be returned
-from the next read.
-
-----------
-void relay_buffers_consumed(reader, buffers_consumed)
-
-Adds to the channel's consumed buffer count.  buffers_consumed should
-be the number of buffers newly consumed, not the total number
-consumed.  NOTE: kernel clients don't need to call this function if
-the reader is auto-consuming or the channel is MODE_CONTINUOUS.
-
-In order for the relay to detect the 'buffers full' condition for a
-channel, it must be kept up-to-date with respect to the number of
-buffers consumed by the client.  If the addition of the value of the
-bufs_consumed param to the current bufs_consumed count for the channel
-would exceed the bufs_produced count for the channel, the channel's
-bufs_consumed count will be set to the bufs_produced count for the
-channel.  This allows clients to 'catch up' if necessary.
-
-----------
-void relay_bytes_consumed(reader, bytes_consumed, read_offset)
-
-Adds to the channel's consumed count.  bytes_consumed should be the
-number of bytes actually read e.g. return value of relay_read() and
-the read_offset should be the actual offset the bytes were read from
-e.g. the actual_read_offset set by relay_read().  NOTE: kernel clients
-don't need to call this function if the reader is auto-consuming or
-the channel is MODE_CONTINUOUS.
-
-In order for the relay to detect the 'buffers full' condition for a
-channel, it must be kept up-to-date with respect to the number of
-bytes consumed by the client.  For packet clients, it makes more sense
-to update after each read rather than after each complete sub-buffer
-read.  The bytes_consumed count updates bufs_consumed when a buffer
-has been consumed so this count remains consistent.
-
-----------
-int relay_info(channel_id, *channel_info)
-
-relay_info() fills in an rchan_info struct with channel status and
-attribute information such as usage modes, sub-buffer size and count,
-the allocated size of the entire buffer, buffers produced and
-consumed, current buffer id, count of writes lost due to buffers full
-condition.
-
-The virtual address of the channel buffer is also available here, for
-those clients that need it.
-
-Clients may need to know how many 'unused' bytes there are at the end
-of a given sub-buffer.  This would only be the case if the client 1)
-didn't either write this count to the end of the sub-buffer or
-otherwise note it (it's available as the difference between the buffer
-end and current write pos params in the buffer_end callback) (if the
-client returned 0 from the buffer_end callback, it's assumed that this
-is indeed the case) 2) isn't using the read() system call to read the
-buffer.  In other words, if the client isn't annotating the stream and
-is reading the buffer by mmaping it, this information would be needed
-in order for the client to 'skip over' the unused bytes at the ends of
-sub-buffers.
-
-Additionally, for the lockless scheme, clients may need to know
-whether a particular sub-buffer is actually complete.  An array of
-boolean values, one per sub-buffer, contains non-zero if the buffer is
-complete, non-zero otherwise.
-
-----------
-int relay_close(channel_id)
-
-relay_close() is used to close the channel.  It finalizes the last
-sub-buffer (the one currently being written to) and marks the channel
-as finalized.  The channel buffer and channel data structure are then
-freed automatically when the last reference to the channel is given
-up.
-
-----------
-int relay_realloc_buffer(channel_id, nbufs, async)
-
-Allocates a new channel buffer using the specified sub-buffer count
-(note that resizing can't change sub-buffer sizes).  If async is
-non-zero, the allocation is done in the background using a work queue.
-When the allocation has completed, the needs_resize() callback is
-called with a resize_type of RELAY_RESIZE_REPLACE.  This function
-doesn't replace the old buffer with the new - see
-relay_replace_buffer().
-
-This function is called by kernel clients in response to a
-needs_resize() callback call with a resize type of RELAY_RESIZE_EXPAND
-or RELAY_RESIZE_SHRINK.  That callback also includes a suggested
-new_bufsize and new_nbufs which should be used when calling this
-function.
-
-Returns 0 on success, or errcode if the channel is busy or if
-the allocation couldn't happen for some reason.
-
-NOTE: if async is not set, this function should not be called with a
-lock held, as it may sleep.
-
-----------
-int relay_replace_buffer(channel_id)
-
-Replaces the current channel buffer with the new buffer allocated by
-relay_realloc_buffer and contained in the channel struct.  When the
-replacement is complete, the needs_resize() callback is called with
-RELAY_RESIZE_REPLACED.  This function is called by kernel clients in
-response to a needs_resize() callback having a resize type of
-RELAY_RESIZE_REPLACE.
-
-Returns 0 on success, or errcode if the channel is busy or if the
-replacement or previous allocation didn't happen for some reason.
-
-NOTE: This function will not sleep, so can called in any context and
-with locks held.  The client should, however, ensure that the channel
-isn't actively being read from or written to.
-
-----------
-int relay_reset(rchan_id)
-
-relay_reset() has the effect of erasing all data from the buffer and
-restarting the channel in its initial state.  The buffer itself is not
-freed, so any mappings are still in effect.  NOTE: Care should be
-taken that the channnel isn't actually being used by anything when
-this call is made.
-
-----------
-int rchan_full(reader)
-
-returns 1 if the channel is full with respect to the reader, 0 if not.
-
-----------
-int rchan_empty(reader)
-
-returns 1 if the channel is empty with respect to the reader, 0 if not.
-
-----------
-int relay_discard_init_buf(rchan_id)
-
-allocates an mmappable channel buffer, copies the contents of init_buf
-into it, and sets the current channel buffer to the newly allocated
-buffer.  This function is used only in conjunction with the init_buf
-and init_buf_size params to relay_open(), and is typically used when
-the ability to write into the channel at init-time is needed.  The
-basic usage is to specify an init_buf and init_buf_size to relay_open,
-then call this function when it's safe to switch over to a normally
-allocated channel buffer.  'Safe' means that the caller is in a
-context that can sleep and that nothing is actively writing to the
-channel.  Returns 0 if successful, negative otherwise.
-
-
-Writing directly into the channel
-=================================
-
-Using the relay_write() API function as described above is the
-preferred means of writing into a channel.  In some cases, however,
-in-kernel clients might want to write directly into a relay channel
-rather than have relay_write() copy it into the buffer on the client's
-behalf.  Clients wishing to do this should follow the model used to
-implement relay_write itself.  The general sequence is:
-
-- get a pointer to the channel via rchan_get().  This increments the
-  channel's reference count.
-- call relay_lock_channel().  This will perform the proper locking for
-  the channel given the scheme in use and the SMP usage.
-- reserve a slot in the channel via relay_reserve()
-- write directly to the reserved address
-- call relay_commit() to commit the write
-- call relay_unlock_channel()
-- call rchan_put() to release the channel reference
-
-In particular, clients should make sure they call rchan_get() and
-rchan_put() and not hold on to references to the channel pointer.
-Also, forgetting to use relay_lock_channel()/relay_unlock_channel()
-has no effect if the lockless scheme is being used, but could result
-in corrupted buffer contents if the locking scheme is used.
-
-
-Limitations
-===========
-
-Writes made via the write() system call are currently limited to 2
-pages worth of data.  There is no such limit on the in-kernel API
-function relay_write().
-
-User applications can currently only mmap the complete buffer (it
-doesn't really make sense to mmap only part of it, given its purpose).
-
-
-Latest version
-==============
-
-The latest version can be found at:
-
-http://www.opersys.com/relayfs
-
-Example relayfs clients, such as dynamic printk and the Linux Trace
-Toolkit, can also be found there.
-
-
-Credits
-=======
-
-The ideas and specs for relayfs came about as a result of discussions
-on tracing involving the following:
-
-Michel Dagenais                <michel.dagenais@polymtl.ca>
-Richard Moore          <richardj_moore@uk.ibm.com>
-Bob Wisniewski         <bob@watson.ibm.com>
-Karim Yaghmour         <karim@opersys.com>
-Tom Zanussi            <zanussi@us.ibm.com>
-
-Also thanks to Hubertus Franke for a lot of useful suggestions and bug
-reports, and for contributing the klog code.
diff --git a/Documentation/i2c/i2c-pport b/Documentation/i2c/i2c-pport
deleted file mode 100644 (file)
index ce68c67..0000000
+++ /dev/null
@@ -1,45 +0,0 @@
-Primitive parallel port is driver for i2c bus, which exploits 
-features of modern bidirectional parallel ports. 
-
-Bidirectional ports have particular bits connected in following way:
-   
-                        |
-            /-----|     R
-         --o|     |-----|
-      read  \-----|     /------- Out pin
-                      |/
-                   - -|\
-                write   V
-                        |
-                       ---  
-
-
-It means when output is set to 1 we can read the port. Therefore 
-we can use 2 pins of parallel port as SDA and SCL for i2c bus. It 
-is not necessary to add any external - additional parts, we can 
-read and write the same port simultaneously.
-       I only use register base+2 so it is possible to use all 
-8 data bits of parallel port for other applications (I have 
-connected EEPROM and LCD display). I do not use bit Enable Bi-directional
- Port. The only disadvantage is we can only support 5V chips.
-
-Layout:
-
-Cannon 25 pin
-
-SDA - connect to pin 14 (Auto Linefeed)
-SCL - connect to pin 16 (Initialize Printer)
-GND - connect to pin 18-25
-+5V - use external supply (I use 5V from 3.5" floppy connector)
-      
-no pullups  requied
-
-Module parameters:
-
-base = 0xXXX
-XXX - 278 or 378
-
-That's all.
-
-Daniel Smolik
-marvin@sitour.cz
diff --git a/Documentation/i2c/i2c-velleman b/Documentation/i2c/i2c-velleman
deleted file mode 100644 (file)
index 04be638..0000000
+++ /dev/null
@@ -1,23 +0,0 @@
-i2c-velleman driver
--------------------
-This is a driver for i2c-hw access for Velleman K8000 and other adapters.
-
-Useful links
-------------
-Velleman:
-       http://www.velleman.be/
-
-Velleman K8000 Howto:
-       http://howto.htlw16.ac.at/k8000-howto.html
-
-K8000 and K8005 libraries
--------------------------
-The project has lead to new libs for the Velleman K8000 and K8005:
-LIBK8000 v1.99.1 and LIBK8005 v0.21
-
-With these libs, you can control the K8000 interface card and the K8005
-stepper motor card with the simple commands which are in the original
-Velleman software, like SetIOchannel, ReadADchannel, SendStepCCWFull and
-many more, using /dev/velleman.
-
-The libs can be found on http://groups.yahoo.com/group/k8000/files/linux/
diff --git a/Documentation/powerpc/hvcs.txt b/Documentation/powerpc/hvcs.txt
deleted file mode 100644 (file)
index 111ad15..0000000
+++ /dev/null
@@ -1,534 +0,0 @@
-===========================================================================
-                                  HVCS
-       IBM "Hypervisor Virtual Console Server" Installation Guide
-                         for Linux Kernel 2.6.4+
-                   Copyright (C) 2004 IBM Corporation
-
-===========================================================================
-NOTE:Eight space tabs are the optimum editor setting for reading this file.
-===========================================================================
-
-              Author(s) :  Ryan S. Arnold <rsa@us.ibm.com>
-                      Date Created: March, 02, 2004
-                      Last Changed: July, 07, 2004
-
----------------------------------------------------------------------------
-Table of contents:
-
-       1.  Driver Introduction:
-       2.  System Requirements
-       3.  Build Options:
-               3.1  Built-in:
-               3.2  Module:
-       4.  Installation:
-       5.  Connection:
-       6.  Disconnection:
-       7.  Configuration:
-       8.  Questions & Answers:
-       9.  Reporting Bugs:
-
----------------------------------------------------------------------------
-1. Driver Introduction:
-
-This is the device driver for the IBM Hypervisor Virtual Console Server,
-"hvcs".  The IBM hvcs provides a tty driver interface to allow Linux user
-space applications access to the system consoles of logically partitioned
-operating systems (Linux and AIX) running on the same partitioned Power5
-ppc64 system.  Physical hardware consoles per partition are not practical
-on this hardware so system consoles are accessed by this driver using
-firmware interfaces to virtual terminal devices.
-
----------------------------------------------------------------------------
-2. System Requirements:
-
-This device driver was written using 2.6.4 Linux kernel APIs and will only
-build and run on kernels of this version or later.
-
-This driver was written to operate solely on IBM Power5 ppc64 hardware
-though some care was taken to abstract the architecture dependent firmware
-calls from the driver code.
-
-Sysfs must be mounted on the system so that the user can determine which
-major and minor numbers are associated with each vty-server.  Directions
-for sysfs mounting are outside the scope of this document.
-
----------------------------------------------------------------------------
-3. Build Options:
-
-The hvcs driver registers itself as a tty driver.  The tty layer
-dynamically allocates a block of major and minor numbers in a quantity
-requested by the registering driver.  The hvcs driver asks the tty layer
-for 64 of these major/minor numbers by default to use for hvcs device node
-entries.
-
-If the default number of device entries is adequate then this driver can be
-built into the kernel.  If not, the default can be over-ridden by inserting
-the driver as a module with insmod parameters.
-
----------------------------------------------------------------------------
-3.1 Built-in:
-
-The following menuconfig example demonstrates selecting to build this
-driver into the kernel.
-
-       Device Drivers  --->
-               Character devices  --->
-                       <*> IBM Hypervisor Virtual Console Server Support
-
-Begin the kernel make process.
-
----------------------------------------------------------------------------
-3.2 Module:
-
-The following menuconfig example demonstrates selecting to build this
-driver as a kernel module.
-
-       Device Drivers  --->
-               Character devices  --->
-                       <M> IBM Hypervisor Virtual Console Server Support
-
-The make process will build the following kernel modules:
-
-       hvcs.ko
-       hvcserver.ko
-
-To insert the module with the default allocation execute the following
-commands in the order they appear:
-
-       insmod hvcserver.ko
-       insmod hvcs.ko
-
-The hvcserver module contains architecture specific firmware calls and must
-be inserted first, otherwise the hvcs module will not find some of the
-symbols it expects.
-
-To override the default use an insmod parameter as follows (requesting 4
-tty devices as an example):
-
-       insmod hvcs.ko hvcs_parm_num_devs=4
-
-There is a maximum number of dev entries that can be specified on insmod.
-We think that 1024 is currently a decent maximum number of server adapters
-to allow.  This can always be changed by modifying the constant in the
-source file before building.
-
-NOTE: The length of time it takes to insmod the driver seems to be related
-to the number of tty interfaces the registering driver requests.
-
-In order to remove the driver module execute the following command:
-
-       rmmod hvcs.ko
-
-The recommended method for installing hvcs as a module is to use depmod to
-build a current modules.dep file in /lib/modules/`uname -r` and then
-execute:
-
-modprobe hvcs hvcs_parm_num_devs=4
-
-The modules.dep file indicates that hvcserver.ko needs to be inserted
-before hvcs.ko and modprobe uses this file to smartly insert the modules in
-the proper order.
-
-The following modprobe command is used to remove hvcs and hvcserver in the
-proper order:
-
-modprobe -r hvcs
-
----------------------------------------------------------------------------
-4. Installation:
-
-The tty layer creates sysfs entries which contain the major and minor
-numbers allocated for the hvcs driver.  The following snippet of "tree"
-output of the sysfs directory shows where these numbers are presented:
-
-       sys/
-       |-- *other sysfs base dirs*
-       |
-       |-- class
-       |   |-- *other classes of devices*
-       |   |
-       |   `-- tty
-       |       |-- *other tty devices*
-       |       |
-       |       |-- hvcs0
-       |       |   `-- dev
-       |       |-- hvcs1
-       |       |   `-- dev
-       |       |-- hvcs2
-       |       |   `-- dev
-       |       |-- hvcs3
-       |       |   `-- dev
-       |       |
-       |       |-- *other tty devices*
-       |
-       |-- *other sysfs base dirs*
-
-For the above examples the following output is a result of cat'ing the
-"dev" entry in the hvcs directory:
-
-       Pow5:/sys/class/tty/hvcs0/ # cat dev
-       254:0
-
-       Pow5:/sys/class/tty/hvcs1/ # cat dev
-       254:1
-
-       Pow5:/sys/class/tty/hvcs2/ # cat dev
-       254:2
-
-       Pow5:/sys/class/tty/hvcs3/ # cat dev
-       254:3
-
-The output from reading the "dev" attribute is the char device major and
-minor numbers that the tty layer has allocated for this driver's use.  Most
-systems running hvcs will already have the device entries created or udev
-will do it automatically.
-
-Given the example output above, to manually create a /dev/hvcs* node entry
-mknod can be used as follows:
-
-       mknod /dev/hvcs0 c 254 0
-       mknod /dev/hvcs1 c 254 1
-       mknod /dev/hvcs2 c 254 2
-       mknod /dev/hvcs3 c 254 3
-
-Using mknod to manually create the device entries makes these device nodes
-persistent.  Once created they will exist prior to the driver insmod.
-
-Attempting to connect an application to /dev/hvcs* prior to insertion of
-the hvcs module will result in an error message similar to the following:
-
-       "/dev/hvcs*: No such device".
-
-NOTE: Just because there is a device node present doesn't mean that there
-is a vty-server device configured for that node.
-
----------------------------------------------------------------------------
-5. Connection
-
-Since this driver controls devices that provide a tty interface a user can
-interact with the device node entries using any standard tty-interactive
-method (e.g. "cat", "dd", "echo").  The intent of this driver however, is
-to provide real time console interaction with a Linux partition's console,
-which requires the use of applications that provide bi-directional,
-interactive I/O with a tty device.
-
-Applications (e.g. "minicom" and "screen") that act as terminal emulators
-or perform terminal type control sequence conversion on the data being
-passed through them are NOT acceptable for providing interactive console
-I/O.  These programs often emulate antiquated terminal types (vt100 and
-ANSI) and expect inbound data to take the form of one of these supported
-terminal types but they either do not convert, or do not _adequately_
-convert, outbound data into the terminal type of the terminal which invoked
-them (though screen makes an attempt and can apparently be configured with
-much termcap wrestling.)
-
-For this reason kermit and cu are two of the recommended applications for
-interacting with a Linux console via an hvcs device.  These programs simply
-act as a conduit for data transfer to and from the tty device.  They do not
-require inbound data to take the form of a particular terminal type, nor do
-they cook outbound data to a particular terminal type.
-
-In order to ensure proper functioning of console applications one must make
-sure that once connected to a /dev/hvcs console that the console's $TERM
-env variable is set to the exact terminal type of the terminal emulator
-used to launch the interactive I/O application.  If one is using xterm and
-kermit to connect to /dev/hvcs0 when the console prompt becomes available
-one should "export TERM=xterm" on the console.  This tells ncurses
-applications that are invoked from the console that they should output
-control sequences that xterm can understand.
-
-As a precautionary measure an hvcs user should always "exit" from their
-session before disconnecting an application such as kermit from the device
-node.  If this is not done, the next user to connect to the console will
-continue using the previous user's logged in session which includes
-using the $TERM variable that the previous user supplied.
-
----------------------------------------------------------------------------
-6. Disconnection
-
-As a security feature to prevent the delivery of stale data to an
-unintended target the Power5 system firmware disables the fetching of data
-and discards that data when a connection between a vty-server and a vty has
-been severed.  As an example, when a vty-server is immediately disconnected
-from a vty following output of data to the vty the vty adapter may not have
-enough time between when it received the data interrupt and when the
-connection was severed to fetch the data from firmware before the fetch is
-disabled by firmware.
-
-When hvcs is being used to serve consoles this behavior is not a huge issue
-because the adapter stays connected for large amounts of time following
-almost all data writes.  When hvcs is being used as a tty conduit to tunnel
-data between two partitions [see Q & A below] this is a huge problem
-because the standard Linux behavior when cat'ing or dd'ing data to a device
-is to open the tty, send the data, and then close the tty.  If this driver
-manually terminated vty-server connections on tty close this would close
-the vty-server and vty connection before the target vty has had a chance to
-fetch the data.
-
-Additionally, disconnecting a vty-server and vty only on module removal or
-adapter removal is impractical because other vty-servers in other
-partitions may require the usage of the target vty at any time.
-
-Due to this behavioral restriction disconnection of vty-servers from the
-connected vty is a manual procedure using a write to a sysfs attribute
-outlined below, on the other hand the initial vty-server connection to a
-vty is established automatically by this driver.  Manual vty-server
-connection is never required.
-
-In order to terminate the connection between a vty-server and vty the
-"vterm_state" sysfs attribute within each vty-server's sysfs entry is used.
-Reading this attribute reveals the current connection state of the
-vty-server adapter.  A zero means that the vty-server is not connected to a
-vty.  A one indicates that a connection is active.
-
-Writing a '0' (zero) to the vterm_state attribute will disconnect the VTERM
-connection between the vty-server and target vty ONLY if the vterm_state
-previously read '1'.  The write directive is ignored if the vterm_state
-read '0' or if any value other than '0' was written to the vterm_state
-attribute.  The following example will show the method used for verifying
-the vty-server connection status and disconnecting a vty-server connection.
-
-       Pow5:/sys/bus/vio/drivers/hvcs/30000004 # cat vterm_state
-       1
-
-       Pow5:/sys/bus/vio/drivers/hvcs/30000004 # echo 0 > vterm_state
-
-       Pow5:/sys/bus/vio/drivers/hvcs/30000004 # cat vterm_state
-       0
-
-All vty-server connections are automatically terminated when the device is
-hotplug removed and when the module is removed.
-
----------------------------------------------------------------------------
-7. Configuration
-
-Each vty-server has a sysfs entry in the /sys/devices/vio directory, which
-is symlinked in several other sysfs tree directories, notably under the
-hvcs driver entry, which looks like the following example:
-
-       Pow5:/sys/bus/vio/drivers/hvcs # ls
-       .  ..  30000003  30000004  rescan
-
-By design, firmware notifies the hvcs driver of vty-server lifetimes and
-partner vty removals but not the addition of partner vtys.  Since an HMC
-Super Admin can add partner info dynamically we have provided the hvcs
-driver sysfs directory with the "rescan" update attribute which will query
-firmware and update the partner info for all the vty-servers that this
-driver manages.  Writing a '1' to the attribute triggers the update.  An
-explicit example follows:
-
-       Pow5:/sys/bus/vio/drivers/hvcs # echo 1 > rescan
-
-Reading the attribute will indicate a state of '1' or '0'.  A one indicates
-that an update is in process.  A zero indicates that an update has
-completed or was never executed.
-
-Vty-server entries in this directory are a 32 bit partition unique unit
-address that is created by firmware.  An example vty-server sysfs entry
-looks like the following:
-
-       Pow5:/sys/bus/vio/drivers/hvcs/30000004 # ls
-       .   current_vty   devspec  partner_clcs  vterm_state
-       ..  detach_state  name     partner_vtys
-
-Each entry is provided, by default with a "name" attribute.  Reading the
-"name" attribute will reveal the device type as shown in the following
-example:
-
-       Pow5:/sys/bus/vio/drivers/hvcs/30000003 # cat name
-       vty-server
-
-Each entry is also provided, by default, with a "devspec" attribute which
-reveals the full device specification when read, as shown in the following
-example:
-
-       Pow5:/sys/bus/vio/drivers/hvcs/30000004 # cat devspec
-       /vdevice/vty-server@30000004
-
-Each vty-server sysfs dir is provided with two read-only attributes that
-provide lists of easily parsed partner vty data: "partner_vtys" and
-"partner_clcs".
-
-       Pow5:/sys/bus/vio/drivers/hvcs/30000004 # cat partner_vtys
-       30000000
-       30000001
-       30000002
-       30000000
-       30000000
-
-       Pow5:/sys/bus/vio/drivers/hvcs/30000004 # cat partner_clcs
-       U5112.428.103048A-V3-C0
-       U5112.428.103048A-V3-C2
-       U5112.428.103048A-V3-C3
-       U5112.428.103048A-V4-C0
-       U5112.428.103048A-V5-C0
-
-Reading partner_vtys returns a list of partner vtys.  Vty unit address
-numbering is only per-partition-unique so entries will frequently repeat.
-
-Reading partner_clcs returns a list of "converged location codes" which are
-composed of a system serial number followed by "-V*", where the '*' is the
-target partition number, and "-C*", where the '*' is the slot of the
-adapter.  The first vty partner corresponds to the first clc item, the
-second vty partner to the second clc item, etc.
-
-A vty-server can only be connected to a single vty at a time.  The entry,
-"current_vty" prints the clc of the currently selected partner vty when
-read.
-
-The current_vty can be changed by writing a valid partner clc to the entry
-as in the following example:
-
-       Pow5:/sys/bus/vio/drivers/hvcs/30000004 # echo U5112.428.10304
-       8A-V4-C0 > current_vty
-
-Changing the current_vty when a vty-server is already connected to a vty
-does not affect the current connection.  The change takes effect when the
-currently open connection is freed.
-
-Information on the "vterm_state" attribute was covered earlier on the
-chapter entitled "disconnection".
-
----------------------------------------------------------------------------
-8. Questions & Answers:
-===========================================================================
-Q: What are the security concerns involving hvcs?
-
-A: There are three main security concerns:
-
-       1. The creator of the /dev/hvcs* nodes has the ability to restrict
-       the access of the device entries to certain users or groups.  It
-       may be best to create a special hvcs group privilege for providing
-       access to system consoles.
-
-       2. To provide network security when grabbing the console it is
-       suggested that the user connect to the console hosting partition
-       using a secure method, such as SSH or sit at a hardware console.
-
-       3. Make sure to exit the user session when done with a console or
-       the next vty-server connection (which may be from another
-       partition) will experience the previously logged in session.
-
----------------------------------------------------------------------------
-Q: How do I multiplex a console that I grab through hvcs so that other
-people can see it:
-
-A: You can use "screen" to directly connect to the /dev/hvcs* device and
-setup a session on your machine with the console group privileges.  As
-pointed out earlier by default screen doesn't provide the termcap settings
-for most terminal emulators to provide adequate character conversion from
-term type "screen" to others.  This means that curses based programs may
-not display properly in screen sessions.
-
----------------------------------------------------------------------------
-Q: Why are the colors all messed up?
-Q: Why are the control characters acting strange or not working?
-Q: Why is the console output all strange and unintelligible?
-
-A: Please see the preceding section on "Connection" for a discussion of how
-applications can affect the display of character control sequences.
-Additionally, just because you logged into the console using and xterm
-doesn't mean someone else didn't log into the console with the HMC console
-(vt320) before you and leave the session logged in.  The best thing to do
-is to export TERM to the terminal type of your terminal emulator when you
-get the console.  Additionally make sure to "exit" the console before you
-disconnect from the console.  This will ensure that the next user gets
-their own TERM type set when they login.
-
----------------------------------------------------------------------------
-Q: When I try to CONNECT kermit to an hvcs device I get:
-"Sorry, can't open connection: /dev/hvcs*"What is happening?
-
-A: Some other Power5 console mechanism has a connection to the vty and
-isn't giving it up.  You can try to force disconnect the consoles from the
-HMC by right clicking on the partition and then selecting "close terminal".
-Otherwise you have to hunt down the people who have console authority.  It
-is possible that you already have the console open using another kermit
-session and just forgot about it.  Please review the console options for
-Power5 systems to determine the many ways a system console can be held.
-
-OR
-
-A: Another user may not have a connectivity method currently attached to a
-/dev/hvcs device but the vterm_state may reveal that they still have the
-vty-server connection established.  They need to free this using the method
-outlined in the section on "Disconnection" in order for others to connect
-to the target vty.
-
-OR
-
-A: The user profile you are using to execute kermit probably doesn't have
-permissions to use the /dev/hvcs* device.
-
-OR
-
-A: You probably haven't inserted the hvcs.ko module yet but the /dev/hvcs*
-entry still exists (on systems without udev).
-
-OR
-
-A: There is not a corresponding vty-server device that maps to an existing
-/dev/hvcs* entry.
-
----------------------------------------------------------------------------
-Q: When I try to CONNECT kermit to an hvcs device I get:
-"Sorry, write access to UUCP lockfile directory denied."
-
-A: The /dev/hvcs* entry you have specified doesn't exist where you said it
-does?  Maybe you haven't inserted the module (on systems with udev).
-
----------------------------------------------------------------------------
-Q: If I already have one Linux partition installed can I use hvcs on said
-partition to provide the console for the install of a second Linux
-partition?
-
-A: Yes granted that your are connected to the /dev/hvcs* device using
-kermit or cu or some other program that doesn't provide terminal emulation.
-
----------------------------------------------------------------------------
-Q: Can I connect to more than one partition's console at a time using this
-driver?
-
-A: Yes.  Of course this means that there must be more than one vty-server
-configured for this partition and each must point to a disconnected vty.
-
----------------------------------------------------------------------------
-Q: Does the hvcs driver support dynamic (hotplug) addition of devices?
-
-A: Yes, if you have dlpar and hotplug enabled for your system and it has
-been built into the kernel the hvcs drivers is configured to dynamically
-handle additions of new devices and removals of unused devices.
-
----------------------------------------------------------------------------
-Q: Can I use /dev/hvcs* as a conduit to another partition and use a tty
-device on that partition as the other end of the pipe?
-
-A: Yes, on Power5 platforms the hvc_console driver provides a tty interface
-for extra /dev/hvc* devices (where /dev/hvc0 is most likely the console).
-In order to get a tty conduit working between the two partitions the HMC
-Super Admin must create an additional "serial server" for the target
-partition with the HMC gui which will show up as /dev/hvc* when the target
-partition is rebooted.
-
-The HMC Super Admin then creates an additional "serial client" for the
-current partition and points this at the target partition's newly created
-"serial server" adapter (remember the slot).  This shows up as an
-additional /dev/hvcs* device.
-
-Now a program on the target system can be configured to read or write to
-/dev/hvc* and another program on the current partition can be configured to
-read or write to /dev/hvcs*.  Now you have a tty conduit between two
-partitions.
-
----------------------------------------------------------------------------
-9. Reporting Bugs:
-
-The proper channel for reporting bugs is either through the Linux OS
-distribution company that provided your OS or by posting issues to the
-ppc64 development mailing list at:
-
-linuxppc64-dev@lists.linuxppc.org
-
-This request is to provide a documented and searchable public exchange
-of the problems and solutions surrounding this driver for the benefit of
-all users.
diff --git a/Documentation/powerpc/mpc52xx.txt b/Documentation/powerpc/mpc52xx.txt
deleted file mode 100644 (file)
index 6efe0a0..0000000
+++ /dev/null
@@ -1,48 +0,0 @@
-Linux 2.6.x on MPC52xx family
------------------------------
-
-For the latest info, go to http://www.246tNt.com/mpc52xx/state.txt
-To compile/use :
-
-  - U-Boot:
-     # <edit Makefile to set ARCH=ppc & CROSS_COMPILE=... ( also EXTRAVERSION
-        if you wish to ).
-     # make lite5200_defconfig
-     # make uImage
-    
-     then, on U-boot:
-     => tftpboot 200000 uImage
-     => tftpboot 400000 pRamdisk
-     => bootm 200000 400000
-    
-  - DBug:
-     # <edit Makefile to set ARCH=ppc & CROSS_COMPILE=... ( also EXTRAVERSION
-        if you wish to ).
-     # make lite5200_defconfig
-     # cp your_initrd.gz arch/ppc/boot/images/ramdisk.image.gz
-     # make zImage.initrd 
-     # make 
-
-     then in DBug:
-     DBug> dn -i zImage.initrd.lite5200
-     
-
-Some remarks :
- - The port is named mpc52xxx, and config options are PPC_MPC52xx. The MGT5100
-   is not supported, and I'm not sure anyone is interesting in working on it
-   so. I didn't took 5xxx because there's apparently a lot of 5xxx that have
-   nothing to do with the MPC5200. I also included the 'MPC' for the same
-   reason.
- - Of course, I inspired myself from the 2.4 port. If you think I forgot to
-   mention you/your company in the copyright of some code, I'll correct it
-   ASAP.
- - The codes wants the MBAR to be set at 0xf0000000 by the bootloader. It's
-   mapped 1:1 with the MMU. If for whatever reason, you want to change this,
-   beware that some code depends on the 0xf0000000 address and other depends
-   on the 1:1 mapping.
- - Most of the code assumes that port multiplexing, frequency selection, ...
-   has already been done. IMHO this should be done as early as possible, in
-   the bootloader. If for whatever reason you can't do it there, do it in the
-   platform setup code (if U-Boot) or in the arch/ppc/boot/simple/... (if
-   DBug)
diff --git a/arch/arm/boot/compressed/head-ftvpci.S b/arch/arm/boot/compressed/head-ftvpci.S
deleted file mode 100644 (file)
index aa272a3..0000000
+++ /dev/null
@@ -1,47 +0,0 @@
-/* 
- * linux/arch/arm/boot/compressed/head-ftvpci.S
- * 
- * Copyright (C) 2000 FutureTV Labs Ltd.
- * 
- * Special startup code for FTV PCI board.
- */
-
-/*
- * 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.
- */
-
-       .section        ".start", "ax"
-ftv_start:
-       mcr     p15, 0, r0, c7, c5, 0           @ flush I cache
-       mrc     p15, 0, r0, c1, c0
-       orr     r0, r0, #1 << 12
-       mcr     p15, 0, r0, c1, c0              @ enable I cache
-       mov     r0, #0
-       mcreq   p15, 0, r0, c15, c1, 2          @ enable clock switching
-
-       /* check to see if the kernel must be relocated */
-       ldr     ip, =ftv_start
-       adr     sl, ftv_start
-       teq     ip, sl
-       beq     2f                              @ no need to copy
-
-       /* in the wrong place -> presumably, executing out of ROM */
-       sub     ip, ip, sl                      @ displacement
-       ldr     lr, =_start                     @ destination
-       sub     sp, lr, ip                      @ source
-       ldr     fp, =_edata                     @ end of copied area
-1:     ldmia   sp!, {r0, r1, r2, r3, r4, r5, r6, r10}
-       stmia   lr!, {r0, r1, r2, r3, r4, r5, r6, r10}
-       cmp     lr, fp
-       ble     1b
-
-2:
-       mov     r8, #0
-       mov     r7, #3
-       b       1f
-.ltorg
-1:
-       /* fall back into head.S */
diff --git a/arch/arm/common/platform.c b/arch/arm/common/platform.c
deleted file mode 100644 (file)
index 441f321..0000000
+++ /dev/null
@@ -1,35 +0,0 @@
-#include <linux/ioport.h>
-#include <linux/device.h>
-#include <linux/init.h>
-
-int __init platform_add_device(struct platform_device *dev)
-{
-       int i;
-
-       for (i = 0; i < dev->num_resources; i++) {
-               struct resource *r = &dev->resource[i];
-
-               r->name = dev->dev.bus_id;
-
-               if (r->flags & IORESOURCE_MEM &&
-                   request_resource(&iomem_resource, r)) {
-                       printk(KERN_ERR
-                              "%s%d: failed to claim resource %d\n",
-                              dev->name, dev->id, i);
-                       break;
-               }
-       }
-       if (i == dev->num_resources)
-               platform_device_register(dev);
-       return 0;
-}
-
-int __init platform_add_devices(struct platform_device **devs, int num)
-{
-       int i;
-
-       for (i = 0; i < num; i++)
-               platform_add_device(devs[i]);
-
-       return 0;
-}
diff --git a/arch/arm/common/plx90x0.c b/arch/arm/common/plx90x0.c
deleted file mode 100644 (file)
index 60d7d35..0000000
+++ /dev/null
@@ -1,178 +0,0 @@
-/* 
- * Driver for PLX Technology PCI9000-series host bridge.
- *
- * Copyright (C) 1997, 1998, 1999, 2000 FutureTV Labs Ltd
- */
-
-/*
- * 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/kernel.h>
-#include <linux/pci.h>
-#include <linux/init.h>
-
-#include <asm/hardware.h>
-#include <asm/io.h>
-#include <asm/ptrace.h>
-#include <asm/irq.h>
-#include <asm/mach/pci.h>
-
-/*
- * Since the following functions are all very similar, the common parts
- * are pulled out into these macros.
- */
-
-#define PLX_CLEAR_CONFIG                                               \
-       __raw_writel(0, PLX_BASE + 0xac);                               \
-       local_irq_restore(flags); }
-
-#define PLX_SET_CONFIG                                                 \
-       { unsigned long flags;                                          \
-       local_irq_save(flags);                                          \
-       __raw_writel((1<<31 | (bus->number << 16)                       \
-               | (devfn << 8) | (where & ~3)                           \
-               | ((bus->number == 0)?0:1)), PLX_BASE + 0xac);          \
-
-#define PLX_CONFIG_WRITE(size)                                         \
-       PLX_SET_CONFIG                                                  \
-       __raw_write##size(value, PCIO_BASE + (where & 3));              \
-       if (__raw_readw(PLX_BASE + 0x6) & 0x2000)                       \
-               __raw_writew(0x2000, PLX_BASE + 0x6);                   \
-       PLX_CLEAR_CONFIG                                                \
-       return PCIBIOS_SUCCESSFUL;
-
-#define PLX_CONFIG_READ(size)                                          \
-       PLX_SET_CONFIG                                                  \
-       *value = __raw_read##size(PCIO_BASE + (where & 3));             \
-       if (__raw_readw(PLX_BASE + 0x6) & 0x2000) {                     \
-               __raw_writew(0x2000, PLX_BASE + 0x6);                   \
-               *value = 0xffffffffUL;                                  \
-       }                                                               \
-       PLX_CLEAR_CONFIG                                                \
-       return PCIBIOS_SUCCESSFUL;
-
-/* Configuration space access routines */
-
-static int 
-plx90x0_read_config (struct pci_bus *bus, unsigned int devfn, int where,
-                    int where, int size, u32 *value)
-{
-       switch (size) {
-       case 1:
-               PLX_CONFIG_READ(b)
-               break;
-       case 2:
-               PLX_CONFIG_READ(w)
-               break;
-       case 4:
-               PLX_CONFIG_READ(l)
-               break;
-       }
-       return PCIBIOS_SUCCESSFUL;
-}
-
-static int 
-plx90x0_write_config (struct pci_bus *bus, unsigned int devfn, int where,
-                     int where, int size, u32 value)
-{
-       switch (size) {
-       case 1:
-               PLX_CONFIG_WRITE(b)
-               break;
-       case 2:
-               PLX_CONFIG_WRITE(w)
-               break;
-       case 4:
-               PLX_CONFIG_WRITE(l)
-               break;
-       }
-       return PCIBIOS_SUCCESSFUL;
-}
-
-static struct pci_ops plx90x0_ops = 
-{
-       .read   = plx90x0_read_config,
-       .write  = plx90x0_write_config,
-};
-
-static void 
-plx_syserr_handler(int irq, void *handle, struct pt_regs *regs)
-{
-       printk("PLX90x0: machine check %04x (pc=%08lx)\n", 
-              readw(PLX_BASE + 6), regs->ARM_pc);
-       __raw_writew(0xf000, PLX_BASE + 6);
-}
-
-/*
- * Initialise the PCI system.
- */
-
-void __init
-plx90x0_init(struct arm_sysdata *sysdata)
-{
-       static const unsigned long int base = PLX_BASE;
-       char *what;
-       unsigned long bar = (unsigned long)virt_to_bus((void *)PAGE_OFFSET);
-
-       /* Have a sniff around and see which PLX device is present. */
-       unsigned long id = __raw_readl(base + 0xf0);
-       
-#if 0
-       /* This check was a good idea, but can fail.  The PLX9060 puts no
-          default value in these registers unless NB# is asserted (which it
-          isn't on these cards).  */
-       if ((id & 0xffff) != PCI_VENDOR_ID_PLX)
-               return;         /* Nothing found */
-#endif
-
-       /* Found one - now work out what it is. */
-       switch (id >> 16) {
-       case 0:         /* PCI_DEVICE_ID_PLX_9060 */
-               what = "PCI9060";
-               break;
-       case PCI_DEVICE_ID_PLX_9060ES:
-               what = "PCI9060ES";
-               break;
-       case PCI_DEVICE_ID_PLX_9060SD:
-               what = "PCI9060SD";             /* uhuhh.. */
-               break;
-       case PCI_DEVICE_ID_PLX_9080:
-               what = "PCI9080";
-               break;
-       default:
-               printk("PCI: Unknown PLX device %04lx found -- ignored.\n",
-                      id >> 16);
-               return;
-       }
-       
-       printk("PCI: PLX Technology %s host bridge found.\n", what);
-       
-       /* Now set it up for both master and slave accesses. */
-       __raw_writel(0xffff0147,        base + 0x4);
-       __raw_writeb(32,                base + 0xd);
-       __raw_writel(0x8 | bar,         base + 0x18);
-       __raw_writel(0xf8000008,        base + 0x80);
-       __raw_writel(0x40000001,        base + 0x84);
-       __raw_writel(0,                 base + 0x88);
-       __raw_writel(0,                 base + 0x8c);
-       __raw_writel(0x11,              base + 0x94);
-       __raw_writel(0xC3 + (4 << 28)
-               + (8 << 11) + (1 << 10)
-                    + (1 << 24),       base + 0x98);
-       __raw_writel(0xC0000000,        base + 0x9c);
-       __raw_writel(PLX_MEM_START,     base + 0xa0);
-       __raw_writel(PLX_IO_START,      base + 0xa4);
-       __raw_writel(0x3,               base + 0xa8);
-       __raw_writel(0,                 base + 0xac);
-       __raw_writel(0x10001,           base + 0xe8);
-       __raw_writel(0x8000767e,        base + 0xec);
-       
-       request_irq(IRQ_SYSERR, plx_syserr_handler, 0, 
-                   "system error", NULL);
-
-       pci_scan_bus(0, &plx90x0_ops, sysdata);
-}
diff --git a/arch/arm/configs/adi_evb_defconfig b/arch/arm/configs/adi_evb_defconfig
deleted file mode 100644 (file)
index bae4866..0000000
+++ /dev/null
@@ -1,678 +0,0 @@
-#
-# Automatically generated by make menuconfig: don't edit
-#
-CONFIG_ARM=y
-# CONFIG_EISA is not set
-# CONFIG_SBUS is not set
-# CONFIG_MCA is not set
-CONFIG_UID16=y
-CONFIG_RWSEM_GENERIC_SPINLOCK=y
-# CONFIG_RWSEM_XCHGADD_ALGORITHM is not set
-# CONFIG_GENERIC_BUST_SPINLOCK is not set
-# CONFIG_GENERIC_ISA_DMA is not set
-
-#
-# Code maturity level options
-#
-CONFIG_EXPERIMENTAL=y
-# CONFIG_OBSOLETE is not set
-
-#
-# Loadable module support
-#
-CONFIG_MODULES=y
-# CONFIG_MODVERSIONS is not set
-# CONFIG_KMOD is not set
-
-#
-# System Type
-#
-CONFIG_ARCH_ADIFCC=y
-# CONFIG_ARCH_ARCA5K is not set
-# CONFIG_ARCH_CLPS7500 is not set
-# CONFIG_ARCH_CLPS711X is not set
-# CONFIG_ARCH_CO285 is not set
-# CONFIG_ARCH_EBSA110 is not set
-# CONFIG_ARCH_CAMELOT is not set
-# CONFIG_ARCH_FOOTBRIDGE is not set
-# CONFIG_ARCH_INTEGRATOR is not set
-# CONFIG_ARCH_IOP310 is not set
-# CONFIG_ARCH_L7200 is not set
-# CONFIG_ARCH_RPC is not set
-# CONFIG_ARCH_SA1100 is not set
-# CONFIG_ARCH_SHARK is not set
-
-#
-# Archimedes/A5000 Implementations
-#
-# CONFIG_ARCH_ARC is not set
-# CONFIG_ARCH_A5K is not set
-
-#
-# Footbridge Implementations
-#
-# CONFIG_ARCH_CATS is not set
-# CONFIG_ARCH_PERSONAL_SERVER is not set
-# CONFIG_ARCH_EBSA285_ADDIN is not set
-# CONFIG_ARCH_EBSA285_HOST is not set
-# CONFIG_ARCH_NETWINDER is not set
-
-#
-# SA11x0 Implementations
-#
-# CONFIG_SA1100_ASSABET is not set
-# CONFIG_ASSABET_NEPONSET is not set
-# CONFIG_SA1100_ADSBITSY is not set
-# CONFIG_SA1100_BRUTUS is not set
-# CONFIG_SA1100_CERF is not set
-# CONFIG_SA1100_H3600 is not set
-# CONFIG_SA1100_EXTENEX1 is not set
-# CONFIG_SA1100_FLEXANET is not set
-# CONFIG_SA1100_FREEBIRD is not set
-# CONFIG_SA1100_GRAPHICSCLIENT is not set
-# CONFIG_SA1100_GRAPHICSMASTER is not set
-# CONFIG_SA1100_JORNADA720 is not set
-# CONFIG_SA1100_HUW_WEBPANEL is not set
-# CONFIG_SA1100_ITSY is not set
-# CONFIG_SA1100_LART is not set
-# CONFIG_SA1100_NANOENGINE is not set
-# CONFIG_SA1100_OMNIMETER is not set
-# CONFIG_SA1100_PANGOLIN is not set
-# CONFIG_SA1100_PLEB is not set
-# CONFIG_SA1100_SHERMAN is not set
-# CONFIG_SA1100_SIMPAD is not set
-# CONFIG_SA1100_PFS168 is not set
-# CONFIG_SA1100_VICTOR is not set
-# CONFIG_SA1100_XP860 is not set
-# CONFIG_SA1100_YOPY is not set
-# CONFIG_SA1100_USB is not set
-# CONFIG_SA1100_USB_NETLINK is not set
-# CONFIG_SA1100_USB_CHAR is not set
-
-#
-# CLPS711X/EP721X Implementations
-#
-# CONFIG_ARCH_CDB89712 is not set
-# CONFIG_ARCH_CLEP7312 is not set
-# CONFIG_ARCH_EDB7211 is not set
-# CONFIG_ARCH_P720T is not set
-# CONFIG_ARCH_EP7211 is not set
-# CONFIG_ARCH_EP7212 is not set
-CONFIG_ARCH_ADI_EVB=y
-CONFIG_XSCALE_PMU_TIMER=y
-# CONFIG_ARCH_ACORN is not set
-# CONFIG_FOOTBRIDGE is not set
-# CONFIG_FOOTBRIDGE_HOST is not set
-# CONFIG_FOOTBRIDGE_ADDIN is not set
-CONFIG_CPU_32=y
-# CONFIG_CPU_26 is not set
-# CONFIG_CPU_32v3 is not set
-# CONFIG_CPU_32v4 is not set
-# CONFIG_CPU_ARM610 is not set
-# CONFIG_CPU_ARM710 is not set
-# CONFIG_CPU_ARM720T is not set
-# CONFIG_CPU_ARM920T is not set
-# CONFIG_CPU_ARM926T is not set
-# CONFIG_CPU_ARM1020 is not set
-# CONFIG_CPU_SA110 is not set
-# CONFIG_CPU_SA1100 is not set
-CONFIG_CPU_32v4=y
-CONFIG_CPU_XSCALE=y
-CONFIG_ARM_THUMB=y
-# CONFIG_XSCALE_TOOLS is not set
-CONFIG_XSCALE_WRITE_ALLOC=y
-CONFIG_XSCALE_PMU=y
-CONFIG_ARM_THUMB=y
-# CONFIG_DISCONTIGMEM is not set
-
-#
-# General setup
-#
-# CONFIG_PCI is not set
-# CONFIG_ISA is not set
-# CONFIG_ISA_DMA is not set
-# CONFIG_HOTPLUG is not set
-# CONFIG_PCMCIA is not set
-CONFIG_NET=y
-CONFIG_SYSVIPC=y
-# CONFIG_BSD_PROCESS_ACCT is not set
-CONFIG_SYSCTL=y
-CONFIG_FPE_NWFPE=y
-# CONFIG_FPE_FASTFPE is not set
-CONFIG_KCORE_ELF=y
-# CONFIG_KCORE_AOUT is not set
-CONFIG_BINFMT_AOUT=y
-CONFIG_BINFMT_ELF=y
-# CONFIG_BINFMT_MISC is not set
-# CONFIG_PM is not set
-# CONFIG_ARTHUR is not set
-CONFIG_CMDLINE="console=ttyS0,115200 root=/dev/mtdblock1 mem=32M initrd=0xc0800000,3M"
-CONFIG_ALIGNMENT_TRAP=y
-
-#
-# Parallel port support
-#
-# CONFIG_PARPORT is not set
-
-#
-# Memory Technology Devices (MTD)
-#
-CONFIG_MTD=y
-# CONFIG_MTD_DEBUG is not set
-CONFIG_MTD_PARTITIONS=y
-# CONFIG_MTD_REDBOOT_PARTS is not set
-# CONFIG_MTD_BOOTLDR_PARTS is not set
-# CONFIG_MTD_AFS_PARTS is not set
-CONFIG_MTD_CHAR=y
-CONFIG_MTD_BLOCK=y
-# CONFIG_FTL is not set
-# CONFIG_NFTL is not set
-
-#
-# RAM/ROM/Flash chip drivers
-#
-CONFIG_MTD_CFI=y
-# CONFIG_MTD_JEDECPROBE is not set
-CONFIG_MTD_GEN_PROBE=y
-# CONFIG_MTD_CFI_ADV_OPTIONS is not set
-CONFIG_MTD_CFI_INTELEXT=y
-# CONFIG_MTD_CFI_AMDSTD is not set
-# CONFIG_MTD_RAM is not set
-# CONFIG_MTD_ROM is not set
-# CONFIG_MTD_ABSENT is not set
-# CONFIG_MTD_OBSOLETE_CHIPS is not set
-# CONFIG_MTD_AMDSTD is not set
-# CONFIG_MTD_SHARP is not set
-# CONFIG_MTD_JEDEC is not set
-
-#
-# Mapping drivers for chip access
-#
-# CONFIG_MTD_PHYSMAP is not set
-# CONFIG_MTD_NORA is not set
-# CONFIG_MTD_ARM_INTEGRATOR is not set
-# CONFIG_MTD_CDB89712 is not set
-# CONFIG_MTD_SA1100 is not set
-# CONFIG_MTD_DC21285 is not set
-# CONFIG_MTD_IQ80310 is not set
-CONFIG_MTD_ADI_EVB=y
-# CONFIG_MTD_PCI is not set
-
-#
-# Self-contained MTD device drivers
-#
-# CONFIG_MTD_PMC551 is not set
-# CONFIG_MTD_SLRAM is not set
-# CONFIG_MTD_MTDRAM is not set
-# CONFIG_MTD_BLKMTD is not set
-# CONFIG_MTD_DOC1000 is not set
-# CONFIG_MTD_DOC2000 is not set
-# CONFIG_MTD_DOC2001 is not set
-# CONFIG_MTD_DOCPROBE is not set
-
-#
-# NAND Flash Device Drivers
-#
-# CONFIG_MTD_NAND is not set
-
-#
-# Plug and Play configuration
-#
-# CONFIG_PNP is not set
-# CONFIG_ISAPNP is not set
-# CONFIG_PNPBIOS is not set
-
-#
-# Block devices
-#
-# CONFIG_BLK_DEV_FD is not set
-# CONFIG_BLK_DEV_XD is not set
-# CONFIG_PARIDE is not set
-# CONFIG_BLK_CPQ_DA is not set
-# CONFIG_BLK_CPQ_CISS_DA is not set
-# CONFIG_CISS_SCSI_TAPE is not set
-# CONFIG_BLK_DEV_DAC960 is not set
-# CONFIG_BLK_DEV_LOOP is not set
-# CONFIG_BLK_DEV_NBD is not set
-CONFIG_BLK_DEV_RAM=y
-CONFIG_BLK_DEV_RAM_SIZE=8192
-CONFIG_BLK_DEV_INITRD=y
-
-#
-# Multi-device support (RAID and LVM)
-#
-# CONFIG_MD is not set
-# CONFIG_BLK_DEV_MD is not set
-# CONFIG_MD_LINEAR is not set
-# CONFIG_MD_RAID0 is not set
-# CONFIG_MD_RAID1 is not set
-# CONFIG_MD_RAID5 is not set
-# CONFIG_MD_MULTIPATH is not set
-# CONFIG_BLK_DEV_LVM is not set
-
-#
-# Networking options
-#
-# CONFIG_PACKET is not set
-CONFIG_NETLINK=y
-CONFIG_RTNETLINK=y
-# CONFIG_NETLINK_DEV is not set
-# CONFIG_NETFILTER is not set
-# CONFIG_FILTER is not set
-CONFIG_UNIX=y
-CONFIG_INET=y
-# CONFIG_IP_MULTICAST is not set
-# CONFIG_IP_ADVANCED_ROUTER is not set
-CONFIG_IP_PNP=y
-# CONFIG_IP_PNP_DHCP is not set
-CONFIG_IP_PNP_BOOTP=y
-# CONFIG_IP_PNP_RARP is not set
-# CONFIG_NET_IPIP is not set
-# CONFIG_NET_IPGRE is not set
-# CONFIG_ARPD is not set
-# CONFIG_INET_ECN is not set
-# CONFIG_SYN_COOKIES is not set
-# CONFIG_IPV6 is not set
-# CONFIG_KHTTPD is not set
-# CONFIG_ATM is not set
-# CONFIG_IPX is not set
-# CONFIG_ATALK is not set
-# CONFIG_DECNET is not set
-# CONFIG_BRIDGE is not set
-# CONFIG_X25 is not set
-# CONFIG_LAPB is not set
-# CONFIG_LLC is not set
-# CONFIG_NET_DIVERT is not set
-# CONFIG_ECONET is not set
-# CONFIG_WAN_ROUTER is not set
-# CONFIG_NET_FASTROUTE is not set
-# CONFIG_NET_HW_FLOWCONTROL is not set
-
-#
-# QoS and/or fair queueing
-#
-# CONFIG_NET_SCHED is not set
-
-#
-# Network device support
-#
-CONFIG_NETDEVICES=y
-
-#
-# ARCnet devices
-#
-# CONFIG_ARCNET is not set
-# CONFIG_DUMMY is not set
-# CONFIG_BONDING is not set
-# CONFIG_EQUALIZER is not set
-# CONFIG_TUN is not set
-# CONFIG_ETHERTAP is not set
-
-#
-# Ethernet (10 or 100Mbit)
-#
-CONFIG_NET_ETHERNET=y
-# CONFIG_ARM_AM79C961A is not set
-# CONFIG_SUNLANCE is not set
-# CONFIG_SUNBMAC is not set
-# CONFIG_SUNQE is not set
-# CONFIG_SUNLANCE is not set
-# CONFIG_SUNGEM is not set
-# CONFIG_NET_VENDOR_3COM is not set
-# CONFIG_LANCE is not set
-# CONFIG_NET_VENDOR_SMC is not set
-# CONFIG_NET_VENDOR_RACAL is not set
-# CONFIG_NET_ISA is not set
-# CONFIG_NET_PCI is not set
-# CONFIG_NET_POCKET is not set
-
-#
-# Ethernet (1000 Mbit)
-#
-# CONFIG_ACENIC is not set
-# CONFIG_DL2K is not set
-# CONFIG_MYRI_SBUS is not set
-# CONFIG_NS83820 is not set
-# CONFIG_HAMACHI is not set
-# CONFIG_YELLOWFIN is not set
-# CONFIG_SK98LIN is not set
-# CONFIG_FDDI is not set
-# CONFIG_HIPPI is not set
-# CONFIG_PLIP is not set
-# CONFIG_PPP is not set
-# CONFIG_SLIP is not set
-
-#
-# Wireless LAN (non-hamradio)
-#
-# CONFIG_NET_RADIO is not set
-
-#
-# Token Ring devices
-#
-# CONFIG_TR is not set
-# CONFIG_NET_FC is not set
-# CONFIG_RCPCI is not set
-# CONFIG_SHAPER is not set
-
-#
-# Wan interfaces
-#
-# CONFIG_WAN is not set
-
-#
-# Amateur Radio support
-#
-# CONFIG_HAMRADIO is not set
-
-#
-# IrDA (infrared) support
-#
-# CONFIG_IRDA is not set
-
-#
-# ATA/IDE/MFM/RLL support
-#
-# CONFIG_IDE is not set
-# CONFIG_BLK_DEV_HD is not set
-
-#
-# SCSI support
-#
-# CONFIG_SCSI is not set
-
-#
-# I2O device support
-#
-# CONFIG_I2O is not set
-# CONFIG_I2O_BLOCK is not set
-# CONFIG_I2O_LAN is not set
-# CONFIG_I2O_SCSI is not set
-# CONFIG_I2O_PROC is not set
-
-#
-# ISDN subsystem
-#
-# CONFIG_ISDN is not set
-
-#
-# Input core support
-#
-# CONFIG_INPUT is not set
-# CONFIG_INPUT_KEYBDEV is not set
-# CONFIG_INPUT_MOUSEDEV is not set
-# CONFIG_INPUT_JOYDEV is not set
-# CONFIG_INPUT_EVDEV is not set
-
-#
-# Character devices
-#
-# CONFIG_VT is not set
-CONFIG_SERIAL=y
-CONFIG_SERIAL_CONSOLE=y
-# CONFIG_SERIAL_EXTENDED is not set
-# CONFIG_SERIAL_NONSTANDARD is not set
-
-#
-# Serial drivers
-#
-# CONFIG_SERIAL_AMBA is not set
-# CONFIG_SERIAL_AMBA_CONSOLE is not set
-# CONFIG_SERIAL_CLPS711X is not set
-# CONFIG_SERIAL_CLPS711X_CONSOLE is not set
-# CONFIG_SERIAL_21285 is not set
-# CONFIG_SERIAL_21285_OLD is not set
-# CONFIG_SERIAL_21285_CONSOLE is not set
-# CONFIG_SERIAL_UART00 is not set
-# CONFIG_SERIAL_UART00_CONSOLE is not set
-# CONFIG_SERIAL_SA1100 is not set
-# CONFIG_SERIAL_SA1100_CONSOLE is not set
-# CONFIG_SERIAL_8250 is not set
-# CONFIG_SERIAL_8250_CONSOLE is not set
-# CONFIG_SERIAL_8250_EXTENDED is not set
-# CONFIG_SERIAL_8250_MANY_PORTS is not set
-# CONFIG_SERIAL_8250_SHARE_IRQ is not set
-# CONFIG_SERIAL_8250_DETECT_IRQ is not set
-# CONFIG_SERIAL_8250_MULTIPORT is not set
-# CONFIG_SERIAL_8250_HUB6 is not set
-CONFIG_UNIX98_PTYS=y
-CONFIG_UNIX98_PTY_COUNT=256
-
-#
-# I2C support
-#
-# CONFIG_I2C is not set
-
-#
-# L3 serial bus support
-#
-# CONFIG_L3 is not set
-# CONFIG_L3_ALGOBIT is not set
-# CONFIG_L3_BIT_SA1100_GPIO is not set
-# CONFIG_L3_SA1111 is not set
-# CONFIG_BIT_SA1100_GPIO is not set
-
-#
-# Mice
-#
-# CONFIG_BUSMOUSE is not set
-CONFIG_MOUSE=y
-CONFIG_PSMOUSE=y
-# CONFIG_82C710_MOUSE is not set
-# CONFIG_PC110_PAD is not set
-
-#
-# Joysticks
-#
-# CONFIG_INPUT_GAMEPORT is not set
-# CONFIG_QIC02_TAPE is not set
-
-#
-# Watchdog Cards
-#
-# CONFIG_WATCHDOG is not set
-# CONFIG_INTEL_RNG is not set
-# CONFIG_NVRAM is not set
-# CONFIG_RTC is not set
-# CONFIG_DTLK is not set
-# CONFIG_R3964 is not set
-# CONFIG_APPLICOM is not set
-
-#
-# Ftape, the floppy tape device driver
-#
-# CONFIG_FTAPE is not set
-# CONFIG_AGP is not set
-# CONFIG_DRM is not set
-
-#
-# Multimedia devices
-#
-# CONFIG_VIDEO_DEV is not set
-
-#
-# File systems
-#
-# CONFIG_QUOTA is not set
-# CONFIG_AUTOFS_FS is not set
-# CONFIG_AUTOFS4_FS is not set
-# CONFIG_REISERFS_FS is not set
-# CONFIG_REISERFS_CHECK is not set
-# CONFIG_ADFS_FS is not set
-# CONFIG_ADFS_FS_RW is not set
-# CONFIG_AFFS_FS is not set
-# CONFIG_HFS_FS is not set
-# CONFIG_BFS_FS is not set
-# CONFIG_CMS_FS is not set
-# CONFIG_EXT3_FS is not set
-# CONFIG_JBD is not set
-# CONFIG_JBD_DEBUG is not set
-# CONFIG_FAT_FS is not set
-# CONFIG_MSDOS_FS is not set
-# CONFIG_UMSDOS_FS is not set
-# CONFIG_VFAT_FS is not set
-# CONFIG_EFS_FS is not set
-# CONFIG_JFFS_FS is not set
-CONFIG_JFFS2_FS=y
-CONFIG_JFFS2_FS_DEBUG=0
-# CONFIG_CRAMFS is not set
-# CONFIG_TMPFS is not set
-CONFIG_RAMFS=y
-# CONFIG_ISO9660_FS is not set
-# CONFIG_JOLIET is not set
-# CONFIG_ZISOFS is not set
-# CONFIG_MINIX_FS is not set
-# CONFIG_FREEVXFS_FS is not set
-# CONFIG_NTFS_FS is not set
-# CONFIG_NTFS_DEBUG is not set
-# CONFIG_NTFS_RW is not set
-# CONFIG_HPFS_FS is not set
-CONFIG_PROC_FS=y
-# CONFIG_DEVFS_FS is not set
-# CONFIG_DEVFS_MOUNT is not set
-# CONFIG_DEVFS_DEBUG is not set
-CONFIG_DEVPTS_FS=y
-# CONFIG_QNX4FS_FS is not set
-# CONFIG_QNX4FS_RW is not set
-# CONFIG_ROMFS_FS is not set
-CONFIG_EXT2_FS=y
-# CONFIG_SYSV_FS is not set
-# CONFIG_UDF_FS is not set
-# CONFIG_UDF_RW is not set
-# CONFIG_UFS_FS is not set
-# CONFIG_UFS_FS_WRITE is not set
-
-#
-# Network File Systems
-#
-# CONFIG_CODA_FS is not set
-# CONFIG_INTERMEZZO_FS is not set
-# CONFIG_NFS_FS is not set
-# CONFIG_NFS_V3 is not set
-# CONFIG_ROOT_NFS is not set
-# CONFIG_NFSD is not set
-# CONFIG_NFSD_V3 is not set
-# CONFIG_SUNRPC is not set
-# CONFIG_LOCKD is not set
-# CONFIG_SMB_FS is not set
-# CONFIG_NCP_FS is not set
-# CONFIG_NCPFS_PACKET_SIGNING is not set
-# CONFIG_NCPFS_IOCTL_LOCKING is not set
-# CONFIG_NCPFS_STRONG is not set
-# CONFIG_NCPFS_NFS_NS is not set
-# CONFIG_NCPFS_OS2_NS is not set
-# CONFIG_NCPFS_SMALLDOS is not set
-# CONFIG_NCPFS_NLS is not set
-# CONFIG_NCPFS_EXTRAS is not set
-# CONFIG_ZISOFS_FS is not set
-# CONFIG_ZLIB_FS_INFLATE is not set
-
-#
-# Partition Types
-#
-CONFIG_PARTITION_ADVANCED=y
-# CONFIG_ACORN_PARTITION is not set
-# CONFIG_OSF_PARTITION is not set
-# CONFIG_AMIGA_PARTITION is not set
-# CONFIG_ATARI_PARTITION is not set
-# CONFIG_MAC_PARTITION is not set
-# CONFIG_MSDOS_PARTITION is not set
-# CONFIG_LDM_PARTITION is not set
-# CONFIG_SGI_PARTITION is not set
-# CONFIG_ULTRIX_PARTITION is not set
-# CONFIG_SUN_PARTITION is not set
-# CONFIG_SMB_NLS is not set
-# CONFIG_NLS is not set
-
-#
-# Multimedia Capabilities Port drivers
-#
-# CONFIG_MCP is not set
-# CONFIG_MCP_SA1100 is not set
-# CONFIG_MCP_UCB1200 is not set
-# CONFIG_MCP_UCB1200_AUDIO is not set
-# CONFIG_MCP_UCB1200_TS is not set
-
-#
-# USB support
-#
-# CONFIG_USB is not set
-# CONFIG_USB_UHCI is not set
-# CONFIG_USB_UHCI_ALT is not set
-# CONFIG_USB_OHCI is not set
-# CONFIG_USB_OHCI_SA1111 is not set
-# CONFIG_USB_AUDIO is not set
-# CONFIG_USB_BLUETOOTH is not set
-# CONFIG_USB_STORAGE is not set
-# CONFIG_USB_STORAGE_DEBUG is not set
-# CONFIG_USB_STORAGE_DATAFAB is not set
-# CONFIG_USB_STORAGE_FREECOM is not set
-# CONFIG_USB_STORAGE_ISD200 is not set
-# CONFIG_USB_STORAGE_DPCM is not set
-# CONFIG_USB_STORAGE_HP8200e is not set
-# CONFIG_USB_STORAGE_SDDR09 is not set
-# CONFIG_USB_STORAGE_JUMPSHOT is not set
-# CONFIG_USB_ACM is not set
-# CONFIG_USB_PRINTER is not set
-# CONFIG_USB_DC2XX is not set
-# CONFIG_USB_MDC800 is not set
-# CONFIG_USB_SCANNER is not set
-# CONFIG_USB_MICROTEK is not set
-# CONFIG_USB_HPUSBSCSI is not set
-# CONFIG_USB_PEGASUS is not set
-# CONFIG_USB_KAWETH is not set
-# CONFIG_USB_CATC is not set
-# CONFIG_USB_CDCETHER is not set
-# CONFIG_USB_USBNET is not set
-# CONFIG_USB_USS720 is not set
-
-#
-# USB Serial Converter support
-#
-# CONFIG_USB_SERIAL is not set
-# CONFIG_USB_SERIAL_GENERIC is not set
-# CONFIG_USB_SERIAL_BELKIN is not set
-# CONFIG_USB_SERIAL_WHITEHEAT is not set
-# CONFIG_USB_SERIAL_DIGI_ACCELEPORT is not set
-# CONFIG_USB_SERIAL_EMPEG is not set
-# CONFIG_USB_SERIAL_FTDI_SIO is not set
-# CONFIG_USB_SERIAL_VISOR is not set
-# CONFIG_USB_SERIAL_IR is not set
-# CONFIG_USB_SERIAL_EDGEPORT is not set
-# CONFIG_USB_SERIAL_KEYSPAN_PDA is not set
-# CONFIG_USB_SERIAL_KEYSPAN is not set
-# CONFIG_USB_SERIAL_KEYSPAN_USA28 is not set
-# CONFIG_USB_SERIAL_KEYSPAN_USA28X is not set
-# CONFIG_USB_SERIAL_KEYSPAN_USA28XA is not set
-# CONFIG_USB_SERIAL_KEYSPAN_USA28XB is not set
-# CONFIG_USB_SERIAL_KEYSPAN_USA19 is not set
-# CONFIG_USB_SERIAL_KEYSPAN_USA18X is not set
-# CONFIG_USB_SERIAL_KEYSPAN_USA19W is not set
-# CONFIG_USB_SERIAL_KEYSPAN_USA49W is not set
-# CONFIG_USB_SERIAL_MCT_U232 is not set
-# CONFIG_USB_SERIAL_PL2303 is not set
-# CONFIG_USB_SERIAL_CYBERJACK is not set
-# CONFIG_USB_SERIAL_XIRCOM is not set
-# CONFIG_USB_SERIAL_OMNINET is not set
-# CONFIG_USB_RIO500 is not set
-# CONFIG_USB_ID75 is not set
-
-#
-# Bluetooth support
-#
-# CONFIG_BT is not set
-
-#
-# Kernel hacking
-#
-CONFIG_FRAME_POINTER=y
-CONFIG_DEBUG_ERRORS=y
-CONFIG_DEBUG_USER=y
-# CONFIG_DEBUG_INFO is not set
-CONFIG_DEBUG_SLAB=y
-# CONFIG_MAGIC_SYSRQ is not set
-# CONFIG_DEBUG_SPINLOCK is not set
-# CONFIG_NO_PGT_CACHE is not set
-CONFIG_DEBUG_LL=y
-# CONFIG_DEBUG_DC21285_PORT is not set
-# CONFIG_DEBUG_CLPS711X_UART2 is not set
diff --git a/arch/arm/kernel/time-acorn.c b/arch/arm/kernel/time-acorn.c
deleted file mode 100644 (file)
index a4dd9f0..0000000
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- *  linux/arch/arm/kernel/time-acorn.c
- *
- *  Copyright (c) 1996-2000 Russell King.
- *
- * 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.
- *
- *  Changelog:
- *   24-Sep-1996       RMK     Created
- *   10-Oct-1996       RMK     Brought up to date with arch-sa110eval
- *   04-Dec-1997       RMK     Updated for new arch/arm/time.c
- */
-#include <linux/timex.h>
-#include <linux/init.h>
-
-#include <asm/hardware.h>
-#include <asm/io.h>
-#include <asm/hardware/ioc.h>
-
-extern unsigned long (*gettimeoffset)(void);
-
-static unsigned long ioctime_gettimeoffset(void)
-{
-       unsigned int count1, count2, status;
-       long offset;
-
-       ioc_writeb (0, IOC_T0LATCH);
-       barrier ();
-       count1 = ioc_readb(IOC_T0CNTL) | (ioc_readb(IOC_T0CNTH) << 8);
-       barrier ();
-       status = ioc_readb(IOC_IRQREQA);
-       barrier ();
-       ioc_writeb (0, IOC_T0LATCH);
-       barrier ();
-       count2 = ioc_readb(IOC_T0CNTL) | (ioc_readb(IOC_T0CNTH) << 8);
-
-       offset = count2;
-       if (count2 < count1) {
-               /*
-                * We have not had an interrupt between reading count1
-                * and count2.
-                */
-               if (status & (1 << 5))
-                       offset -= LATCH;
-       } else if (count2 > count1) {
-               /*
-                * We have just had another interrupt between reading
-                * count1 and count2.
-                */
-               offset -= LATCH;
-       }
-
-       offset = (LATCH - offset) * (tick_nsec / 1000);
-       return (offset + LATCH/2) / LATCH;
-}
-
-void __init ioctime_init(void)
-{
-       ioc_writeb(LATCH & 255, IOC_T0LTCHL);
-       ioc_writeb(LATCH >> 8, IOC_T0LTCHH);
-       ioc_writeb(0, IOC_T0GO);
-
-       gettimeoffset = ioctime_gettimeoffset;
-}
diff --git a/arch/arm/mach-adifcc/Makefile b/arch/arm/mach-adifcc/Makefile
deleted file mode 100644 (file)
index d8c1959..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
-#
-# Makefile for the linux kernel.
-#
-
-# Object file lists.
-
-obj-y                  := arch.o irq.o mm.o
-obj-m                  :=
-obj-n                  :=
-obj-                   :=
-
diff --git a/arch/arm/mach-adifcc/arch.c b/arch/arm/mach-adifcc/arch.c
deleted file mode 100644 (file)
index bfc5955..0000000
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- *  linux/arch/arm/mach-adifcc/arch.c
- *
- *  Copyright (C) 2001 MontaVista Software, Inc.
- *
- * 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.
- */
-#include <linux/config.h>
-#include <linux/init.h>
-#include <linux/major.h>
-#include <linux/fs.h>
-
-#include <asm/setup.h>
-#include <asm/memory.h>
-#include <asm/hardware.h>
-#include <asm/mach-types.h>
-#include <asm/mach/arch.h>
-
-extern void adifcc_map_io(void);
-extern void adifcc_init_irq(void);
-
-#ifdef CONFIG_ARCH_ADI_EVB
-MACHINE_START(ADI_EVB, "ADI 80200FCC Evaluation Board")
-       MAINTAINER("MontaVista Software Inc.")
-       BOOT_MEM(0xc0000000, 0x00400000, 0xff400000)
-       MAPIO(adifcc_map_io)
-       INITIRQ(adifcc_init_irq)
-MACHINE_END
-#endif
-
diff --git a/arch/arm/mach-adifcc/irq.c b/arch/arm/mach-adifcc/irq.c
deleted file mode 100644 (file)
index 4163c60..0000000
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * linux/arch/arm/mach-xscale/irq.c
- *
- * Author:  Deepak Saxena
- * Copyright:   (C) 2001 MontaVista Software Inc.
- *
- * 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.
- *
- * Based on IOP80310 code.  Currently there's nothing more than the
- * 80200 on chip interrupts. That'll change once the hardware adds
- * support for PCI though.
- */
-#include <linux/init.h>
-#include <linux/interrupt.h>
-
-#include <asm/mach/irq.h>
-#include <asm/irq.h>
-#include <asm/hardware.h>
-
-static void xs80200_irq_mask (unsigned int irq)
-{
-       long INTCTL;
-       asm ("mrc p13, 0, %0, c0, c0, 0" : "=r" (INTCTL));
-       switch (irq) {
-           case IRQ_XS80200_BCU:     INTCTL &= ~(1<<3); break;
-           case IRQ_XS80200_PMU:     INTCTL &= ~(1<<2); break;
-           case IRQ_XS80200_EXTIRQ:  INTCTL &= ~(1<<1); break;
-           case IRQ_XS80200_EXTFIQ:  INTCTL &= ~(1<<0); break;
-       }
-       asm ("mcr p13, 0, %0, c0, c0, 0" : : "r" (INTCTL));
-}
-
-static void xs80200_irq_unmask (unsigned int irq)
-{
-       long INTCTL;
-       asm ("mrc p13, 0, %0, c0, c0, 0" : "=r" (INTCTL));
-       switch (irq) {
-           case IRQ_XS80200_BCU:       INTCTL |= (1<<3); break;
-           case IRQ_XS80200_PMU:       INTCTL |= (1<<2); break;
-           case IRQ_XS80200_EXTIRQ:    INTCTL |= (1<<1); break;
-           case IRQ_XS80200_EXTFIQ:    INTCTL |= (1<<0); break;
-       }
-       asm ("mcr p13, 0, %0, c0, c0, 0" : : "r" (INTCTL));
-}
-
-void __init adifcc_init_irq(void)
-{
-       int i;
-
-       for (i = 0; i < NR_XS80200_IRQS; i++) {
-               irq_desc[i].valid       = 1;
-               irq_desc[i].probe_ok    = 0;
-               irq_desc[i].mask_ack    = xs80200_irq_mask;
-               irq_desc[i].mask        = xs80200_irq_mask;
-               irq_desc[i].unmask      = xs80200_irq_unmask;
-       }
-}
-
-
diff --git a/arch/arm/mach-adifcc/mm.c b/arch/arm/mach-adifcc/mm.c
deleted file mode 100644 (file)
index a81a979..0000000
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- *  linux/arch/arm/mach-xscale/mm.c
- */
-#include <linux/kernel.h>
-#include <linux/mm.h>
-#include <linux/init.h>
-
-#include <asm/io.h>
-#include <asm/pgtable.h>
-#include <asm/page.h>
-
-#include <asm/mach/map.h>
-
-
-static struct map_desc adifcc_io_desc[] __initdata = {
- /* on-board devices */
- { 0xff400000,   0x00400000,   0x00300000,   MT_DEVICE }
-};
-
-void __init adifcc_map_io(void)
-{
-       iotable_init(adifcc_io_desc, ARRAY_SIZE(adifcc_io_desc));
-}
diff --git a/arch/arm/mach-ftvpci/Makefile b/arch/arm/mach-ftvpci/Makefile
deleted file mode 100644 (file)
index 8b1ad14..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-#
-# Makefile for the linux kernel.
-#
-
-# Object file lists.
-
-obj-y                  := core.o
-obj-m                  :=
-obj-n                  :=
-obj-                   :=
-
-obj-$(CONFIG_PCI)      += pci.o
-obj-$(CONFIG_LEDS)     += leds.o
diff --git a/arch/arm/mach-ftvpci/core.c b/arch/arm/mach-ftvpci/core.c
deleted file mode 100644 (file)
index ea6d5c3..0000000
+++ /dev/null
@@ -1,96 +0,0 @@
-/*
- *  linux/arch/arm/mach-ftvpci/core.c
- *
- *  Architecture specific fixups.
- *
- * 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/kernel.h>
-#include <linux/mm.h>
-#include <linux/init.h>
-
-#include <asm/setup.h>
-#include <asm/mach-types.h>
-
-#include <asm/mach/arch.h>
-#include <asm/mach/map.h>
-#include <asm/irq.h>
-#include <asm/io.h>
-#include <asm/pgtable.h>
-#include <asm/page.h>
-
-extern unsigned long soft_irq_mask;
-
-static const unsigned char irq_cmd[] =
-{
-       INTCONT_IRQ_DUART,
-       INTCONT_IRQ_PLX,
-       INTCONT_IRQ_D,
-       INTCONT_IRQ_C,
-       INTCONT_IRQ_B,
-       INTCONT_IRQ_A,
-       INTCONT_IRQ_SYSERR
-};
-
-static void ftvpci_mask_irq(unsigned int irq)
-{
-       __raw_writel(irq_cmd[irq], INTCONT_BASE);
-       soft_irq_mask &= ~(1<<irq);
-}
-
-static void ftvpci_unmask_irq(unsigned int irq)
-{
-       soft_irq_mask |= (1<<irq);
-       __raw_writel(irq_cmd[irq] | 1, INTCONT_BASE);
-}
-static void __init ftvpci_init_irq(void)
-{
-       unsigned int i;
-
-       /* Mask all FIQs */
-       __raw_writel(INTCONT_FIQ_PLX, INTCONT_BASE);
-       __raw_writel(INTCONT_FIQ_D, INTCONT_BASE);
-       __raw_writel(INTCONT_FIQ_C, INTCONT_BASE);
-       __raw_writel(INTCONT_FIQ_B, INTCONT_BASE);
-       __raw_writel(INTCONT_FIQ_A, INTCONT_BASE);
-       __raw_writel(INTCONT_FIQ_SYSERR, INTCONT_BASE);
-
-       /* Disable all interrupts initially. */
-       for (i = 0; i < NR_IRQS; i++) {
-               if (i >= FIRST_IRQ && i <= LAST_IRQ) {
-                       irq_desc[i].valid       = 1;
-                       irq_desc[i].probe_ok    = 1;
-                       irq_desc[i].mask_ack    = ftvpci_mask_irq;
-                       irq_desc[i].mask        = ftvpci_mask_irq;
-                       irq_desc[i].unmask      = ftvpci_unmask_irq;
-                       ftvpci_mask_irq(i);
-               } else {
-                       irq_desc[i].valid       = 0;
-                       irq_desc[i].probe_ok    = 0;
-               }       
-       }               
-}
-
-static struct map_desc ftvpci_io_desc[] __initdata = {
-       { INTCONT_BASE, INTCONT_START,  0x00001000, MT_DEVICE },
-       { PLX_BASE,     PLX_START,      0x00001000, MT_DEVICE },
-       { PCIO_BASE,    PLX_IO_START,   0x00100000, MT_DEVICE },
-       { DUART_BASE,   DUART_START,    0x00001000, MT_DEVICE },
-       { STATUS_BASE,  STATUS_START,   0x00001000, MT_DEVICE }
-};
-
-static void __init ftvpci_map_io(void)
-{
-       iotable_init(ftvpci_io_desc, ARRAY_SIZE(ftvpci_io_desc));
-}
-
-MACHINE_START(NEXUSPCI, "FTV/PCI")
-       MAINTAINER("Philip Blundell")
-       BOOT_MEM(0x40000000, 0x10000000, 0xe0000000)
-       MAPIO(ftvpci_map_io)
-       INITIRQ(ftvpci_init_irq)
-MACHINE_END
diff --git a/arch/arm/mach-ftvpci/leds.c b/arch/arm/mach-ftvpci/leds.c
deleted file mode 100644 (file)
index 64345ac..0000000
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- *  linux/arch/arm/kernel/leds-ftvpci.c
- *
- *  Copyright (C) 1999 FutureTV Labs Ltd
- */
-
-#include <linux/module.h>
-#include <linux/init.h>
-
-#include <asm/hardware.h>
-#include <asm/leds.h>
-#include <asm/system.h>
-#include <asm/io.h>
-
-static void ftvpci_leds_event(led_event_t ledevt)
-{
-       static int led_state = 0;
-
-       switch(ledevt) {
-       case led_timer:
-               led_state ^= 1;
-               raw_writeb(0x1a | led_state, INTCONT_BASE);
-               break;
-
-       default:
-               break;
-       }
-}
-
-static int __init ftvpci_leds_init(void)
-{
-       leds_event = ftvpci_leds_event;
-       return 0;
-}
-
-arch_initcall(ftvpci_leds_init);
diff --git a/arch/arm/mach-ftvpci/pci.c b/arch/arm/mach-ftvpci/pci.c
deleted file mode 100644 (file)
index a9941a1..0000000
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- *  linux/arch/arm/kernel/ftv-pci.c
- *
- *  PCI bios-type initialisation for PCI machines
- *
- *  Bits taken from various places.
- */
-#include <linux/kernel.h>
-#include <linux/pci.h>
-#include <linux/init.h>
-
-#include <asm/irq.h>
-#include <asm/mach/pci.h>
-#include <asm/mach-types.h>
-
-/*
- * Owing to a PCB cockup, issue A backplanes are wired thus:
- *
- * Slot 1    2    3    4    5   Bridge   S1    S2    S3    S4
- * IRQ  D    C    B    A    A            C     B     A     D
- *      A    D    C    B    B            D     C     B     A
- *      B    A    D    C    C            A     D     C     B
- *      C    B    A    D    D            B     A     D     C
- *
- * ID A31  A30  A29  A28  A27   A26      DEV4  DEV5  DEV6  DEV7
- *
- * Actually, this isn't too bad, because with the processor card
- * in slot 5 on the primary bus, the IRQs rotate on both sides
- * as you'd expect.
- */
-
-static int irqmap_ftv[] __initdata = { IRQ_PCI_D, IRQ_PCI_C, IRQ_PCI_B, IRQ_PCI_A };
-
-static int __init ftv_map_irq(struct pci_dev *dev, u8 slot, u8 pin)
-{
-       if (slot > 0x10)
-               slot--;
-       return irqmap_ftv[(slot - pin) & 3];
-}
-
-static u8 __init ftv_swizzle(struct pci_dev *dev, u8 *pin)
-{
-       return PCI_SLOT(dev->devfn);
-}
-
-/* ftv host-specific stuff */
-static struct hw_pci ftv_pci __initdata = {
-       .init           = plx90x0_init,
-       .swizzle        = ftv_swizzle,
-       .map_irq        = ftv_map_irq,
-};
-
-static int __init ftv_pci_init(void)
-{
-       if (machine_is_ftvpci())
-               pci_common_init(&ftv_pci);
-       return 0;
-}
-
-subsys_initcall(ftv_pci_init);
diff --git a/arch/arm/mach-s3c2410/gpio.c b/arch/arm/mach-s3c2410/gpio.c
deleted file mode 100644 (file)
index 450b132..0000000
+++ /dev/null
@@ -1,98 +0,0 @@
-/* linux/arch/arm/mach-s3c2410/gpio.c
- *
- * Copyright (c) 2004 Simtec Electronics
- * Ben Dooks <ben@simtec.co.uk>
- *
- * S3C2410 GPIO support
- *
- * 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
- *
- */
-
-
-#include <linux/init.h>
-#include <linux/module.h>
-#include <linux/interrupt.h>
-#include <linux/ioport.h>
-
-#include <asm/hardware.h>
-#include <asm/irq.h>
-#include <asm/io.h>
-
-#include <asm/arch/regs-gpio.h>
-
-void s3c2410_gpio_cfgpin(unsigned int pin, unsigned int function)
-{
-       unsigned long base = S3C2410_GPIO_BASE(pin);
-       unsigned long shift = 1;
-       unsigned long mask = 3;
-       unsigned long con;
-       unsigned long flags;
-
-       if (pin < S3C2410_GPIO_BANKB) {
-               shift = 0;
-               mask  = 1;
-       }
-
-       mask <<= S3C2410_GPIO_OFFSET(pin);
-
-       local_irq_save(flags);
-
-       con = __raw_readl(base + 0x00);
-
-       con &= mask << shift;
-       con |= function;
-
-       __raw_writel(con, base + 0x00);
-
-       local_irq_restore(flags);
-}
-
-void s3c2410_gpio_pullup(unsigned int pin, unsigned int to)
-{
-       unsigned long base = S3C2410_GPIO_BASE(pin);
-       unsigned long offs = S3C2410_GPIO_OFFSET(pin);
-       unsigned long flags;
-       unsigned long up;
-
-       if (pin < S3C2410_GPIO_BANKB)
-               return;
-
-       local_irq_save(flags);
-
-       up = __raw_readl(base + 0x08);
-       up &= 1 << offs;
-       up |= to << offs;
-       __raw_writel(up, base + 0x08);
-
-       local_irq_restore(flags);
-}
-
-void s3c2410_gpio_setpin(unsigned int pin, unsigned int to)
-{
-       unsigned long base = S3C2410_GPIO_BASE(pin);
-       unsigned long offs = S3C2410_GPIO_OFFSET(pin);
-       unsigned long flags;
-       unsigned long dat;
-
-       local_irq_save(flags);
-
-       dat = __raw_readl(base + 0x04);
-       dat &= 1 << offs;
-       dat |= to << offs;
-       __raw_writel(dat, base + 0x04);
-
-       local_irq_restore(flags);
-}
diff --git a/arch/arm/mach-tbox/Makefile b/arch/arm/mach-tbox/Makefile
deleted file mode 100644 (file)
index 4bd8ebd..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
-#
-# Makefile for the linux kernel.
-#
-
-# Object file lists.
-
-obj-y                  := core.o
-obj-m                  :=
-obj-n                  :=
-obj-                   :=
-
diff --git a/arch/arm/mach-tbox/core.c b/arch/arm/mach-tbox/core.c
deleted file mode 100644 (file)
index db9ac78..0000000
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- *  linux/arch/arm/mm/mm-tbox.c
- *
- *  Copyright (C) 1998, 1999, 2000 Phil Blundell
- *  Copyright (C) 1998-1999 Russell King
- *
- *  Extra MM routines for the Tbox architecture
- */
-#include <linux/kernel.h>
-#include <linux/mm.h>
-#include <linux/init.h>
-
-#include <asm/elf.h>
-#include <asm/setup.h>
-#include <asm/mach-types.h>
-#include <asm/io.h>
-#include <asm/pgtable.h>
-#include <asm/page.h>
-
-#include <asm/mach/arch.h>
-#include <asm/mach/map.h>
-
-extern unsigned long soft_irq_mask;
-
-static void tbox_mask_irq(unsigned int irq)
-{
-       __raw_writel(0, INTCONT + (irq << 2));
-       soft_irq_mask &= ~(1<<irq);
-}
-
-static void tbox_unmask_irq(unsigned int irq)
-{
-       soft_irq_mask |= (1<<irq);
-       __raw_writel(1, INTCONT + (irq << 2));
-}
-static void tbox_init_irq(void)
-{
-       unsigned int i;
-
-       /* Disable all interrupts initially. */
-       for (i = 0; i < NR_IRQS; i++) {
-               if (i <= 10 || (i >= 12 && i <= 13)) {
-                       irq_desc[i].valid       = 1;
-                       irq_desc[i].probe_ok    = 0;
-                       irq_desc[i].mask_ack    = tbox_mask_irq;
-                       irq_desc[i].mask        = tbox_mask_irq;
-                       irq_desc[i].unmask      = tbox_unmask_irq;
-                       tbox_mask_irq(i);
-               } else {
-                       irq_desc[i].valid       = 0;
-                       irq_desc[i].probe_ok    = 0;
-               }
-       }
-}
-
-static struct map_desc tbox_io_desc[] __initdata = {
-       /* See hardware.h for details */
-       { IO_BASE,      IO_START,       0x00100000, MT_DEVICE }
-};
-
-static void __init tbox_map_io(void)
-{
-       iotable_init(tbox_io_desc, ARRAY_SIZE(tbox_io_desc));
-}
-
-MACHINE_START(TBOX, "unknown-TBOX")
-       MAINTAINER("Philip Blundell")
-       BOOT_MEM(0x80000000, 0x00400000, 0xe0000000)
-       MAPIO(tbox_map_io)
-       INITIRQ(tbox_init_irq)
-MACHINE_END
-
diff --git a/arch/cris/kernel/hexify.c b/arch/cris/kernel/hexify.c
deleted file mode 100644 (file)
index daa331f..0000000
+++ /dev/null
@@ -1,31 +0,0 @@
-#include <stdio.h>
-
-
-void main()
-{
-       int c;
-       int comma=0;
-       int count=0;
-       while((c=getchar())!=EOF)
-       {
-               unsigned char x=c;
-               if(comma)
-                       printf(",");
-               else
-                       comma=1;
-               if(count==8)
-               {
-                       count=0;
-                       printf("\n");
-               }
-               if(count==0)
-                       printf("\t");
-               printf("0x%02X",c);
-               count++;
-       }
-       if(count)
-               printf("\n");
-       exit(0);
-}
-
-               
diff --git a/arch/cris/kernel/ksyms.c b/arch/cris/kernel/ksyms.c
deleted file mode 100644 (file)
index 1161a25..0000000
+++ /dev/null
@@ -1,96 +0,0 @@
-#include <linux/config.h>
-#include <linux/module.h>
-#include <linux/user.h>
-#include <linux/elfcore.h>
-#include <linux/sched.h>
-#include <linux/in6.h>
-#include <linux/interrupt.h>
-#include <linux/smp_lock.h>
-#include <linux/pm.h>
-#include <linux/kernel.h>
-#include <linux/string.h>
-#include <linux/tty.h>
-#include <asm/semaphore.h>
-#include <asm/processor.h>
-#include <asm/uaccess.h>
-#include <asm/checksum.h>
-#include <asm/io.h>
-#include <asm/hardirq.h>
-#include <asm/delay.h>
-#include <asm/irq.h>
-#include <asm/pgtable.h>
-
-extern void dump_thread(struct pt_regs *, struct user *);
-extern unsigned long get_cmos_time(void);
-extern void __Udiv(void);
-extern void __Umod(void);
-extern void __Div(void);
-extern void __Mod(void);
-extern void __ashrdi3(void);
-extern void iounmap(void *addr);
-
-/* Platform dependent support */
-EXPORT_SYMBOL(dump_thread);
-EXPORT_SYMBOL(enable_irq);
-EXPORT_SYMBOL(disable_irq);
-EXPORT_SYMBOL(kernel_thread);
-EXPORT_SYMBOL(get_cmos_time);
-EXPORT_SYMBOL(loops_per_usec);
-
-/* String functions */
-EXPORT_SYMBOL(memcmp);
-EXPORT_SYMBOL(memmove);
-EXPORT_SYMBOL(strpbrk);
-EXPORT_SYMBOL(strstr);
-EXPORT_SYMBOL(strcpy);
-EXPORT_SYMBOL(strchr);
-EXPORT_SYMBOL(strcmp);
-EXPORT_SYMBOL(strlen);
-EXPORT_SYMBOL(strcat);
-EXPORT_SYMBOL(strncat);
-EXPORT_SYMBOL(strncmp);
-EXPORT_SYMBOL(strncpy);
-
-/* Math functions */
-EXPORT_SYMBOL(__Udiv);
-EXPORT_SYMBOL(__Umod);
-EXPORT_SYMBOL(__Div);
-EXPORT_SYMBOL(__Mod);
-EXPORT_SYMBOL(__ashrdi3);
-
-/* Memory functions */
-EXPORT_SYMBOL(__ioremap);
-EXPORT_SYMBOL(iounmap);
-
-/* Semaphore functions */
-EXPORT_SYMBOL(__up);
-EXPORT_SYMBOL(__down);
-EXPORT_SYMBOL(__down_interruptible);
-EXPORT_SYMBOL(__down_trylock);
-
-/* Export shadow registers for the CPU I/O pins */
-EXPORT_SYMBOL(genconfig_shadow);
-EXPORT_SYMBOL(port_pa_data_shadow);
-EXPORT_SYMBOL(port_pa_dir_shadow);
-EXPORT_SYMBOL(port_pb_data_shadow);
-EXPORT_SYMBOL(port_pb_dir_shadow);
-EXPORT_SYMBOL(port_pb_config_shadow);
-EXPORT_SYMBOL(port_g_data_shadow);
-
-/* Userspace access functions */
-EXPORT_SYMBOL(__copy_user_zeroing);
-EXPORT_SYMBOL(__copy_user);
-
-/* Cache flush functions */
-EXPORT_SYMBOL(flush_etrax_cache);
-EXPORT_SYMBOL(prepare_rx_descriptor);
-
-#undef memcpy
-#undef memset
-extern void * memset(void *, int, __kernel_size_t);
-extern void * memcpy(void *, const void *, __kernel_size_t);
-EXPORT_SYMBOL_NOVERS(memcpy);
-EXPORT_SYMBOL_NOVERS(memset);
-
-
diff --git a/arch/i386/boot98/Makefile b/arch/i386/boot98/Makefile
deleted file mode 100644 (file)
index ccedae2..0000000
+++ /dev/null
@@ -1,102 +0,0 @@
-#
-# arch/i386/boot/Makefile
-#
-# This file is subject to the terms and conditions of the GNU General Public
-# License.  See the file "COPYING" in the main directory of this archive
-# for more details.
-#
-# Copyright (C) 1994 by Linus Torvalds
-#
-
-# ROOT_DEV specifies the default root-device when making the image.
-# This can be either FLOPPY, CURRENT, /dev/xxxx or empty, in which case
-# the default of FLOPPY is used by 'build'.
-
-ROOT_DEV := CURRENT
-
-# If you want to preset the SVGA mode, uncomment the next line and
-# set SVGA_MODE to whatever number you want.
-# Set it to -DSVGA_MODE=NORMAL_VGA if you just want the EGA/VGA mode.
-# The number is the same as you would ordinarily press at bootup.
-
-SVGA_MODE := -DSVGA_MODE=NORMAL_VGA
-
-# If you want the RAM disk device, define this to be the size in blocks.
-
-#RAMDISK := -DRAMDISK=512
-
-targets                := vmlinux.bin bootsect bootsect.o setup setup.o \
-                  zImage bzImage
-subdir-        := compressed
-
-host-progs     := tools/build
-
-# ---------------------------------------------------------------------------
-
-$(obj)/zImage:  IMAGE_OFFSET := 0x1000
-$(obj)/zImage:  EXTRA_AFLAGS := -traditional $(SVGA_MODE) $(RAMDISK)
-$(obj)/bzImage: IMAGE_OFFSET := 0x100000
-$(obj)/bzImage: EXTRA_AFLAGS := -traditional $(SVGA_MODE) $(RAMDISK) -D__BIG_KERNEL__
-$(obj)/bzImage: BUILDFLAGS   := -b
-
-quiet_cmd_image = BUILD   $@
-cmd_image = $(obj)/tools/build $(BUILDFLAGS) $(obj)/bootsect $(obj)/setup \
-           $(obj)/vmlinux.bin $(ROOT_DEV) > $@
-
-$(obj)/zImage $(obj)/bzImage: $(obj)/bootsect $(obj)/setup \
-                             $(obj)/vmlinux.bin $(obj)/tools/build FORCE
-       $(call if_changed,image)
-       @echo 'Kernel: $@ is ready'
-
-$(obj)/vmlinux.bin: $(obj)/compressed/vmlinux FORCE
-       $(call if_changed,objcopy)
-
-LDFLAGS_bootsect := -Ttext 0x0 -s --oformat binary
-LDFLAGS_setup   := -Ttext 0x0 -s --oformat binary -e begtext
-
-$(obj)/setup $(obj)/bootsect: %: %.o FORCE
-       $(call if_changed,ld)
-
-$(obj)/compressed/vmlinux: FORCE
-       $(Q)$(MAKE) $(build)=$(obj)/compressed IMAGE_OFFSET=$(IMAGE_OFFSET) $@
-
-# Set this if you want to pass append arguments to the zdisk/fdimage kernel
-FDARGS = 
-
-$(obj)/mtools.conf: $(src)/mtools.conf.in
-       sed -e 's|@OBJ@|$(obj)|g' < $< > $@
-
-# This requires write access to /dev/fd0
-zdisk: $(BOOTIMAGE) $(obj)/mtools.conf
-       MTOOLSRC=$(obj)/mtools.conf mformat a:                  ; sync
-       syslinux /dev/fd0                                       ; sync
-       echo 'default linux $(FDARGS)' | \
-               MTOOLSRC=$(src)/mtools.conf mcopy - a:syslinux.cfg
-       MTOOLSRC=$(obj)/mtools.conf mcopy $(BOOTIMAGE) a:linux  ; sync
-
-# These require being root or having syslinux 2.02 or higher installed
-fdimage fdimage144: $(BOOTIMAGE) $(obj)/mtools.conf
-       dd if=/dev/zero of=$(obj)/fdimage bs=1024 count=1440
-       MTOOLSRC=$(obj)/mtools.conf mformat v:                  ; sync
-       syslinux $(obj)/fdimage                                 ; sync
-       echo 'default linux $(FDARGS)' | \
-               MTOOLSRC=$(obj)/mtools.conf mcopy - v:syslinux.cfg
-       MTOOLSRC=$(obj)/mtools.conf mcopy $(BOOTIMAGE) v:linux  ; sync
-
-fdimage288: $(BOOTIMAGE) $(obj)/mtools.conf
-       dd if=/dev/zero of=$(obj)/fdimage bs=1024 count=2880
-       MTOOLSRC=$(obj)/mtools.conf mformat w:                  ; sync
-       syslinux $(obj)/fdimage                                 ; sync
-       echo 'default linux $(FDARGS)' | \
-               MTOOLSRC=$(obj)/mtools.conf mcopy - w:syslinux.cfg
-       MTOOLSRC=$(obj)/mtools.conf mcopy $(BOOTIMAGE) w:linux  ; sync
-
-zlilo: $(BOOTIMAGE)
-       if [ -f $(INSTALL_PATH)/vmlinuz ]; then mv $(INSTALL_PATH)/vmlinuz $(INSTALL_PATH)/vmlinuz.old; fi
-       if [ -f $(INSTALL_PATH)/System.map ]; then mv $(INSTALL_PATH)/System.map $(INSTALL_PATH)/System.old; fi
-       cat $(BOOTIMAGE) > $(INSTALL_PATH)/vmlinuz
-       cp System.map $(INSTALL_PATH)/
-       if [ -x /sbin/lilo ]; then /sbin/lilo; else /etc/lilo/install; fi
-
-install: $(BOOTIMAGE)
-       sh $(src)/install.sh $(KERNELRELEASE) $(BOOTIMAGE) System.map "$(INSTALL_PATH)"
diff --git a/arch/i386/boot98/bootsect.S b/arch/i386/boot98/bootsect.S
deleted file mode 100644 (file)
index dc7d86c..0000000
+++ /dev/null
@@ -1,397 +0,0 @@
-/*     
- *     bootsect.S - boot sector for NEC PC-9800 series
- *
- *     Linux/98 project at Kyoto University Microcomputer Club (KMC)
- *                 FUJITA Norimasa, TAKAI Kousuke  1997-1998
- *     rewritten by TAKAI Kousuke (as86 -> gas), Nov 1999
- *
- * Based on:
- *     bootsect.S              Copyright (C) 1991, 1992 Linus Torvalds
- *     modified by Drew Eckhardt
- *     modified by Bruce Evans (bde)
- *
- * bootsect.S is loaded at 0x1FC00 or 0x1FE00 by the bios-startup routines,
- * and moves itself out of the way to address 0x90000, and jumps there.
- *
- * It then loads 'setup' directly after itself (0x90200), and the system
- * at 0x10000, using BIOS interrupts. 
- *
- * NOTE! currently system is at most (8*65536-4096) bytes long. This should 
- * be no problem, even in the future. I want to keep it simple. This 508 kB
- * kernel size should be enough, especially as this doesn't contain the
- * buffer cache as in minix (and especially now that the kernel is 
- * compressed :-)
- *
- * The loader has been made as simple as possible, and continuous
- * read errors will result in a unbreakable loop. Reboot by hand. It
- * loads pretty fast by getting whole tracks at a time whenever possible.
- */
-
-#include <linux/config.h>              /* for CONFIG_ROOT_RDONLY */
-#include <asm/boot.h>
-
-SETUPSECTS     = 4                     /* default nr of setup-sectors */
-BOOTSEG                = 0x1FC0                /* original address of boot-sector */
-INITSEG                = DEF_INITSEG           /* we move boot here - out of the way */
-SETUPSEG       = DEF_SETUPSEG          /* setup starts here */
-SYSSEG         = DEF_SYSSEG            /* system loaded at 0x10000 (65536) */
-SYSSIZE                = DEF_SYSSIZE           /* system size: # of 16-byte clicks */
-                                       /* to be loaded */
-ROOT_DEV       = 0                     /* ROOT_DEV is now written by "build" */
-SWAP_DEV       = 0                     /* SWAP_DEV is now written by "build" */
-
-#ifndef SVGA_MODE
-#define SVGA_MODE ASK_VGA
-#endif
-
-#ifndef RAMDISK
-#define RAMDISK 0
-#endif 
-
-#ifndef ROOT_RDONLY
-#define ROOT_RDONLY 1
-#endif
-
-/* normal/hireso text VRAM segments */
-#define NORMAL_TEXT    0xa000
-#define HIRESO_TEXT    0xe000
-
-/* bios work area addresses */
-#define EXPMMSZ                0x0401
-#define BIOS_FLAG      0x0501
-#define        DISK_BOOT       0x0584
-
-.code16
-.text
-
-.global _start
-_start:
-
-#if 0 /* hook for debugger, harmless unless BIOS is fussy (old HP) */
-       int     $0x3
-#endif
-       jmp     real_start
-       .ascii  "Linux 98"
-       .word   0
-real_start:
-       xorw    %di, %di                /* %di = 0 */
-       movw    %di, %ss                /* %ss = 0 */
-       movw    $0x03F0, %sp
-       pushw   %cx                     /* for hint */
-
-       movw    $0x0A00, %ax            /* normal mode defaults (80x25) */
-
-       testb   $0x08, %ss:BIOS_FLAG    /* check hi-reso bit */
-       jnz     set_crt_mode
-/*
- * Hi-Reso (high-resolution) machine.
- *
- * Some hi-reso machines have no RAMs on bank 8/A (0x080000 - 0x0BFFFF).
- * On such machines we get two RAM banks from top of protect menory and
- * map them on bank 8/A.
- * These work-around must be done before moving myself on INITSEG (0x090000-).
- */
-       movw    $(HIRESO_TEXT >> 8), %cs:(vram + 1)     /* text VRAM segment */
-
-       /* set memory window */
-       movb    $0x08, %al
-       outb    %al, $0x91              /* map native RAM (if any) */
-       movb    $0x0A, %al
-       outb    %al, $0x93
-
-       /* check bank ram A */
-       pushw   $0xA500
-       popw    %ds
-       movw    (%di), %cx              /* %si == 0 from entry */
-       notw    %cx
-       movw    %cx, (%di)
-
-       movw    $0x43F, %dx             /* cache flush for 486 and up. */
-       movb    $0xA0, %al
-       outb    %al, %dx
-       
-       cmpw    %cx, (%di)
-       je      hireso_done
-
-       /* 
-        * Write test failed; we have no native RAM on 080000h - 0BFFFFh.
-        * Take 256KB of RAM from top of protected memory.
-        */
-       movb    %ss:EXPMMSZ, %al
-       subb    $2, %al                 /* reduce 2 x 128KB */
-       movb    %al, %ss:EXPMMSZ
-       addb    %al, %al
-       addb    $0x10, %al
-       outb    %al, $0x91
-       addb    $2, %al
-       outb    %al, $0x93
-
-hireso_done:
-       movb    $0x10, %al              /* CRT mode 80x31, %ah still 0Ah */
-
-set_crt_mode:
-       int     $0x18                   /* set CRT mode */
-
-       movb    $0x0C, %ah              /* turn on text displaying */
-       int     $0x18
-
-       xorw    %dx, %dx                /* position cursor to home */
-       movb    $0x13, %ah
-       int     $0x18
-
-       movb    $0x11, %ah              /* turn cursor displaying on */
-       int     $0x18
-
-       /* move 1 kilobytes from [BOOTSEG:0000h] to [INITSEG:0000h] */
-       cld
-       xorw    %si, %si
-       pushw   $INITSEG
-       popw    %es
-       movw    $512, %cx               /* %di == 0 from entry */
-       rep
-       cs
-       movsw
-
-       ljmp    $INITSEG, $go
-
-go:
-       pushw   %cs
-       popw    %ds             /* %ds = %cs */
-
-       popw    %dx             /* %dh = saved %ch passed from BIOS */
-       movb    %ss:DISK_BOOT, %al
-       andb    $0xf0, %al      /* %al = Device Address */
-       movb    $18, %ch        /* 18 secs/track,  512 b/sec (1440 KB) */
-       cmpb    $0x30, %al
-       je      try512
-       cmpb    $0x90, %al      /* 1 MB I/F, 1 MB floppy */
-       je      try1.2M
-       cmpb    $0xf0, %al      /* 640 KB I/F, 1 MB floppy */
-       je      try1.2M
-       movb    $9, %ch         /*  9 secs/track,  512 b/sec ( 720 KB) */
-       cmpb    $0x10, %al      /* 1 MB I/F, 640 KB floppy */
-       je      try512
-       cmpb    $0x70, %al      /* 640 KB I/F, 640 KB floppy */
-       jne     error           /* unknown device? */
-
-       /* XXX: Does it make sense to support 8 secs/track, 512 b/sec 
-               (640 KB) floppy? */
-
-try512:        movb    $2, %cl         /* 512 b/sec */
-lasttry:call   tryload
-/*
- * Display error message and halt
- */
-error: movw    $error_msg, %si
-       call    print
-wait_reboot:
-       movb    $0x0, %ah
-       int     $0x18                   /* wait keyboard input */
-1:     movb    $0, %al
-       outb    %al, $0xF0              /* reset CPU */
-       jmp     1b                      /* just in case... */
-
-try1.2M:cmpb   $2, %dh
-       je      try2HC
-       movw    $0x0803, %cx    /*  8 secs/track, 1024 b/sec (1232 KB) */
-       call    tryload
-       movb    $15, %ch        /* 15 secs/track,  512 b/sec (1200 KB) */
-       jmp     try512
-try2HC:        movw    $0x0F02, %cx    /* 15 secs/track,  512 b/sec (1200 KB) */
-       call    tryload
-       movw    $0x0803, %cx    /*  8 secs/track, 1024 b/sec (1232 KB) */
-       jmp     lasttry
-
-/*
- * Try to load SETUP and SYSTEM provided geometry information in %cx.
- * This routine *will not* return on successful load...
- */
-tryload:
-       movw    %cx, sectlen
-       movb    %ss:DISK_BOOT, %al
-       movb    $0x7, %ah               /* recalibrate the drive */
-       int     $0x1b
-       jc      error                   /* recalibration should succeed */
-
-       /*
-        * Load SETUP into memory. It is assumed that SETUP fits into
-        * first cylinder (2 tracks, 9KB on 2DD, 15-18KB on 2HD).
-        */
-       movb    $0, %bl
-       movb    setup_sects, %bh
-       incb    %bh
-       shlw    %bx                     /* %bx = (setup_sects + 1) * 512 */
-       movw    $128, %bp
-       shlw    %cl, %bp                /* %bp = <sector size> */
-       subw    %bp, %bx                /* length to load */
-       movw    $0x0002, %dx            /* head 0, sector 2 */
-       movb    %cl, %ch                /* `N' for sector address */
-       movb    $0, %cl                 /* cylinder 0 */
-       pushw   %cs
-       popw    %es                     /* %es = %cs (= INITSEG) */
-       movb    $0xd6, %ah              /* read, multi-track, MFM */
-       int     $0x1b                   /* load it! */
-       jc      read_error
-
-       movw    $loading_msg, %si
-       call    print
-
-       movw    $SYSSEG, %ax
-       movw    %ax, %es                /* %es = SYSSEG */
-
-/*
- * This routine loads the system at address 0x10000, making sure
- * no 64kB boundaries are crossed. We try to load it as fast as
- * possible, loading whole tracks whenever we can.
- *
- * in: es - starting address segment (normally 0x1000)
- */
-       movb    %ch, %cl
-       addb    $7, %cl                 /* %cl = log2 <sector_size> */
-       shrw    %cl, %bx                /* %bx = # of phys. sectors in SETUP */
-       addb    %bl, %dl                /* %dl = start sector # of SYSTEM */
-       decb    %dl                     /* %dl is 0-based in below loop */
-
-rp_read_newseg:
-       xorw    %bp, %bp                /* = starting address within segment */
-#ifdef __BIG_KERNEL__
-       bootsect_kludge = 0x220         /* 0x200 (size of bootsector) + 0x20 (offset */
-       lcall   *bootsect_kludge        /* of bootsect_kludge in setup.S */
-#else
-       movw    %es, %ax
-       subw    $SYSSEG, %ax
-#endif
-       cmpw    syssize, %ax
-       ja      boot                    /* done! */
-
-rp_read:
-       movb    sectors, %al
-       addb    %al, %al
-       movb    %al, %ch                /* # of sectors on both surface */
-       subb    %dl, %al                /* # of sectors left on this track */
-       movb    $0, %ah
-       shlw    %cl, %ax                /* # of bytes left on this track */
-       movw    %ax, %bx                /* transfer length */
-       addw    %bp, %ax                /* cross 64K boundary? */
-       jnc     1f                      /* ok. */
-       jz      1f                      /* also ok. */
-       /*
-        * Oops, we are crossing 64K boundary...
-        * Adjust transfer length to make transfer fit in the boundary.
-        *
-        * Note: sector size is assumed to be a measure of 65536.
-        */
-       xorw    %bx, %bx
-       subw    %bp, %bx
-1:     pushw   %dx
-       movw    $dot_msg, %si           /* give progress message */
-       call    print
-       xchgw   %ax, %dx
-       movb    $0, %ah
-       divb    sectors
-       xchgb   %al, %ah
-       xchgw   %ax, %dx                /* %dh = head # / %dl = sector # */
-       incb    %dl                     /* fix %dl to 1-based */
-       pushw   %cx
-       movw    cylinder, %cx
-       movb    $0xd6, %ah              /* read, multi-track, seek, MFM */
-       movb    %ss:DISK_BOOT, %al
-       int     $0x1b
-       popw    %cx
-       popw    %dx
-       jc      read_error
-       movw    %bx, %ax                /* # of bytes just read */
-       shrw    %cl, %ax                /* %ax = # of sectors just read */
-       addb    %al, %dl                /* advance sector # */
-       cmpb    %ch, %dl                /* %ch = # of sectors/cylinder */
-       jb      2f
-       incb    cylinder                /* next cylinder */
-       xorb    %dl, %dl                /* sector 0 */
-2:     addw    %bx, %bp                /* advance offset pointer */
-       jnc     rp_read
-       /* offset pointer wrapped; advance segment pointer. */
-       movw    %es, %ax
-       addw    $0x1000, %ax
-       movw    %ax, %es
-       jmp     rp_read_newseg
-
-read_error:
-       ret
-
-boot:  movw    %cs, %ax                /* = INITSEG */
-       /* movw %ax, %ds */
-       movw    %ax, %ss
-       movw    $0x4000, %sp            /* 0x4000 is arbitrary value >=
-                                        * length of bootsect + length of
-                                        * setup + room for stack;
-                                        * PC-9800 never have BIOS workareas
-                                        * on high memory.
-                                        */
-/*
- * After that we check which root-device to use. If the device is
- * not defined, /dev/fd0 (2, 0) will be used.
- */
-       cmpw    $0, root_dev
-       jne     3f
-       movb    $2, root_dev+1
-3:
-
-/*
- * After that (everything loaded), we jump to the setup-routine
- * loaded directly after the bootblock:
- */
-       ljmp    $SETUPSEG, $0
-
-/*
- * Subroutine for print string on console.
- *     %cs:%si - pointer to message
- */
-print:
-       pushaw
-       pushw   %ds
-       pushw   %es
-       pushw   %cs
-       popw    %ds
-       lesw    curpos, %di             /* %es:%di = current text VRAM addr. */
-1:     xorw    %ax, %ax
-       lodsb
-       testb   %al, %al
-       jz      2f                      /* end of string */
-       stosw                                   /* character code */
-       movb    $0xE1, %es:0x2000-2(%di)        /* character attribute */
-       jmp     1b
-2:     movw    %di, %dx
-       movb    $0x13, %ah
-       int     $0x18                   /* move cursor to current point */
-       popw    %es
-       popw    %ds
-       popaw
-       ret
-
-loading_msg:
-       .string "Loading"
-dot_msg:
-       .string "."
-error_msg:
-       .string "Read Error!"
-
-       .org    490
-
-curpos:        .word   160             /* current cursor position */
-vram:  .word   NORMAL_TEXT     /* text VRAM segment */
-
-cylinder:      .byte   0       /* current cylinder (lower byte)        */
-sectlen:       .byte   0       /* (log2 of <sector size>) - 7          */
-sectors:       .byte   0x0F    /* default is 2HD (15 sector/track)     */
-
-# XXX: This is a fairly snug fit.
-
-.org 497
-setup_sects:   .byte SETUPSECTS
-root_flags:    .word ROOT_RDONLY
-syssize:       .word SYSSIZE
-swap_dev:      .word SWAP_DEV
-ram_size:      .word RAMDISK
-vid_mode:      .word SVGA_MODE
-root_dev:      .word ROOT_DEV
-boot_flag:     .word 0xAA55
diff --git a/arch/i386/boot98/install.sh b/arch/i386/boot98/install.sh
deleted file mode 100644 (file)
index 90f2452..0000000
+++ /dev/null
@@ -1,40 +0,0 @@
-#!/bin/sh
-#
-# arch/i386/boot/install.sh
-#
-# This file is subject to the terms and conditions of the GNU General Public
-# License.  See the file "COPYING" in the main directory of this archive
-# for more details.
-#
-# Copyright (C) 1995 by Linus Torvalds
-#
-# Adapted from code in arch/i386/boot/Makefile by H. Peter Anvin
-#
-# "make install" script for i386 architecture
-#
-# Arguments:
-#   $1 - kernel version
-#   $2 - kernel image file
-#   $3 - kernel map file
-#   $4 - default install path (blank if root directory)
-#
-
-# User may have a custom install script
-
-if [ -x ~/bin/installkernel ]; then exec ~/bin/installkernel "$@"; fi
-if [ -x /sbin/installkernel ]; then exec /sbin/installkernel "$@"; fi
-
-# Default install - same as make zlilo
-
-if [ -f $4/vmlinuz ]; then
-       mv $4/vmlinuz $4/vmlinuz.old
-fi
-
-if [ -f $4/System.map ]; then
-       mv $4/System.map $4/System.old
-fi
-
-cat $2 > $4/vmlinuz
-cp $3 $4/System.map
-
-if [ -x /sbin/lilo ]; then /sbin/lilo; else /etc/lilo/install; fi
diff --git a/arch/i386/boot98/mtools.conf.in b/arch/i386/boot98/mtools.conf.in
deleted file mode 100644 (file)
index efd6d24..0000000
+++ /dev/null
@@ -1,17 +0,0 @@
-#
-# mtools configuration file for "make (b)zdisk"
-#
-
-# Actual floppy drive
-drive a:
-  file="/dev/fd0"
-
-# 1.44 MB floppy disk image
-drive v:
-  file="@OBJ@/fdimage" cylinders=80 heads=2 sectors=18 filter
-
-# 2.88 MB floppy disk image (mostly for virtual uses)
-drive w:
-  file="@OBJ@/fdimage" cylinders=80 heads=2 sectors=36 filter
-
-
diff --git a/arch/i386/boot98/setup.S b/arch/i386/boot98/setup.S
deleted file mode 100644 (file)
index 4ed9141..0000000
+++ /dev/null
@@ -1,876 +0,0 @@
-/*
- *     setup.S         Copyright (C) 1991, 1992 Linus Torvalds
- *
- * setup.s is responsible for getting the system data from the BIOS,
- * and putting them into the appropriate places in system memory.
- * both setup.s and system has been loaded by the bootblock.
- *
- * This code asks the bios for memory/disk/other parameters, and
- * puts them in a "safe" place: 0x90000-0x901FF, ie where the
- * boot-block used to be. It is then up to the protected mode
- * system to read them from there before the area is overwritten
- * for buffer-blocks.
- *
- * Move PS/2 aux init code to psaux.c
- * (troyer@saifr00.cfsat.Honeywell.COM) 03Oct92
- *
- * some changes and additional features by Christoph Niemann,
- * March 1993/June 1994 (Christoph.Niemann@linux.org)
- *
- * add APM BIOS checking by Stephen Rothwell, May 1994
- * (sfr@canb.auug.org.au)
- *
- * High load stuff, initrd support and position independency
- * by Hans Lermen & Werner Almesberger, February 1996
- * <lermen@elserv.ffm.fgan.de>, <almesber@lrc.epfl.ch>
- *
- * Video handling moved to video.S by Martin Mares, March 1996
- * <mj@k332.feld.cvut.cz>
- *
- * Extended memory detection scheme retwiddled by orc@pell.chi.il.us (david
- * parsons) to avoid loadlin confusion, July 1997
- *
- * Transcribed from Intel (as86) -> AT&T (gas) by Chris Noe, May 1999.
- * <stiker@northlink.com>
- *
- * Fix to work around buggy BIOSes which dont use carry bit correctly
- * and/or report extended memory in CX/DX for e801h memory size detection 
- * call.  As a result the kernel got wrong figures.  The int15/e801h docs
- * from Ralf Brown interrupt list seem to indicate AX/BX should be used
- * anyway.  So to avoid breaking many machines (presumably there was a reason
- * to orginally use CX/DX instead of AX/BX), we do a kludge to see
- * if CX/DX have been changed in the e801 call and if so use AX/BX .
- * Michael Miller, April 2001 <michaelm@mjmm.org>
- *
- * New A20 code ported from SYSLINUX by H. Peter Anvin. AMD Elan bugfixes
- * by Robert Schwebel, December 2001 <robert@schwebel.de>
- *
- * Heavily modified for NEC PC-9800 series by Kyoto University Microcomputer
- * Club (KMC) Linux/98 project <seraphim@kmc.kyoto-u.ac.jp>, 1997-1999
- */
-
-#include <linux/config.h>
-#include <asm/segment.h>
-#include <linux/version.h>
-#include <linux/compile.h>
-#include <asm/boot.h>
-#include <asm/e820.h>
-#include <asm/page.h>
-       
-/* Signature words to ensure LILO loaded us right */
-#define SIG1   0xAA55
-#define SIG2   0x5A5A
-
-#define HIRESO_TEXT    0xe000
-#define NORMAL_TEXT    0xa000
-
-#define BIOS_FLAG2     0x0400
-#define BIOS_FLAG5     0x0458
-#define RDISK_EQUIP    0x0488
-#define BIOS_FLAG      0x0501
-#define KB_SHFT_STS    0x053a
-#define DISK_EQUIP     0x055c
-
-INITSEG  = DEF_INITSEG         # 0x9000, we move boot here, out of the way
-SYSSEG   = DEF_SYSSEG          # 0x1000, system loaded at 0x10000 (65536).
-SETUPSEG = DEF_SETUPSEG                # 0x9020, this is the current segment
-                               # ... and the former contents of CS
-
-DELTA_INITSEG = SETUPSEG - INITSEG     # 0x0020
-
-.code16
-.globl begtext, begdata, begbss, endtext, enddata, endbss
-
-.text
-begtext:
-.data
-begdata:
-.bss
-begbss:
-.text
-
-start:
-       jmp     trampoline
-
-# This is the setup header, and it must start at %cs:2 (old 0x9020:2)
-
-               .ascii  "HdrS"          # header signature
-               .word   0x0203          # header version number (>= 0x0105)
-                                       # or else old loadlin-1.5 will fail)
-realmode_swtch:        .word   0, 0            # default_switch, SETUPSEG
-start_sys_seg: .word   SYSSEG
-               .word   kernel_version  # pointing to kernel version string
-                                       # above section of header is compatible
-                                       # with loadlin-1.5 (header v1.5). Don't
-                                       # change it.
-
-type_of_loader:        .byte   0               # = 0, old one (LILO, Loadlin,
-                                       #      Bootlin, SYSLX, bootsect...)
-                                       # See Documentation/i386/boot.txt for
-                                       # assigned ids
-       
-# flags, unused bits must be zero (RFU) bit within loadflags
-loadflags:
-LOADED_HIGH    = 1                     # If set, the kernel is loaded high
-CAN_USE_HEAP   = 0x80                  # If set, the loader also has set
-                                       # heap_end_ptr to tell how much
-                                       # space behind setup.S can be used for
-                                       # heap purposes.
-                                       # Only the loader knows what is free
-#ifndef __BIG_KERNEL__
-               .byte   0
-#else
-               .byte   LOADED_HIGH
-#endif
-
-setup_move_size: .word  0x8000         # size to move, when setup is not
-                                       # loaded at 0x90000. We will move setup 
-                                       # to 0x90000 then just before jumping
-                                       # into the kernel. However, only the
-                                       # loader knows how much data behind
-                                       # us also needs to be loaded.
-
-code32_start:                          # here loaders can put a different
-                                       # start address for 32-bit code.
-#ifndef __BIG_KERNEL__
-               .long   0x1000          #   0x1000 = default for zImage
-#else
-               .long   0x100000        # 0x100000 = default for big kernel
-#endif
-
-ramdisk_image: .long   0               # address of loaded ramdisk image
-                                       # Here the loader puts the 32-bit
-                                       # address where it loaded the image.
-                                       # This only will be read by the kernel.
-
-ramdisk_size:  .long   0               # its size in bytes
-
-bootsect_kludge:
-               .long   0               # obsolete
-
-heap_end_ptr:  .word   modelist+1024   # (Header version 0x0201 or later)
-                                       # space from here (exclusive) down to
-                                       # end of setup code can be used by setup
-                                       # for local heap purposes.
-
-pad1:          .word   0
-cmd_line_ptr:  .long 0                 # (Header version 0x0202 or later)
-                                       # If nonzero, a 32-bit pointer
-                                       # to the kernel command line.
-                                       # The command line should be
-                                       # located between the start of
-                                       # setup and the end of low
-                                       # memory (0xa0000), or it may
-                                       # get overwritten before it
-                                       # gets read.  If this field is
-                                       # used, there is no longer
-                                       # anything magical about the
-                                       # 0x90000 segment; the setup
-                                       # can be located anywhere in
-                                       # low memory 0x10000 or higher.
-
-ramdisk_max:   .long MAXMEM-1          # (Header version 0x0203 or later)
-                                       # The highest safe address for
-                                       # the contents of an initrd
-
-trampoline:    call    start_of_setup
-               .space  1024
-# End of setup header #####################################################
-
-start_of_setup:
-# Set %ds = %cs, we know that SETUPSEG = %cs at this point
-       movw    %cs, %ax                # aka SETUPSEG
-       movw    %ax, %ds
-# Check signature at end of setup
-       cmpw    $SIG1, setup_sig1
-       jne     bad_sig
-
-       cmpw    $SIG2, setup_sig2
-       jne     bad_sig
-
-       jmp     good_sig1
-
-# Routine to print asciiz string at ds:si
-prtstr:
-       lodsb
-       andb    %al, %al
-       jz      fin
-
-       call    prtchr
-       jmp     prtstr
-
-fin:   ret
-
-no_sig_mess: .string   "No setup signature found ..."
-
-good_sig1:
-       jmp     good_sig
-
-# We now have to find the rest of the setup code/data
-bad_sig:
-       movw    %cs, %ax                        # SETUPSEG
-       subw    $DELTA_INITSEG, %ax             # INITSEG
-       movw    %ax, %ds
-       xorb    %bh, %bh
-       movb    (497), %bl                      # get setup sect from bootsect
-       subw    $4, %bx                         # LILO loads 4 sectors of setup
-       shlw    $8, %bx                         # convert to words (1sect=2^8 words)
-       movw    %bx, %cx
-       shrw    $3, %bx                         # convert to segment
-       addw    $SYSSEG, %bx
-       movw    %bx, %cs:start_sys_seg
-# Move rest of setup code/data to here
-       movw    $2048, %di                      # four sectors loaded by LILO
-       subw    %si, %si
-       pushw   %cs
-       popw    %es
-       movw    $SYSSEG, %ax
-       movw    %ax, %ds
-       rep
-       movsw
-       movw    %cs, %ax                        # aka SETUPSEG
-       movw    %ax, %ds
-       cmpw    $SIG1, setup_sig1
-       jne     no_sig
-
-       cmpw    $SIG2, setup_sig2
-       jne     no_sig
-
-       jmp     good_sig
-
-no_sig:
-       lea     no_sig_mess, %si
-       call    prtstr
-
-no_sig_loop:
-       hlt
-       jmp     no_sig_loop
-
-good_sig:
-       movw    %cs, %ax                        # aka SETUPSEG
-       subw    $DELTA_INITSEG, %ax             # aka INITSEG
-       movw    %ax, %ds
-# Check if an old loader tries to load a big-kernel
-       testb   $LOADED_HIGH, %cs:loadflags     # Do we have a big kernel?
-       jz      loader_ok                       # No, no danger for old loaders.
-
-       cmpb    $0, %cs:type_of_loader          # Do we have a loader that
-                                               # can deal with us?
-       jnz     loader_ok                       # Yes, continue.
-
-       pushw   %cs                             # No, we have an old loader,
-       popw    %ds                             # die. 
-       lea     loader_panic_mess, %si
-       call    prtstr
-
-       jmp     no_sig_loop
-
-loader_panic_mess: .string "Wrong loader, giving up..."
-
-loader_ok:
-# Get memory size (extended mem, kB)
-
-# On PC-9800, memory size detection is done completely in 32-bit
-# kernel initialize code (kernel/setup.c).
-       pushw   %es
-       xorl    %eax, %eax
-       movw    %ax, %es
-       movb    %al, (E820NR)           # PC-9800 has no E820
-       movb    %es:(0x401), %al
-       shll    $7, %eax
-       addw    $1024, %ax
-       movw    %ax, (2)
-       movl    %eax, (0x1e0)
-       movw    %es:(0x594), %ax
-       shll    $10, %eax
-       addl    %eax, (0x1e0)
-       popw    %es
-
-# Check for video adapter and its parameters and allow the
-# user to browse video modes.
-       call    video                           # NOTE: we need %ds pointing
-                                               # to bootsector
-
-# Get text video mode
-       movb    $0x0B, %ah
-       int     $0x18           # CRT mode sense
-       movw    $(20 << 8) + 40, %cx
-       testb   $0x10, %al
-       jnz     3f
-       movb    $20, %ch
-       testb   $0x01, %al
-       jnz     1f
-       movb    $25, %ch
-       jmp     1f
-3:     # If bit 4 was 1, it means either 1) 31 lines for hi-reso mode,
-       # or 2) 30 lines for PC-9821.
-       movb    $31, %ch        # hireso mode value
-       pushw   $0
-       popw    %es
-       testb   $0x08, %es:BIOS_FLAG
-       jnz     1f
-       movb    $30, %ch
-1:     # Now we got # of rows in %ch
-       movb    %ch, (14)
-
-       testb   $0x02, %al
-       jnz     2f
-       movb    $80, %cl
-2:     # Now we got # of columns in %cl
-       movb    %cl, (7)
-
-       # Next, get horizontal frequency if supported
-       movw    $0x3100, %ax
-       int     $0x18           # Call CRT bios
-       movb    %al, (6)        # If 31h is unsupported, %al remains 0
-
-# Get hd0-3 data...
-       pushw   %ds                             # aka INITSEG
-       popw    %es
-       xorw    %ax, %ax
-       movw    %ax, %ds
-       cld
-       movw    $0x0080, %di
-       movb    DISK_EQUIP+1, %ah
-       movb    $0x80, %al
-
-get_hd_info:
-       shrb    %ah
-       pushw   %ax
-       jnc     1f
-       movb    $0x84, %ah
-       int     $0x1b
-       jnc     2f                              # Success
-1:     xorw    %cx, %cx                        # `0 cylinders' means no drive
-2:     # Attention! Work area (drive_info) is arranged for PC-9800.
-       movw    %cx, %ax                        # # of cylinders
-       stosw
-       movw    %dx, %ax                        # # of sectors / # of heads
-       stosw
-       movw    %bx, %ax                        # sector size in bytes
-       stosw
-       popw    %ax
-       incb    %al
-       cmpb    $0x84, %al
-       jb      get_hd_info
-
-# Get fd data...
-       movw    DISK_EQUIP, %ax
-       andw    $0xf00f, %ax
-       orb     %al, %ah
-       movb    RDISK_EQUIP, %al
-       notb    %al
-       andb    %al, %ah                        # ignore all `RAM drive'
-
-       movb    $0x30, %al
-
-get_fd_info:
-       shrb    %ah
-       pushw   %ax
-       jnc     1f
-       movb    $0xc4, %ah
-       int     $0x1b
-       movb    %ah, %al
-       andb    $4, %al                         # 1.44MB support flag
-       shrb    %al
-       addb    $2, %al                         # %al = 2 (1.2MB) or 4 (1.44MB)
-       jmp     2f
-1:     movb    $0, %al                         # no drive
-2:     stosb
-       popw    %ax
-       incb    %al
-       testb   $0x04, %al
-       jz      get_fd_info
-
-       addb    $(0xb0 - 0x34), %al
-       jnc     get_fd_info                     # check FDs on 640KB I/F
-
-       pushw   %es
-       popw    %ds                             # %ds got bootsector again
-#if 0
-       mov     $0, (0x1ff)                     # default is no pointing device
-#endif
-
-#if defined(CONFIG_APM) || defined(CONFIG_APM_MODULE)
-# Then check for an APM BIOS...
-                                               # %ds points to the bootsector
-       movw    $0, 0x40                        # version = 0 means no APM BIOS
-       movw    $0x09a00, %ax                   # APM BIOS installation check
-       xorw    %bx, %bx
-       int     $0x1f
-       jc      done_apm_bios                   # Nope, no APM BIOS
-
-       cmpw    $0x0504d, %bx                   # Check for "PM" signature
-       jne     done_apm_bios                   # No signature, no APM BIOS
-
-       testb   $0x02, %cl                      # Is 32 bit supported?
-       je      done_apm_bios                   # No 32-bit, no (good) APM BIOS
-
-       movw    $0x09a04, %ax                   # Disconnect first just in case
-       xorw    %bx, %bx
-       int     $0x1f                           # ignore return code
-       movw    $0x09a03, %ax                   # 32 bit connect
-       xorl    %ebx, %ebx
-       int     $0x1f
-       jc      no_32_apm_bios                  # Ack, error.
-
-       movw    %ax,  (66)                      # BIOS code segment
-       movl    %ebx, (68)                      # BIOS entry point offset
-       movw    %cx,  (72)                      # BIOS 16 bit code segment
-       movw    %dx,  (74)                      # BIOS data segment
-       movl    %esi, (78)                      # BIOS code segment length
-       movw    %di,  (82)                      # BIOS data segment length
-# Redo the installation check as the 32 bit connect
-# modifies the flags returned on some BIOSs
-       movw    $0x09a00, %ax                   # APM BIOS installation check
-       xorw    %bx, %bx
-       int     $0x1f
-       jc      apm_disconnect                  # error -> shouldn't happen
-
-       cmpw    $0x0504d, %bx                   # check for "PM" signature
-       jne     apm_disconnect                  # no sig -> shouldn't happen
-
-       movw    %ax, (64)                       # record the APM BIOS version
-       movw    %cx, (76)                       # and flags
-       jmp     done_apm_bios
-
-apm_disconnect:                                        # Tidy up
-       movw    $0x09a04, %ax                   # Disconnect
-       xorw    %bx, %bx
-       int     $0x1f                           # ignore return code
-
-       jmp     done_apm_bios
-
-no_32_apm_bios:
-       andw    $0xfffd, (76)                   # remove 32 bit support bit
-done_apm_bios:
-#endif
-
-# Pass cursor position to kernel...
-       movw    %cs:cursor_address, %ax
-       shrw    %ax             # cursor_address is 2 bytes unit
-       movb    $80, %cl
-       divb    %cl
-       xchgb   %al, %ah        # (0) = %al = X, (1) = %ah = Y
-       movw    %ax, (0)
-
-#if 0
-       movw    $msg_cpos, %si
-       call    prtstr_cs
-       call    prthex
-       call    prtstr_cs
-       movw    %ds, %ax
-       call    prthex
-       call    prtstr_cs
-       movb    $0x11, %ah
-       int     $0x18
-       movb    $0, %ah
-       int     $0x18
-       .section .rodata, "a"
-msg_cpos:      .string "Cursor position: 0x"
-               .string ", %ds:0x"
-               .string "\r\n"
-       .previous
-#endif
-
-# Now we want to move to protected mode ...
-       cmpw    $0, %cs:realmode_swtch
-       jz      rmodeswtch_normal
-
-       lcall   *%cs:realmode_swtch
-
-       jmp     rmodeswtch_end
-
-rmodeswtch_normal:
-        pushw  %cs
-       call    default_switch
-
-rmodeswtch_end:
-# we get the code32 start address and modify the below 'jmpi'
-# (loader may have changed it)
-       movl    %cs:code32_start, %eax
-       movl    %eax, %cs:code32
-
-# Now we move the system to its rightful place ... but we check if we have a
-# big-kernel. In that case we *must* not move it ...
-       testb   $LOADED_HIGH, %cs:loadflags
-       jz      do_move0                        # .. then we have a normal low
-                                               # loaded zImage
-                                               # .. or else we have a high
-                                               # loaded bzImage
-       jmp     end_move                        # ... and we skip moving
-
-do_move0:
-       movw    $0x100, %ax                     # start of destination segment
-       movw    %cs, %bp                        # aka SETUPSEG
-       subw    $DELTA_INITSEG, %bp             # aka INITSEG
-       movw    %cs:start_sys_seg, %bx          # start of source segment
-       cld
-do_move:
-       movw    %ax, %es                        # destination segment
-       incb    %ah                             # instead of add ax,#0x100
-       movw    %bx, %ds                        # source segment
-       addw    $0x100, %bx
-       subw    %di, %di
-       subw    %si, %si
-       movw    $0x800, %cx
-       rep
-       movsw
-       cmpw    %bp, %bx                        # assume start_sys_seg > 0x200,
-                                               # so we will perhaps read one
-                                               # page more than needed, but
-                                               # never overwrite INITSEG
-                                               # because destination is a
-                                               # minimum one page below source
-       jb      do_move
-
-end_move:
-# then we load the segment descriptors
-       movw    %cs, %ax                        # aka SETUPSEG
-       movw    %ax, %ds
-               
-# Check whether we need to be downward compatible with version <=201
-       cmpl    $0, cmd_line_ptr
-       jne     end_move_self           # loader uses version >=202 features
-       cmpb    $0x20, type_of_loader
-       je      end_move_self           # bootsect loader, we know of it
-# Boot loader does not support boot protocol version 2.02.
-# If we have our code not at 0x90000, we need to move it there now.
-# We also then need to move the params behind it (commandline)
-# Because we would overwrite the code on the current IP, we move
-# it in two steps, jumping high after the first one.
-       movw    %cs, %ax
-       cmpw    $SETUPSEG, %ax
-       je      end_move_self
-
-       cli                                     # make sure we really have
-                                               # interrupts disabled !
-                                               # because after this the stack
-                                               # should not be used
-       subw    $DELTA_INITSEG, %ax             # aka INITSEG
-       movw    %ss, %dx
-       cmpw    %ax, %dx
-       jb      move_self_1
-
-       addw    $INITSEG, %dx
-       subw    %ax, %dx                        # this will go into %ss after
-                                               # the move
-move_self_1:
-       movw    %ax, %ds
-       movw    $INITSEG, %ax                   # real INITSEG
-       movw    %ax, %es
-       movw    %cs:setup_move_size, %cx
-       std                                     # we have to move up, so we use
-                                               # direction down because the
-                                               # areas may overlap
-       movw    %cx, %di
-       decw    %di
-       movw    %di, %si
-       subw    $move_self_here+0x200, %cx
-       rep
-       movsb
-       ljmp    $SETUPSEG, $move_self_here
-
-move_self_here:
-       movw    $move_self_here+0x200, %cx
-       rep
-       movsb
-       movw    $SETUPSEG, %ax
-       movw    %ax, %ds
-       movw    %dx, %ss
-
-end_move_self:                                 # now we are at the right place
-       lidt    idt_48                          # load idt with 0,0
-       xorl    %eax, %eax                      # Compute gdt_base
-       movw    %ds, %ax                        # (Convert %ds:gdt to a linear ptr)
-       shll    $4, %eax
-       addl    $gdt, %eax
-       movl    %eax, (gdt_48+2)
-       lgdt    gdt_48                          # load gdt with whatever is
-                                               # appropriate
-
-# that was painless, now we enable A20
-
-       outb    %al, $0xf2                      # A20 on
-       movb    $0x02, %al
-       outb    %al, $0xf6                      # also A20 on; making ITF's
-                                               # way our model
-
-       # PC-9800 seems to enable A20 at the moment of `outb';
-       # so we don't wait unlike IBM PCs (see ../setup.S).
-
-# enable DMA to access memory over 0x100000 (1MB).
-
-       movw    $0x439, %dx
-       inb     %dx, %al
-       andb    $(~4), %al
-       outb    %al, %dx
-
-# Set DMA to increment its bank address automatically at 16MB boundary.
-# Initial setting is 64KB boundary mode so that we can't run DMA crossing
-# physical address 0xXXXXFFFF.
-
-       movb    $0x0c, %al
-       outb    %al, $0x29                      # ch. 0
-       movb    $0x0d, %al
-       outb    %al, $0x29                      # ch. 1
-       movb    $0x0e, %al
-       outb    %al, $0x29                      # ch. 2
-       movb    $0x0f, %al
-       outb    %al, $0x29                      # ch. 3
-       movb    $0x50, %al
-       outb    %al, $0x11                      # reinitialize DMAC
-
-# make sure any possible coprocessor is properly reset..
-       movb    $0, %al
-       outb    %al, $0xf8
-       outb    %al, $0x5f                      # delay
-
-# well, that went ok, I hope. Now we mask all interrupts - the rest
-# is done in init_IRQ().
-       movb    $0xFF, %al                      # mask all interrupts for now
-       outb    %al, $0x0A
-       outb    %al, $0x5f                      # delay
-       
-       movb    $0x7F, %al                      # mask all irq's but irq7 which
-       outb    %al, $0x02                      # is cascaded
-
-# Well, that certainly wasn't fun :-(. Hopefully it works, and we don't
-# need no steenking BIOS anyway (except for the initial loading :-).
-# The BIOS-routine wants lots of unnecessary data, and it's less
-# "interesting" anyway. This is how REAL programmers do it.
-#
-# Well, now's the time to actually move into protected mode. To make
-# things as simple as possible, we do no register set-up or anything,
-# we let the gnu-compiled 32-bit programs do that. We just jump to
-# absolute address 0x1000 (or the loader supplied one),
-# in 32-bit protected mode.
-#
-# Note that the short jump isn't strictly needed, although there are
-# reasons why it might be a good idea. It won't hurt in any case.
-       movw    $1, %ax                         # protected mode (PE) bit
-       lmsw    %ax                             # This is it!
-       jmp     flush_instr
-
-flush_instr:
-       xorw    %bx, %bx                        # Flag to indicate a boot
-       xorl    %esi, %esi                      # Pointer to real-mode code
-       movw    %cs, %si
-       subw    $DELTA_INITSEG, %si
-       shll    $4, %esi                        # Convert to 32-bit pointer
-# NOTE: For high loaded big kernels we need a
-#      jmpi    0x100000,__BOOT_CS
-#
-#      but we yet haven't reloaded the CS register, so the default size 
-#      of the target offset still is 16 bit.
-#       However, using an operand prefix (0x66), the CPU will properly
-#      take our 48 bit far pointer. (INTeL 80386 Programmer's Reference
-#      Manual, Mixing 16-bit and 32-bit code, page 16-6)
-
-       .byte 0x66, 0xea                        # prefix + jmpi-opcode
-code32:        .long   0x1000                          # will be set to 0x100000
-                                               # for big kernels
-       .word   __BOOT_CS
-
-# Here's a bunch of information about your current kernel..
-kernel_version:        .ascii  UTS_RELEASE
-               .ascii  " ("
-               .ascii  LINUX_COMPILE_BY
-               .ascii  "@"
-               .ascii  LINUX_COMPILE_HOST
-               .ascii  ") "
-               .ascii  UTS_VERSION
-               .byte   0
-
-# This is the default real mode switch routine.
-# to be called just before protected mode transition
-default_switch:
-       cli                                     # no interrupts allowed !
-       outb    %al, $0x50                      # disable NMI for bootup
-                                               # sequence
-       lret
-
-
-# This routine prints one character (in %al) on console.
-# PC-9800 doesn't have BIOS-function to do it like IBM PC's INT 10h - 0Eh,
-# so we hardcode `prtchr' subroutine here.
-prtchr:
-       pushaw
-       pushw   %es
-       cmpb    $0, %cs:prtchr_initialized
-       jnz     prtchr_ok
-       xorw    %cx, %cx
-       movw    %cx, %es
-       testb   $0x8, %es:BIOS_FLAG
-       jz      1f
-       movb    $(HIRESO_TEXT >> 8), %cs:cursor_address+3
-       movw    $(80 * 31 * 2), %cs:max_cursor_offset
-1:     pushw   %ax
-       call    get_cursor_position
-       movw    %ax, %cs:cursor_address
-       popw    %ax
-       movb    $1, %cs:prtchr_initialized
-prtchr_ok:
-       lesw    %cs:cursor_address, %di
-       movw    $160, %bx
-       movb    $0, %ah
-       cmpb    $13, %al
-       je      do_cr
-       cmpb    $10, %al
-       je      do_lf
-
-       # normal (printable) character
-       stosw
-       movb    $0xe1, %es:0x2000-2(%di)
-       jmp     1f
-
-do_cr: movw    %di, %ax
-       divb    %bl                             # %al = Y, %ah = X * 2
-       mulb    %bl
-       movw    %ax, %dx
-       jmp     2f
-
-do_lf: addw    %bx, %di
-1:     movw    %cs:max_cursor_offset, %cx
-       cmpw    %cx, %di
-       movw    %di, %dx
-       jb      2f
-       # cursor reaches bottom of screen; scroll it
-       subw    %bx, %dx
-       xorw    %di, %di
-       movw    %bx, %si
-       cld
-       subw    %bx, %cx
-       shrw    %cx
-       pushw   %cx
-       rep; es; movsw
-       movb    $32, %al                        # clear bottom line characters
-       movb    $80, %cl
-       rep; stosw
-       movw    $0x2000, %di
-       popw    %cx
-       leaw    (%bx,%di), %si
-       rep; es; movsw
-       movb    $0xe1, %al                      # clear bottom line attributes
-       movb    $80, %cl
-       rep; stosw
-2:     movw    %dx, %cs:cursor_address
-       movb    $0x13, %ah                      # move cursor to right position
-       int     $0x18
-       popw    %es
-       popaw
-       ret
-
-cursor_address:
-       .word   0
-       .word   NORMAL_TEXT
-max_cursor_offset:
-       .word   80 * 25 * 2                     # for normal 80x25 mode
-
-# putstr may called without running through start_of_setup (via bootsect_panic)
-# so we should initialize ourselves on demand.
-prtchr_initialized:
-       .byte   0
-
-# This routine queries GDC (graphic display controller) for current cursor
-# position. Cursor position is returned in %ax (CPU offset address).
-get_cursor_position:
-1:     inb     $0x60, %al
-       outb    %al, $0x5f                      # delay
-       outb    %al, $0x5f                      # delay
-       testb   $0x04, %al                      # Is FIFO empty?
-       jz      1b                              # no -> wait until empty
-
-       movb    $0xe0, %al                      # CSRR command
-       outb    %al, $0x62                      # command write
-       outb    %al, $0x5f                      # delay
-       outb    %al, $0x5f                      # delay
-
-2:     inb     $0x60, %al
-       outb    %al, $0x5f                      # delay
-       outb    %al, $0x5f                      # delay
-       testb   $0x01, %al                      # Is DATA READY?
-       jz      2b                              # no -> wait until ready
-
-       inb     $0x62, %al                      # read xAD (L)
-       outb    %al, $0x5f                      # delay
-       outb    %al, $0x5f                      # delay
-       movb    %al, %ah
-       inb     $0x62, %al                      # read xAD (H)
-       outb    %al, $0x5f                      # delay
-       outb    %al, $0x5f                      # delay
-       xchgb   %al, %ah                        # correct byte order
-       pushw   %ax
-       inb     $0x62, %al                      # read yAD (L)
-       outb    %al, $0x5f                      # delay
-       outb    %al, $0x5f                      # delay
-       inb     $0x62, %al                      # read yAD (M)
-       outb    %al, $0x5f                      # delay
-       outb    %al, $0x5f                      # delay
-       inb     $0x62, %al                      # read yAD (H)
-                                               # yAD is not our interest,
-                                               # so discard it.
-       popw    %ax
-       addw    %ax, %ax                        # convert to CPU address
-       ret
-
-# Descriptor tables
-#
-# NOTE: The intel manual says gdt should be sixteen bytes aligned for
-# efficiency reasons.  However, there are machines which are known not
-# to boot with misaligned GDTs, so alter this at your peril!  If you alter
-# GDT_ENTRY_BOOT_CS (in asm/segment.h) remember to leave at least two
-# empty GDT entries (one for NULL and one reserved).
-#
-# NOTE:        On some CPUs, the GDT must be 8 byte aligned.  This is
-# true for the Voyager Quad CPU card which will not boot without
-# This directive.  16 byte aligment is recommended by intel.
-#
-       .align 16
-gdt:
-       .fill GDT_ENTRY_BOOT_CS,8,0
-
-       .word   0xFFFF                          # 4Gb - (0x100000*0x1000 = 4Gb)
-       .word   0                               # base address = 0
-       .word   0x9A00                          # code read/exec
-       .word   0x00CF                          # granularity = 4096, 386
-                                               #  (+5th nibble of limit)
-
-       .word   0xFFFF                          # 4Gb - (0x100000*0x1000 = 4Gb)
-       .word   0                               # base address = 0
-       .word   0x9200                          # data read/write
-       .word   0x00CF                          # granularity = 4096, 386
-                                               #  (+5th nibble of limit)
-gdt_end:
-       .align  4
-       
-       .word   0                               # alignment byte
-idt_48:
-       .word   0                               # idt limit = 0
-       .word   0, 0                            # idt base = 0L
-
-       .word   0                               # alignment byte
-gdt_48:
-       .word   gdt_end - gdt - 1               # gdt limit
-       .word   0, 0                            # gdt base (filled in later)
-
-# Include video setup & detection code
-
-#include "video.S"
-
-# Setup signature -- must be last
-setup_sig1:    .word   SIG1
-setup_sig2:    .word   SIG2
-
-# After this point, there is some free space which is used by the video mode
-# handling code to store the temporary mode table (not used by the kernel).
-
-modelist:
-
-.text
-endtext:
-.data
-enddata:
-.bss
-endbss:
diff --git a/arch/i386/boot98/video.S b/arch/i386/boot98/video.S
deleted file mode 100644 (file)
index 1042619..0000000
+++ /dev/null
@@ -1,262 +0,0 @@
-/*     video.S
- *
- *  Video mode setup, etc. for NEC PC-9800 series.
- *
- *  Copyright (C) 1997,98,99  Linux/98 project  <seraphim@kmc.kyoto-u.ac.jp>
- *
- *  Based on the video.S for IBM PC:
- *     copyright (C) Martin Mares <mj@atrey.karlin.mff.cuni.cz>
- */
-
-/* Positions of various video parameters passed to the kernel */
-/* (see also include/linux/tty.h) */
-#define PARAM_CURSOR_POS       0x00
-#define PARAM_VIDEO_PAGE       0x04
-#define PARAM_VIDEO_MODE       0x06
-#define PARAM_VIDEO_COLS       0x07
-#define PARAM_VIDEO_EGA_BX     0x0a
-#define PARAM_VIDEO_LINES      0x0e
-#define PARAM_HAVE_VGA         0x0f
-#define PARAM_FONT_POINTS      0x10
-
-#define PARAM_VIDEO98_COMPAT   0x0a
-#define PARAM_VIDEO98_HIRESO   0x0b
-#define PARAM_VIDEO98_MACHTYPE 0x0c
-#define PARAM_VIDEO98_LINES    0x0e
-#define PARAM_VIDEO98_COLS     0x0f
-
-# PARAM_LFB_* and PARAM_VESAPM_* are unused on PC-9800.
-
-# This is the main entry point called by setup.S
-# %ds *must* be pointing to the bootsector
-video: xorw    %ax, %ax
-       movw    %ax, %es                        # %es = 0
-
-       movb    %es:BIOS_FLAG, %al
-       movb    %al, PARAM_VIDEO_MODE
-
-       movb    $0, PARAM_VIDEO98_HIRESO        # 0 = normal
-       movw    $NORMAL_TEXT, PARAM_VIDEO_PAGE
-       testb   $0x8, %al
-       movw    $(80 * 256 + 25), %ax
-       jz      1f
-       # hireso machine.
-       movb    $1, PARAM_VIDEO98_HIRESO        # !0 = hi-reso
-       movb    $(HIRESO_TEXT >> 8), PARAM_VIDEO_PAGE + 1
-       movw    $(80 * 256 + 31), %ax
-1:     movw    %ax, PARAM_VIDEO98_LINES        # also sets VIDEO98_COLS
-
-       movb    $0xc0, %ch                      # 400-line graphic mode
-       movb    $0x42, %ah
-       int     $0x18
-
-       movw    $80, PARAM_VIDEO_COLS
-
-       movw    $msg_probing, %si
-       call    prtstr_cs
-
-# Check vendor from font pattern of `A'...
-
-1:     inb     $0x60, %al                      # wait V-sync
-       testb   $0x20, %al
-       jnz     1b
-2:     inb     $0x60, %al
-       testb   $0x20, %al
-       jz      2b
-
-       movb    $0x00, %al                      # select font of `A'
-       outb    %al, $0xa1
-       movb    $0x41, %al
-       outb    %al, $0xa3
-
-       movw    $8, %cx
-       movw    PARAM_VIDEO_PAGE, %ax
-       cmpw    $NORMAL_TEXT, %ax
-       je      3f
-       movb    $24, %cl                        # for hi-reso machine
-3:     addw    $0x400, %ax                     # %ax = CG window segment
-       pushw   %ds
-       movw    %ax, %ds
-       xorw    %dx, %dx                        # get sum of `A' pattern...
-       xorw    %si, %si
-4:     lodsw
-       addw    %ax, %dx
-       loop    4b
-       popw    %ds
-
-       movw    %dx, %ax
-       movw    $msg_nec, %si
-       xorw    %bx, %bx                        # vendor info will go into %bx
-       testb   $8, %es:BIOS_FLAG
-       jnz     check_hireso_vendor
-       cmpw    $0xc7f8, %ax
-       je      5f
-       jmp     6f
-check_hireso_vendor:
-       cmpw    $0x9639, %ax                    # XXX: NOT VERIFIED!!!
-       je      5f
-6:     incw    %bx                             # compatible machine
-       movw    $msg_compat, %si
-5:     movb    %bl, PARAM_VIDEO98_COMPAT
-       call    prtstr_cs
-
-       movw    $msg_fontdata, %si
-       call    prtstr_cs                       # " (CG sum of A = 0x"
-       movw    %dx, %ax
-       call    prthex
-       call    prtstr_cs                       # ") PC-98"
-
-       movb    $'0', %al
-       pushw   %ds
-       pushw   $0xf8e8
-       popw    %ds
-       cmpw    $0x2198, (0)
-       popw    %ds
-       jne     7f
-       movb    $'2', %al
-7:     call    prtchr
-       call    prtstr_cs                       # "1 "
-
-       movb    $0, PARAM_VIDEO98_MACHTYPE
-#if 0  /* XXX - This check is bogus? [0000:BIOS_FLAG2]-bit7 does NOT
-                indicate whether it is a note machine, but merely indicates
-                whether it has ``RAM drive''. */
-# check note machine
-       testb   $0x80, %es:BIOS_FLAG2
-       jnz     is_note
-       pushw   %ds
-       pushw   $0xfd80
-       popw    %ds
-       movb    (4), %al
-       popw    %ds
-       cmpb    $0x20, %al                      # EPSON note A
-       je      epson_note
-       cmpb    $0x22, %al                      # EPSON note W
-       je      epson_note
-       cmpb    $0x27, %al                      # EPSON note AE
-       je      epson_note
-       cmpb    $0x2a, %al                      # EPSON note WR
-       jne     note_done
-epson_note:
-       movb    $1, PARAM_VIDEO98_MACHTYPE
-       movw    $msg_note, %si
-       call    prtstr_cs
-note_done:
-#endif
-       
-# print h98 ? (only NEC)
-       cmpb    $0, PARAM_VIDEO98_COMPAT
-       jnz     8f                              # not NEC -> not H98
-
-       testb   $0x80, %es:BIOS_FLAG5
-       jz      8f                              # have NESA bus -> H98
-       movw    $msg_h98, %si
-       call    prtstr_cs
-       orb     $2, PARAM_VIDEO98_MACHTYPE
-8:     testb   $0x40, %es:BIOS_FLAG5
-       jz      9f
-       movw    $msg_gs, %si
-       call    prtstr_cs                       # only prints it :-)
-9:
-       movw    $msg_normal, %si                # "normal"
-       testb   $0x8, %es:BIOS_FLAG
-       jz      1f
-       movw    $msg_hireso, %si
-1:     call    prtstr_cs
-
-       movw    $msg_sysclk, %si
-       call    prtstr_cs
-       movb    $'5', %al
-       testb   $0x80, %es:BIOS_FLAG
-       jz      2f
-       movb    $'8', %al
-2:     call    prtchr
-       call    prtstr_cs
-
-#if 0
-       testb   $0x40, %es:(0x45c)
-       jz      no_30line                       # no 30-line support
-
-       movb    %es:KB_SHFT_STS, %al
-       testb   $0x01, %al                      # is SHIFT key pressed?
-       jz      no_30line
-
-       testb   $0x10, %al                      # is CTRL key pressed?
-       jnz     line40
-
-       # switch to 30-line mode
-       movb    $30, PARAM_VIDEO98_LINES
-       movw    $msg_30line, %si
-       jmp     3f
-
-line40:
-       movb    $37, PARAM_VIDEO98_LINES
-       movw    $40, PARAM_VIDEO_LINES
-       movw    $msg_40line, %si
-3:     call    prtstr_cs
-
-       movb    $0x32, %bh
-       movw    $0x300c, %ax
-       int     $0x18                           # switch video mode
-       movb    $0x0c, %ah
-       int     $0x18                           # turn on text plane
-       movw    %cs:cursor_address, %dx
-       movb    $0x13, %ah
-       int     $0x18                           # move cursor to correct place
-       mov     $0x11, %ah
-       int     $0x18                           # turn on text plane
-
-       call    prtstr_cs                       # "Ok.\r\n"
-no_30line:
-#endif
-       ret
-
-prtstr_cs:
-       pushw   %ds
-       pushw   %cs
-       popw    %ds
-       call    prtstr
-       popw    %ds
-       ret
-
-# prthex is for debugging purposes, and prints %ax in hexadecimal.
-prthex:        pushw   %cx
-       movw    $4, %cx
-1:     rolw    $4, %ax
-       pushw   %ax
-       andb    $0xf, %al
-       cmpb    $10, %al
-       sbbb    $0x69, %al
-       das
-       call    prtchr
-       popw    %ax
-       loop    1b
-       popw    %cx
-       ret
-
-msg_probing:   .string "Probing machine: "
-
-msg_nec:       .string "NEC"
-msg_compat:    .string "compatible"
-
-msg_fontdata:  .string " (CG sum of A = 0x"
-               .string ") PC-98"
-               .string "1 "
-
-msg_gs:                .string "(GS) "
-msg_h98:       .string "(H98) "
-
-msg_normal:    .string "normal"
-msg_hireso:    .string "Hi-reso"
-
-msg_sysclk:    .string " mode, system clock "
-               .string "MHz\r\n"
-
-#if 0
-msg_40line:    # cpp will concat following lines, so the assembler can deal.
-               .ascii  "\
-Video mode will be adjusted to 37-line (so-called ``40-line'') mode later.\r\n\
-THIS MODE MAY DAMAGE YOUR MONITOR PHYSICALLY. USE AT YOUR OWN RISK.\r\n"
-msg_30line:    .string "Switching video mode to 30-line (640x480) mode... "
-               .string "Ok.\r\n"
-#endif
diff --git a/arch/i386/crypto/Makefile b/arch/i386/crypto/Makefile
deleted file mode 100644 (file)
index 103c353..0000000
+++ /dev/null
@@ -1,9 +0,0 @@
-# 
-# i386/crypto/Makefile 
-# 
-# Arch-specific CryptoAPI modules.
-# 
-
-obj-$(CONFIG_CRYPTO_AES_586) += aes-i586.o
-
-aes-i586-y := aes-i586-asm.o aes.o
diff --git a/arch/i386/crypto/aes-i586-asm.S b/arch/i386/crypto/aes-i586-asm.S
deleted file mode 100644 (file)
index e8a0471..0000000
+++ /dev/null
@@ -1,341 +0,0 @@
-// -------------------------------------------------------------------------
-// Copyright (c) 2001, Dr Brian Gladman <                 >, Worcester, UK.
-// All rights reserved.
-//
-// LICENSE TERMS
-//
-// The free distribution and use of this software in both source and binary 
-// form is allowed (with or without changes) provided that:
-//
-//   1. distributions of this source code include the above copyright 
-//      notice, this list of conditions and the following disclaimer//
-//
-//   2. distributions in binary form include the above copyright
-//      notice, this list of conditions and the following disclaimer
-//      in the documentation and/or other associated materials//
-//
-//   3. the copyright holder's name is not used to endorse products 
-//      built using this software without specific written permission.
-//
-//
-// ALTERNATIVELY, provided that this notice is retained in full, this product
-// may be distributed under the terms of the GNU General Public License (GPL),
-// in which case the provisions of the GPL apply INSTEAD OF those given above.
-//
-// Copyright (c) 2004 Linus Torvalds <torvalds@osdl.org>
-// Copyright (c) 2004 Red Hat, Inc., James Morris <jmorris@redhat.com>
-
-// DISCLAIMER
-//
-// This software is provided 'as is' with no explicit or implied warranties
-// in respect of its properties including, but not limited to, correctness 
-// and fitness for purpose.
-// -------------------------------------------------------------------------
-// Issue Date: 29/07/2002
-
-.file "aes-i586-asm.S"
-.text
-
-// aes_rval aes_enc_blk(const unsigned char in_blk[], unsigned char out_blk[], const aes_ctx cx[1])//
-// aes_rval aes_dec_blk(const unsigned char in_blk[], unsigned char out_blk[], const aes_ctx cx[1])//
-       
-#define tlen 1024   // length of each of 4 'xor' arrays (256 32-bit words)
-
-// offsets to parameters with one register pushed onto stack
-
-#define in_blk    8  // input byte array address parameter
-#define out_blk  12  // output byte array address parameter
-#define ctx      16  // AES context structure
-
-// offsets in context structure
-
-#define ekey     0   // encryption key schedule base address
-#define nrnd   256   // number of rounds
-#define dkey   260   // decryption key schedule base address
-
-// register mapping for encrypt and decrypt subroutines
-
-#define r0  eax
-#define r1  ebx
-#define r2  ecx
-#define r3  edx
-#define r4  esi
-#define r5  edi
-#define r6  ebp
-
-#define eaxl  al
-#define eaxh  ah
-#define ebxl  bl
-#define ebxh  bh
-#define ecxl  cl
-#define ecxh  ch
-#define edxl  dl
-#define edxh  dh
-
-#define _h(reg) reg##h
-#define h(reg) _h(reg)
-
-#define _l(reg) reg##l
-#define l(reg) _l(reg)
-
-// This macro takes a 32-bit word representing a column and uses
-// each of its four bytes to index into four tables of 256 32-bit
-// words to obtain values that are then xored into the appropriate
-// output registers r0, r1, r4 or r5.  
-
-// Parameters:
-//   %1  out_state[0]
-//   %2  out_state[1]
-//   %3  out_state[2]
-//   %4  out_state[3]
-//   %5  table base address
-//   %6  input register for the round (destroyed)
-//   %7  scratch register for the round
-
-#define do_col(a1, a2, a3, a4, a5, a6, a7)     \
-       movzx   %l(a6),%a7;                     \
-       xor     a5(,%a7,4),%a1;                 \
-       movzx   %h(a6),%a7;                     \
-       shr     $16,%a6;                        \
-       xor     a5+tlen(,%a7,4),%a2;            \
-       movzx   %l(a6),%a7;                     \
-       movzx   %h(a6),%a6;                     \
-       xor     a5+2*tlen(,%a7,4),%a3;          \
-       xor     a5+3*tlen(,%a6,4),%a4;
-
-// initialise output registers from the key schedule
-
-#define do_fcol(a1, a2, a3, a4, a5, a6, a7, a8)        \
-       mov     0 a8,%a1;                       \
-       movzx   %l(a6),%a7;                     \
-       mov     12 a8,%a2;                      \
-       xor     a5(,%a7,4),%a1;                 \
-       mov     4 a8,%a4;                       \
-       movzx   %h(a6),%a7;                     \
-       shr     $16,%a6;                        \
-       xor     a5+tlen(,%a7,4),%a2;            \
-       movzx   %l(a6),%a7;                     \
-       movzx   %h(a6),%a6;                     \
-       xor     a5+3*tlen(,%a6,4),%a4;          \
-       mov     %a3,%a6;                        \
-       mov     8 a8,%a3;                       \
-       xor     a5+2*tlen(,%a7,4),%a3;
-
-// initialise output registers from the key schedule
-
-#define do_icol(a1, a2, a3, a4, a5, a6, a7, a8)        \
-       mov     0 a8,%a1;                       \
-       movzx   %l(a6),%a7;                     \
-       mov     4 a8,%a2;                       \
-       xor     a5(,%a7,4),%a1;                 \
-       mov     12 a8,%a4;                      \
-       movzx   %h(a6),%a7;                     \
-       shr     $16,%a6;                        \
-       xor     a5+tlen(,%a7,4),%a2;            \
-       movzx   %l(a6),%a7;                     \
-       movzx   %h(a6),%a6;                     \
-       xor     a5+3*tlen(,%a6,4),%a4;          \
-       mov     %a3,%a6;                        \
-       mov     8 a8,%a3;                       \
-       xor     a5+2*tlen(,%a7,4),%a3;
-
-
-// original Gladman had conditional saves to MMX regs.
-#define save(a1, a2)           \
-       mov     %a2,4*a1(%esp)
-
-#define restore(a1, a2)                \
-       mov     4*a2(%esp),%a1
-
-// This macro performs a forward encryption cycle. It is entered with
-// the first previous round column values in r0, r1, r4 and r5 and
-// exits with the final values in the same registers, using the MMX
-// registers mm0-mm1 or the stack for temporary storage
-
-// mov current column values into the MMX registers
-#define fwd_rnd(arg, table)                                    \
-       /* mov current column values into the MMX registers */  \
-       mov     %r0,%r2;                                        \
-       save   (0,r1);                                          \
-       save   (1,r5);                                          \
-                                                               \
-       /* compute new column values */                         \
-       do_fcol(r0,r5,r4,r1,table, r2,r3, arg);                 \
-       do_col (r4,r1,r0,r5,table, r2,r3);                      \
-       restore(r2,0);                                          \
-       do_col (r1,r0,r5,r4,table, r2,r3);                      \
-       restore(r2,1);                                          \
-       do_col (r5,r4,r1,r0,table, r2,r3);
-
-// This macro performs an inverse encryption cycle. It is entered with
-// the first previous round column values in r0, r1, r4 and r5 and
-// exits with the final values in the same registers, using the MMX
-// registers mm0-mm1 or the stack for temporary storage
-
-#define inv_rnd(arg, table)                                    \
-       /* mov current column values into the MMX registers */  \
-       mov     %r0,%r2;                                        \
-       save    (0,r1);                                         \
-       save    (1,r5);                                         \
-                                                               \
-       /* compute new column values */                         \
-       do_icol(r0,r1,r4,r5, table, r2,r3, arg);                \
-       do_col (r4,r5,r0,r1, table, r2,r3);                     \
-       restore(r2,0);                                          \
-       do_col (r1,r4,r5,r0, table, r2,r3);                     \
-       restore(r2,1);                                          \
-       do_col (r5,r0,r1,r4, table, r2,r3);
-
-// AES (Rijndael) Encryption Subroutine
-
-.global  aes_enc_blk
-
-.extern  ft_tab
-.extern  fl_tab
-
-.align 4
-
-aes_enc_blk:
-       push    %ebp
-       mov     ctx(%esp),%ebp      // pointer to context
-       xor     %eax,%eax
-
-// CAUTION: the order and the values used in these assigns 
-// rely on the register mappings
-
-1:     push    %ebx
-       mov     in_blk+4(%esp),%r2
-       push    %esi
-       mov     nrnd(%ebp),%r3   // number of rounds
-       push    %edi
-       lea     ekey(%ebp),%r6   // key pointer
-
-// input four columns and xor in first round key
-
-       mov     (%r2),%r0
-       mov     4(%r2),%r1
-       mov     8(%r2),%r4
-       mov     12(%r2),%r5
-       xor     (%r6),%r0
-       xor     4(%r6),%r1
-       xor     8(%r6),%r4
-       xor     12(%r6),%r5
-
-       sub     $8,%esp           // space for register saves on stack
-       add     $16,%r6           // increment to next round key   
-       sub     $10,%r3          
-       je      4f              // 10 rounds for 128-bit key
-       add     $32,%r6
-       sub     $2,%r3
-       je      3f              // 12 rounds for 128-bit key
-       add     $32,%r6
-
-2:     fwd_rnd( -64(%r6) ,ft_tab)      // 14 rounds for 128-bit key
-       fwd_rnd( -48(%r6) ,ft_tab)
-3:     fwd_rnd( -32(%r6) ,ft_tab)      // 12 rounds for 128-bit key
-       fwd_rnd( -16(%r6) ,ft_tab)
-4:     fwd_rnd(    (%r6) ,ft_tab)      // 10 rounds for 128-bit key
-       fwd_rnd( +16(%r6) ,ft_tab)
-       fwd_rnd( +32(%r6) ,ft_tab)
-       fwd_rnd( +48(%r6) ,ft_tab)
-       fwd_rnd( +64(%r6) ,ft_tab)
-       fwd_rnd( +80(%r6) ,ft_tab)
-       fwd_rnd( +96(%r6) ,ft_tab)
-       fwd_rnd(+112(%r6) ,ft_tab)
-       fwd_rnd(+128(%r6) ,ft_tab)
-       fwd_rnd(+144(%r6) ,fl_tab)      // last round uses a different table
-
-// move final values to the output array.  CAUTION: the 
-// order of these assigns rely on the register mappings
-
-       add     $8,%esp
-       mov     out_blk+12(%esp),%r6
-       mov     %r5,12(%r6)
-       pop     %edi
-       mov     %r4,8(%r6)
-       pop     %esi
-       mov     %r1,4(%r6)
-       pop     %ebx
-       mov     %r0,(%r6)
-       pop     %ebp
-       mov     $1,%eax
-       ret
-
-// AES (Rijndael) Decryption Subroutine
-
-.global  aes_dec_blk
-
-.extern  it_tab
-.extern  il_tab
-
-.align 4
-
-aes_dec_blk:
-       push    %ebp
-       mov     ctx(%esp),%ebp       // pointer to context
-       xor     %eax,%eax
-
-// CAUTION: the order and the values used in these assigns 
-// rely on the register mappings
-
-1:     push    %ebx
-       mov     in_blk+4(%esp),%r2
-       push    %esi
-       mov     nrnd(%ebp),%r3   // number of rounds
-       push    %edi
-       lea     dkey(%ebp),%r6   // key pointer
-       mov     %r3,%r0
-       shl     $4,%r0
-       add     %r0,%r6
-       
-// input four columns and xor in first round key
-
-       mov     (%r2),%r0
-       mov     4(%r2),%r1
-       mov     8(%r2),%r4
-       mov     12(%r2),%r5
-       xor     (%r6),%r0
-       xor     4(%r6),%r1
-       xor     8(%r6),%r4
-       xor     12(%r6),%r5
-
-       sub     $8,%esp           // space for register saves on stack
-       sub     $16,%r6           // increment to next round key   
-       sub     $10,%r3          
-       je      4f              // 10 rounds for 128-bit key
-       sub     $32,%r6
-       sub     $2,%r3
-       je      3f              // 12 rounds for 128-bit key
-       sub     $32,%r6
-
-2:     inv_rnd( +64(%r6), it_tab)      // 14 rounds for 128-bit key 
-       inv_rnd( +48(%r6), it_tab)
-3:     inv_rnd( +32(%r6), it_tab)      // 12 rounds for 128-bit key
-       inv_rnd( +16(%r6), it_tab)
-4:     inv_rnd(    (%r6), it_tab)      // 10 rounds for 128-bit key
-       inv_rnd( -16(%r6), it_tab)
-       inv_rnd( -32(%r6), it_tab)
-       inv_rnd( -48(%r6), it_tab)
-       inv_rnd( -64(%r6), it_tab)
-       inv_rnd( -80(%r6), it_tab)
-       inv_rnd( -96(%r6), it_tab)
-       inv_rnd(-112(%r6), it_tab)
-       inv_rnd(-128(%r6), it_tab)
-       inv_rnd(-144(%r6), il_tab)      // last round uses a different table
-
-// move final values to the output array.  CAUTION: the 
-// order of these assigns rely on the register mappings
-
-       add     $8,%esp
-       mov     out_blk+12(%esp),%r6
-       mov     %r5,12(%r6)
-       pop     %edi
-       mov     %r4,8(%r6)
-       pop     %esi
-       mov     %r1,4(%r6)
-       pop     %ebx
-       mov     %r0,(%r6)
-       pop     %ebp
-       mov     $1,%eax
-       ret
-
diff --git a/arch/i386/crypto/aes.c b/arch/i386/crypto/aes.c
deleted file mode 100644 (file)
index 5a34ee9..0000000
+++ /dev/null
@@ -1,520 +0,0 @@
-/* 
- * 
- * Glue Code for optimized 586 assembler version of AES
- *
- * Copyright (c) 2002, Dr Brian Gladman <>, Worcester, UK.
- * All rights reserved.
- *
- * LICENSE TERMS
- *
- * The free distribution and use of this software in both source and binary
- * form is allowed (with or without changes) provided that:
- *
- *   1. distributions of this source code include the above copyright
- *      notice, this list of conditions and the following disclaimer;
- *
- *   2. distributions in binary form include the above copyright
- *      notice, this list of conditions and the following disclaimer
- *      in the documentation and/or other associated materials;
- *
- *   3. the copyright holder's name is not used to endorse products
- *      built using this software without specific written permission.
- *
- * ALTERNATIVELY, provided that this notice is retained in full, this product
- * may be distributed under the terms of the GNU General Public License (GPL),
- * in which case the provisions of the GPL apply INSTEAD OF those given above.
- *
- * DISCLAIMER
- *
- * This software is provided 'as is' with no explicit or implied warranties
- * in respect of its properties, including, but not limited to, correctness
- * and/or fitness for purpose.
- *
- * Copyright (c) 2003, Adam J. Richter <adam@yggdrasil.com> (conversion to
- * 2.5 API).
- * Copyright (c) 2003, 2004 Fruhwirth Clemens <clemens@endorphin.org>
- * Copyright (c) 2004 Red Hat, Inc., James Morris <jmorris@redhat.com>
- *
- */
-#include <linux/kernel.h>
-#include <linux/module.h>
-#include <linux/init.h>
-#include <linux/types.h>
-#include <linux/crypto.h>
-#include <linux/linkage.h>
-
-asmlinkage void aes_enc_blk(const u8 *src, u8 *dst, void *ctx);
-asmlinkage void aes_dec_blk(const u8 *src, u8 *dst, void *ctx);
-
-#define AES_MIN_KEY_SIZE       16
-#define AES_MAX_KEY_SIZE       32
-#define AES_BLOCK_SIZE         16
-#define AES_KS_LENGTH          4 * AES_BLOCK_SIZE
-#define RC_LENGTH              29
-
-struct aes_ctx {
-       u32 ekey[AES_KS_LENGTH];
-       u32 rounds;
-       u32 dkey[AES_KS_LENGTH];
-};
-
-#define WPOLY 0x011b
-#define u32_in(x) le32_to_cpu(*(const u32 *)(x))
-#define bytes2word(b0, b1, b2, b3)  \
-       (((u32)(b3) << 24) | ((u32)(b2) << 16) | ((u32)(b1) << 8) | (b0))
-
-/* define the finite field multiplies required for Rijndael */
-#define f2(x) ((x) ? pow[log[x] + 0x19] : 0)
-#define f3(x) ((x) ? pow[log[x] + 0x01] : 0)
-#define f9(x) ((x) ? pow[log[x] + 0xc7] : 0)
-#define fb(x) ((x) ? pow[log[x] + 0x68] : 0)
-#define fd(x) ((x) ? pow[log[x] + 0xee] : 0)
-#define fe(x) ((x) ? pow[log[x] + 0xdf] : 0)
-#define fi(x) ((x) ?   pow[255 - log[x]]: 0)
-
-static inline u32 upr(u32 x, int n)
-{
-       return (x << 8 * n) | (x >> (32 - 8 * n));
-}
-
-static inline u8 bval(u32 x, int n)
-{
-       return x >> 8 * n;
-}
-
-/* The forward and inverse affine transformations used in the S-box */
-#define fwd_affine(x) \
-       (w = (u32)x, w ^= (w<<1)^(w<<2)^(w<<3)^(w<<4), 0x63^(u8)(w^(w>>8)))
-
-#define inv_affine(x) \
-       (w = (u32)x, w = (w<<1)^(w<<3)^(w<<6), 0x05^(u8)(w^(w>>8)))
-
-static u32 rcon_tab[RC_LENGTH];
-
-u32 ft_tab[4][256];
-u32 fl_tab[4][256];
-u32 ls_tab[4][256];
-u32 im_tab[4][256];
-u32 il_tab[4][256];
-u32 it_tab[4][256];
-
-void gen_tabs(void)
-{
-       u32 i, w;
-       u8 pow[512], log[256];
-
-       /*
-        * log and power tables for GF(2^8) finite field with
-        * WPOLY as modular polynomial - the simplest primitive
-        * root is 0x03, used here to generate the tables.
-        */
-       i = 0; w = 1; 
-       
-       do {
-               pow[i] = (u8)w;
-               pow[i + 255] = (u8)w;
-               log[w] = (u8)i++;
-               w ^=  (w << 1) ^ (w & 0x80 ? WPOLY : 0);
-       } while (w != 1);
-       
-       for(i = 0, w = 1; i < RC_LENGTH; ++i) {
-               rcon_tab[i] = bytes2word(w, 0, 0, 0);
-               w = f2(w);
-       }
-
-       for(i = 0; i < 256; ++i) {
-               u8 b;
-               
-               b = fwd_affine(fi((u8)i));
-               w = bytes2word(f2(b), b, b, f3(b));
-
-               /* tables for a normal encryption round */
-               ft_tab[0][i] = w;
-               ft_tab[1][i] = upr(w, 1);
-               ft_tab[2][i] = upr(w, 2);
-               ft_tab[3][i] = upr(w, 3);
-               w = bytes2word(b, 0, 0, 0);
-               
-               /*
-                * tables for last encryption round
-                * (may also be used in the key schedule)
-                */
-               fl_tab[0][i] = w;
-               fl_tab[1][i] = upr(w, 1);
-               fl_tab[2][i] = upr(w, 2);
-               fl_tab[3][i] = upr(w, 3);
-               
-               /*
-                * table for key schedule if fl_tab above is
-                * not of the required form
-                */
-               ls_tab[0][i] = w;
-               ls_tab[1][i] = upr(w, 1);
-               ls_tab[2][i] = upr(w, 2);
-               ls_tab[3][i] = upr(w, 3);
-               
-               b = fi(inv_affine((u8)i));
-               w = bytes2word(fe(b), f9(b), fd(b), fb(b));
-
-               /* tables for the inverse mix column operation  */
-               im_tab[0][b] = w;
-               im_tab[1][b] = upr(w, 1);
-               im_tab[2][b] = upr(w, 2);
-               im_tab[3][b] = upr(w, 3);
-
-               /* tables for a normal decryption round */
-               it_tab[0][i] = w;
-               it_tab[1][i] = upr(w,1);
-               it_tab[2][i] = upr(w,2);
-               it_tab[3][i] = upr(w,3);
-
-               w = bytes2word(b, 0, 0, 0);
-               
-               /* tables for last decryption round */
-               il_tab[0][i] = w;
-               il_tab[1][i] = upr(w,1);
-               il_tab[2][i] = upr(w,2);
-               il_tab[3][i] = upr(w,3);
-    }
-}
-
-#define four_tables(x,tab,vf,rf,c)             \
-(      tab[0][bval(vf(x,0,c),rf(0,c))] ^       \
-       tab[1][bval(vf(x,1,c),rf(1,c))] ^       \
-       tab[2][bval(vf(x,2,c),rf(2,c))] ^       \
-       tab[3][bval(vf(x,3,c),rf(3,c))]         \
-)
-
-#define vf1(x,r,c)  (x)
-#define rf1(r,c)    (r)
-#define rf2(r,c)    ((r-c)&3)
-
-#define inv_mcol(x) four_tables(x,im_tab,vf1,rf1,0)
-#define ls_box(x,c) four_tables(x,fl_tab,vf1,rf2,c)
-
-#define ff(x) inv_mcol(x)
-
-#define ke4(k,i)                                                       \
-{                                                                      \
-       k[4*(i)+4] = ss[0] ^= ls_box(ss[3],3) ^ rcon_tab[i];            \
-       k[4*(i)+5] = ss[1] ^= ss[0];                                    \
-       k[4*(i)+6] = ss[2] ^= ss[1];                                    \
-       k[4*(i)+7] = ss[3] ^= ss[2];                                    \
-}
-
-#define kel4(k,i)                                                      \
-{                                                                      \
-       k[4*(i)+4] = ss[0] ^= ls_box(ss[3],3) ^ rcon_tab[i];            \
-       k[4*(i)+5] = ss[1] ^= ss[0];                                    \
-       k[4*(i)+6] = ss[2] ^= ss[1]; k[4*(i)+7] = ss[3] ^= ss[2];       \
-}
-
-#define ke6(k,i)                                                       \
-{                                                                      \
-       k[6*(i)+ 6] = ss[0] ^= ls_box(ss[5],3) ^ rcon_tab[i];           \
-       k[6*(i)+ 7] = ss[1] ^= ss[0];                                   \
-       k[6*(i)+ 8] = ss[2] ^= ss[1];                                   \
-       k[6*(i)+ 9] = ss[3] ^= ss[2];                                   \
-       k[6*(i)+10] = ss[4] ^= ss[3];                                   \
-       k[6*(i)+11] = ss[5] ^= ss[4];                                   \
-}
-
-#define kel6(k,i)                                                      \
-{                                                                      \
-       k[6*(i)+ 6] = ss[0] ^= ls_box(ss[5],3) ^ rcon_tab[i];           \
-       k[6*(i)+ 7] = ss[1] ^= ss[0];                                   \
-       k[6*(i)+ 8] = ss[2] ^= ss[1];                                   \
-       k[6*(i)+ 9] = ss[3] ^= ss[2];                                   \
-}
-
-#define ke8(k,i)                                                       \
-{                                                                      \
-       k[8*(i)+ 8] = ss[0] ^= ls_box(ss[7],3) ^ rcon_tab[i];           \
-       k[8*(i)+ 9] = ss[1] ^= ss[0];                                   \
-       k[8*(i)+10] = ss[2] ^= ss[1];                                   \
-       k[8*(i)+11] = ss[3] ^= ss[2];                                   \
-       k[8*(i)+12] = ss[4] ^= ls_box(ss[3],0);                         \
-       k[8*(i)+13] = ss[5] ^= ss[4];                                   \
-       k[8*(i)+14] = ss[6] ^= ss[5];                                   \
-       k[8*(i)+15] = ss[7] ^= ss[6];                                   \
-}
-
-#define kel8(k,i)                                                      \
-{                                                                      \
-       k[8*(i)+ 8] = ss[0] ^= ls_box(ss[7],3) ^ rcon_tab[i];           \
-       k[8*(i)+ 9] = ss[1] ^= ss[0];                                   \
-       k[8*(i)+10] = ss[2] ^= ss[1];                                   \
-       k[8*(i)+11] = ss[3] ^= ss[2];                                   \
-}
-
-#define kdf4(k,i)                                                      \
-{                                                                      \
-       ss[0] = ss[0] ^ ss[2] ^ ss[1] ^ ss[3];                          \
-       ss[1] = ss[1] ^ ss[3];                                          \
-       ss[2] = ss[2] ^ ss[3];                                          \
-       ss[3] = ss[3];                                                  \
-       ss[4] = ls_box(ss[(i+3) % 4], 3) ^ rcon_tab[i];                 \
-       ss[i % 4] ^= ss[4];                                             \
-       ss[4] ^= k[4*(i)];                                              \
-       k[4*(i)+4] = ff(ss[4]);                                         \
-       ss[4] ^= k[4*(i)+1];                                            \
-       k[4*(i)+5] = ff(ss[4]);                                         \
-       ss[4] ^= k[4*(i)+2];                                            \
-       k[4*(i)+6] = ff(ss[4]);                                         \
-       ss[4] ^= k[4*(i)+3];                                            \
-       k[4*(i)+7] = ff(ss[4]);                                         \
-}
-
-#define kd4(k,i)                                                       \
-{                                                                      \
-       ss[4] = ls_box(ss[(i+3) % 4], 3) ^ rcon_tab[i];                 \
-       ss[i % 4] ^= ss[4];                                             \
-       ss[4] = ff(ss[4]);                                              \
-       k[4*(i)+4] = ss[4] ^= k[4*(i)];                                 \
-       k[4*(i)+5] = ss[4] ^= k[4*(i)+1];                               \
-       k[4*(i)+6] = ss[4] ^= k[4*(i)+2];                               \
-       k[4*(i)+7] = ss[4] ^= k[4*(i)+3];                               \
-}
-
-#define kdl4(k,i)                                                      \
-{                                                                      \
-       ss[4] = ls_box(ss[(i+3) % 4], 3) ^ rcon_tab[i];                 \
-       ss[i % 4] ^= ss[4];                                             \
-       k[4*(i)+4] = (ss[0] ^= ss[1]) ^ ss[2] ^ ss[3];                  \
-       k[4*(i)+5] = ss[1] ^ ss[3];                                     \
-       k[4*(i)+6] = ss[0];                                             \
-       k[4*(i)+7] = ss[1];                                             \
-}
-
-#define kdf6(k,i)                                                      \
-{                                                                      \
-       ss[0] ^= ls_box(ss[5],3) ^ rcon_tab[i];                         \
-       k[6*(i)+ 6] = ff(ss[0]);                                        \
-       ss[1] ^= ss[0];                                                 \
-       k[6*(i)+ 7] = ff(ss[1]);                                        \
-       ss[2] ^= ss[1];                                                 \
-       k[6*(i)+ 8] = ff(ss[2]);                                        \
-       ss[3] ^= ss[2];                                                 \
-       k[6*(i)+ 9] = ff(ss[3]);                                        \
-       ss[4] ^= ss[3];                                                 \
-       k[6*(i)+10] = ff(ss[4]);                                        \
-       ss[5] ^= ss[4];                                                 \
-       k[6*(i)+11] = ff(ss[5]);                                        \
-}
-
-#define kd6(k,i)                                                       \
-{                                                                      \
-       ss[6] = ls_box(ss[5],3) ^ rcon_tab[i];                          \
-       ss[0] ^= ss[6]; ss[6] = ff(ss[6]);                              \
-       k[6*(i)+ 6] = ss[6] ^= k[6*(i)];                                \
-       ss[1] ^= ss[0];                                                 \
-       k[6*(i)+ 7] = ss[6] ^= k[6*(i)+ 1];                             \
-       ss[2] ^= ss[1];                                                 \
-       k[6*(i)+ 8] = ss[6] ^= k[6*(i)+ 2];                             \
-       ss[3] ^= ss[2];                                                 \
-       k[6*(i)+ 9] = ss[6] ^= k[6*(i)+ 3];                             \
-       ss[4] ^= ss[3];                                                 \
-       k[6*(i)+10] = ss[6] ^= k[6*(i)+ 4];                             \
-       ss[5] ^= ss[4];                                                 \
-       k[6*(i)+11] = ss[6] ^= k[6*(i)+ 5];                             \
-}
-
-#define kdl6(k,i)                                                      \
-{                                                                      \
-       ss[0] ^= ls_box(ss[5],3) ^ rcon_tab[i];                         \
-       k[6*(i)+ 6] = ss[0];                                            \
-       ss[1] ^= ss[0];                                                 \
-       k[6*(i)+ 7] = ss[1];                                            \
-       ss[2] ^= ss[1];                                                 \
-       k[6*(i)+ 8] = ss[2];                                            \
-       ss[3] ^= ss[2];                                                 \
-       k[6*(i)+ 9] = ss[3];                                            \
-}
-
-#define kdf8(k,i)                                                      \
-{                                                                      \
-       ss[0] ^= ls_box(ss[7],3) ^ rcon_tab[i];                         \
-       k[8*(i)+ 8] = ff(ss[0]);                                        \
-       ss[1] ^= ss[0];                                                 \
-       k[8*(i)+ 9] = ff(ss[1]);                                        \
-       ss[2] ^= ss[1];                                                 \
-       k[8*(i)+10] = ff(ss[2]);                                        \
-       ss[3] ^= ss[2];                                                 \
-       k[8*(i)+11] = ff(ss[3]);                                        \
-       ss[4] ^= ls_box(ss[3],0);                                       \
-       k[8*(i)+12] = ff(ss[4]);                                        \
-       ss[5] ^= ss[4];                                                 \
-       k[8*(i)+13] = ff(ss[5]);                                        \
-       ss[6] ^= ss[5];                                                 \
-       k[8*(i)+14] = ff(ss[6]);                                        \
-       ss[7] ^= ss[6];                                                 \
-       k[8*(i)+15] = ff(ss[7]);                                        \
-}
-
-#define kd8(k,i)                                                       \
-{                                                                      \
-       u32 __g = ls_box(ss[7],3) ^ rcon_tab[i];                        \
-       ss[0] ^= __g;                                                   \
-       __g = ff(__g);                                                  \
-       k[8*(i)+ 8] = __g ^= k[8*(i)];                                  \
-       ss[1] ^= ss[0];                                                 \
-       k[8*(i)+ 9] = __g ^= k[8*(i)+ 1];                               \
-       ss[2] ^= ss[1];                                                 \
-       k[8*(i)+10] = __g ^= k[8*(i)+ 2];                               \
-       ss[3] ^= ss[2];                                                 \
-       k[8*(i)+11] = __g ^= k[8*(i)+ 3];                               \
-       __g = ls_box(ss[3],0);                                          \
-       ss[4] ^= __g;                                                   \
-       __g = ff(__g);                                                  \
-       k[8*(i)+12] = __g ^= k[8*(i)+ 4];                               \
-       ss[5] ^= ss[4];                                                 \
-       k[8*(i)+13] = __g ^= k[8*(i)+ 5];                               \
-       ss[6] ^= ss[5];                                                 \
-       k[8*(i)+14] = __g ^= k[8*(i)+ 6];                               \
-       ss[7] ^= ss[6];                                                 \
-       k[8*(i)+15] = __g ^= k[8*(i)+ 7];                               \
-}
-
-#define kdl8(k,i)                                                      \
-{                                                                      \
-       ss[0] ^= ls_box(ss[7],3) ^ rcon_tab[i];                         \
-       k[8*(i)+ 8] = ss[0];                                            \
-       ss[1] ^= ss[0];                                                 \
-       k[8*(i)+ 9] = ss[1];                                            \
-       ss[2] ^= ss[1];                                                 \
-       k[8*(i)+10] = ss[2];                                            \
-       ss[3] ^= ss[2];                                                 \
-       k[8*(i)+11] = ss[3];                                            \
-}
-
-static int
-aes_set_key(void *ctx_arg, const u8 *in_key, unsigned int key_len, u32 *flags)
-{
-       int i;
-       u32 ss[8];
-       struct aes_ctx *ctx = ctx_arg;
-
-       /* encryption schedule */
-       
-       ctx->ekey[0] = ss[0] = u32_in(in_key);
-       ctx->ekey[1] = ss[1] = u32_in(in_key + 4);
-       ctx->ekey[2] = ss[2] = u32_in(in_key + 8);
-       ctx->ekey[3] = ss[3] = u32_in(in_key + 12);
-
-       switch(key_len) {
-       case 16:
-               for (i = 0; i < 9; i++)
-                       ke4(ctx->ekey, i);
-               kel4(ctx->ekey, 9);
-               ctx->rounds = 10;
-               break;
-               
-       case 24:
-               ctx->ekey[4] = ss[4] = u32_in(in_key + 16);
-               ctx->ekey[5] = ss[5] = u32_in(in_key + 20);
-               for (i = 0; i < 7; i++)
-                       ke6(ctx->ekey, i);
-               kel6(ctx->ekey, 7); 
-               ctx->rounds = 12;
-               break;
-
-       case 32:
-               ctx->ekey[4] = ss[4] = u32_in(in_key + 16);
-               ctx->ekey[5] = ss[5] = u32_in(in_key + 20);
-               ctx->ekey[6] = ss[6] = u32_in(in_key + 24);
-               ctx->ekey[7] = ss[7] = u32_in(in_key + 28);
-               for (i = 0; i < 6; i++)
-                       ke8(ctx->ekey, i);
-               kel8(ctx->ekey, 6);
-               ctx->rounds = 14;
-               break;
-
-       default:
-               *flags |= CRYPTO_TFM_RES_BAD_KEY_LEN;
-               return -EINVAL;
-       }
-       
-       /* decryption schedule */
-       
-       ctx->dkey[0] = ss[0] = u32_in(in_key);
-       ctx->dkey[1] = ss[1] = u32_in(in_key + 4);
-       ctx->dkey[2] = ss[2] = u32_in(in_key + 8);
-       ctx->dkey[3] = ss[3] = u32_in(in_key + 12);
-
-       switch (key_len) {
-       case 16:
-               kdf4(ctx->dkey, 0);
-               for (i = 1; i < 9; i++)
-                       kd4(ctx->dkey, i);
-               kdl4(ctx->dkey, 9);
-               break;
-               
-       case 24:
-               ctx->dkey[4] = ff(ss[4] = u32_in(in_key + 16));
-               ctx->dkey[5] = ff(ss[5] = u32_in(in_key + 20));
-               kdf6(ctx->dkey, 0);
-               for (i = 1; i < 7; i++)
-                       kd6(ctx->dkey, i);
-               kdl6(ctx->dkey, 7);
-               break;
-
-       case 32:
-               ctx->dkey[4] = ff(ss[4] = u32_in(in_key + 16));
-               ctx->dkey[5] = ff(ss[5] = u32_in(in_key + 20));
-               ctx->dkey[6] = ff(ss[6] = u32_in(in_key + 24));
-               ctx->dkey[7] = ff(ss[7] = u32_in(in_key + 28));
-               kdf8(ctx->dkey, 0);
-               for (i = 1; i < 6; i++)
-                       kd8(ctx->dkey, i);
-               kdl8(ctx->dkey, 6);
-               break;
-       }
-       return 0;
-}
-
-static inline void aes_encrypt(void *ctx, u8 *dst, const u8 *src)
-{
-       aes_enc_blk(src, dst, ctx);
-}
-static inline void aes_decrypt(void *ctx, u8 *dst, const u8 *src)
-{
-       aes_dec_blk(src, dst, ctx);
-}
-
-
-static struct crypto_alg aes_alg = {
-       .cra_name               =       "aes",
-       .cra_flags              =       CRYPTO_ALG_TYPE_CIPHER,
-       .cra_blocksize          =       AES_BLOCK_SIZE,
-       .cra_ctxsize            =       sizeof(struct aes_ctx),
-       .cra_module             =       THIS_MODULE,
-       .cra_list               =       LIST_HEAD_INIT(aes_alg.cra_list),
-       .cra_u                  =       {
-               .cipher = {
-                       .cia_min_keysize        =       AES_MIN_KEY_SIZE,
-                       .cia_max_keysize        =       AES_MAX_KEY_SIZE,
-                       .cia_setkey             =       aes_set_key,
-                       .cia_encrypt            =       aes_encrypt,
-                       .cia_decrypt            =       aes_decrypt
-               }
-       }
-};
-
-static int __init aes_init(void)
-{
-       gen_tabs();
-       return crypto_register_alg(&aes_alg);
-}
-
-static void __exit aes_fini(void)
-{
-       crypto_unregister_alg(&aes_alg);
-}
-
-module_init(aes_init);
-module_exit(aes_fini);
-
-MODULE_DESCRIPTION("Rijndael (AES) Cipher Algorithm, i586 asm optimized");
-MODULE_LICENSE("Dual BSD/GPL");
-MODULE_AUTHOR("Fruhwirth Clemens, James Morris, Brian Gladman, Adam Richter");
-MODULE_ALIAS("aes");
diff --git a/arch/i386/kernel/std_resources.c b/arch/i386/kernel/std_resources.c
deleted file mode 100644 (file)
index 9b56474..0000000
+++ /dev/null
@@ -1,204 +0,0 @@
-/*
- *  Machine specific resource allocation for generic.
- */
-
-#include <linux/ioport.h>
-#include <asm/io.h>
-#include <asm/std_resources.h>
-
-#define romsignature(x) (*(unsigned short *)(x) == 0xaa55)
-
-static struct resource system_rom_resource = {
-       .name   = "System ROM",
-       .start  = 0xf0000,
-       .end    = 0xfffff,
-       .flags  = IORESOURCE_BUSY | IORESOURCE_READONLY | IORESOURCE_MEM
-};
-
-static struct resource extension_rom_resource = {
-       .name   = "Extension ROM",
-       .start  = 0xe0000,
-       .end    = 0xeffff,
-       .flags  = IORESOURCE_BUSY | IORESOURCE_READONLY | IORESOURCE_MEM
-};
-
-static struct resource adapter_rom_resources[] = { {
-       .name   = "Adapter ROM",
-       .start  = 0xc8000,
-       .end    = 0,
-       .flags  = IORESOURCE_BUSY | IORESOURCE_READONLY | IORESOURCE_MEM
-}, {
-       .name   = "Adapter ROM",
-       .start  = 0,
-       .end    = 0,
-       .flags  = IORESOURCE_BUSY | IORESOURCE_READONLY | IORESOURCE_MEM
-}, {
-       .name   = "Adapter ROM",
-       .start  = 0,
-       .end    = 0,
-       .flags  = IORESOURCE_BUSY | IORESOURCE_READONLY | IORESOURCE_MEM
-}, {
-       .name   = "Adapter ROM",
-       .start  = 0,
-       .end    = 0,
-       .flags  = IORESOURCE_BUSY | IORESOURCE_READONLY | IORESOURCE_MEM
-}, {
-       .name   = "Adapter ROM",
-       .start  = 0,
-       .end    = 0,
-       .flags  = IORESOURCE_BUSY | IORESOURCE_READONLY | IORESOURCE_MEM
-}, {
-       .name   = "Adapter ROM",
-       .start  = 0,
-       .end    = 0,
-       .flags  = IORESOURCE_BUSY | IORESOURCE_READONLY | IORESOURCE_MEM
-} };
-
-#define ADAPTER_ROM_RESOURCES \
-       (sizeof adapter_rom_resources / sizeof adapter_rom_resources[0])
-
-static struct resource video_rom_resource = {
-       .name   = "Video ROM",
-       .start  = 0xc0000,
-       .end    = 0xc7fff,
-       .flags  = IORESOURCE_BUSY | IORESOURCE_READONLY | IORESOURCE_MEM
-};
-
-static struct resource vram_resource = {
-       .name   = "Video RAM area",
-       .start  = 0xa0000,
-       .end    = 0xbffff,
-       .flags  = IORESOURCE_BUSY | IORESOURCE_MEM
-};
-
-static struct resource standard_io_resources[] = { {
-       .name   = "dma1",
-       .start  = 0x0000,
-       .end    = 0x001f,
-       .flags  = IORESOURCE_BUSY | IORESOURCE_IO
-}, {
-       .name   = "pic1",
-       .start  = 0x0020,
-       .end    = 0x0021,
-       .flags  = IORESOURCE_BUSY | IORESOURCE_IO
-}, {
-       .name   = "timer",
-       .start  = 0x0040,
-       .end    = 0x005f,
-       .flags  = IORESOURCE_BUSY | IORESOURCE_IO
-}, {
-       .name   = "keyboard",
-       .start  = 0x0060,
-       .end    = 0x006f,
-       .flags  = IORESOURCE_BUSY | IORESOURCE_IO
-}, {
-       .name   = "dma page reg",
-       .start  = 0x0080,
-       .end    = 0x008f,
-       .flags  = IORESOURCE_BUSY | IORESOURCE_IO
-}, {
-       .name   = "pic2",
-       .start  = 0x00a0,
-       .end    = 0x00a1,
-       .flags  = IORESOURCE_BUSY | IORESOURCE_IO
-}, {
-       .name   = "dma2",
-       .start  = 0x00c0,
-       .end    = 0x00df,
-       .flags  = IORESOURCE_BUSY | IORESOURCE_IO
-}, {
-       .name   = "fpu",
-       .start  = 0x00f0,
-       .end    = 0x00ff,
-       .flags  = IORESOURCE_BUSY | IORESOURCE_IO
-} };
-
-#define STANDARD_IO_RESOURCES \
-       (sizeof standard_io_resources / sizeof standard_io_resources[0])
-
-static int __init checksum(unsigned char *rom, unsigned long length)
-{
-       unsigned char *p, sum = 0;
-
-       for (p = rom; p < rom + length; p++)
-               sum += *p;
-       return sum == 0;
-}
-
-void __init probe_roms(void)
-{
-       unsigned long start, length, upper;
-       unsigned char *rom;
-       int           i;
-
-       /* video rom */
-       upper = adapter_rom_resources[0].start;
-       for (start = video_rom_resource.start; start < upper; start += 2048) {
-               rom = isa_bus_to_virt(start);
-               if (!romsignature(rom))
-                       continue;
-
-               video_rom_resource.start = start;
-
-               /* 0 < length <= 0x7f * 512, historically */
-               length = rom[2] * 512;
-
-               /* if checksum okay, trust length byte */
-               if (length && checksum(rom, length))
-                       video_rom_resource.end = start + length - 1;
-
-               request_resource(&iomem_resource, &video_rom_resource);
-               break;
-       }
-
-       start = (video_rom_resource.end + 1 + 2047) & ~2047UL;
-       if (start < upper)
-               start = upper;
-
-       /* system rom */
-       request_resource(&iomem_resource, &system_rom_resource);
-       upper = system_rom_resource.start;
-
-       /* check for extension rom (ignore length byte!) */
-       rom = isa_bus_to_virt(extension_rom_resource.start);
-       if (romsignature(rom)) {
-               length = extension_rom_resource.end - extension_rom_resource.start + 1;
-               if (checksum(rom, length)) {
-                       request_resource(&iomem_resource, &extension_rom_resource);
-                       upper = extension_rom_resource.start;
-               }
-       }
-
-       /* check for adapter roms on 2k boundaries */
-       for (i = 0; i < ADAPTER_ROM_RESOURCES && start < upper; start += 2048) {
-               rom = isa_bus_to_virt(start);
-               if (!romsignature(rom))
-                       continue;
-
-               /* 0 < length <= 0x7f * 512, historically */
-               length = rom[2] * 512;
-
-               /* but accept any length that fits if checksum okay */
-               if (!length || start + length > upper || !checksum(rom, length))
-                       continue;
-
-               adapter_rom_resources[i].start = start;
-               adapter_rom_resources[i].end = start + length - 1;
-               request_resource(&iomem_resource, &adapter_rom_resources[i]);
-
-               start = adapter_rom_resources[i++].end & ~2047UL;
-       }
-}
-
-void __init request_graphics_resource(void)
-{
-       request_resource(&iomem_resource, &vram_resource);
-}
-
-void __init request_standard_io_resources(void)
-{
-       int i;
-
-       for (i = 0; i < STANDARD_IO_RESOURCES; i++)
-               request_resource(&ioport_resource, &standard_io_resources[i]);
-}
diff --git a/arch/i386/mach-pc9800/Makefile b/arch/i386/mach-pc9800/Makefile
deleted file mode 100644 (file)
index 7fff765..0000000
+++ /dev/null
@@ -1,5 +0,0 @@
-#
-# Makefile for the linux kernel.
-#
-
-obj-y                          := setup.o topology.o std_resources.o
diff --git a/arch/i386/mach-pc9800/setup.c b/arch/i386/mach-pc9800/setup.c
deleted file mode 100644 (file)
index d32fd17..0000000
+++ /dev/null
@@ -1,117 +0,0 @@
-/*
- *     Machine specific setup for pc9800
- */
-
-#include <linux/config.h>
-#include <linux/mm.h>
-#include <linux/smp.h>
-#include <linux/init.h>
-#include <linux/irq.h>
-#include <linux/interrupt.h>
-#include <linux/apm_bios.h>
-#include <asm/setup.h>
-#include <asm/arch_hooks.h>
-
-struct sys_desc_table_struct {
-       unsigned short length;
-       unsigned char table[0];
-};
-
-/**
- * pre_intr_init_hook - initialisation prior to setting up interrupt vectors
- *
- * Description:
- *     Perform any necessary interrupt initialisation prior to setting up
- *     the "ordinary" interrupt call gates.  For legacy reasons, the ISA
- *     interrupts should be initialised here if the machine emulates a PC
- *     in any way.
- **/
-void __init pre_intr_init_hook(void)
-{
-       init_ISA_irqs();
-}
-
-/*
- * IRQ7 is cascade interrupt to second interrupt controller
- */
-static struct irqaction irq7 = { no_action, 0, 0, "cascade", NULL, NULL};
-
-/**
- * intr_init_hook - post gate setup interrupt initialisation
- *
- * Description:
- *     Fill in any interrupts that may have been left out by the general
- *     init_IRQ() routine.  interrupts having to do with the machine rather
- *     than the devices on the I/O bus (like APIC interrupts in intel MP
- *     systems) are started here.
- **/
-void __init intr_init_hook(void)
-{
-#ifdef CONFIG_X86_LOCAL_APIC
-       apic_intr_init();
-#endif
-
-       setup_irq(7, &irq7);
-}
-
-/**
- * pre_setup_arch_hook - hook called prior to any setup_arch() execution
- *
- * Description:
- *     generally used to activate any machine specific identification
- *     routines that may be needed before setup_arch() runs.  On VISWS
- *     this is used to get the board revision and type.
- **/
-void __init pre_setup_arch_hook(void)
-{
-       SYS_DESC_TABLE.length = 0;
-       MCA_bus = 0;
-       /* In PC-9800, APM BIOS version is written in BCD...?? */
-       APM_BIOS_INFO.version = (APM_BIOS_INFO.version & 0xff00)
-                               | ((APM_BIOS_INFO.version & 0x00f0) >> 4);
-}
-
-/**
- * trap_init_hook - initialise system specific traps
- *
- * Description:
- *     Called as the final act of trap_init().  Used in VISWS to initialise
- *     the various board specific APIC traps.
- **/
-void __init trap_init_hook(void)
-{
-}
-
-static struct irqaction irq0  = { timer_interrupt, SA_INTERRUPT, 0, "timer", NULL, NULL};
-
-/**
- * time_init_hook - do any specific initialisations for the system timer.
- *
- * Description:
- *     Must plug the system timer interrupt source at HZ into the IRQ listed
- *     in irq_vectors.h:TIMER_IRQ
- **/
-void __init time_init_hook(void)
-{
-       setup_irq(0, &irq0);
-}
-
-#ifdef CONFIG_MCA
-/**
- * mca_nmi_hook - hook into MCA specific NMI chain
- *
- * Description:
- *     The MCA (Microchannel Architecture) has an NMI chain for NMI sources
- *     along the MCA bus.  Use this to hook into that chain if you will need
- *     it.
- **/
-void __init mca_nmi_hook(void)
-{
-       /* If I recall correctly, there's a whole bunch of other things that
-        * we can do to check for NMI problems, but that's all I know about
-        * at the moment.
-        */
-
-       printk("NMI generated from unknown source!\n");
-}
-#endif
diff --git a/arch/i386/mach-pc9800/std_resources.c b/arch/i386/mach-pc9800/std_resources.c
deleted file mode 100644 (file)
index 06290bf..0000000
+++ /dev/null
@@ -1,195 +0,0 @@
-/*
- *  Machine specific resource allocation for PC-9800.
- *  Written by Osamu Tomita <tomita@cinet.co.jp>
- */
-
-#include <linux/ioport.h>
-#include <asm/io.h>
-#include <asm/std_resources.h>
-
-static char str_pic1[] = "pic1";
-static char str_dma[] = "dma";
-static char str_pic2[] = "pic2";
-static char str_calender_clock[] = "calender clock";
-static char str_system[] = "system";
-static char str_nmi_control[] = "nmi control";
-static char str_kanji_rom[] = "kanji rom";
-static char str_keyboard[] = "keyboard";
-static char str_text_gdc[] = "text gdc";
-static char str_crtc[] = "crtc";
-static char str_timer[] = "timer";
-static char str_graphic_gdc[] = "graphic gdc";
-static char str_dma_ex_bank[] = "dma ex. bank";
-static char str_beep_freq[] = "beep freq.";
-static char str_mouse_pio[] = "mouse pio";
-struct resource standard_io_resources[] = {
-       { str_pic1, 0x00, 0x00, IORESOURCE_BUSY },
-       { str_dma, 0x01, 0x01, IORESOURCE_BUSY },
-       { str_pic1, 0x02, 0x02, IORESOURCE_BUSY },
-       { str_dma, 0x03, 0x03, IORESOURCE_BUSY },
-       { str_dma, 0x05, 0x05, IORESOURCE_BUSY },
-       { str_dma, 0x07, 0x07, IORESOURCE_BUSY },
-       { str_pic2, 0x08, 0x08, IORESOURCE_BUSY },
-       { str_dma, 0x09, 0x09, IORESOURCE_BUSY },
-       { str_pic2, 0x0a, 0x0a, IORESOURCE_BUSY },
-       { str_dma, 0x0b, 0x0b, IORESOURCE_BUSY },
-       { str_dma, 0x0d, 0x0d, IORESOURCE_BUSY },
-       { str_dma, 0x0f, 0x0f, IORESOURCE_BUSY },
-       { str_dma, 0x11, 0x11, IORESOURCE_BUSY },
-       { str_dma, 0x13, 0x13, IORESOURCE_BUSY },
-       { str_dma, 0x15, 0x15, IORESOURCE_BUSY },
-       { str_dma, 0x17, 0x17, IORESOURCE_BUSY },
-       { str_dma, 0x19, 0x19, IORESOURCE_BUSY },
-       { str_dma, 0x1b, 0x1b, IORESOURCE_BUSY },
-       { str_dma, 0x1d, 0x1d, IORESOURCE_BUSY },
-       { str_dma, 0x1f, 0x1f, IORESOURCE_BUSY },
-       { str_calender_clock, 0x20, 0x20, 0 },
-       { str_dma, 0x21, 0x21, IORESOURCE_BUSY },
-       { str_calender_clock, 0x22, 0x22, 0 },
-       { str_dma, 0x23, 0x23, IORESOURCE_BUSY },
-       { str_dma, 0x25, 0x25, IORESOURCE_BUSY },
-       { str_dma, 0x27, 0x27, IORESOURCE_BUSY },
-       { str_dma, 0x29, 0x29, IORESOURCE_BUSY },
-       { str_dma, 0x2b, 0x2b, IORESOURCE_BUSY },
-       { str_dma, 0x2d, 0x2d, IORESOURCE_BUSY },
-       { str_system, 0x31, 0x31, IORESOURCE_BUSY },
-       { str_system, 0x33, 0x33, IORESOURCE_BUSY },
-       { str_system, 0x35, 0x35, IORESOURCE_BUSY },
-       { str_system, 0x37, 0x37, IORESOURCE_BUSY },
-       { str_nmi_control, 0x50, 0x50, IORESOURCE_BUSY },
-       { str_nmi_control, 0x52, 0x52, IORESOURCE_BUSY },
-       { "time stamp", 0x5c, 0x5f, IORESOURCE_BUSY },
-       { str_kanji_rom, 0xa1, 0xa1, IORESOURCE_BUSY },
-       { str_kanji_rom, 0xa3, 0xa3, IORESOURCE_BUSY },
-       { str_kanji_rom, 0xa5, 0xa5, IORESOURCE_BUSY },
-       { str_kanji_rom, 0xa7, 0xa7, IORESOURCE_BUSY },
-       { str_kanji_rom, 0xa9, 0xa9, IORESOURCE_BUSY },
-       { str_keyboard, 0x41, 0x41, IORESOURCE_BUSY },
-       { str_keyboard, 0x43, 0x43, IORESOURCE_BUSY },
-       { str_text_gdc, 0x60, 0x60, IORESOURCE_BUSY },
-       { str_text_gdc, 0x62, 0x62, IORESOURCE_BUSY },
-       { str_text_gdc, 0x64, 0x64, IORESOURCE_BUSY },
-       { str_text_gdc, 0x66, 0x66, IORESOURCE_BUSY },
-       { str_text_gdc, 0x68, 0x68, IORESOURCE_BUSY },
-       { str_text_gdc, 0x6a, 0x6a, IORESOURCE_BUSY },
-       { str_text_gdc, 0x6c, 0x6c, IORESOURCE_BUSY },
-       { str_text_gdc, 0x6e, 0x6e, IORESOURCE_BUSY },
-       { str_crtc, 0x70, 0x70, IORESOURCE_BUSY },
-       { str_crtc, 0x72, 0x72, IORESOURCE_BUSY },
-       { str_crtc, 0x74, 0x74, IORESOURCE_BUSY },
-       { str_crtc, 0x74, 0x74, IORESOURCE_BUSY },
-       { str_crtc, 0x76, 0x76, IORESOURCE_BUSY },
-       { str_crtc, 0x78, 0x78, IORESOURCE_BUSY },
-       { str_crtc, 0x7a, 0x7a, IORESOURCE_BUSY },
-       { str_timer, 0x71, 0x71, IORESOURCE_BUSY },
-       { str_timer, 0x73, 0x73, IORESOURCE_BUSY },
-       { str_timer, 0x75, 0x75, IORESOURCE_BUSY },
-       { str_timer, 0x77, 0x77, IORESOURCE_BUSY },
-       { str_graphic_gdc, 0xa0, 0xa0, IORESOURCE_BUSY },
-       { str_graphic_gdc, 0xa2, 0xa2, IORESOURCE_BUSY },
-       { str_graphic_gdc, 0xa4, 0xa4, IORESOURCE_BUSY },
-       { str_graphic_gdc, 0xa6, 0xa6, IORESOURCE_BUSY },
-       { "cpu", 0xf0, 0xf7, IORESOURCE_BUSY },
-       { "fpu", 0xf8, 0xff, IORESOURCE_BUSY },
-       { str_dma_ex_bank, 0x0e05, 0x0e05, 0 },
-       { str_dma_ex_bank, 0x0e07, 0x0e07, 0 },
-       { str_dma_ex_bank, 0x0e09, 0x0e09, 0 },
-       { str_dma_ex_bank, 0x0e0b, 0x0e0b, 0 },
-       { str_beep_freq, 0x3fd9, 0x3fd9, IORESOURCE_BUSY },
-       { str_beep_freq, 0x3fdb, 0x3fdb, IORESOURCE_BUSY },
-       { str_beep_freq, 0x3fdd, 0x3fdd, IORESOURCE_BUSY },
-       { str_beep_freq, 0x3fdf, 0x3fdf, IORESOURCE_BUSY },
-       /* All PC-9800 have (exactly) one mouse interface.  */
-       { str_mouse_pio, 0x7fd9, 0x7fd9, 0 },
-       { str_mouse_pio, 0x7fdb, 0x7fdb, 0 },
-       { str_mouse_pio, 0x7fdd, 0x7fdd, 0 },
-       { str_mouse_pio, 0x7fdf, 0x7fdf, 0 },
-       { "mouse timer", 0xbfdb, 0xbfdb, 0 },
-       { "mouse irq", 0x98d7, 0x98d7, 0 },
-};
-
-#define STANDARD_IO_RESOURCES (sizeof(standard_io_resources)/sizeof(struct resource))
-
-static struct resource tvram_resource = { "Text VRAM/CG window", 0xa0000, 0xa4fff, IORESOURCE_BUSY };
-static struct resource gvram_brg_resource = { "Graphic VRAM (B/R/G)", 0xa8000, 0xbffff, IORESOURCE_BUSY };
-static struct resource gvram_e_resource = { "Graphic VRAM (E)", 0xe0000, 0xe7fff, IORESOURCE_BUSY };
-
-/* System ROM resources */
-#define MAXROMS 6
-static struct resource rom_resources[MAXROMS] = {
-       { "System ROM", 0xe8000, 0xfffff, IORESOURCE_BUSY }
-};
-
-void __init probe_roms(void)
-{
-       int i;
-       __u8 *xrom_id;
-       int roms = 1;
-
-       request_resource(&iomem_resource, rom_resources+0);
-
-       xrom_id = (__u8 *) isa_bus_to_virt(PC9800SCA_XROM_ID + 0x10);
-
-       for (i = 0; i < 16; i++) {
-               if (xrom_id[i] & 0x80) {
-                       int j;
-
-                       for (j = i + 1; j < 16 && (xrom_id[j] & 0x80); j++)
-                               ;
-                       rom_resources[roms].start = 0x0d0000 + i * 0x001000;
-                       rom_resources[roms].end = 0x0d0000 + j * 0x001000 - 1;
-                       rom_resources[roms].name = "Extension ROM";
-                       rom_resources[roms].flags = IORESOURCE_BUSY;
-
-                       request_resource(&iomem_resource,
-                                         rom_resources + roms);
-                       if (++roms >= MAXROMS)
-                               return;
-               }
-       }
-}
-
-void __init request_graphics_resource(void)
-{
-       int i;
-
-       if (PC9800_HIGHRESO_P()) {
-               tvram_resource.start = 0xe0000;
-               tvram_resource.end   = 0xe4fff;
-               gvram_brg_resource.name  = "Graphic VRAM";
-               gvram_brg_resource.start = 0xc0000;
-               gvram_brg_resource.end   = 0xdffff;
-       }
-
-       request_resource(&iomem_resource, &tvram_resource);
-       request_resource(&iomem_resource, &gvram_brg_resource);
-       if (!PC9800_HIGHRESO_P())
-               request_resource(&iomem_resource, &gvram_e_resource);
-
-       if (PC9800_HIGHRESO_P() || PC9800_9821_P()) {
-               static char graphics[] = "graphics";
-               static struct resource graphics_resources[] = {
-                       { graphics, 0x9a0, 0x9a0, 0 },
-                       { graphics, 0x9a2, 0x9a2, 0 },
-                       { graphics, 0x9a4, 0x9a4, 0 },
-                       { graphics, 0x9a6, 0x9a6, 0 },
-                       { graphics, 0x9a8, 0x9a8, 0 },
-                       { graphics, 0x9aa, 0x9aa, 0 },
-                       { graphics, 0x9ac, 0x9ac, 0 },
-                       { graphics, 0x9ae, 0x9ae, 0 },
-               };
-
-#define GRAPHICS_RESOURCES (sizeof(graphics_resources)/sizeof(struct resource))
-
-               for (i = 0; i < GRAPHICS_RESOURCES; i++)
-                       request_resource(&ioport_resource, graphics_resources + i);
-       }
-}
-
-void __init request_standard_io_resources(void)
-{
-       int i;
-
-       for (i = 0; i < STANDARD_IO_RESOURCES; i++)
-               request_resource(&ioport_resource, standard_io_resources+i);
-}
diff --git a/arch/i386/mach-pc9800/topology.c b/arch/i386/mach-pc9800/topology.c
deleted file mode 100644 (file)
index de877f6..0000000
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * arch/i386/mach-pc9800/topology.c - Populate driverfs with topology information
- *
- * Written by: Matthew Dobson, IBM Corporation
- * Original Code: Paul Dorwin, IBM Corporation, Patrick Mochel, OSDL
- *
- * Copyright (C) 2002, IBM Corp.
- *
- * 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, GOOD TITLE or
- * NON INFRINGEMENT.  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.
- *
- * Modify for PC-9800 by Osamu Tomita <tomita@cinet.co.jp>
- *
- */
-#include <linux/init.h>
-#include <linux/smp.h>
-#include <asm/cpu.h>
-
-struct i386_cpu cpu_devices[NR_CPUS];
-
-static int __init topology_init(void)
-{
-       int i;
-
-       for (i = 0; i < NR_CPUS; i++)
-               if (cpu_possible(i)) arch_register_cpu(i);
-       return 0;
-}
-
-subsys_initcall(topology_init);
diff --git a/arch/i386/mm/mmap.c b/arch/i386/mm/mmap.c
deleted file mode 100644 (file)
index f88a6c8..0000000
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- *  linux/arch/i386/mm/mmap.c
- *
- *  flexible mmap layout support
- *
- * Copyright 2003-2004 Red Hat Inc., Durham, North Carolina.
- * 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
- *
- *
- * Started by Ingo Molnar <mingo@elte.hu>
- */
-
-#include <linux/personality.h>
-#include <linux/mm.h>
-
-/*
- * Top of mmap area (just below the process stack).
- *
- * Leave an at least ~128 MB hole.
- */
-#define MIN_GAP (128*1024*1024)
-#define MAX_GAP (TASK_SIZE/6*5)
-
-static inline unsigned long mmap_base(struct mm_struct *mm)
-{
-       unsigned long gap = current->rlim[RLIMIT_STACK].rlim_cur;
-
-       if (gap < MIN_GAP)
-               gap = MIN_GAP;
-       else if (gap > MAX_GAP)
-               gap = MAX_GAP;
-
-       return TASK_SIZE - (gap & PAGE_MASK);
-}
-
-/*
- * This function, called very early during the creation of a new
- * process VM image, sets up which VM layout function to use:
- */
-void arch_pick_mmap_layout(struct mm_struct *mm)
-{
-       /*
-        * Fall back to the standard layout if the personality
-        * bit is set, or if the expected stack growth is unlimited:
-        */
-       if (sysctl_legacy_va_layout || (current->personality & ADDR_COMPAT_LAYOUT) ||
-                       current->rlim[RLIMIT_STACK].rlim_cur == RLIM_INFINITY) {
-               mm->mmap_base = TASK_UNMAPPED_BASE;
-               mm->get_unmapped_area = arch_get_unmapped_area;
-               mm->unmap_area = arch_unmap_area;
-       } else {
-               mm->mmap_base = mmap_base(mm);
-               mm->get_unmapped_area = arch_get_unmapped_area_topdown;
-               mm->get_unmapped_exec_area = arch_get_unmapped_exec_area;
-               mm->unmap_area = arch_unmap_area_topdown;
-       }
-}
diff --git a/arch/mips/configs/eagle_defconfig b/arch/mips/configs/eagle_defconfig
deleted file mode 100644 (file)
index 9a4517f..0000000
+++ /dev/null
@@ -1,749 +0,0 @@
-#
-# Automatically generated make config: don't edit
-#
-CONFIG_MIPS=y
-# CONFIG_MIPS64 is not set
-# CONFIG_64BIT is not set
-CONFIG_MIPS32=y
-
-#
-# Code maturity level options
-#
-CONFIG_EXPERIMENTAL=y
-CONFIG_CLEAN_COMPILE=y
-CONFIG_STANDALONE=y
-CONFIG_BROKEN_ON_SMP=y
-
-#
-# General setup
-#
-CONFIG_SWAP=y
-CONFIG_SYSVIPC=y
-# CONFIG_POSIX_MQUEUE is not set
-# CONFIG_BSD_PROCESS_ACCT is not set
-CONFIG_SYSCTL=y
-# CONFIG_AUDIT is not set
-CONFIG_LOG_BUF_SHIFT=14
-CONFIG_HOTPLUG=y
-# CONFIG_IKCONFIG is not set
-CONFIG_EMBEDDED=y
-CONFIG_KALLSYMS=y
-CONFIG_FUTEX=y
-CONFIG_EPOLL=y
-CONFIG_IOSCHED_NOOP=y
-CONFIG_IOSCHED_AS=y
-CONFIG_IOSCHED_DEADLINE=y
-CONFIG_IOSCHED_CFQ=y
-# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
-
-#
-# Loadable module support
-#
-CONFIG_MODULES=y
-CONFIG_MODULE_UNLOAD=y
-# CONFIG_MODULE_FORCE_UNLOAD is not set
-CONFIG_OBSOLETE_MODPARM=y
-CONFIG_MODVERSIONS=y
-CONFIG_KMOD=y
-
-#
-# Machine selection
-#
-# CONFIG_MACH_JAZZ is not set
-# CONFIG_BAGET_MIPS is not set
-CONFIG_MACH_VR41XX=y
-# CONFIG_CASIO_E55 is not set
-# CONFIG_IBM_WORKPAD is not set
-CONFIG_NEC_EAGLE=y
-# CONFIG_TANBAC_TB0226 is not set
-# CONFIG_TANBAC_TB0229 is not set
-# CONFIG_VICTOR_MPC30X is not set
-# CONFIG_ZAO_CAPCELLA is not set
-CONFIG_VRC4173=y
-# CONFIG_TOSHIBA_JMR3927 is not set
-# CONFIG_MIPS_COBALT is not set
-# CONFIG_MACH_DECSTATION is not set
-# CONFIG_MIPS_EV64120 is not set
-# CONFIG_MIPS_EV96100 is not set
-# CONFIG_MIPS_IVR is not set
-# CONFIG_LASAT is not set
-# CONFIG_MIPS_ITE8172 is not set
-# CONFIG_MIPS_ATLAS is not set
-# CONFIG_MIPS_MALTA is not set
-# CONFIG_MIPS_SEAD is not set
-# CONFIG_MOMENCO_OCELOT is not set
-# CONFIG_MOMENCO_OCELOT_G is not set
-# CONFIG_MOMENCO_OCELOT_C is not set
-# CONFIG_MOMENCO_JAGUAR_ATX is not set
-# CONFIG_PMC_YOSEMITE is not set
-# CONFIG_DDB5074 is not set
-# CONFIG_DDB5476 is not set
-# CONFIG_DDB5477 is not set
-# CONFIG_NEC_OSPREY is not set
-# CONFIG_SGI_IP22 is not set
-# CONFIG_SGI_IP32 is not set
-# CONFIG_SOC_AU1X00 is not set
-# CONFIG_SIBYTE_SB1xxx_SOC is not set
-# CONFIG_SNI_RM200_PCI is not set
-# CONFIG_TOSHIBA_RBTX4927 is not set
-CONFIG_RWSEM_GENERIC_SPINLOCK=y
-CONFIG_HAVE_DEC_LOCK=y
-CONFIG_DMA_NONCOHERENT=y
-CONFIG_CPU_LITTLE_ENDIAN=y
-CONFIG_IRQ_CPU=y
-CONFIG_DUMMY_KEYB=y
-CONFIG_MIPS_L1_CACHE_SHIFT=5
-# CONFIG_FB is not set
-
-#
-# CPU selection
-#
-# CONFIG_CPU_MIPS32 is not set
-# CONFIG_CPU_MIPS64 is not set
-# CONFIG_CPU_R3000 is not set
-# CONFIG_CPU_TX39XX is not set
-CONFIG_CPU_VR41XX=y
-# CONFIG_CPU_R4300 is not set
-# CONFIG_CPU_R4X00 is not set
-# CONFIG_CPU_TX49XX is not set
-# CONFIG_CPU_R5000 is not set
-# CONFIG_CPU_R5432 is not set
-# CONFIG_CPU_R6000 is not set
-# CONFIG_CPU_NEVADA is not set
-# CONFIG_CPU_R8000 is not set
-# CONFIG_CPU_R10000 is not set
-# CONFIG_CPU_RM7000 is not set
-# CONFIG_CPU_RM9000 is not set
-# CONFIG_CPU_SB1 is not set
-CONFIG_PAGE_SIZE_4KB=y
-# CONFIG_PAGE_SIZE_16KB is not set
-# CONFIG_PAGE_SIZE_64KB is not set
-# CONFIG_CPU_ADVANCED is not set
-CONFIG_CPU_HAS_SYNC=y
-# CONFIG_PREEMPT is not set
-# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
-
-#
-# Bus options (PCI, PCMCIA, EISA, ISA, TC)
-#
-CONFIG_PCI=y
-CONFIG_PCI_LEGACY_PROC=y
-CONFIG_PCI_NAMES=y
-CONFIG_MMU=y
-
-#
-# PCMCIA/CardBus support
-#
-CONFIG_PCMCIA=y
-# CONFIG_PCMCIA_DEBUG is not set
-# CONFIG_YENTA is not set
-# CONFIG_I82092 is not set
-# CONFIG_TCIC is not set
-# CONFIG_PCMCIA_VRC4173 is not set
-
-#
-# PCI Hotplug Support
-#
-# CONFIG_HOTPLUG_PCI is not set
-
-#
-# Executable file formats
-#
-CONFIG_BINFMT_ELF=y
-# CONFIG_BINFMT_MISC is not set
-CONFIG_TRAD_SIGNALS=y
-
-#
-# Device Drivers
-#
-
-#
-# Generic Driver Options
-#
-# CONFIG_FW_LOADER is not set
-
-#
-# Memory Technology Devices (MTD)
-#
-CONFIG_MTD=y
-# CONFIG_MTD_DEBUG is not set
-# CONFIG_MTD_PARTITIONS is not set
-# CONFIG_MTD_CONCAT is not set
-
-#
-# User Modules And Translation Layers
-#
-CONFIG_MTD_CHAR=y
-CONFIG_MTD_BLOCK=y
-# CONFIG_FTL is not set
-# CONFIG_NFTL is not set
-# CONFIG_INFTL is not set
-
-#
-# RAM/ROM/Flash chip drivers
-#
-CONFIG_MTD_CFI=y
-# CONFIG_MTD_JEDECPROBE is not set
-CONFIG_MTD_GEN_PROBE=y
-CONFIG_MTD_CFI_ADV_OPTIONS=y
-CONFIG_MTD_CFI_NOSWAP=y
-# CONFIG_MTD_CFI_BE_BYTE_SWAP is not set
-# CONFIG_MTD_CFI_LE_BYTE_SWAP is not set
-# CONFIG_MTD_CFI_GEOMETRY is not set
-CONFIG_MTD_CFI_INTELEXT=y
-# CONFIG_MTD_CFI_AMDSTD is not set
-# CONFIG_MTD_CFI_STAA is not set
-# CONFIG_MTD_RAM is not set
-# CONFIG_MTD_ROM is not set
-# CONFIG_MTD_ABSENT is not set
-# CONFIG_MTD_OBSOLETE_CHIPS is not set
-
-#
-# Mapping drivers for chip access
-#
-# CONFIG_MTD_COMPLEX_MAPPINGS is not set
-CONFIG_MTD_PHYSMAP=y
-CONFIG_MTD_PHYSMAP_START=0x1c000000
-CONFIG_MTD_PHYSMAP_LEN=0x2000000
-CONFIG_MTD_PHYSMAP_BUSWIDTH=4
-
-#
-# Self-contained MTD device drivers
-#
-# CONFIG_MTD_PMC551 is not set
-# CONFIG_MTD_SLRAM is not set
-# CONFIG_MTD_MTDRAM is not set
-# CONFIG_MTD_BLKMTD is not set
-
-#
-# Disk-On-Chip Device Drivers
-#
-# CONFIG_MTD_DOC2000 is not set
-# CONFIG_MTD_DOC2001 is not set
-# CONFIG_MTD_DOC2001PLUS is not set
-
-#
-# NAND Flash Device Drivers
-#
-# CONFIG_MTD_NAND is not set
-
-#
-# Parallel port support
-#
-# CONFIG_PARPORT is not set
-
-#
-# Plug and Play support
-#
-
-#
-# Block devices
-#
-# CONFIG_BLK_DEV_FD is not set
-# CONFIG_BLK_CPQ_DA is not set
-# CONFIG_BLK_CPQ_CISS_DA is not set
-# CONFIG_BLK_DEV_DAC960 is not set
-# CONFIG_BLK_DEV_UMEM is not set
-# CONFIG_BLK_DEV_LOOP is not set
-# CONFIG_BLK_DEV_NBD is not set
-# CONFIG_BLK_DEV_CARMEL is not set
-# CONFIG_BLK_DEV_RAM is not set
-# CONFIG_LBD is not set
-
-#
-# ATA/ATAPI/MFM/RLL support
-#
-CONFIG_IDE=y
-CONFIG_BLK_DEV_IDE=y
-
-#
-# Please see Documentation/ide.txt for help/info on IDE drives
-#
-CONFIG_BLK_DEV_IDEDISK=y
-CONFIG_IDEDISK_MULTI_MODE=y
-# CONFIG_IDEDISK_STROKE is not set
-CONFIG_BLK_DEV_IDECS=y
-# CONFIG_BLK_DEV_IDECD is not set
-# CONFIG_BLK_DEV_IDETAPE is not set
-# CONFIG_BLK_DEV_IDEFLOPPY is not set
-# CONFIG_IDE_TASK_IOCTL is not set
-CONFIG_IDE_TASKFILE_IO=y
-
-#
-# IDE chipset support/bugfixes
-#
-CONFIG_IDE_GENERIC=y
-# CONFIG_BLK_DEV_IDEPCI is not set
-# CONFIG_BLK_DEV_IDEDMA is not set
-# CONFIG_IDEDMA_AUTO is not set
-# CONFIG_BLK_DEV_HD is not set
-
-#
-# SCSI device support
-#
-# CONFIG_SCSI is not set
-
-#
-# Multi-device support (RAID and LVM)
-#
-# CONFIG_MD is not set
-
-#
-# Fusion MPT device support
-#
-# CONFIG_FUSION is not set
-
-#
-# IEEE 1394 (FireWire) support
-#
-# CONFIG_IEEE1394 is not set
-
-#
-# I2O device support
-#
-# CONFIG_I2O is not set
-
-#
-# Networking support
-#
-CONFIG_NET=y
-
-#
-# Networking options
-#
-CONFIG_PACKET=y
-CONFIG_PACKET_MMAP=y
-CONFIG_NETLINK_DEV=y
-CONFIG_UNIX=y
-CONFIG_NET_KEY=y
-CONFIG_INET=y
-CONFIG_IP_MULTICAST=y
-# CONFIG_IP_ADVANCED_ROUTER is not set
-CONFIG_IP_PNP=y
-# CONFIG_IP_PNP_DHCP is not set
-CONFIG_IP_PNP_BOOTP=y
-# CONFIG_IP_PNP_RARP is not set
-# CONFIG_NET_IPIP is not set
-# CONFIG_NET_IPGRE is not set
-# CONFIG_IP_MROUTE is not set
-# CONFIG_ARPD is not set
-# CONFIG_SYN_COOKIES is not set
-# CONFIG_INET_AH is not set
-# CONFIG_INET_ESP is not set
-# CONFIG_INET_IPCOMP is not set
-# CONFIG_IPV6 is not set
-# CONFIG_NETFILTER is not set
-CONFIG_XFRM=y
-# CONFIG_XFRM_USER is not set
-
-#
-# SCTP Configuration (EXPERIMENTAL)
-#
-# CONFIG_IP_SCTP is not set
-# CONFIG_ATM is not set
-# CONFIG_BRIDGE is not set
-# CONFIG_VLAN_8021Q is not set
-# CONFIG_DECNET is not set
-# CONFIG_LLC2 is not set
-# CONFIG_IPX is not set
-# CONFIG_ATALK is not set
-# CONFIG_X25 is not set
-# CONFIG_LAPB is not set
-# CONFIG_NET_DIVERT is not set
-# CONFIG_ECONET is not set
-# CONFIG_WAN_ROUTER is not set
-# CONFIG_NET_FASTROUTE is not set
-# CONFIG_NET_HW_FLOWCONTROL is not set
-
-#
-# QoS and/or fair queueing
-#
-# CONFIG_NET_SCHED is not set
-
-#
-# Network testing
-#
-# CONFIG_NET_PKTGEN is not set
-# CONFIG_NETPOLL is not set
-# CONFIG_NET_POLL_CONTROLLER is not set
-# CONFIG_HAMRADIO is not set
-# CONFIG_IRDA is not set
-# CONFIG_BT is not set
-CONFIG_NETDEVICES=y
-# CONFIG_DUMMY is not set
-# CONFIG_BONDING is not set
-# CONFIG_EQUALIZER is not set
-# CONFIG_TUN is not set
-# CONFIG_ETHERTAP is not set
-
-#
-# ARCnet devices
-#
-# CONFIG_ARCNET is not set
-
-#
-# Ethernet (10 or 100Mbit)
-#
-CONFIG_NET_ETHERNET=y
-# CONFIG_MII is not set
-# CONFIG_HAPPYMEAL is not set
-# CONFIG_SUNGEM is not set
-# CONFIG_NET_VENDOR_3COM is not set
-
-#
-# Tulip family network device support
-#
-# CONFIG_NET_TULIP is not set
-# CONFIG_HP100 is not set
-# CONFIG_NET_PCI is not set
-
-#
-# Ethernet (1000 Mbit)
-#
-# CONFIG_ACENIC is not set
-# CONFIG_DL2K is not set
-# CONFIG_E1000 is not set
-# CONFIG_NS83820 is not set
-# CONFIG_HAMACHI is not set
-# CONFIG_YELLOWFIN is not set
-# CONFIG_R8169 is not set
-# CONFIG_SK98LIN is not set
-# CONFIG_TIGON3 is not set
-
-#
-# Ethernet (10000 Mbit)
-#
-# CONFIG_IXGB is not set
-# CONFIG_S2IO is not set
-
-#
-# Token Ring devices
-#
-# CONFIG_TR is not set
-
-#
-# Wireless LAN (non-hamradio)
-#
-# CONFIG_NET_RADIO is not set
-
-#
-# PCMCIA network device support
-#
-CONFIG_NET_PCMCIA=y
-# CONFIG_PCMCIA_3C589 is not set
-# CONFIG_PCMCIA_3C574 is not set
-CONFIG_PCMCIA_FMVJ18X=y
-CONFIG_PCMCIA_PCNET=m
-# CONFIG_PCMCIA_NMCLAN is not set
-# CONFIG_PCMCIA_SMC91C92 is not set
-# CONFIG_PCMCIA_XIRC2PS is not set
-# CONFIG_PCMCIA_AXNET is not set
-
-#
-# Wan interfaces
-#
-# CONFIG_WAN is not set
-# CONFIG_FDDI is not set
-# CONFIG_HIPPI is not set
-# CONFIG_PPP is not set
-# CONFIG_SLIP is not set
-# CONFIG_RCPCI is not set
-# CONFIG_SHAPER is not set
-# CONFIG_NETCONSOLE is not set
-
-#
-# ISDN subsystem
-#
-# CONFIG_ISDN is not set
-
-#
-# Telephony Support
-#
-# CONFIG_PHONE is not set
-
-#
-# Input device support
-#
-CONFIG_INPUT=y
-
-#
-# Userland interfaces
-#
-CONFIG_INPUT_MOUSEDEV=y
-CONFIG_INPUT_MOUSEDEV_PSAUX=y
-CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
-CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
-# CONFIG_INPUT_JOYDEV is not set
-# CONFIG_INPUT_TSDEV is not set
-# CONFIG_INPUT_EVDEV is not set
-# CONFIG_INPUT_EVBUG is not set
-
-#
-# Input I/O drivers
-#
-# CONFIG_GAMEPORT is not set
-CONFIG_SOUND_GAMEPORT=y
-CONFIG_SERIO=y
-CONFIG_SERIO_I8042=y
-CONFIG_SERIO_SERPORT=y
-# CONFIG_SERIO_CT82C710 is not set
-# CONFIG_SERIO_PCIPS2 is not set
-
-#
-# Input Device Drivers
-#
-# CONFIG_INPUT_KEYBOARD is not set
-# CONFIG_INPUT_MOUSE is not set
-# CONFIG_INPUT_JOYSTICK is not set
-# CONFIG_INPUT_TOUCHSCREEN is not set
-# CONFIG_INPUT_MISC is not set
-
-#
-# Character devices
-#
-CONFIG_VT=y
-CONFIG_VT_CONSOLE=y
-CONFIG_HW_CONSOLE=y
-# CONFIG_SERIAL_NONSTANDARD is not set
-
-#
-# Serial drivers
-#
-CONFIG_SERIAL_8250=y
-CONFIG_SERIAL_8250_CONSOLE=y
-# CONFIG_SERIAL_8250_CS is not set
-CONFIG_SERIAL_8250_NR_UARTS=4
-# CONFIG_SERIAL_8250_EXTENDED is not set
-
-#
-# Non-8250 serial port support
-#
-CONFIG_SERIAL_CORE=y
-CONFIG_SERIAL_CORE_CONSOLE=y
-CONFIG_UNIX98_PTYS=y
-CONFIG_LEGACY_PTYS=y
-CONFIG_LEGACY_PTY_COUNT=256
-# CONFIG_QIC02_TAPE is not set
-
-#
-# IPMI
-#
-# CONFIG_IPMI_HANDLER is not set
-
-#
-# Watchdog Cards
-#
-CONFIG_WATCHDOG=y
-# CONFIG_WATCHDOG_NOWAYOUT is not set
-
-#
-# Watchdog Device Drivers
-#
-# CONFIG_SOFT_WATCHDOG is not set
-
-#
-# PCI-based Watchdog Cards
-#
-# CONFIG_PCIPCWATCHDOG is not set
-# CONFIG_WDTPCI is not set
-# CONFIG_RTC is not set
-# CONFIG_GEN_RTC is not set
-# CONFIG_DTLK is not set
-# CONFIG_R3964 is not set
-# CONFIG_APPLICOM is not set
-
-#
-# Ftape, the floppy tape device driver
-#
-# CONFIG_FTAPE is not set
-# CONFIG_AGP is not set
-# CONFIG_DRM is not set
-
-#
-# PCMCIA character devices
-#
-# CONFIG_SYNCLINK_CS is not set
-# CONFIG_RAW_DRIVER is not set
-
-#
-# I2C support
-#
-# CONFIG_I2C is not set
-
-#
-# Misc devices
-#
-
-#
-# Multimedia devices
-#
-# CONFIG_VIDEO_DEV is not set
-
-#
-# Digital Video Broadcasting Devices
-#
-# CONFIG_DVB is not set
-
-#
-# Graphics support
-#
-
-#
-# Console display driver support
-#
-# CONFIG_VGA_CONSOLE is not set
-# CONFIG_MDA_CONSOLE is not set
-CONFIG_DUMMY_CONSOLE=y
-
-#
-# Sound
-#
-# CONFIG_SOUND is not set
-
-#
-# USB support
-#
-# CONFIG_USB is not set
-
-#
-# USB Gadget Support
-#
-# CONFIG_USB_GADGET is not set
-
-#
-# File systems
-#
-CONFIG_EXT2_FS=y
-# CONFIG_EXT2_FS_XATTR is not set
-# CONFIG_EXT3_FS is not set
-# CONFIG_JBD is not set
-# CONFIG_REISERFS_FS is not set
-# CONFIG_JFS_FS is not set
-# CONFIG_XFS_FS is not set
-# CONFIG_MINIX_FS is not set
-# CONFIG_ROMFS_FS is not set
-# CONFIG_QUOTA is not set
-CONFIG_AUTOFS_FS=y
-CONFIG_AUTOFS4_FS=y
-
-#
-# CD-ROM/DVD Filesystems
-#
-# CONFIG_ISO9660_FS is not set
-# CONFIG_UDF_FS is not set
-
-#
-# DOS/FAT/NT Filesystems
-#
-# CONFIG_FAT_FS is not set
-# CONFIG_NTFS_FS is not set
-
-#
-# Pseudo filesystems
-#
-CONFIG_PROC_FS=y
-CONFIG_PROC_KCORE=y
-CONFIG_SYSFS=y
-# CONFIG_DEVFS_FS is not set
-CONFIG_DEVPTS_FS_XATTR=y
-CONFIG_DEVPTS_FS_SECURITY=y
-# CONFIG_TMPFS is not set
-# CONFIG_HUGETLB_PAGE is not set
-CONFIG_RAMFS=y
-
-#
-# Miscellaneous filesystems
-#
-# CONFIG_ADFS_FS is not set
-# CONFIG_AFFS_FS is not set
-# CONFIG_HFS_FS is not set
-# CONFIG_HFSPLUS_FS is not set
-# CONFIG_BEFS_FS is not set
-# CONFIG_BFS_FS is not set
-# CONFIG_EFS_FS is not set
-CONFIG_JFFS_FS=y
-CONFIG_JFFS_FS_VERBOSE=0
-CONFIG_JFFS2_FS=y
-CONFIG_JFFS2_FS_DEBUG=0
-# CONFIG_JFFS2_FS_NAND is not set
-# CONFIG_CRAMFS is not set
-# CONFIG_VXFS_FS is not set
-# CONFIG_HPFS_FS is not set
-# CONFIG_QNX4FS_FS is not set
-# CONFIG_SYSV_FS is not set
-# CONFIG_UFS_FS is not set
-
-#
-# Network File Systems
-#
-CONFIG_NFS_FS=y
-# CONFIG_NFS_V3 is not set
-# CONFIG_NFS_V4 is not set
-# CONFIG_NFS_DIRECTIO is not set
-CONFIG_NFSD=y
-# CONFIG_NFSD_V3 is not set
-# CONFIG_NFSD_TCP is not set
-CONFIG_ROOT_NFS=y
-CONFIG_LOCKD=y
-CONFIG_EXPORTFS=y
-CONFIG_SUNRPC=y
-# CONFIG_RPCSEC_GSS_KRB5 is not set
-# CONFIG_SMB_FS is not set
-# CONFIG_CIFS is not set
-# CONFIG_NCP_FS is not set
-# CONFIG_CODA_FS is not set
-# CONFIG_INTERMEZZO_FS is not set
-# CONFIG_AFS_FS is not set
-
-#
-# Partition Types
-#
-# CONFIG_PARTITION_ADVANCED is not set
-CONFIG_MSDOS_PARTITION=y
-
-#
-# Native Language Support
-#
-# CONFIG_NLS is not set
-
-#
-# Kernel hacking
-#
-CONFIG_CROSSCOMPILE=y
-CONFIG_CMDLINE=""
-# CONFIG_DEBUG_KERNEL is not set
-
-#
-# Security options
-#
-# CONFIG_SECURITY is not set
-
-#
-# Cryptographic options
-#
-CONFIG_CRYPTO=y
-CONFIG_CRYPTO_HMAC=y
-CONFIG_CRYPTO_NULL=y
-# CONFIG_CRYPTO_MD4 is not set
-# CONFIG_CRYPTO_MD5 is not set
-# CONFIG_CRYPTO_SHA1 is not set
-# CONFIG_CRYPTO_SHA256 is not set
-CONFIG_CRYPTO_SHA512=y
-# CONFIG_CRYPTO_DES is not set
-# CONFIG_CRYPTO_BLOWFISH is not set
-CONFIG_CRYPTO_TWOFISH=y
-# CONFIG_CRYPTO_SERPENT is not set
-CONFIG_CRYPTO_AES=y
-# CONFIG_CRYPTO_CAST5 is not set
-# CONFIG_CRYPTO_CAST6 is not set
-# CONFIG_CRYPTO_ARC4 is not set
-CONFIG_CRYPTO_DEFLATE=y
-CONFIG_CRYPTO_MICHAEL_MIC=y
-# CONFIG_CRYPTO_TEST is not set
-
-#
-# Library routines
-#
-CONFIG_CRC32=y
-CONFIG_ZLIB_INFLATE=y
-CONFIG_ZLIB_DEFLATE=y
diff --git a/arch/mips/mm-32/Makefile b/arch/mips/mm-32/Makefile
deleted file mode 100644 (file)
index 956f4bb..0000000
+++ /dev/null
@@ -1,19 +0,0 @@
-#
-# Makefile for the Linux/MIPS-specific parts of the memory manager.
-#
-
-obj-$(CONFIG_CPU_TX49XX)       += tlbex-r4k.o
-obj-$(CONFIG_CPU_R4300)                += tlbex-r4k.o
-obj-$(CONFIG_CPU_R4X00)                += tlbex-r4k.o
-obj-$(CONFIG_CPU_VR41XX)       += tlbex-r4k.o
-obj-$(CONFIG_CPU_R5000)                += tlbex-r4k.o
-obj-$(CONFIG_CPU_NEVADA)       += tlbex-r4k.o
-obj-$(CONFIG_CPU_R5432)                += tlbex-r4k.o
-obj-$(CONFIG_CPU_RM7000)       += tlbex-r4k.o
-obj-$(CONFIG_CPU_RM9000)       += tlbex-r4k.o
-obj-$(CONFIG_CPU_R10000)       += tlbex-r4k.o
-obj-$(CONFIG_CPU_MIPS32)       += tlbex-r4k.o
-obj-$(CONFIG_CPU_MIPS64)       += tlbex-r4k.o
-obj-$(CONFIG_CPU_SB1)          += tlbex-r4k.o
-
-EXTRA_AFLAGS := $(CFLAGS)
diff --git a/arch/mips/mm-32/tlbex-r4k.S b/arch/mips/mm-32/tlbex-r4k.S
deleted file mode 100644 (file)
index 4974271..0000000
+++ /dev/null
@@ -1,524 +0,0 @@
-/*
- * TLB exception handling code for r4k.
- *
- * Copyright (C) 1994, 1995, 1996 by Ralf Baechle and Andreas Busse
- *
- * Multi-cpu abstraction and reworking:
- * Copyright (C) 1996 David S. Miller (dm@engr.sgi.com)
- *
- * Carsten Langgaard, carstenl@mips.com
- * Copyright (C) 2000 MIPS Technologies, Inc.  All rights reserved.
- */
-#include <linux/init.h>
-#include <linux/config.h>
-
-#include <asm/asm.h>
-#include <asm/offset.h>
-#include <asm/cachectl.h>
-#include <asm/fpregdef.h>
-#include <asm/mipsregs.h>
-#include <asm/page.h>
-#include <asm/pgtable-bits.h>
-#include <asm/regdef.h>
-#include <asm/stackframe.h>
-#include <asm/war.h>
-
-#define TLB_OPTIMIZE /* If you are paranoid, disable this. */
-
-#ifdef CONFIG_64BIT_PHYS_ADDR
-#define PTE_L          ld
-#define PTE_S          sd
-#define PTE_SRL                dsrl
-#define P_MTC0         dmtc0
-#define PTE_SIZE       8
-#define PTEP_INDX_MSK  0xff0
-#define PTE_INDX_MSK   0xff8
-#define PTE_INDX_SHIFT 9
-#else
-#define PTE_L          lw
-#define PTE_S          sw
-#define PTE_SRL                srl
-#define P_MTC0         mtc0
-#define PTE_SIZE       4
-#define PTEP_INDX_MSK  0xff8
-#define PTE_INDX_MSK   0xffc
-#define PTE_INDX_SHIFT 10
-#endif
-
-/*
- * ABUSE of CPP macros 101.
- *
- * After this macro runs, the pte faulted on is
- * in register PTE, a ptr into the table in which
- * the pte belongs is in PTR.
- */
-
-#ifdef CONFIG_SMP
-#define GET_PGD(scratch, ptr)        \
-       mfc0    ptr, CP0_CONTEXT;    \
-       la      scratch, pgd_current;\
-       srl     ptr, 23;             \
-       sll     ptr, 2;              \
-       addu    ptr, scratch, ptr;   \
-       lw      ptr, (ptr);
-#else
-#define GET_PGD(scratch, ptr)    \
-       lw      ptr, pgd_current;
-#endif
-
-#define LOAD_PTE(pte, ptr) \
-       GET_PGD(pte, ptr)          \
-       mfc0    pte, CP0_BADVADDR; \
-       srl     pte, pte, _PGDIR_SHIFT; \
-       sll     pte, pte, 2; \
-       addu    ptr, ptr, pte; \
-       mfc0    pte, CP0_BADVADDR; \
-       lw      ptr, (ptr); \
-       srl     pte, pte, PTE_INDX_SHIFT; \
-       and     pte, pte, PTE_INDX_MSK; \
-       addu    ptr, ptr, pte; \
-       PTE_L   pte, (ptr);
-
-       /* This places the even/odd pte pair in the page
-        * table at PTR into ENTRYLO0 and ENTRYLO1 using
-        * TMP as a scratch register.
-        */
-#define PTE_RELOAD(ptr, tmp) \
-       ori     ptr, ptr, PTE_SIZE; \
-       xori    ptr, ptr, PTE_SIZE; \
-       PTE_L   tmp, PTE_SIZE(ptr); \
-       PTE_L   ptr, 0(ptr); \
-       PTE_SRL tmp, tmp, 6; \
-       P_MTC0  tmp, CP0_ENTRYLO1; \
-       PTE_SRL ptr, ptr, 6; \
-       P_MTC0  ptr, CP0_ENTRYLO0;
-
-#define DO_FAULT(write) \
-       .set    noat; \
-       SAVE_ALL; \
-       mfc0    a2, CP0_BADVADDR; \
-       KMODE; \
-       .set    at; \
-       move    a0, sp; \
-       jal     do_page_fault; \
-        li     a1, write; \
-       j       ret_from_exception; \
-        nop; \
-       .set    noat;
-
-       /* Check is PTE is present, if not then jump to LABEL.
-        * PTR points to the page table where this PTE is located,
-        * when the macro is done executing PTE will be restored
-        * with it's original value.
-        */
-#define PTE_PRESENT(pte, ptr, label) \
-       andi    pte, pte, (_PAGE_PRESENT | _PAGE_READ); \
-       xori    pte, pte, (_PAGE_PRESENT | _PAGE_READ); \
-       bnez    pte, label; \
-        PTE_L  pte, (ptr);
-
-       /* Make PTE valid, store result in PTR. */
-#define PTE_MAKEVALID(pte, ptr) \
-       ori     pte, pte, (_PAGE_VALID | _PAGE_ACCESSED); \
-       PTE_S   pte, (ptr);
-
-       /* Check if PTE can be written to, if not branch to LABEL.
-        * Regardless restore PTE with value from PTR when done.
-        */
-#define PTE_WRITABLE(pte, ptr, label) \
-       andi    pte, pte, (_PAGE_PRESENT | _PAGE_WRITE); \
-       xori    pte, pte, (_PAGE_PRESENT | _PAGE_WRITE); \
-       bnez    pte, label; \
-        PTE_L  pte, (ptr);
-
-       /* Make PTE writable, update software status bits as well,
-        * then store at PTR.
-        */
-#define PTE_MAKEWRITE(pte, ptr) \
-       ori     pte, pte, (_PAGE_ACCESSED | _PAGE_MODIFIED | \
-                          _PAGE_VALID | _PAGE_DIRTY); \
-       PTE_S   pte, (ptr);
-
-       __INIT
-
-#ifdef CONFIG_64BIT_PHYS_ADDR
-#define GET_PTE_OFF(reg)
-#elif CONFIG_CPU_VR41XX
-#define GET_PTE_OFF(reg)       srl     reg, reg, 3
-#else
-#define GET_PTE_OFF(reg)       srl     reg, reg, 1
-#endif
-
-/*
- * These handlers much be written in a relocatable manner
- * because based upon the cpu type an arbitrary one of the
- * following pieces of code will be copied to the KSEG0
- * vector location.
- */
-       /* TLB refill, EXL == 0, R4xx0, non-R4600 version */
-       .set    noreorder
-       .set    noat
-       LEAF(except_vec0_r4000)
-       .set    mips3
-       GET_PGD(k0, k1)                         # get pgd pointer
-       mfc0    k0, CP0_BADVADDR                # Get faulting address
-       srl     k0, k0, _PGDIR_SHIFT            # get pgd only bits
-
-       sll     k0, k0, 2
-       addu    k1, k1, k0                      # add in pgd offset
-       mfc0    k0, CP0_CONTEXT                 # get context reg
-       lw      k1, (k1)
-       GET_PTE_OFF(k0)                         # get pte offset
-       and     k0, k0, PTEP_INDX_MSK
-       addu    k1, k1, k0                      # add in offset
-       PTE_L   k0, 0(k1)                       # get even pte
-       PTE_L   k1, PTE_SIZE(k1)                # get odd pte
-       PTE_SRL k0, k0, 6                       # convert to entrylo0
-       P_MTC0  k0, CP0_ENTRYLO0                # load it
-       PTE_SRL k1, k1, 6                       # convert to entrylo1
-       P_MTC0  k1, CP0_ENTRYLO1                # load it
-       mtc0_tlbw_hazard
-       tlbwr                                   # write random tlb entry
-       tlbw_eret_hazard
-       eret                                    # return from trap
-       END(except_vec0_r4000)
-
-       /* TLB refill, EXL == 0, R4600 version */
-       LEAF(except_vec0_r4600)
-       .set    mips3
-       GET_PGD(k0, k1)                         # get pgd pointer
-       mfc0    k0, CP0_BADVADDR
-       srl     k0, k0, _PGDIR_SHIFT
-       sll     k0, k0, 2                       # log2(sizeof(pgd_t)
-       addu    k1, k1, k0
-       mfc0    k0, CP0_CONTEXT
-       lw      k1, (k1)
-       GET_PTE_OFF(k0)                         # get pte offset
-       and     k0, k0, PTEP_INDX_MSK
-       addu    k1, k1, k0
-       PTE_L   k0, 0(k1)
-       PTE_L   k1, PTE_SIZE(k1)
-       PTE_SRL k0, k0, 6
-       P_MTC0  k0, CP0_ENTRYLO0
-       PTE_SRL k1, k1, 6
-       P_MTC0  k1, CP0_ENTRYLO1
-       nop
-       tlbwr
-       nop
-       eret
-       END(except_vec0_r4600)
-
-       /* TLB refill, EXL == 0, R52x0 "Nevada" version */
-        /*
-         * This version has a bug workaround for the Nevada.  It seems
-         * as if under certain circumstances the move from cp0_context
-         * might produce a bogus result when the mfc0 instruction and
-         * it's consumer are in a different cacheline or a load instruction,
-         * probably any memory reference, is between them.  This is
-         * potencially slower than the R4000 version, so we use this
-         * special version.
-         */
-       .set    noreorder
-       .set    noat
-       LEAF(except_vec0_nevada)
-       .set    mips3
-       mfc0    k0, CP0_BADVADDR                # Get faulting address
-       srl     k0, k0, _PGDIR_SHIFT            # get pgd only bits
-       lw      k1, pgd_current                 # get pgd pointer
-       sll     k0, k0, 2                       # log2(sizeof(pgd_t)
-       addu    k1, k1, k0                      # add in pgd offset
-       lw      k1, (k1)
-       mfc0    k0, CP0_CONTEXT                 # get context reg
-       GET_PTE_OFF(k0)                         # get pte offset
-       and     k0, k0, PTEP_INDX_MSK
-       addu    k1, k1, k0                      # add in offset
-       PTE_L   k0, 0(k1)                       # get even pte
-       PTE_L   k1, PTE_SIZE(k1)                # get odd pte
-       PTE_SRL k0, k0, 6                       # convert to entrylo0
-       P_MTC0  k0, CP0_ENTRYLO0                # load it
-       PTE_SRL k1, k1, 6                       # convert to entrylo1
-       P_MTC0  k1, CP0_ENTRYLO1                # load it
-       nop                                     # QED specified nops
-       nop
-       tlbwr                                   # write random tlb entry
-       nop                                     # traditional nop
-       eret                                    # return from trap
-       END(except_vec0_nevada)
-
-       /* TLB refill, EXL == 0, SB1 with M3 errata handling version */
-       LEAF(except_vec0_sb1)
-#if BCM1250_M3_WAR
-       mfc0    k0, CP0_BADVADDR
-       mfc0    k1, CP0_ENTRYHI
-       xor     k0, k1
-       srl     k0, k0, PAGE_SHIFT+1
-       bnez    k0, 1f
-#endif
-       GET_PGD(k0, k1)                         # get pgd pointer
-       mfc0    k0, CP0_BADVADDR                # Get faulting address
-       srl     k0, k0, _PGDIR_SHIFT            # get pgd only bits
-       sll     k0, k0, 2
-       addu    k1, k1, k0                      # add in pgd offset
-       mfc0    k0, CP0_CONTEXT                 # get context reg
-       lw      k1, (k1)
-       GET_PTE_OFF(k0)                         # get pte offset
-       and     k0, k0, PTEP_INDX_MSK
-       addu    k1, k1, k0                      # add in offset
-       PTE_L   k0, 0(k1)                       # get even pte
-       PTE_L   k1, PTE_SIZE(k1)                # get odd pte
-       PTE_SRL k0, k0, 6                       # convert to entrylo0
-       P_MTC0  k0, CP0_ENTRYLO0                # load it
-       PTE_SRL k1, k1, 6                       # convert to entrylo1
-       P_MTC0  k1, CP0_ENTRYLO1                # load it
-       tlbwr                                   # write random tlb entry
-1:     eret                                    # return from trap
-       END(except_vec0_sb1)
-
-       /* TLB refill, EXL == 0, R4[40]00/R5000 badvaddr hwbug version */
-       LEAF(except_vec0_r45k_bvahwbug)
-       .set    mips3
-       GET_PGD(k0, k1)                         # get pgd pointer
-       mfc0    k0, CP0_BADVADDR
-       srl     k0, k0, _PGDIR_SHIFT
-       sll     k0, k0, 2                       # log2(sizeof(pgd_t)
-       addu    k1, k1, k0
-       mfc0    k0, CP0_CONTEXT
-       lw      k1, (k1)
-#ifndef CONFIG_64BIT_PHYS_ADDR
-       srl     k0, k0, 1
-#endif
-       and     k0, k0, PTEP_INDX_MSK
-       addu    k1, k1, k0
-       PTE_L   k0, 0(k1)
-       PTE_L   k1, PTE_SIZE(k1)
-       nop                             /* XXX */
-       tlbp
-       PTE_SRL k0, k0, 6
-       P_MTC0  k0, CP0_ENTRYLO0
-       PTE_SRL k1, k1, 6
-       mfc0    k0, CP0_INDEX
-       P_MTC0  k1, CP0_ENTRYLO1
-       bltzl   k0, 1f
-       tlbwr
-1:
-       nop
-       eret
-       END(except_vec0_r45k_bvahwbug)
-
-#ifdef CONFIG_SMP
-       /* TLB refill, EXL == 0, R4000 MP badvaddr hwbug version */
-       LEAF(except_vec0_r4k_mphwbug)
-       .set    mips3
-       GET_PGD(k0, k1)                         # get pgd pointer
-       mfc0    k0, CP0_BADVADDR
-       srl     k0, k0, _PGDIR_SHIFT
-       sll     k0, k0, 2                       # log2(sizeof(pgd_t)
-       addu    k1, k1, k0
-       mfc0    k0, CP0_CONTEXT
-       lw      k1, (k1)
-#ifndef CONFIG_64BIT_PHYS_ADDR
-       srl     k0, k0, 1
-#endif
-       and     k0, k0, PTEP_INDX_MSK
-       addu    k1, k1, k0
-       PTE_L   k0, 0(k1)
-       PTE_L   k1, PTE_SIZE(k1)
-       nop                             /* XXX */
-       tlbp
-       PTE_SRL k0, k0, 6
-       P_MTC0  k0, CP0_ENTRYLO0
-       PTE_SRL k1, k1, 6
-       mfc0    k0, CP0_INDEX
-       P_MTC0  k1, CP0_ENTRYLO1
-       bltzl   k0, 1f
-       tlbwr
-1:
-       nop
-       eret
-       END(except_vec0_r4k_mphwbug)
-#endif
-
-       /* TLB refill, EXL == 0, R4000 UP 250MHZ entrylo[01] hwbug version */
-       LEAF(except_vec0_r4k_250MHZhwbug)
-       .set    mips3
-       GET_PGD(k0, k1)                         # get pgd pointer
-       mfc0    k0, CP0_BADVADDR
-       srl     k0, k0, _PGDIR_SHIFT
-       sll     k0, k0, 2                       # log2(sizeof(pgd_t)
-       addu    k1, k1, k0
-       mfc0    k0, CP0_CONTEXT
-       lw      k1, (k1)
-#ifndef CONFIG_64BIT_PHYS_ADDR
-       srl     k0, k0, 1
-#endif
-       and     k0, k0, PTEP_INDX_MSK
-       addu    k1, k1, k0
-       PTE_L   k0, 0(k1)
-       PTE_L   k1, PTE_SIZE(k1)
-       PTE_SRL k0, k0, 6
-       P_MTC0  zero, CP0_ENTRYLO0
-       P_MTC0  k0, CP0_ENTRYLO0
-       PTE_SRL k1, k1, 6
-       P_MTC0  zero, CP0_ENTRYLO1
-       P_MTC0  k1, CP0_ENTRYLO1
-       b       1f
-       tlbwr
-1:
-       nop
-       eret
-       END(except_vec0_r4k_250MHZhwbug)
-
-#ifdef CONFIG_SMP
-       /* TLB refill, EXL == 0, R4000 MP 250MHZ entrylo[01]+badvaddr bug version */
-       LEAF(except_vec0_r4k_MP250MHZhwbug)
-       .set    mips3
-       GET_PGD(k0, k1)                         # get pgd pointer
-       mfc0    k0, CP0_BADVADDR
-       srl     k0, k0, _PGDIR_SHIFT
-       sll     k0, k0, 2                       # log2(sizeof(pgd_t)
-       addu    k1, k1, k0
-       mfc0    k0, CP0_CONTEXT
-       lw      k1, (k1)
-#ifndef CONFIG_64BIT_PHYS_ADDR
-       srl     k0, k0, 1
-#endif
-       and     k0, k0, PTEP_INDX_MSK
-       addu    k1, k1, k0
-       PTE_L   k0, 0(k1)
-       PTE_L   k1, PTE_SIZE(k1)
-       nop                             /* XXX */
-       tlbp
-       PTE_SRL k0, k0, 6
-       P_MTC0  zero, CP0_ENTRYLO0
-       P_MTC0  k0, CP0_ENTRYLO0
-       mfc0    k0, CP0_INDEX
-       PTE_SRL k1, k1, 6
-       P_MTC0  zero, CP0_ENTRYLO1
-       P_MTC0  k1, CP0_ENTRYLO1
-       bltzl   k0, 1f
-       tlbwr
-1:
-       nop
-       eret
-       END(except_vec0_r4k_MP250MHZhwbug)
-#endif
-
-       __FINIT
-
-       .set    noreorder
-
-/*
- * From the IDT errata for the QED RM5230 (Nevada), processor revision 1.0:
- * 2. A timing hazard exists for the TLBP instruction.
- *
- *      stalling_instruction
- *      TLBP
- *
- * The JTLB is being read for the TLBP throughout the stall generated by the
- * previous instruction. This is not really correct as the stalling instruction
- * can modify the address used to access the JTLB.  The failure symptom is that
- * the TLBP instruction will use an address created for the stalling instruction
- * and not the address held in C0_ENHI and thus report the wrong results.
- *
- * The software work-around is to not allow the instruction preceding the TLBP
- * to stall - make it an NOP or some other instruction guaranteed not to stall.
- *
- * Errata 2 will not be fixed.  This errata is also on the R5000.
- *
- * As if we MIPS hackers wouldn't know how to nop pipelines happy ...
- */
-#define R5K_HAZARD nop
-
-       /*
-        * Note for many R4k variants tlb probes cannot be executed out
-        * of the instruction cache else you get bogus results.
-        */
-       .align  5
-       NESTED(handle_tlbl, PT_SIZE, sp)
-       .set    noat
-#if BCM1250_M3_WAR
-       mfc0    k0, CP0_BADVADDR
-       mfc0    k1, CP0_ENTRYHI
-       xor     k0, k1
-       srl     k0, k0, PAGE_SHIFT+1
-       beqz    k0, 1f
-        nop
-       .set    mips3
-       eret
-       .set    mips0
-1:
-#endif
-invalid_tlbl:
-#ifdef TLB_OPTIMIZE
-       .set    mips3
-       /* Test present bit in entry. */
-       LOAD_PTE(k0, k1)
-       R5K_HAZARD
-       tlbp
-       PTE_PRESENT(k0, k1, nopage_tlbl)
-       PTE_MAKEVALID(k0, k1)
-       PTE_RELOAD(k1, k0)
-       mtc0_tlbw_hazard
-       tlbwi
-       tlbw_eret_hazard
-       .set    mips3
-       eret
-       .set    mips0
-#endif
-
-nopage_tlbl:
-       DO_FAULT(0)
-       END(handle_tlbl)
-
-       .align  5
-       NESTED(handle_tlbs, PT_SIZE, sp)
-       .set    noat
-#ifdef TLB_OPTIMIZE
-       .set    mips3
-        li      k0,0
-       LOAD_PTE(k0, k1)
-       R5K_HAZARD
-       tlbp                            # find faulting entry
-       PTE_WRITABLE(k0, k1, nopage_tlbs)
-       PTE_MAKEWRITE(k0, k1)
-       PTE_RELOAD(k1, k0)
-       mtc0_tlbw_hazard
-       tlbwi
-       tlbw_eret_hazard
-       .set    mips3
-       eret
-       .set    mips0
-#endif
-
-nopage_tlbs:
-       DO_FAULT(1)
-       END(handle_tlbs)
-
-       .align  5
-       NESTED(handle_mod, PT_SIZE, sp)
-       .set    noat
-#ifdef TLB_OPTIMIZE
-       .set    mips3
-       LOAD_PTE(k0, k1)
-       R5K_HAZARD
-       tlbp                                    # find faulting entry
-       andi    k0, k0, _PAGE_WRITE
-       beqz    k0, nowrite_mod
-        PTE_L  k0, (k1)
-
-       /* Present and writable bits set, set accessed and dirty bits. */
-       PTE_MAKEWRITE(k0, k1)
-
-       /* Now reload the entry into the tlb. */
-       PTE_RELOAD(k1, k0)
-       mtc0_tlbw_hazard
-       tlbwi
-       tlbw_eret_hazard
-       .set    mips3
-       eret
-       .set    mips0
-#endif
-
-nowrite_mod:
-       DO_FAULT(1)
-       END(handle_mod)
diff --git a/arch/mips/mm-64/Makefile b/arch/mips/mm-64/Makefile
deleted file mode 100644 (file)
index 30b4d33..0000000
+++ /dev/null
@@ -1,25 +0,0 @@
-#
-# Makefile for the Linux/MIPS-specific parts of the memory manager.
-#
-
-obj-y                          := tlbex-r4k.o
-
-obj-$(CONFIG_CPU_R4300)                += tlb-glue-r4k.o
-obj-$(CONFIG_CPU_R4X00)                += tlb-glue-r4k.o
-obj-$(CONFIG_CPU_R5000)                += tlb-glue-r4k.o
-obj-$(CONFIG_CPU_NEVADA)       += tlb-glue-r4k.o
-obj-$(CONFIG_CPU_R5432)                += tlb-glue-r4k.o
-obj-$(CONFIG_CPU_RM7000)       += tlb-glue-r4k.o
-obj-$(CONFIG_CPU_RM9000)       += tlb-glue-r4k.o
-obj-$(CONFIG_CPU_R10000)       += tlb-glue-r4k.o
-obj-$(CONFIG_CPU_SB1)          += tlb-glue-sb1.o
-obj-$(CONFIG_CPU_MIPS64)       += tlb-glue-r4k.o
-
-#
-# Debug TLB exception handler, currently unused
-#
-#obj-y                         +=  tlb-dbg-r4k.o
-
-AFLAGS_tlb-glue-r4k.o := -P
-
-EXTRA_AFLAGS := $(CFLAGS)
diff --git a/arch/mips/mm-64/tlb-dbg-r4k.c b/arch/mips/mm-64/tlb-dbg-r4k.c
deleted file mode 100644 (file)
index 44e64f7..0000000
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * This file is subject to the terms and conditions of the GNU General Public
- * License.  See the file "COPYING" in the main directory of this archive
- * for more details.
- *
- * Copyright (C) 1999 Ralf Baechle
- * Copyright (C) 1999 Silicon Graphics, Inc.
- *
- * TLB debugging routines.  These perform horribly slow but can easily be
- * modified for debugging purposes.
- */
-#include <linux/linkage.h>
-#include <linux/kernel.h>
-#include <linux/sched.h>
-#include <linux/mm.h>
-#include <asm/page.h>
-#include <asm/pgtable.h>
-#include <asm/ptrace.h>
-#include <asm/system.h>
-
-asmlinkage void do_page_fault(struct pt_regs *regs, unsigned long write,
-                              unsigned long address);
-
-asmlinkage void tlb_refill_debug(struct pt_regs regs)
-{
-       show_regs(&regs);
-       panic("%s called.  This Does Not Happen (TM).", __FUNCTION__);
-}
-
-asmlinkage void xtlb_refill_debug(struct pt_regs *regs)
-{
-       unsigned long addr;
-       pgd_t *pgd;
-       pmd_t *pmd;
-       pte_t *pte;
-
-       addr = regs->cp0_badvaddr & ~((PAGE_SIZE << 1) - 1);
-       pgd = pgd_offset(current->active_mm, addr);
-       pmd = pmd_offset(pgd, addr);
-       pte = pte_offset(pmd, addr);
-
-       write_c0_entrylo0(pte_val(pte[0]) >> 6);
-       write_c0_entrylo1(pte_val(pte[1]) >> 6);
-       __asm__ __volatile__("nop;nop;nop");
-
-       tlb_write_random();
-}
-
-asmlinkage void xtlb_mod_debug(struct pt_regs *regs)
-{
-       unsigned long addr;
-
-       addr = regs->cp0_badvaddr;
-       do_page_fault(regs, 1, addr);
-}
-
-asmlinkage void xtlb_tlbl_debug(struct pt_regs *regs)
-{
-       unsigned long addr;
-
-       addr = regs->cp0_badvaddr;
-       do_page_fault(regs, 0, addr);
-}
-
-asmlinkage void xtlb_tlbs_debug(struct pt_regs *regs)
-{
-       unsigned long addr;
-
-       addr = regs->cp0_badvaddr;
-       do_page_fault(regs, 1, addr);
-}
diff --git a/arch/mips/mm-64/tlb-glue-r4k.S b/arch/mips/mm-64/tlb-glue-r4k.S
deleted file mode 100644 (file)
index 4e0194a..0000000
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * This file is subject to the terms and conditions of the GNU General Public
- * License.  See the file "COPYING" in the main directory of this archive
- * for more details.
- *
- * Copyright (C) 1999 Ralf Baechle
- * Copyright (C) 1999 Silicon Graphics, Inc.
- */
-#include <linux/init.h>
-#include <asm/mipsregs.h>
-#include <asm/regdef.h>
-#include <asm/stackframe.h>
-
-       .macro  __BUILD_cli
-       CLI
-       .endm
-
-       .macro  __BUILD_sti
-       STI
-       .endm
-
-       .macro  __BUILD_kmode
-       KMODE
-       .endm
-
-       .macro  tlb_handler name interruptible writebit
-       NESTED(__\name, PT_SIZE, sp)
-       SAVE_ALL
-       dmfc0   a2, CP0_BADVADDR
-       __BUILD_\interruptible
-       li      a1, \writebit
-       sd      a2, PT_BVADDR(sp)
-       move    a0, sp
-       jal     do_page_fault
-       j       ret_from_exception
-       END(__\name)
-       .endm
-
-       tlb_handler     xtlb_mod kmode 1
-       tlb_handler     xtlb_tlbl kmode 0
-       tlb_handler     xtlb_tlbs kmode 1
diff --git a/arch/mips/mm-64/tlb-glue-sb1.S b/arch/mips/mm-64/tlb-glue-sb1.S
deleted file mode 100644 (file)
index 3c23653..0000000
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * This file is subject to the terms and conditions of the GNU General Public
- * License.  See the file "COPYING" in the main directory of this archive
- * for more details.
- *
- * Copyright (C) 1999 Ralf Baechle
- * Copyright (C) 1999 Silicon Graphics, Inc.
- */
-#include <linux/init.h>
-#include <asm/mipsregs.h>
-#include <asm/page.h>
-#include <asm/regdef.h>
-#include <asm/stackframe.h>
-#include <asm/war.h>
-
-       .macro  __BUILD_cli
-       CLI
-       .endm
-
-       .macro  __BUILD_sti
-       STI
-       .endm
-
-       .macro  __BUILD_kmode
-       KMODE
-       .endm
-
-       .macro  tlb_handler name interruptible writebit
-       NESTED(__\name, PT_SIZE, sp)
-       SAVE_ALL
-       dmfc0   a2, CP0_BADVADDR
-       __BUILD_\interruptible
-       li      a1, \writebit
-       sd      a2, PT_BVADDR(sp)
-       move    a0, sp
-       jal     do_page_fault
-       j       ret_from_exception
-       END(__\name)
-       .endm
-
-       .macro  tlb_handler_m3 name interruptible writebit
-       NESTED(__\name, PT_SIZE, sp)
-       dmfc0   k0, CP0_BADVADDR
-       dmfc0   k1, CP0_ENTRYHI
-       xor     k0, k1
-       dsrl    k0, k0, PAGE_SHIFT + 1
-       bnez    k0, 1f
-       SAVE_ALL
-       dmfc0   a2, CP0_BADVADDR
-       __BUILD_\interruptible
-       li      a1, \writebit
-       sd      a2, PT_BVADDR(sp)
-       move    a0, sp
-       jal     do_page_fault
-1:
-       j       ret_from_exception
-       END(__\name)
-       .endm
-
-       tlb_handler     xtlb_mod kmode 1
-#if BCM1250_M3_WAR
-       tlb_handler_m3  xtlb_tlbl kmode 0
-#else
-       tlb_handler     xtlb_tlbl kmode 0
-#endif
-       tlb_handler     xtlb_tlbs kmode 1
diff --git a/arch/mips/mm-64/tlbex-r4k.S b/arch/mips/mm-64/tlbex-r4k.S
deleted file mode 100644 (file)
index 728d18f..0000000
+++ /dev/null
@@ -1,203 +0,0 @@
-/*
- * This file is subject to the terms and conditions of the GNU General Public
- * License.  See the file "COPYING" in the main directory of this archive
- * for more details.
- *
- * Copyright (C) 2000 Silicon Graphics, Inc.
- * Written by Ulf Carlsson (ulfc@engr.sgi.com)
- * Copyright (C) 2002  Maciej W. Rozycki
- */
-#include <linux/config.h>
-#include <linux/init.h>
-#include <linux/threads.h>
-
-#include <asm/asm.h>
-#include <asm/hazards.h>
-#include <asm/regdef.h>
-#include <asm/mipsregs.h>
-#include <asm/stackframe.h>
-#include <asm/war.h>
-
-#define _VMALLOC_START 0xc000000000000000
-
-       /*
-        * After this macro runs we have a pointer to the pte of the address
-        * that caused the fault in PTR.
-        */
-       .macro  LOAD_PTE2, ptr, tmp, kaddr
-#ifdef CONFIG_SMP
-       dmfc0   \ptr, CP0_CONTEXT
-       dmfc0   \tmp, CP0_BADVADDR
-       dsra    \ptr, 23                        # get pgd_current[cpu]
-#else
-       dmfc0   \tmp, CP0_BADVADDR
-       dla     \ptr, pgd_current
-#endif
-       bltz    \tmp, \kaddr
-        ld     \ptr, (\ptr)
-       dsrl    \tmp, (_PGDIR_SHIFT-3)          # get pgd offset in bytes
-       andi    \tmp, ((_PTRS_PER_PGD - 1)<<3)
-       daddu   \ptr, \tmp                      # add in pgd offset
-       dmfc0   \tmp, CP0_BADVADDR
-       ld      \ptr, (\ptr)                    # get pmd pointer
-       dsrl    \tmp, (_PMD_SHIFT-3)            # get pmd offset in bytes
-       andi    \tmp, ((_PTRS_PER_PMD - 1)<<3)
-       daddu   \ptr, \tmp                      # add in pmd offset
-       dmfc0   \tmp, CP0_XCONTEXT
-       ld      \ptr, (\ptr)                    # get pte pointer
-       andi    \tmp, 0xff0                     # get pte offset
-       daddu   \ptr, \tmp
-       .endm
-
-
-       /*
-        * Ditto for the kernel table.
-        */
-       .macro  LOAD_KPTE2, ptr, tmp, not_vmalloc
-       /*
-        * First, determine that the address is in/above vmalloc range.
-        */
-       dmfc0   \tmp, CP0_BADVADDR
-       dli     \ptr, _VMALLOC_START
-
-       /*
-        * Now find offset into kptbl.
-        */
-       dsubu   \tmp, \tmp, \ptr
-       dla     \ptr, kptbl
-       dsrl    \tmp, (_PAGE_SHIFT+1)           # get vpn2
-       dsll    \tmp, 4                         # byte offset of pte
-       daddu   \ptr, \ptr, \tmp
-
-       /*
-        * Determine that fault address is within vmalloc range.
-        */
-       dla     \tmp, ekptbl
-       slt     \tmp, \ptr, \tmp
-       beqz    \tmp, \not_vmalloc              # not vmalloc
-        nop
-       .endm
-
-
-       /*
-        * This places the even/odd pte pair in the page table at the pte
-        * entry pointed to by PTE into ENTRYLO0 and ENTRYLO1.
-        */
-       .macro  PTE_RELOAD, pte0, pte1
-       dsrl    \pte0, 6                        # convert to entrylo0
-       dmtc0   \pte0, CP0_ENTRYLO0             # load it
-       dsrl    \pte1, 6                        # convert to entrylo1
-       dmtc0   \pte1, CP0_ENTRYLO1             # load it
-       .endm
-
-
-       .text
-       .set    noreorder
-       .set    mips3
-
-       __INIT
-
-       /*
-        * TLB refill handlers for the R4000 and SB1.
-        * Attention:  We may only use 32 instructions / 128 bytes.
-        */
-       .align  5
-LEAF(except_vec1_r4k)
-       .set    noat
-       dla     k0, handle_vec1_r4k
-       jr      k0
-        nop
-END(except_vec1_r4k)
-
-LEAF(except_vec1_sb1)
-#if BCM1250_M3_WAR
-       dmfc0   k0, CP0_BADVADDR
-       dmfc0   k1, CP0_ENTRYHI
-       xor     k0, k1
-       dsrl    k0, k0, _PAGE_SHIFT+1
-       bnez    k0, 1f
-#endif
-       .set    noat
-       dla     k0, handle_vec1_r4k
-       jr      k0
-        nop
-
-1:     eret
-       nop
-END(except_vec1_sb1)
-
-       __FINIT
-
-       .align  5
-LEAF(handle_vec1_r4k)
-       .set    noat
-       LOAD_PTE2 k1 k0 9f
-       ld      k0, 0(k1)                       # get even pte
-       ld      k1, 8(k1)                       # get odd pte
-       PTE_RELOAD k0 k1
-       mtc0_tlbw_hazard
-       tlbwr
-       tlbw_eret_hazard
-       eret
-
-9:                                             # handle the vmalloc range
-       LOAD_KPTE2 k1 k0 invalid_vmalloc_address
-       ld      k0, 0(k1)                       # get even pte
-       ld      k1, 8(k1)                       # get odd pte
-       PTE_RELOAD k0 k1
-       mtc0_tlbw_hazard
-        tlbwr
-       tlbw_eret_hazard
-       eret
-END(handle_vec1_r4k)
-
-
-       __INIT
-
-       /*
-        * TLB refill handler for the R10000.
-        * Attention:  We may only use 32 instructions / 128 bytes.
-        */
-       .align  5
-LEAF(except_vec1_r10k)
-       .set    noat
-       dla     k0, handle_vec1_r10k
-       jr      k0
-        nop
-END(except_vec1_r10k)
-
-       __FINIT
-
-       .align  5
-LEAF(handle_vec1_r10k)
-       .set    noat
-       LOAD_PTE2 k1 k0 9f
-       ld      k0, 0(k1)                       # get even pte
-       ld      k1, 8(k1)                       # get odd pte
-       PTE_RELOAD k0 k1
-       nop
-       tlbwr
-       eret
-
-9:                                             # handle the vmalloc range
-       LOAD_KPTE2 k1 k0 invalid_vmalloc_address
-       ld      k0, 0(k1)                       # get even pte
-       ld      k1, 8(k1)                       # get odd pte
-       PTE_RELOAD k0 k1
-       nop
-       tlbwr
-       eret
-END(handle_vec1_r10k)
-
-
-       .align  5
-LEAF(invalid_vmalloc_address)
-       .set    noat
-       SAVE_ALL
-       CLI
-       dmfc0   t0, CP0_BADVADDR
-       sd      t0, PT_BVADDR(sp)
-       move    a0, sp
-       jal     show_regs
-       PANIC("Invalid kernel address")
-END(invalid_vmalloc_address)
diff --git a/arch/mips/mm/tlbex-r3k.S b/arch/mips/mm/tlbex-r3k.S
deleted file mode 100644 (file)
index cc4a464..0000000
+++ /dev/null
@@ -1,224 +0,0 @@
-/*
- * TLB exception handling code for R2000/R3000.
- *
- * Copyright (C) 1994, 1995, 1996 by Ralf Baechle and Andreas Busse
- *
- * Multi-CPU abstraction reworking:
- * Copyright (C) 1996 David S. Miller (dm@engr.sgi.com)
- *
- * Further modifications to make this work:
- * Copyright (c) 1998 Harald Koerfgen
- * Copyright (c) 1998, 1999 Gleb Raiko & Vladimir Roganov
- * Copyright (c) 2001 Ralf Baechle
- * Copyright (c) 2001 MIPS Technologies, Inc.
- */
-#include <linux/init.h>
-#include <asm/asm.h>
-#include <asm/cachectl.h>
-#include <asm/fpregdef.h>
-#include <asm/mipsregs.h>
-#include <asm/page.h>
-#include <asm/pgtable-bits.h>
-#include <asm/regdef.h>
-#include <asm/stackframe.h>
-
-#define TLB_OPTIMIZE /* If you are paranoid, disable this. */
-
-       .text
-       .set    mips1
-       .set    noreorder
-
-       __INIT
-
-       /* TLB refill, R[23]00 version */
-       LEAF(except_vec0_r2300)
-       .set    noat
-       .set    mips1
-       mfc0    k0, CP0_BADVADDR
-       lw      k1, pgd_current                 # get pgd pointer
-       srl     k0, k0, 22
-       sll     k0, k0, 2
-       addu    k1, k1, k0
-       mfc0    k0, CP0_CONTEXT
-       lw      k1, (k1)
-       and     k0, k0, 0xffc
-       addu    k1, k1, k0
-       lw      k0, (k1)
-       nop
-       mtc0    k0, CP0_ENTRYLO0
-       mfc0    k1, CP0_EPC
-       tlbwr
-       jr      k1
-       rfe
-       END(except_vec0_r2300)
-
-       __FINIT
-
-       /* ABUSE of CPP macros 101. */
-
-       /* After this macro runs, the pte faulted on is
-        * in register PTE, a ptr into the table in which
-        * the pte belongs is in PTR.
-        */
-#define LOAD_PTE(pte, ptr) \
-       mfc0    pte, CP0_BADVADDR; \
-       lw      ptr, pgd_current; \
-       srl     pte, pte, 22; \
-       sll     pte, pte, 2; \
-       addu    ptr, ptr, pte; \
-       mfc0    pte, CP0_CONTEXT; \
-       lw      ptr, (ptr); \
-       andi    pte, pte, 0xffc; \
-       addu    ptr, ptr, pte; \
-       lw      pte, (ptr); \
-       nop;
-
-       /* This places the even/odd pte pair in the page
-        * table at PTR into ENTRYLO0 and ENTRYLO1 using
-        * TMP as a scratch register.
-        */
-#define PTE_RELOAD(ptr) \
-       lw      ptr, (ptr)      ; \
-       nop                     ; \
-       mtc0    ptr, CP0_ENTRYLO0; \
-       nop;
-
-#define DO_FAULT(write) \
-       .set    noat; \
-       .set    macro; \
-       SAVE_ALL; \
-       mfc0    a2, CP0_BADVADDR; \
-       KMODE; \
-       .set    at; \
-       move    a0, sp; \
-       jal     do_page_fault; \
-        li     a1, write; \
-       j       ret_from_exception; \
-        nop; \
-       .set    noat; \
-       .set    nomacro;
-
-       /* Check is PTE is present, if not then jump to LABEL.
-        * PTR points to the page table where this PTE is located,
-        * when the macro is done executing PTE will be restored
-        * with it's original value.
-        */
-#define PTE_PRESENT(pte, ptr, label) \
-       andi    pte, pte, (_PAGE_PRESENT | _PAGE_READ); \
-       xori    pte, pte, (_PAGE_PRESENT | _PAGE_READ); \
-       bnez    pte, label; \
-       .set    push;       \
-       .set    reorder;    \
-        lw     pte, (ptr); \
-       .set    pop;
-
-       /* Make PTE valid, store result in PTR. */
-#define PTE_MAKEVALID(pte, ptr) \
-       ori     pte, pte, (_PAGE_VALID | _PAGE_ACCESSED); \
-       sw      pte, (ptr);
-
-       /* Check if PTE can be written to, if not branch to LABEL.
-        * Regardless restore PTE with value from PTR when done.
-        */
-#define PTE_WRITABLE(pte, ptr, label) \
-       andi    pte, pte, (_PAGE_PRESENT | _PAGE_WRITE); \
-       xori    pte, pte, (_PAGE_PRESENT | _PAGE_WRITE); \
-       bnez    pte, label; \
-       .set    push;       \
-       .set    reorder;    \
-       lw      pte, (ptr); \
-       .set    pop;
-
-
-       /* Make PTE writable, update software status bits as well,
-        * then store at PTR.
-        */
-#define PTE_MAKEWRITE(pte, ptr) \
-       ori     pte, pte, (_PAGE_ACCESSED | _PAGE_MODIFIED | \
-                          _PAGE_VALID | _PAGE_DIRTY); \
-       sw      pte, (ptr);
-
-/*
- * The index register may have the probe fail bit set,
- * because we would trap on access kseg2, i.e. without refill.
- */
-#define TLB_WRITE(reg) \
-       mfc0    reg, CP0_INDEX; \
-       nop; \
-       bltz    reg, 1f; \
-        nop; \
-       tlbwi; \
-       j       2f; \
-        nop; \
-1:     tlbwr; \
-2:
-
-#define RET(reg) \
-       mfc0    reg, CP0_EPC; \
-       nop; \
-       jr      reg; \
-        rfe
-
-       .set    noreorder
-
-       .align  5
-NESTED(handle_tlbl, PT_SIZE, sp)
-       .set    noat
-
-#ifdef TLB_OPTIMIZE
-       /* Test present bit in entry. */
-       LOAD_PTE(k0, k1)
-        tlbp
-        PTE_PRESENT(k0, k1, nopage_tlbl)
-        PTE_MAKEVALID(k0, k1)
-        PTE_RELOAD(k1)
-       TLB_WRITE(k0)
-       RET(k0)
-nopage_tlbl:
-#endif
-
-       DO_FAULT(0)
-END(handle_tlbl)
-
-NESTED(handle_tlbs, PT_SIZE, sp)
-       .set    noat
-
-#ifdef TLB_OPTIMIZE
-       LOAD_PTE(k0, k1)
-       tlbp                            # find faulting entry
-       PTE_WRITABLE(k0, k1, nopage_tlbs)
-       PTE_MAKEWRITE(k0, k1)
-       PTE_RELOAD(k1)
-       TLB_WRITE(k0)
-       RET(k0)
-nopage_tlbs:
-#endif
-
-       DO_FAULT(1)
-END(handle_tlbs)
-
-       .align  5
-NESTED(handle_mod, PT_SIZE, sp)
-       .set    noat
-#ifdef TLB_OPTIMIZE
-       LOAD_PTE(k0, k1)
-       tlbp                                    # find faulting entry
-       andi    k0, k0, _PAGE_WRITE
-       beqz    k0, nowrite_mod
-       .set    push
-       .set    reorder
-       lw      k0, (k1)
-       .set    pop
-
-       /* Present and writable bits set, set accessed and dirty bits. */
-       PTE_MAKEWRITE(k0, k1)
-
-       /* Now reload the entry into the tlb. */
-       PTE_RELOAD(k1)
-       tlbwi
-       RET(k0)
-#endif
-
-nowrite_mod:
-       DO_FAULT(1)
-END(handle_mod)
diff --git a/arch/mips/momentum/ocelot_c/pci-irq.c b/arch/mips/momentum/ocelot_c/pci-irq.c
deleted file mode 100644 (file)
index c14b6d9..0000000
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * Copyright 2002 Momentum Computer Inc.
- * Author: Matthew Dharm <mdharm@momenco.com> 
- *
- * Based on work for the Linux port to the Ocelot board, which is
- * Copyright 2001 MontaVista Software Inc.
- * Author: Jun Sun, jsun@mvista.com or jsun@junsun.net
- *
- * arch/mips/momentum/ocelot_g/pci.c
- *     Board-specific PCI routines for mv64340 controller.
- *
- * 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/types.h>
-#include <linux/pci.h>
-#include <linux/kernel.h>
-#include <linux/init.h>
-#include <asm/pci.h>
-
-
-void __init mv64340_board_pcibios_fixup_bus(struct pci_bus *bus)
-{
-       struct pci_bus *current_bus = bus;
-       struct pci_dev *devices;
-       struct list_head *devices_link;
-       u16 cmd;
-
-       /* loop over all known devices on this bus */
-       list_for_each(devices_link, &(current_bus->devices)) {
-
-               devices = pci_dev_b(devices_link);
-               if (devices == NULL)
-                       continue;
-
-               if ((current_bus->number == 0) &&
-                       (PCI_SLOT(devices->devfn) == 1) &&
-                       (PCI_FUNC(devices->devfn) == 0)) {
-                       /* LSI 53C10101R SCSI (A) */
-                       devices->irq = 2;
-               } else if ((current_bus->number == 0) &&
-                       (PCI_SLOT(devices->devfn) == 1) &&
-                       (PCI_FUNC(devices->devfn) == 1)) {
-                       /* LSI 53C10101R SCSI (B) */
-                       devices->irq = 2;
-               } else if ((current_bus->number == 1) &&
-                       (PCI_SLOT(devices->devfn) == 1)) {
-                       /* Intel 21555 bridge */
-                       devices->irq = 12;
-               } else if ((current_bus->number == 1) &&
-                       (PCI_SLOT(devices->devfn) == 2)) {
-                       /* PMC Slot */
-                       devices->irq = 4;
-               } else {
-                       /* We don't have assign interrupts for other devices. */
-                       devices->irq = 0xff;
-               }
-
-               /* Assign an interrupt number for the device */
-               bus->ops->write_byte(devices, PCI_INTERRUPT_LINE, devices->irq);
-
-               /* enable master for everything but the MV-64340 */
-               if (((current_bus->number != 0) && (current_bus->number != 1))
-                               || (PCI_SLOT(devices->devfn) != 0)) {
-                       bus->ops->read_word(devices, PCI_COMMAND, &cmd);
-                       cmd |= PCI_COMMAND_MASTER;
-                       bus->ops->write_word(devices, PCI_COMMAND, cmd);
-               }
-       }
-}
diff --git a/arch/mips/momentum/ocelot_g/gt64240.h b/arch/mips/momentum/ocelot_g/gt64240.h
deleted file mode 100644 (file)
index c6cfc0b..0000000
+++ /dev/null
@@ -1,1238 +0,0 @@
-/* gt64240r.h - GT-64240 Internal registers definition file */
-
-/* Copyright - Galileo technology. */
-
-#ifndef __INCgt64240rh
-#define __INCgt64240rh
-
-#define GTREG(v)        (((v) & 0xff) << 24) | (((v) & 0xff00) << 8) | \
-                        (((v) >> 24) & 0xff) | (((v) >> 8) & 0xff00)
-
-#if 0
-#define GTREG_SHORT(X) (((X) << 8) | ((X) >> 8))
-
-#define LONG_GTREG(X)  ((l64) \
-                       (((X)&0x00000000000000ffULL) << 56) | \
-                       (((X)&0x000000000000ff00ULL) << 40) | \
-                       (((X)&0x0000000000ff0000ULL) << 24) | \
-                       (((X)&0x00000000ff000000ULL) << 8)  | \
-                       (((X)&0x000000ff00000000ULL) >> 8)  | \
-                       (((X)&0x0000ff0000000000ULL) >> 24) | \
-                       (((X)&0x00ff000000000000ULL) >> 40) | \
-                       (((X)&0xff00000000000000ULL) >> 56))
-#endif
-
-#include "gt64240_dep.h"
-
-/****************************************/
-/* CPU Control Registers               */
-/****************************************/
-
-#define CPU_CONFIGURATION                                      0x000
-#define CPU_MODE                                               0x120
-#define CPU_READ_RESPONSE_CROSSBAR_LOW                         0x170
-#define CPU_READ_RESPONSE_CROSSBAR_HIGH                                0x178
-
-/****************************************/
-/* Processor Address Space             */
-/****************************************/
-
-/* Sdram's BAR'S */
-#define SCS_0_LOW_DECODE_ADDRESS                               0x008
-#define SCS_0_HIGH_DECODE_ADDRESS                              0x010
-#define SCS_1_LOW_DECODE_ADDRESS                               0x208
-#define SCS_1_HIGH_DECODE_ADDRESS                              0x210
-#define SCS_2_LOW_DECODE_ADDRESS                               0x018
-#define SCS_2_HIGH_DECODE_ADDRESS                              0x020
-#define SCS_3_LOW_DECODE_ADDRESS                               0x218
-#define SCS_3_HIGH_DECODE_ADDRESS                              0x220
-/* Devices BAR'S */
-#define CS_0_LOW_DECODE_ADDRESS                                        0x028
-#define CS_0_HIGH_DECODE_ADDRESS                               0x030
-#define CS_1_LOW_DECODE_ADDRESS                                        0x228
-#define CS_1_HIGH_DECODE_ADDRESS                               0x230
-#define CS_2_LOW_DECODE_ADDRESS                                        0x248
-#define CS_2_HIGH_DECODE_ADDRESS                               0x250
-#define CS_3_LOW_DECODE_ADDRESS                                        0x038
-#define CS_3_HIGH_DECODE_ADDRESS                               0x040
-#define BOOTCS_LOW_DECODE_ADDRESS                              0x238
-#define BOOTCS_HIGH_DECODE_ADDRESS                             0x240
-
-#define PCI_0I_O_LOW_DECODE_ADDRESS                            0x048
-#define PCI_0I_O_HIGH_DECODE_ADDRESS                           0x050
-#define PCI_0MEMORY0_LOW_DECODE_ADDRESS                                0x058
-#define PCI_0MEMORY0_HIGH_DECODE_ADDRESS                       0x060
-#define PCI_0MEMORY1_LOW_DECODE_ADDRESS                                0x080
-#define PCI_0MEMORY1_HIGH_DECODE_ADDRESS                       0x088
-#define PCI_0MEMORY2_LOW_DECODE_ADDRESS                                0x258
-#define PCI_0MEMORY2_HIGH_DECODE_ADDRESS                       0x260
-#define PCI_0MEMORY3_LOW_DECODE_ADDRESS                                0x280
-#define PCI_0MEMORY3_HIGH_DECODE_ADDRESS                       0x288
-
-#define PCI_1I_O_LOW_DECODE_ADDRESS                            0x090
-#define PCI_1I_O_HIGH_DECODE_ADDRESS                           0x098
-#define PCI_1MEMORY0_LOW_DECODE_ADDRESS                                0x0a0
-#define PCI_1MEMORY0_HIGH_DECODE_ADDRESS                       0x0a8
-#define PCI_1MEMORY1_LOW_DECODE_ADDRESS                                0x0b0
-#define PCI_1MEMORY1_HIGH_DECODE_ADDRESS                       0x0b8
-#define PCI_1MEMORY2_LOW_DECODE_ADDRESS                                0x2a0
-#define PCI_1MEMORY2_HIGH_DECODE_ADDRESS                       0x2a8
-#define PCI_1MEMORY3_LOW_DECODE_ADDRESS                                0x2b0
-#define PCI_1MEMORY3_HIGH_DECODE_ADDRESS                       0x2b8
-
-#define INTERNAL_SPACE_DECODE                                  0x068
-
-#define CPU_0_LOW_DECODE_ADDRESS                            0x290
-#define CPU_0_HIGH_DECODE_ADDRESS                           0x298
-#define CPU_1_LOW_DECODE_ADDRESS                            0x2c0
-#define CPU_1_HIGH_DECODE_ADDRESS                           0x2c8
-
-#define PCI_0I_O_ADDRESS_REMAP                                 0x0f0
-#define PCI_0MEMORY0_ADDRESS_REMAP                             0x0f8
-#define PCI_0MEMORY0_HIGH_ADDRESS_REMAP                                0x320
-#define PCI_0MEMORY1_ADDRESS_REMAP                             0x100
-#define PCI_0MEMORY1_HIGH_ADDRESS_REMAP                                0x328
-#define PCI_0MEMORY2_ADDRESS_REMAP                             0x2f8
-#define PCI_0MEMORY2_HIGH_ADDRESS_REMAP                                0x330
-#define PCI_0MEMORY3_ADDRESS_REMAP                             0x300
-#define PCI_0MEMORY3_HIGH_ADDRESS_REMAP                                0x338
-
-#define PCI_1I_O_ADDRESS_REMAP                                 0x108
-#define PCI_1MEMORY0_ADDRESS_REMAP                             0x110
-#define PCI_1MEMORY0_HIGH_ADDRESS_REMAP                                0x340
-#define PCI_1MEMORY1_ADDRESS_REMAP                             0x118
-#define PCI_1MEMORY1_HIGH_ADDRESS_REMAP                                0x348
-#define PCI_1MEMORY2_ADDRESS_REMAP                             0x310
-#define PCI_1MEMORY2_HIGH_ADDRESS_REMAP                                0x350
-#define PCI_1MEMORY3_ADDRESS_REMAP                             0x318
-#define PCI_1MEMORY3_HIGH_ADDRESS_REMAP                                0x358
-
-/****************************************/
-/* CPU Sync Barrier                            */
-/****************************************/
-
-#define PCI_0SYNC_BARIER_VIRTUAL_REGISTER                      0x0c0
-#define PCI_1SYNC_BARIER_VIRTUAL_REGISTER                      0x0c8
-
-
-/****************************************/
-/* CPU Access Protect                          */
-/****************************************/
-
-#define CPU_LOW_PROTECT_ADDRESS_0                           0X180
-#define CPU_HIGH_PROTECT_ADDRESS_0                          0X188
-#define CPU_LOW_PROTECT_ADDRESS_1                           0X190
-#define CPU_HIGH_PROTECT_ADDRESS_1                          0X198
-#define CPU_LOW_PROTECT_ADDRESS_2                           0X1a0
-#define CPU_HIGH_PROTECT_ADDRESS_2                          0X1a8
-#define CPU_LOW_PROTECT_ADDRESS_3                           0X1b0
-#define CPU_HIGH_PROTECT_ADDRESS_3                          0X1b8
-#define CPU_LOW_PROTECT_ADDRESS_4                           0X1c0
-#define CPU_HIGH_PROTECT_ADDRESS_4                          0X1c8
-#define CPU_LOW_PROTECT_ADDRESS_5                           0X1d0
-#define CPU_HIGH_PROTECT_ADDRESS_5                          0X1d8
-#define CPU_LOW_PROTECT_ADDRESS_6                           0X1e0
-#define CPU_HIGH_PROTECT_ADDRESS_6                          0X1e8
-#define CPU_LOW_PROTECT_ADDRESS_7                           0X1f0
-#define CPU_HIGH_PROTECT_ADDRESS_7                          0X1f8
-
-
-/****************************************/
-/*          Snoop Control                      */
-/****************************************/
-
-#define SNOOP_BASE_ADDRESS_0                                0x380
-#define SNOOP_TOP_ADDRESS_0                                 0x388
-#define SNOOP_BASE_ADDRESS_1                                0x390
-#define SNOOP_TOP_ADDRESS_1                                 0x398
-#define SNOOP_BASE_ADDRESS_2                                0x3a0
-#define SNOOP_TOP_ADDRESS_2                                 0x3a8
-#define SNOOP_BASE_ADDRESS_3                                0x3b0
-#define SNOOP_TOP_ADDRESS_3                                 0x3b8
-
-/****************************************/
-/*          CPU Error Report                   */
-/****************************************/
-
-#define CPU_ERROR_ADDRESS_LOW                              0x070
-#define CPU_ERROR_ADDRESS_HIGH                                     0x078
-#define CPU_ERROR_DATA_LOW                                  0x128
-#define CPU_ERROR_DATA_HIGH                                 0x130
-#define CPU_ERROR_PARITY                                    0x138
-#define CPU_ERROR_CAUSE                                     0x140
-#define CPU_ERROR_MASK                                      0x148
-
-/****************************************/
-/*          Pslave Debug                       */
-/****************************************/
-
-#define X_0_ADDRESS                                         0x360
-#define X_0_COMMAND_ID                                      0x368
-#define X_1_ADDRESS                                         0x370
-#define X_1_COMMAND_ID                                      0x378
-#define WRITE_DATA_LOW                                      0x3c0
-#define WRITE_DATA_HIGH                                     0x3c8
-#define WRITE_BYTE_ENABLE                                   0X3e0
-#define READ_DATA_LOW                                       0x3d0
-#define READ_DATA_HIGH                                      0x3d8
-#define READ_ID                                             0x3e8
-
-
-/****************************************/
-/* SDRAM and Device Address Space      */
-/****************************************/
-
-
-/****************************************/
-/* SDRAM Configuration                 */
-/****************************************/
-
-#define SDRAM_CONFIGURATION                            0x448
-#define SDRAM_OPERATION_MODE                           0x474
-#define SDRAM_ADDRESS_DECODE                           0x47C
-#define SDRAM_TIMING_PARAMETERS                         0x4b4
-#define SDRAM_UMA_CONTROL                               0x4a4
-#define SDRAM_CROSS_BAR_CONTROL_LOW                     0x4a8
-#define SDRAM_CROSS_BAR_CONTROL_HIGH                    0x4ac
-#define SDRAM_CROSS_BAR_TIMEOUT                         0x4b0
-
-
-/****************************************/
-/* SDRAM Parameters                    */
-/****************************************/
-
-#define SDRAM_BANK0PARAMETERS                          0x44C
-#define SDRAM_BANK1PARAMETERS                          0x450
-#define SDRAM_BANK2PARAMETERS                          0x454
-#define SDRAM_BANK3PARAMETERS                          0x458
-
-
-/****************************************/
-/* SDRAM Error Report                  */
-/****************************************/
-
-#define SDRAM_ERROR_DATA_LOW                            0x484
-#define SDRAM_ERROR_DATA_HIGH                           0x480
-#define SDRAM_AND_DEVICE_ERROR_ADDRESS                  0x490
-#define SDRAM_RECEIVED_ECC                              0x488
-#define SDRAM_CALCULATED_ECC                            0x48c
-#define SDRAM_ECC_CONTROL                               0x494
-#define SDRAM_ECC_ERROR_COUNTER                         0x498
-
-
-/****************************************/
-/* SDunit Debug (for internal use)     */
-/****************************************/
-
-#define X0_ADDRESS                                      0x500
-#define X0_COMMAND_AND_ID                               0x504
-#define X0_WRITE_DATA_LOW                               0x508
-#define X0_WRITE_DATA_HIGH                              0x50c
-#define X0_WRITE_BYTE_ENABLE                            0x518
-#define X0_READ_DATA_LOW                                0x510
-#define X0_READ_DATA_HIGH                               0x514
-#define X0_READ_ID                                      0x51c
-#define X1_ADDRESS                                      0x520
-#define X1_COMMAND_AND_ID                               0x524
-#define X1_WRITE_DATA_LOW                               0x528
-#define X1_WRITE_DATA_HIGH                              0x52c
-#define X1_WRITE_BYTE_ENABLE                            0x538
-#define X1_READ_DATA_LOW                                0x530
-#define X1_READ_DATA_HIGH                               0x534
-#define X1_READ_ID                                      0x53c
-#define X0_SNOOP_ADDRESS                                0x540
-#define X0_SNOOP_COMMAND                                0x544
-#define X1_SNOOP_ADDRESS                                0x548
-#define X1_SNOOP_COMMAND                                0x54c
-
-
-/****************************************/
-/* Device Parameters                   */
-/****************************************/
-
-#define DEVICE_BANK0PARAMETERS                         0x45c
-#define DEVICE_BANK1PARAMETERS                         0x460
-#define DEVICE_BANK2PARAMETERS                         0x464
-#define DEVICE_BANK3PARAMETERS                         0x468
-#define DEVICE_BOOT_BANK_PARAMETERS                    0x46c
-#define DEVICE_CONTROL                                  0x4c0
-#define DEVICE_CROSS_BAR_CONTROL_LOW                    0x4c8
-#define DEVICE_CROSS_BAR_CONTROL_HIGH                   0x4cc
-#define DEVICE_CROSS_BAR_TIMEOUT                        0x4c4
-
-
-/****************************************/
-/* Device Interrupt                    */
-/****************************************/
-
-#define DEVICE_INTERRUPT_CAUSE                              0x4d0
-#define DEVICE_INTERRUPT_MASK                               0x4d4
-#define DEVICE_ERROR_ADDRESS                                0x4d8
-
-/****************************************/
-/* DMA Record                          */
-/****************************************/
-
-#define CHANNEL0_DMA_BYTE_COUNT                                        0x800
-#define CHANNEL1_DMA_BYTE_COUNT                                        0x804
-#define CHANNEL2_DMA_BYTE_COUNT                                        0x808
-#define CHANNEL3_DMA_BYTE_COUNT                                        0x80C
-#define CHANNEL4_DMA_BYTE_COUNT                                        0x900
-#define CHANNEL5_DMA_BYTE_COUNT                                        0x904
-#define CHANNEL6_DMA_BYTE_COUNT                                        0x908
-#define CHANNEL7_DMA_BYTE_COUNT                                        0x90C
-#define CHANNEL0_DMA_SOURCE_ADDRESS                            0x810
-#define CHANNEL1_DMA_SOURCE_ADDRESS                            0x814
-#define CHANNEL2_DMA_SOURCE_ADDRESS                            0x818
-#define CHANNEL3_DMA_SOURCE_ADDRESS                            0x81C
-#define CHANNEL4_DMA_SOURCE_ADDRESS                            0x910
-#define CHANNEL5_DMA_SOURCE_ADDRESS                            0x914
-#define CHANNEL6_DMA_SOURCE_ADDRESS                            0x918
-#define CHANNEL7_DMA_SOURCE_ADDRESS                            0x91C
-#define CHANNEL0_DMA_DESTINATION_ADDRESS                       0x820
-#define CHANNEL1_DMA_DESTINATION_ADDRESS                       0x824
-#define CHANNEL2_DMA_DESTINATION_ADDRESS                       0x828
-#define CHANNEL3_DMA_DESTINATION_ADDRESS                       0x82C
-#define CHANNEL4_DMA_DESTINATION_ADDRESS                       0x920
-#define CHANNEL5_DMA_DESTINATION_ADDRESS                       0x924
-#define CHANNEL6_DMA_DESTINATION_ADDRESS                       0x928
-#define CHANNEL7_DMA_DESTINATION_ADDRESS                       0x92C
-#define CHANNEL0NEXT_RECORD_POINTER                            0x830
-#define CHANNEL1NEXT_RECORD_POINTER                            0x834
-#define CHANNEL2NEXT_RECORD_POINTER                            0x838
-#define CHANNEL3NEXT_RECORD_POINTER                            0x83C
-#define CHANNEL4NEXT_RECORD_POINTER                            0x930
-#define CHANNEL5NEXT_RECORD_POINTER                            0x934
-#define CHANNEL6NEXT_RECORD_POINTER                            0x938
-#define CHANNEL7NEXT_RECORD_POINTER                            0x93C
-#define CHANNEL0CURRENT_DESCRIPTOR_POINTER                     0x870
-#define CHANNEL1CURRENT_DESCRIPTOR_POINTER                     0x874
-#define CHANNEL2CURRENT_DESCRIPTOR_POINTER                     0x878
-#define CHANNEL3CURRENT_DESCRIPTOR_POINTER                     0x87C
-#define CHANNEL4CURRENT_DESCRIPTOR_POINTER                     0x970
-#define CHANNEL5CURRENT_DESCRIPTOR_POINTER                     0x974
-#define CHANNEL6CURRENT_DESCRIPTOR_POINTER                     0x978
-#define CHANNEL7CURRENT_DESCRIPTOR_POINTER                     0x97C
-#define CHANNEL0_DMA_SOURCE_HIGH_PCI_ADDRESS                   0x890
-#define CHANNEL1_DMA_SOURCE_HIGH_PCI_ADDRESS                   0x894
-#define CHANNEL2_DMA_SOURCE_HIGH_PCI_ADDRESS                   0x898
-#define CHANNEL3_DMA_SOURCE_HIGH_PCI_ADDRESS                   0x89c
-#define CHANNEL4_DMA_SOURCE_HIGH_PCI_ADDRESS                   0x990
-#define CHANNEL5_DMA_SOURCE_HIGH_PCI_ADDRESS                   0x994
-#define CHANNEL6_DMA_SOURCE_HIGH_PCI_ADDRESS                   0x998
-#define CHANNEL7_DMA_SOURCE_HIGH_PCI_ADDRESS                   0x99c
-#define CHANNEL0_DMA_DESTINATION_HIGH_PCI_ADDRESS              0x8a0
-#define CHANNEL1_DMA_DESTINATION_HIGH_PCI_ADDRESS              0x8a4
-#define CHANNEL2_DMA_DESTINATION_HIGH_PCI_ADDRESS              0x8a8
-#define CHANNEL3_DMA_DESTINATION_HIGH_PCI_ADDRESS              0x8ac
-#define CHANNEL4_DMA_DESTINATION_HIGH_PCI_ADDRESS              0x9a0
-#define CHANNEL5_DMA_DESTINATION_HIGH_PCI_ADDRESS              0x9a4
-#define CHANNEL6_DMA_DESTINATION_HIGH_PCI_ADDRESS              0x9a8
-#define CHANNEL7_DMA_DESTINATION_HIGH_PCI_ADDRESS              0x9ac
-#define CHANNEL0_DMA_NEXT_RECORD_POINTER_HIGH_PCI_ADDRESS      0x8b0
-#define CHANNEL1_DMA_NEXT_RECORD_POINTER_HIGH_PCI_ADDRESS      0x8b4
-#define CHANNEL2_DMA_NEXT_RECORD_POINTER_HIGH_PCI_ADDRESS      0x8b8
-#define CHANNEL3_DMA_NEXT_RECORD_POINTER_HIGH_PCI_ADDRESS      0x8bc
-#define CHANNEL4_DMA_NEXT_RECORD_POINTER_HIGH_PCI_ADDRESS      0x9b0
-#define CHANNEL5_DMA_NEXT_RECORD_POINTER_HIGH_PCI_ADDRESS      0x9b4
-#define CHANNEL6_DMA_NEXT_RECORD_POINTER_HIGH_PCI_ADDRESS      0x9b8
-#define CHANNEL7_DMA_NEXT_RECORD_POINTER_HIGH_PCI_ADDRESS      0x9bc
-
-/****************************************/
-/* DMA Channel Control                 */
-/****************************************/
-
-#define CHANNEL0CONTROL                                        0x840
-#define CHANNEL0CONTROL_HIGH                                   0x880
-
-#define CHANNEL1CONTROL                                        0x844
-#define CHANNEL1CONTROL_HIGH                                   0x884
-
-#define CHANNEL2CONTROL                                        0x848
-#define CHANNEL2CONTROL_HIGH                                   0x888
-
-#define CHANNEL3CONTROL                                        0x84C
-#define CHANNEL3CONTROL_HIGH                                   0x88C
-
-#define CHANNEL4CONTROL                                        0x940
-#define CHANNEL4CONTROL_HIGH                                   0x980
-
-#define CHANNEL5CONTROL                                        0x944
-#define CHANNEL5CONTROL_HIGH                                   0x984
-
-#define CHANNEL6CONTROL                                        0x948
-#define CHANNEL6CONTROL_HIGH                                   0x988
-
-#define CHANNEL7CONTROL                                        0x94C
-#define CHANNEL7CONTROL_HIGH                                   0x98C
-
-
-/****************************************/
-/* DMA Arbiter                         */
-/****************************************/
-
-#define ARBITER_CONTROL_0_3                                    0x860
-#define ARBITER_CONTROL_4_7                                    0x960
-
-
-/****************************************/
-/* DMA Interrupt                       */
-/****************************************/
-
-#define CHANELS0_3_INTERRUPT_CAUSE                             0x8c0
-#define CHANELS0_3_INTERRUPT_MASK                              0x8c4
-#define CHANELS0_3_ERROR_ADDRESS                               0x8c8
-#define CHANELS0_3_ERROR_SELECT                                        0x8cc
-#define CHANELS4_7_INTERRUPT_CAUSE                             0x9c0
-#define CHANELS4_7_INTERRUPT_MASK                              0x9c4
-#define CHANELS4_7_ERROR_ADDRESS                               0x9c8
-#define CHANELS4_7_ERROR_SELECT                                        0x9cc
-
-
-/****************************************/
-/* DMA Debug (for internal use)         */
-/****************************************/
-
-#define DMA_X0_ADDRESS                                      0x8e0
-#define DMA_X0_COMMAND_AND_ID                               0x8e4
-#define DMA_X0_WRITE_DATA_LOW                               0x8e8
-#define DMA_X0_WRITE_DATA_HIGH                              0x8ec
-#define DMA_X0_WRITE_BYTE_ENABLE                            0x8f8
-#define DMA_X0_READ_DATA_LOW                                0x8f0
-#define DMA_X0_READ_DATA_HIGH                               0x8f4
-#define DMA_X0_READ_ID                                      0x8fc
-#define DMA_X1_ADDRESS                                      0x9e0
-#define DMA_X1_COMMAND_AND_ID                               0x9e4
-#define DMA_X1_WRITE_DATA_LOW                               0x9e8
-#define DMA_X1_WRITE_DATA_HIGH                              0x9ec
-#define DMA_X1_WRITE_BYTE_ENABLE                            0x9f8
-#define DMA_X1_READ_DATA_LOW                                0x9f0
-#define DMA_X1_READ_DATA_HIGH                               0x9f4
-#define DMA_X1_READ_ID                                      0x9fc
-
-/****************************************/
-/* Timer_Counter                                               */
-/****************************************/
-
-#define TIMER_COUNTER0                                         0x850
-#define TIMER_COUNTER1                                         0x854
-#define TIMER_COUNTER2                                         0x858
-#define TIMER_COUNTER3                                         0x85C
-#define TIMER_COUNTER_0_3_CONTROL                              0x864
-#define TIMER_COUNTER_0_3_INTERRUPT_CAUSE                      0x868
-#define TIMER_COUNTER_0_3_INTERRUPT_MASK                       0x86c
-#define TIMER_COUNTER4                                         0x950
-#define TIMER_COUNTER5                                         0x954
-#define TIMER_COUNTER6                                         0x958
-#define TIMER_COUNTER7                                         0x95C
-#define TIMER_COUNTER_4_7_CONTROL                              0x964
-#define TIMER_COUNTER_4_7_INTERRUPT_CAUSE                      0x968
-#define TIMER_COUNTER_4_7_INTERRUPT_MASK                       0x96c
-
-/****************************************/
-/* PCI Slave Address Decoding           */
-/****************************************/
-
-#define PCI_0SCS_0_BANK_SIZE                                   0xc08
-#define PCI_1SCS_0_BANK_SIZE                                   0xc88
-#define PCI_0SCS_1_BANK_SIZE                                   0xd08
-#define PCI_1SCS_1_BANK_SIZE                                   0xd88
-#define PCI_0SCS_2_BANK_SIZE                                   0xc0c
-#define PCI_1SCS_2_BANK_SIZE                                   0xc8c
-#define PCI_0SCS_3_BANK_SIZE                                   0xd0c
-#define PCI_1SCS_3_BANK_SIZE                                   0xd8c
-#define PCI_0CS_0_BANK_SIZE                                    0xc10
-#define PCI_1CS_0_BANK_SIZE                                    0xc90
-#define PCI_0CS_1_BANK_SIZE                                    0xd10
-#define PCI_1CS_1_BANK_SIZE                                    0xd90
-#define PCI_0CS_2_BANK_SIZE                                    0xd18
-#define PCI_1CS_2_BANK_SIZE                                    0xd98
-#define PCI_0CS_3_BANK_SIZE                                    0xc14
-#define PCI_1CS_3_BANK_SIZE                                    0xc94
-#define PCI_0CS_BOOT_BANK_SIZE                                 0xd14
-#define PCI_1CS_BOOT_BANK_SIZE                                 0xd94
-#define PCI_0P2P_MEM0_BAR_SIZE                              0xd1c
-#define PCI_1P2P_MEM0_BAR_SIZE                              0xd9c
-#define PCI_0P2P_MEM1_BAR_SIZE                              0xd20
-#define PCI_1P2P_MEM1_BAR_SIZE                              0xda0
-#define PCI_0P2P_I_O_BAR_SIZE                               0xd24
-#define PCI_1P2P_I_O_BAR_SIZE                               0xda4
-#define PCI_0CPU_BAR_SIZE                                   0xd28
-#define PCI_1CPU_BAR_SIZE                                   0xda8
-#define PCI_0DAC_SCS_0_BANK_SIZE                            0xe00
-#define PCI_1DAC_SCS_0_BANK_SIZE                            0xe80
-#define PCI_0DAC_SCS_1_BANK_SIZE                            0xe04
-#define PCI_1DAC_SCS_1_BANK_SIZE                            0xe84
-#define PCI_0DAC_SCS_2_BANK_SIZE                            0xe08
-#define PCI_1DAC_SCS_2_BANK_SIZE                            0xe88
-#define PCI_0DAC_SCS_3_BANK_SIZE                            0xe0c
-#define PCI_1DAC_SCS_3_BANK_SIZE                            0xe8c
-#define PCI_0DAC_CS_0_BANK_SIZE                             0xe10
-#define PCI_1DAC_CS_0_BANK_SIZE                             0xe90
-#define PCI_0DAC_CS_1_BANK_SIZE                             0xe14
-#define PCI_1DAC_CS_1_BANK_SIZE                             0xe94
-#define PCI_0DAC_CS_2_BANK_SIZE                             0xe18
-#define PCI_1DAC_CS_2_BANK_SIZE                             0xe98
-#define PCI_0DAC_CS_3_BANK_SIZE                             0xe1c
-#define PCI_1DAC_CS_3_BANK_SIZE                             0xe9c
-#define PCI_0DAC_BOOTCS_BANK_SIZE                           0xe20
-#define PCI_1DAC_BOOTCS_BANK_SIZE                           0xea0
-#define PCI_0DAC_P2P_MEM0_BAR_SIZE                          0xe24
-#define PCI_1DAC_P2P_MEM0_BAR_SIZE                          0xea4
-#define PCI_0DAC_P2P_MEM1_BAR_SIZE                          0xe28
-#define PCI_1DAC_P2P_MEM1_BAR_SIZE                          0xea8
-#define PCI_0DAC_CPU_BAR_SIZE                               0xe2c
-#define PCI_1DAC_CPU_BAR_SIZE                               0xeac
-#define PCI_0EXPANSION_ROM_BAR_SIZE                         0xd2c
-#define PCI_1EXPANSION_ROM_BAR_SIZE                         0xdac
-#define PCI_0BASE_ADDRESS_REGISTERS_ENABLE                     0xc3c
-#define PCI_1BASE_ADDRESS_REGISTERS_ENABLE                     0xcbc
-#define PCI_0SCS_0_BASE_ADDRESS_REMAP                          0xc48
-#define PCI_1SCS_0_BASE_ADDRESS_REMAP                          0xcc8
-#define PCI_0SCS_1_BASE_ADDRESS_REMAP                          0xd48
-#define PCI_1SCS_1_BASE_ADDRESS_REMAP                          0xdc8
-#define PCI_0SCS_2_BASE_ADDRESS_REMAP                          0xc4c
-#define PCI_1SCS_2_BASE_ADDRESS_REMAP                          0xccc
-#define PCI_0SCS_3_BASE_ADDRESS_REMAP                          0xd4c
-#define PCI_1SCS_3_BASE_ADDRESS_REMAP                          0xdcc
-#define PCI_0CS_0_BASE_ADDRESS_REMAP                           0xc50
-#define PCI_1CS_0_BASE_ADDRESS_REMAP                           0xcd0
-#define PCI_0CS_1_BASE_ADDRESS_REMAP                           0xd50
-#define PCI_1CS_1_BASE_ADDRESS_REMAP                           0xdd0
-#define PCI_0CS_2_BASE_ADDRESS_REMAP                           0xd58
-#define PCI_1CS_2_BASE_ADDRESS_REMAP                           0xdd8
-#define PCI_0CS_3_BASE_ADDRESS_REMAP                                   0xc54
-#define PCI_1CS_3_BASE_ADDRESS_REMAP                                   0xcd4
-#define PCI_0CS_BOOTCS_BASE_ADDRESS_REMAP                              0xd54
-#define PCI_1CS_BOOTCS_BASE_ADDRESS_REMAP                              0xdd4
-#define PCI_0P2P_MEM0_BASE_ADDRESS_REMAP_LOW                0xd5c
-#define PCI_1P2P_MEM0_BASE_ADDRESS_REMAP_LOW                0xddc
-#define PCI_0P2P_MEM0_BASE_ADDRESS_REMAP_HIGH               0xd60
-#define PCI_1P2P_MEM0_BASE_ADDRESS_REMAP_HIGH               0xde0
-#define PCI_0P2P_MEM1_BASE_ADDRESS_REMAP_LOW                0xd64
-#define PCI_1P2P_MEM1_BASE_ADDRESS_REMAP_LOW                0xde4
-#define PCI_0P2P_MEM1_BASE_ADDRESS_REMAP_HIGH               0xd68
-#define PCI_1P2P_MEM1_BASE_ADDRESS_REMAP_HIGH               0xde8
-#define PCI_0P2P_I_O_BASE_ADDRESS_REMAP                     0xd6c
-#define PCI_1P2P_I_O_BASE_ADDRESS_REMAP                     0xdec
-#define PCI_0CPU_BASE_ADDRESS_REMAP                         0xd70
-#define PCI_1CPU_BASE_ADDRESS_REMAP                         0xdf0
-#define PCI_0DAC_SCS_0_BASE_ADDRESS_REMAP                   0xf00
-#define PCI_1DAC_SCS_0_BASE_ADDRESS_REMAP                   0xff0
-#define PCI_0DAC_SCS_1_BASE_ADDRESS_REMAP                   0xf04
-#define PCI_1DAC_SCS_1_BASE_ADDRESS_REMAP                   0xf84
-#define PCI_0DAC_SCS_2_BASE_ADDRESS_REMAP                   0xf08
-#define PCI_1DAC_SCS_2_BASE_ADDRESS_REMAP                   0xf88
-#define PCI_0DAC_SCS_3_BASE_ADDRESS_REMAP                   0xf0c
-#define PCI_1DAC_SCS_3_BASE_ADDRESS_REMAP                   0xf8c
-#define PCI_0DAC_CS_0_BASE_ADDRESS_REMAP                    0xf10
-#define PCI_1DAC_CS_0_BASE_ADDRESS_REMAP                    0xf90
-#define PCI_0DAC_CS_1_BASE_ADDRESS_REMAP                    0xf14
-#define PCI_1DAC_CS_1_BASE_ADDRESS_REMAP                    0xf94
-#define PCI_0DAC_CS_2_BASE_ADDRESS_REMAP                    0xf18
-#define PCI_1DAC_CS_2_BASE_ADDRESS_REMAP                    0xf98
-#define PCI_0DAC_CS_3_BASE_ADDRESS_REMAP                    0xf1c
-#define PCI_1DAC_CS_3_BASE_ADDRESS_REMAP                    0xf9c
-#define PCI_0DAC_BOOTCS_BASE_ADDRESS_REMAP                  0xf20
-#define PCI_1DAC_BOOTCS_BASE_ADDRESS_REMAP                  0xfa0
-#define PCI_0DAC_P2P_MEM0_BASE_ADDRESS_REMAP_LOW            0xf24
-#define PCI_1DAC_P2P_MEM0_BASE_ADDRESS_REMAP_LOW            0xfa4
-#define PCI_0DAC_P2P_MEM0_BASE_ADDRESS_REMAP_HIGH           0xf28
-#define PCI_1DAC_P2P_MEM0_BASE_ADDRESS_REMAP_HIGH           0xfa8
-#define PCI_0DAC_P2P_MEM1_BASE_ADDRESS_REMAP_LOW            0xf2c
-#define PCI_1DAC_P2P_MEM1_BASE_ADDRESS_REMAP_LOW            0xfac
-#define PCI_0DAC_P2P_MEM1_BASE_ADDRESS_REMAP_HIGH           0xf30
-#define PCI_1DAC_P2P_MEM1_BASE_ADDRESS_REMAP_HIGH           0xfb0
-#define PCI_0DAC_CPU_BASE_ADDRESS_REMAP                     0xf34
-#define PCI_1DAC_CPU_BASE_ADDRESS_REMAP                     0xfb4
-#define PCI_0EXPANSION_ROM_BASE_ADDRESS_REMAP               0xf38
-#define PCI_1EXPANSION_ROM_BASE_ADDRESS_REMAP               0xfb8
-#define PCI_0ADDRESS_DECODE_CONTROL                         0xd3c
-#define PCI_1ADDRESS_DECODE_CONTROL                         0xdbc
-
-/****************************************/
-/* PCI Control                          */
-/****************************************/
-
-#define PCI_0COMMAND                                           0xc00
-#define PCI_1COMMAND                                           0xc80
-#define PCI_0MODE                                           0xd00
-#define PCI_1MODE                                           0xd80
-#define PCI_0TIMEOUT_RETRY                                     0xc04
-#define PCI_1TIMEOUT_RETRY                                     0xc84
-#define PCI_0READ_BUFFER_DISCARD_TIMER                      0xd04
-#define PCI_1READ_BUFFER_DISCARD_TIMER                      0xd84
-#define MSI_0TRIGGER_TIMER                                  0xc38
-#define MSI_1TRIGGER_TIMER                                  0xcb8
-#define PCI_0ARBITER_CONTROL                                0x1d00
-#define PCI_1ARBITER_CONTROL                                0x1d80
-/* changing untill here */
-#define PCI_0CROSS_BAR_CONTROL_LOW                           0x1d08
-#define PCI_0CROSS_BAR_CONTROL_HIGH                          0x1d0c
-#define PCI_0CROSS_BAR_TIMEOUT                               0x1d04
-#define PCI_0READ_RESPONSE_CROSS_BAR_CONTROL_LOW             0x1d18
-#define PCI_0READ_RESPONSE_CROSS_BAR_CONTROL_HIGH            0x1d1c
-#define PCI_0SYNC_BARRIER_VIRTUAL_REGISTER                   0x1d10
-#define PCI_0P2P_CONFIGURATION                               0x1d14
-#define PCI_0ACCESS_CONTROL_BASE_0_LOW                       0x1e00
-#define PCI_0ACCESS_CONTROL_BASE_0_HIGH                      0x1e04
-#define PCI_0ACCESS_CONTROL_TOP_0                            0x1e08
-#define PCI_0ACCESS_CONTROL_BASE_1_LOW                       0c1e10
-#define PCI_0ACCESS_CONTROL_BASE_1_HIGH                      0x1e14
-#define PCI_0ACCESS_CONTROL_TOP_1                            0x1e18
-#define PCI_0ACCESS_CONTROL_BASE_2_LOW                       0c1e20
-#define PCI_0ACCESS_CONTROL_BASE_2_HIGH                      0x1e24
-#define PCI_0ACCESS_CONTROL_TOP_2                            0x1e28
-#define PCI_0ACCESS_CONTROL_BASE_3_LOW                       0c1e30
-#define PCI_0ACCESS_CONTROL_BASE_3_HIGH                      0x1e34
-#define PCI_0ACCESS_CONTROL_TOP_3                            0x1e38
-#define PCI_0ACCESS_CONTROL_BASE_4_LOW                       0c1e40
-#define PCI_0ACCESS_CONTROL_BASE_4_HIGH                      0x1e44
-#define PCI_0ACCESS_CONTROL_TOP_4                            0x1e48
-#define PCI_0ACCESS_CONTROL_BASE_5_LOW                       0c1e50
-#define PCI_0ACCESS_CONTROL_BASE_5_HIGH                      0x1e54
-#define PCI_0ACCESS_CONTROL_TOP_5                            0x1e58
-#define PCI_0ACCESS_CONTROL_BASE_6_LOW                       0c1e60
-#define PCI_0ACCESS_CONTROL_BASE_6_HIGH                      0x1e64
-#define PCI_0ACCESS_CONTROL_TOP_6                            0x1e68
-#define PCI_0ACCESS_CONTROL_BASE_7_LOW                       0c1e70
-#define PCI_0ACCESS_CONTROL_BASE_7_HIGH                      0x1e74
-#define PCI_0ACCESS_CONTROL_TOP_7                            0x1e78
-#define PCI_1CROSS_BAR_CONTROL_LOW                           0x1d88
-#define PCI_1CROSS_BAR_CONTROL_HIGH                          0x1d8c
-#define PCI_1CROSS_BAR_TIMEOUT                               0x1d84
-#define PCI_1READ_RESPONSE_CROSS_BAR_CONTROL_LOW             0x1d98
-#define PCI_1READ_RESPONSE_CROSS_BAR_CONTROL_HIGH            0x1d9c
-#define PCI_1SYNC_BARRIER_VIRTUAL_REGISTER                   0x1d90
-#define PCI_1P2P_CONFIGURATION                               0x1d94
-#define PCI_1ACCESS_CONTROL_BASE_0_LOW                       0x1e80
-#define PCI_1ACCESS_CONTROL_BASE_0_HIGH                      0x1e84
-#define PCI_1ACCESS_CONTROL_TOP_0                            0x1e88
-#define PCI_1ACCESS_CONTROL_BASE_1_LOW                       0c1e90
-#define PCI_1ACCESS_CONTROL_BASE_1_HIGH                      0x1e94
-#define PCI_1ACCESS_CONTROL_TOP_1                            0x1e98
-#define PCI_1ACCESS_CONTROL_BASE_2_LOW                       0c1ea0
-#define PCI_1ACCESS_CONTROL_BASE_2_HIGH                      0x1ea4
-#define PCI_1ACCESS_CONTROL_TOP_2                            0x1ea8
-#define PCI_1ACCESS_CONTROL_BASE_3_LOW                       0c1eb0
-#define PCI_1ACCESS_CONTROL_BASE_3_HIGH                      0x1eb4
-#define PCI_1ACCESS_CONTROL_TOP_3                            0x1eb8
-#define PCI_1ACCESS_CONTROL_BASE_4_LOW                       0c1ec0
-#define PCI_1ACCESS_CONTROL_BASE_4_HIGH                      0x1ec4
-#define PCI_1ACCESS_CONTROL_TOP_4                            0x1ec8
-#define PCI_1ACCESS_CONTROL_BASE_5_LOW                       0c1ed0
-#define PCI_1ACCESS_CONTROL_BASE_5_HIGH                      0x1ed4
-#define PCI_1ACCESS_CONTROL_TOP_5                            0x1ed8
-#define PCI_1ACCESS_CONTROL_BASE_6_LOW                       0c1ee0
-#define PCI_1ACCESS_CONTROL_BASE_6_HIGH                      0x1ee4
-#define PCI_1ACCESS_CONTROL_TOP_6                            0x1ee8
-#define PCI_1ACCESS_CONTROL_BASE_7_LOW                       0c1ef0
-#define PCI_1ACCESS_CONTROL_BASE_7_HIGH                      0x1ef4
-#define PCI_1ACCESS_CONTROL_TOP_7                            0x1ef8
-
-/****************************************/
-/* PCI Snoop Control                    */
-/****************************************/
-
-#define PCI_0SNOOP_CONTROL_BASE_0_LOW                        0x1f00
-#define PCI_0SNOOP_CONTROL_BASE_0_HIGH                       0x1f04
-#define PCI_0SNOOP_CONTROL_TOP_0                             0x1f08
-#define PCI_0SNOOP_CONTROL_BASE_1_0_LOW                      0x1f10
-#define PCI_0SNOOP_CONTROL_BASE_1_0_HIGH                     0x1f14
-#define PCI_0SNOOP_CONTROL_TOP_1                             0x1f18
-#define PCI_0SNOOP_CONTROL_BASE_2_0_LOW                      0x1f20
-#define PCI_0SNOOP_CONTROL_BASE_2_0_HIGH                     0x1f24
-#define PCI_0SNOOP_CONTROL_TOP_2                             0x1f28
-#define PCI_0SNOOP_CONTROL_BASE_3_0_LOW                      0x1f30
-#define PCI_0SNOOP_CONTROL_BASE_3_0_HIGH                     0x1f34
-#define PCI_0SNOOP_CONTROL_TOP_3                             0x1f38
-#define PCI_1SNOOP_CONTROL_BASE_0_LOW                        0x1f80
-#define PCI_1SNOOP_CONTROL_BASE_0_HIGH                       0x1f84
-#define PCI_1SNOOP_CONTROL_TOP_0                             0x1f88
-#define PCI_1SNOOP_CONTROL_BASE_1_0_LOW                      0x1f90
-#define PCI_1SNOOP_CONTROL_BASE_1_0_HIGH                     0x1f94
-#define PCI_1SNOOP_CONTROL_TOP_1                             0x1f98
-#define PCI_1SNOOP_CONTROL_BASE_2_0_LOW                      0x1fa0
-#define PCI_1SNOOP_CONTROL_BASE_2_0_HIGH                     0x1fa4
-#define PCI_1SNOOP_CONTROL_TOP_2                             0x1fa8
-#define PCI_1SNOOP_CONTROL_BASE_3_0_LOW                      0x1fb0
-#define PCI_1SNOOP_CONTROL_BASE_3_0_HIGH                     0x1fb4
-#define PCI_1SNOOP_CONTROL_TOP_3                             0x1fb8
-
-/****************************************/
-/* PCI Configuration Address            */
-/****************************************/
-
-#define PCI_0CONFIGURATION_ADDRESS                             0xcf8
-#define PCI_0CONFIGURATION_DATA_VIRTUAL_REGISTER               0xcfc
-#define PCI_1CONFIGURATION_ADDRESS                             0xc78
-#define PCI_1CONFIGURATION_DATA_VIRTUAL_REGISTER               0xc7c
-#define PCI_0INTERRUPT_ACKNOWLEDGE_VIRTUAL_REGISTER            0xc34
-#define PCI_1INTERRUPT_ACKNOWLEDGE_VIRTUAL_REGISTER            0xcb4
-
-/****************************************/
-/* PCI Error Report                     */
-/****************************************/
-
-#define PCI_0SERR_MASK                                          0xc28
-#define PCI_0ERROR_ADDRESS_LOW                               0x1d40
-#define PCI_0ERROR_ADDRESS_HIGH                              0x1d44
-#define PCI_0ERROR_DATA_LOW                                  0x1d48
-#define PCI_0ERROR_DATA_HIGH                                 0x1d4c
-#define PCI_0ERROR_COMMAND                                   0x1d50
-#define PCI_0ERROR_CAUSE                                     0x1d58
-#define PCI_0ERROR_MASK                                      0x1d5c
-
-#define PCI_1SERR_MASK                                          0xca8
-#define PCI_1ERROR_ADDRESS_LOW                               0x1dc0
-#define PCI_1ERROR_ADDRESS_HIGH                              0x1dc4
-#define PCI_1ERROR_DATA_LOW                                  0x1dc8
-#define PCI_1ERROR_DATA_HIGH                                 0x1dcc
-#define PCI_1ERROR_COMMAND                                   0x1dd0
-#define PCI_1ERROR_CAUSE                                     0x1dd8
-#define PCI_1ERROR_MASK                                      0x1ddc
-
-
-/****************************************/
-/* Lslave Debug  (for internal use)     */
-/****************************************/
-
-#define L_SLAVE_X0_ADDRESS                                  0x1d20
-#define L_SLAVE_X0_COMMAND_AND_ID                           0x1d24
-#define L_SLAVE_X1_ADDRESS                                  0x1d28
-#define L_SLAVE_X1_COMMAND_AND_ID                           0x1d2c
-#define L_SLAVE_WRITE_DATA_LOW                              0x1d30
-#define L_SLAVE_WRITE_DATA_HIGH                             0x1d34
-#define L_SLAVE_WRITE_BYTE_ENABLE                           0x1d60
-#define L_SLAVE_READ_DATA_LOW                               0x1d38
-#define L_SLAVE_READ_DATA_HIGH                              0x1d3c
-#define L_SLAVE_READ_ID                                     0x1d64
-
-/****************************************/
-/* PCI Configuration Function 0         */
-/****************************************/
-
-#define PCI_DEVICE_AND_VENDOR_ID                               0x000
-#define PCI_STATUS_AND_COMMAND                                 0x004
-#define PCI_CLASS_CODE_AND_REVISION_ID                         0x008
-#define PCI_BIST_HEADER_TYPE_LATENCY_TIMER_CACHE_LINE          0x00C
-#define PCI_SCS_0_BASE_ADDRESS                                 0x010
-#define PCI_SCS_1_BASE_ADDRESS                                         0x014
-#define PCI_SCS_2_BASE_ADDRESS                                         0x018
-#define PCI_SCS_3_BASE_ADDRESS                                 0x01C
-#define PCI_INTERNAL_REGISTERS_MEMORY_MAPPED_BASE_ADDRESS      0x020
-#define PCI_INTERNAL_REGISTERS_I_OMAPPED_BASE_ADDRESS          0x024
-#define PCI_SUBSYSTEM_ID_AND_SUBSYSTEM_VENDOR_ID               0x02C
-#define PCI_EXPANSION_ROM_BASE_ADDRESS_REGISTER                        0x030
-#define PCI_CAPABILTY_LIST_POINTER                          0x034
-#define PCI_INTERRUPT_PIN_AND_LINE                         0x03C
-#define PCI_POWER_MANAGEMENT_CAPABILITY                     0x040
-#define PCI_POWER_MANAGEMENT_STATUS_AND_CONTROL             0x044
-#define PCI_VPD_ADDRESS                                     0x048
-#define PCI_VPD_DATA                                        0X04c
-#define PCI_MSI_MESSAGE_CONTROL                             0x050
-#define PCI_MSI_MESSAGE_ADDRESS                             0x054
-#define PCI_MSI_MESSAGE_UPPER_ADDRESS                       0x058
-#define PCI_MSI_MESSAGE_DATA                                0x05c
-#define PCI_COMPACT_PCI_HOT_SWAP_CAPABILITY                 0x058
-
-/****************************************/
-/* PCI Configuration Function 1         */
-/****************************************/
-
-#define PCI_CS_0_BASE_ADDRESS                                  0x110
-#define PCI_CS_1_BASE_ADDRESS                                  0x114
-#define PCI_CS_2_BASE_ADDRESS                                  0x118
-#define PCI_CS_3_BASE_ADDRESS                                  0x11c
-#define PCI_BOOTCS_BASE_ADDRESS                            0x120
-
-/****************************************/
-/* PCI Configuration Function 2         */
-/****************************************/
-
-#define PCI_P2P_MEM0_BASE_ADDRESS                              0x210
-#define PCI_P2P_MEM1_BASE_ADDRESS                              0x214
-#define PCI_P2P_I_O_BASE_ADDRESS                               0x218
-#define PCI_CPU_BASE_ADDRESS                                   0x21c
-
-/****************************************/
-/* PCI Configuration Function 4         */
-/****************************************/
-
-#define PCI_DAC_SCS_0_BASE_ADDRESS_LOW                                 0x410
-#define PCI_DAC_SCS_0_BASE_ADDRESS_HIGH                                0x414
-#define PCI_DAC_SCS_1_BASE_ADDRESS_LOW                         0x418
-#define PCI_DAC_SCS_1_BASE_ADDRESS_HIGH                    0x41c
-#define PCI_DAC_P2P_MEM0_BASE_ADDRESS_LOW                          0x420
-#define PCI_DAC_P2P_MEM0_BASE_ADDRESS_HIGH                         0x424
-
-
-/****************************************/
-/* PCI Configuration Function 5         */
-/****************************************/
-
-#define PCI_DAC_SCS_2_BASE_ADDRESS_LOW                                 0x510
-#define PCI_DAC_SCS_2_BASE_ADDRESS_HIGH                                0x514
-#define PCI_DAC_SCS_3_BASE_ADDRESS_LOW                         0x518
-#define PCI_DAC_SCS_3_BASE_ADDRESS_HIGH                        0x51c
-#define PCI_DAC_P2P_MEM1_BASE_ADDRESS_LOW                          0x520
-#define PCI_DAC_P2P_MEM1_BASE_ADDRESS_HIGH                         0x524
-
-
-/****************************************/
-/* PCI Configuration Function 6         */
-/****************************************/
-
-#define PCI_DAC_CS_0_BASE_ADDRESS_LOW                          0x610
-#define PCI_DAC_CS_0_BASE_ADDRESS_HIGH                         0x614
-#define PCI_DAC_CS_1_BASE_ADDRESS_LOW                          0x618
-#define PCI_DAC_CS_1_BASE_ADDRESS_HIGH                         0x61c
-#define PCI_DAC_CS_2_BASE_ADDRESS_LOW                          0x620
-#define PCI_DAC_CS_2_BASE_ADDRESS_HIGH                         0x624
-
-/****************************************/
-/* PCI Configuration Function 7         */
-/****************************************/
-
-#define PCI_DAC_CS_3_BASE_ADDRESS_LOW                          0x710
-#define PCI_DAC_CS_3_BASE_ADDRESS_HIGH                         0x714
-#define PCI_DAC_BOOTCS_BASE_ADDRESS_LOW                        0x718
-#define PCI_DAC_BOOTCS_BASE_ADDRESS_HIGH                       0x71c
-#define PCI_DAC_CPU_BASE_ADDRESS_LOW                           0x720
-#define PCI_DAC_CPU_BASE_ADDRESS_HIGH                          0x724
-
-/****************************************/
-/* Interrupts                          */
-/****************************************/
-
-#define LOW_INTERRUPT_CAUSE_REGISTER                                   0xc18
-#define HIGH_INTERRUPT_CAUSE_REGISTER                          0xc68
-#define CPU_INTERRUPT_MASK_REGISTER_LOW                                0xc1c
-#define CPU_INTERRUPT_MASK_REGISTER_HIGH                       0xc6c
-#define CPU_SELECT_CAUSE_REGISTER                              0xc70
-#define PCI_0INTERRUPT_CAUSE_MASK_REGISTER_LOW                 0xc24
-#define PCI_0INTERRUPT_CAUSE_MASK_REGISTER_HIGH                        0xc64
-#define PCI_0SELECT_CAUSE                                   0xc74
-#define PCI_1INTERRUPT_CAUSE_MASK_REGISTER_LOW                 0xca4
-#define PCI_1INTERRUPT_CAUSE_MASK_REGISTER_HIGH                        0xce4
-#define PCI_1SELECT_CAUSE                                   0xcf4
-#define CPU_INT_0_MASK                                      0xe60
-#define CPU_INT_1_MASK                                      0xe64
-#define CPU_INT_2_MASK                                      0xe68
-#define CPU_INT_3_MASK                                      0xe6c
-
-/****************************************/
-/* I20 Support registers               */
-/****************************************/
-
-#define INBOUND_MESSAGE_REGISTER0_PCI0_SIDE                    0x010
-#define INBOUND_MESSAGE_REGISTER1_PCI0_SIDE                    0x014
-#define OUTBOUND_MESSAGE_REGISTER0_PCI0_SIDE                   0x018
-#define OUTBOUND_MESSAGE_REGISTER1_PCI0_SIDE                   0x01C
-#define INBOUND_DOORBELL_REGISTER_PCI0_SIDE                    0x020
-#define INBOUND_INTERRUPT_CAUSE_REGISTER_PCI0_SIDE             0x024
-#define INBOUND_INTERRUPT_MASK_REGISTER_PCI0_SIDE              0x028
-#define OUTBOUND_DOORBELL_REGISTER_PCI0_SIDE                   0x02C
-#define OUTBOUND_INTERRUPT_CAUSE_REGISTER_PCI0_SIDE            0x030
-#define OUTBOUND_INTERRUPT_MASK_REGISTER_PCI0_SIDE             0x034
-#define INBOUND_QUEUE_PORT_VIRTUAL_REGISTER_PCI0_SIDE                  0x040
-#define OUTBOUND_QUEUE_PORT_VIRTUAL_REGISTER_PCI0_SIDE         0x044
-#define QUEUE_CONTROL_REGISTER_PCI0_SIDE                       0x050
-#define QUEUE_BASE_ADDRESS_REGISTER_PCI0_SIDE                  0x054
-#define INBOUND_FREE_HEAD_POINTER_REGISTER_PCI0_SIDE           0x060
-#define INBOUND_FREE_TAIL_POINTER_REGISTER_PCI0_SIDE           0x064
-#define INBOUND_POST_HEAD_POINTER_REGISTER_PCI0_SIDE           0x068
-#define INBOUND_POST_TAIL_POINTER_REGISTER_PCI0_SIDE           0x06C
-#define OUTBOUND_FREE_HEAD_POINTER_REGISTER_PCI0_SIDE          0x070
-#define OUTBOUND_FREE_TAIL_POINTER_REGISTER_PCI0_SIDE          0x074
-#define OUTBOUND_POST_HEAD_POINTER_REGISTER_PCI0_SIDE          0x0F8
-#define OUTBOUND_POST_TAIL_POINTER_REGISTER_PCI0_SIDE          0x0FC
-
-#define INBOUND_MESSAGE_REGISTER0_PCI1_SIDE                            0x090
-#define INBOUND_MESSAGE_REGISTER1_PCI1_SIDE                            0x094
-#define OUTBOUND_MESSAGE_REGISTER0_PCI1_SIDE                           0x098
-#define OUTBOUND_MESSAGE_REGISTER1_PCI1_SIDE                           0x09C
-#define INBOUND_DOORBELL_REGISTER_PCI1_SIDE                            0x0A0
-#define INBOUND_INTERRUPT_CAUSE_REGISTER_PCI1_SIDE             0x0A4
-#define INBOUND_INTERRUPT_MASK_REGISTER_PCI1_SIDE                      0x0A8
-#define OUTBOUND_DOORBELL_REGISTER_PCI1_SIDE                           0x0AC
-#define OUTBOUND_INTERRUPT_CAUSE_REGISTER_PCI1_SIDE            0x0B0
-#define OUTBOUND_INTERRUPT_MASK_REGISTER_PCI1_SIDE             0x0B4
-#define INBOUND_QUEUE_PORT_VIRTUAL_REGISTER_PCI1_SIDE                  0x0C0
-#define OUTBOUND_QUEUE_PORT_VIRTUAL_REGISTER_PCI1_SIDE         0x0C4
-#define QUEUE_CONTROL_REGISTER_PCI1_SIDE                               0x0D0
-#define QUEUE_BASE_ADDRESS_REGISTER_PCI1_SIDE                          0x0D4
-#define INBOUND_FREE_HEAD_POINTER_REGISTER_PCI1_SIDE           0x0E0
-#define INBOUND_FREE_TAIL_POINTER_REGISTER_PCI1_SIDE           0x0E4
-#define INBOUND_POST_HEAD_POINTER_REGISTER_PCI1_SIDE           0x0E8
-#define INBOUND_POST_TAIL_POINTER_REGISTER_PCI1_SIDE           0x0EC
-#define OUTBOUND_FREE_HEAD_POINTER_REGISTER_PCI1_SIDE          0x0F0
-#define OUTBOUND_FREE_TAIL_POINTER_REGISTER_PCI1_SIDE          0x0F4
-#define OUTBOUND_POST_HEAD_POINTER_REGISTER_PCI1_SIDE          0x078
-#define OUTBOUND_POST_TAIL_POINTER_REGISTER_PCI1_SIDE          0x07C
-
-#define INBOUND_MESSAGE_REGISTER0_CPU0_SIDE                            0X1C10
-#define INBOUND_MESSAGE_REGISTER1_CPU0_SIDE                            0X1C14
-#define OUTBOUND_MESSAGE_REGISTER0_CPU0_SIDE                           0X1C18
-#define OUTBOUND_MESSAGE_REGISTER1_CPU0_SIDE                           0X1C1C
-#define INBOUND_DOORBELL_REGISTER_CPU0_SIDE                            0X1C20
-#define INBOUND_INTERRUPT_CAUSE_REGISTER_CPU0_SIDE             0X1C24
-#define INBOUND_INTERRUPT_MASK_REGISTER_CPU0_SIDE                      0X1C28
-#define OUTBOUND_DOORBELL_REGISTER_CPU0_SIDE                           0X1C2C
-#define OUTBOUND_INTERRUPT_CAUSE_REGISTER_CPU0_SIDE            0X1C30
-#define OUTBOUND_INTERRUPT_MASK_REGISTER_CPU0_SIDE             0X1C34
-#define INBOUND_QUEUE_PORT_VIRTUAL_REGISTER_CPU0_SIDE                  0X1C40
-#define OUTBOUND_QUEUE_PORT_VIRTUAL_REGISTER_CPU0_SIDE         0X1C44
-#define QUEUE_CONTROL_REGISTER_CPU0_SIDE                               0X1C50
-#define QUEUE_BASE_ADDRESS_REGISTER_CPU0_SIDE                          0X1C54
-#define INBOUND_FREE_HEAD_POINTER_REGISTER_CPU0_SIDE           0X1C60
-#define INBOUND_FREE_TAIL_POINTER_REGISTER_CPU0_SIDE           0X1C64
-#define INBOUND_POST_HEAD_POINTER_REGISTER_CPU0_SIDE           0X1C68
-#define INBOUND_POST_TAIL_POINTER_REGISTER_CPU0_SIDE           0X1C6C
-#define OUTBOUND_FREE_HEAD_POINTER_REGISTER_CPU0_SIDE          0X1C70
-#define OUTBOUND_FREE_TAIL_POINTER_REGISTER_CPU0_SIDE          0X1C74
-#define OUTBOUND_POST_HEAD_POINTER_REGISTER_CPU0_SIDE          0X1CF8
-#define OUTBOUND_POST_TAIL_POINTER_REGISTER_CPU0_SIDE          0X1CFC
-
-#define INBOUND_MESSAGE_REGISTER0_CPU1_SIDE                            0X1C90
-#define INBOUND_MESSAGE_REGISTER1_CPU1_SIDE                            0X1C94
-#define OUTBOUND_MESSAGE_REGISTER0_CPU1_SIDE                           0X1C98
-#define OUTBOUND_MESSAGE_REGISTER1_CPU1_SIDE                           0X1C9C
-#define INBOUND_DOORBELL_REGISTER_CPU1_SIDE                            0X1CA0
-#define INBOUND_INTERRUPT_CAUSE_REGISTER_CPU1_SIDE             0X1CA4
-#define INBOUND_INTERRUPT_MASK_REGISTER_CPU1_SIDE                      0X1CA8
-#define OUTBOUND_DOORBELL_REGISTER_CPU1_SIDE                           0X1CAC
-#define OUTBOUND_INTERRUPT_CAUSE_REGISTER_CPU1_SIDE            0X1CB0
-#define OUTBOUND_INTERRUPT_MASK_REGISTER_CPU1_SIDE             0X1CB4
-#define INBOUND_QUEUE_PORT_VIRTUAL_REGISTER_CPU1_SIDE                  0X1CC0
-#define OUTBOUND_QUEUE_PORT_VIRTUAL_REGISTER_CPU1_SIDE         0X1CC4
-#define QUEUE_CONTROL_REGISTER_CPU1_SIDE                               0X1CD0
-#define QUEUE_BASE_ADDRESS_REGISTER_CPU1_SIDE                          0X1CD4
-#define INBOUND_FREE_HEAD_POINTER_REGISTER_CPU1_SIDE           0X1CE0
-#define INBOUND_FREE_TAIL_POINTER_REGISTER_CPU1_SIDE           0X1CE4
-#define INBOUND_POST_HEAD_POINTER_REGISTER_CPU1_SIDE           0X1CE8
-#define INBOUND_POST_TAIL_POINTER_REGISTER_CPU1_SIDE           0X1CEC
-#define OUTBOUND_FREE_HEAD_POINTER_REGISTER_CPU1_SIDE          0X1CF0
-#define OUTBOUND_FREE_TAIL_POINTER_REGISTER_CPU1_SIDE          0X1CF4
-#define OUTBOUND_POST_HEAD_POINTER_REGISTER_CPU1_SIDE          0X1C78
-#define OUTBOUND_POST_TAIL_POINTER_REGISTER_CPU1_SIDE          0X1C7C
-
-/****************************************/
-/* Communication Unit Registers         */
-/****************************************/
-
-#define ETHERNET_0_ADDRESS_CONTROL_LOW
-#define ETHERNET_0_ADDRESS_CONTROL_HIGH                     0xf204
-#define ETHERNET_0_RECEIVE_BUFFER_PCI_HIGH_ADDRESS          0xf208
-#define ETHERNET_0_TRANSMIT_BUFFER_PCI_HIGH_ADDRESS         0xf20c
-#define ETHERNET_0_RECEIVE_DESCRIPTOR_PCI_HIGH_ADDRESS      0xf210
-#define ETHERNET_0_TRANSMIT_DESCRIPTOR_PCI_HIGH_ADDRESS     0xf214
-#define ETHERNET_0_HASH_TABLE_PCI_HIGH_ADDRESS              0xf218
-#define ETHERNET_1_ADDRESS_CONTROL_LOW                      0xf220
-#define ETHERNET_1_ADDRESS_CONTROL_HIGH                     0xf224
-#define ETHERNET_1_RECEIVE_BUFFER_PCI_HIGH_ADDRESS          0xf228
-#define ETHERNET_1_TRANSMIT_BUFFER_PCI_HIGH_ADDRESS         0xf22c
-#define ETHERNET_1_RECEIVE_DESCRIPTOR_PCI_HIGH_ADDRESS      0xf230
-#define ETHERNET_1_TRANSMIT_DESCRIPTOR_PCI_HIGH_ADDRESS     0xf234
-#define ETHERNET_1_HASH_TABLE_PCI_HIGH_ADDRESS              0xf238
-#define ETHERNET_2_ADDRESS_CONTROL_LOW                      0xf240
-#define ETHERNET_2_ADDRESS_CONTROL_HIGH                     0xf244
-#define ETHERNET_2_RECEIVE_BUFFER_PCI_HIGH_ADDRESS          0xf248
-#define ETHERNET_2_TRANSMIT_BUFFER_PCI_HIGH_ADDRESS         0xf24c
-#define ETHERNET_2_RECEIVE_DESCRIPTOR_PCI_HIGH_ADDRESS      0xf250
-#define ETHERNET_2_TRANSMIT_DESCRIPTOR_PCI_HIGH_ADDRESS     0xf254
-#define ETHERNET_2_HASH_TABLE_PCI_HIGH_ADDRESS              0xf258
-#define MPSC_0_ADDRESS_CONTROL_LOW                          0xf280
-#define MPSC_0_ADDRESS_CONTROL_HIGH                         0xf284
-#define MPSC_0_RECEIVE_BUFFER_PCI_HIGH_ADDRESS              0xf288
-#define MPSC_0_TRANSMIT_BUFFER_PCI_HIGH_ADDRESS             0xf28c
-#define MPSC_0_RECEIVE_DESCRIPTOR_PCI_HIGH_ADDRESS          0xf290
-#define MPSC_0_TRANSMIT_DESCRIPTOR_PCI_HIGH_ADDRESS         0xf294
-#define MPSC_1_ADDRESS_CONTROL_LOW                          0xf2a0
-#define MPSC_1_ADDRESS_CONTROL_HIGH                         0xf2a4
-#define MPSC_1_RECEIVE_BUFFER_PCI_HIGH_ADDRESS              0xf2a8
-#define MPSC_1_TRANSMIT_BUFFER_PCI_HIGH_ADDRESS             0xf2ac
-#define MPSC_1_RECEIVE_DESCRIPTOR_PCI_HIGH_ADDRESS          0xf2b0
-#define MPSC_1_TRANSMIT_DESCRIPTOR_PCI_HIGH_ADDRESS         0xf2b4
-#define MPSC_2_ADDRESS_CONTROL_LOW                          0xf2c0
-#define MPSC_2_ADDRESS_CONTROL_HIGH                         0xf2c4
-#define MPSC_2_RECEIVE_BUFFER_PCI_HIGH_ADDRESS              0xf2c8
-#define MPSC_2_TRANSMIT_BUFFER_PCI_HIGH_ADDRESS             0xf2cc
-#define MPSC_2_RECEIVE_DESCRIPTOR_PCI_HIGH_ADDRESS          0xf2d0
-#define MPSC_2_TRANSMIT_DESCRIPTOR_PCI_HIGH_ADDRESS         0xf2d4
-#define SERIAL_INIT_PCI_HIGH_ADDRESS                        0xf320
-#define SERIAL_INIT_LAST_DATA                               0xf324
-#define SERIAL_INIT_STATUS_AND_CONTROL                      0xf328
-#define COMM_UNIT_ARBITER_CONTROL                           0xf300
-#define COMM_UNIT_CROSS_BAR_TIMEOUT                         0xf304
-#define COMM_UNIT_INTERRUPT_CAUSE                           0xf310
-#define COMM_UNIT_INTERRUPT_MASK                            0xf314
-#define COMM_UNIT_ERROR_ADDRESS                             0xf314
-
-/****************************************/
-/* Cunit Debug  (for internal use)     */
-/****************************************/
-
-#define CUNIT_ADDRESS                                       0xf340
-#define CUNIT_COMMAND_AND_ID                                0xf344
-#define CUNIT_WRITE_DATA_LOW                                0xf348
-#define CUNIT_WRITE_DATA_HIGH                               0xf34c
-#define CUNIT_WRITE_BYTE_ENABLE                             0xf358
-#define CUNIT_READ_DATA_LOW                                 0xf350
-#define CUNIT_READ_DATA_HIGH                                0xf354
-#define CUNIT_READ_ID                                       0xf35c
-
-/****************************************/
-/* Fast Ethernet Unit Registers         */
-/****************************************/
-
-/* Ethernet */
-
-#define ETHERNET_PHY_ADDRESS_REGISTER                       0x2000
-#define ETHERNET_SMI_REGISTER                               0x2010
-
-/* Ethernet 0 */
-
-#define ETHERNET0_PORT_CONFIGURATION_REGISTER               0x2400
-#define ETHERNET0_PORT_CONFIGURATION_EXTEND_REGISTER        0x2408
-#define ETHERNET0_PORT_COMMAND_REGISTER                     0x2410
-#define ETHERNET0_PORT_STATUS_REGISTER                      0x2418
-#define ETHERNET0_SERIAL_PARAMETRS_REGISTER                 0x2420
-#define ETHERNET0_HASH_TABLE_POINTER_REGISTER               0x2428
-#define ETHERNET0_FLOW_CONTROL_SOURCE_ADDRESS_LOW           0x2430
-#define ETHERNET0_FLOW_CONTROL_SOURCE_ADDRESS_HIGH          0x2438
-#define ETHERNET0_SDMA_CONFIGURATION_REGISTER               0x2440
-#define ETHERNET0_SDMA_COMMAND_REGISTER                     0x2448
-#define ETHERNET0_INTERRUPT_CAUSE_REGISTER                  0x2450
-#define ETHERNET0_INTERRUPT_MASK_REGISTER                   0x2458
-#define ETHERNET0_FIRST_RX_DESCRIPTOR_POINTER0              0x2480
-#define ETHERNET0_FIRST_RX_DESCRIPTOR_POINTER1              0x2484
-#define ETHERNET0_FIRST_RX_DESCRIPTOR_POINTER2              0x2488
-#define ETHERNET0_FIRST_RX_DESCRIPTOR_POINTER3              0x248c
-#define ETHERNET0_CURRENT_RX_DESCRIPTOR_POINTER0            0x24a0
-#define ETHERNET0_CURRENT_RX_DESCRIPTOR_POINTER1            0x24a4
-#define ETHERNET0_CURRENT_RX_DESCRIPTOR_POINTER2            0x24a8
-#define ETHERNET0_CURRENT_RX_DESCRIPTOR_POINTER3            0x24ac
-#define ETHERNET0_CURRENT_TX_DESCRIPTOR_POINTER0            0x24e0
-#define ETHERNET0_CURRENT_TX_DESCRIPTOR_POINTER1            0x24e4
-#define ETHERNET0_MIB_COUNTER_BASE                          0x2500
-
-/* Ethernet 1 */
-
-#define ETHERNET1_PORT_CONFIGURATION_REGISTER               0x2800
-#define ETHERNET1_PORT_CONFIGURATION_EXTEND_REGISTER        0x2808
-#define ETHERNET1_PORT_COMMAND_REGISTER                     0x2810
-#define ETHERNET1_PORT_STATUS_REGISTER                      0x2818
-#define ETHERNET1_SERIAL_PARAMETRS_REGISTER                 0x2820
-#define ETHERNET1_HASH_TABLE_POINTER_REGISTER               0x2828
-#define ETHERNET1_FLOW_CONTROL_SOURCE_ADDRESS_LOW           0x2830
-#define ETHERNET1_FLOW_CONTROL_SOURCE_ADDRESS_HIGH          0x2838
-#define ETHERNET1_SDMA_CONFIGURATION_REGISTER               0x2840
-#define ETHERNET1_SDMA_COMMAND_REGISTER                     0x2848
-#define ETHERNET1_INTERRUPT_CAUSE_REGISTER                  0x2850
-#define ETHERNET1_INTERRUPT_MASK_REGISTER                   0x2858
-#define ETHERNET1_FIRST_RX_DESCRIPTOR_POINTER0              0x2880
-#define ETHERNET1_FIRST_RX_DESCRIPTOR_POINTER1              0x2884
-#define ETHERNET1_FIRST_RX_DESCRIPTOR_POINTER2              0x2888
-#define ETHERNET1_FIRST_RX_DESCRIPTOR_POINTER3              0x288c
-#define ETHERNET1_CURRENT_RX_DESCRIPTOR_POINTER0            0x28a0
-#define ETHERNET1_CURRENT_RX_DESCRIPTOR_POINTER1            0x28a4
-#define ETHERNET1_CURRENT_RX_DESCRIPTOR_POINTER2            0x28a8
-#define ETHERNET1_CURRENT_RX_DESCRIPTOR_POINTER3            0x28ac
-#define ETHERNET1_CURRENT_TX_DESCRIPTOR_POINTER0            0x28e0
-#define ETHERNET1_CURRENT_TX_DESCRIPTOR_POINTER1            0x28e4
-#define ETHERNET1_MIB_COUNTER_BASE                          0x2900
-
-/* Ethernet 2 */
-
-#define ETHERNET2_PORT_CONFIGURATION_REGISTER               0x2c00
-#define ETHERNET2_PORT_CONFIGURATION_EXTEND_REGISTER        0x2c08
-#define ETHERNET2_PORT_COMMAND_REGISTER                     0x2c10
-#define ETHERNET2_PORT_STATUS_REGISTER                      0x2c18
-#define ETHERNET2_SERIAL_PARAMETRS_REGISTER                 0x2c20
-#define ETHERNET2_HASH_TABLE_POINTER_REGISTER               0x2c28
-#define ETHERNET2_FLOW_CONTROL_SOURCE_ADDRESS_LOW           0x2c30
-#define ETHERNET2_FLOW_CONTROL_SOURCE_ADDRESS_HIGH          0x2c38
-#define ETHERNET2_SDMA_CONFIGURATION_REGISTER               0x2c40
-#define ETHERNET2_SDMA_COMMAND_REGISTER                     0x2c48
-#define ETHERNET2_INTERRUPT_CAUSE_REGISTER                  0x2c50
-#define ETHERNET2_INTERRUPT_MASK_REGISTER                   0x2c58
-#define ETHERNET2_FIRST_RX_DESCRIPTOR_POINTER0              0x2c80
-#define ETHERNET2_FIRST_RX_DESCRIPTOR_POINTER1              0x2c84
-#define ETHERNET2_FIRST_RX_DESCRIPTOR_POINTER2              0x2c88
-#define ETHERNET2_FIRST_RX_DESCRIPTOR_POINTER3              0x2c8c
-#define ETHERNET2_CURRENT_RX_DESCRIPTOR_POINTER0            0x2ca0
-#define ETHERNET2_CURRENT_RX_DESCRIPTOR_POINTER1            0x2ca4
-#define ETHERNET2_CURRENT_RX_DESCRIPTOR_POINTER2            0x2ca8
-#define ETHERNET2_CURRENT_RX_DESCRIPTOR_POINTER3            0x2cac
-#define ETHERNET2_CURRENT_TX_DESCRIPTOR_POINTER0            0x2ce0
-#define ETHERNET2_CURRENT_TX_DESCRIPTOR_POINTER1            0x2ce4
-#define ETHERNET2_MIB_COUNTER_BASE                          0x2d00
-
-/****************************************/
-/* SDMA Registers                       */
-/****************************************/
-
-#define SDMA_GROUP_CONFIGURATION_REGISTER                   0xb1f0
-#define CHANNEL0_CONFIGURATION_REGISTER                     0x4000
-#define CHANNEL0_COMMAND_REGISTER                           0x4008
-#define CHANNEL0_RX_CMD_STATUS                              0x4800
-#define CHANNEL0_RX_PACKET_AND_BUFFER_SIZES                 0x4804
-#define CHANNEL0_RX_BUFFER_POINTER                          0x4808
-#define CHANNEL0_RX_NEXT_POINTER                            0x480c
-#define CHANNEL0_CURRENT_RX_DESCRIPTOR_POINTER              0x4810
-#define CHANNEL0_TX_CMD_STATUS                              0x4C00
-#define CHANNEL0_TX_PACKET_SIZE                             0x4C04
-#define CHANNEL0_TX_BUFFER_POINTER                          0x4C08
-#define CHANNEL0_TX_NEXT_POINTER                            0x4C0c
-#define CHANNEL0_CURRENT_TX_DESCRIPTOR_POINTER              0x4c10
-#define CHANNEL0_FIRST_TX_DESCRIPTOR_POINTER                0x4c14
-#define CHANNEL1_CONFIGURATION_REGISTER                     0x6000
-#define CHANNEL1_COMMAND_REGISTER                           0x6008
-#define CHANNEL1_RX_CMD_STATUS                              0x6800
-#define CHANNEL1_RX_PACKET_AND_BUFFER_SIZES                 0x6804
-#define CHANNEL1_RX_BUFFER_POINTER                          0x6808
-#define CHANNEL1_RX_NEXT_POINTER                            0x680c
-#define CHANNEL1_CURRENT_RX_DESCRIPTOR_POINTER              0x6810
-#define CHANNEL1_TX_CMD_STATUS                              0x6C00
-#define CHANNEL1_TX_PACKET_SIZE                             0x6C04
-#define CHANNEL1_TX_BUFFER_POINTER                          0x6C08
-#define CHANNEL1_TX_NEXT_POINTER                            0x6C0c
-#define CHANNEL1_CURRENT_RX_DESCRIPTOR_POINTER              0x6810
-#define CHANNEL1_CURRENT_TX_DESCRIPTOR_POINTER              0x6c10
-#define CHANNEL1_FIRST_TX_DESCRIPTOR_POINTER                0x6c14
-
-/* SDMA Interrupt */
-
-#define SDMA_CAUSE                                          0xb820
-#define SDMA_MASK                                           0xb8a0
-
-
-/****************************************/
-/* Baude Rate Generators Registers      */
-/****************************************/
-
-/* BRG 0 */
-
-#define BRG0_CONFIGURATION_REGISTER                         0xb200
-#define BRG0_BAUDE_TUNING_REGISTER                          0xb204
-
-/* BRG 1 */
-
-#define BRG1_CONFIGURATION_REGISTER                         0xb208
-#define BRG1_BAUDE_TUNING_REGISTER                          0xb20c
-
-/* BRG 2 */
-
-#define BRG2_CONFIGURATION_REGISTER                         0xb210
-#define BRG2_BAUDE_TUNING_REGISTER                          0xb214
-
-/* BRG Interrupts */
-
-#define BRG_CAUSE_REGISTER                                  0xb834
-#define BRG_MASK_REGISTER                                   0xb8b4
-
-/* MISC */
-
-#define MAIN_ROUTING_REGISTER                               0xb400
-#define RECEIVE_CLOCK_ROUTING_REGISTER                      0xb404
-#define TRANSMIT_CLOCK_ROUTING_REGISTER                     0xb408
-#define COMM_UNIT_ARBITER_CONFIGURATION_REGISTER            0xb40c
-#define WATCHDOG_CONFIGURATION_REGISTER                     0xb410
-#define WATCHDOG_VALUE_REGISTER                             0xb414
-
-
-/****************************************/
-/* Flex TDM Registers                   */
-/****************************************/
-
-/* FTDM Port */
-
-#define FLEXTDM_TRANSMIT_READ_POINTER                       0xa800
-#define FLEXTDM_RECEIVE_READ_POINTER                        0xa804
-#define FLEXTDM_CONFIGURATION_REGISTER                      0xa808
-#define FLEXTDM_AUX_CHANNELA_TX_REGISTER                    0xa80c
-#define FLEXTDM_AUX_CHANNELA_RX_REGISTER                    0xa810
-#define FLEXTDM_AUX_CHANNELB_TX_REGISTER                    0xa814
-#define FLEXTDM_AUX_CHANNELB_RX_REGISTER                    0xa818
-
-/* FTDM Interrupts */
-
-#define FTDM_CAUSE_REGISTER                                 0xb830
-#define FTDM_MASK_REGISTER                                  0xb8b0
-
-
-/****************************************/
-/* GPP Interface Registers              */
-/****************************************/
-
-#define GPP_IO_CONTROL                                      0xf100
-#define GPP_LEVEL_CONTROL                                   0xf110
-#define GPP_VALUE                                           0xf104
-#define GPP_INTERRUPT_CAUSE                                 0xf108
-#define GPP_INTERRUPT_MASK                                  0xf10c
-
-#define MPP_CONTROL0                                        0xf000
-#define MPP_CONTROL1                                        0xf004
-#define MPP_CONTROL2                                        0xf008
-#define MPP_CONTROL3                                        0xf00c
-#define DEBUG_PORT_MULTIPLEX                                0xf014
-#define SERIAL_PORT_MULTIPLEX                               0xf010
-
-/****************************************/
-/* I2C Registers                        */
-/****************************************/
-
-#define I2C_SLAVE_ADDRESS                                   0xc000
-#define I2C_EXTENDED_SLAVE_ADDRESS                          0xc040
-#define I2C_DATA                                            0xc004
-#define I2C_CONTROL                                         0xc008
-#define I2C_STATUS_BAUDE_RATE                               0xc00C
-#define I2C_SOFT_RESET                                      0xc01c
-
-/****************************************/
-/* MPSC Registers                       */
-/****************************************/
-
-/* MPSC0  */
-
-#define MPSC0_MAIN_CONFIGURATION_LOW                        0x8000
-#define MPSC0_MAIN_CONFIGURATION_HIGH                       0x8004
-#define MPSC0_PROTOCOL_CONFIGURATION                        0x8008
-#define CHANNEL0_REGISTER1                                  0x800c
-#define CHANNEL0_REGISTER2                                  0x8010
-#define CHANNEL0_REGISTER3                                  0x8014
-#define CHANNEL0_REGISTER4                                  0x8018
-#define CHANNEL0_REGISTER5                                  0x801c
-#define CHANNEL0_REGISTER6                                  0x8020
-#define CHANNEL0_REGISTER7                                  0x8024
-#define CHANNEL0_REGISTER8                                  0x8028
-#define CHANNEL0_REGISTER9                                  0x802c
-#define CHANNEL0_REGISTER10                                 0x8030
-#define CHANNEL0_REGISTER11                                 0x8034
-
-/* MPSC1  */
-
-#define MPSC1_MAIN_CONFIGURATION_LOW                        0x9000
-#define MPSC1_MAIN_CONFIGURATION_HIGH                       0x9004
-#define MPSC1_PROTOCOL_CONFIGURATION                        0x9008
-#define CHANNEL1_REGISTER1                                  0x900c
-#define CHANNEL1_REGISTER2                                  0x9010
-#define CHANNEL1_REGISTER3                                  0x9014
-#define CHANNEL1_REGISTER4                                  0x9018
-#define CHANNEL1_REGISTER5                                  0x901c
-#define CHANNEL1_REGISTER6                                  0x9020
-#define CHANNEL1_REGISTER7                                  0x9024
-#define CHANNEL1_REGISTER8                                  0x9028
-#define CHANNEL1_REGISTER9                                  0x902c
-#define CHANNEL1_REGISTER10                                 0x9030
-#define CHANNEL1_REGISTER11                                 0x9034
-
-/* MPSCs Interupts  */
-
-#define MPSC0_CAUSE                                         0xb804
-#define MPSC0_MASK                                          0xb884
-#define MPSC1_CAUSE                                         0xb80c
-#define MPSC1_MASK                                          0xb88c
-
-#endif /* __INCgt64240rh */
diff --git a/arch/mips/momentum/ocelot_g/gt64240_dep.h b/arch/mips/momentum/ocelot_g/gt64240_dep.h
deleted file mode 100644 (file)
index f51bf0d..0000000
+++ /dev/null
@@ -1,57 +0,0 @@
-/***********************************************************************
- * Copyright 2001 MontaVista Software Inc.
- * Author: Jun Sun, jsun@mvista.com or jsun@junsun.net
- *
- * arch/mips/gt64240/gt64240-dep.h
- *     Board-dependent definitions for GT-64120 chip.
- *
- * 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 _ASM_GT64240_DEP_H
-#define _ASM_GT64240_DEP_H
-
-#include <asm/addrspace.h>             /* for KSEG1ADDR() */
-#include <asm/byteorder.h>             /* for cpu_to_le32() */
-
-/*
- * PCI address allocation
- */
-#if 0
-#define GT_PCI_MEM_BASE    (0x22000000)
-#define GT_PCI_MEM_SIZE    GT_DEF_PCI0_MEM0_SIZE
-#define GT_PCI_IO_BASE     (0x20000000)
-#define GT_PCI_IO_SIZE     GT_DEF_PCI0_IO_SIZE
-#endif
-
-extern unsigned long gt64240_base;
-
-#define GT64240_BASE       (gt64240_base)
-
-/*
- * Because of an error/peculiarity in the Galileo chip, we need to swap the
- * bytes when running bigendian.
- */
-
-#define GT_WRITE(ofs, data)  \
-        *(volatile u32 *)(GT64240_BASE+(ofs)) = cpu_to_le32(data)
-#define GT_READ(ofs, data)   \
-        *(data) = le32_to_cpu(*(volatile u32 *)(GT64240_BASE+(ofs)))
-#define GT_READ_DATA(ofs)    \
-        le32_to_cpu(*(volatile u32 *)(GT64240_BASE+(ofs)))
-
-#define GT_WRITE_16(ofs, data)  \
-        *(volatile u16 *)(GT64240_BASE+(ofs)) = cpu_to_le16(data)
-#define GT_READ_16(ofs, data)   \
-        *(data) = le16_to_cpu(*(volatile u16 *)(GT64240_BASE+(ofs)))
-
-#define GT_WRITE_8(ofs, data)  \
-        *(volatile u8 *)(GT64240_BASE+(ofs)) = data
-#define GT_READ_8(ofs, data)   \
-        *(data) = *(volatile u8 *)(GT64240_BASE+(ofs))
-
-#endif  /* _ASM_GT64120_MOMENCO_OCELOT_GT64120_DEP_H */
diff --git a/arch/mips/momentum/ocelot_g/pci-irq.c b/arch/mips/momentum/ocelot_g/pci-irq.c
deleted file mode 100644 (file)
index e300e15..0000000
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * Copyright 2002 Momentum Computer Inc.
- * Author: Matthew Dharm <mdharm@momenco.com>
- *
- * Based on work for the Linux port to the Ocelot board, which is
- * Copyright 2001 MontaVista Software Inc.
- * Author: Jun Sun, jsun@mvista.com or jsun@junsun.net
- *
- * arch/mips/momentum/ocelot_g/pci.c
- *     Board-specific PCI routines for gt64240 controller.
- *
- * 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/types.h>
-#include <linux/pci.h>
-#include <linux/kernel.h>
-#include <linux/init.h>
-#include <asm/pci.h>
-
-
-void __devinit gt64240_board_pcibios_fixup_bus(struct pci_bus *bus)
-{
-       struct pci_bus *current_bus = bus;
-       struct pci_dev *devices;
-       struct list_head *devices_link;
-       u16 cmd;
-
-       /* loop over all known devices on this bus */
-       list_for_each(devices_link, &(current_bus->devices)) {
-
-               devices = pci_dev_b(devices_link);
-               if (devices == NULL)
-                       continue;
-
-               if ((current_bus->number == 0) &&
-                               PCI_SLOT(devices->devfn) == 1) {
-                       /* Intel 82543 Gigabit MAC */
-                       devices->irq = 2;       /* irq_nr is 2 for INT0 */
-               } else if ((current_bus->number == 0) &&
-                               PCI_SLOT(devices->devfn) == 2) {
-                       /* Intel 82543 Gigabit MAC */
-                       devices->irq = 3;       /* irq_nr is 3 for INT1 */
-               } else if ((current_bus->number == 1) &&
-                               PCI_SLOT(devices->devfn) == 3) {
-                       /* Intel 21555 bridge */
-                       devices->irq = 5;       /* irq_nr is 8 for INT6 */
-               } else if ((current_bus->number == 1) &&
-                               PCI_SLOT(devices->devfn) == 4) {
-                       /* PMC Slot */
-                       devices->irq = 9;       /* irq_nr is 9 for INT7 */
-               } else {
-                       /* We don't have assign interrupts for other devices. */
-                       devices->irq = 0xff;
-               }
-
-               /* Assign an interrupt number for the device */
-               bus->ops->write(current_bus, devices,
-                       PCI_INTERRUPT_LINE, 1, devices->irq);
-
-               /* enable master for everything but the GT-64240 */
-               if (((current_bus->number != 0) && (current_bus->number != 1))
-                               || (PCI_SLOT(devices->devfn) != 0)) {
-                       bus->ops->read(current_bus, devices,
-                                       PCI_COMMAND, 2, &cmd);
-                       cmd |= PCI_COMMAND_MASTER;
-                       bus->ops->write(current_bus, devices,
-                                       PCI_COMMAND, 2, cmd);
-               }
-       }
-}
diff --git a/arch/mips/pci/fixup-eagle.c b/arch/mips/pci/fixup-eagle.c
deleted file mode 100644 (file)
index ac6f9d8..0000000
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * arch/mips/vr41xx/nec-eagle/pci_fixup.c
- *
- * The NEC Eagle/Hawk Board specific PCI fixups.
- *
- * Author: Yoichi Yuasa <you@mvista.com, or source@mvista.com>
- *
- * 2001-2002,2004 (c) MontaVista, Software, Inc. This file is licensed under
- * the terms of the GNU General Public License version 2. This program
- * is licensed "as is" without any warranty of any kind, whether express
- * or implied.
- */
-#include <linux/init.h>
-#include <linux/pci.h>
-
-#include <asm/vr41xx/eagle.h>
-#include <asm/vr41xx/vrc4173.h>
-
-/*
- * Shortcuts
- */
-#define INTA   CP_INTA_IRQ
-#define INTB   CP_INTB_IRQ
-#define INTC   CP_INTC_IRQ
-#define INTD   CP_INTD_IRQ
-#define PCMCIA1        VRC4173_PCMCIA1_IRQ
-#define PCMCIA2        VRC4173_PCMCIA2_IRQ
-#define LAN    LANINTA_IRQ
-#define SLOT   PCISLOT_IRQ
-
-static char irq_tab_eagle[][5] __initdata = {
- [ 8] = { 0,    INTA, INTB, INTC, INTD },
- [ 9] = { 0,    INTD, INTA, INTB, INTC },
- [10] = { 0,    INTC, INTD, INTA, INTB },
- [12] = { 0, PCMCIA1,    0,    0,    0 },
- [13] = { 0, PCMCIA2,    0,    0,    0 },
- [28] = { 0,     LAN,    0,    0,    0 },
- [29] = { 0,    SLOT, INTB, INTC, INTD },
-};
-
-/*
- * This is a multifunction device.
- */
-static char irq_func_tab[] __initdata = {
-       VRC4173_CASCADE_IRQ,
-       VRC4173_AC97_IRQ,
-       VRC4173_USB_IRQ
-};
-
-int __init pcibios_map_irq(struct pci_dev *dev, u8 slot, u8 pin)
-{
-       if (slot == 30)
-               return irq_func_tab[PCI_FUNC(dev->devfn)];
-
-       return irq_tab_eagle[slot][pin];
-}
-
-struct pci_fixup pcibios_fixups[] __initdata = {
-       {       .pass = 0,      },
-};
diff --git a/arch/mips/pci/fixup-mv64340.c b/arch/mips/pci/fixup-mv64340.c
deleted file mode 100644 (file)
index fa78b9b..0000000
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * This file is subject to the terms and conditions of the GNU General Public
- * License.  See the file "COPYING" in the main directory of this archive
- * for more details.
- *
- * Marvell MV64340 interrupt fixup code.
- *
- * Marvell wants an NDA for their docs so this was written without
- * documentation.  You've been warned.
- *
- * Copyright (C) 2004 Ralf Baechle
- */
-#include <linux/kernel.h>
-#include <linux/init.h>
-#include <linux/pci.h>
-
-#include <asm/mipsregs.h>
-#include <asm/pci_channel.h>
-
-/*
- * WARNING: Example of how _NOT_ to do it.
- */
-int __init pcibios_map_irq(struct pci_dev *dev, u8 slot, u8 pin)
-{
-       int bus = dev->bus->number;
-
-       if (bus == 0 && slot == 1)
-               return 3;       /* PCI-X A */
-       if (bus == 0 && slot == 2)
-               return 4;       /* PCI-X B */
-       if (bus == 1 && slot == 1)
-               return 5;       /* PCI A */
-       if (bus == 1 && slot == 2)
-               return 6;       /* PCI B */
-
-return 0;
-       panic("Whooops in pcibios_map_irq");
-}
-
-struct pci_fixup pcibios_fixups[] = {
-       {0}
-};
diff --git a/arch/mips/pci/fixup-tb0229.c b/arch/mips/pci/fixup-tb0229.c
deleted file mode 100644 (file)
index 8109c05..0000000
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * FILE NAME
- *     arch/mips/vr41xx/tanbac-tb0229/pci_fixup.c
- *
- * BRIEF MODULE DESCRIPTION
- *     The TANBAC TB0229(VR4131DIMM) specific PCI fixups.
- *
- * Copyright 2003 Megasolution Inc.
- *                matsu@megasolution.jp
- *
- *  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/init.h>
-#include <linux/pci.h>
-
-#include <asm/vr41xx/tb0229.h>
-
-void __init pcibios_fixup_irqs(void)
-{
-#ifdef CONFIG_TANBAC_TB0219
-       struct pci_dev *dev = NULL;
-       u8 slot;
-
-       while ((dev = pci_find_device(PCI_ANY_ID, PCI_ANY_ID, dev)) != NULL) {
-               slot = PCI_SLOT(dev->devfn);
-               dev->irq = 0;
-
-               switch (slot) {
-               case 12:
-                       vr41xx_set_irq_trigger(TB0219_PCI_SLOT1_PIN,
-                                              TRIGGER_LEVEL,
-                                              SIGNAL_THROUGH);
-                       vr41xx_set_irq_level(TB0219_PCI_SLOT1_PIN,
-                                            LEVEL_LOW);
-                       dev->irq = TB0219_PCI_SLOT1_IRQ;
-                       break;
-               case 13:
-                       vr41xx_set_irq_trigger(TB0219_PCI_SLOT2_PIN,
-                                              TRIGGER_LEVEL,
-                                              SIGNAL_THROUGH);
-                       vr41xx_set_irq_level(TB0219_PCI_SLOT2_PIN,
-                                            LEVEL_LOW);
-                       dev->irq = TB0219_PCI_SLOT2_IRQ;
-                       break;
-               case 14:
-                       vr41xx_set_irq_trigger(TB0219_PCI_SLOT3_PIN,
-                                              TRIGGER_LEVEL,
-                                              SIGNAL_THROUGH);
-                       vr41xx_set_irq_level(TB0219_PCI_SLOT3_PIN,
-                                            LEVEL_LOW);
-                       dev->irq = TB0219_PCI_SLOT3_IRQ;
-                       break;
-               default:
-                       break;
-               }
-
-               pci_write_config_byte(dev, PCI_INTERRUPT_LINE, dev->irq);
-       }
-#endif
-}
diff --git a/arch/mips/pci/fixup-victor-mpc30x.c b/arch/mips/pci/fixup-victor-mpc30x.c
deleted file mode 100644 (file)
index 3ec5951..0000000
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * FILE NAME
- *     arch/mips/vr41xx/victor-mpc30x/pci_fixup.c
- *
- * BRIEF MODULE DESCRIPTION
- *     The Victor MP-C303/304 specific PCI fixups.
- *
- * Copyright 2002 Yoichi Yuasa
- *                yuasa@hh.iij4u.or.jp
- *
- *  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/init.h>
-#include <linux/pci.h>
-
-#include <asm/vr41xx/vrc4173.h>
-#include <asm/vr41xx/mpc30x.h>
-
-/*
- * Shortcuts
- */
-#define PCMCIA1        VRC4173_PCMCIA1_IRQ
-#define PCMCIA2        VRC4173_PCMCIA2_IRQ
-#define MQ     MQ200_IRQ
-
-static const int internal_func_irqs[8] __initdata = {
-       VRC4173_CASCADE_IRQ,
-       VRC4173_AC97_IRQ,
-       VRC4173_USB_IRQ,
-       
-};
-
-static char irq_tab_mpc30x[][5] __initdata = {
- [12] = { PCMCIA1, PCMCIA1, 0, 0 },
- [13] = { PCMCIA2, PCMCIA2, 0, 0 },
- [29] = {      MQ,      MQ, 0, 0 },            /* mediaQ MQ-200 */
-};
-
-int __init pcibios_map_irq(struct pci_dev *dev, u8 slot, u8 pin)
-{
-       if (slot == 30)
-               return internal_func_irqs[PCI_FUNC(dev->devfn)];
-
-       return irq_tab_mpc30x[slot][pin];
-}
diff --git a/arch/mips/pci/ops-mv64340.c b/arch/mips/pci/ops-mv64340.c
deleted file mode 100644 (file)
index 235e01b..0000000
+++ /dev/null
@@ -1,145 +0,0 @@
-/*
- * Copyright 2002 Momentum Computer
- * Author: Matthew Dharm <mdharm@momenco.com>
- *
- * Copyright (C) 2003, 2004 Ralf Baechle (ralf@linux-mips.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  SOFTWARE  IS PROVIDED   ``AS  IS'' AND   ANY  EXPRESS OR IMPLIED
- *  WARRANTIES,   INCLUDING, BUT NOT  LIMITED  TO, THE IMPLIED WARRANTIES OF
- *  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN
- *  NO  EVENT  SHALL   THE AUTHOR  BE    LIABLE FOR ANY   DIRECT, INDIRECT,
- *  INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- *  NOT LIMITED   TO, PROCUREMENT OF  SUBSTITUTE GOODS  OR SERVICES; LOSS OF
- *  USE, DATA,  OR PROFITS; OR  BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- *  ANY THEORY OF LIABILITY, WHETHER IN  CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- *  THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- *  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.
- */
-#include <linux/types.h>
-#include <linux/pci.h>
-#include <linux/kernel.h>
-#include <asm/mv64340.h>
-
-/*
- * galileo_pcibios_(read/write)_config_(dword/word/byte) -
- *
- * reads/write a dword/word/byte register from the configuration space
- * of a device.
- *
- * Note that bus 0 and bus 1 are local, and we assume all other busses are
- * bridged from bus 1.  This is a safe assumption, since any other
- * configuration will require major modifications to the CP7000G
- *
- * Inputs :
- * bus - bus number
- * dev - device number
- * offset - register offset in the configuration space
- * val - value to be written / read
- *
- * Outputs :
- * PCIBIOS_SUCCESSFUL when operation was succesfull
- * PCIBIOS_DEVICE_NOT_FOUND when the bus or dev is errorneous
- * PCIBIOS_BAD_REGISTER_NUMBER when accessing non aligned
- */
-
-static int mv64340_read_config(struct pci_bus *bus, unsigned int devfn, int reg,
-       int size, u32 * val, u32 address_reg, u32 data_reg)
-{
-       u32 address;
-
-       /* Accessing device 31 crashes the MV-64340. */
-       if (PCI_SLOT(devfn) > 5)
-               return PCIBIOS_DEVICE_NOT_FOUND;
-
-       address = (bus->number << 16) | (devfn << 8) |
-                 (reg & 0xfc) | 0x80000000;
-
-       /* start the configuration cycle */
-       MV_WRITE(address_reg, address);
-
-       switch (size) {
-       case 1:
-               *val = MV_READ_8(data_reg + (reg & 0x3));
-               break;
-
-       case 2:
-               *val = MV_READ_16(data_reg + (reg & 0x3));
-               break;
-
-       case 4:
-               *val = MV_READ(data_reg);
-               break;
-       }
-
-       return PCIBIOS_SUCCESSFUL;
-}
-
-static int mv64340_write_config(struct pci_bus *bus, unsigned int devfn,
-       int reg, int size, u32 val, u32 address_reg, u32 data_reg)
-{
-       u32 address;
-
-       /* Accessing device 31 crashes the MV-64340. */
-       if (PCI_SLOT(devfn) > 5)
-               return PCIBIOS_DEVICE_NOT_FOUND;
-
-       address = (bus->number << 16) | (devfn << 8) |
-                 (reg & 0xfc) | 0x80000000;
-
-       /* start the configuration cycle */
-       MV_WRITE(address_reg, address);
-
-       switch (size) {
-       case 1:
-               /* write the data */
-               MV_WRITE_8(data_reg + (reg & 0x3), val);
-               break;
-
-       case 2:
-               /* write the data */
-               MV_WRITE_16(data_reg + (reg & 0x3), val);
-               break;
-
-       case 4:
-               /* write the data */
-               MV_WRITE(data_reg, val);
-               break;
-       }
-
-       return PCIBIOS_SUCCESSFUL;
-}
-
-#define BUILD_PCI_OPS(host)                                            \
-                                                                       \
-static int mv64340_bus ## host ## _read_config(struct pci_bus *bus,    \
-       unsigned int devfn, int reg, int size, u32 * val)               \
-{                                                                      \
-       return mv64340_read_config(bus, devfn, reg, size, val,          \
-                  MV64340_PCI_ ## host ## _CONFIG_ADDR,                \
-                  MV64340_PCI_ ## host ## _CONFIG_DATA_VIRTUAL_REG);   \
-}                                                                      \
-                                                                       \
-static int mv64340_bus ## host ## _write_config(struct pci_bus *bus,   \
-       unsigned int devfn, int reg, int size, u32 val)                 \
-{                                                                      \
-       return mv64340_write_config(bus, devfn, reg, size, val,         \
-                  MV64340_PCI_ ## host ## _CONFIG_ADDR,                \
-                  MV64340_PCI_ ## host ## _CONFIG_DATA_VIRTUAL_REG);   \
-}                                                                      \
-                                                                       \
-struct pci_ops mv64340_bus ## host ## _pci_ops = {                     \
-       .read   = mv64340_bus ## host ## _read_config,                  \
-       .write  = mv64340_bus ## host ## _write_config                  \
-};
-
-BUILD_PCI_OPS(0)
-BUILD_PCI_OPS(1)
diff --git a/arch/mips/pci/ops-vrc4173.c b/arch/mips/pci/ops-vrc4173.c
deleted file mode 100644 (file)
index ce4e702..0000000
+++ /dev/null
@@ -1,120 +0,0 @@
-/*
- * FILE NAME
- *     arch/mips/vr41xx/nec-eagle/vrc4173.c
- *
- * BRIEF MODULE DESCRIPTION
- *     Pre-setup for NEC VRC4173.
- *
- * Author: Yoichi Yuasa
- *         yyuasa@mvista.com or source@mvista.com
- *
- * Copyright 2001,2002 MontaVista Software 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.
- *
- *  THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED
- *  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- *  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- *  IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- *  INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
- *  BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
- *  OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- *  ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
- *  TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
- *  USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- *  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.
- */
-#include <linux/init.h>
-#include <linux/pci.h>
-#include <linux/module.h>
-
-#include <asm/io.h>
-#include <asm/vr41xx/eagle.h>
-#include <asm/vr41xx/vrc4173.h>
-
-#define PCI_CONFIG_ADDR        KSEG1ADDR(0x0f000c18)
-#define PCI_CONFIG_DATA        KSEG1ADDR(0x0f000c14)
-
-static inline void config_writeb(u8 reg, u8 val)
-{
-       u32 data;
-       int shift;
-
-       writel((1UL << 0x1e) | (reg & 0xfc), PCI_CONFIG_ADDR);
-       data = readl(PCI_CONFIG_DATA);
-
-       shift = (reg & 3) << 3;
-       data &= ~(0xff << shift);
-       data |= (((u32) val) << shift);
-
-       writel(data, PCI_CONFIG_DATA);
-}
-
-static inline u16 config_readw(u8 reg)
-{
-       u32 data;
-
-       writel(((1UL << 30) | (reg & 0xfc)), PCI_CONFIG_ADDR);
-       data = readl(PCI_CONFIG_DATA);
-
-       return (u16) (data >> ((reg & 2) << 3));
-}
-
-static inline u32 config_readl(u8 reg)
-{
-       writel(((1UL << 30) | (reg & 0xfc)), PCI_CONFIG_ADDR);
-
-       return readl(PCI_CONFIG_DATA);
-}
-
-static inline void config_writel(u8 reg, u32 val)
-{
-       writel((1UL << 0x1e) | (reg & 0xfc), PCI_CONFIG_ADDR);
-       writel(val, PCI_CONFIG_DATA);
-}
-
-void __init vrc4173_preinit(void)
-{
-       u32 cmdsts, base;
-       u16 cmu_mask;
-
-
-       if ((config_readw(PCI_VENDOR_ID) == PCI_VENDOR_ID_NEC) &&
-           (config_readw(PCI_DEVICE_ID) == PCI_DEVICE_ID_NEC_VRC4173)) {
-               /*
-                * Initialized NEC VRC4173 Bus Control Unit
-                */
-               cmdsts = config_readl(PCI_COMMAND);
-               config_writel(PCI_COMMAND,
-                             cmdsts |
-                             PCI_COMMAND_IO |
-                             PCI_COMMAND_MEMORY | PCI_COMMAND_MASTER);
-
-               config_writeb(PCI_LATENCY_TIMER, 0x80);
-
-               config_writel(PCI_BASE_ADDRESS_0, VR41XX_PCI_IO_START);
-               base = config_readl(PCI_BASE_ADDRESS_0);
-               base &= PCI_BASE_ADDRESS_IO_MASK;
-               config_writeb(0x40, 0x01);
-
-               /* CARDU1 IDSEL = AD12, CARDU2 IDSEL = AD13 */
-               config_writeb(0x41, 0);
-
-               cmu_mask = 0x1000;
-               outw(cmu_mask, base + 0x040);
-               cmu_mask |= 0x0800;
-               outw(cmu_mask, base + 0x040);
-
-               outw(0x000f, base + 0x042);     /* Soft reset of CMU */
-               cmu_mask |= 0x05e0;
-               outw(cmu_mask, base + 0x040);
-               cmu_mask = inw(base + 0x040);   /* dummy read */
-               outw(0x0000, base + 0x042);
-       }
-}
diff --git a/arch/mips/vr41xx/nec-eagle/Makefile b/arch/mips/vr41xx/nec-eagle/Makefile
deleted file mode 100644 (file)
index 0b25725..0000000
+++ /dev/null
@@ -1,10 +0,0 @@
-#
-# Makefile for the NEC Eagle/Hawk specific parts of the kernel
-#
-# Author: Yoichi Yuasa
-#         yyuasa@mvista.com or source@mvista.com
-#
-# Copyright 2001,2002 MontaVista Software Inc.
-#
-
-obj-y                  += irq.o setup.o
diff --git a/arch/mips/vr41xx/nec-eagle/irq.c b/arch/mips/vr41xx/nec-eagle/irq.c
deleted file mode 100644 (file)
index 03f74a5..0000000
+++ /dev/null
@@ -1,190 +0,0 @@
-/*
- *  irq.c,  Interrupt routines for the NEC Eagle/Hawk board.
- *
- *  Copyright (C) 2002  MontaVista Software, Inc.
- *    Author: Yoichi Yuasa <yyuasa@mvista.com, or source@mvista.com>
- *  Copyright (C) 2004  Yoichi Yuasa <yuasa@hh.iij4u.or.jp>
- *
- *  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
- */
-/*
- * Changes:
- *  MontaVista Software Inc. <yyuasa@mvista.com> or <source@mvista.com>
- *  - New creation, NEC Eagle is supported.
- *  - Added support for NEC Hawk.
- *
- *  Yoichi Yuasa <yuasa@hh.iij4u.or.jp>
- *  - Changed from board_irq_init to driver module.
- */
-#include <linux/config.h>
-#include <linux/init.h>
-#include <linux/interrupt.h>
-#include <linux/module.h>
-#include <linux/types.h>
-
-#include <asm/io.h>
-#include <asm/vr41xx/eagle.h>
-
-MODULE_DESCRIPTION("IRQ module driver for NEC Eagle/Hawk");
-MODULE_AUTHOR("Yoichi Yuasa <yyuasa@mvista.com>");
-MODULE_LICENSE("GPL");
-
-static void enable_pciint_irq(unsigned int irq)
-{
-       uint8_t val;
-
-       val = readb(NEC_EAGLE_PCIINTMSKREG);
-       val |= (uint8_t)1 << (irq - PCIINT_IRQ_BASE);
-       writeb(val, NEC_EAGLE_PCIINTMSKREG);
-}
-
-static void disable_pciint_irq(unsigned int irq)
-{
-       uint8_t val;
-
-       val = readb(NEC_EAGLE_PCIINTMSKREG);
-       val &= ~((uint8_t)1 << (irq - PCIINT_IRQ_BASE));
-       writeb(val, NEC_EAGLE_PCIINTMSKREG);
-}
-
-static unsigned int startup_pciint_irq(unsigned int irq)
-{
-       enable_pciint_irq(irq);
-       return 0; /* never anything pending */
-}
-
-#define shutdown_pciint_irq    disable_pciint_irq
-#define ack_pciint_irq         disable_pciint_irq
-
-static void end_pciint_irq(unsigned int irq)
-{
-       if (!(irq_desc[irq].status & (IRQ_DISABLED | IRQ_INPROGRESS)))
-               enable_pciint_irq(irq);
-}
-
-static struct hw_interrupt_type pciint_irq_type = {
-       .typename       = "PCIINT",
-       .startup        = startup_pciint_irq,
-       .shutdown       = shutdown_pciint_irq,
-       .enable         = enable_pciint_irq,
-       .disable        = disable_pciint_irq,
-       .ack            = ack_pciint_irq,
-       .end            = end_pciint_irq,
-};
-
-static void enable_sdbint_irq(unsigned int irq)
-{
-       uint8_t val;
-
-       val = readb(NEC_EAGLE_SDBINTMSK);
-       val |= (uint8_t)1 << (irq - SDBINT_IRQ_BASE);
-       writeb(val, NEC_EAGLE_SDBINTMSK);
-}
-
-static void disable_sdbint_irq(unsigned int irq)
-{
-       uint8_t val;
-
-       val = readb(NEC_EAGLE_SDBINTMSK);
-       val &= ~((uint8_t)1 << (irq - SDBINT_IRQ_BASE));
-       writeb(val, NEC_EAGLE_SDBINTMSK);
-}
-
-static unsigned int startup_sdbint_irq(unsigned int irq)
-{
-       enable_sdbint_irq(irq);
-       return 0; /* never anything pending */
-}
-
-#define shutdown_sdbint_irq    disable_sdbint_irq
-#define ack_sdbint_irq         disable_sdbint_irq
-
-static void end_sdbint_irq(unsigned int irq)
-{
-       if (!(irq_desc[irq].status & (IRQ_DISABLED | IRQ_INPROGRESS)))
-               enable_sdbint_irq(irq);
-}
-
-static struct hw_interrupt_type sdbint_irq_type = {
-       .typename       = "SDBINT",
-       .startup        = startup_sdbint_irq,
-       .shutdown       = shutdown_sdbint_irq,
-       .enable         = enable_sdbint_irq,
-       .disable        = disable_sdbint_irq,
-       .ack            = ack_sdbint_irq,
-       .end            = end_sdbint_irq,
-};
-
-static int eagle_get_irq_number(int irq)
-{
-       uint8_t sdbint, pciint;
-       int i;
-
-       sdbint = readb(NEC_EAGLE_SDBINT);
-       sdbint &= (NEC_EAGLE_SDBINT_DEG | NEC_EAGLE_SDBINT_ENUM |
-                  NEC_EAGLE_SDBINT_SIO1INT | NEC_EAGLE_SDBINT_SIO2INT |
-                  NEC_EAGLE_SDBINT_PARINT);
-       pciint = readb(NEC_EAGLE_PCIINTREG);
-       pciint &= (NEC_EAGLE_PCIINT_CP_INTA | NEC_EAGLE_PCIINT_CP_INTB |
-                  NEC_EAGLE_PCIINT_CP_INTC | NEC_EAGLE_PCIINT_CP_INTD |
-                  NEC_EAGLE_PCIINT_LANINT);
-
-       for (i = 1; i < 6; i++)
-               if (sdbint & (0x01 << i))
-                       return SDBINT_IRQ_BASE + i;
-
-       for (i = 0; i < 5; i++)
-               if (pciint & (0x01 << i))
-                       return PCIINT_IRQ_BASE + i;
-
-       return -EINVAL;
-}
-
-static int __devinit eagle_irq_init(void)
-{
-       int i, retval;
-
-       writeb(0, NEC_EAGLE_SDBINTMSK);
-       writeb(0, NEC_EAGLE_PCIINTMSKREG);
-
-       vr41xx_set_irq_trigger(PCISLOT_PIN, TRIGGER_LEVEL, SIGNAL_THROUGH);
-       vr41xx_set_irq_level(PCISLOT_PIN, LEVEL_HIGH);
-
-       vr41xx_set_irq_trigger(FPGA_PIN, TRIGGER_LEVEL, SIGNAL_THROUGH);
-       vr41xx_set_irq_level(FPGA_PIN, LEVEL_HIGH);
-
-       vr41xx_set_irq_trigger(DCD_PIN, TRIGGER_EDGE, SIGNAL_HOLD);
-       vr41xx_set_irq_level(DCD_PIN, LEVEL_LOW);
-
-       for (i = SDBINT_IRQ_BASE; i <= SDBINT_IRQ_LAST; i++)
-               irq_desc[i].handler = &sdbint_irq_type;
-
-       for (i = PCIINT_IRQ_BASE; i <= PCIINT_IRQ_LAST; i++)
-               irq_desc[i].handler = &pciint_irq_type;
-
-       retval = vr41xx_cascade_irq(FPGA_CASCADE_IRQ, eagle_get_irq_number);
-       if (retval != 0)
-               printk(KERN_ERR "eagle: Cannot cascade IRQ %d\n", FPGA_CASCADE_IRQ);
-
-       return retval;
-}
-
-static void __devexit eagle_irq_exit(void)
-{
-       free_irq(FPGA_CASCADE_IRQ, NULL);
-}
-
-module_init(eagle_irq_init);
-module_exit(eagle_irq_exit);
diff --git a/arch/mips/vr41xx/nec-eagle/setup.c b/arch/mips/vr41xx/nec-eagle/setup.c
deleted file mode 100644 (file)
index cc055af..0000000
+++ /dev/null
@@ -1,97 +0,0 @@
-/*
- * arch/mips/vr41xx/nec-eagle/setup.c
- *
- * Setup for the NEC Eagle/Hawk board.
- *
- * Author: Yoichi Yuasa <yyuasa@mvista.com, or source@mvista.com>
- *
- * 2001-2004 (c) MontaVista, Software, Inc. This file is licensed under
- * the terms of the GNU General Public License version 2. This program
- * is licensed "as is" without any warranty of any kind, whether express
- * or implied.
- */
-#include <linux/config.h>
-#include <linux/ioport.h>
-
-#include <asm/io.h>
-#include <asm/pci_channel.h>
-#include <asm/vr41xx/eagle.h>
-
-#ifdef CONFIG_PCI
-
-extern void vrc4173_preinit(void);
-
-static struct resource vr41xx_pci_io_resource = {
-       "PCI I/O space",
-       VR41XX_PCI_IO_START,
-       VR41XX_PCI_IO_END,
-       IORESOURCE_IO
-};
-
-static struct resource vr41xx_pci_mem_resource = {
-       "PCI memory space",
-       VR41XX_PCI_MEM_START,
-       VR41XX_PCI_MEM_END,
-       IORESOURCE_MEM
-};
-
-extern struct pci_ops vr41xx_pci_ops;
-
-struct pci_controller vr41xx_controller = {
-       .pci_ops        = &vr41xx_pci_ops,
-       .io_resource    = &vr41xx_pci_io_resource,
-       .mem_resource   = &vr41xx_pci_mem_resource,
-};
-
-struct vr41xx_pci_address_space vr41xx_pci_mem1 = {
-       VR41XX_PCI_MEM1_BASE,
-       VR41XX_PCI_MEM1_MASK,
-       IO_MEM1_RESOURCE_START
-};
-
-struct vr41xx_pci_address_space vr41xx_pci_mem2 = {
-       VR41XX_PCI_MEM2_BASE,
-       VR41XX_PCI_MEM2_MASK,
-       IO_MEM2_RESOURCE_START
-};
-
-struct vr41xx_pci_address_space vr41xx_pci_io = {
-       VR41XX_PCI_IO_BASE,
-       VR41XX_PCI_IO_MASK,
-       IO_PORT_RESOURCE_START
-};
-
-static struct vr41xx_pci_address_map pci_address_map = {
-       &vr41xx_pci_mem1,
-       &vr41xx_pci_mem2,
-       &vr41xx_pci_io
-};
-#endif
-
-const char *get_system_type(void)
-{
-       return "NEC SDB-VR4122/VR4131(Eagle/Hawk)";
-}
-
-static int nec_eagle_setup(void)
-{
-       set_io_port_base(IO_PORT_BASE);
-       ioport_resource.start = IO_PORT_RESOURCE_START;
-       ioport_resource.end = IO_PORT_RESOURCE_END;
-
-#ifdef CONFIG_SERIAL_8250
-       vr41xx_select_siu_interface(SIU_RS232C, IRDA_NONE);
-       vr41xx_siu_init();
-       vr41xx_dsiu_init();
-#endif
-
-#ifdef CONFIG_PCI
-       vr41xx_pciu_init(&pci_address_map);
-
-       vrc4173_preinit();
-#endif
-
-       return 0;
-}
-
-early_initcall(nec_eagle_setup);
diff --git a/arch/mips/vr41xx/tanbac-tb0229/reboot.c b/arch/mips/vr41xx/tanbac-tb0229/reboot.c
deleted file mode 100644 (file)
index 02e8378..0000000
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * FILE NAME
- *     arch/mips/vr41xx/tanbac-tb0229/reboot.c
- *
- * BRIEF MODULE DESCRIPTION
- *     Depending on TANBAC TB0229(VR4131DIMM) of reboot system call.
- *
- * Copyright 2003 Megasolution Inc.
- *                matsu@megasolution.jp
- *
- *  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 <asm/io.h>
-#include <asm/vr41xx/tb0229.h>
-
-#define tb0229_hard_reset()    writew(0, TB0219_RESET_REGS)
-
-void tanbac_tb0229_restart(char *command)
-{
-       local_irq_disable();
-       tb0229_hard_reset();
-       while (1);
-}
diff --git a/arch/parisc/configs/n4000_defconfig b/arch/parisc/configs/n4000_defconfig
deleted file mode 100644 (file)
index 8df4bb1..0000000
+++ /dev/null
@@ -1,905 +0,0 @@
-#
-# Automatically generated make config: don't edit
-#
-CONFIG_PARISC=y
-CONFIG_MMU=y
-CONFIG_STACK_GROWSUP=y
-CONFIG_RWSEM_GENERIC_SPINLOCK=y
-
-#
-# Code maturity level options
-#
-CONFIG_EXPERIMENTAL=y
-# CONFIG_CLEAN_COMPILE is not set
-# CONFIG_STANDALONE is not set
-CONFIG_BROKEN=y
-CONFIG_BROKEN_ON_SMP=y
-
-#
-# General setup
-#
-CONFIG_SWAP=y
-CONFIG_SYSVIPC=y
-CONFIG_POSIX_MQUEUE=y
-# CONFIG_BSD_PROCESS_ACCT is not set
-CONFIG_SYSCTL=y
-# CONFIG_AUDIT is not set
-CONFIG_LOG_BUF_SHIFT=16
-CONFIG_HOTPLUG=y
-CONFIG_IKCONFIG=y
-CONFIG_IKCONFIG_PROC=y
-CONFIG_EMBEDDED=y
-CONFIG_KALLSYMS=y
-CONFIG_KALLSYMS_ALL=y
-CONFIG_FUTEX=y
-CONFIG_EPOLL=y
-CONFIG_IOSCHED_NOOP=y
-CONFIG_IOSCHED_AS=y
-CONFIG_IOSCHED_DEADLINE=y
-CONFIG_IOSCHED_CFQ=y
-# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
-
-#
-# Loadable module support
-#
-CONFIG_MODULES=y
-CONFIG_MODULE_UNLOAD=y
-CONFIG_MODULE_FORCE_UNLOAD=y
-CONFIG_OBSOLETE_MODPARM=y
-# CONFIG_MODVERSIONS is not set
-CONFIG_KMOD=y
-
-#
-# Processor type and features
-#
-# CONFIG_PA7000 is not set
-# CONFIG_PA7100LC is not set
-# CONFIG_PA7200 is not set
-# CONFIG_PA7300LC is not set
-CONFIG_PA8X00=y
-CONFIG_PA20=y
-CONFIG_PREFETCH=y
-CONFIG_PARISC64=y
-CONFIG_64BIT=y
-# CONFIG_SMP is not set
-CONFIG_DISCONTIGMEM=y
-# CONFIG_PREEMPT is not set
-CONFIG_COMPAT=y
-
-#
-# Bus options (PCI, PCMCIA, EISA, GSC, ISA)
-#
-# CONFIG_GSC is not set
-CONFIG_PCI=y
-CONFIG_PCI_LEGACY_PROC=y
-CONFIG_PCI_NAMES=y
-CONFIG_PCI_LBA=y
-CONFIG_IOSAPIC=y
-CONFIG_IOMMU_SBA=y
-# CONFIG_SUPERIO is not set
-CONFIG_CHASSIS_LCD_LED=y
-# CONFIG_PDC_CHASSIS is not set
-
-#
-# PCMCIA/CardBus support
-#
-CONFIG_PCMCIA=m
-CONFIG_PCMCIA_DEBUG=y
-CONFIG_YENTA=m
-CONFIG_CARDBUS=y
-# CONFIG_I82092 is not set
-# CONFIG_TCIC is not set
-
-#
-# PCI Hotplug Support
-#
-# CONFIG_HOTPLUG_PCI is not set
-
-#
-# Executable file formats
-#
-CONFIG_BINFMT_ELF=y
-# CONFIG_BINFMT_MISC is not set
-
-#
-# Device Drivers
-#
-
-#
-# Generic Driver Options
-#
-# CONFIG_FW_LOADER is not set
-CONFIG_DEBUG_DRIVER=y
-
-#
-# Memory Technology Devices (MTD)
-#
-# CONFIG_MTD is not set
-
-#
-# Parallel port support
-#
-# CONFIG_PARPORT is not set
-
-#
-# Plug and Play support
-#
-
-#
-# Block devices
-#
-# CONFIG_BLK_DEV_FD is not set
-# CONFIG_BLK_CPQ_DA is not set
-# CONFIG_BLK_CPQ_CISS_DA is not set
-# CONFIG_BLK_DEV_DAC960 is not set
-CONFIG_BLK_DEV_UMEM=m
-CONFIG_BLK_DEV_LOOP=y
-# CONFIG_BLK_DEV_CRYPTOLOOP is not set
-# CONFIG_BLK_DEV_NBD is not set
-# CONFIG_BLK_DEV_CARMEL is not set
-CONFIG_BLK_DEV_RAM=y
-CONFIG_BLK_DEV_RAM_SIZE=6144
-CONFIG_BLK_DEV_INITRD=y
-
-#
-# ATA/ATAPI/MFM/RLL support
-#
-# CONFIG_IDE is not set
-
-#
-# SCSI device support
-#
-CONFIG_SCSI=y
-CONFIG_SCSI_PROC_FS=y
-
-#
-# SCSI support type (disk, tape, CD-ROM)
-#
-CONFIG_BLK_DEV_SD=y
-CONFIG_CHR_DEV_ST=y
-# CONFIG_CHR_DEV_OSST is not set
-CONFIG_BLK_DEV_SR=y
-# CONFIG_BLK_DEV_SR_VENDOR is not set
-CONFIG_CHR_DEV_SG=y
-
-#
-# Some SCSI devices (e.g. CD jukebox) support multiple LUNs
-#
-CONFIG_SCSI_MULTI_LUN=y
-# CONFIG_SCSI_CONSTANTS is not set
-# CONFIG_SCSI_LOGGING is not set
-
-#
-# SCSI Transport Attributes
-#
-CONFIG_SCSI_SPI_ATTRS=y
-CONFIG_SCSI_FC_ATTRS=m
-
-#
-# SCSI low-level drivers
-#
-# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
-# CONFIG_SCSI_ACARD is not set
-# CONFIG_SCSI_AACRAID is not set
-# CONFIG_SCSI_AIC7XXX is not set
-# CONFIG_SCSI_AIC7XXX_OLD is not set
-# CONFIG_SCSI_AIC79XX is not set
-# CONFIG_SCSI_ADVANSYS is not set
-# CONFIG_SCSI_MEGARAID is not set
-# CONFIG_SCSI_SATA is not set
-# CONFIG_SCSI_BUSLOGIC is not set
-# CONFIG_SCSI_CPQFCTS is not set
-# CONFIG_SCSI_DMX3191D is not set
-# CONFIG_SCSI_EATA is not set
-# CONFIG_SCSI_EATA_PIO is not set
-# CONFIG_SCSI_FUTURE_DOMAIN is not set
-# CONFIG_SCSI_GDTH is not set
-# CONFIG_SCSI_IPS is not set
-# CONFIG_SCSI_INITIO is not set
-# CONFIG_SCSI_INIA100 is not set
-CONFIG_SCSI_SYM53C8XX_2=y
-CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=0
-CONFIG_SCSI_SYM53C8XX_DEFAULT_TAGS=16
-CONFIG_SCSI_SYM53C8XX_MAX_TAGS=64
-CONFIG_SCSI_SYM53C8XX_IOMAPPED=y
-# CONFIG_SCSI_IPR is not set
-# CONFIG_SCSI_PCI2000 is not set
-# CONFIG_SCSI_PCI2220I is not set
-# CONFIG_SCSI_QLOGIC_ISP is not set
-CONFIG_SCSI_QLOGIC_FC=m
-# CONFIG_SCSI_QLOGIC_FC_FIRMWARE is not set
-CONFIG_SCSI_QLOGIC_1280=m
-CONFIG_SCSI_QLA2XXX=y
-# CONFIG_SCSI_QLA21XX is not set
-# CONFIG_SCSI_QLA22XX is not set
-CONFIG_SCSI_QLA2300=m
-CONFIG_SCSI_QLA2322=m
-CONFIG_SCSI_QLA6312=m
-CONFIG_SCSI_QLA6322=m
-# CONFIG_SCSI_DC395x is not set
-# CONFIG_SCSI_DC390T is not set
-CONFIG_SCSI_DEBUG=m
-
-#
-# PCMCIA SCSI adapter support
-#
-# CONFIG_PCMCIA_FDOMAIN is not set
-# CONFIG_PCMCIA_QLOGIC is not set
-# CONFIG_PCMCIA_SYM53C500 is not set
-
-#
-# Multi-device support (RAID and LVM)
-#
-CONFIG_MD=y
-CONFIG_BLK_DEV_MD=y
-CONFIG_MD_LINEAR=y
-CONFIG_MD_RAID0=y
-CONFIG_MD_RAID1=y
-# CONFIG_MD_RAID5 is not set
-# CONFIG_MD_RAID6 is not set
-# CONFIG_MD_MULTIPATH is not set
-# CONFIG_BLK_DEV_DM is not set
-
-#
-# Fusion MPT device support
-#
-CONFIG_FUSION=m
-CONFIG_FUSION_MAX_SGE=40
-CONFIG_FUSION_ISENSE=m
-CONFIG_FUSION_CTL=m
-
-#
-# IEEE 1394 (FireWire) support
-#
-# CONFIG_IEEE1394 is not set
-
-#
-# I2O device support
-#
-# CONFIG_I2O is not set
-
-#
-# Networking support
-#
-CONFIG_NET=y
-
-#
-# Networking options
-#
-CONFIG_PACKET=y
-CONFIG_PACKET_MMAP=y
-CONFIG_NETLINK_DEV=y
-CONFIG_UNIX=y
-CONFIG_NET_KEY=m
-CONFIG_INET=y
-CONFIG_IP_MULTICAST=y
-# CONFIG_IP_ADVANCED_ROUTER is not set
-CONFIG_IP_PNP=y
-CONFIG_IP_PNP_DHCP=y
-CONFIG_IP_PNP_BOOTP=y
-# CONFIG_IP_PNP_RARP is not set
-# CONFIG_NET_IPIP is not set
-# CONFIG_NET_IPGRE is not set
-# CONFIG_IP_MROUTE is not set
-# CONFIG_ARPD is not set
-# CONFIG_SYN_COOKIES is not set
-CONFIG_INET_AH=m
-CONFIG_INET_ESP=m
-# CONFIG_INET_IPCOMP is not set
-
-#
-# IP: Virtual Server Configuration
-#
-# CONFIG_IP_VS is not set
-# CONFIG_IPV6 is not set
-CONFIG_NETFILTER=y
-# CONFIG_NETFILTER_DEBUG is not set
-
-#
-# IP: Netfilter Configuration
-#
-CONFIG_IP_NF_CONNTRACK=m
-CONFIG_IP_NF_FTP=m
-CONFIG_IP_NF_IRC=m
-CONFIG_IP_NF_TFTP=m
-CONFIG_IP_NF_AMANDA=m
-CONFIG_IP_NF_QUEUE=m
-CONFIG_IP_NF_IPTABLES=m
-CONFIG_IP_NF_MATCH_LIMIT=m
-CONFIG_IP_NF_MATCH_IPRANGE=m
-CONFIG_IP_NF_MATCH_MAC=m
-CONFIG_IP_NF_MATCH_PKTTYPE=m
-CONFIG_IP_NF_MATCH_MARK=m
-CONFIG_IP_NF_MATCH_MULTIPORT=m
-CONFIG_IP_NF_MATCH_TOS=m
-CONFIG_IP_NF_MATCH_RECENT=m
-CONFIG_IP_NF_MATCH_ECN=m
-CONFIG_IP_NF_MATCH_DSCP=m
-CONFIG_IP_NF_MATCH_AH_ESP=m
-CONFIG_IP_NF_MATCH_LENGTH=m
-CONFIG_IP_NF_MATCH_TTL=m
-CONFIG_IP_NF_MATCH_TCPMSS=m
-CONFIG_IP_NF_MATCH_HELPER=m
-CONFIG_IP_NF_MATCH_STATE=m
-CONFIG_IP_NF_MATCH_CONNTRACK=m
-CONFIG_IP_NF_MATCH_OWNER=m
-CONFIG_IP_NF_FILTER=m
-CONFIG_IP_NF_TARGET_REJECT=m
-CONFIG_IP_NF_NAT=m
-CONFIG_IP_NF_NAT_NEEDED=y
-CONFIG_IP_NF_TARGET_MASQUERADE=m
-CONFIG_IP_NF_TARGET_REDIRECT=m
-CONFIG_IP_NF_TARGET_NETMAP=m
-CONFIG_IP_NF_TARGET_SAME=m
-# CONFIG_IP_NF_NAT_LOCAL is not set
-CONFIG_IP_NF_NAT_SNMP_BASIC=m
-CONFIG_IP_NF_NAT_IRC=m
-CONFIG_IP_NF_NAT_FTP=m
-CONFIG_IP_NF_NAT_TFTP=m
-CONFIG_IP_NF_NAT_AMANDA=m
-CONFIG_IP_NF_MANGLE=m
-CONFIG_IP_NF_TARGET_TOS=m
-CONFIG_IP_NF_TARGET_ECN=m
-CONFIG_IP_NF_TARGET_DSCP=m
-CONFIG_IP_NF_TARGET_MARK=m
-CONFIG_IP_NF_TARGET_CLASSIFY=m
-CONFIG_IP_NF_TARGET_LOG=m
-CONFIG_IP_NF_TARGET_ULOG=m
-CONFIG_IP_NF_TARGET_TCPMSS=m
-CONFIG_IP_NF_ARPTABLES=m
-CONFIG_IP_NF_ARPFILTER=m
-CONFIG_IP_NF_ARP_MANGLE=m
-# CONFIG_IP_NF_COMPAT_IPCHAINS is not set
-# CONFIG_IP_NF_COMPAT_IPFWADM is not set
-CONFIG_IP_NF_TARGET_NOTRACK=m
-CONFIG_IP_NF_RAW=m
-CONFIG_XFRM=y
-CONFIG_XFRM_USER=m
-
-#
-# SCTP Configuration (EXPERIMENTAL)
-#
-# CONFIG_IP_SCTP is not set
-# CONFIG_ATM is not set
-# CONFIG_BRIDGE is not set
-# CONFIG_VLAN_8021Q is not set
-# CONFIG_DECNET is not set
-CONFIG_LLC=m
-CONFIG_LLC2=m
-# CONFIG_IPX is not set
-# CONFIG_ATALK is not set
-# CONFIG_X25 is not set
-# CONFIG_LAPB is not set
-# CONFIG_NET_DIVERT is not set
-# CONFIG_ECONET is not set
-# CONFIG_WAN_ROUTER is not set
-# CONFIG_NET_FASTROUTE is not set
-# CONFIG_NET_HW_FLOWCONTROL is not set
-
-#
-# QoS and/or fair queueing
-#
-# CONFIG_NET_SCHED is not set
-
-#
-# Network testing
-#
-CONFIG_NET_PKTGEN=m
-# CONFIG_NETPOLL is not set
-# CONFIG_NET_POLL_CONTROLLER is not set
-# CONFIG_HAMRADIO is not set
-# CONFIG_IRDA is not set
-# CONFIG_BT is not set
-CONFIG_NETDEVICES=y
-CONFIG_DUMMY=m
-CONFIG_BONDING=m
-# CONFIG_EQUALIZER is not set
-CONFIG_TUN=m
-# CONFIG_ETHERTAP is not set
-
-#
-# ARCnet devices
-#
-# CONFIG_ARCNET is not set
-
-#
-# Ethernet (10 or 100Mbit)
-#
-CONFIG_NET_ETHERNET=y
-CONFIG_MII=m
-# CONFIG_HAPPYMEAL is not set
-# CONFIG_SUNGEM is not set
-CONFIG_NET_VENDOR_3COM=y
-CONFIG_VORTEX=m
-CONFIG_TYPHOON=m
-
-#
-# Tulip family network device support
-#
-CONFIG_NET_TULIP=y
-CONFIG_DE2104X=y
-CONFIG_TULIP=y
-# CONFIG_TULIP_MWI is not set
-CONFIG_TULIP_MMIO=y
-# CONFIG_TULIP_NAPI is not set
-# CONFIG_DE4X5 is not set
-# CONFIG_WINBOND_840 is not set
-# CONFIG_DM9102 is not set
-CONFIG_PCMCIA_XIRCOM=m
-CONFIG_PCMCIA_XIRTULIP=m
-CONFIG_HP100=m
-CONFIG_NET_PCI=y
-CONFIG_PCNET32=m
-# CONFIG_AMD8111_ETH is not set
-# CONFIG_ADAPTEC_STARFIRE is not set
-# CONFIG_B44 is not set
-# CONFIG_FORCEDETH is not set
-# CONFIG_DGRS is not set
-CONFIG_EEPRO100=m
-# CONFIG_EEPRO100_PIO is not set
-CONFIG_E100=m
-CONFIG_E100_NAPI=y
-# CONFIG_FEALNX is not set
-CONFIG_NATSEMI=m
-# CONFIG_NE2K_PCI is not set
-# CONFIG_8139CP is not set
-CONFIG_8139TOO=m
-# CONFIG_8139TOO_PIO is not set
-# CONFIG_8139TOO_TUNE_TWISTER is not set
-# CONFIG_8139TOO_8129 is not set
-# CONFIG_8139_OLD_RX_RESET is not set
-# CONFIG_SIS900 is not set
-CONFIG_EPIC100=m
-# CONFIG_SUNDANCE is not set
-CONFIG_VIA_RHINE=m
-CONFIG_VIA_RHINE_MMIO=y
-
-#
-# Ethernet (1000 Mbit)
-#
-CONFIG_ACENIC=m
-CONFIG_ACENIC_OMIT_TIGON_I=y
-CONFIG_DL2K=m
-CONFIG_E1000=m
-CONFIG_E1000_NAPI=y
-# CONFIG_NS83820 is not set
-# CONFIG_HAMACHI is not set
-# CONFIG_YELLOWFIN is not set
-# CONFIG_R8169 is not set
-# CONFIG_SK98LIN is not set
-CONFIG_TIGON3=m
-
-#
-# Ethernet (10000 Mbit)
-#
-CONFIG_IXGB=m
-CONFIG_IXGB_NAPI=y
-CONFIG_S2IO=m
-CONFIG_S2IO_NAPI=y
-
-#
-# Token Ring devices
-#
-# CONFIG_TR is not set
-
-#
-# Wireless LAN (non-hamradio)
-#
-CONFIG_NET_RADIO=y
-
-#
-# Obsolete Wireless cards support (pre-802.11)
-#
-# CONFIG_STRIP is not set
-CONFIG_PCMCIA_WAVELAN=m
-CONFIG_PCMCIA_NETWAVE=m
-
-#
-# Wireless 802.11 Frequency Hopping cards support
-#
-# CONFIG_PCMCIA_RAYCS is not set
-
-#
-# Wireless 802.11b ISA/PCI cards support
-#
-# CONFIG_AIRO is not set
-CONFIG_HERMES=m
-CONFIG_PLX_HERMES=m
-CONFIG_TMD_HERMES=m
-CONFIG_PCI_HERMES=m
-# CONFIG_ATMEL is not set
-
-#
-# Wireless 802.11b Pcmcia/Cardbus cards support
-#
-CONFIG_PCMCIA_HERMES=m
-CONFIG_AIRO_CS=m
-# CONFIG_PCMCIA_WL3501 is not set
-
-#
-# Prism GT/Duette 802.11(a/b/g) PCI/Cardbus support
-#
-# CONFIG_PRISM54 is not set
-CONFIG_NET_WIRELESS=y
-
-#
-# PCMCIA network device support
-#
-CONFIG_NET_PCMCIA=y
-CONFIG_PCMCIA_3C589=m
-CONFIG_PCMCIA_3C574=m
-# CONFIG_PCMCIA_FMVJ18X is not set
-# CONFIG_PCMCIA_PCNET is not set
-# CONFIG_PCMCIA_NMCLAN is not set
-CONFIG_PCMCIA_SMC91C92=m
-CONFIG_PCMCIA_XIRC2PS=m
-# CONFIG_PCMCIA_AXNET is not set
-
-#
-# Wan interfaces
-#
-# CONFIG_WAN is not set
-# CONFIG_FDDI is not set
-# CONFIG_HIPPI is not set
-CONFIG_PPP=m
-# CONFIG_PPP_MULTILINK is not set
-# CONFIG_PPP_FILTER is not set
-CONFIG_PPP_ASYNC=m
-CONFIG_PPP_SYNC_TTY=m
-CONFIG_PPP_DEFLATE=m
-CONFIG_PPP_BSDCOMP=m
-# CONFIG_PPPOE is not set
-# CONFIG_SLIP is not set
-# CONFIG_NET_FC is not set
-# CONFIG_SHAPER is not set
-# CONFIG_NETCONSOLE is not set
-
-#
-# ISDN subsystem
-#
-# CONFIG_ISDN is not set
-
-#
-# Telephony Support
-#
-# CONFIG_PHONE is not set
-
-#
-# Input device support
-#
-CONFIG_INPUT=y
-
-#
-# Userland interfaces
-#
-# CONFIG_INPUT_MOUSEDEV is not set
-# CONFIG_INPUT_JOYDEV is not set
-# CONFIG_INPUT_TSDEV is not set
-# CONFIG_INPUT_EVDEV is not set
-# CONFIG_INPUT_EVBUG is not set
-
-#
-# Input I/O drivers
-#
-# CONFIG_GAMEPORT is not set
-CONFIG_SOUND_GAMEPORT=y
-# CONFIG_SERIO is not set
-
-#
-# Input Device Drivers
-#
-# CONFIG_INPUT_KEYBOARD is not set
-# CONFIG_INPUT_MOUSE is not set
-# CONFIG_INPUT_JOYSTICK is not set
-# CONFIG_INPUT_TOUCHSCREEN is not set
-# CONFIG_INPUT_MISC is not set
-
-#
-# Character devices
-#
-CONFIG_VT=y
-CONFIG_VT_CONSOLE=y
-CONFIG_HW_CONSOLE=y
-# CONFIG_SERIAL_NONSTANDARD is not set
-
-#
-# Serial drivers
-#
-CONFIG_SERIAL_8250=y
-CONFIG_SERIAL_8250_CONSOLE=y
-# CONFIG_SERIAL_8250_CS is not set
-CONFIG_SERIAL_8250_NR_UARTS=8
-CONFIG_SERIAL_8250_EXTENDED=y
-CONFIG_SERIAL_8250_MANY_PORTS=y
-CONFIG_SERIAL_8250_SHARE_IRQ=y
-# CONFIG_SERIAL_8250_DETECT_IRQ is not set
-# CONFIG_SERIAL_8250_MULTIPORT is not set
-# CONFIG_SERIAL_8250_RSA is not set
-
-#
-# Non-8250 serial port support
-#
-# CONFIG_SERIAL_MUX is not set
-CONFIG_PDC_CONSOLE=y
-CONFIG_SERIAL_CORE=y
-CONFIG_SERIAL_CORE_CONSOLE=y
-CONFIG_UNIX98_PTYS=y
-# CONFIG_LEGACY_PTYS is not set
-# CONFIG_QIC02_TAPE is not set
-
-#
-# IPMI
-#
-# CONFIG_IPMI_HANDLER is not set
-
-#
-# Watchdog Cards
-#
-# CONFIG_WATCHDOG is not set
-CONFIG_GEN_RTC=y
-CONFIG_GEN_RTC_X=y
-# CONFIG_DTLK is not set
-# CONFIG_R3964 is not set
-# CONFIG_APPLICOM is not set
-
-#
-# Ftape, the floppy tape device driver
-#
-# CONFIG_FTAPE is not set
-# CONFIG_AGP is not set
-# CONFIG_DRM is not set
-
-#
-# PCMCIA character devices
-#
-# CONFIG_SYNCLINK_CS is not set
-CONFIG_RAW_DRIVER=y
-CONFIG_MAX_RAW_DEVS=256
-
-#
-# I2C support
-#
-# CONFIG_I2C is not set
-
-#
-# Misc devices
-#
-
-#
-# Multimedia devices
-#
-# CONFIG_VIDEO_DEV is not set
-
-#
-# Digital Video Broadcasting Devices
-#
-# CONFIG_DVB is not set
-
-#
-# Graphics support
-#
-# CONFIG_FB is not set
-
-#
-# Console display driver support
-#
-# CONFIG_MDA_CONSOLE is not set
-CONFIG_DUMMY_CONSOLE_COLUMNS=160
-CONFIG_DUMMY_CONSOLE_ROWS=64
-CONFIG_DUMMY_CONSOLE=y
-
-#
-# Sound
-#
-# CONFIG_SOUND is not set
-
-#
-# USB support
-#
-# CONFIG_USB is not set
-
-#
-# USB Gadget Support
-#
-# CONFIG_USB_GADGET is not set
-
-#
-# File systems
-#
-CONFIG_EXT2_FS=y
-# CONFIG_EXT2_FS_XATTR is not set
-CONFIG_EXT3_FS=y
-# CONFIG_EXT3_FS_XATTR is not set
-CONFIG_JBD=y
-# CONFIG_JBD_DEBUG is not set
-# CONFIG_REISERFS_FS is not set
-CONFIG_JFS_FS=m
-# CONFIG_JFS_POSIX_ACL is not set
-# CONFIG_JFS_DEBUG is not set
-# CONFIG_JFS_STATISTICS is not set
-CONFIG_XFS_FS=m
-# CONFIG_XFS_RT is not set
-# CONFIG_XFS_QUOTA is not set
-# CONFIG_XFS_SECURITY is not set
-# CONFIG_XFS_POSIX_ACL is not set
-# CONFIG_MINIX_FS is not set
-# CONFIG_ROMFS_FS is not set
-# CONFIG_QUOTA is not set
-# CONFIG_AUTOFS_FS is not set
-# CONFIG_AUTOFS4_FS is not set
-
-#
-# CD-ROM/DVD Filesystems
-#
-CONFIG_ISO9660_FS=y
-CONFIG_JOLIET=y
-# CONFIG_ZISOFS is not set
-CONFIG_UDF_FS=m
-
-#
-# DOS/FAT/NT Filesystems
-#
-CONFIG_FAT_FS=m
-CONFIG_MSDOS_FS=m
-CONFIG_VFAT_FS=m
-# CONFIG_NTFS_FS is not set
-
-#
-# Pseudo filesystems
-#
-CONFIG_PROC_FS=y
-CONFIG_PROC_KCORE=y
-CONFIG_SYSFS=y
-# CONFIG_DEVFS_FS is not set
-# CONFIG_DEVPTS_FS_XATTR is not set
-CONFIG_TMPFS=y
-# CONFIG_HUGETLBFS is not set
-# CONFIG_HUGETLB_PAGE is not set
-CONFIG_RAMFS=y
-
-#
-# Miscellaneous filesystems
-#
-# CONFIG_ADFS_FS is not set
-# CONFIG_AFFS_FS is not set
-# CONFIG_HFS_FS is not set
-# CONFIG_HFSPLUS_FS is not set
-# CONFIG_BEFS_FS is not set
-# CONFIG_BFS_FS is not set
-# CONFIG_EFS_FS is not set
-# CONFIG_CRAMFS is not set
-# CONFIG_VXFS_FS is not set
-# CONFIG_HPFS_FS is not set
-# CONFIG_QNX4FS_FS is not set
-# CONFIG_SYSV_FS is not set
-CONFIG_UFS_FS=m
-# CONFIG_UFS_FS_WRITE is not set
-
-#
-# Network File Systems
-#
-CONFIG_NFS_FS=y
-CONFIG_NFS_V3=y
-CONFIG_NFS_V4=y
-CONFIG_NFS_DIRECTIO=y
-CONFIG_NFSD=m
-CONFIG_NFSD_V3=y
-CONFIG_NFSD_V4=y
-CONFIG_NFSD_TCP=y
-CONFIG_ROOT_NFS=y
-CONFIG_LOCKD=y
-CONFIG_LOCKD_V4=y
-CONFIG_EXPORTFS=m
-CONFIG_SUNRPC=y
-CONFIG_SUNRPC_GSS=y
-CONFIG_RPCSEC_GSS_KRB5=y
-CONFIG_SMB_FS=m
-CONFIG_SMB_NLS_DEFAULT=y
-CONFIG_SMB_NLS_REMOTE="cp437"
-CONFIG_CIFS=m
-# CONFIG_CIFS_STATS is not set
-# CONFIG_NCP_FS is not set
-# CONFIG_CODA_FS is not set
-# CONFIG_AFS_FS is not set
-
-#
-# Partition Types
-#
-# CONFIG_PARTITION_ADVANCED is not set
-CONFIG_MSDOS_PARTITION=y
-
-#
-# Native Language Support
-#
-CONFIG_NLS=y
-CONFIG_NLS_DEFAULT="iso8859-1"
-CONFIG_NLS_CODEPAGE_437=m
-# CONFIG_NLS_CODEPAGE_737 is not set
-# CONFIG_NLS_CODEPAGE_775 is not set
-CONFIG_NLS_CODEPAGE_850=m
-CONFIG_NLS_CODEPAGE_852=m
-# CONFIG_NLS_CODEPAGE_855 is not set
-# CONFIG_NLS_CODEPAGE_857 is not set
-# CONFIG_NLS_CODEPAGE_860 is not set
-# CONFIG_NLS_CODEPAGE_861 is not set
-# CONFIG_NLS_CODEPAGE_862 is not set
-CONFIG_NLS_CODEPAGE_863=m
-# CONFIG_NLS_CODEPAGE_864 is not set
-CONFIG_NLS_CODEPAGE_865=m
-# CONFIG_NLS_CODEPAGE_866 is not set
-# CONFIG_NLS_CODEPAGE_869 is not set
-# CONFIG_NLS_CODEPAGE_936 is not set
-# CONFIG_NLS_CODEPAGE_950 is not set
-# CONFIG_NLS_CODEPAGE_932 is not set
-# CONFIG_NLS_CODEPAGE_949 is not set
-# CONFIG_NLS_CODEPAGE_874 is not set
-# CONFIG_NLS_ISO8859_8 is not set
-# CONFIG_NLS_CODEPAGE_1250 is not set
-# CONFIG_NLS_CODEPAGE_1251 is not set
-CONFIG_NLS_ISO8859_1=m
-CONFIG_NLS_ISO8859_2=m
-CONFIG_NLS_ISO8859_3=m
-CONFIG_NLS_ISO8859_4=m
-# CONFIG_NLS_ISO8859_5 is not set
-# CONFIG_NLS_ISO8859_6 is not set
-# CONFIG_NLS_ISO8859_7 is not set
-# CONFIG_NLS_ISO8859_9 is not set
-# CONFIG_NLS_ISO8859_13 is not set
-# CONFIG_NLS_ISO8859_14 is not set
-CONFIG_NLS_ISO8859_15=m
-# CONFIG_NLS_KOI8_R is not set
-# CONFIG_NLS_KOI8_U is not set
-CONFIG_NLS_UTF8=m
-
-#
-# Profiling support
-#
-CONFIG_PROFILING=y
-CONFIG_OPROFILE=m
-
-#
-# Kernel hacking
-#
-CONFIG_DEBUG_KERNEL=y
-# CONFIG_DEBUG_SLAB is not set
-CONFIG_MAGIC_SYSRQ=y
-# CONFIG_DEBUG_SPINLOCK is not set
-# CONFIG_FRAME_POINTER is not set
-# CONFIG_DEBUG_INFO is not set
-
-#
-# Security options
-#
-# CONFIG_SECURITY is not set
-
-#
-# Cryptographic options
-#
-CONFIG_CRYPTO=y
-CONFIG_CRYPTO_HMAC=y
-CONFIG_CRYPTO_NULL=m
-CONFIG_CRYPTO_MD4=m
-CONFIG_CRYPTO_MD5=y
-CONFIG_CRYPTO_SHA1=m
-CONFIG_CRYPTO_SHA256=m
-CONFIG_CRYPTO_SHA512=m
-CONFIG_CRYPTO_DES=y
-CONFIG_CRYPTO_BLOWFISH=m
-CONFIG_CRYPTO_TWOFISH=m
-CONFIG_CRYPTO_SERPENT=m
-CONFIG_CRYPTO_AES=m
-CONFIG_CRYPTO_CAST5=m
-CONFIG_CRYPTO_CAST6=m
-# CONFIG_CRYPTO_ARC4 is not set
-CONFIG_CRYPTO_DEFLATE=m
-# CONFIG_CRYPTO_MICHAEL_MIC is not set
-CONFIG_CRYPTO_CRC32C=m
-CONFIG_CRYPTO_TEST=m
-
-#
-# Library routines
-#
-CONFIG_CRC32=y
-CONFIG_LIBCRC32C=m
-CONFIG_ZLIB_INFLATE=m
-CONFIG_ZLIB_DEFLATE=m
diff --git a/arch/parisc/lib/debuglocks.c b/arch/parisc/lib/debuglocks.c
deleted file mode 100644 (file)
index 7e79f1b..0000000
+++ /dev/null
@@ -1,227 +0,0 @@
-/* 
- *    Debugging versions of SMP locking primitives.
- *
- *    Copyright (C) 2004 Thibaut VARENE <varenet@esiee.fr>
- *
- *    Some code stollen from alpha & sparc64 ;)
- *
- *    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
- */
-
-
-#include <linux/config.h>
-#include <linux/kernel.h>
-#include <linux/sched.h>
-#include <linux/spinlock.h>
-#include <asm/system.h>
-#include <asm/hardirq.h>       /* in_interrupt() */
-
-#undef INIT_STUCK
-#define INIT_STUCK 1L << 30
-
-#ifdef CONFIG_DEBUG_SPINLOCK
-
-void _dbg_spin_lock(spinlock_t * lock, const char *base_file, int line_no)
-{
-       volatile unsigned int *a;
-       long stuck = INIT_STUCK;
-       void *inline_pc = __builtin_return_address(0);
-       unsigned long started = jiffies;
-       int printed = 0;
-       int cpu = smp_processor_id();
-
-try_again:
-
-       /* Do the actual locking */
-       /* <T-Bone> ggg: we can't get stuck on the outter loop?
-        * <ggg> T-Bone: We can hit the outer loop
-        *      alot if multiple CPUs are constantly racing for a lock
-        *      and the backplane is NOT fair about which CPU sees
-        *      the update first. But it won't hang since every failed
-        *      attempt will drop us back into the inner loop and
-        *      decrement `stuck'.
-        * <ggg> K-class and some of the others are NOT fair in the HW
-        *      implementation so we could see false positives.
-        *      But fixing the lock contention is easier than
-        *      fixing the HW to be fair.
-        * <tausq> __ldcw() returns 1 if we get the lock; otherwise we
-        *      spin until the value of the lock changes, or we time out.
-        */
-       a = __ldcw_align(lock);
-       while (stuck && (__ldcw(a) == 0))
-               while ((*a == 0) && --stuck);
-
-       if (unlikely(stuck <= 0)) {
-               printk(KERN_WARNING
-                       "%s:%d: spin_lock(%s/%p) stuck in %s at %p(%d)"
-                       " owned by %s:%d in %s at %p(%d)\n",
-                       base_file, line_no, lock->module, lock,
-                       current->comm, inline_pc, cpu,
-                       lock->bfile, lock->bline, lock->task->comm,
-                       lock->previous, lock->oncpu);
-               stuck = INIT_STUCK;
-               printed = 1;
-               goto try_again;
-       }
-
-       /* Exiting.  Got the lock.  */
-       lock->oncpu = cpu;
-       lock->previous = inline_pc;
-       lock->task = current;
-       lock->bfile = (char *)base_file;
-       lock->bline = line_no;
-
-       if (unlikely(printed)) {
-               printk(KERN_WARNING
-                       "%s:%d: spin_lock grabbed in %s at %p(%d) %ld ticks\n",
-                       base_file, line_no, current->comm, inline_pc,
-                       cpu, jiffies - started);
-       }
-}
-
-void _dbg_spin_unlock(spinlock_t * lock, const char *base_file, int line_no)
-{
-       CHECK_LOCK(lock);
-       volatile unsigned int *a = __ldcw_align(lock);
-       if (unlikely((*a != 0) && lock->babble)) {
-               lock->babble--;
-               printk(KERN_WARNING
-                       "%s:%d: spin_unlock(%s:%p) not locked\n",
-                       base_file, line_no, lock->module, lock);
-       }
-       *a = 1; 
-}
-
-int _dbg_spin_trylock(spinlock_t * lock, const char *base_file, int line_no)
-{
-       int ret;
-       volatile unsigned int *a = __ldcw_align(lock);
-       if ((ret = (__ldcw(a) != 0))) {
-               lock->oncpu = smp_processor_id();
-               lock->previous = __builtin_return_address(0);
-               lock->task = current;
-       } else {
-               lock->bfile = (char *)base_file;
-               lock->bline = line_no;
-       }
-       return ret;
-}
-
-#endif /* CONFIG_DEBUG_SPINLOCK */
-
-#ifdef CONFIG_DEBUG_RWLOCK
-
-/* Interrupts trouble detailed explanation, thx Grant:
- *
- * o writer (wants to modify data) attempts to acquire the rwlock
- * o He gets the write lock.
- * o Interupts are still enabled, we take an interrupt with the
- *   write still holding the lock.
- * o interrupt handler tries to acquire the rwlock for read.
- * o deadlock since the writer can't release it at this point.
- * 
- * In general, any use of spinlocks that competes between "base"
- * level and interrupt level code will risk deadlock. Interrupts
- * need to be disabled in the base level routines to avoid it.
- * Or more precisely, only the IRQ the base level routine
- * is competing with for the lock.  But it's more efficient/faster
- * to just disable all interrupts on that CPU to guarantee
- * once it gets the lock it can release it quickly too.
- */
-void _dbg_write_lock(rwlock_t *rw, const char *bfile, int bline)
-{
-       void *inline_pc = __builtin_return_address(0);
-       unsigned long started = jiffies;
-       long stuck = INIT_STUCK;
-       int printed = 0;
-       int cpu = smp_processor_id();
-       
-       if(unlikely(in_interrupt())) {  /* acquiring write lock in interrupt context, bad idea */
-               printk(KERN_WARNING "write_lock caller: %s:%d, IRQs enabled,\n", bfile, bline);
-               BUG();
-       }
-
-       /* Note: if interrupts are disabled (which is most likely), the printk
-       will never show on the console. We might need a polling method to flush
-       the dmesg buffer anyhow. */
-       
-retry:
-       _raw_spin_lock(&rw->lock);
-
-       if(rw->counter != 0) {
-               /* this basically never happens */
-               _raw_spin_unlock(&rw->lock);
-               
-               stuck--;
-               if ((unlikely(stuck <= 0)) && (rw->counter < 0)) {
-                       printk(KERN_WARNING
-                               "%s:%d: write_lock stuck on writer"
-                               " in %s at %p(%d) %ld ticks\n",
-                               bfile, bline, current->comm, inline_pc,
-                               cpu, jiffies - started);
-                       stuck = INIT_STUCK;
-                       printed = 1;
-               }
-               else if (unlikely(stuck <= 0)) {
-                       printk(KERN_WARNING
-                               "%s:%d: write_lock stuck on reader"
-                               " in %s at %p(%d) %ld ticks\n",
-                               bfile, bline, current->comm, inline_pc,
-                               cpu, jiffies - started);
-                       stuck = INIT_STUCK;
-                       printed = 1;
-               }
-               
-               while(rw->counter != 0);
-
-               goto retry;
-       }
-
-       /* got it.  now leave without unlocking */
-       rw->counter = -1; /* remember we are locked */
-
-       if (unlikely(printed)) {
-               printk(KERN_WARNING
-                       "%s:%d: write_lock grabbed in %s at %p(%d) %ld ticks\n",
-                       bfile, bline, current->comm, inline_pc,
-                       cpu, jiffies - started);
-       }
-}
-
-void _dbg_read_lock(rwlock_t * rw, const char *bfile, int bline)
-{
-#if 0
-       void *inline_pc = __builtin_return_address(0);
-       unsigned long started = jiffies;
-       int cpu = smp_processor_id();
-#endif
-       unsigned long flags;
-
-       local_irq_save(flags);
-       _raw_spin_lock(&rw->lock); 
-
-       rw->counter++;
-#if 0
-       printk(KERN_WARNING
-               "%s:%d: read_lock grabbed in %s at %p(%d) %ld ticks\n",
-               bfile, bline, current->comm, inline_pc,
-               cpu, jiffies - started);
-#endif
-       _raw_spin_unlock(&rw->lock);
-       local_irq_restore(flags);
-}
-
-#endif /* CONFIG_DEBUG_RWLOCK */
diff --git a/arch/ppc/8260_io/commproc.c b/arch/ppc/8260_io/commproc.c
deleted file mode 100644 (file)
index e05b862..0000000
+++ /dev/null
@@ -1,179 +0,0 @@
-/*
- * General Purpose functions for the global management of the
- * 8260 Communication Processor Module.
- * Copyright (c) 1999 Dan Malek (dmalek@jlc.net)
- * Copyright (c) 2000 MontaVista Software, Inc (source@mvista.com)
- *     2.3.99 Updates
- *
- * In addition to the individual control of the communication
- * channels, there are a few functions that globally affect the
- * communication processor.
- *
- * Buffer descriptors must be allocated from the dual ported memory
- * space.  The allocator for that is here.  When the communication
- * process is reset, we reclaim the memory available.  There is
- * currently no deallocator for this memory.
- */
-#include <linux/errno.h>
-#include <linux/sched.h>
-#include <linux/kernel.h>
-#include <linux/param.h>
-#include <linux/string.h>
-#include <linux/mm.h>
-#include <linux/interrupt.h>
-#include <linux/bootmem.h>
-#include <asm/irq.h>
-#include <asm/mpc8260.h>
-#include <asm/page.h>
-#include <asm/pgtable.h>
-#include <asm/immap_8260.h>
-#include <asm/cpm_8260.h>
-
-static uint    dp_alloc_base;  /* Starting offset in DP ram */
-static uint    dp_alloc_top;   /* Max offset + 1 */
-static uint    host_buffer;    /* One page of host buffer */
-static uint    host_end;       /* end + 1 */
-cpm8260_t      *cpmp;          /* Pointer to comm processor space */
-
-/* We allocate this here because it is used almost exclusively for
- * the communication processor devices.
- */
-immap_t                *immr;
-
-void
-m8260_cpm_reset(void)
-{
-       volatile immap_t         *imp;
-       volatile cpm8260_t      *commproc;
-       uint                    vpgaddr;
-
-       immr = imp = (volatile immap_t *)IMAP_ADDR;
-       commproc = &imp->im_cpm;
-
-       /* Reclaim the DP memory for our use.
-       */
-       dp_alloc_base = CPM_DATAONLY_BASE;
-       dp_alloc_top = dp_alloc_base + CPM_DATAONLY_SIZE;
-
-       /* Set the host page for allocation.
-       */
-       host_buffer =
-               (uint) alloc_bootmem_pages(PAGE_SIZE * NUM_CPM_HOST_PAGES);
-       host_end = host_buffer + (PAGE_SIZE * NUM_CPM_HOST_PAGES);
-
-       vpgaddr = host_buffer;
-
-       /* Tell everyone where the comm processor resides.
-       */
-       cpmp = (cpm8260_t *)commproc;
-}
-
-/* Allocate some memory from the dual ported ram.
- * To help protocols with object alignment restrictions, we do that
- * if they ask.
- */
-uint
-m8260_cpm_dpalloc(uint size, uint align)
-{
-       uint    retloc;
-       uint    align_mask, off;
-       uint    savebase;
-
-       align_mask = align - 1;
-       savebase = dp_alloc_base;
-
-       if ((off = (dp_alloc_base & align_mask)) != 0)
-               dp_alloc_base += (align - off);
-
-       if ((dp_alloc_base + size) >= dp_alloc_top) {
-               dp_alloc_base = savebase;
-               return(CPM_DP_NOSPACE);
-       }
-
-       retloc = dp_alloc_base;
-       dp_alloc_base += size;
-
-       return(retloc);
-}
-
-/* We also own one page of host buffer space for the allocation of
- * UART "fifos" and the like.
- */
-uint
-m8260_cpm_hostalloc(uint size, uint align)
-{
-       uint    retloc;
-       uint    align_mask, off;
-       uint    savebase;
-
-       align_mask = align - 1;
-       savebase = host_buffer;
-
-       if ((off = (host_buffer & align_mask)) != 0)
-               host_buffer += (align - off);
-
-       if ((host_buffer + size) >= host_end) {
-               host_buffer = savebase;
-               return(0);
-       }
-
-       retloc = host_buffer;
-       host_buffer += size;
-
-       return(retloc);
-}
-
-/* Set a baud rate generator.  This needs lots of work.  There are
- * eight BRGs, which can be connected to the CPM channels or output
- * as clocks.  The BRGs are in two different block of internal
- * memory mapped space.
- * The baud rate clock is the system clock divided by something.
- * It was set up long ago during the initial boot phase and is
- * is given to us.
- * Baud rate clocks are zero-based in the driver code (as that maps
- * to port numbers).  Documentation uses 1-based numbering.
- */
-#define BRG_INT_CLK    (((bd_t *)__res)->bi_brgfreq)
-#define BRG_UART_CLK   (BRG_INT_CLK/16)
-
-/* This function is used by UARTS, or anything else that uses a 16x
- * oversampled clock.
- */
-void
-m8260_cpm_setbrg(uint brg, uint rate)
-{
-       volatile uint   *bp;
-
-       /* This is good enough to get SMCs running.....
-       */
-       if (brg < 4) {
-               bp = (uint *)&immr->im_brgc1;
-       }
-       else {
-               bp = (uint *)&immr->im_brgc5;
-               brg -= 4;
-       }
-       bp += brg;
-       *bp = ((BRG_UART_CLK / rate) << 1) | CPM_BRG_EN;
-}
-
-/* This function is used to set high speed synchronous baud rate
- * clocks.
- */
-void
-m8260_cpm_fastbrg(uint brg, uint rate, int div16)
-{
-       volatile uint   *bp;
-
-       if (brg < 4) {
-               bp = (uint *)&immr->im_brgc1;
-       }
-       else {
-               bp = (uint *)&immr->im_brgc5;
-               brg -= 4;
-       }
-       bp += brg;
-       *bp = ((BRG_INT_CLK / rate) << 1) | CPM_BRG_EN;
-       if (div16)
-               *bp |= CPM_BRG_DIV16;
-}
diff --git a/arch/ppc/8260_io/uart.c b/arch/ppc/8260_io/uart.c
deleted file mode 100644 (file)
index 23c0322..0000000
+++ /dev/null
@@ -1,3061 +0,0 @@
-/*
- *  UART driver for MPC8260 CPM SCC or SMC
- *  Copyright (c) 1999 Dan Malek (dmalek@jlc.net)
- *  Copyright (c) 2000 MontaVista Software, Inc. (source@mvista.com)
- *     2.3.99 updates
- *  Copyright (c) 2002 Allen Curtis, Ones and Zeros, Inc. (acurtis@onz.com)
- *     2.5.50 updates
- *  Fix the console driver to be registered with initcalls and some minor fixup
- *  for 2.6.2, by Petter Larsen, moreCom as (petter.larsen@morecom.no) and
- *  Miguel Valero, AxxessIT ASA (miguel.valero@axxessit.no)
- *
- * I used the 8xx uart.c driver as the framework for this driver.
- * The original code was written for the EST8260 board.  I tried to make
- * it generic, but there may be some assumptions in the structures that
- * have to be fixed later.
- *
- * The 8xx and 8260 are similar, but not identical.  Over time we
- * could probably merge these two drivers.
- * To save porting time, I did not bother to change any object names
- * that are not accessed outside of this file.
- * It still needs lots of work........When it was easy, I included code
- * to support the SCCs.
- * Only the SCCs support modem control, so that is not complete either.
- */
-
-#include <linux/config.h>
-#include <linux/module.h>
-#include <linux/errno.h>
-#include <linux/signal.h>
-#include <linux/sched.h>
-#include <linux/timer.h>
-#include <linux/workqueue.h>
-#include <linux/interrupt.h>
-#include <linux/tty.h>
-#include <linux/tty_flip.h>
-#include <linux/serial.h>
-#include <linux/serialP.h>
-#include <linux/major.h>
-#include <linux/string.h>
-#include <linux/fcntl.h>
-#include <linux/ptrace.h>
-#include <linux/mm.h>
-#include <linux/slab.h>
-#include <linux/init.h>
-#include <linux/delay.h>
-#include <asm/uaccess.h>
-#include <asm/immap_8260.h>
-#include <asm/mpc8260.h>
-#include <asm/cpm_8260.h>
-#include <asm/irq.h>
-
-#ifdef CONFIG_MAGIC_SYSRQ
-#include <linux/sysrq.h>
-#endif
-
-#ifdef CONFIG_SERIAL_CONSOLE
-#include <linux/console.h>
-
-/* SCC Console configuration.  Not quite finished.  The SCC_CONSOLE
- * should be the number of the SCC to use, but only SCC1 will
- * work at this time.
- */
-#ifdef CONFIG_SCC_CONSOLE
-#define SCC_CONSOLE 1
-#endif
-
-/* this defines the index into rs_table for the port to use
-*/
-#ifndef CONFIG_SERIAL_CONSOLE_PORT
-#define CONFIG_SERIAL_CONSOLE_PORT     0
-#endif
-#endif
-#define CONFIG_SERIAL_CONSOLE_PORT     0
-
-#define TX_WAKEUP      ASYNC_SHARE_IRQ
-
-static char *serial_name = "CPM UART driver";
-static char *serial_version = "0.02";
-
-static struct tty_driver *serial_driver;
-static int __init serial_console_setup( struct console *co, char *options);
-static void serial_console_write(struct console *c, const char *s,
-                                               unsigned count);
-
-static struct tty_driver *serial_console_device(struct console *c, int *index);
-
-#if defined(CONFIG_SERIAL_CONSOLE) && defined(CONFIG_MAGIC_SYSRQ)
-static unsigned long break_pressed; /* break, really ... */
-#endif
-
-/*
- * Serial driver configuration section.  Here are the various options:
- */
-#define SERIAL_PARANOIA_CHECK
-#define CONFIG_SERIAL_NOPAUSE_IO
-#define SERIAL_DO_RESTART
-
-/* Set of debugging defines */
-
-#undef SERIAL_DEBUG_INTR
-#undef SERIAL_DEBUG_OPEN
-#undef SERIAL_DEBUG_FLOW
-#undef SERIAL_DEBUG_RS_WAIT_UNTIL_SENT
-
-#define _INLINE_ inline
-
-#define DBG_CNT(s)
-
-/* We overload some of the items in the data structure to meet our
- * needs.  For example, the port address is the CPM parameter ram
- * offset for the SCC or SMC.  The maximum number of ports is 4 SCCs and
- * 2 SMCs.  The "hub6" field is used to indicate the channel number, with
- * 0 and 1 indicating the SMCs and 2, 3, 4, and 5 are the SCCs.
- * Since these ports are so versatile, I don't yet have a strategy for
- * their management.  For example, SCC1 is used for Ethernet.  Right
- * now, just don't put them in the table.  Of course, right now I just
- * want the SMC to work as a uart :-)..
- * The "type" field is currently set to 0, for PORT_UNKNOWN.  It is
- * not currently used.  I should probably use it to indicate the port
- * type of CMS or SCC.
- * The SMCs do not support any modem control signals.
- */
-#define smc_scc_num    hub6
-
-/* The choice of serial port to use for KGDB.  If the system has
- * two ports, you can use one for console and one for KGDB (which
- * doesn't make sense to me, but people asked for it).
- */
-#ifdef CONFIG_KGDB_TTYS1
-#define KGDB_SER_IDX 1         /* SCC2/SMC2 */
-#else
-#define KGDB_SER_IDX 0         /* SCC1/SMC1 */
-#endif
-
-#ifndef SCC_CONSOLE
-
-/* SMC2 is sometimes used for low performance TDM interfaces.  Define
- * this as 1 if you want SMC2 as a serial port UART managed by this driver.
- * Define this as 0 if you wish to use SMC2 for something else.
- */
-#define USE_SMC2 1
-
-/* Define SCC to ttySx mapping.
-*/
-#define SCC_NUM_BASE   (USE_SMC2 + 1)  /* SCC base tty "number" */
-
-/* Define which SCC is the first one to use for a serial port.  These
- * are 0-based numbers, i.e. this assumes the first SCC (SCC1) is used
- * for Ethernet, and the first available SCC for serial UART is SCC2.
- * NOTE:  IF YOU CHANGE THIS, you have to change the PROFF_xxx and
- * interrupt vectors in the table below to match.
- */
-#define SCC_IDX_BASE   1       /* table index */
-
-static struct serial_state rs_table[] = {
-       /* UART CLK   PORT          IRQ      FLAGS  NUM   */
-       { 0,     0, PROFF_SMC1, SIU_INT_SMC1,   0,    0 },    /* SMC1 ttyS0 */
-#ifdef USE_SMC2
-       { 0,     0, PROFF_SMC2, SIU_INT_SMC2,   0,    1 },    /* SMC2 ttyS1 */
-#endif
-#ifndef CONFIG_SCC1_ENET
-       { 0,     0, PROFF_SCC1, SIU_INT_SCC1,   0, SCC_NUM_BASE},    /* SCC1 ttyS2 */
-#endif
-#if !defined(CONFIG_SBC82xx) && !defined(CONFIG_SCC2_ENET)
-       { 0,     0, PROFF_SCC2, SIU_INT_SCC2,   0, SCC_NUM_BASE + 1},    /* SCC2 ttyS3 */
-#endif
-};
-
-#else /* SCC_CONSOLE */
-#define SCC_NUM_BASE   0       /* SCC base tty "number" */
-#define SCC_IDX_BASE   0       /* table index */
-static struct serial_state rs_table[] = {
-       /* UART CLK   PORT          IRQ      FLAGS  NUM   */
-       { 0,     0, PROFF_SCC1, SIU_INT_SCC1,   0, SCC_NUM_BASE},    /* SCC1 ttyS2 */
-       { 0,     0, PROFF_SCC2, SIU_INT_SCC2,   0, SCC_NUM_BASE + 1},    /* SCC2 ttyS3 */
-};
-#endif /* SCC_CONSOLE */
-
-#define PORT_NUM(P)    (((P) < (SCC_NUM_BASE)) ? (P) : (P)-(SCC_NUM_BASE))
-
-#define NR_PORTS       (sizeof(rs_table)/sizeof(struct serial_state))
-
-/* The number of buffer descriptors and their sizes.
-*/
-#define RX_NUM_FIFO    4
-#define RX_BUF_SIZE    32
-#define TX_NUM_FIFO    4
-#define TX_BUF_SIZE    32
-
-/* The async_struct in serial.h does not really give us what we
- * need, so define our own here.
- */
-typedef struct serial_info {
-       int                     magic;
-       int                     flags;
-       struct serial_state     *state;
-       struct tty_struct       *tty;
-       int                     read_status_mask;
-       int                     ignore_status_mask;
-       int                     timeout;
-       int                     line;
-       int                     x_char; /* xon/xoff character */
-       int                     close_delay;
-       unsigned short          closing_wait;
-       unsigned short          closing_wait2;
-       unsigned long           event;
-       unsigned long           last_active;
-       int                     blocked_open; /* # of blocked opens */
-       struct work_struct      tqueue;
-       struct work_struct      tqueue_hangup;
-       wait_queue_head_t       open_wait;
-       wait_queue_head_t       close_wait;
-
-       /* CPM Buffer Descriptor pointers.
-       */
-       cbd_t                   *rx_bd_base;
-       cbd_t                   *rx_cur;
-       cbd_t                   *tx_bd_base;
-       cbd_t                   *tx_cur;
-} ser_info_t;
-
-static struct console sercons = {
-       .name =         "ttyS",
-       .write =        serial_console_write,
-       .device =       serial_console_device,
-       .setup =        serial_console_setup,
-       .flags =        CON_PRINTBUFFER,
-       .index =        CONFIG_SERIAL_CONSOLE_PORT,
-};
-
-static void change_speed(ser_info_t *info);
-static void rs_8xx_wait_until_sent(struct tty_struct *tty, int timeout);
-
-static inline int serial_paranoia_check(ser_info_t *info,
-                                       char *name, const char *routine)
-{
-#ifdef SERIAL_PARANOIA_CHECK
-       static const char *badmagic =
-               "Warning: bad magic number for serial struct (%s) in %s\n";
-       static const char *badinfo =
-               "Warning: null async_struct for (%s) in %s\n";
-
-       if (!info) {
-               printk(badinfo, name, routine);
-               return 1;
-       }
-       if (info->magic != SERIAL_MAGIC) {
-               printk(badmagic, name, routine);
-               return 1;
-       }
-#endif
-       return 0;
-}
-
-/*
- * This is used to figure out the divisor speeds and the timeouts,
- * indexed by the termio value.  The generic CPM functions are responsible
- * for setting and assigning baud rate generators for us.
- */
-static int baud_table[] = {
-       0, 50, 75, 110, 134, 150, 200, 300, 600, 1200, 1800, 2400, 4800,
-       9600, 19200, 38400, 57600, 115200, 230400, 460800, 0 };
-
-
-/*
- * ------------------------------------------------------------
- * rs_stop() and rs_start()
- *
- * This routines are called before setting or resetting tty->stopped.
- * They enable or disable transmitter interrupts, as necessary.
- * ------------------------------------------------------------
- */
-static void rs_8xx_stop(struct tty_struct *tty)
-{
-       ser_info_t *info = (ser_info_t *)tty->driver_data;
-       int     idx;
-       unsigned long flags;
-       volatile scc_t  *sccp;
-       volatile smc_t  *smcp;
-
-       if (serial_paranoia_check(info, tty->name, "rs_stop"))
-               return;
-
-       save_flags(flags); cli();
-       if ((idx = info->state->smc_scc_num) < SCC_NUM_BASE) {
-               smcp = &immr->im_smc[idx];
-               smcp->smc_smcm &= ~SMCM_TX;
-       }
-       else {
-               sccp = &immr->im_scc[idx - SCC_IDX_BASE];
-               sccp->scc_sccm &= ~UART_SCCM_TX;
-       }
-       restore_flags(flags);
-}
-
-static void rs_8xx_start(struct tty_struct *tty)
-{
-       ser_info_t *info = (ser_info_t *)tty->driver_data;
-       int     idx;
-       unsigned long flags;
-       volatile scc_t  *sccp;
-       volatile smc_t  *smcp;
-
-       if (serial_paranoia_check(info, tty->name, "rs_stop"))
-               return;
-
-       save_flags(flags); cli();
-       if ((idx = info->state->smc_scc_num) < SCC_NUM_BASE) {
-               smcp = &immr->im_smc[idx];
-               smcp->smc_smcm |= SMCM_TX;
-       }
-       else {
-               sccp = &immr->im_scc[idx - SCC_IDX_BASE];
-               sccp->scc_sccm |= UART_SCCM_TX;
-       }
-       restore_flags(flags);
-}
-
-/*
- * ----------------------------------------------------------------------
- *
- * Here starts the interrupt handling routines.  All of the following
- * subroutines are declared as inline and are folded into
- * rs_interrupt().  They were separated out for readability's sake.
- *
- * Note: rs_interrupt() is a "fast" interrupt, which means that it
- * runs with interrupts turned off.  People who may want to modify
- * rs_interrupt() should try to keep the interrupt handler as fast as
- * possible.  After you are done making modifications, it is not a bad
- * idea to do:
- *
- * gcc -S -DKERNEL -Wall -Wstrict-prototypes -O6 -fomit-frame-pointer serial.c
- *
- * and look at the resulting assemble code in serial.s.
- *
- *                             - Ted Ts'o (tytso@mit.edu), 7-Mar-93
- * -----------------------------------------------------------------------
- */
-
-/*
- * This routine is used by the interrupt handler to schedule
- * processing in the software interrupt portion of the driver.
- */
-static _INLINE_ void rs_sched_event(ser_info_t *info,
-                                 int event)
-{
-       info->event |= 1 << event;
-       schedule_work(&info->tqueue);
-}
-
-static _INLINE_ void receive_chars(ser_info_t *info, struct pt_regs *regs)
-{
-       struct tty_struct *tty = info->tty;
-       unsigned char ch, *cp;
-       /*int   ignored = 0;*/
-       int     i;
-       ushort  status;
-       struct  async_icount *icount;
-       volatile cbd_t  *bdp;
-
-       icount = &info->state->icount;
-
-       /* Just loop through the closed BDs and copy the characters into
-        * the buffer.
-        */
-       bdp = info->rx_cur;
-       for (;;) {
-               if (bdp->cbd_sc & BD_SC_EMPTY)  /* If this one is empty */
-                       break;                  /*   we are all done */
-
-               /* The read status mask tell us what we should do with
-                * incoming characters, especially if errors occur.
-                * One special case is the use of BD_SC_EMPTY.  If
-                * this is not set, we are supposed to be ignoring
-                * inputs.  In this case, just mark the buffer empty and
-                * continue.
-               if (!(info->read_status_mask & BD_SC_EMPTY)) {
-                       bdp->cbd_sc |= BD_SC_EMPTY;
-                       bdp->cbd_sc &=
-                               ~(BD_SC_BR | BD_SC_FR | BD_SC_PR | BD_SC_OV);
-
-                       if (bdp->cbd_sc & BD_SC_WRAP)
-                               bdp = info->rx_bd_base;
-                       else
-                               bdp++;
-                       continue;
-               }
-                */
-
-               /* Get the number of characters and the buffer pointer.
-               */
-               i = bdp->cbd_datlen;
-               cp = (unsigned char *)__va(bdp->cbd_bufaddr);
-               status = bdp->cbd_sc;
-#ifdef CONFIG_KGDB
-               if (info->state->smc_scc_num == KGDB_SER_IDX) {
-                       if (*cp == 0x03 || *cp == '$')
-                               breakpoint();
-                       return;
-               }
-#endif
-
-               /* Check to see if there is room in the tty buffer for
-                * the characters in our BD buffer.  If not, we exit
-                * now, leaving the BD with the characters.  We'll pick
-                * them up again on the next receive interrupt (which could
-                * be a timeout).
-                */
-               if ((tty->flip.count + i) >= TTY_FLIPBUF_SIZE)
-                       break;
-
-               while (i-- > 0) {
-                       ch = *cp++;
-                       *tty->flip.char_buf_ptr = ch;
-                       icount->rx++;
-
-#ifdef SERIAL_DEBUG_INTR
-                       printk("DR%02x:%02x...", ch, *status);
-#endif
-                       *tty->flip.flag_buf_ptr = 0;
-                       if (status & (BD_SC_BR | BD_SC_FR |
-                                      BD_SC_PR | BD_SC_OV)) {
-                               /*
-                                * For statistics only
-                                */
-                               if (status & BD_SC_BR)
-                                       icount->brk++;
-                               else if (status & BD_SC_PR)
-                                       icount->parity++;
-                               else if (status & BD_SC_FR)
-                                       icount->frame++;
-                               if (status & BD_SC_OV)
-                                       icount->overrun++;
-
-                               /*
-                                * Now check to see if character should be
-                                * ignored, and mask off conditions which
-                                * should be ignored.
-                               if (status & info->ignore_status_mask) {
-                                       if (++ignored > 100)
-                                               break;
-                                       continue;
-                               }
-                                */
-                               status &= info->read_status_mask;
-
-                               if (status & (BD_SC_BR)) {
-#ifdef SERIAL_DEBUG_INTR
-                                       printk("handling break....");
-#endif
-                                       *tty->flip.flag_buf_ptr = TTY_BREAK;
-                                       if (info->flags & ASYNC_SAK)
-                                               do_SAK(tty);
-                               } else if (status & BD_SC_PR)
-                                       *tty->flip.flag_buf_ptr = TTY_PARITY;
-                               else if (status & BD_SC_FR)
-                                       *tty->flip.flag_buf_ptr = TTY_FRAME;
-                               if (status & BD_SC_OV) {
-                                       /*
-                                        * Overrun is special, since it's
-                                        * reported immediately, and doesn't
-                                        * affect the current character
-                                        */
-                                       if (tty->flip.count < TTY_FLIPBUF_SIZE) {
-                                               tty->flip.count++;
-                                               tty->flip.flag_buf_ptr++;
-                                               tty->flip.char_buf_ptr++;
-                                               *tty->flip.flag_buf_ptr =
-                                                               TTY_OVERRUN;
-                                       }
-                               }
-                       }
-
-#if defined(CONFIG_SERIAL_CONSOLE) && defined(CONFIG_MAGIC_SYSRQ)
-                       if (break_pressed && info->line == sercons.index) {
-                               if (ch != 0 && time_before(jiffies,
-                                                       break_pressed + HZ*5)) {
-                                       handle_sysrq(ch, regs, NULL);
-                                       break_pressed = 0;
-                                       goto ignore_char;
-                               } else
-                                       break_pressed = 0;
-                       }
-#endif
-       
-                       if (tty->flip.count >= TTY_FLIPBUF_SIZE)
-                               break;
-
-                       tty->flip.flag_buf_ptr++;
-                       tty->flip.char_buf_ptr++;
-                       tty->flip.count++;
-               }
-
-#if defined(CONFIG_SERIAL_CONSOLE) && defined(CONFIG_MAGIC_SYSRQ)
-       ignore_char:
-#endif
-
-               /* This BD is ready to be used again.  Clear status.
-                * Get next BD.
-                */
-               bdp->cbd_sc |= BD_SC_EMPTY;
-               bdp->cbd_sc &= ~(BD_SC_BR | BD_SC_FR | BD_SC_PR | BD_SC_OV);
-
-               if (bdp->cbd_sc & BD_SC_WRAP)
-                       bdp = info->rx_bd_base;
-               else
-                       bdp++;
-       }
-
-       info->rx_cur = (cbd_t *)bdp;
-
-       schedule_delayed_work(&tty->flip.work, 1);
-}
-
-static _INLINE_ void receive_break(ser_info_t *info, struct pt_regs *regs)
-{
-       struct tty_struct *tty = info->tty;
-
-       info->state->icount.brk++;
-
-#if defined(CONFIG_SERIAL_CONSOLE) && defined(CONFIG_MAGIC_SYSRQ)
-       if (info->line == sercons.index) {
-               if (!break_pressed) {
-                       break_pressed = jiffies;
-                       return;
-               } else
-                       break_pressed = 0;
-       }
-#endif
-
-       /* Check to see if there is room in the tty buffer for
-        * the break.  If not, we exit now, losing the break.  FIXME
-        */
-       if ((tty->flip.count + 1) >= TTY_FLIPBUF_SIZE)
-               return;
-       *(tty->flip.flag_buf_ptr++) = TTY_BREAK;
-       *(tty->flip.char_buf_ptr++) = 0;
-       tty->flip.count++;
-}
-
-
-static _INLINE_ void transmit_chars(ser_info_t *info, struct pt_regs *regs)
-{
-
-       if (info->flags & TX_WAKEUP) {
-               rs_sched_event(info, RS_EVENT_WRITE_WAKEUP);
-       }
-
-#ifdef SERIAL_DEBUG_INTR
-       printk("THRE...");
-#endif
-}
-
-#ifdef notdef
-       /* I need to do this for the SCCs, so it is left as a reminder.
-       */
-static _INLINE_ void check_modem_status(struct async_struct *info)
-{
-       int     status;
-       struct  async_icount *icount;
-
-       status = serial_in(info, UART_MSR);
-
-       if (status & UART_MSR_ANY_DELTA) {
-               icount = &info->state->icount;
-               /* update input line counters */
-               if (status & UART_MSR_TERI)
-                       icount->rng++;
-               if (status & UART_MSR_DDSR)
-                       icount->dsr++;
-               if (status & UART_MSR_DDCD) {
-                       icount->dcd++;
-#ifdef CONFIG_HARD_PPS
-                       if ((info->flags & ASYNC_HARDPPS_CD) &&
-                           (status & UART_MSR_DCD))
-                               hardpps();
-#endif
-               }
-               if (status & UART_MSR_DCTS)
-                       icount->cts++;
-               wake_up_interruptible(&info->delta_msr_wait);
-       }
-
-       if ((info->flags & ASYNC_CHECK_CD) && (status & UART_MSR_DDCD)) {
-#if (defined(SERIAL_DEBUG_OPEN) || defined(SERIAL_DEBUG_INTR))
-               printk("ttys%d CD now %s...", info->line,
-                      (status & UART_MSR_DCD) ? "on" : "off");
-#endif
-               if (status & UART_MSR_DCD)
-                       wake_up_interruptible(&info->open_wait);
-               else {
-#ifdef SERIAL_DEBUG_OPEN
-                       printk("scheduling hangup...");
-#endif
-                       schedule_work(&info->tqueue_hangup);
-               }
-       }
-       if (info->flags & ASYNC_CTS_FLOW) {
-               if (info->tty->hw_stopped) {
-                       if (status & UART_MSR_CTS) {
-#if (defined(SERIAL_DEBUG_INTR) || defined(SERIAL_DEBUG_FLOW))
-                               printk("CTS tx start...");
-#endif
-                               info->tty->hw_stopped = 0;
-                               info->IER |= UART_IER_THRI;
-                               serial_out(info, UART_IER, info->IER);
-                               rs_sched_event(info, RS_EVENT_WRITE_WAKEUP);
-                               return;
-                       }
-               } else {
-                       if (!(status & UART_MSR_CTS)) {
-#if (defined(SERIAL_DEBUG_INTR) || defined(SERIAL_DEBUG_FLOW))
-                               printk("CTS tx stop...");
-#endif
-                               info->tty->hw_stopped = 1;
-                               info->IER &= ~UART_IER_THRI;
-                               serial_out(info, UART_IER, info->IER);
-                       }
-               }
-       }
-}
-#endif
-
-/*
- * This is the serial driver's interrupt routine for a single port
- */
-static irqreturn_t rs_8xx_interrupt(int irq, void * dev_id, struct pt_regs * regs)
-{
-       u_char  events;
-       int     idx;
-       ser_info_t *info;
-       volatile smc_t  *smcp;
-       volatile scc_t  *sccp;
-
-       info = (ser_info_t *)dev_id;
-
-       if ((idx = info->state->smc_scc_num) < SCC_NUM_BASE) {
-               smcp = &immr->im_smc[idx];
-               events = smcp->smc_smce;
-               if (events & SMCM_BRKE)
-                       receive_break(info, regs);
-               if (events & SMCM_RX)
-                       receive_chars(info, regs);
-               if (events & SMCM_TX)
-                       transmit_chars(info, regs);
-               smcp->smc_smce = events;
-       }
-       else {
-               sccp = &immr->im_scc[idx - SCC_IDX_BASE];
-               events = sccp->scc_scce;
-               if (events & SMCM_BRKE)
-                       receive_break(info, regs);
-               if (events & SCCM_RX)
-                       receive_chars(info, regs);
-               if (events & SCCM_TX)
-                       transmit_chars(info, regs);
-               sccp->scc_scce = events;
-       }
-
-#ifdef SERIAL_DEBUG_INTR
-       printk("rs_interrupt_single(%d, %x)...",
-                                       info->state->smc_scc_num, events);
-#endif
-#ifdef modem_control
-       check_modem_status(info);
-#endif
-       info->last_active = jiffies;
-#ifdef SERIAL_DEBUG_INTR
-       printk("end.\n");
-#endif
-       return IRQ_HANDLED;
-}
-
-
-/*
- * -------------------------------------------------------------------
- * Here ends the serial interrupt routines.
- * -------------------------------------------------------------------
- */
-
-/*
- * This routine is used to handle the "bottom half" processing for the
- * serial driver, known also the "software interrupt" processing.
- * This processing is done at the kernel interrupt level, after the
- * rs_interrupt() has returned, BUT WITH INTERRUPTS TURNED ON.  This
- * is where time-consuming activities which can not be done in the
- * interrupt driver proper are done; the interrupt driver schedules
- * them using rs_sched_event(), and they get done here.
- */
-static void do_softint(void *private_)
-{
-       ser_info_t      *info = (ser_info_t *) private_;
-       struct tty_struct       *tty;
-
-       tty = info->tty;
-       if (!tty)
-               return;
-
-       if (test_and_clear_bit(RS_EVENT_WRITE_WAKEUP, &info->event)) {
-               if ((tty->flags & (1 << TTY_DO_WRITE_WAKEUP)) &&
-                   tty->ldisc.write_wakeup)
-                       (tty->ldisc.write_wakeup)(tty);
-               wake_up_interruptible(&tty->write_wait);
-       }
-}
-
-/*
- * This routine is called from the scheduler work queue when the interrupt
- * routine has signalled that a hangup has occurred.  The path of
- * hangup processing is:
- *
- *     serial interrupt routine -> (scheduler tqueue) ->
- *     do_serial_hangup() -> tty->hangup() -> rs_hangup()
- *
- */
-static void do_serial_hangup(void *private_)
-{
-       struct async_struct     *info = (struct async_struct *) private_;
-       struct tty_struct       *tty;
-
-       tty = info->tty;
-       if (tty)
-               tty_hangup(tty);
-}
-
-/*static void rs_8xx_timer(void)
-{
-       printk("rs_8xx_timer\n");
-}*/
-
-
-static int startup(ser_info_t *info)
-{
-       unsigned long flags;
-       int     retval=0;
-       int     idx;
-       struct serial_state *state= info->state;
-       volatile smc_t          *smcp;
-       volatile scc_t          *sccp;
-       volatile smc_uart_t     *up;
-       volatile scc_uart_t     *scup;
-
-
-       save_flags(flags); cli();
-
-       if (info->flags & ASYNC_INITIALIZED) {
-               goto errout;
-       }
-
-#ifdef maybe
-       if (!state->port || !state->type) {
-               if (info->tty)
-                       set_bit(TTY_IO_ERROR, &info->tty->flags);
-               goto errout;
-       }
-#endif
-
-#ifdef SERIAL_DEBUG_OPEN
-       printk("starting up ttys%d (irq %d)...", info->line, state->irq);
-#endif
-
-
-#ifdef modem_control
-       info->MCR = 0;
-       if (info->tty->termios->c_cflag & CBAUD)
-               info->MCR = UART_MCR_DTR | UART_MCR_RTS;
-#endif
-
-       if (info->tty)
-               clear_bit(TTY_IO_ERROR, &info->tty->flags);
-
-       /*
-        * and set the speed of the serial port
-        */
-       change_speed(info);
-
-       if ((idx = info->state->smc_scc_num) < SCC_NUM_BASE) {
-               smcp = &immr->im_smc[idx];
-
-               /* Enable interrupts and I/O.
-               */
-               smcp->smc_smcm |= (SMCM_RX | SMCM_TX);
-               smcp->smc_smcmr |= (SMCMR_REN | SMCMR_TEN);
-
-               /* We can tune the buffer length and idle characters
-                * to take advantage of the entire incoming buffer size.
-                * If mrblr is something other than 1, maxidl has to be
-                * non-zero or we never get an interrupt.  The maxidl
-                * is the number of character times we wait after reception
-                * of the last character before we decide no more characters
-                * are coming.
-                */
-               up = (smc_uart_t *)&immr->im_dprambase[state->port];
-#if 0
-               up->smc_mrblr = 1;      /* receive buffer length */
-               up->smc_maxidl = 0;     /* wait forever for next char */
-#else
-               up->smc_mrblr = RX_BUF_SIZE;
-               up->smc_maxidl = RX_BUF_SIZE;
-#endif
-               up->smc_brkcr = 1;      /* number of break chars */
-       }
-       else {
-               sccp = &immr->im_scc[idx - SCC_IDX_BASE];
-               scup = (scc_uart_t *)&immr->im_dprambase[state->port];
-#if 0
-               scup->scc_genscc.scc_mrblr = 1; /* receive buffer length */
-               scup->scc_maxidl = 0;   /* wait forever for next char */
-#else
-               scup->scc_genscc.scc_mrblr = RX_BUF_SIZE;
-               scup->scc_maxidl = RX_BUF_SIZE;
-#endif
-
-               sccp->scc_sccm |= (UART_SCCM_TX | UART_SCCM_RX);
-               sccp->scc_gsmrl |= (SCC_GSMRL_ENR | SCC_GSMRL_ENT);
-       }
-
-       info->flags |= ASYNC_INITIALIZED;
-       restore_flags(flags);
-       return 0;
-
-errout:
-       restore_flags(flags);
-       return retval;
-}
-
-/*
- * This routine will shutdown a serial port; interrupts are disabled, and
- * DTR is dropped if the hangup on close termio flag is on.
- */
-static void shutdown(ser_info_t * info)
-{
-       unsigned long   flags;
-       struct serial_state *state;
-       int             idx;
-       volatile smc_t  *smcp;
-       volatile scc_t  *sccp;
-
-       if (!(info->flags & ASYNC_INITIALIZED))
-               return;
-
-       state = info->state;
-
-#ifdef SERIAL_DEBUG_OPEN
-       printk("Shutting down serial port %d (irq %d)....", info->line,
-              state->irq);
-#endif
-
-       save_flags(flags); cli(); /* Disable interrupts */
-
-       if ((idx = info->state->smc_scc_num) < SCC_NUM_BASE) {
-               smcp = &immr->im_smc[idx];
-
-               /* Disable interrupts and I/O.
-               */
-               smcp->smc_smcm &= ~(SMCM_RX | SMCM_TX);
-#ifdef CONFIG_SERIAL_CONSOLE
-               /* We can't disable the transmitter if this is the
-                * system console.
-                */
-               if (idx != CONFIG_SERIAL_CONSOLE_PORT)
-#endif
-                       smcp->smc_smcmr &= ~(SMCMR_REN | SMCMR_TEN);
-       }
-       else {
-               sccp = &immr->im_scc[idx - SCC_IDX_BASE];
-               sccp->scc_sccm &= ~(UART_SCCM_TX | UART_SCCM_RX);
-#ifdef CONFIG_SERIAL_CONSOLE
-               if (idx != CONFIG_SERIAL_CONSOLE_PORT)
-                       sccp->scc_gsmrl &= ~(SCC_GSMRL_ENR | SCC_GSMRL_ENT);
-#endif
-       }
-
-       if (info->tty)
-               set_bit(TTY_IO_ERROR, &info->tty->flags);
-
-       info->flags &= ~ASYNC_INITIALIZED;
-       restore_flags(flags);
-}
-
-/*
- * This routine is called to set the UART divisor registers to match
- * the specified baud rate for a serial port.
- */
-static void change_speed(ser_info_t *info)
-{
-       int     baud_rate;
-       unsigned cflag, cval, scval, prev_mode;
-       int     i, bits, sbits, idx;
-       unsigned long   flags;
-       volatile smc_t  *smcp;
-       volatile scc_t  *sccp;
-
-       if (!info->tty || !info->tty->termios)
-               return;
-       cflag = info->tty->termios->c_cflag;
-
-       /* Character length programmed into the mode register is the
-        * sum of: 1 start bit, number of data bits, 0 or 1 parity bit,
-        * 1 or 2 stop bits, minus 1.
-        * The value 'bits' counts this for us.
-        */
-       cval = 0;
-       scval = 0;
-
-       /* byte size and parity */
-       switch (cflag & CSIZE) {
-             case CS5: bits = 5; break;
-             case CS6: bits = 6; break;
-             case CS7: bits = 7; break;
-             case CS8: bits = 8; break;
-             /* Never happens, but GCC is too dumb to figure it out */
-             default:  bits = 8; break;
-       }
-       sbits = bits - 5;
-
-       if (cflag & CSTOPB) {
-               cval |= SMCMR_SL;       /* Two stops */
-               scval |= SCU_PMSR_SL;
-               bits++;
-       }
-       if (cflag & PARENB) {
-               cval |= SMCMR_PEN;
-               scval |= SCU_PMSR_PEN;
-               bits++;
-       }
-       if (!(cflag & PARODD)) {
-               cval |= SMCMR_PM_EVEN;
-               scval |= (SCU_PMSR_REVP | SCU_PMSR_TEVP);
-       }
-
-       /* Determine divisor based on baud rate */
-       i = cflag & CBAUD;
-       if (i >= (sizeof(baud_table)/sizeof(int)))
-               baud_rate = 9600;
-       else
-               baud_rate = baud_table[i];
-
-       info->timeout = (TX_BUF_SIZE*HZ*bits);
-       info->timeout += HZ/50;         /* Add .02 seconds of slop */
-
-#ifdef modem_control
-       /* CTS flow control flag and modem status interrupts */
-       info->IER &= ~UART_IER_MSI;
-       if (info->flags & ASYNC_HARDPPS_CD)
-               info->IER |= UART_IER_MSI;
-       if (cflag & CRTSCTS) {
-               info->flags |= ASYNC_CTS_FLOW;
-               info->IER |= UART_IER_MSI;
-       } else
-               info->flags &= ~ASYNC_CTS_FLOW;
-       if (cflag & CLOCAL)
-               info->flags &= ~ASYNC_CHECK_CD;
-       else {
-               info->flags |= ASYNC_CHECK_CD;
-               info->IER |= UART_IER_MSI;
-       }
-       serial_out(info, UART_IER, info->IER);
-#endif
-
-       /*
-        * Set up parity check flag
-        */
-#define RELEVANT_IFLAG(iflag) (iflag & (IGNBRK|BRKINT|IGNPAR|PARMRK|INPCK))
-
-       info->read_status_mask = (BD_SC_EMPTY | BD_SC_OV);
-       if (I_INPCK(info->tty))
-               info->read_status_mask |= BD_SC_FR | BD_SC_PR;
-       if (I_BRKINT(info->tty) || I_PARMRK(info->tty))
-               info->read_status_mask |= BD_SC_BR;
-
-       /*
-        * Characters to ignore
-        */
-       info->ignore_status_mask = 0;
-       if (I_IGNPAR(info->tty))
-               info->ignore_status_mask |= BD_SC_PR | BD_SC_FR;
-       if (I_IGNBRK(info->tty)) {
-               info->ignore_status_mask |= BD_SC_BR;
-               /*
-                * If we're ignore parity and break indicators, ignore
-                * overruns too.  (For real raw support).
-                */
-               if (I_IGNPAR(info->tty))
-                       info->ignore_status_mask |= BD_SC_OV;
-       }
-       /*
-        * !!! ignore all characters if CREAD is not set
-        */
-       if ((cflag & CREAD) == 0)
-               info->read_status_mask &= ~BD_SC_EMPTY;
-       save_flags(flags); cli();
-
-       /* Start bit has not been added (so don't, because we would just
-        * subtract it later), and we need to add one for the number of
-        * stops bits (there is always at least one).
-        */
-       bits++;
-       if ((idx = info->state->smc_scc_num) < SCC_NUM_BASE) {
-               smcp = &immr->im_smc[idx];
-
-               /* Set the mode register.  We want to keep a copy of the
-                * enables, because we want to put them back if they were
-                * present.
-                */
-               prev_mode = smcp->smc_smcmr;
-               smcp->smc_smcmr = smcr_mk_clen(bits) | cval |  SMCMR_SM_UART;
-               smcp->smc_smcmr |= (prev_mode & (SMCMR_REN | SMCMR_TEN));
-       }
-       else {
-               sccp = &immr->im_scc[idx - SCC_IDX_BASE];
-               sccp->scc_pmsr = (sbits << 12) | scval;
-       }
-
-       m8260_cpm_setbrg(info->state->smc_scc_num, baud_rate);
-
-       restore_flags(flags);
-}
-
-static void rs_8xx_put_char(struct tty_struct *tty, unsigned char ch)
-{
-       ser_info_t *info = (ser_info_t *)tty->driver_data;
-       volatile cbd_t  *bdp;
-
-       if (serial_paranoia_check(info, tty->name, "rs_put_char"))
-               return;
-
-       if (!tty)
-               return;
-
-       bdp = info->tx_cur;
-       while (bdp->cbd_sc & BD_SC_READY);
-
-       *((char *)__va(bdp->cbd_bufaddr)) = ch;
-       bdp->cbd_datlen = 1;
-       bdp->cbd_sc |= BD_SC_READY;
-
-       /* Get next BD.
-       */
-       if (bdp->cbd_sc & BD_SC_WRAP)
-               bdp = info->tx_bd_base;
-       else
-               bdp++;
-
-       info->tx_cur = (cbd_t *)bdp;
-
-}
-
-static int rs_8xx_write(struct tty_struct * tty, int from_user,
-                   const unsigned char *buf, int count)
-{
-       int     c, ret = 0;
-       ser_info_t *info = (ser_info_t *)tty->driver_data;
-       volatile cbd_t *bdp;
-
-       if (serial_paranoia_check(info, tty->name, "rs_write"))
-               return 0;
-
-       if (!tty)
-               return 0;
-
-       bdp = info->tx_cur;
-
-       while (1) {
-               c = min(count, TX_BUF_SIZE);
-
-               if (c <= 0)
-                       break;
-
-               if (bdp->cbd_sc & BD_SC_READY) {
-                       info->flags |= TX_WAKEUP;
-                       break;
-               }
-
-               if (from_user) {
-                       if (copy_from_user(__va(bdp->cbd_bufaddr), buf, c)) {
-                               if (!ret)
-                                       ret = -EFAULT;
-                               break;
-                       }
-               } else {
-                       memcpy(__va(bdp->cbd_bufaddr), buf, c);
-               }
-
-               bdp->cbd_datlen = c;
-               bdp->cbd_sc |= BD_SC_READY;
-
-               buf += c;
-               count -= c;
-               ret += c;
-
-               /* Get next BD.
-               */
-               if (bdp->cbd_sc & BD_SC_WRAP)
-                       bdp = info->tx_bd_base;
-               else
-                       bdp++;
-               info->tx_cur = (cbd_t *)bdp;
-       }
-       return ret;
-}
-
-static int rs_8xx_write_room(struct tty_struct *tty)
-{
-       ser_info_t *info = (ser_info_t *)tty->driver_data;
-       int     ret;
-
-       if (serial_paranoia_check(info, tty->name, "rs_write_room"))
-               return 0;
-
-       if ((info->tx_cur->cbd_sc & BD_SC_READY) == 0) {
-               info->flags &= ~TX_WAKEUP;
-               ret = TX_BUF_SIZE;
-       }
-       else {
-               info->flags |= TX_WAKEUP;
-               ret = 0;
-       }
-       return ret;
-}
-
-/* I could track this with transmit counters....maybe later.
-*/
-static int rs_8xx_chars_in_buffer(struct tty_struct *tty)
-{
-       ser_info_t *info = (ser_info_t *)tty->driver_data;
-               
-       if (serial_paranoia_check(info, tty->name, "rs_chars_in_buffer"))
-               return 0;
-       return 0;
-}
-
-static void rs_8xx_flush_buffer(struct tty_struct *tty)
-{
-       ser_info_t *info = (ser_info_t *)tty->driver_data;
-               
-       if (serial_paranoia_check(info, tty->name, "rs_flush_buffer"))
-               return;
-
-       /* There is nothing to "flush", whatever we gave the CPM
-        * is on its way out.
-        */
-       wake_up_interruptible(&tty->write_wait);
-       if ((tty->flags & (1 << TTY_DO_WRITE_WAKEUP)) &&
-           tty->ldisc.write_wakeup)
-               (tty->ldisc.write_wakeup)(tty);
-       info->flags &= ~TX_WAKEUP;
-}
-
-/*
- * This function is used to send a high-priority XON/XOFF character to
- * the device
- */
-static void rs_8xx_send_xchar(struct tty_struct *tty, char ch)
-{
-       volatile cbd_t  *bdp;
-
-       ser_info_t *info = (ser_info_t *)tty->driver_data;
-
-       if (serial_paranoia_check(info, tty->name, "rs_send_char"))
-               return;
-
-       bdp = info->tx_cur;
-       while (bdp->cbd_sc & BD_SC_READY);
-
-       *((char *)__va(bdp->cbd_bufaddr)) = ch;
-       bdp->cbd_datlen = 1;
-       bdp->cbd_sc |= BD_SC_READY;
-
-       /* Get next BD.
-       */
-       if (bdp->cbd_sc & BD_SC_WRAP)
-               bdp = info->tx_bd_base;
-       else
-               bdp++;
-
-       info->tx_cur = (cbd_t *)bdp;
-}
-
-/*
- * ------------------------------------------------------------
- * rs_throttle()
- *
- * This routine is called by the upper-layer tty layer to signal that
- * incoming characters should be throttled.
- * ------------------------------------------------------------
- */
-static void rs_8xx_throttle(struct tty_struct * tty)
-{
-       ser_info_t *info = (ser_info_t *)tty->driver_data;
-#ifdef SERIAL_DEBUG_THROTTLE
-       char    buf[64];
-
-       printk("throttle %s: %d....\n", _tty_name(tty, buf),
-              tty->ldisc.chars_in_buffer(tty));
-#endif
-
-       if (serial_paranoia_check(info, tty->name, "rs_throttle"))
-               return;
-
-       if (I_IXOFF(tty))
-               rs_8xx_send_xchar(tty, STOP_CHAR(tty));
-
-#ifdef modem_control
-       if (tty->termios->c_cflag & CRTSCTS)
-               info->MCR &= ~UART_MCR_RTS;
-
-       cli();
-       serial_out(info, UART_MCR, info->MCR);
-       sti();
-#endif
-}
-
-static void rs_8xx_unthrottle(struct tty_struct * tty)
-{
-       ser_info_t *info = (ser_info_t *)tty->driver_data;
-#ifdef SERIAL_DEBUG_THROTTLE
-       char    buf[64];
-
-       printk("unthrottle %s: %d....\n", _tty_name(tty, buf),
-              tty->ldisc.chars_in_buffer(tty));
-#endif
-
-       if (serial_paranoia_check(info, tty->name, "rs_unthrottle"))
-               return;
-
-       if (I_IXOFF(tty)) {
-               if (info->x_char)
-                       info->x_char = 0;
-               else
-                       rs_8xx_send_xchar(tty, START_CHAR(tty));
-       }
-#ifdef modem_control
-       if (tty->termios->c_cflag & CRTSCTS)
-               info->MCR |= UART_MCR_RTS;
-       cli();
-       serial_out(info, UART_MCR, info->MCR);
-       sti();
-#endif
-}
-
-/*
- * ------------------------------------------------------------
- * rs_ioctl() and friends
- * ------------------------------------------------------------
- */
-
-#ifdef maybe
-/*
- * get_lsr_info - get line status register info
- *
- * Purpose: Let user call ioctl() to get info when the UART physically
- *         is emptied.  On bus types like RS485, the transmitter must
- *         release the bus after transmitting. This must be done when
- *         the transmit shift register is empty, not be done when the
- *         transmit holding register is empty.  This functionality
- *         allows an RS485 driver to be written in user space.
- */
-static int get_lsr_info(struct async_struct * info, unsigned int *value)
-{
-       unsigned char status;
-       unsigned int result;
-
-       cli();
-       status = serial_in(info, UART_LSR);
-       sti();
-       result = ((status & UART_LSR_TEMT) ? TIOCSER_TEMT : 0);
-       return put_user(result,value);
-}
-#endif
-
-static int get_modem_info(ser_info_t *info, unsigned int *value)
-{
-       unsigned int result = 0;
-#ifdef modem_control
-       unsigned char control, status;
-
-       control = info->MCR;
-       cli();
-       status = serial_in(info, UART_MSR);
-       sti();
-       result =  ((control & UART_MCR_RTS) ? TIOCM_RTS : 0)
-               | ((control & UART_MCR_DTR) ? TIOCM_DTR : 0)
-#ifdef TIOCM_OUT1
-               | ((control & UART_MCR_OUT1) ? TIOCM_OUT1 : 0)
-               | ((control & UART_MCR_OUT2) ? TIOCM_OUT2 : 0)
-#endif
-               | ((status  & UART_MSR_DCD) ? TIOCM_CAR : 0)
-               | ((status  & UART_MSR_RI) ? TIOCM_RNG : 0)
-               | ((status  & UART_MSR_DSR) ? TIOCM_DSR : 0)
-               | ((status  & UART_MSR_CTS) ? TIOCM_CTS : 0);
-#endif
-       return put_user(result,value);
-}
-
-static int set_modem_info(ser_info_t *info, unsigned int cmd,
-                         unsigned int *value)
-{
-       int error;
-       unsigned int arg;
-
-       error = get_user(arg, value);
-       if (error)
-               return error;
-#ifdef modem_control
-       switch (cmd) {
-       case TIOCMBIS:
-               if (arg & TIOCM_RTS)
-                       info->MCR |= UART_MCR_RTS;
-               if (arg & TIOCM_DTR)
-                       info->MCR |= UART_MCR_DTR;
-#ifdef TIOCM_OUT1
-               if (arg & TIOCM_OUT1)
-                       info->MCR |= UART_MCR_OUT1;
-               if (arg & TIOCM_OUT2)
-                       info->MCR |= UART_MCR_OUT2;
-#endif
-               break;
-       case TIOCMBIC:
-               if (arg & TIOCM_RTS)
-                       info->MCR &= ~UART_MCR_RTS;
-               if (arg & TIOCM_DTR)
-                       info->MCR &= ~UART_MCR_DTR;
-#ifdef TIOCM_OUT1
-               if (arg & TIOCM_OUT1)
-                       info->MCR &= ~UART_MCR_OUT1;
-               if (arg & TIOCM_OUT2)
-                       info->MCR &= ~UART_MCR_OUT2;
-#endif
-               break;
-       case TIOCMSET:
-               info->MCR = ((info->MCR & ~(UART_MCR_RTS |
-#ifdef TIOCM_OUT1
-                                           UART_MCR_OUT1 |
-                                           UART_MCR_OUT2 |
-#endif
-                                           UART_MCR_DTR))
-                            | ((arg & TIOCM_RTS) ? UART_MCR_RTS : 0)
-#ifdef TIOCM_OUT1
-                            | ((arg & TIOCM_OUT1) ? UART_MCR_OUT1 : 0)
-                            | ((arg & TIOCM_OUT2) ? UART_MCR_OUT2 : 0)
-#endif
-                            | ((arg & TIOCM_DTR) ? UART_MCR_DTR : 0));
-               break;
-       default:
-               return -EINVAL;
-       }
-       cli();
-       serial_out(info, UART_MCR, info->MCR);
-       sti();
-#endif
-       return 0;
-}
-
-/* Sending a break is a two step process on the SMC/SCC.  It is accomplished
- * by sending a STOP TRANSMIT command followed by a RESTART TRANSMIT
- * command.  We take advantage of the begin/end functions to make this
- * happen.
- */
-static void begin_break(ser_info_t *info)
-{
-       volatile cpm8260_t *cp;
-       uint    page, sblock;
-       int     num;
-
-       cp = cpmp;
-
-       if ((num = info->state->smc_scc_num) < SCC_NUM_BASE) {
-               if (num == 0) {
-                       page = CPM_CR_SMC1_PAGE;
-                       sblock = CPM_CR_SMC1_SBLOCK;
-               }
-               else {
-                       page = CPM_CR_SMC2_PAGE;
-                       sblock = CPM_CR_SMC2_SBLOCK;
-               }
-       }
-       else {
-               num -= SCC_NUM_BASE;
-               switch (num) {
-               case 0:
-                       page = CPM_CR_SCC1_PAGE;
-                       sblock = CPM_CR_SCC1_SBLOCK;
-                       break;
-               case 1:
-                       page = CPM_CR_SCC2_PAGE;
-                       sblock = CPM_CR_SCC2_SBLOCK;
-                       break;
-               case 2:
-                       page = CPM_CR_SCC3_PAGE;
-                       sblock = CPM_CR_SCC3_SBLOCK;
-                       break;
-               case 3:
-                       page = CPM_CR_SCC4_PAGE;
-                       sblock = CPM_CR_SCC4_SBLOCK;
-                       break;
-               default: return;
-               }
-       }
-       cp->cp_cpcr = mk_cr_cmd(page, sblock, 0, CPM_CR_STOP_TX) | CPM_CR_FLG;
-       while (cp->cp_cpcr & CPM_CR_FLG);
-}
-
-static void end_break(ser_info_t *info)
-{
-       volatile cpm8260_t *cp;
-       uint    page, sblock;
-       int     num;
-
-       cp = cpmp;
-
-       if ((num = info->state->smc_scc_num) < SCC_NUM_BASE) {
-               if (num == 0) {
-                       page = CPM_CR_SMC1_PAGE;
-                       sblock = CPM_CR_SMC1_SBLOCK;
-               }
-               else {
-                       page = CPM_CR_SMC2_PAGE;
-                       sblock = CPM_CR_SMC2_SBLOCK;
-               }
-       }
-       else {
-               num -= SCC_NUM_BASE;
-               switch (num) {
-               case 0:
-                       page = CPM_CR_SCC1_PAGE;
-                       sblock = CPM_CR_SCC1_SBLOCK;
-                       break;
-               case 1:
-                       page = CPM_CR_SCC2_PAGE;
-                       sblock = CPM_CR_SCC2_SBLOCK;
-                       break;
-               case 2:
-                       page = CPM_CR_SCC3_PAGE;
-                       sblock = CPM_CR_SCC3_SBLOCK;
-                       break;
-               case 3:
-                       page = CPM_CR_SCC4_PAGE;
-                       sblock = CPM_CR_SCC4_SBLOCK;
-                       break;
-               default: return;
-               }
-       }
-       cp->cp_cpcr = mk_cr_cmd(page, sblock, 0, CPM_CR_RESTART_TX) | CPM_CR_FLG;
-       while (cp->cp_cpcr & CPM_CR_FLG);
-}
-
-/*
- * This routine sends a break character out the serial port.
- */
-static void send_break(ser_info_t *info, int duration)
-{
-       current->state = TASK_INTERRUPTIBLE;
-#ifdef SERIAL_DEBUG_SEND_BREAK
-       printk("rs_send_break(%d) jiff=%lu...", duration, jiffies);
-#endif
-       begin_break(info);
-       schedule_timeout(duration);
-       end_break(info);
-#ifdef SERIAL_DEBUG_SEND_BREAK
-       printk("done jiffies=%lu\n", jiffies);
-#endif
-}
-
-
-static int rs_8xx_ioctl(struct tty_struct *tty, struct file * file,
-                   unsigned int cmd, unsigned long arg)
-{
-       int error;
-       ser_info_t *info = (ser_info_t *)tty->driver_data;
-       int retval;
-       struct async_icount cnow;       /* kernel counter temps */
-       struct serial_icounter_struct *p_cuser; /* user space */
-
-       if (serial_paranoia_check(info, tty->name, "rs_ioctl"))
-               return -ENODEV;
-
-       if ((cmd != TIOCMIWAIT) && (cmd != TIOCGICOUNT)) {
-               if (tty->flags & (1 << TTY_IO_ERROR))
-                   return -EIO;
-       }
-
-       switch (cmd) {
-               case TCSBRK:    /* SVID version: non-zero arg --> no break */
-                       retval = tty_check_change(tty);
-                       if (retval)
-                               return retval;
-                       tty_wait_until_sent(tty, 0);
-                       if (signal_pending(current))
-                               return -EINTR;
-                       if (!arg) {
-                               send_break(info, HZ/4); /* 1/4 second */
-                               if (signal_pending(current))
-                                       return -EINTR;
-                       }
-                       return 0;
-               case TCSBRKP:   /* support for POSIX tcsendbreak() */
-                       retval = tty_check_change(tty);
-                       if (retval)
-                               return retval;
-                       tty_wait_until_sent(tty, 0);
-                       if (signal_pending(current))
-                               return -EINTR;
-                       send_break(info, arg ? arg*(HZ/10) : HZ/4);
-                       if (signal_pending(current))
-                               return -EINTR;
-                       return 0;
-               case TIOCSBRK:
-                       retval = tty_check_change(tty);
-                       if (retval)
-                               return retval;
-                       tty_wait_until_sent(tty, 0);
-                       begin_break(info);
-                       return 0;
-               case TIOCCBRK:
-                       retval = tty_check_change(tty);
-                       if (retval)
-                               return retval;
-                       end_break(info);
-                       return 0;
-               case TIOCGSOFTCAR:
-                       return put_user(C_CLOCAL(tty) ? 1 : 0, (int *) arg);
-               case TIOCSSOFTCAR:
-                       error = get_user(arg, (unsigned int *) arg);
-                       if (error)
-                               return error;
-                       tty->termios->c_cflag =
-                               ((tty->termios->c_cflag & ~CLOCAL) |
-                                (arg ? CLOCAL : 0));
-                       return 0;
-               case TIOCMGET:
-                       return get_modem_info(info, (unsigned int *) arg);
-               case TIOCMBIS:
-               case TIOCMBIC:
-               case TIOCMSET:
-                       return set_modem_info(info, cmd, (unsigned int *) arg);
-#ifdef maybe
-               case TIOCSERGETLSR: /* Get line status register */
-                       return get_lsr_info(info, (unsigned int *) arg);
-#endif
-               /*
-                * Wait for any of the 4 modem inputs (DCD,RI,DSR,CTS) to change
-                * - mask passed in arg for lines of interest
-                *   (use |'ed TIOCM_RNG/DSR/CD/CTS for masking)
-                * Caller should use TIOCGICOUNT to see which one it was
-                */
-                case TIOCMIWAIT:
-#ifdef modem_control
-                       cli();
-                       /* note the counters on entry */
-                       cprev = info->state->icount;
-                       sti();
-                       while (1) {
-                               interruptible_sleep_on(&info->delta_msr_wait);
-                               /* see if a signal did it */
-                               if (signal_pending(current))
-                                       return -ERESTARTSYS;
-                               cli();
-                               cnow = info->state->icount; /* atomic copy */
-                               sti();
-                               if (cnow.rng == cprev.rng && cnow.dsr == cprev.dsr &&
-                                   cnow.dcd == cprev.dcd && cnow.cts == cprev.cts)
-                                       return -EIO; /* no change => error */
-                               if ( ((arg & TIOCM_RNG) && (cnow.rng != cprev.rng)) ||
-                                    ((arg & TIOCM_DSR) && (cnow.dsr != cprev.dsr)) ||
-                                    ((arg & TIOCM_CD)  && (cnow.dcd != cprev.dcd)) ||
-                                    ((arg & TIOCM_CTS) && (cnow.cts != cprev.cts)) ) {
-                                       return 0;
-                               }
-                               cprev = cnow;
-                       }
-                       /* NOTREACHED */
-#else
-                       return 0;
-#endif
-
-               /*
-                * Get counter of input serial line interrupts (DCD,RI,DSR,CTS)
-                * Return: write counters to the user passed counter struct
-                * NB: both 1->0 and 0->1 transitions are counted except for
-                *     RI where only 0->1 is counted.
-                */
-               case TIOCGICOUNT:
-                       cli();
-                       cnow = info->state->icount;
-                       sti();
-                       p_cuser = (struct serial_icounter_struct *) arg;
-                       error = put_user(cnow.cts, &p_cuser->cts);
-                       if (error) return error;
-                       error = put_user(cnow.dsr, &p_cuser->dsr);
-                       if (error) return error;
-                       error = put_user(cnow.rng, &p_cuser->rng);
-                       if (error) return error;
-                       error = put_user(cnow.dcd, &p_cuser->dcd);
-                       if (error) return error;
-                       return 0;
-
-               default:
-                       return -ENOIOCTLCMD;
-               }
-       return 0;
-}
-
-/* FIX UP modem control here someday......
-*/
-static void rs_8xx_set_termios(struct tty_struct *tty, struct termios *old_termios)
-{
-       ser_info_t *info = (ser_info_t *)tty->driver_data;
-
-       if (   (tty->termios->c_cflag == old_termios->c_cflag)
-           && (   RELEVANT_IFLAG(tty->termios->c_iflag)
-               == RELEVANT_IFLAG(old_termios->c_iflag)))
-         return;
-
-       change_speed(info);
-
-#ifdef modem_control
-       /* Handle transition to B0 status */
-       if ((old_termios->c_cflag & CBAUD) &&
-           !(tty->termios->c_cflag & CBAUD)) {
-               info->MCR &= ~(UART_MCR_DTR|UART_MCR_RTS);
-               cli();
-               serial_out(info, UART_MCR, info->MCR);
-               sti();
-       }
-
-       /* Handle transition away from B0 status */
-       if (!(old_termios->c_cflag & CBAUD) &&
-           (tty->termios->c_cflag & CBAUD)) {
-               info->MCR |= UART_MCR_DTR;
-               if (!tty->hw_stopped ||
-                   !(tty->termios->c_cflag & CRTSCTS)) {
-                       info->MCR |= UART_MCR_RTS;
-               }
-               cli();
-               serial_out(info, UART_MCR, info->MCR);
-               sti();
-       }
-
-       /* Handle turning off CRTSCTS */
-       if ((old_termios->c_cflag & CRTSCTS) &&
-           !(tty->termios->c_cflag & CRTSCTS)) {
-               tty->hw_stopped = 0;
-               rs_8xx_start(tty);
-       }
-#endif
-
-#if 0
-       /*
-        * No need to wake up processes in open wait, since they
-        * sample the CLOCAL flag once, and don't recheck it.
-        * XXX  It's not clear whether the current behavior is correct
-        * or not.  Hence, this may change.....
-        */
-       if (!(old_termios->c_cflag & CLOCAL) &&
-           (tty->termios->c_cflag & CLOCAL))
-               wake_up_interruptible(&info->open_wait);
-#endif
-}
-
-/*
- * ------------------------------------------------------------
- * rs_close()
- *
- * This routine is called when the serial port gets closed.  First, we
- * wait for the last remaining data to be sent.  Then, we unlink its
- * async structure from the interrupt chain if necessary, and we free
- * that IRQ if nothing is left in the chain.
- * ------------------------------------------------------------
- */
-static void rs_8xx_close(struct tty_struct *tty, struct file * filp)
-{
-       ser_info_t *info = (ser_info_t *)tty->driver_data;
-       struct serial_state *state;
-       unsigned long   flags;
-       int             idx;
-       volatile smc_t  *smcp;
-       volatile scc_t  *sccp;
-
-       if (!info || serial_paranoia_check(info, tty->name, "rs_close"))
-               return;
-
-       state = info->state;
-
-       save_flags(flags); cli();
-
-       if (tty_hung_up_p(filp)) {
-               DBG_CNT("before DEC-hung");
-               restore_flags(flags);
-               return;
-       }
-
-#ifdef SERIAL_DEBUG_OPEN
-       printk("rs_close ttys%d, count = %d\n", info->line, state->count);
-#endif
-       if ((tty->count == 1) && (state->count != 1)) {
-               /*
-                * Uh, oh.  tty->count is 1, which means that the tty
-                * structure will be freed.  state->count should always
-                * be one in these conditions.  If it's greater than
-                * one, we've got real problems, since it means the
-                * serial port won't be shutdown.
-                */
-               printk("rs_close: bad serial port count; tty->count is 1, "
-                      "state->count is %d\n", state->count);
-               state->count = 1;
-       }
-       if (--state->count < 0) {
-               printk("rs_close: bad serial port count for ttys%d: %d\n",
-                      info->line, state->count);
-               state->count = 0;
-       }
-       if (state->count) {
-               DBG_CNT("before DEC-2");
-               restore_flags(flags);
-               return;
-       }
-       info->flags |= ASYNC_CLOSING;
-       /*
-        * Now we wait for the transmit buffer to clear; and we notify
-        * the line discipline to only process XON/XOFF characters.
-        */
-       tty->closing = 1;
-       if (info->closing_wait != ASYNC_CLOSING_WAIT_NONE)
-               tty_wait_until_sent(tty, info->closing_wait);
-       /*
-        * At this point we stop accepting input.  To do this, we
-        * disable the receive line status interrupts, and tell the
-        * interrupt driver to stop checking the data ready bit in the
-        * line status register.
-        */
-       info->read_status_mask &= ~BD_SC_EMPTY;
-       if (info->flags & ASYNC_INITIALIZED) {
-               if ((idx = info->state->smc_scc_num) < SCC_NUM_BASE) {
-                       smcp = &immr->im_smc[idx];
-                       smcp->smc_smcm &= ~SMCM_RX;
-                       smcp->smc_smcmr &= ~SMCMR_REN;
-               }
-               else {
-                       sccp = &immr->im_scc[idx - SCC_IDX_BASE];
-                       sccp->scc_sccm &= ~UART_SCCM_RX;
-                       sccp->scc_gsmrl &= ~SCC_GSMRL_ENR;
-               }
-               /*
-                * Before we drop DTR, make sure the UART transmitter
-                * has completely drained; this is especially
-                * important if there is a transmit FIFO!
-                */
-               rs_8xx_wait_until_sent(tty, info->timeout);
-       }
-       shutdown(info);
-       if (tty->driver->flush_buffer)
-               tty->driver->flush_buffer(tty);
-       if (tty->ldisc.flush_buffer)
-               tty->ldisc.flush_buffer(tty);
-       tty->closing = 0;
-       info->event = 0;
-       info->tty = 0;
-       if (info->blocked_open) {
-               if (info->close_delay) {
-                       current->state = TASK_INTERRUPTIBLE;
-                       schedule_timeout(info->close_delay);
-               }
-               wake_up_interruptible(&info->open_wait);
-       }
-       info->flags &= ~(ASYNC_NORMAL_ACTIVE|ASYNC_CLOSING);
-       wake_up_interruptible(&info->close_wait);
-       restore_flags(flags);
-}
-
-/*
- * rs_wait_until_sent() --- wait until the transmitter is empty
- */
-static void rs_8xx_wait_until_sent(struct tty_struct *tty, int timeout)
-{
-       ser_info_t *info = (ser_info_t *)tty->driver_data;
-       unsigned long orig_jiffies, char_time;
-       /*int lsr;*/
-       volatile cbd_t *bdp;
-
-       if (serial_paranoia_check(info, tty->name, "rs_wait_until_sent"))
-               return;
-
-#ifdef maybe
-       if (info->state->type == PORT_UNKNOWN)
-               return;
-#endif
-
-       orig_jiffies = jiffies;
-       /*
-        * Set the check interval to be 1/5 of the estimated time to
-        * send a single character, and make it at least 1.  The check
-        * interval should also be less than the timeout.
-        *
-        * Note: we have to use pretty tight timings here to satisfy
-        * the NIST-PCTS.
-        */
-       char_time = 1;
-       if (timeout)
-               char_time = min(char_time, (unsigned long)timeout);
-#ifdef SERIAL_DEBUG_RS_WAIT_UNTIL_SENT
-       printk("In rs_wait_until_sent(%d) check=%lu...", timeout, char_time);
-       printk("jiff=%lu...", jiffies);
-#endif
-
-       /* We go through the loop at least once because we can't tell
-        * exactly when the last character exits the shifter.  There can
-        * be at least two characters waiting to be sent after the buffers
-        * are empty.
-        */
-       do {
-#ifdef SERIAL_DEBUG_RS_WAIT_UNTIL_SENT
-               printk("lsr = %d (jiff=%lu)...", lsr, jiffies);
-#endif
-               current->state = TASK_INTERRUPTIBLE;
-/*             current->dyn_prio = 0;   make us low-priority */
-               schedule_timeout(char_time);
-               if (signal_pending(current))
-                       break;
-               if (timeout && time_after(jiffies, orig_jiffies + timeout))
-                       break;
-               bdp = info->tx_cur;
-       } while (bdp->cbd_sc & BD_SC_READY);
-       current->state = TASK_RUNNING;
-#ifdef SERIAL_DEBUG_RS_WAIT_UNTIL_SENT
-       printk("lsr = %d (jiff=%lu)...done\n", lsr, jiffies);
-#endif
-}
-
-/*
- * rs_hangup() --- called by tty_hangup() when a hangup is signaled.
- */
-static void rs_8xx_hangup(struct tty_struct *tty)
-{
-       ser_info_t *info = (ser_info_t *)tty->driver_data;
-       struct serial_state *state = info->state;
-
-       if (serial_paranoia_check(info, tty->name, "rs_hangup"))
-               return;
-
-       state = info->state;
-
-       rs_8xx_flush_buffer(tty);
-       shutdown(info);
-       info->event = 0;
-       state->count = 0;
-       info->flags &= ~ASYNC_NORMAL_ACTIVE;
-       info->tty = 0;
-       wake_up_interruptible(&info->open_wait);
-}
-
-/*
- * ------------------------------------------------------------
- * rs_open() and friends
- * ------------------------------------------------------------
- */
-static int block_til_ready(struct tty_struct *tty, struct file * filp,
-                          ser_info_t *info)
-{
-#ifdef DO_THIS_LATER
-       DECLARE_WAITQUEUE(wait, current);
-       struct serial_state *state = info->state;
-#endif
-       int             retval;
-       int             do_clocal = 0;
-
-       /*
-        * If the device is in the middle of being closed, then block
-        * until it's done, and then try again.
-        */
-       if (tty_hung_up_p(filp) ||
-           (info->flags & ASYNC_CLOSING)) {
-               if (info->flags & ASYNC_CLOSING)
-                       interruptible_sleep_on(&info->close_wait);
-#ifdef SERIAL_DO_RESTART
-               if (info->flags & ASYNC_HUP_NOTIFY)
-                       return -EAGAIN;
-               else
-                       return -ERESTARTSYS;
-#else
-               return -EAGAIN;
-#endif
-       }
-
-       /*
-        * If non-blocking mode is set, or the port is not enabled,
-        * then make the check up front and then exit.
-        * If this is an SMC port, we don't have modem control to wait
-        * for, so just get out here.
-        */
-       if ((filp->f_flags & O_NONBLOCK) ||
-           (tty->flags & (1 << TTY_IO_ERROR)) ||
-           (info->state->smc_scc_num < SCC_NUM_BASE)) {
-               info->flags |= ASYNC_NORMAL_ACTIVE;
-               return 0;
-       }
-
-       if (tty->termios->c_cflag & CLOCAL)
-               do_clocal = 1;
-
-       /*
-        * Block waiting for the carrier detect and the line to become
-        * free (i.e., not in use by the callout).  While we are in
-        * this loop, state->count is dropped by one, so that
-        * rs_close() knows when to free things.  We restore it upon
-        * exit, either normal or abnormal.
-        */
-       retval = 0;
-#ifdef DO_THIS_LATER
-       add_wait_queue(&info->open_wait, &wait);
-#ifdef SERIAL_DEBUG_OPEN
-       printk("block_til_ready before block: ttys%d, count = %d\n",
-              state->line, state->count);
-#endif
-       cli();
-       if (!tty_hung_up_p(filp))
-               state->count--;
-       sti();
-       info->blocked_open++;
-       while (1) {
-               cli();
-               if (tty->termios->c_cflag & CBAUD)
-                       serial_out(info, UART_MCR,
-                                  serial_inp(info, UART_MCR) |
-                                  (UART_MCR_DTR | UART_MCR_RTS));
-               sti();
-               set_current_state(TASK_INTERRUPTIBLE);
-               if (tty_hung_up_p(filp) ||
-                   !(info->flags & ASYNC_INITIALIZED)) {
-#ifdef SERIAL_DO_RESTART
-                       if (info->flags & ASYNC_HUP_NOTIFY)
-                               retval = -EAGAIN;
-                       else
-                               retval = -ERESTARTSYS;
-#else
-                       retval = -EAGAIN;
-#endif
-                       break;
-               }
-               if (!(info->flags & ASYNC_CLOSING) &&
-                   (do_clocal || (serial_in(info, UART_MSR) &
-                                  UART_MSR_DCD)))
-                       break;
-               if (signal_pending(current)) {
-                       retval = -ERESTARTSYS;
-                       break;
-               }
-#ifdef SERIAL_DEBUG_OPEN
-               printk("block_til_ready blocking: ttys%d, count = %d\n",
-                      info->line, state->count);
-#endif
-               schedule();
-       }
-       current->state = TASK_RUNNING;
-       remove_wait_queue(&info->open_wait, &wait);
-       if (!tty_hung_up_p(filp))
-               state->count++;
-       info->blocked_open--;
-#ifdef SERIAL_DEBUG_OPEN
-       printk("block_til_ready after blocking: ttys%d, count = %d\n",
-              info->line, state->count);
-#endif
-#endif /* DO_THIS_LATER */
-       if (retval)
-               return retval;
-       info->flags |= ASYNC_NORMAL_ACTIVE;
-       return 0;
-}
-
-static int get_async_struct(int line, ser_info_t **ret_info)
-{
-       struct serial_state *sstate;
-
-       sstate = rs_table + line;
-       if (sstate->info) {
-               sstate->count++;
-               *ret_info = (ser_info_t *)sstate->info;
-               return 0;
-       }
-       else {
-               return -ENOMEM;
-       }
-}
-
-/*
- * This routine is called whenever a serial port is opened.  It
- * enables interrupts for a serial port, linking in its async structure into
- * the IRQ chain.   It also performs the serial-specific
- * initialization for the tty structure.
- */
-static int rs_8xx_open(struct tty_struct *tty, struct file * filp)
-{
-       ser_info_t      *info;
-       int             retval, line;
-
-       line = tty->index;
-       if ((line < 0) || (line >= NR_PORTS))
-               return -ENODEV;
-       retval = get_async_struct(line, &info);
-       if (retval)
-               return retval;
-       if (serial_paranoia_check(info, tty->name, "rs_open"))
-               return -ENODEV;
-
-#ifdef SERIAL_DEBUG_OPEN
-       printk("rs_open %s, count = %d\n", tty->name, info->state->count);
-#endif
-       tty->driver_data = info;
-       info->tty = tty;
-
-       /*
-        * Start up serial port
-        */
-       retval = startup(info);
-       if (retval)
-               return retval;
-
-       retval = block_til_ready(tty, filp, info);
-       if (retval) {
-#ifdef SERIAL_DEBUG_OPEN
-               printk("rs_open returning after block_til_ready with %d\n",
-                      retval);
-#endif
-               return retval;
-       }
-
-#ifdef SERIAL_DEBUG_OPEN
-       printk("rs_open %s successful...", line);
-#endif
-       return 0;
-}
-
-/*
- * /proc fs routines....
- */
-
-static inline int line_info(char *buf, struct serial_state *state)
-{
-#ifdef notdef
-       struct async_struct *info = state->info, scr_info;
-       char    stat_buf[30], control, status;
-#endif
-       int     ret;
-
-       ret = sprintf(buf, "%d: uart:%s port:%X irq:%d",
-                     state->line,
-                     (state->smc_scc_num < SCC_NUM_BASE) ? "SMC" : "SCC",
-                     (unsigned int)(state->port), state->irq);
-
-       if (!state->port || (state->type == PORT_UNKNOWN)) {
-               ret += sprintf(buf+ret, "\n");
-               return ret;
-       }
-
-#ifdef notdef
-       /*
-        * Figure out the current RS-232 lines
-        */
-       if (!info) {
-               info = &scr_info;       /* This is just for serial_{in,out} */
-
-               info->magic = SERIAL_MAGIC;
-               info->port = state->port;
-               info->flags = state->flags;
-               info->quot = 0;
-               info->tty = 0;
-       }
-       cli();
-       status = serial_in(info, UART_MSR);
-       control = info ? info->MCR : serial_in(info, UART_MCR);
-       sti();
-
-       stat_buf[0] = 0;
-       stat_buf[1] = 0;
-       if (control & UART_MCR_RTS)
-               strcat(stat_buf, "|RTS");
-       if (status & UART_MSR_CTS)
-               strcat(stat_buf, "|CTS");
-       if (control & UART_MCR_DTR)
-               strcat(stat_buf, "|DTR");
-       if (status & UART_MSR_DSR)
-               strcat(stat_buf, "|DSR");
-       if (status & UART_MSR_DCD)
-               strcat(stat_buf, "|CD");
-       if (status & UART_MSR_RI)
-               strcat(stat_buf, "|RI");
-
-       if (info->quot) {
-               ret += sprintf(buf+ret, " baud:%d",
-                              state->baud_base / info->quot);
-       }
-
-       ret += sprintf(buf+ret, " tx:%d rx:%d",
-                     state->icount.tx, state->icount.rx);
-
-       if (state->icount.frame)
-               ret += sprintf(buf+ret, " fe:%d", state->icount.frame);
-
-       if (state->icount.parity)
-               ret += sprintf(buf+ret, " pe:%d", state->icount.parity);
-
-       if (state->icount.brk)
-               ret += sprintf(buf+ret, " brk:%d", state->icount.brk);
-
-       if (state->icount.overrun)
-               ret += sprintf(buf+ret, " oe:%d", state->icount.overrun);
-
-       /*
-        * Last thing is the RS-232 status lines
-        */
-       ret += sprintf(buf+ret, " %s\n", stat_buf+1);
-#endif
-       return ret;
-}
-
-int rs_8xx_read_proc(char *page, char **start, off_t off, int count,
-                int *eof, void *data)
-{
-       int i, len = 0;
-       off_t   begin = 0;
-
-       len += sprintf(page, "serinfo:1.0 driver:%s\n", serial_version);
-       for (i = 0; i < NR_PORTS && len < 4000; i++) {
-               len += line_info(page + len, &rs_table[i]);
-               if (len+begin > off+count)
-                       goto done;
-               if (len+begin < off) {
-                       begin += len;
-                       len = 0;
-               }
-       }
-       *eof = 1;
-done:
-       if (off >= len+begin)
-               return 0;
-       *start = page + (begin-off);
-       return ((count < begin+len-off) ? count : begin+len-off);
-}
-
-/*
- * ---------------------------------------------------------------------
- * rs_init() and friends
- *
- * rs_init() is called at boot-time to initialize the serial driver.
- * ---------------------------------------------------------------------
- */
-
-/*
- * This routine prints out the appropriate serial driver version
- * number, and identifies which options were configured into this
- * driver.
- */
-static _INLINE_ void show_serial_version(void)
-{
-       printk(KERN_INFO "%s version %s\n", serial_name, serial_version);
-}
-
-
-/*
- * The serial console driver used during boot.  Note that these names
- * clash with those found in "serial.c", so we currently can't support
- * the 16xxx uarts and these at the same time.  I will fix this to become
- * an indirect function call from tty_io.c (or something).
- */
-
-#ifdef CONFIG_SERIAL_CONSOLE
-
-/*
- * Print a string to the serial port trying not to disturb any possible
- * real use of the port...
- * These funcitons work equally well for SCC, even though they are
- * designed for SMC.  Our only interests are the transmit/receive
- * buffers, which are identically mapped for either the SCC or SMC.
- */
-static void my_console_write(int idx, const char *s,
-                               unsigned count)
-{
-       struct          serial_state    *ser;
-       ser_info_t                      *info;
-       unsigned                        i;
-       volatile        cbd_t           *bdp, *bdbase;
-       volatile        smc_uart_t      *up;
-       volatile        u_char          *cp;
-
-       ser = rs_table + idx;
-
-       /* If the port has been initialized for general use, we have
-        * to use the buffer descriptors allocated there.  Otherwise,
-        * we simply use the single buffer allocated.
-        */
-       if ((info = (ser_info_t *)ser->info) != NULL) {
-               bdp = info->tx_cur;
-               bdbase = info->tx_bd_base;
-       }
-       else {
-               /* Pointer to UART in parameter ram.
-               */
-               up = (smc_uart_t *)&immr->im_dprambase[ser->port];
-
-               /* Get the address of the host memory buffer.
-                */
-               bdp = bdbase = (cbd_t *)&immr->im_dprambase[up->smc_tbase];
-       }
-
-       /*
-        * We need to gracefully shut down the transmitter, disable
-        * interrupts, then send our bytes out.
-        */
-
-       /*
-        * Now, do each character.  This is not as bad as it looks
-        * since this is a holding FIFO and not a transmitting FIFO.
-        * We could add the complexity of filling the entire transmit
-        * buffer, but we would just wait longer between accesses......
-        */
-       for (i = 0; i < count; i++, s++) {
-               /* Wait for transmitter fifo to empty.
-                * Ready indicates output is ready, and xmt is doing
-                * that, not that it is ready for us to send.
-                */
-               while (bdp->cbd_sc & BD_SC_READY);
-
-               /* Send the character out.
-                * If the buffer address is in the CPM DPRAM, don't
-                * convert it.
-                */
-               if ((uint)(bdp->cbd_bufaddr) > (uint)IMAP_ADDR)
-                       cp = (u_char *)(bdp->cbd_bufaddr);
-               else
-                       cp = __va(bdp->cbd_bufaddr);
-               *cp = *s;
-
-               bdp->cbd_datlen = 1;
-               bdp->cbd_sc |= BD_SC_READY;
-
-               if (bdp->cbd_sc & BD_SC_WRAP)
-                       bdp = bdbase;
-               else
-                       bdp++;
-
-               /* if a LF, also do CR... */
-               if (*s == 10) {
-                       while (bdp->cbd_sc & BD_SC_READY);
-                       cp = __va(bdp->cbd_bufaddr);
-                       *cp = 13;
-                       bdp->cbd_datlen = 1;
-                       bdp->cbd_sc |= BD_SC_READY;
-
-                       if (bdp->cbd_sc & BD_SC_WRAP) {
-                               bdp = bdbase;
-                       }
-                       else {
-                               bdp++;
-                       }
-               }
-       }
-
-       /*
-        * Finally, Wait for transmitter & holding register to empty
-        *  and restore the IER
-        */
-       while (bdp->cbd_sc & BD_SC_READY);
-
-       if (info)
-               info->tx_cur = (cbd_t *)bdp;
-}
-
-static void serial_console_write(struct console *c, const char *s,
-                               unsigned count)
-{
-#if defined(CONFIG_KGDB_CONSOLE) && !defined(CONFIG_USE_SERIAL2_KGDB)
-       /* Try to let stub handle output. Returns true if it did. */
-       if (kgdb_output_string(s, count))
-               return;
-#endif
-       my_console_write(c->index, s, count);
-}
-
-#ifdef CONFIG_XMON
-int
-xmon_8xx_write(const char *s, unsigned count)
-{
-       my_console_write(KGDB_SER_IDX, s, count);
-       return(count);
-}
-#endif
-
-#ifdef CONFIG_KGDB
-void
-putDebugChar(char ch)
-{
-       my_console_write(KGDB_SER_IDX, &ch, 1);
-}
-#endif
-
-#if defined(CONFIG_XMON) || defined(CONFIG_KGDB)
-/*
- * Receive character from the serial port.  This only works well
- * before the port is initialize for real use.
- */
-static int my_console_wait_key(int idx, int xmon, char *obuf)
-{
-       struct serial_state             *ser;
-       u_char                          c, *cp;
-       ser_info_t                      *info;
-       volatile        cbd_t           *bdp;
-       volatile        smc_uart_t      *up;
-       int                             i;
-
-       ser = rs_table + idx;
-
-       /* Pointer to UART in parameter ram.
-       */
-       up = (smc_uart_t *)&immr->im_dprambase[ser->port];
-
-       /* Get the address of the host memory buffer.
-        * If the port has been initialized for general use, we must
-        * use information from the port structure.
-        */
-       if ((info = (ser_info_t *)ser->info))
-               bdp = info->rx_cur;
-       else
-               bdp = (cbd_t *)&immr->im_dprambase[up->smc_rbase];
-
-       /*
-        * We need to gracefully shut down the receiver, disable
-        * interrupts, then read the input.
-        * XMON just wants a poll.  If no character, return -1, else
-        * return the character.
-        */
-       if (!xmon) {
-               while (bdp->cbd_sc & BD_SC_EMPTY);
-       }
-       else {
-               if (bdp->cbd_sc & BD_SC_EMPTY)
-                       return -1;
-       }
-
-       /* If the buffer address is in the CPM DPRAM, don't
-        * convert it.
-        */
-       if ((uint)(bdp->cbd_bufaddr) > (uint)IMAP_ADDR)
-               cp = (u_char *)(bdp->cbd_bufaddr);
-       else
-               cp = __va(bdp->cbd_bufaddr);
-
-       if (obuf) {
-               i = c = bdp->cbd_datlen;
-               while (i-- > 0)
-                       *obuf++ = *cp++;
-       }
-       else {
-               c = *cp;
-       }
-       bdp->cbd_sc |= BD_SC_EMPTY;
-
-       if (info) {
-               if (bdp->cbd_sc & BD_SC_WRAP) {
-                       bdp = info->rx_bd_base;
-               }
-               else {
-                       bdp++;
-               }
-               info->rx_cur = (cbd_t *)bdp;
-       }
-
-       return((int)c);
-}
-#endif /* CONFIG_XMON || CONFIG_KGDB */
-
-#ifdef CONFIG_XMON
-int
-xmon_8xx_read_poll(void)
-{
-       return(my_console_wait_key(KGDB_SER_IDX, 1, NULL));
-}
-
-int
-xmon_8xx_read_char(void)
-{
-       return(my_console_wait_key(KGDB_SER_IDX, 0, NULL));
-}
-#endif
-
-#ifdef CONFIG_KGDB
-static char kgdb_buf[RX_BUF_SIZE], *kgdp;
-static int kgdb_chars;
-
-char
-getDebugChar(void)
-{
-       if (kgdb_chars <= 0) {
-               kgdb_chars = my_console_wait_key(KGDB_SER_IDX, 0, kgdb_buf);
-               kgdp = kgdb_buf;
-       }
-       kgdb_chars--;
-
-       return(*kgdp++);
-}
-
-void kgdb_interruptible(int yes)
-{
-       volatile smc_t  *smcp;
-
-       smcp = &immr->im_smc[KGDB_SER_IDX];
-
-       if (yes == 1)
-               smcp->smc_smcm |= SMCM_RX;
-       else
-               smcp->smc_smcm &= ~SMCM_RX;
-}
-
-void kgdb_map_scc(void)
-{
-       ushort          serbase;
-       uint            mem_addr;
-       volatile        cbd_t           *bdp;
-       volatile        smc_uart_t      *up;
-
-       /* The serial port has already been initialized before
-        * we get here.  We have to assign some pointers needed by
-        * the kernel, and grab a memory location in the CPM that will
-        * work until the driver is really initialized.
-        */
-       immr = (immap_t *)IMAP_ADDR;
-
-       /* Right now, assume we are using SMCs.
-       */
-#ifdef USE_KGDB_SMC2
-       *(ushort *)(&immr->im_dprambase[PROFF_SMC2_BASE]) = serbase = PROFF_SMC2;
-#else
-       *(ushort *)(&immr->im_dprambase[PROFF_SMC1_BASE]) = serbase = PROFF_SMC1;
-#endif
-       up = (smc_uart_t *)&immr->im_dprambase[serbase];
-
-       /* Allocate space for an input FIFO, plus a few bytes for output.
-        * Allocate bytes to maintain word alignment.
-        */
-       mem_addr = (uint)(&immr->im_dprambase[0x1000]);
-
-       /* Set the physical address of the host memory buffers in
-        * the buffer descriptors.
-        */
-       bdp = (cbd_t *)&immr->im_dprambase[up->smc_rbase];
-       bdp->cbd_bufaddr = mem_addr;
-
-       bdp = (cbd_t *)&immr->im_dprambase[up->smc_tbase];
-       bdp->cbd_bufaddr = mem_addr+RX_BUF_SIZE;
-
-       up->smc_mrblr = RX_BUF_SIZE;            /* receive buffer length */
-       up->smc_maxidl = RX_BUF_SIZE;
-}
-#endif
-
-static struct tty_driver *serial_console_device(struct console *c, int *index)
-{
-       *index = c->index;
-       return serial_driver;
-}
-
-/*
- *     Register console.
- */
-static int __init console_8xx_init(void)
-{
-       register_console(&sercons);
-       return 0;
-}
-
-console_initcall(console_8xx_init);
-
-#endif
-
-/* Default console baud rate as determined by the board information
- * structure.
- */
-static int     baud_idx;
-
-static struct tty_operations rs_8xx_ops = {
-       .open = rs_8xx_open,
-       .close = rs_8xx_close,
-       .write = rs_8xx_write,
-       .put_char = rs_8xx_put_char,
-       .write_room = rs_8xx_write_room,
-       .chars_in_buffer = rs_8xx_chars_in_buffer,
-       .flush_buffer = rs_8xx_flush_buffer,
-       .ioctl = rs_8xx_ioctl,
-       .throttle = rs_8xx_throttle,
-       .unthrottle = rs_8xx_unthrottle,
-       .send_xchar = rs_8xx_send_xchar,
-       .set_termios = rs_8xx_set_termios,
-       .stop = rs_8xx_stop,
-       .start = rs_8xx_start,
-       .hangup = rs_8xx_hangup,
-       .wait_until_sent = rs_8xx_wait_until_sent,
-       .read_proc = rs_8xx_read_proc,
-};
-
-/*
- * The serial driver boot-time initialization code!
- */
-static int __init rs_8xx_init(void)
-{
-       struct serial_state * state;
-       ser_info_t      *info;
-       uint            mem_addr, dp_addr;
-       int             i, j, idx;
-       uint            page, sblock;
-       volatile        cbd_t           *bdp;
-       volatile        cpm8260_t       *cp;
-       volatile        smc_t           *sp;
-       volatile        smc_uart_t      *up;
-       volatile        scc_t           *scp;
-       volatile        scc_uart_t      *sup;
-       volatile        immap_t         *immap;
-       volatile        iop8260_t       *io;
-
-       serial_driver = alloc_tty_driver(NR_PORTS);
-       if (!serial_driver)
-               return -ENOMEM;
-
-       show_serial_version();
-
-       /* Initialize the tty_driver structure */
-
-       serial_driver->owner = THIS_MODULE;
-       serial_driver->driver_name = "serial";
-       serial_driver->devfs_name = "tts/";
-       serial_driver->name = "ttyS";
-       serial_driver->major = TTY_MAJOR;
-       serial_driver->minor_start = 64;
-       serial_driver->type = TTY_DRIVER_TYPE_SERIAL;
-       serial_driver->subtype = SERIAL_TYPE_NORMAL;
-       serial_driver->init_termios = tty_std_termios;
-       serial_driver->init_termios.c_cflag =
-               baud_idx | CS8 | CREAD | HUPCL | CLOCAL;
-       serial_driver->flags = TTY_DRIVER_REAL_RAW;
-       tty_set_operations(serial_driver, &rs_8xx_ops);
-       if (tty_register_driver(serial_driver))
-               panic("Couldn't register serial driver\n");
-
-       immap = immr;
-       cp = &immap->im_cpm;
-       io = &immap->im_ioport;
-
-       /* This should have been done long ago by the early boot code,
-        * but do it again to make sure.
-        */
-       *(ushort *)(&immap->im_dprambase[PROFF_SMC1_BASE]) = PROFF_SMC1;
-       *(ushort *)(&immap->im_dprambase[PROFF_SMC2_BASE]) = PROFF_SMC2;
-
-       /* Geeze, here we go....Picking I/O port bits....Lots of
-        * choices.  If you don't like mine, pick your own.
-        * Configure SMCs Tx/Rx.  SMC1 is only on Port D, SMC2 is
-        * only on Port A.  You either pick 'em, or not.
-        */
-#ifndef SCC_CONSOLE
-       io->iop_ppard |= 0x00c00000;
-       io->iop_pdird |= 0x00400000;
-       io->iop_pdird &= ~0x00800000;
-       io->iop_psord &= ~0x00c00000;
-#ifdef USE_SMC2
-       io->iop_ppara |= 0x00c00000;
-       io->iop_pdira |= 0x00400000;
-       io->iop_pdira &= ~0x00800000;
-       io->iop_psora &= ~0x00c00000;
-#endif
-
-       /* Configure SCC2 and SCC3.  Be careful about the fine print.
-        * Secondary options are only available when you take away
-        * the primary option.  Unless the pins are used for something
-        * else, SCC2 and SCC3 are on Port B.
-        *      Port B,  8 - SCC3 TxD
-        *      Port B, 12 - SCC2 TxD
-        *      Port B, 14 - SCC3 RxD
-        *      Port B, 15 - SCC2 RxD
-        */
-       io->iop_pparb |= 0x008b0000;
-       io->iop_pdirb |= 0x00880000;
-       io->iop_psorb |= 0x00880000;
-       io->iop_pdirb &= ~0x00030000;
-       io->iop_psorb &= ~0x00030000;
-
-       /* Wire BRG1 to SMC1 and BRG2 to SMC2.
-       */
-       immap->im_cpmux.cmx_smr = 0;
-
-       /* Connect SCC2 and SCC3 to NMSI.  Connect BRG3 to SCC2 and
-        * BRG4 to SCC3.
-        */
-       immap->im_cpmux.cmx_scr &= ~0x00ffff00;
-       immap->im_cpmux.cmx_scr |= 0x00121b00;
-#else
-       io->iop_pparb |= 0x008b0000;
-       io->iop_pdirb |= 0x00880000;
-       io->iop_psorb |= 0x00880000;
-       io->iop_pdirb &= ~0x00030000;
-       io->iop_psorb &= ~0x00030000;
-
-       /* Use Port D for SCC1 instead of other functions.
-       */
-       io->iop_ppard |= 0x00000003;
-       io->iop_psord &= ~0x00000001;   /* Rx */
-       io->iop_psord |= 0x00000002;    /* Tx */
-       io->iop_pdird &= ~0x00000001;   /* Rx */
-       io->iop_pdird |= 0x00000002;    /* Tx */
-
-       /* Connect SCC1, SCC2, SCC3 to NMSI.  Connect BRG1 to SCC1,
-        * BRG2 to SCC2, BRG3 to SCC3.
-        */
-       immap->im_cpmux.cmx_scr &= ~0xffffff00;
-       immap->im_cpmux.cmx_scr |= 0x00091200;
-#endif
-
-       for (i = 0, state = rs_table; i < NR_PORTS; i++,state++) {
-               state->magic = SSTATE_MAGIC;
-               state->line = i;
-               state->type = PORT_UNKNOWN;
-               state->custom_divisor = 0;
-               state->close_delay = 5*HZ/10;
-               state->closing_wait = 30*HZ;
-               state->icount.cts = state->icount.dsr =
-                       state->icount.rng = state->icount.dcd = 0;
-               state->icount.rx = state->icount.tx = 0;
-               state->icount.frame = state->icount.parity = 0;
-               state->icount.overrun = state->icount.brk = 0;
-               printk (KERN_INFO "ttyS%d on %s%d at 0x%04x, BRG%d\n",
-                       i,
-                       (state->smc_scc_num < SCC_NUM_BASE) ? "SMC" : "SCC",
-                       PORT_NUM(state->smc_scc_num) + 1,
-                       (unsigned int)(state->port),
-                       state->smc_scc_num + 1);
-#ifdef CONFIG_SERIAL_CONSOLE
-               /* If we just printed the message on the console port, and
-                * we are about to initialize it for general use, we have
-                * to wait a couple of character times for the CR/NL to
-                * make it out of the transmit buffer.
-                */
-               if (i == CONFIG_SERIAL_CONSOLE_PORT)
-                       mdelay(300);
-#endif
-               info = kmalloc(sizeof(ser_info_t), GFP_KERNEL);
-               if (info) {
-                       /*memset(info, 0, sizeof(ser_info_t));*/
-                       __clear_user(info,sizeof(ser_info_t));
-                       init_waitqueue_head(&info->open_wait);
-                       init_waitqueue_head(&info->close_wait);
-                       info->magic = SERIAL_MAGIC;
-                       info->flags = state->flags;
-                       INIT_WORK(&info->tqueue, do_softint, info);
-                       INIT_WORK(&info->tqueue_hangup, do_serial_hangup, info);
-                       info->line = i;
-                       info->state = state;
-                       state->info = (struct async_struct *)info;
-
-                       /* We need to allocate a transmit and receive buffer
-                        * descriptors from dual port ram, and a character
-                        * buffer area from host mem.
-                        */
-                       dp_addr = m8260_cpm_dpalloc(sizeof(cbd_t) * RX_NUM_FIFO, 8);
-
-                       /* Allocate space for FIFOs in the host memory.
-                       */
-                       mem_addr = m8260_cpm_hostalloc(RX_NUM_FIFO * RX_BUF_SIZE, 1);
-
-                       /* Set the physical address of the host memory
-                        * buffers in the buffer descriptors, and the
-                        * virtual address for us to work with.
-                        */
-                       bdp = (cbd_t *)&immap->im_dprambase[dp_addr];
-                       info->rx_cur = info->rx_bd_base = (cbd_t *)bdp;
-
-                       for (j=0; j<(RX_NUM_FIFO-1); j++) {
-                               bdp->cbd_bufaddr = __pa(mem_addr);
-                               bdp->cbd_sc = BD_SC_EMPTY | BD_SC_INTRPT;
-                               mem_addr += RX_BUF_SIZE;
-                               bdp++;
-                       }
-                       bdp->cbd_bufaddr = __pa(mem_addr);
-                       bdp->cbd_sc = BD_SC_WRAP | BD_SC_EMPTY | BD_SC_INTRPT;
-
-                       if ((idx = state->smc_scc_num) < SCC_NUM_BASE) {
-                               sp = &immap->im_smc[idx];
-                               up = (smc_uart_t *)&immap->im_dprambase[state->port];
-                               up->smc_rbase = dp_addr;
-                       }
-                       else {
-                               scp = &immap->im_scc[idx - SCC_IDX_BASE];
-                               sup = (scc_uart_t *)&immap->im_dprambase[state->port];
-                               scp->scc_gsmrl &= ~(SCC_GSMRL_ENR | SCC_GSMRL_ENT);
-                               sup->scc_genscc.scc_rbase = dp_addr;
-                       }
-
-                       dp_addr = m8260_cpm_dpalloc(sizeof(cbd_t) * TX_NUM_FIFO, 8);
-
-                       /* Allocate space for FIFOs in the host memory.
-                       */
-                       mem_addr = m8260_cpm_hostalloc(TX_NUM_FIFO * TX_BUF_SIZE, 1);
-
-                       /* Set the physical address of the host memory
-                        * buffers in the buffer descriptors, and the
-                        * virtual address for us to work with.
-                        */
-                       bdp = (cbd_t *)&immap->im_dprambase[dp_addr];
-                       info->tx_cur = info->tx_bd_base = (cbd_t *)bdp;
-
-                       for (j=0; j<(TX_NUM_FIFO-1); j++) {
-                               bdp->cbd_bufaddr = __pa(mem_addr);
-                               bdp->cbd_sc = BD_SC_INTRPT;
-                               mem_addr += TX_BUF_SIZE;
-                               bdp++;
-                       }
-                       bdp->cbd_bufaddr = __pa(mem_addr);
-                       bdp->cbd_sc = (BD_SC_WRAP | BD_SC_INTRPT);
-
-                       if (idx < SCC_NUM_BASE) {
-                               up->smc_tbase = dp_addr;
-
-                               /* Set up the uart parameters in the
-                                * parameter ram.
-                                */
-                               up->smc_rfcr = CPMFCR_GBL | CPMFCR_EB;
-                               up->smc_tfcr = CPMFCR_GBL | CPMFCR_EB;
-
-                               /* Set this to 1 for now, so we get single
-                                * character interrupts.  Using idle charater
-                                * time requires some additional tuning.
-                                */
-                               up->smc_mrblr = 1;
-                               up->smc_maxidl = 0;
-                               up->smc_brkcr = 1;
-
-                               /* Send the CPM an initialize command.
-                               */
-                               if (state->smc_scc_num == 0) {
-                                       page = CPM_CR_SMC1_PAGE;
-                                       sblock = CPM_CR_SMC1_SBLOCK;
-                               }
-                               else {
-                                       page = CPM_CR_SMC2_PAGE;
-                                       sblock = CPM_CR_SMC2_SBLOCK;
-                               }
-
-                               cp->cp_cpcr = mk_cr_cmd(page, sblock, 0,
-                                               CPM_CR_INIT_TRX) | CPM_CR_FLG;
-                               while (cp->cp_cpcr & CPM_CR_FLG);
-
-                               /* Set UART mode, 8 bit, no parity, one stop.
-                                * Enable receive and transmit.
-                                */
-                               sp->smc_smcmr = smcr_mk_clen(9) | SMCMR_SM_UART;
-
-                               /* Disable all interrupts and clear all pending
-                                * events.
-                                */
-                               sp->smc_smcm = 0;
-                               sp->smc_smce = 0xff;
-                       }
-                       else {
-                               sup->scc_genscc.scc_tbase = dp_addr;
-
-                               /* Set up the uart parameters in the
-                                * parameter ram.
-                                */
-                               sup->scc_genscc.scc_rfcr = CPMFCR_GBL | CPMFCR_EB;
-                               sup->scc_genscc.scc_tfcr = CPMFCR_GBL | CPMFCR_EB;
-
-                               /* Set this to 1 for now, so we get single
-                                * character interrupts.  Using idle charater
-                                * time requires some additional tuning.
-                                */
-                               sup->scc_genscc.scc_mrblr = 1;
-                               sup->scc_maxidl = 0;
-                               sup->scc_brkcr = 1;
-                               sup->scc_parec = 0;
-                               sup->scc_frmec = 0;
-                               sup->scc_nosec = 0;
-                               sup->scc_brkec = 0;
-                               sup->scc_uaddr1 = 0;
-                               sup->scc_uaddr2 = 0;
-                               sup->scc_toseq = 0;
-                               sup->scc_char1 = 0x8000;
-                               sup->scc_char2 = 0x8000;
-                               sup->scc_char3 = 0x8000;
-                               sup->scc_char4 = 0x8000;
-                               sup->scc_char5 = 0x8000;
-                               sup->scc_char6 = 0x8000;
-                               sup->scc_char7 = 0x8000;
-                               sup->scc_char8 = 0x8000;
-                               sup->scc_rccm = 0xc0ff;
-
-                               /* Send the CPM an initialize command.
-                               */
-#ifdef SCC_CONSOLE
-                               switch (state->smc_scc_num) {
-                               case 0:
-                                       page = CPM_CR_SCC1_PAGE;
-                                       sblock = CPM_CR_SCC1_SBLOCK;
-                                       break;
-                               case 1:
-                                       page = CPM_CR_SCC2_PAGE;
-                                       sblock = CPM_CR_SCC2_SBLOCK;
-                                       break;
-                               case 2:
-                                       page = CPM_CR_SCC3_PAGE;
-                                       sblock = CPM_CR_SCC3_SBLOCK;
-                                       break;
-                               }
-#else
-                               if (state->smc_scc_num == 2) {
-                                       page = CPM_CR_SCC2_PAGE;
-                                       sblock = CPM_CR_SCC2_SBLOCK;
-                               }
-                               else {
-                                       page = CPM_CR_SCC3_PAGE;
-                                       sblock = CPM_CR_SCC3_SBLOCK;
-                               }
-#endif
-
-                               cp->cp_cpcr = mk_cr_cmd(page, sblock, 0,
-                                               CPM_CR_INIT_TRX) | CPM_CR_FLG;
-                               while (cp->cp_cpcr & CPM_CR_FLG);
-
-                               /* Set UART mode, 8 bit, no parity, one stop.
-                                * Enable receive and transmit.
-                                */
-                               scp->scc_gsmrh = 0;
-                               scp->scc_gsmrl =
-                                       (SCC_GSMRL_MODE_UART | SCC_GSMRL_TDCR_16 | SCC_GSMRL_RDCR_16);
-
-                               /* Disable all interrupts and clear all pending
-                                * events.
-                                */
-                               scp->scc_sccm = 0;
-                               scp->scc_scce = 0xffff;
-                               scp->scc_dsr = 0x7e7e;
-                               scp->scc_pmsr = 0x3000;
-                       }
-
-                       /* Install interrupt handler.
-                       */
-                       request_irq(state->irq, rs_8xx_interrupt, 0, "uart", info);
-
-                       /* Set up the baud rate generator.
-                       */
-                       m8260_cpm_setbrg(state->smc_scc_num,
-                                                       baud_table[baud_idx]);
-
-                       /* If the port is the console, enable Rx and Tx.
-                       */
-#ifdef CONFIG_SERIAL_CONSOLE
-                       if (i == CONFIG_SERIAL_CONSOLE_PORT) {
-                               if (idx < SCC_NUM_BASE)
-                                       sp->smc_smcmr |= SMCMR_REN | SMCMR_TEN;
-                               else
-                                       scp->scc_gsmrl |= (SCC_GSMRL_ENR | SCC_GSMRL_ENT);
-                       }
-#endif
-               }
-       }
-       return 0;
-}
-module_init(rs_8xx_init);
-
-/* This must always be called before the rs_8xx_init() function, otherwise
- * it blows away the port control information.
-*/
-static int __init serial_console_setup(struct console *co, char *options)
-{
-       struct          serial_state *ser;
-       uint            mem_addr, dp_addr, bidx;
-       volatile        cbd_t           *bdp;
-       volatile        cpm8260_t       *cp;
-       volatile        immap_t         *immap;
-#ifndef SCC_CONSOLE
-       volatile        smc_t           *sp;
-       volatile        smc_uart_t      *up;
-#endif
-#ifdef SCC_CONSOLE
-       volatile        scc_t           *scp;
-       volatile        scc_uart_t      *sup;
-#endif
-       volatile        iop8260_t       *io;
-       bd_t                            *bd;
-
-       bd = (bd_t *)__res;
-
-       for (bidx = 0; bidx < (sizeof(baud_table) / sizeof(int)); bidx++)
-               if (bd->bi_baudrate == baud_table[bidx])
-                       break;
-
-       co->cflag = CREAD|CLOCAL|bidx|CS8;
-       baud_idx = bidx;
-
-       ser = rs_table + co->index;
-
-       immap = immr;
-       cp = &immap->im_cpm;
-       io = &immap->im_ioport;
-
-#ifdef SCC_CONSOLE
-       scp = (scc_t *)&(immap->im_scc[SCC_CONSOLE-1]);
-       sup = (scc_uart_t *)&immap->im_dprambase[PROFF_SCC1 + ((SCC_CONSOLE-1) << 8)];
-       scp->scc_sccm &= ~(UART_SCCM_TX | UART_SCCM_RX);
-       scp->scc_gsmrl &= ~(SCC_GSMRL_ENR | SCC_GSMRL_ENT);
-
-       /* Use Port D for SCC1 instead of other functions.
-       */
-       io->iop_ppard |= 0x00000003;
-       io->iop_psord &= ~0x00000001;   /* Rx */
-       io->iop_psord |= 0x00000002;    /* Tx */
-       io->iop_pdird &= ~0x00000001;   /* Rx */
-       io->iop_pdird |= 0x00000002;    /* Tx */
-
-#else
-       /* This should have been done long ago by the early boot code,
-        * but do it again to make sure.
-        */
-       *(ushort *)(&immap->im_dprambase[PROFF_SMC1_BASE]) = PROFF_SMC1;
-       *(ushort *)(&immap->im_dprambase[PROFF_SMC2_BASE]) = PROFF_SMC2;
-
-       /* Right now, assume we are using SMCs.
-       */
-       sp = &immap->im_smc[ser->smc_scc_num];
-
-       /* When we get here, the CPM has been reset, so we need
-        * to configure the port.
-        * We need to allocate a transmit and receive buffer descriptor
-        * from dual port ram, and a character buffer area from host mem.
-        */
-       up = (smc_uart_t *)&immap->im_dprambase[ser->port];
-
-       /* Disable transmitter/receiver.
-       */
-       sp->smc_smcmr &= ~(SMCMR_REN | SMCMR_TEN);
-
-       /* Use Port D for SMC1 instead of other functions.
-       */
-       io->iop_ppard |= 0x00c00000;
-       io->iop_pdird |= 0x00400000;
-       io->iop_pdird &= ~0x00800000;
-       io->iop_psord &= ~0x00c00000;
-#endif
-
-       /* Allocate space for two buffer descriptors in the DP ram.
-       */
-       dp_addr = m8260_cpm_dpalloc(sizeof(cbd_t) * 2, 8);
-
-       /* Allocate space for two 2 byte FIFOs in the host memory.
-       */
-       mem_addr = m8260_cpm_hostalloc(4, 1);
-
-       /* Set the physical address of the host memory buffers in
-        * the buffer descriptors.
-        */
-       bdp = (cbd_t *)&immap->im_dprambase[dp_addr];
-       bdp->cbd_bufaddr = __pa(mem_addr);
-       (bdp+1)->cbd_bufaddr = __pa(mem_addr+2);
-
-       /* For the receive, set empty and wrap.
-        * For transmit, set wrap.
-        */
-       bdp->cbd_sc = BD_SC_EMPTY | BD_SC_WRAP;
-       (bdp+1)->cbd_sc = BD_SC_WRAP;
-
-       /* Set up the uart parameters in the parameter ram.
-       */
-#ifdef SCC_CONSOLE
-       sup->scc_genscc.scc_rbase = dp_addr;
-       sup->scc_genscc.scc_tbase = dp_addr + sizeof(cbd_t);
-
-       /* Set up the uart parameters in the
-        * parameter ram.
-        */
-       sup->scc_genscc.scc_rfcr = CPMFCR_GBL | CPMFCR_EB;
-       sup->scc_genscc.scc_tfcr = CPMFCR_GBL | CPMFCR_EB;
-
-       sup->scc_genscc.scc_mrblr = 1;
-       sup->scc_maxidl = 0;
-       sup->scc_brkcr = 1;
-       sup->scc_parec = 0;
-       sup->scc_frmec = 0;
-       sup->scc_nosec = 0;
-       sup->scc_brkec = 0;
-       sup->scc_uaddr1 = 0;
-       sup->scc_uaddr2 = 0;
-       sup->scc_toseq = 0;
-       sup->scc_char1 = 0x8000;
-       sup->scc_char2 = 0x8000;
-       sup->scc_char3 = 0x8000;
-       sup->scc_char4 = 0x8000;
-       sup->scc_char5 = 0x8000;
-       sup->scc_char6 = 0x8000;
-       sup->scc_char7 = 0x8000;
-       sup->scc_char8 = 0x8000;
-       sup->scc_rccm = 0xc0ff;
-
-       /* Send the CPM an initialize command.
-       */
-       cp->cp_cpcr = mk_cr_cmd(CPM_CR_SCC1_PAGE, CPM_CR_SCC1_SBLOCK, 0,
-                       CPM_CR_INIT_TRX) | CPM_CR_FLG;
-       while (cp->cp_cpcr & CPM_CR_FLG);
-
-       /* Set UART mode, 8 bit, no parity, one stop.
-        * Enable receive and transmit.
-        */
-       scp->scc_gsmrh = 0;
-       scp->scc_gsmrl =
-               (SCC_GSMRL_MODE_UART | SCC_GSMRL_TDCR_16 | SCC_GSMRL_RDCR_16);
-
-       /* Disable all interrupts and clear all pending
-        * events.
-        */
-       scp->scc_sccm = 0;
-       scp->scc_scce = 0xffff;
-       scp->scc_dsr = 0x7e7e;
-       scp->scc_pmsr = 0x3000;
-
-       /* Wire BRG1 to SCC1.  The serial init will take care of
-        * others.
-        */
-       immap->im_cpmux.cmx_scr = 0;
-
-       /* Set up the baud rate generator.
-       */
-       m8260_cpm_setbrg(ser->smc_scc_num, bd->bi_baudrate);
-
-       scp->scc_gsmrl |= (SCC_GSMRL_ENR | SCC_GSMRL_ENT);
-#else
-       up->smc_rbase = dp_addr;        /* Base of receive buffer desc. */
-       up->smc_tbase = dp_addr+sizeof(cbd_t);  /* Base of xmt buffer desc. */
-       up->smc_rfcr = CPMFCR_GBL | CPMFCR_EB;
-       up->smc_tfcr = CPMFCR_GBL | CPMFCR_EB;
-
-       /* Set this to 1 for now, so we get single character interrupts.
-       */
-       up->smc_mrblr = 1;              /* receive buffer length */
-       up->smc_maxidl = 0;             /* wait forever for next char */
-
-       /* Send the CPM an initialize command.
-       */
-       cp->cp_cpcr = mk_cr_cmd(CPM_CR_SMC1_PAGE, CPM_CR_SMC1_SBLOCK, 0,
-                       CPM_CR_INIT_TRX) | CPM_CR_FLG;
-       while (cp->cp_cpcr & CPM_CR_FLG);
-
-       /* Set UART mode, 8 bit, no parity, one stop.
-        * Enable receive and transmit.
-        */
-       sp->smc_smcmr = smcr_mk_clen(9) |  SMCMR_SM_UART;
-
-       /* Set up the baud rate generator.
-       */
-       m8260_cpm_setbrg(ser->smc_scc_num, bd->bi_baudrate);
-
-       /* And finally, enable Rx and Tx.
-       */
-       sp->smc_smcmr |= SMCMR_REN | SMCMR_TEN;
-#endif
-
-       return 0;
-}
diff --git a/arch/ppc/boot/simple/misc-mv64x60.S b/arch/ppc/boot/simple/misc-mv64x60.S
deleted file mode 100644 (file)
index 9c809c8..0000000
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * arch/ppc/boot/simple/misc-mv64x60.S
- * 
- * Code to change the base address of the host bridges and call board specific
- * init routine.
- *
- * Author: Mark Greer <mgreer@mvista.com>
- *
- * 2002 (c) MontaVista, Software, Inc.  This file is licensed under the terms
- * of the GNU General Public License version 2.  This program is licensed
- * "as is" without any warranty of any kind, whether express or implied.
- */
-
-#include <linux/config.h>
-#include <asm/ppc_asm.h>
-#include <asm/processor.h>
-#include <asm/cache.h>
-#include <asm/mv64x60_defs.h>
-
-       .globl  mv64x60_init
-mv64x60_init:
-       mflr    r27
-
-#if (CONFIG_MV64X60_NEW_BASE != CONFIG_MV64X60_BASE)
-       bl      move_base
-#endif
-       bl      mv64x60_board_init
-
-       mtlr    r27
-       blr
-
-#if (CONFIG_MV64X60_NEW_BASE != CONFIG_MV64X60_BASE)
-move_base:
-       li      r20,0
-       li      r23,20
-
-       /* Relocate bridge's regs */
-        addis  r25,0,CONFIG_MV64X60_BASE@h
-        ori    r25,r25,MV64x60_INTERNAL_SPACE_DECODE             
-        lwbrx  r26,0,(r25)
-       lis     r24,0xffff
-       and     r26,r26,r24
-       addis   r24,0,CONFIG_MV64X60_NEW_BASE@h
-       srw     r24,r24,r23
-       or      r26,r26,r24
-        stwbrx  r26,0,(r25)
-       sync
-
-       /* Wait for write to take effect */
-        addis  r25,0,CONFIG_MV64X60_NEW_BASE@h
-       ori     r25,r25,MV64x60_INTERNAL_SPACE_DECODE
-1:     lwbrx   r24,0,(r25)
-       cmpw    r24,r26
-       bne     1b
-
-       blr
-#endif
diff --git a/arch/ppc/boot/simple/mpc52xx_tty.c b/arch/ppc/boot/simple/mpc52xx_tty.c
deleted file mode 100644 (file)
index 8a1c663..0000000
+++ /dev/null
@@ -1,138 +0,0 @@
-/*
- * arch/ppc/boot/simple/mpc52xx_tty.c
- *
- * Minimal serial functions needed to send messages out a MPC52xx
- * Programmable Serial Controller (PSC).
- *
- * Author: Dale Farnsworth <dfarnsworth@mvista.com>
- *
- * 2003-2004 (c) MontaVista, Software, Inc.  This file is licensed under the
- * terms of the GNU General Public License version 2.  This program is licensed
- * "as is" without any warranty of any kind, whether express or implied.
- */
-
-#include <linux/config.h>
-#include <linux/types.h>
-#include <asm/uaccess.h>
-#include <asm/mpc52xx.h>
-#include <asm/mpc52xx_psc.h>
-#include <asm/serial.h>
-#include <asm/time.h>
-
-#if MPC52xx_PF_CONSOLE_PORT == 0
-#define MPC52xx_CONSOLE                MPC52xx_PSC1
-#define MPC52xx_PSC_CONFIG_SHIFT       0
-#elif MPC52xx_PF_CONSOLE_PORT == 1
-#define MPC52xx_CONSOLE                MPC52xx_PSC2
-#define MPC52xx_PSC_CONFIG_SHIFT       4
-#elif MPC52xx_PF_CONSOLE_PORT == 2
-#define MPC52xx_CONSOLE                MPC52xx_PSC3
-#define MPC52xx_PSC_CONFIG_SHIFT       8
-#else
-#error "MPC52xx_PF_CONSOLE_PORT not defined"
-#endif
-
-static struct mpc52xx_psc *psc = (struct mpc52xx_psc *)MPC52xx_CONSOLE;
-
-/* The decrementer counts at the system bus clock frequency
- * divided by four.  The most accurate time base is connected to the
- * rtc.  We read the decrementer change during one rtc tick (one second)
- * and multiply by 4 to get the system bus clock frequency.
- */
-int
-mpc52xx_ipbfreq(void)
-{
-       struct mpc52xx_rtc *rtc = (struct mpc52xx_rtc*)MPC52xx_RTC;
-       struct mpc52xx_cdm *cdm = (struct mpc52xx_cdm*)MPC52xx_CDM;
-       int current_time, previous_time;
-       int tbl_start, tbl_end;
-       int xlbfreq, ipbfreq;
-
-       out_be32(&rtc->dividers, 0x8f1f0000);   /* Set RTC 64x faster */
-       previous_time = in_be32(&rtc->time);
-       while ((current_time = in_be32(&rtc->time)) == previous_time) ;
-       tbl_start = get_tbl();
-       previous_time = current_time;
-       while ((current_time = in_be32(&rtc->time)) == previous_time) ;
-       tbl_end = get_tbl();
-       out_be32(&rtc->dividers, 0xffff0000);   /* Restore RTC */
-
-       xlbfreq = (tbl_end - tbl_start) << 8;
-       ipbfreq = (in_8(&cdm->ipb_clk_sel) & 1) ? xlbfreq / 2 : xlbfreq;
-
-       return ipbfreq;
-}
-
-unsigned long
-serial_init(int ignored, void *ignored2)
-{
-       struct mpc52xx_gpio *gpio = (struct mpc52xx_gpio *)MPC52xx_GPIO;
-       int divisor;
-       int mode1;
-       int mode2;
-       u32 val32;
-
-       static int been_here = 0;
-
-       if (been_here)
-               return 0;
-
-       been_here = 1;
-
-       val32 = in_be32(&gpio->port_config);
-       val32 &= ~(0x7 << MPC52xx_PSC_CONFIG_SHIFT);
-       val32 |= MPC52xx_GPIO_PSC_CONFIG_UART_WITHOUT_CD
-                               << MPC52xx_PSC_CONFIG_SHIFT;
-       out_be32(&gpio->port_config, val32);
-
-       out_8(&psc->command, MPC52xx_PSC_RST_TX
-                       | MPC52xx_PSC_RX_DISABLE | MPC52xx_PSC_TX_ENABLE);
-       out_8(&psc->command, MPC52xx_PSC_RST_RX);
-
-       out_be32(&psc->sicr, 0x0);
-       out_be16(&psc->mpc52xx_psc_clock_select, 0xdd00);
-       out_be16(&psc->tfalarm, 0xf8);
-
-       out_8(&psc->command, MPC52xx_PSC_SEL_MODE_REG_1
-                       | MPC52xx_PSC_RX_ENABLE
-                       | MPC52xx_PSC_TX_ENABLE);
-
-       divisor = ((mpc52xx_ipbfreq()
-                       / (CONFIG_SERIAL_MPC52xx_CONSOLE_BAUD * 16)) + 1) >> 1;
-
-       mode1 = MPC52xx_PSC_MODE_8_BITS | MPC52xx_PSC_MODE_PARNONE
-                       | MPC52xx_PSC_MODE_ERR;
-       mode2 = MPC52xx_PSC_MODE_ONE_STOP;
-
-       out_8(&psc->ctur, divisor>>8);
-       out_8(&psc->ctlr, divisor);
-       out_8(&psc->command, MPC52xx_PSC_SEL_MODE_REG_1);
-       out_8(&psc->mode, mode1);
-       out_8(&psc->mode, mode2);
-
-       return 0;       /* ignored */
-}
-
-void
-serial_putc(void *ignored, const char c)
-{
-       serial_init(0, 0);
-
-       while (!(in_be16(&psc->mpc52xx_psc_status) & MPC52xx_PSC_SR_TXEMP)) ;
-       out_8(&psc->mpc52xx_psc_buffer_8, c);
-       while (!(in_be16(&psc->mpc52xx_psc_status) & MPC52xx_PSC_SR_TXEMP)) ;
-}
-
-char
-serial_getc(void *ignored)
-{
-       while (!(in_be16(&psc->mpc52xx_psc_status) & MPC52xx_PSC_SR_RXRDY)) ;
-
-       return in_8(&psc->mpc52xx_psc_buffer_8);
-}
-
-int
-serial_tstc(void *ignored)
-{
-       return (in_be16(&psc->mpc52xx_psc_status) & MPC52xx_PSC_SR_RXRDY) != 0;
-}
diff --git a/arch/ppc/boot/simple/mv64x60_stub.c b/arch/ppc/boot/simple/mv64x60_stub.c
deleted file mode 100644 (file)
index 46d9924..0000000
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * arch/ppc/boot/simple/mv64x60_stub.c
- *
- * Stub for board_init() routine called from mv64x60_init().
- *
- * Author: Mark A. Greer <mgreer@mvista.com>
- *
- * 2002 (c) MontaVista, Software, Inc.  This file is licensed under the terms
- * of the GNU General Public License version 2.  This program is licensed
- * "as is" without any warranty of any kind, whether express or implied.
- */
-
-long   mv64x60_console_baud = 9600;            /* Default baud: 9600 */
-long   mv64x60_mpsc_clk_src = 8;               /* Default clk src: TCLK */
-long   mv64x60_mpsc_clk_freq = 100000000;      /* Default clk freq: 100 MHz */
-
-void
-mv64x60_board_init(void)
-{
-}
diff --git a/arch/ppc/boot/simple/mv64x60_tty.c b/arch/ppc/boot/simple/mv64x60_tty.c
deleted file mode 100644 (file)
index b1cb21a..0000000
+++ /dev/null
@@ -1,331 +0,0 @@
-/*
- * arch/ppc/boot/simple/mv64x60_tty.c
- * 
- * Bootloader version of the embedded MPSC/UART driver for the Marvell 64x60.
- * Note: Due to a GT64260A erratum, DMA will be used for UART input (via SDMA).
- *
- * Author: Mark A. Greer <mgreer@mvista.com>
- *
- * Copyright 2001 MontaVista Software 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.
- */
-
-/* This code assumes that the data cache has been disabled (L1, L2, L3). */
-
-#include <linux/config.h>
-#include <linux/types.h>
-#include <linux/serial_reg.h>
-#include <asm/serial.h>
-#include <asm/mv64x60_defs.h>
-#include "../../../../drivers/serial/mpsc/mpsc_defs.h"
-
-extern void udelay(long);
-static void stop_dma(int chan);
-
-static u32     mv64x60_base = CONFIG_MV64X60_NEW_BASE;
-
-inline unsigned
-mv64x60_in_le32(volatile unsigned *addr)
-{
-       unsigned ret;
-
-       __asm__ __volatile__("lwbrx %0,0,%1; eieio" : "=r" (ret) :
-                                    "r" (addr), "m" (*addr));
-       return ret;
-}
-
-inline void
-mv64x60_out_le32(volatile unsigned *addr, int val)
-{
-       __asm__ __volatile__("stwbrx %1,0,%2; eieio" : "=m" (*addr) :
-                                    "r" (val), "r" (addr));
-}
-
-#define MV64x60_REG_READ(offs)                                         \
-       (mv64x60_in_le32((volatile uint *)(mv64x60_base + (offs))))
-#define MV64x60_REG_WRITE(offs, d)                                     \
-        (mv64x60_out_le32((volatile uint *)(mv64x60_base + (offs)), (int)(d)))
-
-
-typedef struct {
-       u32     sdc;
-       u32     sdcm;
-       u32     rx_desc;
-       u32     rx_buf_ptr;
-       u32     scrdp;
-       u32     tx_desc;
-       u32     sctdp;
-       u32     sftdp;
-} sdma_regs_t;
-
-static sdma_regs_t  sdma_regs[2];
-
-#define        SDMA_REGS_INIT(s, reg_base) {                   \
-       (s)->sdc        = (reg_base) + SDMA_SDC;        \
-       (s)->sdcm       = (reg_base) + SDMA_SDCM;       \
-       (s)->rx_desc    = (reg_base) + SDMA_RX_DESC;    \
-       (s)->rx_buf_ptr = (reg_base) + SDMA_RX_BUF_PTR; \
-       (s)->scrdp      = (reg_base) + SDMA_SCRDP;      \
-       (s)->tx_desc    = (reg_base) + SDMA_TX_DESC;    \
-       (s)->sctdp      = (reg_base) + SDMA_SCTDP;      \
-       (s)->sftdp      = (reg_base) + SDMA_SFTDP;      \
-}
-
-typedef struct {
-       volatile u16 bufsize;
-       volatile u16 bytecnt;
-       volatile u32 cmd_stat;
-       volatile u32 next_desc_ptr;
-       volatile u32 buffer;
-} mv64x60_rx_desc_t;
-
-typedef struct {
-       volatile u16 bytecnt;
-       volatile u16 shadow;
-       volatile u32 cmd_stat;
-       volatile u32 next_desc_ptr;
-       volatile u32 buffer;
-} mv64x60_tx_desc_t;
-
-#define        MAX_RESET_WAIT  10000
-#define        MAX_TX_WAIT     10000
-
-#define        RX_NUM_DESC     2
-#define        TX_NUM_DESC     2
-
-#define        RX_BUF_SIZE     16
-#define        TX_BUF_SIZE     16
-
-static mv64x60_rx_desc_t rd[2][RX_NUM_DESC] __attribute__ ((aligned(32)));
-static mv64x60_tx_desc_t td[2][TX_NUM_DESC] __attribute__ ((aligned(32)));
-
-static char rx_buf[2][RX_NUM_DESC * RX_BUF_SIZE] __attribute__ ((aligned(32)));
-static char tx_buf[2][TX_NUM_DESC * TX_BUF_SIZE] __attribute__ ((aligned(32)));
-
-static int cur_rd[2] = { 0, 0 };
-static int cur_td[2] = { 0, 0 };
-
-static char chan_initialized[2] = { 0, 0 };
-
-
-#define        RX_INIT_RDP(rdp) {                      \
-       (rdp)->bufsize = 2;                     \
-       (rdp)->bytecnt = 0;                     \
-       (rdp)->cmd_stat = SDMA_DESC_CMDSTAT_L | \
-                         SDMA_DESC_CMDSTAT_F | \
-                         SDMA_DESC_CMDSTAT_O;  \
-}
-
-unsigned long
-serial_init(int chan, void *ignored)
-{
-       u32             mpsc_base, mpsc_routing_base, sdma_base, brg_bcr, cdv;
-       int             i;
-       extern long     mv64x60_console_baud;
-       extern long     mv64x60_mpsc_clk_src;
-       extern long     mv64x60_mpsc_clk_freq;
-
-       chan = (chan == 1);  /* default to chan 0 if anything but 1 */
-
-       if (chan_initialized[chan]) return chan;
-
-       chan_initialized[chan] = 1;
-
-       if (chan == 0) {
-               mpsc_base = MV64x60_MPSC_0_OFFSET;
-               sdma_base = MV64x60_SDMA_0_OFFSET;
-               brg_bcr = MV64x60_BRG_0_OFFSET + BRG_BCR;
-               SDMA_REGS_INIT(&sdma_regs[0], MV64x60_SDMA_0_OFFSET);
-       }
-       else {
-               mpsc_base = MV64x60_MPSC_1_OFFSET;
-               sdma_base = MV64x60_SDMA_1_OFFSET;
-               brg_bcr = MV64x60_BRG_1_OFFSET + BRG_BCR;
-               SDMA_REGS_INIT(&sdma_regs[0], MV64x60_SDMA_1_OFFSET);
-       }
-
-       mpsc_routing_base = MV64x60_MPSC_ROUTING_OFFSET;
-
-       stop_dma(chan);
-
-       /* Set up ring buffers */
-       for (i=0; i<RX_NUM_DESC; i++) {
-               RX_INIT_RDP(&rd[chan][i]);
-               rd[chan][i].buffer = (u32)&rx_buf[chan][i * RX_BUF_SIZE];
-               rd[chan][i].next_desc_ptr = (u32)&rd[chan][i+1];
-       }
-       rd[chan][RX_NUM_DESC - 1].next_desc_ptr = (u32)&rd[chan][0];
-
-       for (i=0; i<TX_NUM_DESC; i++) {
-               td[chan][i].bytecnt = 0;
-               td[chan][i].shadow = 0;
-               td[chan][i].buffer = (u32)&tx_buf[chan][i * TX_BUF_SIZE];
-               td[chan][i].cmd_stat = SDMA_DESC_CMDSTAT_F|SDMA_DESC_CMDSTAT_L;
-               td[chan][i].next_desc_ptr = (u32)&td[chan][i+1];
-       }
-       td[chan][TX_NUM_DESC - 1].next_desc_ptr = (u32)&td[chan][0];
-
-       /* Set MPSC Routing */
-        MV64x60_REG_WRITE(mpsc_routing_base + MPSC_MRR, 0x3ffffe38);
-
-/* XXXX Not for 64360 XXXX*/
-        MV64x60_REG_WRITE(GT64260_MPP_SERIAL_PORTS_MULTIPLEX, 0x00001102);
-
-       /* MPSC 0/1 Rx & Tx get clocks BRG0/1 */
-        MV64x60_REG_WRITE(mpsc_routing_base + MPSC_RCRR, 0x00000100);
-        MV64x60_REG_WRITE(mpsc_routing_base + MPSC_TCRR, 0x00000100);
-
-       /* clear pending interrupts */
-        MV64x60_REG_WRITE(MV64x60_SDMA_INTR_OFFSET + SDMA_INTR_MASK, 0);
-
-       MV64x60_REG_WRITE(SDMA_SCRDP + sdma_base, &rd[chan][0]);
-       MV64x60_REG_WRITE(SDMA_SCTDP + sdma_base, &td[chan][TX_NUM_DESC - 1]);
-       MV64x60_REG_WRITE(SDMA_SFTDP + sdma_base, &td[chan][TX_NUM_DESC - 1]);
-
-       MV64x60_REG_WRITE(SDMA_SDC + sdma_base,
-                 SDMA_SDC_RFT | SDMA_SDC_SFM | SDMA_SDC_BLMR | SDMA_SDC_BLMT |
-                 (3 << 12));
-
-       cdv = ((mv64x60_mpsc_clk_freq/(32*mv64x60_console_baud))-1);
-       MV64x60_REG_WRITE(brg_bcr,
-               ((mv64x60_mpsc_clk_src << 18) | (1 << 16) | cdv));
-
-       /* Put MPSC into UART mode, no null modem, 16x clock mode */
-       MV64x60_REG_WRITE(MPSC_MMCRL + mpsc_base, 0x000004c4);
-       MV64x60_REG_WRITE(MPSC_MMCRH + mpsc_base, 0x04400400);
-
-        MV64x60_REG_WRITE(MPSC_CHR_1 + mpsc_base, 0);
-        MV64x60_REG_WRITE(MPSC_CHR_9 + mpsc_base, 0);
-        MV64x60_REG_WRITE(MPSC_CHR_10 + mpsc_base, 0);
-        MV64x60_REG_WRITE(MPSC_CHR_3 + mpsc_base, 4);
-        MV64x60_REG_WRITE(MPSC_CHR_4 + mpsc_base, 0);
-        MV64x60_REG_WRITE(MPSC_CHR_5 + mpsc_base, 0);
-        MV64x60_REG_WRITE(MPSC_CHR_6 + mpsc_base, 0);
-        MV64x60_REG_WRITE(MPSC_CHR_7 + mpsc_base, 0);
-        MV64x60_REG_WRITE(MPSC_CHR_8 + mpsc_base, 0);
-
-       /* 8 data bits, 1 stop bit */
-       MV64x60_REG_WRITE(MPSC_MPCR + mpsc_base, (3 << 12));
-       MV64x60_REG_WRITE(SDMA_SDCM + sdma_base, SDMA_SDCM_ERD);
-       MV64x60_REG_WRITE(MPSC_CHR_2 + mpsc_base, MPSC_CHR_2_EH);
-
-       udelay(100);
-
-       return chan;
-}
-
-static void
-stop_dma(int chan)
-{
-       int     i;
-
-       /* Abort SDMA Rx, Tx */
-       MV64x60_REG_WRITE(sdma_regs[chan].sdcm, SDMA_SDCM_AR | SDMA_SDCM_STD);
-
-       for (i=0; i<MAX_RESET_WAIT; i++) {
-               if ((MV64x60_REG_READ(sdma_regs[chan].sdcm) &
-                       (SDMA_SDCM_AR | SDMA_SDCM_AT)) == 0) {
-                       break;
-               }
-               udelay(100);
-       }
-
-       return;
-}
-
-static int
-wait_for_ownership(int chan)
-{
-       int     i;
-
-       for (i=0; i<MAX_TX_WAIT; i++) {
-               if ((MV64x60_REG_READ(sdma_regs[chan].sdcm) &
-                                       SDMA_SDCM_TXD) == 0)
-                       break;
-               udelay(1000);
-       }
-
-       return (i < MAX_TX_WAIT);
-}
-
-void
-serial_putc(unsigned long com_port, unsigned char c)
-{
-       mv64x60_tx_desc_t       *tdp;
-
-       if (wait_for_ownership(com_port) == 0) return;
-
-       tdp = &td[com_port][cur_td[com_port]];
-       if (++cur_td[com_port] >= TX_NUM_DESC) cur_td[com_port] = 0;
-
-       *(unchar *)(tdp->buffer ^ 7) = c;
-       tdp->bytecnt = 1;
-       tdp->shadow = 1;
-       tdp->cmd_stat = SDMA_DESC_CMDSTAT_L | SDMA_DESC_CMDSTAT_F |
-               SDMA_DESC_CMDSTAT_O;
-
-       MV64x60_REG_WRITE(sdma_regs[com_port].sctdp, tdp);
-       MV64x60_REG_WRITE(sdma_regs[com_port].sftdp, tdp);
-       MV64x60_REG_WRITE(sdma_regs[com_port].sdcm,
-               MV64x60_REG_READ(sdma_regs[com_port].sdcm) | SDMA_SDCM_TXD);
-
-       return;
-}
-
-unsigned char
-serial_getc(unsigned long com_port)
-{
-       mv64x60_rx_desc_t       *rdp;
-       unchar                  c = '\0';
-
-       rdp = &rd[com_port][cur_rd[com_port]];
-
-       if ((rdp->cmd_stat & (SDMA_DESC_CMDSTAT_O|SDMA_DESC_CMDSTAT_ES)) == 0) {
-               c = *(unchar *)(rdp->buffer ^ 7);
-               RX_INIT_RDP(rdp);
-               if (++cur_rd[com_port] >= RX_NUM_DESC) cur_rd[com_port] = 0;
-       }
-
-       return c;
-}
-
-int
-serial_tstc(unsigned long com_port)
-{
-       mv64x60_rx_desc_t       *rdp;
-       int                     loop_count = 0;
-       int                     rc = 0;
-
-       rdp = &rd[com_port][cur_rd[com_port]];
-
-       /* Go thru rcv desc's until empty looking for one with data (no error)*/
-       while (((rdp->cmd_stat & SDMA_DESC_CMDSTAT_O) == 0) &&
-              (loop_count++ < RX_NUM_DESC)) {
-
-               /* If there was an error, reinit the desc & continue */
-               if ((rdp->cmd_stat & SDMA_DESC_CMDSTAT_ES) != 0) {
-                       RX_INIT_RDP(rdp);
-                       if (++cur_rd[com_port] >= RX_NUM_DESC) {
-                               cur_rd[com_port] = 0;
-                       }
-                       rdp = (mv64x60_rx_desc_t *)rdp->next_desc_ptr;
-               }
-               else {
-                       rc = 1;
-                       break;
-               }
-       }
-
-       return rc;
-}
-
-void
-serial_close(unsigned long com_port)
-{
-       stop_dma(com_port);
-       return;
-}
diff --git a/arch/ppc/configs/lite5200_defconfig b/arch/ppc/configs/lite5200_defconfig
deleted file mode 100644 (file)
index 7e7a943..0000000
+++ /dev/null
@@ -1,436 +0,0 @@
-#
-# Automatically generated make config: don't edit
-#
-CONFIG_MMU=y
-CONFIG_RWSEM_XCHGADD_ALGORITHM=y
-CONFIG_HAVE_DEC_LOCK=y
-CONFIG_PPC=y
-CONFIG_PPC32=y
-CONFIG_GENERIC_NVRAM=y
-#
-# Code maturity level options
-#
-CONFIG_EXPERIMENTAL=y
-CONFIG_CLEAN_COMPILE=y
-CONFIG_STANDALONE=y
-CONFIG_BROKEN_ON_SMP=y
-#
-# General setup
-#
-CONFIG_SWAP=y
-CONFIG_SYSVIPC=y
-# CONFIG_BSD_PROCESS_ACCT is not set
-CONFIG_SYSCTL=y
-# CONFIG_AUDIT is not set
-CONFIG_LOG_BUF_SHIFT=14
-# CONFIG_HOTPLUG is not set
-# CONFIG_IKCONFIG is not set
-# CONFIG_EMBEDDED is not set
-CONFIG_KALLSYMS=y
-# CONFIG_KALLSYMS_ALL is not set
-# CONFIG_KALLSYMS_EXTRA_PASS is not set
-CONFIG_FUTEX=y
-CONFIG_EPOLL=y
-CONFIG_IOSCHED_NOOP=y
-CONFIG_IOSCHED_AS=y
-CONFIG_IOSCHED_DEADLINE=y
-CONFIG_IOSCHED_CFQ=y
-# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
-#
-# Loadable module support
-#
-CONFIG_MODULES=y
-CONFIG_MODULE_UNLOAD=y
-# CONFIG_MODULE_FORCE_UNLOAD is not set
-CONFIG_OBSOLETE_MODPARM=y
-CONFIG_MODVERSIONS=y
-CONFIG_KMOD=y
-#
-# Processor
-#
-CONFIG_6xx=y
-# CONFIG_40x is not set
-# CONFIG_44x is not set
-# CONFIG_POWER3 is not set
-# CONFIG_POWER4 is not set
-# CONFIG_8xx is not set
-# CONFIG_E500 is not set
-# CONFIG_ALTIVEC is not set
-# CONFIG_TAU is not set
-# CONFIG_CPU_FREQ is not set
-CONFIG_FSL_OCP=y
-CONFIG_PPC_STD_MMU=y
-#
-# Platform options
-#
-# CONFIG_PPC_MULTIPLATFORM is not set
-# CONFIG_APUS is not set
-# CONFIG_WILLOW is not set
-# CONFIG_PCORE is not set
-# CONFIG_POWERPMC250 is not set
-# CONFIG_EV64260 is not set
-# CONFIG_SPRUCE is not set
-# CONFIG_LOPEC is not set
-# CONFIG_MCPN765 is not set
-# CONFIG_MVME5100 is not set
-# CONFIG_PPLUS is not set
-# CONFIG_PRPMC750 is not set
-# CONFIG_PRPMC800 is not set
-# CONFIG_SANDPOINT is not set
-# CONFIG_ADIR is not set
-# CONFIG_K2 is not set
-# CONFIG_PAL4 is not set
-# CONFIG_GEMINI is not set
-# CONFIG_EST8260 is not set
-# CONFIG_SBC82xx is not set
-# CONFIG_SBS8260 is not set
-# CONFIG_RPX6 is not set
-# CONFIG_TQM8260 is not set
-# CONFIG_ADS8272 is not set
-CONFIG_LITE5200=y
-CONFIG_PPC_MPC52xx=y
-# CONFIG_SMP is not set
-# CONFIG_PREEMPT is not set
-# CONFIG_HIGHMEM is not set
-CONFIG_KERNEL_ELF=y
-CONFIG_BINFMT_ELF=y
-# CONFIG_BINFMT_MISC is not set
-CONFIG_CMDLINE_BOOL=y
-CONFIG_CMDLINE="console=ttyS0 root=/dev/ram0 rw"
-#
-# Bus options
-#
-CONFIG_GENERIC_ISA_DMA=y
-CONFIG_PCI=y
-CONFIG_PCI_DOMAINS=y
-# CONFIG_PCI_LEGACY_PROC is not set
-# CONFIG_PCI_NAMES is not set
-#
-# Advanced setup
-#
-CONFIG_ADVANCED_OPTIONS=y
-CONFIG_HIGHMEM_START=0xfe000000
-# CONFIG_LOWMEM_SIZE_BOOL is not set
-CONFIG_LOWMEM_SIZE=0x30000000
-# CONFIG_KERNEL_START_BOOL is not set
-CONFIG_KERNEL_START=0xc0000000
-# CONFIG_TASK_SIZE_BOOL is not set
-CONFIG_TASK_SIZE=0x80000000
-# CONFIG_BOOT_LOAD_BOOL is not set
-CONFIG_BOOT_LOAD=0x00800000
-#
-# Device Drivers
-#
-#
-# Generic Driver Options
-#
-CONFIG_PREVENT_FIRMWARE_BUILD=y
-# CONFIG_DEBUG_DRIVER is not set
-#
-# Memory Technology Devices (MTD)
-#
-# CONFIG_MTD is not set
-#
-# Parallel port support
-#
-# CONFIG_PARPORT is not set
-#
-# Plug and Play support
-#
-#
-# Block devices
-#
-# CONFIG_BLK_DEV_FD is not set
-# CONFIG_BLK_CPQ_DA is not set
-# CONFIG_BLK_CPQ_CISS_DA is not set
-# CONFIG_BLK_DEV_DAC960 is not set
-# CONFIG_BLK_DEV_UMEM is not set
-# CONFIG_BLK_DEV_LOOP is not set
-# CONFIG_BLK_DEV_SX8 is not set
-CONFIG_BLK_DEV_RAM=y
-CONFIG_BLK_DEV_RAM_SIZE=4096
-CONFIG_BLK_DEV_INITRD=y
-# CONFIG_LBD is not set
-#
-# ATA/ATAPI/MFM/RLL support
-#
-# CONFIG_IDE is not set
-#
-# SCSI device support
-#
-# CONFIG_SCSI is not set
-#
-# Multi-device support (RAID and LVM)
-#
-# CONFIG_MD is not set
-#
-# Fusion MPT device support
-#
-#
-# IEEE 1394 (FireWire) support
-#
-# CONFIG_IEEE1394 is not set
-#
-# I2O device support
-#
-# CONFIG_I2O is not set
-#
-# Macintosh device drivers
-#
-#
-# Networking support
-#
-# CONFIG_NET is not set
-# CONFIG_NETPOLL is not set
-# CONFIG_NET_POLL_CONTROLLER is not set
-#
-# ISDN subsystem
-#
-#
-# Telephony Support
-#
-# CONFIG_PHONE is not set
-#
-# Input device support
-#
-CONFIG_INPUT=y
-#
-# Userland interfaces
-#
-CONFIG_INPUT_MOUSEDEV=y
-CONFIG_INPUT_MOUSEDEV_PSAUX=y
-CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
-CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
-# CONFIG_INPUT_JOYDEV is not set
-# CONFIG_INPUT_TSDEV is not set
-CONFIG_INPUT_EVDEV=y
-CONFIG_INPUT_EVBUG=y
-#
-# Input I/O drivers
-#
-# CONFIG_GAMEPORT is not set
-CONFIG_SOUND_GAMEPORT=y
-CONFIG_SERIO=y
-# CONFIG_SERIO_I8042 is not set
-CONFIG_SERIO_SERPORT=y
-# CONFIG_SERIO_CT82C710 is not set
-# CONFIG_SERIO_PCIPS2 is not set
-#
-# Input Device Drivers
-#
-# CONFIG_INPUT_KEYBOARD is not set
-# CONFIG_INPUT_MOUSE is not set
-# CONFIG_INPUT_JOYSTICK is not set
-# CONFIG_INPUT_TOUCHSCREEN is not set
-# CONFIG_INPUT_MISC is not set
-#
-# Character devices
-#
-CONFIG_VT=y
-CONFIG_VT_CONSOLE=y
-CONFIG_HW_CONSOLE=y
-# CONFIG_SERIAL_NONSTANDARD is not set
-#
-# Serial drivers
-#
-# CONFIG_SERIAL_8250 is not set
-#
-# Non-8250 serial port support
-#
-CONFIG_SERIAL_CORE=y
-CONFIG_SERIAL_CORE_CONSOLE=y
-CONFIG_SERIAL_MPC52xx=y
-CONFIG_SERIAL_MPC52xx_CONSOLE=y
-CONFIG_SERIAL_MPC52xx_CONSOLE_BAUD=9600
-CONFIG_UNIX98_PTYS=y
-CONFIG_LEGACY_PTYS=y
-CONFIG_LEGACY_PTY_COUNT=256
-# CONFIG_QIC02_TAPE is not set
-#
-# IPMI
-#
-# CONFIG_IPMI_HANDLER is not set
-#
-# Watchdog Cards
-#
-# CONFIG_WATCHDOG is not set
-# CONFIG_NVRAM is not set
-# CONFIG_GEN_RTC is not set
-# CONFIG_DTLK is not set
-# CONFIG_R3964 is not set
-# CONFIG_APPLICOM is not set
-#
-# Ftape, the floppy tape device driver
-#
-# CONFIG_FTAPE is not set
-# CONFIG_AGP is not set
-# CONFIG_DRM is not set
-# CONFIG_RAW_DRIVER is not set
-#
-# I2C support
-#
-# CONFIG_I2C is not set
-#
-# Misc devices
-#
-#
-# Multimedia devices
-#
-# CONFIG_VIDEO_DEV is not set
-#
-# Digital Video Broadcasting Devices
-#
-#
-# Graphics support
-#
-# CONFIG_FB is not set
-#
-# Console display driver support
-#
-CONFIG_VGA_CONSOLE=y
-# CONFIG_MDA_CONSOLE is not set
-CONFIG_DUMMY_CONSOLE=y
-#
-# Sound
-#
-# CONFIG_SOUND is not set
-#
-# USB support
-#
-# CONFIG_USB is not set
-#
-# USB Gadget Support
-#
-# CONFIG_USB_GADGET is not set
-#
-# File systems
-#
-CONFIG_EXT2_FS=y
-# CONFIG_EXT2_FS_XATTR is not set
-# CONFIG_EXT3_FS is not set
-# CONFIG_JBD is not set
-# CONFIG_REISERFS_FS is not set
-# CONFIG_JFS_FS is not set
-# CONFIG_XFS_FS is not set
-# CONFIG_MINIX_FS is not set
-# CONFIG_ROMFS_FS is not set
-# CONFIG_QUOTA is not set
-# CONFIG_AUTOFS_FS is not set
-# CONFIG_AUTOFS4_FS is not set
-#
-# CD-ROM/DVD Filesystems
-#
-# CONFIG_ISO9660_FS is not set
-# CONFIG_UDF_FS is not set
-#
-# DOS/FAT/NT Filesystems
-#
-# CONFIG_FAT_FS is not set
-# CONFIG_NTFS_FS is not set
-#
-# Pseudo filesystems
-#
-CONFIG_PROC_FS=y
-CONFIG_PROC_KCORE=y
-CONFIG_SYSFS=y
-# CONFIG_DEVFS_FS is not set
-# CONFIG_DEVPTS_FS_XATTR is not set
-CONFIG_TMPFS=y
-# CONFIG_HUGETLB_PAGE is not set
-CONFIG_RAMFS=y
-#
-# Miscellaneous filesystems
-#
-# CONFIG_ADFS_FS is not set
-# CONFIG_AFFS_FS is not set
-# CONFIG_HFS_FS is not set
-# CONFIG_HFSPLUS_FS is not set
-# CONFIG_BEFS_FS is not set
-# CONFIG_BFS_FS is not set
-# CONFIG_EFS_FS is not set
-# CONFIG_CRAMFS is not set
-# CONFIG_VXFS_FS is not set
-# CONFIG_HPFS_FS is not set
-# CONFIG_QNX4FS_FS is not set
-# CONFIG_SYSV_FS is not set
-# CONFIG_UFS_FS is not set
-#
-# Partition Types
-#
-# CONFIG_PARTITION_ADVANCED is not set
-CONFIG_MSDOS_PARTITION=y
-#
-# Native Language Support
-#
-CONFIG_NLS=y
-CONFIG_NLS_DEFAULT="iso8859-1"
-# CONFIG_NLS_CODEPAGE_437 is not set
-# CONFIG_NLS_CODEPAGE_737 is not set
-# CONFIG_NLS_CODEPAGE_775 is not set
-# CONFIG_NLS_CODEPAGE_850 is not set
-# CONFIG_NLS_CODEPAGE_852 is not set
-# CONFIG_NLS_CODEPAGE_855 is not set
-# CONFIG_NLS_CODEPAGE_857 is not set
-# CONFIG_NLS_CODEPAGE_860 is not set
-# CONFIG_NLS_CODEPAGE_861 is not set
-# CONFIG_NLS_CODEPAGE_862 is not set
-# CONFIG_NLS_CODEPAGE_863 is not set
-# CONFIG_NLS_CODEPAGE_864 is not set
-# CONFIG_NLS_CODEPAGE_865 is not set
-# CONFIG_NLS_CODEPAGE_866 is not set
-# CONFIG_NLS_CODEPAGE_869 is not set
-# CONFIG_NLS_CODEPAGE_936 is not set
-# CONFIG_NLS_CODEPAGE_950 is not set
-# CONFIG_NLS_CODEPAGE_932 is not set
-# CONFIG_NLS_CODEPAGE_949 is not set
-# CONFIG_NLS_CODEPAGE_874 is not set
-# CONFIG_NLS_ISO8859_8 is not set
-# CONFIG_NLS_CODEPAGE_1250 is not set
-# CONFIG_NLS_CODEPAGE_1251 is not set
-# CONFIG_NLS_ASCII is not set
-CONFIG_NLS_ISO8859_1=m
-# CONFIG_NLS_ISO8859_2 is not set
-# CONFIG_NLS_ISO8859_3 is not set
-# CONFIG_NLS_ISO8859_4 is not set
-# CONFIG_NLS_ISO8859_5 is not set
-# CONFIG_NLS_ISO8859_6 is not set
-# CONFIG_NLS_ISO8859_7 is not set
-# CONFIG_NLS_ISO8859_9 is not set
-# CONFIG_NLS_ISO8859_13 is not set
-# CONFIG_NLS_ISO8859_14 is not set
-# CONFIG_NLS_ISO8859_15 is not set
-# CONFIG_NLS_KOI8_R is not set
-# CONFIG_NLS_KOI8_U is not set
-# CONFIG_NLS_UTF8 is not set
-#
-# Library routines
-#
-# CONFIG_CRC16 is not set
-# CONFIG_CRC32 is not set
-# CONFIG_LIBCRC32C is not set
-#
-# Profiling support
-#
-# CONFIG_PROFILING is not set
-#
-# Kernel hacking
-#
-CONFIG_DEBUG_KERNEL=y
-# CONFIG_DEBUG_SLAB is not set
-CONFIG_MAGIC_SYSRQ=y
-# CONFIG_DEBUG_SPINLOCK is not set
-CONFIG_DEBUG_SPINLOCK_SLEEP=y
-# CONFIG_KGDB is not set
-# CONFIG_XMON is not set
-# CONFIG_BDI_SWITCH is not set
-CONFIG_DEBUG_INFO=y
-CONFIG_SERIAL_TEXT_DEBUG=y
-CONFIG_PPC_OCP=y
-#
-# Security options
-#
-# CONFIG_SECURITY is not set
-#
-# Cryptographic options
-#
-# CONFIG_CRYPTO is not set
diff --git a/arch/ppc/configs/rpx8260_defconfig b/arch/ppc/configs/rpx8260_defconfig
deleted file mode 100644 (file)
index a69e0b4..0000000
+++ /dev/null
@@ -1,556 +0,0 @@
-#
-# Automatically generated make config: don't edit
-#
-CONFIG_MMU=y
-CONFIG_RWSEM_XCHGADD_ALGORITHM=y
-CONFIG_HAVE_DEC_LOCK=y
-CONFIG_PPC=y
-CONFIG_PPC32=y
-CONFIG_GENERIC_NVRAM=y
-
-#
-# Code maturity level options
-#
-CONFIG_EXPERIMENTAL=y
-CONFIG_CLEAN_COMPILE=y
-CONFIG_STANDALONE=y
-CONFIG_BROKEN_ON_SMP=y
-
-#
-# General setup
-#
-# CONFIG_SWAP is not set
-CONFIG_SYSVIPC=y
-# CONFIG_POSIX_MQUEUE is not set
-# CONFIG_BSD_PROCESS_ACCT is not set
-CONFIG_SYSCTL=y
-# CONFIG_AUDIT is not set
-CONFIG_LOG_BUF_SHIFT=14
-# CONFIG_HOTPLUG is not set
-# CONFIG_IKCONFIG is not set
-CONFIG_EMBEDDED=y
-# CONFIG_KALLSYMS is not set
-CONFIG_FUTEX=y
-# CONFIG_EPOLL is not set
-CONFIG_IOSCHED_NOOP=y
-CONFIG_IOSCHED_AS=y
-CONFIG_IOSCHED_DEADLINE=y
-CONFIG_IOSCHED_CFQ=y
-# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
-
-#
-# Loadable module support
-#
-# CONFIG_MODULES is not set
-
-#
-# Processor
-#
-CONFIG_6xx=y
-# CONFIG_40x is not set
-# CONFIG_44x is not set
-# CONFIG_POWER3 is not set
-# CONFIG_POWER4 is not set
-# CONFIG_8xx is not set
-# CONFIG_E500 is not set
-# CONFIG_CPU_FREQ is not set
-CONFIG_EMBEDDEDBOOT=y
-CONFIG_PPC_STD_MMU=y
-
-#
-# Platform options
-#
-# CONFIG_PPC_MULTIPLATFORM is not set
-# CONFIG_APUS is not set
-# CONFIG_WILLOW is not set
-# CONFIG_PCORE is not set
-# CONFIG_POWERPMC250 is not set
-# CONFIG_EV64260 is not set
-# CONFIG_SPRUCE is not set
-# CONFIG_LOPEC is not set
-# CONFIG_MCPN765 is not set
-# CONFIG_MVME5100 is not set
-# CONFIG_PPLUS is not set
-# CONFIG_PRPMC750 is not set
-# CONFIG_PRPMC800 is not set
-# CONFIG_SANDPOINT is not set
-# CONFIG_ADIR is not set
-# CONFIG_K2 is not set
-# CONFIG_PAL4 is not set
-# CONFIG_GEMINI is not set
-# CONFIG_EST8260 is not set
-# CONFIG_SBC82xx is not set
-# CONFIG_SBS8260 is not set
-CONFIG_RPX8260=y
-# CONFIG_TQM8260 is not set
-# CONFIG_ADS8272 is not set
-CONFIG_8260=y
-CONFIG_CPM2=y
-# CONFIG_PC_KEYBOARD is not set
-# CONFIG_SMP is not set
-# CONFIG_PREEMPT is not set
-# CONFIG_HIGHMEM is not set
-CONFIG_KERNEL_ELF=y
-CONFIG_BINFMT_ELF=y
-# CONFIG_BINFMT_MISC is not set
-# CONFIG_CMDLINE_BOOL is not set
-
-#
-# Bus options
-#
-# CONFIG_PCI is not set
-# CONFIG_PCI_DOMAINS is not set
-
-#
-# Advanced setup
-#
-# CONFIG_ADVANCED_OPTIONS is not set
-
-#
-# Default settings for advanced configuration options are used
-#
-CONFIG_HIGHMEM_START=0xfe000000
-CONFIG_LOWMEM_SIZE=0x30000000
-CONFIG_KERNEL_START=0xc0000000
-CONFIG_TASK_SIZE=0x80000000
-CONFIG_BOOT_LOAD=0x00400000
-
-#
-# Device Drivers
-#
-
-#
-# Generic Driver Options
-#
-CONFIG_PREVENT_FIRMWARE_BUILD=y
-
-#
-# Memory Technology Devices (MTD)
-#
-# CONFIG_MTD is not set
-
-#
-# Parallel port support
-#
-# CONFIG_PARPORT is not set
-
-#
-# Plug and Play support
-#
-
-#
-# Block devices
-#
-# CONFIG_BLK_DEV_FD is not set
-CONFIG_BLK_DEV_LOOP=y
-# CONFIG_BLK_DEV_CRYPTOLOOP is not set
-# CONFIG_BLK_DEV_NBD is not set
-CONFIG_BLK_DEV_RAM=y
-CONFIG_BLK_DEV_RAM_SIZE=4096
-CONFIG_BLK_DEV_INITRD=y
-# CONFIG_LBD is not set
-
-#
-# ATA/ATAPI/MFM/RLL support
-#
-# CONFIG_IDE is not set
-
-#
-# SCSI device support
-#
-# CONFIG_SCSI is not set
-
-#
-# Multi-device support (RAID and LVM)
-#
-# CONFIG_MD is not set
-
-#
-# Fusion MPT device support
-#
-
-#
-# IEEE 1394 (FireWire) support
-#
-# CONFIG_IEEE1394 is not set
-
-#
-# I2O device support
-#
-
-#
-# Macintosh device drivers
-#
-
-#
-# Networking support
-#
-CONFIG_NET=y
-
-#
-# Networking options
-#
-CONFIG_PACKET=y
-# CONFIG_PACKET_MMAP is not set
-# CONFIG_NETLINK_DEV is not set
-CONFIG_UNIX=y
-# CONFIG_NET_KEY is not set
-CONFIG_INET=y
-CONFIG_IP_MULTICAST=y
-# CONFIG_IP_ADVANCED_ROUTER is not set
-CONFIG_IP_PNP=y
-# CONFIG_IP_PNP_DHCP is not set
-CONFIG_IP_PNP_BOOTP=y
-# CONFIG_IP_PNP_RARP is not set
-# CONFIG_NET_IPIP is not set
-# CONFIG_NET_IPGRE is not set
-# CONFIG_IP_MROUTE is not set
-# CONFIG_ARPD is not set
-CONFIG_SYN_COOKIES=y
-# CONFIG_INET_AH is not set
-# CONFIG_INET_ESP is not set
-# CONFIG_INET_IPCOMP is not set
-# CONFIG_IPV6 is not set
-# CONFIG_NETFILTER is not set
-
-#
-# SCTP Configuration (EXPERIMENTAL)
-#
-# CONFIG_IP_SCTP is not set
-# CONFIG_ATM is not set
-# CONFIG_BRIDGE is not set
-# CONFIG_VLAN_8021Q is not set
-# CONFIG_DECNET is not set
-# CONFIG_LLC2 is not set
-# CONFIG_IPX is not set
-# CONFIG_ATALK is not set
-# CONFIG_X25 is not set
-# CONFIG_LAPB is not set
-# CONFIG_NET_DIVERT is not set
-# CONFIG_ECONET is not set
-# CONFIG_WAN_ROUTER is not set
-# CONFIG_NET_FASTROUTE is not set
-# CONFIG_NET_HW_FLOWCONTROL is not set
-
-#
-# QoS and/or fair queueing
-#
-# CONFIG_NET_SCHED is not set
-# CONFIG_NET_CLS_ROUTE is not set
-
-#
-# Network testing
-#
-# CONFIG_NET_PKTGEN is not set
-# CONFIG_NETPOLL is not set
-# CONFIG_NET_POLL_CONTROLLER is not set
-# CONFIG_HAMRADIO is not set
-# CONFIG_IRDA is not set
-# CONFIG_BT is not set
-CONFIG_NETDEVICES=y
-# CONFIG_DUMMY is not set
-# CONFIG_BONDING is not set
-# CONFIG_EQUALIZER is not set
-# CONFIG_TUN is not set
-
-#
-# Ethernet (10 or 100Mbit)
-#
-CONFIG_NET_ETHERNET=y
-# CONFIG_MII is not set
-# CONFIG_OAKNET is not set
-
-#
-# Ethernet (1000 Mbit)
-#
-
-#
-# Ethernet (10000 Mbit)
-#
-
-#
-# Token Ring devices
-#
-
-#
-# Wireless LAN (non-hamradio)
-#
-# CONFIG_NET_RADIO is not set
-
-#
-# Wan interfaces
-#
-# CONFIG_WAN is not set
-# CONFIG_PPP is not set
-# CONFIG_SLIP is not set
-# CONFIG_SHAPER is not set
-# CONFIG_NETCONSOLE is not set
-
-#
-# ISDN subsystem
-#
-# CONFIG_ISDN is not set
-
-#
-# Telephony Support
-#
-# CONFIG_PHONE is not set
-
-#
-# Input device support
-#
-# CONFIG_INPUT is not set
-
-#
-# Userland interfaces
-#
-
-#
-# Input I/O drivers
-#
-# CONFIG_GAMEPORT is not set
-CONFIG_SOUND_GAMEPORT=y
-# CONFIG_SERIO is not set
-# CONFIG_SERIO_I8042 is not set
-
-#
-# Input Device Drivers
-#
-
-#
-# Character devices
-#
-# CONFIG_VT is not set
-# CONFIG_SERIAL_NONSTANDARD is not set
-
-#
-# Serial drivers
-#
-# CONFIG_SERIAL_8250 is not set
-
-#
-# Non-8250 serial port support
-#
-CONFIG_SERIAL_CORE=y
-CONFIG_SERIAL_CORE_CONSOLE=y
-CONFIG_SERIAL_CPM=y
-CONFIG_SERIAL_CPM_CONSOLE=y
-# CONFIG_SERIAL_CPM_SCC1 is not set
-# CONFIG_SERIAL_CPM_SCC2 is not set
-# CONFIG_SERIAL_CPM_SCC3 is not set
-# CONFIG_SERIAL_CPM_SCC4 is not set
-CONFIG_SERIAL_CPM_SMC1=y
-# CONFIG_SERIAL_CPM_SMC2 is not set
-CONFIG_UNIX98_PTYS=y
-CONFIG_LEGACY_PTYS=y
-CONFIG_LEGACY_PTY_COUNT=256
-# CONFIG_QIC02_TAPE is not set
-
-#
-# IPMI
-#
-# CONFIG_IPMI_HANDLER is not set
-
-#
-# Watchdog Cards
-#
-# CONFIG_WATCHDOG is not set
-# CONFIG_NVRAM is not set
-# CONFIG_GEN_RTC is not set
-# CONFIG_DTLK is not set
-# CONFIG_R3964 is not set
-# CONFIG_APPLICOM is not set
-
-#
-# Ftape, the floppy tape device driver
-#
-# CONFIG_FTAPE is not set
-# CONFIG_AGP is not set
-# CONFIG_DRM is not set
-# CONFIG_RAW_DRIVER is not set
-
-#
-# I2C support
-#
-# CONFIG_I2C is not set
-
-#
-# Dallas's 1-wire bus
-#
-# CONFIG_W1 is not set
-
-#
-# Misc devices
-#
-
-#
-# Multimedia devices
-#
-# CONFIG_VIDEO_DEV is not set
-
-#
-# Digital Video Broadcasting Devices
-#
-# CONFIG_DVB is not set
-
-#
-# Graphics support
-#
-# CONFIG_FB is not set
-
-#
-# Sound
-#
-# CONFIG_SOUND is not set
-
-#
-# USB support
-#
-
-#
-# USB Gadget Support
-#
-# CONFIG_USB_GADGET is not set
-
-#
-# File systems
-#
-CONFIG_EXT2_FS=y
-# CONFIG_EXT2_FS_XATTR is not set
-CONFIG_EXT3_FS=y
-CONFIG_EXT3_FS_XATTR=y
-# CONFIG_EXT3_FS_POSIX_ACL is not set
-# CONFIG_EXT3_FS_SECURITY is not set
-CONFIG_JBD=y
-# CONFIG_JBD_DEBUG is not set
-CONFIG_FS_MBCACHE=y
-# CONFIG_REISERFS_FS is not set
-# CONFIG_JFS_FS is not set
-# CONFIG_XFS_FS is not set
-# CONFIG_MINIX_FS is not set
-# CONFIG_ROMFS_FS is not set
-# CONFIG_QUOTA is not set
-# CONFIG_AUTOFS_FS is not set
-# CONFIG_AUTOFS4_FS is not set
-
-#
-# CD-ROM/DVD Filesystems
-#
-# CONFIG_ISO9660_FS is not set
-# CONFIG_UDF_FS is not set
-
-#
-# DOS/FAT/NT Filesystems
-#
-# CONFIG_MSDOS_FS is not set
-# CONFIG_VFAT_FS is not set
-# CONFIG_NTFS_FS is not set
-
-#
-# Pseudo filesystems
-#
-CONFIG_PROC_FS=y
-CONFIG_PROC_KCORE=y
-CONFIG_SYSFS=y
-# CONFIG_DEVFS_FS is not set
-# CONFIG_DEVPTS_FS_XATTR is not set
-CONFIG_TMPFS=y
-# CONFIG_HUGETLB_PAGE is not set
-CONFIG_RAMFS=y
-
-#
-# Miscellaneous filesystems
-#
-# CONFIG_ADFS_FS is not set
-# CONFIG_AFFS_FS is not set
-# CONFIG_HFS_FS is not set
-# CONFIG_HFSPLUS_FS is not set
-# CONFIG_BEFS_FS is not set
-# CONFIG_BFS_FS is not set
-# CONFIG_EFS_FS is not set
-# CONFIG_JFFS2_COMPRESSION_OPTIONS is not set
-# CONFIG_CRAMFS is not set
-# CONFIG_VXFS_FS is not set
-# CONFIG_HPFS_FS is not set
-# CONFIG_QNX4FS_FS is not set
-# CONFIG_SYSV_FS is not set
-# CONFIG_UFS_FS is not set
-
-#
-# Network File Systems
-#
-CONFIG_NFS_FS=y
-CONFIG_NFS_V3=y
-# CONFIG_NFS_V4 is not set
-# CONFIG_NFS_DIRECTIO is not set
-# CONFIG_NFSD is not set
-CONFIG_ROOT_NFS=y
-CONFIG_LOCKD=y
-CONFIG_LOCKD_V4=y
-# CONFIG_EXPORTFS is not set
-CONFIG_SUNRPC=y
-# CONFIG_RPCSEC_GSS_KRB5 is not set
-# CONFIG_SMB_FS is not set
-# CONFIG_CIFS is not set
-# CONFIG_NCP_FS is not set
-# CONFIG_CODA_FS is not set
-# CONFIG_AFS_FS is not set
-
-#
-# Partition Types
-#
-CONFIG_PARTITION_ADVANCED=y
-# CONFIG_ACORN_PARTITION is not set
-# CONFIG_OSF_PARTITION is not set
-# CONFIG_AMIGA_PARTITION is not set
-# CONFIG_ATARI_PARTITION is not set
-# CONFIG_MAC_PARTITION is not set
-# CONFIG_MSDOS_PARTITION is not set
-# CONFIG_LDM_PARTITION is not set
-# CONFIG_SGI_PARTITION is not set
-# CONFIG_ULTRIX_PARTITION is not set
-# CONFIG_SUN_PARTITION is not set
-# CONFIG_EFI_PARTITION is not set
-
-#
-# Native Language Support
-#
-# CONFIG_NLS is not set
-# CONFIG_SCC_ENET is not set
-CONFIG_FEC_ENET=y
-# CONFIG_USE_MDIO is not set
-
-#
-# CPM2 Options
-#
-# CONFIG_FCC1_ENET is not set
-# CONFIG_FCC2_ENET is not set
-CONFIG_FCC3_ENET=y
-
-#
-# Library routines
-#
-# CONFIG_CRC_CCITT is not set
-# CONFIG_CRC32 is not set
-# CONFIG_LIBCRC32C is not set
-
-#
-# Profiling support
-#
-# CONFIG_PROFILING is not set
-
-#
-# Kernel hacking
-#
-# CONFIG_DEBUG_KERNEL is not set
-# CONFIG_KGDB_CONSOLE is not set
-
-#
-# Security options
-#
-# CONFIG_SECURITY is not set
-
-#
-# Cryptographic options
-#
-# CONFIG_CRYPTO is not set
diff --git a/arch/ppc/platforms/85xx/mpc8555.c b/arch/ppc/platforms/85xx/mpc8555.c
deleted file mode 100644 (file)
index 9427584..0000000
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
- * arch/ppc/platform/85xx/mpc8555.c
- *
- * MPC8555 I/O descriptions
- *
- * Maintainer: Kumar Gala <kumar.gala@freescale.com>
- *
- * Copyright 2004 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.
- */
-
-#include <linux/init.h>
-#include <linux/module.h>
-#include <asm/mpc85xx.h>
-#include <asm/ocp.h>
-
-/* These should be defined in platform code */
-extern struct ocp_gfar_data mpc85xx_tsec1_def;
-extern struct ocp_gfar_data mpc85xx_tsec2_def;
-extern struct ocp_mpc_i2c_data mpc85xx_i2c1_def;
-
-/* We use offsets for paddr since we do not know at compile time
- * what CCSRBAR is, platform code should fix this up in
- * setup_arch
- *
- * Only the first IRQ is given even if a device has
- * multiple lines associated with ita
- */
-struct ocp_def core_ocp[] = {
-        { .vendor       = OCP_VENDOR_FREESCALE,
-          .function     = OCP_FUNC_IIC,
-          .index        = 0,
-          .paddr        = MPC85xx_IIC1_OFFSET,
-          .irq          = MPC85xx_IRQ_IIC1,
-          .pm           = OCP_CPM_NA,
-         .additions    = &mpc85xx_i2c1_def,
-        },
-        { .vendor       = OCP_VENDOR_FREESCALE,
-          .function     = OCP_FUNC_16550,
-          .index        = 0,
-          .paddr        = MPC85xx_UART0_OFFSET,
-          .irq          = MPC85xx_IRQ_DUART,
-          .pm           = OCP_CPM_NA,
-        },
-        { .vendor       = OCP_VENDOR_FREESCALE,
-          .function     = OCP_FUNC_16550,
-          .index        = 1,
-          .paddr        = MPC85xx_UART1_OFFSET,
-          .irq          = MPC85xx_IRQ_DUART,
-          .pm           = OCP_CPM_NA,
-        },
-        { .vendor       = OCP_VENDOR_FREESCALE,
-          .function     = OCP_FUNC_GFAR,
-          .index        = 0,
-          .paddr        = MPC85xx_ENET1_OFFSET,
-          .irq          = MPC85xx_IRQ_TSEC1_TX,
-          .pm           = OCP_CPM_NA,
-          .additions    = &mpc85xx_tsec1_def,
-        },
-        { .vendor       = OCP_VENDOR_FREESCALE,
-          .function     = OCP_FUNC_GFAR,
-          .index        = 1,
-          .paddr        = MPC85xx_ENET2_OFFSET,
-          .irq          = MPC85xx_IRQ_TSEC2_TX,
-          .pm           = OCP_CPM_NA,
-          .additions    = &mpc85xx_tsec2_def,
-        },
-        { .vendor       = OCP_VENDOR_FREESCALE,
-          .function     = OCP_FUNC_DMA,
-          .index        = 0,
-          .paddr        = MPC85xx_DMA_OFFSET,
-          .irq          = MPC85xx_IRQ_DMA0,
-          .pm           = OCP_CPM_NA,
-        },
-        { .vendor       = OCP_VENDOR_FREESCALE,
-          .function     = OCP_FUNC_PERFMON,
-          .index        = 0,
-          .paddr        = MPC85xx_PERFMON_OFFSET,
-          .irq          = MPC85xx_IRQ_PERFMON,
-          .pm           = OCP_CPM_NA,
-        },
-        { .vendor       = OCP_VENDOR_INVALID
-        }
-};
diff --git a/arch/ppc/platforms/85xx/mpc8555_cds.h b/arch/ppc/platforms/85xx/mpc8555_cds.h
deleted file mode 100644 (file)
index 566e0e1..0000000
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * arch/ppc/platforms/mpc8555_cds.h
- *
- * MPC8555CDS board definitions
- *
- * Maintainer: Kumar Gala <kumar.gala@freescale.com>
- *
- * Copyright 2004 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.
- *
- */
-
-#ifndef __MACH_MPC8555CDS_H__
-#define __MACH_MPC8555CDS_H__
-
-#include <linux/config.h>
-#include <linux/serial.h>
-#include <platforms/85xx/mpc85xx_cds_common.h>
-
-#define CPM_MAP_ADDR   (CCSRBAR + MPC85xx_CPM_OFFSET)
-
-#endif /* __MACH_MPC8555CDS_H__ */
diff --git a/arch/ppc/platforms/85xx/mpc8560_ads.c b/arch/ppc/platforms/85xx/mpc8560_ads.c
deleted file mode 100644 (file)
index 0cb2c34..0000000
+++ /dev/null
@@ -1,241 +0,0 @@
-/*
- * arch/ppc/platforms/85xx/mpc8560_ads.c
- *
- * MPC8560ADS board specific routines
- *
- * Maintainer: Kumar Gala <kumar.gala@freescale.com>
- *
- * Copyright 2004 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.
- */
-
-#include <linux/config.h>
-#include <linux/stddef.h>
-#include <linux/kernel.h>
-#include <linux/init.h>
-#include <linux/errno.h>
-#include <linux/reboot.h>
-#include <linux/pci.h>
-#include <linux/kdev_t.h>
-#include <linux/major.h>
-#include <linux/console.h>
-#include <linux/delay.h>
-#include <linux/irq.h>
-#include <linux/seq_file.h>
-#include <linux/root_dev.h>
-#include <linux/serial.h>
-#include <linux/tty.h> /* for linux/serial_core.h */
-#include <linux/serial_core.h>
-#include <linux/initrd.h>
-#include <linux/module.h>
-
-#include <asm/system.h>
-#include <asm/pgtable.h>
-#include <asm/page.h>
-#include <asm/atomic.h>
-#include <asm/time.h>
-#include <asm/io.h>
-#include <asm/machdep.h>
-#include <asm/prom.h>
-#include <asm/open_pic.h>
-#include <asm/bootinfo.h>
-#include <asm/pci-bridge.h>
-#include <asm/mpc85xx.h>
-#include <asm/irq.h>
-#include <asm/immap_85xx.h>
-#include <asm/kgdb.h>
-#include <asm/ocp.h>
-#include <asm/cpm2.h>
-#include <mm/mmu_decl.h>
-
-#include <syslib/cpm2_pic.h>
-#include <syslib/ppc85xx_common.h>
-#include <syslib/ppc85xx_setup.h>
-
-extern void cpm2_reset(void);
-
-struct ocp_gfar_data mpc85xx_tsec1_def = {
-        .interruptTransmit = MPC85xx_IRQ_TSEC1_TX,
-        .interruptError = MPC85xx_IRQ_TSEC1_ERROR,
-        .interruptReceive = MPC85xx_IRQ_TSEC1_RX,
-        .interruptPHY = MPC85xx_IRQ_EXT5,
-        .flags = (GFAR_HAS_GIGABIT | GFAR_HAS_MULTI_INTR
-                       | GFAR_HAS_RMON | GFAR_HAS_COALESCE
-                        | GFAR_HAS_PHY_INTR),
-        .phyid = 0,
-        .phyregidx = 0,
-};
-
-struct ocp_gfar_data mpc85xx_tsec2_def = {
-        .interruptTransmit = MPC85xx_IRQ_TSEC2_TX,
-        .interruptError = MPC85xx_IRQ_TSEC2_ERROR,
-        .interruptReceive = MPC85xx_IRQ_TSEC2_RX,
-        .interruptPHY = MPC85xx_IRQ_EXT5,
-        .flags = (GFAR_HAS_GIGABIT | GFAR_HAS_MULTI_INTR
-                       | GFAR_HAS_RMON | GFAR_HAS_COALESCE
-                        | GFAR_HAS_PHY_INTR),
-        .phyid = 1,
-        .phyregidx = 0,
-};
-
-struct ocp_fs_i2c_data mpc85xx_i2c1_def = {
-       .flags = FS_I2C_SEPARATE_DFSRR,
-};
-
-/* ************************************************************************
- *
- * Setup the architecture
- *
- */
-
-static void __init
-mpc8560ads_setup_arch(void)
-{
-       struct ocp_def *def;
-       struct ocp_gfar_data *einfo;
-       bd_t *binfo = (bd_t *) __res;
-       unsigned int freq;
-
-       cpm2_reset();
-
-       /* get the core frequency */
-       freq = binfo->bi_intfreq;
-
-       if (ppc_md.progress)
-               ppc_md.progress("mpc8560ads_setup_arch()", 0);
-
-       /* Set loops_per_jiffy to a half-way reasonable value,
-          for use until calibrate_delay gets called. */
-       loops_per_jiffy = freq / HZ;
-
-#ifdef CONFIG_PCI
-       /* setup PCI host bridges */
-       mpc85xx_setup_hose();
-#endif
-
-       def = ocp_get_one_device(OCP_VENDOR_FREESCALE, OCP_FUNC_GFAR, 0);
-       if (def) {
-               einfo = (struct ocp_gfar_data *) def->additions;
-               memcpy(einfo->mac_addr, binfo->bi_enetaddr, 6);
-       }
-
-       def = ocp_get_one_device(OCP_VENDOR_FREESCALE, OCP_FUNC_GFAR, 1);
-       if (def) {
-               einfo = (struct ocp_gfar_data *) def->additions;
-               memcpy(einfo->mac_addr, binfo->bi_enet1addr, 6);
-       }
-
-#ifdef CONFIG_BLK_DEV_INITRD
-       if (initrd_start)
-               ROOT_DEV = Root_RAM0;
-       else
-#endif
-#ifdef  CONFIG_ROOT_NFS
-               ROOT_DEV = Root_NFS;
-#else
-               ROOT_DEV = Root_HDA1;
-#endif
-
-       ocp_for_each_device(mpc85xx_update_paddr_ocp, &(binfo->bi_immr_base));
-}
-
-static irqreturn_t cpm2_cascade(int irq, void *dev_id, struct pt_regs *regs)
-{
-       while ((irq = cpm2_get_irq(regs)) >= 0) {
-               ppc_irq_dispatch_handler(regs, irq);
-       }
-       return IRQ_HANDLED;
-}
-
-static void __init
-mpc8560_ads_init_IRQ(void)
-{
-       int i;
-       volatile cpm2_map_t *immap = cpm2_immr;
-
-       /* Setup OpenPIC */
-       mpc85xx_ads_init_IRQ();
-
-       /* disable all CPM interupts */
-       immap->im_intctl.ic_simrh = 0x0;
-       immap->im_intctl.ic_simrl = 0x0;
-
-       for (i = CPM_IRQ_OFFSET; i < (NR_CPM_INTS + CPM_IRQ_OFFSET); i++)
-               irq_desc[i].handler = &cpm2_pic;
-
-       /* Initialize the default interrupt mapping priorities,
-        * in case the boot rom changed something on us.
-        */
-       immap->im_intctl.ic_sicr = 0;
-       immap->im_intctl.ic_scprrh = 0x05309770;
-       immap->im_intctl.ic_scprrl = 0x05309770;
-
-       request_irq(MPC85xx_IRQ_CPM, cpm2_cascade, SA_INTERRUPT, "cpm2_cascade", NULL);
-
-       return;
-}
-
-
-
-/* ************************************************************************ */
-void __init
-platform_init(unsigned long r3, unsigned long r4, unsigned long r5,
-             unsigned long r6, unsigned long r7)
-{
-       /* parse_bootinfo must always be called first */
-       parse_bootinfo(find_bootinfo());
-
-       /*
-        * If we were passed in a board information, copy it into the
-        * residual data area.
-        */
-       if (r3) {
-               memcpy((void *) __res, (void *) (r3 + KERNELBASE),
-                      sizeof (bd_t));
-
-       }
-#if defined(CONFIG_BLK_DEV_INITRD)
-       /*
-        * If the init RAM disk has been configured in, and there's a valid
-        * starting address for it, set it up.
-        */
-       if (r4) {
-               initrd_start = r4 + KERNELBASE;
-               initrd_end = r5 + KERNELBASE;
-       }
-#endif                         /* CONFIG_BLK_DEV_INITRD */
-
-       /* Copy the kernel command line arguments to a safe place. */
-
-       if (r6) {
-               *(char *) (r7 + KERNELBASE) = 0;
-               strcpy(cmd_line, (char *) (r6 + KERNELBASE));
-       }
-
-       /* setup the PowerPC module struct */
-       ppc_md.setup_arch = mpc8560ads_setup_arch;
-       ppc_md.show_cpuinfo = mpc85xx_ads_show_cpuinfo;
-
-       ppc_md.init_IRQ = mpc8560_ads_init_IRQ;
-       ppc_md.get_irq = openpic_get_irq;
-
-       ppc_md.restart = mpc85xx_restart;
-       ppc_md.power_off = mpc85xx_power_off;
-       ppc_md.halt = mpc85xx_halt;
-
-       ppc_md.find_end_of_memory = mpc85xx_find_end_of_memory;
-
-       ppc_md.time_init = NULL;
-       ppc_md.set_rtc_time = NULL;
-       ppc_md.get_rtc_time = NULL;
-       ppc_md.calibrate_decr = mpc85xx_calibrate_decr;
-
-       if (ppc_md.progress)
-               ppc_md.progress("mpc8560ads_init(): exit", 0);
-
-       return;
-}
diff --git a/arch/ppc/platforms/85xx/mpc8560_ads.h b/arch/ppc/platforms/85xx/mpc8560_ads.h
deleted file mode 100644 (file)
index 7df885d..0000000
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * arch/ppc/platforms/mpc8560_ads.h
- *
- * MPC8540ADS board definitions
- *
- * Maintainer: Kumar Gala <kumar.gala@freescale.com>
- *
- * Copyright 2004 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.
- *
- */
-
-#ifndef __MACH_MPC8560ADS_H
-#define __MACH_MPC8560ADS_H
-
-#include <linux/config.h>
-#include <syslib/ppc85xx_setup.h>
-#include <platforms/85xx/mpc85xx_ads_common.h>
-
-#define CPM_MAP_ADDR   (CCSRBAR + MPC85xx_CPM_OFFSET)
-#define PHY_INTERRUPT  MPC85xx_IRQ_EXT7
-
-#endif                         /* __MACH_MPC8560ADS_H */
diff --git a/arch/ppc/platforms/85xx/mpc85xx_cds_common.c b/arch/ppc/platforms/85xx/mpc85xx_cds_common.c
deleted file mode 100644 (file)
index c7e53e3..0000000
+++ /dev/null
@@ -1,473 +0,0 @@
-/*
- * arch/ppc/platform/85xx/mpc85xx_cds_common.c
- *
- * MPC85xx CDS board specific routines
- *
- * Maintainer: Kumar Gala <kumar.gala@freescale.com>
- *
- * Copyright 2004 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.
- */
-
-#include <linux/config.h>
-#include <linux/stddef.h>
-#include <linux/kernel.h>
-#include <linux/init.h>
-#include <linux/errno.h>
-#include <linux/reboot.h>
-#include <linux/pci.h>
-#include <linux/kdev_t.h>
-#include <linux/major.h>
-#include <linux/console.h>
-#include <linux/delay.h>
-#include <linux/irq.h>
-#include <linux/seq_file.h>
-#include <linux/serial.h>
-#include <linux/module.h>
-#include <linux/root_dev.h>
-#include <linux/initrd.h>
-#include <linux/tty.h>
-#include <linux/serial_core.h>
-
-#include <asm/system.h>
-#include <asm/pgtable.h>
-#include <asm/page.h>
-#include <asm/atomic.h>
-#include <asm/time.h>
-#include <asm/io.h>
-#include <asm/machdep.h>
-#include <asm/prom.h>
-#include <asm/open_pic.h>
-#include <asm/bootinfo.h>
-#include <asm/pci-bridge.h>
-#include <asm/mpc85xx.h>
-#include <asm/irq.h>
-#include <asm/immap_85xx.h>
-#include <asm/immap_cpm2.h>
-#include <asm/ocp.h>
-#include <asm/kgdb.h>
-
-#include <mm/mmu_decl.h>
-#include <syslib/cpm2_pic.h>
-#include <syslib/ppc85xx_common.h>
-#include <syslib/ppc85xx_setup.h>
-
-
-#ifndef CONFIG_PCI
-unsigned long isa_io_base = 0;
-unsigned long isa_mem_base = 0;
-#endif
-
-extern unsigned long total_memory;      /* in mm/init */
-
-unsigned char __res[sizeof (bd_t)];
-
-static int cds_pci_slot = 2;
-static volatile u8 * cadmus;
-
-/* Internal interrupts are all Level Sensitive, and Positive Polarity */
-
-static u_char mpc85xx_cds_openpic_initsenses[] __initdata = {
-        (IRQ_SENSE_LEVEL | IRQ_POLARITY_POSITIVE),        /* Internal  0: L2 Cache */
-        (IRQ_SENSE_LEVEL | IRQ_POLARITY_POSITIVE),        /* Internal  1: ECM */
-        (IRQ_SENSE_LEVEL | IRQ_POLARITY_POSITIVE),        /* Internal  2: DDR DRAM */
-        (IRQ_SENSE_LEVEL | IRQ_POLARITY_POSITIVE),        /* Internal  3: LBIU */
-        (IRQ_SENSE_LEVEL | IRQ_POLARITY_POSITIVE),        /* Internal  4: DMA 0 */
-        (IRQ_SENSE_LEVEL | IRQ_POLARITY_POSITIVE),        /* Internal  5: DMA 1 */
-        (IRQ_SENSE_LEVEL | IRQ_POLARITY_POSITIVE),        /* Internal  6: DMA 2 */
-        (IRQ_SENSE_LEVEL | IRQ_POLARITY_POSITIVE),        /* Internal  7: DMA 3 */
-        (IRQ_SENSE_LEVEL | IRQ_POLARITY_POSITIVE),        /* Internal  8: PCI/PCI-X */
-        (IRQ_SENSE_LEVEL | IRQ_POLARITY_POSITIVE),        /* Internal  9: RIO Inbound Port Write Error */
-        (IRQ_SENSE_LEVEL | IRQ_POLARITY_POSITIVE),        /* Internal 10: RIO Doorbell Inbound */
-        (IRQ_SENSE_LEVEL | IRQ_POLARITY_POSITIVE),        /* Internal 11: RIO Outbound Message */
-        (IRQ_SENSE_LEVEL | IRQ_POLARITY_POSITIVE),        /* Internal 12: RIO Inbound Message */
-        (IRQ_SENSE_LEVEL | IRQ_POLARITY_POSITIVE),        /* Internal 13: TSEC 0 Transmit */
-        (IRQ_SENSE_LEVEL | IRQ_POLARITY_POSITIVE),        /* Internal 14: TSEC 0 Receive */
-        (IRQ_SENSE_LEVEL | IRQ_POLARITY_POSITIVE),        /* Internal 15: Unused */
-        (IRQ_SENSE_LEVEL | IRQ_POLARITY_POSITIVE),        /* Internal 16: Unused */
-        (IRQ_SENSE_LEVEL | IRQ_POLARITY_POSITIVE),        /* Internal 17: Unused */
-        (IRQ_SENSE_LEVEL | IRQ_POLARITY_POSITIVE),        /* Internal 18: TSEC 0 Receive/Transmit Error */
-        (IRQ_SENSE_LEVEL | IRQ_POLARITY_POSITIVE),        /* Internal 19: TSEC 1 Transmit */
-        (IRQ_SENSE_LEVEL | IRQ_POLARITY_POSITIVE),        /* Internal 20: TSEC 1 Receive */
-        (IRQ_SENSE_LEVEL | IRQ_POLARITY_POSITIVE),        /* Internal 21: Unused */
-        (IRQ_SENSE_LEVEL | IRQ_POLARITY_POSITIVE),        /* Internal 22: Unused */
-        (IRQ_SENSE_LEVEL | IRQ_POLARITY_POSITIVE),        /* Internal 23: Unused */
-        (IRQ_SENSE_LEVEL | IRQ_POLARITY_POSITIVE),        /* Internal 24: TSEC 1 Receive/Transmit Error */
-        (IRQ_SENSE_LEVEL | IRQ_POLARITY_POSITIVE),        /* Internal 25: Fast Ethernet */
-        (IRQ_SENSE_LEVEL | IRQ_POLARITY_POSITIVE),        /* Internal 26: DUART */
-        (IRQ_SENSE_LEVEL | IRQ_POLARITY_POSITIVE),        /* Internal 27: I2C */
-        (IRQ_SENSE_LEVEL | IRQ_POLARITY_POSITIVE),        /* Internal 28: Performance Monitor */
-        (IRQ_SENSE_LEVEL | IRQ_POLARITY_POSITIVE),        /* Internal 29: Unused */
-        (IRQ_SENSE_LEVEL | IRQ_POLARITY_POSITIVE),        /* Internal 30: CPM */
-        (IRQ_SENSE_LEVEL | IRQ_POLARITY_POSITIVE),        /* Internal 31: Unused */
-#if defined(CONFIG_PCI)
-        (IRQ_SENSE_LEVEL | IRQ_POLARITY_NEGATIVE),      /* External 0: PCI1 slot */
-        (IRQ_SENSE_LEVEL | IRQ_POLARITY_NEGATIVE),      /* External 1: PCI1 slot */
-        (IRQ_SENSE_LEVEL | IRQ_POLARITY_NEGATIVE),      /* External 2: PCI1 slot */
-        (IRQ_SENSE_LEVEL | IRQ_POLARITY_NEGATIVE),      /* External 3: PCI1 slot */
-#else
-        0x0,                            /* External  0: */
-        0x0,                            /* External  1: */
-        0x0,                            /* External  2: */
-        0x0,                            /* External  3: */
-#endif
-        0x0,                            /* External  4: */
-        (IRQ_SENSE_LEVEL | IRQ_POLARITY_NEGATIVE),      /* External 5: PHY */
-        0x0,                            /* External  6: */
-        0x0,                            /* External  7: */
-        0x0,                            /* External  8: */
-        0x0,                            /* External  9: */
-        0x0,                            /* External 10: */
-#if defined(CONFIG_85xx_PCI2) && defined(CONFIG_PCI)
-        (IRQ_SENSE_LEVEL | IRQ_POLARITY_NEGATIVE),      /* External 11: PCI2 slot 0 */
-#else
-        0x0,                            /* External 11: */
-#endif
-};
-
-struct ocp_gfar_data mpc85xx_tsec1_def = {
-        .interruptTransmit = MPC85xx_IRQ_TSEC1_TX,
-        .interruptError = MPC85xx_IRQ_TSEC1_ERROR,
-        .interruptReceive = MPC85xx_IRQ_TSEC1_RX,
-        .interruptPHY = MPC85xx_IRQ_EXT5,
-        .flags = (GFAR_HAS_GIGABIT | GFAR_HAS_MULTI_INTR |
-                        GFAR_HAS_PHY_INTR),
-        .phyid = 0,
-        .phyregidx = 0,
-};
-
-struct ocp_gfar_data mpc85xx_tsec2_def = {
-        .interruptTransmit = MPC85xx_IRQ_TSEC2_TX,
-        .interruptError = MPC85xx_IRQ_TSEC2_ERROR,
-        .interruptReceive = MPC85xx_IRQ_TSEC2_RX,
-        .interruptPHY = MPC85xx_IRQ_EXT5,
-        .flags = (GFAR_HAS_GIGABIT | GFAR_HAS_MULTI_INTR |
-                        GFAR_HAS_PHY_INTR),
-        .phyid = 1,
-        .phyregidx = 0,
-};
-
-struct ocp_fs_i2c_data mpc85xx_i2c1_def = {
-       .flags = FS_I2C_SEPARATE_DFSRR,
-};
-
-/* ************************************************************************ */
-int
-mpc85xx_cds_show_cpuinfo(struct seq_file *m)
-{
-        uint pvid, svid, phid1;
-        uint memsize = total_memory;
-        bd_t *binfo = (bd_t *) __res;
-        unsigned int freq;
-
-        /* get the core frequency */
-        freq = binfo->bi_intfreq;
-
-        pvid = mfspr(PVR);
-        svid = mfspr(SVR);
-
-        seq_printf(m, "Vendor\t\t: Freescale Semiconductor\n");
-       seq_printf(m, "Machine\t\t: CDS (%x)\n", cadmus[CM_VER]);
-        seq_printf(m, "bus freq\t: %u.%.6u MHz\n", freq / 1000000,
-                   freq % 1000000);
-        seq_printf(m, "PVR\t\t: 0x%x\n", pvid);
-        seq_printf(m, "SVR\t\t: 0x%x\n", svid);
-
-        /* Display cpu Pll setting */
-        phid1 = mfspr(HID1);
-        seq_printf(m, "PLL setting\t: 0x%x\n", ((phid1 >> 24) & 0x3f));
-
-        /* Display the amount of memory */
-        seq_printf(m, "Memory\t\t: %d MB\n", memsize / (1024 * 1024));
-
-        return 0;
-}
-
-#ifdef CONFIG_CPM2
-static void cpm2_cascade(int irq, void *dev_id, struct pt_regs *regs)
-{
-       while((irq = cpm2_get_irq(regs)) >= 0)
-       {
-               ppc_irq_dispatch_handler(regs,irq);
-       }
-}
-#endif /* CONFIG_CPM2 */
-
-void __init
-mpc85xx_cds_init_IRQ(void)
-{
-       bd_t *binfo = (bd_t *) __res;
-#ifdef CONFIG_CPM2
-       volatile cpm2_map_t *immap = cpm2_immr;
-       int i;
-#endif
-
-        /* Determine the Physical Address of the OpenPIC regs */
-        phys_addr_t OpenPIC_PAddr = binfo->bi_immr_base + MPC85xx_OPENPIC_OFFSET;
-        OpenPIC_Addr = ioremap(OpenPIC_PAddr, MPC85xx_OPENPIC_SIZE);
-        OpenPIC_InitSenses = mpc85xx_cds_openpic_initsenses;
-        OpenPIC_NumInitSenses = sizeof (mpc85xx_cds_openpic_initsenses);
-
-        /* Skip reserved space and internal sources */
-        openpic_set_sources(0, 32, OpenPIC_Addr + 0x10200);
-        /* Map PIC IRQs 0-11 */
-        openpic_set_sources(32, 12, OpenPIC_Addr + 0x10000);
-
-        /* we let openpic interrupts starting from an offset, to
-         * leave space for cascading interrupts underneath.
-         */
-        openpic_init(MPC85xx_OPENPIC_IRQ_OFFSET);
-
-#ifdef CONFIG_CPM2
-       /* disable all CPM interupts */
-       immap->im_intctl.ic_simrh = 0x0;
-       immap->im_intctl.ic_simrl = 0x0;
-
-       for (i = CPM_IRQ_OFFSET; i < (NR_CPM_INTS + CPM_IRQ_OFFSET); i++)
-               irq_desc[i].handler = &cpm2_pic;
-
-       /* Initialize the default interrupt mapping priorities,
-        * in case the boot rom changed something on us.
-        */
-       immap->im_intctl.ic_sicr = 0;
-       immap->im_intctl.ic_scprrh = 0x05309770;
-       immap->im_intctl.ic_scprrl = 0x05309770;
-
-       request_irq(MPC85xx_IRQ_CPM, cpm2_cascade, SA_INTERRUPT, "cpm2_cascade", NULL);
-#endif
-
-        return;
-}
-
-#ifdef CONFIG_PCI
-/*
- * interrupt routing
- */
-int
-mpc85xx_map_irq(struct pci_dev *dev, unsigned char idsel, unsigned char pin)
-{
-       struct pci_controller *hose = pci_bus_to_hose(dev->bus->number);
-
-       if (!hose->index)
-       {
-               /* Handle PCI1 interrupts */
-               char pci_irq_table[][4] =
-                       /*
-                        *      PCI IDSEL/INTPIN->INTLINE
-                        *        A      B      C      D
-                        */
-
-                       /* Note IRQ assignment for slots is based on which slot the elysium is
-                        * in -- in this setup elysium is in slot #2 (this PIRQA as first
-                        * interrupt on slot */
-               {
-                       { 0, 1, 2, 3 }, /* 16 - PMC */
-                       { 3, 0, 0, 0 }, /* 17 P2P (Tsi320) */
-                       { 0, 1, 2, 3 }, /* 18 - Slot 1 */
-                       { 1, 2, 3, 0 }, /* 19 - Slot 2 */
-                       { 2, 3, 0, 1 }, /* 20 - Slot 3 */
-                       { 3, 0, 1, 2 }, /* 21 - Slot 4 */
-               };
-
-               const long min_idsel = 16, max_idsel = 21, irqs_per_slot = 4;
-               int i, j;
-
-               for (i = 0; i < 6; i++)
-                       for (j = 0; j < 4; j++)
-                               pci_irq_table[i][j] =
-                                       ((pci_irq_table[i][j] + 5 -
-                                         cds_pci_slot) & 0x3) + PIRQ0A;
-
-               return PCI_IRQ_TABLE_LOOKUP;
-       } else {
-               /* Handle PCI2 interrupts (if we have one) */
-               char pci_irq_table[][4] =
-               {
-                       /*
-                        * We only have one slot and one interrupt
-                        * going to PIRQA - PIRQD */
-                       { PIRQ1A, PIRQ1A, PIRQ1A, PIRQ1A }, /* 21 - slot 0 */
-               };
-
-               const long min_idsel = 21, max_idsel = 21, irqs_per_slot = 4;
-
-               return PCI_IRQ_TABLE_LOOKUP;
-       }
-}
-
-#define ARCADIA_HOST_BRIDGE_IDSEL     17
-#define ARCADIA_2ND_BRIDGE_IDSEL     3
-
-int
-mpc85xx_exclude_device(u_char bus, u_char devfn)
-{
-       if (bus == 0 && PCI_SLOT(devfn) == 0)
-               return PCIBIOS_DEVICE_NOT_FOUND;
-#if CONFIG_85xx_PCI2
-       /* With the current code we know PCI2 will be bus 2, however this may
-        * not be guarnteed */
-       if (bus == 2 && PCI_SLOT(devfn) == 0)
-               return PCIBIOS_DEVICE_NOT_FOUND;
-#endif
-       /* We explicitly do not go past the Tundra 320 Bridge */
-       if (bus == 1)
-               return PCIBIOS_DEVICE_NOT_FOUND;
-       if ((bus == 0) && (PCI_SLOT(devfn) == ARCADIA_2ND_BRIDGE_IDSEL))
-               return PCIBIOS_DEVICE_NOT_FOUND;
-       else
-               return PCIBIOS_SUCCESSFUL;
-}
-#endif /* CONFIG_PCI */
-
-/* ************************************************************************
- *
- * Setup the architecture
- *
- */
-static void __init
-mpc85xx_cds_setup_arch(void)
-{
-        struct ocp_def *def;
-        struct ocp_gfar_data *einfo;
-        bd_t *binfo = (bd_t *) __res;
-        unsigned int freq;
-
-        /* get the core frequency */
-        freq = binfo->bi_intfreq;
-
-        printk("mpc85xx_cds_setup_arch\n");
-
-#ifdef CONFIG_CPM2
-       cpm2_reset();
-#endif
-
-       cadmus = ioremap(CADMUS_BASE, CADMUS_SIZE);
-       cds_pci_slot = ((cadmus[CM_CSR] >> 6) & 0x3) + 1;
-       printk("CDS Version = %x in PCI slot %d\n", cadmus[CM_VER], cds_pci_slot);
-
-        /* Set loops_per_jiffy to a half-way reasonable value,
-           for use until calibrate_delay gets called. */
-        loops_per_jiffy = freq / HZ;
-
-#ifdef CONFIG_PCI
-        /* setup PCI host bridges */
-        mpc85xx_setup_hose();
-#endif
-
-#ifdef CONFIG_DUMMY_CONSOLE
-        conswitchp = &dummy_con;
-#endif
-
-#ifdef CONFIG_SERIAL_8250
-        mpc85xx_early_serial_map();
-#endif
-
-#ifdef CONFIG_SERIAL_TEXT_DEBUG
-       /* Invalidate the entry we stole earlier the serial ports
-        * should be properly mapped */
-       invalidate_tlbcam_entry(NUM_TLBCAMS - 1);
-#endif
-
-        def = ocp_get_one_device(OCP_VENDOR_FREESCALE, OCP_FUNC_GFAR, 0);
-        if (def) {
-                einfo = (struct ocp_gfar_data *) def->additions;
-                memcpy(einfo->mac_addr, binfo->bi_enetaddr, 6);
-        }
-
-        def = ocp_get_one_device(OCP_VENDOR_FREESCALE, OCP_FUNC_GFAR, 1);
-        if (def) {
-                einfo = (struct ocp_gfar_data *) def->additions;
-                memcpy(einfo->mac_addr, binfo->bi_enet1addr, 6);
-        }
-
-#ifdef CONFIG_BLK_DEV_INITRD
-        if (initrd_start)
-                ROOT_DEV = Root_RAM0;
-        else
-#endif
-#ifdef  CONFIG_ROOT_NFS
-                ROOT_DEV = Root_NFS;
-#else
-                ROOT_DEV = Root_HDA1;
-#endif
-
-       ocp_for_each_device(mpc85xx_update_paddr_ocp, &(binfo->bi_immr_base));
-}
-
-/* ************************************************************************ */
-void __init
-platform_init(unsigned long r3, unsigned long r4, unsigned long r5,
-              unsigned long r6, unsigned long r7)
-{
-        /* parse_bootinfo must always be called first */
-        parse_bootinfo(find_bootinfo());
-
-        /*
-         * If we were passed in a board information, copy it into the
-         * residual data area.
-         */
-        if (r3) {
-                memcpy((void *) __res, (void *) (r3 + KERNELBASE),
-                       sizeof (bd_t));
-
-        }
-#ifdef CONFIG_SERIAL_TEXT_DEBUG
-       {
-               bd_t *binfo = (bd_t *) __res;
-
-               /* Use the last TLB entry to map CCSRBAR to allow access to DUART regs */
-               settlbcam(NUM_TLBCAMS - 1, binfo->bi_immr_base,
-                       binfo->bi_immr_base, MPC85xx_CCSRBAR_SIZE, _PAGE_IO, 0);
-
-       }
-#endif
-
-#if defined(CONFIG_BLK_DEV_INITRD)
-        /*
-         * If the init RAM disk has been configured in, and there's a valid
-         * starting address for it, set it up.
-         */
-        if (r4) {
-                initrd_start = r4 + KERNELBASE;
-                initrd_end = r5 + KERNELBASE;
-        }
-#endif                          /* CONFIG_BLK_DEV_INITRD */
-
-        /* Copy the kernel command line arguments to a safe place. */
-
-        if (r6) {
-                *(char *) (r7 + KERNELBASE) = 0;
-                strcpy(cmd_line, (char *) (r6 + KERNELBASE));
-        }
-
-        /* setup the PowerPC module struct */
-        ppc_md.setup_arch = mpc85xx_cds_setup_arch;
-        ppc_md.show_cpuinfo = mpc85xx_cds_show_cpuinfo;
-
-        ppc_md.init_IRQ = mpc85xx_cds_init_IRQ;
-        ppc_md.get_irq = openpic_get_irq;
-
-        ppc_md.restart = mpc85xx_restart;
-        ppc_md.power_off = mpc85xx_power_off;
-        ppc_md.halt = mpc85xx_halt;
-
-        ppc_md.find_end_of_memory = mpc85xx_find_end_of_memory;
-
-        ppc_md.time_init = NULL;
-        ppc_md.set_rtc_time = NULL;
-        ppc_md.get_rtc_time = NULL;
-        ppc_md.calibrate_decr = mpc85xx_calibrate_decr;
-
-#if defined(CONFIG_SERIAL_8250) && defined(CONFIG_SERIAL_TEXT_DEBUG)
-        ppc_md.progress = gen550_progress;
-#endif /* CONFIG_SERIAL_8250 && CONFIG_SERIAL_TEXT_DEBUG */
-
-        if (ppc_md.progress)
-                ppc_md.progress("mpc85xx_cds_init(): exit", 0);
-
-        return;
-}
diff --git a/arch/ppc/platforms/85xx/mpc85xx_cds_common.h b/arch/ppc/platforms/85xx/mpc85xx_cds_common.h
deleted file mode 100644 (file)
index a7290ed..0000000
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- * arch/ppc/platforms/85xx/mpc85xx_cds_common.h
- *
- * MPC85xx CDS board definitions
- *
- * Maintainer: Kumar Gala <kumar.gala@freescale.com>
- *
- * Copyright 2004 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.
- *
- */
-
-#ifndef __MACH_MPC85XX_CDS_H__
-#define __MACH_MPC85XX_CDS_H__
-
-#include <linux/config.h>
-#include <linux/serial.h>
-#include <asm/ppcboot.h>
-#include <linux/initrd.h>
-#include <syslib/ppc85xx_setup.h>
-
-#define BOARD_CCSRBAR           ((uint)0xe0000000)
-#define CCSRBAR_SIZE            ((uint)1024*1024)
-
-/* CADMUS info */
-#define CADMUS_BASE (0xf8004000)
-#define CADMUS_SIZE (256)
-#define CM_VER (0)
-#define CM_CSR (1)
-#define CM_RST (2)
-
-/* PCI config */
-#define PCI1_CFG_ADDR_OFFSET   (0x8000)
-#define PCI1_CFG_DATA_OFFSET   (0x8004)
-
-#define PCI2_CFG_ADDR_OFFSET   (0x9000)
-#define PCI2_CFG_DATA_OFFSET   (0x9004)
-
-/* PCI interrupt controller */
-#define PIRQ0A                   MPC85xx_IRQ_EXT0
-#define PIRQ0B                   MPC85xx_IRQ_EXT1
-#define PIRQ0C                   MPC85xx_IRQ_EXT2
-#define PIRQ0D                   MPC85xx_IRQ_EXT3
-#define PIRQ1A                   MPC85xx_IRQ_EXT11
-
-/* PCI 1 memory map */
-#define MPC85XX_PCI1_LOWER_IO        0x00000000
-#define MPC85XX_PCI1_UPPER_IO        0x00ffffff
-
-#define MPC85XX_PCI1_LOWER_MEM       0x80000000
-#define MPC85XX_PCI1_UPPER_MEM       0x9fffffff
-
-#define MPC85XX_PCI1_IO_BASE         0xe2000000
-#define MPC85XX_PCI1_MEM_OFFSET      0x00000000
-
-#define MPC85XX_PCI1_IO_SIZE         0x01000000
-
-/* PCI 2 memory map */
-#define MPC85XX_PCI2_LOWER_IO        0x01000000
-#define MPC85XX_PCI2_UPPER_IO        0x01ffffff
-
-#define MPC85XX_PCI2_LOWER_MEM       0xa0000000
-#define MPC85XX_PCI2_UPPER_MEM       0xbfffffff
-
-#define MPC85XX_PCI2_IO_BASE         0xe3000000
-#define MPC85XX_PCI2_MEM_OFFSET      0x00000000
-
-#define MPC85XX_PCI2_IO_SIZE         0x01000000
-
-#define SERIAL_PORT_DFNS               \
-              STD_UART_OP(0)           \
-              STD_UART_OP(1)
-
-#endif /* __MACH_MPC85XX_CDS_H__ */
diff --git a/arch/ppc/platforms/dmv182.c b/arch/ppc/platforms/dmv182.c
deleted file mode 100644 (file)
index dd57e16..0000000
+++ /dev/null
@@ -1,707 +0,0 @@
-/*
- * arch/ppc/platforms/dmv182p.c
- * Setup code for the Dy-4 SVME/DMV-182
- *
- * Copyright (C) 2004 TimeSys Corporation
- * Copyright (C) 2004 Red Hat, Inc.
- *
- * Original 2.4 port by Scott Wood <scott.wood@timesys.com>
- *
- * 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.
- */
-
-#include <linux/config.h>
-#include <linux/init.h>
-#include <linux/pci.h>
-#include <linux/irq.h>
-#include <linux/interrupt.h>
-#include <linux/initrd.h>
-#include <linux/root_dev.h>
-#include <linux/delay.h>
-
-#include <asm/serial.h>
-#include <asm/bootinfo.h>
-#include <asm/machdep.h>
-#include <asm/io.h>
-#include <asm/pgtable.h>
-#include <asm/mv64x60.h>
-#include <asm/processor.h>
-#include <asm/time.h>
-#include <asm/atomic.h>
-#include <asm/bitops.h>
-#include <asm/todc.h>
-#include <linux/tty.h>  /* for linux/serial_core.h */
-#include <linux/serial.h>
-#include <linux/serial_core.h>
-
-#include "dmv182.h"
-
-extern int mv64360_get_irq(struct pt_regs *regs);
-extern void mv64360_init_irq(void);
-
-extern void gen550_progress(char *s, unsigned short hex);
-extern void gen550_init(int, struct uart_port *);
-
-static void __init dmv182_setup_peripherals(void);
-static void __init dmv182_setup_bridge(void);
-
-static struct mv64x60_handle bh;
-
-TODC_ALLOC();
-
-static void __init dmv182_map_io(void)
-{
-       io_block_mapping((unsigned long)dmv182_board_io_virt,
-                        dmv182_board_io_phys, 0x10000000, _PAGE_IO);
-}
-
-// This sets up BAT3 to cover the serial port and Discovery chip.
-
-static void __init dmv182_setup_bats(void)
-{
-       int tmp1, tmp2;
-
-       asm volatile("lis %0, 0xe000;"
-                    "ori %0, %0, 0x002a;"
-                    "lis %1, 0xf000;"
-                    "ori %1, %1, 0x1ffe;"
-                    "mtspr %2, %0;"
-                    "mtspr %3, %1"
-                  : "=r" (tmp1), "=r" (tmp2)
-                  : "i" (DBAT3L), "i" (DBAT3U)
-                  : "memory");
-}
-
-static u8 *const irqstat = dmv182_fpga_io + 0x80;
-static u8 *const irqmask = dmv182_fpga_io + 0x81;
-
-// These two functions transform an IRQ number into
-// byte and bit indices into the above arrays.
-
-static inline int irqreg(unsigned int irq)
-{
-       return ((irq - 96) >> 3) * 3;
-}
-
-static inline int irqbit(unsigned int irq)
-{
-       return (irq - 96) & 7;
-}
-
-// FIXME: CPU1 and affinity support
-// The Marvell code doesn't appear to support anything
-// other than doorbells on CPU1 at the moment.
-
-static void dmv182_mask_irq(unsigned int irq)
-{
-       irqmask[irqreg(irq)] &= ~(1 << irqbit(irq));
-}
-
-static void dmv182_unmask_irq(unsigned int irq)
-{
-       irqmask[irqreg(irq)] |= 1 << irqbit(irq);
-}
-
-static unsigned int dmv182_startup_irq(unsigned int irq)
-{
-       dmv182_unmask_irq(irq);
-       return 0;
-}
-
-struct hw_interrupt_type dmv182_pic = {
-       .typename     = " DMV182_PIC ",
-       .startup      = dmv182_startup_irq,
-       .shutdown     = dmv182_mask_irq,
-       .enable       = dmv182_unmask_irq,
-       .disable      = dmv182_mask_irq,
-       .ack          = dmv182_mask_irq,
-       .end          = dmv182_unmask_irq,
-       .set_affinity = NULL
-};
-
-atomic_t spurious_interrupts;
-
-static irqreturn_t dmv182_cascade(int irq, void *dev_id, struct pt_regs *regs)
-{
-       int i, j;
-       int cpu = smp_processor_id();
-       int irqs;
-
-       for (i = 0, j = 96; i < 24; i += 3, j += 8) {
-               irqs = irqstat[i] & irqmask[i + cpu];
-               
-               if (irqs)
-                       break;
-       }
-       
-       if (i < 24) {
-               ppc_irq_dispatch_handler(regs, j + ffs(irqs) - 1);
-               return IRQ_HANDLED;
-       }
-
-       atomic_inc(&spurious_interrupts);
-       return IRQ_NONE;
-}
-
-#ifdef CONFIG_SMP
-static irqreturn_t dmv182_doorbell(int irq, void *dev_id, struct pt_regs *regs);
-#endif
-
-static void __init dmv182_init_irq(void)
-{
-       int i;
-
-       if (ppc_md.progress)
-               ppc_md.progress("dmv182_init_irq", 0x1821);
-       
-       for (i = 96; i < 160; i++) {
-               dmv182_mask_irq(i);
-               irqmask[irqreg(i) + 1] &= ~(1 << irqbit(i));
-               irq_desc[i].handler = &dmv182_pic;
-               irq_desc[i].status = IRQ_LEVEL | IRQ_DISABLED;
-       }
-       
-       mv64360_init_irq();
-       
-       if (request_irq(94, dmv182_cascade, SA_INTERRUPT,
-                       "DMV182 CPU0 cascade", NULL) < 0)
-       {
-               panic("Could not request CPU0 cascade IRQ\n");
-       }
-
-#ifdef CONFIG_SMP
-#if 0
-       if (request_irq(95, dmv182_cascade, SA_INTERRUPT,
-                       "DMV182 CPU1 cascade", NULL) < 0)
-       {
-               panic("Could not request CPU1 cascade IRQ\n");
-       }
-#endif
-
-       if (request_irq(60, dmv182_doorbell, SA_INTERRUPT,
-                       "CPU0 doorbell", NULL) < 0)
-       {
-               panic("Could not request CPU1 doorbell IRQ\n");
-       }
-
-       if (request_irq(28, dmv182_doorbell, SA_INTERRUPT,
-                       "CPU1 doorbell", NULL) < 0)
-       {
-               panic("Could not request CPU1 doorbell IRQ\n");
-       }
-       
-       // Clear and unmask all doorbell interrupts.
-       
-       mv64x60_write(&bh, MV64360_CPU0_DOORBELL_CLR, 0xff);
-       mv64x60_write(&bh, MV64360_CPU1_DOORBELL_CLR, 0xff);
-       mv64x60_write(&bh, MV64360_CPU0_DOORBELL_MASK, 0xff);
-       mv64x60_write(&bh, MV64360_CPU1_DOORBELL_MASK, 0xff);
-#endif
-}
-
-// It's really device numbers, not idsels, but we have
-// to call it that so the PCI_IRQ_TABLE_LOOKUP will work.
-
-static int __init dmv182_map_irq(struct pci_dev *dev,
-                                  unsigned char idsel,
-                                  unsigned char pin)
-{
-       struct pci_controller *hose = pci_bus_to_hose(dev->bus->number);
-
-#if 0
-       printk("map irq: hose %d, bus %d, slot %d, first %d\n", hose->index,
-              dev->bus->number, idsel, hose->first_busno);
-#endif
-
-       if (hose->index != 0 && hose->index != 1) {
-               printk(KERN_ERR "map_irq: unknown hose %d\n", hose->index);
-               return 0;
-       }
-       
-       // Some of this is guesswork...
-       // In particular, I don't know if the ABCD mappings are right,
-       // and I don't know which IPM goes with which slot (the manual
-       // merely says "IPM" for both).
-
-       if (hose->index == 0) {
-               static u8 pci_irq_table[][4] = 
-               /*
-                * PCI IDSEL/INTPIN->INTLINE
-                *  A   B   C   D
-                */
-               {
-                       { DMV182_IRQ_PMC1A, DMV182_IRQ_PMC1B,
-                         DMV182_IRQ_PMC1C, DMV182_IRQ_PMC1D }, // PMC Slot 1 A
-                       { DMV182_IRQ_PMC1A, DMV182_IRQ_PMC1B,
-                         DMV182_IRQ_PMC1C, DMV182_IRQ_PMC1D }, // PMC Slot 1 B
-               };
-               
-               const int min_idsel = 4, max_idsel = 5, irqs_per_slot = 4;
-               return PCI_IRQ_TABLE_LOOKUP;
-       } else if (dev->bus->parent && dev->bus->primary == hose->first_busno &&
-                  dev->bus->self->devfn == 0x10) {
-               static u8 pci_irq_table[][4] = 
-               /*
-                * PCI IDSEL/INTPIN->INTLINE
-                *  A   B   C   D
-                */
-               {
-                       { DMV182_IRQ_IPM0, DMV182_IRQ_IPM0,
-                         DMV182_IRQ_IPM0, DMV182_IRQ_IPM0 }, // IPM... 0?
-                       { DMV182_IRQ_IPM1, DMV182_IRQ_IPM1,
-                         DMV182_IRQ_IPM1, DMV182_IRQ_IPM1 }, // IPM... 1?
-                       { DMV182_IRQ_USB_A, DMV182_IRQ_USB_B,
-                         DMV182_IRQ_USB_C, DMV182_IRQ_USB_SMI }, // USB
-                       { DMV182_IRQ_VME_CPU0, DMV182_IRQ_VME_CPU1, 0, 0 }, // VME
-               };
-               
-               const int min_idsel = 1, max_idsel = 4, irqs_per_slot = 4;
-               return PCI_IRQ_TABLE_LOOKUP;
-       } else {
-               static u8 pci_irq_table[][4] = 
-               /*
-                * PCI IDSEL/INTPIN->INTLINE
-                *  A   B   C   D
-                */
-               {
-                       { DMV182_IRQ_PMC2A, DMV182_IRQ_PMC2B,
-                         DMV182_IRQ_PMC2C, DMV182_IRQ_PMC2D }, // PMC Slot 2 A
-                       { DMV182_IRQ_PMC2A, DMV182_IRQ_PMC2B,
-                         DMV182_IRQ_PMC2C, DMV182_IRQ_PMC2D }, // PMC Slot 2 B
-               };
-               
-               const int min_idsel = 4, max_idsel = 5, irqs_per_slot = 4;
-               return PCI_IRQ_TABLE_LOOKUP;
-       }
-}
-
-static unsigned char dmv182_pci_swizzle(struct pci_dev *dev,
-                                         unsigned char *pinp)
-{
-       struct pci_controller *hose = dev->sysdata;
-
-       // The devices under this particular bridge have their IRQs
-       // directly routed to the PIC, rather than through the parent
-       // bus.  Thus, don't swizzle them.  The bus is determined by
-       // the devfn of the parent, rather than its own bus number,
-       // in case a PMC card is added that has its own bridge(s),
-       // causing the numbering to change.
-       
-       if (hose->index == 1 && dev->bus->parent &&
-           dev->bus->primary == hose->first_busno &&
-           dev->bus->self->devfn == 0x10)
-               return PCI_SLOT(dev->devfn);
-       
-       return common_swizzle(dev, pinp);
-}
-
-static unsigned long __init
-dmv182_pci_bridge_reserve_space(struct pci_controller *hose,
-                                 unsigned char bus, unsigned char devfn)
-{
-       // Reserve 768 MiB for the bus containing VME.  This
-       // will allow one to map the entire RAM of a 512 MiB
-       // card over VME, while still allowing space for other
-       // stuff on the bridge.
-       if (hose->first_busno == bus && devfn == 0x10)
-               return 0x30000000;
-       
-       return 0;
-}
-
-static void __init dmv182_setup_caches(void)
-{
-#if 0 // This actually causes the TimeSys 2.4 port to blow up too, for me 
-
-       // Why can't L2CR be set by generic 745x code?
-       // And what's with the underscore?
-       _set_L2CR(0xc0000000);
-
-       _set_L3CR(0x9e8a0180);
-#endif
-}
-
-#ifdef CONFIG_SERIAL_8250
-static void __init dmv182_early_serial_map(void)
-{
-        struct uart_port uart_req;
-       void *membase = ioremap(0xe0010000, PAGE_SIZE);
-
-        /* Setup serial port access */
-        memset(&uart_req, 0, sizeof (uart_req));
-        uart_req.irq = DMV182_IRQ_SERIAL_CH1;
-        uart_req.flags = 0;
-       uart_req.type = PORT_16550;
-        uart_req.uartclk = BASE_BAUD * 16;
-        uart_req.iotype = SERIAL_IO_MEM;
-        uart_req.mapbase = (unsigned long)dmv182_fpga_io + 0x18;
-        uart_req.membase = membase + 0x18;
-
-#if defined(CONFIG_SERIAL_TEXT_DEBUG) || defined(CONFIG_KGDB)
-        gen550_init(0, &uart_req);
-#endif
-
-        if (early_serial_setup(&uart_req) != 0)
-                printk("Early serial init of port 0 failed\n");
-
-        /* Assume early_serial_setup() doesn't modify uart_req */
-        uart_req.line = 1;
-        uart_req.mapbase = (unsigned long)dmv182_fpga_io + 0x20;
-        uart_req.membase = membase + 0x20;
-        uart_req.irq = DMV182_IRQ_SERIAL_CH2;
-
-#if defined(CONFIG_SERIAL_TEXT_DEBUG) || defined(CONFIG_KGDB)
-        gen550_init(1, &uart_req);
-#endif
-
-        if (early_serial_setup(&uart_req) != 0)
-                printk("Early serial init of port 1 failed\n");
-}
-#endif
-
-static void __init dmv182_setup_arch(void)
-{
-       if (ppc_md.progress)
-               ppc_md.progress("dmv182_setup_arch", 0x1820);
-
-       ppc_md.pci_swizzle = dmv182_pci_swizzle;
-
-       dmv182_setup_caches();
-
-       // Enable snooping.
-//     MV_SET_REG_BITS(MV64360_CPU_MASTER_CONTROL, (1 << 12) | (1 << 13));
-
-       // Set up the RTC.
-       dmv182_setup_bridge();
-       dmv182_setup_peripherals();
-
-#ifdef CONFIG_SERIAL_8250
-       dmv182_early_serial_map();
-#endif
-       if (ppc_md.progress)
-               ppc_md.progress("dmv182_setup_arch end", 0x182f);
-}
-
-static void __init dmv182_calibrate_decr(void)
-{
-       if (ppc_md.progress)
-               ppc_md.progress("dmv182_calibrate_decr", 0x1822);
-       
-       tb_ticks_per_jiffy = 25000000 / HZ;
-       tb_to_us = mulhwu_scale_factor(25000000, 1000000);
-}
-
-static void dmv182_halt(void)
-{
-       local_irq_disable();
-       for(;;);
-}
-
-static void dmv182_restart(char *cmd)
-{
-       unsigned long reg;
-       volatile unsigned long *ptr = NULL;
-       struct pci_dev *dev;
-
-       local_irq_disable();
-
-       /* 
-        * The best way to reset the board is through the Universe VME. 
-        * Since the VME driver may or may not be loaded, we can't rely
-        * on that, so the best way I can think of in resetting the board
-        * is to search all the PCI devices looking for the Universe chip 
-        * and write to its command register to reset the board.
-        */
-       dev = pci_find_device(PCI_VENDOR_ID_TUNDRA, 0, NULL);
-       if (dev) {
-               printk("Found VME device %s\n",dev->slot_name);
-
-               for (reg = 0; reg < 6; reg++) {
-                       struct resource *res = dev->resource + reg;
-                       if ((res->flags & PCI_BASE_ADDRESS_SPACE) ==
-                           PCI_BASE_ADDRESS_SPACE_MEMORY) {
-                               ptr = ioremap(res->start + 0x404, sizeof(ptr)); /* CTRL_REG */
-                               break;
-                       }
-               }
-       }
-
-       if (!ptr) {
-               printk("No VME device found to reset board\n");
-               return;
-       }
-
-       printk("**** resetting board through VME ****\n");
-       mdelay(10);
-
-       reg = *ptr;
-       reg |= 0x8000; /* reset only the board and not the entire chassis. */
-       *ptr = reg;
-
-       for(;;);
-}
-
-void board_get_mac(int port, u8 *addr)
-{
-       if (port < 1 || port > 2) {
-               printk(KERN_ERR "Unknown port %d in board_get_mac()...\n", port);
-               return;
-       }
-       
-       memcpy(addr, (u8 *)dmv182_nvram + 8 + (2 - port) * 6, 6);
-       printk(KERN_NOTICE "Ethernet port %d MAC: %02x:%02x:%02x:%02x:%02x:%02x\n",
-              port, addr[0], addr[1], addr[2], addr[3], addr[4], addr[5]);
-}
-
-#ifdef CONFIG_SMP
-
-static int dmv182_smp_probe(void)
-{
-       return 2;
-}
-
-void __secondary_start(void);
-
-static void dmv182_kick_cpu(int cpu)
-{
-       BUG_ON(cpu != 1);
-
-       *(u32 *)(PAGE_OFFSET + 4) = (u32)__secondary_start - PAGE_OFFSET;
-       wmb();
-       *(u32 *)(PAGE_OFFSET + 0) = 0x38a3fd19;
-       wmb();
-
-       /* Set MaskBR1 to allow CPU1 to get access to the bus. */
-       mv64x60_modify(&bh, MV64x60_CPU_MASTER_CNTL, 0, 1<<9);
-}
-
-static void dmv182_setup_cpu(int cpu)
-{
-       int whoami = mv64x60_read(&bh, MV64360_WHO_AM_I);
-       
-       if (cpu != whoami) {
-               printk("CPU %d whoami %d\n", cpu, whoami);
-               BUG();
-       }
-
-       // Enable broadcasting of synchronization and cache/tlb
-       // flushing/invalidation instructions
-       
-       mtspr(SPRN_HID1, mfspr(SPRN_HID1) | HID1_ABE | HID1_SYNCBE);
-       asm volatile("sync; isync" : : : "memory");
-
-       if (cpu == 1)
-               dmv182_setup_caches();
-}
-
-static void dmv182_message_pass(int target, int msg, ulong data, int wait)
-{
-       int i;
-       int reg;
-       
-       if (unlikely(msg < 0 || msg > 7)) {
-               printk(KERN_ERR "dmv182_message_pass: bad message %x\n", msg);
-               return;
-       }
-       
-       for_each_online_cpu(i) {
-               reg = MV64360_CPUx_DOORBELL(i);
-
-               if (target == MSG_ALL ||
-                   (target == MSG_ALL_BUT_SELF && i != smp_processor_id()) ||
-                   target == i)
-                       mv64x60_modify(&bh, reg, 1 << msg, 1 << msg);
-       }
-}
-
-static irqreturn_t dmv182_doorbell(int irq, void *dev_id, struct pt_regs *regs)
-{
-       u32 bits = mv64x60_read(&bh, MV64360_CPUx_DOORBELL(smp_processor_id()));
-
-       bits &= 0xff;
-
-       mv64x60_write(&bh, MV64360_CPU0_DOORBELL_CLR +
-                     smp_processor_id() * 0x10, bits);
-
-       while (bits) {
-               int msg = __ilog2(bits);;
-               smp_message_recv(msg, regs);
-               bits &= ~(1 << msg);
-       }
-       return IRQ_HANDLED;
-}
-
-static struct smp_ops_t dmv182_smp_ops = {
-       .probe        = dmv182_smp_probe,
-       .kick_cpu     = dmv182_kick_cpu,
-       .setup_cpu    = dmv182_setup_cpu,
-       .message_pass = dmv182_message_pass,
-       .give_timebase = smp_generic_give_timebase,
-       .take_timebase = smp_generic_take_timebase,
-};
-
-#endif
-
-static void __init dmv182_setup_bridge(void)
-{
-       mv64x60_setup_info_t si;
-
-       memset(&si, 0, sizeof(si));
-
-       si.phys_reg_base = CONFIG_MV64X60_NEW_BASE;
-       si.map_irq = dmv182_map_irq;
-
-       si.pci_0.enable_bus = 1;
-       si.pci_0.enumerate_bus = 1;
-       si.pci_0.pci_io.cpu_base = 0xa0000000;
-       si.pci_0.pci_io.pci_base_hi = 0;
-       si.pci_0.pci_io.pci_base_lo = 0;
-       si.pci_0.pci_io.size = 0x01000000;
-       si.pci_0.pci_io.swap = 0x01000000; /* XXXX No swapping */
-       si.pci_0.pci_mem[0].cpu_base = 0x80000000;
-       si.pci_0.pci_mem[0].pci_base_hi = 0;
-       si.pci_0.pci_mem[0].pci_base_lo = 0x80000000;
-       si.pci_0.pci_mem[0].size = 0x10000000;
-       si.pci_0.pci_mem[0].swap = 0x01000000; /* XXXX No swapping */
-       si.pci_0.pci_mem[1].cpu_base = 0;
-       si.pci_0.pci_mem[1].pci_base_hi = 0;
-       si.pci_0.pci_mem[1].pci_base_lo = 0;
-       si.pci_0.pci_mem[1].size = 0;   /* Don't use this window */
-       si.pci_0.pci_mem[1].swap = 0;
-       si.pci_0.pci_mem[2].cpu_base = 0;
-       si.pci_0.pci_mem[2].pci_base_hi = 0;
-       si.pci_0.pci_mem[2].pci_base_lo = 0;
-       si.pci_0.pci_mem[2].size = 0;   /* Don't use this window */
-       si.pci_0.pci_mem[1].swap = 0;
-       si.pci_0.pci_cmd_bits = 0;
-       si.pci_0.latency_timer = 0x8;
-
-       si.pci_1.enable_bus = 1;
-       si.pci_1.enumerate_bus = 1;
-       si.pci_1.pci_io.cpu_base = 0xa1000000;
-       si.pci_1.pci_io.pci_base_hi = 0;
-       si.pci_1.pci_io.pci_base_lo = 0x01000000;
-       si.pci_1.pci_io.size = 0x01000000;
-       si.pci_1.pci_io.swap = 0x01000000; /* XXXX No swapping */
-       si.pci_1.pci_mem[0].cpu_base = 0x90000000;
-       si.pci_1.pci_mem[0].pci_base_hi = 0;
-       si.pci_1.pci_mem[0].pci_base_lo = 0x90000000;
-       si.pci_1.pci_mem[0].size = 0x10000000;
-       si.pci_1.pci_mem[0].swap = 0x01000000; /* XXXX No swapping */
-       si.pci_1.pci_mem[1].cpu_base = 0;
-       si.pci_1.pci_mem[1].pci_base_hi = 0;
-       si.pci_1.pci_mem[1].pci_base_lo = 0;
-       si.pci_1.pci_mem[1].size = 0;   /* Don't use this window */
-       si.pci_1.pci_mem[1].swap = 0;
-       si.pci_1.pci_mem[2].cpu_base = 0;
-       si.pci_1.pci_mem[2].pci_base_hi = 0;
-       si.pci_1.pci_mem[2].pci_base_lo = 0;
-       si.pci_1.pci_mem[2].size = 0;   /* Don't use this window */
-       si.pci_1.pci_mem[1].swap = 0;
-       si.pci_1.pci_cmd_bits = 0;
-       si.pci_1.latency_timer = 0x8;
-       si.pci_1.pci_cmd_bits = 0;
-       si.pci_1.latency_timer = 0x8;
-
-       si.window_preserve_mask_32 = 0x1f0;
-#if 0
-       for (i=0; i<MV64x60_CPU2MEM_WINDOWS; i++) {
-               si.cpu_prot_options[i] = 0;
-//             si.cpu_snoop_options[i] = GT64260_CPU_SNOOP_WB;
-               si.pci_0.acc_cntl_options[i] =
-                       /* Breaks PCI (especially slot 4)
-                       GT64260_PCI_ACC_CNTL_PREFETCHEN |
-                       */
-                       GT64260_PCI_ACC_CNTL_DREADEN |
-                       GT64260_PCI_ACC_CNTL_RDPREFETCH |
-                       GT64260_PCI_ACC_CNTL_RDLINEPREFETCH |
-                       GT64260_PCI_ACC_CNTL_RDMULPREFETCH |
-                       GT64260_PCI_ACC_CNTL_SWAP_NONE |
-                       GT64260_PCI_ACC_CNTL_MBURST_32_BTYES;
-               si.pci_0.snoop_options[i] = GT64260_PCI_SNOOP_WB;
-               si.pci_1.acc_cntl_options[i] =
-                       /* Breaks PCI (especially slot 4)
-                       GT64260_PCI_ACC_CNTL_PREFETCHEN |
-                       */
-                       GT64260_PCI_ACC_CNTL_DREADEN |
-                       GT64260_PCI_ACC_CNTL_RDPREFETCH |
-                       GT64260_PCI_ACC_CNTL_RDLINEPREFETCH |
-                       GT64260_PCI_ACC_CNTL_RDMULPREFETCH |
-                       GT64260_PCI_ACC_CNTL_SWAP_NONE |
-                       GT64260_PCI_ACC_CNTL_MBURST_32_BTYES;
-//             si.pci_1.snoop_options[i] = GT64260_PCI_SNOOP_WB;
-       }
-#endif
-
-       mv64x60_pci_exclude_bridge = 0;
-
-        /* Lookup PCI host bridges */
-        if (mv64x60_init(&bh, &si)) {
-                printk("Bridge initialization failed.\n");
-        }
-
-       return;
-}
-
-static void __init dmv182_setup_peripherals(void)
-{
-       mv64x60_set_32bit_window(&bh, MV64x60_CPU2BOOT_WIN,
-                                0xf0000000, 0x08000000, 0); // FLASH
-       mv64x60_set_32bit_window(&bh, MV64x60_CPU2DEV_0_WIN,
-                                0xe0010000, 0x10000, 0); // I/O FPGA
-       mv64x60_set_32bit_window(&bh, MV64x60_CPU2DEV_1_WIN,
-                                0xe0000000, 0x10000, 0); // EPLD
-       mv64x60_set_32bit_window(&bh, MV64x60_CPU2DEV_2_WIN,
-                                0xe0020000, 0x10000, 0); // RTC
-       mv64x60_set_32bit_window(&bh, MV64x60_CPU2DEV_3_WIN,
-                                0xe0030000, 0x10000, 0); // NVRAM
-
-       TODC_INIT(TODC_TYPE_DS1501, 0, 0, dmv182_rtc, 8);
-}
-
-unsigned long __init dmv182_find_end_of_memory(void)
-{
-#if 0
-       return mv64x60_get_mem_size(0xfff00000 /*CONFIG_MV64X60_NEW_BASE*/,
-                                                 MV64x60_TYPE_MV64360);
-#endif
-       /* But it dies if we enable more than 512MiB. Debug later... */
-       return 0x20000000;
-}
-
-void __init platform_init(unsigned long r3, unsigned long r4,
-                          unsigned long r5, unsigned long r6,
-                          unsigned long r7)
-{
-       parse_bootinfo(find_bootinfo());
-       
-       dmv182_setup_bats();
-
-#if defined(CONFIG_SERIAL_TEXT_DEBUG)
-       ppc_md.progress = gen550_progress;
-#endif
-       ppc_md.setup_io_mappings = dmv182_map_io;
-       ppc_md.find_end_of_memory = dmv182_find_end_of_memory;
-       ppc_md.setup_arch = dmv182_setup_arch;
-       ppc_md.init_IRQ = dmv182_init_irq;
-       ppc_md.get_irq = mv64360_get_irq;
-       ppc_md.calibrate_decr = dmv182_calibrate_decr;
-//     ppc_md.pci_bridge_reserve_space = dmv182_pci_bridge_reserve_space;
-       
-       ppc_md.halt = dmv182_halt;
-       ppc_md.power_off = dmv182_halt;
-       ppc_md.restart = dmv182_restart;
-#ifdef CONFIG_SMP
-       ppc_md.smp_ops = &dmv182_smp_ops;
-#endif
-#ifdef CONFIG_GEN_RTC
-       ppc_md.time_init = todc_time_init;
-       ppc_md.set_rtc_time = todc_set_rtc_time;
-       ppc_md.get_rtc_time = todc_get_rtc_time;
-
-       ppc_md.nvram_read_val = todc_direct_read_val;
-       ppc_md.nvram_write_val = todc_direct_write_val;
-#endif
-}
diff --git a/arch/ppc/platforms/dmv182.h b/arch/ppc/platforms/dmv182.h
deleted file mode 100644 (file)
index fde6ba7..0000000
+++ /dev/null
@@ -1,61 +0,0 @@
-#ifndef __DMV182_H
-#define __DMV182_H
-
-#include <linux/config.h>
-#include <linux/types.h>
-
-#define dmv182_board_io_phys 0xe0000000
-#define dmv182_board_io_size 0x00040000
-
-#ifdef __BOOTER__
-#define dmv182_board_io_virt ((u8 *)dmv182_board_io_phys)
-#else
-#define dmv182_board_io_virt ((u8 *)0xf0000000)
-#endif
-
-#define dmv182_fpga_io (dmv182_board_io_virt + 0x10000)
-#define dmv182_rtc     (dmv182_board_io_virt + 0x20000)
-#define dmv182_nvram   (dmv182_board_io_virt + 0x30000)
-
-// This has to go above the mv64360 interrupts, as even though
-// the mv64360 code can handle relocating its interrupt range,
-// the device drivers themselves are oblivious to this.
-
-#define DMV182_IRQ_TEMPA        96
-#define DMV182_IRQ_TEMPB        97
-#define DMV182_IRQ_TEMPC        98
-#define DMV182_IRQ_TEMPD        99
-#define DMV182_IRQ_PMC1A       100
-#define DMV182_IRQ_PMC1B       101
-#define DMV182_IRQ_PMC1C       102
-#define DMV182_IRQ_PMC1D       103
-#define DMV182_IRQ_PMC2A       104
-#define DMV182_IRQ_PMC2B       105
-#define DMV182_IRQ_PMC2C       106
-#define DMV182_IRQ_PMC2D       107
-#define DMV182_IRQ_ENET_PHY2   108
-#define DMV182_IRQ_ENET_PHY1   109
-#define DMV182_IRQ_IPM0        110
-#define DMV182_IRQ_IPM1        111
-#define DMV182_IRQ_USB_A       112
-#define DMV182_IRQ_USB_B       113
-#define DMV182_IRQ_USB_C       114
-#define DMV182_IRQ_USB_SMI     115
-#define DMV182_IRQ_RTC         116
-#define DMV182_IRQ_WDOG_CPU0   117
-#define DMV182_IRQ_WDOG_CPU1   118
-#define DMV182_IRQ_TIMER0_CPU0 120
-#define DMV182_IRQ_TIMER1_CPU0 121
-#define DMV182_IRQ_TIMER2_CPU0 122
-#define DMV182_IRQ_TIMER0_CPU1 123
-#define DMV182_IRQ_TIMER1_CPU1 124
-#define DMV182_IRQ_TIMER2_CPU1 125
-#define DMV182_IRQ_SERIAL_CH1  126
-#define DMV182_IRQ_SERIAL_CH2  127
-#define DMV182_IRQ_VME_CPU0    128
-#define DMV182_IRQ_VME_CPU1    129
-
-// 28 FPGA interrupts starting from here
-#define DMV182_IRQ_FPGA        132
-
-#endif
diff --git a/arch/ppc/platforms/dmv182_serial.h b/arch/ppc/platforms/dmv182_serial.h
deleted file mode 100644 (file)
index b1dbb2d..0000000
+++ /dev/null
@@ -1,19 +0,0 @@
-#ifndef __DMV182_SERIAL_H
-#define __DMV182_SERIAL_H
-
-#include <linux/serial.h>
-#include <platforms/dmv182.h>
-
-#define BASE_BAUD (36864000 / 16)
-#define RS_TABLE_SIZE 2
-
-#define STD_UART_OP(num) \
-       { .baud_base = BASE_BAUD, \
-         .irq = DMV182_IRQ_SERIAL_CH##num, \
-         .flags = ASYNC_SKIP_TEST | ASYNC_BUGGY_UART, \
-         .iomem_base = dmv182_fpga_io + 0x18 + 8 * (num - 1), \
-         .io_type = SERIAL_IO_MEM },
-
-#define SERIAL_PORT_DFNS STD_UART_OP(1) STD_UART_OP(2)
-
-#endif
diff --git a/arch/ppc/platforms/ev64260.c b/arch/ppc/platforms/ev64260.c
deleted file mode 100644 (file)
index 1275889..0000000
+++ /dev/null
@@ -1,893 +0,0 @@
-/*
- * arch/ppc/platforms/ev64260.c
- *
- * Board setup routines for the Marvell/Galileo EV-64260-BP Evaluation Board.
- *
- * Author: Mark A. Greer <mgreer@mvista.com>
- *
- * 2001-2003 (c) MontaVista, Software, Inc.  This file is licensed under
- * the terms of the GNU General Public License version 2.  This program
- * is licensed "as is" without any warranty of any kind, whether express
- * or implied.
- */
-
-/*
- * The EV-64260-BP port is the result of hard work from many people from
- * many companies.  In particular, employees of Marvell/Galileo, Mission
- * Critical Linux, Xyterra, and MontaVista Software were heavily involved.
- *
- * Note: I have not been able to get *all* PCI slots to work reliably
- *     at 66 MHz.  I recommend setting jumpers J15 & J16 to short pins 1&2
- *     so that 33 MHz is used. --MAG
- * Note: The 750CXe and 7450 are not stable with a 125MHz or 133MHz TCLK/SYSCLK.
- *     At 100MHz, they are solid.
- */
-#include <linux/config.h>
-
-#include <linux/delay.h>
-#include <linux/pci.h>
-#include <linux/ide.h>
-#include <linux/irq.h>
-#include <linux/fs.h>
-#include <linux/seq_file.h>
-#include <linux/console.h>
-#include <linux/initrd.h>
-#include <linux/root_dev.h>
-#if !defined(CONFIG_SERIAL_MPSC_CONSOLE)
-#include <linux/serial.h>
-#include <linux/tty.h>
-#include <linux/serial_core.h>
-#endif
-#include <asm/bootinfo.h>
-#include <asm/machdep.h>
-#include <asm/mv64x60.h>
-#include <asm/ppcboot.h>
-#include <asm/todc.h>
-#include <asm/time.h>
-#include <asm/ocp.h>
-
-#include <platforms/ev64260.h>
-
-#define BOARD_VENDOR   "Marvell/Galileo"
-#define BOARD_MACHINE  "EV-64260-BP"
-
-/* Set IDE controllers into Native mode? */
-/* XXXX
-#define SET_PCI_IDE_NATIVE
-*/
-
-ulong  ev64260_mem_size = 0;
-bd_t   ppcboot_bd;
-int    ppcboot_bd_valid=0;
-
-static mv64x60_handle_t        bh;
-
-#if !defined(CONFIG_SERIAL_MPSC_CONSOLE)
-extern void gen550_progress(char *, unsigned short);
-extern void gen550_init(int, struct serial_struct *);
-#endif
-
-static const unsigned int cpu_7xx[16] = { /* 7xx & 74xx (but not 745x) */
-       18, 15, 14, 2, 4, 13, 5, 9, 6, 11, 8, 10, 16, 12, 7, 0
-};
-static const unsigned int cpu_745x[2][16] = { /* PLL_EXT 0 & 1 */
-       { 1, 15, 14,  2,  4, 13,  5,  9,  6, 11,  8, 10, 16, 12,  7,  0 },
-       { 0, 30,  0,  2,  0, 26,  0, 18,  0, 22, 20, 24, 28, 32,  0,  0 }
-};
-
-
-TODC_ALLOC();
-
-static int
-ev64260_get_bus_speed(void)
-{
-       int     speed;
-
-       if (ppcboot_bd_valid) {
-               speed = ppcboot_bd.bi_busfreq;
-       }
-       else {
-               speed = 100000000; /* Only 100MHz is stable */
-       }
-
-       return speed;
-}
-
-static int
-ev64260_get_cpu_speed(void)
-{
-       unsigned long   pvr, hid1, pll_ext;
-
-       pvr = PVR_VER(mfspr(PVR));
-
-       if (pvr != PVR_VER(PVR_7450)) {
-               hid1 = mfspr(HID1) >> 28;
-               return ev64260_get_bus_speed() * cpu_7xx[hid1]/2;
-       }
-       else {
-               hid1 = (mfspr(HID1) & 0x0001e000) >> 13;
-               pll_ext = 0; /* No way to read; must get from schematic */
-               return ev64260_get_bus_speed() * cpu_745x[pll_ext][hid1]/2;
-       }
-}
-
-unsigned long __init
-ev64260_find_end_of_memory(void)
-{
-       if(!ppcboot_bd_valid) {
-               return mv64x60_get_mem_size(CONFIG_MV64X60_NEW_BASE,
-                       MV64x60_TYPE_GT64260A);
-       }
-       return ppcboot_bd.bi_memsize;
-}
-
-#if 0  /* XXXX */
-#ifdef SET_PCI_IDE_NATIVE
-static void __init
-set_pci_native_mode(void)
-{
-       struct pci_dev *dev;
-
-       /* Better way of doing this ??? */
-       pci_for_each_dev(dev) { 
-               int class = dev->class >> 8;
-
-               /* enable pci native mode */
-               if (class == PCI_CLASS_STORAGE_IDE) {
-                       u8 reg;
-
-                       pci_read_config_byte(dev, 0x9, &reg);
-                       if (reg == 0x8a) {
-                               printk("PCI: Enabling PCI IDE native mode on %s\n", dev->slot_name); 
-                               pci_write_config_byte(dev, 0x9,  0x8f);
-
-                               /* let the pci code set this device up after we change it */
-                               pci_setup_device(dev); 
-                       } else if (reg != 0x8f) {
-                               printk("PCI: IDE chip in unknown mode 0x%02x on %s", reg, dev->slot_name);
-                       }
-               }
-       }
-}
-#endif
-#endif
-
-static void __init
-ev64260_pci_fixups(void)
-{
-#ifdef SET_PCI_IDE_NATIVE
-       set_pci_native_mode();
-#endif
-}
-
-
-/*
- * Marvell/Galileo EV-64260-BP Evaluation Board PCI interrupt routing.
- * Note: By playing with J8 and JP1-4, you can get 2 IRQ's from the first
- *     PCI bus (in which cast, INTPIN B would be EV64260_PCI_1_IRQ).
- *     This is the most IRQs you can get from one bus with this board, though.
- */
-static int __init
-ev64260_map_irq(struct pci_dev *dev, unsigned char idsel, unsigned char pin)
-{
-       struct pci_controller   *hose = pci_bus_to_hose(dev->bus->number);
-
-       if (hose->index == 0) {
-               static char pci_irq_table[][4] =
-               /*
-                *      PCI IDSEL/INTPIN->INTLINE 
-                *         A   B   C   D
-                */
-               {
-                       {EV64260_PCI_0_IRQ,0,0,0}, /* IDSEL 7 - PCI bus 0 */
-                       {EV64260_PCI_0_IRQ,0,0,0}, /* IDSEL 8 - PCI bus 0 */
-               };
-
-               const long min_idsel = 7, max_idsel = 8, irqs_per_slot = 4;
-               return PCI_IRQ_TABLE_LOOKUP;
-       }
-       else {
-               static char pci_irq_table[][4] =
-               /*
-                *      PCI IDSEL/INTPIN->INTLINE 
-                *         A   B   C   D
-                */
-               {
-                       { EV64260_PCI_1_IRQ,0,0,0}, /* IDSEL 7 - PCI bus 1 */
-                       { EV64260_PCI_1_IRQ,0,0,0}, /* IDSEL 8 - PCI bus 1 */
-               };
-
-               const long min_idsel = 7, max_idsel = 8, irqs_per_slot = 4;
-               return PCI_IRQ_TABLE_LOOKUP;
-       }
-}
-
-static void __init
-ev64260_setup_peripherals(void)
-{
-       mv64x60_set_32bit_window(&bh, MV64x60_CPU2BOOT_WIN,
-               EV64260_EMB_FLASH_BASE, EV64260_EMB_FLASH_SIZE, 0);
-       mv64x60_set_32bit_window(&bh, MV64x60_CPU2DEV_0_WIN,
-               EV64260_EXT_SRAM_BASE, EV64260_EXT_SRAM_SIZE, 0);
-       mv64x60_set_32bit_window(&bh, MV64x60_CPU2DEV_1_WIN,
-               EV64260_TODC_BASE, EV64260_TODC_SIZE, 0);
-       mv64x60_set_32bit_window(&bh, MV64x60_CPU2DEV_2_WIN,
-               EV64260_UART_BASE, EV64260_UART_SIZE, 0);
-       mv64x60_set_32bit_window(&bh, MV64x60_CPU2DEV_3_WIN,
-               EV64260_EXT_FLASH_BASE, EV64260_EXT_FLASH_SIZE, 0);
-
-       TODC_INIT(TODC_TYPE_DS1501, 0, 0,
-                       ioremap(EV64260_TODC_BASE, EV64260_TODC_SIZE), 8);
-
-       mv64x60_clr_bits(&bh, MV64x60_CPU_CONFIG, ((1<<28) | (1<<29)));
-       mv64x60_set_bits(&bh, MV64x60_CPU_CONFIG, (1<<27));
-
-       if (ev64260_get_bus_speed() > 100000000) {
-               mv64x60_set_bits(&bh, MV64x60_CPU_CONFIG, (1<<23));
-       }
-
-       mv64x60_set_bits(&bh, MV64x60_PCI0_PCI_DECODE_CNTL,((1<<0) | (1<<3)));
-       mv64x60_set_bits(&bh, MV64x60_PCI1_PCI_DECODE_CNTL,((1<<0) | (1<<3)));
-
-        /*
-         * Enabling of PCI internal-vs-external arbitration
-         * is a platform- and errata-dependent decision.
-         */
-        if (bh.type == MV64x60_TYPE_GT64260A )  {
-                mv64x60_set_bits(&bh, MV64x60_PCI0_ARBITER_CNTL, (1<<31));
-                mv64x60_set_bits(&bh, MV64x60_PCI1_ARBITER_CNTL, (1<<31));
-        }
-
-        mv64x60_set_bits(&bh, MV64x60_CPU_MASTER_CNTL, (1<<9)); /* Only 1 cpu */
-
-       /*
-        * The EV-64260-BP uses several Multi-Purpose Pins (MPP) on the 64260
-        * bridge as interrupt inputs (via the General Purpose Ports (GPP)
-        * register).  Need to route the MPP inputs to the GPP and set the
-        * polarity correctly.
-        *
-        * In MPP Control 2 Register
-        *   MPP 21 -> GPP 21 (DUART channel A intr) bits 20-23 -> 0
-        *   MPP 22 -> GPP 22 (DUART channel B intr) bits 24-27 -> 0
-        */
-       mv64x60_clr_bits(&bh, MV64x60_MPP_CNTL_2, (0xf<<20) | (0xf<<24) );
-
-       /*
-        * In MPP Control 3 Register
-        *   MPP 26 -> GPP 26 (RTC INT)         bits  8-11 -> 0
-        *   MPP 27 -> GPP 27 (PCI 0 INTA)      bits 12-15 -> 0
-        *   MPP 29 -> GPP 29 (PCI 1 INTA)      bits 20-23 -> 0
-        */
-       mv64x60_clr_bits(&bh, MV64x60_MPP_CNTL_3,
-               (0xf<<8) | (0xf<<12) | (0xf<<20));
-
-#define GPP_EXTERNAL_INTERRUPTS \
-               ((1<<21) | (1<<22) | (1<<26) | (1<<27) | (1<<29))
-       /* DUART & PCI interrupts are inputs */
-       mv64x60_clr_bits(&bh, MV64x60_GPP_IO_CNTL, GPP_EXTERNAL_INTERRUPTS);
-       /* DUART & PCI interrupts are active low */
-       mv64x60_set_bits(&bh, MV64x60_GPP_LEVEL_CNTL, GPP_EXTERNAL_INTERRUPTS);
-
-       /* Clear any pending interrupts for these inputs and enable them. */
-       mv64x60_write(&bh, MV64x60_GPP_INTR_CAUSE, ~GPP_EXTERNAL_INTERRUPTS);
-       mv64x60_set_bits(&bh, MV64x60_GPP_INTR_MASK, GPP_EXTERNAL_INTERRUPTS);
-
-       /*
-        * Set MPSC Multiplex RMII
-        * NOTE: ethernet driver modifies bit 0 and 1
-        */
-       mv64x60_write(&bh, GT64260_MPP_SERIAL_PORTS_MULTIPLEX, 0x00001102);
-       return;
-}
-
-
-static void __init
-ev64260_setup_bridge(void)
-{
-       mv64x60_setup_info_t    si;
-       int                     i;
-
-       memset(&si, 0, sizeof(si));
-
-       si.phys_reg_base = CONFIG_MV64X60_NEW_BASE;
-       si.map_irq = ev64260_map_irq;
-
-       si.pci_0.enable_bus = 1;
-       si.pci_0.enumerate_bus = 1;
-       si.pci_0.pci_io.cpu_base = 0xa0000000;
-       si.pci_0.pci_io.pci_base_hi = 0;
-       si.pci_0.pci_io.pci_base_lo = 0;
-       si.pci_0.pci_io.size = 0x01000000;
-       si.pci_0.pci_io.swap = 0x01000000; /* XXXX No swapping */
-       si.pci_0.pci_mem[0].cpu_base = 0x80000000;
-       si.pci_0.pci_mem[0].pci_base_hi = 0;
-       si.pci_0.pci_mem[0].pci_base_lo = 0x80000000;
-       si.pci_0.pci_mem[0].size = 0x10000000;
-       si.pci_0.pci_mem[0].swap = 0x01000000; /* XXXX No swapping */
-       si.pci_0.pci_mem[1].cpu_base = 0;
-       si.pci_0.pci_mem[1].pci_base_hi = 0;
-       si.pci_0.pci_mem[1].pci_base_lo = 0;
-       si.pci_0.pci_mem[1].size = 0;   /* Don't use this window */
-       si.pci_0.pci_mem[1].swap = 0;
-       si.pci_0.pci_mem[2].cpu_base = 0;
-       si.pci_0.pci_mem[2].pci_base_hi = 0;
-       si.pci_0.pci_mem[2].pci_base_lo = 0;
-       si.pci_0.pci_mem[2].size = 0;   /* Don't use this window */
-       si.pci_0.pci_mem[1].swap = 0;
-       si.pci_0.pci_cmd_bits = 0;
-       si.pci_0.latency_timer = 0x8;
-
-       si.pci_1.enable_bus = 1;
-       si.pci_1.enumerate_bus = 1;
-       si.pci_1.pci_io.cpu_base = 0xa1000000;
-       si.pci_1.pci_io.pci_base_hi = 0;
-       si.pci_1.pci_io.pci_base_lo = 0x01000000;
-       si.pci_1.pci_io.size = 0x01000000;
-       si.pci_1.pci_io.swap = 0x01000000; /* XXXX No swapping */
-       si.pci_1.pci_mem[0].cpu_base = 0x90000000;
-       si.pci_1.pci_mem[0].pci_base_hi = 0;
-       si.pci_1.pci_mem[0].pci_base_lo = 0x90000000;
-       si.pci_1.pci_mem[0].size = 0x10000000;
-       si.pci_1.pci_mem[0].swap = 0x01000000; /* XXXX No swapping */
-       si.pci_1.pci_mem[1].cpu_base = 0;
-       si.pci_1.pci_mem[1].pci_base_hi = 0;
-       si.pci_1.pci_mem[1].pci_base_lo = 0;
-       si.pci_1.pci_mem[1].size = 0;   /* Don't use this window */
-       si.pci_1.pci_mem[1].swap = 0;
-       si.pci_1.pci_mem[2].cpu_base = 0;
-       si.pci_1.pci_mem[2].pci_base_hi = 0;
-       si.pci_1.pci_mem[2].pci_base_lo = 0;
-       si.pci_1.pci_mem[2].size = 0;   /* Don't use this window */
-       si.pci_1.pci_mem[1].swap = 0;
-       si.pci_1.pci_cmd_bits = 0;
-       si.pci_1.latency_timer = 0x8;
-       si.pci_1.pci_cmd_bits = 0;
-       si.pci_1.latency_timer = 0x8;
-
-       for (i=0; i<MV64x60_CPU2MEM_WINDOWS; i++) {
-               si.cpu_prot_options[i] = 0;
-               si.cpu_snoop_options[i] = GT64260_CPU_SNOOP_WB;
-               si.pci_0.acc_cntl_options[i] =
-                       /* Breaks PCI (especially slot 4)
-                       GT64260_PCI_ACC_CNTL_PREFETCHEN |
-                       */
-                       GT64260_PCI_ACC_CNTL_DREADEN |
-                       GT64260_PCI_ACC_CNTL_RDPREFETCH |
-                       GT64260_PCI_ACC_CNTL_RDLINEPREFETCH |
-                       GT64260_PCI_ACC_CNTL_RDMULPREFETCH |
-                       GT64260_PCI_ACC_CNTL_SWAP_NONE |
-                       GT64260_PCI_ACC_CNTL_MBURST_32_BTYES;
-               si.pci_0.snoop_options[i] = GT64260_PCI_SNOOP_WB;
-               si.pci_1.acc_cntl_options[i] =
-                       /* Breaks PCI (especially slot 4)
-                       GT64260_PCI_ACC_CNTL_PREFETCHEN |
-                       */
-                       GT64260_PCI_ACC_CNTL_DREADEN |
-                       GT64260_PCI_ACC_CNTL_RDPREFETCH |
-                       GT64260_PCI_ACC_CNTL_RDLINEPREFETCH |
-                       GT64260_PCI_ACC_CNTL_RDMULPREFETCH |
-                       GT64260_PCI_ACC_CNTL_SWAP_NONE |
-                       GT64260_PCI_ACC_CNTL_MBURST_32_BTYES;
-               si.pci_1.snoop_options[i] = GT64260_PCI_SNOOP_WB;
-       }
-
-        /* Lookup PCI host bridges */
-        if (mv64x60_init(&bh, &si)) {
-                printk("Bridge initialization failed.\n");
-        }
-
-       return;
-}
-
-#if defined(CONFIG_SERIAL_8250) && !defined(CONFIG_SERIAL_MPSC_CONSOLE)
-static void __init
-ev64260_early_serial_map(void)
-{
-       struct uart_port        port;
-       static char             first_time = 1;
-
-       if (first_time) {
-               memset(&port, 0, sizeof(port));
-
-               port.membase = ioremap(EV64260_SERIAL_0, EV64260_UART_SIZE);
-               port.irq = EV64260_UART_0_IRQ;
-               port.uartclk = BASE_BAUD * 16;
-               port.regshift = 2;
-               port.iotype = SERIAL_IO_MEM;
-               port.flags = STD_COM_FLAGS;
-
-#if defined(CONFIG_SERIAL_TEXT_DEBUG) || defined(CONFIG_KGDB)
-               gen550_init(0, &port);
-#endif
-
-               if (early_serial_setup(&port) != 0) {
-                       printk("Early serial init of port 0 failed\n");
-               }
-
-#if 0  /* XXXX */
-               /* Assume early_serial_setup() doesn't modify port */
-               port.membase = ioremap(EV64260_SERIAL_1, EV64260_UART_SIZE);
-               port.irq = EV64260_UART_1_IRQ;
-
-#if defined(CONFIG_SERIAL_TEXT_DEBUG) || defined(CONFIG_KGDB)
-               gen550_init(1, &port);
-#endif
-
-               if (early_serial_setup(&port) != 0) {
-                       printk("Early serial init of port 1 failed\n");
-               }
-#endif
-
-               first_time = 0;
-       }
-
-       return;
-}
-#elif defined(CONFIG_SERIAL_MPSC_CONSOLE)
-static void __init
-ev64260_early_serial_map(void)
-{
-#ifdef CONFIG_KGDB
-       static char     first_time = 1;
-
-
-#if defined(CONFIG_KGDB_TTYS0)
-#define KGDB_PORT 0
-#elif defined(CONFIG_KGDB_TTYS1)
-#define KGDB_PORT 1
-#else
-#error "Invalid kgdb_tty port"
-#endif
-
-       if (first_time) {
-               gt_early_mpsc_init(KGDB_PORT, B9600|CS8|CREAD|HUPCL|CLOCAL);
-               first_time = 0;
-       }
-
-       return;
-#endif
-}
-#endif
-
-static void __init
-ev64260_fixup_ocp(void)
-{
-#if defined(CONFIG_SERIAL_MPSC)
-       struct ocp_device       *dev;
-       mv64x60_ocp_mpsc_data_t *dp;
-
-       if ((dev = ocp_find_device(OCP_VENDOR_MARVELL, OCP_FUNC_MPSC, 0))
-                                                               != NULL) {
-               dp = (mv64x60_ocp_mpsc_data_t *)dev->def->additions;
-
-               dp->max_idle = 40;      /* XXXX what should this be? */
-               dp->default_baud = EV64260_DEFAULT_BAUD;
-               dp->brg_clk_src = EV64260_MPSC_CLK_SRC;
-               dp->brg_clk_freq = EV64260_MPSC_CLK_FREQ;
-       }
-
-       if ((dev = ocp_find_device(OCP_VENDOR_MARVELL, OCP_FUNC_MPSC, 1))
-                                                               != NULL) {
-               dp = (mv64x60_ocp_mpsc_data_t *)dev->def->additions;
-
-               dp->max_idle = 40;      /* XXXX what should this be? */
-               dp->default_baud = 9600;        /* XXXX */
-               dp->brg_clk_src = EV64260_MPSC_CLK_SRC;
-               dp->brg_clk_freq = EV64260_MPSC_CLK_FREQ;
-       }
-#endif
-
-       return;
-}
-
-static void __init
-ev64260_setup_arch(void)
-{
-       if ( ppc_md.progress )
-               ppc_md.progress("ev64260_setup_arch: enter", 0);
-
-#ifdef CONFIG_BLK_DEV_INITRD
-       if (initrd_start)
-               ROOT_DEV = Root_RAM0;
-       else
-#endif
-#ifdef CONFIG_ROOT_NFS
-               ROOT_DEV = Root_NFS;
-#else
-               ROOT_DEV = Root_SDA2;
-#endif
-
-       if ( ppc_md.progress )
-               ppc_md.progress("ev64260_setup_arch: Enabling L2 cache", 0);
-
-       /* Enable L2 and L3 caches (if 745x) */
-       _set_L2CR(_get_L2CR() | L2CR_L2E);
-       _set_L3CR(_get_L3CR() | L3CR_L3E);
-
-       if ( ppc_md.progress )
-               ppc_md.progress("ev64260_setup_arch: Initializing bridge", 0);
-
-       ev64260_setup_bridge();         /* set up PCI bridge(s) */
-       ev64260_setup_peripherals();    /* set up chip selects/GPP/MPP etc */
-
-       if ( ppc_md.progress )
-               ppc_md.progress("ev64260_setup_arch: bridge init complete", 0);
-
-       /* Set OCP values to reflect this board's setup */
-       ev64260_fixup_ocp();
-
-#ifdef CONFIG_DUMMY_CONSOLE
-       conswitchp = &dummy_con;
-#endif
-#if defined(CONFIG_SERIAL_8250) || defined(CONFIG_SERIAL_MPSC_CONSOLE)
-       ev64260_early_serial_map();
-#endif
-
-       printk(BOARD_VENDOR " " BOARD_MACHINE "\n");
-       printk("EV-64260-BP port (C) 2001 MontaVista Software, Inc. (source@mvista.com)\n");
-
-       if ( ppc_md.progress )
-               ppc_md.progress("ev64260_setup_arch: exit", 0);
-
-       return;
-}
-
-static void
-ev64260_reset_board(void *addr)
-{
-       local_irq_disable();
-
-       /* disable and invalidate the L2 cache */
-       _set_L2CR(0);
-       _set_L2CR(0x200000);
-
-       /* flush and disable L1 I/D cache */
-       __asm__ __volatile__
-       ("mfspr   3,1008\n\t"
-        "ori   5,5,0xcc00\n\t"
-        "ori   4,3,0xc00\n\t"
-        "andc  5,3,5\n\t"
-        "sync\n\t"
-        "mtspr 1008,4\n\t"
-        "isync\n\t"
-        "sync\n\t"
-        "mtspr 1008,5\n\t"
-        "isync\n\t"
-        "sync\n\t");
-
-       /* unmap any other random cs's that might overlap with bootcs */
-       mv64x60_set_32bit_window(&bh, MV64x60_CPU2DEV_0_WIN, 0, 0, 0);
-       mv64x60_set_32bit_window(&bh, MV64x60_CPU2DEV_1_WIN, 0, 0, 0);
-       mv64x60_set_32bit_window(&bh, MV64x60_CPU2DEV_2_WIN, 0, 0, 0);
-       mv64x60_set_32bit_window(&bh, MV64x60_CPU2DEV_3_WIN, 0, 0, 0);
-
-       /* map bootrom back in to gt @ reset defaults */
-       mv64x60_set_32bit_window(&bh, MV64x60_CPU2BOOT_WIN,
-                                               0xff800000, 8*1024*1024, 0);
-
-       /* move gt reg base back to default, setup default pci0 swapping
-        * config... */
-       mv64x60_write(&bh, MV64x60_INTERNAL_SPACE_DECODE,
-               (1<<24) | MV64x60_INTERNAL_SPACE_DEFAULT_ADDR>>20);
-
-       /* NOTE: FROM NOW ON no more GT_REGS accesses.. 0x1 is not mapped
-        * via BAT or MMU, and MSR IR/DR is ON */
-#if 0
-       /* BROKEN... IR/DR is still on !!  won't work!! */
-       /* Set exception prefix high - to the firmware */
-       _nmask_and_or_msr(0, MSR_IP);
-
-       out_8((u_char *)EV64260_BOARD_MODRST_REG, 0x01);
-#else
-       /* SRR0 has system reset vector, SRR1 has default MSR value */
-       /* rfi restores MSR from SRR1 and sets the PC to the SRR0 value */
-       /* NOTE: assumes reset vector is at 0xfff00100 */
-       __asm__ __volatile__
-       ("mtspr   26, %0\n\t"
-        "li      4,(1<<6)\n\t"
-        "mtspr   27,4\n\t"
-        "rfi\n\t"
-        :: "r" (addr):"r4");
-#endif
-       return;
-}
-
-static void
-ev64260_restart(char *cmd)
-{
-       volatile ulong  i = 10000000;
-
-       ev64260_reset_board((void *)0xfff00100);
-
-       while (i-- > 0);
-       panic("restart failed\n");
-}
-
-static void
-ev64260_halt(void)
-{
-       local_irq_disable();
-       while (1);
-       /* NOTREACHED */
-}
-
-static void
-ev64260_power_off(void)
-{
-       ev64260_halt();
-       /* NOTREACHED */
-}
-
-static int
-ev64260_show_cpuinfo(struct seq_file *m)
-{
-       uint pvid;
-
-       pvid = mfspr(PVR);
-       seq_printf(m, "vendor\t\t: " BOARD_VENDOR "\n");
-       seq_printf(m, "machine\t\t: " BOARD_MACHINE "\n");
-       seq_printf(m, "cpu MHz\t\t: %d\n", ev64260_get_cpu_speed()/1000/1000);
-       seq_printf(m, "bus MHz\t\t: %d\n", ev64260_get_bus_speed()/1000/1000);
-
-       return 0;
-}
-
-/* DS1501 RTC has too much variation to use RTC for calibration */
-static void __init
-ev64260_calibrate_decr(void)
-{
-       ulong freq;
-
-       freq = ev64260_get_bus_speed()/4;
-
-       printk("time_init: decrementer frequency = %lu.%.6lu MHz\n",
-              freq/1000000, freq%1000000);
-
-       tb_ticks_per_jiffy = freq / HZ;
-       tb_to_us = mulhwu_scale_factor(freq, 1000000);
-
-       return;
-}
-
-#if 0  /* XXXX */
-#ifdef CONFIG_USE_PPCBOOT
-static void parse_ppcbootinfo(unsigned long r3,
-       unsigned long r4, unsigned long r5,
-       unsigned long r6, unsigned long r7)
-{
-    bd_t *bd=NULL;
-    char *cmdline_start=NULL;
-    int cmdline_len=0;
-
-    if(r3) {
-       if((r3 & 0xf0000000) == 0) r3 += KERNELBASE;
-       if((r3 & 0xf0000000) == KERNELBASE) {
-           bd=(void *)r3;
-
-           /* hack for ppcboot loaders that report freqs in Mhz */
-           if(bd->bi_intfreq<1000000) bd->bi_intfreq*=1000000;
-           if(bd->bi_busfreq<1000000) bd->bi_busfreq*=1000000;
-
-           memcpy(&ppcboot_bd,bd,sizeof(ppcboot_bd));
-           ppcboot_bd_valid=1;
-       }
-    }
-
-#ifdef CONFIG_BLK_DEV_INITRD
-    if(r4 && r5 && r5>r4) {
-       if((r4 & 0xf0000000) == 0) r4 += KERNELBASE;
-       if((r5 & 0xf0000000) == 0) r5 += KERNELBASE;
-       if((r4 & 0xf0000000) == KERNELBASE) {
-           initrd_start=r4;
-           initrd_end=r5;
-           initrd_below_start_ok = 1;
-       }
-    }
-#endif /* CONFIG_BLK_DEV_INITRD */
-
-    if(r6 && r7 && r7>r6) {
-       if((r6 & 0xf0000000) == 0) r6 += KERNELBASE;
-       if((r7 & 0xf0000000) == 0) r7 += KERNELBASE;
-       if((r6 & 0xf0000000) == KERNELBASE) {
-           cmdline_start=(void *)r6;
-           cmdline_len=(r7-r6);
-           strncpy(cmd_line,cmdline_start,cmdline_len);
-       }
-    }
-
-    if(ppcboot_bd_valid) {                     
-       printk("found bd_t @%p\n", bd);
-       printk("memstart=%08lx\n", bd->bi_memstart);
-       printk("memsize=%08lx\n", bd->bi_memsize);
-       printk("enetaddr=%02x%02x%02x%02x%02x%02x\n",
-               bd->bi_enetaddr[0],
-               bd->bi_enetaddr[1],
-               bd->bi_enetaddr[2],
-               bd->bi_enetaddr[3],
-               bd->bi_enetaddr[4],
-               bd->bi_enetaddr[5]
-               );
-       printk("intfreq=%ld\n", bd->bi_intfreq);
-       printk("busfreq=%ld\n", bd->bi_busfreq);
-       printk("baudrate=%ld\n", bd->bi_baudrate);
-    }
-
-#ifdef CONFIG_BLK_DEV_INITRD
-    if(initrd_start) {
-       printk("found initrd @%lx-%lx\n", initrd_start, initrd_end);
-    }
-#endif /* CONFIG_BLK_DEV_INITRD */
-
-    if(cmdline_start && cmdline_len) {
-       printk("found cmdline: '%s'\n", cmd_line);
-    }
-}
-#endif /* USE PPC_BOOT */
-#endif
-
-#if 0  /* XXXX */
-#if defined(CONFIG_BLK_DEV_IDE) || defined(CONFIG_BLK_DEV_IDE_MODULE)
-static int
-ev64260_ide_check_region(ide_ioreg_t from, unsigned int extent)
-{
-        return check_region(from, extent);
-}
-
-static void
-ev64260_ide_request_region(ide_ioreg_t from,
-                        unsigned int extent,
-                        const char *name)
-{
-        request_region(from, extent, name);
-       return;
-}
-
-static void
-ev64260_ide_release_region(ide_ioreg_t from,
-                        unsigned int extent)
-{
-        release_region(from, extent);
-       return;
-}
-
-static void __init
-ev64260_ide_pci_init_hwif_ports(hw_regs_t *hw, ide_ioreg_t data_port,
-                ide_ioreg_t ctrl_port, int *irq)
-{
-       struct pci_dev  *dev;
-#if 1 /* NTL */
-        int i;
-
-       //printk("regs %d to %d @ 0x%x\n", IDE_DATA_OFFSET, IDE_STATUS_OFFSET, data_port);
-        for (i = IDE_DATA_OFFSET; i <= IDE_STATUS_OFFSET; i++) {
-                hw->io_ports[i] = data_port;
-                data_port++;
-        }
-
-       //printk("ctrl %d @ 0x%x\n", IDE_CONTROL_OFFSET, ctrl_port);
-        hw->io_ports[IDE_CONTROL_OFFSET] = ctrl_port;
-#endif
-
-       pci_for_each_dev(dev) {
-               if (((dev->class >> 8) == PCI_CLASS_STORAGE_IDE) ||
-                   ((dev->class >> 8) == PCI_CLASS_STORAGE_RAID)) {
-                       hw->irq = dev->irq;
-
-                       if (irq != NULL) {
-                               *irq = dev->irq;
-                       }
-               }
-       }
-
-       return;
-}
-#endif
-#endif
-
-#if !defined(CONFIG_USE_PPCBOOT)
-/*
- * Set BAT 3 to map 0xfb000000 to 0xfc000000 of physical memory space.
- */
-static __inline__ void
-ev64260_set_bat(void)
-{
-       mb();
-       mtspr(DBAT1U, 0xfb0001fe);
-       mtspr(DBAT1L, 0xfb00002a);
-       mb();
-
-       return;
-}
-#endif
-
-#if defined(CONFIG_SERIAL_TEXT_DEBUG) || defined(CONFIG_KGDB)
-static void __init
-ev64260_map_io(void)
-{
-       io_block_mapping(0xfb000000, 0xfb000000, 0x01000000, _PAGE_IO);
-}
-#endif
-
-void __init
-platform_init(unsigned long r3, unsigned long r4, unsigned long r5,
-             unsigned long r6, unsigned long r7)
-{
-#ifdef CONFIG_BLK_DEV_INITRD
-       extern int      initrd_below_start_ok;
-
-       initrd_start=initrd_end=0;
-       initrd_below_start_ok=0;
-#endif /* CONFIG_BLK_DEV_INITRD */
-
-       ppcboot_bd_valid=0;
-       memset(&ppcboot_bd,0,sizeof(ppcboot_bd));
-
-#ifdef CONFIG_USE_PPCBOOT
-       parse_ppcbootinfo(r3, r4, r5, r6, r7);
-#else
-       parse_bootinfo(find_bootinfo());
-#endif
-
-       isa_mem_base = 0;
-       isa_io_base = 0xa0000000;       /* XXXX */
-       pci_dram_offset = 0x80000000;   /* XXXX */
-
-       loops_per_jiffy = ev64260_get_cpu_speed() / HZ;
-
-       ppc_md.setup_arch = ev64260_setup_arch;
-       ppc_md.show_cpuinfo = ev64260_show_cpuinfo;
-       ppc_md.init_IRQ = gt64260_init_irq;
-       ppc_md.get_irq = gt64260_get_irq;
-
-       ppc_md.pcibios_fixup = ev64260_pci_fixups;
-
-       ppc_md.restart = ev64260_restart;
-       ppc_md.power_off = ev64260_power_off;
-       ppc_md.halt = ev64260_halt;
-
-       ppc_md.find_end_of_memory = ev64260_find_end_of_memory;
-
-       ppc_md.init = NULL;
-
-       ppc_md.time_init = todc_time_init;
-       ppc_md.set_rtc_time = todc_set_rtc_time;
-       ppc_md.get_rtc_time = todc_get_rtc_time;
-
-       ppc_md.nvram_read_val = todc_direct_read_val;
-       ppc_md.nvram_write_val = todc_direct_write_val;
-
-       ppc_md.calibrate_decr = ev64260_calibrate_decr;
-
-#if defined(CONFIG_BLK_DEV_IDE) || defined(CONFIG_BLK_DEV_IDE_MODULE)
-        ppc_ide_md.ide_init_hwif = ev64260_ide_pci_init_hwif_ports;
-#endif
-
-       bh.p_base = CONFIG_MV64X60_NEW_BASE;
-
-#if !defined(CONFIG_USE_PPCBOOT)
-       ev64260_set_bat();
-#endif
-
-#ifdef CONFIG_SERIAL_8250
-#if defined(CONFIG_SERIAL_TEXT_DEBUG)
-       ppc_md.setup_io_mappings = ev64260_map_io;
-       ppc_md.progress = gen550_progress;
-#endif
-#if defined(CONFIG_KGDB)
-       ppc_md.setup_io_mappings = ev64260_map_io;
-       ppc_md.early_serial_map = ev64260_early_serial_map;
-#endif
-#elif defined(CONFIG_SERIAL_MPSC_CONSOLE)
-#ifdef CONFIG_SERIAL_TEXT_DEBUG
-       ppc_md.setup_io_mappings = ev64260_map_io;
-       ppc_md.progress = gt64260_mpsc_progress;
-#endif /* CONFIG_SERIAL_TEXT_DEBUG */
-#ifdef CONFIG_KGDB
-       ppc_md.setup_io_mappings = ev64260_map_io;
-       ppc_md.early_serial_map = ev64260_early_serial_map;
-#endif /* CONFIG_KGDB */
-
-#endif
-
-       return;
-}
diff --git a/arch/ppc/platforms/lite5200.c b/arch/ppc/platforms/lite5200.c
deleted file mode 100644 (file)
index 043040d..0000000
+++ /dev/null
@@ -1,152 +0,0 @@
-/*
- * arch/ppc/platforms/lite5200.c
- *
- * Platform support file for the Freescale LITE5200 based on MPC52xx.
- * A maximum of this file should be moved to syslib/mpc52xx_?????
- * so that new platform based on MPC52xx need a minimal platform file
- * ( avoid code duplication )
- *
- * 
- * Maintainer : Sylvain Munaut <tnt@246tNt.com>
- *
- * Based on the 2.4 code written by Kent Borg,
- * Dale Farnsworth <dale.farnsworth@mvista.com> and
- * Wolfgang Denk <wd@denx.de>
- * 
- * Copyright 2004 Sylvain Munaut <tnt@246tNt.com>
- * Copyright 2003 Motorola Inc.
- * Copyright 2003 MontaVista Software Inc.
- * Copyright 2003 DENX Software Engineering (wd@denx.de)
- *
- * This file is licensed under the terms of the GNU General Public License
- * version 2. This program is licensed "as is" without any warranty of any
- * kind, whether express or implied.
- */
-
-#include <linux/config.h>
-#include <linux/initrd.h>
-#include <linux/seq_file.h>
-#include <linux/kdev_t.h>
-#include <linux/root_dev.h>
-#include <linux/console.h>
-
-#include <asm/bootinfo.h>
-#include <asm/io.h>
-#include <asm/ocp.h>
-#include <asm/mpc52xx.h>
-
-
-/* Board data given by U-Boot */
-bd_t __res;
-EXPORT_SYMBOL(__res);  /* For modules */
-
-
-/* ======================================================================== */
-/* OCP device definition                                                    */
-/* For board/shared resources like PSCs                                     */
-/* ======================================================================== */
-/* Be sure not to load conficting devices : e.g. loading the UART drivers for
- * PSC1 and then also loading a AC97 for this same PSC.
- * For details about how to create an entry, look in the doc of the concerned
- * driver ( eg drivers/serial/mpc52xx_uart.c for the PSC in uart mode )
- */
-
-struct ocp_def board_ocp[] = {
-       {
-               .vendor         = OCP_VENDOR_FREESCALE,
-               .function       = OCP_FUNC_PSC_UART,
-               .index          = 0,
-               .paddr          = MPC52xx_PSC1,
-               .irq            = MPC52xx_PSC1_IRQ,
-               .pm             = OCP_CPM_NA,
-       },
-       {       /* Terminating entry */
-               .vendor         = OCP_VENDOR_INVALID
-       }
-};
-       
-
-/* ======================================================================== */
-/* Platform specific code                                                   */
-/* ======================================================================== */
-
-static int
-icecube_show_cpuinfo(struct seq_file *m)
-{
-       seq_printf(m, "machine\t\t: Freescale LITE5200\n");
-       return 0;
-}
-
-static void __init
-icecube_setup_arch(void)
-{
-
-       /* Add board OCP definitions */
-       mpc52xx_add_board_devices(board_ocp);
-}
-
-void __init
-platform_init(unsigned long r3, unsigned long r4, unsigned long r5,
-              unsigned long r6, unsigned long r7)
-{
-       /* Generic MPC52xx platform initialization */
-       /* TODO Create one and move a max of stuff in it.
-          Put this init in the syslib */
-
-       struct bi_record *bootinfo = find_bootinfo();
-
-       if (bootinfo)
-               parse_bootinfo(bootinfo);
-       else {
-               /* Load the bd_t board info structure */
-               if (r3)
-                       memcpy((void*)&__res,(void*)(r3+KERNELBASE),
-                                       sizeof(bd_t));
-
-#ifdef CONFIG_BLK_DEV_INITRD
-               /* Load the initrd */
-               if (r4) {
-                       initrd_start = r4 + KERNELBASE;
-                       initrd_end = r5 + KERNELBASE;
-               }
-#endif
-       
-               /* Load the command line */
-               if (r6) {
-                       *(char *)(r7+KERNELBASE) = 0;
-                       strcpy(cmd_line, (char *)(r6+KERNELBASE));
-               }
-       }
-
-       /* BAT setup */
-       mpc52xx_set_bat();
-       
-       /* No ISA bus AFAIK */
-       isa_io_base             = 0;
-       isa_mem_base            = 0;
-
-       /* Setup the ppc_md struct */
-       ppc_md.setup_arch       = icecube_setup_arch;
-       ppc_md.show_cpuinfo     = icecube_show_cpuinfo;
-       ppc_md.show_percpuinfo  = NULL;
-       ppc_md.init_IRQ         = mpc52xx_init_irq;
-       ppc_md.get_irq          = mpc52xx_get_irq;
-
-       ppc_md.find_end_of_memory = mpc52xx_find_end_of_memory;
-       ppc_md.setup_io_mappings  = mpc52xx_map_io;
-
-       ppc_md.restart          = mpc52xx_restart;
-       ppc_md.power_off        = mpc52xx_power_off;
-       ppc_md.halt             = mpc52xx_halt;
-       
-               /* No time keeper on the IceCube */
-       ppc_md.time_init        = NULL;
-       ppc_md.get_rtc_time     = NULL;
-       ppc_md.set_rtc_time     = NULL;
-       
-       ppc_md.calibrate_decr   = mpc52xx_calibrate_decr;
-#ifdef CONFIG_SERIAL_TEXT_DEBUG
-       ppc_md.progress         = mpc52xx_progress;
-#endif
-}
-
diff --git a/arch/ppc/platforms/lite5200.h b/arch/ppc/platforms/lite5200.h
deleted file mode 100644 (file)
index 833134b..0000000
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * arch/ppc/platforms/lite5200.h
- * 
- * Definitions for Freescale LITE5200 : MPC52xx Standard Development
- * Platform board support
- * 
- * Maintainer : Sylvain Munaut <tnt@246tNt.com>
- * 
- * Copyright (C) 2004 Sylvain Munaut <tnt@246tNt.com>
- *
- * This file is licensed under the terms of the GNU General Public License
- * version 2. This program is licensed "as is" without any warranty of any
- * kind, whether express or implied.
- */
-
-#ifndef __PLATFORMS_LITE5200_H__
-#define __PLATFORMS_LITE5200_H__
-
-/* Serial port used for low-level debug */
-#define MPC52xx_PF_CONSOLE_PORT 0      /* PSC1 */
-
-
-#endif /* __PLATFORMS_LITE5200_H__ */
diff --git a/arch/ppc/platforms/mpc5200.c b/arch/ppc/platforms/mpc5200.c
deleted file mode 100644 (file)
index 30b6936..0000000
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * arch/ppc/platforms/mpc5200.c
- *
- * OCP Definitions for the boards based on MPC5200 processor. Contains
- * definitions for every common peripherals. (Mostly all but PSCs)
- * 
- * Maintainer : Sylvain Munaut <tnt@246tNt.com>
- *
- * Copyright 2004 Sylvain Munaut <tnt@246tNt.com>
- *
- * This file is licensed under the terms of the GNU General Public License
- * version 2. This program is licensed "as is" without any warranty of any
- * kind, whether express or implied.
- */
-
-#include <asm/ocp.h>
-#include <asm/mpc52xx.h>
-
-/* Here is the core_ocp struct.
- * With all the devices common to all board. Even if port multiplexing is
- * not setup for them (if the user don't want them, just don't select the
- * config option). The potentially conflicting devices (like PSCs) goes in
- * board specific file.
- */
-struct ocp_def core_ocp[] = {
-       {       /* Terminating entry */
-               .vendor         = OCP_VENDOR_INVALID
-       }
-};
diff --git a/arch/ppc/platforms/rpx8260.c b/arch/ppc/platforms/rpx8260.c
deleted file mode 100644 (file)
index 07d78d4..0000000
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * arch/ppc/platforms/rpx8260.c
- *
- * RPC EP8260 platform support
- *
- * Author: Dan Malek <dan@embeddededge.com>
- * Derived from: pq2ads_setup.c by Kumar
- *
- * Copyright 2004 Embedded Edge, LLC
- *
- * 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/seq_file.h>
-
-#include <asm/mpc8260.h>
-#include <asm/machdep.h>
-
-static void (*callback_setup_arch)(void);
-
-extern unsigned char __res[sizeof(bd_t)];
-
-extern void m8260_init(unsigned long r3, unsigned long r4,
-       unsigned long r5, unsigned long r6, unsigned long r7);
-
-static int
-ep8260_show_cpuinfo(struct seq_file *m)
-{
-       bd_t    *binfo = (bd_t *)__res;
-
-       seq_printf(m, "vendor\t\t: RPC\n"
-                     "machine\t\t: EP8260 PPC\n"
-                     "\n"
-                     "mem size\t\t: 0x%08x\n"
-                     "console baud\t\t: %d\n"
-                     "\n",
-                     binfo->bi_memsize,
-                     binfo->bi_baudrate);
-       return 0;
-}
-
-static void __init
-ep8260_setup_arch(void)
-{
-       printk("RPC EP8260 Port\n");
-       callback_setup_arch();
-}
-
-void __init
-platform_init(unsigned long r3, unsigned long r4, unsigned long r5,
-             unsigned long r6, unsigned long r7)
-{
-       /* Generic 8260 platform initialization */
-       m8260_init(r3, r4, r5, r6, r7);
-
-       /* Anything special for this platform */
-       ppc_md.show_cpuinfo     = ep8260_show_cpuinfo;
-
-       callback_setup_arch     = ppc_md.setup_arch;
-       ppc_md.setup_arch       = ep8260_setup_arch;
-}
diff --git a/arch/ppc/platforms/rpx8260.h b/arch/ppc/platforms/rpx8260.h
deleted file mode 100644 (file)
index 7d5cd88..0000000
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- * A collection of structures, addresses, and values associated with
- * the Embedded Planet RPX6 (or RPX Super) MPC8260 board.
- * Copied from the RPX-Classic and SBS8260 stuff.
- *
- * Copyright (c) 2001 Dan Malek <dan@embeddededge.com>
- */
-#ifdef __KERNEL__
-#ifndef __ASM_PLATFORMS_RPX8260_H__
-#define __ASM_PLATFORMS_RPX8260_H__
-
-/* A Board Information structure that is given to a program when
- * prom starts it up.
- */
-typedef struct bd_info {
-       unsigned int    bi_memstart;    /* Memory start address */
-       unsigned int    bi_memsize;     /* Memory (end) size in bytes */
-       unsigned int    bi_nvsize;      /* NVRAM size in bytes (can be 0) */
-       unsigned int    bi_intfreq;     /* Internal Freq, in Hz */
-       unsigned int    bi_busfreq;     /* Bus Freq, in MHz */
-       unsigned int    bi_cpmfreq;     /* CPM Freq, in MHz */
-       unsigned int    bi_brgfreq;     /* BRG Freq, in MHz */
-       unsigned int    bi_vco;         /* VCO Out from PLL */
-       unsigned int    bi_baudrate;    /* Default console baud rate */
-       unsigned int    bi_immr;        /* IMMR when called from boot rom */
-       unsigned char   bi_enetaddr[6];
-} bd_t;
-
-extern bd_t m8xx_board_info;
-
-/* Memory map is configured by the PROM startup.
- * We just map a few things we need.  The CSR is actually 4 byte-wide
- * registers that can be accessed as 8-, 16-, or 32-bit values.
- */
-#define CPM_MAP_ADDR           ((uint)0xf0000000)
-#define RPX_CSR_ADDR           ((uint)0xfa000000)
-#define RPX_CSR_SIZE           ((uint)(512 * 1024))
-#define RPX_NVRTC_ADDR         ((uint)0xfa080000)
-#define RPX_NVRTC_SIZE         ((uint)(512 * 1024))
-
-/* The RPX6 has 16, byte wide control/status registers.
- * Not all are used (yet).
- */
-extern volatile u_char *rpx6_csr_addr;
-
-/* Things of interest in the CSR.
-*/
-#define BCSR0_ID_MASK          ((u_char)0xf0)          /* Read only */
-#define BCSR0_SWITCH_MASK      ((u_char)0x0f)          /* Read only */
-#define BCSR1_XCVR_SMC1                ((u_char)0x80)
-#define BCSR1_XCVR_SMC2                ((u_char)0x40)
-#define BCSR2_FLASH_WENABLE    ((u_char)0x20)
-#define BCSR2_NVRAM_ENABLE     ((u_char)0x10)
-#define BCSR2_ALT_IRQ2         ((u_char)0x08)
-#define BCSR2_ALT_IRQ3         ((u_char)0x04)
-#define BCSR2_PRST             ((u_char)0x02)          /* Force reset */
-#define BCSR2_ENPRST           ((u_char)0x01)          /* Enable POR */
-#define BCSR3_MODCLK_MASK      ((u_char)0xe0)
-#define BCSR3_ENCLKHDR         ((u_char)0x10)
-#define BCSR3_LED5             ((u_char)0x04)          /* 0 == on */
-#define BCSR3_LED6             ((u_char)0x02)          /* 0 == on */
-#define BCSR3_LED7             ((u_char)0x01)          /* 0 == on */
-#define BCSR4_EN_PHY           ((u_char)0x80)          /* Enable PHY */
-#define BCSR4_EN_MII           ((u_char)0x40)          /* Enable PHY */
-#define BCSR4_MII_READ         ((u_char)0x04)
-#define BCSR4_MII_MDC          ((u_char)0x02)
-#define BCSR4_MII_MDIO         ((u_char)0x01)
-#define BCSR13_FETH_IRQMASK    ((u_char)0xf0)
-#define BCSR15_FETH_IRQ                ((u_char)0x20)
-
-#define PHY_INTERRUPT  SIU_INT_IRQ7
-
-#endif /* __ASM_PLATFORMS_RPX8260_H__ */
-#endif /* __KERNEL__ */
diff --git a/arch/ppc/syslib/mpc52xx_pic.c b/arch/ppc/syslib/mpc52xx_pic.c
deleted file mode 100644 (file)
index 0f88e63..0000000
+++ /dev/null
@@ -1,252 +0,0 @@
-/*
- * arch/ppc/syslib/mpc52xx_pic.c
- *
- * Programmable Interrupt Controller functions for the Freescale MPC52xx 
- * embedded CPU.
- *
- * 
- * Maintainer : Sylvain Munaut <tnt@246tNt.com>
- *
- * Based on (well, mostly copied from) the code from the 2.4 kernel by
- * Dale Farnsworth <dfarnsworth@mvista.com> and Kent Borg.
- * 
- * Copyright (C) 2004 Sylvain Munaut <tnt@246tNt.com>
- * Copyright (C) 2003 Montavista Software, Inc
- * 
- * This file is licensed under the terms of the GNU General Public License
- * version 2. This program is licensed "as is" without any warranty of any
- * kind, whether express or implied.
- */
-
-#include <linux/stddef.h>
-#include <linux/init.h>
-#include <linux/sched.h>
-#include <linux/signal.h>
-#include <linux/stddef.h>
-#include <linux/delay.h>
-#include <linux/irq.h>
-
-#include <asm/io.h>
-#include <asm/processor.h>
-#include <asm/system.h>
-#include <asm/irq.h>
-#include <asm/mpc52xx.h>
-
-
-static struct mpc52xx_intr *intr;
-static struct mpc52xx_sdma *sdma;
-
-static void
-mpc52xx_ic_disable(unsigned int irq)
-{
-       u32 val;
-
-       if (irq == MPC52xx_IRQ0) {
-               val = in_be32(&intr->ctrl);
-               val &= ~(1 << 11);
-               out_be32(&intr->ctrl, val);
-       }
-       else if (irq < MPC52xx_IRQ1) {
-               BUG();
-       }
-       else if (irq <= MPC52xx_IRQ3) {
-               val = in_be32(&intr->ctrl);
-               val &= ~(1 << (10 - (irq - MPC52xx_IRQ1)));
-               out_be32(&intr->ctrl, val);
-       }
-       else if (irq < MPC52xx_SDMA_IRQ_BASE) {
-               val = in_be32(&intr->main_mask);
-               val |= 1 << (16 - (irq - MPC52xx_MAIN_IRQ_BASE));
-               out_be32(&intr->main_mask, val);
-       }
-       else if (irq < MPC52xx_PERP_IRQ_BASE) {
-               val = in_be32(&sdma->IntMask);
-               val |= 1 << (irq - MPC52xx_SDMA_IRQ_BASE);
-               out_be32(&sdma->IntMask, val);
-       }
-       else {
-               val = in_be32(&intr->per_mask);
-               val |= 1 << (31 - (irq - MPC52xx_PERP_IRQ_BASE));
-               out_be32(&intr->per_mask, val);
-       }
-}
-
-static void
-mpc52xx_ic_enable(unsigned int irq)
-{
-       u32 val;
-
-       if (irq == MPC52xx_IRQ0) {
-               val = in_be32(&intr->ctrl);
-               val |= 1 << 11;
-               out_be32(&intr->ctrl, val);
-       }
-       else if (irq < MPC52xx_IRQ1) {
-               BUG();
-       }
-       else if (irq <= MPC52xx_IRQ3) {
-               val = in_be32(&intr->ctrl);
-               val |= 1 << (10 - (irq - MPC52xx_IRQ1));
-               out_be32(&intr->ctrl, val);
-       }
-       else if (irq < MPC52xx_SDMA_IRQ_BASE) {
-               val = in_be32(&intr->main_mask);
-               val &= ~(1 << (16 - (irq - MPC52xx_MAIN_IRQ_BASE)));
-               out_be32(&intr->main_mask, val);
-       }
-       else if (irq < MPC52xx_PERP_IRQ_BASE) {
-               val = in_be32(&sdma->IntMask);
-               val &= ~(1 << (irq - MPC52xx_SDMA_IRQ_BASE));
-               out_be32(&sdma->IntMask, val);
-       }
-       else {
-               val = in_be32(&intr->per_mask);
-               val &= ~(1 << (31 - (irq - MPC52xx_PERP_IRQ_BASE)));
-               out_be32(&intr->per_mask, val);
-       }
-}
-
-static void
-mpc52xx_ic_ack(unsigned int irq)
-{
-       u32 val;
-
-       /*
-        * Only some irqs are reset here, others in interrupting hardware.
-        */
-                       
-       switch (irq) {
-       case MPC52xx_IRQ0:
-               val = in_be32(&intr->ctrl);
-               val |= 0x08000000;
-               out_be32(&intr->ctrl, val);
-               break;
-       case MPC52xx_CCS_IRQ:
-               val = in_be32(&intr->enc_status);
-               val |= 0x00000400;
-               out_be32(&intr->enc_status, val);
-               break;
-       case MPC52xx_IRQ1:
-               val = in_be32(&intr->ctrl);
-               val |= 0x04000000;
-               out_be32(&intr->ctrl, val);
-               break;
-       case MPC52xx_IRQ2:
-               val = in_be32(&intr->ctrl);
-               val |= 0x02000000;
-               out_be32(&intr->ctrl, val);
-               break;
-       case MPC52xx_IRQ3:
-               val = in_be32(&intr->ctrl);
-               val |= 0x01000000;
-               out_be32(&intr->ctrl, val);
-               break;
-       default:
-               if (irq >= MPC52xx_SDMA_IRQ_BASE
-                   && irq < (MPC52xx_SDMA_IRQ_BASE + MPC52xx_SDMA_IRQ_NUM)) {
-                       out_be32(&sdma->IntPend,
-                                1 << (irq - MPC52xx_SDMA_IRQ_BASE));
-               }
-               break;
-       }
-}
-
-static void
-mpc52xx_ic_disable_and_ack(unsigned int irq)
-{
-       mpc52xx_ic_disable(irq);
-       mpc52xx_ic_ack(irq);
-}
-
-static void
-mpc52xx_ic_end(unsigned int irq)
-{
-       if (!(irq_desc[irq].status & (IRQ_DISABLED | IRQ_INPROGRESS)))
-               mpc52xx_ic_enable(irq);
-}
-
-static struct hw_interrupt_type mpc52xx_ic = {
-       "MPC52xx",
-       NULL,                           /* startup(irq) */
-       NULL,                           /* shutdown(irq) */
-       mpc52xx_ic_enable,              /* enable(irq) */
-       mpc52xx_ic_disable,             /* disable(irq) */
-       mpc52xx_ic_disable_and_ack,     /* disable_and_ack(irq) */
-       mpc52xx_ic_end,                 /* end(irq) */
-       0                               /* set_affinity(irq, cpumask) SMP. */
-};
-
-void __init
-mpc52xx_init_irq(void)
-{
-       int i;
-
-       /* Remap the necessary zones */
-       intr = (struct mpc52xx_intr *)
-               ioremap(MPC52xx_INTR, sizeof(struct mpc52xx_intr));
-       sdma = (struct mpc52xx_sdma *)
-               ioremap(MPC52xx_SDMA, sizeof(struct mpc52xx_sdma));
-       
-       if ((intr==NULL) || (sdma==NULL))
-               panic("Can't ioremap PIC/SDMA register for init_irq !");
-
-       /* Disable all interrupt sources. */
-       out_be32(&sdma->IntPend, 0xffffffff);   /* 1 means clear pending */
-       out_be32(&sdma->IntMask, 0xffffffff);   /* 1 means disabled */
-       out_be32(&intr->per_mask, 0x7ffffc00);  /* 1 means disabled */
-       out_be32(&intr->main_mask, 0x00010fff); /* 1 means disabled */
-       out_be32(&intr->ctrl,
-                       0x0f000000 |    /* clear IRQ 0-3 */
-                       0x00c00000 |    /* IRQ0: level-sensitive, active low */
-                       0x00001000 |    /* MEE master external enable */
-                       0x00000000 |    /* 0 means disable IRQ 0-3 */
-                       0x00000001);    /* CEb route critical normally */
-
-       /* Zero a bunch of the priority settings.  */
-       out_be32(&intr->per_pri1, 0);
-       out_be32(&intr->per_pri2, 0);
-       out_be32(&intr->per_pri3, 0);
-       out_be32(&intr->main_pri1, 0);
-       out_be32(&intr->main_pri2, 0);
-
-       /* Initialize irq_desc[i].handler's with mpc52xx_ic. */
-       for (i = 0; i < NR_IRQS; i++) {
-               irq_desc[i].handler = &mpc52xx_ic;
-               irq_desc[i].status = IRQ_LEVEL;
-       }
-}
-
-int
-mpc52xx_get_irq(struct pt_regs *regs)
-{
-       u32 status;
-       int irq = -1;
-
-       status = in_be32(&intr->enc_status);
-
-       if (status & 0x00000400) {              /* critical */
-               irq = (status >> 8) & 0x3;
-               if (irq == 2)                   /* high priority peripheral */
-                       goto peripheral;
-               irq += MPC52xx_CRIT_IRQ_BASE;
-       }
-       else if (status & 0x00200000) {         /* main */
-               irq = (status >> 16) & 0x1f;
-               if (irq == 4)                   /* low priority peripheral */
-                       goto peripheral;
-               irq += MPC52xx_MAIN_IRQ_BASE;
-       }
-       else if (status & 0x20000000) {         /* peripheral */
-peripheral:
-               irq = (status >> 24) & 0x1f;
-               if (irq == 0) {                 /* bestcomm */
-                       status = in_be32(&sdma->IntPend);
-                       irq = ffs(status) + MPC52xx_SDMA_IRQ_BASE-1;
-               }
-               else
-                       irq += MPC52xx_PERP_IRQ_BASE;
-       }
-
-       return irq;
-}
-
diff --git a/arch/ppc/syslib/mpc52xx_setup.c b/arch/ppc/syslib/mpc52xx_setup.c
deleted file mode 100644 (file)
index 631cea3..0000000
+++ /dev/null
@@ -1,228 +0,0 @@
-/*
- * arch/ppc/syslib/mpc52xx_common.c
- *
- * Common code for the boards based on Freescale MPC52xx embedded CPU.
- *
- * 
- * Maintainer : Sylvain Munaut <tnt@246tNt.com>
- *
- * Support for other bootloaders than UBoot by Dale Farnsworth 
- * <dfarnsworth@mvista.com>
- * 
- * Copyright (C) 2004 Sylvain Munaut <tnt@246tNt.com>
- * Copyright (C) 2003 Montavista Software, Inc
- * 
- * This file is licensed under the terms of the GNU General Public License
- * version 2. This program is licensed "as is" without any warranty of any
- * kind, whether express or implied.
- */
-
-#include <linux/config.h>
-
-#include <asm/time.h>
-#include <asm/mpc52xx.h>
-#include <asm/mpc52xx_psc.h>
-#include <asm/ocp.h>
-#include <asm/ppcboot.h>
-
-extern bd_t __res;
-
-static int core_mult[] = {             /* CPU Frequency multiplier, taken    */
-       0,  0,  0,  10, 20, 20, 25, 45, /* from the datasheet used to compute */
-       30, 55, 40, 50, 0,  60, 35, 0,  /* CPU frequency from XLB freq and    */
-       30, 25, 65, 10, 70, 20, 75, 45, /* external jumper config             */
-       0,  55, 40, 50, 80, 60, 35, 0
-};
-
-void
-mpc52xx_restart(char *cmd)
-{
-       struct mpc52xx_gpt* gpt0 = (struct mpc52xx_gpt*) MPC52xx_GPTx(0);
-       
-       local_irq_disable();
-       
-       /* Turn on the watchdog and wait for it to expire. It effectively
-         does a reset */
-       if (gpt0 != NULL) {
-               out_be32(&gpt0->count, 0x000000ff);
-               out_be32(&gpt0->mode, 0x00009004);
-       } else
-               printk(KERN_ERR "mpc52xx_restart: Unable to ioremap GPT0 registers, -> looping ...");
-
-       while (1);
-}
-
-void
-mpc52xx_halt(void)
-{
-       local_irq_disable();
-
-       while (1);
-}
-
-void
-mpc52xx_power_off(void)
-{
-       /* By default we don't have any way of shut down.
-          If a specific board wants to, it can set the power down
-          code to any hardware implementation dependent code */
-       mpc52xx_halt();
-}
-
-
-void __init
-mpc52xx_set_bat(void)
-{
-       /* Set BAT 2 to map the 0xf0000000 area */
-       /* This mapping is used during mpc52xx_progress,
-        * mpc52xx_find_end_of_memory, and UARTs/GPIO access for debug
-        */
-       mb();
-       mtspr(DBAT2U, 0xf0001ffe);
-       mtspr(DBAT2L, 0xf000002a);
-       mb();
-}
-
-void __init
-mpc52xx_map_io(void)
-{
-       /* Here we only map the MBAR */
-       io_block_mapping(
-               MPC52xx_MBAR_VIRT, MPC52xx_MBAR, MPC52xx_MBAR_SIZE, _PAGE_IO);
-}
-
-
-#ifdef CONFIG_SERIAL_TEXT_DEBUG
-#ifdef MPC52xx_PF_CONSOLE_PORT
-#define MPC52xx_CONSOLE MPC52xx_PSCx(MPC52xx_PF_CONSOLE_PORT)
-#else
-#error "mpc52xx PSC for console not selected"
-#endif
-
-void
-mpc52xx_progress(char *s, unsigned short hex)
-{
-       struct mpc52xx_psc *psc = (struct mpc52xx_psc *)MPC52xx_CONSOLE;
-       char c;
-
-               /* Don't we need to disable serial interrupts ? */
-       
-       while ((c = *s++) != 0) {
-               if (c == '\n') {
-                       while (!(in_be16(&psc->mpc52xx_psc_status) &
-                                MPC52xx_PSC_SR_TXRDY)) ;
-                       out_8(&psc->mpc52xx_psc_buffer_8, '\r');
-               }
-               while (!(in_be16(&psc->mpc52xx_psc_status) &
-                        MPC52xx_PSC_SR_TXRDY)) ;
-               out_8(&psc->mpc52xx_psc_buffer_8, c);
-       }
-}
-
-#endif  /* CONFIG_SERIAL_TEXT_DEBUG */
-
-
-unsigned long __init
-mpc52xx_find_end_of_memory(void)
-{
-       u32 ramsize = __res.bi_memsize;
-
-       /*
-        * if bootloader passed a memsize, just use it
-        * else get size from sdram config registers
-        */
-       if (ramsize == 0) {
-               struct mpc52xx_mmap_ctl *mmap_ctl;
-               u32 sdram_config_0, sdram_config_1;
-
-               /* Temp BAT2 mapping active when this is called ! */
-               mmap_ctl = (struct mpc52xx_mmap_ctl*) MPC52xx_MMAP_CTL;
-                       
-               sdram_config_0 = in_be32(&mmap_ctl->sdram0);
-               sdram_config_1 = in_be32(&mmap_ctl->sdram1);
-
-               if ((sdram_config_0 & 0x1f) >= 0x13)
-                       ramsize = 1 << ((sdram_config_0 & 0xf) + 17);
-
-               if (((sdram_config_1 & 0x1f) >= 0x13) &&
-                               ((sdram_config_1 & 0xfff00000) == ramsize))
-                       ramsize += 1 << ((sdram_config_1 & 0xf) + 17);
-
-               iounmap(mmap_ctl);
-       }
-       
-       return ramsize;
-}
-
-void __init
-mpc52xx_calibrate_decr(void)
-{
-       int current_time, previous_time;
-       int tbl_start, tbl_end;
-       unsigned int xlbfreq, cpufreq, ipbfreq, pcifreq, divisor;
-
-       xlbfreq = __res.bi_busfreq;
-       /* if bootloader didn't pass bus frequencies, calculate them */
-       if (xlbfreq == 0) {
-               /* Get RTC & Clock manager modules */
-               struct mpc52xx_rtc *rtc;
-               struct mpc52xx_cdm *cdm;
-               
-               rtc = (struct mpc52xx_rtc*)
-                       ioremap(MPC52xx_RTC, sizeof(struct mpc52xx_rtc));
-               cdm = (struct mpc52xx_cdm*)
-                       ioremap(MPC52xx_CDM, sizeof(struct mpc52xx_cdm));
-
-               if ((rtc==NULL) || (cdm==NULL))
-                       panic("Can't ioremap RTC/CDM while computing bus freq");
-
-               /* Count bus clock during 1/64 sec */
-               out_be32(&rtc->dividers, 0x8f1f0000);   /* Set RTC 64x faster */
-               previous_time = in_be32(&rtc->time);
-               while ((current_time = in_be32(&rtc->time)) == previous_time) ;
-               tbl_start = get_tbl();
-               previous_time = current_time;
-               while ((current_time = in_be32(&rtc->time)) == previous_time) ;
-               tbl_end = get_tbl();
-               out_be32(&rtc->dividers, 0xffff0000);   /* Restore RTC */
-
-               /* Compute all frequency from that & CDM settings */
-               xlbfreq = (tbl_end - tbl_start) << 8;
-               cpufreq = (xlbfreq * core_mult[in_be32(&cdm->rstcfg)&0x1f])/10;
-               ipbfreq = (in_8(&cdm->ipb_clk_sel) & 1) ?
-                                       xlbfreq / 2 : xlbfreq;
-               switch (in_8(&cdm->pci_clk_sel) & 3) {
-               case 0:
-                       pcifreq = ipbfreq;
-                       break;
-               case 1:
-                       pcifreq = ipbfreq / 2;
-                       break;
-               default:
-                       pcifreq = xlbfreq / 4;
-                       break;
-               }
-               __res.bi_busfreq = xlbfreq;
-               __res.bi_intfreq = cpufreq;
-               __res.bi_ipbfreq = ipbfreq;
-               __res.bi_pcifreq = pcifreq;
-       
-               /* Release mapping */
-               iounmap((void*)rtc);
-               iounmap((void*)cdm);
-       }
-
-       divisor = 4;
-
-       tb_ticks_per_jiffy = xlbfreq / HZ / divisor;
-       tb_to_us = mulhwu_scale_factor(xlbfreq / divisor, 1000000);
-}
-
-
-void __init
-mpc52xx_add_board_devices(struct ocp_def board_ocp[]) {
-       while (board_ocp->vendor != OCP_VENDOR_INVALID)
-               if(ocp_add_one_device(board_ocp++))
-                       printk("mpc5200-ocp: Failed to add board device !\n");
-}
-
diff --git a/arch/ppc/syslib/mv64360_pic.c b/arch/ppc/syslib/mv64360_pic.c
deleted file mode 100644 (file)
index ef07629..0000000
+++ /dev/null
@@ -1,404 +0,0 @@
-/*
- * arch/ppc/kernel/mv64360_pic.c
- * 
- * Interrupt controller support for Marvell's MV64360.
- *
- * Author: Rabeeh Khoury <rabeeh@galileo.co.il>
- * Based on MV64360 PIC written by
- * Chris Zankel <chris@mvista.com>
- * Mark A. Greer <mgreer@mvista.com>
- *
- * Copyright 2004 MontaVista Software, 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.
- */
-
-/*
- * This file contains the specific functions to support the MV64360
- * interrupt controller.
- *
- * The MV64360 has two main interrupt registers (high and low) that
- * summarizes the interrupts generated by the units of the MV64360.
- * Each bit is assigned to an interrupt number, where the low register
- * are assigned from IRQ0 to IRQ31 and the high cause register
- * from IRQ32 to IRQ63 
- * The GPP (General Purpose Pins) interrupts are assigned from IRQ64 (GPP0) 
- * to IRQ95 (GPP31). 
- * get_irq() returns the lowest interrupt number that is currently asserted.
- *
- * Note: 
- *  - This driver does not initialize the GPP when used as an interrupt 
- *    input.
- */
-
-#include <linux/stddef.h>
-#include <linux/init.h>
-#include <linux/sched.h>
-#include <linux/signal.h>
-#include <linux/stddef.h>
-#include <linux/delay.h>
-#include <linux/irq.h>
-#include <linux/interrupt.h>
-
-#include <asm/io.h>
-#include <asm/processor.h>
-#include <asm/system.h>
-#include <asm/irq.h>
-#include <asm/ocp.h>
-#include <asm/mv64x60.h>
-
-#ifdef CONFIG_IRQ_ALL_CPUS
-#error "The mv64360 does not support yet distribution of IRQs on all CPUs"
-#endif
-/* ========================== forward declaration ========================== */
-
-static void mv64360_unmask_irq(unsigned int);
-static void mv64360_mask_irq(unsigned int);
-static irqreturn_t mv64360_cpu_error_int_handler(int, void *, struct pt_regs *);
-static irqreturn_t mv64360_sram_error_int_handler(int, void *, struct pt_regs *);
-static irqreturn_t mv64360_pci_error_int_handler(int, void *, struct pt_regs *);
-
-/* ========================== local declarations =========================== */
-
-struct hw_interrupt_type mv64360_pic = {
-       .typename = " MV64360_PIC ",    /* typename */
-       .enable = mv64360_unmask_irq,   /* enable */
-       .disable = mv64360_mask_irq,    /* disable */
-       .ack = mv64360_mask_irq,        /* ack */
-};
-
-#define CPU_INTR_STR   "MV64360 CPU interface error"
-#define SRAM_INTR_STR  "MV64360 internal sram error"
-#define PCI0_INTR_STR  "MV64360 PCI 0 error"
-#define PCI1_INTR_STR  "MV64360 PCI 1 error"
-
-static mv64x60_handle_t        base_bh;
-
-u32 mv64360_irq_base = 0;      /* MV64360 handles the next 96 IRQs from here */
-
-/* mv64360_init_irq()
- *
- *  This function initializes the interrupt controller. It assigns
- *  all interrupts from IRQ0 to IRQ95 to the mv64360 interrupt controller.
- *
- * Input Variable(s):
- *  None.
- *
- * Outpu. Variable(s):
- *  None.
- *
- * Returns:
- *  void
- *
- * Note:
- *  We register all GPP inputs as interrupt source, but disable them.
- */
-
-__init void
-mv64360_init_irq(void)
-{
-       struct ocp_def  *def;
-       int i;
-
-       if (ppc_md.progress)
-               ppc_md.progress("mv64360_init_irq: enter", 0x0);
-
-       if ( ppc_md.progress ) ppc_md.progress("mv64360_init_irq: enter", 0x0);
-
-       if ((def = ocp_get_one_device(OCP_VENDOR_MARVELL, OCP_FUNC_HB,
-                                       OCP_ANY_INDEX)) == NULL) {
-               /* XXXX SCREAM */
-               return;
-       }
-       base_bh.v_base = (unsigned long)ioremap(def->paddr, 0x1000);
-
-       ppc_cached_irq_mask[0] = 0;
-       ppc_cached_irq_mask[1] = 0x0f000000;    /* Enable GPP intrs */
-       ppc_cached_irq_mask[2] = 0;
-
-       /* disable all interrupts and clear current interrupts */
-       mv64x60_write(&base_bh, MV64x60_GPP_INTR_CAUSE, 0);
-       mv64x60_write(&base_bh, MV64x60_GPP_INTR_MASK,
-               ppc_cached_irq_mask[2]);
-       mv64x60_write(&base_bh, MV64360_IC_CPU0_INTR_MASK_LO,
-               ppc_cached_irq_mask[0]);
-       mv64x60_write(&base_bh, MV64360_IC_CPU0_INTR_MASK_HI,
-               ppc_cached_irq_mask[1]);
-
-       /* use the mv64360 for all (possible) interrupt sources */
-       for (i = mv64360_irq_base; i < (mv64360_irq_base + 96); i++) {
-               /* All interrupts are level interrupts */
-               irq_desc[i].status |= IRQ_LEVEL;
-               irq_desc[i].handler = &mv64360_pic;
-       }
-
-       /* Register CPU interface error interrupt handler */
-       request_irq(MV64x60_IRQ_CPU_ERR, mv64360_cpu_error_int_handler,
-               SA_INTERRUPT, CPU_INTR_STR, 0);
-       mv64x60_write(&base_bh, MV64x60_CPU_ERR_MASK, 0x000000ff);
-
-       /* Register internal SRAM error interrupt handler */
-       request_irq(MV64360_IRQ_SRAM_PAR_ERR, mv64360_sram_error_int_handler,
-               SA_INTERRUPT, SRAM_INTR_STR, 0);
-
-       /* Register PCI 0 error interrupt handler */
-       request_irq(MV64360_IRQ_PCI0, mv64360_pci_error_int_handler,
-               SA_INTERRUPT, PCI0_INTR_STR, (void *) 0);
-       mv64x60_write(&base_bh, MV64x60_PCI0_ERR_MASK, 0x00a50c25);
-
-       /* Register PCI 1 error interrupt handler */
-       request_irq(MV64360_IRQ_PCI1, mv64360_pci_error_int_handler,
-               SA_INTERRUPT, PCI1_INTR_STR, (void *) 1);
-       mv64x60_write(&base_bh, MV64x60_PCI1_ERR_MASK, 0x00a50c25);
-
-       if (ppc_md.progress)
-               ppc_md.progress("mv64360_init_irq: exit", 0x0);
-}
-
-
-/* mv64360_get_irq()
- *
- *  This function returns the lowest interrupt number of all interrupts that
- *  are currently asserted. 
- *
- * Input Variable(s):
- *  struct pt_regs*    not used
- *
- * Output Variable(s):
- *  None.
- *
- * Returns:
- *  int        <interrupt number> or -2 (bogus interrupt)
- * 
- */
-int
-mv64360_get_irq(struct pt_regs *regs)
-{
-       int irq;
-       int irq_gpp;
-
-#ifdef CONFIG_SMP
-#define BIT28 (1<<28)
-       /* 
-        * Second CPU gets only doorbell (message) interrupts.
-        * The doorbell interrupt is BIT28 in the main interrupt low cause reg.
-        */
-       int cpu_nr = smp_processor_id();
-       if (cpu_nr == 1) {
-               irq = mv64x60_read(&base_bh, MV64360_IC_MAIN_CAUSE_LO);
-               if (!(irq & BIT28))
-                       return -1;
-               return 28;
-       }
-#endif
-
-       irq = mv64x60_read(&base_bh, MV64360_IC_MAIN_CAUSE_LO);
-       irq = __ilog2((irq & 0x3dfffffe) & ppc_cached_irq_mask[0]);
-       if (irq == -1) {
-               irq = mv64x60_read(&base_bh, MV64360_IC_MAIN_CAUSE_HI);
-               irq = __ilog2((irq & 0x1f0003f7) & ppc_cached_irq_mask[1]);
-               if (irq == -1) {
-                       irq = -2;       /* bogus interrupt, should never happen */
-               } else {
-                       if ((irq >= 24) && (irq < 28)) {
-                               irq_gpp =
-                                       mv64x60_read(&base_bh,
-                                               MV64x60_GPP_INTR_CAUSE);
-                               irq_gpp =
-                                       __ilog2(irq_gpp &
-                                       ppc_cached_irq_mask[2]);
-
-                               if (irq_gpp == -1) {
-                                       irq = -2;
-                               } else {
-                                       irq = irq_gpp + 64;
-                                       mv64x60_write(&base_bh,
-                                               MV64x60_GPP_INTR_CAUSE,
-                                               ~(1 << (irq - 64)));
-                               }
-                       } else {
-                               irq += 32;
-                       }
-               }
-       }
-
-       if (irq < 0) {
-               return (irq);
-       } else {
-               return (mv64360_irq_base + irq);
-       }
-}
-
-/* mv64360_unmask_irq()
- *
- *  This function enables an interrupt.
- *
- * Input Variable(s):
- *  unsigned int       interrupt number (IRQ0...IRQ95).
- *
- * Output Variable(s):
- *  None.
- *
- * Returns:
- *  void
- */
-
-static void
-mv64360_unmask_irq(unsigned int irq)
-{
-#ifdef CONFIG_SMP
-       /* second CPU gets only doorbell interrupts */
-       if ((irq - mv64360_irq_base) == 28) {
-               mv64x60_set_bits(&base_bh, MV64360_IC_CPU1_INTR_MASK_LO, BIT28);
-               return;
-       }
-#endif
-       irq -= mv64360_irq_base;
-       if (irq > 31) {
-               if (irq > 63) {
-                       /* unmask GPP irq */
-                       mv64x60_write(&base_bh, MV64x60_GPP_INTR_MASK,
-                               ppc_cached_irq_mask[2] |= (1 << (irq - 64)));
-               } else {
-                       /* mask high interrupt register */
-                       mv64x60_write(&base_bh, MV64360_IC_CPU0_INTR_MASK_HI,
-                               ppc_cached_irq_mask[1] |= (1 << (irq - 32)));
-               }
-       } else {
-               /* mask low interrupt register */
-               mv64x60_write(&base_bh, MV64360_IC_CPU0_INTR_MASK_LO,
-                       ppc_cached_irq_mask[0] |= (1 << irq));
-       }
-}
-
-
-/* mv64360_mask_irq()
- *
- *  This function disables the requested interrupt.
- *
- * Input Variable(s):
- *  unsigned int       interrupt number (IRQ0...IRQ95).
- *
- * Output Variable(s):
- *  None.
- *
- * Returns:
- *  void
- */
-
-static void
-mv64360_mask_irq(unsigned int irq)
-{
-#ifdef CONFIG_SMP
-       if ((irq - mv64360_irq_base) == 28) {
-               mv64x60_clr_bits(&base_bh, MV64360_IC_CPU1_INTR_MASK_LO, BIT28);
-               return;
-       }
-#endif
-       irq -= mv64360_irq_base;
-       if (irq > 31) {
-               if (irq > 63) {
-                       /* mask GPP irq */
-                       mv64x60_write(&base_bh, MV64x60_GPP_INTR_MASK,
-                               ppc_cached_irq_mask[2] &= ~(1 << (irq - 64)));
-               } else {
-                       /* mask high interrupt register */
-                       mv64x60_write(&base_bh, MV64360_IC_CPU0_INTR_MASK_HI,
-                               ppc_cached_irq_mask[1] &= ~(1 << (irq - 32)));
-               }
-       } else {
-               /* mask low interrupt register */
-               mv64x60_write(&base_bh, MV64360_IC_CPU0_INTR_MASK_LO,
-                       ppc_cached_irq_mask[0] &= ~(1 << irq));
-       }
-
-}
-
-static irqreturn_t
-mv64360_cpu_error_int_handler(int irq, void *dev_id, struct pt_regs *regs)
-{
-       u32 val;
-       val = mv64x60_read(&base_bh, MV64x60_CPU_ERR_CAUSE);
-       printk(KERN_ERR
-               "mv64360_cpu_error_int_handler: Error on CPU interface - Cause regiser 0x%08x\n",
-               val);
-       printk(KERN_ERR "\tCPU error register dump:\n");
-       printk(KERN_ERR "\tAddress low  0x%08x\n",
-               mv64x60_read(&base_bh, MV64x60_CPU_ERR_ADDR_LO));
-       printk(KERN_ERR "\tAddress high 0x%08x\n",
-               mv64x60_read(&base_bh, MV64x60_CPU_ERR_ADDR_HI));
-       printk(KERN_ERR "\tData low     0x%08x\n",
-               mv64x60_read(&base_bh, MV64x60_CPU_ERR_DATA_LO));
-       printk(KERN_ERR "\tData high    0x%08x\n",
-               mv64x60_read(&base_bh, MV64x60_CPU_ERR_DATA_HI));
-       printk(KERN_ERR "\tParity       0x%08x\n",
-               mv64x60_read(&base_bh, MV64x60_CPU_ERR_PARITY));
-       mv64x60_write(&base_bh, MV64x60_CPU_ERR_CAUSE, 0);
-       return IRQ_HANDLED;
-}
-
-static irqreturn_t
-mv64360_sram_error_int_handler(int irq, void *dev_id, struct pt_regs *regs)
-{
-       printk(KERN_ERR
-               "mv64360_sram_error_int_handler: Error in internal SRAM - Cause register 0x%08x\n",
-               mv64x60_read(&base_bh, MV64360_SRAM_ERR_CAUSE));
-       printk(KERN_ERR "\tSRAM error register dump:\n");
-       printk(KERN_ERR "\tAddress Low  0x%08x\n",
-               mv64x60_read(&base_bh, MV64360_SRAM_ERR_ADDR_LO));
-       printk(KERN_ERR "\tAddress High 0x%08x\n",
-               mv64x60_read(&base_bh, MV64360_SRAM_ERR_ADDR_HI));
-       printk(KERN_ERR "\tData Low     0x%08x\n",
-               mv64x60_read(&base_bh, MV64360_SRAM_ERR_DATA_LO));
-       printk(KERN_ERR "\tData High    0x%08x\n",
-               mv64x60_read(&base_bh, MV64360_SRAM_ERR_DATA_HI));
-       printk(KERN_ERR "\tParity       0x%08x\n",
-               mv64x60_read(&base_bh, MV64360_SRAM_ERR_PARITY));
-       mv64x60_write(&base_bh, MV64360_SRAM_ERR_CAUSE, 0);
-       return IRQ_HANDLED;
-}
-
-static irqreturn_t
-mv64360_pci_error_int_handler(int irq, void *dev_id, struct pt_regs *regs)
-{
-       u32 val;
-       unsigned int pci_bus = (unsigned int) dev_id;
-       if (pci_bus == 0) {     /* Error on PCI 0 */
-               val = mv64x60_read(&base_bh, MV64x60_PCI0_ERR_CAUSE);
-               printk(KERN_ERR
-                       "mv64360_pci_error_int_handler: Error in PCI %d Interface\n",
-                       pci_bus);
-               printk(KERN_ERR "\tPCI %d error register dump:\n", pci_bus);
-               printk(KERN_ERR "\tCause register 0x%08x\n", val);
-               printk(KERN_ERR "\tAddress Low    0x%08x\n",
-                       mv64x60_read(&base_bh, MV64x60_PCI0_ERR_ADDR_LO));
-               printk(KERN_ERR "\tAddress High   0x%08x\n",
-                       mv64x60_read(&base_bh, MV64x60_PCI0_ERR_ADDR_HI));
-               printk(KERN_ERR "\tAttribute      0x%08x\n",
-                       mv64x60_read(&base_bh, MV64x60_PCI0_ERR_DATA_LO));
-               printk(KERN_ERR "\tCommand        0x%08x\n",
-                       mv64x60_read(&base_bh, MV64x60_PCI0_ERR_CMD));
-               mv64x60_write(&base_bh, MV64x60_PCI0_ERR_CAUSE, ~val);
-       }
-       if (pci_bus == 1) {     /* Error on PCI 1 */
-               val = mv64x60_read(&base_bh, MV64x60_PCI1_ERR_CAUSE);
-               printk(KERN_ERR
-                       "mv64360_pci_error_int_handler: Error in PCI %d Interface\n",
-                       pci_bus);
-               printk(KERN_ERR "\tPCI %d error register dump:\n", pci_bus);
-               printk(KERN_ERR "\tCause register 0x%08x\n", val);
-               printk(KERN_ERR "\tAddress Low    0x%08x\n",
-                       mv64x60_read(&base_bh, MV64x60_PCI1_ERR_ADDR_LO));
-               printk(KERN_ERR "\tAddress High   0x%08x\n",
-                       mv64x60_read(&base_bh, MV64x60_PCI1_ERR_ADDR_HI));
-               printk(KERN_ERR "\tAttribute      0x%08x\n",
-                       mv64x60_read(&base_bh, MV64x60_PCI1_ERR_DATA_LO));
-               printk(KERN_ERR "\tCommand        0x%08x\n",
-                       mv64x60_read(&base_bh, MV64x60_PCI1_ERR_CMD));
-               mv64x60_write(&base_bh, MV64x60_PCI1_ERR_CAUSE, ~val);
-       }
-       return IRQ_HANDLED;
-}
diff --git a/arch/ppc/syslib/mv64x60.c b/arch/ppc/syslib/mv64x60.c
deleted file mode 100644 (file)
index c31fe53..0000000
+++ /dev/null
@@ -1,2872 +0,0 @@
-/*
- * arch/ppc/syslib/mv64x60.c
- * 
- * Common routines for the Marvell/Galileo Discovery line of host bridges
- * (e.g, gt64260 and mv64360).
- *
- * Author: Mark A. Greer <mgreer@mvista.com>
- *        Rabeeh Khoury <rabeeh@galileo.co.il>
- *
- * 2001-2002 (c) MontaVista, Software, Inc.  This file is licensed under
- * the terms of the GNU General Public License version 2.  This program
- * is licensed "as is" without any warranty of any kind, whether express
- * or implied.
- */
-#include <linux/kernel.h>
-#include <linux/init.h>
-#include <linux/pci.h>
-#include <linux/slab.h>
-#include <linux/module.h>
-#include <linux/string.h>
-
-#include <asm/byteorder.h>
-#include <asm/io.h>
-#include <asm/irq.h>
-#include <asm/uaccess.h>
-#include <asm/machdep.h>
-#include <asm/pci-bridge.h>
-#include <asm/mv64x60.h>
-#include <asm/delay.h>
-#include <asm/ocp.h>
-
-
-#undef DEBUG
-
-#ifdef DEBUG
-#define        DBG(x...) printk(x)
-#else
-#define        DBG(x...)
-#endif /* DEBUG */
-
-
-static u32 mv64x60_mask(u32 val, u32 num_bits);
-static u32 mv64x60_shift_left(u32 val, u32 num_bits);
-static u32 mv64x60_shift_right(u32 val, u32 num_bits);
-static void mv64x60_early_init(mv64x60_handle_t *bh, mv64x60_setup_info_t *si);
-static int mv64x60_get_type(mv64x60_handle_t *bh);
-static int mv64x60_setup_for_chip(mv64x60_handle_t *bh);
-static void mv64x60_get_mem_windows(mv64x60_handle_t *bh,
-       u32 mem_windows[MV64x60_CPU2MEM_WINDOWS][2]);
-static u32 mv64x60_calc_mem_size(mv64x60_handle_t *bh,
-       u32 mem_windows[MV64x60_CPU2MEM_WINDOWS][2]);
-static void mv64x60_config_cpu2mem_windows(mv64x60_handle_t *bh,
-       mv64x60_setup_info_t *si, u32 mem_windows[MV64x60_CPU2MEM_WINDOWS][2]);
-static void mv64x60_config_cpu2pci_windows(mv64x60_handle_t *bh,
-       mv64x60_setup_info_t *si);
-static void mv64x60_set_cpu2pci_window(mv64x60_handle_t *bh,
-       mv64x60_pci_info_t *pi, u32 *win_tab, u32 *remap_tab);
-static void mv64x60_config_pci2mem_windows(mv64x60_handle_t *bh,
-       mv64x60_setup_info_t *si, u32 mem_windows[MV64x60_CPU2MEM_WINDOWS][2]);
-static void mv64x60_alloc_hoses(mv64x60_handle_t *bh, mv64x60_setup_info_t *si);
-static void mv64x60_init_hoses(mv64x60_handle_t *bh, mv64x60_setup_info_t *si);
-static void mv64x60_init_resources(struct pci_controller *hose,
-       mv64x60_pci_info_t *pi, u32 io_base);
-static void mv64x60_set_pci_params(struct pci_controller *hose,
-       mv64x60_pci_info_t *pi);
-static void mv64x60_enumerate_buses(mv64x60_handle_t *bh,
-       mv64x60_setup_info_t *si);
-static int mv64x60_pci_exclude_device(u8 bus, u8 devfn);
-static void mv64x60_fixup_ocp(struct ocp_device *, void *arg);
-
-static u32 gt64260_translate_size(u32 base, u32 size, u32 num_bits);
-static u32 gt64260_untranslate_size(u32 base, u32 size, u32 num_bits);
-static void gt64260_set_pci2mem_window(struct pci_controller *hose,
-       u32 window, u32 base);
-static u32 gt64260_is_enabled_32bit(mv64x60_handle_t *bh, u32 window);
-static void gt64260_enable_window_32bit(mv64x60_handle_t *bh, u32 window);
-static void gt64260_disable_window_32bit(mv64x60_handle_t *bh, u32 window);
-static void gt64260_enable_window_64bit(mv64x60_handle_t *bh, u32 window);
-static void gt64260_disable_window_64bit(mv64x60_handle_t *bh, u32 window);
-static void gt64260_disable_all_windows(mv64x60_handle_t *bh,
-                                       mv64x60_setup_info_t *si);
-static void gt64260a_chip_specific_init(mv64x60_handle_t *bh,
-       mv64x60_setup_info_t *si);
-static void gt64260b_chip_specific_init(mv64x60_handle_t *bh,
-       mv64x60_setup_info_t *si);
-
-static u32 mv64360_translate_size(u32 base_addr, u32 size, u32 num_bits);
-static u32 mv64360_untranslate_size(u32 base_addr, u32 size, u32 num_bits);
-static void mv64360_set_pci2mem_window(struct pci_controller *hose,
-       u32 window, u32 base);
-static u32 mv64360_is_enabled_32bit(mv64x60_handle_t *bh, u32 window);
-static void mv64360_enable_window_32bit(mv64x60_handle_t *bh, u32 window);
-static void mv64360_disable_window_32bit(mv64x60_handle_t *bh, u32 window);
-static void mv64360_enable_window_64bit(mv64x60_handle_t *bh, u32 window);
-static void mv64360_disable_window_64bit(mv64x60_handle_t *bh, u32 window);
-static void mv64360_disable_all_windows(mv64x60_handle_t *bh,
-                                       mv64x60_setup_info_t *si);
-static void mv64360_chip_specific_init(mv64x60_handle_t *bh,
-       mv64x60_setup_info_t *si);
-static void mv64460_chip_specific_init(mv64x60_handle_t *bh,
-       mv64x60_setup_info_t *si);
-
-
-u8     mv64x60_pci_exclude_bridge = TRUE;
-
-spinlock_t mv64x60_lock = SPIN_LOCK_UNLOCKED;
-spinlock_t mv64x60_rmw_lock = SPIN_LOCK_UNLOCKED;
-
-static mv64x60_32bit_window_t gt64260_32bit_windows[] __initdata = {
-       /* CPU->MEM Windows */
-       [MV64x60_CPU2MEM_0_WIN] = {
-               .base_reg               = MV64x60_CPU2MEM_0_BASE,
-               .size_reg               = MV64x60_CPU2MEM_0_SIZE,
-               .base_bits              = 12,
-               .size_bits              = 12,
-               .get_from_field         = mv64x60_shift_left,
-               .map_to_field           = mv64x60_shift_right,
-               .extra                  = 0 },
-       [MV64x60_CPU2MEM_1_WIN] = {
-               .base_reg               = MV64x60_CPU2MEM_1_BASE,
-               .size_reg               = MV64x60_CPU2MEM_1_SIZE,
-               .base_bits              = 12,
-               .size_bits              = 12,
-               .get_from_field         = mv64x60_shift_left,
-               .map_to_field           = mv64x60_shift_right,
-               .extra                  = 0 },
-       [MV64x60_CPU2MEM_2_WIN] = {
-               .base_reg               = MV64x60_CPU2MEM_2_BASE,
-               .size_reg               = MV64x60_CPU2MEM_2_SIZE,
-               .base_bits              = 12,
-               .size_bits              = 12,
-               .get_from_field         = mv64x60_shift_left,
-               .map_to_field           = mv64x60_shift_right,
-               .extra                  = 0 },
-       [MV64x60_CPU2MEM_3_WIN] = {
-               .base_reg               = MV64x60_CPU2MEM_3_BASE,
-               .size_reg               = MV64x60_CPU2MEM_3_SIZE,
-               .base_bits              = 12,
-               .size_bits              = 12,
-               .get_from_field         = mv64x60_shift_left,
-               .map_to_field           = mv64x60_shift_right,
-               .extra                  = 0 },
-       /* CPU->Device Windows */
-       [MV64x60_CPU2DEV_0_WIN] = {
-               .base_reg               = MV64x60_CPU2DEV_0_BASE,
-               .size_reg               = MV64x60_CPU2DEV_0_SIZE,
-               .base_bits              = 12,
-               .size_bits              = 12,
-               .get_from_field         = mv64x60_shift_left,
-               .map_to_field           = mv64x60_shift_right,
-               .extra                  = 0 },
-       [MV64x60_CPU2DEV_1_WIN] = {
-               .base_reg               = MV64x60_CPU2DEV_1_BASE,
-               .size_reg               = MV64x60_CPU2DEV_1_SIZE,
-               .base_bits              = 12,
-               .size_bits              = 12,
-               .get_from_field         = mv64x60_shift_left,
-               .map_to_field           = mv64x60_shift_right,
-               .extra                  = 0 },
-       [MV64x60_CPU2DEV_2_WIN] = {
-               .base_reg               = MV64x60_CPU2DEV_2_BASE,
-               .size_reg               = MV64x60_CPU2DEV_2_SIZE,
-               .base_bits              = 12,
-               .size_bits              = 12,
-               .get_from_field         = mv64x60_shift_left,
-               .map_to_field           = mv64x60_shift_right,
-               .extra                  = 0 },
-       [MV64x60_CPU2DEV_3_WIN] = {
-               .base_reg               = MV64x60_CPU2DEV_3_BASE,
-               .size_reg               = MV64x60_CPU2DEV_3_SIZE,
-               .base_bits              = 12,
-               .size_bits              = 12,
-               .get_from_field         = mv64x60_shift_left,
-               .map_to_field           = mv64x60_shift_right,
-               .extra                  = 0 },
-       /* CPU->Boot Window */
-       [MV64x60_CPU2BOOT_WIN] = {
-               .base_reg               = MV64x60_CPU2BOOT_0_BASE,
-               .size_reg               = MV64x60_CPU2BOOT_0_SIZE,
-               .base_bits              = 12,
-               .size_bits              = 12,
-               .get_from_field         = mv64x60_shift_left,
-               .map_to_field           = mv64x60_shift_right,
-               .extra                  = 0 },
-       /* CPU->PCI 0 Windows */
-       [MV64x60_CPU2PCI0_IO_WIN] = {
-               .base_reg               = MV64x60_CPU2PCI0_IO_BASE,
-               .size_reg               = MV64x60_CPU2PCI0_IO_SIZE,
-               .base_bits              = 12,
-               .size_bits              = 12,
-               .get_from_field         = mv64x60_shift_left,
-               .map_to_field           = mv64x60_shift_right,
-               .extra                  = 0 },
-       [MV64x60_CPU2PCI0_MEM_0_WIN] = {
-               .base_reg               = MV64x60_CPU2PCI0_MEM_0_BASE,
-               .size_reg               = MV64x60_CPU2PCI0_MEM_0_SIZE,
-               .base_bits              = 12,
-               .size_bits              = 12,
-               .get_from_field         = mv64x60_shift_left,
-               .map_to_field           = mv64x60_shift_right,
-               .extra                  = 0 },
-       [MV64x60_CPU2PCI0_MEM_1_WIN] = {
-               .base_reg               = MV64x60_CPU2PCI0_MEM_1_BASE,
-               .size_reg               = MV64x60_CPU2PCI0_MEM_1_SIZE,
-               .base_bits              = 12,
-               .size_bits              = 12,
-               .get_from_field         = mv64x60_shift_left,
-               .map_to_field           = mv64x60_shift_right,
-               .extra                  = 0 },
-       [MV64x60_CPU2PCI0_MEM_2_WIN] = {
-               .base_reg               = MV64x60_CPU2PCI0_MEM_2_BASE,
-               .size_reg               = MV64x60_CPU2PCI0_MEM_2_SIZE,
-               .base_bits              = 12,
-               .size_bits              = 12,
-               .get_from_field         = mv64x60_shift_left,
-               .map_to_field           = mv64x60_shift_right,
-               .extra                  = 0 },
-       [MV64x60_CPU2PCI0_MEM_3_WIN] = {
-               .base_reg               = MV64x60_CPU2PCI0_MEM_3_BASE,
-               .size_reg               = MV64x60_CPU2PCI0_MEM_3_SIZE,
-               .base_bits              = 12,
-               .size_bits              = 12,
-               .get_from_field         = mv64x60_shift_left,
-               .map_to_field           = mv64x60_shift_right,
-               .extra                  = 0 },
-       /* CPU->PCI 1 Windows */
-       [MV64x60_CPU2PCI1_IO_WIN] = {
-               .base_reg               = MV64x60_CPU2PCI1_IO_BASE,
-               .size_reg               = MV64x60_CPU2PCI1_IO_SIZE,
-               .base_bits              = 12,
-               .size_bits              = 12,
-               .get_from_field         = mv64x60_shift_left,
-               .map_to_field           = mv64x60_shift_right,
-               .extra                  = 0 },
-       [MV64x60_CPU2PCI1_MEM_0_WIN] = {
-               .base_reg               = MV64x60_CPU2PCI1_MEM_0_BASE,
-               .size_reg               = MV64x60_CPU2PCI1_MEM_0_SIZE,
-               .base_bits              = 12,
-               .size_bits              = 12,
-               .get_from_field         = mv64x60_shift_left,
-               .map_to_field           = mv64x60_shift_right,
-               .extra                  = 0 },
-       [MV64x60_CPU2PCI1_MEM_1_WIN] = {
-               .base_reg               = MV64x60_CPU2PCI1_MEM_1_BASE,
-               .size_reg               = MV64x60_CPU2PCI1_MEM_1_SIZE,
-               .base_bits              = 12,
-               .size_bits              = 12,
-               .get_from_field         = mv64x60_shift_left,
-               .map_to_field           = mv64x60_shift_right,
-               .extra                  = 0 },
-       [MV64x60_CPU2PCI1_MEM_2_WIN] = {
-               .base_reg               = MV64x60_CPU2PCI1_MEM_2_BASE,
-               .size_reg               = MV64x60_CPU2PCI1_MEM_2_SIZE,
-               .base_bits              = 12,
-               .size_bits              = 12,
-               .get_from_field         = mv64x60_shift_left,
-               .map_to_field           = mv64x60_shift_right,
-               .extra                  = 0 },
-       [MV64x60_CPU2PCI1_MEM_3_WIN] = {
-               .base_reg               = MV64x60_CPU2PCI1_MEM_3_BASE,
-               .size_reg               = MV64x60_CPU2PCI1_MEM_3_SIZE,
-               .base_bits              = 12,
-               .size_bits              = 12,
-               .get_from_field         = mv64x60_shift_left,
-               .map_to_field           = mv64x60_shift_right,
-               .extra                  = 0 },
-       /* CPU->SRAM Window (64260 has no integrated SRAM) */
-       /* CPU->PCI 0 Remap I/O Window */
-       [MV64x60_CPU2PCI0_IO_REMAP_WIN] = {
-               .base_reg               = MV64x60_CPU2PCI0_IO_REMAP,
-               .size_reg               = 0,
-               .base_bits              = 12,
-               .size_bits              = 0,
-               .get_from_field         = mv64x60_shift_left,
-               .map_to_field           = mv64x60_shift_right,
-               .extra                  = 0 },
-       /* CPU->PCI 1 Remap I/O Window */
-       [MV64x60_CPU2PCI1_IO_REMAP_WIN] = {
-               .base_reg               = MV64x60_CPU2PCI1_IO_REMAP,
-               .size_reg               = 0,
-               .base_bits              = 12,
-               .size_bits              = 0,
-               .get_from_field         = mv64x60_shift_left,
-               .map_to_field           = mv64x60_shift_right,
-               .extra                  = 0 },
-       /* CPU Memory Protection Windows */
-       [MV64x60_CPU_PROT_0_WIN] = {
-               .base_reg               = MV64x60_CPU_PROT_BASE_0,
-               .size_reg               = MV64x60_CPU_PROT_SIZE_0,
-               .base_bits              = 12,
-               .size_bits              = 12,
-               .get_from_field         = mv64x60_shift_left,
-               .map_to_field           = mv64x60_shift_right,
-               .extra                  = 0 },
-       [MV64x60_CPU_PROT_1_WIN] = {
-               .base_reg               = MV64x60_CPU_PROT_BASE_1,
-               .size_reg               = MV64x60_CPU_PROT_SIZE_1,
-               .base_bits              = 12,
-               .size_bits              = 12,
-               .get_from_field         = mv64x60_shift_left,
-               .map_to_field           = mv64x60_shift_right,
-               .extra                  = 0 },
-       [MV64x60_CPU_PROT_2_WIN] = {
-               .base_reg               = MV64x60_CPU_PROT_BASE_2,
-               .size_reg               = MV64x60_CPU_PROT_SIZE_2,
-               .base_bits              = 12,
-               .size_bits              = 12,
-               .get_from_field         = mv64x60_shift_left,
-               .map_to_field           = mv64x60_shift_right,
-               .extra                  = 0 },
-       [MV64x60_CPU_PROT_3_WIN] = {
-               .base_reg               = MV64x60_CPU_PROT_BASE_3,
-               .size_reg               = MV64x60_CPU_PROT_SIZE_3,
-               .base_bits              = 12,
-               .size_bits              = 12,
-               .get_from_field         = mv64x60_shift_left,
-               .map_to_field           = mv64x60_shift_right,
-               .extra                  = 0 },
-       /* CPU Snoop Windows */
-       [MV64x60_CPU_SNOOP_0_WIN] = {
-               .base_reg               = GT64260_CPU_SNOOP_BASE_0,
-               .size_reg               = GT64260_CPU_SNOOP_SIZE_0,
-               .base_bits              = 12,
-               .size_bits              = 12,
-               .get_from_field         = mv64x60_shift_left,
-               .map_to_field           = mv64x60_shift_right,
-               .extra                  = 0 },
-       [MV64x60_CPU_SNOOP_1_WIN] = {
-               .base_reg               = GT64260_CPU_SNOOP_BASE_1,
-               .size_reg               = GT64260_CPU_SNOOP_SIZE_1,
-               .base_bits              = 12,
-               .size_bits              = 12,
-               .get_from_field         = mv64x60_shift_left,
-               .map_to_field           = mv64x60_shift_right,
-               .extra                  = 0 },
-       [MV64x60_CPU_SNOOP_2_WIN] = {
-               .base_reg               = GT64260_CPU_SNOOP_BASE_2,
-               .size_reg               = GT64260_CPU_SNOOP_SIZE_2,
-               .base_bits              = 12,
-               .size_bits              = 12,
-               .get_from_field         = mv64x60_shift_left,
-               .map_to_field           = mv64x60_shift_right,
-               .extra                  = 0 },
-       [MV64x60_CPU_SNOOP_3_WIN] = {
-               .base_reg               = GT64260_CPU_SNOOP_BASE_3,
-               .size_reg               = GT64260_CPU_SNOOP_SIZE_3,
-               .base_bits              = 12,
-               .size_bits              = 12,
-               .get_from_field         = mv64x60_shift_left,
-               .map_to_field           = mv64x60_shift_right,
-               .extra                  = 0 },
-       /* PCI 0->System Memory Remap Windows */
-       [MV64x60_PCI02MEM_REMAP_0_WIN] = {
-               .base_reg               = MV64x60_PCI0_SLAVE_MEM_0_REMAP,
-               .size_reg               = 0,
-               .base_bits              = 20,
-               .size_bits              = 0,
-               .get_from_field         = mv64x60_mask,
-               .map_to_field           = mv64x60_mask,
-               .extra                  = 0 },
-       [MV64x60_PCI02MEM_REMAP_1_WIN] = {
-               .base_reg               = MV64x60_PCI0_SLAVE_MEM_1_REMAP,
-               .size_reg               = 0,
-               .base_bits              = 20,
-               .size_bits              = 0,
-               .get_from_field         = mv64x60_mask,
-               .map_to_field           = mv64x60_mask,
-               .extra                  = 0 },
-       [MV64x60_PCI02MEM_REMAP_2_WIN] = {
-               .base_reg               = MV64x60_PCI0_SLAVE_MEM_1_REMAP,
-               .size_reg               = 0,
-               .base_bits              = 20,
-               .size_bits              = 0,
-               .get_from_field         = mv64x60_mask,
-               .map_to_field           = mv64x60_mask,
-               .extra                  = 0 },
-       [MV64x60_PCI02MEM_REMAP_3_WIN] = {
-               .base_reg               = MV64x60_PCI0_SLAVE_MEM_1_REMAP,
-               .size_reg               = 0,
-               .base_bits              = 20,
-               .size_bits              = 0,
-               .get_from_field         = mv64x60_mask,
-               .map_to_field           = mv64x60_mask,
-               .extra                  = 0 },
-       /* PCI 1->System Memory Remap Windows */
-       [MV64x60_PCI12MEM_REMAP_0_WIN] = {
-               .base_reg               = MV64x60_PCI1_SLAVE_MEM_0_REMAP,
-               .size_reg               = 0,
-               .base_bits              = 20,
-               .size_bits              = 0,
-               .get_from_field         = mv64x60_mask,
-               .map_to_field           = mv64x60_mask,
-               .extra                  = 0 },
-       [MV64x60_PCI12MEM_REMAP_1_WIN] = {
-               .base_reg               = MV64x60_PCI1_SLAVE_MEM_1_REMAP,
-               .size_reg               = 0,
-               .base_bits              = 20,
-               .size_bits              = 0,
-               .get_from_field         = mv64x60_mask,
-               .map_to_field           = mv64x60_mask,
-               .extra                  = 0 },
-       [MV64x60_PCI12MEM_REMAP_2_WIN] = {
-               .base_reg               = MV64x60_PCI1_SLAVE_MEM_1_REMAP,
-               .size_reg               = 0,
-               .base_bits              = 20,
-               .size_bits              = 0,
-               .get_from_field         = mv64x60_mask,
-               .map_to_field           = mv64x60_mask,
-               .extra                  = 0 },
-       [MV64x60_PCI12MEM_REMAP_3_WIN] = {
-               .base_reg               = MV64x60_PCI1_SLAVE_MEM_1_REMAP,
-               .size_reg               = 0,
-               .base_bits              = 20,
-               .size_bits              = 0,
-               .get_from_field         = mv64x60_mask,
-               .map_to_field           = mv64x60_mask,
-               .extra                  = 0 },
-};
-
-static mv64x60_64bit_window_t gt64260_64bit_windows[] __initdata = {
-       /* CPU->PCI 0 MEM Remap Windows */
-       [MV64x60_CPU2PCI0_MEM_0_REMAP_WIN] = {
-               .base_hi_reg            = MV64x60_CPU2PCI0_MEM_0_REMAP_HI,
-               .base_lo_reg            = MV64x60_CPU2PCI0_MEM_0_REMAP_LO,
-               .size_reg               = 0,
-               .base_lo_bits           = 12,
-               .size_bits              = 0,
-               .get_from_field         = mv64x60_shift_left,
-               .map_to_field           = mv64x60_shift_right,
-               .extra                  = 0 },
-       [MV64x60_CPU2PCI0_MEM_1_REMAP_WIN] = {
-               .base_hi_reg            = MV64x60_CPU2PCI0_MEM_1_REMAP_HI,
-               .base_lo_reg            = MV64x60_CPU2PCI0_MEM_1_REMAP_LO,
-               .size_reg               = 0,
-               .base_lo_bits           = 12,
-               .size_bits              = 0,
-               .get_from_field         = mv64x60_shift_left,
-               .map_to_field           = mv64x60_shift_right,
-               .extra                  = 0 },
-       [MV64x60_CPU2PCI0_MEM_2_REMAP_WIN] = {
-               .base_hi_reg            = MV64x60_CPU2PCI0_MEM_2_REMAP_HI,
-               .base_lo_reg            = MV64x60_CPU2PCI0_MEM_2_REMAP_LO,
-               .size_reg               = 0,
-               .base_lo_bits           = 12,
-               .size_bits              = 0,
-               .get_from_field         = mv64x60_shift_left,
-               .map_to_field           = mv64x60_shift_right,
-               .extra                  = 0 },
-       [MV64x60_CPU2PCI0_MEM_3_REMAP_WIN] = {
-               .base_hi_reg            = MV64x60_CPU2PCI0_MEM_3_REMAP_HI,
-               .base_lo_reg            = MV64x60_CPU2PCI0_MEM_3_REMAP_LO,
-               .size_reg               = 0,
-               .base_lo_bits           = 12,
-               .size_bits              = 0,
-               .get_from_field         = mv64x60_shift_left,
-               .map_to_field           = mv64x60_shift_right,
-               .extra                  = 0 },
-       /* CPU->PCI 1 MEM Remap Windows */
-       [MV64x60_CPU2PCI1_MEM_0_REMAP_WIN] = {
-               .base_hi_reg            = MV64x60_CPU2PCI1_MEM_0_REMAP_HI,
-               .base_lo_reg            = MV64x60_CPU2PCI1_MEM_0_REMAP_LO,
-               .size_reg               = 0,
-               .base_lo_bits           = 12,
-               .size_bits              = 0,
-               .get_from_field         = mv64x60_shift_left,
-               .map_to_field           = mv64x60_shift_right,
-               .extra                  = 0 },
-       [MV64x60_CPU2PCI1_MEM_1_REMAP_WIN] = {
-               .base_hi_reg            = MV64x60_CPU2PCI1_MEM_1_REMAP_HI,
-               .base_lo_reg            = MV64x60_CPU2PCI1_MEM_1_REMAP_LO,
-               .size_reg               = 0,
-               .base_lo_bits           = 12,
-               .size_bits              = 0,
-               .get_from_field         = mv64x60_shift_left,
-               .map_to_field           = mv64x60_shift_right,
-               .extra                  = 0 },
-       [MV64x60_CPU2PCI1_MEM_2_REMAP_WIN] = {
-               .base_hi_reg            = MV64x60_CPU2PCI1_MEM_2_REMAP_HI,
-               .base_lo_reg            = MV64x60_CPU2PCI1_MEM_2_REMAP_LO,
-               .size_reg               = 0,
-               .base_lo_bits           = 12,
-               .size_bits              = 0,
-               .get_from_field         = mv64x60_shift_left,
-               .map_to_field           = mv64x60_shift_right,
-               .extra                  = 0 },
-       [MV64x60_CPU2PCI1_MEM_3_REMAP_WIN] = {
-               .base_hi_reg            = MV64x60_CPU2PCI1_MEM_3_REMAP_HI,
-               .base_lo_reg            = MV64x60_CPU2PCI1_MEM_3_REMAP_LO,
-               .size_reg               = 0,
-               .base_lo_bits           = 12,
-               .size_bits              = 0,
-               .get_from_field         = mv64x60_shift_left,
-               .map_to_field           = mv64x60_shift_right,
-               .extra                  = 0 },
-       /* PCI 0->MEM Access Control Windows */
-       [MV64x60_PCI02MEM_ACC_CNTL_0_WIN] = {
-               .base_hi_reg            = MV64x60_PCI0_ACC_CNTL_0_BASE_HI,
-               .base_lo_reg            = MV64x60_PCI0_ACC_CNTL_0_BASE_LO,
-               .size_reg               = MV64x60_PCI0_ACC_CNTL_0_SIZE,
-               .base_lo_bits           = 12,
-               .size_bits              = 12,
-               .get_from_field         = mv64x60_shift_left,
-               .map_to_field           = mv64x60_shift_right,
-               .extra                  = 0 },
-       [MV64x60_PCI02MEM_ACC_CNTL_1_WIN] = {
-               .base_hi_reg            = MV64x60_PCI0_ACC_CNTL_1_BASE_HI,
-               .base_lo_reg            = MV64x60_PCI0_ACC_CNTL_1_BASE_LO,
-               .size_reg               = MV64x60_PCI0_ACC_CNTL_1_SIZE,
-               .base_lo_bits           = 12,
-               .size_bits              = 12,
-               .get_from_field         = mv64x60_shift_left,
-               .map_to_field           = mv64x60_shift_right,
-               .extra                  = 0 },
-       [MV64x60_PCI02MEM_ACC_CNTL_2_WIN] = {
-               .base_hi_reg            = MV64x60_PCI0_ACC_CNTL_2_BASE_HI,
-               .base_lo_reg            = MV64x60_PCI0_ACC_CNTL_2_BASE_LO,
-               .size_reg               = MV64x60_PCI0_ACC_CNTL_2_SIZE,
-               .base_lo_bits           = 12,
-               .size_bits              = 12,
-               .get_from_field         = mv64x60_shift_left,
-               .map_to_field           = mv64x60_shift_right,
-               .extra                  = 0 },
-       [MV64x60_PCI02MEM_ACC_CNTL_3_WIN] = {
-               .base_hi_reg            = MV64x60_PCI0_ACC_CNTL_3_BASE_HI,
-               .base_lo_reg            = MV64x60_PCI0_ACC_CNTL_3_BASE_LO,
-               .size_reg               = MV64x60_PCI0_ACC_CNTL_3_SIZE,
-               .base_lo_bits           = 12,
-               .size_bits              = 12,
-               .get_from_field         = mv64x60_shift_left,
-               .map_to_field           = mv64x60_shift_right,
-               .extra                  = 0 },
-       /* PCI 1->MEM Access Control Windows */
-       [MV64x60_PCI12MEM_ACC_CNTL_0_WIN] = {
-               .base_hi_reg            = MV64x60_PCI1_ACC_CNTL_0_BASE_HI,
-               .base_lo_reg            = MV64x60_PCI1_ACC_CNTL_0_BASE_LO,
-               .size_reg               = MV64x60_PCI1_ACC_CNTL_0_SIZE,
-               .base_lo_bits           = 12,
-               .size_bits              = 12,
-               .get_from_field         = mv64x60_shift_left,
-               .map_to_field           = mv64x60_shift_right,
-               .extra                  = 0 },
-       [MV64x60_PCI12MEM_ACC_CNTL_1_WIN] = {
-               .base_hi_reg            = MV64x60_PCI1_ACC_CNTL_1_BASE_HI,
-               .base_lo_reg            = MV64x60_PCI1_ACC_CNTL_1_BASE_LO,
-               .size_reg               = MV64x60_PCI1_ACC_CNTL_1_SIZE,
-               .base_lo_bits           = 12,
-               .size_bits              = 12,
-               .get_from_field         = mv64x60_shift_left,
-               .map_to_field           = mv64x60_shift_right,
-               .extra                  = 0 },
-       [MV64x60_PCI12MEM_ACC_CNTL_2_WIN] = {
-               .base_hi_reg            = MV64x60_PCI1_ACC_CNTL_2_BASE_HI,
-               .base_lo_reg            = MV64x60_PCI1_ACC_CNTL_2_BASE_LO,
-               .size_reg               = MV64x60_PCI1_ACC_CNTL_2_SIZE,
-               .base_lo_bits           = 12,
-               .size_bits              = 12,
-               .get_from_field         = mv64x60_shift_left,
-               .map_to_field           = mv64x60_shift_right,
-               .extra                  = 0 },
-       [MV64x60_PCI12MEM_ACC_CNTL_3_WIN] = {
-               .base_hi_reg            = MV64x60_PCI1_ACC_CNTL_3_BASE_HI,
-               .base_lo_reg            = MV64x60_PCI1_ACC_CNTL_3_BASE_LO,
-               .size_reg               = MV64x60_PCI1_ACC_CNTL_3_SIZE,
-               .base_lo_bits           = 12,
-               .size_bits              = 12,
-               .get_from_field         = mv64x60_shift_left,
-               .map_to_field           = mv64x60_shift_right,
-               .extra                  = 0 },
-       /* PCI 0->MEM Snoop Windows */
-       [MV64x60_PCI02MEM_SNOOP_0_WIN] = {
-               .base_hi_reg            = GT64260_PCI0_SNOOP_0_BASE_HI,
-               .base_lo_reg            = GT64260_PCI0_SNOOP_0_BASE_LO,
-               .size_reg               = GT64260_PCI0_SNOOP_0_SIZE,
-               .base_lo_bits           = 12,
-               .size_bits              = 12,
-               .get_from_field         = mv64x60_shift_left,
-               .map_to_field           = mv64x60_shift_right,
-               .extra                  = 0 },
-       [MV64x60_PCI02MEM_SNOOP_1_WIN] = {
-               .base_hi_reg            = GT64260_PCI0_SNOOP_1_BASE_HI,
-               .base_lo_reg            = GT64260_PCI0_SNOOP_1_BASE_LO,
-               .size_reg               = GT64260_PCI0_SNOOP_1_SIZE,
-               .base_lo_bits           = 12,
-               .size_bits              = 12,
-               .get_from_field         = mv64x60_shift_left,
-               .map_to_field           = mv64x60_shift_right,
-               .extra                  = 0 },
-       [MV64x60_PCI02MEM_SNOOP_2_WIN] = {
-               .base_hi_reg            = GT64260_PCI0_SNOOP_2_BASE_HI,
-               .base_lo_reg            = GT64260_PCI0_SNOOP_2_BASE_LO,
-               .size_reg               = GT64260_PCI0_SNOOP_2_SIZE,
-               .base_lo_bits           = 12,
-               .size_bits              = 12,
-               .get_from_field         = mv64x60_shift_left,
-               .map_to_field           = mv64x60_shift_right,
-               .extra                  = 0 },
-       [MV64x60_PCI02MEM_SNOOP_3_WIN] = {
-               .base_hi_reg            = GT64260_PCI0_SNOOP_3_BASE_HI,
-               .base_lo_reg            = GT64260_PCI0_SNOOP_3_BASE_LO,
-               .size_reg               = GT64260_PCI0_SNOOP_3_SIZE,
-               .base_lo_bits           = 12,
-               .size_bits              = 12,
-               .get_from_field         = mv64x60_shift_left,
-               .map_to_field           = mv64x60_shift_right,
-               .extra                  = 0 },
-       /* PCI 1->MEM Snoop Windows */
-       [MV64x60_PCI12MEM_SNOOP_0_WIN] = {
-               .base_hi_reg            = GT64260_PCI1_SNOOP_0_BASE_HI,
-               .base_lo_reg            = GT64260_PCI1_SNOOP_0_BASE_LO,
-               .size_reg               = GT64260_PCI1_SNOOP_0_SIZE,
-               .base_lo_bits           = 12,
-               .size_bits              = 12,
-               .get_from_field         = mv64x60_shift_left,
-               .map_to_field           = mv64x60_shift_right,
-               .extra                  = 0 },
-       [MV64x60_PCI12MEM_SNOOP_1_WIN] = {
-               .base_hi_reg            = GT64260_PCI1_SNOOP_1_BASE_HI,
-               .base_lo_reg            = GT64260_PCI1_SNOOP_1_BASE_LO,
-               .size_reg               = GT64260_PCI1_SNOOP_1_SIZE,
-               .base_lo_bits           = 12,
-               .size_bits              = 12,
-               .get_from_field         = mv64x60_shift_left,
-               .map_to_field           = mv64x60_shift_right,
-               .extra                  = 0 },
-       [MV64x60_PCI12MEM_SNOOP_2_WIN] = {
-               .base_hi_reg            = GT64260_PCI1_SNOOP_2_BASE_HI,
-               .base_lo_reg            = GT64260_PCI1_SNOOP_2_BASE_LO,
-               .size_reg               = GT64260_PCI1_SNOOP_2_SIZE,
-               .base_lo_bits           = 12,
-               .size_bits              = 12,
-               .get_from_field         = mv64x60_shift_left,
-               .map_to_field           = mv64x60_shift_right,
-               .extra                  = 0 },
-       [MV64x60_PCI12MEM_SNOOP_3_WIN] = {
-               .base_hi_reg            = GT64260_PCI1_SNOOP_3_BASE_HI,
-               .base_lo_reg            = GT64260_PCI1_SNOOP_3_BASE_LO,
-               .size_reg               = GT64260_PCI1_SNOOP_3_SIZE,
-               .base_lo_bits           = 12,
-               .size_bits              = 12,
-               .get_from_field         = mv64x60_shift_left,
-               .map_to_field           = mv64x60_shift_right,
-               .extra                  = 0 },
-};
-
-static mv64x60_chip_info_t gt64260a_ci __initdata = {
-       .translate_size         = gt64260_translate_size,
-       .untranslate_size       = gt64260_untranslate_size,
-       .set_pci2mem_window     = gt64260_set_pci2mem_window,
-       .is_enabled_32bit       = gt64260_is_enabled_32bit,
-       .enable_window_32bit    = gt64260_enable_window_32bit,
-       .disable_window_32bit   = gt64260_disable_window_32bit,
-       .enable_window_64bit    = gt64260_enable_window_64bit,
-       .disable_window_64bit   = gt64260_disable_window_64bit,
-       .disable_all_windows    = gt64260_disable_all_windows,
-       .chip_specific_init     = gt64260a_chip_specific_init,
-       .window_tab_32bit       = gt64260_32bit_windows,
-       .window_tab_64bit       = gt64260_64bit_windows,
-};
-
-static mv64x60_chip_info_t gt64260b_ci __initdata = {
-       .translate_size         = gt64260_translate_size,
-       .untranslate_size       = gt64260_untranslate_size,
-       .set_pci2mem_window     = gt64260_set_pci2mem_window,
-       .is_enabled_32bit       = gt64260_is_enabled_32bit,
-       .enable_window_32bit    = gt64260_enable_window_32bit,
-       .disable_window_32bit   = gt64260_disable_window_32bit,
-       .enable_window_64bit    = gt64260_enable_window_64bit,
-       .disable_window_64bit   = gt64260_disable_window_64bit,
-       .disable_all_windows    = gt64260_disable_all_windows,
-       .chip_specific_init     = gt64260b_chip_specific_init,
-       .window_tab_32bit       = gt64260_32bit_windows,
-       .window_tab_64bit       = gt64260_64bit_windows,
-};
-
-
-static mv64x60_32bit_window_t mv64360_32bit_windows[] __initdata = {
-       /* CPU->MEM Windows */
-       [MV64x60_CPU2MEM_0_WIN] = {
-               .base_reg               = MV64x60_CPU2MEM_0_BASE,
-               .size_reg               = MV64x60_CPU2MEM_0_SIZE,
-               .base_bits              = 16,
-               .size_bits              = 16,
-               .get_from_field         = mv64x60_shift_left,
-               .map_to_field           = mv64x60_shift_right,
-               .extra                  = 0 },
-       [MV64x60_CPU2MEM_1_WIN] = {
-               .base_reg               = MV64x60_CPU2MEM_1_BASE,
-               .size_reg               = MV64x60_CPU2MEM_1_SIZE,
-               .base_bits              = 16,
-               .size_bits              = 16,
-               .get_from_field         = mv64x60_shift_left,
-               .map_to_field           = mv64x60_shift_right,
-               .extra                  = 1 },
-       [MV64x60_CPU2MEM_2_WIN] = {
-               .base_reg               = MV64x60_CPU2MEM_2_BASE,
-               .size_reg               = MV64x60_CPU2MEM_2_SIZE,
-               .base_bits              = 16,
-               .size_bits              = 16,
-               .get_from_field         = mv64x60_shift_left,
-               .map_to_field           = mv64x60_shift_right,
-               .extra                  = 2 },
-       [MV64x60_CPU2MEM_3_WIN] = {
-               .base_reg               = MV64x60_CPU2MEM_3_BASE,
-               .size_reg               = MV64x60_CPU2MEM_3_SIZE,
-               .base_bits              = 16,
-               .size_bits              = 16,
-               .get_from_field         = mv64x60_shift_left,
-               .map_to_field           = mv64x60_shift_right,
-               .extra                  = 3 },
-       /* CPU->Device Windows */
-       [MV64x60_CPU2DEV_0_WIN] = {
-               .base_reg               = MV64x60_CPU2DEV_0_BASE,
-               .size_reg               = MV64x60_CPU2DEV_0_SIZE,
-               .base_bits              = 16,
-               .size_bits              = 16,
-               .get_from_field         = mv64x60_shift_left,
-               .map_to_field           = mv64x60_shift_right,
-               .extra                  = 4 },
-       [MV64x60_CPU2DEV_1_WIN] = {
-               .base_reg               = MV64x60_CPU2DEV_1_BASE,
-               .size_reg               = MV64x60_CPU2DEV_1_SIZE,
-               .base_bits              = 16,
-               .size_bits              = 16,
-               .get_from_field         = mv64x60_shift_left,
-               .map_to_field           = mv64x60_shift_right,
-               .extra                  = 5 },
-       [MV64x60_CPU2DEV_2_WIN] = {
-               .base_reg               = MV64x60_CPU2DEV_2_BASE,
-               .size_reg               = MV64x60_CPU2DEV_2_SIZE,
-               .base_bits              = 16,
-               .size_bits              = 16,
-               .get_from_field         = mv64x60_shift_left,
-               .map_to_field           = mv64x60_shift_right,
-               .extra                  = 6 },
-       [MV64x60_CPU2DEV_3_WIN] = {
-               .base_reg               = MV64x60_CPU2DEV_3_BASE,
-               .size_reg               = MV64x60_CPU2DEV_3_SIZE,
-               .base_bits              = 16,
-               .size_bits              = 16,
-               .get_from_field         = mv64x60_shift_left,
-               .map_to_field           = mv64x60_shift_right,
-               .extra                  = 7 },
-       /* CPU->Boot Window */
-       [MV64x60_CPU2BOOT_WIN] = {
-               .base_reg               = MV64x60_CPU2BOOT_0_BASE,
-               .size_reg               = MV64x60_CPU2BOOT_0_SIZE,
-               .base_bits              = 16,
-               .size_bits              = 16,
-               .get_from_field         = mv64x60_shift_left,
-               .map_to_field           = mv64x60_shift_right,
-               .extra                  = 8 },
-       /* CPU->PCI 0 Windows */
-       [MV64x60_CPU2PCI0_IO_WIN] = {
-               .base_reg               = MV64x60_CPU2PCI0_IO_BASE,
-               .size_reg               = MV64x60_CPU2PCI0_IO_SIZE,
-               .base_bits              = 16,
-               .size_bits              = 16,
-               .get_from_field         = mv64x60_shift_left,
-               .map_to_field           = mv64x60_shift_right,
-               .extra                  = 9 },
-       [MV64x60_CPU2PCI0_MEM_0_WIN] = {
-               .base_reg               = MV64x60_CPU2PCI0_MEM_0_BASE,
-               .size_reg               = MV64x60_CPU2PCI0_MEM_0_SIZE,
-               .base_bits              = 16,
-               .size_bits              = 16,
-               .get_from_field         = mv64x60_shift_left,
-               .map_to_field           = mv64x60_shift_right,
-               .extra                  = 10 },
-       [MV64x60_CPU2PCI0_MEM_1_WIN] = {
-               .base_reg               = MV64x60_CPU2PCI0_MEM_1_BASE,
-               .size_reg               = MV64x60_CPU2PCI0_MEM_1_SIZE,
-               .base_bits              = 16,
-               .size_bits              = 16,
-               .get_from_field         = mv64x60_shift_left,
-               .map_to_field           = mv64x60_shift_right,
-               .extra                  = 11 },
-       [MV64x60_CPU2PCI0_MEM_2_WIN] = {
-               .base_reg               = MV64x60_CPU2PCI0_MEM_2_BASE,
-               .size_reg               = MV64x60_CPU2PCI0_MEM_2_SIZE,
-               .base_bits              = 16,
-               .size_bits              = 16,
-               .get_from_field         = mv64x60_shift_left,
-               .map_to_field           = mv64x60_shift_right,
-               .extra                  = 12 },
-       [MV64x60_CPU2PCI0_MEM_3_WIN] = {
-               .base_reg               = MV64x60_CPU2PCI0_MEM_3_BASE,
-               .size_reg               = MV64x60_CPU2PCI0_MEM_3_SIZE,
-               .base_bits              = 16,
-               .size_bits              = 16,
-               .get_from_field         = mv64x60_shift_left,
-               .map_to_field           = mv64x60_shift_right,
-               .extra                  = 13 },
-       /* CPU->PCI 1 Windows */
-       [MV64x60_CPU2PCI1_IO_WIN] = {
-               .base_reg               = MV64x60_CPU2PCI1_IO_BASE,
-               .size_reg               = MV64x60_CPU2PCI1_IO_SIZE,
-               .base_bits              = 16,
-               .size_bits              = 16,
-               .get_from_field         = mv64x60_shift_left,
-               .map_to_field           = mv64x60_shift_right,
-               .extra                  = 14 },
-       [MV64x60_CPU2PCI1_MEM_0_WIN] = {
-               .base_reg               = MV64x60_CPU2PCI1_MEM_0_BASE,
-               .size_reg               = MV64x60_CPU2PCI1_MEM_0_SIZE,
-               .base_bits              = 16,
-               .size_bits              = 16,
-               .get_from_field         = mv64x60_shift_left,
-               .map_to_field           = mv64x60_shift_right,
-               .extra                  = 15 },
-       [MV64x60_CPU2PCI1_MEM_1_WIN] = {
-               .base_reg               = MV64x60_CPU2PCI1_MEM_1_BASE,
-               .size_reg               = MV64x60_CPU2PCI1_MEM_1_SIZE,
-               .base_bits              = 16,
-               .size_bits              = 16,
-               .get_from_field         = mv64x60_shift_left,
-               .map_to_field           = mv64x60_shift_right,
-               .extra                  = 16 },
-       [MV64x60_CPU2PCI1_MEM_2_WIN] = {
-               .base_reg               = MV64x60_CPU2PCI1_MEM_2_BASE,
-               .size_reg               = MV64x60_CPU2PCI1_MEM_2_SIZE,
-               .base_bits              = 16,
-               .size_bits              = 16,
-               .get_from_field         = mv64x60_shift_left,
-               .map_to_field           = mv64x60_shift_right,
-               .extra                  = 17 },
-       [MV64x60_CPU2PCI1_MEM_3_WIN] = {
-               .base_reg               = MV64x60_CPU2PCI1_MEM_3_BASE,
-               .size_reg               = MV64x60_CPU2PCI1_MEM_3_SIZE,
-               .base_bits              = 16,
-               .size_bits              = 16,
-               .get_from_field         = mv64x60_shift_left,
-               .map_to_field           = mv64x60_shift_right,
-               .extra                  = 18 },
-       /* CPU->SRAM Window */
-       [MV64x60_CPU2SRAM_WIN] = {
-               .base_reg               = MV64360_CPU2SRAM_BASE,
-               .size_reg               = 0,
-               .base_bits              = 16,
-               .size_bits              = 0,
-               .get_from_field         = mv64x60_shift_left,
-               .map_to_field           = mv64x60_shift_right,
-               .extra                  = 19 },
-       /* CPU->PCI 0 Remap I/O Window */
-       [MV64x60_CPU2PCI0_IO_REMAP_WIN] = {
-               .base_reg               = MV64x60_CPU2PCI0_IO_REMAP,
-               .size_reg               = 0,
-               .base_bits              = 16,
-               .size_bits              = 0,
-               .get_from_field         = mv64x60_shift_left,
-               .map_to_field           = mv64x60_shift_right,
-               .extra                  = 0 },
-       /* CPU->PCI 1 Remap I/O Window */
-       [MV64x60_CPU2PCI1_IO_REMAP_WIN] = {
-               .base_reg               = MV64x60_CPU2PCI1_IO_REMAP,
-               .size_reg               = 0,
-               .base_bits              = 16,
-               .size_bits              = 0,
-               .get_from_field         = mv64x60_shift_left,
-               .map_to_field           = mv64x60_shift_right,
-               .extra                  = 0 },
-       /* CPU Memory Protection Windows */
-       [MV64x60_CPU_PROT_0_WIN] = {
-               .base_reg               = MV64x60_CPU_PROT_BASE_0,
-               .size_reg               = MV64x60_CPU_PROT_SIZE_0,
-               .base_bits              = 16,
-               .size_bits              = 16,
-               .get_from_field         = mv64x60_shift_left,
-               .map_to_field           = mv64x60_shift_right,
-               .extra                  = 0x80000000 | 31 },
-       [MV64x60_CPU_PROT_1_WIN] = {
-               .base_reg               = MV64x60_CPU_PROT_BASE_1,
-               .size_reg               = MV64x60_CPU_PROT_SIZE_1,
-               .base_bits              = 16,
-               .size_bits              = 16,
-               .get_from_field         = mv64x60_shift_left,
-               .map_to_field           = mv64x60_shift_right,
-               .extra                  = 0x80000000 | 31 },
-       [MV64x60_CPU_PROT_2_WIN] = {
-               .base_reg               = MV64x60_CPU_PROT_BASE_2,
-               .size_reg               = MV64x60_CPU_PROT_SIZE_2,
-               .base_bits              = 16,
-               .size_bits              = 16,
-               .get_from_field         = mv64x60_shift_left,
-               .map_to_field           = mv64x60_shift_right,
-               .extra                  = 0x80000000 | 31 },
-       [MV64x60_CPU_PROT_3_WIN] = {
-               .base_reg               = MV64x60_CPU_PROT_BASE_3,
-               .size_reg               = MV64x60_CPU_PROT_SIZE_3,
-               .base_bits              = 16,
-               .size_bits              = 16,
-               .get_from_field         = mv64x60_shift_left,
-               .map_to_field           = mv64x60_shift_right,
-               .extra                  = 0x80000000 | 31 },
-       /* CPU Snoop Windows -- don't exist on 64360 */
-       /* PCI 0->System Memory Remap Windows */
-       [MV64x60_PCI02MEM_REMAP_0_WIN] = {
-               .base_reg               = MV64x60_PCI0_SLAVE_MEM_0_REMAP,
-               .size_reg               = 0,
-               .base_bits              = 16,
-               .size_bits              = 0,
-               .get_from_field         = mv64x60_mask,
-               .map_to_field           = mv64x60_mask,
-               .extra                  = 0 },
-       [MV64x60_PCI02MEM_REMAP_1_WIN] = {
-               .base_reg               = MV64x60_PCI0_SLAVE_MEM_1_REMAP,
-               .size_reg               = 0,
-               .base_bits              = 16,
-               .size_bits              = 0,
-               .get_from_field         = mv64x60_mask,
-               .map_to_field           = mv64x60_mask,
-               .extra                  = 0 },
-       [MV64x60_PCI02MEM_REMAP_2_WIN] = {
-               .base_reg               = MV64x60_PCI0_SLAVE_MEM_1_REMAP,
-               .size_reg               = 0,
-               .base_bits              = 16,
-               .size_bits              = 0,
-               .get_from_field         = mv64x60_mask,
-               .map_to_field           = mv64x60_mask,
-               .extra                  = 0 },
-       [MV64x60_PCI02MEM_REMAP_3_WIN] = {
-               .base_reg               = MV64x60_PCI0_SLAVE_MEM_1_REMAP,
-               .size_reg               = 0,
-               .base_bits              = 16,
-               .size_bits              = 0,
-               .get_from_field         = mv64x60_mask,
-               .map_to_field           = mv64x60_mask,
-               .extra                  = 0 },
-       /* PCI 1->System Memory Remap Windows */
-       [MV64x60_PCI12MEM_REMAP_0_WIN] = {
-               .base_reg               = MV64x60_PCI1_SLAVE_MEM_0_REMAP,
-               .size_reg               = 0,
-               .base_bits              = 16,
-               .size_bits              = 0,
-               .get_from_field         = mv64x60_mask,
-               .map_to_field           = mv64x60_mask,
-               .extra                  = 0 },
-       [MV64x60_PCI12MEM_REMAP_1_WIN] = {
-               .base_reg               = MV64x60_PCI1_SLAVE_MEM_1_REMAP,
-               .size_reg               = 0,
-               .base_bits              = 16,
-               .size_bits              = 0,
-               .get_from_field         = mv64x60_mask,
-               .map_to_field           = mv64x60_mask,
-               .extra                  = 0 },
-       [MV64x60_PCI12MEM_REMAP_2_WIN] = {
-               .base_reg               = MV64x60_PCI1_SLAVE_MEM_1_REMAP,
-               .size_reg               = 0,
-               .base_bits              = 16,
-               .size_bits              = 0,
-               .get_from_field         = mv64x60_mask,
-               .map_to_field           = mv64x60_mask,
-               .extra                  = 0 },
-       [MV64x60_PCI12MEM_REMAP_3_WIN] = {
-               .base_reg               = MV64x60_PCI1_SLAVE_MEM_1_REMAP,
-               .size_reg               = 0,
-               .base_bits              = 16,
-               .size_bits              = 0,
-               .get_from_field         = mv64x60_mask,
-               .map_to_field           = mv64x60_mask,
-               .extra                  = 0 },
-};
-
-static mv64x60_64bit_window_t mv64360_64bit_windows[MV64x60_64BIT_WIN_COUNT]
-                                                               __initdata = {
-       /* CPU->PCI 0 MEM Remap Windows */
-       [MV64x60_CPU2PCI0_MEM_0_REMAP_WIN] = {
-               .base_hi_reg            = MV64x60_CPU2PCI0_MEM_0_REMAP_HI,
-               .base_lo_reg            = MV64x60_CPU2PCI0_MEM_0_REMAP_LO,
-               .size_reg               = 0,
-               .base_lo_bits           = 16,
-               .size_bits              = 0,
-               .get_from_field         = mv64x60_shift_left,
-               .map_to_field           = mv64x60_shift_right,
-               .extra                  = 0 },
-       [MV64x60_CPU2PCI0_MEM_1_REMAP_WIN] = {
-               .base_hi_reg            = MV64x60_CPU2PCI0_MEM_1_REMAP_HI,
-               .base_lo_reg            = MV64x60_CPU2PCI0_MEM_1_REMAP_LO,
-               .size_reg               = 0,
-               .base_lo_bits           = 16,
-               .size_bits              = 0,
-               .get_from_field         = mv64x60_shift_left,
-               .map_to_field           = mv64x60_shift_right,
-               .extra                  = 0 },
-       [MV64x60_CPU2PCI0_MEM_2_REMAP_WIN] = {
-               .base_hi_reg            = MV64x60_CPU2PCI0_MEM_2_REMAP_HI,
-               .base_lo_reg            = MV64x60_CPU2PCI0_MEM_2_REMAP_LO,
-               .size_reg               = 0,
-               .base_lo_bits           = 16,
-               .size_bits              = 0,
-               .get_from_field         = mv64x60_shift_left,
-               .map_to_field           = mv64x60_shift_right,
-               .extra                  = 0 },
-       [MV64x60_CPU2PCI0_MEM_3_REMAP_WIN] = {
-               .base_hi_reg            = MV64x60_CPU2PCI0_MEM_3_REMAP_HI,
-               .base_lo_reg            = MV64x60_CPU2PCI0_MEM_3_REMAP_LO,
-               .size_reg               = 0,
-               .base_lo_bits           = 16,
-               .size_bits              = 0,
-               .get_from_field         = mv64x60_shift_left,
-               .map_to_field           = mv64x60_shift_right,
-               .extra                  = 0 },
-       /* CPU->PCI 1 MEM Remap Windows */
-       [MV64x60_CPU2PCI1_MEM_0_REMAP_WIN] = {
-               .base_hi_reg            = MV64x60_CPU2PCI1_MEM_0_REMAP_HI,
-               .base_lo_reg            = MV64x60_CPU2PCI1_MEM_0_REMAP_LO,
-               .size_reg               = 0,
-               .base_lo_bits           = 16,
-               .size_bits              = 0,
-               .get_from_field         = mv64x60_shift_left,
-               .map_to_field           = mv64x60_shift_right,
-               .extra                  = 0 },
-       [MV64x60_CPU2PCI1_MEM_1_REMAP_WIN] = {
-               .base_hi_reg            = MV64x60_CPU2PCI1_MEM_1_REMAP_HI,
-               .base_lo_reg            = MV64x60_CPU2PCI1_MEM_1_REMAP_LO,
-               .size_reg               = 0,
-               .base_lo_bits           = 16,
-               .size_bits              = 0,
-               .get_from_field         = mv64x60_shift_left,
-               .map_to_field           = mv64x60_shift_right,
-               .extra                  = 0 },
-       [MV64x60_CPU2PCI1_MEM_2_REMAP_WIN] = {
-               .base_hi_reg            = MV64x60_CPU2PCI1_MEM_2_REMAP_HI,
-               .base_lo_reg            = MV64x60_CPU2PCI1_MEM_2_REMAP_LO,
-               .size_reg               = 0,
-               .base_lo_bits           = 16,
-               .size_bits              = 0,
-               .get_from_field         = mv64x60_shift_left,
-               .map_to_field           = mv64x60_shift_right,
-               .extra                  = 0 },
-       [MV64x60_CPU2PCI1_MEM_3_REMAP_WIN] = {
-               .base_hi_reg            = MV64x60_CPU2PCI1_MEM_3_REMAP_HI,
-               .base_lo_reg            = MV64x60_CPU2PCI1_MEM_3_REMAP_LO,
-               .size_reg               = 0,
-               .base_lo_bits           = 16,
-               .size_bits              = 0,
-               .get_from_field         = mv64x60_shift_left,
-               .map_to_field           = mv64x60_shift_right,
-               .extra                  = 0 },
-       /* PCI 0->MEM Access Control Windows */
-       [MV64x60_PCI02MEM_ACC_CNTL_0_WIN] = {
-               .base_hi_reg            = MV64x60_PCI0_ACC_CNTL_0_BASE_HI,
-               .base_lo_reg            = MV64x60_PCI0_ACC_CNTL_0_BASE_LO,
-               .size_reg               = MV64x60_PCI0_ACC_CNTL_0_SIZE,
-               .base_lo_bits           = 20,
-               .size_bits              = 20,
-               .get_from_field         = mv64x60_mask,
-               .map_to_field           = mv64x60_mask,
-               .extra                  = 0x80000000 | 0 },
-       [MV64x60_PCI02MEM_ACC_CNTL_1_WIN] = {
-               .base_hi_reg            = MV64x60_PCI0_ACC_CNTL_1_BASE_HI,
-               .base_lo_reg            = MV64x60_PCI0_ACC_CNTL_1_BASE_LO,
-               .size_reg               = MV64x60_PCI0_ACC_CNTL_1_SIZE,
-               .base_lo_bits           = 20,
-               .size_bits              = 20,
-               .get_from_field         = mv64x60_mask,
-               .map_to_field           = mv64x60_mask,
-               .extra                  = 0x80000000 | 0 },
-       [MV64x60_PCI02MEM_ACC_CNTL_2_WIN] = {
-               .base_hi_reg            = MV64x60_PCI0_ACC_CNTL_2_BASE_HI,
-               .base_lo_reg            = MV64x60_PCI0_ACC_CNTL_2_BASE_LO,
-               .size_reg               = MV64x60_PCI0_ACC_CNTL_2_SIZE,
-               .base_lo_bits           = 20,
-               .size_bits              = 20,
-               .get_from_field         = mv64x60_mask,
-               .map_to_field           = mv64x60_mask,
-               .extra                  = 0x80000000 | 0 },
-       [MV64x60_PCI02MEM_ACC_CNTL_3_WIN] = {
-               .base_hi_reg            = MV64x60_PCI0_ACC_CNTL_3_BASE_HI,
-               .base_lo_reg            = MV64x60_PCI0_ACC_CNTL_3_BASE_LO,
-               .size_reg               = MV64x60_PCI0_ACC_CNTL_3_SIZE,
-               .base_lo_bits           = 20,
-               .size_bits              = 20,
-               .get_from_field         = mv64x60_mask,
-               .map_to_field           = mv64x60_mask,
-               .extra                  = 0x80000000 | 0 },
-       /* PCI 1->MEM Access Control Windows */
-       [MV64x60_PCI12MEM_ACC_CNTL_0_WIN] = {
-               .base_hi_reg            = MV64x60_PCI1_ACC_CNTL_0_BASE_HI,
-               .base_lo_reg            = MV64x60_PCI1_ACC_CNTL_0_BASE_LO,
-               .size_reg               = MV64x60_PCI1_ACC_CNTL_0_SIZE,
-               .base_lo_bits           = 20,
-               .size_bits              = 20,
-               .get_from_field         = mv64x60_mask,
-               .map_to_field           = mv64x60_mask,
-               .extra                  = 0x80000000 | 0 },
-       [MV64x60_PCI12MEM_ACC_CNTL_1_WIN] = {
-               .base_hi_reg            = MV64x60_PCI1_ACC_CNTL_1_BASE_HI,
-               .base_lo_reg            = MV64x60_PCI1_ACC_CNTL_1_BASE_LO,
-               .size_reg               = MV64x60_PCI1_ACC_CNTL_1_SIZE,
-               .base_lo_bits           = 20,
-               .size_bits              = 20,
-               .get_from_field         = mv64x60_mask,
-               .map_to_field           = mv64x60_mask,
-               .extra                  = 0x80000000 | 0 },
-       [MV64x60_PCI12MEM_ACC_CNTL_2_WIN] = {
-               .base_hi_reg            = MV64x60_PCI1_ACC_CNTL_2_BASE_HI,
-               .base_lo_reg            = MV64x60_PCI1_ACC_CNTL_2_BASE_LO,
-               .size_reg               = MV64x60_PCI1_ACC_CNTL_2_SIZE,
-               .base_lo_bits           = 20,
-               .size_bits              = 20,
-               .get_from_field         = mv64x60_mask,
-               .map_to_field           = mv64x60_mask,
-               .extra                  = 0x80000000 | 0 },
-       [MV64x60_PCI12MEM_ACC_CNTL_3_WIN] = {
-               .base_hi_reg            = MV64x60_PCI1_ACC_CNTL_3_BASE_HI,
-               .base_lo_reg            = MV64x60_PCI1_ACC_CNTL_3_BASE_LO,
-               .size_reg               = MV64x60_PCI1_ACC_CNTL_3_SIZE,
-               .base_lo_bits           = 20,
-               .size_bits              = 20,
-               .get_from_field         = mv64x60_mask,
-               .map_to_field           = mv64x60_mask,
-               .extra                  = 0x80000000 | 0 },
-       /* PCI 0->MEM Snoop Windows -- don't exist on 64360 */
-       /* PCI 1->MEM Snoop Windows -- don't exist on 64360 */
-};
-
-static mv64x60_chip_info_t mv64360_ci __initdata = {
-       .translate_size         = mv64360_translate_size,
-       .untranslate_size       = mv64360_untranslate_size,
-       .set_pci2mem_window     = mv64360_set_pci2mem_window,
-       .is_enabled_32bit       = mv64360_is_enabled_32bit,
-       .enable_window_32bit    = mv64360_enable_window_32bit,
-       .disable_window_32bit   = mv64360_disable_window_32bit,
-       .enable_window_64bit    = mv64360_enable_window_64bit,
-       .disable_window_64bit   = mv64360_disable_window_64bit,
-       .disable_all_windows    = mv64360_disable_all_windows,
-       .chip_specific_init     = mv64360_chip_specific_init,
-       .window_tab_32bit       = mv64360_32bit_windows,
-       .window_tab_64bit       = mv64360_64bit_windows,
-};
-
-static mv64x60_chip_info_t mv64460_ci __initdata = {
-       .translate_size         = mv64360_translate_size,
-       .untranslate_size       = mv64360_untranslate_size,
-       .set_pci2mem_window     = mv64360_set_pci2mem_window,
-       .is_enabled_32bit       = mv64360_is_enabled_32bit,
-       .enable_window_32bit    = mv64360_enable_window_32bit,
-       .disable_window_32bit   = mv64360_disable_window_32bit,
-       .enable_window_64bit    = mv64360_enable_window_64bit,
-       .disable_window_64bit   = mv64360_disable_window_64bit,
-       .disable_all_windows    = mv64360_disable_all_windows,
-       .chip_specific_init     = mv64460_chip_specific_init,
-       .window_tab_32bit       = mv64360_32bit_windows,
-       .window_tab_64bit       = mv64360_64bit_windows,
-};
-
-
-/*
- *****************************************************************************
- *
- *     Bridge Initialization Routines
- *
- *****************************************************************************
- */
-/*
- * mv64x60_init()
- *
- * Initialze the bridge based on setting passed in via 'si'.  The bridge
- * handle, 'bh', will be set so that it can be used to make subsequent
- * calls to routines in this file.
- */
-int __init
-mv64x60_init(mv64x60_handle_t *bh, mv64x60_setup_info_t *si)
-{
-       u32     mem_windows[MV64x60_CPU2MEM_WINDOWS][2];
-       int     rc = 0;
-
-       if (ppc_md.progress)
-               ppc_md.progress("mv64x60_init: Enter", 0x0);
-
-       mv64x60_early_init(bh, si);
-       mv64x60_alloc_hoses(bh, si); /* Allocate pci hose structures */
-       if (mv64x60_get_type(bh))
-               return -1;
-
-       if (mv64x60_setup_for_chip(bh) != 0) {
-               iounmap((void *)bh->v_base);
-
-               if (ppc_md.progress)
-                       ppc_md.progress("mv64x60_init: Exit--error", 0x0);
-               return -1;
-       }
-
-       bh->ci->disable_all_windows(bh, si); /* Disable windows except mem ctlr */
-       mv64x60_config_cpu2pci_windows(bh, si); /* Init CPU->PCI windows */
-       mv64x60_get_mem_windows(bh, mem_windows); /* Read mem ctlr regs */
-       mv64x60_config_cpu2mem_windows(bh, si, mem_windows); /* CPU->MEM setup*/
-       mv64x60_config_pci2mem_windows(bh, si, mem_windows); /* PCI->Sys MEM */
-       mv64x60_init_hoses(bh, si); /* Init hose structs & PCI params */
-       bh->ci->chip_specific_init(bh, si);
-       mv64x60_enumerate_buses(bh, si); /* Enumerate PCI buses */
-       ocp_for_each_device(mv64x60_fixup_ocp, (void *)bh);
-
-       if (ppc_md.progress)
-               ppc_md.progress("mv64x60_init: Exit", 0x0);
-
-       return rc;
-} /* mv64x60_init() */
-
-/*
- *****************************************************************************
- *
- *     Pre-Bridge-Init Routines (Externally Visible)
- *
- *****************************************************************************
- */
-/*
- * mv64x60_get_mem_size()
- *
- * Calculate the amount of memory that the memory controller is set up for.
- * This should only be used by board-specific code if there is no other
- * way to determine the amount of memory in the system.
- */
-u32 __init
-mv64x60_get_mem_size(u32 bridge_base, u32 chip_type)
-{
-       mv64x60_handle_t        bh;
-       u32                     mem_windows[MV64x60_CPU2MEM_WINDOWS][2];
-
-       memset(&bh, 0, sizeof(bh));
-
-       bh.type = chip_type;
-       bh.p_base = bridge_base;
-       bh.v_base = bridge_base;
-
-       (void)mv64x60_setup_for_chip(&bh);
-       mv64x60_get_mem_windows(&bh, mem_windows);
-       return mv64x60_calc_mem_size(&bh, mem_windows);
-}
-
-/*
- *****************************************************************************
- *
- *     Window Config Routines (Externally Visible)
- *
- *****************************************************************************
- */
-/*
- * mv64x60_get_32bit_window()
- *
- * Determine the base address and size of a 32-bit window on the bridge.
- */
-void __init
-mv64x60_get_32bit_window(mv64x60_handle_t *bh, u32 window, u32 *base, u32 *size)
-{
-       u32     val, base_reg, size_reg, base_bits, size_bits;
-       u32     (*get_from_field)(u32 val, u32 num_bits);
-
-       base_reg  = bh->ci->window_tab_32bit[window].base_reg;
-
-       if (base_reg != 0) {
-               size_reg  = bh->ci->window_tab_32bit[window].size_reg;
-               base_bits = bh->ci->window_tab_32bit[window].base_bits;
-               size_bits = bh->ci->window_tab_32bit[window].size_bits;
-               get_from_field= bh->ci->window_tab_32bit[window].get_from_field;
-
-               val = mv64x60_read(bh, base_reg);
-               *base = get_from_field(val, base_bits);
-
-               if (size_reg != 0) {
-                       val = mv64x60_read(bh, size_reg);
-                       val = get_from_field(val, size_bits);
-                       *size = bh->ci->untranslate_size(*base, val, size_bits);
-               }
-               else {
-                       *size = 0;
-               }
-       }
-       else {
-               *base = 0;
-               *size = 0;
-       }
-
-       DBG("get 32bit window: %d, base: 0x%x, size: 0x%x\n",
-               window, *base, *size);
-
-       return;
-}
-
-/*
- * mv64x60_set_32bit_window()
- *
- * Set the base address and size of a 32-bit window on the bridge.
- */
-void __init
-mv64x60_set_32bit_window(mv64x60_handle_t *bh, u32 window, u32 base, u32 size,
-                                                               u32 other_bits)
-{
-       u32     val, base_reg, size_reg, base_bits, size_bits;
-       u32     (*map_to_field)(u32 val, u32 num_bits);
-
-       DBG("set 32bit window: %d, base: 0x%x, size: 0x%x, other: 0x%x\n",
-               window, base, size, other_bits);
-
-       base_reg  = bh->ci->window_tab_32bit[window].base_reg;
-
-       if (base_reg != 0) {
-               size_reg  = bh->ci->window_tab_32bit[window].size_reg;
-               base_bits = bh->ci->window_tab_32bit[window].base_bits;
-               size_bits = bh->ci->window_tab_32bit[window].size_bits;
-               map_to_field = bh->ci->window_tab_32bit[window].map_to_field;
-
-               val = map_to_field(base, base_bits) | other_bits;
-               mv64x60_write(bh, base_reg, val);
-
-               if (size_reg != 0) {
-                       val = bh->ci->translate_size(base, size, size_bits);
-                       val = map_to_field(val, size_bits);
-                       mv64x60_write(bh, size_reg, val);
-               }
-               (void)mv64x60_read(bh, base_reg); /* Flush FIFO */
-       }
-
-       return;
-}
-
-/*
- * mv64x60_get_64bit_window()
- *
- * Determine the base address and size of a 64-bit window on the bridge.
- */
-void __init
-mv64x60_get_64bit_window(mv64x60_handle_t *bh, u32 window, u32 *base_hi,
-                                                       u32 *base_lo, u32 *size)
-{
-       u32     val, base_lo_reg, size_reg, base_lo_bits, size_bits;
-       u32     (*get_from_field)(u32 val, u32 num_bits);
-
-       base_lo_reg = bh->ci->window_tab_64bit[window].base_lo_reg;
-
-       if (base_lo_reg != 0) {
-               size_reg = bh->ci->window_tab_64bit[window].size_reg;
-               base_lo_bits = bh->ci->window_tab_64bit[window].base_lo_bits;
-               size_bits = bh->ci->window_tab_64bit[window].size_bits;
-               get_from_field= bh->ci->window_tab_64bit[window].get_from_field;
-
-               *base_hi = mv64x60_read(bh, 
-                       bh->ci->window_tab_64bit[window].base_hi_reg);
-
-               val = mv64x60_read(bh, base_lo_reg);
-               *base_lo = get_from_field(val, base_lo_bits);
-
-               if (size_reg != 0) {
-                       val = mv64x60_read(bh, size_reg);
-                       val = get_from_field(val, size_bits);
-                       *size = bh->ci->untranslate_size(*base_lo, val,
-                                                               size_bits);
-               }
-               else {
-                       *size = 0;
-               }
-       }
-       else {
-               *base_hi = 0;
-               *base_lo = 0;
-               *size = 0;
-       }
-
-       DBG("get 64bit window: %d, base hi: 0x%x, base lo: 0x%x, size: 0x%x\n",
-               window, *base_hi, *base_lo, *size);
-
-       return;
-}
-
-/*
- * mv64x60_set_64bit_window()
- *
- * Set the base address and size of a 64-bit window on the bridge.
- */
-void __init
-mv64x60_set_64bit_window(mv64x60_handle_t *bh, u32 window,
-                       u32 base_hi, u32 base_lo, u32 size, u32 other_bits)
-{
-       u32     val, base_lo_reg, size_reg, base_lo_bits, size_bits;
-       u32     (*map_to_field)(u32 val, u32 num_bits);
-
-       DBG("set 64bit window: %d, base hi: 0x%x, base lo: 0x%x, " \
-               "size: 0x%x, other: 0x%x\n",
-               window, base_hi, base_lo, size, other_bits);
-
-       base_lo_reg = bh->ci->window_tab_64bit[window].base_lo_reg;
-
-       if (base_lo_reg != 0) {
-               size_reg = bh->ci->window_tab_64bit[window].size_reg;
-               base_lo_bits = bh->ci->window_tab_64bit[window].base_lo_bits;
-               size_bits = bh->ci->window_tab_64bit[window].size_bits;
-               map_to_field = bh->ci->window_tab_64bit[window].map_to_field;
-
-               mv64x60_write(bh, bh->ci->window_tab_64bit[window].base_hi_reg,
-                       base_hi);
-
-               val = map_to_field(base_lo, base_lo_bits) | other_bits;
-               mv64x60_write(bh, base_lo_reg, val);
-
-               if (size_reg != 0) {
-                       val = bh->ci->translate_size(base_lo, size, size_bits);
-                       val = map_to_field(val, size_bits);
-                       mv64x60_write(bh, size_reg, val);
-               }
-
-               (void)mv64x60_read(bh, base_lo_reg); /* Flush FIFO */
-       }
-
-       return;
-}
-
-/*
- * mv64x60_mask()
- *
- * Take the high-order 'num_bits' of 'val' & mask off low bits.
- */
-static u32 __init
-mv64x60_mask(u32 val, u32 num_bits)
-{
-       DBG("mask val: 0x%x, num_bits: %d == 0x%x\n", val,
-               num_bits, val & (0xffffffff << (32 - num_bits)));
-
-       return val & (0xffffffff << (32 - num_bits));
-}
-
-/*
- * mv64x60_mask_shift_left()
- *
- * Take the low-order 'num_bits' of 'val', shift left to align at bit 31 (MSB).
- */
-static u32 __init
-mv64x60_shift_left(u32 val, u32 num_bits)
-{
-       DBG("shift left val: 0x%x, num_bits: %d == 0x%x\n", val,
-               num_bits, val << (32 - num_bits));
-
-       return val << (32 - num_bits);
-}
-
-/*
- * mv64x60_shift_right()
- *
- * Take the high-order 'num_bits' of 'val', shift right to align at bit 0 (LSB).
- */
-static u32 __init
-mv64x60_shift_right(u32 val, u32 num_bits)
-{
-       DBG("shift right val: 0x%x, num_bits: %d == 0x%x\n", val, num_bits,
-               val >> (32 - num_bits));
-
-       return val >> (32 - num_bits);
-}
-
-/*
- *****************************************************************************
- *
- *     Early Init Routines
- *
- *****************************************************************************
- */
-/*
- * mv64x60_early_init()
- *
- * Do some bridge work that must take place before we start messing with
- * the bridge for real.
- */
-static void __init
-mv64x60_early_init(mv64x60_handle_t *bh, mv64x60_setup_info_t *si)
-{
-       memset(bh, 0, sizeof(*bh));
-
-       bh->p_base = si->phys_reg_base;
-       bh->v_base = (u32)ioremap(bh->p_base, MV64x60_INTERNAL_SPACE_SIZE);
-       bh->base_irq = si->base_irq;
-
-       /* Bit 12 MUST be 0; set bit 27--don't auto-update cpu remap regs */
-       mv64x60_clr_bits(bh, MV64x60_CPU_CONFIG, (1<<12));
-       mv64x60_set_bits(bh, MV64x60_CPU_CONFIG, (1<<27));
-
-       /*
-        * Turn off timer/counters.  Not turning off watchdog timer because
-        * can't read its reg on the 64260A so don't know if we'll be enabling
-        * or disabling.
-        */
-       mv64x60_clr_bits(bh, MV64x60_TIMR_CNTR_0_3_CNTL,
-                       ((1<<0) | (1<<8) | (1<<16) | (1<<24)));
-
-#ifdef CONFIG_GT64260
-       mv64x60_clr_bits(bh, GT64260_TIMR_CNTR_4_7_CNTL,
-                       ((1<<0) | (1<<8) | (1<<16) | (1<<24)));
-#endif
-
-#if 0
-XXXX Put in PCI_x_RETRY adjustment XXXX
-#endif
-
-       return;
-}
-
-/*
- *****************************************************************************
- *
- *     Chip Identification Routines
- *
- *****************************************************************************
- */
-/*
- * mv64x60_get_type()
- *
- * Determine the type of bridge chip we have.
- */
-static int __init mv64x60_get_type(struct mv64x60_handle *bh)
-{
-       struct pci_controller *hose = bh->hose_a;
-       int pcidev;
-       int devfn;
-       u16 val;
-       u8 save_exclude;
-
-       pcidev = (mv64x60_read(bh, MV64x60_PCI0_P2P_CONFIG) >> 24) & 0xf;
-       devfn = PCI_DEVFN(pcidev, 0); 
-
-       save_exclude = mv64x60_pci_exclude_bridge;
-       mv64x60_pci_exclude_bridge = FALSE;
-
-       /* Sanity check of bridge's Vendor ID */
-       early_read_config_word(hose, 0, devfn, PCI_VENDOR_ID, &val);
-
-       if (val != PCI_VENDOR_ID_MARVELL)
-               return -1;
-
-       /* Figure out the type of Marvell bridge it is */
-       early_read_config_word(hose, 0, devfn, PCI_DEVICE_ID, &val);
-
-       switch (val) {
-       case PCI_DEVICE_ID_MARVELL_GT64260:
-               early_read_config_word(hose, 0, devfn,
-                                      PCI_CLASS_REVISION, &val);
-
-               switch (val & 0xff) {
-               case GT64260_REV_A:
-                       bh->type = MV64x60_TYPE_GT64260A;
-                       break;
-               case GT64260_REV_B:
-                       bh->type = MV64x60_TYPE_GT64260B;
-                       break;
-               }
-               break;
-
-       case PCI_DEVICE_ID_MARVELL_MV64360:
-               /* Marvell won't tell me how to distinguish a 64361 & 64362 */
-               bh->type = MV64x60_TYPE_MV64360;
-               break;
-
-       case PCI_DEVICE_ID_MARVELL_MV64460:
-               bh->type = MV64x60_TYPE_MV64460;
-               break;
-
-       default:
-               printk(KERN_CRIT "Unknown Marvell bridge type %04x\n", val);
-               return -1;
-       }
-
-       mv64x60_pci_exclude_bridge = save_exclude;
-       return 0;
-}
-
-/*
- * mv64x60_setup_for_chip()
- *
- * Set 'bh' to use the proper set of routine for the bridge chip that we have.
- */
-static int __init
-mv64x60_setup_for_chip(mv64x60_handle_t *bh)
-{
-       int     rc = 0;
-
-       /* Set up chip-specific info based on the chip/bridge type */
-       switch(bh->type) {
-               case MV64x60_TYPE_GT64260A:
-                       bh->ci = &gt64260a_ci;
-                       break;
-
-               case MV64x60_TYPE_GT64260B:
-                       bh->ci = &gt64260b_ci;
-                       break;
-
-               case MV64x60_TYPE_MV64360:
-                       bh->ci = &mv64360_ci;
-                       break;
-
-#if 0 /* Marvell won't tell me how to distinguish--MAG */
-               case MV64x60_TYPE_MV64361:
-               case MV64x60_TYPE_MV64362:
-#endif
-               case MV64x60_TYPE_MV64460:
-                       bh->ci = &mv64460_ci;
-                       break;
-
-               case MV64x60_TYPE_INVALID:
-               default:
-                       if (ppc_md.progress)
-                               ppc_md.progress("mv64x60: Unsupported bridge",
-                                                                       0x0);
-                       printk("mv64x60: Unsupported bridge\n");
-                       rc = -1;
-       }
-
-       return rc;
-}
-
-/*
- *****************************************************************************
- *
- *     System Memory Window Related Routines
- *
- *****************************************************************************
- */
-/*
- * mv64x60_get_mem_windows()
- *
- * Get the values in the memory controller & return in the 'mem_windows' array.
- */
-static void __init
-mv64x60_get_mem_windows(mv64x60_handle_t *bh,
-       u32 mem_windows[MV64x60_CPU2MEM_WINDOWS][2])
-{
-       u32     i;
-       u32     windows[] = { MV64x60_CPU2MEM_0_WIN, MV64x60_CPU2MEM_1_WIN,
-                               MV64x60_CPU2MEM_2_WIN, MV64x60_CPU2MEM_3_WIN };
-
-       for (i=0; i<MV64x60_CPU2MEM_WINDOWS; i++) {
-               if (bh->ci->is_enabled_32bit(bh, i)) {
-                       mv64x60_get_32bit_window(bh, windows[i],
-                               &mem_windows[i][0], &mem_windows[i][1]);
-               }
-               else {
-                       mem_windows[i][0] = 0;
-                       mem_windows[i][1] = 0;
-               }
-       }
-
-       return;
-}
-
-/*
- * mv64x60_calc_mem_size()
- *
- * Using the memory controller register values in 'mem_windows', determine
- * how much memory it is set up for.
- */
-static u32 __init
-mv64x60_calc_mem_size(mv64x60_handle_t *bh,
-       u32 mem_windows[MV64x60_CPU2MEM_WINDOWS][2])
-{
-       u32     i, total = 0;
-
-       for (i=0; i<MV64x60_CPU2MEM_WINDOWS; i++) {
-               total += mem_windows[i][1];
-       }
-
-       return total;
-}
-
-/*
- *****************************************************************************
- *
- *     CPU->System MEM Config Routines
- *
- *****************************************************************************
- */
-/*
- * mv64x60_config_cpu2mem_windows()
- *
- * Configure CPU->Memory windows on the bridge.
- */
-static void __init
-mv64x60_config_cpu2mem_windows(mv64x60_handle_t *bh, mv64x60_setup_info_t *si,
-       u32 mem_windows[MV64x60_CPU2MEM_WINDOWS][2])
-{
-       u32     i;
-       u32     prot_windows[] = {
-                       MV64x60_CPU_PROT_0_WIN, MV64x60_CPU_PROT_1_WIN,
-                       MV64x60_CPU_PROT_2_WIN, MV64x60_CPU_PROT_3_WIN };
-       u32     cpu_snoop_windows[] = {
-                       MV64x60_CPU_SNOOP_0_WIN, MV64x60_CPU_SNOOP_1_WIN,
-                       MV64x60_CPU_SNOOP_2_WIN, MV64x60_CPU_SNOOP_3_WIN };
-
-       /* Set CPU protection & snoop windows */
-       for (i=0; i<MV64x60_CPU2MEM_WINDOWS; i++) {
-               if (bh->ci->is_enabled_32bit(bh, i)) {
-                       mv64x60_set_32bit_window(bh, prot_windows[i],
-                               mem_windows[i][0], mem_windows[i][1],
-                               si->cpu_prot_options[i]);
-                       bh->ci->enable_window_32bit(bh, prot_windows[i]);
-
-                       if (bh->ci->window_tab_32bit[cpu_snoop_windows[i]].
-                                                               base_reg != 0) {
-                               mv64x60_set_32bit_window(bh,
-                                       cpu_snoop_windows[i], mem_windows[i][0],
-                                       mem_windows[i][1],
-                                       si->cpu_snoop_options[i]);
-                               bh->ci->enable_window_32bit(bh,
-                                       cpu_snoop_windows[i]);
-                       }
-
-               }
-       }
-
-       return;
-}
-
-/*
- *****************************************************************************
- *
- *     CPU->PCI Config Routines
- *
- *****************************************************************************
- */
-
-/*
- * mv64x60_config_cpu2pci_windows()
- *
- * Configure the CPU->PCI windows on the bridge.
- */
-static void __init
-mv64x60_config_cpu2pci_windows(mv64x60_handle_t *bh, mv64x60_setup_info_t *si)
-{
-       if (ppc_md.progress)
-               ppc_md.progress("mv64x60_config_bridge: Enter", 0x0);
-
-       /*
-        * Set up various parts of the bridge including CPU->PCI windows.
-        * Depending on the board, there may be only one hose that needs to
-        * be set up.
-        */
-       if (si->pci_0.enable_bus) {
-               u32     win_tab[] = { MV64x60_CPU2PCI0_IO_WIN,
-                               MV64x60_CPU2PCI0_MEM_0_WIN,
-                               MV64x60_CPU2PCI0_MEM_1_WIN,
-                               MV64x60_CPU2PCI0_MEM_2_WIN };
-               u32     remap_tab[] = { MV64x60_CPU2PCI0_IO_REMAP_WIN,
-                               MV64x60_CPU2PCI0_MEM_0_REMAP_WIN,
-                               MV64x60_CPU2PCI0_MEM_1_REMAP_WIN,
-                               MV64x60_CPU2PCI0_MEM_2_REMAP_WIN };
-
-               mv64x60_set_cpu2pci_window(bh, &si->pci_0, win_tab, remap_tab);
-       }
-
-       if (si->pci_1.enable_bus) {
-               u32     win_tab[] = { MV64x60_CPU2PCI1_IO_WIN,
-                               MV64x60_CPU2PCI1_MEM_0_WIN,
-                               MV64x60_CPU2PCI1_MEM_1_WIN,
-                               MV64x60_CPU2PCI1_MEM_2_WIN };
-               u32     remap_tab[] = { MV64x60_CPU2PCI1_IO_REMAP_WIN,
-                               MV64x60_CPU2PCI1_MEM_0_REMAP_WIN,
-                               MV64x60_CPU2PCI1_MEM_1_REMAP_WIN,
-                               MV64x60_CPU2PCI1_MEM_2_REMAP_WIN };
-
-               mv64x60_set_cpu2pci_window(bh, &si->pci_1, win_tab, remap_tab);
-       }
-
-       return;
-} /* mv64x60_config_bridge() */
-
-/*
- * mv64x60_set_cpu2pci_window()
- *
- * Configure the CPU->PCI windows for one of the PCI buses.
- */
-static void __init
-mv64x60_set_cpu2pci_window(mv64x60_handle_t *bh, mv64x60_pci_info_t *pi,
-                                               u32 *win_tab, u32 *remap_tab)
-{
-       int     i;
-
-       if (pi->pci_io.size > 0) {
-               mv64x60_set_32bit_window(bh, win_tab[0], pi->pci_io.cpu_base,
-                                       pi->pci_io.size, pi->pci_io.swap);
-               mv64x60_set_32bit_window(bh, remap_tab[0],
-                                       pi->pci_io.pci_base_lo, 0, 0);
-               bh->ci->enable_window_32bit(bh, win_tab[0]);
-       }
-       else { /* Actually, the window should already be disabled */
-               bh->ci->disable_window_32bit(bh, win_tab[0]);
-       }
-
-       for (i=0; i<3; i++) {
-               if (pi->pci_mem[i].size > 0) {
-                       mv64x60_set_32bit_window(bh, win_tab[i+1],
-                               pi->pci_mem[i].cpu_base, pi->pci_mem[i].size,
-                               pi->pci_mem[i].swap);
-                       mv64x60_set_64bit_window(bh, remap_tab[i+1],
-                               pi->pci_mem[i].pci_base_hi,
-                               pi->pci_mem[i].pci_base_lo, 0, 0);
-                       bh->ci->enable_window_32bit(bh, win_tab[i+1]);
-               }
-               else { /* Actually, the window should already be disabled */
-                       bh->ci->disable_window_32bit(bh, win_tab[i+1]);
-               }
-       }
-
-       return;
-}
-
-/*
- *****************************************************************************
- *
- *     PCI->System MEM Config Routines
- *
- *****************************************************************************
- */
-/*
- * mv64x60_config_pci2mem_windows()
- *
- * Configure the PCI->Memory windows on the bridge.
- */
-static void __init
-mv64x60_config_pci2mem_windows(mv64x60_handle_t *bh, mv64x60_setup_info_t *si,
-       u32 mem_windows[MV64x60_CPU2MEM_WINDOWS][2])
-{
-       u32     i;
-       u32     pci_0_acc_windows[] = {
-                       MV64x60_PCI02MEM_ACC_CNTL_0_WIN,
-                       MV64x60_PCI02MEM_ACC_CNTL_1_WIN,
-                       MV64x60_PCI02MEM_ACC_CNTL_2_WIN,
-                       MV64x60_PCI02MEM_ACC_CNTL_3_WIN };
-       u32     pci_1_acc_windows[] = {
-                       MV64x60_PCI12MEM_ACC_CNTL_0_WIN,
-                       MV64x60_PCI12MEM_ACC_CNTL_1_WIN,
-                       MV64x60_PCI12MEM_ACC_CNTL_2_WIN,
-                       MV64x60_PCI12MEM_ACC_CNTL_3_WIN };
-       u32     pci_0_snoop_windows[] = {
-                       MV64x60_PCI02MEM_SNOOP_0_WIN,
-                       MV64x60_PCI02MEM_SNOOP_1_WIN,
-                       MV64x60_PCI02MEM_SNOOP_2_WIN,
-                       MV64x60_PCI02MEM_SNOOP_3_WIN };
-       u32     pci_1_snoop_windows[] = {
-                       MV64x60_PCI12MEM_SNOOP_0_WIN,
-                       MV64x60_PCI12MEM_SNOOP_1_WIN,
-                       MV64x60_PCI12MEM_SNOOP_2_WIN,
-                       MV64x60_PCI12MEM_SNOOP_3_WIN };
-       u32     pci_0_size[] = {
-                       MV64x60_PCI0_MEM_0_SIZE, MV64x60_PCI0_MEM_1_SIZE,
-                       MV64x60_PCI0_MEM_2_SIZE, MV64x60_PCI0_MEM_3_SIZE };
-       u32     pci_1_size[] = {
-                       MV64x60_PCI1_MEM_0_SIZE, MV64x60_PCI1_MEM_1_SIZE,
-                       MV64x60_PCI1_MEM_2_SIZE, MV64x60_PCI1_MEM_3_SIZE };
-
-       /* Clear bit 0 of PCI addr decode control so PCI->CPU remap 1:1 */
-       mv64x60_clr_bits(bh, MV64x60_PCI0_PCI_DECODE_CNTL, 0x00000001);
-       mv64x60_clr_bits(bh, MV64x60_PCI1_PCI_DECODE_CNTL, 0x00000001);
-
-       /*
-        * Set the access control, snoop, BAR size, and window base addresses.
-        * PCI->MEM windows base addresses will match exactly what the
-        * CPU->MEM windows are.
-        */
-       for (i=0; i<MV64x60_CPU2MEM_WINDOWS; i++) {
-               if (bh->ci->is_enabled_32bit(bh, i)) {
-                       if (si->pci_0.enable_bus) {
-                               mv64x60_set_64bit_window(bh,
-                                       pci_0_acc_windows[i], 0,
-                                       mem_windows[i][0], mem_windows[i][1],
-                                       si->pci_0.acc_cntl_options[i]);
-                               bh->ci->enable_window_64bit(bh,
-                                       pci_0_acc_windows[i]);
-
-                               if (bh->ci->window_tab_64bit[
-                                       pci_0_snoop_windows[i]].base_lo_reg
-                                                                       != 0) {
-                                       mv64x60_set_64bit_window(bh,
-                                               pci_0_snoop_windows[i], 0,
-                                               mem_windows[i][0],
-                                               mem_windows[i][1],
-                                               si->pci_0.snoop_options[i]);
-                                       bh->ci->enable_window_64bit(bh,
-                                               pci_0_snoop_windows[i]);
-                               }
-
-                               bh->ci->set_pci2mem_window(bh->hose_a, i,
-                                       mem_windows[i][0]);
-                               mv64x60_write(bh, pci_0_size[i],
-                                       mv64x60_mask(mem_windows[i][1] -1, 20));
-
-                               /* Enable the window */
-                               mv64x60_clr_bits(bh, MV64x60_PCI0_BAR_ENABLE,
-                                                                       1 << i);
-                       }
-                       if (si->pci_1.enable_bus) {
-                               mv64x60_set_64bit_window(bh,
-                                       pci_1_acc_windows[i], 0,
-                                       mem_windows[i][0], mem_windows[i][1],
-                                       si->pci_1.acc_cntl_options[i]);
-                               bh->ci->enable_window_64bit(bh,
-                                       pci_1_acc_windows[i]);
-
-                               if (bh->ci->window_tab_64bit[
-                                       pci_1_snoop_windows[i]].base_lo_reg
-                                                                       != 0) {
-                                       mv64x60_set_64bit_window(bh,
-                                               pci_1_snoop_windows[i], 0,
-                                               mem_windows[i][0],
-                                               mem_windows[i][1],
-                                               si->pci_1.snoop_options[i]);
-                                       bh->ci->enable_window_64bit(bh,
-                                               pci_1_snoop_windows[i]);
-                               }
-
-                               bh->ci->set_pci2mem_window(bh->hose_b, i,
-                                       mem_windows[i][0]);
-                               mv64x60_write(bh, pci_1_size[i],
-                                       mv64x60_mask(mem_windows[i][1] -1, 20));
-
-                               /* Enable the window */
-                               mv64x60_clr_bits(bh, MV64x60_PCI1_BAR_ENABLE,
-                                                                       1 << i);
-                       }
-               }
-       }
-
-       return;
-}
-
-/*
- *****************************************************************************
- *
- *     Hose & Resource Alloc/Init Routines
- *
- *****************************************************************************
- */
-/*
- * mv64x60_alloc_hoses()
- *
- * Allocate the PCI hose structures for the bridge's PCI buses.
- */
-static void __init
-mv64x60_alloc_hoses(mv64x60_handle_t *bh, mv64x60_setup_info_t *si)
-{
-       /*
-        * Alloc first hose struct even when its not to be configured b/c the
-        * chip identification routines need to use it.
-        */
-       bh->hose_a = pcibios_alloc_controller();
-       setup_indirect_pci(bh->hose_a,
-               bh->p_base + MV64x60_PCI0_CONFIG_ADDR,
-               bh->p_base + MV64x60_PCI0_CONFIG_DATA);
-
-       if (si->pci_1.enable_bus) {
-               bh->hose_b = pcibios_alloc_controller();
-               setup_indirect_pci(bh->hose_b,
-                       bh->p_base + MV64x60_PCI1_CONFIG_ADDR,
-                       bh->p_base + MV64x60_PCI1_CONFIG_DATA);
-       }
-
-       return;
-}
-
-/*
- * mv64x60_init_hoses()
- *
- * Initialize the PCI hose structures for the bridge's PCI hoses.
- */
-static void __init
-mv64x60_init_hoses(mv64x60_handle_t *bh, mv64x60_setup_info_t *si)
-{
-       if (si->pci_1.enable_bus) {
-               bh->io_base_b = (u32)ioremap(si->pci_1.pci_io.cpu_base,
-                                                       si->pci_1.pci_io.size);
-               isa_io_base = bh->io_base_b;
-       }
-
-       if (si->pci_0.enable_bus) {
-               bh->io_base_a = (u32)ioremap(si->pci_0.pci_io.cpu_base,
-                                                       si->pci_0.pci_io.size);
-               isa_io_base = bh->io_base_a;
-
-               mv64x60_init_resources(bh->hose_a, &si->pci_0, bh->io_base_a);
-               mv64x60_set_pci_params(bh->hose_a, &si->pci_0);
-       }
-
-       /* Must do here so proper isa_io_base is used in calculations */
-       if (si->pci_1.enable_bus) {
-               mv64x60_init_resources(bh->hose_b, &si->pci_1, bh->io_base_b);
-               mv64x60_set_pci_params(bh->hose_b, &si->pci_1);
-       }
-
-       return;
-}
-
-/*
- * mv64x60_init_resources()
- *
- * Calculate the offsets, etc. for the hose structures to reflect all of
- * the address remapping that happens as you go from CPU->PCI and PCI->MEM.
- */
-static void __init
-mv64x60_init_resources(struct pci_controller *hose, mv64x60_pci_info_t *pi,
-                               u32 io_base)
-{
-       int             i;
-       /* 2 hoses; 4 resources/hose; sting <= 64 bytes; not work if > 1 chip */
-       static char     s[2][4][64];
-
-       if (pi->pci_io.size != 0) {
-               sprintf(s[hose->index][0], "PCI hose %d I/O Space",
-                       hose->index);
-               pci_init_resource(&hose->io_resource, io_base - isa_io_base,
-                       io_base - isa_io_base + pi->pci_io.size - 1,
-                       IORESOURCE_IO, s[hose->index][0]);
-               hose->io_space.start = pi->pci_io.pci_base_lo;
-               hose->io_space.end = pi->pci_io.pci_base_lo + pi->pci_io.size-1;
-               hose->io_base_virt = (void *)isa_io_base;
-       }
-
-       for (i=0; i<3; i++) {
-               if (pi->pci_mem[i].size != 0) {
-                       sprintf(s[hose->index][i+1], "PCI hose %d MEM Space %d",
-                               hose->index, i);
-                       pci_init_resource(&hose->mem_resources[i],
-                               pi->pci_mem[i].cpu_base,
-                               pi->pci_mem[i].cpu_base + pi->pci_mem[i].size-1,
-                               IORESOURCE_MEM, s[hose->index][i+1]);
-               }
-       }
-       
-       hose->mem_space.end = pi->pci_mem[0].pci_base_lo +
-                                               pi->pci_mem[0].size - 1;
-       hose->pci_mem_offset = pi->pci_mem[0].cpu_base -
-                                               pi->pci_mem[0].pci_base_lo;
-
-       return;
-} /* mv64x60_init_resources() */
-
-/*
- * mv64x60_set_pci_params()
- *
- * Configure a hose's PCI config space parameters.
- */
-static void __init
-mv64x60_set_pci_params(struct pci_controller *hose, mv64x60_pci_info_t *pi)
-{
-       u32     devfn;
-       u16     u16_val;
-       u8      save_exclude;
-
-       devfn = PCI_DEVFN(0,0);
-
-       save_exclude = mv64x60_pci_exclude_bridge;
-       mv64x60_pci_exclude_bridge = FALSE;
-
-       /* Set class code to indicate host bridge */
-       u16_val = PCI_CLASS_BRIDGE_HOST; /* 0x0600 (host bridge) */
-       early_write_config_word(hose, 0, devfn, PCI_CLASS_DEVICE, u16_val);
-
-       /* Enable 64260 to be PCI master & respond to PCI MEM cycles */
-       early_read_config_word(hose, 0, devfn, PCI_COMMAND, &u16_val);
-       u16_val &= ~(PCI_COMMAND_IO | PCI_COMMAND_INVALIDATE |
-               PCI_COMMAND_PARITY | PCI_COMMAND_SERR | PCI_COMMAND_FAST_BACK);
-       u16_val |= pi->pci_cmd_bits | PCI_COMMAND_MASTER | PCI_COMMAND_MEMORY;
-       early_write_config_word(hose, 0, devfn, PCI_COMMAND, u16_val);
-
-       /* Set latency timer, cache line size, clear BIST */
-       u16_val = (pi->latency_timer << 8) | (L1_CACHE_LINE_SIZE >> 2);
-       early_write_config_word(hose, 0, devfn, PCI_CACHE_LINE_SIZE, u16_val);
-
-       mv64x60_pci_exclude_bridge = save_exclude;
-       return;
-}
-
-/*
- *****************************************************************************
- *
- *     PCI Related Routine
- *
- *****************************************************************************
- */
-/*
- * mv64x60_enumerate_buses()
- *
- * If requested, enumerate the PCI buses and set the appropriate
- * info in the hose structures.
- */
-static void __init
-mv64x60_enumerate_buses(mv64x60_handle_t *bh, mv64x60_setup_info_t *si)
-{
-       u32     val;
-
-       pci_dram_offset = 0; /* System mem at same addr on PCI & cpu bus */
-
-       ppc_md.pci_exclude_device = mv64x60_pci_exclude_device;
-       ppc_md.pci_swizzle = common_swizzle;
-       ppc_md.pci_map_irq = si->map_irq;
-
-       /* Now that the bridge is set up, its safe to scan the PCI buses */
-       if (si->pci_0.enable_bus) {
-               if (si->pci_0.enumerate_bus) {
-                       /* Set bus number for PCI 0 to 0 */
-                       val = mv64x60_read(bh, MV64x60_PCI0_P2P_CONFIG);
-                       val &= 0xe0000000;
-                       val |= 0x000000ff;
-                       mv64x60_write(bh, MV64x60_PCI0_P2P_CONFIG, val);
-                       /* Flush FIFO*/
-                       (void)mv64x60_read(bh, MV64x60_PCI0_P2P_CONFIG);
-
-#if 0
-XXXX Different if in PCI-X mode (look at mv64360_find_bridges()) XXXX
-#endif
-
-                       bh->hose_a->first_busno = 0;
-                       bh->hose_a->last_busno  = 0xff;
-
-                       bh->hose_a->last_busno = pciauto_bus_scan(bh->hose_a,
-                                               bh->hose_a->first_busno);
-               }
-               else {
-                       /* Assume bridge set up correctly by someone else */
-                       val = mv64x60_read(bh, MV64x60_PCI0_P2P_CONFIG);
-                       bh->hose_a->first_busno = (val & 0x00ff0000) >> 16;
-               }
-       }
-
-       if (si->pci_1.enable_bus) {
-               if (si->pci_1.enumerate_bus) {
-                       if (si->pci_0.enable_bus) {
-                               bh->hose_b->first_busno =
-                                       bh->hose_a->last_busno + 1;
-
-                               /* Set bus number for PCI 1 hose */
-                               val = mv64x60_read(bh, MV64x60_PCI1_P2P_CONFIG);
-                               val &= 0xe0000000;
-                               val |= (bh->hose_b->first_busno << 16) | 0xff;
-                               mv64x60_write(bh, MV64x60_PCI1_P2P_CONFIG, val);
-                               /* Flush FIFO */
-                               (void)mv64x60_read(bh, MV64x60_PCI1_P2P_CONFIG);
-                       }
-                       else {
-                               bh->hose_b->first_busno = 0;
-                       }
-
-                       bh->hose_b->last_busno  = 0xff;
-                       bh->hose_b->last_busno = pciauto_bus_scan(bh->hose_b,
-                                               bh->hose_b->first_busno);
-               }
-               else {
-                       /* Assume bridge set up correctly by someone else */
-                       val = mv64x60_read(bh, MV64x60_PCI1_P2P_CONFIG);
-                       bh->hose_b->first_busno = (val & 0x00ff0000) >> 16;
-                       bh->hose_b->last_busno = 0xff; /* No way to know */
-               }
-       }
-
-       if (si->pci_0.enable_bus && !si->pci_0.enumerate_bus) {
-               if (si->pci_1.enable_bus) {
-                       bh->hose_a->last_busno = bh->hose_b->first_busno - 1;
-               }
-               else {
-                       bh->hose_a->last_busno = 0xff; /* No way to know */
-               }
-       }
-
-       return;
-}
-
-/*
- * mv64x60_exclude_pci_device()
- *
- * This routine is used to make the bridge not appear when the
- * PCI subsystem is accessing PCI devices (in PCI config space).
- */
-static int
-mv64x60_pci_exclude_device(u8 bus, u8 devfn)
-{
-       struct pci_controller   *hose;
-
-       hose = pci_bus_to_hose(bus);
-
-       /* Skip slot 0 on both hoses */
-       if ((mv64x60_pci_exclude_bridge == TRUE) &&
-           (PCI_SLOT(devfn) == 0) &&
-           (hose->first_busno == bus)) {
-               return PCIBIOS_DEVICE_NOT_FOUND;
-       }
-       else {
-               return PCIBIOS_SUCCESSFUL;
-       }
-} /* mv64x60_pci_exclude_device() */
-
-/*
- *****************************************************************************
- *
- *     OCP Fixup Routines
- *
- *****************************************************************************
- */
-/*
- * mv64x60_fixup_ocp()
- *
- * Adjust the 'paddr' field in the bridge's OCP entries to reflect where they
- * really are in the physical address space.
- */
-static void __init
-mv64x60_fixup_ocp(struct ocp_device *dev, void *arg)
-{
-       mv64x60_handle_t        *bh = (mv64x60_handle_t *)arg;
-
-       if (dev->def->vendor == OCP_VENDOR_MARVELL) {
-               dev->def->paddr += bh->p_base;
-       }
-
-       return;
-}
-
-/*
- *****************************************************************************
- *
- *     GT64260-Specific Routines
- *
- *****************************************************************************
- */
-/*
- * gt64260_translate_size()
- *
- * On the GT64260, the size register is really the "top" address of the window.
- */
-static u32 __init
-gt64260_translate_size(u32 base, u32 size, u32 num_bits)
-{
-       return base + mv64x60_mask(size - 1, num_bits);
-}
-
-/*
- * gt64260_untranslate_size()
- *
- * Translate the top address of a window into a window size.
- */
-static u32 __init
-gt64260_untranslate_size(u32 base, u32 size, u32 num_bits)
-{
-       if (size >= base) {
-               size = size - base + (1 << (32 - num_bits));
-       }
-       else {
-               size = 0;
-       }
-
-       return size;
-}
-
-/*
- * gt64260_set_pci2mem_window()
- *
- * The PCI->MEM window registers are actually in PCI config space so need
- * to set them by setting the correct config space BARs.
- */
-static void __init
-gt64260_set_pci2mem_window(struct pci_controller *hose, u32 window, u32 base)
-{
-       u32     reg_addrs[] = { 0x10, 0x14, 0x18, 0x1c };
-
-       DBG("set pci->mem window: %d, hose: %d, base: 0x%x\n", window,
-               hose->index, base);
-
-       early_write_config_dword(hose, hose->first_busno,
-                       PCI_DEVFN(0, 0), reg_addrs[window],
-                       mv64x60_mask(base, 20) | 0x8);
-       return;
-}
-
-/*
- * gt64260_is_enabled_32bit()
- *
- * On a GT64260, a window is enabled iff its top address is >= to its base
- * address.
- */
-static u32 __init
-gt64260_is_enabled_32bit(mv64x60_handle_t *bh, u32 window)
-{
-       u32     rc = 0;
-
-       if ((gt64260_32bit_windows[window].base_reg != 0) &&
-               (gt64260_32bit_windows[window].size_reg != 0) &&
-               ((mv64x60_read(bh, gt64260_32bit_windows[window].size_reg) &
-                       ((1 << gt64260_32bit_windows[window].size_bits) - 1)) >=
-                (mv64x60_read(bh, gt64260_32bit_windows[window].base_reg) &
-                       ((1 << gt64260_32bit_windows[window].base_bits) - 1)))){
-
-               rc = 1;
-       }
-
-       if (rc) {
-               DBG("32bit window %d is enabled\n", window);
-       }
-       else {
-               DBG("32bit window %d is disabled\n", window);
-       }
-
-       return rc;
-}
-
-/*
- * gt64260_enable_window_32bit()
- *
- * On the GT64260, a window is enabled iff the top address is >= to the base
- * address of the window.  Since the window has already been configured by
- * the time this routine is called, we have nothing to do here.
- */
-static void __init
-gt64260_enable_window_32bit(mv64x60_handle_t *bh, u32 window)
-{
-       DBG("enable 32bit window: %d\n", window);
-       return;
-}
-
-/*
- * gt64260_disable_window_32bit()
- *
- * On a GT64260, you disable a window by setting its top address to be less
- * than its base address.
- */
-static void __init
-gt64260_disable_window_32bit(mv64x60_handle_t *bh, u32 window)
-{
-       DBG("disable 32bit window: %d, base_reg: 0x%x, size_reg: 0x%x\n",
-               window, gt64260_32bit_windows[window].base_reg,
-               gt64260_32bit_windows[window].size_reg);
-
-       if ((gt64260_32bit_windows[window].base_reg != 0) &&
-               (gt64260_32bit_windows[window].size_reg != 0)) {
-
-               /* To disable, make bottom reg higher than top reg */
-               mv64x60_write(bh, gt64260_32bit_windows[window].base_reg,0xfff);
-               mv64x60_write(bh, gt64260_32bit_windows[window].size_reg, 0);
-       }
-
-       return;
-}
-
-/*
- * gt64260_enable_window_64bit()
- *
- * On the GT64260, a window is enabled iff the top address is >= to the base
- * address of the window.  Since the window has already been configured by
- * the time this routine is called, we have nothing to do here.
- */
-static void __init
-gt64260_enable_window_64bit(mv64x60_handle_t *bh, u32 window)
-{
-       DBG("enable 64bit window: %d\n", window);
-       return; /* Enabled when window configured (i.e., when top >= base) */
-}
-
-/*
- * gt64260_disable_window_64bit()
- *
- * On a GT64260, you disable a window by setting its top address to be less
- * than its base address.
- */
-static void __init
-gt64260_disable_window_64bit(mv64x60_handle_t *bh, u32 window)
-{
-       DBG("disable 64bit window: %d, base_reg: 0x%x, size_reg: 0x%x\n",
-               window, gt64260_64bit_windows[window].base_lo_reg,
-               gt64260_64bit_windows[window].size_reg);
-
-       if ((gt64260_64bit_windows[window].base_lo_reg != 0) &&
-               (gt64260_64bit_windows[window].size_reg != 0)) {
-
-               /* To disable, make bottom reg higher than top reg */
-               mv64x60_write(bh, gt64260_64bit_windows[window].base_lo_reg,
-                                                                       0xfff);
-               mv64x60_write(bh, gt64260_64bit_windows[window].base_hi_reg, 0);
-               mv64x60_write(bh, gt64260_64bit_windows[window].size_reg, 0);
-       }
-
-       return;
-}
-
-/*
- * gt64260_disable_all_windows()
- *
- * The GT64260 has several windows that aren't represented in the table of
- * windows at the top of this file.  This routine turns all of them off
- * except for the memory controller windows, of course.
- */
-static void __init
-gt64260_disable_all_windows(mv64x60_handle_t *bh, mv64x60_setup_info_t *si)
-{
-       u32     i;
-
-       /* Disable 32bit windows (don't disable cpu->mem windows) */
-       for (i=MV64x60_CPU2DEV_0_WIN; i<MV64x60_32BIT_WIN_COUNT; i++) {
-               if (!(si->window_preserve_mask_32 & (1<<i)))
-                       gt64260_disable_window_32bit(bh, i);
-       }
-
-       /* Disable 64bit windows */
-       for (i=0; i<MV64x60_64BIT_WIN_COUNT; i++) {
-               if (!(si->window_preserve_mask_64 & (1<<i)))
-                       gt64260_disable_window_64bit(bh, i);
-       }
-
-       /* Turn off cpu protection windows not in gt64260_32bit_windows[] */
-       mv64x60_write(bh, GT64260_CPU_PROT_BASE_4, 0xfff);
-       mv64x60_write(bh, GT64260_CPU_PROT_SIZE_4, 0);
-       mv64x60_write(bh, GT64260_CPU_PROT_BASE_5, 0xfff);
-       mv64x60_write(bh, GT64260_CPU_PROT_SIZE_5, 0);
-       mv64x60_write(bh, GT64260_CPU_PROT_BASE_6, 0xfff);
-       mv64x60_write(bh, GT64260_CPU_PROT_SIZE_6, 0);
-       mv64x60_write(bh, GT64260_CPU_PROT_BASE_7, 0xfff);
-       mv64x60_write(bh, GT64260_CPU_PROT_SIZE_7, 0);
-
-       /* Turn off PCI->MEM access cntl wins not in gt64260_64bit_windows[] */
-       mv64x60_write(bh, MV64x60_PCI0_ACC_CNTL_4_BASE_LO, 0xfff);
-       mv64x60_write(bh, MV64x60_PCI0_ACC_CNTL_4_BASE_HI, 0);
-       mv64x60_write(bh, MV64x60_PCI0_ACC_CNTL_4_SIZE, 0);
-       mv64x60_write(bh, MV64x60_PCI0_ACC_CNTL_5_BASE_LO, 0xfff);
-       mv64x60_write(bh, MV64x60_PCI0_ACC_CNTL_5_BASE_HI, 0);
-       mv64x60_write(bh, MV64x60_PCI0_ACC_CNTL_5_SIZE, 0);
-       mv64x60_write(bh, GT64260_PCI0_ACC_CNTL_6_BASE_LO, 0xfff);
-       mv64x60_write(bh, GT64260_PCI0_ACC_CNTL_6_BASE_HI, 0);
-       mv64x60_write(bh, GT64260_PCI0_ACC_CNTL_6_SIZE, 0);
-       mv64x60_write(bh, GT64260_PCI0_ACC_CNTL_7_BASE_LO, 0xfff);
-       mv64x60_write(bh, GT64260_PCI0_ACC_CNTL_7_BASE_HI, 0);
-       mv64x60_write(bh, GT64260_PCI0_ACC_CNTL_7_SIZE, 0);
-
-       mv64x60_write(bh, MV64x60_PCI1_ACC_CNTL_4_BASE_LO, 0xfff);
-       mv64x60_write(bh, MV64x60_PCI1_ACC_CNTL_4_BASE_HI, 0);
-       mv64x60_write(bh, MV64x60_PCI1_ACC_CNTL_4_SIZE, 0);
-       mv64x60_write(bh, MV64x60_PCI1_ACC_CNTL_5_BASE_LO, 0xfff);
-       mv64x60_write(bh, MV64x60_PCI1_ACC_CNTL_5_BASE_HI, 0);
-       mv64x60_write(bh, MV64x60_PCI1_ACC_CNTL_5_SIZE, 0);
-       mv64x60_write(bh, GT64260_PCI1_ACC_CNTL_6_BASE_LO, 0xfff);
-       mv64x60_write(bh, GT64260_PCI1_ACC_CNTL_6_BASE_HI, 0);
-       mv64x60_write(bh, GT64260_PCI1_ACC_CNTL_6_SIZE, 0);
-       mv64x60_write(bh, GT64260_PCI1_ACC_CNTL_7_BASE_LO, 0xfff);
-       mv64x60_write(bh, GT64260_PCI1_ACC_CNTL_7_BASE_HI, 0);
-       mv64x60_write(bh, GT64260_PCI1_ACC_CNTL_7_SIZE, 0);
-
-       /* Disable all PCI-><whatever> windows */
-       mv64x60_set_bits(bh, MV64x60_PCI0_BAR_ENABLE, 0x07ffffff);
-       mv64x60_set_bits(bh, MV64x60_PCI1_BAR_ENABLE, 0x07ffffff);
-
-       return;
-}
-
-/*
- * gt64260a_chip_specific_init()
- *
- * Implement errata work arounds for the GT64260A.
- */
-static void
-gt64260a_chip_specific_init(mv64x60_handle_t *bh, mv64x60_setup_info_t *si)
-{
-       struct ocp_device       *dev;
-       mv64x60_ocp_mpsc_data_t *mpsc_dp;
-       u8                      save_exclude;
-       u32                     val;
-
-       /* R#18 */
-       /* cpu read buffer to buffer 1 (reg 0x0448) */
-       mv64x60_set_bits(bh, GT64260_SDRAM_CONFIG, (1<<26));
-
-       /* No longer errata so turn on */
-       /* Enable pci read/write combine, master write trigger,
-       * disable slave sync barrier
-       * readmultiple (reg 0x0c00 and 0x0c80)
-       */
-       if (si->pci_0.enable_bus) {
-               mv64x60_set_bits(bh, MV64x60_PCI0_CMD,
-                       ((1<<4) | (1<<5) | (1<<9) | (1<<13)));
-       }
-
-       if (si->pci_1.enable_bus) {
-               mv64x60_set_bits(bh, MV64x60_PCI1_CMD,
-                       ((1<<4) | (1<<5) | (1<<9) | (1<<13)));
-       }
-
-#if 1  /* XXXX */
-       /*
-        * Dave Wilhardt found that bit 4 in the PCI Command registers must
-        * be set if you are using cache coherency.
-        *
-        * Note: he also said that bit 4 must be on in all PCI devices but
-        *       that has not been implemented yet.
-        */
-       save_exclude = mv64x60_pci_exclude_bridge;
-       mv64x60_pci_exclude_bridge = FALSE;
-
-       early_read_config_dword(bh->hose_a,
-                       bh->hose_a->first_busno,
-                       PCI_DEVFN(0,0),
-                       PCI_COMMAND,
-                       &val);
-       val |= PCI_COMMAND_INVALIDATE;
-       early_write_config_dword(bh->hose_a,
-                       bh->hose_a->first_busno,
-                       PCI_DEVFN(0,0),
-                       PCI_COMMAND,
-                       val);
-
-       early_read_config_dword(bh->hose_b,
-                       bh->hose_b->first_busno,
-                       PCI_DEVFN(0,0),
-                       PCI_COMMAND,
-                       &val);
-       val |= PCI_COMMAND_INVALIDATE;
-       early_write_config_dword(bh->hose_b,
-                       bh->hose_b->first_busno,
-                       PCI_DEVFN(0,0),
-                       PCI_COMMAND,
-                       val);
-
-       mv64x60_pci_exclude_bridge = save_exclude;
-#endif
-
-       if ((dev = ocp_find_device(OCP_VENDOR_MARVELL, OCP_FUNC_MPSC, 0))
-                                                               != NULL) {
-               mpsc_dp = (mv64x60_ocp_mpsc_data_t *)dev->def->additions;
-               mpsc_dp->mirror_regs = 1;
-               mpsc_dp->cache_mgmt = 1;
-       }
-
-       if ((dev = ocp_find_device(OCP_VENDOR_MARVELL, OCP_FUNC_MPSC, 1))
-                                                               != NULL) {
-               mpsc_dp = (mv64x60_ocp_mpsc_data_t *)dev->def->additions;
-               mpsc_dp->mirror_regs = 1;
-               mpsc_dp->cache_mgmt = 1;
-       }
-
-       return;
-}
-
-/*
- * gt64260b_chip_specific_init()
- *
- * Implement errata work arounds for the GT64260B.
- */
-static void
-gt64260b_chip_specific_init(mv64x60_handle_t *bh, mv64x60_setup_info_t *si)
-{
-       struct ocp_device       *dev;
-       mv64x60_ocp_mpsc_data_t *mpsc_dp;
-
-       /* R#18 */
-       /* cpu read buffer to buffer 1 (reg 0x0448) */
-       mv64x60_set_bits(bh, GT64260_SDRAM_CONFIG, (1<<26));
-
-       /* No longer errata so turn on */
-       /* Enable pci read/write combine, master write trigger,
-       * disable slave sync barrier
-       * readmultiple (reg 0x0c00 and 0x0c80)
-       */
-       if (si->pci_0.enable_bus) {
-               mv64x60_set_bits(bh, MV64x60_PCI0_CMD,
-                       ((1<<4) | (1<<5) | (1<<9) | (1<<13)));
-       }
-
-       if (si->pci_1.enable_bus) {
-               mv64x60_set_bits(bh, MV64x60_PCI1_CMD,
-                       ((1<<4) | (1<<5) | (1<<9) | (1<<13)));
-       }
-
-       mv64x60_set_bits(bh, GT64260_CPU_WB_PRIORITY_BUFFER_DEPTH, 0xf);
-
-       /*
-        * The 64260B is not supposed to have the bug where the MPSC & ENET
-        * can't access cache coherent regions.  However, testing has shown
-        * that the MPSC, at least, still has this bug.
-        */
-       if ((dev = ocp_find_device(OCP_VENDOR_MARVELL, OCP_FUNC_MPSC, 0))
-                                                               != NULL) {
-               mpsc_dp = (mv64x60_ocp_mpsc_data_t *)dev->def->additions;
-               mpsc_dp->cache_mgmt = 1;
-       }
-
-       if ((dev = ocp_find_device(OCP_VENDOR_MARVELL, OCP_FUNC_MPSC, 1))
-                                                               != NULL) {
-               mpsc_dp = (mv64x60_ocp_mpsc_data_t *)dev->def->additions;
-               mpsc_dp->cache_mgmt = 1;
-       }
-
-       return;
-}
-
-/*
- *****************************************************************************
- *
- *     MV64360-Specific Routines
- *
- *****************************************************************************
- */
-/*
- * mv64360_translate_size()
- *
- * On the MV64360, the size register is set similar to the size you get
- * from a pci config space BAR register.  That is, programmed from LSB to MSB
- * as a sequence of 1's followed by a sequence of 0's. IOW, "size -1" with the
- * assumption that the size is a power of 2.
- */
-static u32 __init
-mv64360_translate_size(u32 base_addr, u32 size, u32 num_bits)
-{
-       return mv64x60_mask(size - 1, num_bits);
-}
-
-/*
- * mv64360_untranslate_size()
- *
- * Translate the size register value of a window into a window size.
- */
-static u32 __init
-mv64360_untranslate_size(u32 base_addr, u32 size, u32 num_bits)
-{
-       if (size > 0) {
-               size >>= (32 - num_bits);
-               size++;
-               size <<= (32 - num_bits);
-       }
-
-       return size;
-}
-
-/*
- * mv64360_set_pci2mem_window()
- *
- * The PCI->MEM window registers are actually in PCI config space so need
- * to set them by setting the correct config space BARs.
- */
-static void __init
-mv64360_set_pci2mem_window(struct pci_controller *hose, u32 window, u32 base)
-{
-       struct {
-               u32     fcn;
-               u32     base_hi_bar;
-               u32     base_lo_bar;
-       } reg_addrs[] = {{ 0, 0x14, 0x10 }, { 0, 0x1c, 0x18 },
-               { 1, 0x14, 0x10 }, { 1, 0x1c, 0x18 }};
-
-       DBG("set pci->mem window: %d, hose: %d, base: 0x%x\n", window,
-               hose->index, base);
-
-       early_write_config_dword(hose, hose->first_busno,
-                       PCI_DEVFN(0, reg_addrs[window].fcn),
-                       reg_addrs[window].base_hi_bar, 0);
-       early_write_config_dword(hose, hose->first_busno,
-                       PCI_DEVFN(0, reg_addrs[window].fcn),
-                       reg_addrs[window].base_lo_bar,
-                       mv64x60_mask(base, 20) | 0xc);
-       return;
-}
-
-/*
- * mv64360_is_enabled_32bit()
- *
- * On a MV64360, a window is enabled by either clearing a bit in the
- * CPU BAR Enable reg or setting a bit in the window's base reg.
- * Note that this doesn't work for windows on the PCI slave side but we don't
- * check those so its okay.
- */
-static u32 __init
-mv64360_is_enabled_32bit(mv64x60_handle_t *bh, u32 window)
-{
-       u32     rc = 0;
-
-       if ((mv64360_32bit_windows[window].base_reg != 0) &&
-               (mv64360_32bit_windows[window].size_reg != 0)) {
-
-               if (mv64360_32bit_windows[window].extra & 0x80000000) {
-                       rc = (mv64x60_read(bh,
-                               mv64360_32bit_windows[window].base_reg) & 
-                               (1 << (mv64360_32bit_windows[window].extra &
-                                                               0xff))) != 0;
-               }
-               else {
-                       rc = (mv64x60_read(bh, MV64360_CPU_BAR_ENABLE) & 
-                               (1 << mv64360_32bit_windows[window].extra)) ==0;
-               }
-       }
-
-       if (rc) {
-               DBG("32bit window %d is enabled\n", window);
-       }
-       else {
-               DBG("32bit window %d is disabled\n", window);
-       }
-
-       return rc;
-}
-
-/*
- * mv64360_enable_window_32bit()
- *
- * On a MV64360, a window is enabled by either clearing a bit in the
- * CPU BAR Enable reg or setting a bit in the window's base reg.
- */
-static void __init
-mv64360_enable_window_32bit(mv64x60_handle_t *bh, u32 window)
-{
-       DBG("enable 32bit window: %d\n", window);
-
-       if ((mv64360_32bit_windows[window].base_reg != 0) &&
-               (mv64360_32bit_windows[window].size_reg != 0)) {
-
-               if (mv64360_32bit_windows[window].extra & 0x80000000) {
-                       mv64x60_set_bits(bh,
-                               mv64360_32bit_windows[window].base_reg,
-                               (1 << (mv64360_32bit_windows[window].extra &
-                                                                       0xff)));
-               }
-               else {
-                       mv64x60_clr_bits(bh, MV64360_CPU_BAR_ENABLE,
-                               (1 << mv64360_32bit_windows[window].extra));
-               }
-       }
-
-       return;
-}
-
-/*
- * mv64360_disable_window_32bit()
- *
- * On a MV64360, a window is disabled by either setting a bit in the
- * CPU BAR Enable reg or clearing a bit in the window's base reg.
- */
-static void __init
-mv64360_disable_window_32bit(mv64x60_handle_t *bh, u32 window)
-{
-       DBG("disable 32bit window: %d, base_reg: 0x%x, size_reg: 0x%x\n",
-               window, mv64360_32bit_windows[window].base_reg,
-               mv64360_32bit_windows[window].size_reg);
-
-       if ((mv64360_32bit_windows[window].base_reg != 0) &&
-               (mv64360_32bit_windows[window].size_reg != 0)) {
-
-               if (mv64360_32bit_windows[window].extra & 0x80000000) {
-                       mv64x60_clr_bits(bh,
-                               mv64360_32bit_windows[window].base_reg,
-                               (1 << (mv64360_32bit_windows[window].extra &
-                                                                       0xff)));
-               }
-               else {
-                       mv64x60_set_bits(bh, MV64360_CPU_BAR_ENABLE,
-                               (1 << mv64360_32bit_windows[window].extra));
-               }
-       }
-
-       return;
-}
-
-/*
- * mv64360_enable_window_64bit()
- *
- * On the MV64360, a 64-bit window is enabled by setting a bit in the window's 
- * base reg.
- */
-static void __init
-mv64360_enable_window_64bit(mv64x60_handle_t *bh, u32 window)
-{
-       DBG("enable 64bit window: %d\n", window);
-
-       /* For 64360, 'extra' field holds bit that enables the window */
-       if ((mv64360_64bit_windows[window].base_lo_reg!= 0) &&
-               (mv64360_64bit_windows[window].size_reg != 0)) {
-
-               if (mv64360_64bit_windows[window].extra & 0x80000000) {
-                       mv64x60_set_bits(bh,
-                               mv64360_64bit_windows[window].base_lo_reg,
-                               (1 << (mv64360_64bit_windows[window].extra &
-                                                                       0xff)));
-               } /* Should be no 'else' ones */
-       }
-
-       return;
-}
-
-/*
- * mv64360_disable_window_64bit()
- *
- * On a MV64360, a 64-bit window is disabled by clearing a bit in the window's
- * base reg.
- */
-static void __init
-mv64360_disable_window_64bit(mv64x60_handle_t *bh, u32 window)
-{
-       DBG("disable 64bit window: %d, base_reg: 0x%x, size_reg: 0x%x\n",
-               window, mv64360_64bit_windows[window].base_lo_reg,
-               mv64360_64bit_windows[window].size_reg);
-
-       if ((mv64360_64bit_windows[window].base_lo_reg != 0) &&
-               (mv64360_64bit_windows[window].size_reg != 0)) {
-
-               if (mv64360_64bit_windows[window].extra & 0x80000000) {
-                       mv64x60_clr_bits(bh,
-                               mv64360_64bit_windows[window].base_lo_reg,
-                               (1 << (mv64360_64bit_windows[window].extra &
-                                                                       0xff)));
-               } /* Should be no 'else' ones */
-       }
-
-       return;
-}
-
-/*
- * mv64360_disable_all_windows()
- *
- * The MV64360 has a few windows that aren't represented in the table of
- * windows at the top of this file.  This routine turns all of them off
- * except for the memory controller windows, of course.
- */
-static void __init
-mv64360_disable_all_windows(mv64x60_handle_t *bh, mv64x60_setup_info_t *si)
-{
-       u32     i;
-
-       /* Disable 32bit windows (don't disable cpu->mem windows) */
-       for (i=MV64x60_CPU2DEV_0_WIN; i<MV64x60_32BIT_WIN_COUNT; i++) {
-               if (!(si->window_preserve_mask_32 & (1<<i)))
-                       mv64360_disable_window_32bit(bh, i);
-       }
-
-       /* Disable 64bit windows */
-       for (i=0; i<MV64x60_64BIT_WIN_COUNT; i++) {
-               if (!(si->window_preserve_mask_64 & (1<<i)))
-                       mv64360_disable_window_64bit(bh, i);
-       }
-
-       /* Turn off PCI->MEM access cntl wins not in mv64360_64bit_windows[] */
-       mv64x60_clr_bits(bh, MV64x60_PCI0_ACC_CNTL_4_BASE_LO, 0);
-       mv64x60_clr_bits(bh, MV64x60_PCI0_ACC_CNTL_5_BASE_LO, 0);
-       mv64x60_clr_bits(bh, MV64x60_PCI1_ACC_CNTL_4_BASE_LO, 0);
-       mv64x60_clr_bits(bh, MV64x60_PCI1_ACC_CNTL_5_BASE_LO, 0);
-
-       /* Disable all PCI-><whatever> windows */
-       mv64x60_set_bits(bh, MV64x60_PCI0_BAR_ENABLE, 0x0000f9ff);
-       mv64x60_set_bits(bh, MV64x60_PCI1_BAR_ENABLE, 0x0000f9ff);
-
-       return;
-}
-
-/*
- * mv64360_chip_specific_init()
- *
- * No errata work arounds for the MV64360 implemented at this point.
- */
-static void
-mv64360_chip_specific_init(mv64x60_handle_t *bh, mv64x60_setup_info_t *si)
-{
-       struct ocp_device       *dev;
-       mv64x60_ocp_mpsc_data_t *mpsc_dp;
-
-       if ((dev = ocp_find_device(OCP_VENDOR_MARVELL, OCP_FUNC_MPSC, 0))
-                                                               != NULL) {
-               mpsc_dp = (mv64x60_ocp_mpsc_data_t *)dev->def->additions;
-               mpsc_dp->brg_can_tune = 1;
-       }
-
-       if ((dev = ocp_find_device(OCP_VENDOR_MARVELL, OCP_FUNC_MPSC, 1))
-                                                               != NULL) {
-               mpsc_dp = (mv64x60_ocp_mpsc_data_t *)dev->def->additions;
-               mpsc_dp->brg_can_tune = 1;
-       }
-
-       return;
-}
-
-/*
- * mv64460_chip_specific_init()
- *
- * No errata work arounds for the MV64460 implemented at this point.
- */
-static void
-mv64460_chip_specific_init(mv64x60_handle_t *bh, mv64x60_setup_info_t *si)
-{
-       mv64360_chip_specific_init(bh, si); /* XXXX check errata */
-       return;
-}
diff --git a/arch/ppc/syslib/mv64x60_ocp.c b/arch/ppc/syslib/mv64x60_ocp.c
deleted file mode 100644 (file)
index 935bb9a..0000000
+++ /dev/null
@@ -1,133 +0,0 @@
-/*
- * arch/ppc/syslib/mv64x60_ocp.c
- * 
- * Common OCP definitions for the Marvell GT64260/MV64360/MV64460/...
- * line of host bridges.
- *
- * Author: Mark A. Greer <mgreer@mvista.com>
- *
- * 2004 (c) MontaVista, Software, Inc.  This file is licensed under
- * the terms of the GNU General Public License version 2.  This program
- * is licensed "as is" without any warranty of any kind, whether express
- * or implied.
- */
-
-#include <linux/kernel.h>
-#include <linux/init.h>
-#include <asm/mv64x60.h>
-#include <asm/ocp.h>
-
-static mv64x60_ocp_mpsc_data_t mv64x60_ocp_mpsc0_def = {
-       .mirror_regs            = 0,
-       .cache_mgmt             = 0,
-       .max_idle               = 0,
-       .default_baud           = 9600,
-       .default_bits           = 8,
-       .default_parity         = 'n',
-       .default_flow           = 'n',
-       .chr_1_val              = 0x00000000,
-       .chr_2_val              = 0x00000000,
-       .chr_10_val             = 0x00000003,
-       .mpcr_val               = 0,
-       .mrr_val                = 0x3ffffe38,
-       .rcrr_val               = 0,
-       .tcrr_val               = 0,
-       .intr_mask_val          = 0,
-       .bcr_val                = 0,
-       .sdma_irq               = MV64x60_IRQ_SDMA_0,
-       .brg_can_tune           = 0,
-       .brg_clk_src            = 8,            /* Default to TCLK */
-       .brg_clk_freq           = 100000000,    /* Default to 100 MHz */
-};
-static mv64x60_ocp_mpsc_data_t mv64x60_ocp_mpsc1_def = {
-       .mirror_regs            = 0,
-       .cache_mgmt             = 0,
-       .max_idle               = 0,
-       .default_baud           = 9600,
-       .default_bits           = 8,
-       .default_parity         = 'n',
-       .default_flow           = 'n',
-       .chr_1_val              = 0x00000000,
-       .chr_1_val              = 0x00000000,
-       .chr_2_val              = 0x00000000,
-       .chr_10_val             = 0x00000003,
-       .mpcr_val               = 0,
-       .mrr_val                = 0x3ffffe38,
-       .rcrr_val               = 0,
-       .tcrr_val               = 0,
-       .intr_mask_val          = 0,
-       .bcr_val                = 0,
-       .sdma_irq               = MV64x60_IRQ_SDMA_1,
-       .brg_can_tune           = 0,
-       .brg_clk_src            = 8,            /* Default to TCLK */
-       .brg_clk_freq           = 100000000,    /* Default to 100 MHz */
-};
-MV64x60_OCP_SYSFS_MPSC_DATA()
-
-struct ocp_def core_ocp[] = {
-       /* Base address for the block of bridge's regs */
-       { .vendor       = OCP_VENDOR_MARVELL,                   /* 0x00 */
-         .function     = OCP_FUNC_HB,
-         .index        = 0,
-         .paddr        = 0,
-         .pm           = OCP_CPM_NA,
-       },
-       /* 10/100 Ethernet controller */
-       { .vendor       = OCP_VENDOR_MARVELL,                   /* 0x01 */
-         .function     = OCP_FUNC_EMAC,
-         .index        = 0,
-         .paddr        = GT64260_ENET_0_OFFSET,
-         .irq          = MV64x60_IRQ_ETH_0,
-         .pm           = OCP_CPM_NA,
-       },
-       { .vendor       = OCP_VENDOR_MARVELL,                   /* 0x02 */
-         .function     = OCP_FUNC_EMAC,
-         .index        = 1,
-         .paddr        = GT64260_ENET_1_OFFSET,
-         .irq          = MV64x60_IRQ_ETH_1,
-         .pm           = OCP_CPM_NA,
-       },
-       { .vendor       = OCP_VENDOR_MARVELL,                   /* 0x03 */
-         .function     = OCP_FUNC_EMAC,
-         .index        = 2,
-         .paddr        = GT64260_ENET_2_OFFSET,
-         .irq          = MV64x60_IRQ_ETH_2,
-         .pm           = OCP_CPM_NA,
-       },
-       /* Multi-Protocol Serial Controller (MPSC) */
-       { .vendor       = OCP_VENDOR_MARVELL,                   /* 0x04 */
-         .function     = OCP_FUNC_MPSC,
-         .index        = 0,
-         .paddr        = MV64x60_MPSC_0_OFFSET,
-         .irq          = MV64x60_IRQ_MPSC_0,
-         .pm           = OCP_CPM_NA,
-         .additions    = &mv64x60_ocp_mpsc0_def,
-         .show         = &mv64x60_ocp_show_mpsc
-       },
-       { .vendor       = OCP_VENDOR_MARVELL,                   /* 0x05 */
-         .function     = OCP_FUNC_MPSC,
-         .index        = 1,
-         .paddr        = MV64x60_MPSC_1_OFFSET,
-         .irq          = MV64x60_IRQ_MPSC_1,
-         .pm           = OCP_CPM_NA,
-         .additions    = &mv64x60_ocp_mpsc1_def,
-         .show         = &mv64x60_ocp_show_mpsc
-       },
-       /* Inter-Integrated Circuit Controller */
-       { .vendor       = OCP_VENDOR_MARVELL,                   /* 0x06 */
-         .function     = OCP_FUNC_I2C,
-         .index        = 0,
-         .paddr        = GT64260_I2C_OFFSET,
-         .irq          = MV64x60_IRQ_I2C,
-         .pm           = OCP_CPM_NA,
-       },
-       /* Programmable Interrupt Controller */
-       { .vendor       = OCP_VENDOR_MARVELL,                   /* 0x07 */
-         .function     = OCP_FUNC_PIC,
-         .index        = 0,
-         .paddr        = GT64260_IC_OFFSET,
-         .pm           = OCP_CPM_NA,
-       },
-       { .vendor       = OCP_VENDOR_INVALID
-       }
-};
diff --git a/arch/ppc/syslib/ppc4xx_sgdma.c b/arch/ppc/syslib/ppc4xx_sgdma.c
deleted file mode 100644 (file)
index 49c6e9c..0000000
+++ /dev/null
@@ -1,455 +0,0 @@
-/*
- * arch/ppc/kernel/ppc4xx_sgdma.c
- *
- * IBM PPC4xx DMA engine scatter/gather library
- *
- * Copyright 2002-2003 MontaVista Software Inc.
- *
- * Cleaned up and converted to new DCR access
- * Matt Porter <mporter@kernel.crashing.org>
- *
- * Original code by Armin Kuster <akuster@mvista.com>
- * and Pete Popov <ppopov@mvista.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 the
- * Free Software Foundation;  either version 2 of the  License, or (at your
- * option) any later version.
- *
- * 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.
- */
-
-#include <linux/config.h>
-#include <linux/kernel.h>
-#include <linux/mm.h>
-#include <linux/init.h>
-#include <linux/module.h>
-#include <linux/pci.h>
-
-#include <asm/system.h>
-#include <asm/io.h>
-#include <asm/ppc4xx_dma.h>
-
-void
-ppc4xx_set_sg_addr(int dmanr, phys_addr_t sg_addr)
-{
-       if (dmanr >= MAX_PPC4xx_DMA_CHANNELS) {
-               printk("ppc4xx_set_sg_addr: bad channel: %d\n", dmanr);
-               return;
-       }
-
-#ifdef PPC4xx_DMA_64BIT
-       mtdcr(DCRN_ASGH0 + (dmanr * 0x8), (u32)(sg_addr >> 32));
-#endif
-       mtdcr(DCRN_ASG0 + (dmanr * 0x8), (u32)sg_addr);
-}
-
-/*
- *   Add a new sgl descriptor to the end of a scatter/gather list
- *   which was created by alloc_dma_handle().
- *
- *   For a memory to memory transfer, both dma addresses must be
- *   valid. For a peripheral to memory transfer, one of the addresses
- *   must be set to NULL, depending on the direction of the transfer:
- *   memory to peripheral: set dst_addr to NULL,
- *   peripheral to memory: set src_addr to NULL.
- */
-int
-ppc4xx_add_dma_sgl(sgl_handle_t handle, phys_addr_t src_addr, phys_addr_t dst_addr,
-                  unsigned int count)
-{
-       sgl_list_info_t *psgl = (sgl_list_info_t *) handle;
-       ppc_dma_ch_t *p_dma_ch;
-
-       if (!handle) {
-               printk("ppc4xx_add_dma_sgl: null handle\n");
-               return DMA_STATUS_BAD_HANDLE;
-       }
-
-       if (psgl->dmanr >= MAX_PPC4xx_DMA_CHANNELS) {
-               printk("ppc4xx_add_dma_sgl: bad channel: %d\n", psgl->dmanr);
-               return DMA_STATUS_BAD_CHANNEL;
-       }
-
-       p_dma_ch = &dma_channels[psgl->dmanr];
-
-#ifdef DEBUG_4xxDMA
-       {
-               int error = 0;
-               unsigned int aligned =
-                   (unsigned) src_addr | (unsigned) dst_addr | count;
-               switch (p_dma_ch->pwidth) {
-               case PW_8:
-                       break;
-               case PW_16:
-                       if (aligned & 0x1)
-                               error = 1;
-                       break;
-               case PW_32:
-                       if (aligned & 0x3)
-                               error = 1;
-                       break;
-               case PW_64:
-                       if (aligned & 0x7)
-                               error = 1;
-                       break;
-               default:
-                       printk("ppc4xx_add_dma_sgl: invalid bus width: 0x%x\n",
-                              p_dma_ch->pwidth);
-                       return DMA_STATUS_GENERAL_ERROR;
-               }
-               if (error)
-                       printk
-                           ("Alignment warning: ppc4xx_add_dma_sgl src 0x%x dst 0x%x count 0x%x bus width var %d\n",
-                            src_addr, dst_addr, count, p_dma_ch->pwidth);
-
-       }
-#endif
-
-       if ((unsigned) (psgl->ptail + 1) >= ((unsigned) psgl + SGL_LIST_SIZE)) {
-               printk("sgl handle out of memory \n");
-               return DMA_STATUS_OUT_OF_MEMORY;
-       }
-
-       if (!psgl->ptail) {
-               psgl->phead = (ppc_sgl_t *)
-                   ((unsigned) psgl + sizeof (sgl_list_info_t));
-               psgl->phead_dma = psgl->dma_addr + sizeof(sgl_list_info_t);
-               psgl->ptail = psgl->phead;
-               psgl->ptail_dma = psgl->phead_dma;
-       } else {
-               psgl->ptail->next = psgl->ptail_dma + sizeof(ppc_sgl_t);
-               psgl->ptail++;
-               psgl->ptail_dma += sizeof(ppc_sgl_t);
-       }
-
-       psgl->ptail->control = psgl->control;
-       psgl->ptail->src_addr = src_addr;
-       psgl->ptail->dst_addr = dst_addr;
-       psgl->ptail->control_count = (count >> p_dma_ch->shift) |
-           psgl->sgl_control;
-       psgl->ptail->next = (uint32_t) NULL;
-
-       return DMA_STATUS_GOOD;
-}
-
-/*
- * Enable (start) the DMA described by the sgl handle.
- */
-void
-ppc4xx_enable_dma_sgl(sgl_handle_t handle)
-{
-       sgl_list_info_t *psgl = (sgl_list_info_t *) handle;
-       ppc_dma_ch_t *p_dma_ch;
-       uint32_t sg_command;
-
-       if (!handle) {
-               printk("ppc4xx_enable_dma_sgl: null handle\n");
-               return;
-       } else if (psgl->dmanr > (MAX_PPC4xx_DMA_CHANNELS - 1)) {
-               printk("ppc4xx_enable_dma_sgl: bad channel in handle %d\n",
-                      psgl->dmanr);
-               return;
-       } else if (!psgl->phead) {
-               printk("ppc4xx_enable_dma_sgl: sg list empty\n");
-               return;
-       }
-
-       p_dma_ch = &dma_channels[psgl->dmanr];
-       psgl->ptail->control_count &= ~SG_LINK; /* make this the last dscrptr */
-       sg_command = mfdcr(DCRN_ASGC);
-
-       ppc4xx_set_sg_addr(psgl->dmanr, psgl->phead_dma);
-
-       sg_command |= SSG_ENABLE(psgl->dmanr);
-
-       mtdcr(DCRN_ASGC, sg_command);   /* start transfer */
-}
-
-/*
- * Halt an active scatter/gather DMA operation.
- */
-void
-ppc4xx_disable_dma_sgl(sgl_handle_t handle)
-{
-       sgl_list_info_t *psgl = (sgl_list_info_t *) handle;
-       uint32_t sg_command;
-
-       if (!handle) {
-               printk("ppc4xx_enable_dma_sgl: null handle\n");
-               return;
-       } else if (psgl->dmanr > (MAX_PPC4xx_DMA_CHANNELS - 1)) {
-               printk("ppc4xx_enable_dma_sgl: bad channel in handle %d\n",
-                      psgl->dmanr);
-               return;
-       }
-
-       sg_command = mfdcr(DCRN_ASGC);
-       sg_command &= ~SSG_ENABLE(psgl->dmanr);
-       mtdcr(DCRN_ASGC, sg_command);   /* stop transfer */
-}
-
-/*
- *  Returns number of bytes left to be transferred from the entire sgl list.
- *  *src_addr and *dst_addr get set to the source/destination address of
- *  the sgl descriptor where the DMA stopped.
- *
- *  An sgl transfer must NOT be active when this function is called.
- */
-int
-ppc4xx_get_dma_sgl_residue(sgl_handle_t handle, phys_addr_t * src_addr,
-                          phys_addr_t * dst_addr)
-{
-       sgl_list_info_t *psgl = (sgl_list_info_t *) handle;
-       ppc_dma_ch_t *p_dma_ch;
-       ppc_sgl_t *pnext, *sgl_addr;
-       uint32_t count_left;
-
-       if (!handle) {
-               printk("ppc4xx_get_dma_sgl_residue: null handle\n");
-               return DMA_STATUS_BAD_HANDLE;
-       } else if (psgl->dmanr > (MAX_PPC4xx_DMA_CHANNELS - 1)) {
-               printk("ppc4xx_get_dma_sgl_residue: bad channel in handle %d\n",
-                      psgl->dmanr);
-               return DMA_STATUS_BAD_CHANNEL;
-       }
-
-       sgl_addr = (ppc_sgl_t *) __va(mfdcr(DCRN_ASG0 + (psgl->dmanr * 0x8)));
-       count_left = mfdcr(DCRN_DMACT0 + (psgl->dmanr * 0x8));
-
-       if (!sgl_addr) {
-               printk("ppc4xx_get_dma_sgl_residue: sgl addr register is null\n");
-               goto error;
-       }
-
-       pnext = psgl->phead;
-       while (pnext &&
-              ((unsigned) pnext < ((unsigned) psgl + SGL_LIST_SIZE) &&
-               (pnext != sgl_addr))
-           ) {
-               pnext++;
-       }
-
-       if (pnext == sgl_addr) {        /* found the sgl descriptor */
-
-               *src_addr = pnext->src_addr;
-               *dst_addr = pnext->dst_addr;
-
-               /*
-                * Now search the remaining descriptors and add their count.
-                * We already have the remaining count from this descriptor in
-                * count_left.
-                */
-               pnext++;
-
-               while ((pnext != psgl->ptail) &&
-                      ((unsigned) pnext < ((unsigned) psgl + SGL_LIST_SIZE))
-                   ) {
-                       count_left += pnext->control_count & SG_COUNT_MASK;
-               }
-
-               if (pnext != psgl->ptail) {     /* should never happen */
-                       printk
-                           ("ppc4xx_get_dma_sgl_residue error (1) psgl->ptail 0x%x handle 0x%x\n",
-                            (unsigned int) psgl->ptail, (unsigned int) handle);
-                       goto error;
-               }
-
-               /* success */
-               p_dma_ch = &dma_channels[psgl->dmanr];
-               return (count_left << p_dma_ch->shift); /* count in bytes */
-
-       } else {
-               /* this shouldn't happen */
-               printk
-                   ("get_dma_sgl_residue, unable to match current address 0x%x, handle 0x%x\n",
-                    (unsigned int) sgl_addr, (unsigned int) handle);
-
-       }
-
-      error:
-       *src_addr = (phys_addr_t) NULL;
-       *dst_addr = (phys_addr_t) NULL;
-       return 0;
-}
-
-/*
- * Returns the address(es) of the buffer(s) contained in the head element of
- * the scatter/gather list.  The element is removed from the scatter/gather
- * list and the next element becomes the head.
- *
- * This function should only be called when the DMA is not active.
- */
-int
-ppc4xx_delete_dma_sgl_element(sgl_handle_t handle, phys_addr_t * src_dma_addr,
-                             phys_addr_t * dst_dma_addr)
-{
-       sgl_list_info_t *psgl = (sgl_list_info_t *) handle;
-
-       if (!handle) {
-               printk("ppc4xx_delete_sgl_element: null handle\n");
-               return DMA_STATUS_BAD_HANDLE;
-       } else if (psgl->dmanr > (MAX_PPC4xx_DMA_CHANNELS - 1)) {
-               printk("ppc4xx_delete_sgl_element: bad channel in handle %d\n",
-                      psgl->dmanr);
-               return DMA_STATUS_BAD_CHANNEL;
-       }
-
-       if (!psgl->phead) {
-               printk("ppc4xx_delete_sgl_element: sgl list empty\n");
-               *src_dma_addr = (phys_addr_t) NULL;
-               *dst_dma_addr = (phys_addr_t) NULL;
-               return DMA_STATUS_SGL_LIST_EMPTY;
-       }
-
-       *src_dma_addr = (phys_addr_t) psgl->phead->src_addr;
-       *dst_dma_addr = (phys_addr_t) psgl->phead->dst_addr;
-
-       if (psgl->phead == psgl->ptail) {
-               /* last descriptor on the list */
-               psgl->phead = NULL;
-               psgl->ptail = NULL;
-       } else {
-               psgl->phead++;
-               psgl->phead_dma += sizeof(ppc_sgl_t);
-       }
-
-       return DMA_STATUS_GOOD;
-}
-
-
-/*
- *   Create a scatter/gather list handle.  This is simply a structure which
- *   describes a scatter/gather list.
- *
- *   A handle is returned in "handle" which the driver should save in order to
- *   be able to access this list later.  A chunk of memory will be allocated
- *   to be used by the API for internal management purposes, including managing
- *   the sg list and allocating memory for the sgl descriptors.  One page should
- *   be more than enough for that purpose.  Perhaps it's a bit wasteful to use
- *   a whole page for a single sg list, but most likely there will be only one
- *   sg list per channel.
- *
- *   Interrupt notes:
- *   Each sgl descriptor has a copy of the DMA control word which the DMA engine
- *   loads in the control register.  The control word has a "global" interrupt
- *   enable bit for that channel. Interrupts are further qualified by a few bits
- *   in the sgl descriptor count register.  In order to setup an sgl, we have to
- *   know ahead of time whether or not interrupts will be enabled at the completion
- *   of the transfers.  Thus, enable_dma_interrupt()/disable_dma_interrupt() MUST
- *   be called before calling alloc_dma_handle().  If the interrupt mode will never
- *   change after powerup, then enable_dma_interrupt()/disable_dma_interrupt()
- *   do not have to be called -- interrupts will be enabled or disabled based
- *   on how the channel was configured after powerup by the hw_init_dma_channel()
- *   function.  Each sgl descriptor will be setup to interrupt if an error occurs;
- *   however, only the last descriptor will be setup to interrupt. Thus, an
- *   interrupt will occur (if interrupts are enabled) only after the complete
- *   sgl transfer is done.
- */
-int
-ppc4xx_alloc_dma_handle(sgl_handle_t * phandle, unsigned int mode, unsigned int dmanr)
-{
-       sgl_list_info_t *psgl;
-       dma_addr_t dma_addr;
-       ppc_dma_ch_t *p_dma_ch = &dma_channels[dmanr];
-       uint32_t sg_command;
-       void *ret;
-
-       if (dmanr >= MAX_PPC4xx_DMA_CHANNELS) {
-               printk("ppc4xx_alloc_dma_handle: invalid channel 0x%x\n", dmanr);
-               return DMA_STATUS_BAD_CHANNEL;
-       }
-
-       if (!phandle) {
-               printk("ppc4xx_alloc_dma_handle: null handle pointer\n");
-               return DMA_STATUS_NULL_POINTER;
-       }
-
-       /* Get a page of memory, which is zeroed out by consistent_alloc() */
-       ret = dma_alloc_coherent(NULL, DMA_PPC4xx_SIZE, &dma_addr, GFP_KERNEL);
-       if (ret != NULL) {
-               memset(ret, 0, DMA_PPC4xx_SIZE);
-               psgl = (sgl_list_info_t *) ret;
-       }
-
-       if (psgl == NULL) {
-               *phandle = (sgl_handle_t) NULL;
-               return DMA_STATUS_OUT_OF_MEMORY;
-       }
-
-       psgl->dma_addr = dma_addr;
-       psgl->dmanr = dmanr;
-
-       /*
-        * Modify and save the control word. These words will be
-        * written to each sgl descriptor.  The DMA engine then
-        * loads this control word into the control register
-        * every time it reads a new descriptor.
-        */
-       psgl->control = p_dma_ch->control;
-       /* Clear all mode bits */
-       psgl->control &= ~(DMA_TM_MASK | DMA_TD);
-       /* Save control word and mode */
-       psgl->control |= (mode | DMA_CE_ENABLE);
-
-       /* In MM mode, we must set ETD/TCE */
-       if (mode == DMA_MODE_MM)
-               psgl->control |= DMA_ETD_OUTPUT | DMA_TCE_ENABLE;
-
-       if (p_dma_ch->int_enable) {
-               /* Enable channel interrupt */
-               psgl->control |= DMA_CIE_ENABLE;
-       } else {
-               psgl->control &= ~DMA_CIE_ENABLE;
-       }
-
-       sg_command = mfdcr(DCRN_ASGC);
-       sg_command |= SSG_MASK_ENABLE(dmanr);
-
-       /* Enable SGL control access */
-       mtdcr(DCRN_ASGC, sg_command);
-       psgl->sgl_control = SG_ERI_ENABLE | SG_LINK;
-
-       if (p_dma_ch->int_enable) {
-               if (p_dma_ch->tce_enable)
-                       psgl->sgl_control |= SG_TCI_ENABLE;
-               else
-                       psgl->sgl_control |= SG_ETI_ENABLE;
-       }
-
-       *phandle = (sgl_handle_t) psgl;
-       return DMA_STATUS_GOOD;
-}
-
-/*
- * Destroy a scatter/gather list handle that was created by alloc_dma_handle().
- * The list must be empty (contain no elements).
- */
-void
-ppc4xx_free_dma_handle(sgl_handle_t handle)
-{
-       sgl_list_info_t *psgl = (sgl_list_info_t *) handle;
-
-       if (!handle) {
-               printk("ppc4xx_free_dma_handle: got NULL\n");
-               return;
-       } else if (psgl->phead) {
-               printk("ppc4xx_free_dma_handle: list not empty\n");
-               return;
-       } else if (!psgl->dma_addr) {   /* should never happen */
-               printk("ppc4xx_free_dma_handle: no dma address\n");
-               return;
-       }
-
-       dma_free_coherent(NULL, DMA_PPC4xx_SIZE, (void *) psgl, 0);
-}
-
-EXPORT_SYMBOL(ppc4xx_alloc_dma_handle);
-EXPORT_SYMBOL(ppc4xx_free_dma_handle);
-EXPORT_SYMBOL(ppc4xx_add_dma_sgl);
-EXPORT_SYMBOL(ppc4xx_delete_dma_sgl_element);
-EXPORT_SYMBOL(ppc4xx_enable_dma_sgl);
-EXPORT_SYMBOL(ppc4xx_disable_dma_sgl);
-EXPORT_SYMBOL(ppc4xx_get_dma_sgl_residue);
diff --git a/arch/ppc/syslib/ppc8260_pic.c b/arch/ppc/syslib/ppc8260_pic.c
deleted file mode 100644 (file)
index 7faeb90..0000000
+++ /dev/null
@@ -1,131 +0,0 @@
-#include <linux/stddef.h>
-#include <linux/init.h>
-#include <linux/sched.h>
-#include <linux/signal.h>
-#include <asm/irq.h>
-#include <asm/immap_8260.h>
-#include <asm/mpc8260.h>
-#include "ppc8260_pic.h"
-
-/* The 8260 internal interrupt controller.  It is usually
- * the only interrupt controller.
- * There are two 32-bit registers (high/low) for up to 64
- * possible interrupts.
- *
- * Now, the fun starts.....Interrupt Numbers DO NOT MAP
- * in a simple arithmetic fashion to mask or pending registers.
- * That is, interrupt 4 does not map to bit position 4.
- * We create two tables, indexed by vector number, to indicate
- * which register to use and which bit in the register to use.
- */
-static u_char  irq_to_siureg[] = {
-       1, 1, 1, 1, 1, 1, 1, 1,
-       1, 1, 1, 1, 1, 1, 1, 1,
-       0, 0, 0, 0, 0, 0, 0, 0,
-       0, 0, 0, 0, 0, 0, 0, 0,
-       1, 1, 1, 1, 1, 1, 1, 1,
-       1, 1, 1, 1, 1, 1, 1, 1,
-       0, 0, 0, 0, 0, 0, 0, 0,
-       0, 0, 0, 0, 0, 0, 0, 0
-};
-
-static u_char  irq_to_siubit[] = {
-       31, 16, 17, 18, 19, 20, 21, 22,
-       23, 24, 25, 26, 27, 28, 29, 30,
-       29, 30, 16, 17, 18, 19, 20, 21,
-       22, 23, 24, 25, 26, 27, 28, 31,
-        0,  1,  2,  3,  4,  5,  6,  7,
-        8,  9, 10, 11, 12, 13, 14, 15,
-       15, 14, 13, 12, 11, 10,  9,  8,
-        7,  6,  5,  4,  3,  2,  1,  0
-};
-
-static void m8260_mask_irq(unsigned int irq_nr)
-{
-       int     bit, word;
-       volatile uint   *simr;
-
-       bit = irq_to_siubit[irq_nr];
-       word = irq_to_siureg[irq_nr];
-
-       simr = &(immr->im_intctl.ic_simrh);
-       ppc_cached_irq_mask[word] &= ~(1 << (31 - bit));
-       simr[word] = ppc_cached_irq_mask[word];
-}
-
-static void m8260_unmask_irq(unsigned int irq_nr)
-{
-       int     bit, word;
-       volatile uint   *simr;
-
-       bit = irq_to_siubit[irq_nr];
-       word = irq_to_siureg[irq_nr];
-
-       simr = &(immr->im_intctl.ic_simrh);
-       ppc_cached_irq_mask[word] |= (1 << (31 - bit));
-       simr[word] = ppc_cached_irq_mask[word];
-}
-
-static void m8260_mask_and_ack(unsigned int irq_nr)
-{
-       int     bit, word;
-       volatile uint   *simr, *sipnr;
-
-       bit = irq_to_siubit[irq_nr];
-       word = irq_to_siureg[irq_nr];
-
-       simr = &(immr->im_intctl.ic_simrh);
-       sipnr = &(immr->im_intctl.ic_sipnrh);
-       ppc_cached_irq_mask[word] &= ~(1 << (31 - bit));
-       simr[word] = ppc_cached_irq_mask[word];
-       sipnr[word] = 1 << (31 - bit);
-}
-
-static void m8260_end_irq(unsigned int irq_nr)
-{
-       int     bit, word;
-       volatile uint   *simr;
-
-       if (!(irq_desc[irq_nr].status & (IRQ_DISABLED|IRQ_INPROGRESS))
-                       && irq_desc[irq_nr].action) {
-
-               bit = irq_to_siubit[irq_nr];
-               word = irq_to_siureg[irq_nr];
-
-               simr = &(immr->im_intctl.ic_simrh);
-               ppc_cached_irq_mask[word] |= (1 << (31 - bit));
-               simr[word] = ppc_cached_irq_mask[word];
-       }
-}
-
-struct hw_interrupt_type ppc8260_pic = {
-       " 8260 SIU  ",
-       NULL,
-       NULL,
-       m8260_unmask_irq,
-       m8260_mask_irq,
-       m8260_mask_and_ack,
-       m8260_end_irq,
-       0
-};
-
-
-int
-m8260_get_irq(struct pt_regs *regs)
-{
-       int irq;
-        unsigned long bits;
-
-        /* For MPC8260, read the SIVEC register and shift the bits down
-         * to get the irq number.         */
-        bits = immr->im_intctl.ic_sivec;
-        irq = bits >> 26;
-
-       if (irq == 0)
-               return(-1);
-#if 0
-        irq += ppc8260_pic.irq_offset;
-#endif
-       return irq;
-}
-
diff --git a/arch/ppc/syslib/ppc8260_pic.h b/arch/ppc/syslib/ppc8260_pic.h
deleted file mode 100644 (file)
index 9f683b7..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-#ifndef _PPC_KERNEL_PPC8260_H
-#define _PPC_KERNEL_PPC8260_H
-
-#include <linux/irq.h>
-
-extern struct hw_interrupt_type ppc8260_pic;
-
-void m8260_pic_init(void);
-void m8260_do_IRQ(struct pt_regs *regs,
-                 int            cpu);
-int m8260_get_irq(struct pt_regs *regs);
-
-#endif /* _PPC_KERNEL_PPC8260_H */
diff --git a/arch/ppc64/kernel/hvcserver.c b/arch/ppc64/kernel/hvcserver.c
deleted file mode 100644 (file)
index fbe445e..0000000
+++ /dev/null
@@ -1,219 +0,0 @@
-/*
- * hvcserver.c
- * Copyright (C) 2004 Ryan S Arnold, IBM Corporation
- *
- * PPC64 virtual I/O console server support.
- *
- * 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
- */
-
-#include <linux/kernel.h>
-#include <linux/list.h>
-#include <linux/module.h>
-#include <asm/hvcall.h>
-#include <asm/hvcserver.h>
-#include <asm/io.h>
-
-#define HVCS_ARCH_VERSION "1.0.0"
-
-MODULE_AUTHOR("Ryan S. Arnold <rsa@us.ibm.com>");
-MODULE_DESCRIPTION("IBM hvcs ppc64 API");
-MODULE_LICENSE("GPL");
-MODULE_VERSION(HVCS_ARCH_VERSION);
-
-/*
- * Convert arch specific return codes into relevant errnos.  The hvcs
- * functions aren't performance sensitive, so this conversion isn't an
- * issue.
- */
-int hvcs_convert(long to_convert)
-{
-       switch (to_convert) {
-               case H_Success:
-                       return 0;
-               case H_Parameter:
-                       return -EINVAL;
-               case H_Hardware:
-                       return -EIO;
-               case H_Busy:
-               case H_LongBusyOrder1msec:
-               case H_LongBusyOrder10msec:
-               case H_LongBusyOrder100msec:
-               case H_LongBusyOrder1sec:
-               case H_LongBusyOrder10sec:
-               case H_LongBusyOrder100sec:
-                       return -EBUSY;
-               case H_Function: /* fall through */
-               default:
-                       return -EPERM;
-       }
-}
-
-int hvcs_free_partner_info(struct list_head *head)
-{
-       struct hvcs_partner_info *pi;
-       struct list_head *element;
-
-       if (!head) {
-               return -EINVAL;
-       }
-
-       while (!list_empty(head)) {
-               element = head->next;
-               pi = list_entry(element, struct hvcs_partner_info, node);
-               list_del(element);
-               kfree(pi);
-       }
-
-       return 0;
-}
-EXPORT_SYMBOL(hvcs_free_partner_info);
-
-/* Helper function for hvcs_get_partner_info */
-int hvcs_next_partner(unsigned int unit_address,
-               unsigned long last_p_partition_ID,
-               unsigned long last_p_unit_address, unsigned long *pi_buff)
-
-{
-       long retval;
-       retval = plpar_hcall_norets(H_VTERM_PARTNER_INFO, unit_address,
-                       last_p_partition_ID,
-                               last_p_unit_address, virt_to_phys(pi_buff));
-       return hvcs_convert(retval);
-}
-
-/*
- * The unit_address parameter is the unit address of the vty-server vdevice
- * in whose partner information the caller is interested.  This function
- * uses a pointer to a list_head instance in which to store the partner info.
- * This function returns non-zero on success, or if there is no partner info.
- *
- * Invocation of this function should always be followed by an invocation of
- * hvcs_free_partner_info() using a pointer to the SAME list head instance
- * that was used to store the partner_info list.
- */
-int hvcs_get_partner_info(unsigned int unit_address, struct list_head *head,
-               unsigned long *pi_buff)
-{
-       /*
-        * This is a page sized buffer to be passed to hvcall per invocation.
-        * NOTE: the first long returned is unit_address.  The second long
-        * returned is the partition ID and starting with pi_buff[2] are
-        * HVCS_CLC_LENGTH characters, which are diff size than the unsigned
-        * long, hence the casting mumbojumbo you see later.
-        */
-       unsigned long   last_p_partition_ID;
-       unsigned long   last_p_unit_address;
-       struct hvcs_partner_info *next_partner_info = NULL;
-       int more = 1;
-       int retval;
-
-       memset(pi_buff, 0x00, PAGE_SIZE);
-       /* invalid parameters */
-       if (!head)
-               return -EINVAL;
-
-       last_p_partition_ID = last_p_unit_address = ~0UL;
-       INIT_LIST_HEAD(head);
-
-       if (!pi_buff)
-               return -ENOMEM;
-
-       do {
-               retval = hvcs_next_partner(unit_address, last_p_partition_ID,
-                               last_p_unit_address, pi_buff);
-               if (retval) {
-                       /*
-                        * Don't indicate that we've failed if we have
-                        * any list elements.
-                        */
-                       if (!list_empty(head))
-                               return 0;
-                       return retval;
-               }
-
-               last_p_partition_ID = pi_buff[0];
-               last_p_unit_address = pi_buff[1];
-
-               /* This indicates that there are no further partners */
-               if (last_p_partition_ID == ~0UL
-                               && last_p_unit_address == ~0UL)
-                       break;
-
-               /* This is a very small struct and will be freed soon in
-                * hvcs_free_partner_info(). */
-               next_partner_info = kmalloc(sizeof(struct hvcs_partner_info),
-                               GFP_ATOMIC);
-
-               if (!next_partner_info) {
-                       printk(KERN_WARNING "HVCONSOLE: kmalloc() failed to"
-                               " allocate partner info struct.\n");
-                       hvcs_free_partner_info(head);
-                       return -ENOMEM;
-               }
-
-               next_partner_info->unit_address
-                       = (unsigned int)last_p_unit_address;
-               next_partner_info->partition_ID
-                       = (unsigned int)last_p_partition_ID;
-
-               /* copy the Null-term char too */
-               strncpy(&next_partner_info->location_code[0],
-                       (char *)&pi_buff[2],
-                       strlen((char *)&pi_buff[2]) + 1);
-
-               list_add_tail(&(next_partner_info->node), head);
-               next_partner_info = NULL;
-
-       } while (more);
-
-       return 0;
-}
-EXPORT_SYMBOL(hvcs_get_partner_info);
-
-/*
- * If this function is called once and -EINVAL is returned it may
- * indicate that the partner info needs to be refreshed for the
- * target unit address at which point the caller must invoke
- * hvcs_get_partner_info() and then call this function again.  If,
- * for a second time, -EINVAL is returned then it indicates that
- * there is probably already a partner connection registered to a
- * different vty-server@ vdevice.  It is also possible that a second
- * -EINVAL may indicate that one of the parms is not valid, for
- * instance if the link was removed between the vty-server@ vdevice
- * and the vty@ vdevice that you are trying to open.  Don't shoot the
- * messenger.  Firmware implemented it this way.
- */
-int hvcs_register_connection( unsigned int unit_address,
-               unsigned int p_partition_ID, unsigned int p_unit_address)
-{
-       long retval;
-       retval = plpar_hcall_norets(H_REGISTER_VTERM, unit_address,
-                               p_partition_ID, p_unit_address);
-       return hvcs_convert(retval);
-}
-EXPORT_SYMBOL(hvcs_register_connection);
-
-/*
- * If -EBUSY is returned continue to call this function
- * until 0 is returned.
- */
-int hvcs_free_connection(unsigned int unit_address)
-{
-       long retval;
-       retval = plpar_hcall_norets(H_FREE_VTERM, unit_address);
-       return hvcs_convert(retval);
-}
-EXPORT_SYMBOL(hvcs_free_connection);
diff --git a/arch/ppc64/mm/slb.c b/arch/ppc64/mm/slb.c
deleted file mode 100644 (file)
index bc61258..0000000
+++ /dev/null
@@ -1,136 +0,0 @@
-/*
- * PowerPC64 SLB support.
- *
- * Copyright (C) 2004 David Gibson <dwg@au.ibm.com>, IBM
- * Based on earlier code writteh by:
- * Dave Engebretsen and Mike Corrigan {engebret|mikejc}@us.ibm.com
- *    Copyright (c) 2001 Dave Engebretsen
- * Copyright (C) 2002 Anton Blanchard <anton@au.ibm.com>, IBM
- *
- *
- *      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 <asm/pgtable.h>
-#include <asm/mmu.h>
-#include <asm/mmu_context.h>
-#include <asm/paca.h>
-#include <asm/naca.h>
-#include <asm/cputable.h>
-
-extern void slb_allocate(unsigned long ea);
-
-static inline void create_slbe(unsigned long ea, unsigned long vsid,
-                              unsigned long flags, unsigned long entry)
-{
-       ea = (ea & ESID_MASK) | SLB_ESID_V | entry;
-       vsid = (vsid << SLB_VSID_SHIFT) | flags;
-       asm volatile("slbmte  %0,%1" :
-                    : "r" (vsid), "r" (ea)
-                    : "memory" );
-}
-
-static void slb_add_bolted(void)
-{
-#ifndef CONFIG_PPC_ISERIES
-       WARN_ON(!irqs_disabled());
-
-       /* If you change this make sure you change SLB_NUM_BOLTED
-        * appropriately too */
-
-       /* Slot 1 - first VMALLOC segment
-         *     Since modules end up there it gets hit very heavily.
-         */
-       create_slbe(VMALLOCBASE, get_kernel_vsid(VMALLOCBASE),
-                   SLB_VSID_KERNEL, 1);
-
-       asm volatile("isync":::"memory");
-#endif
-}
-
-/* Flush all user entries from the segment table of the current processor. */
-void switch_slb(struct task_struct *tsk, struct mm_struct *mm)
-{
-       unsigned long offset = get_paca()->slb_cache_ptr;
-       unsigned long esid_data;
-       unsigned long pc = KSTK_EIP(tsk);
-       unsigned long stack = KSTK_ESP(tsk);
-       unsigned long unmapped_base;
-
-       if (offset <= SLB_CACHE_ENTRIES) {
-               int i;
-               asm volatile("isync" : : : "memory");
-               for (i = 0; i < offset; i++) {
-                       esid_data = (unsigned long)get_paca()->slb_cache[i]
-                               << SID_SHIFT;
-                       asm volatile("slbie %0" : : "r" (esid_data));
-               }
-               asm volatile("isync" : : : "memory");
-       } else {
-               asm volatile("isync; slbia; isync" : : : "memory");
-               slb_add_bolted();
-       }
-
-       /* Workaround POWER5 < DD2.1 issue */
-       if (offset == 1 || offset > SLB_CACHE_ENTRIES) {
-               /* flush segment in EEH region, we shouldn't ever
-                * access addresses in this region. */
-               asm volatile("slbie %0" : : "r"(EEHREGIONBASE));
-       }
-
-       get_paca()->slb_cache_ptr = 0;
-       get_paca()->context = mm->context;
-
-       /*
-        * preload some userspace segments into the SLB.
-        */
-       if (test_tsk_thread_flag(tsk, TIF_32BIT))
-               unmapped_base = TASK_UNMAPPED_BASE_USER32;
-       else
-               unmapped_base = TASK_UNMAPPED_BASE_USER64;
-
-       if (pc >= KERNELBASE)
-               return;
-       slb_allocate(pc);
-
-       if (GET_ESID(pc) == GET_ESID(stack))
-               return;
-
-       if (stack >= KERNELBASE)
-               return;
-       slb_allocate(stack);
-
-       if ((GET_ESID(pc) == GET_ESID(unmapped_base))
-           || (GET_ESID(stack) == GET_ESID(unmapped_base)))
-               return;
-
-       if (unmapped_base >= KERNELBASE)
-               return;
-       slb_allocate(unmapped_base);
-}
-
-void slb_initialize(void)
-{
-#ifdef CONFIG_PPC_ISERIES
-       asm volatile("isync; slbia; isync":::"memory");
-#else
-       unsigned long flags = SLB_VSID_KERNEL;
-
-       /* Invalidate the entire SLB (even slot 0) & all the ERATS */
-       if (cur_cpu_spec->cpu_features & CPU_FTR_16M_PAGE)
-               flags |= SLB_VSID_L;
-
-       asm volatile("isync":::"memory");
-       asm volatile("slbmte  %0,%0"::"r" (0) : "memory");
-       asm volatile("isync; slbia; isync":::"memory");
-       create_slbe(KERNELBASE, get_kernel_vsid(KERNELBASE),
-                   flags, 0);
-
-#endif
-       slb_add_bolted();
-       get_paca()->stab_rr = SLB_NUM_BOLTED;
-}
diff --git a/arch/ppc64/mm/slb_low.S b/arch/ppc64/mm/slb_low.S
deleted file mode 100644 (file)
index 4b3dfe0..0000000
+++ /dev/null
@@ -1,179 +0,0 @@
-/*
- * arch/ppc64/mm/slb_low.S
- *
- * Low-level SLB routines
- *
- * Copyright (C) 2004 David Gibson <dwg@au.ibm.com>, IBM
- *
- * Based on earlier C version:
- * Dave Engebretsen and Mike Corrigan {engebret|mikejc}@us.ibm.com
- *    Copyright (c) 2001 Dave Engebretsen
- * Copyright (C) 2002 Anton Blanchard <anton@au.ibm.com>, IBM
- *
- *  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 <asm/processor.h>
-#include <asm/page.h>
-#include <asm/mmu.h>
-#include <asm/ppc_asm.h>
-#include <asm/offsets.h>
-#include <asm/cputable.h>
-
-/* void slb_allocate(unsigned long ea);
- *
- * Create an SLB entry for the given EA (user or kernel).
- *     r3 = faulting address, r13 = PACA
- *     r9, r10, r11 are clobbered by this function
- * No other registers are examined or changed.
- */
-_GLOBAL(slb_allocate)
-       /*
-        * First find a slot, round robin. Previously we tried to find
-        * a free slot first but that took too long. Unfortunately we
-        * dont have any LRU information to help us choose a slot.
-        */
-       ld      r10,PACASTABRR(r13)
-3:
-       addi    r10,r10,1
-       /* use a cpu feature mask if we ever change our slb size */
-       cmpldi  r10,SLB_NUM_ENTRIES
-
-       blt+    4f
-       li      r10,SLB_NUM_BOLTED
-
-       /*
-        * Never cast out the segment for our kernel stack. Since we
-        * dont invalidate the ERAT we could have a valid translation
-        * for the kernel stack during the first part of exception exit
-        * which gets invalidated due to a tlbie from another cpu at a
-        * non recoverable point (after setting srr0/1) - Anton
-        */
-4:     slbmfee r11,r10
-       srdi    r11,r11,27
-       /*
-        * Use paca->ksave as the value of the kernel stack pointer,
-        * because this is valid at all times.
-        * The >> 27 (rather than >> 28) is so that the LSB is the
-        * valid bit - this way we check valid and ESID in one compare.
-        * In order to completely close the tiny race in the context
-        * switch (between updating r1 and updating paca->ksave),
-        * we check against both r1 and paca->ksave.
-        */
-       srdi    r9,r1,27
-       ori     r9,r9,1                 /* mangle SP for later compare */
-       cmpd    r11,r9
-       beq-    3b
-       ld      r9,PACAKSAVE(r13)
-       srdi    r9,r9,27
-       ori     r9,r9,1
-       cmpd    r11,r9
-       beq-    3b
-
-       std     r10,PACASTABRR(r13)
-
-       /* r3 = faulting address, r10 = entry */
-
-       srdi    r9,r3,60                /* get region */
-       srdi    r3,r3,28                /* get esid */
-       cmpldi  cr7,r9,0xc              /* cmp KERNELBASE for later use */
-
-       /* r9 = region, r3 = esid, cr7 = <>KERNELBASE */
-
-       rldicr. r11,r3,32,16
-       bne-    8f                      /* invalid ea bits set */
-       addi    r11,r9,-1
-       cmpldi  r11,0xb
-       blt-    8f                      /* invalid region */
-
-       /* r9 = region, r3 = esid, r10 = entry, cr7 = <>KERNELBASE */
-
-       blt     cr7,0f                  /* user or kernel? */
-
-       /* kernel address */
-       li      r11,SLB_VSID_KERNEL
-BEGIN_FTR_SECTION
-       bne     cr7,9f
-       li      r11,(SLB_VSID_KERNEL|SLB_VSID_L)
-END_FTR_SECTION_IFSET(CPU_FTR_16M_PAGE)
-       b       9f
-
-0:     /* user address */
-       li      r11,SLB_VSID_USER
-#ifdef CONFIG_HUGETLB_PAGE
-BEGIN_FTR_SECTION
-       /* check against the hugepage ranges */
-       cmpldi  r3,(TASK_HPAGE_END>>SID_SHIFT)
-       bge     6f                      /* >= TASK_HPAGE_END */
-       cmpldi  r3,(TASK_HPAGE_BASE>>SID_SHIFT)
-       bge     5f                      /* TASK_HPAGE_BASE..TASK_HPAGE_END */
-       cmpldi  r3,16
-       bge     6f                      /* 4GB..TASK_HPAGE_BASE */
-
-       lhz     r9,PACAHTLBSEGS(r13)
-       srd     r9,r9,r3
-       andi.   r9,r9,1
-       beq     6f
-
-5:     /* this is a hugepage user address */
-       li      r11,(SLB_VSID_USER|SLB_VSID_L)
-END_FTR_SECTION_IFSET(CPU_FTR_16M_PAGE)
-#endif /* CONFIG_HUGETLB_PAGE */
-
-6:     ld      r9,PACACONTEXTID(r13)
-
-9:     /* r9 = "context", r3 = esid, r11 = flags, r10 = entry */
-
-       rldimi  r9,r3,15,0              /* r9= VSID ordinal */
-
-7:     rldimi  r10,r3,28,0             /* r10= ESID<<28 | entry */
-       oris    r10,r10,SLB_ESID_V@h    /* r10 |= SLB_ESID_V */
-
-       /* r9 = ordinal, r3 = esid, r11 = flags, r10 = esid_data */
-
-       li      r3,VSID_RANDOMIZER@higher
-       sldi    r3,r3,32
-       oris    r3,r3,VSID_RANDOMIZER@h
-       ori     r3,r3,VSID_RANDOMIZER@l
-
-       mulld   r9,r3,r9                /* r9 = ordinal * VSID_RANDOMIZER */
-       clrldi  r9,r9,28                /* r9 &= VSID_MASK */
-       sldi    r9,r9,SLB_VSID_SHIFT    /* r9 <<= SLB_VSID_SHIFT */
-       or      r9,r9,r11               /* r9 |= flags */
-
-       /* r9 = vsid_data, r10 = esid_data, cr7 = <>KERNELBASE */
-
-       /*
-        * No need for an isync before or after this slbmte. The exception
-        * we enter with and the rfid we exit with are context synchronizing.
-        */
-       slbmte  r9,r10
-
-       bgelr   cr7                     /* we're done for kernel addresses */
-
-       /* Update the slb cache */
-       lhz     r3,PACASLBCACHEPTR(r13) /* offset = paca->slb_cache_ptr */
-       cmpldi  r3,SLB_CACHE_ENTRIES
-       bge     1f
-
-       /* still room in the slb cache */
-       sldi    r11,r3,1                /* r11 = offset * sizeof(u16) */
-       rldicl  r10,r10,36,28           /* get low 16 bits of the ESID */
-       add     r11,r11,r13             /* r11 = (u16 *)paca + offset */
-       sth     r10,PACASLBCACHE(r11)   /* paca->slb_cache[offset] = esid */
-       addi    r3,r3,1                 /* offset++ */
-       b       2f
-1:                                     /* offset >= SLB_CACHE_ENTRIES */
-       li      r3,SLB_CACHE_ENTRIES+1
-2:
-       sth     r3,PACASLBCACHEPTR(r13) /* paca->slb_cache_ptr = offset */
-       blr
-
-8:     /* invalid EA */
-       li      r9,0                    /* 0 VSID ordinal -> BAD_VSID */
-       li      r11,SLB_VSID_USER       /* flags don't much matter */
-       b       7b
diff --git a/arch/s390/lib/memset.S b/arch/s390/lib/memset.S
deleted file mode 100644 (file)
index 447af53..0000000
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- *  arch/s390/lib/memset.S
- *    S390 fast memset routine
- *
- *  S390 version
- *    Copyright (C) 1999 IBM Deutschland Entwicklung GmbH, IBM Corporation
- *    Author(s): Martin Schwidefsky (schwidefsky@de.ibm.com),
- */
-
-/*
- * R2 = address to memory area
- * R3 = byte to fill memory with
- * R4 = number of bytes to fill
- */
-        .globl  memset
-memset:
-        LTR     4,4
-        JZ      memset_end
-        LR      0,2                    # save pointer to memory area
-        LR      1,3                    # move pad byte to R1
-        LR      3,4
-        SR      4,4                    # no source for MVCLE, only a pad byte
-        SR      5,5
-        MVCLE   2,4,0(1)               # thats it, MVCLE is your friend
-        JO      .-4
-        LR      2,0                    # return pointer to mem.
-memset_end:
-        BR      14
-        
-
diff --git a/arch/s390/lib/memset64.S b/arch/s390/lib/memset64.S
deleted file mode 100644 (file)
index 1e4b035..0000000
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- *  arch/s390/lib/memset.S
- *    S390 fast memset routine
- *
- *  S390 version
- *    Copyright (C) 1999 IBM Deutschland Entwicklung GmbH, IBM Corporation
- *    Author(s): Martin Schwidefsky (schwidefsky@de.ibm.com),
- */
-
-/*
- * R2 = address to memory area
- * R3 = byte to fill memory with
- * R4 = number of bytes to fill
- */
-        .globl  memset
-memset:
-        LTGR    4,4
-        JZ      memset_end
-        LGR     0,2                    # save pointer to memory area
-        LGR     1,3                    # move pad byte to R1
-        LGR     3,4
-        SGR     4,4                    # no source for MVCLE, only a pad byte
-        SGR     5,5
-        MVCLE   2,4,0(1)               # thats it, MVCLE is your friend
-        JO      .-4
-        LGR     2,0                    # return pointer to mem.
-memset_end:
-        BR      14
-        
-
diff --git a/arch/s390/lib/strcmp.S b/arch/s390/lib/strcmp.S
deleted file mode 100644 (file)
index 340edff..0000000
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- *  arch/s390/lib/strcmp.S
- *    S390 strcmp routine
- *
- *  S390 version
- *    Copyright (C) 1999 IBM Deutschland Entwicklung GmbH, IBM Corporation
- *    Author(s): Martin Schwidefsky (schwidefsky@de.ibm.com),
- */
-
-/*
- * R2 = address of compare string
- * R3 = address of test string
- */
-        .globl   strcmp
-strcmp:
-        SR      0,0
-        SR      1,1
-        CLST    2,3
-        JO      .-4
-        JE      strcmp_equal
-        IC      0,0(3)
-        IC      1,0(2)
-        SR      1,0
-strcmp_equal:
-        LR      2,1
-        BR      14
-        
diff --git a/arch/s390/lib/strcmp64.S b/arch/s390/lib/strcmp64.S
deleted file mode 100644 (file)
index 124f3df..0000000
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- *  arch/s390/lib/strcmp.S
- *    S390 strcmp routine
- *
- *  S390 version
- *    Copyright (C) 1999 IBM Deutschland Entwicklung GmbH, IBM Corporation
- *    Author(s): Martin Schwidefsky (schwidefsky@de.ibm.com),
- */
-
-/*
- * R2 = address of compare string
- * R3 = address of test string
- */
-        .globl   strcmp
-strcmp:
-        SGR     0,0
-        SGR     1,1
-        CLST    2,3
-        JO      .-4
-        JE      strcmp_equal
-        IC      0,0(3)
-        IC      1,0(2)
-        SGR     1,0
-strcmp_equal:
-        LGR     2,1
-        BR      14
-        
diff --git a/arch/s390/lib/strcpy.S b/arch/s390/lib/strcpy.S
deleted file mode 100644 (file)
index 1d36b9c..0000000
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- *  arch/s390/kernel/strcpy.S
- *    S390 strcpy routine
- *
- *  S390 version
- *    Copyright (C) 2004 IBM Deutschland Entwicklung GmbH, IBM Corporation
- *    Author(s): Martin Schwidefsky (schwidefsky@de.ibm.com),
- */
-
-/*
- * R2 = address of destination
- * R3 = address of source string
- */
-        .globl   strcpy
-strcpy:
-       sr      %r0,%r0
-0:     mvst    %r2,%r3
-       jo      0b
-       br      %r14
-
diff --git a/arch/s390/lib/strcpy64.S b/arch/s390/lib/strcpy64.S
deleted file mode 100644 (file)
index 06815dc..0000000
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- *  arch/s390/kernel/strcpy.S
- *    S390 strcpy routine
- *
- *  S390 version
- *    Copyright (C) 2004 IBM Deutschland Entwicklung GmbH, IBM Corporation
- *    Author(s): Martin Schwidefsky (schwidefsky@de.ibm.com),
- */
-
-/*
- * R2 = address of destination
- * R3 = address of source string
- */
-        .globl   strcpy
-strcpy:
-       sgr     %r0,%r0
-0:     mvst    %r2,%r3
-       jo      0b
-       br      %r14
-
diff --git a/arch/s390/lib/strncpy.S b/arch/s390/lib/strncpy.S
deleted file mode 100644 (file)
index a3285bd..0000000
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- *  arch/s390/kernel/strncpy.S
- *    S390 strncpy routine
- *
- *  S390 version
- *    Copyright (C) 1999 IBM Deutschland Entwicklung GmbH, IBM Corporation
- *    Author(s): Martin Schwidefsky (schwidefsky@de.ibm.com),
- */
-
-/*
- * R2 = address of destination
- * R3 = address of source string
- * R4 = max number of bytes to copy
- */
-        .globl   strncpy
-strncpy:
-        LR      1,2            # don't touch address in R2
-       LTR     4,4
-        JZ      strncpy_exit   # 0 bytes -> nothing to do
-       SR      0,0
-strncpy_loop:
-        ICM     0,1,0(3)       # ICM sets the cc, IC does not
-       LA      3,1(3)
-        STC     0,0(1)
-       LA      1,1(1)
-        JZ      strncpy_pad    # ICM inserted a 0x00
-        BRCT    4,strncpy_loop # R4 -= 1, jump to strncpy_loop if >  0
-strncpy_exit:
-        BR      14
-strncpy_clear:
-       STC     0,0(1)
-       LA      1,1(1)
-strncpy_pad:
-       BRCT    4,strncpy_clear
-       BR      14
diff --git a/arch/s390/lib/strncpy64.S b/arch/s390/lib/strncpy64.S
deleted file mode 100644 (file)
index 1e455e5..0000000
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- *  arch/s390/kernel/strncpy.S
- *    S390 strncpy routine
- *
- *  S390 version
- *    Copyright (C) 1999 IBM Deutschland Entwicklung GmbH, IBM Corporation
- *    Author(s): Martin Schwidefsky (schwidefsky@de.ibm.com),
- */
-
-/*
- * R2 = address of destination
- * R3 = address of source string
- * R4 = max number of bytes to copy
- */
-        .globl   strncpy
-strncpy:
-        LGR     1,2            # don't touch address in R2
-       LTR     4,4
-        JZ      strncpy_exit   # 0 bytes -> nothing to do
-       SGR     0,0
-strncpy_loop:
-        ICM     0,1,0(3)       # ICM sets the cc, IC does not
-       LA      3,1(3)
-        STC     0,0(1)
-       LA      1,1(1)
-        JZ      strncpy_pad    # ICM inserted a 0x00
-        BRCTG   4,strncpy_loop # R4 -= 1, jump to strncpy_loop if > 0
-strncpy_exit:
-        BR      14
-strncpy_clear:
-       STC     0,0(1)
-       LA      1,1(1)
-strncpy_pad:
-       BRCTG   4,strncpy_clear
-       BR      14
diff --git a/arch/s390/mm/mmap.c b/arch/s390/mm/mmap.c
deleted file mode 100644 (file)
index 1039196..0000000
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
- *  linux/arch/s390/mm/mmap.c
- *
- *  flexible mmap layout support
- *
- * Copyright 2003-2004 Red Hat Inc., Durham, North Carolina.
- * 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
- *
- *
- * Started by Ingo Molnar <mingo@elte.hu>
- */
-
-#include <linux/personality.h>
-#include <linux/mm.h>
-
-/*
- * Top of mmap area (just below the process stack).
- *
- * Leave an at least ~128 MB hole.
- */
-#define MIN_GAP (128*1024*1024)
-#define MAX_GAP (TASK_SIZE/6*5)
-
-static inline unsigned long mmap_base(void)
-{
-       unsigned long gap = current->rlim[RLIMIT_STACK].rlim_cur;
-
-       if (gap < MIN_GAP)
-               gap = MIN_GAP;
-       else if (gap > MAX_GAP)
-               gap = MAX_GAP;
-
-       return TASK_SIZE - (gap & PAGE_MASK);
-}
-
-static inline int mmap_is_legacy(void)
-{
-#ifdef CONFIG_ARCH_S390X
-       /*
-        * Force standard allocation for 64 bit programs.
-        */
-       if (!test_thread_flag(TIF_31BIT))
-               return 1;
-#endif
-       return sysctl_legacy_va_layout ||
-           (current->personality & ADDR_COMPAT_LAYOUT) ||
-           current->rlim[RLIMIT_STACK].rlim_cur == RLIM_INFINITY;
-}
-
-/*
- * This function, called very early during the creation of a new
- * process VM image, sets up which VM layout function to use:
- */
-void arch_pick_mmap_layout(struct mm_struct *mm)
-{
-       /*
-        * Fall back to the standard layout if the personality
-        * bit is set, or if the expected stack growth is unlimited:
-        */
-       if (mmap_is_legacy()) {
-               mm->mmap_base = TASK_UNMAPPED_BASE;
-               mm->get_unmapped_area = arch_get_unmapped_area;
-               mm->unmap_area = arch_unmap_area;
-       } else {
-               mm->mmap_base = mmap_base();
-               mm->get_unmapped_area = arch_get_unmapped_area_topdown;
-               mm->unmap_area = arch_unmap_area_topdown;
-       }
-}
diff --git a/arch/sh/boards/systemh/Makefile b/arch/sh/boards/systemh/Makefile
deleted file mode 100644 (file)
index 858d4d9..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-#
-# Makefile for the SystemH specific parts of the kernel
-#
-
-obj-y   := setup.o irq.o io.o
-
-# XXX: This wants to be consolidated in arch/sh/drivers/pci, and more
-# importantly, with the generic sh7751_pcic_init() code. For now, we'll
-# just abuse the hell out of kbuild, because we can..
-
-obj-$(CONFIG_PCI) += pci.o
-pci-y := ../se/7751/pci.o
-
diff --git a/arch/sh/boards/systemh/io.c b/arch/sh/boards/systemh/io.c
deleted file mode 100644 (file)
index bb10cb6..0000000
+++ /dev/null
@@ -1,283 +0,0 @@
-/* 
- * linux/arch/sh/boards/systemh/io.c
- *
- * Copyright (C) 2001  Ian da Silva, Jeremy Siegel
- * Based largely on io_se.c.
- *
- * I/O routine for Hitachi 7751 Systemh.
- *
- */
-
-#include <linux/kernel.h>
-#include <linux/types.h>
-#include <asm/systemh/7751systemh.h>
-#include <asm/addrspace.h>
-#include <asm/io.h>
-
-#include <linux/pci.h>
-#include "../../drivers/pci/pci-sh7751.h"
-
-/*
- * The 7751 SystemH Engine uses the built-in PCI controller (PCIC)
- * of the 7751 processor, and has a SuperIO accessible on its memory 
- * bus.
- */ 
-
-#define PCIIOBR                (volatile long *)PCI_REG(SH7751_PCIIOBR)
-#define PCIMBR          (volatile long *)PCI_REG(SH7751_PCIMBR)
-#define PCI_IO_AREA    SH7751_PCI_IO_BASE
-#define PCI_MEM_AREA   SH7751_PCI_CONFIG_BASE
-
-#define PCI_IOMAP(adr) (PCI_IO_AREA + (adr & ~SH7751_PCIIOBR_MASK))
-#define ETHER_IOMAP(adr) (0xB3000000 + (adr)) /*map to 16bits access area
-                                                of smc lan chip*/ 
-
-#define maybebadio(name,port) \
-  printk("bad PC-like io %s for port 0x%lx at 0x%08x\n", \
-        #name, (port), (__u32) __builtin_return_address(0))
-
-static inline void delay(void)
-{
-       ctrl_inw(0xa0000000);
-}
-
-static inline volatile __u16 *
-port2adr(unsigned int port)
-{
-       if (port >= 0x2000)
-               return (volatile __u16 *) (PA_MRSHPC + (port - 0x2000));
-#if 0
-       else
-               return (volatile __u16 *) (PA_SUPERIO + (port << 1));
-#endif
-       maybebadio(name,(unsigned long)port);
-       return (volatile __u16*)port;
-}
-
-/* In case someone configures the kernel w/o PCI support: in that */
-/* scenario, don't ever bother to check for PCI-window addresses */
-
-/* NOTE: WINDOW CHECK MAY BE A BIT OFF, HIGH PCIBIOS_MIN_IO WRAPS? */
-#if defined(CONFIG_PCI)
-#define CHECK_SH7751_PCIIO(port) \
-  ((port >= PCIBIOS_MIN_IO) && (port < (PCIBIOS_MIN_IO + SH7751_PCI_IO_SIZE)))
-#else
-#define CHECK_SH7751_PCIIO(port) (0)
-#endif
-
-/*
- * General outline: remap really low stuff [eventually] to SuperIO,
- * stuff in PCI IO space (at or above window at pci.h:PCIBIOS_MIN_IO)
- * is mapped through the PCI IO window.  Stuff with high bits (PXSEG)
- * should be way beyond the window, and is used  w/o translation for
- * compatibility.
- */
-unsigned char sh7751systemh_inb(unsigned long port)
-{
-       if (PXSEG(port))
-               return *(volatile unsigned char *)port;
-       else if (CHECK_SH7751_PCIIO(port))
-               return *(volatile unsigned char *)PCI_IOMAP(port);
-       else if (port <= 0x3F1)
-               return *(volatile unsigned char *)ETHER_IOMAP(port);
-       else
-               return (*port2adr(port))&0xff; 
-}
-
-unsigned char sh7751systemh_inb_p(unsigned long port)
-{
-       unsigned char v;
-
-        if (PXSEG(port))
-                v = *(volatile unsigned char *)port;
-       else if (CHECK_SH7751_PCIIO(port))
-                v = *(volatile unsigned char *)PCI_IOMAP(port);
-       else if (port <= 0x3F1)
-               v = *(volatile unsigned char *)ETHER_IOMAP(port);
-       else
-               v = (*port2adr(port))&0xff; 
-       delay();
-       return v;
-}
-
-unsigned short sh7751systemh_inw(unsigned long port)
-{
-        if (PXSEG(port))
-                return *(volatile unsigned short *)port;
-       else if (CHECK_SH7751_PCIIO(port))
-                return *(volatile unsigned short *)PCI_IOMAP(port);
-       else if (port >= 0x2000)
-               return *port2adr(port);
-       else if (port <= 0x3F1)
-               return *(volatile unsigned int *)ETHER_IOMAP(port);
-       else
-               maybebadio(inw, port);
-       return 0;
-}
-
-unsigned int sh7751systemh_inl(unsigned long port)
-{
-        if (PXSEG(port))
-                return *(volatile unsigned long *)port;
-       else if (CHECK_SH7751_PCIIO(port))
-                return *(volatile unsigned int *)PCI_IOMAP(port);
-       else if (port >= 0x2000)
-               return *port2adr(port);
-       else if (port <= 0x3F1)
-               return *(volatile unsigned int *)ETHER_IOMAP(port);
-       else
-               maybebadio(inl, port);
-       return 0;
-}
-
-void sh7751systemh_outb(unsigned char value, unsigned long port)
-{
-
-        if (PXSEG(port))
-                *(volatile unsigned char *)port = value;
-       else if (CHECK_SH7751_PCIIO(port))
-               *((unsigned char*)PCI_IOMAP(port)) = value;
-       else if (port <= 0x3F1)
-               *(volatile unsigned char *)ETHER_IOMAP(port) = value;
-       else
-               *(port2adr(port)) = value;
-}
-
-void sh7751systemh_outb_p(unsigned char value, unsigned long port)
-{
-        if (PXSEG(port))
-                *(volatile unsigned char *)port = value;
-       else if (CHECK_SH7751_PCIIO(port))
-               *((unsigned char*)PCI_IOMAP(port)) = value;
-       else if (port <= 0x3F1)
-               *(volatile unsigned char *)ETHER_IOMAP(port) = value;
-       else
-               *(port2adr(port)) = value;
-       delay();
-}
-
-void sh7751systemh_outw(unsigned short value, unsigned long port)
-{
-        if (PXSEG(port))
-                *(volatile unsigned short *)port = value;
-       else if (CHECK_SH7751_PCIIO(port))
-               *((unsigned short *)PCI_IOMAP(port)) = value;
-       else if (port >= 0x2000)
-               *port2adr(port) = value;
-       else if (port <= 0x3F1)
-               *(volatile unsigned short *)ETHER_IOMAP(port) = value;
-       else
-               maybebadio(outw, port);
-}
-
-void sh7751systemh_outl(unsigned int value, unsigned long port)
-{
-        if (PXSEG(port))
-                *(volatile unsigned long *)port = value;
-       else if (CHECK_SH7751_PCIIO(port))
-               *((unsigned long*)PCI_IOMAP(port)) = value;
-       else
-               maybebadio(outl, port);
-}
-
-void sh7751systemh_insb(unsigned long port, void *addr, unsigned long count)
-{
-       unsigned char *p = addr;
-       while (count--) *p++ = sh7751systemh_inb(port);
-}
-
-void sh7751systemh_insw(unsigned long port, void *addr, unsigned long count)
-{
-       unsigned short *p = addr;
-       while (count--) *p++ = sh7751systemh_inw(port);
-}
-
-void sh7751systemh_insl(unsigned long port, void *addr, unsigned long count)
-{
-       maybebadio(insl, port);
-}
-
-void sh7751systemh_outsb(unsigned long port, const void *addr, unsigned long count)
-{
-       unsigned char *p = (unsigned char*)addr;
-       while (count--) sh7751systemh_outb(*p++, port);
-}
-
-void sh7751systemh_outsw(unsigned long port, const void *addr, unsigned long count)
-{
-       unsigned short *p = (unsigned short*)addr;
-       while (count--) sh7751systemh_outw(*p++, port);
-}
-
-void sh7751systemh_outsl(unsigned long port, const void *addr, unsigned long count)
-{
-       maybebadio(outsw, port);
-}
-
-/* For read/write calls, just copy generic (pass-thru); PCIMBR is  */
-/* already set up.  For a larger memory space, these would need to */
-/* reset PCIMBR as needed on a per-call basis...                   */
-
-unsigned char sh7751systemh_readb(unsigned long addr)
-{
-       return *(volatile unsigned char*)addr;
-}
-
-unsigned short sh7751systemh_readw(unsigned long addr)
-{
-       return *(volatile unsigned short*)addr;
-}
-
-unsigned int sh7751systemh_readl(unsigned long addr)
-{
-       return *(volatile unsigned long*)addr;
-}
-
-void sh7751systemh_writeb(unsigned char b, unsigned long addr)
-{
-       *(volatile unsigned char*)addr = b;
-}
-
-void sh7751systemh_writew(unsigned short b, unsigned long addr)
-{
-       *(volatile unsigned short*)addr = b;
-}
-
-void sh7751systemh_writel(unsigned int b, unsigned long addr)
-{
-        *(volatile unsigned long*)addr = b;
-}
-
-\f
-
-/* Map ISA bus address to the real address. Only for PCMCIA.  */
-
-/* ISA page descriptor.  */
-static __u32 sh_isa_memmap[256];
-
-#if 0
-static int
-sh_isa_mmap(__u32 start, __u32 length, __u32 offset)
-{
-       int idx;
-
-       if (start >= 0x100000 || (start & 0xfff) || (length != 0x1000))
-               return -1;
-
-       idx = start >> 12;
-       sh_isa_memmap[idx] = 0xb8000000 + (offset &~ 0xfff);
-       printk("sh_isa_mmap: start %x len %x offset %x (idx %x paddr %x)\n",
-              start, length, offset, idx, sh_isa_memmap[idx]);
-       return 0;
-}
-#endif
-
-unsigned long
-sh7751systemh_isa_port2addr(unsigned long offset)
-{
-       int idx;
-
-       idx = (offset >> 12) & 0xff;
-       offset &= 0xfff;
-       return sh_isa_memmap[idx] + offset;
-}
diff --git a/arch/sh/boards/systemh/irq.c b/arch/sh/boards/systemh/irq.c
deleted file mode 100644 (file)
index cc9ea89..0000000
+++ /dev/null
@@ -1,111 +0,0 @@
-/* 
- * linux/arch/sh/boards/systemh/irq.c
- *
- * Copyright (C) 2000  Kazumoto Kojima
- *
- * Hitachi SystemH Support.
- *
- * Modified for 7751 SystemH by
- * Jonathan Short.
- */
-
-#include <linux/config.h>
-#include <linux/init.h>
-#include <linux/irq.h>
-
-#include <linux/hdreg.h>
-#include <linux/ide.h>
-#include <asm/io.h>
-#include <asm/mach/7751systemh.h>
-#include <asm/smc37c93x.h>
-
-/* address of external interrupt mask register
- * address must be set prior to use these (maybe in init_XXX_irq())
- * XXX : is it better to use .config than specifying it in code? */
-static unsigned long *systemh_irq_mask_register = (unsigned long *)0xB3F10004;
-static unsigned long *systemh_irq_request_register = (unsigned long *)0xB3F10000;
-
-/* forward declaration */
-static unsigned int startup_systemh_irq(unsigned int irq);
-static void shutdown_systemh_irq(unsigned int irq);
-static void enable_systemh_irq(unsigned int irq);
-static void disable_systemh_irq(unsigned int irq);
-static void mask_and_ack_systemh(unsigned int);
-static void end_systemh_irq(unsigned int irq);
-
-/* hw_interrupt_type */
-static struct hw_interrupt_type systemh_irq_type = {
-       " SystemH Register",
-       startup_systemh_irq,
-       shutdown_systemh_irq,
-       enable_systemh_irq,
-       disable_systemh_irq,
-       mask_and_ack_systemh,
-       end_systemh_irq
-};
-
-static unsigned int startup_systemh_irq(unsigned int irq)
-{ 
-       enable_systemh_irq(irq);
-       return 0; /* never anything pending */
-}
-
-static void shutdown_systemh_irq(unsigned int irq)
-{
-       disable_systemh_irq(irq);
-}
-
-static void disable_systemh_irq(unsigned int irq)
-{
-       if (systemh_irq_mask_register) {
-               unsigned long flags;
-               unsigned long val, mask = 0x01 << 1;
-
-               /* Clear the "irq"th bit in the mask and set it in the request */
-               local_irq_save(flags);
-
-               val = ctrl_inl((unsigned long)systemh_irq_mask_register);
-               val &= ~mask;
-               ctrl_outl(val, (unsigned long)systemh_irq_mask_register);
-
-               val = ctrl_inl((unsigned long)systemh_irq_request_register);
-               val |= mask;
-               ctrl_outl(val, (unsigned long)systemh_irq_request_register);
-
-               local_irq_restore(flags);
-       }
-}
-
-static void enable_systemh_irq(unsigned int irq)
-{
-       if (systemh_irq_mask_register) {
-               unsigned long flags;
-               unsigned long val, mask = 0x01 << 1;
-
-               /* Set "irq"th bit in the mask register */
-               local_irq_save(flags);
-               val = ctrl_inl((unsigned long)systemh_irq_mask_register);
-               val |= mask;
-               ctrl_outl(val, (unsigned long)systemh_irq_mask_register);
-               local_irq_restore(flags);
-       }
-}
-
-static void mask_and_ack_systemh(unsigned int irq)
-{
-       disable_systemh_irq(irq);
-}
-
-static void end_systemh_irq(unsigned int irq)
-{
-       if (!(irq_desc[irq].status & (IRQ_DISABLED|IRQ_INPROGRESS)))
-               enable_systemh_irq(irq);
-}
-
-void make_systemh_irq(unsigned int irq)
-{
-       disable_irq_nosync(irq);
-       irq_desc[irq].handler = &systemh_irq_type;
-       disable_systemh_irq(irq);
-}
-
diff --git a/arch/sh/boards/systemh/setup.c b/arch/sh/boards/systemh/setup.c
deleted file mode 100644 (file)
index 7f26345..0000000
+++ /dev/null
@@ -1,80 +0,0 @@
-/* 
- * linux/arch/sh/boards/systemh/setup.c
- *
- * Copyright (C) 2000  Kazumoto Kojima
- * Copyright (C) 2003  Paul Mundt
- *
- * Hitachi SystemH Support.
- *
- * Modified for 7751 SystemH by Jonathan Short.
- *
- * Rewritten for 2.6 by Paul Mundt.
- *
- * This file is subject to the terms and conditions of the GNU General Public
- * License.  See the file "COPYING" in the main directory of this archive
- * for more details.
- */
-#include <linux/init.h>
-#include <asm/mach/7751systemh.h>
-#include <asm/mach/io.h>
-#include <asm/machvec.h>
-
-extern void make_systemh_irq(unsigned int irq);
-
-const char *get_system_type(void)
-{
-       return "7751 SystemH";
-}
-
-/*
- * Initialize IRQ setting
- */
-void __init init_7751systemh_IRQ(void)
-{
-/*     make_ipr_irq(10, BCR_ILCRD, 1, 0x0f-10); LAN */
-/*     make_ipr_irq(14, BCR_ILCRA, 2, 0x0f-4); */
-       make_systemh_irq(0xb);  /* Ethernet interrupt */
-}
-
-struct sh_machine_vector mv_7751systemh __initmv = {
-       .mv_nr_irqs             = 72,
-
-       .mv_inb                 = sh7751systemh_inb,
-       .mv_inw                 = sh7751systemh_inw,
-       .mv_inl                 = sh7751systemh_inl,
-       .mv_outb                = sh7751systemh_outb,
-       .mv_outw                = sh7751systemh_outw,
-       .mv_outl                = sh7751systemh_outl,
-
-       .mv_inb_p               = sh7751systemh_inb_p,
-       .mv_inw_p               = sh7751systemh_inw,
-       .mv_inl_p               = sh7751systemh_inl,
-       .mv_outb_p              = sh7751systemh_outb_p,
-       .mv_outw_p              = sh7751systemh_outw,
-       .mv_outl_p              = sh7751systemh_outl,
-
-       .mv_insb                = sh7751systemh_insb,
-       .mv_insw                = sh7751systemh_insw,
-       .mv_insl                = sh7751systemh_insl,
-       .mv_outsb               = sh7751systemh_outsb,
-       .mv_outsw               = sh7751systemh_outsw,
-       .mv_outsl               = sh7751systemh_outsl,
-
-       .mv_readb               = sh7751systemh_readb,
-       .mv_readw               = sh7751systemh_readw,
-       .mv_readl               = sh7751systemh_readl,
-       .mv_writeb              = sh7751systemh_writeb,
-       .mv_writew              = sh7751systemh_writew,
-       .mv_writel              = sh7751systemh_writel,
-
-       .mv_isa_port2addr       = sh7751systemh_isa_port2addr,
-
-       .mv_init_irq            = init_7751systemh_IRQ,
-};
-ALIAS_MV(7751systemh)
-
-int __init platform_setup(void)
-{
-       return 0;
-}
-
diff --git a/arch/sparc64/lib/clear_page.S b/arch/sparc64/lib/clear_page.S
deleted file mode 100644 (file)
index b59884e..0000000
+++ /dev/null
@@ -1,105 +0,0 @@
-/* clear_page.S: UltraSparc optimized clear page.
- *
- * Copyright (C) 1996, 1998, 1999, 2000, 2004 David S. Miller (davem@redhat.com)
- * Copyright (C) 1997 Jakub Jelinek (jakub@redhat.com)
- */
-
-#include <asm/visasm.h>
-#include <asm/thread_info.h>
-#include <asm/page.h>
-#include <asm/pgtable.h>
-#include <asm/spitfire.h>
-
-       /* What we used to do was lock a TLB entry into a specific
-        * TLB slot, clear the page with interrupts disabled, then
-        * restore the original TLB entry.  This was great for
-        * disturbing the TLB as little as possible, but it meant
-        * we had to keep interrupts disabled for a long time.
-        *
-        * Now, we simply use the normal TLB loading mechanism,
-        * and this makes the cpu choose a slot all by itself.
-        * Then we do a normal TLB flush on exit.  We need only
-        * disable preemption during the clear.
-        */
-
-#define TTE_BITS_TOP   (_PAGE_VALID | _PAGE_SZBITS)
-#define TTE_BITS_BOTTOM        (_PAGE_CP | _PAGE_CV | _PAGE_P | _PAGE_L | _PAGE_W)
-
-       .text
-
-       .globl          _clear_page
-_clear_page:           /* %o0=dest */
-       ba,pt           %xcc, clear_page_common
-        clr            %o4
-
-       /* This thing is pretty important, it shows up
-        * on the profiles via do_anonymous_page().
-        */
-       .align          32
-       .globl          clear_user_page
-clear_user_page:       /* %o0=dest, %o1=vaddr */
-       lduw            [%g6 + TI_PRE_COUNT], %o2
-       sethi           %uhi(PAGE_OFFSET), %g2
-       sethi           %hi(PAGE_SIZE), %o4
-
-       sllx            %g2, 32, %g2
-       sethi           %uhi(TTE_BITS_TOP), %g3
-
-       sllx            %g3, 32, %g3
-       sub             %o0, %g2, %g1           ! paddr
-
-       or              %g3, TTE_BITS_BOTTOM, %g3
-       and             %o1, %o4, %o0           ! vaddr D-cache alias bit
-
-       or              %g1, %g3, %g1           ! TTE data
-       sethi           %hi(TLBTEMP_BASE), %o3
-
-       add             %o2, 1, %o4
-       add             %o0, %o3, %o0           ! TTE vaddr
-
-       /* Disable preemption.  */
-       mov             TLB_TAG_ACCESS, %g3
-       stw             %o4, [%g6 + TI_PRE_COUNT]
-
-       /* Load TLB entry.  */
-       rdpr            %pstate, %o4
-       wrpr            %o4, PSTATE_IE, %pstate
-       stxa            %o0, [%g3] ASI_DMMU
-       stxa            %g1, [%g0] ASI_DTLB_DATA_IN
-       flush           %g6
-       wrpr            %o4, 0x0, %pstate
-
-       mov             1, %o4
-
-clear_page_common:
-       VISEntryHalf
-       membar          #StoreLoad | #StoreStore | #LoadStore
-       fzero           %f0
-       sethi           %hi(PAGE_SIZE/64), %o1
-       mov             %o0, %g1                ! remember vaddr for tlbflush
-       fzero           %f2
-       or              %o1, %lo(PAGE_SIZE/64), %o1
-       faddd           %f0, %f2, %f4
-       fmuld           %f0, %f2, %f6
-       faddd           %f0, %f2, %f8
-       fmuld           %f0, %f2, %f10
-
-       faddd           %f0, %f2, %f12
-       fmuld           %f0, %f2, %f14
-1:     stda            %f0, [%o0 + %g0] ASI_BLK_P
-       subcc           %o1, 1, %o1
-       bne,pt          %icc, 1b
-        add            %o0, 0x40, %o0
-       membar          #Sync
-       VISExitHalf
-
-       brz,pn          %o4, out
-        nop
-
-       stxa            %g0, [%g1] ASI_DMMU_DEMAP
-       membar          #Sync
-       stw             %o2, [%g6 + TI_PRE_COUNT]
-
-out:   retl
-        nop
-
diff --git a/arch/sparc64/lib/copy_page.S b/arch/sparc64/lib/copy_page.S
deleted file mode 100644 (file)
index 862eefb..0000000
+++ /dev/null
@@ -1,239 +0,0 @@
-/* clear_page.S: UltraSparc optimized copy page.
- *
- * Copyright (C) 1996, 1998, 1999, 2000, 2004 David S. Miller (davem@redhat.com)
- * Copyright (C) 1997 Jakub Jelinek (jakub@redhat.com)
- */
-
-#include <asm/visasm.h>
-#include <asm/thread_info.h>
-#include <asm/page.h>
-#include <asm/pgtable.h>
-#include <asm/spitfire.h>
-#include <asm/head.h>
-
-       /* What we used to do was lock a TLB entry into a specific
-        * TLB slot, clear the page with interrupts disabled, then
-        * restore the original TLB entry.  This was great for
-        * disturbing the TLB as little as possible, but it meant
-        * we had to keep interrupts disabled for a long time.
-        *
-        * Now, we simply use the normal TLB loading mechanism,
-        * and this makes the cpu choose a slot all by itself.
-        * Then we do a normal TLB flush on exit.  We need only
-        * disable preemption during the clear.
-        */
-
-#define TTE_BITS_TOP   (_PAGE_VALID | _PAGE_SZBITS)
-#define TTE_BITS_BOTTOM        (_PAGE_CP | _PAGE_CV | _PAGE_P | _PAGE_L | _PAGE_W)
-#define        DCACHE_SIZE     (PAGE_SIZE * 2)
-
-#if (PAGE_SHIFT == 13) || (PAGE_SHIFT == 19)
-#define PAGE_SIZE_REM  0x80
-#elif (PAGE_SHIFT == 16) || (PAGE_SHIFT == 22)
-#define PAGE_SIZE_REM  0x100
-#else
-#error Wrong PAGE_SHIFT specified
-#endif
-
-#define TOUCH(reg0, reg1, reg2, reg3, reg4, reg5, reg6, reg7)  \
-       fmovd   %reg0, %f48;    fmovd   %reg1, %f50;            \
-       fmovd   %reg2, %f52;    fmovd   %reg3, %f54;            \
-       fmovd   %reg4, %f56;    fmovd   %reg5, %f58;            \
-       fmovd   %reg6, %f60;    fmovd   %reg7, %f62;
-
-       .text
-
-       .align          32
-       .globl          copy_user_page
-copy_user_page:                /* %o0=dest, %o1=src, %o2=vaddr */
-       lduw            [%g6 + TI_PRE_COUNT], %o4
-       sethi           %uhi(PAGE_OFFSET), %g2
-       sethi           %hi(PAGE_SIZE), %o3
-
-       sllx            %g2, 32, %g2
-       sethi           %uhi(TTE_BITS_TOP), %g3
-
-       sllx            %g3, 32, %g3
-       sub             %o0, %g2, %g1           ! dest paddr
-
-       sub             %o1, %g2, %g2           ! src paddr
-       or              %g3, TTE_BITS_BOTTOM, %g3
-
-       and             %o2, %o3, %o0           ! vaddr D-cache alias bit
-       or              %g1, %g3, %g1           ! dest TTE data
-
-       or              %g2, %g3, %g2           ! src TTE data
-       sethi           %hi(TLBTEMP_BASE), %o3
-
-       sethi           %hi(DCACHE_SIZE), %o1
-       add             %o0, %o3, %o0           ! dest TTE vaddr
-
-       add             %o4, 1, %o2
-       add             %o0, %o1, %o1           ! src TTE vaddr
-
-       /* Disable preemption.  */
-       mov             TLB_TAG_ACCESS, %g3
-       stw             %o2, [%g6 + TI_PRE_COUNT]
-
-       /* Load TLB entries.  */
-       rdpr            %pstate, %o2
-       wrpr            %o2, PSTATE_IE, %pstate
-       stxa            %o0, [%g3] ASI_DMMU
-       stxa            %g1, [%g0] ASI_DTLB_DATA_IN
-       membar          #Sync
-       stxa            %o1, [%g3] ASI_DMMU
-       stxa            %g2, [%g0] ASI_DTLB_DATA_IN
-       membar          #Sync
-       wrpr            %o2, 0x0, %pstate
-
-       BRANCH_IF_ANY_CHEETAH(g3,o2,1f)
-       ba,pt           %xcc, 9f
-        nop
-
-1:
-       VISEntryHalf
-       membar          #StoreLoad | #StoreStore | #LoadStore
-       sethi           %hi((PAGE_SIZE/64)-2), %o2
-       mov             %o0, %g1
-       prefetch        [%o1 + 0x000], #one_read
-       or              %o2, %lo((PAGE_SIZE/64)-2), %o2
-       prefetch        [%o1 + 0x040], #one_read
-       prefetch        [%o1 + 0x080], #one_read
-       prefetch        [%o1 + 0x0c0], #one_read
-       ldd             [%o1 + 0x000], %f0
-       prefetch        [%o1 + 0x100], #one_read
-       ldd             [%o1 + 0x008], %f2
-       prefetch        [%o1 + 0x140], #one_read
-       ldd             [%o1 + 0x010], %f4
-       prefetch        [%o1 + 0x180], #one_read
-       fmovd           %f0, %f16
-       ldd             [%o1 + 0x018], %f6
-       fmovd           %f2, %f18
-       ldd             [%o1 + 0x020], %f8
-       fmovd           %f4, %f20
-       ldd             [%o1 + 0x028], %f10
-       fmovd           %f6, %f22
-       ldd             [%o1 + 0x030], %f12
-       fmovd           %f8, %f24
-       ldd             [%o1 + 0x038], %f14
-       fmovd           %f10, %f26
-       ldd             [%o1 + 0x040], %f0
-1:     ldd             [%o1 + 0x048], %f2
-       fmovd           %f12, %f28
-       ldd             [%o1 + 0x050], %f4
-       fmovd           %f14, %f30
-       stda            %f16, [%o0] ASI_BLK_P
-       ldd             [%o1 + 0x058], %f6
-       fmovd           %f0, %f16
-       ldd             [%o1 + 0x060], %f8
-       fmovd           %f2, %f18
-       ldd             [%o1 + 0x068], %f10
-       fmovd           %f4, %f20
-       ldd             [%o1 + 0x070], %f12
-       fmovd           %f6, %f22
-       ldd             [%o1 + 0x078], %f14
-       fmovd           %f8, %f24
-       ldd             [%o1 + 0x080], %f0
-       prefetch        [%o1 + 0x180], #one_read
-       fmovd           %f10, %f26
-       subcc           %o2, 1, %o2
-       add             %o0, 0x40, %o0
-       bne,pt          %xcc, 1b
-        add            %o1, 0x40, %o1
-
-       ldd             [%o1 + 0x048], %f2
-       fmovd           %f12, %f28
-       ldd             [%o1 + 0x050], %f4
-       fmovd           %f14, %f30
-       stda            %f16, [%o0] ASI_BLK_P
-       ldd             [%o1 + 0x058], %f6
-       fmovd           %f0, %f16
-       ldd             [%o1 + 0x060], %f8
-       fmovd           %f2, %f18
-       ldd             [%o1 + 0x068], %f10
-       fmovd           %f4, %f20
-       ldd             [%o1 + 0x070], %f12
-       fmovd           %f6, %f22
-       add             %o0, 0x40, %o0
-       ldd             [%o1 + 0x078], %f14
-       fmovd           %f8, %f24
-       fmovd           %f10, %f26
-       fmovd           %f12, %f28
-       fmovd           %f14, %f30
-       stda            %f16, [%o0] ASI_BLK_P
-       membar          #Sync
-       VISExitHalf
-       ba,pt           %xcc, 5f
-        nop
-
-9:
-       VISEntry
-       ldub            [%g6 + TI_FAULT_CODE], %g3
-       mov             %o0, %g1
-       cmp             %g3, 0
-       rd              %asi, %g3
-       be,a,pt         %icc, 1f
-        wr             %g0, ASI_BLK_P, %asi
-       wr              %g0, ASI_BLK_COMMIT_P, %asi
-1:     ldda            [%o1] ASI_BLK_P, %f0
-       add             %o1, 0x40, %o1
-       ldda            [%o1] ASI_BLK_P, %f16
-       add             %o1, 0x40, %o1
-       sethi           %hi(PAGE_SIZE), %o2
-1:     TOUCH(f0, f2, f4, f6, f8, f10, f12, f14)
-       ldda            [%o1] ASI_BLK_P, %f32
-       stda            %f48, [%o0] %asi
-       add             %o1, 0x40, %o1
-       sub             %o2, 0x40, %o2
-       add             %o0, 0x40, %o0
-       TOUCH(f16, f18, f20, f22, f24, f26, f28, f30)
-       ldda            [%o1] ASI_BLK_P, %f0
-       stda            %f48, [%o0] %asi
-       add             %o1, 0x40, %o1
-       sub             %o2, 0x40, %o2
-       add             %o0, 0x40, %o0
-       TOUCH(f32, f34, f36, f38, f40, f42, f44, f46)
-       ldda            [%o1] ASI_BLK_P, %f16
-       stda            %f48, [%o0] %asi
-       sub             %o2, 0x40, %o2
-       add             %o1, 0x40, %o1
-       cmp             %o2, PAGE_SIZE_REM
-       bne,pt          %xcc, 1b
-        add            %o0, 0x40, %o0
-#if (PAGE_SHIFT == 16) || (PAGE_SHIFT == 22)
-       TOUCH(f0, f2, f4, f6, f8, f10, f12, f14)
-       ldda            [%o1] ASI_BLK_P, %f32
-       stda            %f48, [%o0] %asi
-       add             %o1, 0x40, %o1
-       sub             %o2, 0x40, %o2
-       add             %o0, 0x40, %o0
-       TOUCH(f16, f18, f20, f22, f24, f26, f28, f30)
-       ldda            [%o1] ASI_BLK_P, %f0
-       stda            %f48, [%o0] %asi
-       add             %o1, 0x40, %o1
-       sub             %o2, 0x40, %o2
-       add             %o0, 0x40, %o0
-       membar          #Sync
-       stda            %f32, [%o0] %asi
-       add             %o0, 0x40, %o0
-       stda            %f0, [%o0] %asi
-#else
-       membar          #Sync
-       stda            %f0, [%o0] %asi
-       add             %o0, 0x40, %o0
-       stda            %f16, [%o0] %asi
-#endif
-       membar          #Sync
-       wr              %g3, 0x0, %asi
-       VISExit
-
-5:
-       stxa            %g0, [%g1] ASI_DMMU_DEMAP
-       membar          #Sync
-
-       sethi           %hi(DCACHE_SIZE), %g2
-       stxa            %g0, [%g1 + %g2] ASI_DMMU_DEMAP
-       membar          #Sync
-
-       retl
-        stw            %o4, [%g6 + TI_PRE_COUNT]
diff --git a/arch/sparc64/mm/tlb.c b/arch/sparc64/mm/tlb.c
deleted file mode 100644 (file)
index e2d79fc..0000000
+++ /dev/null
@@ -1,158 +0,0 @@
-/* arch/sparc64/mm/tlb.c
- *
- * Copyright (C) 2004 David S. Miller <davem@redhat.com>
- */
-
-#include <linux/kernel.h>
-#include <linux/init.h>
-#include <linux/percpu.h>
-#include <linux/mm.h>
-#include <linux/swap.h>
-
-#include <asm/pgtable.h>
-#include <asm/pgalloc.h>
-#include <asm/tlbflush.h>
-#include <asm/cacheflush.h>
-#include <asm/mmu_context.h>
-#include <asm/tlb.h>
-
-/* Heavily inspired by the ppc64 code.  */
-
-DEFINE_PER_CPU(struct mmu_gather, mmu_gathers) =
-       { NULL, 0, 0, 0, 0, 0, { 0 }, { NULL }, };
-
-void flush_tlb_pending(void)
-{
-       struct mmu_gather *mp = &__get_cpu_var(mmu_gathers);
-
-       if (mp->tlb_nr) {
-               unsigned long context = mp->mm->context;
-
-               if (CTX_VALID(context)) {
-#ifdef CONFIG_SMP
-                       smp_flush_tlb_pending(mp->mm, mp->tlb_nr,
-                                             &mp->vaddrs[0]);
-#else
-                       __flush_tlb_pending(CTX_HWBITS(context), mp->tlb_nr,
-                                           &mp->vaddrs[0]);
-#endif
-               }
-               mp->tlb_nr = 0;
-       }
-}
-
-void tlb_batch_add(pte_t *ptep, pte_t orig)
-{
-       struct mmu_gather *mp = &__get_cpu_var(mmu_gathers);
-       struct page *ptepage;
-       struct mm_struct *mm;
-       unsigned long vaddr, nr;
-
-       ptepage = virt_to_page(ptep);
-       mm = (struct mm_struct *) ptepage->mapping;
-
-       /* It is more efficient to let flush_tlb_kernel_range()
-        * handle these cases.
-        */
-       if (mm == &init_mm)
-               return;
-
-       vaddr = ptepage->index +
-               (((unsigned long)ptep & ~PAGE_MASK) * PTRS_PER_PTE);
-       if (pte_exec(orig))
-               vaddr |= 0x1UL;
-
-       if (pte_dirty(orig)) {
-               unsigned long paddr, pfn = pte_pfn(orig);
-               struct address_space *mapping;
-               struct page *page;
-
-               if (!pfn_valid(pfn))
-                       goto no_cache_flush;
-
-               page = pfn_to_page(pfn);
-               if (PageReserved(page))
-                       goto no_cache_flush;
-
-               /* A real file page? */
-               mapping = page_mapping(page);
-               if (!mapping)
-                       goto no_cache_flush;
-
-               paddr = (unsigned long) page_address(page);
-               if ((paddr ^ vaddr) & (1 << 13))
-                       flush_dcache_page_all(mm, page);
-       }
-
-no_cache_flush:
-       if (mp->tlb_frozen)
-               return;
-
-       nr = mp->tlb_nr;
-
-       if (unlikely(nr != 0 && mm != mp->mm)) {
-               flush_tlb_pending();
-               nr = 0;
-       }
-
-       if (nr == 0)
-               mp->mm = mm;
-
-       mp->vaddrs[nr] = vaddr;
-       mp->tlb_nr = ++nr;
-       if (nr >= TLB_BATCH_NR)
-               flush_tlb_pending();
-}
-
-void flush_tlb_pgtables(struct mm_struct *mm, unsigned long start, unsigned long end)
-{
-       struct mmu_gather *mp = &__get_cpu_var(mmu_gathers);
-       unsigned long nr = mp->tlb_nr;
-       long s = start, e = end, vpte_base;
-
-       if (mp->tlb_frozen)
-               return;
-
-       /* Nobody should call us with start below VM hole and end above.
-        * See if it is really true.
-        */
-       BUG_ON(s > e);
-
-#if 0
-       /* Currently free_pgtables guarantees this.  */
-       s &= PMD_MASK;
-       e = (e + PMD_SIZE - 1) & PMD_MASK;
-#endif
-       vpte_base = (tlb_type == spitfire ?
-                    VPTE_BASE_SPITFIRE :
-                    VPTE_BASE_CHEETAH);
-
-       if (unlikely(nr != 0 && mm != mp->mm)) {
-               flush_tlb_pending();
-               nr = 0;
-       }
-
-       if (nr == 0)
-               mp->mm = mm;
-
-       start = vpte_base + (s >> (PAGE_SHIFT - 3));
-       end = vpte_base + (e >> (PAGE_SHIFT - 3));
-       while (start < end) {
-               mp->vaddrs[nr] = start;
-               mp->tlb_nr = ++nr;
-               if (nr >= TLB_BATCH_NR) {
-                       flush_tlb_pending();
-                       nr = 0;
-               }
-               start += PAGE_SIZE;
-       }
-       if (nr)
-               flush_tlb_pending();
-}
-
-unsigned long __ptrs_per_pmd(void)
-{
-       if (test_thread_flag(TIF_32BIT))
-               return (1UL << (32 - (PAGE_SHIFT-3) - PAGE_SHIFT));
-       return REAL_PTRS_PER_PMD;
-}
diff --git a/arch/um/drivers/cow.h b/arch/um/drivers/cow.h
deleted file mode 100644 (file)
index d875d04..0000000
+++ /dev/null
@@ -1,41 +0,0 @@
-#ifndef __COW_H__
-#define __COW_H__
-
-#include <asm/types.h>
-
-#if __BYTE_ORDER == __BIG_ENDIAN
-# define ntohll(x) (x)
-# define htonll(x) (x)
-#elif __BYTE_ORDER == __LITTLE_ENDIAN
-# define ntohll(x)  bswap_64(x)
-# define htonll(x)  bswap_64(x)
-#else
-#error "__BYTE_ORDER not defined"
-#endif
-
-extern int init_cow_file(int fd, char *cow_file, char *backing_file, 
-                        int sectorsize, int alignment, int *bitmap_offset_out, 
-                        unsigned long *bitmap_len_out, int *data_offset_out);
-
-extern int file_reader(__u64 offset, char *buf, int len, void *arg);
-extern int read_cow_header(int (*reader)(__u64, char *, int, void *), 
-                          void *arg, __u32 *version_out, 
-                          char **backing_file_out, time_t *mtime_out, 
-                          __u64 *size_out, int *sectorsize_out, 
-                          __u32 *align_out, int *bitmap_offset_out);
-
-extern int write_cow_header(char *cow_file, int fd, char *backing_file, 
-                           int sectorsize, int alignment, long long *size);
-
-extern void cow_sizes(int version, __u64 size, int sectorsize, int align,
-                     int bitmap_offset, unsigned long *bitmap_len_out, 
-                     int *data_offset_out);
-
-#endif
-
-/*
- * ---------------------------------------------------------------------------
- * Local variables:
- * c-file-style: "linux"
- * End:
- */
diff --git a/arch/um/drivers/cow_user.c b/arch/um/drivers/cow_user.c
deleted file mode 100644 (file)
index 014c2c8..0000000
+++ /dev/null
@@ -1,375 +0,0 @@
-#include <stddef.h>
-#include <string.h>
-#include <errno.h>
-#include <unistd.h>
-#include <byteswap.h>
-#include <sys/time.h>
-#include <sys/param.h>
-#include <sys/user.h>
-#include <netinet/in.h>
-
-#include "os.h"
-
-#include "cow.h"
-#include "cow_sys.h"
-
-#define PATH_LEN_V1 256
-
-struct cow_header_v1 {
-       int magic;
-       int version;
-       char backing_file[PATH_LEN_V1];
-       time_t mtime;
-       __u64 size;
-       int sectorsize;
-};
-
-#define PATH_LEN_V2 MAXPATHLEN
-
-struct cow_header_v2 {
-       unsigned long magic;
-       unsigned long version;
-       char backing_file[PATH_LEN_V2];
-       time_t mtime;
-       __u64 size;
-       int sectorsize;
-};
-
-/* Define PATH_LEN_V3 as the usual value of MAXPATHLEN, just hard-code it in 
- * case other systems have different values for MAXPATHLEN
- */
-#define PATH_LEN_V3 4096
-
-/* Changes from V2 - 
- *     PATH_LEN_V3 as described above
- *     Explicitly specify field bit lengths for systems with different
- *             lengths for the usual C types.  Not sure whether char or
- *             time_t should be changed, this can be changed later without
- *             breaking compatibility
- *     Add alignment field so that different alignments can be used for the
- *             bitmap and data
- *     Add cow_format field to allow for the possibility of different ways
- *             of specifying the COW blocks.  For now, the only value is 0,
- *             for the traditional COW bitmap.
- *     Move the backing_file field to the end of the header.  This allows
- *             for the possibility of expanding it into the padding required
- *             by the bitmap alignment.
- *     The bitmap and data portions of the file will be aligned as specified
- *             by the alignment field.  This is to allow COW files to be
- *             put on devices with restrictions on access alignments, such as
- *             /dev/raw, with a 512 byte alignment restriction.  This also
- *             allows the data to be more aligned more strictly than on
- *             sector boundaries.  This is needed for ubd-mmap, which needs
- *             the data to be page aligned.
- *     Fixed (finally!) the rounding bug
- */
-
-struct cow_header_v3 {
-       __u32 magic;
-       __u32 version;
-       time_t mtime;
-       __u64 size;
-       __u32 sectorsize;
-       __u32 alignment;
-       __u32 cow_format;
-       char backing_file[PATH_LEN_V3];
-};
-
-/* COW format definitions - for now, we have only the usual COW bitmap */
-#define COW_BITMAP 0
-
-union cow_header {
-       struct cow_header_v1 v1;
-       struct cow_header_v2 v2;
-       struct cow_header_v3 v3;
-};
-
-#define COW_MAGIC 0x4f4f4f4d  /* MOOO */
-#define COW_VERSION 3
-
-#define DIV_ROUND(x, len) (((x) + (len) - 1) / (len))
-#define ROUND_UP(x, align) DIV_ROUND(x, align) * (align)
-
-void cow_sizes(int version, __u64 size, int sectorsize, int align, 
-              int bitmap_offset, unsigned long *bitmap_len_out, 
-              int *data_offset_out)
-{
-       if(version < 3){
-               *bitmap_len_out = (size + sectorsize - 1) / (8 * sectorsize);
-
-               *data_offset_out = bitmap_offset + *bitmap_len_out;
-               *data_offset_out = (*data_offset_out + sectorsize - 1) / 
-                       sectorsize;
-               *data_offset_out *= sectorsize;
-       }
-       else {
-               *bitmap_len_out = DIV_ROUND(size, sectorsize);
-               *bitmap_len_out = DIV_ROUND(*bitmap_len_out, 8);
-
-               *data_offset_out = bitmap_offset + *bitmap_len_out;
-               *data_offset_out = ROUND_UP(*data_offset_out, align);
-       }
-}
-
-static int absolutize(char *to, int size, char *from)
-{
-       char save_cwd[256], *slash;
-       int remaining;
-
-       if(getcwd(save_cwd, sizeof(save_cwd)) == NULL) {
-               cow_printf("absolutize : unable to get cwd - errno = %d\n", 
-                          errno);
-               return(-1);
-       }
-       slash = strrchr(from, '/');
-       if(slash != NULL){
-               *slash = '\0';
-               if(chdir(from)){
-                       *slash = '/';
-                       cow_printf("absolutize : Can't cd to '%s' - " 
-                                  "errno = %d\n", from, errno);
-                       return(-1);
-               }
-               *slash = '/';
-               if(getcwd(to, size) == NULL){
-                       cow_printf("absolutize : unable to get cwd of '%s' - "
-                              "errno = %d\n", from, errno);
-                       return(-1);
-               }
-               remaining = size - strlen(to);
-               if(strlen(slash) + 1 > remaining){
-                       cow_printf("absolutize : unable to fit '%s' into %d "
-                              "chars\n", from, size);
-                       return(-1);
-               }
-               strcat(to, slash);
-       }
-       else {
-               if(strlen(save_cwd) + 1 + strlen(from) + 1 > size){
-                       cow_printf("absolutize : unable to fit '%s' into %d "
-                              "chars\n", from, size);
-                       return(-1);
-               }
-               strcpy(to, save_cwd);
-               strcat(to, "/");
-               strcat(to, from);
-       }
-       chdir(save_cwd);
-       return(0);
-}
-
-int write_cow_header(char *cow_file, int fd, char *backing_file, 
-                    int sectorsize, int alignment, long long *size)
-{
-       struct cow_header_v3 *header;
-       unsigned long modtime;
-       int err;
-
-       err = cow_seek_file(fd, 0);
-       if(err < 0){
-               cow_printf("write_cow_header - lseek failed, err = %d\n", -err);
-               goto out;
-       }
-
-       err = -ENOMEM;
-       header = cow_malloc(sizeof(*header));
-       if(header == NULL){
-               cow_printf("Failed to allocate COW V3 header\n");
-               goto out;
-       }
-       header->magic = htonl(COW_MAGIC);
-       header->version = htonl(COW_VERSION);
-
-       err = -EINVAL;
-       if(strlen(backing_file) > sizeof(header->backing_file) - 1){
-               cow_printf("Backing file name \"%s\" is too long - names are "
-                          "limited to %d characters\n", backing_file, 
-                          sizeof(header->backing_file) - 1);
-               goto out_free;
-       }
-
-       if(absolutize(header->backing_file, sizeof(header->backing_file), 
-                     backing_file))
-               goto out_free;
-
-       err = os_file_modtime(header->backing_file, &modtime);
-       if(err < 0){
-               cow_printf("Backing file '%s' mtime request failed, "
-                          "err = %d\n", header->backing_file, -err);
-               goto out_free;
-       }
-
-       err = cow_file_size(header->backing_file, size);
-       if(err < 0){
-               cow_printf("Couldn't get size of backing file '%s', "
-                          "err = %d\n", header->backing_file, -err);
-               goto out_free;
-       }
-
-       header->mtime = htonl(modtime);
-       header->size = htonll(*size);
-       header->sectorsize = htonl(sectorsize);
-       header->alignment = htonl(alignment);
-       header->cow_format = COW_BITMAP;
-
-       err = os_write_file(fd, header, sizeof(*header));
-       if(err != sizeof(*header)){
-               cow_printf("Write of header to new COW file '%s' failed, "
-                          "err = %d\n", cow_file, -err);
-               goto out_free;
-       }
-       err = 0;
- out_free:
-       cow_free(header);
- out:
-       return(err);
-}
-
-int file_reader(__u64 offset, char *buf, int len, void *arg)
-{
-       int fd = *((int *) arg);
-
-       return(pread(fd, buf, len, offset));
-}
-
-/* XXX Need to sanity-check the values read from the header */
-
-int read_cow_header(int (*reader)(__u64, char *, int, void *), void *arg, 
-                   __u32 *version_out, char **backing_file_out, 
-                   time_t *mtime_out, __u64 *size_out, 
-                   int *sectorsize_out, __u32 *align_out, 
-                   int *bitmap_offset_out)
-{
-       union cow_header *header;
-       char *file;
-       int err, n;
-       unsigned long version, magic;
-
-       header = cow_malloc(sizeof(*header));
-       if(header == NULL){
-               cow_printf("read_cow_header - Failed to allocate header\n");
-               return(-ENOMEM);
-       }
-       err = -EINVAL;
-       n = (*reader)(0, (char *) header, sizeof(*header), arg);
-       if(n < offsetof(typeof(header->v1), backing_file)){
-               cow_printf("read_cow_header - short header\n");
-               goto out;
-       }
-
-       magic = header->v1.magic;
-       if(magic == COW_MAGIC) {
-               version = header->v1.version;
-       }
-       else if(magic == ntohl(COW_MAGIC)){
-               version = ntohl(header->v1.version);
-       }
-       /* No error printed because the non-COW case comes through here */
-       else goto out;
-
-       *version_out = version;
-
-       if(version == 1){
-               if(n < sizeof(header->v1)){
-                       cow_printf("read_cow_header - failed to read V1 "
-                                  "header\n");
-                       goto out;
-               }
-               *mtime_out = header->v1.mtime;
-               *size_out = header->v1.size;
-               *sectorsize_out = header->v1.sectorsize;
-               *bitmap_offset_out = sizeof(header->v1);
-               *align_out = *sectorsize_out;
-               file = header->v1.backing_file;
-       }
-       else if(version == 2){
-               if(n < sizeof(header->v2)){
-                       cow_printf("read_cow_header - failed to read V2 "
-                                  "header\n");
-                       goto out;
-               }
-               *mtime_out = ntohl(header->v2.mtime);
-               *size_out = ntohll(header->v2.size);
-               *sectorsize_out = ntohl(header->v2.sectorsize);
-               *bitmap_offset_out = sizeof(header->v2);
-               *align_out = *sectorsize_out;
-               file = header->v2.backing_file;
-       }
-       else if(version == 3){
-               if(n < sizeof(header->v3)){
-                       cow_printf("read_cow_header - failed to read V2 "
-                                  "header\n");
-                       goto out;
-               }
-               *mtime_out = ntohl(header->v3.mtime);
-               *size_out = ntohll(header->v3.size);
-               *sectorsize_out = ntohl(header->v3.sectorsize);
-               *align_out = ntohl(header->v3.alignment);
-               *bitmap_offset_out = ROUND_UP(sizeof(header->v3), *align_out);
-               file = header->v3.backing_file;
-       }
-       else {
-               cow_printf("read_cow_header - invalid COW version\n");
-               goto out;               
-       }
-       err = -ENOMEM;
-       *backing_file_out = cow_strdup(file);
-       if(*backing_file_out == NULL){
-               cow_printf("read_cow_header - failed to allocate backing "
-                          "file\n");
-               goto out;
-       }
-       err = 0;
- out:
-       cow_free(header);
-       return(err);
-}
-
-int init_cow_file(int fd, char *cow_file, char *backing_file, int sectorsize,
-                 int alignment, int *bitmap_offset_out, 
-                 unsigned long *bitmap_len_out, int *data_offset_out)
-{
-       __u64 size, offset;
-       char zero = 0;
-       int err;
-
-       err = write_cow_header(cow_file, fd, backing_file, sectorsize, 
-                              alignment, &size);
-       if(err) 
-               goto out;
-       
-       *bitmap_offset_out = ROUND_UP(sizeof(struct cow_header_v3), alignment);
-       cow_sizes(COW_VERSION, size, sectorsize, alignment, *bitmap_offset_out,
-                 bitmap_len_out, data_offset_out);
-
-       offset = *data_offset_out + size - sizeof(zero);
-       err = cow_seek_file(fd, offset);
-       if(err < 0){
-               cow_printf("cow bitmap lseek failed : err = %d\n", -err);
-               goto out;
-       }
-
-       /* does not really matter how much we write it is just to set EOF 
-        * this also sets the entire COW bitmap
-        * to zero without having to allocate it 
-        */
-       err = cow_write_file(fd, &zero, sizeof(zero));
-       if(err != sizeof(zero)){
-               cow_printf("Write of bitmap to new COW file '%s' failed, "
-                          "err = %d\n", cow_file, -err);
-               err = -EINVAL;
-               goto out;
-       }
-
-       return(0);
-
- out:
-       return(err);
-}
-
-/*
- * ---------------------------------------------------------------------------
- * Local variables:
- * c-file-style: "linux"
- * End:
- */
diff --git a/arch/um/include/aio.h b/arch/um/include/aio.h
deleted file mode 100644 (file)
index 6096f4f..0000000
+++ /dev/null
@@ -1,36 +0,0 @@
-/* 
- * Copyright (C) 2004 Jeff Dike (jdike@karaya.com)
- * Licensed under the GPL
- */
-
-#ifndef AIO_H__
-#define AIO_H__
-
-enum aio_type { AIO_READ, AIO_WRITE, AIO_MMAP };
-
-struct aio_thread_reply {
-       void *data;
-       int err;
-};
-
-struct aio_context {
-       int reply_fd;
-};
-
-#define INIT_AIO_CONTEXT { .reply_fd   = -1 }
-
-extern int submit_aio(enum aio_type type, int fd, char *buf, int len, 
-                     unsigned long long offset, int reply_fd, void *data);
-
-#endif
-
-/*
- * Overrides for Emacs so that we follow Linus's tabbing style.
- * Emacs will notice this stuff at the end of the file and automatically
- * adjust the settings for this buffer only.  This must remain at the end
- * of the file.
- * ---------------------------------------------------------------------------
- * Local variables:
- * c-file-style: "linux"
- * End:
- */
diff --git a/arch/um/include/irq_kern.h b/arch/um/include/irq_kern.h
deleted file mode 100644 (file)
index 4bcb829..0000000
+++ /dev/null
@@ -1,28 +0,0 @@
-/* 
- * Copyright (C) 2001, 2002 Jeff Dike (jdike@karaya.com)
- * Licensed under the GPL
- */
-
-#ifndef __IRQ_KERN_H__
-#define __IRQ_KERN_H__
-
-#include "linux/interrupt.h"
-
-extern int um_request_irq(unsigned int irq, int fd, int type,
-                         irqreturn_t (*handler)(int, void *, 
-                                                struct pt_regs *),
-                         unsigned long irqflags,  const char * devname,
-                         void *dev_id);
-
-#endif
-
-/*
- * Overrides for Emacs so that we follow Linus's tabbing style.
- * Emacs will notice this stuff at the end of the file and automatically
- * adjust the settings for this buffer only.  This must remain at the end
- * of the file.
- * ---------------------------------------------------------------------------
- * Local variables:
- * c-file-style: "linux"
- * End:
- */
diff --git a/arch/um/include/mem_kern.h b/arch/um/include/mem_kern.h
deleted file mode 100644 (file)
index b39f03d..0000000
+++ /dev/null
@@ -1,30 +0,0 @@
-/* 
- * Copyright (C) 2003 Jeff Dike (jdike@addtoit.com)
- * Licensed under the GPL
- */
-
-#ifndef __MEM_KERN_H__
-#define __MEM_KERN_H__
-
-#include "linux/list.h"
-#include "linux/types.h"
-
-struct remapper {
-       struct list_head list;
-       int (*proc)(int, unsigned long, int, __u64);
-};
-
-extern void register_remapper(struct remapper *info);
-
-#endif
-
-/*
- * Overrides for Emacs so that we follow Linus's tabbing style.
- * Emacs will notice this stuff at the end of the file and automatically
- * adjust the settings for this buffer only.  This must remain at the end
- * of the file.
- * ---------------------------------------------------------------------------
- * Local variables:
- * c-file-style: "linux"
- * End:
- */
diff --git a/arch/um/include/skas_ptregs.h b/arch/um/include/skas_ptregs.h
deleted file mode 100644 (file)
index afd5fc3..0000000
+++ /dev/null
@@ -1,26 +0,0 @@
-/* Automatically generated by arch/um/kernel/skas/util/mk_ptregs */
-
-#ifndef __SKAS_PT_REGS_
-#define __SKAS_PT_REGS_
-
-#define HOST_FRAME_SIZE 17
-#define HOST_FP_SIZE 27
-#define HOST_XFP_SIZE 128
-#define HOST_IP 12
-#define HOST_SP 15
-#define HOST_EFLAGS 14
-#define HOST_EAX 6
-#define HOST_EBX 0
-#define HOST_ECX 1
-#define HOST_EDX 2
-#define HOST_ESI 3
-#define HOST_EDI 4
-#define HOST_EBP 5
-#define HOST_CS 13
-#define HOST_SS 16
-#define HOST_DS 7
-#define HOST_FS 9
-#define HOST_ES 8
-#define HOST_GS 10
-
-#endif
diff --git a/arch/um/kernel/physmem.c b/arch/um/kernel/physmem.c
deleted file mode 100644 (file)
index d0e0f50..0000000
+++ /dev/null
@@ -1,468 +0,0 @@
-/* 
- * Copyright (C) 2000 - 2003 Jeff Dike (jdike@addtoit.com)
- * Licensed under the GPL
- */
-
-#include "linux/mm.h"
-#include "linux/ghash.h"
-#include "linux/slab.h"
-#include "linux/vmalloc.h"
-#include "linux/bootmem.h"
-#include "asm/types.h"
-#include "asm/pgtable.h"
-#include "kern_util.h"
-#include "user_util.h"
-#include "mode_kern.h"
-#include "mem.h"
-#include "mem_user.h"
-#include "os.h"
-#include "kern.h"
-#include "init.h"
-
-#if 0
-static pgd_t physmem_pgd[PTRS_PER_PGD];
-
-static struct phys_desc *lookup_mapping(void *addr)
-{
-       pgd = &physmem_pgd[pgd_index(addr)];
-       if(pgd_none(pgd))
-               return(NULL);
-
-       pmd = pmd_offset(pgd, addr);
-       if(pmd_none(pmd))
-               return(NULL);
-
-       pte = pte_offset_kernel(pmd, addr);
-       return((struct phys_desc *) pte_val(pte));
-}
-
-static struct add_mapping(void *addr, struct phys_desc *new)
-{
-}
-#endif
-
-#define PHYS_HASHSIZE (8192)
-
-struct phys_desc;
-
-DEF_HASH_STRUCTS(virtmem, PHYS_HASHSIZE, struct phys_desc);
-
-struct phys_desc {
-       struct virtmem_ptrs virt_ptrs;
-       int fd;
-       __u64 offset;
-       void *virt;
-       unsigned long phys;
-       struct list_head list;
-};
-
-struct virtmem_table virtmem_hash;
-
-static int virt_cmp(void *virt1, void *virt2)
-{
-       return(virt1 != virt2);
-}
-
-static int virt_hash(void *virt)
-{
-       unsigned long addr = ((unsigned long) virt) >> PAGE_SHIFT;
-       return(addr % PHYS_HASHSIZE);
-}
-
-DEF_HASH(static, virtmem, struct phys_desc, virt_ptrs, void *, virt, virt_cmp, 
-        virt_hash);
-
-LIST_HEAD(descriptor_mappings);
-
-struct desc_mapping {
-       int fd;
-       struct list_head list;
-       struct list_head pages;
-};
-
-static struct desc_mapping *find_mapping(int fd)
-{
-       struct desc_mapping *desc;
-       struct list_head *ele;
-
-       list_for_each(ele, &descriptor_mappings){
-               desc = list_entry(ele, struct desc_mapping, list);
-               if(desc->fd == fd)
-                       return(desc);
-       }
-
-       return(NULL);
-}
-
-static struct desc_mapping *descriptor_mapping(int fd)
-{
-       struct desc_mapping *desc;
-
-       desc = find_mapping(fd);
-       if(desc != NULL)
-               return(desc);
-
-       desc = kmalloc(sizeof(*desc), GFP_ATOMIC);
-       if(desc == NULL)
-               return(NULL);
-
-       *desc = ((struct desc_mapping) 
-               { .fd =         fd,
-                 .list =       LIST_HEAD_INIT(desc->list),
-                 .pages =      LIST_HEAD_INIT(desc->pages) });
-       list_add(&desc->list, &descriptor_mappings);
-
-       return(desc);
-}
-
-int physmem_subst_mapping(void *virt, int fd, __u64 offset, int w)
-{
-       struct desc_mapping *fd_maps;
-       struct phys_desc *desc;
-       unsigned long phys;
-       int err;
-
-       fd_maps = descriptor_mapping(fd);
-       if(fd_maps == NULL)
-               return(-ENOMEM);
-
-       phys = __pa(virt);
-       if(find_virtmem_hash(&virtmem_hash, virt) != NULL)
-               panic("Address 0x%p is already substituted\n", virt);
-
-       err = -ENOMEM;
-       desc = kmalloc(sizeof(*desc), GFP_ATOMIC);
-       if(desc == NULL)
-               goto out;
-
-       *desc = ((struct phys_desc) 
-               { .virt_ptrs =  { NULL, NULL },
-                 .fd =         fd,
-                 .offset =             offset,
-                 .virt =               virt,
-                 .phys =               __pa(virt),
-                 .list =               LIST_HEAD_INIT(desc->list) });
-       insert_virtmem_hash(&virtmem_hash, desc);
-
-       list_add(&desc->list, &fd_maps->pages);
-
-       virt = (void *) ((unsigned long) virt & PAGE_MASK);
-       err = os_map_memory(virt, fd, offset, PAGE_SIZE, 1, w, 0);
-       if(!err)
-               goto out;
-
-       remove_virtmem_hash(&virtmem_hash, desc);
-       kfree(desc);
- out:
-       return(err);
-}
-
-static int physmem_fd = -1;
-
-static void remove_mapping(struct phys_desc *desc)
-{
-       void *virt = desc->virt;
-       int err;
-
-       remove_virtmem_hash(&virtmem_hash, desc);
-       list_del(&desc->list);
-       kfree(desc);
-
-       err = os_map_memory(virt, physmem_fd, __pa(virt), PAGE_SIZE, 1, 1, 0);
-       if(err)
-               panic("Failed to unmap block device page from physical memory, "
-                     "errno = %d", -err);
-}
-
-int physmem_remove_mapping(void *virt)
-{
-       struct phys_desc *desc;
-
-       virt = (void *) ((unsigned long) virt & PAGE_MASK);
-       desc = find_virtmem_hash(&virtmem_hash, virt);
-       if(desc == NULL)
-               return(0);
-
-       remove_mapping(desc);
-       return(1);
-}
-
-void physmem_forget_descriptor(int fd)
-{
-       struct desc_mapping *desc;
-       struct phys_desc *page;
-       struct list_head *ele, *next;
-       __u64 offset;
-       void *addr;
-       int err;
-
-       desc = find_mapping(fd);
-       if(desc == NULL)
-               return;
-
-       list_for_each_safe(ele, next, &desc->pages){
-               page = list_entry(ele, struct phys_desc, list);
-               offset = page->offset;
-               addr = page->virt;
-               remove_mapping(page);
-               err = os_seek_file(fd, offset);
-               if(err)
-                       panic("physmem_forget_descriptor - failed to seek "
-                             "to %lld in fd %d, error = %d\n",
-                             offset, fd, -err);
-               err = os_read_file(fd, addr, PAGE_SIZE);
-               if(err < 0)
-                       panic("physmem_forget_descriptor - failed to read "
-                             "from fd %d to 0x%p, error = %d\n",
-                             fd, addr, -err);
-       }
-
-       list_del(&desc->list);
-       kfree(desc);
-}
-
-void arch_free_page(struct page *page, int order)
-{
-       void *virt;
-       int i;
-
-       for(i = 0; i < (1 << order); i++){
-               virt = __va(page_to_phys(page + i));
-               physmem_remove_mapping(virt);
-       }
-}
-
-int is_remapped(void *virt)
-{
-       return(find_virtmem_hash(&virtmem_hash, virt) != NULL);
-}
-
-/* Changed during early boot */
-unsigned long high_physmem;
-
-extern unsigned long physmem_size;
-
-void *to_virt(unsigned long phys)
-{
-       return((void *) uml_physmem + phys);
-}
-
-unsigned long to_phys(void *virt)
-{
-       return(((unsigned long) virt) - uml_physmem);
-}
-
-int init_maps(unsigned long physmem, unsigned long iomem, unsigned long highmem)
-{
-       struct page *p, *map;
-       unsigned long phys_len, phys_pages, highmem_len, highmem_pages;
-       unsigned long iomem_len, iomem_pages, total_len, total_pages;
-       int i;
-
-       phys_pages = physmem >> PAGE_SHIFT;
-       phys_len = phys_pages * sizeof(struct page);
-
-       iomem_pages = iomem >> PAGE_SHIFT;
-       iomem_len = iomem_pages * sizeof(struct page);
-
-       highmem_pages = highmem >> PAGE_SHIFT;
-       highmem_len = highmem_pages * sizeof(struct page);
-
-       total_pages = phys_pages + iomem_pages + highmem_pages;
-       total_len = phys_len + iomem_pages + highmem_len;
-
-       if(kmalloc_ok){
-               map = kmalloc(total_len, GFP_KERNEL);
-               if(map == NULL) 
-                       map = vmalloc(total_len);
-       }
-       else map = alloc_bootmem_low_pages(total_len);
-
-       if(map == NULL)
-               return(-ENOMEM);
-
-       for(i = 0; i < total_pages; i++){
-               p = &map[i];
-               set_page_count(p, 0);
-               SetPageReserved(p);
-               INIT_LIST_HEAD(&p->lru);
-       }
-
-       mem_map = map;
-       max_mapnr = total_pages;
-       return(0);
-}
-
-struct page *phys_to_page(const unsigned long phys)
-{
-       return(&mem_map[phys >> PAGE_SHIFT]);
-}
-
-struct page *__virt_to_page(const unsigned long virt)
-{
-       return(&mem_map[__pa(virt) >> PAGE_SHIFT]);
-}
-
-unsigned long page_to_phys(struct page *page)
-{
-       return((page - mem_map) << PAGE_SHIFT);
-}
-
-pte_t mk_pte(struct page *page, pgprot_t pgprot)
-{
-       pte_t pte;
-
-       pte_val(pte) = page_to_phys(page) + pgprot_val(pgprot);
-       if(pte_present(pte)) pte_mknewprot(pte_mknewpage(pte));
-       return(pte);
-}
-
-/* Changed during early boot */
-static unsigned long kmem_top = 0;
-
-unsigned long get_kmem_end(void)
-{
-       if(kmem_top == 0) 
-               kmem_top = CHOOSE_MODE(kmem_end_tt, kmem_end_skas);
-       return(kmem_top);
-}
-
-void map_memory(unsigned long virt, unsigned long phys, unsigned long len, 
-               int r, int w, int x)
-{
-       __u64 offset;
-       int fd, err;
-
-       fd = phys_mapping(phys, &offset);
-       err = os_map_memory((void *) virt, fd, offset, len, r, w, x);
-       if(err)
-               panic("map_memory(0x%lx, %d, 0x%llx, %ld, %d, %d, %d) failed, "
-                     "err = %d\n", virt, fd, offset, len, r, w, x, err);
-}
-
-#define PFN_UP(x) (((x) + PAGE_SIZE-1) >> PAGE_SHIFT)
-
-void setup_physmem(unsigned long start, unsigned long reserve_end,
-                  unsigned long len, unsigned long highmem)
-{
-       unsigned long reserve = reserve_end - start;
-       int pfn = PFN_UP(__pa(reserve_end));
-       int delta = (len - reserve) >> PAGE_SHIFT;
-       int err, offset, bootmap_size;
-
-       physmem_fd = create_mem_file(len + highmem);
-
-       offset = uml_reserved - uml_physmem;
-       err = os_map_memory((void *) uml_reserved, physmem_fd, offset, 
-                           len - offset, 1, 1, 0);
-       if(err < 0){
-               os_print_error(err, "Mapping memory");
-               exit(1);
-       }
-
-       bootmap_size = init_bootmem(pfn, pfn + delta);
-       free_bootmem(__pa(reserve_end) + bootmap_size,
-                    len - bootmap_size - reserve);
-}
-
-int phys_mapping(unsigned long phys, __u64 *offset_out)
-{
-       struct phys_desc *desc = find_virtmem_hash(&virtmem_hash, 
-                                                  __va(phys & PAGE_MASK));
-       int fd = -1;
-
-       if(desc != NULL){
-               fd = desc->fd;
-               *offset_out = desc->offset;
-       }
-       else if(phys < physmem_size){
-               fd = physmem_fd;
-               *offset_out = phys;
-       }
-       else if(phys < __pa(end_iomem)){
-               struct iomem_region *region = iomem_regions;
-       
-               while(region != NULL){
-                       if((phys >= region->phys) && 
-                          (phys < region->phys + region->size)){
-                               fd = region->fd;
-                               *offset_out = phys - region->phys;
-                               break;
-                       }
-                       region = region->next;
-               }
-       }
-       else if(phys < __pa(end_iomem) + highmem){
-               fd = physmem_fd;
-               *offset_out = phys - iomem_size;
-       }
-
-       return(fd);
-}
-
-static int __init uml_mem_setup(char *line, int *add)
-{
-       char *retptr;
-       physmem_size = memparse(line,&retptr);
-       return 0;
-}
-__uml_setup("mem=", uml_mem_setup,
-"mem=<Amount of desired ram>\n"
-"    This controls how much \"physical\" memory the kernel allocates\n"
-"    for the system. The size is specified as a number followed by\n"
-"    one of 'k', 'K', 'm', 'M', which have the obvious meanings.\n"
-"    This is not related to the amount of memory in the host.  It can\n"
-"    be more, and the excess, if it's ever used, will just be swapped out.\n"
-"      Example: mem=64M\n\n"
-);
-
-unsigned long find_iomem(char *driver, unsigned long *len_out)
-{
-       struct iomem_region *region = iomem_regions;
-       
-       while(region != NULL){
-               if(!strcmp(region->driver, driver)){
-                       *len_out = region->size;
-                       return(region->virt);
-               }
-       }
-
-       return(0);
-}
-
-int setup_iomem(void)
-{
-       struct iomem_region *region = iomem_regions;
-       unsigned long iomem_start = high_physmem + PAGE_SIZE;
-       int err;
-
-       while(region != NULL){
-               err = os_map_memory((void *) iomem_start, region->fd, 0, 
-                                   region->size, 1, 1, 0);
-               if(err)
-                       printk("Mapping iomem region for driver '%s' failed, "
-                              "errno = %d\n", region->driver, -err);
-               else {
-                       region->virt = iomem_start;
-                       region->phys = __pa(region->virt);
-               }
-
-               iomem_start += region->size + PAGE_SIZE;
-               region = region->next;
-       }
-
-       return(0);
-}
-
-__initcall(setup_iomem);
-
-/*
- * Overrides for Emacs so that we follow Linus's tabbing style.
- * Emacs will notice this stuff at the end of the file and automatically
- * adjust the settings for this buffer only.  This must remain at the end
- * of the file.
- * ---------------------------------------------------------------------------
- * Local variables:
- * c-file-style: "linux"
- * End:
- */
diff --git a/arch/um/kernel/skas/uaccess.c b/arch/um/kernel/skas/uaccess.c
deleted file mode 100644 (file)
index ea82f19..0000000
+++ /dev/null
@@ -1,219 +0,0 @@
-/* 
- * Copyright (C) 2002 - 2003 Jeff Dike (jdike@addtoit.com)
- * Licensed under the GPL
- */
-
-#include "linux/stddef.h"
-#include "linux/kernel.h"
-#include "linux/string.h"
-#include "linux/fs.h"
-#include "linux/highmem.h"
-#include "asm/page.h"
-#include "asm/pgtable.h"
-#include "asm/uaccess.h"
-#include "kern_util.h"
-
-extern void *um_virt_to_phys(struct task_struct *task, unsigned long addr, 
-                            pte_t *pte_out);
-
-static unsigned long maybe_map(unsigned long virt, int is_write)
-{
-       pte_t pte;
-       int err;
-
-       void *phys = um_virt_to_phys(current, virt, &pte);
-       int dummy_code;
-
-       if(IS_ERR(phys) || (is_write && !pte_write(pte))){
-               err = handle_page_fault(virt, 0, is_write, 0, &dummy_code);
-               if(err)
-                       return(0);
-               phys = um_virt_to_phys(current, virt, NULL);
-       }
-       return((unsigned long) phys);
-}
-
-static int do_op(unsigned long addr, int len, int is_write, 
-                int (*op)(unsigned long addr, int len, void *arg), void *arg)
-{
-       struct page *page;
-       int n;
-
-       addr = maybe_map(addr, is_write);
-       if(addr == -1)
-               return(-1);
-
-       page = phys_to_page(addr);
-       addr = (unsigned long) kmap(page) + (addr & ~PAGE_MASK);
-       n = (*op)(addr, len, arg);
-       kunmap(page);
-
-       return(n);
-}
-
-static int buffer_op(unsigned long addr, int len, int is_write,
-                    int (*op)(unsigned long addr, int len, void *arg),
-                    void *arg)
-{
-       int size = min(PAGE_ALIGN(addr) - addr, (unsigned long) len);
-       int remain = len, n;
-
-       n = do_op(addr, size, is_write, op, arg);
-       if(n != 0)
-               return(n < 0 ? remain : 0);
-
-       addr += size;
-       remain -= size;
-       if(remain == 0) 
-               return(0);
-
-       while(addr < ((addr + remain) & PAGE_MASK)){
-               n = do_op(addr, PAGE_SIZE, is_write, op, arg);
-               if(n != 0)
-                       return(n < 0 ? remain : 0);
-
-               addr += PAGE_SIZE;
-               remain -= PAGE_SIZE;
-       }
-       if(remain == 0)
-               return(0);
-
-       n = do_op(addr, remain, is_write, op, arg);
-       if(n != 0)
-               return(n < 0 ? remain : 0);
-       return(0);
-}
-
-static int copy_chunk_from_user(unsigned long from, int len, void *arg)
-{
-       unsigned long *to_ptr = arg, to = *to_ptr;
-
-       memcpy((void *) to, (void *) from, len);
-       *to_ptr += len;
-       return(0);
-}
-
-int copy_from_user_skas(void *to, const void *from, int n)
-{
-       if(segment_eq(get_fs(), KERNEL_DS)){
-               memcpy(to, from, n);
-               return(0);
-       }
-
-       return(access_ok_skas(VERIFY_READ, from, n) ?
-              buffer_op((unsigned long) from, n, 0, copy_chunk_from_user, &to):
-              n);
-}
-
-static int copy_chunk_to_user(unsigned long to, int len, void *arg)
-{
-       unsigned long *from_ptr = arg, from = *from_ptr;
-
-       memcpy((void *) to, (void *) from, len);
-       *from_ptr += len;
-       return(0);
-}
-
-int copy_to_user_skas(void *to, const void *from, int n)
-{
-       if(segment_eq(get_fs(), KERNEL_DS)){
-               memcpy(to, from, n);
-               return(0);
-       }
-
-       return(access_ok_skas(VERIFY_WRITE, to, n) ?
-              buffer_op((unsigned long) to, n, 1, copy_chunk_to_user, &from) :
-              n);
-}
-
-static int strncpy_chunk_from_user(unsigned long from, int len, void *arg)
-{
-       char **to_ptr = arg, *to = *to_ptr;
-       int n;
-
-       strncpy(to, (void *) from, len);
-       n = strnlen(to, len);
-       *to_ptr += n;
-
-       if(n < len) 
-               return(1);
-       return(0);
-}
-
-int strncpy_from_user_skas(char *dst, const char *src, int count)
-{
-       int n;
-       char *ptr = dst;
-
-       if(segment_eq(get_fs(), KERNEL_DS)){
-               strncpy(dst, src, count);
-               return(strnlen(dst, count));
-       }
-
-       if(!access_ok_skas(VERIFY_READ, src, 1))
-               return(-EFAULT);
-
-       n = buffer_op((unsigned long) src, count, 0, strncpy_chunk_from_user, 
-                     &ptr);
-       if(n != 0)
-               return(-EFAULT);
-       return(strnlen(dst, count));
-}
-
-static int clear_chunk(unsigned long addr, int len, void *unused)
-{
-       memset((void *) addr, 0, len);
-       return(0);
-}
-
-int __clear_user_skas(void *mem, int len)
-{
-       return(buffer_op((unsigned long) mem, len, 1, clear_chunk, NULL));
-}
-
-int clear_user_skas(void *mem, int len)
-{
-       if(segment_eq(get_fs(), KERNEL_DS)){
-               memset(mem, 0, len);
-               return(0);
-       }
-
-       return(access_ok_skas(VERIFY_WRITE, mem, len) ? 
-              buffer_op((unsigned long) mem, len, 1, clear_chunk, NULL) : len);
-}
-
-static int strnlen_chunk(unsigned long str, int len, void *arg)
-{
-       int *len_ptr = arg, n;
-
-       n = strnlen((void *) str, len);
-       *len_ptr += n;
-
-       if(n < len)
-               return(1);
-       return(0);
-}
-
-int strnlen_user_skas(const void *str, int len)
-{
-       int count = 0, n;
-
-       if(segment_eq(get_fs(), KERNEL_DS))
-               return(strnlen(str, len) + 1);
-
-       n = buffer_op((unsigned long) str, len, 0, strnlen_chunk, &count);
-       if(n == 0)
-               return(count + 1);
-       return(-EFAULT);
-}
-
-/*
- * Overrides for Emacs so that we follow Linus's tabbing style.
- * Emacs will notice this stuff at the end of the file and automatically
- * adjust the settings for this buffer only.  This must remain at the end
- * of the file.
- * ---------------------------------------------------------------------------
- * Local variables:
- * c-file-style: "linux"
- * End:
- */
diff --git a/arch/um/kernel/tt/uaccess.c b/arch/um/kernel/tt/uaccess.c
deleted file mode 100644 (file)
index 9c84011..0000000
+++ /dev/null
@@ -1,73 +0,0 @@
-/* 
- * Copyright (C) 2000 - 2003 Jeff Dike (jdike@addtoit.com)
- * Licensed under the GPL
- */
-
-#include "linux/sched.h"
-#include "asm/uaccess.h"
-
-int copy_from_user_tt(void *to, const void *from, int n)
-{
-       if(!access_ok_tt(VERIFY_READ, from, n)) 
-               return(n);
-
-       return(__do_copy_from_user(to, from, n, &current->thread.fault_addr,
-                                  &current->thread.fault_catcher));
-}
-
-int copy_to_user_tt(void *to, const void *from, int n)
-{
-       if(!access_ok_tt(VERIFY_WRITE, to, n))
-               return(n);
-               
-       return(__do_copy_to_user(to, from, n, &current->thread.fault_addr,
-                                &current->thread.fault_catcher));
-}
-
-int strncpy_from_user_tt(char *dst, const char *src, int count)
-{
-       int n;
-
-       if(!access_ok_tt(VERIFY_READ, src, 1)) 
-               return(-EFAULT);
-
-       n = __do_strncpy_from_user(dst, src, count, 
-                                  &current->thread.fault_addr,
-                                  &current->thread.fault_catcher);
-       if(n < 0) return(-EFAULT);
-       return(n);
-}
-
-int __clear_user_tt(void *mem, int len)
-{
-       return(__do_clear_user(mem, len,
-                              &current->thread.fault_addr,
-                              &current->thread.fault_catcher));
-}
-
-int clear_user_tt(void *mem, int len)
-{
-       if(!access_ok_tt(VERIFY_WRITE, mem, len))
-               return(len);
-
-       return(__do_clear_user(mem, len, &current->thread.fault_addr,
-                              &current->thread.fault_catcher));
-}
-
-int strnlen_user_tt(const void *str, int len)
-{
-       return(__do_strnlen_user(str, len,
-                                &current->thread.fault_addr,
-                                &current->thread.fault_catcher));
-}
-
-/*
- * Overrides for Emacs so that we follow Linus's tabbing style.
- * Emacs will notice this stuff at the end of the file and automatically
- * adjust the settings for this buffer only.  This must remain at the end
- * of the file.
- * ---------------------------------------------------------------------------
- * Local variables:
- * c-file-style: "linux"
- * End:
- */
diff --git a/arch/um/os-Linux/aio.c b/arch/um/os-Linux/aio.c
deleted file mode 100644 (file)
index 56b3782..0000000
+++ /dev/null
@@ -1,404 +0,0 @@
-/* 
- * Copyright (C) 2004 Jeff Dike (jdike@addtoit.com)
- * Licensed under the GPL
- */
-
-#include <stdlib.h>
-#include <unistd.h>
-#include <signal.h>
-#include <errno.h>
-#include <sched.h>
-#include <sys/syscall.h>
-#include "os.h"
-#include "helper.h"
-#include "aio.h"
-#include "init.h"
-#include "user.h"
-#include "mode.h"
-
-struct aio_thread_req {
-       enum aio_type type;
-       int io_fd;
-       unsigned long long offset;
-       char *buf;
-       int len;
-       int reply_fd;
-       void *data;
-};
-
-static int aio_req_fd_r = -1;
-static int aio_req_fd_w = -1;
-
-#if defined(HAVE_AIO_ABI)
-#include <linux/aio_abi.h>
-
-/* If we have the headers, we are going to build with AIO enabled.
- * If we don't have aio in libc, we define the necessary stubs here.
- */
-
-#if !defined(HAVE_AIO_LIBC)
-
-#define __NR_io_setup 245
-#define __NR_io_getevents 247
-#define __NR_io_submit 248
-
-static long io_setup(int n, aio_context_t *ctxp)
-{
-  return(syscall(__NR_io_setup, n, ctxp));
-}
-
-static long io_submit(aio_context_t ctx, long nr, struct iocb **iocbpp)
-{
-  return(syscall(__NR_io_submit, ctx, nr, iocbpp));
-}
-
-static long io_getevents(aio_context_t ctx_id, long min_nr, long nr,
-                        struct io_event *events, struct timespec *timeout)
-{
-  return(syscall(__NR_io_getevents, ctx_id, min_nr, nr, events, timeout));
-}
-
-#endif
-
-/* The AIO_MMAP cases force the mmapped page into memory here
- * rather than in whatever place first touches the data.  I used
- * to do this by touching the page, but that's delicate because
- * gcc is prone to optimizing that away.  So, what's done here
- * is we read from the descriptor from which the page was 
- * mapped.  The caller is required to pass an offset which is
- * inside the page that was mapped.  Thus, when the read 
- * returns, we know that the page is in the page cache, and
- * that it now backs the mmapped area.
- */
-
-static int do_aio(aio_context_t ctx, enum aio_type type, int fd, char *buf, 
-                 int len, unsigned long long offset, void *data)
-{
-       struct iocb iocb, *iocbp = &iocb;
-       char c;
-       int err;
-
-       iocb = ((struct iocb) { .aio_data       = (unsigned long) data,
-                               .aio_reqprio    = 0,
-                               .aio_fildes     = fd,
-                               .aio_buf        = (unsigned long) buf,
-                               .aio_nbytes     = len,
-                               .aio_offset     = offset,
-                               .aio_reserved1  = 0,
-                               .aio_reserved2  = 0,
-                               .aio_reserved3  = 0 });
-
-       switch(type){
-       case AIO_READ:
-               iocb.aio_lio_opcode = IOCB_CMD_PREAD;
-               err = io_submit(ctx, 1, &iocbp);
-               break;
-       case AIO_WRITE:
-               iocb.aio_lio_opcode = IOCB_CMD_PWRITE;
-               err = io_submit(ctx, 1, &iocbp);
-               break;
-       case AIO_MMAP:
-               iocb.aio_lio_opcode = IOCB_CMD_PREAD;
-               iocb.aio_buf = (unsigned long) &c;
-               iocb.aio_nbytes = sizeof(c);
-               err = io_submit(ctx, 1, &iocbp);
-               break;
-       default:
-               printk("Bogus op in do_aio - %d\n", type);
-               err = -EINVAL;
-               break;
-       }
-       if(err > 0)
-               err = 0;
-
-       return(err);    
-}
-
-static aio_context_t ctx = 0;
-
-static int aio_thread(void *arg)
-{
-       struct aio_thread_reply reply;
-       struct io_event event;
-       int err, n, reply_fd;
-
-       signal(SIGWINCH, SIG_IGN);
-
-       while(1){
-               n = io_getevents(ctx, 1, 1, &event, NULL);
-               if(n < 0){
-                       if(errno == EINTR)
-                               continue;
-                       printk("aio_thread - io_getevents failed, "
-                              "errno = %d\n", errno);
-               }
-               else {
-                       reply = ((struct aio_thread_reply) 
-                               { .data = (void *) event.data,
-                                 .err  = event.res });
-                       reply_fd = 
-                               ((struct aio_context *) event.data)->reply_fd;
-                       err = os_write_file(reply_fd, &reply, sizeof(reply));
-                       if(err != sizeof(reply))
-                               printk("not_aio_thread - write failed, "
-                                      "fd = %d, err = %d\n", 
-                                      aio_req_fd_r, -err);
-               }
-       }
-       return(0);
-}
-
-#endif
-
-static int do_not_aio(struct aio_thread_req *req)
-{
-       char c;
-       int err;
-
-       switch(req->type){
-       case AIO_READ:
-               err = os_seek_file(req->io_fd, req->offset);
-               if(err)
-                       goto out;
-
-               err = os_read_file(req->io_fd, req->buf, req->len);
-               break;
-       case AIO_WRITE:
-               err = os_seek_file(req->io_fd, req->offset);
-               if(err)
-                       goto out;
-
-               err = os_write_file(req->io_fd, req->buf, req->len);
-               break;
-       case AIO_MMAP:
-               err = os_seek_file(req->io_fd, req->offset);
-               if(err)
-                       goto out;
-
-               err = os_read_file(req->io_fd, &c, sizeof(c));
-               break;
-       default:
-               printk("do_not_aio - bad request type : %d\n", req->type);
-               err = -EINVAL;
-               break;
-       }
-
- out:
-       return(err);
-}
-
-static int not_aio_thread(void *arg)
-{
-       struct aio_thread_req req;
-       struct aio_thread_reply reply;
-       int err;
-
-       signal(SIGWINCH, SIG_IGN);
-       while(1){
-               err = os_read_file(aio_req_fd_r, &req, sizeof(req));
-               if(err != sizeof(req)){
-                       if(err < 0)
-                               printk("not_aio_thread - read failed, fd = %d, "
-                                      "err = %d\n", aio_req_fd_r, -err);
-                       else {
-                               printk("not_aio_thread - short read, fd = %d, "
-                                      "length = %d\n", aio_req_fd_r, err);
-                       }
-                       continue;
-               }
-               err = do_not_aio(&req);
-               reply = ((struct aio_thread_reply) { .data      = req.data,
-                                                    .err       = err });
-               err = os_write_file(req.reply_fd, &reply, sizeof(reply));
-               if(err != sizeof(reply))
-                       printk("not_aio_thread - write failed, fd = %d, "
-                              "err = %d\n", aio_req_fd_r, -err);
-       }
-}
-
-static int aio_pid = -1;
-
-static int init_aio_24(void)
-{
-       unsigned long stack;
-       int fds[2], err;
-       
-       err = os_pipe(fds, 1, 1);
-       if(err)
-               goto out;
-
-       aio_req_fd_w = fds[0];
-       aio_req_fd_r = fds[1];
-       err = run_helper_thread(not_aio_thread, NULL, 
-                               CLONE_FILES | CLONE_VM | SIGCHLD, &stack, 0);
-       if(err < 0)
-               goto out_close_pipe;
-
-       aio_pid = err;
-       goto out;
-
- out_close_pipe:
-       os_close_file(fds[0]);
-       os_close_file(fds[1]);
-       aio_req_fd_w = -1;
-       aio_req_fd_r = -1;      
- out:
-       return(0);
-}
-
-#ifdef HAVE_AIO_ABI
-#define DEFAULT_24_AIO 0
-static int init_aio_26(void)
-{
-       unsigned long stack;
-       int err;
-       
-       if(io_setup(256, &ctx)){
-               printk("aio_thread failed to initialize context, err = %d\n",
-                      errno);
-               return(-errno);
-       }
-
-       err = run_helper_thread(aio_thread, NULL, 
-                               CLONE_FILES | CLONE_VM | SIGCHLD, &stack, 0);
-       if(err < 0)
-               return(-errno);
-
-       aio_pid = err;
-       err = 0;
- out:
-       return(err);
-}
-
-int submit_aio_26(enum aio_type type, int io_fd, char *buf, int len, 
-                 unsigned long long offset, int reply_fd, void *data)
-{
-       struct aio_thread_reply reply;
-       int err;
-
-       ((struct aio_context *) data)->reply_fd = reply_fd;
-
-       err = do_aio(ctx, type, io_fd, buf, len, offset, data);
-       if(err){
-               reply = ((struct aio_thread_reply) { .data = data,
-                                                    .err  = err });
-               err = os_write_file(reply_fd, &reply, sizeof(reply));
-               if(err != sizeof(reply))
-                       printk("submit_aio_26 - write failed, "
-                              "fd = %d, err = %d\n", reply_fd, -err);
-               else err = 0;
-       }
-
-       return(err);
-}
-
-#else
-#define DEFAULT_24_AIO 1
-static int init_aio_26(void)
-{
-       return(-ENOSYS);
-}
-
-int submit_aio_26(enum aio_type type, int io_fd, char *buf, int len, 
-                 unsigned long long offset, int reply_fd, void *data)
-{
-       return(-ENOSYS);
-}
-#endif
-
-static int aio_24 = DEFAULT_24_AIO;
-
-static int __init set_aio_24(char *name, int *add)
-{
-       aio_24 = 1;
-       return(0);
-}
-
-__uml_setup("aio=2.4", set_aio_24,
-"aio=2.4\n"
-"    This is used to force UML to use 2.4-style AIO even when 2.6 AIO is\n"
-"    available.  2.4 AIO is a single thread that handles one request at a\n"
-"    time, synchronously.  2.6 AIO is a thread which uses 2.5 AIO interface\n"
-"    to handle an arbitrary number of pending requests.  2.6 AIO is not\n"
-"    available in tt mode, on 2.4 hosts, or when UML is built with\n"
-"    /usr/include/linux/aio_abi no available.\n\n"
-);
-
-static int init_aio(void)
-{
-       int err;
-
-       CHOOSE_MODE(({ 
-               if(!aio_24){ 
-                       printk("Disabling 2.6 AIO in tt mode\n");
-                       aio_24 = 1;
-               } }), (void) 0);
-
-       if(!aio_24){
-               err = init_aio_26();
-               if(err && (errno == ENOSYS)){
-                       printk("2.6 AIO not supported on the host - "
-                              "reverting to 2.4 AIO\n");
-                       aio_24 = 1;
-               }
-               else return(err);
-       }
-
-       if(aio_24)
-               return(init_aio_24());
-
-       return(0);
-}
-
-__initcall(init_aio);
-
-static void exit_aio(void)
-{
-       if(aio_pid != -1)
-               os_kill_process(aio_pid, 1);
-}
-
-__uml_exitcall(exit_aio);
-
-int submit_aio_24(enum aio_type type, int io_fd, char *buf, int len, 
-                 unsigned long long offset, int reply_fd, void *data)
-{
-       struct aio_thread_req req = { .type             = type,
-                                     .io_fd            = io_fd,
-                                     .offset           = offset,
-                                     .buf              = buf,
-                                     .len              = len,
-                                     .reply_fd         = reply_fd,
-                                     .data             = data,
-       };
-       int err;
-
-       err = os_write_file(aio_req_fd_w, &req, sizeof(req));
-       if(err == sizeof(req))
-               err = 0;
-
-       return(err);
-}
-
-int submit_aio(enum aio_type type, int io_fd, char *buf, int len, 
-              unsigned long long offset, int reply_fd, void *data)
-{
-       if(aio_24)
-               return(submit_aio_24(type, io_fd, buf, len, offset, reply_fd, 
-                                    data));
-       else {
-               return(submit_aio_26(type, io_fd, buf, len, offset, reply_fd, 
-                                    data));
-       }
-}
-
-/*
- * Overrides for Emacs so that we follow Linus's tabbing style.
- * Emacs will notice this stuff at the end of the file and automatically
- * adjust the settings for this buffer only.  This must remain at the end
- * of the file.
- * ---------------------------------------------------------------------------
- * Local variables:
- * c-file-style: "linux"
- * End:
- */
diff --git a/arch/um/os-Linux/user_syms.c b/arch/um/os-Linux/user_syms.c
deleted file mode 100644 (file)
index ef0fb71..0000000
+++ /dev/null
@@ -1,88 +0,0 @@
-#include "linux/types.h"
-#include "linux/module.h"
-
-/* Some of this are builtin function (some are not but could in the future),
- * so I *must* declare good prototypes for them and then EXPORT them.
- * The kernel code uses the macro defined by include/linux/string.h,
- * so I undef macros; the userspace code does not include that and I
- * add an EXPORT for the glibc one.*/
-
-#undef strlen
-#undef strstr
-#undef memcpy
-#undef memset
-
-extern size_t strlen(const char *);
-extern void *memcpy(void *, const void *, size_t);
-extern void *memset(void *, int, size_t);
-extern int printf(const char *, ...);
-
-EXPORT_SYMBOL(strlen);
-EXPORT_SYMBOL(memcpy);
-EXPORT_SYMBOL(memset);
-EXPORT_SYMBOL(printf);
-
-EXPORT_SYMBOL(strstr);
-
-/* Here, instead, I can provide a fake prototype. Yes, someone cares: genksyms.
- * However, the modules will use the CRC defined *here*, no matter if it is 
- * good; so the versions of these symbols will always match
- */
-#define EXPORT_SYMBOL_PROTO(sym)       \
-       int sym(void);                  \
-       EXPORT_SYMBOL(sym);
-
-EXPORT_SYMBOL_PROTO(__errno_location);
-
-EXPORT_SYMBOL_PROTO(access);
-EXPORT_SYMBOL_PROTO(open);
-EXPORT_SYMBOL_PROTO(open64);
-EXPORT_SYMBOL_PROTO(close);
-EXPORT_SYMBOL_PROTO(read);
-EXPORT_SYMBOL_PROTO(write);
-EXPORT_SYMBOL_PROTO(dup2);
-EXPORT_SYMBOL_PROTO(__xstat);
-EXPORT_SYMBOL_PROTO(__lxstat);
-EXPORT_SYMBOL_PROTO(__lxstat64);
-EXPORT_SYMBOL_PROTO(lseek);
-EXPORT_SYMBOL_PROTO(lseek64);
-EXPORT_SYMBOL_PROTO(chown);
-EXPORT_SYMBOL_PROTO(truncate);
-EXPORT_SYMBOL_PROTO(utime);
-EXPORT_SYMBOL_PROTO(chmod);
-EXPORT_SYMBOL_PROTO(rename);
-EXPORT_SYMBOL_PROTO(__xmknod);
-
-EXPORT_SYMBOL_PROTO(symlink);
-EXPORT_SYMBOL_PROTO(link);
-EXPORT_SYMBOL_PROTO(unlink);
-EXPORT_SYMBOL_PROTO(readlink);
-
-EXPORT_SYMBOL_PROTO(mkdir);
-EXPORT_SYMBOL_PROTO(rmdir);
-EXPORT_SYMBOL_PROTO(opendir);
-EXPORT_SYMBOL_PROTO(readdir);
-EXPORT_SYMBOL_PROTO(closedir);
-EXPORT_SYMBOL_PROTO(seekdir);
-EXPORT_SYMBOL_PROTO(telldir);
-
-EXPORT_SYMBOL_PROTO(ioctl);
-
-EXPORT_SYMBOL_PROTO(pread64);
-EXPORT_SYMBOL_PROTO(pwrite64);
-
-EXPORT_SYMBOL_PROTO(statfs);
-EXPORT_SYMBOL_PROTO(statfs64);
-
-EXPORT_SYMBOL_PROTO(getuid);
-
-/*
- * Overrides for Emacs so that we follow Linus's tabbing style.
- * Emacs will notice this stuff at the end of the file and automatically
- * adjust the settings for this buffer only.  This must remain at the end
- * of the file.
- * ---------------------------------------------------------------------------
- * Local variables:
- * c-file-style: "linux"
- * End:
- */
diff --git a/arch/x86_64/mm/mmap.c b/arch/x86_64/mm/mmap.c
deleted file mode 100644 (file)
index 011bb4c..0000000
+++ /dev/null
@@ -1,87 +0,0 @@
-/*
- *  linux/arch/x86-64/mm/mmap.c
- *
- *  flexible mmap layout support
- *
- * Copyright 2003-2004 Red Hat Inc., Durham, North Carolina.
- * 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
- *
- *
- * Started by Ingo Molnar <mingo@elte.hu>
- */
-
-#include <linux/personality.h>
-#include <linux/mm.h>
-
-/*
- * Top of mmap area (just below the process stack).
- *
- * Leave an at least ~128 MB hole.
- */
-#define MIN_GAP (128*1024*1024)
-#define MAX_GAP (TASK_SIZE/6*5)
-
-static inline unsigned long mmap_base(void)
-{
-       unsigned long gap = current->rlim[RLIMIT_STACK].rlim_cur;
-
-       if (gap < MIN_GAP)
-               gap = MIN_GAP;
-       else if (gap > MAX_GAP)
-               gap = MAX_GAP;
-
-       return TASK_SIZE - (gap & PAGE_MASK);
-}
-
-static inline int mmap_is_legacy(void)
-{
-       /*
-        * Force standard allocation for 64 bit programs.
-        */
-       if (!test_thread_flag(TIF_IA32))
-               return 1;
-               
-       if (current->personality & ADDR_COMPAT_LAYOUT) 
-               return 1;
-       
-       if (current->rlim[RLIMIT_STACK].rlim_cur == RLIM_INFINITY)
-               return 1;
-               
-       return sysctl_legacy_va_layout;
-}
-
-/*
- * This function, called very early during the creation of a new
- * process VM image, sets up which VM layout function to use:
- */
-void arch_pick_mmap_layout(struct mm_struct *mm)
-{
-       /*
-        * Fall back to the standard layout if the personality
-        * bit is set, or if the expected stack growth is unlimited:
-        */
-       if (mmap_is_legacy()) {
-               mm->mmap_base = TASK_UNMAPPED_BASE;
-               mm->get_unmapped_area = arch_get_unmapped_area;
-               mm->unmap_area = arch_unmap_area;
-       } else {
-               mm->mmap_base = mmap_base();
-               mm->get_unmapped_area = arch_get_unmapped_area_topdown;
-               mm->get_unmapped_exec_area = arch_get_unmapped_exec_area;
-               mm->unmap_area = arch_unmap_area_topdown;
-       }
-}
diff --git a/configs/kernel-2.6.6-i586-smp.config b/configs/kernel-2.6.6-i586-smp.config
deleted file mode 100644 (file)
index bb8957a..0000000
+++ /dev/null
@@ -1,2349 +0,0 @@
-#
-# Automatically generated make config: don't edit
-#
-CONFIG_X86=y
-CONFIG_MMU=y
-CONFIG_UID16=y
-CONFIG_GENERIC_ISA_DMA=y
-
-#
-# Code maturity level options
-#
-CONFIG_EXPERIMENTAL=y
-CONFIG_CLEAN_COMPILE=y
-CONFIG_STANDALONE=y
-
-#
-# General setup
-#
-CONFIG_SWAP=y
-CONFIG_SYSVIPC=y
-CONFIG_POSIX_MQUEUE=y
-CONFIG_BSD_PROCESS_ACCT=y
-CONFIG_SYSCTL=y
-CONFIG_AUDIT=y
-CONFIG_AUDITSYSCALL=y
-CONFIG_LOG_BUF_SHIFT=17
-CONFIG_HOTPLUG=y
-# CONFIG_IKCONFIG is not set
-# CONFIG_EMBEDDED is not set
-CONFIG_KALLSYMS=y
-# CONFIG_KALLSYMS_ALL is not set
-CONFIG_FUTEX=y
-CONFIG_EPOLL=y
-CONFIG_IOSCHED_NOOP=y
-CONFIG_IOSCHED_AS=y
-CONFIG_IOSCHED_DEADLINE=y
-CONFIG_IOSCHED_CFQ=y
-CONFIG_CC_OPTIMIZE_FOR_SIZE=y
-
-#
-# Loadable module support
-#
-CONFIG_MODULES=y
-CONFIG_MODULE_UNLOAD=y
-# CONFIG_MODULE_FORCE_UNLOAD is not set
-CONFIG_OBSOLETE_MODPARM=y
-# CONFIG_MODVERSIONS is not set
-CONFIG_KMOD=y
-CONFIG_STOP_MACHINE=y
-
-#
-# Processor type and features
-#
-CONFIG_X86_PC=y
-# CONFIG_X86_ELAN is not set
-# CONFIG_X86_VOYAGER is not set
-# CONFIG_X86_NUMAQ is not set
-# CONFIG_X86_SUMMIT is not set
-# CONFIG_X86_BIGSMP is not set
-# CONFIG_X86_VISWS is not set
-# CONFIG_X86_GENERICARCH is not set
-# CONFIG_X86_ES7000 is not set
-# CONFIG_M386 is not set
-# CONFIG_M486 is not set
-CONFIG_M586=y
-# CONFIG_M586TSC is not set
-# CONFIG_M586MMX is not set
-# CONFIG_M686 is not set
-# CONFIG_MPENTIUMII is not set
-# CONFIG_MPENTIUMIII is not set
-# CONFIG_MPENTIUMM is not set
-# CONFIG_MPENTIUM4 is not set
-# CONFIG_MK6 is not set
-# CONFIG_MK7 is not set
-# CONFIG_MK8 is not set
-# CONFIG_MCRUSOE is not set
-# CONFIG_MWINCHIPC6 is not set
-# CONFIG_MWINCHIP2 is not set
-# CONFIG_MWINCHIP3D is not set
-# CONFIG_MCYRIXIII is not set
-# CONFIG_MVIAC3_2 is not set
-CONFIG_X86_GENERIC=y
-CONFIG_X86_CMPXCHG=y
-CONFIG_X86_XADD=y
-CONFIG_X86_L1_CACHE_SHIFT=7
-CONFIG_RWSEM_XCHGADD_ALGORITHM=y
-CONFIG_X86_PPRO_FENCE=y
-CONFIG_X86_F00F_BUG=y
-CONFIG_X86_WP_WORKS_OK=y
-CONFIG_X86_INVLPG=y
-CONFIG_X86_BSWAP=y
-CONFIG_X86_POPAD_OK=y
-CONFIG_X86_ALIGNMENT_16=y
-CONFIG_X86_INTEL_USERCOPY=y
-# CONFIG_X86_4G is not set
-# CONFIG_X86_SWITCH_PAGETABLES is not set
-# CONFIG_X86_4G_VM_LAYOUT is not set
-# CONFIG_X86_UACCESS_INDIRECT is not set
-# CONFIG_X86_HIGH_ENTRY is not set
-CONFIG_HPET_TIMER=y
-CONFIG_HPET_EMULATE_RTC=y
-CONFIG_SMP=y
-CONFIG_NR_CPUS=8
-CONFIG_SCHED_SMT=y
-# CONFIG_PREEMPT is not set
-CONFIG_X86_LOCAL_APIC=y
-CONFIG_X86_IO_APIC=y
-CONFIG_X86_MCE=y
-# CONFIG_X86_MCE_NONFATAL is not set
-CONFIG_X86_MCE_P4THERMAL=y
-CONFIG_TOSHIBA=m
-CONFIG_I8K=m
-# CONFIG_MICROCODE is not set
-CONFIG_X86_MSR=m
-CONFIG_X86_CPUID=m
-
-#
-# Firmware Drivers
-#
-CONFIG_EDD=m
-# CONFIG_NOHIGHMEM is not set
-CONFIG_HIGHMEM4G=y
-# CONFIG_HIGHMEM64G is not set
-CONFIG_HIGHMEM=y
-CONFIG_HIGHPTE=y
-# CONFIG_MATH_EMULATION is not set
-CONFIG_MTRR=y
-# CONFIG_EFI is not set
-# CONFIG_IRQBALANCE is not set
-CONFIG_HAVE_DEC_LOCK=y
-CONFIG_REGPARM=y
-
-#
-# Power management options (ACPI, APM)
-#
-CONFIG_PM=y
-# CONFIG_SOFTWARE_SUSPEND is not set
-# CONFIG_PM_DISK is not set
-
-#
-# ACPI (Advanced Configuration and Power Interface) Support
-#
-CONFIG_ACPI=y
-CONFIG_ACPI_BOOT=y
-CONFIG_ACPI_INTERPRETER=y
-CONFIG_ACPI_SLEEP=y
-CONFIG_ACPI_SLEEP_PROC_FS=y
-CONFIG_ACPI_AC=m
-CONFIG_ACPI_BATTERY=m
-CONFIG_ACPI_BUTTON=m
-CONFIG_ACPI_FAN=y
-CONFIG_ACPI_PROCESSOR=y
-CONFIG_ACPI_THERMAL=y
-CONFIG_ACPI_ASUS=m
-CONFIG_ACPI_TOSHIBA=m
-# CONFIG_ACPI_DEBUG is not set
-CONFIG_ACPI_BUS=y
-CONFIG_ACPI_EC=y
-CONFIG_ACPI_POWER=y
-CONFIG_ACPI_PCI=y
-CONFIG_ACPI_SYSTEM=y
-CONFIG_X86_PM_TIMER=y
-
-#
-# APM (Advanced Power Management) BIOS Support
-#
-CONFIG_APM=y
-# CONFIG_APM_IGNORE_USER_SUSPEND is not set
-# CONFIG_APM_DO_ENABLE is not set
-CONFIG_APM_CPU_IDLE=y
-# CONFIG_APM_DISPLAY_BLANK is not set
-CONFIG_APM_RTC_IS_GMT=y
-# CONFIG_APM_ALLOW_INTS is not set
-# CONFIG_APM_REAL_MODE_POWER_OFF is not set
-
-#
-# CPU Frequency scaling
-#
-CONFIG_CPU_FREQ=y
-# CONFIG_CPU_FREQ_PROC_INTF is not set
-# CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set
-CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE=y
-CONFIG_CPU_FREQ_GOV_PERFORMANCE=y
-CONFIG_CPU_FREQ_GOV_POWERSAVE=m
-CONFIG_CPU_FREQ_GOV_USERSPACE=y
-# CONFIG_CPU_FREQ_24_API is not set
-CONFIG_CPU_FREQ_TABLE=y
-
-#
-# CPUFreq processor drivers
-#
-CONFIG_X86_ACPI_CPUFREQ=m
-# CONFIG_X86_ACPI_CPUFREQ_PROC_INTF is not set
-CONFIG_X86_POWERNOW_K6=m
-CONFIG_X86_POWERNOW_K7=y
-CONFIG_X86_POWERNOW_K8=m
-# CONFIG_X86_GX_SUSPMOD is not set
-CONFIG_X86_SPEEDSTEP_CENTRINO=y
-CONFIG_X86_SPEEDSTEP_CENTRINO_TABLE=y
-CONFIG_X86_SPEEDSTEP_CENTRINO_ACPI=y
-CONFIG_X86_SPEEDSTEP_ICH=y
-CONFIG_X86_SPEEDSTEP_SMI=m
-CONFIG_X86_P4_CLOCKMOD=m
-CONFIG_X86_SPEEDSTEP_LIB=y
-# CONFIG_X86_SPEEDSTEP_RELAXED_CAP_CHECK is not set
-CONFIG_X86_LONGRUN=y
-# CONFIG_X86_LONGHAUL is not set
-
-#
-# Bus options (PCI, PCMCIA, EISA, MCA, ISA)
-#
-CONFIG_PCI=y
-# CONFIG_PCI_GOBIOS is not set
-# CONFIG_PCI_GOMMCONFIG is not set
-# CONFIG_PCI_GODIRECT is not set
-CONFIG_PCI_GOANY=y
-CONFIG_PCI_BIOS=y
-CONFIG_PCI_DIRECT=y
-CONFIG_PCI_MMCONFIG=y
-CONFIG_PCI_USE_VECTOR=y
-CONFIG_PCI_LEGACY_PROC=y
-# CONFIG_PCI_NAMES is not set
-CONFIG_ISA=y
-# CONFIG_EISA is not set
-# CONFIG_MCA is not set
-# CONFIG_SCx200 is not set
-
-#
-# PCMCIA/CardBus support
-#
-CONFIG_PCMCIA=m
-# CONFIG_PCMCIA_DEBUG is not set
-CONFIG_YENTA=m
-CONFIG_CARDBUS=y
-CONFIG_I82092=m
-CONFIG_I82365=m
-CONFIG_TCIC=m
-CONFIG_PCMCIA_PROBE=y
-
-#
-# PCI Hotplug Support
-#
-CONFIG_HOTPLUG_PCI=y
-# CONFIG_HOTPLUG_PCI_FAKE is not set
-CONFIG_HOTPLUG_PCI_COMPAQ=m
-# CONFIG_HOTPLUG_PCI_COMPAQ_NVRAM is not set
-CONFIG_HOTPLUG_PCI_IBM=m
-# CONFIG_HOTPLUG_PCI_ACPI is not set
-# CONFIG_HOTPLUG_PCI_CPCI is not set
-CONFIG_HOTPLUG_PCI_PCIE=m
-CONFIG_HOTPLUG_PCI_PCIE_POLL_EVENT_MODE=y
-CONFIG_HOTPLUG_PCI_SHPC=m
-CONFIG_HOTPLUG_PCI_SHPC_POLL_EVENT_MODE=y
-
-#
-# Executable file formats
-#
-CONFIG_BINFMT_ELF=y
-# CONFIG_BINFMT_AOUT is not set
-CONFIG_BINFMT_MISC=m
-
-#
-# Device Drivers
-#
-
-#
-# Generic Driver Options
-#
-CONFIG_FW_LOADER=y
-# CONFIG_DEBUG_DRIVER is not set
-
-#
-# Memory Technology Devices (MTD)
-#
-CONFIG_MTD=m
-# CONFIG_MTD_DEBUG is not set
-CONFIG_MTD_PARTITIONS=m
-CONFIG_MTD_CONCAT=m
-CONFIG_MTD_REDBOOT_PARTS=m
-CONFIG_MTD_CMDLINE_PARTS=m
-
-#
-# User Modules And Translation Layers
-#
-CONFIG_MTD_CHAR=m
-CONFIG_MTD_BLOCK=m
-CONFIG_MTD_BLOCK_RO=m
-CONFIG_FTL=m
-CONFIG_NFTL=m
-CONFIG_NFTL_RW=y
-CONFIG_INFTL=m
-
-#
-# RAM/ROM/Flash chip drivers
-#
-CONFIG_MTD_CFI=m
-CONFIG_MTD_JEDECPROBE=m
-CONFIG_MTD_GEN_PROBE=m
-# CONFIG_MTD_CFI_ADV_OPTIONS is not set
-CONFIG_MTD_CFI_INTELEXT=m
-CONFIG_MTD_CFI_AMDSTD=m
-CONFIG_MTD_CFI_STAA=m
-CONFIG_MTD_RAM=m
-CONFIG_MTD_ROM=m
-CONFIG_MTD_ABSENT=m
-# CONFIG_MTD_OBSOLETE_CHIPS is not set
-
-#
-# Mapping drivers for chip access
-#
-CONFIG_MTD_COMPLEX_MAPPINGS=y
-# CONFIG_MTD_PHYSMAP is not set
-# CONFIG_MTD_PNC2000 is not set
-CONFIG_MTD_SC520CDP=m
-CONFIG_MTD_NETSC520=m
-CONFIG_MTD_SBC_GXX=m
-CONFIG_MTD_ELAN_104NC=m
-CONFIG_MTD_SCx200_DOCFLASH=m
-CONFIG_MTD_AMD76XROM=m
-CONFIG_MTD_ICH2ROM=m
-CONFIG_MTD_SCB2_FLASH=m
-# CONFIG_MTD_NETtel is not set
-# CONFIG_MTD_DILNETPC is not set
-CONFIG_MTD_L440GX=m
-CONFIG_MTD_PCI=m
-
-#
-# Self-contained MTD device drivers
-#
-CONFIG_MTD_PMC551=m
-# CONFIG_MTD_PMC551_BUGFIX is not set
-# CONFIG_MTD_PMC551_DEBUG is not set
-# CONFIG_MTD_SLRAM is not set
-CONFIG_MTD_MTDRAM=m
-CONFIG_MTDRAM_TOTAL_SIZE=4096
-CONFIG_MTDRAM_ERASE_SIZE=128
-# CONFIG_MTD_BLKMTD is not set
-
-#
-# Disk-On-Chip Device Drivers
-#
-CONFIG_MTD_DOC2000=m
-# CONFIG_MTD_DOC2001 is not set
-CONFIG_MTD_DOC2001PLUS=m
-CONFIG_MTD_DOCPROBE=m
-# CONFIG_MTD_DOCPROBE_ADVANCED is not set
-CONFIG_MTD_DOCPROBE_ADDRESS=0
-
-#
-# NAND Flash Device Drivers
-#
-CONFIG_MTD_NAND=m
-# CONFIG_MTD_NAND_VERIFY_WRITE is not set
-CONFIG_MTD_NAND_IDS=m
-
-#
-# Parallel port support
-#
-CONFIG_PARPORT=m
-CONFIG_PARPORT_PC=m
-CONFIG_PARPORT_PC_CML1=m
-CONFIG_PARPORT_SERIAL=m
-# CONFIG_PARPORT_PC_FIFO is not set
-# CONFIG_PARPORT_PC_SUPERIO is not set
-CONFIG_PARPORT_PC_PCMCIA=m
-# CONFIG_PARPORT_OTHER is not set
-CONFIG_PARPORT_1284=y
-
-#
-# Plug and Play support
-#
-CONFIG_PNP=y
-# CONFIG_PNP_DEBUG is not set
-
-#
-# Protocols
-#
-CONFIG_ISAPNP=y
-# CONFIG_PNPBIOS is not set
-
-#
-# Block devices
-#
-CONFIG_BLK_DEV_FD=m
-# CONFIG_BLK_DEV_XD is not set
-# CONFIG_PARIDE is not set
-CONFIG_BLK_CPQ_DA=m
-CONFIG_BLK_CPQ_CISS_DA=m
-CONFIG_CISS_SCSI_TAPE=y
-CONFIG_BLK_DEV_DAC960=m
-CONFIG_BLK_DEV_UMEM=m
-CONFIG_BLK_DEV_LOOP=m
-CONFIG_BLK_DEV_CRYPTOLOOP=m
-CONFIG_BLK_DEV_NBD=m
-CONFIG_BLK_DEV_CARMEL=m
-CONFIG_BLK_DEV_RAM=y
-CONFIG_BLK_DEV_RAM_SIZE=16384
-CONFIG_BLK_DEV_INITRD=y
-CONFIG_LBD=y
-
-#
-# ATA/ATAPI/MFM/RLL support
-#
-CONFIG_IDE=y
-CONFIG_BLK_DEV_IDE=y
-
-#
-# Please see Documentation/ide.txt for help/info on IDE drives
-#
-# CONFIG_BLK_DEV_HD_IDE is not set
-CONFIG_BLK_DEV_IDEDISK=y
-CONFIG_IDEDISK_MULTI_MODE=y
-# CONFIG_IDEDISK_STROKE is not set
-CONFIG_BLK_DEV_IDECS=m
-CONFIG_BLK_DEV_IDECD=y
-CONFIG_BLK_DEV_IDETAPE=m
-CONFIG_BLK_DEV_IDEFLOPPY=y
-# CONFIG_BLK_DEV_IDESCSI is not set
-# CONFIG_IDE_TASK_IOCTL is not set
-# CONFIG_IDE_TASKFILE_IO is not set
-
-#
-# IDE chipset support/bugfixes
-#
-CONFIG_IDE_GENERIC=y
-# CONFIG_BLK_DEV_CMD640 is not set
-CONFIG_BLK_DEV_IDEPNP=y
-CONFIG_BLK_DEV_IDEPCI=y
-CONFIG_IDEPCI_SHARE_IRQ=y
-# CONFIG_BLK_DEV_OFFBOARD is not set
-CONFIG_BLK_DEV_GENERIC=y
-# CONFIG_BLK_DEV_OPTI621 is not set
-CONFIG_BLK_DEV_RZ1000=y
-CONFIG_BLK_DEV_IDEDMA_PCI=y
-# CONFIG_BLK_DEV_IDEDMA_FORCED is not set
-CONFIG_IDEDMA_PCI_AUTO=y
-# CONFIG_IDEDMA_ONLYDISK is not set
-CONFIG_BLK_DEV_ADMA=y
-CONFIG_BLK_DEV_AEC62XX=y
-CONFIG_BLK_DEV_ALI15X3=y
-# CONFIG_WDC_ALI15X3 is not set
-CONFIG_BLK_DEV_AMD74XX=y
-CONFIG_BLK_DEV_ATIIXP=y
-CONFIG_BLK_DEV_CMD64X=y
-CONFIG_BLK_DEV_TRIFLEX=y
-CONFIG_BLK_DEV_CY82C693=y
-CONFIG_BLK_DEV_CS5520=y
-CONFIG_BLK_DEV_CS5530=y
-CONFIG_BLK_DEV_HPT34X=y
-# CONFIG_HPT34X_AUTODMA is not set
-CONFIG_BLK_DEV_HPT366=y
-# CONFIG_BLK_DEV_SC1200 is not set
-CONFIG_BLK_DEV_PIIX=y
-# CONFIG_BLK_DEV_NS87415 is not set
-CONFIG_BLK_DEV_PDC202XX_OLD=y
-# CONFIG_PDC202XX_BURST is not set
-CONFIG_BLK_DEV_PDC202XX_NEW=y
-CONFIG_PDC202XX_FORCE=y
-CONFIG_BLK_DEV_SVWKS=y
-CONFIG_BLK_DEV_SIIMAGE=y
-CONFIG_BLK_DEV_SIS5513=y
-CONFIG_BLK_DEV_SLC90E66=y
-# CONFIG_BLK_DEV_TRM290 is not set
-CONFIG_BLK_DEV_VIA82CXXX=y
-# CONFIG_IDE_ARM is not set
-# CONFIG_IDE_CHIPSETS is not set
-CONFIG_BLK_DEV_IDEDMA=y
-# CONFIG_IDEDMA_IVB is not set
-CONFIG_IDEDMA_AUTO=y
-# CONFIG_BLK_DEV_HD is not set
-
-#
-# SCSI device support
-#
-CONFIG_SCSI=m
-CONFIG_SCSI_PROC_FS=y
-
-#
-# SCSI support type (disk, tape, CD-ROM)
-#
-CONFIG_BLK_DEV_SD=m
-CONFIG_CHR_DEV_ST=m
-CONFIG_CHR_DEV_OSST=m
-CONFIG_BLK_DEV_SR=m
-CONFIG_BLK_DEV_SR_VENDOR=y
-CONFIG_CHR_DEV_SG=m
-
-#
-# Some SCSI devices (e.g. CD jukebox) support multiple LUNs
-#
-# CONFIG_SCSI_MULTI_LUN is not set
-CONFIG_SCSI_CONSTANTS=y
-CONFIG_SCSI_LOGGING=y
-
-#
-# SCSI Transport Attributes
-#
-CONFIG_SCSI_SPI_ATTRS=m
-CONFIG_SCSI_FC_ATTRS=m
-
-#
-# SCSI low-level drivers
-#
-CONFIG_BLK_DEV_3W_XXXX_RAID=m
-# CONFIG_SCSI_7000FASST is not set
-CONFIG_SCSI_ACARD=m
-CONFIG_SCSI_AHA152X=m
-CONFIG_SCSI_AHA1542=m
-CONFIG_SCSI_AACRAID=m
-CONFIG_SCSI_AIC7XXX=m
-CONFIG_AIC7XXX_CMDS_PER_DEVICE=4
-CONFIG_AIC7XXX_RESET_DELAY_MS=15000
-# CONFIG_AIC7XXX_BUILD_FIRMWARE is not set
-# CONFIG_AIC7XXX_DEBUG_ENABLE is not set
-CONFIG_AIC7XXX_DEBUG_MASK=0
-# CONFIG_AIC7XXX_REG_PRETTY_PRINT is not set
-CONFIG_SCSI_AIC7XXX_OLD=m
-CONFIG_SCSI_AIC79XX=m
-CONFIG_AIC79XX_CMDS_PER_DEVICE=4
-CONFIG_AIC79XX_RESET_DELAY_MS=15000
-# CONFIG_AIC79XX_BUILD_FIRMWARE is not set
-# CONFIG_AIC79XX_ENABLE_RD_STRM is not set
-# CONFIG_AIC79XX_DEBUG_ENABLE is not set
-CONFIG_AIC79XX_DEBUG_MASK=0
-# CONFIG_AIC79XX_REG_PRETTY_PRINT is not set
-# CONFIG_SCSI_DPT_I2O is not set
-CONFIG_SCSI_ADVANSYS=m
-CONFIG_SCSI_IN2000=m
-CONFIG_SCSI_MEGARAID=m
-CONFIG_SCSI_SATA=y
-CONFIG_SCSI_SATA_SVW=m
-CONFIG_SCSI_ATA_PIIX=m
-CONFIG_SCSI_SATA_PROMISE=m
-CONFIG_SCSI_SATA_SX4=m
-CONFIG_SCSI_SATA_SIL=m
-CONFIG_SCSI_SATA_SIS=m
-CONFIG_SCSI_SATA_VIA=m
-CONFIG_SCSI_SATA_VITESSE=m
-CONFIG_SCSI_BUSLOGIC=m
-# CONFIG_SCSI_OMIT_FLASHPOINT is not set
-# CONFIG_SCSI_CPQFCTS is not set
-# CONFIG_SCSI_DMX3191D is not set
-# CONFIG_SCSI_DTC3280 is not set
-# CONFIG_SCSI_EATA is not set
-# CONFIG_SCSI_EATA_PIO is not set
-CONFIG_SCSI_FUTURE_DOMAIN=m
-CONFIG_SCSI_GDTH=m
-# CONFIG_SCSI_GENERIC_NCR5380 is not set
-# CONFIG_SCSI_GENERIC_NCR5380_MMIO is not set
-CONFIG_SCSI_IPS=m
-CONFIG_SCSI_INIA100=m
-CONFIG_SCSI_PPA=m
-CONFIG_SCSI_IMM=m
-# CONFIG_SCSI_IZIP_EPP16 is not set
-# CONFIG_SCSI_IZIP_SLOW_CTR is not set
-# CONFIG_SCSI_NCR53C406A is not set
-CONFIG_SCSI_SYM53C8XX_2=m
-CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=1
-CONFIG_SCSI_SYM53C8XX_DEFAULT_TAGS=16
-CONFIG_SCSI_SYM53C8XX_MAX_TAGS=64
-# CONFIG_SCSI_SYM53C8XX_IOMAPPED is not set
-# CONFIG_SCSI_IPR is not set
-# CONFIG_SCSI_PAS16 is not set
-# CONFIG_SCSI_PSI240I is not set
-CONFIG_SCSI_QLOGIC_FAS=m
-CONFIG_SCSI_QLOGIC_ISP=m
-# CONFIG_SCSI_QLOGIC_FC is not set
-CONFIG_SCSI_QLOGIC_1280=m
-CONFIG_SCSI_QLA2XXX=m
-CONFIG_SCSI_QLA21XX=m
-CONFIG_SCSI_QLA22XX=m
-CONFIG_SCSI_QLA2300=m
-CONFIG_SCSI_QLA2322=m
-CONFIG_SCSI_QLA6312=m
-CONFIG_SCSI_QLA6322=m
-# CONFIG_SCSI_SYM53C416 is not set
-# CONFIG_SCSI_DC395x is not set
-CONFIG_SCSI_DC390T=m
-# CONFIG_SCSI_T128 is not set
-# CONFIG_SCSI_U14_34F is not set
-# CONFIG_SCSI_ULTRASTOR is not set
-# CONFIG_SCSI_NSP32 is not set
-# CONFIG_SCSI_DEBUG is not set
-
-#
-# PCMCIA SCSI adapter support
-#
-CONFIG_PCMCIA_AHA152X=m
-CONFIG_PCMCIA_FDOMAIN=m
-CONFIG_PCMCIA_NINJA_SCSI=m
-CONFIG_PCMCIA_QLOGIC=m
-CONFIG_PCMCIA_SYM53C500=m
-
-#
-# Old CD-ROM drivers (not SCSI, not IDE)
-#
-# CONFIG_CD_NO_IDESCSI is not set
-
-#
-# Multi-device support (RAID and LVM)
-#
-CONFIG_MD=y
-CONFIG_BLK_DEV_MD=y
-CONFIG_MD_LINEAR=m
-CONFIG_MD_RAID0=m
-CONFIG_MD_RAID1=m
-CONFIG_MD_RAID5=m
-CONFIG_MD_RAID6=m
-CONFIG_MD_MULTIPATH=m
-CONFIG_BLK_DEV_DM=m
-CONFIG_DM_CRYPT=m
-
-#
-# Fusion MPT device support
-#
-CONFIG_FUSION=m
-CONFIG_FUSION_MAX_SGE=40
-# CONFIG_FUSION_ISENSE is not set
-CONFIG_FUSION_CTL=m
-CONFIG_FUSION_LAN=m
-
-#
-# IEEE 1394 (FireWire) support
-#
-CONFIG_IEEE1394=m
-
-#
-# Subsystem Options
-#
-# CONFIG_IEEE1394_VERBOSEDEBUG is not set
-CONFIG_IEEE1394_OUI_DB=y
-# CONFIG_IEEE1394_EXTRA_CONFIG_ROMS is not set
-
-#
-# Device Drivers
-#
-# CONFIG_IEEE1394_PCILYNX is not set
-CONFIG_IEEE1394_OHCI1394=m
-
-#
-# Protocol Drivers
-#
-CONFIG_IEEE1394_VIDEO1394=m
-CONFIG_IEEE1394_SBP2=m
-# CONFIG_IEEE1394_SBP2_PHYS_DMA is not set
-# CONFIG_IEEE1394_ETH1394 is not set
-CONFIG_IEEE1394_DV1394=m
-CONFIG_IEEE1394_RAWIO=m
-CONFIG_IEEE1394_CMP=m
-CONFIG_IEEE1394_AMDTP=m
-
-#
-# I2O device support
-#
-CONFIG_I2O=m
-CONFIG_I2O_CONFIG=m
-CONFIG_I2O_BLOCK=m
-CONFIG_I2O_SCSI=m
-CONFIG_I2O_PROC=m
-
-#
-# Networking support
-#
-CONFIG_NET=y
-
-#
-# Networking options
-#
-CONFIG_PACKET=y
-CONFIG_PACKET_MMAP=y
-CONFIG_NETLINK_DEV=y
-CONFIG_UNIX=y
-CONFIG_NET_KEY=m
-CONFIG_INET=y
-CONFIG_IP_MULTICAST=y
-CONFIG_IP_ADVANCED_ROUTER=y
-CONFIG_IP_MULTIPLE_TABLES=y
-CONFIG_IP_ROUTE_FWMARK=y
-CONFIG_IP_ROUTE_NAT=y
-CONFIG_IP_ROUTE_MULTIPATH=y
-CONFIG_IP_ROUTE_TOS=y
-CONFIG_IP_ROUTE_VERBOSE=y
-# CONFIG_IP_PNP is not set
-CONFIG_NET_IPIP=m
-CONFIG_NET_IPGRE=m
-CONFIG_NET_IPGRE_BROADCAST=y
-CONFIG_IP_MROUTE=y
-CONFIG_IP_PIMSM_V1=y
-CONFIG_IP_PIMSM_V2=y
-# CONFIG_ARPD is not set
-CONFIG_SYN_COOKIES=y
-CONFIG_INET_AH=m
-CONFIG_INET_ESP=m
-CONFIG_INET_IPCOMP=m
-
-#
-# IP: Virtual Server Configuration
-#
-CONFIG_IP_VS=m
-# CONFIG_IP_VS_DEBUG is not set
-CONFIG_IP_VS_TAB_BITS=12
-
-#
-# IPVS transport protocol load balancing support
-#
-CONFIG_IP_VS_PROTO_TCP=y
-CONFIG_IP_VS_PROTO_UDP=y
-CONFIG_IP_VS_PROTO_ESP=y
-CONFIG_IP_VS_PROTO_AH=y
-
-#
-# IPVS scheduler
-#
-CONFIG_IP_VS_RR=m
-CONFIG_IP_VS_WRR=m
-CONFIG_IP_VS_LC=m
-CONFIG_IP_VS_WLC=m
-CONFIG_IP_VS_LBLC=m
-CONFIG_IP_VS_LBLCR=m
-CONFIG_IP_VS_DH=m
-CONFIG_IP_VS_SH=m
-CONFIG_IP_VS_SED=m
-CONFIG_IP_VS_NQ=m
-
-#
-# IPVS application helper
-#
-CONFIG_IP_VS_FTP=m
-CONFIG_IPV6=m
-CONFIG_IPV6_PRIVACY=y
-CONFIG_INET6_AH=m
-CONFIG_INET6_ESP=m
-CONFIG_INET6_IPCOMP=m
-CONFIG_IPV6_TUNNEL=m
-CONFIG_NETFILTER=y
-# CONFIG_NETFILTER_DEBUG is not set
-CONFIG_BRIDGE_NETFILTER=y
-
-#
-# IP: Netfilter Configuration
-#
-CONFIG_IP_NF_CONNTRACK=m
-CONFIG_IP_NF_FTP=m
-CONFIG_IP_NF_IRC=m
-CONFIG_IP_NF_TFTP=m
-CONFIG_IP_NF_AMANDA=m
-CONFIG_IP_NF_QUEUE=m
-CONFIG_IP_NF_IPTABLES=m
-CONFIG_IP_NF_MATCH_LIMIT=m
-CONFIG_IP_NF_MATCH_IPRANGE=m
-CONFIG_IP_NF_MATCH_MAC=m
-CONFIG_IP_NF_MATCH_PKTTYPE=m
-CONFIG_IP_NF_MATCH_MARK=m
-CONFIG_IP_NF_MATCH_MULTIPORT=m
-CONFIG_IP_NF_MATCH_TOS=m
-CONFIG_IP_NF_MATCH_RECENT=m
-CONFIG_IP_NF_MATCH_ECN=m
-CONFIG_IP_NF_MATCH_DSCP=m
-CONFIG_IP_NF_MATCH_AH_ESP=m
-CONFIG_IP_NF_MATCH_LENGTH=m
-CONFIG_IP_NF_MATCH_TTL=m
-CONFIG_IP_NF_MATCH_TCPMSS=m
-CONFIG_IP_NF_MATCH_HELPER=m
-CONFIG_IP_NF_MATCH_STATE=m
-CONFIG_IP_NF_MATCH_CONNTRACK=m
-CONFIG_IP_NF_MATCH_OWNER=m
-CONFIG_IP_NF_MATCH_PHYSDEV=m
-CONFIG_IP_NF_FILTER=m
-CONFIG_IP_NF_TARGET_REJECT=m
-CONFIG_IP_NF_NAT=m
-CONFIG_IP_NF_NAT_NEEDED=y
-CONFIG_IP_NF_TARGET_MASQUERADE=m
-CONFIG_IP_NF_TARGET_REDIRECT=m
-CONFIG_IP_NF_TARGET_NETMAP=m
-CONFIG_IP_NF_TARGET_SAME=m
-CONFIG_IP_NF_NAT_LOCAL=y
-CONFIG_IP_NF_NAT_SNMP_BASIC=m
-CONFIG_IP_NF_NAT_IRC=m
-CONFIG_IP_NF_NAT_FTP=m
-CONFIG_IP_NF_NAT_TFTP=m
-CONFIG_IP_NF_NAT_AMANDA=m
-CONFIG_IP_NF_MANGLE=m
-CONFIG_IP_NF_TARGET_TOS=m
-CONFIG_IP_NF_TARGET_ECN=m
-CONFIG_IP_NF_TARGET_DSCP=m
-CONFIG_IP_NF_TARGET_MARK=m
-CONFIG_IP_NF_TARGET_CLASSIFY=m
-CONFIG_IP_NF_TARGET_LOG=m
-CONFIG_IP_NF_TARGET_ULOG=m
-CONFIG_IP_NF_TARGET_TCPMSS=m
-CONFIG_IP_NF_ARPTABLES=m
-CONFIG_IP_NF_ARPFILTER=m
-CONFIG_IP_NF_ARP_MANGLE=m
-# CONFIG_IP_NF_COMPAT_IPCHAINS is not set
-# CONFIG_IP_NF_COMPAT_IPFWADM is not set
-CONFIG_IP_NF_TARGET_NOTRACK=m
-CONFIG_IP_NF_RAW=m
-
-#
-# IPv6: Netfilter Configuration
-#
-# CONFIG_IP6_NF_QUEUE is not set
-CONFIG_IP6_NF_IPTABLES=m
-CONFIG_IP6_NF_MATCH_LIMIT=m
-CONFIG_IP6_NF_MATCH_MAC=m
-CONFIG_IP6_NF_MATCH_RT=m
-CONFIG_IP6_NF_MATCH_OPTS=m
-CONFIG_IP6_NF_MATCH_FRAG=m
-CONFIG_IP6_NF_MATCH_HL=m
-CONFIG_IP6_NF_MATCH_MULTIPORT=m
-CONFIG_IP6_NF_MATCH_OWNER=m
-CONFIG_IP6_NF_MATCH_MARK=m
-CONFIG_IP6_NF_MATCH_IPV6HEADER=m
-CONFIG_IP6_NF_MATCH_AHESP=m
-CONFIG_IP6_NF_MATCH_LENGTH=m
-CONFIG_IP6_NF_MATCH_EUI64=m
-CONFIG_IP6_NF_FILTER=m
-CONFIG_IP6_NF_TARGET_LOG=m
-CONFIG_IP6_NF_MANGLE=m
-CONFIG_IP6_NF_TARGET_MARK=m
-CONFIG_IP6_NF_RAW=m
-
-#
-# Bridge: Netfilter Configuration
-#
-CONFIG_BRIDGE_NF_EBTABLES=m
-CONFIG_BRIDGE_EBT_BROUTE=m
-CONFIG_BRIDGE_EBT_T_FILTER=m
-CONFIG_BRIDGE_EBT_T_NAT=m
-CONFIG_BRIDGE_EBT_802_3=m
-CONFIG_BRIDGE_EBT_AMONG=m
-CONFIG_BRIDGE_EBT_ARP=m
-CONFIG_BRIDGE_EBT_IP=m
-CONFIG_BRIDGE_EBT_LIMIT=m
-CONFIG_BRIDGE_EBT_MARK=m
-CONFIG_BRIDGE_EBT_PKTTYPE=m
-CONFIG_BRIDGE_EBT_STP=m
-CONFIG_BRIDGE_EBT_VLAN=m
-CONFIG_BRIDGE_EBT_ARPREPLY=m
-CONFIG_BRIDGE_EBT_DNAT=m
-CONFIG_BRIDGE_EBT_MARK_T=m
-CONFIG_BRIDGE_EBT_REDIRECT=m
-CONFIG_BRIDGE_EBT_SNAT=m
-CONFIG_BRIDGE_EBT_LOG=m
-CONFIG_XFRM=y
-CONFIG_XFRM_USER=y
-
-#
-# SCTP Configuration (EXPERIMENTAL)
-#
-CONFIG_IP_SCTP=m
-# CONFIG_SCTP_DBG_MSG is not set
-# CONFIG_SCTP_DBG_OBJCNT is not set
-# CONFIG_SCTP_HMAC_NONE is not set
-# CONFIG_SCTP_HMAC_SHA1 is not set
-CONFIG_SCTP_HMAC_MD5=y
-# CONFIG_ATM is not set
-CONFIG_BRIDGE=m
-CONFIG_VLAN_8021Q=m
-# CONFIG_DECNET is not set
-CONFIG_LLC=m
-# CONFIG_LLC2 is not set
-CONFIG_IPX=m
-# CONFIG_IPX_INTERN is not set
-CONFIG_ATALK=m
-CONFIG_DEV_APPLETALK=y
-CONFIG_LTPC=m
-CONFIG_COPS=m
-CONFIG_COPS_DAYNA=y
-CONFIG_COPS_TANGENT=y
-CONFIG_IPDDP=m
-CONFIG_IPDDP_ENCAP=y
-CONFIG_IPDDP_DECAP=y
-# CONFIG_X25 is not set
-# CONFIG_LAPB is not set
-CONFIG_NET_DIVERT=y
-# CONFIG_ECONET is not set
-CONFIG_WAN_ROUTER=m
-# CONFIG_NET_FASTROUTE is not set
-# CONFIG_NET_HW_FLOWCONTROL is not set
-
-#
-# QoS and/or fair queueing
-#
-CONFIG_NET_SCHED=y
-CONFIG_NET_SCH_CBQ=m
-CONFIG_NET_SCH_HTB=m
-CONFIG_NET_SCH_HFSC=m
-CONFIG_NET_SCH_CSZ=m
-CONFIG_NET_SCH_PRIO=m
-CONFIG_NET_SCH_RED=m
-CONFIG_NET_SCH_SFQ=m
-CONFIG_NET_SCH_TEQL=m
-CONFIG_NET_SCH_TBF=m
-CONFIG_NET_SCH_GRED=m
-CONFIG_NET_SCH_DSMARK=m
-CONFIG_NET_SCH_DELAY=m
-CONFIG_NET_SCH_INGRESS=m
-CONFIG_NET_QOS=y
-CONFIG_NET_ESTIMATOR=y
-CONFIG_NET_CLS=y
-CONFIG_NET_CLS_TCINDEX=m
-CONFIG_NET_CLS_ROUTE4=m
-CONFIG_NET_CLS_ROUTE=y
-CONFIG_NET_CLS_FW=m
-CONFIG_NET_CLS_U32=m
-CONFIG_NET_CLS_RSVP=m
-CONFIG_NET_CLS_RSVP6=m
-CONFIG_NET_CLS_POLICE=y
-
-#
-# Network testing
-#
-# CONFIG_NET_PKTGEN is not set
-CONFIG_NETPOLL=y
-# CONFIG_NETPOLL_RX is not set
-# CONFIG_NETPOLL_TRAP is not set
-CONFIG_NET_POLL_CONTROLLER=y
-# CONFIG_HAMRADIO is not set
-CONFIG_IRDA=m
-
-#
-# IrDA protocols
-#
-CONFIG_IRLAN=m
-CONFIG_IRNET=m
-CONFIG_IRCOMM=m
-# CONFIG_IRDA_ULTRA is not set
-
-#
-# IrDA options
-#
-CONFIG_IRDA_CACHE_LAST_LSAP=y
-CONFIG_IRDA_FAST_RR=y
-# CONFIG_IRDA_DEBUG is not set
-
-#
-# Infrared-port device drivers
-#
-
-#
-# SIR device drivers
-#
-CONFIG_IRTTY_SIR=m
-
-#
-# Dongle support
-#
-CONFIG_DONGLE=y
-CONFIG_ESI_DONGLE=m
-CONFIG_ACTISYS_DONGLE=m
-CONFIG_TEKRAM_DONGLE=m
-CONFIG_LITELINK_DONGLE=m
-CONFIG_MA600_DONGLE=m
-CONFIG_GIRBIL_DONGLE=m
-CONFIG_MCP2120_DONGLE=m
-CONFIG_OLD_BELKIN_DONGLE=m
-CONFIG_ACT200L_DONGLE=m
-
-#
-# Old SIR device drivers
-#
-
-#
-# Old Serial dongle support
-#
-
-#
-# FIR device drivers
-#
-CONFIG_USB_IRDA=m
-CONFIG_SIGMATEL_FIR=m
-CONFIG_NSC_FIR=m
-# CONFIG_WINBOND_FIR is not set
-# CONFIG_TOSHIBA_FIR is not set
-# CONFIG_SMC_IRCC_FIR is not set
-# CONFIG_ALI_FIR is not set
-# CONFIG_VLSI_FIR is not set
-# CONFIG_VIA_FIR is not set
-CONFIG_BT=m
-CONFIG_BT_L2CAP=m
-CONFIG_BT_SCO=m
-CONFIG_BT_RFCOMM=m
-CONFIG_BT_RFCOMM_TTY=y
-CONFIG_BT_BNEP=m
-CONFIG_BT_BNEP_MC_FILTER=y
-CONFIG_BT_BNEP_PROTO_FILTER=y
-CONFIG_BT_CMTP=m
-
-#
-# Bluetooth device drivers
-#
-CONFIG_BT_HCIUSB=m
-CONFIG_BT_HCIUSB_SCO=y
-CONFIG_BT_HCIUART=m
-CONFIG_BT_HCIUART_H4=y
-CONFIG_BT_HCIUART_BCSP=y
-CONFIG_BT_HCIUART_BCSP_TXCRC=y
-CONFIG_BT_HCIBCM203X=m
-CONFIG_BT_HCIBFUSB=m
-CONFIG_BT_HCIDTL1=m
-CONFIG_BT_HCIBT3C=m
-CONFIG_BT_HCIBLUECARD=m
-CONFIG_BT_HCIBTUART=m
-CONFIG_BT_HCIVHCI=m
-CONFIG_TUX=m
-
-#
-# TUX options
-#
-CONFIG_TUX_EXTCGI=y
-# CONFIG_TUX_EXTENDED_LOG is not set
-# CONFIG_TUX_DEBUG is not set
-CONFIG_NETDEVICES=y
-CONFIG_DUMMY=m
-CONFIG_BONDING=m
-CONFIG_EQUALIZER=m
-CONFIG_TUN=m
-CONFIG_ETHERTAP=m
-CONFIG_NET_SB1000=m
-
-#
-# ARCnet devices
-#
-# CONFIG_ARCNET is not set
-
-#
-# Ethernet (10 or 100Mbit)
-#
-CONFIG_NET_ETHERNET=y
-CONFIG_MII=m
-CONFIG_HAPPYMEAL=m
-CONFIG_SUNGEM=m
-CONFIG_NET_VENDOR_3COM=y
-CONFIG_EL1=m
-CONFIG_EL2=m
-CONFIG_ELPLUS=m
-CONFIG_EL16=m
-CONFIG_EL3=m
-CONFIG_3C515=m
-CONFIG_VORTEX=m
-# CONFIG_TYPHOON is not set
-CONFIG_LANCE=m
-CONFIG_NET_VENDOR_SMC=y
-CONFIG_WD80x3=m
-CONFIG_ULTRA=m
-CONFIG_SMC9194=m
-CONFIG_NET_VENDOR_RACAL=y
-CONFIG_NI52=m
-CONFIG_NI65=m
-
-#
-# Tulip family network device support
-#
-CONFIG_NET_TULIP=y
-CONFIG_DE2104X=m
-CONFIG_TULIP=m
-# CONFIG_TULIP_MWI is not set
-CONFIG_TULIP_MMIO=y
-# CONFIG_TULIP_NAPI is not set
-CONFIG_DE4X5=m
-CONFIG_WINBOND_840=m
-CONFIG_DM9102=m
-CONFIG_PCMCIA_XIRCOM=m
-# CONFIG_AT1700 is not set
-CONFIG_DEPCA=m
-CONFIG_HP100=m
-# CONFIG_NET_ISA is not set
-CONFIG_NE2000=m
-CONFIG_NET_PCI=y
-CONFIG_PCNET32=m
-CONFIG_AMD8111_ETH=m
-CONFIG_AMD8111E_NAPI=y
-CONFIG_ADAPTEC_STARFIRE=m
-CONFIG_ADAPTEC_STARFIRE_NAPI=y
-CONFIG_AC3200=m
-CONFIG_APRICOT=m
-CONFIG_B44=m
-CONFIG_FORCEDETH=m
-CONFIG_CS89x0=m
-CONFIG_DGRS=m
-CONFIG_EEPRO100=m
-# CONFIG_EEPRO100_PIO is not set
-CONFIG_E100=m
-CONFIG_E100_NAPI=y
-CONFIG_FEALNX=m
-CONFIG_NATSEMI=m
-CONFIG_NE2K_PCI=m
-CONFIG_8139CP=m
-CONFIG_8139TOO=m
-CONFIG_8139TOO_PIO=y
-# CONFIG_8139TOO_TUNE_TWISTER is not set
-CONFIG_8139TOO_8129=y
-# CONFIG_8139_OLD_RX_RESET is not set
-CONFIG_SIS900=m
-CONFIG_EPIC100=m
-CONFIG_SUNDANCE=m
-# CONFIG_SUNDANCE_MMIO is not set
-CONFIG_TLAN=m
-CONFIG_VIA_RHINE=m
-CONFIG_VIA_RHINE_MMIO=y
-CONFIG_NET_POCKET=y
-CONFIG_ATP=m
-CONFIG_DE600=m
-CONFIG_DE620=m
-
-#
-# Ethernet (1000 Mbit)
-#
-CONFIG_ACENIC=m
-# CONFIG_ACENIC_OMIT_TIGON_I is not set
-CONFIG_DL2K=m
-CONFIG_E1000=m
-CONFIG_E1000_NAPI=y
-CONFIG_NS83820=m
-CONFIG_HAMACHI=m
-CONFIG_YELLOWFIN=m
-CONFIG_R8169=m
-CONFIG_SK98LIN=m
-CONFIG_TIGON3=m
-
-#
-# Ethernet (10000 Mbit)
-#
-CONFIG_IXGB=m
-CONFIG_IXGB_NAPI=y
-CONFIG_S2IO=m
-CONFIG_S2IO_NAPI=y
-
-#
-# Token Ring devices
-#
-# CONFIG_TR is not set
-
-#
-# Wireless LAN (non-hamradio)
-#
-CONFIG_NET_RADIO=y
-
-#
-# Obsolete Wireless cards support (pre-802.11)
-#
-# CONFIG_STRIP is not set
-# CONFIG_ARLAN is not set
-CONFIG_WAVELAN=m
-CONFIG_PCMCIA_WAVELAN=m
-CONFIG_PCMCIA_NETWAVE=m
-
-#
-# Wireless 802.11 Frequency Hopping cards support
-#
-# CONFIG_PCMCIA_RAYCS is not set
-
-#
-# Wireless 802.11b ISA/PCI cards support
-#
-CONFIG_AIRO=m
-CONFIG_HERMES=m
-CONFIG_PLX_HERMES=m
-CONFIG_TMD_HERMES=m
-CONFIG_PCI_HERMES=m
-CONFIG_ATMEL=m
-CONFIG_PCI_ATMEL=m
-
-#
-# Wireless 802.11b Pcmcia/Cardbus cards support
-#
-CONFIG_PCMCIA_HERMES=m
-CONFIG_AIRO_CS=m
-CONFIG_PCMCIA_ATMEL=m
-CONFIG_PCMCIA_WL3501=m
-
-#
-# Prism GT/Duette 802.11(a/b/g) PCI/Cardbus support
-#
-CONFIG_PRISM54=m
-CONFIG_NET_WIRELESS=y
-
-#
-# PCMCIA network device support
-#
-CONFIG_NET_PCMCIA=y
-CONFIG_PCMCIA_3C589=m
-CONFIG_PCMCIA_3C574=m
-CONFIG_PCMCIA_FMVJ18X=m
-CONFIG_PCMCIA_PCNET=m
-CONFIG_PCMCIA_NMCLAN=m
-CONFIG_PCMCIA_SMC91C92=m
-CONFIG_PCMCIA_XIRC2PS=m
-CONFIG_PCMCIA_AXNET=m
-
-#
-# Wan interfaces
-#
-# CONFIG_WAN is not set
-CONFIG_FDDI=y
-# CONFIG_DEFXX is not set
-CONFIG_SKFP=m
-# CONFIG_HIPPI is not set
-CONFIG_PLIP=m
-CONFIG_PPP=m
-CONFIG_PPP_MULTILINK=y
-CONFIG_PPP_FILTER=y
-CONFIG_PPP_ASYNC=m
-CONFIG_PPP_SYNC_TTY=m
-CONFIG_PPP_DEFLATE=m
-# CONFIG_PPP_BSDCOMP is not set
-CONFIG_PPPOE=m
-# CONFIG_SLIP is not set
-CONFIG_NET_FC=y
-# CONFIG_SHAPER is not set
-CONFIG_NETCONSOLE=m
-
-#
-# ISDN subsystem
-#
-CONFIG_ISDN=m
-
-#
-# Old ISDN4Linux
-#
-CONFIG_ISDN_I4L=m
-CONFIG_ISDN_PPP=y
-CONFIG_ISDN_PPP_VJ=y
-CONFIG_ISDN_MPP=y
-CONFIG_IPPP_FILTER=y
-# CONFIG_ISDN_PPP_BSDCOMP is not set
-CONFIG_ISDN_AUDIO=y
-CONFIG_ISDN_TTY_FAX=y
-
-#
-# ISDN feature submodules
-#
-
-#
-# ISDN4Linux hardware drivers
-#
-
-#
-# Passive cards
-#
-CONFIG_ISDN_DRV_HISAX=m
-
-#
-# D-channel protocol features
-#
-CONFIG_HISAX_EURO=y
-CONFIG_DE_AOC=y
-CONFIG_HISAX_NO_SENDCOMPLETE=y
-CONFIG_HISAX_NO_LLC=y
-CONFIG_HISAX_NO_KEYPAD=y
-CONFIG_HISAX_1TR6=y
-CONFIG_HISAX_NI1=y
-CONFIG_HISAX_MAX_CARDS=8
-
-#
-# HiSax supported cards
-#
-CONFIG_HISAX_16_0=y
-CONFIG_HISAX_16_3=y
-CONFIG_HISAX_TELESPCI=y
-CONFIG_HISAX_S0BOX=y
-CONFIG_HISAX_AVM_A1=y
-CONFIG_HISAX_FRITZPCI=y
-CONFIG_HISAX_AVM_A1_PCMCIA=y
-CONFIG_HISAX_ELSA=y
-CONFIG_HISAX_IX1MICROR2=y
-CONFIG_HISAX_DIEHLDIVA=y
-CONFIG_HISAX_ASUSCOM=y
-CONFIG_HISAX_TELEINT=y
-CONFIG_HISAX_HFCS=y
-CONFIG_HISAX_SEDLBAUER=y
-CONFIG_HISAX_SPORTSTER=y
-CONFIG_HISAX_MIC=y
-CONFIG_HISAX_NETJET=y
-CONFIG_HISAX_NETJET_U=y
-CONFIG_HISAX_NICCY=y
-CONFIG_HISAX_ISURF=y
-CONFIG_HISAX_HSTSAPHIR=y
-CONFIG_HISAX_BKM_A4T=y
-CONFIG_HISAX_SCT_QUADRO=y
-CONFIG_HISAX_GAZEL=y
-CONFIG_HISAX_HFC_PCI=y
-CONFIG_HISAX_W6692=y
-CONFIG_HISAX_HFC_SX=y
-CONFIG_HISAX_ENTERNOW_PCI=y
-# CONFIG_HISAX_DEBUG is not set
-
-#
-# HiSax PCMCIA card service modules
-#
-CONFIG_HISAX_SEDLBAUER_CS=m
-CONFIG_HISAX_ELSA_CS=m
-CONFIG_HISAX_AVM_A1_CS=m
-CONFIG_HISAX_TELES_CS=m
-
-#
-# HiSax sub driver modules
-#
-CONFIG_HISAX_ST5481=m
-CONFIG_HISAX_HFCUSB=m
-CONFIG_HISAX_FRITZ_PCIPNP=m
-CONFIG_HISAX_HDLC=y
-
-#
-# Active cards
-#
-CONFIG_ISDN_DRV_ICN=m
-CONFIG_ISDN_DRV_PCBIT=m
-CONFIG_ISDN_DRV_SC=m
-CONFIG_ISDN_DRV_ACT2000=m
-CONFIG_ISDN_DRV_TPAM=m
-
-#
-# CAPI subsystem
-#
-CONFIG_ISDN_CAPI=m
-CONFIG_ISDN_DRV_AVMB1_VERBOSE_REASON=y
-CONFIG_ISDN_CAPI_MIDDLEWARE=y
-CONFIG_ISDN_CAPI_CAPI20=m
-CONFIG_ISDN_CAPI_CAPIFS_BOOL=y
-CONFIG_ISDN_CAPI_CAPIFS=m
-CONFIG_ISDN_CAPI_CAPIDRV=m
-
-#
-# CAPI hardware drivers
-#
-
-#
-# Active AVM cards
-#
-CONFIG_CAPI_AVM=y
-
-#
-# Active Eicon DIVA Server cards
-#
-CONFIG_CAPI_EICON=y
-CONFIG_ISDN_DIVAS=m
-CONFIG_ISDN_DIVAS_BRIPCI=y
-CONFIG_ISDN_DIVAS_PRIPCI=y
-CONFIG_ISDN_DIVAS_DIVACAPI=m
-CONFIG_ISDN_DIVAS_USERIDI=m
-CONFIG_ISDN_DIVAS_MAINT=m
-
-#
-# Telephony Support
-#
-# CONFIG_PHONE is not set
-
-#
-# Input device support
-#
-CONFIG_INPUT=y
-
-#
-# Userland interfaces
-#
-CONFIG_INPUT_MOUSEDEV=y
-# CONFIG_INPUT_MOUSEDEV_PSAUX is not set
-CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
-CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
-CONFIG_INPUT_JOYDEV=m
-# CONFIG_INPUT_TSDEV is not set
-CONFIG_INPUT_EVDEV=y
-# CONFIG_INPUT_EVBUG is not set
-
-#
-# Input I/O drivers
-#
-CONFIG_GAMEPORT=m
-CONFIG_SOUND_GAMEPORT=m
-CONFIG_GAMEPORT_NS558=m
-CONFIG_GAMEPORT_L4=m
-CONFIG_GAMEPORT_EMU10K1=m
-CONFIG_GAMEPORT_VORTEX=m
-CONFIG_GAMEPORT_FM801=m
-CONFIG_GAMEPORT_CS461x=m
-CONFIG_SERIO=y
-CONFIG_SERIO_I8042=y
-CONFIG_SERIO_SERPORT=y
-# CONFIG_SERIO_CT82C710 is not set
-# CONFIG_SERIO_PARKBD is not set
-# CONFIG_SERIO_PCIPS2 is not set
-
-#
-# Input Device Drivers
-#
-CONFIG_INPUT_KEYBOARD=y
-CONFIG_KEYBOARD_ATKBD=y
-# CONFIG_KEYBOARD_SUNKBD is not set
-# CONFIG_KEYBOARD_LKKBD is not set
-# CONFIG_KEYBOARD_XTKBD is not set
-# CONFIG_KEYBOARD_NEWTON is not set
-CONFIG_INPUT_MOUSE=y
-CONFIG_MOUSE_PS2=y
-CONFIG_MOUSE_SERIAL=m
-CONFIG_MOUSE_INPORT=m
-CONFIG_MOUSE_ATIXL=y
-CONFIG_MOUSE_LOGIBM=m
-CONFIG_MOUSE_PC110PAD=m
-CONFIG_MOUSE_VSXXXAA=m
-CONFIG_INPUT_JOYSTICK=y
-CONFIG_JOYSTICK_ANALOG=m
-CONFIG_JOYSTICK_A3D=m
-CONFIG_JOYSTICK_ADI=m
-CONFIG_JOYSTICK_COBRA=m
-CONFIG_JOYSTICK_GF2K=m
-CONFIG_JOYSTICK_GRIP=m
-CONFIG_JOYSTICK_GRIP_MP=m
-CONFIG_JOYSTICK_GUILLEMOT=m
-CONFIG_JOYSTICK_INTERACT=m
-CONFIG_JOYSTICK_SIDEWINDER=m
-CONFIG_JOYSTICK_TMDC=m
-CONFIG_JOYSTICK_IFORCE=m
-CONFIG_JOYSTICK_IFORCE_USB=y
-CONFIG_JOYSTICK_IFORCE_232=y
-CONFIG_JOYSTICK_WARRIOR=m
-CONFIG_JOYSTICK_MAGELLAN=m
-CONFIG_JOYSTICK_SPACEORB=m
-CONFIG_JOYSTICK_SPACEBALL=m
-CONFIG_JOYSTICK_STINGER=m
-CONFIG_JOYSTICK_TWIDDLER=m
-CONFIG_JOYSTICK_DB9=m
-CONFIG_JOYSTICK_GAMECON=m
-CONFIG_JOYSTICK_TURBOGRAFX=m
-# CONFIG_INPUT_JOYDUMP is not set
-CONFIG_INPUT_TOUCHSCREEN=y
-CONFIG_TOUCHSCREEN_GUNZE=m
-CONFIG_INPUT_MISC=y
-CONFIG_INPUT_PCSPKR=m
-# CONFIG_INPUT_UINPUT is not set
-
-#
-# Character devices
-#
-CONFIG_VT=y
-CONFIG_VT_CONSOLE=y
-CONFIG_HW_CONSOLE=y
-CONFIG_SERIAL_NONSTANDARD=y
-CONFIG_ROCKETPORT=m
-# CONFIG_CYCLADES is not set
-CONFIG_SYNCLINK=m
-CONFIG_SYNCLINKMP=m
-CONFIG_N_HDLC=m
-CONFIG_STALDRV=y
-
-#
-# Serial drivers
-#
-CONFIG_SERIAL_8250=y
-CONFIG_SERIAL_8250_CONSOLE=y
-CONFIG_SERIAL_8250_CS=m
-# CONFIG_SERIAL_8250_ACPI is not set
-CONFIG_SERIAL_8250_NR_UARTS=4
-CONFIG_SERIAL_8250_EXTENDED=y
-# CONFIG_SERIAL_8250_MANY_PORTS is not set
-CONFIG_SERIAL_8250_SHARE_IRQ=y
-CONFIG_SERIAL_8250_DETECT_IRQ=y
-CONFIG_SERIAL_8250_MULTIPORT=y
-CONFIG_SERIAL_8250_RSA=y
-
-#
-# Non-8250 serial port support
-#
-CONFIG_SERIAL_CORE=y
-CONFIG_SERIAL_CORE_CONSOLE=y
-CONFIG_UNIX98_PTYS=y
-# CONFIG_LEGACY_PTYS is not set
-CONFIG_CRASH=m
-CONFIG_PRINTER=m
-CONFIG_LP_CONSOLE=y
-CONFIG_PPDEV=m
-CONFIG_TIPAR=m
-# CONFIG_QIC02_TAPE is not set
-
-#
-# IPMI
-#
-CONFIG_IPMI_HANDLER=m
-# CONFIG_IPMI_PANIC_EVENT is not set
-CONFIG_IPMI_DEVICE_INTERFACE=m
-CONFIG_IPMI_SI=m
-CONFIG_IPMI_WATCHDOG=m
-
-#
-# Watchdog Cards
-#
-CONFIG_WATCHDOG=y
-# CONFIG_WATCHDOG_NOWAYOUT is not set
-
-#
-# Watchdog Device Drivers
-#
-CONFIG_SOFT_WATCHDOG=m
-CONFIG_ACQUIRE_WDT=m
-CONFIG_ADVANTECH_WDT=m
-CONFIG_ALIM1535_WDT=m
-CONFIG_ALIM7101_WDT=m
-CONFIG_SC520_WDT=m
-CONFIG_EUROTECH_WDT=m
-CONFIG_IB700_WDT=m
-CONFIG_WAFER_WDT=m
-CONFIG_I8XX_TCO=m
-CONFIG_SC1200_WDT=m
-# CONFIG_SCx200_WDT is not set
-# CONFIG_60XX_WDT is not set
-CONFIG_CPU5_WDT=m
-CONFIG_W83627HF_WDT=m
-CONFIG_W83877F_WDT=m
-CONFIG_MACHZ_WDT=m
-
-#
-# ISA-based Watchdog Cards
-#
-CONFIG_PCWATCHDOG=m
-# CONFIG_MIXCOMWD is not set
-CONFIG_WDT=m
-# CONFIG_WDT_501 is not set
-
-#
-# PCI-based Watchdog Cards
-#
-CONFIG_PCIPCWATCHDOG=m
-CONFIG_WDTPCI=m
-CONFIG_WDT_501_PCI=y
-
-#
-# USB-based Watchdog Cards
-#
-CONFIG_USBPCWATCHDOG=m
-CONFIG_HW_RANDOM=m
-CONFIG_NVRAM=m
-CONFIG_RTC=y
-CONFIG_DTLK=m
-CONFIG_R3964=m
-# CONFIG_APPLICOM is not set
-CONFIG_SONYPI=m
-
-#
-# Ftape, the floppy tape device driver
-#
-CONFIG_AGP=y
-CONFIG_AGP_ALI=y
-CONFIG_AGP_ATI=y
-CONFIG_AGP_AMD=y
-CONFIG_AGP_AMD64=y
-CONFIG_AGP_INTEL=y
-CONFIG_AGP_INTEL_MCH=y
-CONFIG_AGP_NVIDIA=y
-CONFIG_AGP_SIS=y
-CONFIG_AGP_SWORKS=y
-CONFIG_AGP_VIA=y
-CONFIG_AGP_EFFICEON=y
-CONFIG_DRM=y
-CONFIG_DRM_TDFX=m
-CONFIG_DRM_GAMMA=m
-CONFIG_DRM_R128=m
-CONFIG_DRM_RADEON=m
-CONFIG_DRM_I810=m
-CONFIG_DRM_I830=m
-CONFIG_DRM_MGA=m
-CONFIG_DRM_SIS=m
-
-#
-# PCMCIA character devices
-#
-CONFIG_SYNCLINK_CS=m
-CONFIG_MWAVE=m
-# CONFIG_RAW_DRIVER is not set
-CONFIG_HANGCHECK_TIMER=m
-
-#
-# I2C support
-#
-CONFIG_I2C=m
-CONFIG_I2C_CHARDEV=m
-
-#
-# I2C Algorithms
-#
-CONFIG_I2C_ALGOBIT=m
-CONFIG_I2C_ALGOPCF=m
-
-#
-# I2C Hardware Bus support
-#
-CONFIG_I2C_ALI1535=m
-CONFIG_I2C_ALI1563=m
-CONFIG_I2C_ALI15X3=m
-CONFIG_I2C_AMD756=m
-CONFIG_I2C_AMD8111=m
-CONFIG_I2C_I801=m
-CONFIG_I2C_I810=m
-CONFIG_I2C_ISA=m
-CONFIG_I2C_NFORCE2=m
-# CONFIG_I2C_PARPORT is not set
-# CONFIG_I2C_PARPORT_LIGHT is not set
-CONFIG_I2C_PIIX4=m
-CONFIG_I2C_PROSAVAGE=m
-CONFIG_I2C_SAVAGE4=m
-# CONFIG_SCx200_ACB is not set
-CONFIG_I2C_SIS5595=m
-CONFIG_I2C_SIS630=m
-CONFIG_I2C_SIS96X=m
-CONFIG_I2C_VIA=m
-CONFIG_I2C_VIAPRO=m
-CONFIG_I2C_VOODOO3=m
-
-#
-# Hardware Sensors Chip support
-#
-CONFIG_I2C_SENSOR=m
-CONFIG_SENSORS_ADM1021=m
-CONFIG_SENSORS_ASB100=m
-CONFIG_SENSORS_DS1621=m
-CONFIG_SENSORS_FSCHER=m
-CONFIG_SENSORS_GL518SM=m
-CONFIG_SENSORS_IT87=m
-CONFIG_SENSORS_LM75=m
-CONFIG_SENSORS_LM78=m
-CONFIG_SENSORS_LM80=m
-CONFIG_SENSORS_LM83=m
-CONFIG_SENSORS_LM85=m
-CONFIG_SENSORS_LM90=m
-CONFIG_SENSORS_MAX1619=m
-CONFIG_SENSORS_VIA686A=m
-CONFIG_SENSORS_W83781D=m
-CONFIG_SENSORS_W83L785TS=m
-CONFIG_SENSORS_W83627HF=m
-
-#
-# Other I2C Chip support
-#
-CONFIG_SENSORS_EEPROM=m
-CONFIG_SENSORS_PCF8574=m
-CONFIG_SENSORS_PCF8591=m
-CONFIG_SENSORS_RTC8564=m
-# CONFIG_I2C_DEBUG_CORE is not set
-# CONFIG_I2C_DEBUG_ALGO is not set
-# CONFIG_I2C_DEBUG_BUS is not set
-# CONFIG_I2C_DEBUG_CHIP is not set
-
-#
-# Misc devices
-#
-CONFIG_IBM_ASM=m
-
-#
-# Multimedia devices
-#
-CONFIG_VIDEO_DEV=m
-
-#
-# Video For Linux
-#
-
-#
-# Video Adapters
-#
-CONFIG_VIDEO_BT848=m
-CONFIG_VIDEO_PMS=m
-CONFIG_VIDEO_BWQCAM=m
-CONFIG_VIDEO_CQCAM=m
-CONFIG_VIDEO_W9966=m
-CONFIG_VIDEO_CPIA=m
-CONFIG_VIDEO_CPIA_PP=m
-CONFIG_VIDEO_CPIA_USB=m
-CONFIG_VIDEO_SAA5246A=m
-CONFIG_VIDEO_SAA5249=m
-CONFIG_TUNER_3036=m
-CONFIG_VIDEO_STRADIS=m
-CONFIG_VIDEO_ZORAN=m
-CONFIG_VIDEO_ZORAN_BUZ=m
-CONFIG_VIDEO_ZORAN_DC10=m
-CONFIG_VIDEO_ZORAN_DC30=m
-CONFIG_VIDEO_ZORAN_LML33=m
-CONFIG_VIDEO_ZORAN_LML33R10=m
-CONFIG_VIDEO_MEYE=m
-CONFIG_VIDEO_SAA7134=m
-CONFIG_VIDEO_MXB=m
-CONFIG_VIDEO_DPC=m
-CONFIG_VIDEO_HEXIUM_ORION=m
-CONFIG_VIDEO_HEXIUM_GEMINI=m
-CONFIG_VIDEO_CX88=m
-
-#
-# Radio Adapters
-#
-CONFIG_RADIO_CADET=m
-CONFIG_RADIO_RTRACK=m
-CONFIG_RADIO_RTRACK2=m
-CONFIG_RADIO_AZTECH=m
-CONFIG_RADIO_GEMTEK=m
-CONFIG_RADIO_GEMTEK_PCI=m
-CONFIG_RADIO_MAXIRADIO=m
-CONFIG_RADIO_MAESTRO=m
-CONFIG_RADIO_SF16FMI=m
-CONFIG_RADIO_SF16FMR2=m
-CONFIG_RADIO_TERRATEC=m
-CONFIG_RADIO_TRUST=m
-CONFIG_RADIO_TYPHOON=m
-CONFIG_RADIO_TYPHOON_PROC_FS=y
-CONFIG_RADIO_ZOLTRIX=m
-
-#
-# Digital Video Broadcasting Devices
-#
-# CONFIG_DVB is not set
-CONFIG_VIDEO_SAA7146=m
-CONFIG_VIDEO_SAA7146_VV=m
-CONFIG_VIDEO_VIDEOBUF=m
-CONFIG_VIDEO_TUNER=m
-CONFIG_VIDEO_BUF=m
-CONFIG_VIDEO_BTCX=m
-CONFIG_VIDEO_IR=m
-
-#
-# Graphics support
-#
-CONFIG_FB=y
-# CONFIG_FB_PM2 is not set
-# CONFIG_FB_CYBER2000 is not set
-# CONFIG_FB_ASILIANT is not set
-# CONFIG_FB_IMSTT is not set
-CONFIG_FB_VGA16=m
-CONFIG_FB_VESA=y
-CONFIG_VIDEO_SELECT=y
-CONFIG_FB_HGA=m
-CONFIG_FB_HGA_ACCEL=y
-CONFIG_FB_RIVA=m
-CONFIG_FB_I810=m
-CONFIG_FB_I810_GTF=y
-CONFIG_FB_MATROX=m
-CONFIG_FB_MATROX_MILLENIUM=y
-CONFIG_FB_MATROX_MYSTIQUE=y
-CONFIG_FB_MATROX_G450=y
-CONFIG_FB_MATROX_G100=y
-CONFIG_FB_MATROX_I2C=m
-CONFIG_FB_MATROX_MAVEN=m
-CONFIG_FB_MATROX_MULTIHEAD=y
-# CONFIG_FB_RADEON_OLD is not set
-CONFIG_FB_RADEON=m
-CONFIG_FB_RADEON_I2C=y
-# CONFIG_FB_RADEON_DEBUG is not set
-CONFIG_FB_ATY128=m
-CONFIG_FB_ATY=m
-CONFIG_FB_ATY_CT=y
-CONFIG_FB_ATY_GX=y
-# CONFIG_FB_ATY_XL_INIT is not set
-# CONFIG_FB_SIS is not set
-CONFIG_FB_NEOMAGIC=m
-CONFIG_FB_KYRO=m
-CONFIG_FB_3DFX=m
-CONFIG_FB_3DFX_ACCEL=y
-CONFIG_FB_VOODOO1=m
-CONFIG_FB_TRIDENT=m
-CONFIG_FB_TRIDENT_ACCEL=y
-# CONFIG_FB_VIRTUAL is not set
-
-#
-# Console display driver support
-#
-CONFIG_VGA_CONSOLE=y
-CONFIG_MDA_CONSOLE=m
-CONFIG_DUMMY_CONSOLE=y
-CONFIG_FRAMEBUFFER_CONSOLE=y
-CONFIG_PCI_CONSOLE=y
-# CONFIG_FONTS is not set
-CONFIG_FONT_8x8=y
-CONFIG_FONT_8x16=y
-
-#
-# Logo configuration
-#
-CONFIG_LOGO=y
-# CONFIG_LOGO_LINUX_MONO is not set
-# CONFIG_LOGO_LINUX_VGA16 is not set
-CONFIG_LOGO_LINUX_CLUT224=y
-
-#
-# Sound
-#
-CONFIG_SOUND=m
-
-#
-# Advanced Linux Sound Architecture
-#
-CONFIG_SND=m
-CONFIG_SND_TIMER=m
-CONFIG_SND_PCM=m
-CONFIG_SND_HWDEP=m
-CONFIG_SND_RAWMIDI=m
-CONFIG_SND_SEQUENCER=m
-CONFIG_SND_SEQ_DUMMY=m
-CONFIG_SND_OSSEMUL=y
-CONFIG_SND_MIXER_OSS=m
-CONFIG_SND_PCM_OSS=m
-CONFIG_SND_SEQUENCER_OSS=y
-CONFIG_SND_RTCTIMER=m
-# CONFIG_SND_VERBOSE_PRINTK is not set
-# CONFIG_SND_DEBUG is not set
-
-#
-# Generic devices
-#
-CONFIG_SND_MPU401_UART=m
-CONFIG_SND_OPL3_LIB=m
-CONFIG_SND_OPL4_LIB=m
-CONFIG_SND_VX_LIB=m
-CONFIG_SND_DUMMY=m
-CONFIG_SND_VIRMIDI=m
-CONFIG_SND_MTPAV=m
-# CONFIG_SND_SERIAL_U16550 is not set
-CONFIG_SND_MPU401=m
-
-#
-# ISA devices
-#
-CONFIG_SND_AD1816A=m
-CONFIG_SND_AD1848=m
-CONFIG_SND_CS4231=m
-CONFIG_SND_CS4232=m
-CONFIG_SND_CS4236=m
-CONFIG_SND_ES968=m
-CONFIG_SND_ES1688=m
-CONFIG_SND_ES18XX=m
-CONFIG_SND_GUSCLASSIC=m
-CONFIG_SND_GUSEXTREME=m
-CONFIG_SND_GUSMAX=m
-CONFIG_SND_INTERWAVE=m
-CONFIG_SND_INTERWAVE_STB=m
-CONFIG_SND_OPTI92X_AD1848=m
-CONFIG_SND_OPTI92X_CS4231=m
-CONFIG_SND_OPTI93X=m
-CONFIG_SND_SB8=m
-CONFIG_SND_SB16=m
-CONFIG_SND_SBAWE=m
-CONFIG_SND_SB16_CSP=y
-# CONFIG_SND_WAVEFRONT is not set
-CONFIG_SND_ALS100=m
-CONFIG_SND_AZT2320=m
-CONFIG_SND_CMI8330=m
-CONFIG_SND_DT019X=m
-CONFIG_SND_OPL3SA2=m
-CONFIG_SND_SGALAXY=m
-CONFIG_SND_SSCAPE=m
-
-#
-# PCI devices
-#
-CONFIG_SND_AC97_CODEC=m
-CONFIG_SND_ALI5451=m
-CONFIG_SND_ATIIXP=m
-CONFIG_SND_AU8810=m
-CONFIG_SND_AU8820=m
-CONFIG_SND_AU8830=m
-CONFIG_SND_AZT3328=m
-CONFIG_SND_BT87X=m
-CONFIG_SND_CS46XX=m
-CONFIG_SND_CS46XX_NEW_DSP=y
-CONFIG_SND_CS4281=m
-CONFIG_SND_EMU10K1=m
-CONFIG_SND_KORG1212=m
-CONFIG_SND_MIXART=m
-CONFIG_SND_NM256=m
-CONFIG_SND_RME32=m
-CONFIG_SND_RME96=m
-CONFIG_SND_RME9652=m
-CONFIG_SND_HDSP=m
-CONFIG_SND_TRIDENT=m
-CONFIG_SND_YMFPCI=m
-CONFIG_SND_ALS4000=m
-CONFIG_SND_CMIPCI=m
-CONFIG_SND_ENS1370=m
-CONFIG_SND_ENS1371=m
-CONFIG_SND_ES1938=m
-CONFIG_SND_ES1968=m
-CONFIG_SND_MAESTRO3=m
-CONFIG_SND_FM801=m
-CONFIG_SND_FM801_TEA575X=m
-CONFIG_SND_ICE1712=m
-CONFIG_SND_ICE1724=m
-CONFIG_SND_INTEL8X0=m
-CONFIG_SND_INTEL8X0M=m
-CONFIG_SND_SONICVIBES=m
-CONFIG_SND_VIA82XX=m
-CONFIG_SND_VX222=m
-
-#
-# ALSA USB devices
-#
-CONFIG_SND_USB_AUDIO=m
-
-#
-# PCMCIA devices
-#
-# CONFIG_SND_VXPOCKET is not set
-# CONFIG_SND_VXP440 is not set
-CONFIG_SND_PDAUDIOCF=m
-
-#
-# Open Sound System
-#
-# CONFIG_SOUND_PRIME is not set
-
-#
-# USB support
-#
-CONFIG_USB=y
-# CONFIG_USB_DEBUG is not set
-
-#
-# Miscellaneous USB options
-#
-CONFIG_USB_DEVICEFS=y
-# CONFIG_USB_BANDWIDTH is not set
-# CONFIG_USB_DYNAMIC_MINORS is not set
-
-#
-# USB Host Controller Drivers
-#
-CONFIG_USB_EHCI_HCD=m
-CONFIG_USB_EHCI_SPLIT_ISO=y
-CONFIG_USB_EHCI_ROOT_HUB_TT=y
-CONFIG_USB_OHCI_HCD=m
-CONFIG_USB_UHCI_HCD=m
-
-#
-# USB Device Class drivers
-#
-CONFIG_USB_AUDIO=m
-
-#
-# USB Bluetooth TTY can only be used with disabled Bluetooth subsystem
-#
-CONFIG_USB_MIDI=m
-CONFIG_USB_ACM=m
-CONFIG_USB_PRINTER=m
-CONFIG_USB_STORAGE=m
-# CONFIG_USB_STORAGE_DEBUG is not set
-CONFIG_USB_STORAGE_DATAFAB=y
-CONFIG_USB_STORAGE_FREECOM=y
-CONFIG_USB_STORAGE_ISD200=y
-CONFIG_USB_STORAGE_DPCM=y
-CONFIG_USB_STORAGE_HP8200e=y
-CONFIG_USB_STORAGE_SDDR09=y
-CONFIG_USB_STORAGE_SDDR55=y
-CONFIG_USB_STORAGE_JUMPSHOT=y
-
-#
-# USB Human Interface Devices (HID)
-#
-CONFIG_USB_HID=y
-CONFIG_USB_HIDINPUT=y
-CONFIG_HID_FF=y
-CONFIG_HID_PID=y
-CONFIG_LOGITECH_FF=y
-CONFIG_THRUSTMASTER_FF=y
-CONFIG_USB_HIDDEV=y
-CONFIG_USB_AIPTEK=m
-CONFIG_USB_WACOM=m
-CONFIG_USB_KBTAB=m
-CONFIG_USB_POWERMATE=m
-CONFIG_USB_MTOUCH=m
-CONFIG_USB_EGALAX=m
-CONFIG_USB_XPAD=m
-CONFIG_USB_ATI_REMOTE=m
-
-#
-# USB Imaging devices
-#
-CONFIG_USB_MDC800=m
-CONFIG_USB_MICROTEK=m
-CONFIG_USB_HPUSBSCSI=m
-
-#
-# USB Multimedia devices
-#
-CONFIG_USB_DABUSB=m
-CONFIG_USB_VICAM=m
-CONFIG_USB_DSBR=m
-CONFIG_USB_IBMCAM=m
-CONFIG_USB_KONICAWC=m
-CONFIG_USB_OV511=m
-CONFIG_USB_SE401=m
-CONFIG_USB_STV680=m
-CONFIG_USB_W9968CF=m
-
-#
-# USB Network adaptors
-#
-CONFIG_USB_CATC=m
-CONFIG_USB_KAWETH=m
-CONFIG_USB_PEGASUS=m
-CONFIG_USB_RTL8150=m
-CONFIG_USB_USBNET=m
-
-#
-# USB Host-to-Host Cables
-#
-CONFIG_USB_ALI_M5632=y
-CONFIG_USB_AN2720=y
-CONFIG_USB_BELKIN=y
-CONFIG_USB_GENESYS=y
-CONFIG_USB_NET1080=y
-CONFIG_USB_PL2301=y
-
-#
-# Intelligent USB Devices/Gadgets
-#
-CONFIG_USB_ARMLINUX=y
-CONFIG_USB_EPSON2888=y
-CONFIG_USB_ZAURUS=y
-CONFIG_USB_CDCETHER=y
-
-#
-# USB Network Adapters
-#
-CONFIG_USB_AX8817X=y
-
-#
-# USB port drivers
-#
-CONFIG_USB_USS720=m
-
-#
-# USB Serial Converter support
-#
-CONFIG_USB_SERIAL=m
-CONFIG_USB_SERIAL_GENERIC=y
-CONFIG_USB_SERIAL_BELKIN=m
-CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m
-CONFIG_USB_SERIAL_EMPEG=m
-CONFIG_USB_SERIAL_FTDI_SIO=m
-CONFIG_USB_SERIAL_VISOR=m
-CONFIG_USB_SERIAL_IPAQ=m
-CONFIG_USB_SERIAL_IR=m
-CONFIG_USB_SERIAL_EDGEPORT=m
-CONFIG_USB_SERIAL_EDGEPORT_TI=m
-CONFIG_USB_SERIAL_KEYSPAN_PDA=m
-CONFIG_USB_SERIAL_KEYSPAN=m
-CONFIG_USB_SERIAL_KEYSPAN_MPR=y
-CONFIG_USB_SERIAL_KEYSPAN_USA28=y
-CONFIG_USB_SERIAL_KEYSPAN_USA28X=y
-CONFIG_USB_SERIAL_KEYSPAN_USA28XA=y
-CONFIG_USB_SERIAL_KEYSPAN_USA28XB=y
-CONFIG_USB_SERIAL_KEYSPAN_USA19=y
-CONFIG_USB_SERIAL_KEYSPAN_USA18X=y
-CONFIG_USB_SERIAL_KEYSPAN_USA19W=y
-CONFIG_USB_SERIAL_KEYSPAN_USA19QW=y
-CONFIG_USB_SERIAL_KEYSPAN_USA19QI=y
-CONFIG_USB_SERIAL_KEYSPAN_USA49W=y
-CONFIG_USB_SERIAL_KEYSPAN_USA49WLC=y
-CONFIG_USB_SERIAL_KLSI=m
-CONFIG_USB_SERIAL_KOBIL_SCT=m
-CONFIG_USB_SERIAL_MCT_U232=m
-CONFIG_USB_SERIAL_PL2303=m
-CONFIG_USB_SERIAL_SAFE=m
-CONFIG_USB_SERIAL_SAFE_PADDED=y
-CONFIG_USB_SERIAL_CYBERJACK=m
-CONFIG_USB_SERIAL_XIRCOM=m
-CONFIG_USB_SERIAL_OMNINET=m
-CONFIG_USB_EZUSB=y
-
-#
-# USB Miscellaneous drivers
-#
-CONFIG_USB_EMI62=m
-# CONFIG_USB_EMI26 is not set
-CONFIG_USB_TIGL=m
-CONFIG_USB_AUERSWALD=m
-CONFIG_USB_RIO500=m
-CONFIG_USB_LEGOTOWER=m
-CONFIG_USB_LCD=m
-CONFIG_USB_LED=m
-# CONFIG_USB_CYTHERM is not set
-CONFIG_USB_PHIDGETSERVO=m
-CONFIG_USB_TEST=m
-
-#
-# USB Gadget Support
-#
-# CONFIG_USB_GADGET is not set
-
-#
-# File systems
-#
-CONFIG_EXT2_FS=y
-CONFIG_EXT2_FS_XATTR=y
-CONFIG_EXT2_FS_POSIX_ACL=y
-CONFIG_EXT2_FS_SECURITY=y
-CONFIG_EXT3_FS=m
-CONFIG_EXT3_FS_XATTR=y
-CONFIG_EXT3_FS_POSIX_ACL=y
-CONFIG_EXT3_FS_SECURITY=y
-CONFIG_JBD=m
-# CONFIG_JBD_DEBUG is not set
-CONFIG_FS_MBCACHE=y
-CONFIG_REISERFS_FS=m
-# CONFIG_REISERFS_CHECK is not set
-CONFIG_REISERFS_PROC_INFO=y
-CONFIG_REISERFS_FS_XATTR=y
-CONFIG_REISERFS_FS_POSIX_ACL=y
-CONFIG_REISERFS_FS_SECURITY=y
-CONFIG_JFS_FS=m
-CONFIG_JFS_POSIX_ACL=y
-# CONFIG_JFS_DEBUG is not set
-# CONFIG_JFS_STATISTICS is not set
-CONFIG_FS_POSIX_ACL=y
-CONFIG_XFS_FS=m
-# CONFIG_XFS_RT is not set
-CONFIG_XFS_QUOTA=y
-CONFIG_XFS_SECURITY=y
-CONFIG_XFS_POSIX_ACL=y
-CONFIG_MINIX_FS=m
-CONFIG_ROMFS_FS=m
-CONFIG_QUOTA=y
-# CONFIG_QFMT_V1 is not set
-CONFIG_QFMT_V2=y
-CONFIG_QUOTACTL=y
-CONFIG_AUTOFS_FS=m
-CONFIG_AUTOFS4_FS=m
-
-#
-# CD-ROM/DVD Filesystems
-#
-CONFIG_ISO9660_FS=y
-CONFIG_JOLIET=y
-CONFIG_ZISOFS=y
-CONFIG_ZISOFS_FS=y
-CONFIG_UDF_FS=m
-
-#
-# DOS/FAT/NT Filesystems
-#
-CONFIG_FAT_FS=m
-CONFIG_MSDOS_FS=m
-CONFIG_VFAT_FS=m
-# CONFIG_NTFS_FS is not set
-
-#
-# Pseudo filesystems
-#
-CONFIG_PROC_FS=y
-CONFIG_PROC_KCORE=y
-CONFIG_SYSFS=y
-# CONFIG_DEVFS_FS is not set
-CONFIG_DEVPTS_FS_XATTR=y
-CONFIG_DEVPTS_FS_SECURITY=y
-CONFIG_TMPFS=y
-CONFIG_HUGETLBFS=y
-CONFIG_HUGETLB_PAGE=y
-CONFIG_RAMFS=y
-
-#
-# Miscellaneous filesystems
-#
-# CONFIG_ADFS_FS is not set
-CONFIG_AFFS_FS=m
-CONFIG_HFS_FS=m
-CONFIG_HFSPLUS_FS=m
-CONFIG_BEFS_FS=m
-# CONFIG_BEFS_DEBUG is not set
-CONFIG_BFS_FS=m
-CONFIG_EFS_FS=m
-# CONFIG_JFFS_FS is not set
-CONFIG_JFFS2_FS=m
-CONFIG_JFFS2_FS_DEBUG=0
-CONFIG_JFFS2_FS_NAND=y
-CONFIG_CRAMFS=m
-CONFIG_VXFS_FS=m
-# CONFIG_HPFS_FS is not set
-CONFIG_QNX4FS_FS=m
-# CONFIG_QNX4FS_RW is not set
-CONFIG_SYSV_FS=m
-CONFIG_UFS_FS=m
-# CONFIG_UFS_FS_WRITE is not set
-
-#
-# Network File Systems
-#
-CONFIG_NFS_FS=m
-CONFIG_NFS_V3=y
-CONFIG_NFS_V4=y
-CONFIG_NFS_DIRECTIO=y
-CONFIG_NFSD=m
-CONFIG_NFSD_V3=y
-CONFIG_NFSD_V4=y
-CONFIG_NFSD_TCP=y
-CONFIG_LOCKD=m
-CONFIG_LOCKD_V4=y
-CONFIG_EXPORTFS=m
-CONFIG_SUNRPC=m
-CONFIG_SUNRPC_GSS=m
-CONFIG_RPCSEC_GSS_KRB5=m
-CONFIG_SMB_FS=m
-# CONFIG_SMB_NLS_DEFAULT is not set
-CONFIG_CIFS=m
-# CONFIG_CIFS_STATS is not set
-CONFIG_NCP_FS=m
-CONFIG_NCPFS_PACKET_SIGNING=y
-CONFIG_NCPFS_IOCTL_LOCKING=y
-CONFIG_NCPFS_STRONG=y
-CONFIG_NCPFS_NFS_NS=y
-CONFIG_NCPFS_OS2_NS=y
-CONFIG_NCPFS_SMALLDOS=y
-CONFIG_NCPFS_NLS=y
-CONFIG_NCPFS_EXTRAS=y
-# CONFIG_CODA_FS is not set
-# CONFIG_AFS_FS is not set
-
-#
-# Partition Types
-#
-CONFIG_PARTITION_ADVANCED=y
-# CONFIG_ACORN_PARTITION is not set
-CONFIG_OSF_PARTITION=y
-# CONFIG_AMIGA_PARTITION is not set
-# CONFIG_ATARI_PARTITION is not set
-CONFIG_MAC_PARTITION=y
-CONFIG_MSDOS_PARTITION=y
-CONFIG_BSD_DISKLABEL=y
-CONFIG_MINIX_SUBPARTITION=y
-CONFIG_SOLARIS_X86_PARTITION=y
-CONFIG_UNIXWARE_DISKLABEL=y
-# CONFIG_LDM_PARTITION is not set
-# CONFIG_NEC98_PARTITION is not set
-CONFIG_SGI_PARTITION=y
-# CONFIG_ULTRIX_PARTITION is not set
-CONFIG_SUN_PARTITION=y
-CONFIG_EFI_PARTITION=y
-
-#
-# Native Language Support
-#
-CONFIG_NLS=y
-CONFIG_NLS_DEFAULT="utf8"
-CONFIG_NLS_CODEPAGE_437=m
-CONFIG_NLS_CODEPAGE_737=m
-CONFIG_NLS_CODEPAGE_775=m
-CONFIG_NLS_CODEPAGE_850=m
-CONFIG_NLS_CODEPAGE_852=m
-CONFIG_NLS_CODEPAGE_855=m
-CONFIG_NLS_CODEPAGE_857=m
-CONFIG_NLS_CODEPAGE_860=m
-CONFIG_NLS_CODEPAGE_861=m
-CONFIG_NLS_CODEPAGE_862=m
-CONFIG_NLS_CODEPAGE_863=m
-CONFIG_NLS_CODEPAGE_864=m
-CONFIG_NLS_CODEPAGE_865=m
-CONFIG_NLS_CODEPAGE_866=m
-CONFIG_NLS_CODEPAGE_869=m
-CONFIG_NLS_CODEPAGE_936=m
-CONFIG_NLS_CODEPAGE_950=m
-CONFIG_NLS_CODEPAGE_932=m
-CONFIG_NLS_CODEPAGE_949=m
-CONFIG_NLS_CODEPAGE_874=m
-CONFIG_NLS_ISO8859_8=m
-CONFIG_NLS_CODEPAGE_1250=m
-CONFIG_NLS_CODEPAGE_1251=m
-CONFIG_NLS_ISO8859_1=m
-CONFIG_NLS_ISO8859_2=m
-CONFIG_NLS_ISO8859_3=m
-CONFIG_NLS_ISO8859_4=m
-CONFIG_NLS_ISO8859_5=m
-CONFIG_NLS_ISO8859_6=m
-CONFIG_NLS_ISO8859_7=m
-CONFIG_NLS_ISO8859_9=m
-CONFIG_NLS_ISO8859_13=m
-CONFIG_NLS_ISO8859_14=m
-CONFIG_NLS_ISO8859_15=m
-CONFIG_NLS_KOI8_R=m
-CONFIG_NLS_KOI8_U=m
-CONFIG_NLS_UTF8=m
-
-#
-# Profiling support
-#
-CONFIG_PROFILING=y
-CONFIG_OPROFILE=m
-
-#
-# Kernel hacking
-#
-CONFIG_DEBUG_KERNEL=y
-CONFIG_EARLY_PRINTK=y
-CONFIG_DEBUG_STACKOVERFLOW=y
-# CONFIG_DEBUG_STACK_USAGE is not set
-# CONFIG_DEBUG_SLAB is not set
-CONFIG_MAGIC_SYSRQ=y
-# CONFIG_DEBUG_SPINLOCK is not set
-# CONFIG_DEBUG_PAGEALLOC is not set
-# CONFIG_DEBUG_HIGHMEM is not set
-CONFIG_DEBUG_INFO=y
-CONFIG_DEBUG_SPINLOCK_SLEEP=y
-# CONFIG_FRAME_POINTER is not set
-CONFIG_X86_FIND_SMP_CONFIG=y
-CONFIG_X86_MPPARSE=y
-
-#
-# Security options
-#
-CONFIG_SECURITY=y
-CONFIG_SECURITY_NETWORK=y
-CONFIG_SECURITY_CAPABILITIES=y
-# CONFIG_SECURITY_ROOTPLUG is not set
-CONFIG_SECURITY_SELINUX=y
-CONFIG_SECURITY_SELINUX_BOOTPARAM=y
-CONFIG_SECURITY_SELINUX_DISABLE=y
-CONFIG_SECURITY_SELINUX_DEVELOP=y
-# CONFIG_SECURITY_SELINUX_MLS is not set
-
-#
-# Cryptographic options
-#
-CONFIG_CRYPTO=y
-CONFIG_CRYPTO_HMAC=y
-CONFIG_CRYPTO_NULL=m
-CONFIG_CRYPTO_MD4=m
-CONFIG_CRYPTO_MD5=y
-CONFIG_CRYPTO_SHA1=m
-CONFIG_CRYPTO_SHA256=m
-CONFIG_CRYPTO_SHA512=m
-CONFIG_CRYPTO_DES=m
-CONFIG_CRYPTO_BLOWFISH=m
-CONFIG_CRYPTO_TWOFISH=m
-CONFIG_CRYPTO_SERPENT=m
-CONFIG_CRYPTO_AES=m
-CONFIG_CRYPTO_CAST5=m
-CONFIG_CRYPTO_CAST6=m
-CONFIG_CRYPTO_ARC4=m
-CONFIG_CRYPTO_DEFLATE=m
-CONFIG_CRYPTO_MICHAEL_MIC=m
-CONFIG_CRYPTO_CRC32C=m
-# CONFIG_CRYPTO_TEST is not set
-
-#
-# Library routines
-#
-CONFIG_CRC32=y
-CONFIG_LIBCRC32C=m
-CONFIG_ZLIB_INFLATE=y
-CONFIG_ZLIB_DEFLATE=m
-CONFIG_X86_SMP=y
-CONFIG_X86_HT=y
-CONFIG_X86_BIOS_REBOOT=y
-CONFIG_X86_TRAMPOLINE=y
-CONFIG_X86_STD_RESOURCES=y
-CONFIG_PC=y
diff --git a/configs/kernel-2.6.6-i586.config b/configs/kernel-2.6.6-i586.config
deleted file mode 100644 (file)
index 8b2db36..0000000
+++ /dev/null
@@ -1,2366 +0,0 @@
-#
-# Automatically generated make config: don't edit
-#
-CONFIG_X86=y
-CONFIG_MMU=y
-CONFIG_UID16=y
-CONFIG_GENERIC_ISA_DMA=y
-
-#
-# Code maturity level options
-#
-CONFIG_EXPERIMENTAL=y
-CONFIG_CLEAN_COMPILE=y
-CONFIG_STANDALONE=y
-CONFIG_BROKEN_ON_SMP=y
-
-#
-# General setup
-#
-CONFIG_SWAP=y
-CONFIG_SYSVIPC=y
-CONFIG_POSIX_MQUEUE=y
-CONFIG_BSD_PROCESS_ACCT=y
-CONFIG_SYSCTL=y
-CONFIG_AUDIT=y
-CONFIG_AUDITSYSCALL=y
-CONFIG_LOG_BUF_SHIFT=17
-CONFIG_HOTPLUG=y
-# CONFIG_IKCONFIG is not set
-# CONFIG_EMBEDDED is not set
-CONFIG_KALLSYMS=y
-# CONFIG_KALLSYMS_ALL is not set
-CONFIG_FUTEX=y
-CONFIG_EPOLL=y
-CONFIG_IOSCHED_NOOP=y
-CONFIG_IOSCHED_AS=y
-CONFIG_IOSCHED_DEADLINE=y
-CONFIG_IOSCHED_CFQ=y
-CONFIG_CC_OPTIMIZE_FOR_SIZE=y
-
-#
-# Loadable module support
-#
-CONFIG_MODULES=y
-CONFIG_MODULE_UNLOAD=y
-# CONFIG_MODULE_FORCE_UNLOAD is not set
-CONFIG_OBSOLETE_MODPARM=y
-# CONFIG_MODVERSIONS is not set
-CONFIG_KMOD=y
-
-#
-# Processor type and features
-#
-CONFIG_X86_PC=y
-# CONFIG_X86_ELAN is not set
-# CONFIG_X86_VOYAGER is not set
-# CONFIG_X86_NUMAQ is not set
-# CONFIG_X86_SUMMIT is not set
-# CONFIG_X86_BIGSMP is not set
-# CONFIG_X86_VISWS is not set
-# CONFIG_X86_GENERICARCH is not set
-# CONFIG_X86_ES7000 is not set
-# CONFIG_M386 is not set
-# CONFIG_M486 is not set
-CONFIG_M586=y
-# CONFIG_M586TSC is not set
-# CONFIG_M586MMX is not set
-# CONFIG_M686 is not set
-# CONFIG_MPENTIUMII is not set
-# CONFIG_MPENTIUMIII is not set
-# CONFIG_MPENTIUMM is not set
-# CONFIG_MPENTIUM4 is not set
-# CONFIG_MK6 is not set
-# CONFIG_MK7 is not set
-# CONFIG_MK8 is not set
-# CONFIG_MCRUSOE is not set
-# CONFIG_MWINCHIPC6 is not set
-# CONFIG_MWINCHIP2 is not set
-# CONFIG_MWINCHIP3D is not set
-# CONFIG_MCYRIXIII is not set
-# CONFIG_MVIAC3_2 is not set
-CONFIG_X86_GENERIC=y
-CONFIG_X86_CMPXCHG=y
-CONFIG_X86_XADD=y
-CONFIG_X86_L1_CACHE_SHIFT=7
-CONFIG_RWSEM_XCHGADD_ALGORITHM=y
-CONFIG_X86_PPRO_FENCE=y
-CONFIG_X86_F00F_BUG=y
-CONFIG_X86_WP_WORKS_OK=y
-CONFIG_X86_INVLPG=y
-CONFIG_X86_BSWAP=y
-CONFIG_X86_POPAD_OK=y
-CONFIG_X86_ALIGNMENT_16=y
-CONFIG_X86_INTEL_USERCOPY=y
-# CONFIG_X86_4G is not set
-# CONFIG_X86_SWITCH_PAGETABLES is not set
-# CONFIG_X86_4G_VM_LAYOUT is not set
-# CONFIG_X86_UACCESS_INDIRECT is not set
-# CONFIG_X86_HIGH_ENTRY is not set
-CONFIG_HPET_TIMER=y
-CONFIG_HPET_EMULATE_RTC=y
-# CONFIG_SMP is not set
-# CONFIG_PREEMPT is not set
-# CONFIG_X86_UP_APIC is not set
-CONFIG_X86_MCE=y
-# CONFIG_X86_MCE_NONFATAL is not set
-CONFIG_TOSHIBA=m
-CONFIG_I8K=m
-# CONFIG_MICROCODE is not set
-CONFIG_X86_MSR=m
-CONFIG_X86_CPUID=m
-
-#
-# Firmware Drivers
-#
-CONFIG_EDD=m
-# CONFIG_NOHIGHMEM is not set
-CONFIG_HIGHMEM4G=y
-# CONFIG_HIGHMEM64G is not set
-CONFIG_HIGHMEM=y
-CONFIG_HIGHPTE=y
-# CONFIG_MATH_EMULATION is not set
-CONFIG_MTRR=y
-# CONFIG_EFI is not set
-CONFIG_REGPARM=y
-
-#
-# Power management options (ACPI, APM)
-#
-CONFIG_PM=y
-# CONFIG_SOFTWARE_SUSPEND is not set
-# CONFIG_PM_DISK is not set
-
-#
-# ACPI (Advanced Configuration and Power Interface) Support
-#
-CONFIG_ACPI=y
-CONFIG_ACPI_BOOT=y
-CONFIG_ACPI_INTERPRETER=y
-CONFIG_ACPI_SLEEP=y
-CONFIG_ACPI_SLEEP_PROC_FS=y
-CONFIG_ACPI_AC=m
-CONFIG_ACPI_BATTERY=m
-CONFIG_ACPI_BUTTON=m
-CONFIG_ACPI_FAN=y
-CONFIG_ACPI_PROCESSOR=y
-CONFIG_ACPI_THERMAL=y
-CONFIG_ACPI_ASUS=m
-CONFIG_ACPI_TOSHIBA=m
-# CONFIG_ACPI_DEBUG is not set
-CONFIG_ACPI_BUS=y
-CONFIG_ACPI_EC=y
-CONFIG_ACPI_POWER=y
-CONFIG_ACPI_PCI=y
-CONFIG_ACPI_SYSTEM=y
-CONFIG_X86_PM_TIMER=y
-
-#
-# APM (Advanced Power Management) BIOS Support
-#
-CONFIG_APM=y
-# CONFIG_APM_IGNORE_USER_SUSPEND is not set
-# CONFIG_APM_DO_ENABLE is not set
-CONFIG_APM_CPU_IDLE=y
-# CONFIG_APM_DISPLAY_BLANK is not set
-CONFIG_APM_RTC_IS_GMT=y
-# CONFIG_APM_ALLOW_INTS is not set
-# CONFIG_APM_REAL_MODE_POWER_OFF is not set
-
-#
-# CPU Frequency scaling
-#
-CONFIG_CPU_FREQ=y
-# CONFIG_CPU_FREQ_PROC_INTF is not set
-# CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set
-CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE=y
-CONFIG_CPU_FREQ_GOV_PERFORMANCE=y
-CONFIG_CPU_FREQ_GOV_POWERSAVE=m
-CONFIG_CPU_FREQ_GOV_USERSPACE=y
-# CONFIG_CPU_FREQ_24_API is not set
-CONFIG_CPU_FREQ_TABLE=y
-
-#
-# CPUFreq processor drivers
-#
-CONFIG_X86_ACPI_CPUFREQ=m
-# CONFIG_X86_ACPI_CPUFREQ_PROC_INTF is not set
-CONFIG_X86_POWERNOW_K6=m
-CONFIG_X86_POWERNOW_K7=y
-CONFIG_X86_POWERNOW_K8=m
-# CONFIG_X86_GX_SUSPMOD is not set
-CONFIG_X86_SPEEDSTEP_CENTRINO=y
-CONFIG_X86_SPEEDSTEP_CENTRINO_TABLE=y
-CONFIG_X86_SPEEDSTEP_CENTRINO_ACPI=y
-CONFIG_X86_SPEEDSTEP_ICH=y
-CONFIG_X86_SPEEDSTEP_SMI=m
-CONFIG_X86_P4_CLOCKMOD=m
-CONFIG_X86_SPEEDSTEP_LIB=y
-# CONFIG_X86_SPEEDSTEP_RELAXED_CAP_CHECK is not set
-CONFIG_X86_LONGRUN=y
-# CONFIG_X86_LONGHAUL is not set
-
-#
-# Bus options (PCI, PCMCIA, EISA, MCA, ISA)
-#
-CONFIG_PCI=y
-# CONFIG_PCI_GOBIOS is not set
-# CONFIG_PCI_GOMMCONFIG is not set
-# CONFIG_PCI_GODIRECT is not set
-CONFIG_PCI_GOANY=y
-CONFIG_PCI_BIOS=y
-CONFIG_PCI_DIRECT=y
-CONFIG_PCI_MMCONFIG=y
-CONFIG_PCI_LEGACY_PROC=y
-# CONFIG_PCI_NAMES is not set
-CONFIG_ISA=y
-# CONFIG_EISA is not set
-# CONFIG_MCA is not set
-# CONFIG_SCx200 is not set
-
-#
-# PCMCIA/CardBus support
-#
-CONFIG_PCMCIA=m
-# CONFIG_PCMCIA_DEBUG is not set
-CONFIG_YENTA=m
-CONFIG_CARDBUS=y
-CONFIG_I82092=m
-CONFIG_I82365=m
-CONFIG_TCIC=m
-CONFIG_PCMCIA_PROBE=y
-
-#
-# PCI Hotplug Support
-#
-CONFIG_HOTPLUG_PCI=y
-# CONFIG_HOTPLUG_PCI_FAKE is not set
-CONFIG_HOTPLUG_PCI_COMPAQ=m
-# CONFIG_HOTPLUG_PCI_COMPAQ_NVRAM is not set
-# CONFIG_HOTPLUG_PCI_ACPI is not set
-# CONFIG_HOTPLUG_PCI_CPCI is not set
-CONFIG_HOTPLUG_PCI_PCIE=m
-CONFIG_HOTPLUG_PCI_PCIE_POLL_EVENT_MODE=y
-CONFIG_HOTPLUG_PCI_SHPC=m
-CONFIG_HOTPLUG_PCI_SHPC_POLL_EVENT_MODE=y
-
-#
-# Executable file formats
-#
-CONFIG_BINFMT_ELF=y
-# CONFIG_BINFMT_AOUT is not set
-CONFIG_BINFMT_MISC=m
-
-#
-# Device Drivers
-#
-
-#
-# Generic Driver Options
-#
-CONFIG_FW_LOADER=y
-# CONFIG_DEBUG_DRIVER is not set
-
-#
-# Memory Technology Devices (MTD)
-#
-CONFIG_MTD=m
-# CONFIG_MTD_DEBUG is not set
-CONFIG_MTD_PARTITIONS=m
-CONFIG_MTD_CONCAT=m
-CONFIG_MTD_REDBOOT_PARTS=m
-CONFIG_MTD_CMDLINE_PARTS=m
-
-#
-# User Modules And Translation Layers
-#
-CONFIG_MTD_CHAR=m
-CONFIG_MTD_BLOCK=m
-CONFIG_MTD_BLOCK_RO=m
-CONFIG_FTL=m
-CONFIG_NFTL=m
-CONFIG_NFTL_RW=y
-CONFIG_INFTL=m
-
-#
-# RAM/ROM/Flash chip drivers
-#
-CONFIG_MTD_CFI=m
-CONFIG_MTD_JEDECPROBE=m
-CONFIG_MTD_GEN_PROBE=m
-# CONFIG_MTD_CFI_ADV_OPTIONS is not set
-CONFIG_MTD_CFI_INTELEXT=m
-CONFIG_MTD_CFI_AMDSTD=m
-CONFIG_MTD_CFI_STAA=m
-CONFIG_MTD_RAM=m
-CONFIG_MTD_ROM=m
-CONFIG_MTD_ABSENT=m
-# CONFIG_MTD_OBSOLETE_CHIPS is not set
-
-#
-# Mapping drivers for chip access
-#
-CONFIG_MTD_COMPLEX_MAPPINGS=y
-# CONFIG_MTD_PHYSMAP is not set
-# CONFIG_MTD_PNC2000 is not set
-CONFIG_MTD_SC520CDP=m
-CONFIG_MTD_NETSC520=m
-CONFIG_MTD_SBC_GXX=m
-CONFIG_MTD_ELAN_104NC=m
-CONFIG_MTD_SCx200_DOCFLASH=m
-CONFIG_MTD_AMD76XROM=m
-CONFIG_MTD_ICH2ROM=m
-CONFIG_MTD_SCB2_FLASH=m
-# CONFIG_MTD_NETtel is not set
-# CONFIG_MTD_DILNETPC is not set
-CONFIG_MTD_L440GX=m
-CONFIG_MTD_PCI=m
-
-#
-# Self-contained MTD device drivers
-#
-CONFIG_MTD_PMC551=m
-# CONFIG_MTD_PMC551_BUGFIX is not set
-# CONFIG_MTD_PMC551_DEBUG is not set
-# CONFIG_MTD_SLRAM is not set
-CONFIG_MTD_MTDRAM=m
-CONFIG_MTDRAM_TOTAL_SIZE=4096
-CONFIG_MTDRAM_ERASE_SIZE=128
-# CONFIG_MTD_BLKMTD is not set
-
-#
-# Disk-On-Chip Device Drivers
-#
-CONFIG_MTD_DOC2000=m
-# CONFIG_MTD_DOC2001 is not set
-CONFIG_MTD_DOC2001PLUS=m
-CONFIG_MTD_DOCPROBE=m
-# CONFIG_MTD_DOCPROBE_ADVANCED is not set
-CONFIG_MTD_DOCPROBE_ADDRESS=0
-
-#
-# NAND Flash Device Drivers
-#
-CONFIG_MTD_NAND=m
-# CONFIG_MTD_NAND_VERIFY_WRITE is not set
-CONFIG_MTD_NAND_IDS=m
-
-#
-# Parallel port support
-#
-CONFIG_PARPORT=m
-CONFIG_PARPORT_PC=m
-CONFIG_PARPORT_PC_CML1=m
-CONFIG_PARPORT_SERIAL=m
-# CONFIG_PARPORT_PC_FIFO is not set
-# CONFIG_PARPORT_PC_SUPERIO is not set
-CONFIG_PARPORT_PC_PCMCIA=m
-# CONFIG_PARPORT_OTHER is not set
-CONFIG_PARPORT_1284=y
-
-#
-# Plug and Play support
-#
-CONFIG_PNP=y
-# CONFIG_PNP_DEBUG is not set
-
-#
-# Protocols
-#
-CONFIG_ISAPNP=y
-# CONFIG_PNPBIOS is not set
-
-#
-# Block devices
-#
-CONFIG_BLK_DEV_FD=m
-# CONFIG_BLK_DEV_XD is not set
-# CONFIG_PARIDE is not set
-CONFIG_BLK_CPQ_DA=m
-CONFIG_BLK_CPQ_CISS_DA=m
-CONFIG_CISS_SCSI_TAPE=y
-CONFIG_BLK_DEV_DAC960=m
-CONFIG_BLK_DEV_UMEM=m
-CONFIG_BLK_DEV_LOOP=m
-CONFIG_BLK_DEV_CRYPTOLOOP=m
-CONFIG_BLK_DEV_NBD=m
-CONFIG_BLK_DEV_CARMEL=m
-CONFIG_BLK_DEV_RAM=y
-CONFIG_BLK_DEV_RAM_SIZE=16384
-CONFIG_BLK_DEV_INITRD=y
-CONFIG_LBD=y
-
-#
-# ATA/ATAPI/MFM/RLL support
-#
-CONFIG_IDE=y
-CONFIG_BLK_DEV_IDE=y
-
-#
-# Please see Documentation/ide.txt for help/info on IDE drives
-#
-# CONFIG_BLK_DEV_HD_IDE is not set
-CONFIG_BLK_DEV_IDEDISK=y
-CONFIG_IDEDISK_MULTI_MODE=y
-# CONFIG_IDEDISK_STROKE is not set
-CONFIG_BLK_DEV_IDECS=m
-CONFIG_BLK_DEV_IDECD=y
-CONFIG_BLK_DEV_IDETAPE=m
-CONFIG_BLK_DEV_IDEFLOPPY=y
-# CONFIG_BLK_DEV_IDESCSI is not set
-# CONFIG_IDE_TASK_IOCTL is not set
-# CONFIG_IDE_TASKFILE_IO is not set
-
-#
-# IDE chipset support/bugfixes
-#
-CONFIG_IDE_GENERIC=y
-# CONFIG_BLK_DEV_CMD640 is not set
-CONFIG_BLK_DEV_IDEPNP=y
-CONFIG_BLK_DEV_IDEPCI=y
-CONFIG_IDEPCI_SHARE_IRQ=y
-# CONFIG_BLK_DEV_OFFBOARD is not set
-CONFIG_BLK_DEV_GENERIC=y
-# CONFIG_BLK_DEV_OPTI621 is not set
-CONFIG_BLK_DEV_RZ1000=y
-CONFIG_BLK_DEV_IDEDMA_PCI=y
-# CONFIG_BLK_DEV_IDEDMA_FORCED is not set
-CONFIG_IDEDMA_PCI_AUTO=y
-# CONFIG_IDEDMA_ONLYDISK is not set
-CONFIG_BLK_DEV_ADMA=y
-CONFIG_BLK_DEV_AEC62XX=y
-CONFIG_BLK_DEV_ALI15X3=y
-# CONFIG_WDC_ALI15X3 is not set
-CONFIG_BLK_DEV_AMD74XX=y
-CONFIG_BLK_DEV_ATIIXP=y
-CONFIG_BLK_DEV_CMD64X=y
-CONFIG_BLK_DEV_TRIFLEX=y
-CONFIG_BLK_DEV_CY82C693=y
-CONFIG_BLK_DEV_CS5520=y
-CONFIG_BLK_DEV_CS5530=y
-CONFIG_BLK_DEV_HPT34X=y
-# CONFIG_HPT34X_AUTODMA is not set
-CONFIG_BLK_DEV_HPT366=y
-# CONFIG_BLK_DEV_SC1200 is not set
-CONFIG_BLK_DEV_PIIX=y
-# CONFIG_BLK_DEV_NS87415 is not set
-CONFIG_BLK_DEV_PDC202XX_OLD=y
-# CONFIG_PDC202XX_BURST is not set
-CONFIG_BLK_DEV_PDC202XX_NEW=y
-CONFIG_PDC202XX_FORCE=y
-CONFIG_BLK_DEV_SVWKS=y
-CONFIG_BLK_DEV_SIIMAGE=y
-CONFIG_BLK_DEV_SIS5513=y
-CONFIG_BLK_DEV_SLC90E66=y
-# CONFIG_BLK_DEV_TRM290 is not set
-CONFIG_BLK_DEV_VIA82CXXX=y
-# CONFIG_IDE_ARM is not set
-# CONFIG_IDE_CHIPSETS is not set
-CONFIG_BLK_DEV_IDEDMA=y
-# CONFIG_IDEDMA_IVB is not set
-CONFIG_IDEDMA_AUTO=y
-# CONFIG_BLK_DEV_HD is not set
-
-#
-# SCSI device support
-#
-CONFIG_SCSI=m
-CONFIG_SCSI_PROC_FS=y
-
-#
-# SCSI support type (disk, tape, CD-ROM)
-#
-CONFIG_BLK_DEV_SD=m
-CONFIG_CHR_DEV_ST=m
-CONFIG_CHR_DEV_OSST=m
-CONFIG_BLK_DEV_SR=m
-CONFIG_BLK_DEV_SR_VENDOR=y
-CONFIG_CHR_DEV_SG=m
-
-#
-# Some SCSI devices (e.g. CD jukebox) support multiple LUNs
-#
-# CONFIG_SCSI_MULTI_LUN is not set
-CONFIG_SCSI_CONSTANTS=y
-CONFIG_SCSI_LOGGING=y
-
-#
-# SCSI Transport Attributes
-#
-CONFIG_SCSI_SPI_ATTRS=m
-CONFIG_SCSI_FC_ATTRS=m
-
-#
-# SCSI low-level drivers
-#
-CONFIG_BLK_DEV_3W_XXXX_RAID=m
-# CONFIG_SCSI_7000FASST is not set
-CONFIG_SCSI_ACARD=m
-CONFIG_SCSI_AHA152X=m
-CONFIG_SCSI_AHA1542=m
-CONFIG_SCSI_AACRAID=m
-CONFIG_SCSI_AIC7XXX=m
-CONFIG_AIC7XXX_CMDS_PER_DEVICE=4
-CONFIG_AIC7XXX_RESET_DELAY_MS=15000
-# CONFIG_AIC7XXX_BUILD_FIRMWARE is not set
-# CONFIG_AIC7XXX_DEBUG_ENABLE is not set
-CONFIG_AIC7XXX_DEBUG_MASK=0
-# CONFIG_AIC7XXX_REG_PRETTY_PRINT is not set
-CONFIG_SCSI_AIC7XXX_OLD=m
-CONFIG_SCSI_AIC79XX=m
-CONFIG_AIC79XX_CMDS_PER_DEVICE=4
-CONFIG_AIC79XX_RESET_DELAY_MS=15000
-# CONFIG_AIC79XX_BUILD_FIRMWARE is not set
-# CONFIG_AIC79XX_ENABLE_RD_STRM is not set
-# CONFIG_AIC79XX_DEBUG_ENABLE is not set
-CONFIG_AIC79XX_DEBUG_MASK=0
-# CONFIG_AIC79XX_REG_PRETTY_PRINT is not set
-# CONFIG_SCSI_DPT_I2O is not set
-CONFIG_SCSI_ADVANSYS=m
-CONFIG_SCSI_IN2000=m
-CONFIG_SCSI_MEGARAID=m
-CONFIG_SCSI_SATA=y
-CONFIG_SCSI_SATA_SVW=m
-CONFIG_SCSI_ATA_PIIX=m
-CONFIG_SCSI_SATA_PROMISE=m
-CONFIG_SCSI_SATA_SX4=m
-CONFIG_SCSI_SATA_SIL=m
-CONFIG_SCSI_SATA_SIS=m
-CONFIG_SCSI_SATA_VIA=m
-CONFIG_SCSI_SATA_VITESSE=m
-CONFIG_SCSI_BUSLOGIC=m
-# CONFIG_SCSI_OMIT_FLASHPOINT is not set
-# CONFIG_SCSI_CPQFCTS is not set
-# CONFIG_SCSI_DMX3191D is not set
-# CONFIG_SCSI_DTC3280 is not set
-# CONFIG_SCSI_EATA is not set
-# CONFIG_SCSI_EATA_PIO is not set
-CONFIG_SCSI_FUTURE_DOMAIN=m
-CONFIG_SCSI_GDTH=m
-# CONFIG_SCSI_GENERIC_NCR5380 is not set
-# CONFIG_SCSI_GENERIC_NCR5380_MMIO is not set
-CONFIG_SCSI_IPS=m
-CONFIG_SCSI_INIA100=m
-CONFIG_SCSI_PPA=m
-CONFIG_SCSI_IMM=m
-# CONFIG_SCSI_IZIP_EPP16 is not set
-# CONFIG_SCSI_IZIP_SLOW_CTR is not set
-# CONFIG_SCSI_NCR53C406A is not set
-CONFIG_SCSI_SYM53C8XX_2=m
-CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=1
-CONFIG_SCSI_SYM53C8XX_DEFAULT_TAGS=16
-CONFIG_SCSI_SYM53C8XX_MAX_TAGS=64
-# CONFIG_SCSI_SYM53C8XX_IOMAPPED is not set
-# CONFIG_SCSI_IPR is not set
-# CONFIG_SCSI_PAS16 is not set
-# CONFIG_SCSI_PSI240I is not set
-CONFIG_SCSI_QLOGIC_FAS=m
-CONFIG_SCSI_QLOGIC_ISP=m
-# CONFIG_SCSI_QLOGIC_FC is not set
-CONFIG_SCSI_QLOGIC_1280=m
-CONFIG_SCSI_QLA2XXX=m
-CONFIG_SCSI_QLA21XX=m
-CONFIG_SCSI_QLA22XX=m
-CONFIG_SCSI_QLA2300=m
-CONFIG_SCSI_QLA2322=m
-CONFIG_SCSI_QLA6312=m
-CONFIG_SCSI_QLA6322=m
-# CONFIG_SCSI_SYM53C416 is not set
-# CONFIG_SCSI_DC395x is not set
-CONFIG_SCSI_DC390T=m
-# CONFIG_SCSI_T128 is not set
-# CONFIG_SCSI_U14_34F is not set
-# CONFIG_SCSI_ULTRASTOR is not set
-# CONFIG_SCSI_NSP32 is not set
-# CONFIG_SCSI_DEBUG is not set
-
-#
-# PCMCIA SCSI adapter support
-#
-CONFIG_PCMCIA_AHA152X=m
-CONFIG_PCMCIA_FDOMAIN=m
-CONFIG_PCMCIA_NINJA_SCSI=m
-CONFIG_PCMCIA_QLOGIC=m
-CONFIG_PCMCIA_SYM53C500=m
-
-#
-# Old CD-ROM drivers (not SCSI, not IDE)
-#
-# CONFIG_CD_NO_IDESCSI is not set
-
-#
-# Multi-device support (RAID and LVM)
-#
-CONFIG_MD=y
-CONFIG_BLK_DEV_MD=y
-CONFIG_MD_LINEAR=m
-CONFIG_MD_RAID0=m
-CONFIG_MD_RAID1=m
-CONFIG_MD_RAID5=m
-CONFIG_MD_RAID6=m
-CONFIG_MD_MULTIPATH=m
-CONFIG_BLK_DEV_DM=m
-CONFIG_DM_CRYPT=m
-
-#
-# Fusion MPT device support
-#
-CONFIG_FUSION=m
-CONFIG_FUSION_MAX_SGE=40
-# CONFIG_FUSION_ISENSE is not set
-CONFIG_FUSION_CTL=m
-CONFIG_FUSION_LAN=m
-
-#
-# IEEE 1394 (FireWire) support
-#
-CONFIG_IEEE1394=m
-
-#
-# Subsystem Options
-#
-# CONFIG_IEEE1394_VERBOSEDEBUG is not set
-CONFIG_IEEE1394_OUI_DB=y
-# CONFIG_IEEE1394_EXTRA_CONFIG_ROMS is not set
-
-#
-# Device Drivers
-#
-# CONFIG_IEEE1394_PCILYNX is not set
-CONFIG_IEEE1394_OHCI1394=m
-
-#
-# Protocol Drivers
-#
-CONFIG_IEEE1394_VIDEO1394=m
-CONFIG_IEEE1394_SBP2=m
-# CONFIG_IEEE1394_SBP2_PHYS_DMA is not set
-# CONFIG_IEEE1394_ETH1394 is not set
-CONFIG_IEEE1394_DV1394=m
-CONFIG_IEEE1394_RAWIO=m
-CONFIG_IEEE1394_CMP=m
-CONFIG_IEEE1394_AMDTP=m
-
-#
-# I2O device support
-#
-CONFIG_I2O=m
-CONFIG_I2O_CONFIG=m
-CONFIG_I2O_BLOCK=m
-CONFIG_I2O_SCSI=m
-CONFIG_I2O_PROC=m
-
-#
-# Networking support
-#
-CONFIG_NET=y
-
-#
-# Networking options
-#
-CONFIG_PACKET=y
-CONFIG_PACKET_MMAP=y
-CONFIG_NETLINK_DEV=y
-CONFIG_UNIX=y
-CONFIG_NET_KEY=m
-CONFIG_INET=y
-CONFIG_IP_MULTICAST=y
-CONFIG_IP_ADVANCED_ROUTER=y
-CONFIG_IP_MULTIPLE_TABLES=y
-CONFIG_IP_ROUTE_FWMARK=y
-CONFIG_IP_ROUTE_NAT=y
-CONFIG_IP_ROUTE_MULTIPATH=y
-CONFIG_IP_ROUTE_TOS=y
-CONFIG_IP_ROUTE_VERBOSE=y
-# CONFIG_IP_PNP is not set
-CONFIG_NET_IPIP=m
-CONFIG_NET_IPGRE=m
-CONFIG_NET_IPGRE_BROADCAST=y
-CONFIG_IP_MROUTE=y
-CONFIG_IP_PIMSM_V1=y
-CONFIG_IP_PIMSM_V2=y
-# CONFIG_ARPD is not set
-CONFIG_SYN_COOKIES=y
-CONFIG_INET_AH=m
-CONFIG_INET_ESP=m
-CONFIG_INET_IPCOMP=m
-
-#
-# IP: Virtual Server Configuration
-#
-CONFIG_IP_VS=m
-# CONFIG_IP_VS_DEBUG is not set
-CONFIG_IP_VS_TAB_BITS=12
-
-#
-# IPVS transport protocol load balancing support
-#
-CONFIG_IP_VS_PROTO_TCP=y
-CONFIG_IP_VS_PROTO_UDP=y
-CONFIG_IP_VS_PROTO_ESP=y
-CONFIG_IP_VS_PROTO_AH=y
-
-#
-# IPVS scheduler
-#
-CONFIG_IP_VS_RR=m
-CONFIG_IP_VS_WRR=m
-CONFIG_IP_VS_LC=m
-CONFIG_IP_VS_WLC=m
-CONFIG_IP_VS_LBLC=m
-CONFIG_IP_VS_LBLCR=m
-CONFIG_IP_VS_DH=m
-CONFIG_IP_VS_SH=m
-CONFIG_IP_VS_SED=m
-CONFIG_IP_VS_NQ=m
-
-#
-# IPVS application helper
-#
-CONFIG_IP_VS_FTP=m
-CONFIG_IPV6=m
-CONFIG_IPV6_PRIVACY=y
-CONFIG_INET6_AH=m
-CONFIG_INET6_ESP=m
-CONFIG_INET6_IPCOMP=m
-CONFIG_IPV6_TUNNEL=m
-CONFIG_NETFILTER=y
-# CONFIG_NETFILTER_DEBUG is not set
-CONFIG_BRIDGE_NETFILTER=y
-
-#
-# IP: Netfilter Configuration
-#
-CONFIG_IP_NF_CONNTRACK=m
-CONFIG_IP_NF_FTP=m
-CONFIG_IP_NF_IRC=m
-CONFIG_IP_NF_TFTP=m
-CONFIG_IP_NF_AMANDA=m
-CONFIG_IP_NF_QUEUE=m
-CONFIG_IP_NF_IPTABLES=m
-CONFIG_IP_NF_MATCH_LIMIT=m
-CONFIG_IP_NF_MATCH_IPRANGE=m
-CONFIG_IP_NF_MATCH_MAC=m
-CONFIG_IP_NF_MATCH_PKTTYPE=m
-CONFIG_IP_NF_MATCH_MARK=m
-CONFIG_IP_NF_MATCH_MULTIPORT=m
-CONFIG_IP_NF_MATCH_TOS=m
-CONFIG_IP_NF_MATCH_RECENT=m
-CONFIG_IP_NF_MATCH_ECN=m
-CONFIG_IP_NF_MATCH_DSCP=m
-CONFIG_IP_NF_MATCH_AH_ESP=m
-CONFIG_IP_NF_MATCH_LENGTH=m
-CONFIG_IP_NF_MATCH_TTL=m
-CONFIG_IP_NF_MATCH_TCPMSS=m
-CONFIG_IP_NF_MATCH_HELPER=m
-CONFIG_IP_NF_MATCH_STATE=m
-CONFIG_IP_NF_MATCH_CONNTRACK=m
-CONFIG_IP_NF_MATCH_OWNER=m
-CONFIG_IP_NF_MATCH_PHYSDEV=m
-CONFIG_IP_NF_FILTER=m
-CONFIG_IP_NF_TARGET_REJECT=m
-CONFIG_IP_NF_NAT=m
-CONFIG_IP_NF_NAT_NEEDED=y
-CONFIG_IP_NF_TARGET_MASQUERADE=m
-CONFIG_IP_NF_TARGET_REDIRECT=m
-CONFIG_IP_NF_TARGET_NETMAP=m
-CONFIG_IP_NF_TARGET_SAME=m
-CONFIG_IP_NF_NAT_LOCAL=y
-CONFIG_IP_NF_NAT_SNMP_BASIC=m
-CONFIG_IP_NF_NAT_IRC=m
-CONFIG_IP_NF_NAT_FTP=m
-CONFIG_IP_NF_NAT_TFTP=m
-CONFIG_IP_NF_NAT_AMANDA=m
-CONFIG_IP_NF_MANGLE=m
-CONFIG_IP_NF_TARGET_TOS=m
-CONFIG_IP_NF_TARGET_ECN=m
-CONFIG_IP_NF_TARGET_DSCP=m
-CONFIG_IP_NF_TARGET_MARK=m
-CONFIG_IP_NF_TARGET_CLASSIFY=m
-CONFIG_IP_NF_TARGET_LOG=m
-CONFIG_IP_NF_TARGET_ULOG=m
-CONFIG_IP_NF_TARGET_TCPMSS=m
-CONFIG_IP_NF_ARPTABLES=m
-CONFIG_IP_NF_ARPFILTER=m
-CONFIG_IP_NF_ARP_MANGLE=m
-# CONFIG_IP_NF_COMPAT_IPCHAINS is not set
-# CONFIG_IP_NF_COMPAT_IPFWADM is not set
-CONFIG_IP_NF_TARGET_NOTRACK=m
-CONFIG_IP_NF_RAW=m
-
-#
-# IPv6: Netfilter Configuration
-#
-# CONFIG_IP6_NF_QUEUE is not set
-CONFIG_IP6_NF_IPTABLES=m
-CONFIG_IP6_NF_MATCH_LIMIT=m
-CONFIG_IP6_NF_MATCH_MAC=m
-CONFIG_IP6_NF_MATCH_RT=m
-CONFIG_IP6_NF_MATCH_OPTS=m
-CONFIG_IP6_NF_MATCH_FRAG=m
-CONFIG_IP6_NF_MATCH_HL=m
-CONFIG_IP6_NF_MATCH_MULTIPORT=m
-CONFIG_IP6_NF_MATCH_OWNER=m
-CONFIG_IP6_NF_MATCH_MARK=m
-CONFIG_IP6_NF_MATCH_IPV6HEADER=m
-CONFIG_IP6_NF_MATCH_AHESP=m
-CONFIG_IP6_NF_MATCH_LENGTH=m
-CONFIG_IP6_NF_MATCH_EUI64=m
-CONFIG_IP6_NF_FILTER=m
-CONFIG_IP6_NF_TARGET_LOG=m
-CONFIG_IP6_NF_MANGLE=m
-CONFIG_IP6_NF_TARGET_MARK=m
-CONFIG_IP6_NF_RAW=m
-
-#
-# Bridge: Netfilter Configuration
-#
-CONFIG_BRIDGE_NF_EBTABLES=m
-CONFIG_BRIDGE_EBT_BROUTE=m
-CONFIG_BRIDGE_EBT_T_FILTER=m
-CONFIG_BRIDGE_EBT_T_NAT=m
-CONFIG_BRIDGE_EBT_802_3=m
-CONFIG_BRIDGE_EBT_AMONG=m
-CONFIG_BRIDGE_EBT_ARP=m
-CONFIG_BRIDGE_EBT_IP=m
-CONFIG_BRIDGE_EBT_LIMIT=m
-CONFIG_BRIDGE_EBT_MARK=m
-CONFIG_BRIDGE_EBT_PKTTYPE=m
-CONFIG_BRIDGE_EBT_STP=m
-CONFIG_BRIDGE_EBT_VLAN=m
-CONFIG_BRIDGE_EBT_ARPREPLY=m
-CONFIG_BRIDGE_EBT_DNAT=m
-CONFIG_BRIDGE_EBT_MARK_T=m
-CONFIG_BRIDGE_EBT_REDIRECT=m
-CONFIG_BRIDGE_EBT_SNAT=m
-CONFIG_BRIDGE_EBT_LOG=m
-CONFIG_XFRM=y
-CONFIG_XFRM_USER=y
-
-#
-# SCTP Configuration (EXPERIMENTAL)
-#
-CONFIG_IP_SCTP=m
-# CONFIG_SCTP_DBG_MSG is not set
-# CONFIG_SCTP_DBG_OBJCNT is not set
-# CONFIG_SCTP_HMAC_NONE is not set
-# CONFIG_SCTP_HMAC_SHA1 is not set
-CONFIG_SCTP_HMAC_MD5=y
-# CONFIG_ATM is not set
-CONFIG_BRIDGE=m
-CONFIG_VLAN_8021Q=m
-# CONFIG_DECNET is not set
-CONFIG_LLC=m
-# CONFIG_LLC2 is not set
-CONFIG_IPX=m
-# CONFIG_IPX_INTERN is not set
-CONFIG_ATALK=m
-CONFIG_DEV_APPLETALK=y
-CONFIG_LTPC=m
-CONFIG_COPS=m
-CONFIG_COPS_DAYNA=y
-CONFIG_COPS_TANGENT=y
-CONFIG_IPDDP=m
-CONFIG_IPDDP_ENCAP=y
-CONFIG_IPDDP_DECAP=y
-# CONFIG_X25 is not set
-# CONFIG_LAPB is not set
-CONFIG_NET_DIVERT=y
-# CONFIG_ECONET is not set
-CONFIG_WAN_ROUTER=m
-# CONFIG_NET_FASTROUTE is not set
-# CONFIG_NET_HW_FLOWCONTROL is not set
-
-#
-# QoS and/or fair queueing
-#
-CONFIG_NET_SCHED=y
-CONFIG_NET_SCH_CBQ=m
-CONFIG_NET_SCH_HTB=m
-CONFIG_NET_SCH_HFSC=m
-CONFIG_NET_SCH_CSZ=m
-CONFIG_NET_SCH_PRIO=m
-CONFIG_NET_SCH_RED=m
-CONFIG_NET_SCH_SFQ=m
-CONFIG_NET_SCH_TEQL=m
-CONFIG_NET_SCH_TBF=m
-CONFIG_NET_SCH_GRED=m
-CONFIG_NET_SCH_DSMARK=m
-CONFIG_NET_SCH_DELAY=m
-CONFIG_NET_SCH_INGRESS=m
-CONFIG_NET_QOS=y
-CONFIG_NET_ESTIMATOR=y
-CONFIG_NET_CLS=y
-CONFIG_NET_CLS_TCINDEX=m
-CONFIG_NET_CLS_ROUTE4=m
-CONFIG_NET_CLS_ROUTE=y
-CONFIG_NET_CLS_FW=m
-CONFIG_NET_CLS_U32=m
-CONFIG_NET_CLS_RSVP=m
-CONFIG_NET_CLS_RSVP6=m
-CONFIG_NET_CLS_POLICE=y
-
-#
-# Network testing
-#
-# CONFIG_NET_PKTGEN is not set
-CONFIG_NETPOLL=y
-# CONFIG_NETPOLL_RX is not set
-# CONFIG_NETPOLL_TRAP is not set
-CONFIG_NET_POLL_CONTROLLER=y
-# CONFIG_HAMRADIO is not set
-CONFIG_IRDA=m
-
-#
-# IrDA protocols
-#
-CONFIG_IRLAN=m
-CONFIG_IRNET=m
-CONFIG_IRCOMM=m
-# CONFIG_IRDA_ULTRA is not set
-
-#
-# IrDA options
-#
-CONFIG_IRDA_CACHE_LAST_LSAP=y
-CONFIG_IRDA_FAST_RR=y
-# CONFIG_IRDA_DEBUG is not set
-
-#
-# Infrared-port device drivers
-#
-
-#
-# SIR device drivers
-#
-CONFIG_IRTTY_SIR=m
-
-#
-# Dongle support
-#
-CONFIG_DONGLE=y
-CONFIG_ESI_DONGLE=m
-CONFIG_ACTISYS_DONGLE=m
-CONFIG_TEKRAM_DONGLE=m
-CONFIG_LITELINK_DONGLE=m
-CONFIG_MA600_DONGLE=m
-CONFIG_GIRBIL_DONGLE=m
-CONFIG_MCP2120_DONGLE=m
-CONFIG_OLD_BELKIN_DONGLE=m
-CONFIG_ACT200L_DONGLE=m
-
-#
-# Old SIR device drivers
-#
-CONFIG_IRPORT_SIR=m
-
-#
-# Old Serial dongle support
-#
-# CONFIG_DONGLE_OLD is not set
-
-#
-# FIR device drivers
-#
-CONFIG_USB_IRDA=m
-CONFIG_SIGMATEL_FIR=m
-CONFIG_NSC_FIR=m
-# CONFIG_WINBOND_FIR is not set
-# CONFIG_TOSHIBA_FIR is not set
-# CONFIG_SMC_IRCC_FIR is not set
-# CONFIG_ALI_FIR is not set
-# CONFIG_VLSI_FIR is not set
-# CONFIG_VIA_FIR is not set
-CONFIG_BT=m
-CONFIG_BT_L2CAP=m
-CONFIG_BT_SCO=m
-CONFIG_BT_RFCOMM=m
-CONFIG_BT_RFCOMM_TTY=y
-CONFIG_BT_BNEP=m
-CONFIG_BT_BNEP_MC_FILTER=y
-CONFIG_BT_BNEP_PROTO_FILTER=y
-CONFIG_BT_CMTP=m
-
-#
-# Bluetooth device drivers
-#
-CONFIG_BT_HCIUSB=m
-CONFIG_BT_HCIUSB_SCO=y
-CONFIG_BT_HCIUART=m
-CONFIG_BT_HCIUART_H4=y
-CONFIG_BT_HCIUART_BCSP=y
-CONFIG_BT_HCIUART_BCSP_TXCRC=y
-CONFIG_BT_HCIBCM203X=m
-CONFIG_BT_HCIBFUSB=m
-CONFIG_BT_HCIDTL1=m
-CONFIG_BT_HCIBT3C=m
-CONFIG_BT_HCIBLUECARD=m
-CONFIG_BT_HCIBTUART=m
-CONFIG_BT_HCIVHCI=m
-CONFIG_TUX=m
-
-#
-# TUX options
-#
-CONFIG_TUX_EXTCGI=y
-# CONFIG_TUX_EXTENDED_LOG is not set
-# CONFIG_TUX_DEBUG is not set
-CONFIG_NETDEVICES=y
-CONFIG_DUMMY=m
-CONFIG_BONDING=m
-CONFIG_EQUALIZER=m
-CONFIG_TUN=m
-CONFIG_ETHERTAP=m
-CONFIG_NET_SB1000=m
-
-#
-# ARCnet devices
-#
-# CONFIG_ARCNET is not set
-
-#
-# Ethernet (10 or 100Mbit)
-#
-CONFIG_NET_ETHERNET=y
-CONFIG_MII=m
-CONFIG_HAPPYMEAL=m
-CONFIG_SUNGEM=m
-CONFIG_NET_VENDOR_3COM=y
-CONFIG_EL1=m
-CONFIG_EL2=m
-CONFIG_ELPLUS=m
-CONFIG_EL16=m
-CONFIG_EL3=m
-CONFIG_3C515=m
-CONFIG_VORTEX=m
-# CONFIG_TYPHOON is not set
-CONFIG_LANCE=m
-CONFIG_NET_VENDOR_SMC=y
-CONFIG_WD80x3=m
-CONFIG_ULTRA=m
-CONFIG_SMC9194=m
-CONFIG_NET_VENDOR_RACAL=y
-# CONFIG_NI5010 is not set
-CONFIG_NI52=m
-CONFIG_NI65=m
-
-#
-# Tulip family network device support
-#
-CONFIG_NET_TULIP=y
-CONFIG_DE2104X=m
-CONFIG_TULIP=m
-# CONFIG_TULIP_MWI is not set
-CONFIG_TULIP_MMIO=y
-# CONFIG_TULIP_NAPI is not set
-CONFIG_DE4X5=m
-CONFIG_WINBOND_840=m
-CONFIG_DM9102=m
-CONFIG_PCMCIA_XIRCOM=m
-# CONFIG_PCMCIA_XIRTULIP is not set
-# CONFIG_AT1700 is not set
-CONFIG_DEPCA=m
-CONFIG_HP100=m
-# CONFIG_NET_ISA is not set
-CONFIG_NE2000=m
-CONFIG_NET_PCI=y
-CONFIG_PCNET32=m
-CONFIG_AMD8111_ETH=m
-CONFIG_AMD8111E_NAPI=y
-CONFIG_ADAPTEC_STARFIRE=m
-CONFIG_ADAPTEC_STARFIRE_NAPI=y
-CONFIG_AC3200=m
-CONFIG_APRICOT=m
-CONFIG_B44=m
-CONFIG_FORCEDETH=m
-CONFIG_CS89x0=m
-CONFIG_DGRS=m
-CONFIG_EEPRO100=m
-# CONFIG_EEPRO100_PIO is not set
-CONFIG_E100=m
-CONFIG_E100_NAPI=y
-CONFIG_FEALNX=m
-CONFIG_NATSEMI=m
-CONFIG_NE2K_PCI=m
-CONFIG_8139CP=m
-CONFIG_8139TOO=m
-CONFIG_8139TOO_PIO=y
-# CONFIG_8139TOO_TUNE_TWISTER is not set
-CONFIG_8139TOO_8129=y
-# CONFIG_8139_OLD_RX_RESET is not set
-CONFIG_SIS900=m
-CONFIG_EPIC100=m
-CONFIG_SUNDANCE=m
-# CONFIG_SUNDANCE_MMIO is not set
-CONFIG_TLAN=m
-CONFIG_VIA_RHINE=m
-CONFIG_VIA_RHINE_MMIO=y
-CONFIG_NET_POCKET=y
-CONFIG_ATP=m
-CONFIG_DE600=m
-CONFIG_DE620=m
-
-#
-# Ethernet (1000 Mbit)
-#
-CONFIG_ACENIC=m
-# CONFIG_ACENIC_OMIT_TIGON_I is not set
-CONFIG_DL2K=m
-CONFIG_E1000=m
-CONFIG_E1000_NAPI=y
-CONFIG_NS83820=m
-CONFIG_HAMACHI=m
-CONFIG_YELLOWFIN=m
-CONFIG_R8169=m
-CONFIG_SK98LIN=m
-CONFIG_TIGON3=m
-
-#
-# Ethernet (10000 Mbit)
-#
-CONFIG_IXGB=m
-CONFIG_IXGB_NAPI=y
-CONFIG_S2IO=m
-CONFIG_S2IO_NAPI=y
-
-#
-# Token Ring devices
-#
-# CONFIG_TR is not set
-
-#
-# Wireless LAN (non-hamradio)
-#
-CONFIG_NET_RADIO=y
-
-#
-# Obsolete Wireless cards support (pre-802.11)
-#
-# CONFIG_STRIP is not set
-# CONFIG_ARLAN is not set
-CONFIG_WAVELAN=m
-CONFIG_PCMCIA_WAVELAN=m
-CONFIG_PCMCIA_NETWAVE=m
-
-#
-# Wireless 802.11 Frequency Hopping cards support
-#
-# CONFIG_PCMCIA_RAYCS is not set
-
-#
-# Wireless 802.11b ISA/PCI cards support
-#
-CONFIG_AIRO=m
-CONFIG_HERMES=m
-CONFIG_PLX_HERMES=m
-CONFIG_TMD_HERMES=m
-CONFIG_PCI_HERMES=m
-CONFIG_ATMEL=m
-CONFIG_PCI_ATMEL=m
-
-#
-# Wireless 802.11b Pcmcia/Cardbus cards support
-#
-CONFIG_PCMCIA_HERMES=m
-CONFIG_AIRO_CS=m
-CONFIG_PCMCIA_ATMEL=m
-CONFIG_PCMCIA_WL3501=m
-
-#
-# Prism GT/Duette 802.11(a/b/g) PCI/Cardbus support
-#
-CONFIG_PRISM54=m
-CONFIG_NET_WIRELESS=y
-
-#
-# PCMCIA network device support
-#
-CONFIG_NET_PCMCIA=y
-CONFIG_PCMCIA_3C589=m
-CONFIG_PCMCIA_3C574=m
-CONFIG_PCMCIA_FMVJ18X=m
-CONFIG_PCMCIA_PCNET=m
-CONFIG_PCMCIA_NMCLAN=m
-CONFIG_PCMCIA_SMC91C92=m
-CONFIG_PCMCIA_XIRC2PS=m
-CONFIG_PCMCIA_AXNET=m
-
-#
-# Wan interfaces
-#
-# CONFIG_WAN is not set
-CONFIG_FDDI=y
-# CONFIG_DEFXX is not set
-CONFIG_SKFP=m
-# CONFIG_HIPPI is not set
-CONFIG_PLIP=m
-CONFIG_PPP=m
-CONFIG_PPP_MULTILINK=y
-CONFIG_PPP_FILTER=y
-CONFIG_PPP_ASYNC=m
-CONFIG_PPP_SYNC_TTY=m
-CONFIG_PPP_DEFLATE=m
-# CONFIG_PPP_BSDCOMP is not set
-CONFIG_PPPOE=m
-# CONFIG_SLIP is not set
-CONFIG_NET_FC=y
-# CONFIG_SHAPER is not set
-CONFIG_NETCONSOLE=m
-
-#
-# ISDN subsystem
-#
-CONFIG_ISDN=m
-
-#
-# Old ISDN4Linux
-#
-CONFIG_ISDN_I4L=m
-CONFIG_ISDN_PPP=y
-CONFIG_ISDN_PPP_VJ=y
-CONFIG_ISDN_MPP=y
-CONFIG_IPPP_FILTER=y
-# CONFIG_ISDN_PPP_BSDCOMP is not set
-CONFIG_ISDN_AUDIO=y
-CONFIG_ISDN_TTY_FAX=y
-
-#
-# ISDN feature submodules
-#
-CONFIG_ISDN_DRV_LOOP=m
-
-#
-# ISDN4Linux hardware drivers
-#
-
-#
-# Passive cards
-#
-CONFIG_ISDN_DRV_HISAX=m
-
-#
-# D-channel protocol features
-#
-CONFIG_HISAX_EURO=y
-CONFIG_DE_AOC=y
-CONFIG_HISAX_NO_SENDCOMPLETE=y
-CONFIG_HISAX_NO_LLC=y
-CONFIG_HISAX_NO_KEYPAD=y
-CONFIG_HISAX_1TR6=y
-CONFIG_HISAX_NI1=y
-CONFIG_HISAX_MAX_CARDS=8
-
-#
-# HiSax supported cards
-#
-CONFIG_HISAX_16_0=y
-CONFIG_HISAX_16_3=y
-CONFIG_HISAX_TELESPCI=y
-CONFIG_HISAX_S0BOX=y
-CONFIG_HISAX_AVM_A1=y
-CONFIG_HISAX_FRITZPCI=y
-CONFIG_HISAX_AVM_A1_PCMCIA=y
-CONFIG_HISAX_ELSA=y
-CONFIG_HISAX_IX1MICROR2=y
-CONFIG_HISAX_DIEHLDIVA=y
-CONFIG_HISAX_ASUSCOM=y
-CONFIG_HISAX_TELEINT=y
-CONFIG_HISAX_HFCS=y
-CONFIG_HISAX_SEDLBAUER=y
-CONFIG_HISAX_SPORTSTER=y
-CONFIG_HISAX_MIC=y
-CONFIG_HISAX_NETJET=y
-CONFIG_HISAX_NETJET_U=y
-CONFIG_HISAX_NICCY=y
-CONFIG_HISAX_ISURF=y
-CONFIG_HISAX_HSTSAPHIR=y
-CONFIG_HISAX_BKM_A4T=y
-CONFIG_HISAX_SCT_QUADRO=y
-CONFIG_HISAX_GAZEL=y
-CONFIG_HISAX_HFC_PCI=y
-CONFIG_HISAX_W6692=y
-CONFIG_HISAX_HFC_SX=y
-CONFIG_HISAX_ENTERNOW_PCI=y
-# CONFIG_HISAX_DEBUG is not set
-
-#
-# HiSax PCMCIA card service modules
-#
-CONFIG_HISAX_SEDLBAUER_CS=m
-CONFIG_HISAX_ELSA_CS=m
-CONFIG_HISAX_AVM_A1_CS=m
-CONFIG_HISAX_TELES_CS=m
-
-#
-# HiSax sub driver modules
-#
-CONFIG_HISAX_ST5481=m
-CONFIG_HISAX_HFCUSB=m
-CONFIG_HISAX_FRITZ_PCIPNP=m
-CONFIG_HISAX_HDLC=y
-
-#
-# Active cards
-#
-CONFIG_ISDN_DRV_ICN=m
-CONFIG_ISDN_DRV_PCBIT=m
-CONFIG_ISDN_DRV_SC=m
-CONFIG_ISDN_DRV_ACT2000=m
-CONFIG_ISDN_DRV_TPAM=m
-CONFIG_HYSDN=m
-CONFIG_HYSDN_CAPI=y
-
-#
-# CAPI subsystem
-#
-CONFIG_ISDN_CAPI=m
-CONFIG_ISDN_DRV_AVMB1_VERBOSE_REASON=y
-CONFIG_ISDN_CAPI_MIDDLEWARE=y
-CONFIG_ISDN_CAPI_CAPI20=m
-CONFIG_ISDN_CAPI_CAPIFS_BOOL=y
-CONFIG_ISDN_CAPI_CAPIFS=m
-CONFIG_ISDN_CAPI_CAPIDRV=m
-
-#
-# CAPI hardware drivers
-#
-
-#
-# Active AVM cards
-#
-CONFIG_CAPI_AVM=y
-CONFIG_ISDN_DRV_AVMB1_B1ISA=m
-CONFIG_ISDN_DRV_AVMB1_B1PCI=m
-CONFIG_ISDN_DRV_AVMB1_B1PCIV4=y
-CONFIG_ISDN_DRV_AVMB1_T1ISA=m
-CONFIG_ISDN_DRV_AVMB1_B1PCMCIA=m
-CONFIG_ISDN_DRV_AVMB1_AVM_CS=m
-CONFIG_ISDN_DRV_AVMB1_T1PCI=m
-CONFIG_ISDN_DRV_AVMB1_C4=m
-
-#
-# Active Eicon DIVA Server cards
-#
-CONFIG_CAPI_EICON=y
-CONFIG_ISDN_DIVAS=m
-CONFIG_ISDN_DIVAS_BRIPCI=y
-CONFIG_ISDN_DIVAS_PRIPCI=y
-CONFIG_ISDN_DIVAS_DIVACAPI=m
-CONFIG_ISDN_DIVAS_USERIDI=m
-CONFIG_ISDN_DIVAS_MAINT=m
-
-#
-# Telephony Support
-#
-# CONFIG_PHONE is not set
-
-#
-# Input device support
-#
-CONFIG_INPUT=y
-
-#
-# Userland interfaces
-#
-CONFIG_INPUT_MOUSEDEV=y
-# CONFIG_INPUT_MOUSEDEV_PSAUX is not set
-CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
-CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
-CONFIG_INPUT_JOYDEV=m
-# CONFIG_INPUT_TSDEV is not set
-CONFIG_INPUT_EVDEV=y
-# CONFIG_INPUT_EVBUG is not set
-
-#
-# Input I/O drivers
-#
-CONFIG_GAMEPORT=m
-CONFIG_SOUND_GAMEPORT=m
-CONFIG_GAMEPORT_NS558=m
-CONFIG_GAMEPORT_L4=m
-CONFIG_GAMEPORT_EMU10K1=m
-CONFIG_GAMEPORT_VORTEX=m
-CONFIG_GAMEPORT_FM801=m
-CONFIG_GAMEPORT_CS461x=m
-CONFIG_SERIO=y
-CONFIG_SERIO_I8042=y
-CONFIG_SERIO_SERPORT=y
-# CONFIG_SERIO_CT82C710 is not set
-# CONFIG_SERIO_PARKBD is not set
-# CONFIG_SERIO_PCIPS2 is not set
-
-#
-# Input Device Drivers
-#
-CONFIG_INPUT_KEYBOARD=y
-CONFIG_KEYBOARD_ATKBD=y
-# CONFIG_KEYBOARD_SUNKBD is not set
-# CONFIG_KEYBOARD_LKKBD is not set
-# CONFIG_KEYBOARD_XTKBD is not set
-# CONFIG_KEYBOARD_NEWTON is not set
-CONFIG_INPUT_MOUSE=y
-CONFIG_MOUSE_PS2=y
-CONFIG_MOUSE_SERIAL=m
-CONFIG_MOUSE_INPORT=m
-CONFIG_MOUSE_ATIXL=y
-CONFIG_MOUSE_LOGIBM=m
-CONFIG_MOUSE_PC110PAD=m
-CONFIG_MOUSE_VSXXXAA=m
-CONFIG_INPUT_JOYSTICK=y
-CONFIG_JOYSTICK_ANALOG=m
-CONFIG_JOYSTICK_A3D=m
-CONFIG_JOYSTICK_ADI=m
-CONFIG_JOYSTICK_COBRA=m
-CONFIG_JOYSTICK_GF2K=m
-CONFIG_JOYSTICK_GRIP=m
-CONFIG_JOYSTICK_GRIP_MP=m
-CONFIG_JOYSTICK_GUILLEMOT=m
-CONFIG_JOYSTICK_INTERACT=m
-CONFIG_JOYSTICK_SIDEWINDER=m
-CONFIG_JOYSTICK_TMDC=m
-CONFIG_JOYSTICK_IFORCE=m
-CONFIG_JOYSTICK_IFORCE_USB=y
-CONFIG_JOYSTICK_IFORCE_232=y
-CONFIG_JOYSTICK_WARRIOR=m
-CONFIG_JOYSTICK_MAGELLAN=m
-CONFIG_JOYSTICK_SPACEORB=m
-CONFIG_JOYSTICK_SPACEBALL=m
-CONFIG_JOYSTICK_STINGER=m
-CONFIG_JOYSTICK_TWIDDLER=m
-CONFIG_JOYSTICK_DB9=m
-CONFIG_JOYSTICK_GAMECON=m
-CONFIG_JOYSTICK_TURBOGRAFX=m
-# CONFIG_INPUT_JOYDUMP is not set
-CONFIG_INPUT_TOUCHSCREEN=y
-CONFIG_TOUCHSCREEN_GUNZE=m
-CONFIG_INPUT_MISC=y
-CONFIG_INPUT_PCSPKR=m
-# CONFIG_INPUT_UINPUT is not set
-
-#
-# Character devices
-#
-CONFIG_VT=y
-CONFIG_VT_CONSOLE=y
-CONFIG_HW_CONSOLE=y
-CONFIG_SERIAL_NONSTANDARD=y
-# CONFIG_COMPUTONE is not set
-CONFIG_ROCKETPORT=m
-# CONFIG_CYCLADES is not set
-# CONFIG_DIGIEPCA is not set
-# CONFIG_DIGI is not set
-# CONFIG_ESPSERIAL is not set
-# CONFIG_MOXA_INTELLIO is not set
-# CONFIG_MOXA_SMARTIO is not set
-# CONFIG_ISI is not set
-CONFIG_SYNCLINK=m
-CONFIG_SYNCLINKMP=m
-CONFIG_N_HDLC=m
-# CONFIG_RISCOM8 is not set
-# CONFIG_SPECIALIX is not set
-# CONFIG_SX is not set
-# CONFIG_RIO is not set
-CONFIG_STALDRV=y
-# CONFIG_STALLION is not set
-# CONFIG_ISTALLION is not set
-
-#
-# Serial drivers
-#
-CONFIG_SERIAL_8250=y
-CONFIG_SERIAL_8250_CONSOLE=y
-CONFIG_SERIAL_8250_CS=m
-# CONFIG_SERIAL_8250_ACPI is not set
-CONFIG_SERIAL_8250_NR_UARTS=4
-CONFIG_SERIAL_8250_EXTENDED=y
-# CONFIG_SERIAL_8250_MANY_PORTS is not set
-CONFIG_SERIAL_8250_SHARE_IRQ=y
-CONFIG_SERIAL_8250_DETECT_IRQ=y
-CONFIG_SERIAL_8250_MULTIPORT=y
-CONFIG_SERIAL_8250_RSA=y
-
-#
-# Non-8250 serial port support
-#
-CONFIG_SERIAL_CORE=y
-CONFIG_SERIAL_CORE_CONSOLE=y
-CONFIG_UNIX98_PTYS=y
-# CONFIG_LEGACY_PTYS is not set
-CONFIG_CRASH=m
-CONFIG_PRINTER=m
-CONFIG_LP_CONSOLE=y
-CONFIG_PPDEV=m
-CONFIG_TIPAR=m
-# CONFIG_QIC02_TAPE is not set
-
-#
-# IPMI
-#
-CONFIG_IPMI_HANDLER=m
-# CONFIG_IPMI_PANIC_EVENT is not set
-CONFIG_IPMI_DEVICE_INTERFACE=m
-CONFIG_IPMI_SI=m
-CONFIG_IPMI_WATCHDOG=m
-
-#
-# Watchdog Cards
-#
-CONFIG_WATCHDOG=y
-# CONFIG_WATCHDOG_NOWAYOUT is not set
-
-#
-# Watchdog Device Drivers
-#
-CONFIG_SOFT_WATCHDOG=m
-CONFIG_ACQUIRE_WDT=m
-CONFIG_ADVANTECH_WDT=m
-CONFIG_ALIM1535_WDT=m
-CONFIG_ALIM7101_WDT=m
-CONFIG_SC520_WDT=m
-CONFIG_EUROTECH_WDT=m
-CONFIG_IB700_WDT=m
-CONFIG_WAFER_WDT=m
-CONFIG_I8XX_TCO=m
-CONFIG_SC1200_WDT=m
-# CONFIG_SCx200_WDT is not set
-# CONFIG_60XX_WDT is not set
-CONFIG_CPU5_WDT=m
-CONFIG_W83627HF_WDT=m
-CONFIG_W83877F_WDT=m
-CONFIG_MACHZ_WDT=m
-
-#
-# ISA-based Watchdog Cards
-#
-CONFIG_PCWATCHDOG=m
-# CONFIG_MIXCOMWD is not set
-CONFIG_WDT=m
-# CONFIG_WDT_501 is not set
-
-#
-# PCI-based Watchdog Cards
-#
-CONFIG_PCIPCWATCHDOG=m
-CONFIG_WDTPCI=m
-CONFIG_WDT_501_PCI=y
-
-#
-# USB-based Watchdog Cards
-#
-CONFIG_USBPCWATCHDOG=m
-CONFIG_HW_RANDOM=m
-CONFIG_NVRAM=m
-CONFIG_RTC=y
-CONFIG_DTLK=m
-CONFIG_R3964=m
-# CONFIG_APPLICOM is not set
-CONFIG_SONYPI=m
-
-#
-# Ftape, the floppy tape device driver
-#
-# CONFIG_FTAPE is not set
-CONFIG_AGP=y
-CONFIG_AGP_ALI=y
-CONFIG_AGP_ATI=y
-CONFIG_AGP_AMD=y
-CONFIG_AGP_AMD64=y
-CONFIG_AGP_INTEL=y
-CONFIG_AGP_INTEL_MCH=y
-CONFIG_AGP_NVIDIA=y
-CONFIG_AGP_SIS=y
-CONFIG_AGP_SWORKS=y
-CONFIG_AGP_VIA=y
-CONFIG_AGP_EFFICEON=y
-CONFIG_DRM=y
-CONFIG_DRM_TDFX=m
-CONFIG_DRM_GAMMA=m
-CONFIG_DRM_R128=m
-CONFIG_DRM_RADEON=m
-CONFIG_DRM_I810=m
-CONFIG_DRM_I830=m
-CONFIG_DRM_MGA=m
-CONFIG_DRM_SIS=m
-
-#
-# PCMCIA character devices
-#
-CONFIG_SYNCLINK_CS=m
-CONFIG_MWAVE=m
-# CONFIG_RAW_DRIVER is not set
-CONFIG_HANGCHECK_TIMER=m
-
-#
-# I2C support
-#
-CONFIG_I2C=m
-CONFIG_I2C_CHARDEV=m
-
-#
-# I2C Algorithms
-#
-CONFIG_I2C_ALGOBIT=m
-CONFIG_I2C_ALGOPCF=m
-
-#
-# I2C Hardware Bus support
-#
-CONFIG_I2C_ALI1535=m
-CONFIG_I2C_ALI1563=m
-CONFIG_I2C_ALI15X3=m
-CONFIG_I2C_AMD756=m
-CONFIG_I2C_AMD8111=m
-# CONFIG_I2C_ELEKTOR is not set
-CONFIG_I2C_I801=m
-CONFIG_I2C_I810=m
-CONFIG_I2C_ISA=m
-CONFIG_I2C_NFORCE2=m
-# CONFIG_I2C_PARPORT is not set
-# CONFIG_I2C_PARPORT_LIGHT is not set
-CONFIG_I2C_PIIX4=m
-CONFIG_I2C_PROSAVAGE=m
-CONFIG_I2C_SAVAGE4=m
-# CONFIG_SCx200_ACB is not set
-CONFIG_I2C_SIS5595=m
-CONFIG_I2C_SIS630=m
-CONFIG_I2C_SIS96X=m
-CONFIG_I2C_VIA=m
-CONFIG_I2C_VIAPRO=m
-CONFIG_I2C_VOODOO3=m
-
-#
-# Hardware Sensors Chip support
-#
-CONFIG_I2C_SENSOR=m
-CONFIG_SENSORS_ADM1021=m
-CONFIG_SENSORS_ASB100=m
-CONFIG_SENSORS_DS1621=m
-CONFIG_SENSORS_FSCHER=m
-CONFIG_SENSORS_GL518SM=m
-CONFIG_SENSORS_IT87=m
-CONFIG_SENSORS_LM75=m
-CONFIG_SENSORS_LM78=m
-CONFIG_SENSORS_LM80=m
-CONFIG_SENSORS_LM83=m
-CONFIG_SENSORS_LM85=m
-CONFIG_SENSORS_LM90=m
-CONFIG_SENSORS_MAX1619=m
-CONFIG_SENSORS_VIA686A=m
-CONFIG_SENSORS_W83781D=m
-CONFIG_SENSORS_W83L785TS=m
-CONFIG_SENSORS_W83627HF=m
-
-#
-# Other I2C Chip support
-#
-CONFIG_SENSORS_EEPROM=m
-CONFIG_SENSORS_PCF8574=m
-CONFIG_SENSORS_PCF8591=m
-CONFIG_SENSORS_RTC8564=m
-# CONFIG_I2C_DEBUG_CORE is not set
-# CONFIG_I2C_DEBUG_ALGO is not set
-# CONFIG_I2C_DEBUG_BUS is not set
-# CONFIG_I2C_DEBUG_CHIP is not set
-
-#
-# Misc devices
-#
-CONFIG_IBM_ASM=m
-
-#
-# Multimedia devices
-#
-CONFIG_VIDEO_DEV=m
-
-#
-# Video For Linux
-#
-
-#
-# Video Adapters
-#
-CONFIG_VIDEO_BT848=m
-CONFIG_VIDEO_PMS=m
-CONFIG_VIDEO_BWQCAM=m
-CONFIG_VIDEO_CQCAM=m
-CONFIG_VIDEO_W9966=m
-CONFIG_VIDEO_CPIA=m
-CONFIG_VIDEO_CPIA_PP=m
-CONFIG_VIDEO_CPIA_USB=m
-CONFIG_VIDEO_SAA5246A=m
-CONFIG_VIDEO_SAA5249=m
-CONFIG_TUNER_3036=m
-CONFIG_VIDEO_STRADIS=m
-CONFIG_VIDEO_ZORAN=m
-CONFIG_VIDEO_ZORAN_BUZ=m
-CONFIG_VIDEO_ZORAN_DC10=m
-CONFIG_VIDEO_ZORAN_DC30=m
-CONFIG_VIDEO_ZORAN_LML33=m
-CONFIG_VIDEO_ZORAN_LML33R10=m
-CONFIG_VIDEO_MEYE=m
-CONFIG_VIDEO_SAA7134=m
-CONFIG_VIDEO_MXB=m
-CONFIG_VIDEO_DPC=m
-CONFIG_VIDEO_HEXIUM_ORION=m
-CONFIG_VIDEO_HEXIUM_GEMINI=m
-CONFIG_VIDEO_CX88=m
-
-#
-# Radio Adapters
-#
-CONFIG_RADIO_CADET=m
-CONFIG_RADIO_RTRACK=m
-CONFIG_RADIO_RTRACK2=m
-CONFIG_RADIO_AZTECH=m
-CONFIG_RADIO_GEMTEK=m
-CONFIG_RADIO_GEMTEK_PCI=m
-CONFIG_RADIO_MAXIRADIO=m
-CONFIG_RADIO_MAESTRO=m
-CONFIG_RADIO_SF16FMI=m
-CONFIG_RADIO_SF16FMR2=m
-CONFIG_RADIO_TERRATEC=m
-CONFIG_RADIO_TRUST=m
-CONFIG_RADIO_TYPHOON=m
-CONFIG_RADIO_TYPHOON_PROC_FS=y
-CONFIG_RADIO_ZOLTRIX=m
-
-#
-# Digital Video Broadcasting Devices
-#
-# CONFIG_DVB is not set
-CONFIG_VIDEO_SAA7146=m
-CONFIG_VIDEO_SAA7146_VV=m
-CONFIG_VIDEO_VIDEOBUF=m
-CONFIG_VIDEO_TUNER=m
-CONFIG_VIDEO_BUF=m
-CONFIG_VIDEO_BTCX=m
-CONFIG_VIDEO_IR=m
-
-#
-# Graphics support
-#
-CONFIG_FB=y
-# CONFIG_FB_PM2 is not set
-# CONFIG_FB_CYBER2000 is not set
-# CONFIG_FB_ASILIANT is not set
-# CONFIG_FB_IMSTT is not set
-CONFIG_FB_VGA16=m
-CONFIG_FB_VESA=y
-CONFIG_VIDEO_SELECT=y
-CONFIG_FB_HGA=m
-CONFIG_FB_HGA_ACCEL=y
-CONFIG_FB_RIVA=m
-CONFIG_FB_I810=m
-CONFIG_FB_I810_GTF=y
-CONFIG_FB_MATROX=m
-CONFIG_FB_MATROX_MILLENIUM=y
-CONFIG_FB_MATROX_MYSTIQUE=y
-CONFIG_FB_MATROX_G450=y
-CONFIG_FB_MATROX_G100=y
-CONFIG_FB_MATROX_I2C=m
-CONFIG_FB_MATROX_MAVEN=m
-CONFIG_FB_MATROX_MULTIHEAD=y
-# CONFIG_FB_RADEON_OLD is not set
-CONFIG_FB_RADEON=m
-CONFIG_FB_RADEON_I2C=y
-# CONFIG_FB_RADEON_DEBUG is not set
-CONFIG_FB_ATY128=m
-CONFIG_FB_ATY=m
-CONFIG_FB_ATY_CT=y
-CONFIG_FB_ATY_GX=y
-# CONFIG_FB_ATY_XL_INIT is not set
-# CONFIG_FB_SIS is not set
-CONFIG_FB_NEOMAGIC=m
-CONFIG_FB_KYRO=m
-CONFIG_FB_3DFX=m
-CONFIG_FB_3DFX_ACCEL=y
-CONFIG_FB_VOODOO1=m
-CONFIG_FB_TRIDENT=m
-CONFIG_FB_TRIDENT_ACCEL=y
-# CONFIG_FB_VIRTUAL is not set
-
-#
-# Console display driver support
-#
-CONFIG_VGA_CONSOLE=y
-CONFIG_MDA_CONSOLE=m
-CONFIG_DUMMY_CONSOLE=y
-CONFIG_FRAMEBUFFER_CONSOLE=y
-CONFIG_PCI_CONSOLE=y
-# CONFIG_FONTS is not set
-CONFIG_FONT_8x8=y
-CONFIG_FONT_8x16=y
-
-#
-# Logo configuration
-#
-CONFIG_LOGO=y
-# CONFIG_LOGO_LINUX_MONO is not set
-# CONFIG_LOGO_LINUX_VGA16 is not set
-CONFIG_LOGO_LINUX_CLUT224=y
-
-#
-# Sound
-#
-CONFIG_SOUND=m
-
-#
-# Advanced Linux Sound Architecture
-#
-CONFIG_SND=m
-CONFIG_SND_TIMER=m
-CONFIG_SND_PCM=m
-CONFIG_SND_HWDEP=m
-CONFIG_SND_RAWMIDI=m
-CONFIG_SND_SEQUENCER=m
-CONFIG_SND_SEQ_DUMMY=m
-CONFIG_SND_OSSEMUL=y
-CONFIG_SND_MIXER_OSS=m
-CONFIG_SND_PCM_OSS=m
-CONFIG_SND_SEQUENCER_OSS=y
-CONFIG_SND_RTCTIMER=m
-# CONFIG_SND_VERBOSE_PRINTK is not set
-# CONFIG_SND_DEBUG is not set
-
-#
-# Generic devices
-#
-CONFIG_SND_MPU401_UART=m
-CONFIG_SND_OPL3_LIB=m
-CONFIG_SND_OPL4_LIB=m
-CONFIG_SND_VX_LIB=m
-CONFIG_SND_DUMMY=m
-CONFIG_SND_VIRMIDI=m
-CONFIG_SND_MTPAV=m
-# CONFIG_SND_SERIAL_U16550 is not set
-CONFIG_SND_MPU401=m
-
-#
-# ISA devices
-#
-CONFIG_SND_AD1816A=m
-CONFIG_SND_AD1848=m
-CONFIG_SND_CS4231=m
-CONFIG_SND_CS4232=m
-CONFIG_SND_CS4236=m
-CONFIG_SND_ES968=m
-CONFIG_SND_ES1688=m
-CONFIG_SND_ES18XX=m
-CONFIG_SND_GUSCLASSIC=m
-CONFIG_SND_GUSEXTREME=m
-CONFIG_SND_GUSMAX=m
-CONFIG_SND_INTERWAVE=m
-CONFIG_SND_INTERWAVE_STB=m
-CONFIG_SND_OPTI92X_AD1848=m
-CONFIG_SND_OPTI92X_CS4231=m
-CONFIG_SND_OPTI93X=m
-CONFIG_SND_SB8=m
-CONFIG_SND_SB16=m
-CONFIG_SND_SBAWE=m
-CONFIG_SND_SB16_CSP=y
-# CONFIG_SND_WAVEFRONT is not set
-CONFIG_SND_ALS100=m
-CONFIG_SND_AZT2320=m
-CONFIG_SND_CMI8330=m
-CONFIG_SND_DT019X=m
-CONFIG_SND_OPL3SA2=m
-CONFIG_SND_SGALAXY=m
-CONFIG_SND_SSCAPE=m
-
-#
-# PCI devices
-#
-CONFIG_SND_AC97_CODEC=m
-CONFIG_SND_ALI5451=m
-CONFIG_SND_ATIIXP=m
-CONFIG_SND_AU8810=m
-CONFIG_SND_AU8820=m
-CONFIG_SND_AU8830=m
-CONFIG_SND_AZT3328=m
-CONFIG_SND_BT87X=m
-CONFIG_SND_CS46XX=m
-CONFIG_SND_CS46XX_NEW_DSP=y
-CONFIG_SND_CS4281=m
-CONFIG_SND_EMU10K1=m
-CONFIG_SND_KORG1212=m
-CONFIG_SND_MIXART=m
-CONFIG_SND_NM256=m
-CONFIG_SND_RME32=m
-CONFIG_SND_RME96=m
-CONFIG_SND_RME9652=m
-CONFIG_SND_HDSP=m
-CONFIG_SND_TRIDENT=m
-CONFIG_SND_YMFPCI=m
-CONFIG_SND_ALS4000=m
-CONFIG_SND_CMIPCI=m
-CONFIG_SND_ENS1370=m
-CONFIG_SND_ENS1371=m
-CONFIG_SND_ES1938=m
-CONFIG_SND_ES1968=m
-CONFIG_SND_MAESTRO3=m
-CONFIG_SND_FM801=m
-CONFIG_SND_FM801_TEA575X=m
-CONFIG_SND_ICE1712=m
-CONFIG_SND_ICE1724=m
-CONFIG_SND_INTEL8X0=m
-CONFIG_SND_INTEL8X0M=m
-CONFIG_SND_SONICVIBES=m
-CONFIG_SND_VIA82XX=m
-CONFIG_SND_VX222=m
-
-#
-# ALSA USB devices
-#
-CONFIG_SND_USB_AUDIO=m
-
-#
-# PCMCIA devices
-#
-# CONFIG_SND_VXPOCKET is not set
-# CONFIG_SND_VXP440 is not set
-CONFIG_SND_PDAUDIOCF=m
-
-#
-# Open Sound System
-#
-# CONFIG_SOUND_PRIME is not set
-
-#
-# USB support
-#
-CONFIG_USB=y
-# CONFIG_USB_DEBUG is not set
-
-#
-# Miscellaneous USB options
-#
-CONFIG_USB_DEVICEFS=y
-# CONFIG_USB_BANDWIDTH is not set
-# CONFIG_USB_DYNAMIC_MINORS is not set
-
-#
-# USB Host Controller Drivers
-#
-CONFIG_USB_EHCI_HCD=m
-CONFIG_USB_EHCI_SPLIT_ISO=y
-CONFIG_USB_EHCI_ROOT_HUB_TT=y
-CONFIG_USB_OHCI_HCD=m
-CONFIG_USB_UHCI_HCD=m
-
-#
-# USB Device Class drivers
-#
-CONFIG_USB_AUDIO=m
-
-#
-# USB Bluetooth TTY can only be used with disabled Bluetooth subsystem
-#
-CONFIG_USB_MIDI=m
-CONFIG_USB_ACM=m
-CONFIG_USB_PRINTER=m
-CONFIG_USB_STORAGE=m
-# CONFIG_USB_STORAGE_DEBUG is not set
-CONFIG_USB_STORAGE_DATAFAB=y
-CONFIG_USB_STORAGE_FREECOM=y
-CONFIG_USB_STORAGE_ISD200=y
-CONFIG_USB_STORAGE_DPCM=y
-CONFIG_USB_STORAGE_HP8200e=y
-CONFIG_USB_STORAGE_SDDR09=y
-CONFIG_USB_STORAGE_SDDR55=y
-CONFIG_USB_STORAGE_JUMPSHOT=y
-
-#
-# USB Human Interface Devices (HID)
-#
-CONFIG_USB_HID=y
-CONFIG_USB_HIDINPUT=y
-CONFIG_HID_FF=y
-CONFIG_HID_PID=y
-CONFIG_LOGITECH_FF=y
-CONFIG_THRUSTMASTER_FF=y
-CONFIG_USB_HIDDEV=y
-CONFIG_USB_AIPTEK=m
-CONFIG_USB_WACOM=m
-CONFIG_USB_KBTAB=m
-CONFIG_USB_POWERMATE=m
-CONFIG_USB_MTOUCH=m
-CONFIG_USB_EGALAX=m
-CONFIG_USB_XPAD=m
-CONFIG_USB_ATI_REMOTE=m
-
-#
-# USB Imaging devices
-#
-CONFIG_USB_MDC800=m
-CONFIG_USB_MICROTEK=m
-CONFIG_USB_HPUSBSCSI=m
-
-#
-# USB Multimedia devices
-#
-CONFIG_USB_DABUSB=m
-CONFIG_USB_VICAM=m
-CONFIG_USB_DSBR=m
-CONFIG_USB_IBMCAM=m
-CONFIG_USB_KONICAWC=m
-CONFIG_USB_OV511=m
-CONFIG_USB_SE401=m
-CONFIG_USB_STV680=m
-CONFIG_USB_W9968CF=m
-
-#
-# USB Network adaptors
-#
-CONFIG_USB_CATC=m
-CONFIG_USB_KAWETH=m
-CONFIG_USB_PEGASUS=m
-CONFIG_USB_RTL8150=m
-CONFIG_USB_USBNET=m
-
-#
-# USB Host-to-Host Cables
-#
-CONFIG_USB_ALI_M5632=y
-CONFIG_USB_AN2720=y
-CONFIG_USB_BELKIN=y
-CONFIG_USB_GENESYS=y
-CONFIG_USB_NET1080=y
-CONFIG_USB_PL2301=y
-
-#
-# Intelligent USB Devices/Gadgets
-#
-CONFIG_USB_ARMLINUX=y
-CONFIG_USB_EPSON2888=y
-CONFIG_USB_ZAURUS=y
-CONFIG_USB_CDCETHER=y
-
-#
-# USB Network Adapters
-#
-CONFIG_USB_AX8817X=y
-
-#
-# USB port drivers
-#
-CONFIG_USB_USS720=m
-
-#
-# USB Serial Converter support
-#
-CONFIG_USB_SERIAL=m
-CONFIG_USB_SERIAL_GENERIC=y
-CONFIG_USB_SERIAL_BELKIN=m
-CONFIG_USB_SERIAL_WHITEHEAT=m
-CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m
-CONFIG_USB_SERIAL_EMPEG=m
-CONFIG_USB_SERIAL_FTDI_SIO=m
-CONFIG_USB_SERIAL_VISOR=m
-CONFIG_USB_SERIAL_IPAQ=m
-CONFIG_USB_SERIAL_IR=m
-CONFIG_USB_SERIAL_EDGEPORT=m
-CONFIG_USB_SERIAL_EDGEPORT_TI=m
-CONFIG_USB_SERIAL_KEYSPAN_PDA=m
-CONFIG_USB_SERIAL_KEYSPAN=m
-CONFIG_USB_SERIAL_KEYSPAN_MPR=y
-CONFIG_USB_SERIAL_KEYSPAN_USA28=y
-CONFIG_USB_SERIAL_KEYSPAN_USA28X=y
-CONFIG_USB_SERIAL_KEYSPAN_USA28XA=y
-CONFIG_USB_SERIAL_KEYSPAN_USA28XB=y
-CONFIG_USB_SERIAL_KEYSPAN_USA19=y
-CONFIG_USB_SERIAL_KEYSPAN_USA18X=y
-CONFIG_USB_SERIAL_KEYSPAN_USA19W=y
-CONFIG_USB_SERIAL_KEYSPAN_USA19QW=y
-CONFIG_USB_SERIAL_KEYSPAN_USA19QI=y
-CONFIG_USB_SERIAL_KEYSPAN_USA49W=y
-CONFIG_USB_SERIAL_KEYSPAN_USA49WLC=y
-CONFIG_USB_SERIAL_KLSI=m
-CONFIG_USB_SERIAL_KOBIL_SCT=m
-CONFIG_USB_SERIAL_MCT_U232=m
-CONFIG_USB_SERIAL_PL2303=m
-CONFIG_USB_SERIAL_SAFE=m
-CONFIG_USB_SERIAL_SAFE_PADDED=y
-CONFIG_USB_SERIAL_CYBERJACK=m
-CONFIG_USB_SERIAL_XIRCOM=m
-CONFIG_USB_SERIAL_OMNINET=m
-CONFIG_USB_EZUSB=y
-
-#
-# USB Miscellaneous drivers
-#
-CONFIG_USB_EMI62=m
-# CONFIG_USB_EMI26 is not set
-CONFIG_USB_TIGL=m
-CONFIG_USB_AUERSWALD=m
-CONFIG_USB_RIO500=m
-CONFIG_USB_LEGOTOWER=m
-CONFIG_USB_LCD=m
-CONFIG_USB_LED=m
-# CONFIG_USB_CYTHERM is not set
-CONFIG_USB_PHIDGETSERVO=m
-CONFIG_USB_TEST=m
-
-#
-# USB Gadget Support
-#
-# CONFIG_USB_GADGET is not set
-
-#
-# File systems
-#
-CONFIG_EXT2_FS=y
-CONFIG_EXT2_FS_XATTR=y
-CONFIG_EXT2_FS_POSIX_ACL=y
-CONFIG_EXT2_FS_SECURITY=y
-CONFIG_EXT3_FS=m
-CONFIG_EXT3_FS_XATTR=y
-CONFIG_EXT3_FS_POSIX_ACL=y
-CONFIG_EXT3_FS_SECURITY=y
-CONFIG_JBD=m
-# CONFIG_JBD_DEBUG is not set
-CONFIG_FS_MBCACHE=y
-CONFIG_REISERFS_FS=m
-# CONFIG_REISERFS_CHECK is not set
-CONFIG_REISERFS_PROC_INFO=y
-CONFIG_REISERFS_FS_XATTR=y
-CONFIG_REISERFS_FS_POSIX_ACL=y
-CONFIG_REISERFS_FS_SECURITY=y
-CONFIG_JFS_FS=m
-CONFIG_JFS_POSIX_ACL=y
-# CONFIG_JFS_DEBUG is not set
-# CONFIG_JFS_STATISTICS is not set
-CONFIG_FS_POSIX_ACL=y
-CONFIG_XFS_FS=m
-# CONFIG_XFS_RT is not set
-CONFIG_XFS_QUOTA=y
-CONFIG_XFS_SECURITY=y
-CONFIG_XFS_POSIX_ACL=y
-CONFIG_MINIX_FS=m
-CONFIG_ROMFS_FS=m
-CONFIG_QUOTA=y
-# CONFIG_QFMT_V1 is not set
-CONFIG_QFMT_V2=y
-CONFIG_QUOTACTL=y
-CONFIG_AUTOFS_FS=m
-CONFIG_AUTOFS4_FS=m
-
-#
-# CD-ROM/DVD Filesystems
-#
-CONFIG_ISO9660_FS=y
-CONFIG_JOLIET=y
-CONFIG_ZISOFS=y
-CONFIG_ZISOFS_FS=y
-CONFIG_UDF_FS=m
-
-#
-# DOS/FAT/NT Filesystems
-#
-CONFIG_FAT_FS=m
-CONFIG_MSDOS_FS=m
-CONFIG_VFAT_FS=m
-# CONFIG_NTFS_FS is not set
-
-#
-# Pseudo filesystems
-#
-CONFIG_PROC_FS=y
-CONFIG_PROC_KCORE=y
-CONFIG_SYSFS=y
-# CONFIG_DEVFS_FS is not set
-CONFIG_DEVPTS_FS_XATTR=y
-CONFIG_DEVPTS_FS_SECURITY=y
-CONFIG_TMPFS=y
-CONFIG_HUGETLBFS=y
-CONFIG_HUGETLB_PAGE=y
-CONFIG_RAMFS=y
-
-#
-# Miscellaneous filesystems
-#
-# CONFIG_ADFS_FS is not set
-CONFIG_AFFS_FS=m
-CONFIG_HFS_FS=m
-CONFIG_HFSPLUS_FS=m
-CONFIG_BEFS_FS=m
-# CONFIG_BEFS_DEBUG is not set
-CONFIG_BFS_FS=m
-CONFIG_EFS_FS=m
-# CONFIG_JFFS_FS is not set
-CONFIG_JFFS2_FS=m
-CONFIG_JFFS2_FS_DEBUG=0
-CONFIG_JFFS2_FS_NAND=y
-CONFIG_CRAMFS=m
-CONFIG_VXFS_FS=m
-# CONFIG_HPFS_FS is not set
-CONFIG_QNX4FS_FS=m
-# CONFIG_QNX4FS_RW is not set
-CONFIG_SYSV_FS=m
-CONFIG_UFS_FS=m
-# CONFIG_UFS_FS_WRITE is not set
-
-#
-# Network File Systems
-#
-CONFIG_NFS_FS=m
-CONFIG_NFS_V3=y
-CONFIG_NFS_V4=y
-CONFIG_NFS_DIRECTIO=y
-CONFIG_NFSD=m
-CONFIG_NFSD_V3=y
-CONFIG_NFSD_V4=y
-CONFIG_NFSD_TCP=y
-CONFIG_LOCKD=m
-CONFIG_LOCKD_V4=y
-CONFIG_EXPORTFS=m
-CONFIG_SUNRPC=m
-CONFIG_SUNRPC_GSS=m
-CONFIG_RPCSEC_GSS_KRB5=m
-CONFIG_SMB_FS=m
-# CONFIG_SMB_NLS_DEFAULT is not set
-CONFIG_CIFS=m
-# CONFIG_CIFS_STATS is not set
-CONFIG_NCP_FS=m
-CONFIG_NCPFS_PACKET_SIGNING=y
-CONFIG_NCPFS_IOCTL_LOCKING=y
-CONFIG_NCPFS_STRONG=y
-CONFIG_NCPFS_NFS_NS=y
-CONFIG_NCPFS_OS2_NS=y
-CONFIG_NCPFS_SMALLDOS=y
-CONFIG_NCPFS_NLS=y
-CONFIG_NCPFS_EXTRAS=y
-# CONFIG_CODA_FS is not set
-# CONFIG_AFS_FS is not set
-
-#
-# Partition Types
-#
-CONFIG_PARTITION_ADVANCED=y
-# CONFIG_ACORN_PARTITION is not set
-CONFIG_OSF_PARTITION=y
-# CONFIG_AMIGA_PARTITION is not set
-# CONFIG_ATARI_PARTITION is not set
-CONFIG_MAC_PARTITION=y
-CONFIG_MSDOS_PARTITION=y
-CONFIG_BSD_DISKLABEL=y
-CONFIG_MINIX_SUBPARTITION=y
-CONFIG_SOLARIS_X86_PARTITION=y
-CONFIG_UNIXWARE_DISKLABEL=y
-# CONFIG_LDM_PARTITION is not set
-# CONFIG_NEC98_PARTITION is not set
-CONFIG_SGI_PARTITION=y
-# CONFIG_ULTRIX_PARTITION is not set
-CONFIG_SUN_PARTITION=y
-CONFIG_EFI_PARTITION=y
-
-#
-# Native Language Support
-#
-CONFIG_NLS=y
-CONFIG_NLS_DEFAULT="utf8"
-CONFIG_NLS_CODEPAGE_437=m
-CONFIG_NLS_CODEPAGE_737=m
-CONFIG_NLS_CODEPAGE_775=m
-CONFIG_NLS_CODEPAGE_850=m
-CONFIG_NLS_CODEPAGE_852=m
-CONFIG_NLS_CODEPAGE_855=m
-CONFIG_NLS_CODEPAGE_857=m
-CONFIG_NLS_CODEPAGE_860=m
-CONFIG_NLS_CODEPAGE_861=m
-CONFIG_NLS_CODEPAGE_862=m
-CONFIG_NLS_CODEPAGE_863=m
-CONFIG_NLS_CODEPAGE_864=m
-CONFIG_NLS_CODEPAGE_865=m
-CONFIG_NLS_CODEPAGE_866=m
-CONFIG_NLS_CODEPAGE_869=m
-CONFIG_NLS_CODEPAGE_936=m
-CONFIG_NLS_CODEPAGE_950=m
-CONFIG_NLS_CODEPAGE_932=m
-CONFIG_NLS_CODEPAGE_949=m
-CONFIG_NLS_CODEPAGE_874=m
-CONFIG_NLS_ISO8859_8=m
-CONFIG_NLS_CODEPAGE_1250=m
-CONFIG_NLS_CODEPAGE_1251=m
-CONFIG_NLS_ISO8859_1=m
-CONFIG_NLS_ISO8859_2=m
-CONFIG_NLS_ISO8859_3=m
-CONFIG_NLS_ISO8859_4=m
-CONFIG_NLS_ISO8859_5=m
-CONFIG_NLS_ISO8859_6=m
-CONFIG_NLS_ISO8859_7=m
-CONFIG_NLS_ISO8859_9=m
-CONFIG_NLS_ISO8859_13=m
-CONFIG_NLS_ISO8859_14=m
-CONFIG_NLS_ISO8859_15=m
-CONFIG_NLS_KOI8_R=m
-CONFIG_NLS_KOI8_U=m
-CONFIG_NLS_UTF8=m
-
-#
-# Profiling support
-#
-# CONFIG_PROFILING is not set
-
-#
-# Kernel hacking
-#
-CONFIG_DEBUG_KERNEL=y
-CONFIG_EARLY_PRINTK=y
-CONFIG_DEBUG_STACKOVERFLOW=y
-# CONFIG_DEBUG_STACK_USAGE is not set
-# CONFIG_DEBUG_SLAB is not set
-CONFIG_MAGIC_SYSRQ=y
-# CONFIG_DEBUG_SPINLOCK is not set
-# CONFIG_DEBUG_PAGEALLOC is not set
-# CONFIG_DEBUG_HIGHMEM is not set
-CONFIG_DEBUG_INFO=y
-CONFIG_DEBUG_SPINLOCK_SLEEP=y
-# CONFIG_FRAME_POINTER is not set
-
-#
-# Security options
-#
-CONFIG_SECURITY=y
-CONFIG_SECURITY_NETWORK=y
-CONFIG_SECURITY_CAPABILITIES=y
-# CONFIG_SECURITY_ROOTPLUG is not set
-CONFIG_SECURITY_SELINUX=y
-CONFIG_SECURITY_SELINUX_BOOTPARAM=y
-CONFIG_SECURITY_SELINUX_DISABLE=y
-CONFIG_SECURITY_SELINUX_DEVELOP=y
-# CONFIG_SECURITY_SELINUX_MLS is not set
-
-#
-# Cryptographic options
-#
-CONFIG_CRYPTO=y
-CONFIG_CRYPTO_HMAC=y
-CONFIG_CRYPTO_NULL=m
-CONFIG_CRYPTO_MD4=m
-CONFIG_CRYPTO_MD5=y
-CONFIG_CRYPTO_SHA1=m
-CONFIG_CRYPTO_SHA256=m
-CONFIG_CRYPTO_SHA512=m
-CONFIG_CRYPTO_DES=m
-CONFIG_CRYPTO_BLOWFISH=m
-CONFIG_CRYPTO_TWOFISH=m
-CONFIG_CRYPTO_SERPENT=m
-CONFIG_CRYPTO_AES=m
-CONFIG_CRYPTO_CAST5=m
-CONFIG_CRYPTO_CAST6=m
-CONFIG_CRYPTO_ARC4=m
-CONFIG_CRYPTO_DEFLATE=m
-CONFIG_CRYPTO_MICHAEL_MIC=m
-CONFIG_CRYPTO_CRC32C=m
-# CONFIG_CRYPTO_TEST is not set
-
-#
-# Library routines
-#
-CONFIG_CRC32=y
-CONFIG_LIBCRC32C=m
-CONFIG_ZLIB_INFLATE=y
-CONFIG_ZLIB_DEFLATE=m
-CONFIG_X86_BIOS_REBOOT=y
-CONFIG_X86_STD_RESOURCES=y
-CONFIG_PC=y
diff --git a/configs/kernel-2.6.6-i686-smp.config b/configs/kernel-2.6.6-i686-smp.config
deleted file mode 100644 (file)
index 3407585..0000000
+++ /dev/null
@@ -1,2352 +0,0 @@
-#
-# Automatically generated make config: don't edit
-#
-CONFIG_X86=y
-CONFIG_MMU=y
-CONFIG_UID16=y
-CONFIG_GENERIC_ISA_DMA=y
-
-#
-# Code maturity level options
-#
-CONFIG_EXPERIMENTAL=y
-CONFIG_CLEAN_COMPILE=y
-CONFIG_STANDALONE=y
-
-#
-# General setup
-#
-CONFIG_SWAP=y
-CONFIG_SYSVIPC=y
-CONFIG_POSIX_MQUEUE=y
-CONFIG_BSD_PROCESS_ACCT=y
-CONFIG_SYSCTL=y
-CONFIG_AUDIT=y
-CONFIG_AUDITSYSCALL=y
-CONFIG_LOG_BUF_SHIFT=17
-CONFIG_HOTPLUG=y
-# CONFIG_IKCONFIG is not set
-# CONFIG_EMBEDDED is not set
-CONFIG_KALLSYMS=y
-# CONFIG_KALLSYMS_ALL is not set
-CONFIG_FUTEX=y
-CONFIG_EPOLL=y
-CONFIG_IOSCHED_NOOP=y
-CONFIG_IOSCHED_AS=y
-CONFIG_IOSCHED_DEADLINE=y
-CONFIG_IOSCHED_CFQ=y
-CONFIG_CC_OPTIMIZE_FOR_SIZE=y
-
-#
-# Loadable module support
-#
-CONFIG_MODULES=y
-CONFIG_MODULE_UNLOAD=y
-# CONFIG_MODULE_FORCE_UNLOAD is not set
-CONFIG_OBSOLETE_MODPARM=y
-# CONFIG_MODVERSIONS is not set
-CONFIG_KMOD=y
-CONFIG_STOP_MACHINE=y
-
-#
-# Processor type and features
-#
-# CONFIG_X86_PC is not set
-# CONFIG_X86_ELAN is not set
-# CONFIG_X86_VOYAGER is not set
-# CONFIG_X86_NUMAQ is not set
-# CONFIG_X86_SUMMIT is not set
-# CONFIG_X86_BIGSMP is not set
-# CONFIG_X86_VISWS is not set
-CONFIG_X86_GENERICARCH=y
-# CONFIG_X86_ES7000 is not set
-CONFIG_X86_CYCLONE_TIMER=y
-# CONFIG_M386 is not set
-# CONFIG_M486 is not set
-# CONFIG_M586 is not set
-# CONFIG_M586TSC is not set
-# CONFIG_M586MMX is not set
-CONFIG_M686=y
-# CONFIG_MPENTIUMII is not set
-# CONFIG_MPENTIUMIII is not set
-# CONFIG_MPENTIUMM is not set
-# CONFIG_MPENTIUM4 is not set
-# CONFIG_MK6 is not set
-# CONFIG_MK7 is not set
-# CONFIG_MK8 is not set
-# CONFIG_MCRUSOE is not set
-# CONFIG_MWINCHIPC6 is not set
-# CONFIG_MWINCHIP2 is not set
-# CONFIG_MWINCHIP3D is not set
-# CONFIG_MCYRIXIII is not set
-# CONFIG_MVIAC3_2 is not set
-CONFIG_X86_GENERIC=y
-CONFIG_X86_CMPXCHG=y
-CONFIG_X86_XADD=y
-CONFIG_X86_L1_CACHE_SHIFT=7
-CONFIG_RWSEM_XCHGADD_ALGORITHM=y
-CONFIG_X86_PPRO_FENCE=y
-CONFIG_X86_WP_WORKS_OK=y
-CONFIG_X86_INVLPG=y
-CONFIG_X86_BSWAP=y
-CONFIG_X86_POPAD_OK=y
-CONFIG_X86_GOOD_APIC=y
-CONFIG_X86_INTEL_USERCOPY=y
-CONFIG_X86_USE_PPRO_CHECKSUM=y
-CONFIG_X86_4G=y
-CONFIG_X86_SWITCH_PAGETABLES=y
-CONFIG_X86_4G_VM_LAYOUT=y
-CONFIG_X86_UACCESS_INDIRECT=y
-CONFIG_X86_HIGH_ENTRY=y
-CONFIG_HPET_TIMER=y
-CONFIG_HPET_EMULATE_RTC=y
-CONFIG_SMP=y
-CONFIG_NR_CPUS=32
-CONFIG_SCHED_SMT=y
-# CONFIG_PREEMPT is not set
-CONFIG_X86_LOCAL_APIC=y
-CONFIG_X86_IO_APIC=y
-CONFIG_X86_TSC=y
-CONFIG_X86_MCE=y
-# CONFIG_X86_MCE_NONFATAL is not set
-CONFIG_X86_MCE_P4THERMAL=y
-CONFIG_TOSHIBA=m
-CONFIG_I8K=m
-CONFIG_MICROCODE=m
-CONFIG_X86_MSR=m
-CONFIG_X86_CPUID=m
-
-#
-# Firmware Drivers
-#
-CONFIG_EDD=m
-# CONFIG_NOHIGHMEM is not set
-# CONFIG_HIGHMEM4G is not set
-CONFIG_HIGHMEM64G=y
-CONFIG_HIGHMEM=y
-CONFIG_X86_PAE=y
-# CONFIG_NUMA is not set
-CONFIG_HIGHPTE=y
-# CONFIG_MATH_EMULATION is not set
-CONFIG_MTRR=y
-# CONFIG_EFI is not set
-# CONFIG_IRQBALANCE is not set
-CONFIG_HAVE_DEC_LOCK=y
-CONFIG_REGPARM=y
-
-#
-# Power management options (ACPI, APM)
-#
-CONFIG_PM=y
-# CONFIG_SOFTWARE_SUSPEND is not set
-# CONFIG_PM_DISK is not set
-
-#
-# ACPI (Advanced Configuration and Power Interface) Support
-#
-CONFIG_ACPI=y
-CONFIG_ACPI_BOOT=y
-CONFIG_ACPI_INTERPRETER=y
-CONFIG_ACPI_SLEEP=y
-CONFIG_ACPI_SLEEP_PROC_FS=y
-CONFIG_ACPI_AC=m
-CONFIG_ACPI_BATTERY=m
-CONFIG_ACPI_BUTTON=m
-CONFIG_ACPI_FAN=y
-CONFIG_ACPI_PROCESSOR=y
-CONFIG_ACPI_THERMAL=y
-CONFIG_ACPI_ASUS=m
-CONFIG_ACPI_TOSHIBA=m
-# CONFIG_ACPI_DEBUG is not set
-CONFIG_ACPI_BUS=y
-CONFIG_ACPI_EC=y
-CONFIG_ACPI_POWER=y
-CONFIG_ACPI_PCI=y
-CONFIG_ACPI_SYSTEM=y
-CONFIG_X86_PM_TIMER=y
-
-#
-# APM (Advanced Power Management) BIOS Support
-#
-CONFIG_APM=y
-# CONFIG_APM_IGNORE_USER_SUSPEND is not set
-# CONFIG_APM_DO_ENABLE is not set
-CONFIG_APM_CPU_IDLE=y
-# CONFIG_APM_DISPLAY_BLANK is not set
-CONFIG_APM_RTC_IS_GMT=y
-# CONFIG_APM_ALLOW_INTS is not set
-# CONFIG_APM_REAL_MODE_POWER_OFF is not set
-
-#
-# CPU Frequency scaling
-#
-CONFIG_CPU_FREQ=y
-# CONFIG_CPU_FREQ_PROC_INTF is not set
-# CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set
-CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE=y
-CONFIG_CPU_FREQ_GOV_PERFORMANCE=y
-CONFIG_CPU_FREQ_GOV_POWERSAVE=m
-CONFIG_CPU_FREQ_GOV_USERSPACE=y
-# CONFIG_CPU_FREQ_24_API is not set
-CONFIG_CPU_FREQ_TABLE=y
-
-#
-# CPUFreq processor drivers
-#
-CONFIG_X86_ACPI_CPUFREQ=m
-# CONFIG_X86_ACPI_CPUFREQ_PROC_INTF is not set
-CONFIG_X86_POWERNOW_K6=m
-CONFIG_X86_POWERNOW_K7=y
-CONFIG_X86_POWERNOW_K8=m
-# CONFIG_X86_GX_SUSPMOD is not set
-CONFIG_X86_SPEEDSTEP_CENTRINO=y
-CONFIG_X86_SPEEDSTEP_CENTRINO_TABLE=y
-CONFIG_X86_SPEEDSTEP_CENTRINO_ACPI=y
-CONFIG_X86_SPEEDSTEP_ICH=y
-CONFIG_X86_SPEEDSTEP_SMI=m
-CONFIG_X86_P4_CLOCKMOD=m
-CONFIG_X86_SPEEDSTEP_LIB=y
-# CONFIG_X86_SPEEDSTEP_RELAXED_CAP_CHECK is not set
-CONFIG_X86_LONGRUN=y
-# CONFIG_X86_LONGHAUL is not set
-
-#
-# Bus options (PCI, PCMCIA, EISA, MCA, ISA)
-#
-CONFIG_PCI=y
-# CONFIG_PCI_GOBIOS is not set
-# CONFIG_PCI_GOMMCONFIG is not set
-# CONFIG_PCI_GODIRECT is not set
-CONFIG_PCI_GOANY=y
-CONFIG_PCI_BIOS=y
-CONFIG_PCI_DIRECT=y
-CONFIG_PCI_MMCONFIG=y
-CONFIG_PCI_USE_VECTOR=y
-CONFIG_PCI_LEGACY_PROC=y
-# CONFIG_PCI_NAMES is not set
-CONFIG_ISA=y
-# CONFIG_EISA is not set
-# CONFIG_MCA is not set
-# CONFIG_SCx200 is not set
-
-#
-# PCMCIA/CardBus support
-#
-CONFIG_PCMCIA=m
-# CONFIG_PCMCIA_DEBUG is not set
-CONFIG_YENTA=m
-CONFIG_CARDBUS=y
-CONFIG_I82092=m
-CONFIG_I82365=m
-CONFIG_TCIC=m
-CONFIG_PCMCIA_PROBE=y
-
-#
-# PCI Hotplug Support
-#
-CONFIG_HOTPLUG_PCI=y
-# CONFIG_HOTPLUG_PCI_FAKE is not set
-CONFIG_HOTPLUG_PCI_COMPAQ=m
-# CONFIG_HOTPLUG_PCI_COMPAQ_NVRAM is not set
-CONFIG_HOTPLUG_PCI_IBM=m
-# CONFIG_HOTPLUG_PCI_ACPI is not set
-# CONFIG_HOTPLUG_PCI_CPCI is not set
-CONFIG_HOTPLUG_PCI_PCIE=m
-CONFIG_HOTPLUG_PCI_PCIE_POLL_EVENT_MODE=y
-CONFIG_HOTPLUG_PCI_SHPC=m
-CONFIG_HOTPLUG_PCI_SHPC_POLL_EVENT_MODE=y
-
-#
-# Executable file formats
-#
-CONFIG_BINFMT_ELF=y
-# CONFIG_BINFMT_AOUT is not set
-CONFIG_BINFMT_MISC=m
-
-#
-# Device Drivers
-#
-
-#
-# Generic Driver Options
-#
-CONFIG_FW_LOADER=y
-# CONFIG_DEBUG_DRIVER is not set
-
-#
-# Memory Technology Devices (MTD)
-#
-CONFIG_MTD=m
-# CONFIG_MTD_DEBUG is not set
-CONFIG_MTD_PARTITIONS=m
-CONFIG_MTD_CONCAT=m
-CONFIG_MTD_REDBOOT_PARTS=m
-CONFIG_MTD_CMDLINE_PARTS=m
-
-#
-# User Modules And Translation Layers
-#
-CONFIG_MTD_CHAR=m
-CONFIG_MTD_BLOCK=m
-CONFIG_MTD_BLOCK_RO=m
-CONFIG_FTL=m
-CONFIG_NFTL=m
-CONFIG_NFTL_RW=y
-CONFIG_INFTL=m
-
-#
-# RAM/ROM/Flash chip drivers
-#
-CONFIG_MTD_CFI=m
-CONFIG_MTD_JEDECPROBE=m
-CONFIG_MTD_GEN_PROBE=m
-# CONFIG_MTD_CFI_ADV_OPTIONS is not set
-CONFIG_MTD_CFI_INTELEXT=m
-CONFIG_MTD_CFI_AMDSTD=m
-CONFIG_MTD_CFI_STAA=m
-CONFIG_MTD_RAM=m
-CONFIG_MTD_ROM=m
-CONFIG_MTD_ABSENT=m
-# CONFIG_MTD_OBSOLETE_CHIPS is not set
-
-#
-# Mapping drivers for chip access
-#
-CONFIG_MTD_COMPLEX_MAPPINGS=y
-# CONFIG_MTD_PHYSMAP is not set
-# CONFIG_MTD_PNC2000 is not set
-CONFIG_MTD_SC520CDP=m
-CONFIG_MTD_NETSC520=m
-CONFIG_MTD_SBC_GXX=m
-CONFIG_MTD_ELAN_104NC=m
-CONFIG_MTD_SCx200_DOCFLASH=m
-CONFIG_MTD_AMD76XROM=m
-CONFIG_MTD_ICH2ROM=m
-CONFIG_MTD_SCB2_FLASH=m
-# CONFIG_MTD_NETtel is not set
-# CONFIG_MTD_DILNETPC is not set
-CONFIG_MTD_L440GX=m
-CONFIG_MTD_PCI=m
-
-#
-# Self-contained MTD device drivers
-#
-CONFIG_MTD_PMC551=m
-# CONFIG_MTD_PMC551_BUGFIX is not set
-# CONFIG_MTD_PMC551_DEBUG is not set
-# CONFIG_MTD_SLRAM is not set
-CONFIG_MTD_MTDRAM=m
-CONFIG_MTDRAM_TOTAL_SIZE=4096
-CONFIG_MTDRAM_ERASE_SIZE=128
-# CONFIG_MTD_BLKMTD is not set
-
-#
-# Disk-On-Chip Device Drivers
-#
-CONFIG_MTD_DOC2000=m
-# CONFIG_MTD_DOC2001 is not set
-CONFIG_MTD_DOC2001PLUS=m
-CONFIG_MTD_DOCPROBE=m
-# CONFIG_MTD_DOCPROBE_ADVANCED is not set
-CONFIG_MTD_DOCPROBE_ADDRESS=0
-
-#
-# NAND Flash Device Drivers
-#
-CONFIG_MTD_NAND=m
-# CONFIG_MTD_NAND_VERIFY_WRITE is not set
-CONFIG_MTD_NAND_IDS=m
-
-#
-# Parallel port support
-#
-CONFIG_PARPORT=m
-CONFIG_PARPORT_PC=m
-CONFIG_PARPORT_PC_CML1=m
-CONFIG_PARPORT_SERIAL=m
-# CONFIG_PARPORT_PC_FIFO is not set
-# CONFIG_PARPORT_PC_SUPERIO is not set
-CONFIG_PARPORT_PC_PCMCIA=m
-# CONFIG_PARPORT_OTHER is not set
-CONFIG_PARPORT_1284=y
-
-#
-# Plug and Play support
-#
-CONFIG_PNP=y
-# CONFIG_PNP_DEBUG is not set
-
-#
-# Protocols
-#
-CONFIG_ISAPNP=y
-# CONFIG_PNPBIOS is not set
-
-#
-# Block devices
-#
-CONFIG_BLK_DEV_FD=m
-# CONFIG_BLK_DEV_XD is not set
-# CONFIG_PARIDE is not set
-CONFIG_BLK_CPQ_DA=m
-CONFIG_BLK_CPQ_CISS_DA=m
-CONFIG_CISS_SCSI_TAPE=y
-CONFIG_BLK_DEV_DAC960=m
-CONFIG_BLK_DEV_UMEM=m
-CONFIG_BLK_DEV_LOOP=m
-CONFIG_BLK_DEV_CRYPTOLOOP=m
-CONFIG_BLK_DEV_NBD=m
-CONFIG_BLK_DEV_CARMEL=m
-CONFIG_BLK_DEV_RAM=y
-CONFIG_BLK_DEV_RAM_SIZE=16384
-CONFIG_BLK_DEV_INITRD=y
-CONFIG_LBD=y
-
-#
-# ATA/ATAPI/MFM/RLL support
-#
-CONFIG_IDE=y
-CONFIG_BLK_DEV_IDE=y
-
-#
-# Please see Documentation/ide.txt for help/info on IDE drives
-#
-# CONFIG_BLK_DEV_HD_IDE is not set
-CONFIG_BLK_DEV_IDEDISK=y
-CONFIG_IDEDISK_MULTI_MODE=y
-# CONFIG_IDEDISK_STROKE is not set
-CONFIG_BLK_DEV_IDECS=m
-CONFIG_BLK_DEV_IDECD=y
-CONFIG_BLK_DEV_IDETAPE=m
-CONFIG_BLK_DEV_IDEFLOPPY=y
-# CONFIG_BLK_DEV_IDESCSI is not set
-# CONFIG_IDE_TASK_IOCTL is not set
-# CONFIG_IDE_TASKFILE_IO is not set
-
-#
-# IDE chipset support/bugfixes
-#
-CONFIG_IDE_GENERIC=y
-# CONFIG_BLK_DEV_CMD640 is not set
-CONFIG_BLK_DEV_IDEPNP=y
-CONFIG_BLK_DEV_IDEPCI=y
-CONFIG_IDEPCI_SHARE_IRQ=y
-# CONFIG_BLK_DEV_OFFBOARD is not set
-CONFIG_BLK_DEV_GENERIC=y
-# CONFIG_BLK_DEV_OPTI621 is not set
-CONFIG_BLK_DEV_RZ1000=y
-CONFIG_BLK_DEV_IDEDMA_PCI=y
-# CONFIG_BLK_DEV_IDEDMA_FORCED is not set
-CONFIG_IDEDMA_PCI_AUTO=y
-# CONFIG_IDEDMA_ONLYDISK is not set
-CONFIG_BLK_DEV_ADMA=y
-CONFIG_BLK_DEV_AEC62XX=y
-CONFIG_BLK_DEV_ALI15X3=y
-# CONFIG_WDC_ALI15X3 is not set
-CONFIG_BLK_DEV_AMD74XX=y
-CONFIG_BLK_DEV_ATIIXP=y
-CONFIG_BLK_DEV_CMD64X=y
-CONFIG_BLK_DEV_TRIFLEX=y
-CONFIG_BLK_DEV_CY82C693=y
-CONFIG_BLK_DEV_CS5520=y
-CONFIG_BLK_DEV_CS5530=y
-CONFIG_BLK_DEV_HPT34X=y
-# CONFIG_HPT34X_AUTODMA is not set
-CONFIG_BLK_DEV_HPT366=y
-# CONFIG_BLK_DEV_SC1200 is not set
-CONFIG_BLK_DEV_PIIX=y
-# CONFIG_BLK_DEV_NS87415 is not set
-CONFIG_BLK_DEV_PDC202XX_OLD=y
-# CONFIG_PDC202XX_BURST is not set
-CONFIG_BLK_DEV_PDC202XX_NEW=y
-CONFIG_PDC202XX_FORCE=y
-CONFIG_BLK_DEV_SVWKS=y
-CONFIG_BLK_DEV_SIIMAGE=y
-CONFIG_BLK_DEV_SIS5513=y
-CONFIG_BLK_DEV_SLC90E66=y
-# CONFIG_BLK_DEV_TRM290 is not set
-CONFIG_BLK_DEV_VIA82CXXX=y
-# CONFIG_IDE_ARM is not set
-# CONFIG_IDE_CHIPSETS is not set
-CONFIG_BLK_DEV_IDEDMA=y
-# CONFIG_IDEDMA_IVB is not set
-CONFIG_IDEDMA_AUTO=y
-# CONFIG_BLK_DEV_HD is not set
-
-#
-# SCSI device support
-#
-CONFIG_SCSI=m
-CONFIG_SCSI_PROC_FS=y
-
-#
-# SCSI support type (disk, tape, CD-ROM)
-#
-CONFIG_BLK_DEV_SD=m
-CONFIG_CHR_DEV_ST=m
-CONFIG_CHR_DEV_OSST=m
-CONFIG_BLK_DEV_SR=m
-CONFIG_BLK_DEV_SR_VENDOR=y
-CONFIG_CHR_DEV_SG=m
-
-#
-# Some SCSI devices (e.g. CD jukebox) support multiple LUNs
-#
-# CONFIG_SCSI_MULTI_LUN is not set
-CONFIG_SCSI_CONSTANTS=y
-CONFIG_SCSI_LOGGING=y
-
-#
-# SCSI Transport Attributes
-#
-CONFIG_SCSI_SPI_ATTRS=m
-CONFIG_SCSI_FC_ATTRS=m
-
-#
-# SCSI low-level drivers
-#
-CONFIG_BLK_DEV_3W_XXXX_RAID=m
-# CONFIG_SCSI_7000FASST is not set
-CONFIG_SCSI_ACARD=m
-CONFIG_SCSI_AHA152X=m
-CONFIG_SCSI_AHA1542=m
-CONFIG_SCSI_AACRAID=m
-CONFIG_SCSI_AIC7XXX=m
-CONFIG_AIC7XXX_CMDS_PER_DEVICE=4
-CONFIG_AIC7XXX_RESET_DELAY_MS=15000
-# CONFIG_AIC7XXX_BUILD_FIRMWARE is not set
-# CONFIG_AIC7XXX_DEBUG_ENABLE is not set
-CONFIG_AIC7XXX_DEBUG_MASK=0
-# CONFIG_AIC7XXX_REG_PRETTY_PRINT is not set
-CONFIG_SCSI_AIC7XXX_OLD=m
-CONFIG_SCSI_AIC79XX=m
-CONFIG_AIC79XX_CMDS_PER_DEVICE=4
-CONFIG_AIC79XX_RESET_DELAY_MS=15000
-# CONFIG_AIC79XX_BUILD_FIRMWARE is not set
-# CONFIG_AIC79XX_ENABLE_RD_STRM is not set
-# CONFIG_AIC79XX_DEBUG_ENABLE is not set
-CONFIG_AIC79XX_DEBUG_MASK=0
-# CONFIG_AIC79XX_REG_PRETTY_PRINT is not set
-# CONFIG_SCSI_DPT_I2O is not set
-CONFIG_SCSI_ADVANSYS=m
-CONFIG_SCSI_IN2000=m
-CONFIG_SCSI_MEGARAID=m
-CONFIG_SCSI_SATA=y
-CONFIG_SCSI_SATA_SVW=m
-CONFIG_SCSI_ATA_PIIX=m
-CONFIG_SCSI_SATA_PROMISE=m
-CONFIG_SCSI_SATA_SX4=m
-CONFIG_SCSI_SATA_SIL=m
-CONFIG_SCSI_SATA_SIS=m
-CONFIG_SCSI_SATA_VIA=m
-CONFIG_SCSI_SATA_VITESSE=m
-CONFIG_SCSI_BUSLOGIC=m
-# CONFIG_SCSI_OMIT_FLASHPOINT is not set
-# CONFIG_SCSI_CPQFCTS is not set
-# CONFIG_SCSI_DMX3191D is not set
-# CONFIG_SCSI_DTC3280 is not set
-# CONFIG_SCSI_EATA is not set
-# CONFIG_SCSI_EATA_PIO is not set
-CONFIG_SCSI_FUTURE_DOMAIN=m
-CONFIG_SCSI_GDTH=m
-# CONFIG_SCSI_GENERIC_NCR5380 is not set
-# CONFIG_SCSI_GENERIC_NCR5380_MMIO is not set
-CONFIG_SCSI_IPS=m
-CONFIG_SCSI_INIA100=m
-CONFIG_SCSI_PPA=m
-CONFIG_SCSI_IMM=m
-# CONFIG_SCSI_IZIP_EPP16 is not set
-# CONFIG_SCSI_IZIP_SLOW_CTR is not set
-# CONFIG_SCSI_NCR53C406A is not set
-CONFIG_SCSI_SYM53C8XX_2=m
-CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=1
-CONFIG_SCSI_SYM53C8XX_DEFAULT_TAGS=16
-CONFIG_SCSI_SYM53C8XX_MAX_TAGS=64
-# CONFIG_SCSI_SYM53C8XX_IOMAPPED is not set
-# CONFIG_SCSI_IPR is not set
-# CONFIG_SCSI_PAS16 is not set
-# CONFIG_SCSI_PSI240I is not set
-CONFIG_SCSI_QLOGIC_FAS=m
-CONFIG_SCSI_QLOGIC_ISP=m
-# CONFIG_SCSI_QLOGIC_FC is not set
-CONFIG_SCSI_QLOGIC_1280=m
-CONFIG_SCSI_QLA2XXX=m
-CONFIG_SCSI_QLA21XX=m
-CONFIG_SCSI_QLA22XX=m
-CONFIG_SCSI_QLA2300=m
-CONFIG_SCSI_QLA2322=m
-CONFIG_SCSI_QLA6312=m
-CONFIG_SCSI_QLA6322=m
-# CONFIG_SCSI_SYM53C416 is not set
-# CONFIG_SCSI_DC395x is not set
-CONFIG_SCSI_DC390T=m
-# CONFIG_SCSI_T128 is not set
-# CONFIG_SCSI_U14_34F is not set
-# CONFIG_SCSI_ULTRASTOR is not set
-# CONFIG_SCSI_NSP32 is not set
-# CONFIG_SCSI_DEBUG is not set
-
-#
-# PCMCIA SCSI adapter support
-#
-CONFIG_PCMCIA_AHA152X=m
-CONFIG_PCMCIA_FDOMAIN=m
-CONFIG_PCMCIA_NINJA_SCSI=m
-CONFIG_PCMCIA_QLOGIC=m
-CONFIG_PCMCIA_SYM53C500=m
-
-#
-# Old CD-ROM drivers (not SCSI, not IDE)
-#
-# CONFIG_CD_NO_IDESCSI is not set
-
-#
-# Multi-device support (RAID and LVM)
-#
-CONFIG_MD=y
-CONFIG_BLK_DEV_MD=y
-CONFIG_MD_LINEAR=m
-CONFIG_MD_RAID0=m
-CONFIG_MD_RAID1=m
-CONFIG_MD_RAID5=m
-CONFIG_MD_RAID6=m
-CONFIG_MD_MULTIPATH=m
-CONFIG_BLK_DEV_DM=m
-CONFIG_DM_CRYPT=m
-
-#
-# Fusion MPT device support
-#
-CONFIG_FUSION=m
-CONFIG_FUSION_MAX_SGE=40
-# CONFIG_FUSION_ISENSE is not set
-CONFIG_FUSION_CTL=m
-CONFIG_FUSION_LAN=m
-
-#
-# IEEE 1394 (FireWire) support
-#
-CONFIG_IEEE1394=m
-
-#
-# Subsystem Options
-#
-# CONFIG_IEEE1394_VERBOSEDEBUG is not set
-CONFIG_IEEE1394_OUI_DB=y
-# CONFIG_IEEE1394_EXTRA_CONFIG_ROMS is not set
-
-#
-# Device Drivers
-#
-# CONFIG_IEEE1394_PCILYNX is not set
-CONFIG_IEEE1394_OHCI1394=m
-
-#
-# Protocol Drivers
-#
-CONFIG_IEEE1394_VIDEO1394=m
-CONFIG_IEEE1394_SBP2=m
-# CONFIG_IEEE1394_SBP2_PHYS_DMA is not set
-# CONFIG_IEEE1394_ETH1394 is not set
-CONFIG_IEEE1394_DV1394=m
-CONFIG_IEEE1394_RAWIO=m
-CONFIG_IEEE1394_CMP=m
-CONFIG_IEEE1394_AMDTP=m
-
-#
-# I2O device support
-#
-CONFIG_I2O=m
-CONFIG_I2O_CONFIG=m
-CONFIG_I2O_BLOCK=m
-CONFIG_I2O_SCSI=m
-CONFIG_I2O_PROC=m
-
-#
-# Networking support
-#
-CONFIG_NET=y
-
-#
-# Networking options
-#
-CONFIG_PACKET=y
-CONFIG_PACKET_MMAP=y
-CONFIG_NETLINK_DEV=y
-CONFIG_UNIX=y
-CONFIG_NET_KEY=m
-CONFIG_INET=y
-CONFIG_IP_MULTICAST=y
-CONFIG_IP_ADVANCED_ROUTER=y
-CONFIG_IP_MULTIPLE_TABLES=y
-CONFIG_IP_ROUTE_FWMARK=y
-CONFIG_IP_ROUTE_NAT=y
-CONFIG_IP_ROUTE_MULTIPATH=y
-CONFIG_IP_ROUTE_TOS=y
-CONFIG_IP_ROUTE_VERBOSE=y
-# CONFIG_IP_PNP is not set
-CONFIG_NET_IPIP=m
-CONFIG_NET_IPGRE=m
-CONFIG_NET_IPGRE_BROADCAST=y
-CONFIG_IP_MROUTE=y
-CONFIG_IP_PIMSM_V1=y
-CONFIG_IP_PIMSM_V2=y
-# CONFIG_ARPD is not set
-CONFIG_SYN_COOKIES=y
-CONFIG_INET_AH=m
-CONFIG_INET_ESP=m
-CONFIG_INET_IPCOMP=m
-
-#
-# IP: Virtual Server Configuration
-#
-CONFIG_IP_VS=m
-# CONFIG_IP_VS_DEBUG is not set
-CONFIG_IP_VS_TAB_BITS=12
-
-#
-# IPVS transport protocol load balancing support
-#
-CONFIG_IP_VS_PROTO_TCP=y
-CONFIG_IP_VS_PROTO_UDP=y
-CONFIG_IP_VS_PROTO_ESP=y
-CONFIG_IP_VS_PROTO_AH=y
-
-#
-# IPVS scheduler
-#
-CONFIG_IP_VS_RR=m
-CONFIG_IP_VS_WRR=m
-CONFIG_IP_VS_LC=m
-CONFIG_IP_VS_WLC=m
-CONFIG_IP_VS_LBLC=m
-CONFIG_IP_VS_LBLCR=m
-CONFIG_IP_VS_DH=m
-CONFIG_IP_VS_SH=m
-CONFIG_IP_VS_SED=m
-CONFIG_IP_VS_NQ=m
-
-#
-# IPVS application helper
-#
-CONFIG_IP_VS_FTP=m
-CONFIG_IPV6=m
-CONFIG_IPV6_PRIVACY=y
-CONFIG_INET6_AH=m
-CONFIG_INET6_ESP=m
-CONFIG_INET6_IPCOMP=m
-CONFIG_IPV6_TUNNEL=m
-CONFIG_NETFILTER=y
-# CONFIG_NETFILTER_DEBUG is not set
-CONFIG_BRIDGE_NETFILTER=y
-
-#
-# IP: Netfilter Configuration
-#
-CONFIG_IP_NF_CONNTRACK=m
-CONFIG_IP_NF_FTP=m
-CONFIG_IP_NF_IRC=m
-CONFIG_IP_NF_TFTP=m
-CONFIG_IP_NF_AMANDA=m
-CONFIG_IP_NF_QUEUE=m
-CONFIG_IP_NF_IPTABLES=m
-CONFIG_IP_NF_MATCH_LIMIT=m
-CONFIG_IP_NF_MATCH_IPRANGE=m
-CONFIG_IP_NF_MATCH_MAC=m
-CONFIG_IP_NF_MATCH_PKTTYPE=m
-CONFIG_IP_NF_MATCH_MARK=m
-CONFIG_IP_NF_MATCH_MULTIPORT=m
-CONFIG_IP_NF_MATCH_TOS=m
-CONFIG_IP_NF_MATCH_RECENT=m
-CONFIG_IP_NF_MATCH_ECN=m
-CONFIG_IP_NF_MATCH_DSCP=m
-CONFIG_IP_NF_MATCH_AH_ESP=m
-CONFIG_IP_NF_MATCH_LENGTH=m
-CONFIG_IP_NF_MATCH_TTL=m
-CONFIG_IP_NF_MATCH_TCPMSS=m
-CONFIG_IP_NF_MATCH_HELPER=m
-CONFIG_IP_NF_MATCH_STATE=m
-CONFIG_IP_NF_MATCH_CONNTRACK=m
-CONFIG_IP_NF_MATCH_OWNER=m
-CONFIG_IP_NF_MATCH_PHYSDEV=m
-CONFIG_IP_NF_FILTER=m
-CONFIG_IP_NF_TARGET_REJECT=m
-CONFIG_IP_NF_NAT=m
-CONFIG_IP_NF_NAT_NEEDED=y
-CONFIG_IP_NF_TARGET_MASQUERADE=m
-CONFIG_IP_NF_TARGET_REDIRECT=m
-CONFIG_IP_NF_TARGET_NETMAP=m
-CONFIG_IP_NF_TARGET_SAME=m
-CONFIG_IP_NF_NAT_LOCAL=y
-CONFIG_IP_NF_NAT_SNMP_BASIC=m
-CONFIG_IP_NF_NAT_IRC=m
-CONFIG_IP_NF_NAT_FTP=m
-CONFIG_IP_NF_NAT_TFTP=m
-CONFIG_IP_NF_NAT_AMANDA=m
-CONFIG_IP_NF_MANGLE=m
-CONFIG_IP_NF_TARGET_TOS=m
-CONFIG_IP_NF_TARGET_ECN=m
-CONFIG_IP_NF_TARGET_DSCP=m
-CONFIG_IP_NF_TARGET_MARK=m
-CONFIG_IP_NF_TARGET_CLASSIFY=m
-CONFIG_IP_NF_TARGET_LOG=m
-CONFIG_IP_NF_TARGET_ULOG=m
-CONFIG_IP_NF_TARGET_TCPMSS=m
-CONFIG_IP_NF_ARPTABLES=m
-CONFIG_IP_NF_ARPFILTER=m
-CONFIG_IP_NF_ARP_MANGLE=m
-# CONFIG_IP_NF_COMPAT_IPCHAINS is not set
-# CONFIG_IP_NF_COMPAT_IPFWADM is not set
-CONFIG_IP_NF_TARGET_NOTRACK=m
-CONFIG_IP_NF_RAW=m
-
-#
-# IPv6: Netfilter Configuration
-#
-# CONFIG_IP6_NF_QUEUE is not set
-CONFIG_IP6_NF_IPTABLES=m
-CONFIG_IP6_NF_MATCH_LIMIT=m
-CONFIG_IP6_NF_MATCH_MAC=m
-CONFIG_IP6_NF_MATCH_RT=m
-CONFIG_IP6_NF_MATCH_OPTS=m
-CONFIG_IP6_NF_MATCH_FRAG=m
-CONFIG_IP6_NF_MATCH_HL=m
-CONFIG_IP6_NF_MATCH_MULTIPORT=m
-CONFIG_IP6_NF_MATCH_OWNER=m
-CONFIG_IP6_NF_MATCH_MARK=m
-CONFIG_IP6_NF_MATCH_IPV6HEADER=m
-CONFIG_IP6_NF_MATCH_AHESP=m
-CONFIG_IP6_NF_MATCH_LENGTH=m
-CONFIG_IP6_NF_MATCH_EUI64=m
-CONFIG_IP6_NF_FILTER=m
-CONFIG_IP6_NF_TARGET_LOG=m
-CONFIG_IP6_NF_MANGLE=m
-CONFIG_IP6_NF_TARGET_MARK=m
-CONFIG_IP6_NF_RAW=m
-
-#
-# Bridge: Netfilter Configuration
-#
-CONFIG_BRIDGE_NF_EBTABLES=m
-CONFIG_BRIDGE_EBT_BROUTE=m
-CONFIG_BRIDGE_EBT_T_FILTER=m
-CONFIG_BRIDGE_EBT_T_NAT=m
-CONFIG_BRIDGE_EBT_802_3=m
-CONFIG_BRIDGE_EBT_AMONG=m
-CONFIG_BRIDGE_EBT_ARP=m
-CONFIG_BRIDGE_EBT_IP=m
-CONFIG_BRIDGE_EBT_LIMIT=m
-CONFIG_BRIDGE_EBT_MARK=m
-CONFIG_BRIDGE_EBT_PKTTYPE=m
-CONFIG_BRIDGE_EBT_STP=m
-CONFIG_BRIDGE_EBT_VLAN=m
-CONFIG_BRIDGE_EBT_ARPREPLY=m
-CONFIG_BRIDGE_EBT_DNAT=m
-CONFIG_BRIDGE_EBT_MARK_T=m
-CONFIG_BRIDGE_EBT_REDIRECT=m
-CONFIG_BRIDGE_EBT_SNAT=m
-CONFIG_BRIDGE_EBT_LOG=m
-CONFIG_XFRM=y
-CONFIG_XFRM_USER=y
-
-#
-# SCTP Configuration (EXPERIMENTAL)
-#
-CONFIG_IP_SCTP=m
-# CONFIG_SCTP_DBG_MSG is not set
-# CONFIG_SCTP_DBG_OBJCNT is not set
-# CONFIG_SCTP_HMAC_NONE is not set
-# CONFIG_SCTP_HMAC_SHA1 is not set
-CONFIG_SCTP_HMAC_MD5=y
-# CONFIG_ATM is not set
-CONFIG_BRIDGE=m
-CONFIG_VLAN_8021Q=m
-# CONFIG_DECNET is not set
-CONFIG_LLC=m
-# CONFIG_LLC2 is not set
-CONFIG_IPX=m
-# CONFIG_IPX_INTERN is not set
-CONFIG_ATALK=m
-CONFIG_DEV_APPLETALK=y
-CONFIG_LTPC=m
-CONFIG_COPS=m
-CONFIG_COPS_DAYNA=y
-CONFIG_COPS_TANGENT=y
-CONFIG_IPDDP=m
-CONFIG_IPDDP_ENCAP=y
-CONFIG_IPDDP_DECAP=y
-# CONFIG_X25 is not set
-# CONFIG_LAPB is not set
-CONFIG_NET_DIVERT=y
-# CONFIG_ECONET is not set
-CONFIG_WAN_ROUTER=m
-# CONFIG_NET_FASTROUTE is not set
-# CONFIG_NET_HW_FLOWCONTROL is not set
-
-#
-# QoS and/or fair queueing
-#
-CONFIG_NET_SCHED=y
-CONFIG_NET_SCH_CBQ=m
-CONFIG_NET_SCH_HTB=m
-CONFIG_NET_SCH_HFSC=m
-CONFIG_NET_SCH_CSZ=m
-CONFIG_NET_SCH_PRIO=m
-CONFIG_NET_SCH_RED=m
-CONFIG_NET_SCH_SFQ=m
-CONFIG_NET_SCH_TEQL=m
-CONFIG_NET_SCH_TBF=m
-CONFIG_NET_SCH_GRED=m
-CONFIG_NET_SCH_DSMARK=m
-CONFIG_NET_SCH_DELAY=m
-CONFIG_NET_SCH_INGRESS=m
-CONFIG_NET_QOS=y
-CONFIG_NET_ESTIMATOR=y
-CONFIG_NET_CLS=y
-CONFIG_NET_CLS_TCINDEX=m
-CONFIG_NET_CLS_ROUTE4=m
-CONFIG_NET_CLS_ROUTE=y
-CONFIG_NET_CLS_FW=m
-CONFIG_NET_CLS_U32=m
-CONFIG_NET_CLS_RSVP=m
-CONFIG_NET_CLS_RSVP6=m
-CONFIG_NET_CLS_POLICE=y
-
-#
-# Network testing
-#
-# CONFIG_NET_PKTGEN is not set
-CONFIG_NETPOLL=y
-# CONFIG_NETPOLL_RX is not set
-# CONFIG_NETPOLL_TRAP is not set
-CONFIG_NET_POLL_CONTROLLER=y
-# CONFIG_HAMRADIO is not set
-CONFIG_IRDA=m
-
-#
-# IrDA protocols
-#
-CONFIG_IRLAN=m
-CONFIG_IRNET=m
-CONFIG_IRCOMM=m
-# CONFIG_IRDA_ULTRA is not set
-
-#
-# IrDA options
-#
-CONFIG_IRDA_CACHE_LAST_LSAP=y
-CONFIG_IRDA_FAST_RR=y
-# CONFIG_IRDA_DEBUG is not set
-
-#
-# Infrared-port device drivers
-#
-
-#
-# SIR device drivers
-#
-CONFIG_IRTTY_SIR=m
-
-#
-# Dongle support
-#
-CONFIG_DONGLE=y
-CONFIG_ESI_DONGLE=m
-CONFIG_ACTISYS_DONGLE=m
-CONFIG_TEKRAM_DONGLE=m
-CONFIG_LITELINK_DONGLE=m
-CONFIG_MA600_DONGLE=m
-CONFIG_GIRBIL_DONGLE=m
-CONFIG_MCP2120_DONGLE=m
-CONFIG_OLD_BELKIN_DONGLE=m
-CONFIG_ACT200L_DONGLE=m
-
-#
-# Old SIR device drivers
-#
-
-#
-# Old Serial dongle support
-#
-
-#
-# FIR device drivers
-#
-CONFIG_USB_IRDA=m
-CONFIG_SIGMATEL_FIR=m
-CONFIG_NSC_FIR=m
-# CONFIG_WINBOND_FIR is not set
-# CONFIG_TOSHIBA_FIR is not set
-# CONFIG_SMC_IRCC_FIR is not set
-# CONFIG_ALI_FIR is not set
-# CONFIG_VLSI_FIR is not set
-# CONFIG_VIA_FIR is not set
-CONFIG_BT=m
-CONFIG_BT_L2CAP=m
-CONFIG_BT_SCO=m
-CONFIG_BT_RFCOMM=m
-CONFIG_BT_RFCOMM_TTY=y
-CONFIG_BT_BNEP=m
-CONFIG_BT_BNEP_MC_FILTER=y
-CONFIG_BT_BNEP_PROTO_FILTER=y
-CONFIG_BT_CMTP=m
-
-#
-# Bluetooth device drivers
-#
-CONFIG_BT_HCIUSB=m
-CONFIG_BT_HCIUSB_SCO=y
-CONFIG_BT_HCIUART=m
-CONFIG_BT_HCIUART_H4=y
-CONFIG_BT_HCIUART_BCSP=y
-CONFIG_BT_HCIUART_BCSP_TXCRC=y
-CONFIG_BT_HCIBCM203X=m
-CONFIG_BT_HCIBFUSB=m
-CONFIG_BT_HCIDTL1=m
-CONFIG_BT_HCIBT3C=m
-CONFIG_BT_HCIBLUECARD=m
-CONFIG_BT_HCIBTUART=m
-CONFIG_BT_HCIVHCI=m
-CONFIG_TUX=m
-
-#
-# TUX options
-#
-CONFIG_TUX_EXTCGI=y
-# CONFIG_TUX_EXTENDED_LOG is not set
-# CONFIG_TUX_DEBUG is not set
-CONFIG_NETDEVICES=y
-CONFIG_DUMMY=m
-CONFIG_BONDING=m
-CONFIG_EQUALIZER=m
-CONFIG_TUN=m
-CONFIG_ETHERTAP=m
-CONFIG_NET_SB1000=m
-
-#
-# ARCnet devices
-#
-# CONFIG_ARCNET is not set
-
-#
-# Ethernet (10 or 100Mbit)
-#
-CONFIG_NET_ETHERNET=y
-CONFIG_MII=m
-CONFIG_HAPPYMEAL=m
-CONFIG_SUNGEM=m
-CONFIG_NET_VENDOR_3COM=y
-CONFIG_EL1=m
-CONFIG_EL2=m
-CONFIG_ELPLUS=m
-CONFIG_EL16=m
-CONFIG_EL3=m
-CONFIG_3C515=m
-CONFIG_VORTEX=m
-CONFIG_TYPHOON=m
-CONFIG_LANCE=m
-CONFIG_NET_VENDOR_SMC=y
-CONFIG_WD80x3=m
-CONFIG_ULTRA=m
-CONFIG_SMC9194=m
-CONFIG_NET_VENDOR_RACAL=y
-CONFIG_NI52=m
-CONFIG_NI65=m
-
-#
-# Tulip family network device support
-#
-CONFIG_NET_TULIP=y
-CONFIG_DE2104X=m
-CONFIG_TULIP=m
-# CONFIG_TULIP_MWI is not set
-CONFIG_TULIP_MMIO=y
-# CONFIG_TULIP_NAPI is not set
-CONFIG_DE4X5=m
-CONFIG_WINBOND_840=m
-CONFIG_DM9102=m
-CONFIG_PCMCIA_XIRCOM=m
-# CONFIG_AT1700 is not set
-CONFIG_DEPCA=m
-CONFIG_HP100=m
-# CONFIG_NET_ISA is not set
-CONFIG_NE2000=m
-CONFIG_NET_PCI=y
-CONFIG_PCNET32=m
-CONFIG_AMD8111_ETH=m
-CONFIG_AMD8111E_NAPI=y
-CONFIG_ADAPTEC_STARFIRE=m
-CONFIG_ADAPTEC_STARFIRE_NAPI=y
-CONFIG_AC3200=m
-CONFIG_APRICOT=m
-CONFIG_B44=m
-CONFIG_FORCEDETH=m
-CONFIG_CS89x0=m
-CONFIG_DGRS=m
-CONFIG_EEPRO100=m
-# CONFIG_EEPRO100_PIO is not set
-CONFIG_E100=m
-CONFIG_E100_NAPI=y
-CONFIG_FEALNX=m
-CONFIG_NATSEMI=m
-CONFIG_NE2K_PCI=m
-CONFIG_8139CP=m
-CONFIG_8139TOO=m
-CONFIG_8139TOO_PIO=y
-# CONFIG_8139TOO_TUNE_TWISTER is not set
-CONFIG_8139TOO_8129=y
-# CONFIG_8139_OLD_RX_RESET is not set
-CONFIG_SIS900=m
-CONFIG_EPIC100=m
-CONFIG_SUNDANCE=m
-# CONFIG_SUNDANCE_MMIO is not set
-CONFIG_TLAN=m
-CONFIG_VIA_RHINE=m
-CONFIG_VIA_RHINE_MMIO=y
-CONFIG_NET_POCKET=y
-CONFIG_ATP=m
-CONFIG_DE600=m
-CONFIG_DE620=m
-
-#
-# Ethernet (1000 Mbit)
-#
-CONFIG_ACENIC=m
-# CONFIG_ACENIC_OMIT_TIGON_I is not set
-CONFIG_DL2K=m
-CONFIG_E1000=m
-CONFIG_E1000_NAPI=y
-CONFIG_NS83820=m
-CONFIG_HAMACHI=m
-CONFIG_YELLOWFIN=m
-CONFIG_R8169=m
-CONFIG_SK98LIN=m
-CONFIG_TIGON3=m
-
-#
-# Ethernet (10000 Mbit)
-#
-CONFIG_IXGB=m
-CONFIG_IXGB_NAPI=y
-CONFIG_S2IO=m
-CONFIG_S2IO_NAPI=y
-
-#
-# Token Ring devices
-#
-# CONFIG_TR is not set
-
-#
-# Wireless LAN (non-hamradio)
-#
-CONFIG_NET_RADIO=y
-
-#
-# Obsolete Wireless cards support (pre-802.11)
-#
-# CONFIG_STRIP is not set
-# CONFIG_ARLAN is not set
-CONFIG_WAVELAN=m
-CONFIG_PCMCIA_WAVELAN=m
-CONFIG_PCMCIA_NETWAVE=m
-
-#
-# Wireless 802.11 Frequency Hopping cards support
-#
-# CONFIG_PCMCIA_RAYCS is not set
-
-#
-# Wireless 802.11b ISA/PCI cards support
-#
-CONFIG_AIRO=m
-CONFIG_HERMES=m
-CONFIG_PLX_HERMES=m
-CONFIG_TMD_HERMES=m
-CONFIG_PCI_HERMES=m
-CONFIG_ATMEL=m
-CONFIG_PCI_ATMEL=m
-
-#
-# Wireless 802.11b Pcmcia/Cardbus cards support
-#
-CONFIG_PCMCIA_HERMES=m
-CONFIG_AIRO_CS=m
-CONFIG_PCMCIA_ATMEL=m
-CONFIG_PCMCIA_WL3501=m
-
-#
-# Prism GT/Duette 802.11(a/b/g) PCI/Cardbus support
-#
-CONFIG_PRISM54=m
-CONFIG_NET_WIRELESS=y
-
-#
-# PCMCIA network device support
-#
-CONFIG_NET_PCMCIA=y
-CONFIG_PCMCIA_3C589=m
-CONFIG_PCMCIA_3C574=m
-CONFIG_PCMCIA_FMVJ18X=m
-CONFIG_PCMCIA_PCNET=m
-CONFIG_PCMCIA_NMCLAN=m
-CONFIG_PCMCIA_SMC91C92=m
-CONFIG_PCMCIA_XIRC2PS=m
-CONFIG_PCMCIA_AXNET=m
-
-#
-# Wan interfaces
-#
-# CONFIG_WAN is not set
-CONFIG_FDDI=y
-# CONFIG_DEFXX is not set
-CONFIG_SKFP=m
-# CONFIG_HIPPI is not set
-CONFIG_PLIP=m
-CONFIG_PPP=m
-CONFIG_PPP_MULTILINK=y
-CONFIG_PPP_FILTER=y
-CONFIG_PPP_ASYNC=m
-CONFIG_PPP_SYNC_TTY=m
-CONFIG_PPP_DEFLATE=m
-# CONFIG_PPP_BSDCOMP is not set
-CONFIG_PPPOE=m
-# CONFIG_SLIP is not set
-CONFIG_NET_FC=y
-# CONFIG_SHAPER is not set
-CONFIG_NETCONSOLE=m
-
-#
-# ISDN subsystem
-#
-CONFIG_ISDN=m
-
-#
-# Old ISDN4Linux
-#
-CONFIG_ISDN_I4L=m
-CONFIG_ISDN_PPP=y
-CONFIG_ISDN_PPP_VJ=y
-CONFIG_ISDN_MPP=y
-CONFIG_IPPP_FILTER=y
-# CONFIG_ISDN_PPP_BSDCOMP is not set
-CONFIG_ISDN_AUDIO=y
-CONFIG_ISDN_TTY_FAX=y
-
-#
-# ISDN feature submodules
-#
-
-#
-# ISDN4Linux hardware drivers
-#
-
-#
-# Passive cards
-#
-CONFIG_ISDN_DRV_HISAX=m
-
-#
-# D-channel protocol features
-#
-CONFIG_HISAX_EURO=y
-CONFIG_DE_AOC=y
-CONFIG_HISAX_NO_SENDCOMPLETE=y
-CONFIG_HISAX_NO_LLC=y
-CONFIG_HISAX_NO_KEYPAD=y
-CONFIG_HISAX_1TR6=y
-CONFIG_HISAX_NI1=y
-CONFIG_HISAX_MAX_CARDS=8
-
-#
-# HiSax supported cards
-#
-CONFIG_HISAX_16_0=y
-CONFIG_HISAX_16_3=y
-CONFIG_HISAX_TELESPCI=y
-CONFIG_HISAX_S0BOX=y
-CONFIG_HISAX_AVM_A1=y
-CONFIG_HISAX_FRITZPCI=y
-CONFIG_HISAX_AVM_A1_PCMCIA=y
-CONFIG_HISAX_ELSA=y
-CONFIG_HISAX_IX1MICROR2=y
-CONFIG_HISAX_DIEHLDIVA=y
-CONFIG_HISAX_ASUSCOM=y
-CONFIG_HISAX_TELEINT=y
-CONFIG_HISAX_HFCS=y
-CONFIG_HISAX_SEDLBAUER=y
-CONFIG_HISAX_SPORTSTER=y
-CONFIG_HISAX_MIC=y
-CONFIG_HISAX_NETJET=y
-CONFIG_HISAX_NETJET_U=y
-CONFIG_HISAX_NICCY=y
-CONFIG_HISAX_ISURF=y
-CONFIG_HISAX_HSTSAPHIR=y
-CONFIG_HISAX_BKM_A4T=y
-CONFIG_HISAX_SCT_QUADRO=y
-CONFIG_HISAX_GAZEL=y
-CONFIG_HISAX_HFC_PCI=y
-CONFIG_HISAX_W6692=y
-CONFIG_HISAX_HFC_SX=y
-CONFIG_HISAX_ENTERNOW_PCI=y
-# CONFIG_HISAX_DEBUG is not set
-
-#
-# HiSax PCMCIA card service modules
-#
-CONFIG_HISAX_SEDLBAUER_CS=m
-CONFIG_HISAX_ELSA_CS=m
-CONFIG_HISAX_AVM_A1_CS=m
-CONFIG_HISAX_TELES_CS=m
-
-#
-# HiSax sub driver modules
-#
-CONFIG_HISAX_ST5481=m
-CONFIG_HISAX_HFCUSB=m
-CONFIG_HISAX_FRITZ_PCIPNP=m
-CONFIG_HISAX_HDLC=y
-
-#
-# Active cards
-#
-CONFIG_ISDN_DRV_ICN=m
-CONFIG_ISDN_DRV_PCBIT=m
-CONFIG_ISDN_DRV_SC=m
-CONFIG_ISDN_DRV_ACT2000=m
-CONFIG_ISDN_DRV_TPAM=m
-
-#
-# CAPI subsystem
-#
-CONFIG_ISDN_CAPI=m
-CONFIG_ISDN_DRV_AVMB1_VERBOSE_REASON=y
-CONFIG_ISDN_CAPI_MIDDLEWARE=y
-CONFIG_ISDN_CAPI_CAPI20=m
-CONFIG_ISDN_CAPI_CAPIFS_BOOL=y
-CONFIG_ISDN_CAPI_CAPIFS=m
-CONFIG_ISDN_CAPI_CAPIDRV=m
-
-#
-# CAPI hardware drivers
-#
-
-#
-# Active AVM cards
-#
-CONFIG_CAPI_AVM=y
-
-#
-# Active Eicon DIVA Server cards
-#
-CONFIG_CAPI_EICON=y
-CONFIG_ISDN_DIVAS=m
-CONFIG_ISDN_DIVAS_BRIPCI=y
-CONFIG_ISDN_DIVAS_PRIPCI=y
-CONFIG_ISDN_DIVAS_DIVACAPI=m
-CONFIG_ISDN_DIVAS_USERIDI=m
-CONFIG_ISDN_DIVAS_MAINT=m
-
-#
-# Telephony Support
-#
-# CONFIG_PHONE is not set
-
-#
-# Input device support
-#
-CONFIG_INPUT=y
-
-#
-# Userland interfaces
-#
-CONFIG_INPUT_MOUSEDEV=y
-# CONFIG_INPUT_MOUSEDEV_PSAUX is not set
-CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
-CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
-CONFIG_INPUT_JOYDEV=m
-# CONFIG_INPUT_TSDEV is not set
-CONFIG_INPUT_EVDEV=y
-# CONFIG_INPUT_EVBUG is not set
-
-#
-# Input I/O drivers
-#
-CONFIG_GAMEPORT=m
-CONFIG_SOUND_GAMEPORT=m
-CONFIG_GAMEPORT_NS558=m
-CONFIG_GAMEPORT_L4=m
-CONFIG_GAMEPORT_EMU10K1=m
-CONFIG_GAMEPORT_VORTEX=m
-CONFIG_GAMEPORT_FM801=m
-CONFIG_GAMEPORT_CS461x=m
-CONFIG_SERIO=y
-CONFIG_SERIO_I8042=y
-CONFIG_SERIO_SERPORT=y
-# CONFIG_SERIO_CT82C710 is not set
-# CONFIG_SERIO_PARKBD is not set
-# CONFIG_SERIO_PCIPS2 is not set
-
-#
-# Input Device Drivers
-#
-CONFIG_INPUT_KEYBOARD=y
-CONFIG_KEYBOARD_ATKBD=y
-# CONFIG_KEYBOARD_SUNKBD is not set
-# CONFIG_KEYBOARD_LKKBD is not set
-# CONFIG_KEYBOARD_XTKBD is not set
-# CONFIG_KEYBOARD_NEWTON is not set
-CONFIG_INPUT_MOUSE=y
-CONFIG_MOUSE_PS2=y
-CONFIG_MOUSE_SERIAL=m
-CONFIG_MOUSE_INPORT=m
-CONFIG_MOUSE_ATIXL=y
-CONFIG_MOUSE_LOGIBM=m
-CONFIG_MOUSE_PC110PAD=m
-CONFIG_MOUSE_VSXXXAA=m
-CONFIG_INPUT_JOYSTICK=y
-CONFIG_JOYSTICK_ANALOG=m
-CONFIG_JOYSTICK_A3D=m
-CONFIG_JOYSTICK_ADI=m
-CONFIG_JOYSTICK_COBRA=m
-CONFIG_JOYSTICK_GF2K=m
-CONFIG_JOYSTICK_GRIP=m
-CONFIG_JOYSTICK_GRIP_MP=m
-CONFIG_JOYSTICK_GUILLEMOT=m
-CONFIG_JOYSTICK_INTERACT=m
-CONFIG_JOYSTICK_SIDEWINDER=m
-CONFIG_JOYSTICK_TMDC=m
-CONFIG_JOYSTICK_IFORCE=m
-CONFIG_JOYSTICK_IFORCE_USB=y
-CONFIG_JOYSTICK_IFORCE_232=y
-CONFIG_JOYSTICK_WARRIOR=m
-CONFIG_JOYSTICK_MAGELLAN=m
-CONFIG_JOYSTICK_SPACEORB=m
-CONFIG_JOYSTICK_SPACEBALL=m
-CONFIG_JOYSTICK_STINGER=m
-CONFIG_JOYSTICK_TWIDDLER=m
-CONFIG_JOYSTICK_DB9=m
-CONFIG_JOYSTICK_GAMECON=m
-CONFIG_JOYSTICK_TURBOGRAFX=m
-# CONFIG_INPUT_JOYDUMP is not set
-CONFIG_INPUT_TOUCHSCREEN=y
-CONFIG_TOUCHSCREEN_GUNZE=m
-CONFIG_INPUT_MISC=y
-CONFIG_INPUT_PCSPKR=m
-# CONFIG_INPUT_UINPUT is not set
-
-#
-# Character devices
-#
-CONFIG_VT=y
-CONFIG_VT_CONSOLE=y
-CONFIG_HW_CONSOLE=y
-CONFIG_SERIAL_NONSTANDARD=y
-CONFIG_ROCKETPORT=m
-# CONFIG_CYCLADES is not set
-CONFIG_SYNCLINK=m
-CONFIG_SYNCLINKMP=m
-CONFIG_N_HDLC=m
-CONFIG_STALDRV=y
-
-#
-# Serial drivers
-#
-CONFIG_SERIAL_8250=y
-CONFIG_SERIAL_8250_CONSOLE=y
-CONFIG_SERIAL_8250_CS=m
-# CONFIG_SERIAL_8250_ACPI is not set
-CONFIG_SERIAL_8250_NR_UARTS=4
-CONFIG_SERIAL_8250_EXTENDED=y
-# CONFIG_SERIAL_8250_MANY_PORTS is not set
-CONFIG_SERIAL_8250_SHARE_IRQ=y
-CONFIG_SERIAL_8250_DETECT_IRQ=y
-CONFIG_SERIAL_8250_MULTIPORT=y
-CONFIG_SERIAL_8250_RSA=y
-
-#
-# Non-8250 serial port support
-#
-CONFIG_SERIAL_CORE=y
-CONFIG_SERIAL_CORE_CONSOLE=y
-CONFIG_UNIX98_PTYS=y
-# CONFIG_LEGACY_PTYS is not set
-CONFIG_CRASH=m
-CONFIG_PRINTER=m
-CONFIG_LP_CONSOLE=y
-CONFIG_PPDEV=m
-CONFIG_TIPAR=m
-# CONFIG_QIC02_TAPE is not set
-
-#
-# IPMI
-#
-CONFIG_IPMI_HANDLER=m
-# CONFIG_IPMI_PANIC_EVENT is not set
-CONFIG_IPMI_DEVICE_INTERFACE=m
-CONFIG_IPMI_SI=m
-CONFIG_IPMI_WATCHDOG=m
-
-#
-# Watchdog Cards
-#
-CONFIG_WATCHDOG=y
-# CONFIG_WATCHDOG_NOWAYOUT is not set
-
-#
-# Watchdog Device Drivers
-#
-CONFIG_SOFT_WATCHDOG=m
-CONFIG_ACQUIRE_WDT=m
-CONFIG_ADVANTECH_WDT=m
-CONFIG_ALIM1535_WDT=m
-CONFIG_ALIM7101_WDT=m
-CONFIG_SC520_WDT=m
-CONFIG_EUROTECH_WDT=m
-CONFIG_IB700_WDT=m
-CONFIG_WAFER_WDT=m
-CONFIG_I8XX_TCO=m
-CONFIG_SC1200_WDT=m
-# CONFIG_SCx200_WDT is not set
-# CONFIG_60XX_WDT is not set
-CONFIG_CPU5_WDT=m
-CONFIG_W83627HF_WDT=m
-CONFIG_W83877F_WDT=m
-CONFIG_MACHZ_WDT=m
-
-#
-# ISA-based Watchdog Cards
-#
-CONFIG_PCWATCHDOG=m
-# CONFIG_MIXCOMWD is not set
-CONFIG_WDT=m
-# CONFIG_WDT_501 is not set
-
-#
-# PCI-based Watchdog Cards
-#
-CONFIG_PCIPCWATCHDOG=m
-CONFIG_WDTPCI=m
-CONFIG_WDT_501_PCI=y
-
-#
-# USB-based Watchdog Cards
-#
-CONFIG_USBPCWATCHDOG=m
-CONFIG_HW_RANDOM=m
-CONFIG_NVRAM=m
-CONFIG_RTC=y
-CONFIG_DTLK=m
-CONFIG_R3964=m
-# CONFIG_APPLICOM is not set
-CONFIG_SONYPI=m
-
-#
-# Ftape, the floppy tape device driver
-#
-CONFIG_AGP=y
-CONFIG_AGP_ALI=y
-CONFIG_AGP_ATI=y
-CONFIG_AGP_AMD=y
-CONFIG_AGP_AMD64=y
-CONFIG_AGP_INTEL=y
-CONFIG_AGP_INTEL_MCH=y
-CONFIG_AGP_NVIDIA=y
-CONFIG_AGP_SIS=y
-CONFIG_AGP_SWORKS=y
-CONFIG_AGP_VIA=y
-CONFIG_AGP_EFFICEON=y
-CONFIG_DRM=y
-CONFIG_DRM_TDFX=m
-CONFIG_DRM_GAMMA=m
-CONFIG_DRM_R128=m
-CONFIG_DRM_RADEON=m
-CONFIG_DRM_I810=m
-CONFIG_DRM_I830=m
-CONFIG_DRM_MGA=m
-CONFIG_DRM_SIS=m
-
-#
-# PCMCIA character devices
-#
-CONFIG_SYNCLINK_CS=m
-CONFIG_MWAVE=m
-# CONFIG_RAW_DRIVER is not set
-CONFIG_HANGCHECK_TIMER=m
-
-#
-# I2C support
-#
-CONFIG_I2C=m
-CONFIG_I2C_CHARDEV=m
-
-#
-# I2C Algorithms
-#
-CONFIG_I2C_ALGOBIT=m
-CONFIG_I2C_ALGOPCF=m
-
-#
-# I2C Hardware Bus support
-#
-CONFIG_I2C_ALI1535=m
-CONFIG_I2C_ALI1563=m
-CONFIG_I2C_ALI15X3=m
-CONFIG_I2C_AMD756=m
-CONFIG_I2C_AMD8111=m
-CONFIG_I2C_I801=m
-CONFIG_I2C_I810=m
-CONFIG_I2C_ISA=m
-CONFIG_I2C_NFORCE2=m
-# CONFIG_I2C_PARPORT is not set
-# CONFIG_I2C_PARPORT_LIGHT is not set
-CONFIG_I2C_PIIX4=m
-CONFIG_I2C_PROSAVAGE=m
-CONFIG_I2C_SAVAGE4=m
-# CONFIG_SCx200_ACB is not set
-CONFIG_I2C_SIS5595=m
-CONFIG_I2C_SIS630=m
-CONFIG_I2C_SIS96X=m
-CONFIG_I2C_VIA=m
-CONFIG_I2C_VIAPRO=m
-CONFIG_I2C_VOODOO3=m
-
-#
-# Hardware Sensors Chip support
-#
-CONFIG_I2C_SENSOR=m
-CONFIG_SENSORS_ADM1021=m
-CONFIG_SENSORS_ASB100=m
-CONFIG_SENSORS_DS1621=m
-CONFIG_SENSORS_FSCHER=m
-CONFIG_SENSORS_GL518SM=m
-CONFIG_SENSORS_IT87=m
-CONFIG_SENSORS_LM75=m
-CONFIG_SENSORS_LM78=m
-CONFIG_SENSORS_LM80=m
-CONFIG_SENSORS_LM83=m
-CONFIG_SENSORS_LM85=m
-CONFIG_SENSORS_LM90=m
-CONFIG_SENSORS_MAX1619=m
-CONFIG_SENSORS_VIA686A=m
-CONFIG_SENSORS_W83781D=m
-CONFIG_SENSORS_W83L785TS=m
-CONFIG_SENSORS_W83627HF=m
-
-#
-# Other I2C Chip support
-#
-CONFIG_SENSORS_EEPROM=m
-CONFIG_SENSORS_PCF8574=m
-CONFIG_SENSORS_PCF8591=m
-CONFIG_SENSORS_RTC8564=m
-# CONFIG_I2C_DEBUG_CORE is not set
-# CONFIG_I2C_DEBUG_ALGO is not set
-# CONFIG_I2C_DEBUG_BUS is not set
-# CONFIG_I2C_DEBUG_CHIP is not set
-
-#
-# Misc devices
-#
-CONFIG_IBM_ASM=m
-
-#
-# Multimedia devices
-#
-CONFIG_VIDEO_DEV=m
-
-#
-# Video For Linux
-#
-
-#
-# Video Adapters
-#
-CONFIG_VIDEO_BT848=m
-CONFIG_VIDEO_PMS=m
-CONFIG_VIDEO_BWQCAM=m
-CONFIG_VIDEO_CQCAM=m
-CONFIG_VIDEO_W9966=m
-CONFIG_VIDEO_CPIA=m
-CONFIG_VIDEO_CPIA_PP=m
-CONFIG_VIDEO_CPIA_USB=m
-CONFIG_VIDEO_SAA5246A=m
-CONFIG_VIDEO_SAA5249=m
-CONFIG_TUNER_3036=m
-CONFIG_VIDEO_STRADIS=m
-CONFIG_VIDEO_ZORAN=m
-CONFIG_VIDEO_ZORAN_BUZ=m
-CONFIG_VIDEO_ZORAN_DC10=m
-CONFIG_VIDEO_ZORAN_DC30=m
-CONFIG_VIDEO_ZORAN_LML33=m
-CONFIG_VIDEO_ZORAN_LML33R10=m
-CONFIG_VIDEO_SAA7134=m
-CONFIG_VIDEO_MXB=m
-CONFIG_VIDEO_DPC=m
-CONFIG_VIDEO_HEXIUM_ORION=m
-CONFIG_VIDEO_HEXIUM_GEMINI=m
-CONFIG_VIDEO_CX88=m
-
-#
-# Radio Adapters
-#
-CONFIG_RADIO_CADET=m
-CONFIG_RADIO_RTRACK=m
-CONFIG_RADIO_RTRACK2=m
-CONFIG_RADIO_AZTECH=m
-CONFIG_RADIO_GEMTEK=m
-CONFIG_RADIO_GEMTEK_PCI=m
-CONFIG_RADIO_MAXIRADIO=m
-CONFIG_RADIO_MAESTRO=m
-CONFIG_RADIO_SF16FMI=m
-CONFIG_RADIO_SF16FMR2=m
-CONFIG_RADIO_TERRATEC=m
-CONFIG_RADIO_TRUST=m
-CONFIG_RADIO_TYPHOON=m
-CONFIG_RADIO_TYPHOON_PROC_FS=y
-CONFIG_RADIO_ZOLTRIX=m
-
-#
-# Digital Video Broadcasting Devices
-#
-# CONFIG_DVB is not set
-CONFIG_VIDEO_SAA7146=m
-CONFIG_VIDEO_SAA7146_VV=m
-CONFIG_VIDEO_VIDEOBUF=m
-CONFIG_VIDEO_TUNER=m
-CONFIG_VIDEO_BUF=m
-CONFIG_VIDEO_BTCX=m
-CONFIG_VIDEO_IR=m
-
-#
-# Graphics support
-#
-CONFIG_FB=y
-# CONFIG_FB_PM2 is not set
-# CONFIG_FB_CYBER2000 is not set
-# CONFIG_FB_ASILIANT is not set
-# CONFIG_FB_IMSTT is not set
-CONFIG_FB_VGA16=m
-CONFIG_FB_VESA=y
-CONFIG_VIDEO_SELECT=y
-CONFIG_FB_HGA=m
-CONFIG_FB_HGA_ACCEL=y
-CONFIG_FB_RIVA=m
-CONFIG_FB_I810=m
-CONFIG_FB_I810_GTF=y
-CONFIG_FB_MATROX=m
-CONFIG_FB_MATROX_MILLENIUM=y
-CONFIG_FB_MATROX_MYSTIQUE=y
-CONFIG_FB_MATROX_G450=y
-CONFIG_FB_MATROX_G100=y
-CONFIG_FB_MATROX_I2C=m
-CONFIG_FB_MATROX_MAVEN=m
-CONFIG_FB_MATROX_MULTIHEAD=y
-# CONFIG_FB_RADEON_OLD is not set
-CONFIG_FB_RADEON=m
-CONFIG_FB_RADEON_I2C=y
-# CONFIG_FB_RADEON_DEBUG is not set
-CONFIG_FB_ATY128=m
-CONFIG_FB_ATY=m
-CONFIG_FB_ATY_CT=y
-CONFIG_FB_ATY_GX=y
-# CONFIG_FB_ATY_XL_INIT is not set
-# CONFIG_FB_SIS is not set
-CONFIG_FB_NEOMAGIC=m
-CONFIG_FB_KYRO=m
-CONFIG_FB_3DFX=m
-CONFIG_FB_3DFX_ACCEL=y
-CONFIG_FB_VOODOO1=m
-CONFIG_FB_TRIDENT=m
-CONFIG_FB_TRIDENT_ACCEL=y
-# CONFIG_FB_VIRTUAL is not set
-
-#
-# Console display driver support
-#
-CONFIG_VGA_CONSOLE=y
-CONFIG_MDA_CONSOLE=m
-CONFIG_DUMMY_CONSOLE=y
-CONFIG_FRAMEBUFFER_CONSOLE=y
-CONFIG_PCI_CONSOLE=y
-# CONFIG_FONTS is not set
-CONFIG_FONT_8x8=y
-CONFIG_FONT_8x16=y
-
-#
-# Logo configuration
-#
-CONFIG_LOGO=y
-# CONFIG_LOGO_LINUX_MONO is not set
-# CONFIG_LOGO_LINUX_VGA16 is not set
-CONFIG_LOGO_LINUX_CLUT224=y
-
-#
-# Sound
-#
-CONFIG_SOUND=m
-
-#
-# Advanced Linux Sound Architecture
-#
-CONFIG_SND=m
-CONFIG_SND_TIMER=m
-CONFIG_SND_PCM=m
-CONFIG_SND_HWDEP=m
-CONFIG_SND_RAWMIDI=m
-CONFIG_SND_SEQUENCER=m
-CONFIG_SND_SEQ_DUMMY=m
-CONFIG_SND_OSSEMUL=y
-CONFIG_SND_MIXER_OSS=m
-CONFIG_SND_PCM_OSS=m
-CONFIG_SND_SEQUENCER_OSS=y
-CONFIG_SND_RTCTIMER=m
-# CONFIG_SND_VERBOSE_PRINTK is not set
-# CONFIG_SND_DEBUG is not set
-
-#
-# Generic devices
-#
-CONFIG_SND_MPU401_UART=m
-CONFIG_SND_OPL3_LIB=m
-CONFIG_SND_OPL4_LIB=m
-CONFIG_SND_VX_LIB=m
-CONFIG_SND_DUMMY=m
-CONFIG_SND_VIRMIDI=m
-CONFIG_SND_MTPAV=m
-# CONFIG_SND_SERIAL_U16550 is not set
-CONFIG_SND_MPU401=m
-
-#
-# ISA devices
-#
-CONFIG_SND_AD1816A=m
-CONFIG_SND_AD1848=m
-CONFIG_SND_CS4231=m
-CONFIG_SND_CS4232=m
-CONFIG_SND_CS4236=m
-CONFIG_SND_ES968=m
-CONFIG_SND_ES1688=m
-CONFIG_SND_ES18XX=m
-CONFIG_SND_GUSCLASSIC=m
-CONFIG_SND_GUSEXTREME=m
-CONFIG_SND_GUSMAX=m
-CONFIG_SND_INTERWAVE=m
-CONFIG_SND_INTERWAVE_STB=m
-CONFIG_SND_OPTI92X_AD1848=m
-CONFIG_SND_OPTI92X_CS4231=m
-CONFIG_SND_OPTI93X=m
-CONFIG_SND_SB8=m
-CONFIG_SND_SB16=m
-CONFIG_SND_SBAWE=m
-CONFIG_SND_SB16_CSP=y
-# CONFIG_SND_WAVEFRONT is not set
-CONFIG_SND_ALS100=m
-CONFIG_SND_AZT2320=m
-CONFIG_SND_CMI8330=m
-CONFIG_SND_DT019X=m
-CONFIG_SND_OPL3SA2=m
-CONFIG_SND_SGALAXY=m
-CONFIG_SND_SSCAPE=m
-
-#
-# PCI devices
-#
-CONFIG_SND_AC97_CODEC=m
-CONFIG_SND_ALI5451=m
-CONFIG_SND_ATIIXP=m
-CONFIG_SND_AU8810=m
-CONFIG_SND_AU8820=m
-CONFIG_SND_AU8830=m
-CONFIG_SND_AZT3328=m
-CONFIG_SND_BT87X=m
-CONFIG_SND_CS46XX=m
-CONFIG_SND_CS46XX_NEW_DSP=y
-CONFIG_SND_CS4281=m
-CONFIG_SND_EMU10K1=m
-CONFIG_SND_KORG1212=m
-CONFIG_SND_MIXART=m
-CONFIG_SND_NM256=m
-CONFIG_SND_RME32=m
-CONFIG_SND_RME96=m
-CONFIG_SND_RME9652=m
-CONFIG_SND_HDSP=m
-CONFIG_SND_TRIDENT=m
-CONFIG_SND_YMFPCI=m
-CONFIG_SND_ALS4000=m
-CONFIG_SND_CMIPCI=m
-CONFIG_SND_ENS1370=m
-CONFIG_SND_ENS1371=m
-CONFIG_SND_ES1938=m
-CONFIG_SND_ES1968=m
-CONFIG_SND_MAESTRO3=m
-CONFIG_SND_FM801=m
-CONFIG_SND_FM801_TEA575X=m
-CONFIG_SND_ICE1712=m
-CONFIG_SND_ICE1724=m
-CONFIG_SND_INTEL8X0=m
-CONFIG_SND_INTEL8X0M=m
-CONFIG_SND_SONICVIBES=m
-CONFIG_SND_VIA82XX=m
-CONFIG_SND_VX222=m
-
-#
-# ALSA USB devices
-#
-CONFIG_SND_USB_AUDIO=m
-
-#
-# PCMCIA devices
-#
-# CONFIG_SND_VXPOCKET is not set
-# CONFIG_SND_VXP440 is not set
-CONFIG_SND_PDAUDIOCF=m
-
-#
-# Open Sound System
-#
-# CONFIG_SOUND_PRIME is not set
-
-#
-# USB support
-#
-CONFIG_USB=y
-# CONFIG_USB_DEBUG is not set
-
-#
-# Miscellaneous USB options
-#
-CONFIG_USB_DEVICEFS=y
-# CONFIG_USB_BANDWIDTH is not set
-# CONFIG_USB_DYNAMIC_MINORS is not set
-
-#
-# USB Host Controller Drivers
-#
-CONFIG_USB_EHCI_HCD=m
-CONFIG_USB_EHCI_SPLIT_ISO=y
-CONFIG_USB_EHCI_ROOT_HUB_TT=y
-CONFIG_USB_OHCI_HCD=m
-CONFIG_USB_UHCI_HCD=m
-
-#
-# USB Device Class drivers
-#
-CONFIG_USB_AUDIO=m
-
-#
-# USB Bluetooth TTY can only be used with disabled Bluetooth subsystem
-#
-CONFIG_USB_MIDI=m
-CONFIG_USB_ACM=m
-CONFIG_USB_PRINTER=m
-CONFIG_USB_STORAGE=m
-# CONFIG_USB_STORAGE_DEBUG is not set
-CONFIG_USB_STORAGE_DATAFAB=y
-CONFIG_USB_STORAGE_FREECOM=y
-CONFIG_USB_STORAGE_ISD200=y
-CONFIG_USB_STORAGE_DPCM=y
-CONFIG_USB_STORAGE_HP8200e=y
-CONFIG_USB_STORAGE_SDDR09=y
-CONFIG_USB_STORAGE_SDDR55=y
-CONFIG_USB_STORAGE_JUMPSHOT=y
-
-#
-# USB Human Interface Devices (HID)
-#
-CONFIG_USB_HID=y
-CONFIG_USB_HIDINPUT=y
-CONFIG_HID_FF=y
-CONFIG_HID_PID=y
-CONFIG_LOGITECH_FF=y
-CONFIG_THRUSTMASTER_FF=y
-CONFIG_USB_HIDDEV=y
-CONFIG_USB_AIPTEK=m
-CONFIG_USB_WACOM=m
-CONFIG_USB_KBTAB=m
-CONFIG_USB_POWERMATE=m
-CONFIG_USB_MTOUCH=m
-CONFIG_USB_EGALAX=m
-CONFIG_USB_XPAD=m
-CONFIG_USB_ATI_REMOTE=m
-
-#
-# USB Imaging devices
-#
-CONFIG_USB_MDC800=m
-CONFIG_USB_MICROTEK=m
-CONFIG_USB_HPUSBSCSI=m
-
-#
-# USB Multimedia devices
-#
-CONFIG_USB_DABUSB=m
-CONFIG_USB_VICAM=m
-CONFIG_USB_DSBR=m
-CONFIG_USB_IBMCAM=m
-CONFIG_USB_KONICAWC=m
-CONFIG_USB_OV511=m
-CONFIG_USB_SE401=m
-CONFIG_USB_STV680=m
-CONFIG_USB_W9968CF=m
-
-#
-# USB Network adaptors
-#
-CONFIG_USB_CATC=m
-CONFIG_USB_KAWETH=m
-CONFIG_USB_PEGASUS=m
-CONFIG_USB_RTL8150=m
-CONFIG_USB_USBNET=m
-
-#
-# USB Host-to-Host Cables
-#
-CONFIG_USB_ALI_M5632=y
-CONFIG_USB_AN2720=y
-CONFIG_USB_BELKIN=y
-CONFIG_USB_GENESYS=y
-CONFIG_USB_NET1080=y
-CONFIG_USB_PL2301=y
-
-#
-# Intelligent USB Devices/Gadgets
-#
-CONFIG_USB_ARMLINUX=y
-CONFIG_USB_EPSON2888=y
-CONFIG_USB_ZAURUS=y
-CONFIG_USB_CDCETHER=y
-
-#
-# USB Network Adapters
-#
-CONFIG_USB_AX8817X=y
-
-#
-# USB port drivers
-#
-CONFIG_USB_USS720=m
-
-#
-# USB Serial Converter support
-#
-CONFIG_USB_SERIAL=m
-CONFIG_USB_SERIAL_GENERIC=y
-CONFIG_USB_SERIAL_BELKIN=m
-CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m
-CONFIG_USB_SERIAL_EMPEG=m
-CONFIG_USB_SERIAL_FTDI_SIO=m
-CONFIG_USB_SERIAL_VISOR=m
-CONFIG_USB_SERIAL_IPAQ=m
-CONFIG_USB_SERIAL_IR=m
-CONFIG_USB_SERIAL_EDGEPORT=m
-CONFIG_USB_SERIAL_EDGEPORT_TI=m
-CONFIG_USB_SERIAL_KEYSPAN_PDA=m
-CONFIG_USB_SERIAL_KEYSPAN=m
-CONFIG_USB_SERIAL_KEYSPAN_MPR=y
-CONFIG_USB_SERIAL_KEYSPAN_USA28=y
-CONFIG_USB_SERIAL_KEYSPAN_USA28X=y
-CONFIG_USB_SERIAL_KEYSPAN_USA28XA=y
-CONFIG_USB_SERIAL_KEYSPAN_USA28XB=y
-CONFIG_USB_SERIAL_KEYSPAN_USA19=y
-CONFIG_USB_SERIAL_KEYSPAN_USA18X=y
-CONFIG_USB_SERIAL_KEYSPAN_USA19W=y
-CONFIG_USB_SERIAL_KEYSPAN_USA19QW=y
-CONFIG_USB_SERIAL_KEYSPAN_USA19QI=y
-CONFIG_USB_SERIAL_KEYSPAN_USA49W=y
-CONFIG_USB_SERIAL_KEYSPAN_USA49WLC=y
-CONFIG_USB_SERIAL_KLSI=m
-CONFIG_USB_SERIAL_KOBIL_SCT=m
-CONFIG_USB_SERIAL_MCT_U232=m
-CONFIG_USB_SERIAL_PL2303=m
-CONFIG_USB_SERIAL_SAFE=m
-CONFIG_USB_SERIAL_SAFE_PADDED=y
-CONFIG_USB_SERIAL_CYBERJACK=m
-CONFIG_USB_SERIAL_XIRCOM=m
-CONFIG_USB_SERIAL_OMNINET=m
-CONFIG_USB_EZUSB=y
-
-#
-# USB Miscellaneous drivers
-#
-CONFIG_USB_EMI62=m
-# CONFIG_USB_EMI26 is not set
-CONFIG_USB_TIGL=m
-CONFIG_USB_AUERSWALD=m
-CONFIG_USB_RIO500=m
-CONFIG_USB_LEGOTOWER=m
-CONFIG_USB_LCD=m
-CONFIG_USB_LED=m
-# CONFIG_USB_CYTHERM is not set
-CONFIG_USB_PHIDGETSERVO=m
-CONFIG_USB_TEST=m
-
-#
-# USB Gadget Support
-#
-# CONFIG_USB_GADGET is not set
-
-#
-# File systems
-#
-CONFIG_EXT2_FS=y
-CONFIG_EXT2_FS_XATTR=y
-CONFIG_EXT2_FS_POSIX_ACL=y
-CONFIG_EXT2_FS_SECURITY=y
-CONFIG_EXT3_FS=m
-CONFIG_EXT3_FS_XATTR=y
-CONFIG_EXT3_FS_POSIX_ACL=y
-CONFIG_EXT3_FS_SECURITY=y
-CONFIG_JBD=m
-# CONFIG_JBD_DEBUG is not set
-CONFIG_FS_MBCACHE=y
-CONFIG_REISERFS_FS=m
-# CONFIG_REISERFS_CHECK is not set
-CONFIG_REISERFS_PROC_INFO=y
-CONFIG_REISERFS_FS_XATTR=y
-CONFIG_REISERFS_FS_POSIX_ACL=y
-CONFIG_REISERFS_FS_SECURITY=y
-CONFIG_JFS_FS=m
-CONFIG_JFS_POSIX_ACL=y
-# CONFIG_JFS_DEBUG is not set
-# CONFIG_JFS_STATISTICS is not set
-CONFIG_FS_POSIX_ACL=y
-CONFIG_XFS_FS=m
-# CONFIG_XFS_RT is not set
-CONFIG_XFS_QUOTA=y
-CONFIG_XFS_SECURITY=y
-CONFIG_XFS_POSIX_ACL=y
-CONFIG_MINIX_FS=m
-CONFIG_ROMFS_FS=m
-CONFIG_QUOTA=y
-# CONFIG_QFMT_V1 is not set
-CONFIG_QFMT_V2=y
-CONFIG_QUOTACTL=y
-CONFIG_AUTOFS_FS=m
-CONFIG_AUTOFS4_FS=m
-
-#
-# CD-ROM/DVD Filesystems
-#
-CONFIG_ISO9660_FS=y
-CONFIG_JOLIET=y
-CONFIG_ZISOFS=y
-CONFIG_ZISOFS_FS=y
-CONFIG_UDF_FS=m
-
-#
-# DOS/FAT/NT Filesystems
-#
-CONFIG_FAT_FS=m
-CONFIG_MSDOS_FS=m
-CONFIG_VFAT_FS=m
-# CONFIG_NTFS_FS is not set
-
-#
-# Pseudo filesystems
-#
-CONFIG_PROC_FS=y
-CONFIG_PROC_KCORE=y
-CONFIG_SYSFS=y
-# CONFIG_DEVFS_FS is not set
-CONFIG_DEVPTS_FS_XATTR=y
-CONFIG_DEVPTS_FS_SECURITY=y
-CONFIG_TMPFS=y
-CONFIG_HUGETLBFS=y
-CONFIG_HUGETLB_PAGE=y
-CONFIG_RAMFS=y
-
-#
-# Miscellaneous filesystems
-#
-# CONFIG_ADFS_FS is not set
-CONFIG_AFFS_FS=m
-CONFIG_HFS_FS=m
-CONFIG_HFSPLUS_FS=m
-CONFIG_BEFS_FS=m
-# CONFIG_BEFS_DEBUG is not set
-CONFIG_BFS_FS=m
-CONFIG_EFS_FS=m
-# CONFIG_JFFS_FS is not set
-CONFIG_JFFS2_FS=m
-CONFIG_JFFS2_FS_DEBUG=0
-CONFIG_JFFS2_FS_NAND=y
-CONFIG_CRAMFS=m
-CONFIG_VXFS_FS=m
-# CONFIG_HPFS_FS is not set
-CONFIG_QNX4FS_FS=m
-# CONFIG_QNX4FS_RW is not set
-CONFIG_SYSV_FS=m
-CONFIG_UFS_FS=m
-# CONFIG_UFS_FS_WRITE is not set
-
-#
-# Network File Systems
-#
-CONFIG_NFS_FS=m
-CONFIG_NFS_V3=y
-CONFIG_NFS_V4=y
-CONFIG_NFS_DIRECTIO=y
-CONFIG_NFSD=m
-CONFIG_NFSD_V3=y
-CONFIG_NFSD_V4=y
-CONFIG_NFSD_TCP=y
-CONFIG_LOCKD=m
-CONFIG_LOCKD_V4=y
-CONFIG_EXPORTFS=m
-CONFIG_SUNRPC=m
-CONFIG_SUNRPC_GSS=m
-CONFIG_RPCSEC_GSS_KRB5=m
-CONFIG_SMB_FS=m
-# CONFIG_SMB_NLS_DEFAULT is not set
-CONFIG_CIFS=m
-# CONFIG_CIFS_STATS is not set
-CONFIG_NCP_FS=m
-CONFIG_NCPFS_PACKET_SIGNING=y
-CONFIG_NCPFS_IOCTL_LOCKING=y
-CONFIG_NCPFS_STRONG=y
-CONFIG_NCPFS_NFS_NS=y
-CONFIG_NCPFS_OS2_NS=y
-CONFIG_NCPFS_SMALLDOS=y
-CONFIG_NCPFS_NLS=y
-CONFIG_NCPFS_EXTRAS=y
-# CONFIG_CODA_FS is not set
-# CONFIG_AFS_FS is not set
-
-#
-# Partition Types
-#
-CONFIG_PARTITION_ADVANCED=y
-# CONFIG_ACORN_PARTITION is not set
-CONFIG_OSF_PARTITION=y
-# CONFIG_AMIGA_PARTITION is not set
-# CONFIG_ATARI_PARTITION is not set
-CONFIG_MAC_PARTITION=y
-CONFIG_MSDOS_PARTITION=y
-CONFIG_BSD_DISKLABEL=y
-CONFIG_MINIX_SUBPARTITION=y
-CONFIG_SOLARIS_X86_PARTITION=y
-CONFIG_UNIXWARE_DISKLABEL=y
-# CONFIG_LDM_PARTITION is not set
-# CONFIG_NEC98_PARTITION is not set
-CONFIG_SGI_PARTITION=y
-# CONFIG_ULTRIX_PARTITION is not set
-CONFIG_SUN_PARTITION=y
-CONFIG_EFI_PARTITION=y
-
-#
-# Native Language Support
-#
-CONFIG_NLS=y
-CONFIG_NLS_DEFAULT="utf8"
-CONFIG_NLS_CODEPAGE_437=m
-CONFIG_NLS_CODEPAGE_737=m
-CONFIG_NLS_CODEPAGE_775=m
-CONFIG_NLS_CODEPAGE_850=m
-CONFIG_NLS_CODEPAGE_852=m
-CONFIG_NLS_CODEPAGE_855=m
-CONFIG_NLS_CODEPAGE_857=m
-CONFIG_NLS_CODEPAGE_860=m
-CONFIG_NLS_CODEPAGE_861=m
-CONFIG_NLS_CODEPAGE_862=m
-CONFIG_NLS_CODEPAGE_863=m
-CONFIG_NLS_CODEPAGE_864=m
-CONFIG_NLS_CODEPAGE_865=m
-CONFIG_NLS_CODEPAGE_866=m
-CONFIG_NLS_CODEPAGE_869=m
-CONFIG_NLS_CODEPAGE_936=m
-CONFIG_NLS_CODEPAGE_950=m
-CONFIG_NLS_CODEPAGE_932=m
-CONFIG_NLS_CODEPAGE_949=m
-CONFIG_NLS_CODEPAGE_874=m
-CONFIG_NLS_ISO8859_8=m
-CONFIG_NLS_CODEPAGE_1250=m
-CONFIG_NLS_CODEPAGE_1251=m
-CONFIG_NLS_ISO8859_1=m
-CONFIG_NLS_ISO8859_2=m
-CONFIG_NLS_ISO8859_3=m
-CONFIG_NLS_ISO8859_4=m
-CONFIG_NLS_ISO8859_5=m
-CONFIG_NLS_ISO8859_6=m
-CONFIG_NLS_ISO8859_7=m
-CONFIG_NLS_ISO8859_9=m
-CONFIG_NLS_ISO8859_13=m
-CONFIG_NLS_ISO8859_14=m
-CONFIG_NLS_ISO8859_15=m
-CONFIG_NLS_KOI8_R=m
-CONFIG_NLS_KOI8_U=m
-CONFIG_NLS_UTF8=m
-
-#
-# Profiling support
-#
-CONFIG_PROFILING=y
-CONFIG_OPROFILE=m
-
-#
-# Kernel hacking
-#
-CONFIG_DEBUG_KERNEL=y
-CONFIG_EARLY_PRINTK=y
-CONFIG_DEBUG_STACKOVERFLOW=y
-# CONFIG_DEBUG_STACK_USAGE is not set
-# CONFIG_DEBUG_SLAB is not set
-CONFIG_MAGIC_SYSRQ=y
-# CONFIG_DEBUG_SPINLOCK is not set
-# CONFIG_DEBUG_PAGEALLOC is not set
-# CONFIG_DEBUG_HIGHMEM is not set
-CONFIG_DEBUG_INFO=y
-CONFIG_DEBUG_SPINLOCK_SLEEP=y
-# CONFIG_FRAME_POINTER is not set
-CONFIG_X86_FIND_SMP_CONFIG=y
-CONFIG_X86_MPPARSE=y
-
-#
-# Security options
-#
-CONFIG_SECURITY=y
-CONFIG_SECURITY_NETWORK=y
-CONFIG_SECURITY_CAPABILITIES=y
-# CONFIG_SECURITY_ROOTPLUG is not set
-CONFIG_SECURITY_SELINUX=y
-CONFIG_SECURITY_SELINUX_BOOTPARAM=y
-CONFIG_SECURITY_SELINUX_DISABLE=y
-CONFIG_SECURITY_SELINUX_DEVELOP=y
-# CONFIG_SECURITY_SELINUX_MLS is not set
-
-#
-# Cryptographic options
-#
-CONFIG_CRYPTO=y
-CONFIG_CRYPTO_HMAC=y
-CONFIG_CRYPTO_NULL=m
-CONFIG_CRYPTO_MD4=m
-CONFIG_CRYPTO_MD5=y
-CONFIG_CRYPTO_SHA1=m
-CONFIG_CRYPTO_SHA256=m
-CONFIG_CRYPTO_SHA512=m
-CONFIG_CRYPTO_DES=m
-CONFIG_CRYPTO_BLOWFISH=m
-CONFIG_CRYPTO_TWOFISH=m
-CONFIG_CRYPTO_SERPENT=m
-CONFIG_CRYPTO_AES=m
-CONFIG_CRYPTO_CAST5=m
-CONFIG_CRYPTO_CAST6=m
-CONFIG_CRYPTO_ARC4=m
-CONFIG_CRYPTO_DEFLATE=m
-CONFIG_CRYPTO_MICHAEL_MIC=m
-CONFIG_CRYPTO_CRC32C=m
-# CONFIG_CRYPTO_TEST is not set
-
-#
-# Library routines
-#
-CONFIG_CRC32=y
-CONFIG_LIBCRC32C=m
-CONFIG_ZLIB_INFLATE=y
-CONFIG_ZLIB_DEFLATE=m
-CONFIG_X86_SMP=y
-CONFIG_X86_HT=y
-CONFIG_X86_BIOS_REBOOT=y
-CONFIG_X86_TRAMPOLINE=y
-CONFIG_X86_STD_RESOURCES=y
-CONFIG_PC=y
diff --git a/configs/kernel-2.6.6-i686.config b/configs/kernel-2.6.6-i686.config
deleted file mode 100644 (file)
index d04be48..0000000
+++ /dev/null
@@ -1,2367 +0,0 @@
-#
-# Automatically generated make config: don't edit
-#
-CONFIG_X86=y
-CONFIG_MMU=y
-CONFIG_UID16=y
-CONFIG_GENERIC_ISA_DMA=y
-
-#
-# Code maturity level options
-#
-CONFIG_EXPERIMENTAL=y
-CONFIG_CLEAN_COMPILE=y
-CONFIG_STANDALONE=y
-CONFIG_BROKEN_ON_SMP=y
-
-#
-# General setup
-#
-CONFIG_SWAP=y
-CONFIG_SYSVIPC=y
-CONFIG_POSIX_MQUEUE=y
-CONFIG_BSD_PROCESS_ACCT=y
-CONFIG_SYSCTL=y
-CONFIG_AUDIT=y
-CONFIG_AUDITSYSCALL=y
-CONFIG_LOG_BUF_SHIFT=17
-CONFIG_HOTPLUG=y
-# CONFIG_IKCONFIG is not set
-# CONFIG_EMBEDDED is not set
-CONFIG_KALLSYMS=y
-# CONFIG_KALLSYMS_ALL is not set
-CONFIG_FUTEX=y
-CONFIG_EPOLL=y
-CONFIG_IOSCHED_NOOP=y
-CONFIG_IOSCHED_AS=y
-CONFIG_IOSCHED_DEADLINE=y
-CONFIG_IOSCHED_CFQ=y
-CONFIG_CC_OPTIMIZE_FOR_SIZE=y
-
-#
-# Loadable module support
-#
-CONFIG_MODULES=y
-CONFIG_MODULE_UNLOAD=y
-# CONFIG_MODULE_FORCE_UNLOAD is not set
-CONFIG_OBSOLETE_MODPARM=y
-# CONFIG_MODVERSIONS is not set
-CONFIG_KMOD=y
-
-#
-# Processor type and features
-#
-CONFIG_X86_PC=y
-# CONFIG_X86_ELAN is not set
-# CONFIG_X86_VOYAGER is not set
-# CONFIG_X86_NUMAQ is not set
-# CONFIG_X86_SUMMIT is not set
-# CONFIG_X86_BIGSMP is not set
-# CONFIG_X86_VISWS is not set
-# CONFIG_X86_GENERICARCH is not set
-# CONFIG_X86_ES7000 is not set
-# CONFIG_M386 is not set
-# CONFIG_M486 is not set
-# CONFIG_M586 is not set
-# CONFIG_M586TSC is not set
-# CONFIG_M586MMX is not set
-CONFIG_M686=y
-# CONFIG_MPENTIUMII is not set
-# CONFIG_MPENTIUMIII is not set
-# CONFIG_MPENTIUMM is not set
-# CONFIG_MPENTIUM4 is not set
-# CONFIG_MK6 is not set
-# CONFIG_MK7 is not set
-# CONFIG_MK8 is not set
-# CONFIG_MCRUSOE is not set
-# CONFIG_MWINCHIPC6 is not set
-# CONFIG_MWINCHIP2 is not set
-# CONFIG_MWINCHIP3D is not set
-# CONFIG_MCYRIXIII is not set
-# CONFIG_MVIAC3_2 is not set
-CONFIG_X86_GENERIC=y
-CONFIG_X86_CMPXCHG=y
-CONFIG_X86_XADD=y
-CONFIG_X86_L1_CACHE_SHIFT=7
-CONFIG_RWSEM_XCHGADD_ALGORITHM=y
-CONFIG_X86_PPRO_FENCE=y
-CONFIG_X86_WP_WORKS_OK=y
-CONFIG_X86_INVLPG=y
-CONFIG_X86_BSWAP=y
-CONFIG_X86_POPAD_OK=y
-CONFIG_X86_GOOD_APIC=y
-CONFIG_X86_INTEL_USERCOPY=y
-CONFIG_X86_USE_PPRO_CHECKSUM=y
-CONFIG_X86_4G=y
-CONFIG_X86_SWITCH_PAGETABLES=y
-CONFIG_X86_4G_VM_LAYOUT=y
-CONFIG_X86_UACCESS_INDIRECT=y
-CONFIG_X86_HIGH_ENTRY=y
-CONFIG_HPET_TIMER=y
-CONFIG_HPET_EMULATE_RTC=y
-# CONFIG_SMP is not set
-# CONFIG_PREEMPT is not set
-# CONFIG_X86_UP_APIC is not set
-CONFIG_X86_TSC=y
-CONFIG_X86_MCE=y
-# CONFIG_X86_MCE_NONFATAL is not set
-CONFIG_TOSHIBA=m
-CONFIG_I8K=m
-CONFIG_MICROCODE=m
-CONFIG_X86_MSR=m
-CONFIG_X86_CPUID=m
-
-#
-# Firmware Drivers
-#
-CONFIG_EDD=m
-# CONFIG_NOHIGHMEM is not set
-CONFIG_HIGHMEM4G=y
-# CONFIG_HIGHMEM64G is not set
-CONFIG_HIGHMEM=y
-CONFIG_HIGHPTE=y
-# CONFIG_MATH_EMULATION is not set
-CONFIG_MTRR=y
-# CONFIG_EFI is not set
-CONFIG_REGPARM=y
-
-#
-# Power management options (ACPI, APM)
-#
-CONFIG_PM=y
-# CONFIG_SOFTWARE_SUSPEND is not set
-# CONFIG_PM_DISK is not set
-
-#
-# ACPI (Advanced Configuration and Power Interface) Support
-#
-CONFIG_ACPI=y
-CONFIG_ACPI_BOOT=y
-CONFIG_ACPI_INTERPRETER=y
-CONFIG_ACPI_SLEEP=y
-CONFIG_ACPI_SLEEP_PROC_FS=y
-CONFIG_ACPI_AC=m
-CONFIG_ACPI_BATTERY=m
-CONFIG_ACPI_BUTTON=m
-CONFIG_ACPI_FAN=y
-CONFIG_ACPI_PROCESSOR=y
-CONFIG_ACPI_THERMAL=y
-CONFIG_ACPI_ASUS=m
-CONFIG_ACPI_TOSHIBA=m
-# CONFIG_ACPI_DEBUG is not set
-CONFIG_ACPI_BUS=y
-CONFIG_ACPI_EC=y
-CONFIG_ACPI_POWER=y
-CONFIG_ACPI_PCI=y
-CONFIG_ACPI_SYSTEM=y
-CONFIG_X86_PM_TIMER=y
-
-#
-# APM (Advanced Power Management) BIOS Support
-#
-CONFIG_APM=y
-# CONFIG_APM_IGNORE_USER_SUSPEND is not set
-# CONFIG_APM_DO_ENABLE is not set
-CONFIG_APM_CPU_IDLE=y
-# CONFIG_APM_DISPLAY_BLANK is not set
-CONFIG_APM_RTC_IS_GMT=y
-# CONFIG_APM_ALLOW_INTS is not set
-# CONFIG_APM_REAL_MODE_POWER_OFF is not set
-
-#
-# CPU Frequency scaling
-#
-CONFIG_CPU_FREQ=y
-# CONFIG_CPU_FREQ_PROC_INTF is not set
-# CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set
-CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE=y
-CONFIG_CPU_FREQ_GOV_PERFORMANCE=y
-CONFIG_CPU_FREQ_GOV_POWERSAVE=m
-CONFIG_CPU_FREQ_GOV_USERSPACE=y
-# CONFIG_CPU_FREQ_24_API is not set
-CONFIG_CPU_FREQ_TABLE=y
-
-#
-# CPUFreq processor drivers
-#
-CONFIG_X86_ACPI_CPUFREQ=m
-# CONFIG_X86_ACPI_CPUFREQ_PROC_INTF is not set
-CONFIG_X86_POWERNOW_K6=m
-CONFIG_X86_POWERNOW_K7=y
-CONFIG_X86_POWERNOW_K8=m
-# CONFIG_X86_GX_SUSPMOD is not set
-CONFIG_X86_SPEEDSTEP_CENTRINO=y
-CONFIG_X86_SPEEDSTEP_CENTRINO_TABLE=y
-CONFIG_X86_SPEEDSTEP_CENTRINO_ACPI=y
-CONFIG_X86_SPEEDSTEP_ICH=y
-CONFIG_X86_SPEEDSTEP_SMI=m
-CONFIG_X86_P4_CLOCKMOD=m
-CONFIG_X86_SPEEDSTEP_LIB=y
-# CONFIG_X86_SPEEDSTEP_RELAXED_CAP_CHECK is not set
-CONFIG_X86_LONGRUN=y
-# CONFIG_X86_LONGHAUL is not set
-
-#
-# Bus options (PCI, PCMCIA, EISA, MCA, ISA)
-#
-CONFIG_PCI=y
-# CONFIG_PCI_GOBIOS is not set
-# CONFIG_PCI_GOMMCONFIG is not set
-# CONFIG_PCI_GODIRECT is not set
-CONFIG_PCI_GOANY=y
-CONFIG_PCI_BIOS=y
-CONFIG_PCI_DIRECT=y
-CONFIG_PCI_MMCONFIG=y
-CONFIG_PCI_LEGACY_PROC=y
-# CONFIG_PCI_NAMES is not set
-CONFIG_ISA=y
-# CONFIG_EISA is not set
-# CONFIG_MCA is not set
-# CONFIG_SCx200 is not set
-
-#
-# PCMCIA/CardBus support
-#
-CONFIG_PCMCIA=m
-# CONFIG_PCMCIA_DEBUG is not set
-CONFIG_YENTA=m
-CONFIG_CARDBUS=y
-CONFIG_I82092=m
-CONFIG_I82365=m
-CONFIG_TCIC=m
-CONFIG_PCMCIA_PROBE=y
-
-#
-# PCI Hotplug Support
-#
-CONFIG_HOTPLUG_PCI=y
-# CONFIG_HOTPLUG_PCI_FAKE is not set
-CONFIG_HOTPLUG_PCI_COMPAQ=m
-# CONFIG_HOTPLUG_PCI_COMPAQ_NVRAM is not set
-# CONFIG_HOTPLUG_PCI_ACPI is not set
-# CONFIG_HOTPLUG_PCI_CPCI is not set
-CONFIG_HOTPLUG_PCI_PCIE=m
-CONFIG_HOTPLUG_PCI_PCIE_POLL_EVENT_MODE=y
-CONFIG_HOTPLUG_PCI_SHPC=m
-CONFIG_HOTPLUG_PCI_SHPC_POLL_EVENT_MODE=y
-
-#
-# Executable file formats
-#
-CONFIG_BINFMT_ELF=y
-# CONFIG_BINFMT_AOUT is not set
-CONFIG_BINFMT_MISC=m
-
-#
-# Device Drivers
-#
-
-#
-# Generic Driver Options
-#
-CONFIG_FW_LOADER=y
-# CONFIG_DEBUG_DRIVER is not set
-
-#
-# Memory Technology Devices (MTD)
-#
-CONFIG_MTD=m
-# CONFIG_MTD_DEBUG is not set
-CONFIG_MTD_PARTITIONS=m
-CONFIG_MTD_CONCAT=m
-CONFIG_MTD_REDBOOT_PARTS=m
-CONFIG_MTD_CMDLINE_PARTS=m
-
-#
-# User Modules And Translation Layers
-#
-CONFIG_MTD_CHAR=m
-CONFIG_MTD_BLOCK=m
-CONFIG_MTD_BLOCK_RO=m
-CONFIG_FTL=m
-CONFIG_NFTL=m
-CONFIG_NFTL_RW=y
-CONFIG_INFTL=m
-
-#
-# RAM/ROM/Flash chip drivers
-#
-CONFIG_MTD_CFI=m
-CONFIG_MTD_JEDECPROBE=m
-CONFIG_MTD_GEN_PROBE=m
-# CONFIG_MTD_CFI_ADV_OPTIONS is not set
-CONFIG_MTD_CFI_INTELEXT=m
-CONFIG_MTD_CFI_AMDSTD=m
-CONFIG_MTD_CFI_STAA=m
-CONFIG_MTD_RAM=m
-CONFIG_MTD_ROM=m
-CONFIG_MTD_ABSENT=m
-# CONFIG_MTD_OBSOLETE_CHIPS is not set
-
-#
-# Mapping drivers for chip access
-#
-CONFIG_MTD_COMPLEX_MAPPINGS=y
-# CONFIG_MTD_PHYSMAP is not set
-# CONFIG_MTD_PNC2000 is not set
-CONFIG_MTD_SC520CDP=m
-CONFIG_MTD_NETSC520=m
-CONFIG_MTD_SBC_GXX=m
-CONFIG_MTD_ELAN_104NC=m
-CONFIG_MTD_SCx200_DOCFLASH=m
-CONFIG_MTD_AMD76XROM=m
-CONFIG_MTD_ICH2ROM=m
-CONFIG_MTD_SCB2_FLASH=m
-# CONFIG_MTD_NETtel is not set
-# CONFIG_MTD_DILNETPC is not set
-CONFIG_MTD_L440GX=m
-CONFIG_MTD_PCI=m
-
-#
-# Self-contained MTD device drivers
-#
-CONFIG_MTD_PMC551=m
-# CONFIG_MTD_PMC551_BUGFIX is not set
-# CONFIG_MTD_PMC551_DEBUG is not set
-# CONFIG_MTD_SLRAM is not set
-CONFIG_MTD_MTDRAM=m
-CONFIG_MTDRAM_TOTAL_SIZE=4096
-CONFIG_MTDRAM_ERASE_SIZE=128
-# CONFIG_MTD_BLKMTD is not set
-
-#
-# Disk-On-Chip Device Drivers
-#
-CONFIG_MTD_DOC2000=m
-# CONFIG_MTD_DOC2001 is not set
-CONFIG_MTD_DOC2001PLUS=m
-CONFIG_MTD_DOCPROBE=m
-# CONFIG_MTD_DOCPROBE_ADVANCED is not set
-CONFIG_MTD_DOCPROBE_ADDRESS=0
-
-#
-# NAND Flash Device Drivers
-#
-CONFIG_MTD_NAND=m
-# CONFIG_MTD_NAND_VERIFY_WRITE is not set
-CONFIG_MTD_NAND_IDS=m
-
-#
-# Parallel port support
-#
-CONFIG_PARPORT=m
-CONFIG_PARPORT_PC=m
-CONFIG_PARPORT_PC_CML1=m
-CONFIG_PARPORT_SERIAL=m
-# CONFIG_PARPORT_PC_FIFO is not set
-# CONFIG_PARPORT_PC_SUPERIO is not set
-CONFIG_PARPORT_PC_PCMCIA=m
-# CONFIG_PARPORT_OTHER is not set
-CONFIG_PARPORT_1284=y
-
-#
-# Plug and Play support
-#
-CONFIG_PNP=y
-# CONFIG_PNP_DEBUG is not set
-
-#
-# Protocols
-#
-CONFIG_ISAPNP=y
-# CONFIG_PNPBIOS is not set
-
-#
-# Block devices
-#
-CONFIG_BLK_DEV_FD=m
-# CONFIG_BLK_DEV_XD is not set
-# CONFIG_PARIDE is not set
-CONFIG_BLK_CPQ_DA=m
-CONFIG_BLK_CPQ_CISS_DA=m
-CONFIG_CISS_SCSI_TAPE=y
-CONFIG_BLK_DEV_DAC960=m
-CONFIG_BLK_DEV_UMEM=m
-CONFIG_BLK_DEV_LOOP=m
-CONFIG_BLK_DEV_CRYPTOLOOP=m
-CONFIG_BLK_DEV_NBD=m
-CONFIG_BLK_DEV_CARMEL=m
-CONFIG_BLK_DEV_RAM=y
-CONFIG_BLK_DEV_RAM_SIZE=16384
-CONFIG_BLK_DEV_INITRD=y
-CONFIG_LBD=y
-
-#
-# ATA/ATAPI/MFM/RLL support
-#
-CONFIG_IDE=y
-CONFIG_BLK_DEV_IDE=y
-
-#
-# Please see Documentation/ide.txt for help/info on IDE drives
-#
-# CONFIG_BLK_DEV_HD_IDE is not set
-CONFIG_BLK_DEV_IDEDISK=y
-CONFIG_IDEDISK_MULTI_MODE=y
-# CONFIG_IDEDISK_STROKE is not set
-CONFIG_BLK_DEV_IDECS=m
-CONFIG_BLK_DEV_IDECD=y
-CONFIG_BLK_DEV_IDETAPE=m
-CONFIG_BLK_DEV_IDEFLOPPY=y
-# CONFIG_BLK_DEV_IDESCSI is not set
-# CONFIG_IDE_TASK_IOCTL is not set
-# CONFIG_IDE_TASKFILE_IO is not set
-
-#
-# IDE chipset support/bugfixes
-#
-CONFIG_IDE_GENERIC=y
-# CONFIG_BLK_DEV_CMD640 is not set
-CONFIG_BLK_DEV_IDEPNP=y
-CONFIG_BLK_DEV_IDEPCI=y
-CONFIG_IDEPCI_SHARE_IRQ=y
-# CONFIG_BLK_DEV_OFFBOARD is not set
-CONFIG_BLK_DEV_GENERIC=y
-# CONFIG_BLK_DEV_OPTI621 is not set
-CONFIG_BLK_DEV_RZ1000=y
-CONFIG_BLK_DEV_IDEDMA_PCI=y
-# CONFIG_BLK_DEV_IDEDMA_FORCED is not set
-CONFIG_IDEDMA_PCI_AUTO=y
-# CONFIG_IDEDMA_ONLYDISK is not set
-CONFIG_BLK_DEV_ADMA=y
-CONFIG_BLK_DEV_AEC62XX=y
-CONFIG_BLK_DEV_ALI15X3=y
-# CONFIG_WDC_ALI15X3 is not set
-CONFIG_BLK_DEV_AMD74XX=y
-CONFIG_BLK_DEV_ATIIXP=y
-CONFIG_BLK_DEV_CMD64X=y
-CONFIG_BLK_DEV_TRIFLEX=y
-CONFIG_BLK_DEV_CY82C693=y
-CONFIG_BLK_DEV_CS5520=y
-CONFIG_BLK_DEV_CS5530=y
-CONFIG_BLK_DEV_HPT34X=y
-# CONFIG_HPT34X_AUTODMA is not set
-CONFIG_BLK_DEV_HPT366=y
-# CONFIG_BLK_DEV_SC1200 is not set
-CONFIG_BLK_DEV_PIIX=y
-# CONFIG_BLK_DEV_NS87415 is not set
-CONFIG_BLK_DEV_PDC202XX_OLD=y
-# CONFIG_PDC202XX_BURST is not set
-CONFIG_BLK_DEV_PDC202XX_NEW=y
-CONFIG_PDC202XX_FORCE=y
-CONFIG_BLK_DEV_SVWKS=y
-CONFIG_BLK_DEV_SIIMAGE=y
-CONFIG_BLK_DEV_SIS5513=y
-CONFIG_BLK_DEV_SLC90E66=y
-# CONFIG_BLK_DEV_TRM290 is not set
-CONFIG_BLK_DEV_VIA82CXXX=y
-# CONFIG_IDE_ARM is not set
-# CONFIG_IDE_CHIPSETS is not set
-CONFIG_BLK_DEV_IDEDMA=y
-# CONFIG_IDEDMA_IVB is not set
-CONFIG_IDEDMA_AUTO=y
-# CONFIG_BLK_DEV_HD is not set
-
-#
-# SCSI device support
-#
-CONFIG_SCSI=m
-CONFIG_SCSI_PROC_FS=y
-
-#
-# SCSI support type (disk, tape, CD-ROM)
-#
-CONFIG_BLK_DEV_SD=m
-CONFIG_CHR_DEV_ST=m
-CONFIG_CHR_DEV_OSST=m
-CONFIG_BLK_DEV_SR=m
-CONFIG_BLK_DEV_SR_VENDOR=y
-CONFIG_CHR_DEV_SG=m
-
-#
-# Some SCSI devices (e.g. CD jukebox) support multiple LUNs
-#
-# CONFIG_SCSI_MULTI_LUN is not set
-CONFIG_SCSI_CONSTANTS=y
-CONFIG_SCSI_LOGGING=y
-
-#
-# SCSI Transport Attributes
-#
-CONFIG_SCSI_SPI_ATTRS=m
-CONFIG_SCSI_FC_ATTRS=m
-
-#
-# SCSI low-level drivers
-#
-CONFIG_BLK_DEV_3W_XXXX_RAID=m
-# CONFIG_SCSI_7000FASST is not set
-CONFIG_SCSI_ACARD=m
-CONFIG_SCSI_AHA152X=m
-CONFIG_SCSI_AHA1542=m
-CONFIG_SCSI_AACRAID=m
-CONFIG_SCSI_AIC7XXX=m
-CONFIG_AIC7XXX_CMDS_PER_DEVICE=4
-CONFIG_AIC7XXX_RESET_DELAY_MS=15000
-# CONFIG_AIC7XXX_BUILD_FIRMWARE is not set
-# CONFIG_AIC7XXX_DEBUG_ENABLE is not set
-CONFIG_AIC7XXX_DEBUG_MASK=0
-# CONFIG_AIC7XXX_REG_PRETTY_PRINT is not set
-CONFIG_SCSI_AIC7XXX_OLD=m
-CONFIG_SCSI_AIC79XX=m
-CONFIG_AIC79XX_CMDS_PER_DEVICE=4
-CONFIG_AIC79XX_RESET_DELAY_MS=15000
-# CONFIG_AIC79XX_BUILD_FIRMWARE is not set
-# CONFIG_AIC79XX_ENABLE_RD_STRM is not set
-# CONFIG_AIC79XX_DEBUG_ENABLE is not set
-CONFIG_AIC79XX_DEBUG_MASK=0
-# CONFIG_AIC79XX_REG_PRETTY_PRINT is not set
-# CONFIG_SCSI_DPT_I2O is not set
-CONFIG_SCSI_ADVANSYS=m
-CONFIG_SCSI_IN2000=m
-CONFIG_SCSI_MEGARAID=m
-CONFIG_SCSI_SATA=y
-CONFIG_SCSI_SATA_SVW=m
-CONFIG_SCSI_ATA_PIIX=m
-CONFIG_SCSI_SATA_PROMISE=m
-CONFIG_SCSI_SATA_SX4=m
-CONFIG_SCSI_SATA_SIL=m
-CONFIG_SCSI_SATA_SIS=m
-CONFIG_SCSI_SATA_VIA=m
-CONFIG_SCSI_SATA_VITESSE=m
-CONFIG_SCSI_BUSLOGIC=m
-# CONFIG_SCSI_OMIT_FLASHPOINT is not set
-# CONFIG_SCSI_CPQFCTS is not set
-# CONFIG_SCSI_DMX3191D is not set
-# CONFIG_SCSI_DTC3280 is not set
-# CONFIG_SCSI_EATA is not set
-# CONFIG_SCSI_EATA_PIO is not set
-CONFIG_SCSI_FUTURE_DOMAIN=m
-CONFIG_SCSI_GDTH=m
-# CONFIG_SCSI_GENERIC_NCR5380 is not set
-# CONFIG_SCSI_GENERIC_NCR5380_MMIO is not set
-CONFIG_SCSI_IPS=m
-CONFIG_SCSI_INIA100=m
-CONFIG_SCSI_PPA=m
-CONFIG_SCSI_IMM=m
-# CONFIG_SCSI_IZIP_EPP16 is not set
-# CONFIG_SCSI_IZIP_SLOW_CTR is not set
-# CONFIG_SCSI_NCR53C406A is not set
-CONFIG_SCSI_SYM53C8XX_2=m
-CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=1
-CONFIG_SCSI_SYM53C8XX_DEFAULT_TAGS=16
-CONFIG_SCSI_SYM53C8XX_MAX_TAGS=64
-# CONFIG_SCSI_SYM53C8XX_IOMAPPED is not set
-# CONFIG_SCSI_IPR is not set
-# CONFIG_SCSI_PAS16 is not set
-# CONFIG_SCSI_PSI240I is not set
-CONFIG_SCSI_QLOGIC_FAS=m
-CONFIG_SCSI_QLOGIC_ISP=m
-# CONFIG_SCSI_QLOGIC_FC is not set
-CONFIG_SCSI_QLOGIC_1280=m
-CONFIG_SCSI_QLA2XXX=m
-CONFIG_SCSI_QLA21XX=m
-CONFIG_SCSI_QLA22XX=m
-CONFIG_SCSI_QLA2300=m
-CONFIG_SCSI_QLA2322=m
-CONFIG_SCSI_QLA6312=m
-CONFIG_SCSI_QLA6322=m
-# CONFIG_SCSI_SYM53C416 is not set
-# CONFIG_SCSI_DC395x is not set
-CONFIG_SCSI_DC390T=m
-# CONFIG_SCSI_T128 is not set
-# CONFIG_SCSI_U14_34F is not set
-# CONFIG_SCSI_ULTRASTOR is not set
-# CONFIG_SCSI_NSP32 is not set
-# CONFIG_SCSI_DEBUG is not set
-
-#
-# PCMCIA SCSI adapter support
-#
-CONFIG_PCMCIA_AHA152X=m
-CONFIG_PCMCIA_FDOMAIN=m
-CONFIG_PCMCIA_NINJA_SCSI=m
-CONFIG_PCMCIA_QLOGIC=m
-CONFIG_PCMCIA_SYM53C500=m
-
-#
-# Old CD-ROM drivers (not SCSI, not IDE)
-#
-# CONFIG_CD_NO_IDESCSI is not set
-
-#
-# Multi-device support (RAID and LVM)
-#
-CONFIG_MD=y
-CONFIG_BLK_DEV_MD=y
-CONFIG_MD_LINEAR=m
-CONFIG_MD_RAID0=m
-CONFIG_MD_RAID1=m
-CONFIG_MD_RAID5=m
-CONFIG_MD_RAID6=m
-CONFIG_MD_MULTIPATH=m
-CONFIG_BLK_DEV_DM=m
-CONFIG_DM_CRYPT=m
-
-#
-# Fusion MPT device support
-#
-CONFIG_FUSION=m
-CONFIG_FUSION_MAX_SGE=40
-# CONFIG_FUSION_ISENSE is not set
-CONFIG_FUSION_CTL=m
-CONFIG_FUSION_LAN=m
-
-#
-# IEEE 1394 (FireWire) support
-#
-CONFIG_IEEE1394=m
-
-#
-# Subsystem Options
-#
-# CONFIG_IEEE1394_VERBOSEDEBUG is not set
-CONFIG_IEEE1394_OUI_DB=y
-# CONFIG_IEEE1394_EXTRA_CONFIG_ROMS is not set
-
-#
-# Device Drivers
-#
-# CONFIG_IEEE1394_PCILYNX is not set
-CONFIG_IEEE1394_OHCI1394=m
-
-#
-# Protocol Drivers
-#
-CONFIG_IEEE1394_VIDEO1394=m
-CONFIG_IEEE1394_SBP2=m
-# CONFIG_IEEE1394_SBP2_PHYS_DMA is not set
-# CONFIG_IEEE1394_ETH1394 is not set
-CONFIG_IEEE1394_DV1394=m
-CONFIG_IEEE1394_RAWIO=m
-CONFIG_IEEE1394_CMP=m
-CONFIG_IEEE1394_AMDTP=m
-
-#
-# I2O device support
-#
-CONFIG_I2O=m
-CONFIG_I2O_CONFIG=m
-CONFIG_I2O_BLOCK=m
-CONFIG_I2O_SCSI=m
-CONFIG_I2O_PROC=m
-
-#
-# Networking support
-#
-CONFIG_NET=y
-
-#
-# Networking options
-#
-CONFIG_PACKET=y
-CONFIG_PACKET_MMAP=y
-CONFIG_NETLINK_DEV=y
-CONFIG_UNIX=y
-CONFIG_NET_KEY=m
-CONFIG_INET=y
-CONFIG_IP_MULTICAST=y
-CONFIG_IP_ADVANCED_ROUTER=y
-CONFIG_IP_MULTIPLE_TABLES=y
-CONFIG_IP_ROUTE_FWMARK=y
-CONFIG_IP_ROUTE_NAT=y
-CONFIG_IP_ROUTE_MULTIPATH=y
-CONFIG_IP_ROUTE_TOS=y
-CONFIG_IP_ROUTE_VERBOSE=y
-# CONFIG_IP_PNP is not set
-CONFIG_NET_IPIP=m
-CONFIG_NET_IPGRE=m
-CONFIG_NET_IPGRE_BROADCAST=y
-CONFIG_IP_MROUTE=y
-CONFIG_IP_PIMSM_V1=y
-CONFIG_IP_PIMSM_V2=y
-# CONFIG_ARPD is not set
-CONFIG_SYN_COOKIES=y
-CONFIG_INET_AH=m
-CONFIG_INET_ESP=m
-CONFIG_INET_IPCOMP=m
-
-#
-# IP: Virtual Server Configuration
-#
-CONFIG_IP_VS=m
-# CONFIG_IP_VS_DEBUG is not set
-CONFIG_IP_VS_TAB_BITS=12
-
-#
-# IPVS transport protocol load balancing support
-#
-CONFIG_IP_VS_PROTO_TCP=y
-CONFIG_IP_VS_PROTO_UDP=y
-CONFIG_IP_VS_PROTO_ESP=y
-CONFIG_IP_VS_PROTO_AH=y
-
-#
-# IPVS scheduler
-#
-CONFIG_IP_VS_RR=m
-CONFIG_IP_VS_WRR=m
-CONFIG_IP_VS_LC=m
-CONFIG_IP_VS_WLC=m
-CONFIG_IP_VS_LBLC=m
-CONFIG_IP_VS_LBLCR=m
-CONFIG_IP_VS_DH=m
-CONFIG_IP_VS_SH=m
-CONFIG_IP_VS_SED=m
-CONFIG_IP_VS_NQ=m
-
-#
-# IPVS application helper
-#
-CONFIG_IP_VS_FTP=m
-CONFIG_IPV6=m
-CONFIG_IPV6_PRIVACY=y
-CONFIG_INET6_AH=m
-CONFIG_INET6_ESP=m
-CONFIG_INET6_IPCOMP=m
-CONFIG_IPV6_TUNNEL=m
-CONFIG_NETFILTER=y
-# CONFIG_NETFILTER_DEBUG is not set
-CONFIG_BRIDGE_NETFILTER=y
-
-#
-# IP: Netfilter Configuration
-#
-CONFIG_IP_NF_CONNTRACK=m
-CONFIG_IP_NF_FTP=m
-CONFIG_IP_NF_IRC=m
-CONFIG_IP_NF_TFTP=m
-CONFIG_IP_NF_AMANDA=m
-CONFIG_IP_NF_QUEUE=m
-CONFIG_IP_NF_IPTABLES=m
-CONFIG_IP_NF_MATCH_LIMIT=m
-CONFIG_IP_NF_MATCH_IPRANGE=m
-CONFIG_IP_NF_MATCH_MAC=m
-CONFIG_IP_NF_MATCH_PKTTYPE=m
-CONFIG_IP_NF_MATCH_MARK=m
-CONFIG_IP_NF_MATCH_MULTIPORT=m
-CONFIG_IP_NF_MATCH_TOS=m
-CONFIG_IP_NF_MATCH_RECENT=m
-CONFIG_IP_NF_MATCH_ECN=m
-CONFIG_IP_NF_MATCH_DSCP=m
-CONFIG_IP_NF_MATCH_AH_ESP=m
-CONFIG_IP_NF_MATCH_LENGTH=m
-CONFIG_IP_NF_MATCH_TTL=m
-CONFIG_IP_NF_MATCH_TCPMSS=m
-CONFIG_IP_NF_MATCH_HELPER=m
-CONFIG_IP_NF_MATCH_STATE=m
-CONFIG_IP_NF_MATCH_CONNTRACK=m
-CONFIG_IP_NF_MATCH_OWNER=m
-CONFIG_IP_NF_MATCH_PHYSDEV=m
-CONFIG_IP_NF_FILTER=m
-CONFIG_IP_NF_TARGET_REJECT=m
-CONFIG_IP_NF_NAT=m
-CONFIG_IP_NF_NAT_NEEDED=y
-CONFIG_IP_NF_TARGET_MASQUERADE=m
-CONFIG_IP_NF_TARGET_REDIRECT=m
-CONFIG_IP_NF_TARGET_NETMAP=m
-CONFIG_IP_NF_TARGET_SAME=m
-CONFIG_IP_NF_NAT_LOCAL=y
-CONFIG_IP_NF_NAT_SNMP_BASIC=m
-CONFIG_IP_NF_NAT_IRC=m
-CONFIG_IP_NF_NAT_FTP=m
-CONFIG_IP_NF_NAT_TFTP=m
-CONFIG_IP_NF_NAT_AMANDA=m
-CONFIG_IP_NF_MANGLE=m
-CONFIG_IP_NF_TARGET_TOS=m
-CONFIG_IP_NF_TARGET_ECN=m
-CONFIG_IP_NF_TARGET_DSCP=m
-CONFIG_IP_NF_TARGET_MARK=m
-CONFIG_IP_NF_TARGET_CLASSIFY=m
-CONFIG_IP_NF_TARGET_LOG=m
-CONFIG_IP_NF_TARGET_ULOG=m
-CONFIG_IP_NF_TARGET_TCPMSS=m
-CONFIG_IP_NF_ARPTABLES=m
-CONFIG_IP_NF_ARPFILTER=m
-CONFIG_IP_NF_ARP_MANGLE=m
-# CONFIG_IP_NF_COMPAT_IPCHAINS is not set
-# CONFIG_IP_NF_COMPAT_IPFWADM is not set
-CONFIG_IP_NF_TARGET_NOTRACK=m
-CONFIG_IP_NF_RAW=m
-
-#
-# IPv6: Netfilter Configuration
-#
-# CONFIG_IP6_NF_QUEUE is not set
-CONFIG_IP6_NF_IPTABLES=m
-CONFIG_IP6_NF_MATCH_LIMIT=m
-CONFIG_IP6_NF_MATCH_MAC=m
-CONFIG_IP6_NF_MATCH_RT=m
-CONFIG_IP6_NF_MATCH_OPTS=m
-CONFIG_IP6_NF_MATCH_FRAG=m
-CONFIG_IP6_NF_MATCH_HL=m
-CONFIG_IP6_NF_MATCH_MULTIPORT=m
-CONFIG_IP6_NF_MATCH_OWNER=m
-CONFIG_IP6_NF_MATCH_MARK=m
-CONFIG_IP6_NF_MATCH_IPV6HEADER=m
-CONFIG_IP6_NF_MATCH_AHESP=m
-CONFIG_IP6_NF_MATCH_LENGTH=m
-CONFIG_IP6_NF_MATCH_EUI64=m
-CONFIG_IP6_NF_FILTER=m
-CONFIG_IP6_NF_TARGET_LOG=m
-CONFIG_IP6_NF_MANGLE=m
-CONFIG_IP6_NF_TARGET_MARK=m
-CONFIG_IP6_NF_RAW=m
-
-#
-# Bridge: Netfilter Configuration
-#
-CONFIG_BRIDGE_NF_EBTABLES=m
-CONFIG_BRIDGE_EBT_BROUTE=m
-CONFIG_BRIDGE_EBT_T_FILTER=m
-CONFIG_BRIDGE_EBT_T_NAT=m
-CONFIG_BRIDGE_EBT_802_3=m
-CONFIG_BRIDGE_EBT_AMONG=m
-CONFIG_BRIDGE_EBT_ARP=m
-CONFIG_BRIDGE_EBT_IP=m
-CONFIG_BRIDGE_EBT_LIMIT=m
-CONFIG_BRIDGE_EBT_MARK=m
-CONFIG_BRIDGE_EBT_PKTTYPE=m
-CONFIG_BRIDGE_EBT_STP=m
-CONFIG_BRIDGE_EBT_VLAN=m
-CONFIG_BRIDGE_EBT_ARPREPLY=m
-CONFIG_BRIDGE_EBT_DNAT=m
-CONFIG_BRIDGE_EBT_MARK_T=m
-CONFIG_BRIDGE_EBT_REDIRECT=m
-CONFIG_BRIDGE_EBT_SNAT=m
-CONFIG_BRIDGE_EBT_LOG=m
-CONFIG_XFRM=y
-CONFIG_XFRM_USER=y
-
-#
-# SCTP Configuration (EXPERIMENTAL)
-#
-CONFIG_IP_SCTP=m
-# CONFIG_SCTP_DBG_MSG is not set
-# CONFIG_SCTP_DBG_OBJCNT is not set
-# CONFIG_SCTP_HMAC_NONE is not set
-# CONFIG_SCTP_HMAC_SHA1 is not set
-CONFIG_SCTP_HMAC_MD5=y
-# CONFIG_ATM is not set
-CONFIG_BRIDGE=m
-CONFIG_VLAN_8021Q=m
-# CONFIG_DECNET is not set
-CONFIG_LLC=m
-# CONFIG_LLC2 is not set
-CONFIG_IPX=m
-# CONFIG_IPX_INTERN is not set
-CONFIG_ATALK=m
-CONFIG_DEV_APPLETALK=y
-CONFIG_LTPC=m
-CONFIG_COPS=m
-CONFIG_COPS_DAYNA=y
-CONFIG_COPS_TANGENT=y
-CONFIG_IPDDP=m
-CONFIG_IPDDP_ENCAP=y
-CONFIG_IPDDP_DECAP=y
-# CONFIG_X25 is not set
-# CONFIG_LAPB is not set
-CONFIG_NET_DIVERT=y
-# CONFIG_ECONET is not set
-CONFIG_WAN_ROUTER=m
-# CONFIG_NET_FASTROUTE is not set
-# CONFIG_NET_HW_FLOWCONTROL is not set
-
-#
-# QoS and/or fair queueing
-#
-CONFIG_NET_SCHED=y
-CONFIG_NET_SCH_CBQ=m
-CONFIG_NET_SCH_HTB=m
-CONFIG_NET_SCH_HFSC=m
-CONFIG_NET_SCH_CSZ=m
-CONFIG_NET_SCH_PRIO=m
-CONFIG_NET_SCH_RED=m
-CONFIG_NET_SCH_SFQ=m
-CONFIG_NET_SCH_TEQL=m
-CONFIG_NET_SCH_TBF=m
-CONFIG_NET_SCH_GRED=m
-CONFIG_NET_SCH_DSMARK=m
-CONFIG_NET_SCH_DELAY=m
-CONFIG_NET_SCH_INGRESS=m
-CONFIG_NET_QOS=y
-CONFIG_NET_ESTIMATOR=y
-CONFIG_NET_CLS=y
-CONFIG_NET_CLS_TCINDEX=m
-CONFIG_NET_CLS_ROUTE4=m
-CONFIG_NET_CLS_ROUTE=y
-CONFIG_NET_CLS_FW=m
-CONFIG_NET_CLS_U32=m
-CONFIG_NET_CLS_RSVP=m
-CONFIG_NET_CLS_RSVP6=m
-CONFIG_NET_CLS_POLICE=y
-
-#
-# Network testing
-#
-# CONFIG_NET_PKTGEN is not set
-CONFIG_NETPOLL=y
-# CONFIG_NETPOLL_RX is not set
-# CONFIG_NETPOLL_TRAP is not set
-CONFIG_NET_POLL_CONTROLLER=y
-# CONFIG_HAMRADIO is not set
-CONFIG_IRDA=m
-
-#
-# IrDA protocols
-#
-CONFIG_IRLAN=m
-CONFIG_IRNET=m
-CONFIG_IRCOMM=m
-# CONFIG_IRDA_ULTRA is not set
-
-#
-# IrDA options
-#
-CONFIG_IRDA_CACHE_LAST_LSAP=y
-CONFIG_IRDA_FAST_RR=y
-# CONFIG_IRDA_DEBUG is not set
-
-#
-# Infrared-port device drivers
-#
-
-#
-# SIR device drivers
-#
-CONFIG_IRTTY_SIR=m
-
-#
-# Dongle support
-#
-CONFIG_DONGLE=y
-CONFIG_ESI_DONGLE=m
-CONFIG_ACTISYS_DONGLE=m
-CONFIG_TEKRAM_DONGLE=m
-CONFIG_LITELINK_DONGLE=m
-CONFIG_MA600_DONGLE=m
-CONFIG_GIRBIL_DONGLE=m
-CONFIG_MCP2120_DONGLE=m
-CONFIG_OLD_BELKIN_DONGLE=m
-CONFIG_ACT200L_DONGLE=m
-
-#
-# Old SIR device drivers
-#
-CONFIG_IRPORT_SIR=m
-
-#
-# Old Serial dongle support
-#
-# CONFIG_DONGLE_OLD is not set
-
-#
-# FIR device drivers
-#
-CONFIG_USB_IRDA=m
-CONFIG_SIGMATEL_FIR=m
-CONFIG_NSC_FIR=m
-# CONFIG_WINBOND_FIR is not set
-# CONFIG_TOSHIBA_FIR is not set
-# CONFIG_SMC_IRCC_FIR is not set
-# CONFIG_ALI_FIR is not set
-# CONFIG_VLSI_FIR is not set
-# CONFIG_VIA_FIR is not set
-CONFIG_BT=m
-CONFIG_BT_L2CAP=m
-CONFIG_BT_SCO=m
-CONFIG_BT_RFCOMM=m
-CONFIG_BT_RFCOMM_TTY=y
-CONFIG_BT_BNEP=m
-CONFIG_BT_BNEP_MC_FILTER=y
-CONFIG_BT_BNEP_PROTO_FILTER=y
-CONFIG_BT_CMTP=m
-
-#
-# Bluetooth device drivers
-#
-CONFIG_BT_HCIUSB=m
-CONFIG_BT_HCIUSB_SCO=y
-CONFIG_BT_HCIUART=m
-CONFIG_BT_HCIUART_H4=y
-CONFIG_BT_HCIUART_BCSP=y
-CONFIG_BT_HCIUART_BCSP_TXCRC=y
-CONFIG_BT_HCIBCM203X=m
-CONFIG_BT_HCIBFUSB=m
-CONFIG_BT_HCIDTL1=m
-CONFIG_BT_HCIBT3C=m
-CONFIG_BT_HCIBLUECARD=m
-CONFIG_BT_HCIBTUART=m
-CONFIG_BT_HCIVHCI=m
-CONFIG_TUX=m
-
-#
-# TUX options
-#
-CONFIG_TUX_EXTCGI=y
-# CONFIG_TUX_EXTENDED_LOG is not set
-# CONFIG_TUX_DEBUG is not set
-CONFIG_NETDEVICES=y
-CONFIG_DUMMY=m
-CONFIG_BONDING=m
-CONFIG_EQUALIZER=m
-CONFIG_TUN=m
-CONFIG_ETHERTAP=m
-CONFIG_NET_SB1000=m
-
-#
-# ARCnet devices
-#
-# CONFIG_ARCNET is not set
-
-#
-# Ethernet (10 or 100Mbit)
-#
-CONFIG_NET_ETHERNET=y
-CONFIG_MII=m
-CONFIG_HAPPYMEAL=m
-CONFIG_SUNGEM=m
-CONFIG_NET_VENDOR_3COM=y
-CONFIG_EL1=m
-CONFIG_EL2=m
-CONFIG_ELPLUS=m
-CONFIG_EL16=m
-CONFIG_EL3=m
-CONFIG_3C515=m
-CONFIG_VORTEX=m
-CONFIG_TYPHOON=m
-CONFIG_LANCE=m
-CONFIG_NET_VENDOR_SMC=y
-CONFIG_WD80x3=m
-CONFIG_ULTRA=m
-CONFIG_SMC9194=m
-CONFIG_NET_VENDOR_RACAL=y
-# CONFIG_NI5010 is not set
-CONFIG_NI52=m
-CONFIG_NI65=m
-
-#
-# Tulip family network device support
-#
-CONFIG_NET_TULIP=y
-CONFIG_DE2104X=m
-CONFIG_TULIP=m
-# CONFIG_TULIP_MWI is not set
-CONFIG_TULIP_MMIO=y
-# CONFIG_TULIP_NAPI is not set
-CONFIG_DE4X5=m
-CONFIG_WINBOND_840=m
-CONFIG_DM9102=m
-CONFIG_PCMCIA_XIRCOM=m
-# CONFIG_PCMCIA_XIRTULIP is not set
-# CONFIG_AT1700 is not set
-CONFIG_DEPCA=m
-CONFIG_HP100=m
-# CONFIG_NET_ISA is not set
-CONFIG_NE2000=m
-CONFIG_NET_PCI=y
-CONFIG_PCNET32=m
-CONFIG_AMD8111_ETH=m
-CONFIG_AMD8111E_NAPI=y
-CONFIG_ADAPTEC_STARFIRE=m
-CONFIG_ADAPTEC_STARFIRE_NAPI=y
-CONFIG_AC3200=m
-CONFIG_APRICOT=m
-CONFIG_B44=m
-CONFIG_FORCEDETH=m
-CONFIG_CS89x0=m
-CONFIG_DGRS=m
-CONFIG_EEPRO100=m
-# CONFIG_EEPRO100_PIO is not set
-CONFIG_E100=m
-CONFIG_E100_NAPI=y
-CONFIG_FEALNX=m
-CONFIG_NATSEMI=m
-CONFIG_NE2K_PCI=m
-CONFIG_8139CP=m
-CONFIG_8139TOO=m
-CONFIG_8139TOO_PIO=y
-# CONFIG_8139TOO_TUNE_TWISTER is not set
-CONFIG_8139TOO_8129=y
-# CONFIG_8139_OLD_RX_RESET is not set
-CONFIG_SIS900=m
-CONFIG_EPIC100=m
-CONFIG_SUNDANCE=m
-# CONFIG_SUNDANCE_MMIO is not set
-CONFIG_TLAN=m
-CONFIG_VIA_RHINE=m
-CONFIG_VIA_RHINE_MMIO=y
-CONFIG_NET_POCKET=y
-CONFIG_ATP=m
-CONFIG_DE600=m
-CONFIG_DE620=m
-
-#
-# Ethernet (1000 Mbit)
-#
-CONFIG_ACENIC=m
-# CONFIG_ACENIC_OMIT_TIGON_I is not set
-CONFIG_DL2K=m
-CONFIG_E1000=m
-CONFIG_E1000_NAPI=y
-CONFIG_NS83820=m
-CONFIG_HAMACHI=m
-CONFIG_YELLOWFIN=m
-CONFIG_R8169=m
-CONFIG_SK98LIN=m
-CONFIG_TIGON3=m
-
-#
-# Ethernet (10000 Mbit)
-#
-CONFIG_IXGB=m
-CONFIG_IXGB_NAPI=y
-CONFIG_S2IO=m
-CONFIG_S2IO_NAPI=y
-
-#
-# Token Ring devices
-#
-# CONFIG_TR is not set
-
-#
-# Wireless LAN (non-hamradio)
-#
-CONFIG_NET_RADIO=y
-
-#
-# Obsolete Wireless cards support (pre-802.11)
-#
-# CONFIG_STRIP is not set
-# CONFIG_ARLAN is not set
-CONFIG_WAVELAN=m
-CONFIG_PCMCIA_WAVELAN=m
-CONFIG_PCMCIA_NETWAVE=m
-
-#
-# Wireless 802.11 Frequency Hopping cards support
-#
-# CONFIG_PCMCIA_RAYCS is not set
-
-#
-# Wireless 802.11b ISA/PCI cards support
-#
-CONFIG_AIRO=m
-CONFIG_HERMES=m
-CONFIG_PLX_HERMES=m
-CONFIG_TMD_HERMES=m
-CONFIG_PCI_HERMES=m
-CONFIG_ATMEL=m
-CONFIG_PCI_ATMEL=m
-
-#
-# Wireless 802.11b Pcmcia/Cardbus cards support
-#
-CONFIG_PCMCIA_HERMES=m
-CONFIG_AIRO_CS=m
-CONFIG_PCMCIA_ATMEL=m
-CONFIG_PCMCIA_WL3501=m
-
-#
-# Prism GT/Duette 802.11(a/b/g) PCI/Cardbus support
-#
-CONFIG_PRISM54=m
-CONFIG_NET_WIRELESS=y
-
-#
-# PCMCIA network device support
-#
-CONFIG_NET_PCMCIA=y
-CONFIG_PCMCIA_3C589=m
-CONFIG_PCMCIA_3C574=m
-CONFIG_PCMCIA_FMVJ18X=m
-CONFIG_PCMCIA_PCNET=m
-CONFIG_PCMCIA_NMCLAN=m
-CONFIG_PCMCIA_SMC91C92=m
-CONFIG_PCMCIA_XIRC2PS=m
-CONFIG_PCMCIA_AXNET=m
-
-#
-# Wan interfaces
-#
-# CONFIG_WAN is not set
-CONFIG_FDDI=y
-# CONFIG_DEFXX is not set
-CONFIG_SKFP=m
-# CONFIG_HIPPI is not set
-CONFIG_PLIP=m
-CONFIG_PPP=m
-CONFIG_PPP_MULTILINK=y
-CONFIG_PPP_FILTER=y
-CONFIG_PPP_ASYNC=m
-CONFIG_PPP_SYNC_TTY=m
-CONFIG_PPP_DEFLATE=m
-# CONFIG_PPP_BSDCOMP is not set
-CONFIG_PPPOE=m
-# CONFIG_SLIP is not set
-CONFIG_NET_FC=y
-# CONFIG_SHAPER is not set
-CONFIG_NETCONSOLE=m
-
-#
-# ISDN subsystem
-#
-CONFIG_ISDN=m
-
-#
-# Old ISDN4Linux
-#
-CONFIG_ISDN_I4L=m
-CONFIG_ISDN_PPP=y
-CONFIG_ISDN_PPP_VJ=y
-CONFIG_ISDN_MPP=y
-CONFIG_IPPP_FILTER=y
-# CONFIG_ISDN_PPP_BSDCOMP is not set
-CONFIG_ISDN_AUDIO=y
-CONFIG_ISDN_TTY_FAX=y
-
-#
-# ISDN feature submodules
-#
-CONFIG_ISDN_DRV_LOOP=m
-
-#
-# ISDN4Linux hardware drivers
-#
-
-#
-# Passive cards
-#
-CONFIG_ISDN_DRV_HISAX=m
-
-#
-# D-channel protocol features
-#
-CONFIG_HISAX_EURO=y
-CONFIG_DE_AOC=y
-CONFIG_HISAX_NO_SENDCOMPLETE=y
-CONFIG_HISAX_NO_LLC=y
-CONFIG_HISAX_NO_KEYPAD=y
-CONFIG_HISAX_1TR6=y
-CONFIG_HISAX_NI1=y
-CONFIG_HISAX_MAX_CARDS=8
-
-#
-# HiSax supported cards
-#
-CONFIG_HISAX_16_0=y
-CONFIG_HISAX_16_3=y
-CONFIG_HISAX_TELESPCI=y
-CONFIG_HISAX_S0BOX=y
-CONFIG_HISAX_AVM_A1=y
-CONFIG_HISAX_FRITZPCI=y
-CONFIG_HISAX_AVM_A1_PCMCIA=y
-CONFIG_HISAX_ELSA=y
-CONFIG_HISAX_IX1MICROR2=y
-CONFIG_HISAX_DIEHLDIVA=y
-CONFIG_HISAX_ASUSCOM=y
-CONFIG_HISAX_TELEINT=y
-CONFIG_HISAX_HFCS=y
-CONFIG_HISAX_SEDLBAUER=y
-CONFIG_HISAX_SPORTSTER=y
-CONFIG_HISAX_MIC=y
-CONFIG_HISAX_NETJET=y
-CONFIG_HISAX_NETJET_U=y
-CONFIG_HISAX_NICCY=y
-CONFIG_HISAX_ISURF=y
-CONFIG_HISAX_HSTSAPHIR=y
-CONFIG_HISAX_BKM_A4T=y
-CONFIG_HISAX_SCT_QUADRO=y
-CONFIG_HISAX_GAZEL=y
-CONFIG_HISAX_HFC_PCI=y
-CONFIG_HISAX_W6692=y
-CONFIG_HISAX_HFC_SX=y
-CONFIG_HISAX_ENTERNOW_PCI=y
-# CONFIG_HISAX_DEBUG is not set
-
-#
-# HiSax PCMCIA card service modules
-#
-CONFIG_HISAX_SEDLBAUER_CS=m
-CONFIG_HISAX_ELSA_CS=m
-CONFIG_HISAX_AVM_A1_CS=m
-CONFIG_HISAX_TELES_CS=m
-
-#
-# HiSax sub driver modules
-#
-CONFIG_HISAX_ST5481=m
-CONFIG_HISAX_HFCUSB=m
-CONFIG_HISAX_FRITZ_PCIPNP=m
-CONFIG_HISAX_HDLC=y
-
-#
-# Active cards
-#
-CONFIG_ISDN_DRV_ICN=m
-CONFIG_ISDN_DRV_PCBIT=m
-CONFIG_ISDN_DRV_SC=m
-CONFIG_ISDN_DRV_ACT2000=m
-CONFIG_ISDN_DRV_TPAM=m
-CONFIG_HYSDN=m
-CONFIG_HYSDN_CAPI=y
-
-#
-# CAPI subsystem
-#
-CONFIG_ISDN_CAPI=m
-CONFIG_ISDN_DRV_AVMB1_VERBOSE_REASON=y
-CONFIG_ISDN_CAPI_MIDDLEWARE=y
-CONFIG_ISDN_CAPI_CAPI20=m
-CONFIG_ISDN_CAPI_CAPIFS_BOOL=y
-CONFIG_ISDN_CAPI_CAPIFS=m
-CONFIG_ISDN_CAPI_CAPIDRV=m
-
-#
-# CAPI hardware drivers
-#
-
-#
-# Active AVM cards
-#
-CONFIG_CAPI_AVM=y
-CONFIG_ISDN_DRV_AVMB1_B1ISA=m
-CONFIG_ISDN_DRV_AVMB1_B1PCI=m
-CONFIG_ISDN_DRV_AVMB1_B1PCIV4=y
-CONFIG_ISDN_DRV_AVMB1_T1ISA=m
-CONFIG_ISDN_DRV_AVMB1_B1PCMCIA=m
-CONFIG_ISDN_DRV_AVMB1_AVM_CS=m
-CONFIG_ISDN_DRV_AVMB1_T1PCI=m
-CONFIG_ISDN_DRV_AVMB1_C4=m
-
-#
-# Active Eicon DIVA Server cards
-#
-CONFIG_CAPI_EICON=y
-CONFIG_ISDN_DIVAS=m
-CONFIG_ISDN_DIVAS_BRIPCI=y
-CONFIG_ISDN_DIVAS_PRIPCI=y
-CONFIG_ISDN_DIVAS_DIVACAPI=m
-CONFIG_ISDN_DIVAS_USERIDI=m
-CONFIG_ISDN_DIVAS_MAINT=m
-
-#
-# Telephony Support
-#
-# CONFIG_PHONE is not set
-
-#
-# Input device support
-#
-CONFIG_INPUT=y
-
-#
-# Userland interfaces
-#
-CONFIG_INPUT_MOUSEDEV=y
-# CONFIG_INPUT_MOUSEDEV_PSAUX is not set
-CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
-CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
-CONFIG_INPUT_JOYDEV=m
-# CONFIG_INPUT_TSDEV is not set
-CONFIG_INPUT_EVDEV=y
-# CONFIG_INPUT_EVBUG is not set
-
-#
-# Input I/O drivers
-#
-CONFIG_GAMEPORT=m
-CONFIG_SOUND_GAMEPORT=m
-CONFIG_GAMEPORT_NS558=m
-CONFIG_GAMEPORT_L4=m
-CONFIG_GAMEPORT_EMU10K1=m
-CONFIG_GAMEPORT_VORTEX=m
-CONFIG_GAMEPORT_FM801=m
-CONFIG_GAMEPORT_CS461x=m
-CONFIG_SERIO=y
-CONFIG_SERIO_I8042=y
-CONFIG_SERIO_SERPORT=y
-# CONFIG_SERIO_CT82C710 is not set
-# CONFIG_SERIO_PARKBD is not set
-# CONFIG_SERIO_PCIPS2 is not set
-
-#
-# Input Device Drivers
-#
-CONFIG_INPUT_KEYBOARD=y
-CONFIG_KEYBOARD_ATKBD=y
-# CONFIG_KEYBOARD_SUNKBD is not set
-# CONFIG_KEYBOARD_LKKBD is not set
-# CONFIG_KEYBOARD_XTKBD is not set
-# CONFIG_KEYBOARD_NEWTON is not set
-CONFIG_INPUT_MOUSE=y
-CONFIG_MOUSE_PS2=y
-CONFIG_MOUSE_SERIAL=m
-CONFIG_MOUSE_INPORT=m
-CONFIG_MOUSE_ATIXL=y
-CONFIG_MOUSE_LOGIBM=m
-CONFIG_MOUSE_PC110PAD=m
-CONFIG_MOUSE_VSXXXAA=m
-CONFIG_INPUT_JOYSTICK=y
-CONFIG_JOYSTICK_ANALOG=m
-CONFIG_JOYSTICK_A3D=m
-CONFIG_JOYSTICK_ADI=m
-CONFIG_JOYSTICK_COBRA=m
-CONFIG_JOYSTICK_GF2K=m
-CONFIG_JOYSTICK_GRIP=m
-CONFIG_JOYSTICK_GRIP_MP=m
-CONFIG_JOYSTICK_GUILLEMOT=m
-CONFIG_JOYSTICK_INTERACT=m
-CONFIG_JOYSTICK_SIDEWINDER=m
-CONFIG_JOYSTICK_TMDC=m
-CONFIG_JOYSTICK_IFORCE=m
-CONFIG_JOYSTICK_IFORCE_USB=y
-CONFIG_JOYSTICK_IFORCE_232=y
-CONFIG_JOYSTICK_WARRIOR=m
-CONFIG_JOYSTICK_MAGELLAN=m
-CONFIG_JOYSTICK_SPACEORB=m
-CONFIG_JOYSTICK_SPACEBALL=m
-CONFIG_JOYSTICK_STINGER=m
-CONFIG_JOYSTICK_TWIDDLER=m
-CONFIG_JOYSTICK_DB9=m
-CONFIG_JOYSTICK_GAMECON=m
-CONFIG_JOYSTICK_TURBOGRAFX=m
-# CONFIG_INPUT_JOYDUMP is not set
-CONFIG_INPUT_TOUCHSCREEN=y
-CONFIG_TOUCHSCREEN_GUNZE=m
-CONFIG_INPUT_MISC=y
-CONFIG_INPUT_PCSPKR=m
-# CONFIG_INPUT_UINPUT is not set
-
-#
-# Character devices
-#
-CONFIG_VT=y
-CONFIG_VT_CONSOLE=y
-CONFIG_HW_CONSOLE=y
-CONFIG_SERIAL_NONSTANDARD=y
-# CONFIG_COMPUTONE is not set
-CONFIG_ROCKETPORT=m
-# CONFIG_CYCLADES is not set
-# CONFIG_DIGIEPCA is not set
-# CONFIG_DIGI is not set
-# CONFIG_ESPSERIAL is not set
-# CONFIG_MOXA_INTELLIO is not set
-# CONFIG_MOXA_SMARTIO is not set
-# CONFIG_ISI is not set
-CONFIG_SYNCLINK=m
-CONFIG_SYNCLINKMP=m
-CONFIG_N_HDLC=m
-# CONFIG_RISCOM8 is not set
-# CONFIG_SPECIALIX is not set
-# CONFIG_SX is not set
-# CONFIG_RIO is not set
-CONFIG_STALDRV=y
-# CONFIG_STALLION is not set
-# CONFIG_ISTALLION is not set
-
-#
-# Serial drivers
-#
-CONFIG_SERIAL_8250=y
-CONFIG_SERIAL_8250_CONSOLE=y
-CONFIG_SERIAL_8250_CS=m
-# CONFIG_SERIAL_8250_ACPI is not set
-CONFIG_SERIAL_8250_NR_UARTS=4
-CONFIG_SERIAL_8250_EXTENDED=y
-# CONFIG_SERIAL_8250_MANY_PORTS is not set
-CONFIG_SERIAL_8250_SHARE_IRQ=y
-CONFIG_SERIAL_8250_DETECT_IRQ=y
-CONFIG_SERIAL_8250_MULTIPORT=y
-CONFIG_SERIAL_8250_RSA=y
-
-#
-# Non-8250 serial port support
-#
-CONFIG_SERIAL_CORE=y
-CONFIG_SERIAL_CORE_CONSOLE=y
-CONFIG_UNIX98_PTYS=y
-# CONFIG_LEGACY_PTYS is not set
-CONFIG_CRASH=m
-CONFIG_PRINTER=m
-CONFIG_LP_CONSOLE=y
-CONFIG_PPDEV=m
-CONFIG_TIPAR=m
-# CONFIG_QIC02_TAPE is not set
-
-#
-# IPMI
-#
-CONFIG_IPMI_HANDLER=m
-# CONFIG_IPMI_PANIC_EVENT is not set
-CONFIG_IPMI_DEVICE_INTERFACE=m
-CONFIG_IPMI_SI=m
-CONFIG_IPMI_WATCHDOG=m
-
-#
-# Watchdog Cards
-#
-CONFIG_WATCHDOG=y
-# CONFIG_WATCHDOG_NOWAYOUT is not set
-
-#
-# Watchdog Device Drivers
-#
-CONFIG_SOFT_WATCHDOG=m
-CONFIG_ACQUIRE_WDT=m
-CONFIG_ADVANTECH_WDT=m
-CONFIG_ALIM1535_WDT=m
-CONFIG_ALIM7101_WDT=m
-CONFIG_SC520_WDT=m
-CONFIG_EUROTECH_WDT=m
-CONFIG_IB700_WDT=m
-CONFIG_WAFER_WDT=m
-CONFIG_I8XX_TCO=m
-CONFIG_SC1200_WDT=m
-# CONFIG_SCx200_WDT is not set
-# CONFIG_60XX_WDT is not set
-CONFIG_CPU5_WDT=m
-CONFIG_W83627HF_WDT=m
-CONFIG_W83877F_WDT=m
-CONFIG_MACHZ_WDT=m
-
-#
-# ISA-based Watchdog Cards
-#
-CONFIG_PCWATCHDOG=m
-# CONFIG_MIXCOMWD is not set
-CONFIG_WDT=m
-# CONFIG_WDT_501 is not set
-
-#
-# PCI-based Watchdog Cards
-#
-CONFIG_PCIPCWATCHDOG=m
-CONFIG_WDTPCI=m
-CONFIG_WDT_501_PCI=y
-
-#
-# USB-based Watchdog Cards
-#
-CONFIG_USBPCWATCHDOG=m
-CONFIG_HW_RANDOM=m
-CONFIG_NVRAM=m
-CONFIG_RTC=y
-CONFIG_DTLK=m
-CONFIG_R3964=m
-# CONFIG_APPLICOM is not set
-CONFIG_SONYPI=m
-
-#
-# Ftape, the floppy tape device driver
-#
-# CONFIG_FTAPE is not set
-CONFIG_AGP=y
-CONFIG_AGP_ALI=y
-CONFIG_AGP_ATI=y
-CONFIG_AGP_AMD=y
-CONFIG_AGP_AMD64=y
-CONFIG_AGP_INTEL=y
-CONFIG_AGP_INTEL_MCH=y
-CONFIG_AGP_NVIDIA=y
-CONFIG_AGP_SIS=y
-CONFIG_AGP_SWORKS=y
-CONFIG_AGP_VIA=y
-CONFIG_AGP_EFFICEON=y
-CONFIG_DRM=y
-CONFIG_DRM_TDFX=m
-CONFIG_DRM_GAMMA=m
-CONFIG_DRM_R128=m
-CONFIG_DRM_RADEON=m
-CONFIG_DRM_I810=m
-CONFIG_DRM_I830=m
-CONFIG_DRM_MGA=m
-CONFIG_DRM_SIS=m
-
-#
-# PCMCIA character devices
-#
-CONFIG_SYNCLINK_CS=m
-CONFIG_MWAVE=m
-# CONFIG_RAW_DRIVER is not set
-CONFIG_HANGCHECK_TIMER=m
-
-#
-# I2C support
-#
-CONFIG_I2C=m
-CONFIG_I2C_CHARDEV=m
-
-#
-# I2C Algorithms
-#
-CONFIG_I2C_ALGOBIT=m
-CONFIG_I2C_ALGOPCF=m
-
-#
-# I2C Hardware Bus support
-#
-CONFIG_I2C_ALI1535=m
-CONFIG_I2C_ALI1563=m
-CONFIG_I2C_ALI15X3=m
-CONFIG_I2C_AMD756=m
-CONFIG_I2C_AMD8111=m
-# CONFIG_I2C_ELEKTOR is not set
-CONFIG_I2C_I801=m
-CONFIG_I2C_I810=m
-CONFIG_I2C_ISA=m
-CONFIG_I2C_NFORCE2=m
-# CONFIG_I2C_PARPORT is not set
-# CONFIG_I2C_PARPORT_LIGHT is not set
-CONFIG_I2C_PIIX4=m
-CONFIG_I2C_PROSAVAGE=m
-CONFIG_I2C_SAVAGE4=m
-# CONFIG_SCx200_ACB is not set
-CONFIG_I2C_SIS5595=m
-CONFIG_I2C_SIS630=m
-CONFIG_I2C_SIS96X=m
-CONFIG_I2C_VIA=m
-CONFIG_I2C_VIAPRO=m
-CONFIG_I2C_VOODOO3=m
-
-#
-# Hardware Sensors Chip support
-#
-CONFIG_I2C_SENSOR=m
-CONFIG_SENSORS_ADM1021=m
-CONFIG_SENSORS_ASB100=m
-CONFIG_SENSORS_DS1621=m
-CONFIG_SENSORS_FSCHER=m
-CONFIG_SENSORS_GL518SM=m
-CONFIG_SENSORS_IT87=m
-CONFIG_SENSORS_LM75=m
-CONFIG_SENSORS_LM78=m
-CONFIG_SENSORS_LM80=m
-CONFIG_SENSORS_LM83=m
-CONFIG_SENSORS_LM85=m
-CONFIG_SENSORS_LM90=m
-CONFIG_SENSORS_MAX1619=m
-CONFIG_SENSORS_VIA686A=m
-CONFIG_SENSORS_W83781D=m
-CONFIG_SENSORS_W83L785TS=m
-CONFIG_SENSORS_W83627HF=m
-
-#
-# Other I2C Chip support
-#
-CONFIG_SENSORS_EEPROM=m
-CONFIG_SENSORS_PCF8574=m
-CONFIG_SENSORS_PCF8591=m
-CONFIG_SENSORS_RTC8564=m
-# CONFIG_I2C_DEBUG_CORE is not set
-# CONFIG_I2C_DEBUG_ALGO is not set
-# CONFIG_I2C_DEBUG_BUS is not set
-# CONFIG_I2C_DEBUG_CHIP is not set
-
-#
-# Misc devices
-#
-CONFIG_IBM_ASM=m
-
-#
-# Multimedia devices
-#
-CONFIG_VIDEO_DEV=m
-
-#
-# Video For Linux
-#
-
-#
-# Video Adapters
-#
-CONFIG_VIDEO_BT848=m
-CONFIG_VIDEO_PMS=m
-CONFIG_VIDEO_BWQCAM=m
-CONFIG_VIDEO_CQCAM=m
-CONFIG_VIDEO_W9966=m
-CONFIG_VIDEO_CPIA=m
-CONFIG_VIDEO_CPIA_PP=m
-CONFIG_VIDEO_CPIA_USB=m
-CONFIG_VIDEO_SAA5246A=m
-CONFIG_VIDEO_SAA5249=m
-CONFIG_TUNER_3036=m
-CONFIG_VIDEO_STRADIS=m
-CONFIG_VIDEO_ZORAN=m
-CONFIG_VIDEO_ZORAN_BUZ=m
-CONFIG_VIDEO_ZORAN_DC10=m
-CONFIG_VIDEO_ZORAN_DC30=m
-CONFIG_VIDEO_ZORAN_LML33=m
-CONFIG_VIDEO_ZORAN_LML33R10=m
-CONFIG_VIDEO_MEYE=m
-CONFIG_VIDEO_SAA7134=m
-CONFIG_VIDEO_MXB=m
-CONFIG_VIDEO_DPC=m
-CONFIG_VIDEO_HEXIUM_ORION=m
-CONFIG_VIDEO_HEXIUM_GEMINI=m
-CONFIG_VIDEO_CX88=m
-
-#
-# Radio Adapters
-#
-CONFIG_RADIO_CADET=m
-CONFIG_RADIO_RTRACK=m
-CONFIG_RADIO_RTRACK2=m
-CONFIG_RADIO_AZTECH=m
-CONFIG_RADIO_GEMTEK=m
-CONFIG_RADIO_GEMTEK_PCI=m
-CONFIG_RADIO_MAXIRADIO=m
-CONFIG_RADIO_MAESTRO=m
-CONFIG_RADIO_SF16FMI=m
-CONFIG_RADIO_SF16FMR2=m
-CONFIG_RADIO_TERRATEC=m
-CONFIG_RADIO_TRUST=m
-CONFIG_RADIO_TYPHOON=m
-CONFIG_RADIO_TYPHOON_PROC_FS=y
-CONFIG_RADIO_ZOLTRIX=m
-
-#
-# Digital Video Broadcasting Devices
-#
-# CONFIG_DVB is not set
-CONFIG_VIDEO_SAA7146=m
-CONFIG_VIDEO_SAA7146_VV=m
-CONFIG_VIDEO_VIDEOBUF=m
-CONFIG_VIDEO_TUNER=m
-CONFIG_VIDEO_BUF=m
-CONFIG_VIDEO_BTCX=m
-CONFIG_VIDEO_IR=m
-
-#
-# Graphics support
-#
-CONFIG_FB=y
-# CONFIG_FB_PM2 is not set
-# CONFIG_FB_CYBER2000 is not set
-# CONFIG_FB_ASILIANT is not set
-# CONFIG_FB_IMSTT is not set
-CONFIG_FB_VGA16=m
-CONFIG_FB_VESA=y
-CONFIG_VIDEO_SELECT=y
-CONFIG_FB_HGA=m
-CONFIG_FB_HGA_ACCEL=y
-CONFIG_FB_RIVA=m
-CONFIG_FB_I810=m
-CONFIG_FB_I810_GTF=y
-CONFIG_FB_MATROX=m
-CONFIG_FB_MATROX_MILLENIUM=y
-CONFIG_FB_MATROX_MYSTIQUE=y
-CONFIG_FB_MATROX_G450=y
-CONFIG_FB_MATROX_G100=y
-CONFIG_FB_MATROX_I2C=m
-CONFIG_FB_MATROX_MAVEN=m
-CONFIG_FB_MATROX_MULTIHEAD=y
-# CONFIG_FB_RADEON_OLD is not set
-CONFIG_FB_RADEON=m
-CONFIG_FB_RADEON_I2C=y
-# CONFIG_FB_RADEON_DEBUG is not set
-CONFIG_FB_ATY128=m
-CONFIG_FB_ATY=m
-CONFIG_FB_ATY_CT=y
-CONFIG_FB_ATY_GX=y
-# CONFIG_FB_ATY_XL_INIT is not set
-# CONFIG_FB_SIS is not set
-CONFIG_FB_NEOMAGIC=m
-CONFIG_FB_KYRO=m
-CONFIG_FB_3DFX=m
-CONFIG_FB_3DFX_ACCEL=y
-CONFIG_FB_VOODOO1=m
-CONFIG_FB_TRIDENT=m
-CONFIG_FB_TRIDENT_ACCEL=y
-# CONFIG_FB_VIRTUAL is not set
-
-#
-# Console display driver support
-#
-CONFIG_VGA_CONSOLE=y
-CONFIG_MDA_CONSOLE=m
-CONFIG_DUMMY_CONSOLE=y
-CONFIG_FRAMEBUFFER_CONSOLE=y
-CONFIG_PCI_CONSOLE=y
-# CONFIG_FONTS is not set
-CONFIG_FONT_8x8=y
-CONFIG_FONT_8x16=y
-
-#
-# Logo configuration
-#
-CONFIG_LOGO=y
-# CONFIG_LOGO_LINUX_MONO is not set
-# CONFIG_LOGO_LINUX_VGA16 is not set
-CONFIG_LOGO_LINUX_CLUT224=y
-
-#
-# Sound
-#
-CONFIG_SOUND=m
-
-#
-# Advanced Linux Sound Architecture
-#
-CONFIG_SND=m
-CONFIG_SND_TIMER=m
-CONFIG_SND_PCM=m
-CONFIG_SND_HWDEP=m
-CONFIG_SND_RAWMIDI=m
-CONFIG_SND_SEQUENCER=m
-CONFIG_SND_SEQ_DUMMY=m
-CONFIG_SND_OSSEMUL=y
-CONFIG_SND_MIXER_OSS=m
-CONFIG_SND_PCM_OSS=m
-CONFIG_SND_SEQUENCER_OSS=y
-CONFIG_SND_RTCTIMER=m
-# CONFIG_SND_VERBOSE_PRINTK is not set
-# CONFIG_SND_DEBUG is not set
-
-#
-# Generic devices
-#
-CONFIG_SND_MPU401_UART=m
-CONFIG_SND_OPL3_LIB=m
-CONFIG_SND_OPL4_LIB=m
-CONFIG_SND_VX_LIB=m
-CONFIG_SND_DUMMY=m
-CONFIG_SND_VIRMIDI=m
-CONFIG_SND_MTPAV=m
-# CONFIG_SND_SERIAL_U16550 is not set
-CONFIG_SND_MPU401=m
-
-#
-# ISA devices
-#
-CONFIG_SND_AD1816A=m
-CONFIG_SND_AD1848=m
-CONFIG_SND_CS4231=m
-CONFIG_SND_CS4232=m
-CONFIG_SND_CS4236=m
-CONFIG_SND_ES968=m
-CONFIG_SND_ES1688=m
-CONFIG_SND_ES18XX=m
-CONFIG_SND_GUSCLASSIC=m
-CONFIG_SND_GUSEXTREME=m
-CONFIG_SND_GUSMAX=m
-CONFIG_SND_INTERWAVE=m
-CONFIG_SND_INTERWAVE_STB=m
-CONFIG_SND_OPTI92X_AD1848=m
-CONFIG_SND_OPTI92X_CS4231=m
-CONFIG_SND_OPTI93X=m
-CONFIG_SND_SB8=m
-CONFIG_SND_SB16=m
-CONFIG_SND_SBAWE=m
-CONFIG_SND_SB16_CSP=y
-# CONFIG_SND_WAVEFRONT is not set
-CONFIG_SND_ALS100=m
-CONFIG_SND_AZT2320=m
-CONFIG_SND_CMI8330=m
-CONFIG_SND_DT019X=m
-CONFIG_SND_OPL3SA2=m
-CONFIG_SND_SGALAXY=m
-CONFIG_SND_SSCAPE=m
-
-#
-# PCI devices
-#
-CONFIG_SND_AC97_CODEC=m
-CONFIG_SND_ALI5451=m
-CONFIG_SND_ATIIXP=m
-CONFIG_SND_AU8810=m
-CONFIG_SND_AU8820=m
-CONFIG_SND_AU8830=m
-CONFIG_SND_AZT3328=m
-CONFIG_SND_BT87X=m
-CONFIG_SND_CS46XX=m
-CONFIG_SND_CS46XX_NEW_DSP=y
-CONFIG_SND_CS4281=m
-CONFIG_SND_EMU10K1=m
-CONFIG_SND_KORG1212=m
-CONFIG_SND_MIXART=m
-CONFIG_SND_NM256=m
-CONFIG_SND_RME32=m
-CONFIG_SND_RME96=m
-CONFIG_SND_RME9652=m
-CONFIG_SND_HDSP=m
-CONFIG_SND_TRIDENT=m
-CONFIG_SND_YMFPCI=m
-CONFIG_SND_ALS4000=m
-CONFIG_SND_CMIPCI=m
-CONFIG_SND_ENS1370=m
-CONFIG_SND_ENS1371=m
-CONFIG_SND_ES1938=m
-CONFIG_SND_ES1968=m
-CONFIG_SND_MAESTRO3=m
-CONFIG_SND_FM801=m
-CONFIG_SND_FM801_TEA575X=m
-CONFIG_SND_ICE1712=m
-CONFIG_SND_ICE1724=m
-CONFIG_SND_INTEL8X0=m
-CONFIG_SND_INTEL8X0M=m
-CONFIG_SND_SONICVIBES=m
-CONFIG_SND_VIA82XX=m
-CONFIG_SND_VX222=m
-
-#
-# ALSA USB devices
-#
-CONFIG_SND_USB_AUDIO=m
-
-#
-# PCMCIA devices
-#
-# CONFIG_SND_VXPOCKET is not set
-# CONFIG_SND_VXP440 is not set
-CONFIG_SND_PDAUDIOCF=m
-
-#
-# Open Sound System
-#
-# CONFIG_SOUND_PRIME is not set
-
-#
-# USB support
-#
-CONFIG_USB=y
-# CONFIG_USB_DEBUG is not set
-
-#
-# Miscellaneous USB options
-#
-CONFIG_USB_DEVICEFS=y
-# CONFIG_USB_BANDWIDTH is not set
-# CONFIG_USB_DYNAMIC_MINORS is not set
-
-#
-# USB Host Controller Drivers
-#
-CONFIG_USB_EHCI_HCD=m
-CONFIG_USB_EHCI_SPLIT_ISO=y
-CONFIG_USB_EHCI_ROOT_HUB_TT=y
-CONFIG_USB_OHCI_HCD=m
-CONFIG_USB_UHCI_HCD=m
-
-#
-# USB Device Class drivers
-#
-CONFIG_USB_AUDIO=m
-
-#
-# USB Bluetooth TTY can only be used with disabled Bluetooth subsystem
-#
-CONFIG_USB_MIDI=m
-CONFIG_USB_ACM=m
-CONFIG_USB_PRINTER=m
-CONFIG_USB_STORAGE=m
-# CONFIG_USB_STORAGE_DEBUG is not set
-CONFIG_USB_STORAGE_DATAFAB=y
-CONFIG_USB_STORAGE_FREECOM=y
-CONFIG_USB_STORAGE_ISD200=y
-CONFIG_USB_STORAGE_DPCM=y
-CONFIG_USB_STORAGE_HP8200e=y
-CONFIG_USB_STORAGE_SDDR09=y
-CONFIG_USB_STORAGE_SDDR55=y
-CONFIG_USB_STORAGE_JUMPSHOT=y
-
-#
-# USB Human Interface Devices (HID)
-#
-CONFIG_USB_HID=y
-CONFIG_USB_HIDINPUT=y
-CONFIG_HID_FF=y
-CONFIG_HID_PID=y
-CONFIG_LOGITECH_FF=y
-CONFIG_THRUSTMASTER_FF=y
-CONFIG_USB_HIDDEV=y
-CONFIG_USB_AIPTEK=m
-CONFIG_USB_WACOM=m
-CONFIG_USB_KBTAB=m
-CONFIG_USB_POWERMATE=m
-CONFIG_USB_MTOUCH=m
-CONFIG_USB_EGALAX=m
-CONFIG_USB_XPAD=m
-CONFIG_USB_ATI_REMOTE=m
-
-#
-# USB Imaging devices
-#
-CONFIG_USB_MDC800=m
-CONFIG_USB_MICROTEK=m
-CONFIG_USB_HPUSBSCSI=m
-
-#
-# USB Multimedia devices
-#
-CONFIG_USB_DABUSB=m
-CONFIG_USB_VICAM=m
-CONFIG_USB_DSBR=m
-CONFIG_USB_IBMCAM=m
-CONFIG_USB_KONICAWC=m
-CONFIG_USB_OV511=m
-CONFIG_USB_SE401=m
-CONFIG_USB_STV680=m
-CONFIG_USB_W9968CF=m
-
-#
-# USB Network adaptors
-#
-CONFIG_USB_CATC=m
-CONFIG_USB_KAWETH=m
-CONFIG_USB_PEGASUS=m
-CONFIG_USB_RTL8150=m
-CONFIG_USB_USBNET=m
-
-#
-# USB Host-to-Host Cables
-#
-CONFIG_USB_ALI_M5632=y
-CONFIG_USB_AN2720=y
-CONFIG_USB_BELKIN=y
-CONFIG_USB_GENESYS=y
-CONFIG_USB_NET1080=y
-CONFIG_USB_PL2301=y
-
-#
-# Intelligent USB Devices/Gadgets
-#
-CONFIG_USB_ARMLINUX=y
-CONFIG_USB_EPSON2888=y
-CONFIG_USB_ZAURUS=y
-CONFIG_USB_CDCETHER=y
-
-#
-# USB Network Adapters
-#
-CONFIG_USB_AX8817X=y
-
-#
-# USB port drivers
-#
-CONFIG_USB_USS720=m
-
-#
-# USB Serial Converter support
-#
-CONFIG_USB_SERIAL=m
-CONFIG_USB_SERIAL_GENERIC=y
-CONFIG_USB_SERIAL_BELKIN=m
-CONFIG_USB_SERIAL_WHITEHEAT=m
-CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m
-CONFIG_USB_SERIAL_EMPEG=m
-CONFIG_USB_SERIAL_FTDI_SIO=m
-CONFIG_USB_SERIAL_VISOR=m
-CONFIG_USB_SERIAL_IPAQ=m
-CONFIG_USB_SERIAL_IR=m
-CONFIG_USB_SERIAL_EDGEPORT=m
-CONFIG_USB_SERIAL_EDGEPORT_TI=m
-CONFIG_USB_SERIAL_KEYSPAN_PDA=m
-CONFIG_USB_SERIAL_KEYSPAN=m
-CONFIG_USB_SERIAL_KEYSPAN_MPR=y
-CONFIG_USB_SERIAL_KEYSPAN_USA28=y
-CONFIG_USB_SERIAL_KEYSPAN_USA28X=y
-CONFIG_USB_SERIAL_KEYSPAN_USA28XA=y
-CONFIG_USB_SERIAL_KEYSPAN_USA28XB=y
-CONFIG_USB_SERIAL_KEYSPAN_USA19=y
-CONFIG_USB_SERIAL_KEYSPAN_USA18X=y
-CONFIG_USB_SERIAL_KEYSPAN_USA19W=y
-CONFIG_USB_SERIAL_KEYSPAN_USA19QW=y
-CONFIG_USB_SERIAL_KEYSPAN_USA19QI=y
-CONFIG_USB_SERIAL_KEYSPAN_USA49W=y
-CONFIG_USB_SERIAL_KEYSPAN_USA49WLC=y
-CONFIG_USB_SERIAL_KLSI=m
-CONFIG_USB_SERIAL_KOBIL_SCT=m
-CONFIG_USB_SERIAL_MCT_U232=m
-CONFIG_USB_SERIAL_PL2303=m
-CONFIG_USB_SERIAL_SAFE=m
-CONFIG_USB_SERIAL_SAFE_PADDED=y
-CONFIG_USB_SERIAL_CYBERJACK=m
-CONFIG_USB_SERIAL_XIRCOM=m
-CONFIG_USB_SERIAL_OMNINET=m
-CONFIG_USB_EZUSB=y
-
-#
-# USB Miscellaneous drivers
-#
-CONFIG_USB_EMI62=m
-# CONFIG_USB_EMI26 is not set
-CONFIG_USB_TIGL=m
-CONFIG_USB_AUERSWALD=m
-CONFIG_USB_RIO500=m
-CONFIG_USB_LEGOTOWER=m
-CONFIG_USB_LCD=m
-CONFIG_USB_LED=m
-# CONFIG_USB_CYTHERM is not set
-CONFIG_USB_PHIDGETSERVO=m
-CONFIG_USB_TEST=m
-
-#
-# USB Gadget Support
-#
-# CONFIG_USB_GADGET is not set
-
-#
-# File systems
-#
-CONFIG_EXT2_FS=y
-CONFIG_EXT2_FS_XATTR=y
-CONFIG_EXT2_FS_POSIX_ACL=y
-CONFIG_EXT2_FS_SECURITY=y
-CONFIG_EXT3_FS=m
-CONFIG_EXT3_FS_XATTR=y
-CONFIG_EXT3_FS_POSIX_ACL=y
-CONFIG_EXT3_FS_SECURITY=y
-CONFIG_JBD=m
-# CONFIG_JBD_DEBUG is not set
-CONFIG_FS_MBCACHE=y
-CONFIG_REISERFS_FS=m
-# CONFIG_REISERFS_CHECK is not set
-CONFIG_REISERFS_PROC_INFO=y
-CONFIG_REISERFS_FS_XATTR=y
-CONFIG_REISERFS_FS_POSIX_ACL=y
-CONFIG_REISERFS_FS_SECURITY=y
-CONFIG_JFS_FS=m
-CONFIG_JFS_POSIX_ACL=y
-# CONFIG_JFS_DEBUG is not set
-# CONFIG_JFS_STATISTICS is not set
-CONFIG_FS_POSIX_ACL=y
-CONFIG_XFS_FS=m
-# CONFIG_XFS_RT is not set
-CONFIG_XFS_QUOTA=y
-CONFIG_XFS_SECURITY=y
-CONFIG_XFS_POSIX_ACL=y
-CONFIG_MINIX_FS=m
-CONFIG_ROMFS_FS=m
-CONFIG_QUOTA=y
-# CONFIG_QFMT_V1 is not set
-CONFIG_QFMT_V2=y
-CONFIG_QUOTACTL=y
-CONFIG_AUTOFS_FS=m
-CONFIG_AUTOFS4_FS=m
-
-#
-# CD-ROM/DVD Filesystems
-#
-CONFIG_ISO9660_FS=y
-CONFIG_JOLIET=y
-CONFIG_ZISOFS=y
-CONFIG_ZISOFS_FS=y
-CONFIG_UDF_FS=m
-
-#
-# DOS/FAT/NT Filesystems
-#
-CONFIG_FAT_FS=m
-CONFIG_MSDOS_FS=m
-CONFIG_VFAT_FS=m
-# CONFIG_NTFS_FS is not set
-
-#
-# Pseudo filesystems
-#
-CONFIG_PROC_FS=y
-CONFIG_PROC_KCORE=y
-CONFIG_SYSFS=y
-# CONFIG_DEVFS_FS is not set
-CONFIG_DEVPTS_FS_XATTR=y
-CONFIG_DEVPTS_FS_SECURITY=y
-CONFIG_TMPFS=y
-CONFIG_HUGETLBFS=y
-CONFIG_HUGETLB_PAGE=y
-CONFIG_RAMFS=y
-
-#
-# Miscellaneous filesystems
-#
-# CONFIG_ADFS_FS is not set
-CONFIG_AFFS_FS=m
-CONFIG_HFS_FS=m
-CONFIG_HFSPLUS_FS=m
-CONFIG_BEFS_FS=m
-# CONFIG_BEFS_DEBUG is not set
-CONFIG_BFS_FS=m
-CONFIG_EFS_FS=m
-# CONFIG_JFFS_FS is not set
-CONFIG_JFFS2_FS=m
-CONFIG_JFFS2_FS_DEBUG=0
-CONFIG_JFFS2_FS_NAND=y
-CONFIG_CRAMFS=m
-CONFIG_VXFS_FS=m
-# CONFIG_HPFS_FS is not set
-CONFIG_QNX4FS_FS=m
-# CONFIG_QNX4FS_RW is not set
-CONFIG_SYSV_FS=m
-CONFIG_UFS_FS=m
-# CONFIG_UFS_FS_WRITE is not set
-
-#
-# Network File Systems
-#
-CONFIG_NFS_FS=m
-CONFIG_NFS_V3=y
-CONFIG_NFS_V4=y
-CONFIG_NFS_DIRECTIO=y
-CONFIG_NFSD=m
-CONFIG_NFSD_V3=y
-CONFIG_NFSD_V4=y
-CONFIG_NFSD_TCP=y
-CONFIG_LOCKD=m
-CONFIG_LOCKD_V4=y
-CONFIG_EXPORTFS=m
-CONFIG_SUNRPC=m
-CONFIG_SUNRPC_GSS=m
-CONFIG_RPCSEC_GSS_KRB5=m
-CONFIG_SMB_FS=m
-# CONFIG_SMB_NLS_DEFAULT is not set
-CONFIG_CIFS=m
-# CONFIG_CIFS_STATS is not set
-CONFIG_NCP_FS=m
-CONFIG_NCPFS_PACKET_SIGNING=y
-CONFIG_NCPFS_IOCTL_LOCKING=y
-CONFIG_NCPFS_STRONG=y
-CONFIG_NCPFS_NFS_NS=y
-CONFIG_NCPFS_OS2_NS=y
-CONFIG_NCPFS_SMALLDOS=y
-CONFIG_NCPFS_NLS=y
-CONFIG_NCPFS_EXTRAS=y
-# CONFIG_CODA_FS is not set
-# CONFIG_AFS_FS is not set
-
-#
-# Partition Types
-#
-CONFIG_PARTITION_ADVANCED=y
-# CONFIG_ACORN_PARTITION is not set
-CONFIG_OSF_PARTITION=y
-# CONFIG_AMIGA_PARTITION is not set
-# CONFIG_ATARI_PARTITION is not set
-CONFIG_MAC_PARTITION=y
-CONFIG_MSDOS_PARTITION=y
-CONFIG_BSD_DISKLABEL=y
-CONFIG_MINIX_SUBPARTITION=y
-CONFIG_SOLARIS_X86_PARTITION=y
-CONFIG_UNIXWARE_DISKLABEL=y
-# CONFIG_LDM_PARTITION is not set
-# CONFIG_NEC98_PARTITION is not set
-CONFIG_SGI_PARTITION=y
-# CONFIG_ULTRIX_PARTITION is not set
-CONFIG_SUN_PARTITION=y
-CONFIG_EFI_PARTITION=y
-
-#
-# Native Language Support
-#
-CONFIG_NLS=y
-CONFIG_NLS_DEFAULT="utf8"
-CONFIG_NLS_CODEPAGE_437=m
-CONFIG_NLS_CODEPAGE_737=m
-CONFIG_NLS_CODEPAGE_775=m
-CONFIG_NLS_CODEPAGE_850=m
-CONFIG_NLS_CODEPAGE_852=m
-CONFIG_NLS_CODEPAGE_855=m
-CONFIG_NLS_CODEPAGE_857=m
-CONFIG_NLS_CODEPAGE_860=m
-CONFIG_NLS_CODEPAGE_861=m
-CONFIG_NLS_CODEPAGE_862=m
-CONFIG_NLS_CODEPAGE_863=m
-CONFIG_NLS_CODEPAGE_864=m
-CONFIG_NLS_CODEPAGE_865=m
-CONFIG_NLS_CODEPAGE_866=m
-CONFIG_NLS_CODEPAGE_869=m
-CONFIG_NLS_CODEPAGE_936=m
-CONFIG_NLS_CODEPAGE_950=m
-CONFIG_NLS_CODEPAGE_932=m
-CONFIG_NLS_CODEPAGE_949=m
-CONFIG_NLS_CODEPAGE_874=m
-CONFIG_NLS_ISO8859_8=m
-CONFIG_NLS_CODEPAGE_1250=m
-CONFIG_NLS_CODEPAGE_1251=m
-CONFIG_NLS_ISO8859_1=m
-CONFIG_NLS_ISO8859_2=m
-CONFIG_NLS_ISO8859_3=m
-CONFIG_NLS_ISO8859_4=m
-CONFIG_NLS_ISO8859_5=m
-CONFIG_NLS_ISO8859_6=m
-CONFIG_NLS_ISO8859_7=m
-CONFIG_NLS_ISO8859_9=m
-CONFIG_NLS_ISO8859_13=m
-CONFIG_NLS_ISO8859_14=m
-CONFIG_NLS_ISO8859_15=m
-CONFIG_NLS_KOI8_R=m
-CONFIG_NLS_KOI8_U=m
-CONFIG_NLS_UTF8=m
-
-#
-# Profiling support
-#
-# CONFIG_PROFILING is not set
-
-#
-# Kernel hacking
-#
-CONFIG_DEBUG_KERNEL=y
-CONFIG_EARLY_PRINTK=y
-CONFIG_DEBUG_STACKOVERFLOW=y
-# CONFIG_DEBUG_STACK_USAGE is not set
-# CONFIG_DEBUG_SLAB is not set
-CONFIG_MAGIC_SYSRQ=y
-# CONFIG_DEBUG_SPINLOCK is not set
-# CONFIG_DEBUG_PAGEALLOC is not set
-# CONFIG_DEBUG_HIGHMEM is not set
-CONFIG_DEBUG_INFO=y
-CONFIG_DEBUG_SPINLOCK_SLEEP=y
-# CONFIG_FRAME_POINTER is not set
-
-#
-# Security options
-#
-CONFIG_SECURITY=y
-CONFIG_SECURITY_NETWORK=y
-CONFIG_SECURITY_CAPABILITIES=y
-# CONFIG_SECURITY_ROOTPLUG is not set
-CONFIG_SECURITY_SELINUX=y
-CONFIG_SECURITY_SELINUX_BOOTPARAM=y
-CONFIG_SECURITY_SELINUX_DISABLE=y
-CONFIG_SECURITY_SELINUX_DEVELOP=y
-# CONFIG_SECURITY_SELINUX_MLS is not set
-
-#
-# Cryptographic options
-#
-CONFIG_CRYPTO=y
-CONFIG_CRYPTO_HMAC=y
-CONFIG_CRYPTO_NULL=m
-CONFIG_CRYPTO_MD4=m
-CONFIG_CRYPTO_MD5=y
-CONFIG_CRYPTO_SHA1=m
-CONFIG_CRYPTO_SHA256=m
-CONFIG_CRYPTO_SHA512=m
-CONFIG_CRYPTO_DES=m
-CONFIG_CRYPTO_BLOWFISH=m
-CONFIG_CRYPTO_TWOFISH=m
-CONFIG_CRYPTO_SERPENT=m
-CONFIG_CRYPTO_AES=m
-CONFIG_CRYPTO_CAST5=m
-CONFIG_CRYPTO_CAST6=m
-CONFIG_CRYPTO_ARC4=m
-CONFIG_CRYPTO_DEFLATE=m
-CONFIG_CRYPTO_MICHAEL_MIC=m
-CONFIG_CRYPTO_CRC32C=m
-# CONFIG_CRYPTO_TEST is not set
-
-#
-# Library routines
-#
-CONFIG_CRC32=y
-CONFIG_LIBCRC32C=m
-CONFIG_ZLIB_INFLATE=y
-CONFIG_ZLIB_DEFLATE=m
-CONFIG_X86_BIOS_REBOOT=y
-CONFIG_X86_STD_RESOURCES=y
-CONFIG_PC=y
diff --git a/crypto/khazad.c b/crypto/khazad.c
deleted file mode 100644 (file)
index 738cb0d..0000000
+++ /dev/null
@@ -1,915 +0,0 @@
-/*
- * Cryptographic API.
- *
- * Khazad Algorithm
- *
- * The Khazad algorithm was developed by Paulo S. L. M. Barreto and
- * Vincent Rijmen.  It was a finalist in the NESSIE encryption contest.
- *
- * The original authors have disclaimed all copyright interest in this
- * code and thus put it in the public domain. The subsequent authors
- * have put this under the GNU General Public License.
- *
- * By Aaron Grothe ajgrothe@yahoo.com, August 1, 2004
- *
- * 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/init.h>
-#include <linux/module.h>
-#include <linux/mm.h>
-#include <asm/scatterlist.h>
-#include <linux/crypto.h>
-
-#define KHAZAD_KEY_SIZE                16
-#define KHAZAD_BLOCK_SIZE      8
-#define KHAZAD_ROUNDS          8
-
-struct khazad_ctx {
-       u64 E[KHAZAD_ROUNDS + 1];
-       u64 D[KHAZAD_ROUNDS + 1];
-};
-
-static const u64 T0[256] = {
-       0xbad3d268bbb96a01ULL, 0x54fc4d19e59a66b1ULL, 0x2f71bc93e26514cdULL,
-       0x749ccdb925871b51ULL, 0x53f55102f7a257a4ULL, 0xd3686bb8d0d6be03ULL,
-       0xd26b6fbdd6deb504ULL, 0x4dd72964b35285feULL, 0x50f05d0dfdba4aadULL,
-       0xace98a26cf09e063ULL, 0x8d8a0e83091c9684ULL, 0xbfdcc679a5914d1aULL,
-       0x7090ddad3da7374dULL, 0x52f65507f1aa5ca3ULL, 0x9ab352c87ba417e1ULL,
-       0x4cd42d61b55a8ef9ULL, 0xea238f65460320acULL, 0xd56273a6c4e68411ULL,
-       0x97a466f155cc68c2ULL, 0xd16e63b2dcc6a80dULL, 0x3355ccffaa85d099ULL,
-       0x51f35908fbb241aaULL, 0x5bed712ac7e20f9cULL, 0xa6f7a204f359ae55ULL,
-       0xde7f5f81febec120ULL, 0x48d83d75ad7aa2e5ULL, 0xa8e59a32d729cc7fULL,
-       0x99b65ec771bc0ae8ULL, 0xdb704b90e096e63bULL, 0x3256c8faac8ddb9eULL,
-       0xb7c4e65195d11522ULL, 0xfc19d72b32b3aaceULL, 0xe338ab48704b7393ULL,
-       0x9ebf42dc63843bfdULL, 0x91ae7eef41fc52d0ULL, 0x9bb056cd7dac1ce6ULL,
-       0xe23baf4d76437894ULL, 0xbbd0d66dbdb16106ULL, 0x41c319589b32f1daULL,
-       0x6eb2a5cb7957e517ULL, 0xa5f2ae0bf941b35cULL, 0xcb400bc08016564bULL,
-       0x6bbdb1da677fc20cULL, 0x95a26efb59dc7eccULL, 0xa1febe1fe1619f40ULL,
-       0xf308eb1810cbc3e3ULL, 0xb1cefe4f81e12f30ULL, 0x0206080a0c10160eULL,
-       0xcc4917db922e675eULL, 0xc45137f3a26e3f66ULL, 0x1d2774694ee8cf53ULL,
-       0x143c504478a09c6cULL, 0xc3582be8b0560e73ULL, 0x63a591f2573f9a34ULL,
-       0xda734f95e69eed3cULL, 0x5de76934d3d2358eULL, 0x5fe1613edfc22380ULL,
-       0xdc79578bf2aed72eULL, 0x7d87e99413cf486eULL, 0xcd4a13de94266c59ULL,
-       0x7f81e19e1fdf5e60ULL, 0x5aee752fc1ea049bULL, 0x6cb4adc17547f319ULL,
-       0x5ce46d31d5da3e89ULL, 0xf704fb0c08ebefffULL, 0x266a98bed42d47f2ULL,
-       0xff1cdb2438abb7c7ULL, 0xed2a937e543b11b9ULL, 0xe825876f4a1336a2ULL,
-       0x9dba4ed3699c26f4ULL, 0x6fb1a1ce7f5fee10ULL, 0x8e8f028c03048b8dULL,
-       0x192b647d56c8e34fULL, 0xa0fdba1ae7699447ULL, 0xf00de7171ad3deeaULL,
-       0x89861e97113cba98ULL, 0x0f113c332278692dULL, 0x07091c1b12383115ULL,
-       0xafec8629c511fd6aULL, 0xfb10cb30208b9bdbULL, 0x0818202830405838ULL,
-       0x153f54417ea8976bULL, 0x0d1734392e687f23ULL, 0x040c101418202c1cULL,
-       0x0103040506080b07ULL, 0x64ac8de94507ab21ULL, 0xdf7c5b84f8b6ca27ULL,
-       0x769ac5b329970d5fULL, 0x798bf9800bef6472ULL, 0xdd7a538ef4a6dc29ULL,
-       0x3d47f4c98ef5b2b3ULL, 0x163a584e74b08a62ULL, 0x3f41fcc382e5a4bdULL,
-       0x3759dcebb2a5fc85ULL, 0x6db7a9c4734ff81eULL, 0x3848e0d890dd95a8ULL,
-       0xb9d6de67b1a17708ULL, 0x7395d1a237bf2a44ULL, 0xe926836a4c1b3da5ULL,
-       0x355fd4e1beb5ea8bULL, 0x55ff491ce3926db6ULL, 0x7193d9a83baf3c4aULL,
-       0x7b8df18a07ff727cULL, 0x8c890a860f149d83ULL, 0x7296d5a731b72143ULL,
-       0x88851a921734b19fULL, 0xf607ff090ee3e4f8ULL, 0x2a7ea882fc4d33d6ULL,
-       0x3e42f8c684edafbaULL, 0x5ee2653bd9ca2887ULL, 0x27699cbbd2254cf5ULL,
-       0x46ca0543890ac0cfULL, 0x0c14303c28607424ULL, 0x65af89ec430fa026ULL,
-       0x68b8bdd56d67df05ULL, 0x61a399f85b2f8c3aULL, 0x03050c0f0a181d09ULL,
-       0xc15e23e2bc46187dULL, 0x57f94116ef827bb8ULL, 0xd6677fa9cefe9918ULL,
-       0xd976439aec86f035ULL, 0x58e87d25cdfa1295ULL, 0xd875479fea8efb32ULL,
-       0x66aa85e34917bd2fULL, 0xd7647bacc8f6921fULL, 0x3a4ee8d29ccd83a6ULL,
-       0xc84507cf8a0e4b42ULL, 0x3c44f0cc88fdb9b4ULL, 0xfa13cf35268390dcULL,
-       0x96a762f453c463c5ULL, 0xa7f4a601f551a552ULL, 0x98b55ac277b401efULL,
-       0xec29977b52331abeULL, 0xb8d5da62b7a97c0fULL, 0xc7543bfca876226fULL,
-       0xaeef822cc319f66dULL, 0x69bbb9d06b6fd402ULL, 0x4bdd317aa762bfecULL,
-       0xabe0963ddd31d176ULL, 0xa9e69e37d121c778ULL, 0x67a981e64f1fb628ULL,
-       0x0a1e28223c504e36ULL, 0x47c901468f02cbc8ULL, 0xf20bef1d16c3c8e4ULL,
-       0xb5c2ee5b99c1032cULL, 0x226688aacc0d6beeULL, 0xe532b356647b4981ULL,
-       0xee2f9f715e230cb0ULL, 0xbedfc27ca399461dULL, 0x2b7dac87fa4538d1ULL,
-       0x819e3ebf217ce2a0ULL, 0x1236485a6c90a67eULL, 0x839836b52d6cf4aeULL,
-       0x1b2d6c775ad8f541ULL, 0x0e1238362470622aULL, 0x23658cafca0560e9ULL,
-       0xf502f30604fbf9f1ULL, 0x45cf094c8312ddc6ULL, 0x216384a5c61576e7ULL,
-       0xce4f1fd19e3e7150ULL, 0x49db3970ab72a9e2ULL, 0x2c74b09ce87d09c4ULL,
-       0xf916c33a2c9b8dd5ULL, 0xe637bf596e635488ULL, 0xb6c7e25493d91e25ULL,
-       0x2878a088f05d25d8ULL, 0x17395c4b72b88165ULL, 0x829b32b02b64ffa9ULL,
-       0x1a2e68725cd0fe46ULL, 0x8b80169d1d2cac96ULL, 0xfe1fdf213ea3bcc0ULL,
-       0x8a8312981b24a791ULL, 0x091b242d3648533fULL, 0xc94603ca8c064045ULL,
-       0x879426a1354cd8b2ULL, 0x4ed2256bb94a98f7ULL, 0xe13ea3427c5b659dULL,
-       0x2e72b896e46d1fcaULL, 0xe431b75362734286ULL, 0xe03da7477a536e9aULL,
-       0xeb208b60400b2babULL, 0x90ad7aea47f459d7ULL, 0xa4f1aa0eff49b85bULL,
-       0x1e22786644f0d25aULL, 0x85922eab395ccebcULL, 0x60a09dfd5d27873dULL,
-       0x0000000000000000ULL, 0x256f94b1de355afbULL, 0xf401f70302f3f2f6ULL,
-       0xf10ee3121cdbd5edULL, 0x94a16afe5fd475cbULL, 0x0b1d2c273a584531ULL,
-       0xe734bb5c686b5f8fULL, 0x759fc9bc238f1056ULL, 0xef2c9b74582b07b7ULL,
-       0x345cd0e4b8bde18cULL, 0x3153c4f5a695c697ULL, 0xd46177a3c2ee8f16ULL,
-       0xd06d67b7dacea30aULL, 0x869722a43344d3b5ULL, 0x7e82e59b19d75567ULL,
-       0xadea8e23c901eb64ULL, 0xfd1ad32e34bba1c9ULL, 0x297ba48df6552edfULL,
-       0x3050c0f0a09dcd90ULL, 0x3b4decd79ac588a1ULL, 0x9fbc46d9658c30faULL,
-       0xf815c73f2a9386d2ULL, 0xc6573ff9ae7e2968ULL, 0x13354c5f6a98ad79ULL,
-       0x060a181e14303a12ULL, 0x050f14111e28271bULL, 0xc55233f6a4663461ULL,
-       0x113344556688bb77ULL, 0x7799c1b62f9f0658ULL, 0x7c84ed9115c74369ULL,
-       0x7a8ef58f01f7797bULL, 0x7888fd850de76f75ULL, 0x365ad8eeb4adf782ULL,
-       0x1c24706c48e0c454ULL, 0x394be4dd96d59eafULL, 0x59eb7920cbf21992ULL,
-       0x1828607850c0e848ULL, 0x56fa4513e98a70bfULL, 0xb3c8f6458df1393eULL,
-       0xb0cdfa4a87e92437ULL, 0x246c90b4d83d51fcULL, 0x206080a0c01d7de0ULL,
-       0xb2cbf2408bf93239ULL, 0x92ab72e04be44fd9ULL, 0xa3f8b615ed71894eULL,
-       0xc05d27e7ba4e137aULL, 0x44cc0d49851ad6c1ULL, 0x62a695f751379133ULL,
-       0x103040506080b070ULL, 0xb4c1ea5e9fc9082bULL, 0x84912aae3f54c5bbULL,
-       0x43c511529722e7d4ULL, 0x93a876e54dec44deULL, 0xc25b2fedb65e0574ULL,
-       0x4ade357fa16ab4ebULL, 0xbddace73a9815b14ULL, 0x8f8c0689050c808aULL,
-       0x2d77b499ee7502c3ULL, 0xbcd9ca76af895013ULL, 0x9cb94ad66f942df3ULL,
-       0x6abeb5df6177c90bULL, 0x40c01d5d9d3afaddULL, 0xcf4c1bd498367a57ULL,
-       0xa2fbb210eb798249ULL, 0x809d3aba2774e9a7ULL, 0x4fd1216ebf4293f0ULL,
-       0x1f217c6342f8d95dULL, 0xca430fc5861e5d4cULL, 0xaae39238db39da71ULL,
-       0x42c61557912aecd3ULL
-};
-
-static const u64 T1[256] = {
-       0xd3ba68d2b9bb016aULL, 0xfc54194d9ae5b166ULL, 0x712f93bc65e2cd14ULL,
-       0x9c74b9cd8725511bULL, 0xf5530251a2f7a457ULL, 0x68d3b86bd6d003beULL,
-       0x6bd2bd6fded604b5ULL, 0xd74d642952b3fe85ULL, 0xf0500d5dbafdad4aULL,
-       0xe9ac268a09cf63e0ULL, 0x8a8d830e1c098496ULL, 0xdcbf79c691a51a4dULL,
-       0x9070addda73d4d37ULL, 0xf6520755aaf1a35cULL, 0xb39ac852a47be117ULL,
-       0xd44c612d5ab5f98eULL, 0x23ea658f0346ac20ULL, 0x62d5a673e6c41184ULL,
-       0xa497f166cc55c268ULL, 0x6ed1b263c6dc0da8ULL, 0x5533ffcc85aa99d0ULL,
-       0xf3510859b2fbaa41ULL, 0xed5b2a71e2c79c0fULL, 0xf7a604a259f355aeULL,
-       0x7fde815fbefe20c1ULL, 0xd848753d7aade5a2ULL, 0xe5a8329a29d77fccULL,
-       0xb699c75ebc71e80aULL, 0x70db904b96e03be6ULL, 0x5632fac88dac9edbULL,
-       0xc4b751e6d1952215ULL, 0x19fc2bd7b332ceaaULL, 0x38e348ab4b709373ULL,
-       0xbf9edc428463fd3bULL, 0xae91ef7efc41d052ULL, 0xb09bcd56ac7de61cULL,
-       0x3be24daf43769478ULL, 0xd0bb6dd6b1bd0661ULL, 0xc3415819329bdaf1ULL,
-       0xb26ecba5577917e5ULL, 0xf2a50bae41f95cb3ULL, 0x40cbc00b16804b56ULL,
-       0xbd6bdab17f670cc2ULL, 0xa295fb6edc59cc7eULL, 0xfea11fbe61e1409fULL,
-       0x08f318ebcb10e3c3ULL, 0xceb14ffee181302fULL, 0x06020a08100c0e16ULL,
-       0x49ccdb172e925e67ULL, 0x51c4f3376ea2663fULL, 0x271d6974e84e53cfULL,
-       0x3c144450a0786c9cULL, 0x58c3e82b56b0730eULL, 0xa563f2913f57349aULL,
-       0x73da954f9ee63cedULL, 0xe75d3469d2d38e35ULL, 0xe15f3e61c2df8023ULL,
-       0x79dc8b57aef22ed7ULL, 0x877d94e9cf136e48ULL, 0x4acdde132694596cULL,
-       0x817f9ee1df1f605eULL, 0xee5a2f75eac19b04ULL, 0xb46cc1ad477519f3ULL,
-       0xe45c316ddad5893eULL, 0x04f70cfbeb08ffefULL, 0x6a26be982dd4f247ULL,
-       0x1cff24dbab38c7b7ULL, 0x2aed7e933b54b911ULL, 0x25e86f87134aa236ULL,
-       0xba9dd34e9c69f426ULL, 0xb16fcea15f7f10eeULL, 0x8f8e8c0204038d8bULL,
-       0x2b197d64c8564fe3ULL, 0xfda01aba69e74794ULL, 0x0df017e7d31aeadeULL,
-       0x8689971e3c1198baULL, 0x110f333c78222d69ULL, 0x09071b1c38121531ULL,
-       0xecaf298611c56afdULL, 0x10fb30cb8b20db9bULL, 0x1808282040303858ULL,
-       0x3f154154a87e6b97ULL, 0x170d3934682e237fULL, 0x0c04141020181c2cULL,
-       0x030105040806070bULL, 0xac64e98d074521abULL, 0x7cdf845bb6f827caULL,
-       0x9a76b3c597295f0dULL, 0x8b7980f9ef0b7264ULL, 0x7add8e53a6f429dcULL,
-       0x473dc9f4f58eb3b2ULL, 0x3a164e58b074628aULL, 0x413fc3fce582bda4ULL,
-       0x5937ebdca5b285fcULL, 0xb76dc4a94f731ef8ULL, 0x4838d8e0dd90a895ULL,
-       0xd6b967dea1b10877ULL, 0x9573a2d1bf37442aULL, 0x26e96a831b4ca53dULL,
-       0x5f35e1d4b5be8beaULL, 0xff551c4992e3b66dULL, 0x9371a8d9af3b4a3cULL,
-       0x8d7b8af1ff077c72ULL, 0x898c860a140f839dULL, 0x9672a7d5b7314321ULL,
-       0x8588921a34179fb1ULL, 0x07f609ffe30ef8e4ULL, 0x7e2a82a84dfcd633ULL,
-       0x423ec6f8ed84baafULL, 0xe25e3b65cad98728ULL, 0x6927bb9c25d2f54cULL,
-       0xca4643050a89cfc0ULL, 0x140c3c3060282474ULL, 0xaf65ec890f4326a0ULL,
-       0xb868d5bd676d05dfULL, 0xa361f8992f5b3a8cULL, 0x05030f0c180a091dULL,
-       0x5ec1e22346bc7d18ULL, 0xf957164182efb87bULL, 0x67d6a97ffece1899ULL,
-       0x76d99a4386ec35f0ULL, 0xe858257dfacd9512ULL, 0x75d89f478eea32fbULL,
-       0xaa66e38517492fbdULL, 0x64d7ac7bf6c81f92ULL, 0x4e3ad2e8cd9ca683ULL,
-       0x45c8cf070e8a424bULL, 0x443cccf0fd88b4b9ULL, 0x13fa35cf8326dc90ULL,
-       0xa796f462c453c563ULL, 0xf4a701a651f552a5ULL, 0xb598c25ab477ef01ULL,
-       0x29ec7b973352be1aULL, 0xd5b862daa9b70f7cULL, 0x54c7fc3b76a86f22ULL,
-       0xefae2c8219c36df6ULL, 0xbb69d0b96f6b02d4ULL, 0xdd4b7a3162a7ecbfULL,
-       0xe0ab3d9631dd76d1ULL, 0xe6a9379e21d178c7ULL, 0xa967e6811f4f28b6ULL,
-       0x1e0a2228503c364eULL, 0xc9474601028fc8cbULL, 0x0bf21defc316e4c8ULL,
-       0xc2b55beec1992c03ULL, 0x6622aa880dccee6bULL, 0x32e556b37b648149ULL,
-       0x2fee719f235eb00cULL, 0xdfbe7cc299a31d46ULL, 0x7d2b87ac45fad138ULL,
-       0x9e81bf3e7c21a0e2ULL, 0x36125a48906c7ea6ULL, 0x9883b5366c2daef4ULL,
-       0x2d1b776cd85a41f5ULL, 0x120e363870242a62ULL, 0x6523af8c05cae960ULL,
-       0x02f506f3fb04f1f9ULL, 0xcf454c091283c6ddULL, 0x6321a58415c6e776ULL,
-       0x4fced11f3e9e5071ULL, 0xdb49703972abe2a9ULL, 0x742c9cb07de8c409ULL,
-       0x16f93ac39b2cd58dULL, 0x37e659bf636e8854ULL, 0xc7b654e2d993251eULL,
-       0x782888a05df0d825ULL, 0x39174b5cb8726581ULL, 0x9b82b032642ba9ffULL,
-       0x2e1a7268d05c46feULL, 0x808b9d162c1d96acULL, 0x1ffe21dfa33ec0bcULL,
-       0x838a9812241b91a7ULL, 0x1b092d2448363f53ULL, 0x46c9ca03068c4540ULL,
-       0x9487a1264c35b2d8ULL, 0xd24e6b254ab9f798ULL, 0x3ee142a35b7c9d65ULL,
-       0x722e96b86de4ca1fULL, 0x31e453b773628642ULL, 0x3de047a7537a9a6eULL,
-       0x20eb608b0b40ab2bULL, 0xad90ea7af447d759ULL, 0xf1a40eaa49ff5bb8ULL,
-       0x221e6678f0445ad2ULL, 0x9285ab2e5c39bcceULL, 0xa060fd9d275d3d87ULL,
-       0x0000000000000000ULL, 0x6f25b19435defb5aULL, 0x01f403f7f302f6f2ULL,
-       0x0ef112e3db1cedd5ULL, 0xa194fe6ad45fcb75ULL, 0x1d0b272c583a3145ULL,
-       0x34e75cbb6b688f5fULL, 0x9f75bcc98f235610ULL, 0x2cef749b2b58b707ULL,
-       0x5c34e4d0bdb88ce1ULL, 0x5331f5c495a697c6ULL, 0x61d4a377eec2168fULL,
-       0x6dd0b767ceda0aa3ULL, 0x9786a4224433b5d3ULL, 0x827e9be5d7196755ULL,
-       0xeaad238e01c964ebULL, 0x1afd2ed3bb34c9a1ULL, 0x7b298da455f6df2eULL,
-       0x5030f0c09da090cdULL, 0x4d3bd7ecc59aa188ULL, 0xbc9fd9468c65fa30ULL,
-       0x15f83fc7932ad286ULL, 0x57c6f93f7eae6829ULL, 0x35135f4c986a79adULL,
-       0x0a061e183014123aULL, 0x0f051114281e1b27ULL, 0x52c5f63366a46134ULL,
-       0x33115544886677bbULL, 0x9977b6c19f2f5806ULL, 0x847c91edc7156943ULL,
-       0x8e7a8ff5f7017b79ULL, 0x887885fde70d756fULL, 0x5a36eed8adb482f7ULL,
-       0x241c6c70e04854c4ULL, 0x4b39dde4d596af9eULL, 0xeb592079f2cb9219ULL,
-       0x28187860c05048e8ULL, 0xfa5613458ae9bf70ULL, 0xc8b345f6f18d3e39ULL,
-       0xcdb04afae9873724ULL, 0x6c24b4903dd8fc51ULL, 0x6020a0801dc0e07dULL,
-       0xcbb240f2f98b3932ULL, 0xab92e072e44bd94fULL, 0xf8a315b671ed4e89ULL,
-       0x5dc0e7274eba7a13ULL, 0xcc44490d1a85c1d6ULL, 0xa662f79537513391ULL,
-       0x30105040806070b0ULL, 0xc1b45eeac99f2b08ULL, 0x9184ae2a543fbbc5ULL,
-       0xc54352112297d4e7ULL, 0xa893e576ec4dde44ULL, 0x5bc2ed2f5eb67405ULL,
-       0xde4a7f356aa1ebb4ULL, 0xdabd73ce81a9145bULL, 0x8c8f89060c058a80ULL,
-       0x772d99b475eec302ULL, 0xd9bc76ca89af1350ULL, 0xb99cd64a946ff32dULL,
-       0xbe6adfb577610bc9ULL, 0xc0405d1d3a9dddfaULL, 0x4ccfd41b3698577aULL,
-       0xfba210b279eb4982ULL, 0x9d80ba3a7427a7e9ULL, 0xd14f6e2142bff093ULL,
-       0x211f637cf8425dd9ULL, 0x43cac50f1e864c5dULL, 0xe3aa389239db71daULL,
-       0xc64257152a91d3ecULL
-};
-
-static const u64 T2[256] = {
-       0xd268bad36a01bbb9ULL, 0x4d1954fc66b1e59aULL, 0xbc932f7114cde265ULL,
-       0xcdb9749c1b512587ULL, 0x510253f557a4f7a2ULL, 0x6bb8d368be03d0d6ULL,
-       0x6fbdd26bb504d6deULL, 0x29644dd785feb352ULL, 0x5d0d50f04aadfdbaULL,
-       0x8a26ace9e063cf09ULL, 0x0e838d8a9684091cULL, 0xc679bfdc4d1aa591ULL,
-       0xddad7090374d3da7ULL, 0x550752f65ca3f1aaULL, 0x52c89ab317e17ba4ULL,
-       0x2d614cd48ef9b55aULL, 0x8f65ea2320ac4603ULL, 0x73a6d5628411c4e6ULL,
-       0x66f197a468c255ccULL, 0x63b2d16ea80ddcc6ULL, 0xccff3355d099aa85ULL,
-       0x590851f341aafbb2ULL, 0x712a5bed0f9cc7e2ULL, 0xa204a6f7ae55f359ULL,
-       0x5f81de7fc120febeULL, 0x3d7548d8a2e5ad7aULL, 0x9a32a8e5cc7fd729ULL,
-       0x5ec799b60ae871bcULL, 0x4b90db70e63be096ULL, 0xc8fa3256db9eac8dULL,
-       0xe651b7c4152295d1ULL, 0xd72bfc19aace32b3ULL, 0xab48e3387393704bULL,
-       0x42dc9ebf3bfd6384ULL, 0x7eef91ae52d041fcULL, 0x56cd9bb01ce67dacULL,
-       0xaf4de23b78947643ULL, 0xd66dbbd06106bdb1ULL, 0x195841c3f1da9b32ULL,
-       0xa5cb6eb2e5177957ULL, 0xae0ba5f2b35cf941ULL, 0x0bc0cb40564b8016ULL,
-       0xb1da6bbdc20c677fULL, 0x6efb95a27ecc59dcULL, 0xbe1fa1fe9f40e161ULL,
-       0xeb18f308c3e310cbULL, 0xfe4fb1ce2f3081e1ULL, 0x080a0206160e0c10ULL,
-       0x17dbcc49675e922eULL, 0x37f3c4513f66a26eULL, 0x74691d27cf534ee8ULL,
-       0x5044143c9c6c78a0ULL, 0x2be8c3580e73b056ULL, 0x91f263a59a34573fULL,
-       0x4f95da73ed3ce69eULL, 0x69345de7358ed3d2ULL, 0x613e5fe12380dfc2ULL,
-       0x578bdc79d72ef2aeULL, 0xe9947d87486e13cfULL, 0x13decd4a6c599426ULL,
-       0xe19e7f815e601fdfULL, 0x752f5aee049bc1eaULL, 0xadc16cb4f3197547ULL,
-       0x6d315ce43e89d5daULL, 0xfb0cf704efff08ebULL, 0x98be266a47f2d42dULL,
-       0xdb24ff1cb7c738abULL, 0x937eed2a11b9543bULL, 0x876fe82536a24a13ULL,
-       0x4ed39dba26f4699cULL, 0xa1ce6fb1ee107f5fULL, 0x028c8e8f8b8d0304ULL,
-       0x647d192be34f56c8ULL, 0xba1aa0fd9447e769ULL, 0xe717f00ddeea1ad3ULL,
-       0x1e978986ba98113cULL, 0x3c330f11692d2278ULL, 0x1c1b070931151238ULL,
-       0x8629afecfd6ac511ULL, 0xcb30fb109bdb208bULL, 0x2028081858383040ULL,
-       0x5441153f976b7ea8ULL, 0x34390d177f232e68ULL, 0x1014040c2c1c1820ULL,
-       0x040501030b070608ULL, 0x8de964acab214507ULL, 0x5b84df7cca27f8b6ULL,
-       0xc5b3769a0d5f2997ULL, 0xf980798b64720befULL, 0x538edd7adc29f4a6ULL,
-       0xf4c93d47b2b38ef5ULL, 0x584e163a8a6274b0ULL, 0xfcc33f41a4bd82e5ULL,
-       0xdceb3759fc85b2a5ULL, 0xa9c46db7f81e734fULL, 0xe0d8384895a890ddULL,
-       0xde67b9d67708b1a1ULL, 0xd1a273952a4437bfULL, 0x836ae9263da54c1bULL,
-       0xd4e1355fea8bbeb5ULL, 0x491c55ff6db6e392ULL, 0xd9a871933c4a3bafULL,
-       0xf18a7b8d727c07ffULL, 0x0a868c899d830f14ULL, 0xd5a77296214331b7ULL,
-       0x1a928885b19f1734ULL, 0xff09f607e4f80ee3ULL, 0xa8822a7e33d6fc4dULL,
-       0xf8c63e42afba84edULL, 0x653b5ee22887d9caULL, 0x9cbb27694cf5d225ULL,
-       0x054346cac0cf890aULL, 0x303c0c1474242860ULL, 0x89ec65afa026430fULL,
-       0xbdd568b8df056d67ULL, 0x99f861a38c3a5b2fULL, 0x0c0f03051d090a18ULL,
-       0x23e2c15e187dbc46ULL, 0x411657f97bb8ef82ULL, 0x7fa9d6679918cefeULL,
-       0x439ad976f035ec86ULL, 0x7d2558e81295cdfaULL, 0x479fd875fb32ea8eULL,
-       0x85e366aabd2f4917ULL, 0x7bacd764921fc8f6ULL, 0xe8d23a4e83a69ccdULL,
-       0x07cfc8454b428a0eULL, 0xf0cc3c44b9b488fdULL, 0xcf35fa1390dc2683ULL,
-       0x62f496a763c553c4ULL, 0xa601a7f4a552f551ULL, 0x5ac298b501ef77b4ULL,
-       0x977bec291abe5233ULL, 0xda62b8d57c0fb7a9ULL, 0x3bfcc754226fa876ULL,
-       0x822caeeff66dc319ULL, 0xb9d069bbd4026b6fULL, 0x317a4bddbfeca762ULL,
-       0x963dabe0d176dd31ULL, 0x9e37a9e6c778d121ULL, 0x81e667a9b6284f1fULL,
-       0x28220a1e4e363c50ULL, 0x014647c9cbc88f02ULL, 0xef1df20bc8e416c3ULL,
-       0xee5bb5c2032c99c1ULL, 0x88aa22666beecc0dULL, 0xb356e5324981647bULL,
-       0x9f71ee2f0cb05e23ULL, 0xc27cbedf461da399ULL, 0xac872b7d38d1fa45ULL,
-       0x3ebf819ee2a0217cULL, 0x485a1236a67e6c90ULL, 0x36b58398f4ae2d6cULL,
-       0x6c771b2df5415ad8ULL, 0x38360e12622a2470ULL, 0x8caf236560e9ca05ULL,
-       0xf306f502f9f104fbULL, 0x094c45cfddc68312ULL, 0x84a5216376e7c615ULL,
-       0x1fd1ce4f71509e3eULL, 0x397049dba9e2ab72ULL, 0xb09c2c7409c4e87dULL,
-       0xc33af9168dd52c9bULL, 0xbf59e63754886e63ULL, 0xe254b6c71e2593d9ULL,
-       0xa088287825d8f05dULL, 0x5c4b1739816572b8ULL, 0x32b0829bffa92b64ULL,
-       0x68721a2efe465cd0ULL, 0x169d8b80ac961d2cULL, 0xdf21fe1fbcc03ea3ULL,
-       0x12988a83a7911b24ULL, 0x242d091b533f3648ULL, 0x03cac94640458c06ULL,
-       0x26a18794d8b2354cULL, 0x256b4ed298f7b94aULL, 0xa342e13e659d7c5bULL,
-       0xb8962e721fcae46dULL, 0xb753e43142866273ULL, 0xa747e03d6e9a7a53ULL,
-       0x8b60eb202bab400bULL, 0x7aea90ad59d747f4ULL, 0xaa0ea4f1b85bff49ULL,
-       0x78661e22d25a44f0ULL, 0x2eab8592cebc395cULL, 0x9dfd60a0873d5d27ULL,
-       0x0000000000000000ULL, 0x94b1256f5afbde35ULL, 0xf703f401f2f602f3ULL,
-       0xe312f10ed5ed1cdbULL, 0x6afe94a175cb5fd4ULL, 0x2c270b1d45313a58ULL,
-       0xbb5ce7345f8f686bULL, 0xc9bc759f1056238fULL, 0x9b74ef2c07b7582bULL,
-       0xd0e4345ce18cb8bdULL, 0xc4f53153c697a695ULL, 0x77a3d4618f16c2eeULL,
-       0x67b7d06da30adaceULL, 0x22a48697d3b53344ULL, 0xe59b7e82556719d7ULL,
-       0x8e23adeaeb64c901ULL, 0xd32efd1aa1c934bbULL, 0xa48d297b2edff655ULL,
-       0xc0f03050cd90a09dULL, 0xecd73b4d88a19ac5ULL, 0x46d99fbc30fa658cULL,
-       0xc73ff81586d22a93ULL, 0x3ff9c6572968ae7eULL, 0x4c5f1335ad796a98ULL,
-       0x181e060a3a121430ULL, 0x1411050f271b1e28ULL, 0x33f6c5523461a466ULL,
-       0x44551133bb776688ULL, 0xc1b6779906582f9fULL, 0xed917c84436915c7ULL,
-       0xf58f7a8e797b01f7ULL, 0xfd8578886f750de7ULL, 0xd8ee365af782b4adULL,
-       0x706c1c24c45448e0ULL, 0xe4dd394b9eaf96d5ULL, 0x792059eb1992cbf2ULL,
-       0x60781828e84850c0ULL, 0x451356fa70bfe98aULL, 0xf645b3c8393e8df1ULL,
-       0xfa4ab0cd243787e9ULL, 0x90b4246c51fcd83dULL, 0x80a020607de0c01dULL,
-       0xf240b2cb32398bf9ULL, 0x72e092ab4fd94be4ULL, 0xb615a3f8894eed71ULL,
-       0x27e7c05d137aba4eULL, 0x0d4944ccd6c1851aULL, 0x95f762a691335137ULL,
-       0x40501030b0706080ULL, 0xea5eb4c1082b9fc9ULL, 0x2aae8491c5bb3f54ULL,
-       0x115243c5e7d49722ULL, 0x76e593a844de4decULL, 0x2fedc25b0574b65eULL,
-       0x357f4adeb4eba16aULL, 0xce73bdda5b14a981ULL, 0x06898f8c808a050cULL,
-       0xb4992d7702c3ee75ULL, 0xca76bcd95013af89ULL, 0x4ad69cb92df36f94ULL,
-       0xb5df6abec90b6177ULL, 0x1d5d40c0fadd9d3aULL, 0x1bd4cf4c7a579836ULL,
-       0xb210a2fb8249eb79ULL, 0x3aba809de9a72774ULL, 0x216e4fd193f0bf42ULL,
-       0x7c631f21d95d42f8ULL, 0x0fc5ca435d4c861eULL, 0x9238aae3da71db39ULL,
-       0x155742c6ecd3912aULL
-};
-
-static const u64 T3[256] = {
-       0x68d2d3ba016ab9bbULL, 0x194dfc54b1669ae5ULL, 0x93bc712fcd1465e2ULL,
-       0xb9cd9c74511b8725ULL, 0x0251f553a457a2f7ULL, 0xb86b68d303bed6d0ULL,
-       0xbd6f6bd204b5ded6ULL, 0x6429d74dfe8552b3ULL, 0x0d5df050ad4abafdULL,
-       0x268ae9ac63e009cfULL, 0x830e8a8d84961c09ULL, 0x79c6dcbf1a4d91a5ULL,
-       0xaddd90704d37a73dULL, 0x0755f652a35caaf1ULL, 0xc852b39ae117a47bULL,
-       0x612dd44cf98e5ab5ULL, 0x658f23eaac200346ULL, 0xa67362d51184e6c4ULL,
-       0xf166a497c268cc55ULL, 0xb2636ed10da8c6dcULL, 0xffcc553399d085aaULL,
-       0x0859f351aa41b2fbULL, 0x2a71ed5b9c0fe2c7ULL, 0x04a2f7a655ae59f3ULL,
-       0x815f7fde20c1befeULL, 0x753dd848e5a27aadULL, 0x329ae5a87fcc29d7ULL,
-       0xc75eb699e80abc71ULL, 0x904b70db3be696e0ULL, 0xfac856329edb8dacULL,
-       0x51e6c4b72215d195ULL, 0x2bd719fcceaab332ULL, 0x48ab38e393734b70ULL,
-       0xdc42bf9efd3b8463ULL, 0xef7eae91d052fc41ULL, 0xcd56b09be61cac7dULL,
-       0x4daf3be294784376ULL, 0x6dd6d0bb0661b1bdULL, 0x5819c341daf1329bULL,
-       0xcba5b26e17e55779ULL, 0x0baef2a55cb341f9ULL, 0xc00b40cb4b561680ULL,
-       0xdab1bd6b0cc27f67ULL, 0xfb6ea295cc7edc59ULL, 0x1fbefea1409f61e1ULL,
-       0x18eb08f3e3c3cb10ULL, 0x4ffeceb1302fe181ULL, 0x0a0806020e16100cULL,
-       0xdb1749cc5e672e92ULL, 0xf33751c4663f6ea2ULL, 0x6974271d53cfe84eULL,
-       0x44503c146c9ca078ULL, 0xe82b58c3730e56b0ULL, 0xf291a563349a3f57ULL,
-       0x954f73da3ced9ee6ULL, 0x3469e75d8e35d2d3ULL, 0x3e61e15f8023c2dfULL,
-       0x8b5779dc2ed7aef2ULL, 0x94e9877d6e48cf13ULL, 0xde134acd596c2694ULL,
-       0x9ee1817f605edf1fULL, 0x2f75ee5a9b04eac1ULL, 0xc1adb46c19f34775ULL,
-       0x316de45c893edad5ULL, 0x0cfb04f7ffefeb08ULL, 0xbe986a26f2472dd4ULL,
-       0x24db1cffc7b7ab38ULL, 0x7e932aedb9113b54ULL, 0x6f8725e8a236134aULL,
-       0xd34eba9df4269c69ULL, 0xcea1b16f10ee5f7fULL, 0x8c028f8e8d8b0403ULL,
-       0x7d642b194fe3c856ULL, 0x1abafda0479469e7ULL, 0x17e70df0eaded31aULL,
-       0x971e868998ba3c11ULL, 0x333c110f2d697822ULL, 0x1b1c090715313812ULL,
-       0x2986ecaf6afd11c5ULL, 0x30cb10fbdb9b8b20ULL, 0x2820180838584030ULL,
-       0x41543f156b97a87eULL, 0x3934170d237f682eULL, 0x14100c041c2c2018ULL,
-       0x05040301070b0806ULL, 0xe98dac6421ab0745ULL, 0x845b7cdf27cab6f8ULL,
-       0xb3c59a765f0d9729ULL, 0x80f98b797264ef0bULL, 0x8e537add29dca6f4ULL,
-       0xc9f4473db3b2f58eULL, 0x4e583a16628ab074ULL, 0xc3fc413fbda4e582ULL,
-       0xebdc593785fca5b2ULL, 0xc4a9b76d1ef84f73ULL, 0xd8e04838a895dd90ULL,
-       0x67ded6b90877a1b1ULL, 0xa2d19573442abf37ULL, 0x6a8326e9a53d1b4cULL,
-       0xe1d45f358beab5beULL, 0x1c49ff55b66d92e3ULL, 0xa8d993714a3caf3bULL,
-       0x8af18d7b7c72ff07ULL, 0x860a898c839d140fULL, 0xa7d596724321b731ULL,
-       0x921a85889fb13417ULL, 0x09ff07f6f8e4e30eULL, 0x82a87e2ad6334dfcULL,
-       0xc6f8423ebaafed84ULL, 0x3b65e25e8728cad9ULL, 0xbb9c6927f54c25d2ULL,
-       0x4305ca46cfc00a89ULL, 0x3c30140c24746028ULL, 0xec89af6526a00f43ULL,
-       0xd5bdb86805df676dULL, 0xf899a3613a8c2f5bULL, 0x0f0c0503091d180aULL,
-       0xe2235ec17d1846bcULL, 0x1641f957b87b82efULL, 0xa97f67d61899feceULL,
-       0x9a4376d935f086ecULL, 0x257de8589512facdULL, 0x9f4775d832fb8eeaULL,
-       0xe385aa662fbd1749ULL, 0xac7b64d71f92f6c8ULL, 0xd2e84e3aa683cd9cULL,
-       0xcf0745c8424b0e8aULL, 0xccf0443cb4b9fd88ULL, 0x35cf13fadc908326ULL,
-       0xf462a796c563c453ULL, 0x01a6f4a752a551f5ULL, 0xc25ab598ef01b477ULL,
-       0x7b9729ecbe1a3352ULL, 0x62dad5b80f7ca9b7ULL, 0xfc3b54c76f2276a8ULL,
-       0x2c82efae6df619c3ULL, 0xd0b9bb6902d46f6bULL, 0x7a31dd4becbf62a7ULL,
-       0x3d96e0ab76d131ddULL, 0x379ee6a978c721d1ULL, 0xe681a96728b61f4fULL,
-       0x22281e0a364e503cULL, 0x4601c947c8cb028fULL, 0x1def0bf2e4c8c316ULL,
-       0x5beec2b52c03c199ULL, 0xaa886622ee6b0dccULL, 0x56b332e581497b64ULL,
-       0x719f2feeb00c235eULL, 0x7cc2dfbe1d4699a3ULL, 0x87ac7d2bd13845faULL,
-       0xbf3e9e81a0e27c21ULL, 0x5a4836127ea6906cULL, 0xb5369883aef46c2dULL,
-       0x776c2d1b41f5d85aULL, 0x3638120e2a627024ULL, 0xaf8c6523e96005caULL,
-       0x06f302f5f1f9fb04ULL, 0x4c09cf45c6dd1283ULL, 0xa5846321e77615c6ULL,
-       0xd11f4fce50713e9eULL, 0x7039db49e2a972abULL, 0x9cb0742cc4097de8ULL,
-       0x3ac316f9d58d9b2cULL, 0x59bf37e68854636eULL, 0x54e2c7b6251ed993ULL,
-       0x88a07828d8255df0ULL, 0x4b5c39176581b872ULL, 0xb0329b82a9ff642bULL,
-       0x72682e1a46fed05cULL, 0x9d16808b96ac2c1dULL, 0x21df1ffec0bca33eULL,
-       0x9812838a91a7241bULL, 0x2d241b093f534836ULL, 0xca0346c94540068cULL,
-       0xa1269487b2d84c35ULL, 0x6b25d24ef7984ab9ULL, 0x42a33ee19d655b7cULL,
-       0x96b8722eca1f6de4ULL, 0x53b731e486427362ULL, 0x47a73de09a6e537aULL,
-       0x608b20ebab2b0b40ULL, 0xea7aad90d759f447ULL, 0x0eaaf1a45bb849ffULL,
-       0x6678221e5ad2f044ULL, 0xab2e9285bcce5c39ULL, 0xfd9da0603d87275dULL,
-       0x0000000000000000ULL, 0xb1946f25fb5a35deULL, 0x03f701f4f6f2f302ULL,
-       0x12e30ef1edd5db1cULL, 0xfe6aa194cb75d45fULL, 0x272c1d0b3145583aULL,
-       0x5cbb34e78f5f6b68ULL, 0xbcc99f7556108f23ULL, 0x749b2cefb7072b58ULL,
-       0xe4d05c348ce1bdb8ULL, 0xf5c4533197c695a6ULL, 0xa37761d4168feec2ULL,
-       0xb7676dd00aa3cedaULL, 0xa4229786b5d34433ULL, 0x9be5827e6755d719ULL,
-       0x238eeaad64eb01c9ULL, 0x2ed31afdc9a1bb34ULL, 0x8da47b29df2e55f6ULL,
-       0xf0c0503090cd9da0ULL, 0xd7ec4d3ba188c59aULL, 0xd946bc9ffa308c65ULL,
-       0x3fc715f8d286932aULL, 0xf93f57c668297eaeULL, 0x5f4c351379ad986aULL,
-       0x1e180a06123a3014ULL, 0x11140f051b27281eULL, 0xf63352c5613466a4ULL,
-       0x5544331177bb8866ULL, 0xb6c1997758069f2fULL, 0x91ed847c6943c715ULL,
-       0x8ff58e7a7b79f701ULL, 0x85fd8878756fe70dULL, 0xeed85a3682f7adb4ULL,
-       0x6c70241c54c4e048ULL, 0xdde44b39af9ed596ULL, 0x2079eb599219f2cbULL,
-       0x7860281848e8c050ULL, 0x1345fa56bf708ae9ULL, 0x45f6c8b33e39f18dULL,
-       0x4afacdb03724e987ULL, 0xb4906c24fc513dd8ULL, 0xa0806020e07d1dc0ULL,
-       0x40f2cbb23932f98bULL, 0xe072ab92d94fe44bULL, 0x15b6f8a34e8971edULL,
-       0xe7275dc07a134ebaULL, 0x490dcc44c1d61a85ULL, 0xf795a66233913751ULL,
-       0x5040301070b08060ULL, 0x5eeac1b42b08c99fULL, 0xae2a9184bbc5543fULL,
-       0x5211c543d4e72297ULL, 0xe576a893de44ec4dULL, 0xed2f5bc274055eb6ULL,
-       0x7f35de4aebb46aa1ULL, 0x73cedabd145b81a9ULL, 0x89068c8f8a800c05ULL,
-       0x99b4772dc30275eeULL, 0x76cad9bc135089afULL, 0xd64ab99cf32d946fULL,
-       0xdfb5be6a0bc97761ULL, 0x5d1dc040ddfa3a9dULL, 0xd41b4ccf577a3698ULL,
-       0x10b2fba2498279ebULL, 0xba3a9d80a7e97427ULL, 0x6e21d14ff09342bfULL,
-       0x637c211f5dd9f842ULL, 0xc50f43ca4c5d1e86ULL, 0x3892e3aa71da39dbULL,
-       0x5715c642d3ec2a91ULL
-};
-
-static const u64 T4[256] = {
-       0xbbb96a01bad3d268ULL, 0xe59a66b154fc4d19ULL, 0xe26514cd2f71bc93ULL,
-       0x25871b51749ccdb9ULL, 0xf7a257a453f55102ULL, 0xd0d6be03d3686bb8ULL,
-       0xd6deb504d26b6fbdULL, 0xb35285fe4dd72964ULL, 0xfdba4aad50f05d0dULL,
-       0xcf09e063ace98a26ULL, 0x091c96848d8a0e83ULL, 0xa5914d1abfdcc679ULL,
-       0x3da7374d7090ddadULL, 0xf1aa5ca352f65507ULL, 0x7ba417e19ab352c8ULL,
-       0xb55a8ef94cd42d61ULL, 0x460320acea238f65ULL, 0xc4e68411d56273a6ULL,
-       0x55cc68c297a466f1ULL, 0xdcc6a80dd16e63b2ULL, 0xaa85d0993355ccffULL,
-       0xfbb241aa51f35908ULL, 0xc7e20f9c5bed712aULL, 0xf359ae55a6f7a204ULL,
-       0xfebec120de7f5f81ULL, 0xad7aa2e548d83d75ULL, 0xd729cc7fa8e59a32ULL,
-       0x71bc0ae899b65ec7ULL, 0xe096e63bdb704b90ULL, 0xac8ddb9e3256c8faULL,
-       0x95d11522b7c4e651ULL, 0x32b3aacefc19d72bULL, 0x704b7393e338ab48ULL,
-       0x63843bfd9ebf42dcULL, 0x41fc52d091ae7eefULL, 0x7dac1ce69bb056cdULL,
-       0x76437894e23baf4dULL, 0xbdb16106bbd0d66dULL, 0x9b32f1da41c31958ULL,
-       0x7957e5176eb2a5cbULL, 0xf941b35ca5f2ae0bULL, 0x8016564bcb400bc0ULL,
-       0x677fc20c6bbdb1daULL, 0x59dc7ecc95a26efbULL, 0xe1619f40a1febe1fULL,
-       0x10cbc3e3f308eb18ULL, 0x81e12f30b1cefe4fULL, 0x0c10160e0206080aULL,
-       0x922e675ecc4917dbULL, 0xa26e3f66c45137f3ULL, 0x4ee8cf531d277469ULL,
-       0x78a09c6c143c5044ULL, 0xb0560e73c3582be8ULL, 0x573f9a3463a591f2ULL,
-       0xe69eed3cda734f95ULL, 0xd3d2358e5de76934ULL, 0xdfc223805fe1613eULL,
-       0xf2aed72edc79578bULL, 0x13cf486e7d87e994ULL, 0x94266c59cd4a13deULL,
-       0x1fdf5e607f81e19eULL, 0xc1ea049b5aee752fULL, 0x7547f3196cb4adc1ULL,
-       0xd5da3e895ce46d31ULL, 0x08ebeffff704fb0cULL, 0xd42d47f2266a98beULL,
-       0x38abb7c7ff1cdb24ULL, 0x543b11b9ed2a937eULL, 0x4a1336a2e825876fULL,
-       0x699c26f49dba4ed3ULL, 0x7f5fee106fb1a1ceULL, 0x03048b8d8e8f028cULL,
-       0x56c8e34f192b647dULL, 0xe7699447a0fdba1aULL, 0x1ad3deeaf00de717ULL,
-       0x113cba9889861e97ULL, 0x2278692d0f113c33ULL, 0x1238311507091c1bULL,
-       0xc511fd6aafec8629ULL, 0x208b9bdbfb10cb30ULL, 0x3040583808182028ULL,
-       0x7ea8976b153f5441ULL, 0x2e687f230d173439ULL, 0x18202c1c040c1014ULL,
-       0x06080b0701030405ULL, 0x4507ab2164ac8de9ULL, 0xf8b6ca27df7c5b84ULL,
-       0x29970d5f769ac5b3ULL, 0x0bef6472798bf980ULL, 0xf4a6dc29dd7a538eULL,
-       0x8ef5b2b33d47f4c9ULL, 0x74b08a62163a584eULL, 0x82e5a4bd3f41fcc3ULL,
-       0xb2a5fc853759dcebULL, 0x734ff81e6db7a9c4ULL, 0x90dd95a83848e0d8ULL,
-       0xb1a17708b9d6de67ULL, 0x37bf2a447395d1a2ULL, 0x4c1b3da5e926836aULL,
-       0xbeb5ea8b355fd4e1ULL, 0xe3926db655ff491cULL, 0x3baf3c4a7193d9a8ULL,
-       0x07ff727c7b8df18aULL, 0x0f149d838c890a86ULL, 0x31b721437296d5a7ULL,
-       0x1734b19f88851a92ULL, 0x0ee3e4f8f607ff09ULL, 0xfc4d33d62a7ea882ULL,
-       0x84edafba3e42f8c6ULL, 0xd9ca28875ee2653bULL, 0xd2254cf527699cbbULL,
-       0x890ac0cf46ca0543ULL, 0x286074240c14303cULL, 0x430fa02665af89ecULL,
-       0x6d67df0568b8bdd5ULL, 0x5b2f8c3a61a399f8ULL, 0x0a181d0903050c0fULL,
-       0xbc46187dc15e23e2ULL, 0xef827bb857f94116ULL, 0xcefe9918d6677fa9ULL,
-       0xec86f035d976439aULL, 0xcdfa129558e87d25ULL, 0xea8efb32d875479fULL,
-       0x4917bd2f66aa85e3ULL, 0xc8f6921fd7647bacULL, 0x9ccd83a63a4ee8d2ULL,
-       0x8a0e4b42c84507cfULL, 0x88fdb9b43c44f0ccULL, 0x268390dcfa13cf35ULL,
-       0x53c463c596a762f4ULL, 0xf551a552a7f4a601ULL, 0x77b401ef98b55ac2ULL,
-       0x52331abeec29977bULL, 0xb7a97c0fb8d5da62ULL, 0xa876226fc7543bfcULL,
-       0xc319f66daeef822cULL, 0x6b6fd40269bbb9d0ULL, 0xa762bfec4bdd317aULL,
-       0xdd31d176abe0963dULL, 0xd121c778a9e69e37ULL, 0x4f1fb62867a981e6ULL,
-       0x3c504e360a1e2822ULL, 0x8f02cbc847c90146ULL, 0x16c3c8e4f20bef1dULL,
-       0x99c1032cb5c2ee5bULL, 0xcc0d6bee226688aaULL, 0x647b4981e532b356ULL,
-       0x5e230cb0ee2f9f71ULL, 0xa399461dbedfc27cULL, 0xfa4538d12b7dac87ULL,
-       0x217ce2a0819e3ebfULL, 0x6c90a67e1236485aULL, 0x2d6cf4ae839836b5ULL,
-       0x5ad8f5411b2d6c77ULL, 0x2470622a0e123836ULL, 0xca0560e923658cafULL,
-       0x04fbf9f1f502f306ULL, 0x8312ddc645cf094cULL, 0xc61576e7216384a5ULL,
-       0x9e3e7150ce4f1fd1ULL, 0xab72a9e249db3970ULL, 0xe87d09c42c74b09cULL,
-       0x2c9b8dd5f916c33aULL, 0x6e635488e637bf59ULL, 0x93d91e25b6c7e254ULL,
-       0xf05d25d82878a088ULL, 0x72b8816517395c4bULL, 0x2b64ffa9829b32b0ULL,
-       0x5cd0fe461a2e6872ULL, 0x1d2cac968b80169dULL, 0x3ea3bcc0fe1fdf21ULL,
-       0x1b24a7918a831298ULL, 0x3648533f091b242dULL, 0x8c064045c94603caULL,
-       0x354cd8b2879426a1ULL, 0xb94a98f74ed2256bULL, 0x7c5b659de13ea342ULL,
-       0xe46d1fca2e72b896ULL, 0x62734286e431b753ULL, 0x7a536e9ae03da747ULL,
-       0x400b2babeb208b60ULL, 0x47f459d790ad7aeaULL, 0xff49b85ba4f1aa0eULL,
-       0x44f0d25a1e227866ULL, 0x395ccebc85922eabULL, 0x5d27873d60a09dfdULL,
-       0x0000000000000000ULL, 0xde355afb256f94b1ULL, 0x02f3f2f6f401f703ULL,
-       0x1cdbd5edf10ee312ULL, 0x5fd475cb94a16afeULL, 0x3a5845310b1d2c27ULL,
-       0x686b5f8fe734bb5cULL, 0x238f1056759fc9bcULL, 0x582b07b7ef2c9b74ULL,
-       0xb8bde18c345cd0e4ULL, 0xa695c6973153c4f5ULL, 0xc2ee8f16d46177a3ULL,
-       0xdacea30ad06d67b7ULL, 0x3344d3b5869722a4ULL, 0x19d755677e82e59bULL,
-       0xc901eb64adea8e23ULL, 0x34bba1c9fd1ad32eULL, 0xf6552edf297ba48dULL,
-       0xa09dcd903050c0f0ULL, 0x9ac588a13b4decd7ULL, 0x658c30fa9fbc46d9ULL,
-       0x2a9386d2f815c73fULL, 0xae7e2968c6573ff9ULL, 0x6a98ad7913354c5fULL,
-       0x14303a12060a181eULL, 0x1e28271b050f1411ULL, 0xa4663461c55233f6ULL,
-       0x6688bb7711334455ULL, 0x2f9f06587799c1b6ULL, 0x15c743697c84ed91ULL,
-       0x01f7797b7a8ef58fULL, 0x0de76f757888fd85ULL, 0xb4adf782365ad8eeULL,
-       0x48e0c4541c24706cULL, 0x96d59eaf394be4ddULL, 0xcbf2199259eb7920ULL,
-       0x50c0e84818286078ULL, 0xe98a70bf56fa4513ULL, 0x8df1393eb3c8f645ULL,
-       0x87e92437b0cdfa4aULL, 0xd83d51fc246c90b4ULL, 0xc01d7de0206080a0ULL,
-       0x8bf93239b2cbf240ULL, 0x4be44fd992ab72e0ULL, 0xed71894ea3f8b615ULL,
-       0xba4e137ac05d27e7ULL, 0x851ad6c144cc0d49ULL, 0x5137913362a695f7ULL,
-       0x6080b07010304050ULL, 0x9fc9082bb4c1ea5eULL, 0x3f54c5bb84912aaeULL,
-       0x9722e7d443c51152ULL, 0x4dec44de93a876e5ULL, 0xb65e0574c25b2fedULL,
-       0xa16ab4eb4ade357fULL, 0xa9815b14bddace73ULL, 0x050c808a8f8c0689ULL,
-       0xee7502c32d77b499ULL, 0xaf895013bcd9ca76ULL, 0x6f942df39cb94ad6ULL,
-       0x6177c90b6abeb5dfULL, 0x9d3afadd40c01d5dULL, 0x98367a57cf4c1bd4ULL,
-       0xeb798249a2fbb210ULL, 0x2774e9a7809d3abaULL, 0xbf4293f04fd1216eULL,
-       0x42f8d95d1f217c63ULL, 0x861e5d4cca430fc5ULL, 0xdb39da71aae39238ULL,
-       0x912aecd342c61557ULL
-};
-
-static const u64 T5[256] = {
-       0xb9bb016ad3ba68d2ULL, 0x9ae5b166fc54194dULL, 0x65e2cd14712f93bcULL,
-       0x8725511b9c74b9cdULL, 0xa2f7a457f5530251ULL, 0xd6d003be68d3b86bULL,
-       0xded604b56bd2bd6fULL, 0x52b3fe85d74d6429ULL, 0xbafdad4af0500d5dULL,
-       0x09cf63e0e9ac268aULL, 0x1c0984968a8d830eULL, 0x91a51a4ddcbf79c6ULL,
-       0xa73d4d379070adddULL, 0xaaf1a35cf6520755ULL, 0xa47be117b39ac852ULL,
-       0x5ab5f98ed44c612dULL, 0x0346ac2023ea658fULL, 0xe6c4118462d5a673ULL,
-       0xcc55c268a497f166ULL, 0xc6dc0da86ed1b263ULL, 0x85aa99d05533ffccULL,
-       0xb2fbaa41f3510859ULL, 0xe2c79c0fed5b2a71ULL, 0x59f355aef7a604a2ULL,
-       0xbefe20c17fde815fULL, 0x7aade5a2d848753dULL, 0x29d77fcce5a8329aULL,
-       0xbc71e80ab699c75eULL, 0x96e03be670db904bULL, 0x8dac9edb5632fac8ULL,
-       0xd1952215c4b751e6ULL, 0xb332ceaa19fc2bd7ULL, 0x4b70937338e348abULL,
-       0x8463fd3bbf9edc42ULL, 0xfc41d052ae91ef7eULL, 0xac7de61cb09bcd56ULL,
-       0x437694783be24dafULL, 0xb1bd0661d0bb6dd6ULL, 0x329bdaf1c3415819ULL,
-       0x577917e5b26ecba5ULL, 0x41f95cb3f2a50baeULL, 0x16804b5640cbc00bULL,
-       0x7f670cc2bd6bdab1ULL, 0xdc59cc7ea295fb6eULL, 0x61e1409ffea11fbeULL,
-       0xcb10e3c308f318ebULL, 0xe181302fceb14ffeULL, 0x100c0e1606020a08ULL,
-       0x2e925e6749ccdb17ULL, 0x6ea2663f51c4f337ULL, 0xe84e53cf271d6974ULL,
-       0xa0786c9c3c144450ULL, 0x56b0730e58c3e82bULL, 0x3f57349aa563f291ULL,
-       0x9ee63ced73da954fULL, 0xd2d38e35e75d3469ULL, 0xc2df8023e15f3e61ULL,
-       0xaef22ed779dc8b57ULL, 0xcf136e48877d94e9ULL, 0x2694596c4acdde13ULL,
-       0xdf1f605e817f9ee1ULL, 0xeac19b04ee5a2f75ULL, 0x477519f3b46cc1adULL,
-       0xdad5893ee45c316dULL, 0xeb08ffef04f70cfbULL, 0x2dd4f2476a26be98ULL,
-       0xab38c7b71cff24dbULL, 0x3b54b9112aed7e93ULL, 0x134aa23625e86f87ULL,
-       0x9c69f426ba9dd34eULL, 0x5f7f10eeb16fcea1ULL, 0x04038d8b8f8e8c02ULL,
-       0xc8564fe32b197d64ULL, 0x69e74794fda01abaULL, 0xd31aeade0df017e7ULL,
-       0x3c1198ba8689971eULL, 0x78222d69110f333cULL, 0x3812153109071b1cULL,
-       0x11c56afdecaf2986ULL, 0x8b20db9b10fb30cbULL, 0x4030385818082820ULL,
-       0xa87e6b973f154154ULL, 0x682e237f170d3934ULL, 0x20181c2c0c041410ULL,
-       0x0806070b03010504ULL, 0x074521abac64e98dULL, 0xb6f827ca7cdf845bULL,
-       0x97295f0d9a76b3c5ULL, 0xef0b72648b7980f9ULL, 0xa6f429dc7add8e53ULL,
-       0xf58eb3b2473dc9f4ULL, 0xb074628a3a164e58ULL, 0xe582bda4413fc3fcULL,
-       0xa5b285fc5937ebdcULL, 0x4f731ef8b76dc4a9ULL, 0xdd90a8954838d8e0ULL,
-       0xa1b10877d6b967deULL, 0xbf37442a9573a2d1ULL, 0x1b4ca53d26e96a83ULL,
-       0xb5be8bea5f35e1d4ULL, 0x92e3b66dff551c49ULL, 0xaf3b4a3c9371a8d9ULL,
-       0xff077c728d7b8af1ULL, 0x140f839d898c860aULL, 0xb73143219672a7d5ULL,
-       0x34179fb18588921aULL, 0xe30ef8e407f609ffULL, 0x4dfcd6337e2a82a8ULL,
-       0xed84baaf423ec6f8ULL, 0xcad98728e25e3b65ULL, 0x25d2f54c6927bb9cULL,
-       0x0a89cfc0ca464305ULL, 0x60282474140c3c30ULL, 0x0f4326a0af65ec89ULL,
-       0x676d05dfb868d5bdULL, 0x2f5b3a8ca361f899ULL, 0x180a091d05030f0cULL,
-       0x46bc7d185ec1e223ULL, 0x82efb87bf9571641ULL, 0xfece189967d6a97fULL,
-       0x86ec35f076d99a43ULL, 0xfacd9512e858257dULL, 0x8eea32fb75d89f47ULL,
-       0x17492fbdaa66e385ULL, 0xf6c81f9264d7ac7bULL, 0xcd9ca6834e3ad2e8ULL,
-       0x0e8a424b45c8cf07ULL, 0xfd88b4b9443cccf0ULL, 0x8326dc9013fa35cfULL,
-       0xc453c563a796f462ULL, 0x51f552a5f4a701a6ULL, 0xb477ef01b598c25aULL,
-       0x3352be1a29ec7b97ULL, 0xa9b70f7cd5b862daULL, 0x76a86f2254c7fc3bULL,
-       0x19c36df6efae2c82ULL, 0x6f6b02d4bb69d0b9ULL, 0x62a7ecbfdd4b7a31ULL,
-       0x31dd76d1e0ab3d96ULL, 0x21d178c7e6a9379eULL, 0x1f4f28b6a967e681ULL,
-       0x503c364e1e0a2228ULL, 0x028fc8cbc9474601ULL, 0xc316e4c80bf21defULL,
-       0xc1992c03c2b55beeULL, 0x0dccee6b6622aa88ULL, 0x7b64814932e556b3ULL,
-       0x235eb00c2fee719fULL, 0x99a31d46dfbe7cc2ULL, 0x45fad1387d2b87acULL,
-       0x7c21a0e29e81bf3eULL, 0x906c7ea636125a48ULL, 0x6c2daef49883b536ULL,
-       0xd85a41f52d1b776cULL, 0x70242a62120e3638ULL, 0x05cae9606523af8cULL,
-       0xfb04f1f902f506f3ULL, 0x1283c6ddcf454c09ULL, 0x15c6e7766321a584ULL,
-       0x3e9e50714fced11fULL, 0x72abe2a9db497039ULL, 0x7de8c409742c9cb0ULL,
-       0x9b2cd58d16f93ac3ULL, 0x636e885437e659bfULL, 0xd993251ec7b654e2ULL,
-       0x5df0d825782888a0ULL, 0xb872658139174b5cULL, 0x642ba9ff9b82b032ULL,
-       0xd05c46fe2e1a7268ULL, 0x2c1d96ac808b9d16ULL, 0xa33ec0bc1ffe21dfULL,
-       0x241b91a7838a9812ULL, 0x48363f531b092d24ULL, 0x068c454046c9ca03ULL,
-       0x4c35b2d89487a126ULL, 0x4ab9f798d24e6b25ULL, 0x5b7c9d653ee142a3ULL,
-       0x6de4ca1f722e96b8ULL, 0x7362864231e453b7ULL, 0x537a9a6e3de047a7ULL,
-       0x0b40ab2b20eb608bULL, 0xf447d759ad90ea7aULL, 0x49ff5bb8f1a40eaaULL,
-       0xf0445ad2221e6678ULL, 0x5c39bcce9285ab2eULL, 0x275d3d87a060fd9dULL,
-       0x0000000000000000ULL, 0x35defb5a6f25b194ULL, 0xf302f6f201f403f7ULL,
-       0xdb1cedd50ef112e3ULL, 0xd45fcb75a194fe6aULL, 0x583a31451d0b272cULL,
-       0x6b688f5f34e75cbbULL, 0x8f2356109f75bcc9ULL, 0x2b58b7072cef749bULL,
-       0xbdb88ce15c34e4d0ULL, 0x95a697c65331f5c4ULL, 0xeec2168f61d4a377ULL,
-       0xceda0aa36dd0b767ULL, 0x4433b5d39786a422ULL, 0xd7196755827e9be5ULL,
-       0x01c964ebeaad238eULL, 0xbb34c9a11afd2ed3ULL, 0x55f6df2e7b298da4ULL,
-       0x9da090cd5030f0c0ULL, 0xc59aa1884d3bd7ecULL, 0x8c65fa30bc9fd946ULL,
-       0x932ad28615f83fc7ULL, 0x7eae682957c6f93fULL, 0x986a79ad35135f4cULL,
-       0x3014123a0a061e18ULL, 0x281e1b270f051114ULL, 0x66a4613452c5f633ULL,
-       0x886677bb33115544ULL, 0x9f2f58069977b6c1ULL, 0xc7156943847c91edULL,
-       0xf7017b798e7a8ff5ULL, 0xe70d756f887885fdULL, 0xadb482f75a36eed8ULL,
-       0xe04854c4241c6c70ULL, 0xd596af9e4b39dde4ULL, 0xf2cb9219eb592079ULL,
-       0xc05048e828187860ULL, 0x8ae9bf70fa561345ULL, 0xf18d3e39c8b345f6ULL,
-       0xe9873724cdb04afaULL, 0x3dd8fc516c24b490ULL, 0x1dc0e07d6020a080ULL,
-       0xf98b3932cbb240f2ULL, 0xe44bd94fab92e072ULL, 0x71ed4e89f8a315b6ULL,
-       0x4eba7a135dc0e727ULL, 0x1a85c1d6cc44490dULL, 0x37513391a662f795ULL,
-       0x806070b030105040ULL, 0xc99f2b08c1b45eeaULL, 0x543fbbc59184ae2aULL,
-       0x2297d4e7c5435211ULL, 0xec4dde44a893e576ULL, 0x5eb674055bc2ed2fULL,
-       0x6aa1ebb4de4a7f35ULL, 0x81a9145bdabd73ceULL, 0x0c058a808c8f8906ULL,
-       0x75eec302772d99b4ULL, 0x89af1350d9bc76caULL, 0x946ff32db99cd64aULL,
-       0x77610bc9be6adfb5ULL, 0x3a9dddfac0405d1dULL, 0x3698577a4ccfd41bULL,
-       0x79eb4982fba210b2ULL, 0x7427a7e99d80ba3aULL, 0x42bff093d14f6e21ULL,
-       0xf8425dd9211f637cULL, 0x1e864c5d43cac50fULL, 0x39db71dae3aa3892ULL,
-       0x2a91d3ecc6425715ULL
-};
-
-static const u64 T6[256] = {
-       0x6a01bbb9d268bad3ULL, 0x66b1e59a4d1954fcULL, 0x14cde265bc932f71ULL,
-       0x1b512587cdb9749cULL, 0x57a4f7a2510253f5ULL, 0xbe03d0d66bb8d368ULL,
-       0xb504d6de6fbdd26bULL, 0x85feb35229644dd7ULL, 0x4aadfdba5d0d50f0ULL,
-       0xe063cf098a26ace9ULL, 0x9684091c0e838d8aULL, 0x4d1aa591c679bfdcULL,
-       0x374d3da7ddad7090ULL, 0x5ca3f1aa550752f6ULL, 0x17e17ba452c89ab3ULL,
-       0x8ef9b55a2d614cd4ULL, 0x20ac46038f65ea23ULL, 0x8411c4e673a6d562ULL,
-       0x68c255cc66f197a4ULL, 0xa80ddcc663b2d16eULL, 0xd099aa85ccff3355ULL,
-       0x41aafbb2590851f3ULL, 0x0f9cc7e2712a5bedULL, 0xae55f359a204a6f7ULL,
-       0xc120febe5f81de7fULL, 0xa2e5ad7a3d7548d8ULL, 0xcc7fd7299a32a8e5ULL,
-       0x0ae871bc5ec799b6ULL, 0xe63be0964b90db70ULL, 0xdb9eac8dc8fa3256ULL,
-       0x152295d1e651b7c4ULL, 0xaace32b3d72bfc19ULL, 0x7393704bab48e338ULL,
-       0x3bfd638442dc9ebfULL, 0x52d041fc7eef91aeULL, 0x1ce67dac56cd9bb0ULL,
-       0x78947643af4de23bULL, 0x6106bdb1d66dbbd0ULL, 0xf1da9b32195841c3ULL,
-       0xe5177957a5cb6eb2ULL, 0xb35cf941ae0ba5f2ULL, 0x564b80160bc0cb40ULL,
-       0xc20c677fb1da6bbdULL, 0x7ecc59dc6efb95a2ULL, 0x9f40e161be1fa1feULL,
-       0xc3e310cbeb18f308ULL, 0x2f3081e1fe4fb1ceULL, 0x160e0c10080a0206ULL,
-       0x675e922e17dbcc49ULL, 0x3f66a26e37f3c451ULL, 0xcf534ee874691d27ULL,
-       0x9c6c78a05044143cULL, 0x0e73b0562be8c358ULL, 0x9a34573f91f263a5ULL,
-       0xed3ce69e4f95da73ULL, 0x358ed3d269345de7ULL, 0x2380dfc2613e5fe1ULL,
-       0xd72ef2ae578bdc79ULL, 0x486e13cfe9947d87ULL, 0x6c59942613decd4aULL,
-       0x5e601fdfe19e7f81ULL, 0x049bc1ea752f5aeeULL, 0xf3197547adc16cb4ULL,
-       0x3e89d5da6d315ce4ULL, 0xefff08ebfb0cf704ULL, 0x47f2d42d98be266aULL,
-       0xb7c738abdb24ff1cULL, 0x11b9543b937eed2aULL, 0x36a24a13876fe825ULL,
-       0x26f4699c4ed39dbaULL, 0xee107f5fa1ce6fb1ULL, 0x8b8d0304028c8e8fULL,
-       0xe34f56c8647d192bULL, 0x9447e769ba1aa0fdULL, 0xdeea1ad3e717f00dULL,
-       0xba98113c1e978986ULL, 0x692d22783c330f11ULL, 0x311512381c1b0709ULL,
-       0xfd6ac5118629afecULL, 0x9bdb208bcb30fb10ULL, 0x5838304020280818ULL,
-       0x976b7ea85441153fULL, 0x7f232e6834390d17ULL, 0x2c1c18201014040cULL,
-       0x0b07060804050103ULL, 0xab2145078de964acULL, 0xca27f8b65b84df7cULL,
-       0x0d5f2997c5b3769aULL, 0x64720beff980798bULL, 0xdc29f4a6538edd7aULL,
-       0xb2b38ef5f4c93d47ULL, 0x8a6274b0584e163aULL, 0xa4bd82e5fcc33f41ULL,
-       0xfc85b2a5dceb3759ULL, 0xf81e734fa9c46db7ULL, 0x95a890dde0d83848ULL,
-       0x7708b1a1de67b9d6ULL, 0x2a4437bfd1a27395ULL, 0x3da54c1b836ae926ULL,
-       0xea8bbeb5d4e1355fULL, 0x6db6e392491c55ffULL, 0x3c4a3bafd9a87193ULL,
-       0x727c07fff18a7b8dULL, 0x9d830f140a868c89ULL, 0x214331b7d5a77296ULL,
-       0xb19f17341a928885ULL, 0xe4f80ee3ff09f607ULL, 0x33d6fc4da8822a7eULL,
-       0xafba84edf8c63e42ULL, 0x2887d9ca653b5ee2ULL, 0x4cf5d2259cbb2769ULL,
-       0xc0cf890a054346caULL, 0x74242860303c0c14ULL, 0xa026430f89ec65afULL,
-       0xdf056d67bdd568b8ULL, 0x8c3a5b2f99f861a3ULL, 0x1d090a180c0f0305ULL,
-       0x187dbc4623e2c15eULL, 0x7bb8ef82411657f9ULL, 0x9918cefe7fa9d667ULL,
-       0xf035ec86439ad976ULL, 0x1295cdfa7d2558e8ULL, 0xfb32ea8e479fd875ULL,
-       0xbd2f491785e366aaULL, 0x921fc8f67bacd764ULL, 0x83a69ccde8d23a4eULL,
-       0x4b428a0e07cfc845ULL, 0xb9b488fdf0cc3c44ULL, 0x90dc2683cf35fa13ULL,
-       0x63c553c462f496a7ULL, 0xa552f551a601a7f4ULL, 0x01ef77b45ac298b5ULL,
-       0x1abe5233977bec29ULL, 0x7c0fb7a9da62b8d5ULL, 0x226fa8763bfcc754ULL,
-       0xf66dc319822caeefULL, 0xd4026b6fb9d069bbULL, 0xbfeca762317a4bddULL,
-       0xd176dd31963dabe0ULL, 0xc778d1219e37a9e6ULL, 0xb6284f1f81e667a9ULL,
-       0x4e363c5028220a1eULL, 0xcbc88f02014647c9ULL, 0xc8e416c3ef1df20bULL,
-       0x032c99c1ee5bb5c2ULL, 0x6beecc0d88aa2266ULL, 0x4981647bb356e532ULL,
-       0x0cb05e239f71ee2fULL, 0x461da399c27cbedfULL, 0x38d1fa45ac872b7dULL,
-       0xe2a0217c3ebf819eULL, 0xa67e6c90485a1236ULL, 0xf4ae2d6c36b58398ULL,
-       0xf5415ad86c771b2dULL, 0x622a247038360e12ULL, 0x60e9ca058caf2365ULL,
-       0xf9f104fbf306f502ULL, 0xddc68312094c45cfULL, 0x76e7c61584a52163ULL,
-       0x71509e3e1fd1ce4fULL, 0xa9e2ab72397049dbULL, 0x09c4e87db09c2c74ULL,
-       0x8dd52c9bc33af916ULL, 0x54886e63bf59e637ULL, 0x1e2593d9e254b6c7ULL,
-       0x25d8f05da0882878ULL, 0x816572b85c4b1739ULL, 0xffa92b6432b0829bULL,
-       0xfe465cd068721a2eULL, 0xac961d2c169d8b80ULL, 0xbcc03ea3df21fe1fULL,
-       0xa7911b2412988a83ULL, 0x533f3648242d091bULL, 0x40458c0603cac946ULL,
-       0xd8b2354c26a18794ULL, 0x98f7b94a256b4ed2ULL, 0x659d7c5ba342e13eULL,
-       0x1fcae46db8962e72ULL, 0x42866273b753e431ULL, 0x6e9a7a53a747e03dULL,
-       0x2bab400b8b60eb20ULL, 0x59d747f47aea90adULL, 0xb85bff49aa0ea4f1ULL,
-       0xd25a44f078661e22ULL, 0xcebc395c2eab8592ULL, 0x873d5d279dfd60a0ULL,
-       0x0000000000000000ULL, 0x5afbde3594b1256fULL, 0xf2f602f3f703f401ULL,
-       0xd5ed1cdbe312f10eULL, 0x75cb5fd46afe94a1ULL, 0x45313a582c270b1dULL,
-       0x5f8f686bbb5ce734ULL, 0x1056238fc9bc759fULL, 0x07b7582b9b74ef2cULL,
-       0xe18cb8bdd0e4345cULL, 0xc697a695c4f53153ULL, 0x8f16c2ee77a3d461ULL,
-       0xa30adace67b7d06dULL, 0xd3b5334422a48697ULL, 0x556719d7e59b7e82ULL,
-       0xeb64c9018e23adeaULL, 0xa1c934bbd32efd1aULL, 0x2edff655a48d297bULL,
-       0xcd90a09dc0f03050ULL, 0x88a19ac5ecd73b4dULL, 0x30fa658c46d99fbcULL,
-       0x86d22a93c73ff815ULL, 0x2968ae7e3ff9c657ULL, 0xad796a984c5f1335ULL,
-       0x3a121430181e060aULL, 0x271b1e281411050fULL, 0x3461a46633f6c552ULL,
-       0xbb77668844551133ULL, 0x06582f9fc1b67799ULL, 0x436915c7ed917c84ULL,
-       0x797b01f7f58f7a8eULL, 0x6f750de7fd857888ULL, 0xf782b4add8ee365aULL,
-       0xc45448e0706c1c24ULL, 0x9eaf96d5e4dd394bULL, 0x1992cbf2792059ebULL,
-       0xe84850c060781828ULL, 0x70bfe98a451356faULL, 0x393e8df1f645b3c8ULL,
-       0x243787e9fa4ab0cdULL, 0x51fcd83d90b4246cULL, 0x7de0c01d80a02060ULL,
-       0x32398bf9f240b2cbULL, 0x4fd94be472e092abULL, 0x894eed71b615a3f8ULL,
-       0x137aba4e27e7c05dULL, 0xd6c1851a0d4944ccULL, 0x9133513795f762a6ULL,
-       0xb070608040501030ULL, 0x082b9fc9ea5eb4c1ULL, 0xc5bb3f542aae8491ULL,
-       0xe7d49722115243c5ULL, 0x44de4dec76e593a8ULL, 0x0574b65e2fedc25bULL,
-       0xb4eba16a357f4adeULL, 0x5b14a981ce73bddaULL, 0x808a050c06898f8cULL,
-       0x02c3ee75b4992d77ULL, 0x5013af89ca76bcd9ULL, 0x2df36f944ad69cb9ULL,
-       0xc90b6177b5df6abeULL, 0xfadd9d3a1d5d40c0ULL, 0x7a5798361bd4cf4cULL,
-       0x8249eb79b210a2fbULL, 0xe9a727743aba809dULL, 0x93f0bf42216e4fd1ULL,
-       0xd95d42f87c631f21ULL, 0x5d4c861e0fc5ca43ULL, 0xda71db399238aae3ULL,
-       0xecd3912a155742c6ULL
-};
-
-static const u64 T7[256] = {
-       0x016ab9bb68d2d3baULL, 0xb1669ae5194dfc54ULL, 0xcd1465e293bc712fULL,
-       0x511b8725b9cd9c74ULL, 0xa457a2f70251f553ULL, 0x03bed6d0b86b68d3ULL,
-       0x04b5ded6bd6f6bd2ULL, 0xfe8552b36429d74dULL, 0xad4abafd0d5df050ULL,
-       0x63e009cf268ae9acULL, 0x84961c09830e8a8dULL, 0x1a4d91a579c6dcbfULL,
-       0x4d37a73daddd9070ULL, 0xa35caaf10755f652ULL, 0xe117a47bc852b39aULL,
-       0xf98e5ab5612dd44cULL, 0xac200346658f23eaULL, 0x1184e6c4a67362d5ULL,
-       0xc268cc55f166a497ULL, 0x0da8c6dcb2636ed1ULL, 0x99d085aaffcc5533ULL,
-       0xaa41b2fb0859f351ULL, 0x9c0fe2c72a71ed5bULL, 0x55ae59f304a2f7a6ULL,
-       0x20c1befe815f7fdeULL, 0xe5a27aad753dd848ULL, 0x7fcc29d7329ae5a8ULL,
-       0xe80abc71c75eb699ULL, 0x3be696e0904b70dbULL, 0x9edb8dacfac85632ULL,
-       0x2215d19551e6c4b7ULL, 0xceaab3322bd719fcULL, 0x93734b7048ab38e3ULL,
-       0xfd3b8463dc42bf9eULL, 0xd052fc41ef7eae91ULL, 0xe61cac7dcd56b09bULL,
-       0x947843764daf3be2ULL, 0x0661b1bd6dd6d0bbULL, 0xdaf1329b5819c341ULL,
-       0x17e55779cba5b26eULL, 0x5cb341f90baef2a5ULL, 0x4b561680c00b40cbULL,
-       0x0cc27f67dab1bd6bULL, 0xcc7edc59fb6ea295ULL, 0x409f61e11fbefea1ULL,
-       0xe3c3cb1018eb08f3ULL, 0x302fe1814ffeceb1ULL, 0x0e16100c0a080602ULL,
-       0x5e672e92db1749ccULL, 0x663f6ea2f33751c4ULL, 0x53cfe84e6974271dULL,
-       0x6c9ca07844503c14ULL, 0x730e56b0e82b58c3ULL, 0x349a3f57f291a563ULL,
-       0x3ced9ee6954f73daULL, 0x8e35d2d33469e75dULL, 0x8023c2df3e61e15fULL,
-       0x2ed7aef28b5779dcULL, 0x6e48cf1394e9877dULL, 0x596c2694de134acdULL,
-       0x605edf1f9ee1817fULL, 0x9b04eac12f75ee5aULL, 0x19f34775c1adb46cULL,
-       0x893edad5316de45cULL, 0xffefeb080cfb04f7ULL, 0xf2472dd4be986a26ULL,
-       0xc7b7ab3824db1cffULL, 0xb9113b547e932aedULL, 0xa236134a6f8725e8ULL,
-       0xf4269c69d34eba9dULL, 0x10ee5f7fcea1b16fULL, 0x8d8b04038c028f8eULL,
-       0x4fe3c8567d642b19ULL, 0x479469e71abafda0ULL, 0xeaded31a17e70df0ULL,
-       0x98ba3c11971e8689ULL, 0x2d697822333c110fULL, 0x153138121b1c0907ULL,
-       0x6afd11c52986ecafULL, 0xdb9b8b2030cb10fbULL, 0x3858403028201808ULL,
-       0x6b97a87e41543f15ULL, 0x237f682e3934170dULL, 0x1c2c201814100c04ULL,
-       0x070b080605040301ULL, 0x21ab0745e98dac64ULL, 0x27cab6f8845b7cdfULL,
-       0x5f0d9729b3c59a76ULL, 0x7264ef0b80f98b79ULL, 0x29dca6f48e537addULL,
-       0xb3b2f58ec9f4473dULL, 0x628ab0744e583a16ULL, 0xbda4e582c3fc413fULL,
-       0x85fca5b2ebdc5937ULL, 0x1ef84f73c4a9b76dULL, 0xa895dd90d8e04838ULL,
-       0x0877a1b167ded6b9ULL, 0x442abf37a2d19573ULL, 0xa53d1b4c6a8326e9ULL,
-       0x8beab5bee1d45f35ULL, 0xb66d92e31c49ff55ULL, 0x4a3caf3ba8d99371ULL,
-       0x7c72ff078af18d7bULL, 0x839d140f860a898cULL, 0x4321b731a7d59672ULL,
-       0x9fb13417921a8588ULL, 0xf8e4e30e09ff07f6ULL, 0xd6334dfc82a87e2aULL,
-       0xbaafed84c6f8423eULL, 0x8728cad93b65e25eULL, 0xf54c25d2bb9c6927ULL,
-       0xcfc00a894305ca46ULL, 0x247460283c30140cULL, 0x26a00f43ec89af65ULL,
-       0x05df676dd5bdb868ULL, 0x3a8c2f5bf899a361ULL, 0x091d180a0f0c0503ULL,
-       0x7d1846bce2235ec1ULL, 0xb87b82ef1641f957ULL, 0x1899fecea97f67d6ULL,
-       0x35f086ec9a4376d9ULL, 0x9512facd257de858ULL, 0x32fb8eea9f4775d8ULL,
-       0x2fbd1749e385aa66ULL, 0x1f92f6c8ac7b64d7ULL, 0xa683cd9cd2e84e3aULL,
-       0x424b0e8acf0745c8ULL, 0xb4b9fd88ccf0443cULL, 0xdc90832635cf13faULL,
-       0xc563c453f462a796ULL, 0x52a551f501a6f4a7ULL, 0xef01b477c25ab598ULL,
-       0xbe1a33527b9729ecULL, 0x0f7ca9b762dad5b8ULL, 0x6f2276a8fc3b54c7ULL,
-       0x6df619c32c82efaeULL, 0x02d46f6bd0b9bb69ULL, 0xecbf62a77a31dd4bULL,
-       0x76d131dd3d96e0abULL, 0x78c721d1379ee6a9ULL, 0x28b61f4fe681a967ULL,
-       0x364e503c22281e0aULL, 0xc8cb028f4601c947ULL, 0xe4c8c3161def0bf2ULL,
-       0x2c03c1995beec2b5ULL, 0xee6b0dccaa886622ULL, 0x81497b6456b332e5ULL,
-       0xb00c235e719f2feeULL, 0x1d4699a37cc2dfbeULL, 0xd13845fa87ac7d2bULL,
-       0xa0e27c21bf3e9e81ULL, 0x7ea6906c5a483612ULL, 0xaef46c2db5369883ULL,
-       0x41f5d85a776c2d1bULL, 0x2a6270243638120eULL, 0xe96005caaf8c6523ULL,
-       0xf1f9fb0406f302f5ULL, 0xc6dd12834c09cf45ULL, 0xe77615c6a5846321ULL,
-       0x50713e9ed11f4fceULL, 0xe2a972ab7039db49ULL, 0xc4097de89cb0742cULL,
-       0xd58d9b2c3ac316f9ULL, 0x8854636e59bf37e6ULL, 0x251ed99354e2c7b6ULL,
-       0xd8255df088a07828ULL, 0x6581b8724b5c3917ULL, 0xa9ff642bb0329b82ULL,
-       0x46fed05c72682e1aULL, 0x96ac2c1d9d16808bULL, 0xc0bca33e21df1ffeULL,
-       0x91a7241b9812838aULL, 0x3f5348362d241b09ULL, 0x4540068cca0346c9ULL,
-       0xb2d84c35a1269487ULL, 0xf7984ab96b25d24eULL, 0x9d655b7c42a33ee1ULL,
-       0xca1f6de496b8722eULL, 0x8642736253b731e4ULL, 0x9a6e537a47a73de0ULL,
-       0xab2b0b40608b20ebULL, 0xd759f447ea7aad90ULL, 0x5bb849ff0eaaf1a4ULL,
-       0x5ad2f0446678221eULL, 0xbcce5c39ab2e9285ULL, 0x3d87275dfd9da060ULL,
-       0x0000000000000000ULL, 0xfb5a35deb1946f25ULL, 0xf6f2f30203f701f4ULL,
-       0xedd5db1c12e30ef1ULL, 0xcb75d45ffe6aa194ULL, 0x3145583a272c1d0bULL,
-       0x8f5f6b685cbb34e7ULL, 0x56108f23bcc99f75ULL, 0xb7072b58749b2cefULL,
-       0x8ce1bdb8e4d05c34ULL, 0x97c695a6f5c45331ULL, 0x168feec2a37761d4ULL,
-       0x0aa3cedab7676dd0ULL, 0xb5d34433a4229786ULL, 0x6755d7199be5827eULL,
-       0x64eb01c9238eeaadULL, 0xc9a1bb342ed31afdULL, 0xdf2e55f68da47b29ULL,
-       0x90cd9da0f0c05030ULL, 0xa188c59ad7ec4d3bULL, 0xfa308c65d946bc9fULL,
-       0xd286932a3fc715f8ULL, 0x68297eaef93f57c6ULL, 0x79ad986a5f4c3513ULL,
-       0x123a30141e180a06ULL, 0x1b27281e11140f05ULL, 0x613466a4f63352c5ULL,
-       0x77bb886655443311ULL, 0x58069f2fb6c19977ULL, 0x6943c71591ed847cULL,
-       0x7b79f7018ff58e7aULL, 0x756fe70d85fd8878ULL, 0x82f7adb4eed85a36ULL,
-       0x54c4e0486c70241cULL, 0xaf9ed596dde44b39ULL, 0x9219f2cb2079eb59ULL,
-       0x48e8c05078602818ULL, 0xbf708ae91345fa56ULL, 0x3e39f18d45f6c8b3ULL,
-       0x3724e9874afacdb0ULL, 0xfc513dd8b4906c24ULL, 0xe07d1dc0a0806020ULL,
-       0x3932f98b40f2cbb2ULL, 0xd94fe44be072ab92ULL, 0x4e8971ed15b6f8a3ULL,
-       0x7a134ebae7275dc0ULL, 0xc1d61a85490dcc44ULL, 0x33913751f795a662ULL,
-       0x70b0806050403010ULL, 0x2b08c99f5eeac1b4ULL, 0xbbc5543fae2a9184ULL,
-       0xd4e722975211c543ULL, 0xde44ec4de576a893ULL, 0x74055eb6ed2f5bc2ULL,
-       0xebb46aa17f35de4aULL, 0x145b81a973cedabdULL, 0x8a800c0589068c8fULL,
-       0xc30275ee99b4772dULL, 0x135089af76cad9bcULL, 0xf32d946fd64ab99cULL,
-       0x0bc97761dfb5be6aULL, 0xddfa3a9d5d1dc040ULL, 0x577a3698d41b4ccfULL,
-       0x498279eb10b2fba2ULL, 0xa7e97427ba3a9d80ULL, 0xf09342bf6e21d14fULL,
-       0x5dd9f842637c211fULL, 0x4c5d1e86c50f43caULL, 0x71da39db3892e3aaULL,
-       0xd3ec2a915715c642ULL
-};
-
-static const u64 c[KHAZAD_ROUNDS + 1] = {
-       0xba542f7453d3d24dULL, 0x50ac8dbf70529a4cULL, 0xead597d133515ba6ULL,
-       0xde48a899db32b7fcULL, 0xe39e919be2bb416eULL, 0xa5cb6b95a1f3b102ULL,
-       0xccc41d14c363da5dULL, 0x5fdc7dcd7f5a6c5cULL, 0xf726ffede89d6f8eULL
-};
-
-static int khazad_setkey(void *ctx_arg, const u8 *in_key,
-                       unsigned int key_len, u32 *flags)
-{
-
-       struct khazad_ctx *ctx = ctx_arg;
-       int r;
-       const u64 *S = T7;
-       u64 K2, K1;
-       
-       if (key_len != 16)
-       {
-               *flags |= CRYPTO_TFM_RES_BAD_KEY_LEN;
-               return -EINVAL;
-       }
-
-       K2 = ((u64)in_key[ 0] << 56) ^
-            ((u64)in_key[ 1] << 48) ^
-            ((u64)in_key[ 2] << 40) ^
-            ((u64)in_key[ 3] << 32) ^
-            ((u64)in_key[ 4] << 24) ^
-            ((u64)in_key[ 5] << 16) ^
-            ((u64)in_key[ 6] <<  8) ^
-            ((u64)in_key[ 7]      );
-       K1 = ((u64)in_key[ 8] << 56) ^
-            ((u64)in_key[ 9] << 48) ^
-            ((u64)in_key[10] << 40) ^
-            ((u64)in_key[11] << 32) ^
-            ((u64)in_key[12] << 24) ^
-            ((u64)in_key[13] << 16) ^
-            ((u64)in_key[14] <<  8) ^
-            ((u64)in_key[15]      );
-
-       /* setup the encrypt key */
-       for (r = 0; r <= KHAZAD_ROUNDS; r++) {
-               ctx->E[r] = T0[(int)(K1 >> 56)       ] ^
-                           T1[(int)(K1 >> 48) & 0xff] ^
-                           T2[(int)(K1 >> 40) & 0xff] ^
-                           T3[(int)(K1 >> 32) & 0xff] ^
-                           T4[(int)(K1 >> 24) & 0xff] ^
-                           T5[(int)(K1 >> 16) & 0xff] ^
-                           T6[(int)(K1 >>  8) & 0xff] ^
-                           T7[(int)(K1      ) & 0xff] ^
-                           c[r] ^ K2;
-               K2 = K1; 
-               K1 = ctx->E[r];
-       }
-       /* Setup the decrypt key */
-       ctx->D[0] = ctx->E[KHAZAD_ROUNDS];
-       for (r = 1; r < KHAZAD_ROUNDS; r++) {
-               K1 = ctx->E[KHAZAD_ROUNDS - r];
-               ctx->D[r] = T0[(int)S[(int)(K1 >> 56)       ] & 0xff] ^
-                           T1[(int)S[(int)(K1 >> 48) & 0xff] & 0xff] ^
-                           T2[(int)S[(int)(K1 >> 40) & 0xff] & 0xff] ^
-                           T3[(int)S[(int)(K1 >> 32) & 0xff] & 0xff] ^
-                           T4[(int)S[(int)(K1 >> 24) & 0xff] & 0xff] ^
-                           T5[(int)S[(int)(K1 >> 16) & 0xff] & 0xff] ^
-                           T6[(int)S[(int)(K1 >>  8) & 0xff] & 0xff] ^
-                           T7[(int)S[(int)(K1      ) & 0xff] & 0xff];
-       }
-       ctx->D[KHAZAD_ROUNDS] = ctx->E[0];
-
-       return 0;
-
-}
-
-static void khazad_crypt(const u64 roundKey[KHAZAD_ROUNDS + 1],
-               u8 *ciphertext, const u8 *plaintext)
-{
-
-       int r;
-       u64 state;
-
-       state = ((u64)plaintext[0] << 56) ^
-               ((u64)plaintext[1] << 48) ^
-               ((u64)plaintext[2] << 40) ^
-               ((u64)plaintext[3] << 32) ^
-               ((u64)plaintext[4] << 24) ^
-               ((u64)plaintext[5] << 16) ^
-               ((u64)plaintext[6] <<  8) ^
-               ((u64)plaintext[7]      ) ^
-               roundKey[0];
-
-       for (r = 1; r < KHAZAD_ROUNDS; r++) {
-               state = T0[(int)(state >> 56)       ] ^
-                       T1[(int)(state >> 48) & 0xff] ^
-                       T2[(int)(state >> 40) & 0xff] ^
-                       T3[(int)(state >> 32) & 0xff] ^
-                       T4[(int)(state >> 24) & 0xff] ^
-                       T5[(int)(state >> 16) & 0xff] ^
-                       T6[(int)(state >>  8) & 0xff] ^
-                       T7[(int)(state      ) & 0xff] ^
-                       roundKey[r];
-       }
-
-       state = (T0[(int)(state >> 56)       ] & 0xff00000000000000ULL) ^
-               (T1[(int)(state >> 48) & 0xff] & 0x00ff000000000000ULL) ^
-               (T2[(int)(state >> 40) & 0xff] & 0x0000ff0000000000ULL) ^
-               (T3[(int)(state >> 32) & 0xff] & 0x000000ff00000000ULL) ^
-               (T4[(int)(state >> 24) & 0xff] & 0x00000000ff000000ULL) ^
-               (T5[(int)(state >> 16) & 0xff] & 0x0000000000ff0000ULL) ^
-               (T6[(int)(state >>  8) & 0xff] & 0x000000000000ff00ULL) ^
-               (T7[(int)(state      ) & 0xff] & 0x00000000000000ffULL) ^
-               roundKey[KHAZAD_ROUNDS];
-
-       ciphertext[0] = (u8)(state >> 56);
-       ciphertext[1] = (u8)(state >> 48);
-       ciphertext[2] = (u8)(state >> 40);
-       ciphertext[3] = (u8)(state >> 32);
-       ciphertext[4] = (u8)(state >> 24);
-       ciphertext[5] = (u8)(state >> 16);
-       ciphertext[6] = (u8)(state >>  8);
-       ciphertext[7] = (u8)(state      );
-
-}
-
-static void khazad_encrypt(void *ctx_arg, u8 *dst, const u8 *src)
-{
-       struct khazad_ctx *ctx = ctx_arg;
-       khazad_crypt(ctx->E, dst, src);
-}
-
-static void khazad_decrypt(void *ctx_arg, u8 *dst, const u8 *src)
-{
-       struct khazad_ctx *ctx = ctx_arg;
-       khazad_crypt(ctx->D, dst, src);
-}
-
-static struct crypto_alg khazad_alg = {
-       .cra_name               =       "khazad",
-       .cra_flags              =       CRYPTO_ALG_TYPE_CIPHER,
-       .cra_blocksize          =       KHAZAD_BLOCK_SIZE,
-       .cra_ctxsize            =       sizeof (struct khazad_ctx),
-       .cra_module             =       THIS_MODULE,
-       .cra_list               =       LIST_HEAD_INIT(khazad_alg.cra_list),
-       .cra_u                  =       { .cipher = {
-       .cia_min_keysize        =       KHAZAD_KEY_SIZE,
-       .cia_max_keysize        =       KHAZAD_KEY_SIZE,
-       .cia_setkey             =       khazad_setkey,
-       .cia_encrypt            =       khazad_encrypt,
-       .cia_decrypt            =       khazad_decrypt } }
-};
-
-static int __init init(void)
-{
-       int ret = 0;
-       
-       ret = crypto_register_alg(&khazad_alg);
-       return ret;
-}
-
-static void __exit fini(void)
-{
-       crypto_unregister_alg(&khazad_alg);
-}
-
-
-module_init(init);
-module_exit(fini);
-
-MODULE_LICENSE("GPL");
-MODULE_DESCRIPTION("Khazad Cryptographic Algorithm");
diff --git a/drivers/block/carmel.c b/drivers/block/carmel.c
deleted file mode 100644 (file)
index 38fd6fe..0000000
+++ /dev/null
@@ -1,1763 +0,0 @@
-/*
- *  carmel.c: Driver for Promise SATA SX8 looks-like-I2O hardware
- *
- *  Copyright 2004 Red Hat, Inc.
- *
- *  Author/maintainer:  Jeff Garzik <jgarzik@pobox.com>
- *
- *  This file is subject to the terms and conditions of the GNU General Public
- *  License.  See the file "COPYING" in the main directory of this archive
- *  for more details.
- */
-
-#include <linux/kernel.h>
-#include <linux/module.h>
-#include <linux/init.h>
-#include <linux/pci.h>
-#include <linux/slab.h>
-#include <linux/spinlock.h>
-#include <linux/blkdev.h>
-#include <linux/sched.h>
-#include <linux/devfs_fs_kernel.h>
-#include <linux/interrupt.h>
-#include <linux/compiler.h>
-#include <linux/workqueue.h>
-#include <linux/bitops.h>
-#include <linux/delay.h>
-#include <linux/time.h>
-#include <linux/hdreg.h>
-#include <asm/io.h>
-#include <asm/semaphore.h>
-#include <asm/uaccess.h>
-
-MODULE_AUTHOR("Jeff Garzik");
-MODULE_LICENSE("GPL");
-MODULE_DESCRIPTION("Promise SATA SX8 (carmel) block driver");
-
-#if 0
-#define CARM_DEBUG
-#define CARM_VERBOSE_DEBUG
-#else
-#undef CARM_DEBUG
-#undef CARM_VERBOSE_DEBUG
-#endif
-#undef CARM_NDEBUG
-
-#define DRV_NAME "carmel"
-#define DRV_VERSION "0.8"
-#define PFX DRV_NAME ": "
-
-#define NEXT_RESP(idx) ((idx + 1) % RMSG_Q_LEN)
-
-/* 0xf is just arbitrary, non-zero noise; this is sorta like poisoning */
-#define TAG_ENCODE(tag)        (((tag) << 16) | 0xf)
-#define TAG_DECODE(tag)        (((tag) >> 16) & 0x1f)
-#define TAG_VALID(tag) ((((tag) & 0xf) == 0xf) && (TAG_DECODE(tag) < 32))
-
-/* note: prints function name for you */
-#ifdef CARM_DEBUG
-#define DPRINTK(fmt, args...) printk(KERN_ERR "%s: " fmt, __FUNCTION__, ## args)
-#ifdef CARM_VERBOSE_DEBUG
-#define VPRINTK(fmt, args...) printk(KERN_ERR "%s: " fmt, __FUNCTION__, ## args)
-#else
-#define VPRINTK(fmt, args...)
-#endif /* CARM_VERBOSE_DEBUG */
-#else
-#define DPRINTK(fmt, args...)
-#define VPRINTK(fmt, args...)
-#endif /* CARM_DEBUG */
-
-#ifdef CARM_NDEBUG
-#define assert(expr)
-#else
-#define assert(expr) \
-        if(unlikely(!(expr))) {                                   \
-        printk(KERN_ERR "Assertion failed! %s,%s,%s,line=%d\n", \
-        #expr,__FILE__,__FUNCTION__,__LINE__);          \
-        }
-#endif
-
-/* defines only for the constants which don't work well as enums */
-struct carm_host;
-
-enum {
-       /* adapter-wide limits */
-       CARM_MAX_PORTS          = 8,
-       CARM_SHM_SIZE           = (4096 << 7),
-       CARM_MINORS_PER_MAJOR   = 256 / CARM_MAX_PORTS,
-       CARM_MAX_WAIT_Q         = CARM_MAX_PORTS + 1,
-
-       /* command message queue limits */
-       CARM_MAX_REQ            = 64,          /* max command msgs per host */
-       CARM_MAX_Q              = 1,               /* one command at a time */
-       CARM_MSG_LOW_WATER      = (CARM_MAX_REQ / 4),        /* refill mark */
-
-       /* S/G limits, host-wide and per-request */
-       CARM_MAX_REQ_SG         = 32,        /* max s/g entries per request */
-       CARM_SG_BOUNDARY        = 0xffffUL,         /* s/g segment boundary */
-       CARM_MAX_HOST_SG        = 600,          /* max s/g entries per host */
-       CARM_SG_LOW_WATER       = (CARM_MAX_HOST_SG / 4),   /* re-fill mark */
-
-       /* hardware registers */
-       CARM_IHQP               = 0x1c,
-       CARM_INT_STAT           = 0x10, /* interrupt status */
-       CARM_INT_MASK           = 0x14, /* interrupt mask */
-       CARM_HMUC               = 0x18, /* host message unit control */
-       RBUF_ADDR_LO            = 0x20, /* response msg DMA buf low 32 bits */
-       RBUF_ADDR_HI            = 0x24, /* response msg DMA buf high 32 bits */
-       RBUF_BYTE_SZ            = 0x28,
-       CARM_RESP_IDX           = 0x2c,
-       CARM_CMS0               = 0x30, /* command message size reg 0 */
-       CARM_LMUC               = 0x48,
-       CARM_HMPHA              = 0x6c,
-       CARM_INITC              = 0xb5,
-
-       /* bits in CARM_INT_{STAT,MASK} */
-       INT_RESERVED            = 0xfffffff0,
-       INT_WATCHDOG            = (1 << 3),     /* watchdog timer */
-       INT_Q_OVERFLOW          = (1 << 2),     /* cmd msg q overflow */
-       INT_Q_AVAILABLE         = (1 << 1),     /* cmd msg q has free space */
-       INT_RESPONSE            = (1 << 0),     /* response msg available */
-       INT_ACK_MASK            = INT_WATCHDOG | INT_Q_OVERFLOW,
-       INT_DEF_MASK            = INT_RESERVED | INT_Q_OVERFLOW |
-                                 INT_RESPONSE,
-
-       /* command messages, and related register bits */
-       CARM_HAVE_RESP          = 0x01,
-       CARM_MSG_READ           = 1,
-       CARM_MSG_WRITE          = 2,
-       CARM_MSG_VERIFY         = 3,
-       CARM_MSG_GET_CAPACITY   = 4,
-       CARM_MSG_FLUSH          = 5,
-       CARM_MSG_IOCTL          = 6,
-       CARM_MSG_ARRAY          = 8,
-       CARM_MSG_MISC           = 9,
-       CARM_CME                = (1 << 2),
-       CARM_RME                = (1 << 1),
-       CARM_WZBC               = (1 << 0),
-       CARM_RMI                = (1 << 0),
-       CARM_Q_FULL             = (1 << 3),
-       CARM_MSG_SIZE           = 288,
-       CARM_Q_LEN              = 48,
-
-       /* CARM_MSG_IOCTL messages */
-       CARM_IOC_SCAN_CHAN      = 5,    /* scan channels for devices */
-       CARM_IOC_GET_TCQ        = 13,   /* get tcq/ncq depth */
-       CARM_IOC_SET_TCQ        = 14,   /* set tcq/ncq depth */
-
-       IOC_SCAN_CHAN_NODEV     = 0x1f,
-       IOC_SCAN_CHAN_OFFSET    = 0x40,
-
-       /* CARM_MSG_ARRAY messages */
-       CARM_ARRAY_INFO         = 0,
-
-       ARRAY_NO_EXIST          = (1 << 31),
-
-       /* response messages */
-       RMSG_SZ                 = 8,    /* sizeof(struct carm_response) */
-       RMSG_Q_LEN              = 48,   /* resp. msg list length */
-       RMSG_OK                 = 1,    /* bit indicating msg was successful */
-                                       /* length of entire resp. msg buffer */
-       RBUF_LEN                = RMSG_SZ * RMSG_Q_LEN,
-
-       PDC_SHM_SIZE            = (4096 << 7), /* length of entire h/w buffer */
-
-       /* CARM_MSG_MISC messages */
-       MISC_GET_FW_VER         = 2,
-       MISC_ALLOC_MEM          = 3,
-       MISC_SET_TIME           = 5,
-
-       /* MISC_GET_FW_VER feature bits */
-       FW_VER_4PORT            = (1 << 2), /* 1=4 ports, 0=8 ports */
-       FW_VER_NON_RAID         = (1 << 1), /* 1=non-RAID firmware, 0=RAID */
-       FW_VER_ZCR              = (1 << 0), /* zero channel RAID (whatever that is) */
-
-       /* carm_host flags */
-       FL_NON_RAID             = FW_VER_NON_RAID,
-       FL_4PORT                = FW_VER_4PORT,
-       FL_FW_VER_MASK          = (FW_VER_NON_RAID | FW_VER_4PORT),
-       FL_DAC                  = (1 << 16),
-       FL_DYN_MAJOR            = (1 << 17),
-};
-
-enum scatter_gather_types {
-       SGT_32BIT               = 0,
-       SGT_64BIT               = 1,
-};
-
-enum host_states {
-       HST_INVALID,            /* invalid state; never used */
-       HST_ALLOC_BUF,          /* setting up master SHM area */
-       HST_ERROR,              /* we never leave here */
-       HST_PORT_SCAN,          /* start dev scan */
-       HST_DEV_SCAN_START,     /* start per-device probe */
-       HST_DEV_SCAN,           /* continue per-device probe */
-       HST_DEV_ACTIVATE,       /* activate devices we found */
-       HST_PROBE_FINISHED,     /* probe is complete */
-       HST_PROBE_START,        /* initiate probe */
-       HST_SYNC_TIME,          /* tell firmware what time it is */
-       HST_GET_FW_VER,         /* get firmware version, adapter port cnt */
-};
-
-#ifdef CARM_DEBUG
-static const char *state_name[] = {
-       "HST_INVALID",
-       "HST_ALLOC_BUF",
-       "HST_ERROR",
-       "HST_PORT_SCAN",
-       "HST_DEV_SCAN_START",
-       "HST_DEV_SCAN",
-       "HST_DEV_ACTIVATE",
-       "HST_PROBE_FINISHED",
-       "HST_PROBE_START",
-       "HST_SYNC_TIME",
-       "HST_GET_FW_VER",
-};
-#endif
-
-struct carm_port {
-       unsigned int                    port_no;
-       unsigned int                    n_queued;
-       struct gendisk                  *disk;
-       struct carm_host                *host;
-
-       /* attached device characteristics */
-       u64                             capacity;
-       char                            name[41];
-       u16                             dev_geom_head;
-       u16                             dev_geom_sect;
-       u16                             dev_geom_cyl;
-};
-
-struct carm_request {
-       unsigned int                    tag;
-       int                             n_elem;
-       unsigned int                    msg_type;
-       unsigned int                    msg_subtype;
-       unsigned int                    msg_bucket;
-       struct request                  *rq;
-       struct carm_port                *port;
-       struct scatterlist              sg[CARM_MAX_REQ_SG];
-};
-
-struct carm_host {
-       unsigned long                   flags;
-       void                            *mmio;
-       void                            *shm;
-       dma_addr_t                      shm_dma;
-
-       int                             major;
-       int                             id;
-       char                            name[32];
-
-       spinlock_t                      lock;
-       struct pci_dev                  *pdev;
-       unsigned int                    state;
-       u32                             fw_ver;
-
-       request_queue_t                 *oob_q;
-       unsigned int                    n_oob;
-
-       unsigned int                    hw_sg_used;
-
-       unsigned int                    resp_idx;
-
-       unsigned int                    wait_q_prod;
-       unsigned int                    wait_q_cons;
-       request_queue_t                 *wait_q[CARM_MAX_WAIT_Q];
-
-       unsigned int                    n_msgs;
-       u64                             msg_alloc;
-       struct carm_request             req[CARM_MAX_REQ];
-       void                            *msg_base;
-       dma_addr_t                      msg_dma;
-
-       int                             cur_scan_dev;
-       unsigned long                   dev_active;
-       unsigned long                   dev_present;
-       struct carm_port                port[CARM_MAX_PORTS];
-
-       struct work_struct              fsm_task;
-
-       struct semaphore                probe_sem;
-};
-
-struct carm_response {
-       u32 ret_handle;
-       u32 status;
-}  __attribute__((packed));
-
-struct carm_msg_sg {
-       u32 start;
-       u32 len;
-}  __attribute__((packed));
-
-struct carm_msg_rw {
-       u8 type;
-       u8 id;
-       u8 sg_count;
-       u8 sg_type;
-       u32 handle;
-       u32 lba;
-       u16 lba_count;
-       u16 lba_high;
-       struct carm_msg_sg sg[32];
-}  __attribute__((packed));
-
-struct carm_msg_allocbuf {
-       u8 type;
-       u8 subtype;
-       u8 n_sg;
-       u8 sg_type;
-       u32 handle;
-       u32 addr;
-       u32 len;
-       u32 evt_pool;
-       u32 n_evt;
-       u32 rbuf_pool;
-       u32 n_rbuf;
-       u32 msg_pool;
-       u32 n_msg;
-       struct carm_msg_sg sg[8];
-}  __attribute__((packed));
-
-struct carm_msg_ioctl {
-       u8 type;
-       u8 subtype;
-       u8 array_id;
-       u8 reserved1;
-       u32 handle;
-       u32 data_addr;
-       u32 reserved2;
-}  __attribute__((packed));
-
-struct carm_msg_sync_time {
-       u8 type;
-       u8 subtype;
-       u16 reserved1;
-       u32 handle;
-       u32 reserved2;
-       u32 timestamp;
-}  __attribute__((packed));
-
-struct carm_msg_get_fw_ver {
-       u8 type;
-       u8 subtype;
-       u16 reserved1;
-       u32 handle;
-       u32 data_addr;
-       u32 reserved2;
-}  __attribute__((packed));
-
-struct carm_fw_ver {
-       u32 version;
-       u8 features;
-       u8 reserved1;
-       u16 reserved2;
-}  __attribute__((packed));
-
-struct carm_array_info {
-       u32 size;
-
-       u16 size_hi;
-       u16 stripe_size;
-
-       u32 mode;
-
-       u16 stripe_blk_sz;
-       u16 reserved1;
-
-       u16 cyl;
-       u16 head;
-
-       u16 sect;
-       u8 array_id;
-       u8 reserved2;
-
-       char name[40];
-
-       u32 array_status;
-
-       /* device list continues beyond this point? */
-}  __attribute__((packed));
-
-static int carm_init_one (struct pci_dev *pdev, const struct pci_device_id *ent);
-static void carm_remove_one (struct pci_dev *pdev);
-static int carm_bdev_ioctl(struct inode *ino, struct file *fil,
-                          unsigned int cmd, unsigned long arg);
-
-static struct pci_device_id carm_pci_tbl[] = {
-       { PCI_VENDOR_ID_PROMISE, 0x8000, PCI_ANY_ID, PCI_ANY_ID, 0, 0, },
-       { PCI_VENDOR_ID_PROMISE, 0x8002, PCI_ANY_ID, PCI_ANY_ID, 0, 0, },
-       { }     /* terminate list */
-};
-MODULE_DEVICE_TABLE(pci, carm_pci_tbl);
-
-static struct pci_driver carm_driver = {
-       .name           = DRV_NAME,
-       .id_table       = carm_pci_tbl,
-       .probe          = carm_init_one,
-       .remove         = carm_remove_one,
-};
-
-static struct block_device_operations carm_bd_ops = {
-       .owner          = THIS_MODULE,
-       .ioctl          = carm_bdev_ioctl,
-};
-
-static unsigned int carm_host_id;
-static unsigned long carm_major_alloc;
-
-
-
-static int carm_bdev_ioctl(struct inode *ino, struct file *fil,
-                          unsigned int cmd, unsigned long arg)
-{
-       void __user *usermem = (void __user *) arg;
-       struct carm_port *port = ino->i_bdev->bd_disk->private_data;
-       struct hd_geometry geom;
-
-       switch (cmd) {
-       case HDIO_GETGEO:
-               if (!usermem)
-                       return -EINVAL;
-
-               geom.heads = (u8) port->dev_geom_head;
-               geom.sectors = (u8) port->dev_geom_sect;
-               geom.cylinders = port->dev_geom_cyl;
-               geom.start = get_start_sect(ino->i_bdev);
-
-               if (copy_to_user(usermem, &geom, sizeof(geom)))
-                       return -EFAULT;
-               return 0;
-
-       default:
-               break;
-       }
-
-       return -EOPNOTSUPP;
-}
-
-static const u32 msg_sizes[] = { 32, 64, 128, CARM_MSG_SIZE };
-
-static inline int carm_lookup_bucket(u32 msg_size)
-{
-       int i;
-
-       for (i = 0; i < ARRAY_SIZE(msg_sizes); i++)
-               if (msg_size <= msg_sizes[i])
-                       return i;
-       
-       return -ENOENT;
-}
-
-static void carm_init_buckets(void *mmio)
-{
-       unsigned int i;
-
-       for (i = 0; i < ARRAY_SIZE(msg_sizes); i++)
-               writel(msg_sizes[i], mmio + CARM_CMS0 + (4 * i));
-}
-
-static inline void *carm_ref_msg(struct carm_host *host,
-                                unsigned int msg_idx)
-{
-       return host->msg_base + (msg_idx * CARM_MSG_SIZE);
-}
-
-static inline dma_addr_t carm_ref_msg_dma(struct carm_host *host,
-                                         unsigned int msg_idx)
-{
-       return host->msg_dma + (msg_idx * CARM_MSG_SIZE);
-}
-
-static int carm_send_msg(struct carm_host *host,
-                        struct carm_request *crq)
-{
-       void *mmio = host->mmio;
-       u32 msg = (u32) carm_ref_msg_dma(host, crq->tag);
-       u32 cm_bucket = crq->msg_bucket;
-       u32 tmp;
-       int rc = 0;
-
-       VPRINTK("ENTER\n");
-
-       tmp = readl(mmio + CARM_HMUC);
-       if (tmp & CARM_Q_FULL) {
-#if 0
-               tmp = readl(mmio + CARM_INT_MASK);
-               tmp |= INT_Q_AVAILABLE;
-               writel(tmp, mmio + CARM_INT_MASK);
-               readl(mmio + CARM_INT_MASK);    /* flush */
-#endif
-               DPRINTK("host msg queue full\n");
-               rc = -EBUSY;
-       } else {
-               writel(msg | (cm_bucket << 1), mmio + CARM_IHQP);
-               readl(mmio + CARM_IHQP);        /* flush */
-       }
-
-       return rc;
-}
-
-static struct carm_request *carm_get_request(struct carm_host *host)
-{
-       unsigned int i;
-
-       /* obey global hardware limit on S/G entries */
-       if (host->hw_sg_used >= (CARM_MAX_HOST_SG - CARM_MAX_REQ_SG))
-               return NULL;
-
-       for (i = 0; i < CARM_MAX_Q; i++)
-               if ((host->msg_alloc & (1ULL << i)) == 0) {
-                       struct carm_request *crq = &host->req[i];
-                       crq->port = NULL;
-                       crq->n_elem = 0;
-
-                       host->msg_alloc |= (1ULL << i);
-                       host->n_msgs++;
-
-                       assert(host->n_msgs <= CARM_MAX_REQ);
-                       return crq;
-               }
-       
-       DPRINTK("no request available, returning NULL\n");
-       return NULL;
-}
-
-static int carm_put_request(struct carm_host *host, struct carm_request *crq)
-{
-       assert(crq->tag < CARM_MAX_Q);
-
-       if (unlikely((host->msg_alloc & (1ULL << crq->tag)) == 0))
-               return -EINVAL; /* tried to clear a tag that was not active */
-
-       assert(host->hw_sg_used >= crq->n_elem);
-
-       host->msg_alloc &= ~(1ULL << crq->tag);
-       host->hw_sg_used -= crq->n_elem;
-       host->n_msgs--;
-
-       return 0;
-}
-
-static struct carm_request *carm_get_special(struct carm_host *host)
-{
-       unsigned long flags;
-       struct carm_request *crq = NULL;
-       struct request *rq;
-       int tries = 5000;
-
-       while (tries-- > 0) {
-               spin_lock_irqsave(&host->lock, flags);
-               crq = carm_get_request(host);
-               spin_unlock_irqrestore(&host->lock, flags);
-
-               if (crq)
-                       break;
-               msleep(10);
-       }
-
-       if (!crq)
-               return NULL;
-
-       rq = blk_get_request(host->oob_q, WRITE /* bogus */, GFP_KERNEL);
-       if (!rq) {
-               spin_lock_irqsave(&host->lock, flags);
-               carm_put_request(host, crq);
-               spin_unlock_irqrestore(&host->lock, flags);
-               return NULL;
-       }
-
-       crq->rq = rq;
-       return crq;
-}
-
-static int carm_array_info (struct carm_host *host, unsigned int array_idx)
-{
-       struct carm_msg_ioctl *ioc;
-       unsigned int idx;
-       u32 msg_data;
-       dma_addr_t msg_dma;
-       struct carm_request *crq;
-       int rc;
-
-       crq = carm_get_special(host);
-       if (!crq) {
-               rc = -ENOMEM;
-               goto err_out;
-       }
-
-       idx = crq->tag;
-
-       ioc = carm_ref_msg(host, idx);
-       msg_dma = carm_ref_msg_dma(host, idx);
-       msg_data = (u32) (msg_dma + sizeof(struct carm_array_info));
-
-       crq->msg_type = CARM_MSG_ARRAY;
-       crq->msg_subtype = CARM_ARRAY_INFO;
-       rc = carm_lookup_bucket(sizeof(struct carm_msg_ioctl) +
-                               sizeof(struct carm_array_info));
-       BUG_ON(rc < 0);
-       crq->msg_bucket = (u32) rc;
-
-       memset(ioc, 0, sizeof(*ioc));
-       ioc->type       = CARM_MSG_ARRAY;
-       ioc->subtype    = CARM_ARRAY_INFO;
-       ioc->array_id   = (u8) array_idx;
-       ioc->handle     = cpu_to_le32(TAG_ENCODE(idx));
-       ioc->data_addr  = cpu_to_le32(msg_data);
-
-       spin_lock_irq(&host->lock);
-       assert(host->state == HST_DEV_SCAN_START ||
-              host->state == HST_DEV_SCAN);
-       spin_unlock_irq(&host->lock);
-
-       DPRINTK("blk_insert_request, tag == %u\n", idx);
-       blk_insert_request(host->oob_q, crq->rq, 1, crq, 0);
-
-       return 0;
-
-err_out:
-       spin_lock_irq(&host->lock);
-       host->state = HST_ERROR;
-       spin_unlock_irq(&host->lock);
-       return rc;
-}
-
-typedef unsigned int (*carm_sspc_t)(struct carm_host *, unsigned int, void *);
-
-static int carm_send_special (struct carm_host *host, carm_sspc_t func)
-{
-       struct carm_request *crq;
-       struct carm_msg_ioctl *ioc;
-       void *mem;
-       unsigned int idx, msg_size;
-       int rc;
-
-       crq = carm_get_special(host);
-       if (!crq)
-               return -ENOMEM;
-
-       idx = crq->tag;
-
-       mem = carm_ref_msg(host, idx);
-
-       msg_size = func(host, idx, mem);
-
-       ioc = mem;
-       crq->msg_type = ioc->type;
-       crq->msg_subtype = ioc->subtype;
-       rc = carm_lookup_bucket(msg_size);
-       BUG_ON(rc < 0);
-       crq->msg_bucket = (u32) rc;
-
-       DPRINTK("blk_insert_request, tag == %u\n", idx);
-       blk_insert_request(host->oob_q, crq->rq, 1, crq, 0);
-
-       return 0;
-}
-
-static unsigned int carm_fill_sync_time(struct carm_host *host,
-                                       unsigned int idx, void *mem)
-{
-       struct timeval tv;
-       struct carm_msg_sync_time *st = mem;
-
-       do_gettimeofday(&tv);
-
-       memset(st, 0, sizeof(*st));
-       st->type        = CARM_MSG_MISC;
-       st->subtype     = MISC_SET_TIME;
-       st->handle      = cpu_to_le32(TAG_ENCODE(idx));
-       st->timestamp   = cpu_to_le32(tv.tv_sec);
-
-       return sizeof(struct carm_msg_sync_time);
-}
-
-static unsigned int carm_fill_alloc_buf(struct carm_host *host,
-                                       unsigned int idx, void *mem)
-{
-       struct carm_msg_allocbuf *ab = mem;
-
-       memset(ab, 0, sizeof(*ab));
-       ab->type        = CARM_MSG_MISC;
-       ab->subtype     = MISC_ALLOC_MEM;
-       ab->handle      = cpu_to_le32(TAG_ENCODE(idx));
-       ab->n_sg        = 1;
-       ab->sg_type     = SGT_32BIT;
-       ab->addr        = cpu_to_le32(host->shm_dma + (PDC_SHM_SIZE >> 1));
-       ab->len         = cpu_to_le32(PDC_SHM_SIZE >> 1);
-       ab->evt_pool    = cpu_to_le32(host->shm_dma + (16 * 1024));
-       ab->n_evt       = cpu_to_le32(1024);
-       ab->rbuf_pool   = cpu_to_le32(host->shm_dma);
-       ab->n_rbuf      = cpu_to_le32(RMSG_Q_LEN);
-       ab->msg_pool    = cpu_to_le32(host->shm_dma + RBUF_LEN);
-       ab->n_msg       = cpu_to_le32(CARM_Q_LEN);
-       ab->sg[0].start = cpu_to_le32(host->shm_dma + (PDC_SHM_SIZE >> 1));
-       ab->sg[0].len   = cpu_to_le32(65536);
-
-       return sizeof(struct carm_msg_allocbuf);
-}
-
-static unsigned int carm_fill_scan_channels(struct carm_host *host,
-                                           unsigned int idx, void *mem)
-{
-       struct carm_msg_ioctl *ioc = mem;
-       u32 msg_data = (u32) (carm_ref_msg_dma(host, idx) +
-                             IOC_SCAN_CHAN_OFFSET);
-
-       memset(ioc, 0, sizeof(*ioc));
-       ioc->type       = CARM_MSG_IOCTL;
-       ioc->subtype    = CARM_IOC_SCAN_CHAN;
-       ioc->handle     = cpu_to_le32(TAG_ENCODE(idx));
-       ioc->data_addr  = cpu_to_le32(msg_data);
-
-       /* fill output data area with "no device" default values */
-       mem += IOC_SCAN_CHAN_OFFSET;
-       memset(mem, IOC_SCAN_CHAN_NODEV, CARM_MAX_PORTS);
-
-       return IOC_SCAN_CHAN_OFFSET + CARM_MAX_PORTS;
-}
-
-static unsigned int carm_fill_get_fw_ver(struct carm_host *host,
-                                        unsigned int idx, void *mem)
-{
-       struct carm_msg_get_fw_ver *ioc = mem;
-       u32 msg_data = (u32) (carm_ref_msg_dma(host, idx) + sizeof(*ioc));
-
-       memset(ioc, 0, sizeof(*ioc));
-       ioc->type       = CARM_MSG_MISC;
-       ioc->subtype    = MISC_GET_FW_VER;
-       ioc->handle     = cpu_to_le32(TAG_ENCODE(idx));
-       ioc->data_addr  = cpu_to_le32(msg_data);
-
-       return sizeof(struct carm_msg_get_fw_ver) +
-              sizeof(struct carm_fw_ver);
-}
-
-static inline void carm_end_request_queued(struct carm_host *host,
-                                          struct carm_request *crq,
-                                          int uptodate)
-{
-       struct request *req = crq->rq;
-       int rc;
-
-       rc = end_that_request_first(req, uptodate, req->hard_nr_sectors);
-       assert(rc == 0);
-
-       end_that_request_last(req);
-
-       rc = carm_put_request(host, crq);
-       assert(rc == 0);
-}
-
-static inline void carm_push_q (struct carm_host *host, request_queue_t *q)
-{
-       unsigned int idx = host->wait_q_prod % CARM_MAX_WAIT_Q;
-
-       blk_stop_queue(q);
-       VPRINTK("STOPPED QUEUE %p\n", q);
-
-       host->wait_q[idx] = q;
-       host->wait_q_prod++;
-       BUG_ON(host->wait_q_prod == host->wait_q_cons); /* overrun */
-}
-
-static inline request_queue_t *carm_pop_q(struct carm_host *host)
-{
-       unsigned int idx;
-
-       if (host->wait_q_prod == host->wait_q_cons)
-               return NULL;
-
-       idx = host->wait_q_cons % CARM_MAX_WAIT_Q;
-       host->wait_q_cons++;
-
-       return host->wait_q[idx];
-}
-
-static inline void carm_round_robin(struct carm_host *host)
-{
-       request_queue_t *q = carm_pop_q(host);
-       if (q) {
-               blk_start_queue(q);
-               VPRINTK("STARTED QUEUE %p\n", q);
-       }
-}
-
-static inline void carm_end_rq(struct carm_host *host, struct carm_request *crq,
-                       int is_ok)
-{
-       carm_end_request_queued(host, crq, is_ok);
-       if (CARM_MAX_Q == 1)
-               carm_round_robin(host);
-       else if ((host->n_msgs <= CARM_MSG_LOW_WATER) &&
-                (host->hw_sg_used <= CARM_SG_LOW_WATER)) {
-               carm_round_robin(host);
-       }
-}
-
-static void carm_oob_rq_fn(request_queue_t *q)
-{
-       struct carm_host *host = q->queuedata;
-       struct carm_request *crq;
-       struct request *rq;
-       int rc;
-
-       while (1) {
-               DPRINTK("get req\n");
-               rq = elv_next_request(q);
-               if (!rq)
-                       break;
-
-               blkdev_dequeue_request(rq);
-
-               crq = rq->special;
-               assert(crq != NULL);
-               assert(crq->rq == rq);
-
-               crq->n_elem = 0;
-
-               DPRINTK("send req\n");
-               rc = carm_send_msg(host, crq);
-               if (rc) {
-                       blk_requeue_request(q, rq);
-                       carm_push_q(host, q);
-                       return;         /* call us again later, eventually */
-               }
-       }
-}
-
-static void carm_rq_fn(request_queue_t *q)
-{
-       struct carm_port *port = q->queuedata;
-       struct carm_host *host = port->host;
-       struct carm_msg_rw *msg;
-       struct carm_request *crq;
-       struct request *rq;
-       struct scatterlist *sg;
-       int writing = 0, pci_dir, i, n_elem, rc;
-       u32 tmp;
-       unsigned int msg_size;
-
-queue_one_request:
-       VPRINTK("get req\n");
-       rq = elv_next_request(q);
-       if (!rq)
-               return;
-
-       crq = carm_get_request(host);
-       if (!crq) {
-               carm_push_q(host, q);
-               return;         /* call us again later, eventually */
-       }
-       crq->rq = rq;
-
-       blkdev_dequeue_request(rq);
-
-       if (rq_data_dir(rq) == WRITE) {
-               writing = 1;
-               pci_dir = PCI_DMA_TODEVICE;
-       } else {
-               pci_dir = PCI_DMA_FROMDEVICE;
-       }
-
-       /* get scatterlist from block layer */
-       sg = &crq->sg[0];
-       n_elem = blk_rq_map_sg(q, rq, sg);
-       if (n_elem <= 0) {
-               carm_end_rq(host, crq, 0);
-               return;         /* request with no s/g entries? */
-       }
-
-       /* map scatterlist to PCI bus addresses */
-       n_elem = pci_map_sg(host->pdev, sg, n_elem, pci_dir);
-       if (n_elem <= 0) {
-               carm_end_rq(host, crq, 0);
-               return;         /* request with no s/g entries? */
-       }
-       crq->n_elem = n_elem;
-       crq->port = port;
-       host->hw_sg_used += n_elem;
-
-       /*
-        * build read/write message
-        */
-
-       VPRINTK("build msg\n");
-       msg = (struct carm_msg_rw *) carm_ref_msg(host, crq->tag);
-
-       if (writing) {
-               msg->type = CARM_MSG_WRITE;
-               crq->msg_type = CARM_MSG_WRITE;
-       } else {
-               msg->type = CARM_MSG_READ;
-               crq->msg_type = CARM_MSG_READ;
-       }
-
-       msg->id         = port->port_no;
-       msg->sg_count   = n_elem;
-       msg->sg_type    = SGT_32BIT;
-       msg->handle     = cpu_to_le32(TAG_ENCODE(crq->tag));
-       msg->lba        = cpu_to_le32(rq->sector & 0xffffffff);
-       tmp             = (rq->sector >> 16) >> 16;
-       msg->lba_high   = cpu_to_le16( (u16) tmp );
-       msg->lba_count  = cpu_to_le16(rq->nr_sectors);
-
-       msg_size = sizeof(struct carm_msg_rw) - sizeof(msg->sg);
-       for (i = 0; i < n_elem; i++) {
-               struct carm_msg_sg *carm_sg = &msg->sg[i];
-               carm_sg->start = cpu_to_le32(sg_dma_address(&crq->sg[i]));
-               carm_sg->len = cpu_to_le32(sg_dma_len(&crq->sg[i]));
-               msg_size += sizeof(struct carm_msg_sg);
-       }
-
-       rc = carm_lookup_bucket(msg_size);
-       BUG_ON(rc < 0);
-       crq->msg_bucket = (u32) rc;
-
-       /*
-        * queue read/write message to hardware
-        */
-
-       VPRINTK("send msg, tag == %u\n", crq->tag);
-       rc = carm_send_msg(host, crq);
-       if (rc) {
-               carm_put_request(host, crq);
-               blk_requeue_request(q, rq);
-               carm_push_q(host, q);
-               return;         /* call us again later, eventually */
-       }
-
-       goto queue_one_request;
-}
-
-static void carm_handle_array_info(struct carm_host *host,
-                                  struct carm_request *crq, u8 *mem,
-                                  int is_ok)
-{
-       struct carm_port *port;
-       u8 *msg_data = mem + sizeof(struct carm_array_info);
-       struct carm_array_info *desc = (struct carm_array_info *) msg_data;
-       u64 lo, hi;
-       int cur_port;
-       size_t slen;
-
-       DPRINTK("ENTER\n");
-
-       carm_end_rq(host, crq, is_ok);
-
-       if (!is_ok)
-               goto out;
-       if (le32_to_cpu(desc->array_status) & ARRAY_NO_EXIST)
-               goto out;
-
-       cur_port = host->cur_scan_dev;
-
-       /* should never occur */
-       if ((cur_port < 0) || (cur_port >= CARM_MAX_PORTS)) {
-               printk(KERN_ERR PFX "BUG: cur_scan_dev==%d, array_id==%d\n",
-                      cur_port, (int) desc->array_id);
-               goto out;
-       }
-
-       port = &host->port[cur_port];
-
-       lo = (u64) le32_to_cpu(desc->size);
-       hi = (u64) le32_to_cpu(desc->size_hi);
-
-       port->capacity = lo | (hi << 32);
-       port->dev_geom_head = le16_to_cpu(desc->head);
-       port->dev_geom_sect = le16_to_cpu(desc->sect);
-       port->dev_geom_cyl = le16_to_cpu(desc->cyl);
-
-       host->dev_active |= (1 << cur_port);
-
-       strncpy(port->name, desc->name, sizeof(port->name));
-       port->name[sizeof(port->name) - 1] = 0;
-       slen = strlen(port->name);
-       while (slen && (port->name[slen - 1] == ' ')) {
-               port->name[slen - 1] = 0;
-               slen--;
-       }
-
-       printk(KERN_INFO DRV_NAME "(%s): port %u device %Lu sectors\n",
-              pci_name(host->pdev), port->port_no,
-              (unsigned long long) port->capacity);
-       printk(KERN_INFO DRV_NAME "(%s): port %u device \"%s\"\n",
-              pci_name(host->pdev), port->port_no, port->name);
-
-out:
-       assert(host->state == HST_DEV_SCAN);
-       schedule_work(&host->fsm_task);
-}
-
-static void carm_handle_scan_chan(struct carm_host *host,
-                                 struct carm_request *crq, u8 *mem,
-                                 int is_ok)
-{
-       u8 *msg_data = mem + IOC_SCAN_CHAN_OFFSET;
-       unsigned int i, dev_count = 0;
-       int new_state = HST_DEV_SCAN_START;
-
-       DPRINTK("ENTER\n");
-
-       carm_end_rq(host, crq, is_ok);
-
-       if (!is_ok) {
-               new_state = HST_ERROR;
-               goto out;
-       }
-
-       /* TODO: scan and support non-disk devices */
-       for (i = 0; i < 8; i++)
-               if (msg_data[i] == 0) { /* direct-access device (disk) */
-                       host->dev_present |= (1 << i);
-                       dev_count++;
-               }
-
-       printk(KERN_INFO DRV_NAME "(%s): found %u interesting devices\n",
-              pci_name(host->pdev), dev_count);
-
-out:
-       assert(host->state == HST_PORT_SCAN);
-       host->state = new_state;
-       schedule_work(&host->fsm_task);
-}
-
-static void carm_handle_generic(struct carm_host *host,
-                               struct carm_request *crq, int is_ok,
-                               int cur_state, int next_state)
-{
-       DPRINTK("ENTER\n");
-
-       carm_end_rq(host, crq, is_ok);
-
-       assert(host->state == cur_state);
-       if (is_ok)
-               host->state = next_state;
-       else
-               host->state = HST_ERROR;
-       schedule_work(&host->fsm_task);
-}
-
-static inline void carm_handle_rw(struct carm_host *host,
-                                 struct carm_request *crq, int is_ok)
-{
-       int pci_dir;
-
-       VPRINTK("ENTER\n");
-
-       if (rq_data_dir(crq->rq) == WRITE)
-               pci_dir = PCI_DMA_TODEVICE;
-       else
-               pci_dir = PCI_DMA_FROMDEVICE;
-
-       pci_unmap_sg(host->pdev, &crq->sg[0], crq->n_elem, pci_dir);
-
-       carm_end_rq(host, crq, is_ok);
-}
-
-static inline void carm_handle_resp(struct carm_host *host,
-                                   u32 ret_handle_le, u32 status)
-{
-       u32 handle = le32_to_cpu(ret_handle_le);
-       unsigned int msg_idx;
-       struct carm_request *crq;
-       int is_ok = (status == RMSG_OK);
-       u8 *mem;
-
-       VPRINTK("ENTER, handle == 0x%x\n", handle);
-
-       if (unlikely(!TAG_VALID(handle))) {
-               printk(KERN_ERR DRV_NAME "(%s): BUG: invalid tag 0x%x\n",
-                      pci_name(host->pdev), handle);
-               return;
-       }
-
-       msg_idx = TAG_DECODE(handle);
-       VPRINTK("tag == %u\n", msg_idx);
-
-       crq = &host->req[msg_idx];
-
-       /* fast path */
-       if (likely(crq->msg_type == CARM_MSG_READ ||
-                  crq->msg_type == CARM_MSG_WRITE)) {
-               carm_handle_rw(host, crq, is_ok);
-               return;
-       }
-
-       mem = carm_ref_msg(host, msg_idx);
-
-       switch (crq->msg_type) {
-       case CARM_MSG_IOCTL: {
-               switch (crq->msg_subtype) {
-               case CARM_IOC_SCAN_CHAN:
-                       carm_handle_scan_chan(host, crq, mem, is_ok);
-                       break;
-               default:
-                       /* unknown / invalid response */
-                       goto err_out;
-               }
-               break;
-       }
-
-       case CARM_MSG_MISC: {
-               switch (crq->msg_subtype) {
-               case MISC_ALLOC_MEM:
-                       carm_handle_generic(host, crq, is_ok,
-                                           HST_ALLOC_BUF, HST_SYNC_TIME);
-                       break;
-               case MISC_SET_TIME:
-                       carm_handle_generic(host, crq, is_ok,
-                                           HST_SYNC_TIME, HST_GET_FW_VER);
-                       break;
-               case MISC_GET_FW_VER: {
-                       struct carm_fw_ver *ver = (struct carm_fw_ver *)
-                               mem + sizeof(struct carm_msg_get_fw_ver);
-                       if (is_ok) {
-                               host->fw_ver = le32_to_cpu(ver->version);
-                               host->flags |= (ver->features & FL_FW_VER_MASK);
-                       }
-                       carm_handle_generic(host, crq, is_ok,
-                                           HST_GET_FW_VER, HST_PORT_SCAN);
-                       break;
-               }
-               default:
-                       /* unknown / invalid response */
-                       goto err_out;
-               }
-               break;
-       }
-
-       case CARM_MSG_ARRAY: {
-               switch (crq->msg_subtype) {
-               case CARM_ARRAY_INFO:
-                       carm_handle_array_info(host, crq, mem, is_ok);
-                       break;
-               default:
-                       /* unknown / invalid response */
-                       goto err_out;
-               }
-               break;
-       }
-
-       default:
-               /* unknown / invalid response */
-               goto err_out;
-       }
-
-       return;
-
-err_out:
-       printk(KERN_WARNING DRV_NAME "(%s): BUG: unhandled message type %d/%d\n",
-              pci_name(host->pdev), crq->msg_type, crq->msg_subtype);
-       carm_end_rq(host, crq, 0);
-}
-
-static inline void carm_handle_responses(struct carm_host *host)
-{
-       void *mmio = host->mmio;
-       struct carm_response *resp = (struct carm_response *) host->shm;
-       unsigned int work = 0;
-       unsigned int idx = host->resp_idx % RMSG_Q_LEN;
-
-       while (1) {
-               u32 status = le32_to_cpu(resp[idx].status);
-
-               if (status == 0xffffffff) {
-                       VPRINTK("ending response on index %u\n", idx);
-                       writel(idx << 3, mmio + CARM_RESP_IDX);
-                       break;
-               }
-
-               /* response to a message we sent */
-               else if ((status & (1 << 31)) == 0) {
-                       VPRINTK("handling msg response on index %u\n", idx);
-                       carm_handle_resp(host, resp[idx].ret_handle, status);
-                       resp[idx].status = 0xffffffff;
-               }
-
-               /* asynchronous events the hardware throws our way */
-               else if ((status & 0xff000000) == (1 << 31)) {
-                       u8 *evt_type_ptr = (u8 *) &resp[idx];
-                       u8 evt_type = *evt_type_ptr;
-                       printk(KERN_WARNING DRV_NAME "(%s): unhandled event type %d\n",
-                              pci_name(host->pdev), (int) evt_type);
-                       resp[idx].status = 0xffffffff;
-               }
-
-               idx = NEXT_RESP(idx);
-               work++;
-       }
-
-       VPRINTK("EXIT, work==%u\n", work);
-       host->resp_idx += work;
-}
-
-static irqreturn_t carm_interrupt(int irq, void *__host, struct pt_regs *regs)
-{
-       struct carm_host *host = __host;
-       void *mmio;
-       u32 mask;
-       int handled = 0;
-       unsigned long flags;
-
-       if (!host) {
-               VPRINTK("no host\n");
-               return IRQ_NONE;
-       }
-
-       spin_lock_irqsave(&host->lock, flags);
-
-       mmio = host->mmio;
-
-       /* reading should also clear interrupts */
-       mask = readl(mmio + CARM_INT_STAT);
-
-       if (mask == 0 || mask == 0xffffffff) {
-               VPRINTK("no work, mask == 0x%x\n", mask);
-               goto out;
-       }
-
-       if (mask & INT_ACK_MASK)
-               writel(mask, mmio + CARM_INT_STAT);
-
-       if (unlikely(host->state == HST_INVALID)) {
-               VPRINTK("not initialized yet, mask = 0x%x\n", mask);
-               goto out;
-       }
-
-       if (mask & CARM_HAVE_RESP) {
-               handled = 1;
-               carm_handle_responses(host);
-       }
-
-out:
-       spin_unlock_irqrestore(&host->lock, flags);
-       VPRINTK("EXIT\n");
-       return IRQ_RETVAL(handled);
-}
-
-static void carm_fsm_task (void *_data)
-{
-       struct carm_host *host = _data;
-       unsigned long flags;
-       unsigned int state;
-       int rc, i, next_dev;
-       int reschedule = 0;
-       int new_state = HST_INVALID;
-
-       spin_lock_irqsave(&host->lock, flags);
-       state = host->state;
-       spin_unlock_irqrestore(&host->lock, flags);
-
-       DPRINTK("ENTER, state == %s\n", state_name[state]);
-
-       switch (state) {
-       case HST_PROBE_START:
-               new_state = HST_ALLOC_BUF;
-               reschedule = 1;
-               break;
-
-       case HST_ALLOC_BUF:
-               rc = carm_send_special(host, carm_fill_alloc_buf);
-               if (rc) {
-                       new_state = HST_ERROR;
-                       reschedule = 1;
-               }
-               break;
-
-       case HST_SYNC_TIME:
-               rc = carm_send_special(host, carm_fill_sync_time);
-               if (rc) {
-                       new_state = HST_ERROR;
-                       reschedule = 1;
-               }
-               break;
-
-       case HST_GET_FW_VER:
-               rc = carm_send_special(host, carm_fill_get_fw_ver);
-               if (rc) {
-                       new_state = HST_ERROR;
-                       reschedule = 1;
-               }
-               break;
-
-       case HST_PORT_SCAN:
-               rc = carm_send_special(host, carm_fill_scan_channels);
-               if (rc) {
-                       new_state = HST_ERROR;
-                       reschedule = 1;
-               }
-               break;
-
-       case HST_DEV_SCAN_START:
-               host->cur_scan_dev = -1;
-               new_state = HST_DEV_SCAN;
-               reschedule = 1;
-               break;
-
-       case HST_DEV_SCAN:
-               next_dev = -1;
-               for (i = host->cur_scan_dev + 1; i < CARM_MAX_PORTS; i++)
-                       if (host->dev_present & (1 << i)) {
-                               next_dev = i;
-                               break;
-                       }
-
-               if (next_dev >= 0) {
-                       host->cur_scan_dev = next_dev;
-                       rc = carm_array_info(host, next_dev);
-                       if (rc) {
-                               new_state = HST_ERROR;
-                               reschedule = 1;
-                       }
-               } else {
-                       new_state = HST_DEV_ACTIVATE;
-                       reschedule = 1;
-               }
-               break;
-
-       case HST_DEV_ACTIVATE: {
-               int activated = 0;
-               for (i = 0; i < CARM_MAX_PORTS; i++)
-                       if (host->dev_active & (1 << i)) {
-                               struct carm_port *port = &host->port[i];
-                               struct gendisk *disk = port->disk;
-
-                               set_capacity(disk, port->capacity);
-                               add_disk(disk);
-                               activated++;
-                       }
-
-               printk(KERN_INFO DRV_NAME "(%s): %d ports activated\n",
-                      pci_name(host->pdev), activated);
-
-               new_state = HST_PROBE_FINISHED;
-               reschedule = 1;
-               break;
-       }
-
-       case HST_PROBE_FINISHED:
-               up(&host->probe_sem);
-               break;
-
-       case HST_ERROR:
-               /* FIXME: TODO */
-               break;
-
-       default:
-               /* should never occur */
-               printk(KERN_ERR PFX "BUG: unknown state %d\n", state);
-               assert(0);
-               break;
-       }
-
-       if (new_state != HST_INVALID) {
-               spin_lock_irqsave(&host->lock, flags);
-               host->state = new_state;
-               spin_unlock_irqrestore(&host->lock, flags);
-       }
-       if (reschedule)
-               schedule_work(&host->fsm_task);
-}
-
-static int carm_init_wait(void *mmio, u32 bits, unsigned int test_bit)
-{
-       unsigned int i;
-
-       for (i = 0; i < 50000; i++) {
-               u32 tmp = readl(mmio + CARM_LMUC);
-               udelay(100);
-
-               if (test_bit) {
-                       if ((tmp & bits) == bits)
-                               return 0;
-               } else {
-                       if ((tmp & bits) == 0)
-                               return 0;
-               }
-
-               cond_resched();
-       }
-
-       printk(KERN_ERR PFX "carm_init_wait timeout, bits == 0x%x, test_bit == %s\n",
-              bits, test_bit ? "yes" : "no");
-       return -EBUSY;
-}
-
-static void carm_init_responses(struct carm_host *host)
-{
-       void *mmio = host->mmio;
-       unsigned int i;
-       struct carm_response *resp = (struct carm_response *) host->shm;
-
-       for (i = 0; i < RMSG_Q_LEN; i++)
-               resp[i].status = 0xffffffff;
-
-       writel(0, mmio + CARM_RESP_IDX);
-}
-
-static int carm_init_host(struct carm_host *host)
-{
-       void *mmio = host->mmio;
-       u32 tmp;
-       u8 tmp8;
-       int rc;
-
-       DPRINTK("ENTER\n");
-
-       writel(0, mmio + CARM_INT_MASK);
-
-       tmp8 = readb(mmio + CARM_INITC);
-       if (tmp8 & 0x01) {
-               tmp8 &= ~0x01;
-               writeb(tmp8, CARM_INITC);
-               readb(mmio + CARM_INITC);       /* flush */
-
-               DPRINTK("snooze...\n");
-               msleep(5000);
-       }
-
-       tmp = readl(mmio + CARM_HMUC);
-       if (tmp & CARM_CME) {
-               DPRINTK("CME bit present, waiting\n");
-               rc = carm_init_wait(mmio, CARM_CME, 1);
-               if (rc) {
-                       DPRINTK("EXIT, carm_init_wait 1 failed\n");
-                       return rc;
-               }
-       }
-       if (tmp & CARM_RME) {
-               DPRINTK("RME bit present, waiting\n");
-               rc = carm_init_wait(mmio, CARM_RME, 1);
-               if (rc) {
-                       DPRINTK("EXIT, carm_init_wait 2 failed\n");
-                       return rc;
-               }
-       }
-
-       tmp &= ~(CARM_RME | CARM_CME);
-       writel(tmp, mmio + CARM_HMUC);
-       readl(mmio + CARM_HMUC);        /* flush */
-
-       rc = carm_init_wait(mmio, CARM_RME | CARM_CME, 0);
-       if (rc) {
-               DPRINTK("EXIT, carm_init_wait 3 failed\n");
-               return rc;
-       }
-
-       carm_init_buckets(mmio);
-
-       writel(host->shm_dma & 0xffffffff, mmio + RBUF_ADDR_LO);
-       writel((host->shm_dma >> 16) >> 16, mmio + RBUF_ADDR_HI);
-       writel(RBUF_LEN, mmio + RBUF_BYTE_SZ);
-
-       tmp = readl(mmio + CARM_HMUC);
-       tmp |= (CARM_RME | CARM_CME | CARM_WZBC);
-       writel(tmp, mmio + CARM_HMUC);
-       readl(mmio + CARM_HMUC);        /* flush */
-
-       rc = carm_init_wait(mmio, CARM_RME | CARM_CME, 1);
-       if (rc) {
-               DPRINTK("EXIT, carm_init_wait 4 failed\n");
-               return rc;
-       }
-
-       writel(0, mmio + CARM_HMPHA);
-       writel(INT_DEF_MASK, mmio + CARM_INT_MASK);
-
-       carm_init_responses(host);
-
-       /* start initialization, probing state machine */
-       spin_lock_irq(&host->lock);
-       assert(host->state == HST_INVALID);
-       host->state = HST_PROBE_START;
-       spin_unlock_irq(&host->lock);
-       schedule_work(&host->fsm_task);
-
-       DPRINTK("EXIT\n");
-       return 0;
-}
-
-static int carm_init_disks(struct carm_host *host)
-{
-       unsigned int i;
-       int rc = 0;
-
-       for (i = 0; i < CARM_MAX_PORTS; i++) {
-               struct gendisk *disk;
-               request_queue_t *q;
-               struct carm_port *port;
-
-               port = &host->port[i];
-               port->host = host;
-               port->port_no = i;
-
-               disk = alloc_disk(CARM_MINORS_PER_MAJOR);
-               if (!disk) {
-                       rc = -ENOMEM;
-                       break;
-               }
-
-               port->disk = disk;
-               sprintf(disk->disk_name, DRV_NAME "%u_%u", host->id, i);
-               sprintf(disk->devfs_name, DRV_NAME "/%u_%u", host->id, i);
-               disk->major = host->major;
-               disk->first_minor = i * CARM_MINORS_PER_MAJOR;
-               disk->fops = &carm_bd_ops;
-               disk->private_data = port;
-
-               q = blk_init_queue(carm_rq_fn, &host->lock);
-               if (!q) {
-                       rc = -ENOMEM;
-                       break;
-               }
-               disk->queue = q;
-               blk_queue_max_hw_segments(q, CARM_MAX_REQ_SG);
-               blk_queue_max_phys_segments(q, CARM_MAX_REQ_SG);
-               blk_queue_segment_boundary(q, CARM_SG_BOUNDARY);
-
-               q->queuedata = port;
-       }
-
-       return rc;
-}
-
-static void carm_free_disks(struct carm_host *host)
-{
-       unsigned int i;
-
-       for (i = 0; i < CARM_MAX_PORTS; i++) {
-               struct gendisk *disk = host->port[i].disk;
-               if (disk) {
-                       request_queue_t *q = disk->queue;
-
-                       if (disk->flags & GENHD_FL_UP)
-                               del_gendisk(disk);
-                       if (q)
-                               blk_cleanup_queue(q);
-                       put_disk(disk);
-               }
-       }
-}
-
-static int carm_init_shm(struct carm_host *host)
-{
-       host->shm = pci_alloc_consistent(host->pdev, CARM_SHM_SIZE,
-                                        &host->shm_dma);
-       if (!host->shm)
-               return -ENOMEM;
-
-       host->msg_base = host->shm + RBUF_LEN;
-       host->msg_dma = host->shm_dma + RBUF_LEN;
-
-       memset(host->shm, 0xff, RBUF_LEN);
-       memset(host->msg_base, 0, PDC_SHM_SIZE - RBUF_LEN);
-
-       return 0;
-}
-
-static int carm_init_one (struct pci_dev *pdev, const struct pci_device_id *ent)
-{
-       static unsigned int printed_version;
-       struct carm_host *host;
-       unsigned int pci_dac;
-       int rc;
-       request_queue_t *q;
-       unsigned int i;
-
-       if (!printed_version++)
-               printk(KERN_DEBUG DRV_NAME " version " DRV_VERSION "\n");
-
-       rc = pci_enable_device(pdev);
-       if (rc)
-               return rc;
-
-       rc = pci_request_regions(pdev, DRV_NAME);
-       if (rc)
-               goto err_out;
-
-#if IF_64BIT_DMA_IS_POSSIBLE /* grrrr... */
-       rc = pci_set_dma_mask(pdev, 0xffffffffffffffffULL);
-       if (!rc) {
-               rc = pci_set_consistent_dma_mask(pdev, 0xffffffffffffffffULL);
-               if (rc) {
-                       printk(KERN_ERR DRV_NAME "(%s): consistent DMA mask failure\n",
-                               pci_name(pdev));
-                       goto err_out_regions;
-               }
-               pci_dac = 1;
-       } else {
-#endif
-               rc = pci_set_dma_mask(pdev, 0xffffffffULL);
-               if (rc) {
-                       printk(KERN_ERR DRV_NAME "(%s): DMA mask failure\n",
-                               pci_name(pdev));
-                       goto err_out_regions;
-               }
-               pci_dac = 0;
-#if IF_64BIT_DMA_IS_POSSIBLE /* grrrr... */
-       }
-#endif
-
-       host = kmalloc(sizeof(*host), GFP_KERNEL);
-       if (!host) {
-               printk(KERN_ERR DRV_NAME "(%s): memory alloc failure\n",
-                      pci_name(pdev));
-               rc = -ENOMEM;
-               goto err_out_regions;
-       }
-
-       memset(host, 0, sizeof(*host));
-       host->pdev = pdev;
-       host->flags = pci_dac ? FL_DAC : 0;
-       spin_lock_init(&host->lock);
-       INIT_WORK(&host->fsm_task, carm_fsm_task, host);
-       init_MUTEX_LOCKED(&host->probe_sem);
-
-       for (i = 0; i < ARRAY_SIZE(host->req); i++)
-               host->req[i].tag = i;
-
-       host->mmio = ioremap(pci_resource_start(pdev, 0),
-                            pci_resource_len(pdev, 0));
-       if (!host->mmio) {
-               printk(KERN_ERR DRV_NAME "(%s): MMIO alloc failure\n",
-                      pci_name(pdev));
-               rc = -ENOMEM;
-               goto err_out_kfree;
-       }
-
-       rc = carm_init_shm(host);
-       if (rc) {
-               printk(KERN_ERR DRV_NAME "(%s): DMA SHM alloc failure\n",
-                      pci_name(pdev));
-               goto err_out_iounmap;
-       }
-
-       q = blk_init_queue(carm_oob_rq_fn, &host->lock);
-       if (!q) {
-               printk(KERN_ERR DRV_NAME "(%s): OOB queue alloc failure\n",
-                      pci_name(pdev));
-               rc = -ENOMEM;
-               goto err_out_pci_free;
-       }
-       host->oob_q = q;
-       q->queuedata = host;
-
-       /*
-        * Figure out which major to use: 160, 161, or dynamic
-        */
-       if (!test_and_set_bit(0, &carm_major_alloc))
-               host->major = 160;
-       else if (!test_and_set_bit(1, &carm_major_alloc))
-               host->major = 161;
-       else
-               host->flags |= FL_DYN_MAJOR;
-
-       host->id = carm_host_id;
-       sprintf(host->name, DRV_NAME "%d", carm_host_id);
-
-       rc = register_blkdev(host->major, host->name);
-       if (rc < 0)
-               goto err_out_free_majors;
-       if (host->flags & FL_DYN_MAJOR)
-               host->major = rc;
-
-       devfs_mk_dir(DRV_NAME);
-
-       rc = carm_init_disks(host);
-       if (rc)
-               goto err_out_blkdev_disks;
-
-       pci_set_master(pdev);
-
-       rc = request_irq(pdev->irq, carm_interrupt, SA_SHIRQ, DRV_NAME, host);
-       if (rc) {
-               printk(KERN_ERR DRV_NAME "(%s): irq alloc failure\n",
-                      pci_name(pdev));
-               goto err_out_blkdev_disks;
-       }
-
-       rc = carm_init_host(host);
-       if (rc)
-               goto err_out_free_irq;
-
-       DPRINTK("waiting for probe_sem\n");
-       down(&host->probe_sem);
-
-       printk(KERN_INFO "%s: pci %s, ports %d, io %lx, irq %u, major %d\n",
-              host->name, pci_name(pdev), (int) CARM_MAX_PORTS,
-              pci_resource_start(pdev, 0), pdev->irq, host->major);
-
-       carm_host_id++;
-       pci_set_drvdata(pdev, host);
-       return 0;
-
-err_out_free_irq:
-       free_irq(pdev->irq, host);
-err_out_blkdev_disks:
-       carm_free_disks(host);
-       unregister_blkdev(host->major, host->name);
-err_out_free_majors:
-       if (host->major == 160)
-               clear_bit(0, &carm_major_alloc);
-       else if (host->major == 161)
-               clear_bit(1, &carm_major_alloc);
-       blk_cleanup_queue(host->oob_q);
-err_out_pci_free:
-       pci_free_consistent(pdev, CARM_SHM_SIZE, host->shm, host->shm_dma);
-err_out_iounmap:
-       iounmap(host->mmio);
-err_out_kfree:
-       kfree(host);
-err_out_regions:
-       pci_release_regions(pdev);
-err_out:
-       pci_disable_device(pdev);
-       return rc;
-}
-
-static void carm_remove_one (struct pci_dev *pdev)
-{
-       struct carm_host *host = pci_get_drvdata(pdev);
-
-       if (!host) {
-               printk(KERN_ERR PFX "BUG: no host data for PCI(%s)\n",
-                      pci_name(pdev));
-               return;
-       }
-
-       free_irq(pdev->irq, host);
-       carm_free_disks(host);
-       devfs_remove(DRV_NAME);
-       unregister_blkdev(host->major, host->name);
-       if (host->major == 160)
-               clear_bit(0, &carm_major_alloc);
-       else if (host->major == 161)
-               clear_bit(1, &carm_major_alloc);
-       blk_cleanup_queue(host->oob_q);
-       pci_free_consistent(pdev, CARM_SHM_SIZE, host->shm, host->shm_dma);
-       iounmap(host->mmio);
-       kfree(host);
-       pci_release_regions(pdev);
-       pci_disable_device(pdev);
-       pci_set_drvdata(pdev, NULL);
-}
-
-static int __init carm_init(void)
-{
-       return pci_module_init(&carm_driver);
-}
-
-static void __exit carm_exit(void)
-{
-       pci_unregister_driver(&carm_driver);
-}
-
-module_init(carm_init);
-module_exit(carm_exit);
-
-
diff --git a/drivers/block/floppy98.c b/drivers/block/floppy98.c
deleted file mode 100644 (file)
index 95031f1..0000000
+++ /dev/null
@@ -1,4682 +0,0 @@
-/*
- *  linux/drivers/block/floppy.c
- *
- *  Copyright (C) 1991, 1992  Linus Torvalds
- *  Copyright (C) 1993, 1994  Alain Knaff
- *  Copyright (C) 1998 Alan Cox
- */
-/*
- * 02.12.91 - Changed to static variables to indicate need for reset
- * and recalibrate. This makes some things easier (output_byte reset
- * checking etc), and means less interrupt jumping in case of errors,
- * so the code is hopefully easier to understand.
- */
-
-/*
- * This file is certainly a mess. I've tried my best to get it working,
- * but I don't like programming floppies, and I have only one anyway.
- * Urgel. I should check for more errors, and do more graceful error
- * recovery. Seems there are problems with several drives. I've tried to
- * correct them. No promises.
- */
-
-/*
- * As with hd.c, all routines within this file can (and will) be called
- * by interrupts, so extreme caution is needed. A hardware interrupt
- * handler may not sleep, or a kernel panic will happen. Thus I cannot
- * call "floppy-on" directly, but have to set a special timer interrupt
- * etc.
- */
-
-/*
- * 28.02.92 - made track-buffering routines, based on the routines written
- * by entropy@wintermute.wpi.edu (Lawrence Foard). Linus.
- */
-
-/*
- * Automatic floppy-detection and formatting written by Werner Almesberger
- * (almesber@nessie.cs.id.ethz.ch), who also corrected some problems with
- * the floppy-change signal detection.
- */
-
-/*
- * 1992/7/22 -- Hennus Bergman: Added better error reporting, fixed
- * FDC data overrun bug, added some preliminary stuff for vertical
- * recording support.
- *
- * 1992/9/17: Added DMA allocation & DMA functions. -- hhb.
- *
- * TODO: Errors are still not counted properly.
- */
-
-/* 1992/9/20
- * Modifications for ``Sector Shifting'' by Rob Hooft (hooft@chem.ruu.nl)
- * modeled after the freeware MS-DOS program fdformat/88 V1.8 by
- * Christoph H. Hochst\"atter.
- * I have fixed the shift values to the ones I always use. Maybe a new
- * ioctl() should be created to be able to modify them.
- * There is a bug in the driver that makes it impossible to format a
- * floppy as the first thing after bootup.
- */
-
-/*
- * 1993/4/29 -- Linus -- cleaned up the timer handling in the kernel, and
- * this helped the floppy driver as well. Much cleaner, and still seems to
- * work.
- */
-
-/* 1994/6/24 --bbroad-- added the floppy table entries and made
- * minor modifications to allow 2.88 floppies to be run.
- */
-
-/* 1994/7/13 -- Paul Vojta -- modified the probing code to allow three or more
- * disk types.
- */
-
-/*
- * 1994/8/8 -- Alain Knaff -- Switched to fdpatch driver: Support for bigger
- * format bug fixes, but unfortunately some new bugs too...
- */
-
-/* 1994/9/17 -- Koen Holtman -- added logging of physical floppy write
- * errors to allow safe writing by specialized programs.
- */
-
-/* 1995/4/24 -- Dan Fandrich -- added support for Commodore 1581 3.5" disks
- * by defining bit 1 of the "stretch" parameter to mean put sectors on the
- * opposite side of the disk, leaving the sector IDs alone (i.e. Commodore's
- * drives are "upside-down").
- */
-
-/*
- * 1995/8/26 -- Andreas Busse -- added Mips support.
- */
-
-/*
- * 1995/10/18 -- Ralf Baechle -- Portability cleanup; move machine dependent
- * features to asm/floppy.h.
- */
-
-/*
- * 1998/05/07 -- Russell King -- More portability cleanups; moved definition of
- * interrupt and dma channel to asm/floppy.h. Cleaned up some formatting &
- * use of '0' for NULL.
- */
-/*
- * 1998/06/07 -- Alan Cox -- Merged the 2.0.34 fixes for resource allocation
- * failures.
- */
-
-/*
- * 1998/09/20 -- David Weinehall -- Added slow-down code for buggy PS/2-drives.
- */
-
-/*
- * 1999/01/19 -- N.Fujita & Linux/98 Project -- Added code for NEC PC-9800
- * series.
- */
-
-/*
- * 1999/08/13 -- Paul Slootman -- floppy stopped working on Alpha after 24
- * days, 6 hours, 32 minutes and 32 seconds (i.e. MAXINT jiffies; ints were
- * being used to store jiffies, which are unsigned longs).
- */
-
-/*
- * 2000/08/28 -- Arnaldo Carvalho de Melo <acme@conectiva.com.br>
- * - get rid of check_region
- * - s/suser/capable/
- */
-
-/*
- * 2001/08/26 -- Paul Gortmaker - fix insmod oops on machines with no
- * floppy controller (lingering task on list after module is gone... boom.)
- */
-
-/*
- * 2002/02/07 -- Anton Altaparmakov - Fix io ports reservation to correct range
- * (0x3f2-0x3f5, 0x3f7). This fix is a bit of a hack but the proper fix
- * requires many non-obvious changes in arch dependent code.
- */
-
-/*
- * 2002/10/12 -- Osamu Tomita <tomita@cinet.co.jp>
- * split code from floppy.c
- * support NEC PC-9800 only
- */
-
-#define FLOPPY_SANITY_CHECK
-#undef  FLOPPY_SILENT_DCL_CLEAR
-
-/*
-#define PC9800_DEBUG_FLOPPY
-#define PC9800_DEBUG_FLOPPY2
-*/
-
-#define REALLY_SLOW_IO
-
-#define DEBUGT 2
-#define DCL_DEBUG /* debug disk change line */
-
-/* do print messages for unexpected interrupts */
-static int print_unex=1;
-#include <linux/module.h>
-#include <linux/sched.h>
-#include <linux/fs.h>
-#include <linux/kernel.h>
-#include <linux/timer.h>
-#include <linux/workqueue.h>
-#include <linux/version.h>
-#include <linux/fdreg.h>
-#include <linux/blkdev.h>
-#include <linux/blkpg.h>
-#include <linux/cdrom.h>       /* for the compatibility eject ioctl */
-#include <linux/completion.h>
-
-/*
- * 1998/1/21 -- Richard Gooch <rgooch@atnf.csiro.au> -- devfs support
- */
-
-
-#include <linux/fd.h>
-#define FLOPPY98_MOTOR_MASK 0x08
-
-#include <linux/hdreg.h>
-#define FD98_STATUS    (0 + FD_IOPORT )
-#define FD98_DATA      (2 + FD_IOPORT )
-#define FD_MODE                (4 + FD_IOPORT )
-#define FD_MODE_CHANGE 0xbe
-#define FD_EMODE_CHANGE        0x4be
-
-#include <linux/errno.h>
-#include <linux/slab.h>
-#include <linux/mm.h>
-#include <linux/bio.h>
-#include <linux/string.h>
-#include <linux/fcntl.h>
-#include <linux/delay.h>
-#include <linux/mc146818rtc.h> /* CMOS defines */
-#include <linux/ioport.h>
-#include <linux/interrupt.h>
-#include <linux/init.h>
-#include <linux/devfs_fs_kernel.h>
-#include <linux/device.h>
-#include <linux/buffer_head.h>         /* for invalidate_buffers() */
-
-/*
- * PS/2 floppies have much slower step rates than regular floppies.
- * It's been recommended that take about 1/4 of the default speed
- * in some more extreme cases.
- */
-static int slow_floppy;
-
-#include <asm/dma.h>
-#include <asm/irq.h>
-#include <asm/system.h>
-#include <asm/io.h>
-#include <asm/uaccess.h>
-
-#ifndef DEFAULT_FLOPPY_IRQ
-# define DEFAULT_FLOPPY_IRQ    11
-#endif
-#ifndef DEFAULT_FLOPPY_DMA
-# define DEFAULT_FLOPPY_DMA    2
-#endif
-
-static int FLOPPY_IRQ=DEFAULT_FLOPPY_IRQ;
-static int FLOPPY_DMA=DEFAULT_FLOPPY_DMA;
-static int can_use_virtual_dma=2;
-static int auto_detect_mode = 0;
-static int retry_auto_detect = 0;
-#define FD_AFTER_RESET_DELAY 1000
-
-/* =======
- * can use virtual DMA:
- * 0 = use of virtual DMA disallowed by config
- * 1 = use of virtual DMA prescribed by config
- * 2 = no virtual DMA preference configured.  By default try hard DMA,
- * but fall back on virtual DMA when not enough memory available
- */
-
-static int use_virtual_dma;
-/* =======
- * use virtual DMA
- * 0 using hard DMA
- * 1 using virtual DMA
- * This variable is set to virtual when a DMA mem problem arises, and
- * reset back in floppy_grab_irq_and_dma.
- * It is not safe to reset it in other circumstances, because the floppy
- * driver may have several buffers in use at once, and we do currently not
- * record each buffers capabilities
- */
-
-static spinlock_t floppy_lock = SPIN_LOCK_UNLOCKED;
-static struct completion device_release;
-
-static unsigned short virtual_dma_port=0x3f0;
-irqreturn_t floppy_interrupt(int irq, void *dev_id, struct pt_regs * regs);
-static int set_mode(char mask, char data);
-static void register_devfs_entries (int drive) __init;
-
-#define K_64   0x10000         /* 64KB */
-
-/* the following is the mask of allowed drives. By default units 2 and
- * 3 of both floppy controllers are disabled, because switching on the
- * motor of these drives causes system hangs on some PCI computers. drive
- * 0 is the low bit (0x1), and drive 7 is the high bit (0x80). Bits are on if
- * a drive is allowed.
- *
- * NOTE: This must come before we include the arch floppy header because
- *       some ports reference this variable from there. -DaveM
- */
-
-static int allowed_drive_mask = 0x0f;
-
-#include <asm/floppy.h>
-
-static int irqdma_allocated;
-
-#define LOCAL_END_REQUEST
-#define DEVICE_NAME "floppy"
-
-#include <linux/blkpg.h>
-#include <linux/cdrom.h> /* for the compatibility eject ioctl */
-#include <linux/completion.h>
-
-static struct request *current_req;
-static struct request_queue *floppy_queue;
-
-#ifndef fd_get_dma_residue
-#define fd_get_dma_residue() get_dma_residue(FLOPPY_DMA)
-#endif
-
-/* Dma Memory related stuff */
-
-#ifndef fd_dma_mem_free
-#define fd_dma_mem_free(addr, size) free_pages(addr, get_order(size))
-#endif
-
-#ifndef fd_dma_mem_alloc
-#define fd_dma_mem_alloc(size) __get_dma_pages(GFP_KERNEL,get_order(size))
-#endif
-
-static inline void fallback_on_nodma_alloc(char **addr, size_t l)
-{
-#ifdef FLOPPY_CAN_FALLBACK_ON_NODMA
-       if (*addr)
-               return; /* we have the memory */
-       if (can_use_virtual_dma != 2)
-               return; /* no fallback allowed */
-       printk("DMA memory shortage. Temporarily falling back on virtual DMA\n");
-       *addr = (char *) nodma_mem_alloc(l);
-#else
-       return;
-#endif
-}
-
-/* End dma memory related stuff */
-
-static unsigned long fake_change;
-static int initialising=1;
-
-#define ITYPE(x) (((x)>>2) & 0x1f)
-#define TOMINOR(x) ((x & 3) | ((x & 4) << 5))
-#define UNIT(x) ((x) & 0x03)           /* drive on fdc */
-#define FDC(x) (((x) & 0x04) >> 2)  /* fdc of drive */
-#define REVDRIVE(fdc, unit) ((unit) + ((fdc) << 2))
-                               /* reverse mapping from unit and fdc to drive */
-#define DP (&drive_params[current_drive])
-#define DRS (&drive_state[current_drive])
-#define DRWE (&write_errors[current_drive])
-#define FDCS (&fdc_state[fdc])
-#define CLEARF(x) (clear_bit(x##_BIT, &DRS->flags))
-#define SETF(x) (set_bit(x##_BIT, &DRS->flags))
-#define TESTF(x) (test_bit(x##_BIT, &DRS->flags))
-
-#define UDP (&drive_params[drive])
-#define UDRS (&drive_state[drive])
-#define UDRWE (&write_errors[drive])
-#define UFDCS (&fdc_state[FDC(drive)])
-#define UCLEARF(x) (clear_bit(x##_BIT, &UDRS->flags))
-#define USETF(x) (set_bit(x##_BIT, &UDRS->flags))
-#define UTESTF(x) (test_bit(x##_BIT, &UDRS->flags))
-
-#define DPRINT(format, args...) printk(DEVICE_NAME "%d: " format, current_drive , ## args)
-
-#define PH_HEAD(floppy,head) (((((floppy)->stretch & 2) >>1) ^ head) << 2)
-#define STRETCH(floppy) ((floppy)->stretch & FD_STRETCH)
-
-#define CLEARSTRUCT(x) memset((x), 0, sizeof(*(x)))
-
-/* read/write */
-#define COMMAND raw_cmd->cmd[0]
-#define DR_SELECT raw_cmd->cmd[1]
-#define TRACK raw_cmd->cmd[2]
-#define HEAD raw_cmd->cmd[3]
-#define SECTOR raw_cmd->cmd[4]
-#define SIZECODE raw_cmd->cmd[5]
-#define SECT_PER_TRACK raw_cmd->cmd[6]
-#define GAP raw_cmd->cmd[7]
-#define SIZECODE2 raw_cmd->cmd[8]
-#define NR_RW 9
-
-/* format */
-#define F_SIZECODE raw_cmd->cmd[2]
-#define F_SECT_PER_TRACK raw_cmd->cmd[3]
-#define F_GAP raw_cmd->cmd[4]
-#define F_FILL raw_cmd->cmd[5]
-#define NR_F 6
-
-/*
- * Maximum disk size (in kilobytes). This default is used whenever the
- * current disk size is unknown.
- * [Now it is rather a minimum]
- */
-#define MAX_DISK_SIZE 4 /* 3984*/
-
-
-/*
- * globals used by 'result()'
- */
-#define MAX_REPLIES 16
-static unsigned char reply_buffer[MAX_REPLIES];
-static int inr; /* size of reply buffer, when called from interrupt */
-#define ST0 (reply_buffer[0])
-#define ST1 (reply_buffer[1])
-#define ST2 (reply_buffer[2])
-#define ST3 (reply_buffer[0]) /* result of GETSTATUS */
-#define R_TRACK (reply_buffer[3])
-#define R_HEAD (reply_buffer[4])
-#define R_SECTOR (reply_buffer[5])
-#define R_SIZECODE (reply_buffer[6])
-
-#define SEL_DLY (2*HZ/100)
-
-/*
- * this struct defines the different floppy drive types.
- */
-static struct {
-       struct floppy_drive_params params;
-       const char *name; /* name printed while booting */
-} default_drive_params[]= {
-/* NOTE: the time values in jiffies should be in msec!
- CMOS drive type
-  |     Maximum data rate supported by drive type
-  |     |   Head load time, msec
-  |     |   |   Head unload time, msec (not used)
-  |     |   |   |     Step rate interval, usec
-  |     |   |   |     |       Time needed for spinup time (jiffies)
-  |     |   |   |     |       |      Timeout for spinning down (jiffies)
-  |     |   |   |     |       |      |   Spindown offset (where disk stops)
-  |     |   |   |     |       |      |   |     Select delay
-  |     |   |   |     |       |      |   |     |     RPS
-  |     |   |   |     |       |      |   |     |     |    Max number of tracks
-  |     |   |   |     |       |      |   |     |     |    |     Interrupt timeout
-  |     |   |   |     |       |      |   |     |     |    |     |   Max nonintlv. sectors
-  |     |   |   |     |       |      |   |     |     |    |     |   | -Max Errors- flags */
-{{0,  500, 16, 16, 8000,    1*HZ, 3*HZ,  0, SEL_DLY, 5,  80, 3*HZ, 20, {3,1,2,0,2}, 0,
-      0, { 7, 4, 8, 2, 1, 5, 3,10}, 3*HZ/2, 0 }, "unknown" },
-
-{{1,  300, 16, 16, 8000,    1*HZ, 3*HZ,  0, SEL_DLY, 5,  40, 3*HZ, 17, {3,1,2,0,2}, 0,
-      0, { 1, 0, 0, 0, 0, 0, 0, 0}, 3*HZ/2, 1 }, "360K PC" }, /*5 1/4 360 KB PC*/
-
-{{2,  500, 16, 16, 6000, 4*HZ/10, 3*HZ, 14, SEL_DLY, 6,  83, 3*HZ, 17, {3,1,2,0,2}, 0,
-      0, { 2, 6, 4, 0, 0, 0, 0, 0}, 3*HZ/2, 2 }, "1.2M" }, /*5 1/4 HD AT*/
-
-{{3,  250, 16, 16, 3000,    1*HZ, 3*HZ,  0, SEL_DLY, 5,  83, 3*HZ, 20, {3,1,2,0,2}, 0,
-      0, { 4, 6, 0, 0, 0, 0, 0, 0}, 3*HZ/2, 4 }, "720k" }, /*3 1/2 DD*/
-
-{{4,  500, 16, 16, 4000, 4*HZ/10, 3*HZ, 10, SEL_DLY, 5,  83, 3*HZ, 20, {3,1,2,0,2}, 0,
-      0, { 7,10, 2, 4, 6, 0, 0, 0}, 3*HZ/2, 7 }, "1.44M" }, /*3 1/2 HD*/
-
-{{5, 1000, 15,  8, 3000, 4*HZ/10, 3*HZ, 10, SEL_DLY, 5,  83, 3*HZ, 40, {3,1,2,0,2}, 0,
-      0, { 7, 8, 4,25,28,22,31,21}, 3*HZ/2, 8 }, "2.88M AMI BIOS" }, /*3 1/2 ED*/
-
-{{6, 1000, 15,  8, 3000, 4*HZ/10, 3*HZ, 10, SEL_DLY, 5,  83, 3*HZ, 40, {3,1,2,0,2}, 0,
-      0, { 7, 8, 4,25,28,22,31,21}, 3*HZ/2, 8 }, "2.88M" } /*3 1/2 ED*/
-/*    |  --autodetected formats---    |      |      |
- *    read_track                      |      |    Name printed when booting
- *                                   |     Native format
- *                 Frequency of disk change checks */
-};
-
-static struct floppy_drive_params drive_params[N_DRIVE];
-static struct floppy_drive_struct drive_state[N_DRIVE];
-static struct floppy_write_errors write_errors[N_DRIVE];
-static struct timer_list motor_off_timer[N_DRIVE];
-static struct gendisk *disks[N_DRIVE];
-static struct block_device *opened_bdev[N_DRIVE];
-static DECLARE_MUTEX(open_lock);
-static struct floppy_raw_cmd *raw_cmd, default_raw_cmd;
-
-/*
- * This struct defines the different floppy types.
- *
- * Bit 0 of 'stretch' tells if the tracks need to be doubled for some
- * types (e.g. 360kB diskette in 1.2MB drive, etc.).  Bit 1 of 'stretch'
- * tells if the disk is in Commodore 1581 format, which means side 0 sectors
- * are located on side 1 of the disk but with a side 0 ID, and vice-versa.
- * This is the same as the Sharp MZ-80 5.25" CP/M disk format, except that the
- * 1581's logical side 0 is on physical side 1, whereas the Sharp's logical
- * side 0 is on physical side 0 (but with the misnamed sector IDs).
- * 'stretch' should probably be renamed to something more general, like
- * 'options'.  Other parameters should be self-explanatory (see also
- * setfdprm(8)).
- */
-/*
-           Size
-            |  Sectors per track
-            |  | Head
-            |  | |  Tracks
-            |  | |  | Stretch
-            |  | |  | |  Gap 1 size
-            |  | |  | |    |  Data rate, | 0x40 for perp
-            |  | |  | |    |    |  Spec1 (stepping rate, head unload
-            |  | |  | |    |    |    |    /fmt gap (gap2) */
-static struct floppy_struct floppy_type[32] = {
-       {    0, 0,0, 0,0,0x00,0x00,0x00,0x00,NULL    }, /*  0 no testing    */
-#if 0
-       {  720, 9,2,40,0,0x2A,0x02,0xDF,0x50,"d360"  }, /*  1 360KB PC      */
-#else
-       { 2464,16,2,77,0,0x35,0x48,0xDF,0x74,"d360"  }, /*  1 1.25MB 98     */
-#endif
-       { 2400,15,2,80,0,0x1B,0x00,0xDF,0x54,"h1200" }, /*  2 1.2MB AT      */
-       {  720, 9,1,80,0,0x2A,0x02,0xDF,0x50,"D360"  }, /*  3 360KB SS 3.5" */
-       { 1440, 9,2,80,0,0x2A,0x02,0xDF,0x50,"D720"  }, /*  4 720KB 3.5"    */
-       {  720, 9,2,40,1,0x23,0x01,0xDF,0x50,"h360"  }, /*  5 360KB AT      */
-       { 1440, 9,2,80,0,0x23,0x01,0xDF,0x50,"h720"  }, /*  6 720KB AT      */
-       { 2880,18,2,80,0,0x1B,0x00,0xCF,0x6C,"H1440" }, /*  7 1.44MB 3.5"   */
-       { 5760,36,2,80,0,0x1B,0x43,0xAF,0x54,"E2880" }, /*  8 2.88MB 3.5"   */
-       { 6240,39,2,80,0,0x1B,0x43,0xAF,0x28,"E3120" }, /*  9 3.12MB 3.5"   */
-
-       { 2880,18,2,80,0,0x25,0x00,0xDF,0x02,"h1440" }, /* 10 1.44MB 5.25"  */
-       { 3360,21,2,80,0,0x1C,0x00,0xCF,0x0C,"H1680" }, /* 11 1.68MB 3.5"   */
-       {  820,10,2,41,1,0x25,0x01,0xDF,0x2E,"h410"  }, /* 12 410KB 5.25"   */
-       { 1640,10,2,82,0,0x25,0x02,0xDF,0x2E,"H820"  }, /* 13 820KB 3.5"    */
-       { 2952,18,2,82,0,0x25,0x00,0xDF,0x02,"h1476" }, /* 14 1.48MB 5.25"  */
-       { 3444,21,2,82,0,0x25,0x00,0xDF,0x0C,"H1722" }, /* 15 1.72MB 3.5"   */
-       {  840,10,2,42,1,0x25,0x01,0xDF,0x2E,"h420"  }, /* 16 420KB 5.25"   */
-       { 1660,10,2,83,0,0x25,0x02,0xDF,0x2E,"H830"  }, /* 17 830KB 3.5"    */
-       { 2988,18,2,83,0,0x25,0x00,0xDF,0x02,"h1494" }, /* 18 1.49MB 5.25"  */
-       { 3486,21,2,83,0,0x25,0x00,0xDF,0x0C,"H1743" }, /* 19 1.74 MB 3.5"  */
-
-       { 1760,11,2,80,0,0x1C,0x09,0xCF,0x00,"h880"  }, /* 20 880KB 5.25"   */
-       { 2080,13,2,80,0,0x1C,0x01,0xCF,0x00,"D1040" }, /* 21 1.04MB 3.5"   */
-       { 2240,14,2,80,0,0x1C,0x19,0xCF,0x00,"D1120" }, /* 22 1.12MB 3.5"   */
-       { 3200,20,2,80,0,0x1C,0x20,0xCF,0x2C,"h1600" }, /* 23 1.6MB 5.25"   */
-       { 3520,22,2,80,0,0x1C,0x08,0xCF,0x2e,"H1760" }, /* 24 1.76MB 3.5"   */
-       { 3840,24,2,80,0,0x1C,0x20,0xCF,0x00,"H1920" }, /* 25 1.92MB 3.5"   */
-       { 6400,40,2,80,0,0x25,0x5B,0xCF,0x00,"E3200" }, /* 26 3.20MB 3.5"   */
-       { 7040,44,2,80,0,0x25,0x5B,0xCF,0x00,"E3520" }, /* 27 3.52MB 3.5"   */
-       { 7680,48,2,80,0,0x25,0x63,0xCF,0x00,"E3840" }, /* 28 3.84MB 3.5"   */
-
-       { 3680,23,2,80,0,0x1C,0x10,0xCF,0x00,"H1840" }, /* 29 1.84MB 3.5"   */
-       { 1600,10,2,80,0,0x25,0x02,0xDF,0x2E,"D800"  }, /* 30 800KB 3.5"    */
-       { 3200,20,2,80,0,0x1C,0x00,0xCF,0x2C,"H1600" }, /* 31 1.6MB 3.5"    */
-};
-
-#define        NUMBER(x)       (sizeof(x) / sizeof(*(x)))
-#define SECTSIZE (_FD_SECTSIZE(*floppy))
-
-/* Auto-detection: Disk type used until the next media change occurs. */
-static struct floppy_struct *current_type[N_DRIVE];
-
-/*
- * User-provided type information. current_type points to
- * the respective entry of this array.
- */
-static struct floppy_struct user_params[N_DRIVE];
-
-static sector_t floppy_sizes[256];
-
-/*
- * The driver is trying to determine the correct media format
- * while probing is set. rw_interrupt() clears it after a
- * successful access.
- */
-static int probing;
-
-/* Synchronization of FDC access. */
-#define FD_COMMAND_NONE -1
-#define FD_COMMAND_ERROR 2
-#define FD_COMMAND_OKAY 3
-
-static volatile int command_status = FD_COMMAND_NONE;
-static unsigned long fdc_busy;
-static DECLARE_WAIT_QUEUE_HEAD(fdc_wait);
-static DECLARE_WAIT_QUEUE_HEAD(command_done);
-
-#define NO_SIGNAL (!interruptible || !signal_pending(current))
-#define CALL(x) if ((x) == -EINTR) return -EINTR
-#define ECALL(x) if ((ret = (x))) return ret;
-#define _WAIT(x,i) CALL(ret=wait_til_done((x),i))
-#define WAIT(x) _WAIT((x),interruptible)
-#define IWAIT(x) _WAIT((x),1)
-
-/* Errors during formatting are counted here. */
-static int format_errors;
-
-/* Format request descriptor. */
-static struct format_descr format_req;
-
-/*
- * Rate is 0 for 500kb/s, 1 for 300kbps, 2 for 250kbps
- * Spec1 is 0xSH, where S is stepping rate (F=1ms, E=2ms, D=3ms etc),
- * H is head unload time (1=16ms, 2=32ms, etc)
- */
-
-/*
- * Track buffer
- * Because these are written to by the DMA controller, they must
- * not contain a 64k byte boundary crossing, or data will be
- * corrupted/lost.
- */
-static char *floppy_track_buffer;
-static int max_buffer_sectors;
-
-static int *errors;
-typedef void (*done_f)(int);
-static struct cont_t {
-       void (*interrupt)(void); /* this is called after the interrupt of the
-                                 * main command */
-       void (*redo)(void); /* this is called to retry the operation */
-       void (*error)(void); /* this is called to tally an error */
-       done_f done; /* this is called to say if the operation has 
-                     * succeeded/failed */
-} *cont;
-
-static void floppy_ready(void);
-static void floppy_start(void);
-static void process_fd_request(void);
-static void recalibrate_floppy(void);
-static void floppy_shutdown(unsigned long);
-
-static int floppy_grab_irq_and_dma(void);
-static void floppy_release_irq_and_dma(void);
-
-/*
- * The "reset" variable should be tested whenever an interrupt is scheduled,
- * after the commands have been sent. This is to ensure that the driver doesn't
- * get wedged when the interrupt doesn't come because of a failed command.
- * reset doesn't need to be tested before sending commands, because
- * output_byte is automatically disabled when reset is set.
- */
-#define CHECK_RESET { if (FDCS->reset){ reset_fdc(); return; } }
-static void reset_fdc(void);
-
-/*
- * These are global variables, as that's the easiest way to give
- * information to interrupts. They are the data used for the current
- * request.
- */
-#define NO_TRACK -1
-#define NEED_1_RECAL -2
-#define NEED_2_RECAL -3
-
-static int usage_count;
-
-/* buffer related variables */
-static int buffer_track = -1;
-static int buffer_drive = -1;
-static int buffer_min = -1;
-static int buffer_max = -1;
-
-/* fdc related variables, should end up in a struct */
-static struct floppy_fdc_state fdc_state[N_FDC];
-static int fdc; /* current fdc */
-
-static struct floppy_struct *_floppy = floppy_type;
-static unsigned char current_drive;
-static long current_count_sectors;
-static unsigned char fsector_t; /* sector in track */
-static unsigned char in_sector_offset; /* offset within physical sector,
-                                        * expressed in units of 512 bytes */
-
-#ifndef fd_eject
-static inline int fd_eject(int drive)
-{
-       return -EINVAL;
-}
-#endif
-
-#ifdef DEBUGT
-static long unsigned debugtimer;
-#endif
-
-/*
- * Debugging
- * =========
- */
-static inline void set_debugt(void)
-{
-#ifdef DEBUGT
-       debugtimer = jiffies;
-#endif
-}
-
-static inline void debugt(const char *message)
-{
-#ifdef DEBUGT
-       if (DP->flags & DEBUGT)
-               printk("%s dtime=%lu\n", message, jiffies-debugtimer);
-#endif
-}
-
-typedef void (*timeout_fn)(unsigned long);
-static struct timer_list fd_timeout = TIMER_INITIALIZER(floppy_shutdown, 0, 0);
-
-static const char *timeout_message;
-
-#ifdef FLOPPY_SANITY_CHECK
-static void is_alive(const char *message)
-{
-       /* this routine checks whether the floppy driver is "alive" */
-       if (fdc_busy && command_status < 2 && !timer_pending(&fd_timeout)){
-               DPRINT("timeout handler died: %s\n",message);
-       }
-}
-#endif
-
-static void (*do_floppy)(void) = NULL;
-
-#ifdef FLOPPY_SANITY_CHECK
-
-#define OLOGSIZE 20
-
-static void (*lasthandler)(void);
-static unsigned long interruptjiffies;
-static unsigned long resultjiffies;
-static int resultsize;
-static unsigned long lastredo;
-
-static struct output_log {
-       unsigned char data;
-       unsigned char status;
-       unsigned long jiffies;
-} output_log[OLOGSIZE];
-
-static int output_log_pos;
-#endif
-
-#define current_reqD -1
-#define MAXTIMEOUT -2
-
-static void reschedule_timeout(int drive, const char *message, int marg)
-{
-       unsigned long delay;
-
-       if (drive == current_reqD)
-               drive = current_drive;
-       if (drive < 0 || drive > N_DRIVE) {
-               delay = 20UL*HZ;
-               drive=0;
-       } else
-               delay = UDP->timeout;
-       mod_timer(&fd_timeout, delay + jiffies);
-       if (UDP->flags & FD_DEBUG){
-               DPRINT("reschedule timeout ");
-               printk(message, marg);
-               printk("\n");
-       }
-       timeout_message = message;
-}
-
-static int maximum(int a, int b)
-{
-       if (a > b)
-               return a;
-       else
-               return b;
-}
-#define INFBOUND(a,b) (a)=maximum((a),(b));
-
-static int minimum(int a, int b)
-{
-       if (a < b)
-               return a;
-       else
-               return b;
-}
-#define SUPBOUND(a,b) (a)=minimum((a),(b));
-
-
-/*
- * Bottom half floppy driver.
- * ==========================
- *
- * This part of the file contains the code talking directly to the hardware,
- * and also the main service loop (seek-configure-spinup-command)
- */
-
-/*
- * disk change.
- * This routine is responsible for maintaining the FD_DISK_CHANGE flag,
- * and the last_checked date.
- *
- * last_checked is the date of the last check which showed 'no disk change'
- * FD_DISK_CHANGE is set under two conditions:
- * 1. The floppy has been changed after some i/o to that floppy already
- *    took place.
- * 2. No floppy disk is in the drive. This is done in order to ensure that
- *    requests are quickly flushed in case there is no disk in the drive. It
- *    follows that FD_DISK_CHANGE can only be cleared if there is a disk in
- *    the drive.
- *
- * For 1., maxblock is observed. Maxblock is 0 if no i/o has taken place yet.
- * For 2., FD_DISK_NEWCHANGE is watched. FD_DISK_NEWCHANGE is cleared on
- *  each seek. If a disk is present, the disk change line should also be
- *  cleared on each seek. Thus, if FD_DISK_NEWCHANGE is clear, but the disk
- *  change line is set, this means either that no disk is in the drive, or
- *  that it has been removed since the last seek.
- *
- * This means that we really have a third possibility too:
- *  The floppy has been changed after the last seek.
- */
-
-static int disk_change(int drive)
-{
-       return UTESTF(FD_DISK_CHANGED);
-}
-
-static int set_mode(char mask, char data)
-{
-       register unsigned char newdor, olddor;
-
-       olddor = FDCS->dor;
-       newdor = (olddor & mask) | data;
-       if (newdor != olddor) {
-               FDCS->dor = newdor;
-               fd_outb(newdor, FD_MODE);
-       }
-
-       if (newdor & FLOPPY98_MOTOR_MASK)
-               floppy_grab_irq_and_dma();
-
-       if (olddor & FLOPPY98_MOTOR_MASK)
-               floppy_release_irq_and_dma();
-
-       return olddor;
-}
-
-static void twaddle(void)
-{
-       if (DP->select_delay)
-               return;
-
-       fd_outb(FDCS->dor & 0xf7, FD_MODE);
-       fd_outb(FDCS->dor, FD_MODE);
-       DRS->select_date = jiffies;
-}
-
-/* reset all driver information about the current fdc. This is needed after
- * a reset, and after a raw command. */
-static void reset_fdc_info(int mode)
-{
-       int drive;
-
-       FDCS->spec1 = FDCS->spec2 = -1;
-       FDCS->need_configure = 1;
-       FDCS->perp_mode = 1;
-       FDCS->rawcmd = 0;
-       for (drive = 0; drive < N_DRIVE; drive++)
-               if (FDC(drive) == fdc &&
-                   (mode || UDRS->track != NEED_1_RECAL))
-                       UDRS->track = NEED_2_RECAL;
-}
-
-/* selects the fdc and drive, and enables the fdc's input/dma. */
-static void set_fdc(int drive)
-{
-       fdc = 0;
-       current_drive = drive;
-       set_mode(~0, 0x10);
-       if (FDCS->rawcmd == 2)
-               reset_fdc_info(1);
-
-       if (fd_inb(FD98_STATUS) != STATUS_READY)
-               FDCS->reset = 1;
-}
-
-/* locks the driver */
-static int _lock_fdc(int drive, int interruptible, int line)
-{
-       if (!usage_count){
-               printk(KERN_ERR "Trying to lock fdc while usage count=0 at line %d\n", line);
-               return -1;
-       }
-       if(floppy_grab_irq_and_dma()==-1)
-               return -EBUSY;
-
-       if (test_and_set_bit(0, &fdc_busy)) {
-               DECLARE_WAITQUEUE(wait, current);
-               add_wait_queue(&fdc_wait, &wait);
-
-               for (;;) {
-                       set_current_state(TASK_INTERRUPTIBLE);
-
-                       if (!test_and_set_bit(0, &fdc_busy))
-                               break;
-
-                       schedule();
-
-                       if (!NO_SIGNAL) {
-                               remove_wait_queue(&fdc_wait, &wait);
-                               return -EINTR;
-                       }
-               }
-
-               set_current_state(TASK_RUNNING);
-               remove_wait_queue(&fdc_wait, &wait);
-       }
-       command_status = FD_COMMAND_NONE;
-
-       reschedule_timeout(drive, "lock fdc", 0);
-       set_fdc(drive);
-       return 0;
-}
-
-#define lock_fdc(drive,interruptible) _lock_fdc(drive,interruptible, __LINE__)
-
-#define LOCK_FDC(drive,interruptible) \
-if (lock_fdc(drive,interruptible)) return -EINTR;
-
-
-/* unlocks the driver */
-static inline void unlock_fdc(void)
-{
-       raw_cmd = 0;
-       if (!fdc_busy)
-               DPRINT("FDC access conflict!\n");
-
-       if (do_floppy)
-               DPRINT("device interrupt still active at FDC release: %p!\n",
-                       do_floppy);
-       command_status = FD_COMMAND_NONE;
-       del_timer(&fd_timeout);
-       cont = NULL;
-       clear_bit(0, &fdc_busy);
-       floppy_release_irq_and_dma();
-       wake_up(&fdc_wait);
-}
-
-#ifndef CONFIG_PC9800_MOTOR_OFF /* tomita */
-
-/* switches the motor off after a given timeout */
-static void motor_off_callback(unsigned long nr)
-{
-       printk(KERN_DEBUG "fdc%lu: turn off motor\n", nr);
-}
-
-/* schedules motor off */
-static void floppy_off(unsigned int drive)
-{
-}
-
-#else /* CONFIG_PC9800_MOTOR_OFF */
-
-/* switches the motor off after a given timeout */
-static void motor_off_callback(unsigned long fdc)
-{
-       printk(KERN_DEBUG "fdc%u: turn off motor\n", (unsigned int) fdc);
-
-       fd_outb(0, FD_MODE);    /* MTON = 0 */
-}
-
-static struct timer_list motor_off_timer[N_FDC] = {
-       { data: 0, function: motor_off_callback },
-#if N_FDC > 1
-       { data: 1, function: motor_off_callback },
-#endif
-#if N_FDC > 2
-# error "N_FDC > 2; please fix initializer for motor_off_timer[]"
-#endif
-};
-
-/* schedules motor off */
-static void floppy_off(unsigned int drive)
-{
-       unsigned long volatile delta;
-       register int fdc = FDC(drive);
-
-       if (!(FDCS->dor & (0x10 << UNIT(drive))))
-               return;
-
-       del_timer(motor_off_timer + fdc);
-
-#if 0
-       /* make spindle stop in a position which minimizes spinup time
-        * next time */
-       if (UDP->rps){
-               delta = jiffies - UDRS->first_read_date + HZ -
-                       UDP->spindown_offset;
-               delta = ((delta * UDP->rps) % HZ) / UDP->rps;
-               motor_off_timer[drive].expires = jiffies + UDP->spindown - delta;
-       }
-#else
-       if (UDP->rps)
-               motor_off_timer[drive].expires = jiffies + UDP->spindown;
-#endif
-
-       add_timer(motor_off_timer + fdc);
-}
-
-#endif /* CONFIG_PC9800_MOTOR_OFF */
-
-/*
- * cycle through all N_DRIVE floppy drives, for disk change testing.
- * stopping at current drive. This is done before any long operation, to
- * be sure to have up to date disk change information.
- */
-static void scandrives(void)
-{
-       int i, drive, saved_drive;
-
-       if (DP->select_delay)
-               return;
-
-       saved_drive = current_drive;
-       for (i=0; i < N_DRIVE; i++){
-               drive = (saved_drive + i + 1) % N_DRIVE;
-               if (UDRS->fd_ref == 0 || UDP->select_delay != 0)
-                       continue; /* skip closed drives */
-               set_fdc(drive);
-       }
-       set_fdc(saved_drive);
-}
-
-static void empty(void)
-{
-}
-
-static DECLARE_WORK(floppy_work, NULL, NULL);
-
-static void schedule_bh(void (*handler) (void))
-{
-       PREPARE_WORK(&floppy_work, (void (*)(void *))handler, NULL);
-       schedule_work(&floppy_work);
-}
-
-static struct timer_list fd_timer = TIMER_INITIALIZER(NULL, 0, 0);
-
-static void cancel_activity(void)
-{
-       do_floppy = NULL;
-       PREPARE_WORK(&floppy_work, (void*)(void*)empty, NULL);
-       del_timer(&fd_timer);
-}
-
-/* this function makes sure that the disk stays in the drive during the
- * transfer */
-static void fd_watchdog(void)
-{
-#ifdef DCL_DEBUG
-       if (DP->flags & FD_DEBUG){
-               DPRINT("calling disk change from watchdog\n");
-       }
-#endif
-
-       if (disk_change(current_drive)){
-               DPRINT("disk removed during i/o\n");
-               cancel_activity();
-               cont->done(0);
-               reset_fdc();
-       } else {
-               del_timer(&fd_timer);
-               fd_timer.function = (timeout_fn) fd_watchdog;
-               fd_timer.expires = jiffies + HZ / 10;
-               add_timer(&fd_timer);
-       }
-}
-
-static void main_command_interrupt(void)
-{
-       del_timer(&fd_timer);
-       cont->interrupt();
-}
-
-/* waits for a delay (spinup or select) to pass */
-static int fd_wait_for_completion(unsigned long delay, timeout_fn function)
-{
-       if (FDCS->reset){
-               reset_fdc(); /* do the reset during sleep to win time
-                             * if we don't need to sleep, it's a good
-                             * occasion anyways */
-               return 1;
-       }
-
-       if ((signed) (jiffies - delay) < 0){
-               del_timer(&fd_timer);
-               fd_timer.function = function;
-               fd_timer.expires = delay;
-               add_timer(&fd_timer);
-               return 1;
-       }
-       return 0;
-}
-
-static spinlock_t floppy_hlt_lock = SPIN_LOCK_UNLOCKED;
-static int hlt_disabled;
-static void floppy_disable_hlt(void)
-{
-       unsigned long flags;
-
-       spin_lock_irqsave(&floppy_hlt_lock, flags);
-       if (!hlt_disabled) {
-               hlt_disabled=1;
-#ifdef HAVE_DISABLE_HLT
-               disable_hlt();
-#endif
-       }
-       spin_unlock_irqrestore(&floppy_hlt_lock, flags);
-}
-
-static void floppy_enable_hlt(void)
-{
-       unsigned long flags;
-
-       spin_lock_irqsave(&floppy_hlt_lock, flags);
-       if (hlt_disabled){
-               hlt_disabled=0;
-#ifdef HAVE_DISABLE_HLT
-               enable_hlt();
-#endif
-       }
-       spin_unlock_irqrestore(&floppy_hlt_lock, flags);
-}
-
-
-static void setup_DMA(void)
-{
-       unsigned long f;
-
-#ifdef FLOPPY_SANITY_CHECK
-       if (raw_cmd->length == 0){
-               int i;
-
-               printk("zero dma transfer size:");
-               for (i=0; i < raw_cmd->cmd_count; i++)
-                       printk("%x,", raw_cmd->cmd[i]);
-               printk("\n");
-               cont->done(0);
-               FDCS->reset = 1;
-               return;
-       }
-       if (((unsigned long) raw_cmd->kernel_data) % 512){
-               printk("non aligned address: %p\n", raw_cmd->kernel_data);
-               cont->done(0);
-               FDCS->reset=1;
-               return;
-       }
-#endif
-       f=claim_dma_lock();
-       fd_disable_dma();
-#ifdef fd_dma_setup
-       if (fd_dma_setup(raw_cmd->kernel_data, raw_cmd->length, 
-                       (raw_cmd->flags & FD_RAW_READ)?
-                       DMA_MODE_READ : DMA_MODE_WRITE,
-                       FDCS->address) < 0) {
-               release_dma_lock(f);
-               cont->done(0);
-               FDCS->reset=1;
-               return;
-       }
-       release_dma_lock(f);
-#else  
-       fd_clear_dma_ff();
-       fd_cacheflush(raw_cmd->kernel_data, raw_cmd->length);
-       fd_set_dma_mode((raw_cmd->flags & FD_RAW_READ)?
-                       DMA_MODE_READ : DMA_MODE_WRITE);
-       fd_set_dma_addr(raw_cmd->kernel_data);
-       fd_set_dma_count(raw_cmd->length);
-       virtual_dma_port = FDCS->address;
-       fd_enable_dma();
-       release_dma_lock(f);
-#endif
-       floppy_disable_hlt();
-}
-
-static void show_floppy(void);
-
-/* waits until the fdc becomes ready */
-
-#ifdef PC9800_DEBUG_FLOPPY
-#define READY_DELAY 10000000
-#else
-#define READY_DELAY 100000
-#endif
-
-static int wait_til_ready(void)
-{
-       int counter, status;
-       if (FDCS->reset)
-               return -1;
-       for (counter = 0; counter < READY_DELAY; counter++) {
-               status = fd_inb(FD98_STATUS);           
-               if (status & STATUS_READY)
-                       return status;
-       }
-       if (!initialising) {
-               DPRINT("Getstatus times out (%x) on fdc %d\n",
-                       status, fdc);
-               show_floppy();
-       }
-       FDCS->reset = 1;
-       return -1;
-}
-
-/* sends a command byte to the fdc */
-static int output_byte(char byte)
-{
-       int status;
-
-       if ((status = wait_til_ready()) < 0)
-               return -1;
-       if ((status & (STATUS_READY|STATUS_DIR|STATUS_DMA)) == STATUS_READY){
-               fd_outb(byte,FD98_DATA);
-#ifdef FLOPPY_SANITY_CHECK
-               output_log[output_log_pos].data = byte;
-               output_log[output_log_pos].status = status;
-               output_log[output_log_pos].jiffies = jiffies;
-               output_log_pos = (output_log_pos + 1) % OLOGSIZE;
-#endif
-               return 0;
-       }
-       FDCS->reset = 1;
-       if (!initialising) {
-               DPRINT("Unable to send byte %x to FDC. Fdc=%x Status=%x\n",
-                      byte, fdc, status);
-               show_floppy();
-       }
-       return -1;
-}
-#define LAST_OUT(x) if (output_byte(x)<0){ reset_fdc();return;}
-
-/* gets the response from the fdc */
-static int result(void)
-{
-       int i, status=0;
-
-       for(i=0; i < MAX_REPLIES; i++) {
-               if ((status = wait_til_ready()) < 0)
-                       break;
-               status &= STATUS_DIR|STATUS_READY|STATUS_BUSY|STATUS_DMA;
-               if ((status & ~STATUS_BUSY) == STATUS_READY){
-#ifdef FLOPPY_SANITY_CHECK
-                       resultjiffies = jiffies;
-                       resultsize = i;
-#endif
-                       return i;
-               }
-               if (status == (STATUS_DIR|STATUS_READY|STATUS_BUSY))
-                       reply_buffer[i] = fd_inb(FD98_DATA);
-               else
-                       break;
-       }
-       if (!initialising) {
-               DPRINT("get result error. Fdc=%d Last status=%x Read bytes=%d\n",
-                      fdc, status, i);
-               show_floppy();
-       }
-       FDCS->reset = 1;
-       return -1;
-}
-
-static int fifo_depth = 0xa;
-static int no_fifo;
-
-#define NOMINAL_DTR 500
-
-/* Issue a "SPECIFY" command to set the step rate time, head unload time,
- * head load time, and DMA disable flag to values needed by floppy.
- *
- * The value "dtr" is the data transfer rate in Kbps.  It is needed
- * to account for the data rate-based scaling done by the 82072 and 82077
- * FDC types.  This parameter is ignored for other types of FDCs (i.e.
- * 8272a).
- *
- * Note that changing the data transfer rate has a (probably deleterious)
- * effect on the parameters subject to scaling for 82072/82077 FDCs, so
- * fdc_specify is called again after each data transfer rate
- * change.
- *
- * srt: 1000 to 16000 in microseconds
- * hut: 16 to 240 milliseconds
- * hlt: 2 to 254 milliseconds
- *
- * These values are rounded up to the next highest available delay time.
- */
-static void fdc_specify(void)
-{
-       output_byte(FD_SPECIFY);
-       output_byte(FDCS->spec1 = 0xdf);
-       output_byte(FDCS->spec2 = 0x24);
-}
-
-static void tell_sector(void)
-{
-       printk(": track %d, head %d, sector %d, size %d",
-              R_TRACK, R_HEAD, R_SECTOR, R_SIZECODE);
-} /* tell_sector */
-
-static int auto_detect_mode_pc9800(void)
-{
-#ifdef PC9800_DEBUG_FLOPPY
-       printk("auto_detect_mode_pc9800: retry_auto_detect=%d\n",
-               retry_auto_detect);
-#endif
-       if (retry_auto_detect > 4) {
-               retry_auto_detect = 0;     
-               return 1;
-       }
-
-       switch ((int)(_floppy - floppy_type)) {
-               case 2:
-                       _floppy = floppy_type + 4;
-                       break;
-
-               case 4:
-               case 6:
-                       _floppy = floppy_type + 7;
-                       break;
-
-               case 7:
-               case 10:
-                       _floppy = floppy_type + 2;
-                       break;
-
-               default:
-                       _floppy = floppy_type + 7;
-       }
-
-       retry_auto_detect++;
-       return 0;
-}
-
-static void access_mode_change_pc9800(void);
-
-/*
- * OK, this error interpreting routine is called after a
- * DMA read/write has succeeded
- * or failed, so we check the results, and copy any buffers.
- * hhb: Added better error reporting.
- * ak: Made this into a separate routine.
- */
-static int interpret_errors(void)
-{
-       char bad;
-
-       if (inr!=7) {
-               DPRINT("-- FDC reply error");
-               FDCS->reset = 1;
-               return 1;
-       }
-
-       /* check IC to find cause of interrupt */
-       switch (ST0 & ST0_INTR) {
-               case 0x40:      /* error occurred during command execution */
-                       if (ST1 & ST1_EOC)
-                               return 0; /* occurs with pseudo-DMA */
-                       bad = 1;
-                       if (ST1 & ST1_WP) {
-                               DPRINT("Drive is write protected\n");
-                               CLEARF(FD_DISK_WRITABLE);
-                               cont->done(0);
-                               bad = 2;
-                       } else if (ST1 & ST1_ND) {
-                               SETF(FD_NEED_TWADDLE);
-                       } else if (ST1 & ST1_OR) {
-                               if (DP->flags & FTD_MSG)
-                                       DPRINT("Over/Underrun - retrying\n");
-                               bad = 0;
-                       }else if (*errors >= DP->max_errors.reporting){
-                               if (ST0 & ST0_ECE) {
-                                       printk("Recalibrate failed!");
-                               } else if (ST2 & ST2_CRC) {
-                                       printk("data CRC error");
-                                       tell_sector();
-                               } else if (ST1 & ST1_CRC) {
-                                       printk("CRC error");
-                                       tell_sector();
-                               } else if ((ST1 & (ST1_MAM|ST1_ND)) || (ST2 & ST2_MAM)) {
-                                       if (auto_detect_mode) {
-                                               bad = (char)auto_detect_mode_pc9800();
-                                               access_mode_change_pc9800();
-                                       }
-
-                                       if (bad) {
-                                               printk("floppy error: MA: _floppy - floppy_type=%d\n", (int)(_floppy - floppy_type));
-                                               printk("bad=%d\n", (int)bad);
-                                               if (!probing) {
-                                                       printk("sector not found");
-                                                       tell_sector();
-                                               } else
-                                                       printk("probe failed...");
-                                       }
-                               } else if (ST2 & ST2_WC) {      /* seek error */
-                                       printk("wrong cylinder");
-                               } else if (ST2 & ST2_BC) {      /* cylinder marked as bad */
-                                       printk("bad cylinder");
-                               } else {
-                                       printk("unknown error. ST[0..2] are: 0x%x 0x%x 0x%x", ST0, ST1, ST2);
-                                       tell_sector();
-                               }
-                               printk("\n");
-
-                       }
-                       if (ST2 & ST2_WC || ST2 & ST2_BC)
-                               /* wrong cylinder => recal */
-                               DRS->track = NEED_2_RECAL;
-                       return bad;
-               case 0x80: /* invalid command given */
-                       DPRINT("Invalid FDC command given!\n");
-                       cont->done(0);
-                       return 2;
-               case 0xc0:
-                       SETF(FD_DISK_CHANGED);
-                       SETF(FD_DISK_WRITABLE);
-                       DPRINT("Abnormal termination caused by polling\n");
-                       cont->error();
-                       return 2;
-               default: /* (0) Normal command termination */
-                       auto_detect_mode = 0;
-                       return 0;
-       }
-}
-
-/*
- * This routine is called when everything should be correctly set up
- * for the transfer (i.e. floppy motor is on, the correct floppy is
- * selected, and the head is sitting on the right track).
- */
-static void setup_rw_floppy(void)
-{
-       int i,r, flags,dflags;
-       unsigned long ready_date;
-       timeout_fn function;
-
-       access_mode_change_pc9800();
-       flags = raw_cmd->flags;
-       if (flags & (FD_RAW_READ | FD_RAW_WRITE))
-               flags |= FD_RAW_INTR;
-
-       if ((flags & FD_RAW_SPIN) && !(flags & FD_RAW_NO_MOTOR)){
-               ready_date = DRS->spinup_date + DP->spinup;
-               /* If spinup will take a long time, rerun scandrives
-                * again just before spinup completion. Beware that
-                * after scandrives, we must again wait for selection.
-                */
-               if ((signed) (ready_date - jiffies) > DP->select_delay){
-                       ready_date -= DP->select_delay;
-                       function = (timeout_fn) floppy_start;
-               } else
-                       function = (timeout_fn) setup_rw_floppy;
-
-               /* wait until the floppy is spinning fast enough */
-               if (fd_wait_for_completion(ready_date,function))
-                       return;
-       }
-       dflags = DRS->flags;
-
-       if ((flags & FD_RAW_READ) || (flags & FD_RAW_WRITE))
-               setup_DMA();
-
-       if (flags & FD_RAW_INTR)
-               do_floppy = main_command_interrupt;
-
-       r=0;
-       for (i=0; i< raw_cmd->cmd_count; i++)
-               r|=output_byte(raw_cmd->cmd[i]);
-
-#ifdef DEBUGT
-       debugt("rw_command: ");
-#endif
-       if (r){
-               cont->error();
-               reset_fdc();
-               return;
-       }
-
-       if (!(flags & FD_RAW_INTR)){
-               inr = result();
-               cont->interrupt();
-       } else if (flags & FD_RAW_NEED_DISK)
-               fd_watchdog();
-}
-
-static int blind_seek;
-
-/*
- * This is the routine called after every seek (or recalibrate) interrupt
- * from the floppy controller.
- */
-static void seek_interrupt(void)
-{
-#ifdef DEBUGT
-       debugt("seek interrupt:");
-#endif
-       if (inr != 2 || (ST0 & 0xF8) != 0x20) {
-               DRS->track = NEED_2_RECAL;
-               cont->error();
-               cont->redo();
-               return;
-       }
-       if (DRS->track >= 0 && DRS->track != ST1 && !blind_seek){
-#ifdef DCL_DEBUG
-               if (DP->flags & FD_DEBUG){
-                       DPRINT("clearing NEWCHANGE flag because of effective seek\n");
-                       DPRINT("jiffies=%lu\n", jiffies);
-               }
-#endif
-               CLEARF(FD_DISK_NEWCHANGE); /* effective seek */
-               CLEARF(FD_DISK_CHANGED); /* effective seek */
-               DRS->select_date = jiffies;
-       }
-       DRS->track = ST1;
-       floppy_ready();
-}
-
-static void check_wp(void)
-{
-       if (TESTF(FD_VERIFY)) {
-               /* check write protection */
-               output_byte(FD_GETSTATUS);
-               output_byte(UNIT(current_drive));
-               if (result() != 1){
-                       FDCS->reset = 1;
-                       return;
-               }
-               CLEARF(FD_VERIFY);
-               CLEARF(FD_NEED_TWADDLE);
-#ifdef DCL_DEBUG
-               if (DP->flags & FD_DEBUG){
-                       DPRINT("checking whether disk is write protected\n");
-                       DPRINT("wp=%x\n",ST3 & 0x40);
-               }
-#endif
-               if (!(ST3  & 0x40))
-                       SETF(FD_DISK_WRITABLE);
-               else
-                       CLEARF(FD_DISK_WRITABLE);
-       }
-}
-
-static void seek_floppy(void)
-{
-       int track;
-
-       blind_seek=0;
-
-#ifdef DCL_DEBUG
-       if (DP->flags & FD_DEBUG){
-               DPRINT("calling disk change from seek\n");
-       }
-#endif
-
-       if (!TESTF(FD_DISK_NEWCHANGE) &&
-           disk_change(current_drive) &&
-           (raw_cmd->flags & FD_RAW_NEED_DISK)){
-               /* the media changed flag should be cleared after the seek.
-                * If it isn't, this means that there is really no disk in
-                * the drive.
-                */
-               SETF(FD_DISK_CHANGED);
-               cont->done(0);
-               cont->redo();
-               return;
-       }
-       if (DRS->track <= NEED_1_RECAL){
-               recalibrate_floppy();
-               return;
-       } else if (TESTF(FD_DISK_NEWCHANGE) &&
-                  (raw_cmd->flags & FD_RAW_NEED_DISK) &&
-                  (DRS->track <= NO_TRACK || DRS->track == raw_cmd->track)) {
-               /* we seek to clear the media-changed condition. Does anybody
-                * know a more elegant way, which works on all drives? */
-               if (raw_cmd->track)
-                       track = raw_cmd->track - 1;
-               else {
-                       if (DP->flags & FD_SILENT_DCL_CLEAR){
-                               blind_seek = 1;
-                               raw_cmd->flags |= FD_RAW_NEED_SEEK;
-                       }
-                       track = 1;
-               }
-       } else {
-               check_wp();
-               if (raw_cmd->track != DRS->track &&
-                   (raw_cmd->flags & FD_RAW_NEED_SEEK))
-                       track = raw_cmd->track;
-               else {
-                       setup_rw_floppy();
-                       return;
-               }
-       }
-
-       do_floppy = seek_interrupt;
-       output_byte(FD_SEEK);
-       output_byte(UNIT(current_drive));
-       LAST_OUT(track);
-#ifdef DEBUGT
-       debugt("seek command:");
-#endif
-}
-
-static void recal_interrupt(void)
-{
-#ifdef DEBUGT
-       debugt("recal interrupt:");
-#endif
-       if (inr !=2)
-               FDCS->reset = 1;
-       else if (ST0 & ST0_ECE) {
-               switch(DRS->track){
-                       case NEED_1_RECAL:
-#ifdef DEBUGT
-                               debugt("recal interrupt need 1 recal:");
-#endif
-                               /* after a second recalibrate, we still haven't
-                                * reached track 0. Probably no drive. Raise an
-                                * error, as failing immediately might upset
-                                * computers possessed by the Devil :-) */
-                               cont->error();
-                               cont->redo();
-                               return;
-                       case NEED_2_RECAL:
-#ifdef DEBUGT
-                               debugt("recal interrupt need 2 recal:");
-#endif
-                               /* If we already did a recalibrate,
-                                * and we are not at track 0, this
-                                * means we have moved. (The only way
-                                * not to move at recalibration is to
-                                * be already at track 0.) Clear the
-                                * new change flag */
-#ifdef DCL_DEBUG
-                               if (DP->flags & FD_DEBUG){
-                                       DPRINT("clearing NEWCHANGE flag because of second recalibrate\n");
-                               }
-#endif
-
-                               CLEARF(FD_DISK_NEWCHANGE);
-                               DRS->select_date = jiffies;
-                               /* fall through */
-                       default:
-#ifdef DEBUGT
-                               debugt("recal interrupt default:");
-#endif
-                               /* Recalibrate moves the head by at
-                                * most 80 steps. If after one
-                                * recalibrate we don't have reached
-                                * track 0, this might mean that we
-                                * started beyond track 80.  Try
-                                * again.  */
-                               DRS->track = NEED_1_RECAL;
-                               break;
-               }
-       } else
-               DRS->track = ST1;
-       floppy_ready();
-}
-
-static void print_result(char *message, int inr)
-{
-       int i;
-
-       DPRINT("%s ", message);
-       if (inr >= 0)
-               for (i=0; i<inr; i++)
-                       printk("repl[%d]=%x ", i, reply_buffer[i]);
-       printk("\n");
-}
-
-/* interrupt handler. Note that this can be called externally on the Sparc */
-irqreturn_t floppy_interrupt(int irq, void *dev_id, struct pt_regs * regs)
-{
-       void (*handler)(void) = do_floppy;
-       int do_print;
-       unsigned long f;
-
-       lasthandler = handler;
-       interruptjiffies = jiffies;
-
-       f=claim_dma_lock();
-       fd_disable_dma();
-       release_dma_lock(f);
-
-       floppy_enable_hlt();
-       do_floppy = NULL;
-       if (fdc >= N_FDC || FDCS->address == -1){
-               /* we don't even know which FDC is the culprit */
-               printk("DOR0=%x\n", fdc_state[0].dor);
-               printk("floppy interrupt on bizarre fdc %d\n",fdc);
-               printk("handler=%p\n", handler);
-               is_alive("bizarre fdc");
-               return IRQ_NONE;
-       }
-
-       FDCS->reset = 0;
-       /* We have to clear the reset flag here, because apparently on boxes
-        * with level triggered interrupts (PS/2, Sparc, ...), it is needed to
-        * emit SENSEI's to clear the interrupt line. And FDCS->reset blocks the
-        * emission of the SENSEI's.
-        * It is OK to emit floppy commands because we are in an interrupt
-        * handler here, and thus we have to fear no interference of other
-        * activity.
-        */
-
-       do_print = !handler && print_unex && !initialising;
-
-       inr = result();
-       if (inr && do_print)
-               print_result("unexpected interrupt", inr);
-       if (inr == 0){
-               do {
-                       output_byte(FD_SENSEI);
-                       inr = result();
-                       if ((ST0 & ST0_INTR) == 0xC0) {
-                               int drive = ST0 & ST0_DS;
-
-                               /* Attention Interrupt. */
-                               if (ST0 & ST0_NR) {
-#ifdef PC9800_DEBUG_FLOPPY
-                                       if (do_print)
-                                               printk(KERN_DEBUG
-                                                       "floppy debug: floppy ejected (drive %d)\n",
-                                                       drive);
-#endif
-                                       USETF(FD_DISK_CHANGED);
-                                       USETF(FD_VERIFY);
-                               } else {
-#ifdef PC9800_DEBUG_FLOPPY
-                                       if (do_print)
-                                               printk(KERN_DEBUG
-                                                       "floppy debug: floppy inserted (drive %d)\n",
-                                                       drive);
-#endif
-                               }
-                       } /* Attention Interrupt */
-#ifdef PC9800_DEBUG_FLOPPY
-                       else {
-                               printk(KERN_DEBUG
-                                       "floppy debug : unknown interrupt\n");
-                       }
-#endif
-               } while ((ST0 & 0x83) != UNIT(current_drive) && inr == 2);
-       }
-       if (handler) {
-               schedule_bh(handler);
-       } else {
-#if 0
-               FDCS->reset = 1;
-#endif
-       }
-       is_alive("normal interrupt end");
-
-       /* FIXME! Was it really for us? */
-       return IRQ_HANDLED;
-}
-
-static void recalibrate_floppy(void)
-{
-#ifdef DEBUGT
-       debugt("recalibrate floppy:");
-#endif
-       do_floppy = recal_interrupt;
-       output_byte(FD_RECALIBRATE);
-       LAST_OUT(UNIT(current_drive));
-}
-
-/*
- * Must do 4 FD_SENSEIs after reset because of ``drive polling''.
- */
-static void reset_interrupt(void)
-{
-#ifdef PC9800_DEBUG_FLOPPY
-       printk("floppy debug: reset interrupt\n");
-#endif
-#ifdef DEBUGT
-       debugt("reset interrupt:");
-#endif
-       result();               /* get the status ready for set_fdc */
-       if (FDCS->reset) {
-               printk("reset set in interrupt, calling %p\n", cont->error);
-               cont->error(); /* a reset just after a reset. BAD! */
-       }
-       cont->redo();
-}
-
-/*
- * reset is done by pulling bit 2 of DOR low for a while (old FDCs),
- * or by setting the self clearing bit 7 of STATUS (newer FDCs)
- */
-static void reset_fdc(void)
-{
-       unsigned long flags;
-
-#ifdef PC9800_DEBUG_FLOPPY
-       printk("floppy debug: reset_fdc\n");
-#endif
-
-       do_floppy = reset_interrupt;
-       FDCS->reset = 0;
-       reset_fdc_info(0);
-
-       /* Pseudo-DMA may intercept 'reset finished' interrupt.  */
-       /* Irrelevant for systems with true DMA (i386).          */
-
-       flags=claim_dma_lock();
-       fd_disable_dma();
-       release_dma_lock(flags);
-
-       fd_outb(FDCS->dor | 0x80, FD_MODE);
-       udelay(FD_RESET_DELAY);
-       fd_outb(FDCS->dor, FD_MODE);
-       udelay(FD_AFTER_RESET_DELAY);
-}
-
-static void show_floppy(void)
-{
-       int i;
-
-       printk("\n");
-       printk("floppy driver state\n");
-       printk("-------------------\n");
-       printk("now=%lu last interrupt=%lu diff=%lu last called handler=%p\n",
-              jiffies, interruptjiffies, jiffies-interruptjiffies, lasthandler);
-
-
-#ifdef FLOPPY_SANITY_CHECK
-       printk("timeout_message=%s\n", timeout_message);
-       printk("last output bytes:\n");
-       for (i=0; i < OLOGSIZE; i++)
-               printk("%2x %2x %lu\n",
-                      output_log[(i+output_log_pos) % OLOGSIZE].data,
-                      output_log[(i+output_log_pos) % OLOGSIZE].status,
-                      output_log[(i+output_log_pos) % OLOGSIZE].jiffies);
-       printk("last result at %lu\n", resultjiffies);
-       printk("last redo_fd_request at %lu\n", lastredo);
-       for (i=0; i<resultsize; i++){
-               printk("%2x ", reply_buffer[i]);
-       }
-       printk("\n");
-#endif
-
-       printk("status=%x\n", fd_inb(FD98_STATUS));
-       printk("fdc_busy=%lu\n", fdc_busy);
-       if (do_floppy)
-               printk("do_floppy=%p\n", do_floppy);
-       if (floppy_work.pending)
-               printk("floppy_work.func=%p\n", floppy_work.func);
-       if (timer_pending(&fd_timer))
-               printk("fd_timer.function=%p\n", fd_timer.function);
-       if (timer_pending(&fd_timeout)){
-               printk("timer_function=%p\n",fd_timeout.function);
-               printk("expires=%lu\n",fd_timeout.expires-jiffies);
-               printk("now=%lu\n",jiffies);
-       }
-       printk("cont=%p\n", cont);
-       printk("current_req=%p\n", current_req);
-       printk("command_status=%d\n", command_status);
-       printk("\n");
-}
-
-static void floppy_shutdown(unsigned long data)
-{
-       unsigned long flags;
-       
-       if (!initialising)
-               show_floppy();
-       cancel_activity();
-
-       floppy_enable_hlt();
-       
-       flags=claim_dma_lock();
-       fd_disable_dma();
-       release_dma_lock(flags);
-       
-       /* avoid dma going to a random drive after shutdown */
-
-       if (!initialising)
-               DPRINT("floppy timeout called\n");
-       FDCS->reset = 1;
-       if (cont){
-               cont->done(0);
-               cont->redo(); /* this will recall reset when needed */
-       } else {
-               printk("no cont in shutdown!\n");
-               process_fd_request();
-       }
-       is_alive("floppy shutdown");
-}
-/*typedef void (*timeout_fn)(unsigned long);*/
-
-static void access_mode_change_pc9800(void)
-{
-       static int access_mode, mode_change_now, old_mode, new_set = 1;
-#ifdef PC9800_DEBUG_FLOPPY2
-       printk("enter access_mode_change\n");
-#endif
-       access_mode = mode_change_now = 0;
-       if (DP->cmos==4) {
-               switch ((int)(_floppy - &floppy_type[0])) {
-               case 1:
-               case 2:
-                       new_set = 1;
-                       access_mode = 2;
-                       break;
-
-               case 4:
-               case 6:
-                       new_set = 1;
-                       access_mode = 3;
-                       break;
-
-               case 7:
-               case 10:
-                       new_set = 1;
-                       access_mode = 1;
-                       break;
-
-               default:
-                       access_mode = 1;
-                       break;
-               }
-
-               old_mode = fd_inb(FD_MODE_CHANGE) & 3;
-
-               switch (access_mode) {
-               case 1:
-                       if ((old_mode & 2) == 0) {
-                               fd_outb(old_mode | 2, FD_MODE_CHANGE);
-                               mode_change_now = 1;
-                       } else {
-                               fd_outb(current_drive << 5, FD_EMODE_CHANGE);
-                               if (fd_inb(FD_EMODE_CHANGE) == 0xff)
-                                       return;
-                       }
-
-                       fd_outb((current_drive << 5) | 0x11, FD_EMODE_CHANGE);
-                       mode_change_now = 1;
-                       break;
-
-               case 2:
-                       if ((old_mode & 2) == 0) {
-                               fd_outb(old_mode | 2, FD_MODE_CHANGE);
-                               mode_change_now = 1;
-                       } else {
-                               fd_outb(current_drive << 5, FD_EMODE_CHANGE);
-                               if ((fd_inb(FD_EMODE_CHANGE) & 1) == 0)
-                                       return;
-                               fd_outb((current_drive << 5) | 0x10, FD_EMODE_CHANGE);
-                               mode_change_now = 1;
-                       }
-
-                       break;
-
-               case 3:
-                       if ((old_mode & 2) == 0)
-                               return;
-                       fd_outb(current_drive << 5, FD_EMODE_CHANGE);
-                       if (fd_inb(FD_EMODE_CHANGE) & 1)
-                               fd_outb((current_drive << 5) | 0x10, FD_EMODE_CHANGE);
-                       fd_outb(old_mode & 0xfd, FD_MODE_CHANGE);
-                       mode_change_now = 1;
-                       break;
-
-               default:
-                       break;
-               }
-       } else {
-               switch ((int)(_floppy - &floppy_type[0])) {
-               case 1:
-               case 2:
-                       new_set = 1;
-                       access_mode = 2;
-                       break;
-
-               case 4:
-               case 6:
-                       new_set = 1;
-                       access_mode = 3;
-                       break;
-
-               default:
-                       switch (DP->cmos) {
-                       case 2:
-                               access_mode = 2;
-                               break;
-
-                       case 3:
-                               access_mode = 3;
-                               break;
-
-                       default:
-                               break;
-                       }
-
-                       break;
-               }
-
-               old_mode = fd_inb(FD_MODE_CHANGE) & 3;
-
-               switch (access_mode) {
-               case 2:
-                       if ((old_mode & 2) == 0) {
-                               fd_outb(old_mode | 2, FD_MODE_CHANGE);
-                               mode_change_now = 1;
-                       }
-
-                       break;
-
-               case 3:
-                       if (old_mode & 2) {
-                               fd_outb(old_mode & 0xfd, FD_MODE_CHANGE);
-                               mode_change_now = 1;
-                       }
-
-                       break;
-
-               default:
-                       break;
-               }
-       }
-#ifdef PC9800_DEBUG_FLOPPY2
-       printk("floppy debug: DP->cmos=%d\n", DP->cmos);
-       printk("floppy debug: mode_change_now=%d\n", mode_change_now);
-       printk("floppy debug: access_mode=%d\n", access_mode);
-       printk("floppy debug: old_mode=%d\n", old_mode);
-       printk("floppy debug: _floppy - &floppy_type[0]=%d\n", (int)(_floppy - &floppy_type[0]));
-#endif /* PC9800_DEBUG_FLOPPY2 */
-       if(mode_change_now)
-               reset_fdc();
-}
-
-/* start motor, check media-changed condition and write protection */
-static int start_motor(void (*function)(void) )
-{
-       access_mode_change_pc9800();
-       set_mode(~0, 0x8);
-
-       /* wait_for_completion also schedules reset if needed. */
-       return(fd_wait_for_completion(DRS->select_date+DP->select_delay,
-                                  (timeout_fn) function));
-}
-
-static void floppy_ready(void)
-{
-       CHECK_RESET;
-       if (start_motor(floppy_ready)) return;
-
-#ifdef DCL_DEBUG
-       if (DP->flags & FD_DEBUG){
-               DPRINT("calling disk change from floppy_ready\n");
-       }
-#endif
-       if (!(raw_cmd->flags & FD_RAW_NO_MOTOR) &&
-          disk_change(current_drive) &&
-          !DP->select_delay)
-               twaddle(); /* this clears the dcl on certain drive/controller
-                           * combinations */
-
-#ifdef fd_chose_dma_mode
-       if ((raw_cmd->flags & FD_RAW_READ) || 
-           (raw_cmd->flags & FD_RAW_WRITE))
-       {
-               unsigned long flags = claim_dma_lock();
-               fd_chose_dma_mode(raw_cmd->kernel_data,
-                                 raw_cmd->length);
-               release_dma_lock(flags);
-       }
-#endif
-
-#if 0
-       access_mode_change_pc9800();
-#endif
-       if (raw_cmd->flags & (FD_RAW_NEED_SEEK | FD_RAW_NEED_DISK)){
-               fdc_specify(); /* must be done here because of hut, hlt ... */
-               seek_floppy();
-       } else {
-               if ((raw_cmd->flags & FD_RAW_READ) || 
-                   (raw_cmd->flags & FD_RAW_WRITE))
-                       fdc_specify();
-               setup_rw_floppy();
-       }
-}
-
-static void floppy_start(void)
-{
-       reschedule_timeout(current_reqD, "floppy start", 0);
-
-       scandrives();
-#ifdef DCL_DEBUG
-       if (DP->flags & FD_DEBUG){
-               DPRINT("setting NEWCHANGE in floppy_start\n");
-       }
-#endif
-       SETF(FD_DISK_NEWCHANGE);
-       floppy_ready();
-}
-
-/*
- * ========================================================================
- * here ends the bottom half. Exported routines are:
- * floppy_start, floppy_off, floppy_ready, lock_fdc, unlock_fdc, set_fdc,
- * start_motor, reset_fdc, reset_fdc_info, interpret_errors.
- * Initialization also uses output_byte, result, set_dor, floppy_interrupt
- * and set_dor.
- * ========================================================================
- */
-/*
- * General purpose continuations.
- * ==============================
- */
-
-static void do_wakeup(void)
-{
-       reschedule_timeout(MAXTIMEOUT, "do wakeup", 0);
-       cont = 0;
-       command_status += 2;
-       wake_up(&command_done);
-}
-
-static struct cont_t wakeup_cont={
-       empty,
-       do_wakeup,
-       empty,
-       (done_f)empty
-};
-
-
-static struct cont_t intr_cont={
-       empty,
-       process_fd_request,
-       empty,
-       (done_f) empty
-};
-
-static int wait_til_done(void (*handler)(void), int interruptible)
-{
-       int ret;
-
-       schedule_bh((void *)(void *)handler);
-
-       if (command_status < 2 && NO_SIGNAL) {
-               DECLARE_WAITQUEUE(wait, current);
-
-               add_wait_queue(&command_done, &wait);
-               for (;;) {
-                       set_current_state(interruptible?
-                                         TASK_INTERRUPTIBLE:
-                                         TASK_UNINTERRUPTIBLE);
-
-                       if (command_status >= 2 || !NO_SIGNAL)
-                               break;
-
-                       is_alive("wait_til_done");
-
-                       schedule();
-               }
-
-               set_current_state(TASK_RUNNING);
-               remove_wait_queue(&command_done, &wait);
-       }
-
-       if (command_status < 2){
-               cancel_activity();
-               cont = &intr_cont;
-               reset_fdc();
-               return -EINTR;
-       }
-
-#ifdef PC9800_DEBUG_FLOPPY
-       if (command_status != FD_COMMAND_OKAY)
-               printk("floppy check: wait_til_done out:%d\n", command_status);
-#endif
-       if (FDCS->reset)
-               command_status = FD_COMMAND_ERROR;
-       if (command_status == FD_COMMAND_OKAY)
-               ret=0;
-       else
-               ret=-EIO;
-       command_status = FD_COMMAND_NONE;
-       return ret;
-}
-
-static void generic_done(int result)
-{
-       command_status = result;
-       cont = &wakeup_cont;
-}
-
-static void generic_success(void)
-{
-       cont->done(1);
-}
-
-static void generic_failure(void)
-{
-       cont->done(0);
-}
-
-static void success_and_wakeup(void)
-{
-       generic_success();
-       cont->redo();
-}
-
-
-/*
- * formatting and rw support.
- * ==========================
- */
-
-static int next_valid_format(void)
-{
-       int probed_format;
-
-       probed_format = DRS->probed_format;
-       while(1){
-               if (probed_format >= 8 ||
-                    !DP->autodetect[probed_format]){
-                       DRS->probed_format = 0;
-                       return 1;
-               }
-               if (floppy_type[DP->autodetect[probed_format]].sect){
-                       DRS->probed_format = probed_format;
-                       return 0;
-               }
-               probed_format++;
-       }
-}
-
-static void bad_flp_intr(void)
-{
-       if (probing){
-               DRS->probed_format++;
-               if (!next_valid_format())
-                       return;
-       }
-       (*errors)++;
-       INFBOUND(DRWE->badness, *errors);
-       if (*errors > DP->max_errors.abort)
-               cont->done(0);
-       if (*errors > DP->max_errors.reset)
-               FDCS->reset = 1;
-       else if (*errors > DP->max_errors.recal)
-               DRS->track = NEED_2_RECAL;
-}
-
-static void set_floppy(int drive)
-{
-       int type = ITYPE(UDRS->fd_device);
-       if (type) {
-               auto_detect_mode = 0;
-               _floppy = floppy_type + type;
-       } else if (auto_detect_mode == 0) {
-               auto_detect_mode = 1;
-               retry_auto_detect = 0;
-               _floppy = current_type[drive];
-       }
-#ifdef PC9800_DEBUG_FLOPPY2
-       printk("set_floppy: set floppy type=%d\n", (int)(_floppy - floppy_type));
-#endif
-}
-
-/*
- * formatting support.
- * ===================
- */
-static void format_interrupt(void)
-{
-       switch (interpret_errors()){
-               case 1:
-                       cont->error();
-               case 2:
-                       break;
-               case 0:
-                       cont->done(1);
-       }
-       cont->redo();
-}
-
-#define CODE2SIZE (ssize = ((1 << SIZECODE) + 3) >> 2)
-#define FM_MODE(x,y) ((y) & ~(((x)->rate & 0x80) >>1))
-#define CT(x) ((x) | 0xc0)
-static void setup_format_params(int track)
-{
-       struct fparm {
-               unsigned char track,head,sect,size;
-       } *here = (struct fparm *)floppy_track_buffer;
-       int il,n;
-       int count,head_shift,track_shift;
-
-       raw_cmd = &default_raw_cmd;
-       raw_cmd->track = track;
-
-       raw_cmd->flags = FD_RAW_WRITE | FD_RAW_INTR | FD_RAW_SPIN |
-               FD_RAW_NEED_DISK | FD_RAW_NEED_SEEK;
-       raw_cmd->rate = _floppy->rate & 0x43;
-       raw_cmd->cmd_count = NR_F;
-       COMMAND = FM_MODE(_floppy,FD_FORMAT);
-       DR_SELECT = UNIT(current_drive) + PH_HEAD(_floppy,format_req.head);
-       F_SIZECODE = FD_SIZECODE(_floppy);
-       F_SECT_PER_TRACK = _floppy->sect << 2 >> F_SIZECODE;
-       F_GAP = _floppy->fmt_gap;
-       F_FILL = FD_FILL_BYTE;
-
-       raw_cmd->kernel_data = floppy_track_buffer;
-       raw_cmd->length = 4 * F_SECT_PER_TRACK;
-
-       /* allow for about 30ms for data transport per track */
-       head_shift  = (F_SECT_PER_TRACK + 5) / 6;
-
-       /* a ``cylinder'' is two tracks plus a little stepping time */
-       track_shift = 2 * head_shift + 3;
-
-       /* position of logical sector 1 on this track */
-       n = (track_shift * format_req.track + head_shift * format_req.head)
-               % F_SECT_PER_TRACK;
-
-       /* determine interleave */
-       il = 1;
-       if (_floppy->fmt_gap < 0x22)
-               il++;
-
-       /* initialize field */
-       for (count = 0; count < F_SECT_PER_TRACK; ++count) {
-               here[count].track = format_req.track;
-               here[count].head = format_req.head;
-               here[count].sect = 0;
-               here[count].size = F_SIZECODE;
-       }
-       /* place logical sectors */
-       for (count = 1; count <= F_SECT_PER_TRACK; ++count) {
-               here[n].sect = count;
-               n = (n+il) % F_SECT_PER_TRACK;
-               if (here[n].sect) { /* sector busy, find next free sector */
-                       ++n;
-                       if (n>= F_SECT_PER_TRACK) {
-                               n-=F_SECT_PER_TRACK;
-                               while (here[n].sect) ++n;
-                       }
-               }
-       }
-}
-
-static void redo_format(void)
-{
-       buffer_track = -1;
-       setup_format_params(format_req.track << STRETCH(_floppy));
-       floppy_start();
-#ifdef DEBUGT
-       debugt("queue format request");
-#endif
-}
-
-static struct cont_t format_cont={
-       format_interrupt,
-       redo_format,
-       bad_flp_intr,
-       generic_done };
-
-static int do_format(int drive, struct format_descr *tmp_format_req)
-{
-       int ret;
-
-       LOCK_FDC(drive,1);
-       set_floppy(drive);
-       if (!_floppy ||
-           _floppy->track > DP->tracks ||
-           tmp_format_req->track >= _floppy->track ||
-           tmp_format_req->head >= _floppy->head ||
-           (_floppy->sect << 2) % (1 <<  FD_SIZECODE(_floppy)) ||
-           !_floppy->fmt_gap) {
-               process_fd_request();
-               return -EINVAL;
-       }
-       format_req = *tmp_format_req;
-       format_errors = 0;
-       cont = &format_cont;
-       errors = &format_errors;
-       IWAIT(redo_format);
-       process_fd_request();
-       return ret;
-}
-
-/*
- * Buffer read/write and support
- * =============================
- */
-
-static void floppy_end_request(struct request *req, int uptodate)
-{
-       if (end_that_request_first(req, uptodate, current_count_sectors))
-               return;
-       add_disk_randomness(req->rq_disk);
-       floppy_off((long)req->rq_disk->private_data);
-       blkdev_dequeue_request(req);
-       end_that_request_last(req);
-
-       /* We're done with the request */
-       current_req = NULL;
-}
-
-
-/* new request_done. Can handle physical sectors which are smaller than a
- * logical buffer */
-static void request_done(int uptodate)
-{
-       struct request_queue *q = floppy_queue;
-       struct request *req = current_req;
-       unsigned long flags;
-       int block;
-
-       probing = 0;
-       reschedule_timeout(MAXTIMEOUT, "request done %d", uptodate);
-
-       if (!req) {
-               printk("floppy.c: no request in request_done\n");
-               return;
-       }
-
-       if (uptodate){
-               /* maintain values for invalidation on geometry
-                * change */
-               block = current_count_sectors + req->sector;
-               INFBOUND(DRS->maxblock, block);
-               if (block > _floppy->sect)
-                       DRS->maxtrack = 1;
-
-               /* unlock chained buffers */
-               spin_lock_irqsave(q->queue_lock, flags);
-               floppy_end_request(req, 1);
-               spin_unlock_irqrestore(q->queue_lock, flags);
-       } else {
-               if (rq_data_dir(req) == WRITE) {
-                       /* record write error information */
-                       DRWE->write_errors++;
-                       if (DRWE->write_errors == 1) {
-                               DRWE->first_error_sector = req->sector;
-                               DRWE->first_error_generation = DRS->generation;
-                       }
-                       DRWE->last_error_sector = req->sector;
-                       DRWE->last_error_generation = DRS->generation;
-               }
-               spin_lock_irqsave(q->queue_lock, flags);
-               floppy_end_request(req, 0);
-               spin_unlock_irqrestore(q->queue_lock, flags);
-       }
-}
-
-/* Interrupt handler evaluating the result of the r/w operation */
-static void rw_interrupt(void)
-{
-       int nr_sectors, ssize, eoc, heads;
-
-       if (R_HEAD >= 2) {
-           /* some Toshiba floppy controllers occasionnally seem to
-            * return bogus interrupts after read/write operations, which
-            * can be recognized by a bad head number (>= 2) */
-            return;
-       }  
-
-       if (!DRS->first_read_date)
-               DRS->first_read_date = jiffies;
-
-       nr_sectors = 0;
-       CODE2SIZE;
-
-       if (ST1 & ST1_EOC)
-               eoc = 1;
-       else
-               eoc = 0;
-
-       if (COMMAND & 0x80)
-               heads = 2;
-       else
-               heads = 1;
-
-       nr_sectors = (((R_TRACK-TRACK) * heads +
-                                  R_HEAD-HEAD) * SECT_PER_TRACK +
-                                  R_SECTOR-SECTOR + eoc) << SIZECODE >> 2;
-
-#ifdef FLOPPY_SANITY_CHECK
-       if (nr_sectors / ssize > 
-               (in_sector_offset + current_count_sectors + ssize - 1) / ssize) {
-               DPRINT("long rw: %x instead of %lx\n",
-                       nr_sectors, current_count_sectors);
-               printk("rs=%d s=%d\n", R_SECTOR, SECTOR);
-               printk("rh=%d h=%d\n", R_HEAD, HEAD);
-               printk("rt=%d t=%d\n", R_TRACK, TRACK);
-               printk("heads=%d eoc=%d\n", heads, eoc);
-               printk("spt=%d st=%d ss=%d\n", SECT_PER_TRACK,
-                      fsector_t, ssize);
-               printk("in_sector_offset=%d\n", in_sector_offset);
-       }
-#endif
-
-       nr_sectors -= in_sector_offset;
-       INFBOUND(nr_sectors,0);
-       SUPBOUND(current_count_sectors, nr_sectors);
-
-       switch (interpret_errors()){
-               case 2:
-                       cont->redo();
-                       return;
-               case 1:
-                       if (!current_count_sectors){
-                               cont->error();
-                               cont->redo();
-                               return;
-                       }
-                       break;
-               case 0:
-                       if (!current_count_sectors){
-                               cont->redo();
-                               return;
-                       }
-                       current_type[current_drive] = _floppy;
-                       floppy_sizes[TOMINOR(current_drive) ]= _floppy->size;
-                       break;
-       }
-
-       if (probing) {
-               if (DP->flags & FTD_MSG)
-                       DPRINT("Auto-detected floppy type %s in fd%d\n",
-                               _floppy->name,current_drive);
-               current_type[current_drive] = _floppy;
-               floppy_sizes[TOMINOR(current_drive)] = _floppy->size;
-               probing = 0;
-       }
-
-       if (CT(COMMAND) != FD_READ || 
-            raw_cmd->kernel_data == current_req->buffer){
-               /* transfer directly from buffer */
-               cont->done(1);
-       } else if (CT(COMMAND) == FD_READ){
-               buffer_track = raw_cmd->track;
-               buffer_drive = current_drive;
-               INFBOUND(buffer_max, nr_sectors + fsector_t);
-       }
-       cont->redo();
-}
-
-/* Compute maximal contiguous buffer size. */
-static int buffer_chain_size(void)
-{
-       struct bio *bio;
-       struct bio_vec *bv;
-       int size, i;
-       char *base;
-
-       base = bio_data(current_req->bio);
-       size = 0;
-
-       rq_for_each_bio(bio, current_req) {
-               bio_for_each_segment(bv, bio, i) {
-                       if (page_address(bv->bv_page) + bv->bv_offset != base + size)
-                               break;
-
-                       size += bv->bv_len;
-               }
-       }
-
-       return size >> 9;
-}
-
-/* Compute the maximal transfer size */
-static int transfer_size(int ssize, int max_sector, int max_size)
-{
-       SUPBOUND(max_sector, fsector_t + max_size);
-
-       /* alignment */
-       max_sector -= (max_sector % _floppy->sect) % ssize;
-
-       /* transfer size, beginning not aligned */
-       current_count_sectors = max_sector - fsector_t ;
-
-       return max_sector;
-}
-
-/*
- * Move data from/to the track buffer to/from the buffer cache.
- */
-static void copy_buffer(int ssize, int max_sector, int max_sector_2)
-{
-       int remaining; /* number of transferred 512-byte sectors */
-       struct bio_vec *bv;
-       struct bio *bio;
-       char *buffer, *dma_buffer;
-       int size, i;
-
-       max_sector = transfer_size(ssize,
-                                  minimum(max_sector, max_sector_2),
-                                  current_req->nr_sectors);
-
-       if (current_count_sectors <= 0 && CT(COMMAND) == FD_WRITE &&
-           buffer_max > fsector_t + current_req->nr_sectors)
-               current_count_sectors = minimum(buffer_max - fsector_t,
-                                               current_req->nr_sectors);
-
-       remaining = current_count_sectors << 9;
-#ifdef FLOPPY_SANITY_CHECK
-       if ((remaining >> 9) > current_req->nr_sectors  &&
-           CT(COMMAND) == FD_WRITE){
-               DPRINT("in copy buffer\n");
-               printk("current_count_sectors=%ld\n", current_count_sectors);
-               printk("remaining=%d\n", remaining >> 9);
-               printk("current_req->nr_sectors=%ld\n",current_req->nr_sectors);
-               printk("current_req->current_nr_sectors=%u\n",
-                      current_req->current_nr_sectors);
-               printk("max_sector=%d\n", max_sector);
-               printk("ssize=%d\n", ssize);
-       }
-#endif
-
-       buffer_max = maximum(max_sector, buffer_max);
-
-       dma_buffer = floppy_track_buffer + ((fsector_t - buffer_min) << 9);
-
-       size = current_req->current_nr_sectors << 9;
-
-       rq_for_each_bio(bio, current_req) {
-               bio_for_each_segment(bv, bio, i) {
-                       if (!remaining)
-                               break;
-
-                       size = bv->bv_len;
-                       SUPBOUND(size, remaining);
-
-                       buffer = page_address(bv->bv_page) + bv->bv_offset;
-#ifdef FLOPPY_SANITY_CHECK
-               if (dma_buffer + size >
-                   floppy_track_buffer + (max_buffer_sectors << 10) ||
-                   dma_buffer < floppy_track_buffer){
-                       DPRINT("buffer overrun in copy buffer %d\n",
-                               (int) ((floppy_track_buffer - dma_buffer) >>9));
-                       printk("fsector_t=%d buffer_min=%d\n",
-                              fsector_t, buffer_min);
-                       printk("current_count_sectors=%ld\n",
-                              current_count_sectors);
-                       if (CT(COMMAND) == FD_READ)
-                               printk("read\n");
-                       if (CT(COMMAND) == FD_WRITE)
-                               printk("write\n");
-                       break;
-               }
-               if (((unsigned long)buffer) % 512)
-                       DPRINT("%p buffer not aligned\n", buffer);
-#endif
-                       if (CT(COMMAND) == FD_READ)
-                               memcpy(buffer, dma_buffer, size);
-                       else
-                               memcpy(dma_buffer, buffer, size);
-
-                       remaining -= size;
-                       dma_buffer += size;
-               }
-       }
-#ifdef FLOPPY_SANITY_CHECK
-       if (remaining){
-               if (remaining > 0)
-                       max_sector -= remaining >> 9;
-               DPRINT("weirdness: remaining %d\n", remaining>>9);
-       }
-#endif
-}
-
-#if 0
-static inline int check_dma_crossing(char *start, 
-                                    unsigned long length, char *message)
-{
-       if (CROSS_64KB(start, length)) {
-               printk("DMA xfer crosses 64KB boundary in %s %p-%p\n", 
-                      message, start, start+length);
-               return 1;
-       } else
-               return 0;
-}
-#endif
-
-/* work around a bug in pseudo DMA
- * (on some FDCs) pseudo DMA does not stop when the CPU stops
- * sending data.  Hence we need a different way to signal the
- * transfer length:  We use SECT_PER_TRACK.  Unfortunately, this
- * does not work with MT, hence we can only transfer one head at
- * a time
- */
-static void virtualdmabug_workaround(void)
-{
-       int hard_sectors, end_sector;
-
-       if(CT(COMMAND) == FD_WRITE) {
-               COMMAND &= ~0x80; /* switch off multiple track mode */
-
-               hard_sectors = raw_cmd->length >> (7 + SIZECODE);
-               end_sector = SECTOR + hard_sectors - 1;
-#ifdef FLOPPY_SANITY_CHECK
-               if(end_sector > SECT_PER_TRACK) {
-                       printk("too many sectors %d > %d\n",
-                              end_sector, SECT_PER_TRACK);
-                       return;
-               }
-#endif
-               SECT_PER_TRACK = end_sector; /* make sure SECT_PER_TRACK points
-                                             * to end of transfer */
-       }
-}
-
-/*
- * Formulate a read/write request.
- * this routine decides where to load the data (directly to buffer, or to
- * tmp floppy area), how much data to load (the size of the buffer, the whole
- * track, or a single sector)
- * All floppy_track_buffer handling goes in here. If we ever add track buffer
- * allocation on the fly, it should be done here. No other part should need
- * modification.
- */
-
-static int make_raw_rw_request(void)
-{
-       int aligned_sector_t;
-       int max_sector, max_size, tracksize, ssize;
-
-       if(max_buffer_sectors == 0) {
-               printk("VFS: Block I/O scheduled on unopened device\n");
-               return 0;
-       }
-
-       set_fdc((long)current_req->rq_disk->private_data);
-
-       raw_cmd = &default_raw_cmd;
-       raw_cmd->flags = FD_RAW_SPIN | FD_RAW_NEED_DISK | FD_RAW_NEED_DISK |
-               FD_RAW_NEED_SEEK;
-       raw_cmd->cmd_count = NR_RW;
-       if (rq_data_dir(current_req) == READ) {
-               raw_cmd->flags |= FD_RAW_READ;
-               COMMAND = FM_MODE(_floppy,FD_READ);
-       } else if (rq_data_dir(current_req) == WRITE){
-               raw_cmd->flags |= FD_RAW_WRITE;
-               COMMAND = FM_MODE(_floppy,FD_WRITE);
-       } else {
-               DPRINT("make_raw_rw_request: unknown command\n");
-               return 0;
-       }
-
-       max_sector = _floppy->sect * _floppy->head;
-
-       TRACK = (int)current_req->sector / max_sector;
-       fsector_t = (int)current_req->sector % max_sector;
-       if (_floppy->track && TRACK >= _floppy->track) {
-               if (current_req->current_nr_sectors & 1) {
-                       current_count_sectors = 1;
-                       return 1;
-               } else
-                       return 0;
-       }
-       HEAD = fsector_t / _floppy->sect;
-
-       if (((_floppy->stretch & FD_SWAPSIDES) || TESTF(FD_NEED_TWADDLE)) &&
-           fsector_t < _floppy->sect)
-               max_sector = _floppy->sect;
-
-       /* 2M disks have phantom sectors on the first track */
-       if ((_floppy->rate & FD_2M) && (!TRACK) && (!HEAD)){
-               max_sector = 2 * _floppy->sect / 3;
-               if (fsector_t >= max_sector){
-                       current_count_sectors = minimum(_floppy->sect - fsector_t,
-                                                       current_req->nr_sectors);
-                       return 1;
-               }
-               SIZECODE = 2;
-       } else
-               SIZECODE = FD_SIZECODE(_floppy);
-       raw_cmd->rate = _floppy->rate & 0x43;
-       if ((_floppy->rate & FD_2M) &&
-           (TRACK || HEAD) &&
-           raw_cmd->rate == 2)
-               raw_cmd->rate = 1;
-
-       if (SIZECODE)
-               SIZECODE2 = 0xff;
-       else
-               SIZECODE2 = 0x80;
-       raw_cmd->track = TRACK << STRETCH(_floppy);
-       DR_SELECT = UNIT(current_drive) + PH_HEAD(_floppy,HEAD);
-       GAP = _floppy->gap;
-       CODE2SIZE;
-       SECT_PER_TRACK = _floppy->sect << 2 >> SIZECODE;
-       SECTOR = ((fsector_t % _floppy->sect) << 2 >> SIZECODE) + 1;
-
-       /* tracksize describes the size which can be filled up with sectors
-        * of size ssize.
-        */
-       tracksize = _floppy->sect - _floppy->sect % ssize;
-       if (tracksize < _floppy->sect){
-               SECT_PER_TRACK ++;
-               if (tracksize <= fsector_t % _floppy->sect)
-                       SECTOR--;
-
-               /* if we are beyond tracksize, fill up using smaller sectors */
-               while (tracksize <= fsector_t % _floppy->sect){
-                       while(tracksize + ssize > _floppy->sect){
-                               SIZECODE--;
-                               ssize >>= 1;
-                       }
-                       SECTOR++; SECT_PER_TRACK ++;
-                       tracksize += ssize;
-               }
-               max_sector = HEAD * _floppy->sect + tracksize;
-       } else if (!TRACK && !HEAD && !(_floppy->rate & FD_2M) && probing) {
-               max_sector = _floppy->sect;
-       } else if (!HEAD && CT(COMMAND) == FD_WRITE) {
-               /* for virtual DMA bug workaround */
-               max_sector = _floppy->sect;
-       }
-
-       in_sector_offset = (fsector_t % _floppy->sect) % ssize;
-       aligned_sector_t = fsector_t - in_sector_offset;
-       max_size = current_req->nr_sectors;
-       if ((raw_cmd->track == buffer_track) && 
-           (current_drive == buffer_drive) &&
-           (fsector_t >= buffer_min) && (fsector_t < buffer_max)) {
-               /* data already in track buffer */
-               if (CT(COMMAND) == FD_READ) {
-                       copy_buffer(1, max_sector, buffer_max);
-                       return 1;
-               }
-       } else if (in_sector_offset || current_req->nr_sectors < ssize){
-               if (CT(COMMAND) == FD_WRITE){
-                       if (fsector_t + current_req->nr_sectors > ssize &&
-                           fsector_t + current_req->nr_sectors < ssize + ssize)
-                               max_size = ssize + ssize;
-                       else
-                               max_size = ssize;
-               }
-               raw_cmd->flags &= ~FD_RAW_WRITE;
-               raw_cmd->flags |= FD_RAW_READ;
-               COMMAND = FM_MODE(_floppy,FD_READ);
-       } else if ((unsigned long)current_req->buffer < MAX_DMA_ADDRESS) {
-               unsigned long dma_limit;
-               int direct, indirect;
-
-               indirect= transfer_size(ssize,max_sector,max_buffer_sectors*2) -
-                       fsector_t;
-
-               /*
-                * Do NOT use minimum() here---MAX_DMA_ADDRESS is 64 bits wide
-                * on a 64 bit machine!
-                */
-               max_size = buffer_chain_size();
-               dma_limit = (MAX_DMA_ADDRESS - ((unsigned long) current_req->buffer)) >> 9;
-               if ((unsigned long) max_size > dma_limit) {
-                       max_size = dma_limit;
-               }
-               /* 64 kb boundaries */
-               if (CROSS_64KB(current_req->buffer, max_size << 9))
-                       max_size = (K_64 - 
-                                   ((unsigned long)current_req->buffer) % K_64)>>9;
-               direct = transfer_size(ssize,max_sector,max_size) - fsector_t;
-               /*
-                * We try to read tracks, but if we get too many errors, we
-                * go back to reading just one sector at a time.
-                *
-                * This means we should be able to read a sector even if there
-                * are other bad sectors on this track.
-                */
-               if (!direct ||
-                   (indirect * 2 > direct * 3 &&
-                    *errors < DP->max_errors.read_track &&
-                    /*!TESTF(FD_NEED_TWADDLE) &&*/
-                    ((!probing || (DP->read_track&(1<<DRS->probed_format)))))){
-                       max_size = current_req->nr_sectors;
-               } else {
-                       raw_cmd->kernel_data = current_req->buffer;
-                       raw_cmd->length = current_count_sectors << 9;
-                       if (raw_cmd->length == 0){
-                               DPRINT("zero dma transfer attempted from make_raw_request\n");
-                               DPRINT("indirect=%d direct=%d fsector_t=%d",
-                                       indirect, direct, fsector_t);
-                               return 0;
-                       }
-/*                     check_dma_crossing(raw_cmd->kernel_data, 
-                                          raw_cmd->length, 
-                                          "end of make_raw_request [1]");*/
-
-                       virtualdmabug_workaround();
-                       return 2;
-               }
-       }
-
-       if (CT(COMMAND) == FD_READ)
-               max_size = max_sector; /* unbounded */
-
-       /* claim buffer track if needed */
-       if (buffer_track != raw_cmd->track ||  /* bad track */
-           buffer_drive !=current_drive || /* bad drive */
-           fsector_t > buffer_max ||
-           fsector_t < buffer_min ||
-           ((CT(COMMAND) == FD_READ ||
-             (!in_sector_offset && current_req->nr_sectors >= ssize))&&
-            max_sector > 2 * max_buffer_sectors + buffer_min &&
-            max_size + fsector_t > 2 * max_buffer_sectors + buffer_min)
-           /* not enough space */){
-               buffer_track = -1;
-               buffer_drive = current_drive;
-               buffer_max = buffer_min = aligned_sector_t;
-       }
-       raw_cmd->kernel_data = floppy_track_buffer + 
-               ((aligned_sector_t-buffer_min)<<9);
-
-       if (CT(COMMAND) == FD_WRITE){
-               /* copy write buffer to track buffer.
-                * if we get here, we know that the write
-                * is either aligned or the data already in the buffer
-                * (buffer will be overwritten) */
-#ifdef FLOPPY_SANITY_CHECK
-               if (in_sector_offset && buffer_track == -1)
-                       DPRINT("internal error offset !=0 on write\n");
-#endif
-               buffer_track = raw_cmd->track;
-               buffer_drive = current_drive;
-               copy_buffer(ssize, max_sector, 2*max_buffer_sectors+buffer_min);
-       } else
-               transfer_size(ssize, max_sector,
-                             2*max_buffer_sectors+buffer_min-aligned_sector_t);
-
-       /* round up current_count_sectors to get dma xfer size */
-       raw_cmd->length = in_sector_offset+current_count_sectors;
-       raw_cmd->length = ((raw_cmd->length -1)|(ssize-1))+1;
-       raw_cmd->length <<= 9;
-#ifdef FLOPPY_SANITY_CHECK
-       /*check_dma_crossing(raw_cmd->kernel_data, raw_cmd->length, 
-         "end of make_raw_request");*/
-       if ((raw_cmd->length < current_count_sectors << 9) ||
-           (raw_cmd->kernel_data != current_req->buffer &&
-            CT(COMMAND) == FD_WRITE &&
-            (aligned_sector_t + (raw_cmd->length >> 9) > buffer_max ||
-             aligned_sector_t < buffer_min)) ||
-           raw_cmd->length % (128 << SIZECODE) ||
-           raw_cmd->length <= 0 || current_count_sectors <= 0){
-               DPRINT("fractionary current count b=%lx s=%lx\n",
-                       raw_cmd->length, current_count_sectors);
-               if (raw_cmd->kernel_data != current_req->buffer)
-                       printk("addr=%d, length=%ld\n",
-                              (int) ((raw_cmd->kernel_data - 
-                                      floppy_track_buffer) >> 9),
-                              current_count_sectors);
-               printk("st=%d ast=%d mse=%d msi=%d\n",
-                      fsector_t, aligned_sector_t, max_sector, max_size);
-               printk("ssize=%x SIZECODE=%d\n", ssize, SIZECODE);
-               printk("command=%x SECTOR=%d HEAD=%d, TRACK=%d\n",
-                      COMMAND, SECTOR, HEAD, TRACK);
-               printk("buffer drive=%d\n", buffer_drive);
-               printk("buffer track=%d\n", buffer_track);
-               printk("buffer_min=%d\n", buffer_min);
-               printk("buffer_max=%d\n", buffer_max);
-               return 0;
-       }
-
-       if (raw_cmd->kernel_data != current_req->buffer){
-               if (raw_cmd->kernel_data < floppy_track_buffer ||
-                   current_count_sectors < 0 ||
-                   raw_cmd->length < 0 ||
-                   raw_cmd->kernel_data + raw_cmd->length >
-                   floppy_track_buffer + (max_buffer_sectors  << 10)){
-                       DPRINT("buffer overrun in schedule dma\n");
-                       printk("fsector_t=%d buffer_min=%d current_count=%ld\n",
-                              fsector_t, buffer_min,
-                              raw_cmd->length >> 9);
-                       printk("current_count_sectors=%ld\n",
-                              current_count_sectors);
-                       if (CT(COMMAND) == FD_READ)
-                               printk("read\n");
-                       if (CT(COMMAND) == FD_WRITE)
-                               printk("write\n");
-                       return 0;
-               }
-       } else if (raw_cmd->length > current_req->nr_sectors << 9 ||
-                  current_count_sectors > current_req->nr_sectors){
-               DPRINT("buffer overrun in direct transfer\n");
-               return 0;
-       } else if (raw_cmd->length < current_count_sectors << 9){
-               DPRINT("more sectors than bytes\n");
-               printk("bytes=%ld\n", raw_cmd->length >> 9);
-               printk("sectors=%ld\n", current_count_sectors);
-       }
-       if (raw_cmd->length == 0){
-               DPRINT("zero dma transfer attempted from make_raw_request\n");
-               return 0;
-       }
-#endif
-
-       virtualdmabug_workaround();
-       return 2;
-}
-
-static void redo_fd_request(void)
-{
-#define REPEAT {request_done(0); continue; }
-       int drive;
-       int tmp;
-
-       lastredo = jiffies;
-       if (current_drive < N_DRIVE)
-               floppy_off(current_drive);
-
-       for (;;) {
-               if (!current_req) {
-                       struct request *req;
-
-                       spin_lock_irq(floppy_queue->queue_lock);
-                       req = elv_next_request(floppy_queue);
-                       spin_unlock_irq(floppy_queue->queue_lock);
-                       if (!req) {
-                               do_floppy = NULL;
-                               unlock_fdc();
-                               return;
-                       }
-                       current_req = req;
-               }
-               drive = (long)current_req->rq_disk->private_data;
-               set_fdc(drive);
-               reschedule_timeout(current_reqD, "redo fd request", 0);
-
-               set_floppy(drive);
-               raw_cmd = & default_raw_cmd;
-               raw_cmd->flags = 0;
-               if (start_motor(redo_fd_request)) return;
-               disk_change(current_drive);
-               if (test_bit(current_drive, &fake_change) ||
-                  TESTF(FD_DISK_CHANGED)){
-                       DPRINT("disk absent or changed during operation\n");
-                       REPEAT;
-               }
-               if (!_floppy) { /* Autodetection */
-                       if (!probing){
-                               DRS->probed_format = 0;
-                               if (next_valid_format()){
-                                       DPRINT("no autodetectable formats\n");
-                                       _floppy = NULL;
-                                       REPEAT;
-                               }
-                       }
-                       probing = 1;
-                       _floppy = floppy_type+DP->autodetect[DRS->probed_format];
-               } else
-                       probing = 0;
-               errors = & (current_req->errors);
-               tmp = make_raw_rw_request();
-               if (tmp < 2){
-                       request_done(tmp);
-                       continue;
-               }
-
-               if (TESTF(FD_NEED_TWADDLE))
-                       twaddle();
-               schedule_bh( (void *)(void *) floppy_start);
-#ifdef DEBUGT
-               debugt("queue fd request");
-#endif
-               return;
-       }
-#undef REPEAT
-}
-
-static struct cont_t rw_cont={
-       rw_interrupt,
-       redo_fd_request,
-       bad_flp_intr,
-       request_done };
-
-static void process_fd_request(void)
-{
-       cont = &rw_cont;
-       schedule_bh( (void *)(void *) redo_fd_request);
-}
-
-static void do_fd_request(request_queue_t * q)
-{
-       if(max_buffer_sectors == 0) {
-               printk("VFS: do_fd_request called on non-open device\n");
-               return;
-       }
-
-       if (usage_count == 0) {
-               printk("warning: usage count=0, current_req=%p exiting\n", current_req);
-               printk("sect=%ld flags=%lx\n", (long)current_req->sector, current_req->flags);
-               return;
-       }
-       if (fdc_busy){
-               /* fdc busy, this new request will be treated when the
-                  current one is done */
-               is_alive("do fd request, old request running");
-               return;
-       }
-       lock_fdc(MAXTIMEOUT,0);
-       process_fd_request();
-       is_alive("do fd request");
-}
-
-static struct cont_t poll_cont={
-       success_and_wakeup,
-       floppy_ready,
-       generic_failure,
-       generic_done };
-
-static int poll_drive(int interruptible, int flag)
-{
-       int ret;
-       /* no auto-sense, just clear dcl */
-       raw_cmd = &default_raw_cmd;
-       raw_cmd->flags= flag;
-       raw_cmd->track=0;
-       raw_cmd->cmd_count=0;
-       cont = &poll_cont;
-#ifdef DCL_DEBUG
-       if (DP->flags & FD_DEBUG){
-               DPRINT("setting NEWCHANGE in poll_drive\n");
-       }
-#endif
-       SETF(FD_DISK_NEWCHANGE);
-       WAIT(floppy_ready);
-       return ret;
-}
-
-/*
- * User triggered reset
- * ====================
- */
-
-static void reset_intr(void)
-{
-       printk("weird, reset interrupt called\n");
-}
-
-static struct cont_t reset_cont={
-       reset_intr,
-       success_and_wakeup,
-       generic_failure,
-       generic_done };
-
-static int user_reset_fdc(int drive, int arg, int interruptible)
-{
-       int ret;
-
-       ret=0;
-       LOCK_FDC(drive,interruptible);
-       if (arg == FD_RESET_ALWAYS)
-               FDCS->reset=1;
-       if (FDCS->reset){
-               cont = &reset_cont;
-               WAIT(reset_fdc);
-       }
-       process_fd_request();
-       return ret;
-}
-
-/*
- * Misc Ioctl's and support
- * ========================
- */
-static inline int fd_copyout(void *param, const void *address, unsigned long size)
-{
-       return copy_to_user(param,address, size) ? -EFAULT : 0;
-}
-
-static inline int fd_copyin(void *param, void *address, unsigned long size)
-{
-       return copy_from_user(address, param, size) ? -EFAULT : 0;
-}
-
-#define _COPYOUT(x) (copy_to_user((void *)param, &(x), sizeof(x)) ? -EFAULT : 0)
-#define _COPYIN(x) (copy_from_user(&(x), (void *)param, sizeof(x)) ? -EFAULT : 0)
-
-#define COPYOUT(x) ECALL(_COPYOUT(x))
-#define COPYIN(x) ECALL(_COPYIN(x))
-
-static inline const char *drive_name(int type, int drive)
-{
-       struct floppy_struct *floppy;
-
-       if (type)
-               floppy = floppy_type + type;
-       else {
-               if (UDP->native_format)
-                       floppy = floppy_type + UDP->native_format;
-               else
-                       return "(null)";
-       }
-       if (floppy->name)
-               return floppy->name;
-       else
-               return "(null)";
-}
-
-
-/* raw commands */
-static void raw_cmd_done(int flag)
-{
-       int i;
-
-       if (!flag) {
-               raw_cmd->flags |= FD_RAW_FAILURE;
-               raw_cmd->flags |= FD_RAW_HARDFAILURE;
-       } else {
-               raw_cmd->reply_count = inr;
-               if (raw_cmd->reply_count > MAX_REPLIES)
-                       raw_cmd->reply_count=0;
-               for (i=0; i< raw_cmd->reply_count; i++)
-                       raw_cmd->reply[i] = reply_buffer[i];
-
-               if (raw_cmd->flags & (FD_RAW_READ | FD_RAW_WRITE))
-               {
-                       unsigned long flags;
-                       flags=claim_dma_lock();
-                       raw_cmd->length = fd_get_dma_residue();
-                       release_dma_lock(flags);
-               }
-               
-               if ((raw_cmd->flags & FD_RAW_SOFTFAILURE) &&
-                   (!raw_cmd->reply_count || (raw_cmd->reply[0] & 0xc0)))
-                       raw_cmd->flags |= FD_RAW_FAILURE;
-
-               if (disk_change(current_drive))
-                       raw_cmd->flags |= FD_RAW_DISK_CHANGE;
-               else
-                       raw_cmd->flags &= ~FD_RAW_DISK_CHANGE;
-               if (raw_cmd->flags & FD_RAW_NO_MOTOR_AFTER)
-                       motor_off_callback(current_drive);
-
-               if (raw_cmd->next &&
-                  (!(raw_cmd->flags & FD_RAW_FAILURE) ||
-                   !(raw_cmd->flags & FD_RAW_STOP_IF_FAILURE)) &&
-                  ((raw_cmd->flags & FD_RAW_FAILURE) ||
-                   !(raw_cmd->flags &FD_RAW_STOP_IF_SUCCESS))) {
-                       raw_cmd = raw_cmd->next;
-                       return;
-               }
-       }
-       generic_done(flag);
-}
-
-
-static struct cont_t raw_cmd_cont={
-       success_and_wakeup,
-       floppy_start,
-       generic_failure,
-       raw_cmd_done
-};
-
-static inline int raw_cmd_copyout(int cmd, char *param,
-                                 struct floppy_raw_cmd *ptr)
-{
-       int ret;
-
-       while(ptr) {
-               COPYOUT(*ptr);
-               param += sizeof(struct floppy_raw_cmd);
-               if ((ptr->flags & FD_RAW_READ) && ptr->buffer_length){
-                       if (ptr->length>=0 && ptr->length<=ptr->buffer_length)
-                               ECALL(fd_copyout(ptr->data, 
-                                                ptr->kernel_data, 
-                                                ptr->buffer_length - 
-                                                ptr->length));
-               }
-               ptr = ptr->next;
-       }
-       return 0;
-}
-
-
-static void raw_cmd_free(struct floppy_raw_cmd **ptr)
-{
-       struct floppy_raw_cmd *next,*this;
-
-       this = *ptr;
-       *ptr = 0;
-       while(this) {
-               if (this->buffer_length) {
-                       fd_dma_mem_free((unsigned long)this->kernel_data,
-                                       this->buffer_length);
-                       this->buffer_length = 0;
-               }
-               next = this->next;
-               kfree(this);
-               this = next;
-       }
-}
-
-
-static inline int raw_cmd_copyin(int cmd, char *param,
-                                struct floppy_raw_cmd **rcmd)
-{
-       struct floppy_raw_cmd *ptr;
-       int ret;
-       int i;
-       
-       *rcmd = 0;
-       while(1) {
-               ptr = (struct floppy_raw_cmd *) 
-                       kmalloc(sizeof(struct floppy_raw_cmd), GFP_USER);
-               if (!ptr)
-                       return -ENOMEM;
-               *rcmd = ptr;
-               COPYIN(*ptr);
-               ptr->next = 0;
-               ptr->buffer_length = 0;
-               param += sizeof(struct floppy_raw_cmd);
-               if (ptr->cmd_count > 33)
-                       /* the command may now also take up the space
-                        * initially intended for the reply & the
-                        * reply count. Needed for long 82078 commands
-                        * such as RESTORE, which takes ... 17 command
-                        * bytes. Murphy's law #137: When you reserve
-                        * 16 bytes for a structure, you'll one day
-                        * discover that you really need 17...
-                        */
-                       return -EINVAL;
-
-               for (i=0; i< 16; i++)
-                       ptr->reply[i] = 0;
-               ptr->resultcode = 0;
-               ptr->kernel_data = 0;
-
-               if (ptr->flags & (FD_RAW_READ | FD_RAW_WRITE)) {
-                       if (ptr->length <= 0)
-                               return -EINVAL;
-                       ptr->kernel_data =(char*)fd_dma_mem_alloc(ptr->length);
-                       fallback_on_nodma_alloc(&ptr->kernel_data,
-                                               ptr->length);
-                       if (!ptr->kernel_data)
-                               return -ENOMEM;
-                       ptr->buffer_length = ptr->length;
-               }
-               if (ptr->flags & FD_RAW_WRITE)
-                       ECALL(fd_copyin(ptr->data, ptr->kernel_data, 
-                                       ptr->length));
-               rcmd = & (ptr->next);
-               if (!(ptr->flags & FD_RAW_MORE))
-                       return 0;
-               ptr->rate &= 0x43;
-       }
-}
-
-
-static int raw_cmd_ioctl(int cmd, void *param)
-{
-       int drive, ret, ret2;
-       struct floppy_raw_cmd *my_raw_cmd;
-
-       if (FDCS->rawcmd <= 1)
-               FDCS->rawcmd = 1;
-       for (drive= 0; drive < N_DRIVE; drive++){
-               if (FDC(drive) != fdc)
-                       continue;
-               if (drive == current_drive){
-                       if (UDRS->fd_ref > 1){
-                               FDCS->rawcmd = 2;
-                               break;
-                       }
-               } else if (UDRS->fd_ref){
-                       FDCS->rawcmd = 2;
-                       break;
-               }
-       }
-
-       if (FDCS->reset)
-               return -EIO;
-
-       ret = raw_cmd_copyin(cmd, param, &my_raw_cmd);
-       if (ret) {
-               raw_cmd_free(&my_raw_cmd);
-               return ret;
-       }
-
-       raw_cmd = my_raw_cmd;
-       cont = &raw_cmd_cont;
-       ret=wait_til_done(floppy_start,1);
-#ifdef DCL_DEBUG
-       if (DP->flags & FD_DEBUG){
-               DPRINT("calling disk change from raw_cmd ioctl\n");
-       }
-#endif
-
-       if (ret != -EINTR && FDCS->reset)
-               ret = -EIO;
-
-       DRS->track = NO_TRACK;
-
-       ret2 = raw_cmd_copyout(cmd, param, my_raw_cmd);
-       if (!ret)
-               ret = ret2;
-       raw_cmd_free(&my_raw_cmd);
-       return ret;
-}
-
-static int invalidate_drive(struct block_device *bdev)
-{
-       /* invalidate the buffer track to force a reread */
-       set_bit((long)bdev->bd_disk->private_data, &fake_change);
-       process_fd_request();
-       check_disk_change(bdev);
-       return 0;
-}
-
-
-static inline void clear_write_error(int drive)
-{
-       CLEARSTRUCT(UDRWE);
-}
-
-static inline int set_geometry(unsigned int cmd, struct floppy_struct *g,
-                              int drive, int type, struct block_device *bdev)
-{
-       int cnt;
-
-       /* sanity checking for parameters.*/
-       if (g->sect <= 0 ||
-           g->head <= 0 ||
-           g->track <= 0 ||
-           g->track > UDP->tracks>>STRETCH(g) ||
-           /* check if reserved bits are set */
-           (g->stretch&~(FD_STRETCH|FD_SWAPSIDES)) != 0)
-               return -EINVAL;
-       if (type){
-               if (!capable(CAP_SYS_ADMIN))
-                       return -EPERM;
-               down(&open_lock);
-               LOCK_FDC(drive,1);
-               floppy_type[type] = *g;
-               floppy_type[type].name="user format";
-               for (cnt = type << 2; cnt < (type << 2) + 4; cnt++)
-                       floppy_sizes[cnt]= floppy_sizes[cnt+0x80]=
-                               floppy_type[type].size+1;
-               process_fd_request();
-               for (cnt = 0; cnt < N_DRIVE; cnt++) {
-                       struct block_device *bdev = opened_bdev[cnt];
-                       if (!bdev || ITYPE(drive_state[cnt].fd_device) != type)
-                               continue;
-                       __invalidate_device(bdev, 0);
-               }
-               up(&open_lock);
-       } else {
-               LOCK_FDC(drive,1);
-               if (cmd != FDDEFPRM)
-                       /* notice a disk change immediately, else
-                        * we lose our settings immediately*/
-                       CALL(poll_drive(1, FD_RAW_NEED_DISK));
-               user_params[drive] = *g;
-               if (buffer_drive == drive)
-                       SUPBOUND(buffer_max, user_params[drive].sect);
-               current_type[drive] = &user_params[drive];
-               floppy_sizes[drive] = user_params[drive].size;
-               if (cmd == FDDEFPRM)
-                       DRS->keep_data = -1;
-               else
-                       DRS->keep_data = 1;
-               /* invalidation. Invalidate only when needed, i.e.
-                * when there are already sectors in the buffer cache
-                * whose number will change. This is useful, because
-                * mtools often changes the geometry of the disk after
-                * looking at the boot block */
-               if (DRS->maxblock > user_params[drive].sect || DRS->maxtrack)
-                       invalidate_drive(bdev);
-               else
-                       process_fd_request();
-       }
-       return 0;
-}
-
-/* handle obsolete ioctl's */
-static int ioctl_table[]= {
-       FDCLRPRM,
-       FDSETPRM,
-       FDDEFPRM,
-       FDGETPRM,
-       FDMSGON,
-       FDMSGOFF,
-       FDFMTBEG,
-       FDFMTTRK,
-       FDFMTEND,
-       FDSETEMSGTRESH,
-       FDFLUSH,
-       FDSETMAXERRS,
-       FDGETMAXERRS,
-       FDGETDRVTYP,
-       FDSETDRVPRM,
-       FDGETDRVPRM,
-       FDGETDRVSTAT,
-       FDPOLLDRVSTAT,
-       FDRESET,
-       FDGETFDCSTAT,
-       FDWERRORCLR,
-       FDWERRORGET,
-       FDRAWCMD,
-       FDEJECT,
-       FDTWADDLE
-};
-
-static inline int normalize_ioctl(int *cmd, int *size)
-{
-       int i;
-
-       for (i=0; i < ARRAY_SIZE(ioctl_table); i++) {
-               if ((*cmd & 0xffff) == (ioctl_table[i] & 0xffff)){
-                       *size = _IOC_SIZE(*cmd);
-                       *cmd = ioctl_table[i];
-                       if (*size > _IOC_SIZE(*cmd)) {
-                               printk("ioctl not yet supported\n");
-                               return -EFAULT;
-                       }
-                       return 0;
-               }
-       }
-       return -EINVAL;
-}
-
-static int get_floppy_geometry(int drive, int type, struct floppy_struct **g)
-{
-       if (type)
-               *g = &floppy_type[type];
-       else {
-               LOCK_FDC(drive,0);
-               CALL(poll_drive(0,0));
-               process_fd_request();           
-               *g = current_type[drive];
-       }
-       if (!*g)
-               return -ENODEV;
-       return 0;
-}
-
-static int fd_ioctl(struct inode *inode, struct file *filp, unsigned int cmd,
-                   unsigned long param)
-{
-#define FD_IOCTL_ALLOWED ((filp) && (filp)->private_data)
-#define OUT(c,x) case c: outparam = (const char *) (x); break
-#define IN(c,x,tag) case c: *(x) = inparam. tag ; return 0
-
-       int drive = (long)inode->i_bdev->bd_disk->private_data;
-       int i, type = ITYPE(UDRS->fd_device);
-       int ret;
-       int size;
-       union inparam {
-               struct floppy_struct g; /* geometry */
-               struct format_descr f;
-               struct floppy_max_errors max_errors;
-               struct floppy_drive_params dp;
-       } inparam; /* parameters coming from user space */
-       const char *outparam; /* parameters passed back to user space */
-
-       /* convert compatibility eject ioctls into floppy eject ioctl.
-        * We do this in order to provide a means to eject floppy disks before
-        * installing the new fdutils package */
-       if (cmd == CDROMEJECT || /* CD-ROM eject */
-           cmd == 0x6470 /* SunOS floppy eject */) {
-               DPRINT("obsolete eject ioctl\n");
-               DPRINT("please use floppycontrol --eject\n");
-               cmd = FDEJECT;
-       }
-
-       /* generic block device ioctls */
-       switch(cmd) {
-               /* the following have been inspired by the corresponding
-                * code for other block devices. */
-               struct floppy_struct *g;
-               case HDIO_GETGEO:
-               {
-                       struct hd_geometry loc;
-                       ECALL(get_floppy_geometry(drive, type, &g));
-                       loc.heads = g->head;
-                       loc.sectors = g->sect;
-                       loc.cylinders = g->track;
-                       loc.start = 0;
-                       return _COPYOUT(loc);
-               }
-       }
-
-       /* convert the old style command into a new style command */
-       if ((cmd & 0xff00) == 0x0200) {
-               ECALL(normalize_ioctl(&cmd, &size));
-       } else
-               return -EINVAL;
-
-       /* permission checks */
-       if (((cmd & 0x40) && !FD_IOCTL_ALLOWED) ||
-           ((cmd & 0x80) && !capable(CAP_SYS_ADMIN)))
-               return -EPERM;
-
-       /* copyin */
-       CLEARSTRUCT(&inparam);
-       if (_IOC_DIR(cmd) & _IOC_WRITE)
-               ECALL(fd_copyin((void *)param, &inparam, size))
-
-       switch (cmd) {
-               case FDEJECT:
-                       if (UDRS->fd_ref != 1)
-                               /* somebody else has this drive open */
-                               return -EBUSY;
-                       LOCK_FDC(drive,1);
-
-                       /* do the actual eject. Fails on
-                        * non-Sparc architectures */
-                       ret=fd_eject(UNIT(drive));
-
-                       USETF(FD_DISK_CHANGED);
-                       USETF(FD_VERIFY);
-                       process_fd_request();
-                       return ret;                     
-               case FDCLRPRM:
-                       LOCK_FDC(drive,1);
-                       current_type[drive] = NULL;
-                       floppy_sizes[drive] = MAX_DISK_SIZE << 1;
-                       UDRS->keep_data = 0;
-                       return invalidate_drive(inode->i_bdev);
-               case FDSETPRM:
-               case FDDEFPRM:
-                       return set_geometry(cmd, & inparam.g,
-                                           drive, type, inode->i_bdev);
-               case FDGETPRM:
-                       ECALL(get_floppy_geometry(drive, type, 
-                                                 (struct floppy_struct**)
-                                                 &outparam));
-                       break;
-
-               case FDMSGON:
-                       UDP->flags |= FTD_MSG;
-                       return 0;
-               case FDMSGOFF:
-                       UDP->flags &= ~FTD_MSG;
-                       return 0;
-
-               case FDFMTBEG:
-                       LOCK_FDC(drive,1);
-                       CALL(poll_drive(1, FD_RAW_NEED_DISK));
-                       ret = UDRS->flags;
-                       if (ret & FD_VERIFY) {
-                               CALL(poll_drive(1, FD_RAW_NEED_DISK));
-                               ret = UDRS->flags;
-                       }
-
-                       if (ret & FD_VERIFY) {
-                               CALL(poll_drive(1, FD_RAW_NEED_DISK));
-                               ret = UDRS->flags;
-                       }
-
-                       if (ret & FD_VERIFY) {
-                               CALL(poll_drive(1, FD_RAW_NEED_DISK));
-                               ret = UDRS->flags;
-                       }
-
-                       if (ret & FD_VERIFY) {
-                               CALL(poll_drive(1, FD_RAW_NEED_DISK));
-                               ret = UDRS->flags;
-                       }
-
-                       if(ret & FD_VERIFY){
-                               CALL(poll_drive(1, FD_RAW_NEED_DISK));
-                               ret = UDRS->flags;
-                       }
-                       process_fd_request();
-                       if (ret & FD_VERIFY)
-                               return -ENODEV;
-                       if (!(ret & FD_DISK_WRITABLE))
-                               return -EROFS;
-                       return 0;
-               case FDFMTTRK:
-                       if (UDRS->fd_ref != 1)
-                               return -EBUSY;
-                       return do_format(drive, &inparam.f);
-               case FDFMTEND:
-               case FDFLUSH:
-                       LOCK_FDC(drive,1);
-                       return invalidate_drive(inode->i_bdev);
-
-               case FDSETEMSGTRESH:
-                       UDP->max_errors.reporting =
-                               (unsigned short) (param & 0x0f);
-                       return 0;
-               OUT(FDGETMAXERRS, &UDP->max_errors);
-               IN(FDSETMAXERRS, &UDP->max_errors, max_errors);
-
-               case FDGETDRVTYP:
-                       outparam = drive_name(type,drive);
-                       SUPBOUND(size,strlen(outparam)+1);
-                       break;
-
-               IN(FDSETDRVPRM, UDP, dp);
-               OUT(FDGETDRVPRM, UDP);
-
-               case FDPOLLDRVSTAT:
-                       LOCK_FDC(drive,1);
-                       CALL(poll_drive(1, FD_RAW_NEED_DISK));
-                       process_fd_request();
-                       /* fall through */
-               OUT(FDGETDRVSTAT, UDRS);
-
-               case FDRESET:
-                       return user_reset_fdc(drive, (int)param, 1);
-
-               OUT(FDGETFDCSTAT,UFDCS);
-
-               case FDWERRORCLR:
-                       CLEARSTRUCT(UDRWE);
-                       return 0;
-               OUT(FDWERRORGET,UDRWE);
-
-               case FDRAWCMD:
-                       if (type)
-                               return -EINVAL;
-                       LOCK_FDC(drive,1);
-                       set_floppy(drive);
-                       CALL(i = raw_cmd_ioctl(cmd,(void *) param));
-                       process_fd_request();
-                       return i;
-
-               case FDTWADDLE:
-                       LOCK_FDC(drive,1);
-                       twaddle();
-                       process_fd_request();
-                       return 0;
-
-               default:
-                       return -EINVAL;
-       }
-
-       if (_IOC_DIR(cmd) & _IOC_READ)
-               return fd_copyout((void *)param, outparam, size);
-       else
-               return 0;
-#undef OUT
-#undef IN
-}
-
-static void __init config_types(void)
-{
-       int first=1;
-       int drive;
-       extern struct fd_info {
-               unsigned char dummy[4 * 6];
-               unsigned char fd_types[8];
-       } drive_info;
-
-       for (drive = 0; drive < 4; drive++)
-               UDP->cmos = drive_info.fd_types[drive];
-
-       /* XXX */
-       /* additional physical CMOS drive detection should go here */
-
-       for (drive=0; drive < N_DRIVE; drive++){
-               unsigned int type = UDP->cmos;
-               struct floppy_drive_params *params;
-               const char *name = NULL;
-               static char temparea[32];
-
-               if (type < NUMBER(default_drive_params)) {
-                       params = &default_drive_params[type].params;
-                       if (type) {
-                               name = default_drive_params[type].name;
-                               allowed_drive_mask |= 1 << drive;
-                       }
-                       else
-                               allowed_drive_mask &= ~(1 << drive);
-               } else {
-                       params = &default_drive_params[0].params;
-                       sprintf(temparea, "unknown type %d (usb?)", type);
-                       name = temparea;
-               }
-               if (name) {
-                       const char * prepend = ",";
-                       if (first) {
-                               prepend = KERN_INFO "Floppy drive(s):";
-                               first = 0;
-                       }
-                       printk("%s fd%d is %s", prepend, drive, name);
-                       register_devfs_entries (drive);
-               }
-               *UDP = *params;
-       }
-       if (!first)
-               printk("\n");
-}
-
-static int floppy_release(struct inode * inode, struct file * filp)
-{
-       int drive = (long)inode->i_bdev->bd_disk->private_data;
-
-       down(&open_lock);
-       if (UDRS->fd_ref < 0)
-               UDRS->fd_ref=0;
-       else if (!UDRS->fd_ref--) {
-               DPRINT("floppy_release with fd_ref == 0");
-               UDRS->fd_ref = 0;
-       }
-       if (!UDRS->fd_ref)
-               opened_bdev[drive] = NULL;
-       floppy_release_irq_and_dma();
-       up(&open_lock);
-       return 0;
-}
-
-/*
- * floppy_open check for aliasing (/dev/fd0 can be the same as
- * /dev/PS0 etc), and disallows simultaneous access to the same
- * drive with different device numbers.
- */
-#define RETERR(x) do{floppy_release(inode,filp); return -(x);}while(0)
-
-static int floppy_open(struct inode * inode, struct file * filp)
-{
-       int drive = (long)inode->i_bdev->bd_disk->private_data;
-       int old_dev;
-       int try;
-       int res = -EBUSY;
-       char *tmp;
-
-#ifdef PC9800_DEBUG_FLOPPY
-       printk("floppy open: start\n");
-#endif
-       filp->private_data = (void*) 0;
-
-#ifdef PC9800_DEBUG_FLOPPY
-       printk("floppy open: drive=%d, current_drive=%d, UDP->cmos=%d\n"
-                  "floppy open: FDCS={spec1=%d, spec2=%d, dtr=%d, version=%d, dor=%d, address=%lu}\n",
-                  drive, current_drive, UDP->cmos, FDCS->spec1, FDCS->spec2,
-                  FDCS->dtr, FDCS->version, FDCS->dor, FDCS->address);
-       if (_floppy) {
-               printk("floppy open: _floppy={size=%d, sect=%d, head=%d, track=%d, spec1=%d}\n",
-                          _floppy->size, _floppy->sect, _floppy->head,
-                          _floppy->track, _floppy->spec1);
-       } else {
-               printk("floppy open: _floppy=NULL\n");
-       }
-#endif /* PC9800_DEBUG_FLOPPY */
-
-       down(&open_lock);
-       old_dev = UDRS->fd_device;
-       if (opened_bdev[drive] && opened_bdev[drive] != inode->i_bdev)
-               goto out2;
-
-       if (!UDRS->fd_ref && (UDP->flags & FD_BROKEN_DCL)){
-               USETF(FD_DISK_CHANGED);
-               USETF(FD_VERIFY);
-       }
-
-       if (UDRS->fd_ref == -1 ||
-          (UDRS->fd_ref && (filp->f_flags & O_EXCL)))
-               goto out2;
-
-       if (floppy_grab_irq_and_dma())
-               goto out2;
-
-       if (filp->f_flags & O_EXCL)
-               UDRS->fd_ref = -1;
-       else
-               UDRS->fd_ref++;
-
-       opened_bdev[drive] = inode->i_bdev;
-
-       res = -ENXIO;
-
-       if (!floppy_track_buffer){
-               /* if opening an ED drive, reserve a big buffer,
-                * else reserve a small one */
-               if ((UDP->cmos == 6) || (UDP->cmos == 5))
-                       try = 64; /* Only 48 actually useful */
-               else
-                       try = 32; /* Only 24 actually useful */
-
-               tmp=(char *)fd_dma_mem_alloc(1024 * try);
-               if (!tmp && !floppy_track_buffer) {
-                       try >>= 1; /* buffer only one side */
-                       INFBOUND(try, 16);
-                       tmp= (char *)fd_dma_mem_alloc(1024*try);
-               }
-               if (!tmp && !floppy_track_buffer) {
-                       fallback_on_nodma_alloc(&tmp, 2048 * try);
-               }
-               if (!tmp && !floppy_track_buffer) {
-                       DPRINT("Unable to allocate DMA memory\n");
-                       goto out;
-               }
-               if (floppy_track_buffer) {
-                       if (tmp)
-                               fd_dma_mem_free((unsigned long)tmp,try*1024);
-               } else {
-                       buffer_min = buffer_max = -1;
-                       floppy_track_buffer = tmp;
-                       max_buffer_sectors = try;
-               }
-       }
-
-       UDRS->fd_device = iminor(inode);
-       set_capacity(disks[drive], floppy_sizes[iminor(inode)]);
-       if (old_dev != -1 && old_dev != iminor(inode)) {
-               if (buffer_drive == drive)
-                       buffer_track = -1;
-       }
-
-#ifdef PC9800_DEBUG_FLOPPY
-       printk("floppy open: floppy.c:%d passed\n", __LINE__);
-#endif
-
-
-       /* Allow ioctls if we have write-permissions even if read-only open.
-        * Needed so that programs such as fdrawcmd still can work on write
-        * protected disks */
-       if (filp->f_mode & 2 || permission(filp->f_dentry->d_inode,2,NULL) == 0)
-           filp->private_data = (void*) 8;
-
-       if (UFDCS->rawcmd == 1)
-               UFDCS->rawcmd = 2;
-
-#ifdef PC9800_DEBUG_FLOPPY
-       printk("floppy open: floppy.c:%d passed\n", __LINE__);
-#endif
-
-       if (!(filp->f_flags & O_NDELAY)) {
-               if (filp->f_mode & 3) {
-                       UDRS->last_checked = 0;
-                       check_disk_change(inode->i_bdev);
-                       if (UTESTF(FD_DISK_CHANGED))
-                               goto out;
-               }
-               res = -EROFS;
-               if ((filp->f_mode & 2) && !(UTESTF(FD_DISK_WRITABLE)))
-                       goto out;
-#ifdef PC9800_DEBUG_FLOPPY
-               printk("floppy open: end normally\n");
-#endif
-       }
-       up(&open_lock);
-       return 0;
-out:
-       if (UDRS->fd_ref < 0)
-               UDRS->fd_ref=0;
-       else
-               UDRS->fd_ref--;
-       if (!UDRS->fd_ref)
-               opened_bdev[drive] = NULL;
-       floppy_release_irq_and_dma();
-out2:
-       up(&open_lock);
-       return res;
-}
-
-/*
- * Check if the disk has been changed or if a change has been faked.
- */
-static int check_floppy_change(struct gendisk *disk)
-{
-       int drive = (long)disk->private_data;
-
-#ifdef PC9800_DEBUG_FLOPPY
-       printk("check_floppy_change: MINOR=%d\n", minor(dev));
-#endif
-
-       if (UTESTF(FD_DISK_CHANGED) || UTESTF(FD_VERIFY))
-               return 1;
-
-       if (UDP->checkfreq < (int)(jiffies - UDRS->last_checked)) {
-               if(floppy_grab_irq_and_dma()) {
-                       return 1;
-               }
-
-               lock_fdc(drive,0);
-               poll_drive(0,0);
-               process_fd_request();
-               floppy_release_irq_and_dma();
-       }
-
-       if (UTESTF(FD_DISK_CHANGED) ||
-          UTESTF(FD_VERIFY) ||
-          test_bit(drive, &fake_change) ||
-          (!ITYPE(UDRS->fd_device) && !current_type[drive]))
-               return 1;
-       return 0;
-}
-
-/*
- * This implements "read block 0" for floppy_revalidate().
- * Needed for format autodetection, checking whether there is
- * a disk in the drive, and whether that disk is writable.
- */
-
-static int floppy_rb0_complete(struct bio *bio, unsigned int bytes_done, int err)
-{
-       if (bio->bi_size)
-               return 1;
-
-       complete((struct completion*)bio->bi_private);
-       return 0;
-}
-
-static int __floppy_read_block_0(struct block_device *bdev)
-{
-       struct bio bio;
-       struct bio_vec bio_vec;
-       struct completion complete;
-       struct page *page;
-       size_t size;
-
-       page = alloc_page(GFP_NOIO);
-       if (!page) {
-               process_fd_request();
-               return -ENOMEM;
-       }
-
-       size = bdev->bd_block_size;
-       if (!size)
-               size = 1024;
-
-       bio_init(&bio);
-       bio.bi_io_vec = &bio_vec;
-       bio_vec.bv_page = page;
-       bio_vec.bv_len = size;
-       bio_vec.bv_offset = 0;
-       bio.bi_vcnt = 1;
-       bio.bi_idx = 0;
-       bio.bi_size = size;
-       bio.bi_bdev = bdev;
-       bio.bi_sector = 0;
-       init_completion(&complete);
-       bio.bi_private = &complete;
-       bio.bi_end_io = floppy_rb0_complete;
-
-       submit_bio(READ, &bio);
-       generic_unplug_device(bdev_get_queue(bdev));
-       process_fd_request();
-       wait_for_completion(&complete);
-
-       __free_page(page);
-
-       return 0;
-}
-
-/* revalidate the floppy disk, i.e. trigger format autodetection by reading
- * the bootblock (block 0). "Autodetection" is also needed to check whether
- * there is a disk in the drive at all... Thus we also do it for fixed
- * geometry formats */
-static int floppy_revalidate(struct gendisk *disk)
-{
-       int drive=(long)disk->private_data;
-#define NO_GEOM (!current_type[drive] && !ITYPE(UDRS->fd_device))
-       int cf;
-       int res = 0;
-
-       if (UTESTF(FD_DISK_CHANGED) ||
-           UTESTF(FD_VERIFY) ||
-           test_bit(drive, &fake_change) ||
-           NO_GEOM){
-               if(usage_count == 0) {
-                       printk("VFS: revalidate called on non-open device.\n");
-                       return -EFAULT;
-               }
-               lock_fdc(drive,0);
-               cf = UTESTF(FD_DISK_CHANGED) || UTESTF(FD_VERIFY);
-               if (!(cf || test_bit(drive, &fake_change) || NO_GEOM)){
-                       process_fd_request(); /*already done by another thread*/
-                       return 0;
-               }
-               UDRS->maxblock = 0;
-               UDRS->maxtrack = 0;
-               if (buffer_drive == drive)
-                       buffer_track = -1;
-               clear_bit(drive, &fake_change);
-               UCLEARF(FD_DISK_CHANGED);
-               if (cf)
-                       UDRS->generation++;
-               if (NO_GEOM){
-                       /* auto-sensing */
-                       res = __floppy_read_block_0(opened_bdev[drive]);
-               } else {
-                       if (cf)
-                               poll_drive(0, FD_RAW_NEED_DISK);
-                       process_fd_request();
-               }
-       }
-       set_capacity(disk, floppy_sizes[UDRS->fd_device]);
-       return res;
-}
-
-static struct block_device_operations floppy_fops = {
-       .owner          = THIS_MODULE,
-       .open           = floppy_open,
-       .release        = floppy_release,
-       .ioctl          = fd_ioctl,
-       .media_changed  = check_floppy_change,
-       .revalidate_disk= floppy_revalidate,
-};
-
-static char *table[] =
-{"",
-#if 0
-       "d360", 
-#else
-       "h1232",
-#endif
-       "h1200", "u360", "u720", "h360", "h720",
-       "u1440", "u2880", "CompaQ", "h1440", "u1680", "h410",
-       "u820", "h1476", "u1722", "h420", "u830", "h1494", "u1743",
-       "h880", "u1040", "u1120", "h1600", "u1760", "u1920",
-       "u3200", "u3520", "u3840", "u1840", "u800", "u1600",
-NULL
-};
-
-static int t360[] = {
-       1,0
-};
-static int t1200[] = {
-       2,5,6,10,12,14,16,18,20,23,0
-};
-static int t3in[] = {
-        8, 9,26,27,28, 7,11,15,19,24,25,
-       29,31, 3, 4,13,17,21,22,30, 0
-};
-
-static int *table_sup[] = {
-       NULL, t360, t1200, t3in+5+8, t3in+5, t3in, t3in
-};
-
-static void __init register_devfs_entries (int drive)
-{
-       int base_minor = (drive < 4) ? drive : (124 + drive);
-
-       if (UDP->cmos < NUMBER(default_drive_params)) {
-               int i = 0;
-               do {
-                       int minor = base_minor + (table_sup[UDP->cmos][i] << 2);
-
-                       devfs_mk_bdev(MKDEV(FLOPPY_MAJOR, minor), 
-                                       S_IFBLK|S_IRUSR|S_IWUSR|S_IRGRP|S_IWGRP,
-                                       "floppy/%d%s",
-                                       drive, table[table_sup[UDP->cmos][i]]);
-               } while (table_sup[UDP->cmos][i++]);
-       }
-}
-
-/*
- * Floppy Driver initialization
- * =============================
- */
-
-static inline char __init get_fdc_version(void)
-{
-       return FDC_8272A;
-}
-
-/* lilo configuration */
-
-static void __init floppy_set_flags(int *ints,int param, int param2)
-{
-       int i;
-
-       for (i=0; i < ARRAY_SIZE(default_drive_params); i++){
-               if (param)
-                       default_drive_params[i].params.flags |= param2;
-               else
-                       default_drive_params[i].params.flags &= ~param2;
-       }
-       DPRINT("%s flag 0x%x\n", param2 ? "Setting" : "Clearing", param);
-}
-
-static void __init daring(int *ints,int param, int param2)
-{
-       int i;
-
-       for (i=0; i < ARRAY_SIZE(default_drive_params); i++){
-               if (param){
-                       default_drive_params[i].params.select_delay = 0;
-                       default_drive_params[i].params.flags |= FD_SILENT_DCL_CLEAR;
-               } else {
-                       default_drive_params[i].params.select_delay = 2*HZ/100;
-                       default_drive_params[i].params.flags &= ~FD_SILENT_DCL_CLEAR;
-               }
-       }
-       DPRINT("Assuming %s floppy hardware\n", param ? "standard" : "broken");
-}
-
-static void __init set_cmos(int *ints, int dummy, int dummy2)
-{
-       int current_drive=0;
-
-       if (ints[0] != 2){
-               DPRINT("wrong number of parameters for CMOS\n");
-               return;
-       }
-       current_drive = ints[1];
-       if (current_drive < 0 || current_drive >= 8){
-               DPRINT("bad drive for set_cmos\n");
-               return;
-       }
-#if N_FDC > 1
-       if (current_drive >= 4 && !FDC2)
-               FDC2 = 0x370;
-#endif
-       DP->cmos = ints[2];
-       DPRINT("setting CMOS code to %d\n", ints[2]);
-}
-
-static struct param_table {
-       const char *name;
-       void (*fn)(int *ints, int param, int param2);
-       int *var;
-       int def_param;
-       int param2;
-} config_params[]={
-       { "allowed_drive_mask", 0, &allowed_drive_mask, 0xff, 0}, /* obsolete */
-       { "all_drives", 0, &allowed_drive_mask, 0xff, 0 }, /* obsolete */
-       { "irq", 0, &FLOPPY_IRQ, DEFAULT_FLOPPY_IRQ, 0 },
-       { "dma", 0, &FLOPPY_DMA, DEFAULT_FLOPPY_DMA, 0 },
-
-       { "daring", daring, 0, 1, 0},
-#if N_FDC > 1
-       { "two_fdc",  0, &FDC2, 0x370, 0 },
-       { "one_fdc", 0, &FDC2, 0, 0 },
-#endif
-       { "broken_dcl", floppy_set_flags, 0, 1, FD_BROKEN_DCL },
-       { "messages", floppy_set_flags, 0, 1, FTD_MSG },
-       { "silent_dcl_clear", floppy_set_flags, 0, 1, FD_SILENT_DCL_CLEAR },
-       { "debug", floppy_set_flags, 0, 1, FD_DEBUG },
-
-       { "nodma", 0, &can_use_virtual_dma, 1, 0 },
-       { "yesdma", 0, &can_use_virtual_dma, 0, 0 },
-
-       { "fifo_depth", 0, &fifo_depth, 0xa, 0 },
-       { "nofifo", 0, &no_fifo, 0x20, 0 },
-       { "usefifo", 0, &no_fifo, 0, 0 },
-
-       { "cmos", set_cmos, 0, 0, 0 },
-       { "slow", 0, &slow_floppy, 1, 0 },
-
-       { "unexpected_interrupts", 0, &print_unex, 1, 0 },
-       { "no_unexpected_interrupts", 0, &print_unex, 0, 0 },
-
-       EXTRA_FLOPPY_PARAMS
-};
-
-static int __init floppy_setup(char *str)
-{
-       int i;
-       int param;
-       int ints[11];
-
-       str = get_options(str,ARRAY_SIZE(ints),ints);
-       if (str) {
-               for (i=0; i< ARRAY_SIZE(config_params); i++){
-                       if (strcmp(str,config_params[i].name) == 0){
-                               if (ints[0])
-                                       param = ints[1];
-                               else
-                                       param = config_params[i].def_param;
-                               if (config_params[i].fn)
-                                       config_params[i].
-                                               fn(ints,param,
-                                                  config_params[i].param2);
-                               if (config_params[i].var) {
-                                       DPRINT("%s=%d\n", str, param);
-                                       *config_params[i].var = param;
-                               }
-                               return 1;
-                       }
-               }
-       }
-       if (str) {
-               DPRINT("unknown floppy option [%s]\n", str);
-               
-               DPRINT("allowed options are:");
-               for (i=0; i< ARRAY_SIZE(config_params); i++)
-                       printk(" %s",config_params[i].name);
-               printk("\n");
-       } else
-               DPRINT("botched floppy option\n");
-       DPRINT("Read linux/Documentation/floppy.txt\n");
-       return 0;
-}
-
-static int have_no_fdc= -ENODEV;
-
-static void floppy_device_release(struct device *dev)
-{
-       complete(&device_release);
-}
-
-static struct platform_device floppy_device = {
-       .name           = "floppy",
-       .id             = 0,
-       .dev            = {
-                       .release = floppy_device_release,
-       },
-};
-
-static struct kobject *floppy_find(dev_t dev, int *part, void *data)
-{
-       int drive = (*part&3) | ((*part&0x80) >> 5);
-       if (drive >= N_DRIVE ||
-           !(allowed_drive_mask & (1 << drive)) ||
-           fdc_state[FDC(drive)].version == FDC_NONE)
-               return NULL;
-       if (((*part>>2) & 0x1f) >= NUMBER(floppy_type))
-               return NULL;
-       *part = 0;
-       return get_disk(disks[drive]);
-}
-
-int __init floppy_init(void)
-{
-       int i,unit,drive;
-       int err;
-
-       raw_cmd = NULL;
-       FDC1 = 0x90;
-
-       for (i=0; i<N_DRIVE; i++) {
-               disks[i] = alloc_disk(1);
-               if (!disks[i])
-                       goto Enomem;
-       }
-
-       devfs_mk_dir (NULL, "floppy", NULL);
-       if ((err = register_blkdev(FLOPPY_MAJOR,"fd")))
-               goto out;
-
-       for (i=0; i<N_DRIVE; i++) {
-               disks[i]->major = FLOPPY_MAJOR;
-               disks[i]->first_minor = TOMINOR(i);
-               disks[i]->fops = &floppy_fops;
-               sprintf(disks[i]->disk_name, "fd%d", i);
-       }
-
-       blk_register_region(MKDEV(FLOPPY_MAJOR, 0), 256, THIS_MODULE,
-                               floppy_find, NULL, NULL);
-
-       for (i=0; i<256; i++)
-               if (ITYPE(i))
-                       floppy_sizes[i] = floppy_type[ITYPE(i)].size;
-               else
-                       floppy_sizes[i] = MAX_DISK_SIZE << 1;
-
-       floppy_queue = blk_init_queue(do_fd_request, &floppy_lock);
-       if (!floppy_queue)
-               goto out_queue;
-
-       reschedule_timeout(MAXTIMEOUT, "floppy init", MAXTIMEOUT);
-       config_types();
-
-       for (i = 0; i < N_FDC; i++) {
-               fdc = i;
-               CLEARSTRUCT(FDCS);
-               FDCS->dtr = -1;
-               FDCS->dor = 0;
-       }
-
-       if ((fd_inb(FD_MODE_CHANGE) & 1) == 0)
-               FDC1 = 0xc8;
-
-       use_virtual_dma = can_use_virtual_dma & 1;
-       fdc_state[0].address = FDC1;
-       if (fdc_state[0].address == -1) {
-               err = -ENODEV;
-               goto out1;
-       }
-#if N_FDC > 1
-       fdc_state[1].address = FDC2;
-#endif
-
-       fdc = 0; /* reset fdc in case of unexpected interrupt */
-       if (floppy_grab_irq_and_dma()){
-               err = -EBUSY;
-               goto out1;
-       }
-
-       /* initialise drive state */
-       for (drive = 0; drive < N_DRIVE; drive++) {
-               CLEARSTRUCT(UDRS);
-               CLEARSTRUCT(UDRWE);
-               USETF(FD_DISK_NEWCHANGE);
-               USETF(FD_DISK_CHANGED);
-               USETF(FD_VERIFY);
-               UDRS->fd_device = -1;
-               floppy_track_buffer = NULL;
-               max_buffer_sectors = 0;
-       }
-
-       for (i = 0; i < N_FDC; i++) {
-               fdc = i;
-               FDCS->driver_version = FD_DRIVER_VERSION;
-               for (unit=0; unit<4; unit++)
-                       FDCS->track[unit] = 0;
-               if (FDCS->address == -1)
-                       continue;
-               FDCS->rawcmd = 2;
-               user_reset_fdc(-1, FD_RESET_ALWAYS, 0);
-
-               /* Try to determine the floppy controller type */
-               FDCS->version = get_fdc_version();
-               if (FDCS->version == FDC_NONE){
-                       /* free ioports reserved by floppy_grab_irq_and_dma() */
-                       release_region(FDCS->address, 1);
-                       release_region(FDCS->address + 2, 1);
-                       release_region(FDCS->address + 4, 1);
-                       release_region(0xbe, 1);
-                       release_region(0x4be, 1);
-                       FDCS->address = -1;
-                       continue;
-               }
-               if (can_use_virtual_dma == 2 && FDCS->version < FDC_82072A)
-                       can_use_virtual_dma = 0;
-
-               have_no_fdc = 0;
-               /* Not all FDCs seem to be able to handle the version command
-                * properly, so force a reset for the standard FDC clones,
-                * to avoid interrupt garbage.
-                */
-               user_reset_fdc(-1,FD_RESET_ALWAYS,0);
-       }
-       fdc=0;
-       del_timer(&fd_timeout);
-       current_drive = 0;
-       floppy_release_irq_and_dma();
-#if 0  /* no message */
-       initialising=0;
-#endif
-       if (have_no_fdc) {
-               DPRINT("no floppy controllers found\n");
-               flush_scheduled_work();
-               if (usage_count)
-                       floppy_release_irq_and_dma();
-               err = have_no_fdc;
-               goto out2;
-       }
-       
-       for (drive = 0; drive < N_DRIVE; drive++) {
-               init_timer(&motor_off_timer[drive]);
-               motor_off_timer[drive].data = drive;
-               motor_off_timer[drive].function = motor_off_callback;
-               if (!(allowed_drive_mask & (1 << drive)))
-                       continue;
-               if (fdc_state[FDC(drive)].version == FDC_NONE)
-                       continue;
-               /* to be cleaned up... */
-               disks[drive]->private_data = (void*)(long)drive;
-               disks[drive]->queue = floppy_queue;
-               add_disk(disks[drive]);
-       }
-
-       platform_device_register(&floppy_device);
-       return 0;
-
-out1:
-       del_timer_sync(&fd_timeout);
-out2:
-       blk_cleanup_queue(floppy_queue);
-out_queue:
-       blk_unregister_region(MKDEV(FLOPPY_MAJOR, 0), 256);
-       unregister_blkdev(FLOPPY_MAJOR,"fd");
-out:
-       for (i=0; i<N_DRIVE; i++)
-               put_disk(disks[i]);
-       return err;
-
-Enomem:
-       while (i--)
-               put_disk(disks[i]);
-       return -ENOMEM;
-}
-
-static spinlock_t floppy_usage_lock = SPIN_LOCK_UNLOCKED;
-
-static int floppy_grab_irq_and_dma(void)
-{
-       unsigned long flags;
-
-       spin_lock_irqsave(&floppy_usage_lock, flags);
-       if (usage_count++){
-               spin_unlock_irqrestore(&floppy_usage_lock, flags);
-               return 0;
-       }
-       spin_unlock_irqrestore(&floppy_usage_lock, flags);
-       if (fd_request_irq()) {
-               DPRINT("Unable to grab IRQ%d for the floppy driver\n",
-                       FLOPPY_IRQ);
-               spin_lock_irqsave(&floppy_usage_lock, flags);
-               usage_count--;
-               spin_unlock_irqrestore(&floppy_usage_lock, flags);
-               return -1;
-       }
-       if (fd_request_dma()) {
-               DPRINT("Unable to grab DMA%d for the floppy driver\n",
-                       FLOPPY_DMA);
-               fd_free_irq();
-               spin_lock_irqsave(&floppy_usage_lock, flags);
-               usage_count--;
-               spin_unlock_irqrestore(&floppy_usage_lock, flags);
-               return -1;
-       }
-
-       for (fdc=0; fdc< N_FDC; fdc++){
-               if (FDCS->address != -1){
-                       static char floppy[] = "floppy";
-                       if (!request_region(FDCS->address, 1, floppy))
-                               goto cleanup0;
-
-                       if (!request_region(FDCS->address + 2, 1, floppy)) {
-                               release_region(FDCS->address, 1);
-                               goto cleanup0;
-                       }
-
-                       if (!request_region(FDCS->address + 4, 1, floppy)) {
-                               release_region(FDCS->address, 1);
-                               release_region(FDCS->address + 2, 1);
-                               goto cleanup0;
-                       }
-
-                       if (fdc == 0) {  /* internal FDC */
-                               if (request_region(0xbe, 1, "floppy mode change")) {
-                                       if (request_region(0x4be, 1, "floppy ex. mode change"))
-                                               continue;
-                                       else
-                                               DPRINT("Floppy io-port 0x4be in use\n");
-
-                                       release_region(0xbe, 1);
-                               } else
-                                       DPRINT("Floppy io-port 0xbe in use\n");
-
-                               release_region(FDCS->address, 1);
-                               release_region(FDCS->address + 2, 1);
-                               release_region(FDCS->address + 4, 1);
-                       }
-
-                       goto cleanup1;
-               }
-       }
-       for (fdc=0; fdc< N_FDC; fdc++){
-               if (FDCS->address != -1){
-                       reset_fdc_info(1);
-                       fd_outb(FDCS->dor, FD_MODE);
-               }
-       }
-       fdc = 0;
-       fd_outb((FDCS->dor & 8), FD_MODE);
-
-       for (fdc = 0; fdc < N_FDC; fdc++)
-               if (FDCS->address != -1)
-                       fd_outb(FDCS->dor, FD_MODE);
-       /*
-        *      The driver will try and free resources and relies on us
-        *      to know if they were allocated or not.
-        */
-       fdc = 0;
-       irqdma_allocated = 1;
-       return 0;
-
-cleanup0:
-       DPRINT("Floppy io-port 0x%04lx in use\n", FDCS->address);
-cleanup1:
-       fd_free_irq();
-       fd_free_dma();
-       while(--fdc >= 0) {
-               release_region(FDCS->address, 1);
-               release_region(FDCS->address + 2, 1);
-               release_region(FDCS->address + 4, 1);
-               if (fdc == 0) {
-                       release_region(0x00be, 1);
-                       release_region(0x04be, 1);
-               }
-       }
-       spin_lock_irqsave(&floppy_usage_lock, flags);
-       usage_count--;
-       spin_unlock_irqrestore(&floppy_usage_lock, flags);
-       return -1;
-}
-
-static void floppy_release_irq_and_dma(void)
-{
-       int old_fdc;
-#ifdef FLOPPY_SANITY_CHECK
-       int drive;
-#endif
-       long tmpsize;
-       unsigned long tmpaddr;
-       unsigned long flags;
-
-       spin_lock_irqsave(&floppy_usage_lock, flags);
-       if (--usage_count){
-               spin_unlock_irqrestore(&floppy_usage_lock, flags);
-               return;
-       }
-       spin_unlock_irqrestore(&floppy_usage_lock, flags);
-       if(irqdma_allocated)
-       {
-               fd_disable_dma();
-               fd_free_dma();
-               fd_free_irq();
-               irqdma_allocated=0;
-       }
-       fd_outb(0, FD_MODE);
-       floppy_enable_hlt();
-
-       if (floppy_track_buffer && max_buffer_sectors) {
-               tmpsize = max_buffer_sectors*1024;
-               tmpaddr = (unsigned long)floppy_track_buffer;
-               floppy_track_buffer = NULL;
-               max_buffer_sectors = 0;
-               buffer_min = buffer_max = -1;
-               fd_dma_mem_free(tmpaddr, tmpsize);
-       }
-
-#ifdef FLOPPY_SANITY_CHECK
-       for (drive=0; drive < N_FDC * 4; drive++)
-               if (timer_pending(motor_off_timer + drive))
-                       printk("motor off timer %d still active\n", drive);
-
-       if (timer_pending(&fd_timeout))
-               printk("floppy timer still active:%s\n", timeout_message);
-       if (timer_pending(&fd_timer))
-               printk("auxiliary floppy timer still active\n");
-       if (floppy_work.pending)
-               printk("work still pending\n");
-#endif
-       old_fdc = fdc;
-       for (fdc = 0; fdc < N_FDC; fdc++)
-               if (FDCS->address != -1) {
-                       release_region(FDCS->address, 1);
-                       release_region(FDCS->address + 2, 1);
-                       release_region(FDCS->address + 4, 1);
-                       if (fdc == 0) {
-                               release_region(0xbe, 1);
-                               release_region(0x4be, 1);
-                       }
-               }
-       fdc = old_fdc;
-}
-
-
-#ifdef MODULE
-
-char *floppy;
-
-static void unregister_devfs_entries (int drive)
-{
-    int i;
-
-    if (UDP->cmos < NUMBER(default_drive_params)) {
-       i = 0;
-       do {
-           devfs_remove("floppy/%d%s", drive, table[table_sup[UDP->cmos][i]]);
-       } while (table_sup[UDP->cmos][i++]);
-    }
-}
-
-static void __init parse_floppy_cfg_string(char *cfg)
-{
-       char *ptr;
-
-       while(*cfg) {
-               for(ptr = cfg;*cfg && *cfg != ' ' && *cfg != '\t'; cfg++);
-               if (*cfg) {
-                       *cfg = '\0';
-                       cfg++;
-               }
-               if (*ptr)
-                       floppy_setup(ptr);
-       }
-}
-
-int init_module(void)
-{
-       printk(KERN_INFO "inserting floppy driver for " UTS_RELEASE "\n");
-               
-       if (floppy)
-               parse_floppy_cfg_string(floppy);
-       return floppy_init();
-}
-
-void cleanup_module(void)
-{
-       int drive;
-               
-       init_completion(&device_release);
-       platform_device_unregister(&floppy_device);
-       blk_unregister_region(MKDEV(FLOPPY_MAJOR, 0), 256);
-       unregister_blkdev(FLOPPY_MAJOR, "fd");
-
-       for (drive = 0; drive < N_DRIVE; drive++) {
-               del_timer_sync(&motor_off_timer[drive]);
-
-               if ((allowed_drive_mask & (1 << drive)) &&
-                   fdc_state[FDC(drive)].version != FDC_NONE) {
-                       del_gendisk(disks[drive]);
-                       unregister_devfs_entries(drive);
-               }
-               put_disk(disks[drive]);
-       }
-       devfs_remove("floppy");
-
-       del_timer_sync(&fd_timeout);
-       del_timer_sync(&fd_timer);
-       blk_cleanup_queue(floppy_queue);
-
-       if (usage_count)
-               floppy_release_irq_and_dma();
-
-       /* eject disk, if any */
-       fd_eject(0);
-
-       wait_for_completion(&device_release);
-}
-
-MODULE_PARM(floppy,"s");
-MODULE_PARM(FLOPPY_IRQ,"i");
-MODULE_PARM(FLOPPY_DMA,"i");
-MODULE_AUTHOR("Osamu Tomita");
-MODULE_SUPPORTED_DEVICE("fd");
-MODULE_LICENSE("GPL");
-
-#else
-
-__setup ("floppy=", floppy_setup);
-module_init(floppy_init)
-#endif
diff --git a/drivers/char/h8.c b/drivers/char/h8.c
deleted file mode 100644 (file)
index 19843a0..0000000
+++ /dev/null
@@ -1,1180 +0,0 @@
-/*
- * Hitachi H8/337 Microcontroller driver
- *
- * The H8 is used to deal with the power and thermal environment
- * of a system.
- *
- * Fixes:
- *     June 1999, AV   added releasing /proc/driver/h8
- *     Feb  2000, Borislav Deianov
- *                     changed queues to use list.h instead of lists.h
- */
-
-#include <linux/config.h>
-#include <linux/module.h>
-
-#include <asm/system.h>
-#include <asm/io.h>
-
-#include <linux/types.h>
-#include <linux/stddef.h>
-#include <linux/timer.h>
-#include <linux/fcntl.h>
-#include <linux/linkage.h>
-#include <linux/stat.h>
-#include <linux/proc_fs.h>
-#include <linux/miscdevice.h>
-#include <linux/list.h>
-#include <linux/ioport.h>
-#include <linux/poll.h>
-#include <linux/init.h>
-#include <linux/slab.h>
-
-#include "h8.h"
-
-#define DEBUG_H8
-
-#ifdef DEBUG_H8
-#define Dprintk                printk
-#else
-#define Dprintk
-#endif
-
-#define XDprintk if(h8_debug==-1)printk
-
-/*
- * The h8 device is one of the misc char devices.
- */
-#define H8_MINOR_DEV   140
-
-/*
- * Forward declarations.
- */
-static int  h8_init(void);
-static int  h8_display_blank(void);
-static int  h8_display_unblank(void);
-
-static void  h8_intr(int irq, void *dev_id, struct pt_regs *regs);
-
-static int   h8_get_info(char *, char **, off_t, int);
-
-/*
- * Support Routines.
- */
-static void h8_hw_init(void);
-static void h8_start_new_cmd(void);
-static void h8_send_next_cmd_byte(void);
-static void h8_read_event_status(void);
-static void h8_sync(void);
-static void h8_q_cmd(u_char *, int, int);
-static void h8_cmd_done(h8_cmd_q_t *qp);
-static int  h8_alloc_queues(void);
-
-static u_long h8_get_cpu_speed(void);
-static int h8_get_curr_temp(u_char curr_temp[]);
-static void h8_get_max_temp(void);
-static void h8_get_upper_therm_thold(void);
-static void h8_set_upper_therm_thold(int);
-static int h8_get_ext_status(u_char stat_word[]);
-
-static int h8_monitor_thread(void *);
-
-static int h8_manage_therm(void);
-static void h8_set_cpu_speed(int speed_divisor);
-
-static void h8_start_monitor_timer(unsigned long secs);
-static void h8_activate_monitor(unsigned long unused);
-
-/* in arch/alpha/kernel/lca.c */
-extern void lca_clock_print(void);
-extern int  lca_get_clock(void);
-extern void lca_clock_fiddle(int);
-
-static void h8_set_event_mask(int);
-static void h8_clear_event_mask(int);
-
-/*
- * Driver structures
- */
-
-static struct timer_list h8_monitor_timer;
-static int h8_monitor_timer_active = 0;
-
-static char  driver_version[] = "X0.0";/* no spaces */
-
-static union   intr_buf intrbuf;
-static int     intr_buf_ptr;
-static union   intr_buf xx;    
-static u_char  last_temp;
-
-/*
- * I/O Macros for register reads and writes.
- */
-#define H8_READ(a)     inb((a))
-#define H8_WRITE(d,a)  outb((d),(a))
-
-#define        H8_GET_STATUS   H8_READ((h8_base) + H8_STATUS_REG_OFF)
-#define H8_READ_DATA   H8_READ((h8_base) + H8_DATA_REG_OFF)
-#define WRITE_DATA(d)  H8_WRITE((d), h8_base + H8_DATA_REG_OFF)
-#define WRITE_CMD(d)   H8_WRITE((d), h8_base + H8_CMD_REG_OFF)
-
-static unsigned int h8_base = H8_BASE_ADDR;
-static unsigned int h8_irq = H8_IRQ;
-static unsigned int h8_state = H8_IDLE;
-static unsigned int h8_index = -1;
-static unsigned int h8_enabled = 0;
-
-static LIST_HEAD(h8_actq);
-static LIST_HEAD(h8_cmdq);
-static LIST_HEAD(h8_freeq);
-
-/* 
- * Globals used in thermal control of Alphabook1.
- */
-static int cpu_speed_divisor = -1;                     
-static int h8_event_mask = 0;                  
-static DECLARE_WAIT_QUEUE_HEAD(h8_monitor_wait);
-static unsigned int h8_command_mask = 0;
-static int h8_uthermal_threshold = DEFAULT_UTHERMAL_THRESHOLD;
-static int h8_uthermal_window = UTH_HYSTERESIS;                      
-static int h8_debug = 0xfffffdfc;
-static int h8_ldamp = MHZ_115;
-static int h8_udamp = MHZ_57;
-static u_char h8_current_temp = 0;
-static u_char h8_system_temp = 0;
-static int h8_sync_channel = 0;
-static DECLARE_WAIT_QUEUE_HEAD(h8_sync_wait);
-static int h8_init_performed;
-
-/* CPU speeds and clock divisor values */
-static int speed_tab[6] = {230, 153, 115, 57, 28, 14};
-  
-/*
- * H8 interrupt handler
-  */
-static void h8_intr(int irq, void *dev_id, struct pt_regs *regs)
-{
-       u_char  stat_reg, data_reg;
-       h8_cmd_q_t *qp = list_entry(h8_actq.next, h8_cmd_q_t, link);
-
-       stat_reg = H8_GET_STATUS;
-       data_reg = H8_READ_DATA;
-
-       XDprintk("h8_intr: state %d status 0x%x data 0x%x\n", h8_state, stat_reg, data_reg);
-
-       switch (h8_state) {
-         /* Response to an asynchronous event. */
-       case H8_IDLE: { /* H8_IDLE */
-           if (stat_reg & H8_OFULL) {
-               if (data_reg == H8_INTR) {
-                   h8_state = H8_INTR_MODE;
-                   /* Executing a command to determine what happened. */
-                   WRITE_CMD(H8_RD_EVENT_STATUS);
-                   intr_buf_ptr = 1;
-                   WRITE_CMD(H8_RD_EVENT_STATUS);
-               } else {
-                   Dprintk("h8_intr: idle stat 0x%x data 0x%x\n",
-                           stat_reg, data_reg);
-               }
-           } else {
-               Dprintk("h8_intr: bogus interrupt\n");
-           }
-           break;
-       }
-       case H8_INTR_MODE: { /* H8_INTR_MODE */
-           XDprintk("H8 intr/intr_mode\n");
-           if (data_reg == H8_BYTE_LEVEL_ACK) {
-               return;
-           } else if (data_reg == H8_CMD_ACK) {
-               return;
-           } else {
-               intrbuf.byte[intr_buf_ptr] = data_reg;
-               if(!intr_buf_ptr) {
-                   h8_state = H8_IDLE;
-                   h8_read_event_status();
-               }
-               intr_buf_ptr--;
-           }
-           break;
-       }
-       /* Placed in this state by h8_start_new_cmd(). */
-       case H8_XMIT: { /* H8_XMIT */
-           XDprintk("H8 intr/xmit\n");
-           /* If a byte level acknowledgement has been received */
-           if (data_reg == H8_BYTE_LEVEL_ACK) {
-               XDprintk("H8 intr/xmit BYTE ACK\n");
-               qp->nacks++;
-               if (qp->nacks > qp->ncmd)
-                   if(h8_debug & 0x1)
-                       Dprintk("h8intr: bogus # of acks!\n");
-               /* 
-                * If the number of bytes sent is less than the total 
-                * number of bytes in the command.
-                */ 
-               if (qp->cnt < qp->ncmd) {
-                   h8_send_next_cmd_byte();
-               }
-               return;
-               /* If the complete command has produced an acknowledgement. */
-           } else if (data_reg == H8_CMD_ACK) {
-               XDprintk("H8 intr/xmit CMD ACK\n");
-               /* If there are response bytes */
-               if (qp->nrsp)
-                   h8_state = H8_RCV;
-               else
-                   h8_state = H8_IDLE;
-               qp->cnt = 0;
-               return;
-               /* Error, need to start over with a clean slate. */
-           } else if (data_reg == H8_NACK) {
-               XDprintk("h8_intr: NACK received restarting command\n");
-               qp->nacks = 0;
-               qp->cnt = 0;
-               h8_state = H8_IDLE;
-               WRITE_CMD(H8_SYNC);
-               return;
-           } else {
-               Dprintk ("h8intr: xmit unknown data 0x%x \n", data_reg);
-               return;
-           }
-           break;
-       }
-       case H8_RESYNC: { /* H8_RESYNC */
-           XDprintk("H8 intr/resync\n");
-           if (data_reg == H8_BYTE_LEVEL_ACK) {
-               return;
-           } else if (data_reg == H8_SYNC_BYTE) {
-               h8_state = H8_IDLE;
-               if (!list_empty(&h8_actq))
-                   h8_send_next_cmd_byte();
-           } else {
-               Dprintk ("h8_intr: resync unknown data 0x%x \n", data_reg);
-               return;
-           }
-           break;
-       } 
-       case H8_RCV: { /* H8_RCV */
-           XDprintk("H8 intr/rcv\n");
-           if (qp->cnt < qp->nrsp) {
-               qp->rcvbuf[qp->cnt] = data_reg;
-               qp->cnt++;
-               /* If command reception finished. */
-               if (qp->cnt == qp->nrsp) {
-                   h8_state = H8_IDLE;
-                   list_del(&qp->link);
-                   h8_cmd_done (qp);
-                   /* More commands to send over? */
-                   if (!list_empty(&h8_cmdq))
-                       h8_start_new_cmd();
-               }
-               return;
-           } else {
-               Dprintk ("h8intr: rcv overflow cmd 0x%x\n", qp->cmdbuf[0]);
-           }
-           break;
-       }
-       default: /* default */
-           Dprintk("H8 intr/unknown\n");
-           break;
-       }
-       return;
-}
-
-static void __exit h8_cleanup (void)
-{
-       remove_proc_entry("driver/h8", NULL);
-        release_region(h8_base, 8);
-        free_irq(h8_irq, NULL);
-}
-
-static int __init h8_init(void)
-{
-        if(request_irq(h8_irq, h8_intr, SA_INTERRUPT, "h8", NULL))
-        {
-                printk(KERN_ERR "H8: error: IRQ %d is not free\n", h8_irq);
-                return -EIO;
-        }
-        printk(KERN_INFO "H8 at 0x%x IRQ %d\n", h8_base, h8_irq);
-
-        if (!request_region(h8_base, 8, "h8"))
-        {
-               free_irq(h8_irq, NULL);
-               return -EIO;
-        }
-
-        create_proc_info_entry("driver/h8", 0, NULL, h8_get_info);
-
-       h8_alloc_queues();
-
-       h8_hw_init();
-
-       kernel_thread(h8_monitor_thread, NULL, 0);
-
-        return 0;
-}
-
-module_init(h8_init);
-module_exit(h8_cleanup);
-
-static void __init h8_hw_init(void)
-{
-       u_char  buf[H8_MAX_CMD_SIZE];
-
-       /* set CPU speed to max for booting */
-       h8_set_cpu_speed(MHZ_230);
-
-       /*
-        * Initialize the H8
-        */
-       h8_sync();  /* activate interrupts */
-
-       /* To clear conditions left by console */
-       h8_read_event_status(); 
-
-       /* Perform a conditioning read */
-       buf[0] = H8_DEVICE_CONTROL;
-       buf[1] = 0xff;
-       buf[2] = 0x0;
-       h8_q_cmd(buf, 3, 1);
-
-       /* Turn on built-in and external mice, capture power switch */
-       buf[0] = H8_DEVICE_CONTROL;
-       buf[1] = 0x0;
-       buf[2] = H8_ENAB_INT_PTR | H8_ENAB_EXT_PTR |
-              /*H8_DISAB_PWR_OFF_SW |*/ H8_ENAB_LOW_SPD_IND;
-       h8_q_cmd(buf, 3, 1);
-
-        h8_enabled = 1;
-       return;
-}
-
-static int h8_get_info(char *buf, char **start, off_t fpos, int length)
-{
-#ifdef CONFIG_PROC_FS
-        char *p;
-
-        if (!h8_enabled)
-                return 0;
-        p = buf;
-
-
-        /*
-           0) Linux driver version (this will change if format changes)
-           1) 
-           2) 
-           3)
-           4)
-       */
-            
-        p += sprintf(p, "%s \n",
-                     driver_version
-                    );
-
-        return p - buf;
-#else
-       return 0;
-#endif
-}
-
-/* Called from console driver -- must make sure h8_enabled. */
-static int h8_display_blank(void)
-{
-#ifdef CONFIG_H8_DISPLAY_BLANK
-        int     error;
-
-        if (!h8_enabled)
-                return 0;
-        error = h8_set_display_power_state(H8_STATE_STANDBY);
-        if (error == H8_SUCCESS)
-                return 1;
-        h8_error("set display standby", error);
-#endif
-        return 0;
-}
-
-/* Called from console driver -- must make sure h8_enabled. */
-static int h8_display_unblank(void)
-{
-#ifdef CONFIG_H8_DISPLAY_BLANK
-        int error;
-
-        if (!h8_enabled)
-                return 0;
-        error = h8_set_display_power_state(H8_STATE_READY);
-        if (error == H8_SUCCESS)
-                return 1;
-        h8_error("set display ready", error);
-#endif
-        return 0;
-}
-
-static int h8_alloc_queues(void)
-{
-        h8_cmd_q_t *qp;
-       unsigned long flags;
-        int i;
-
-        qp = (h8_cmd_q_t *)kmalloc((sizeof (h8_cmd_q_t) * H8_Q_ALLOC_AMOUNT),
-                                  GFP_KERNEL);
-
-        if (!qp) {
-                printk(KERN_ERR "H8: could not allocate memory for command queue\n");
-                return(0);
-        }
-        /* add to the free queue */
-        save_flags(flags); cli();
-        for (i = 0; i < H8_Q_ALLOC_AMOUNT; i++) {
-                /* place each at front of freeq */
-                list_add(&qp[i].link, &h8_freeq);
-        }
-        restore_flags(flags);
-        return (1);
-}
-
-/* 
- * Basic means by which commands are sent to the H8.
- */
-void
-h8_q_cmd(u_char *cmd, int cmd_size, int resp_size)
-{
-        h8_cmd_q_t      *qp;
-       unsigned long flags;
-        int             i;
-
-        /* get cmd buf */
-       save_flags(flags); cli();
-        while (list_empty(&h8_freeq)) {
-                Dprintk("H8: need to allocate more cmd buffers\n");
-                restore_flags(flags);
-                h8_alloc_queues();
-                save_flags(flags); cli();
-        }
-        /* get first element from queue */
-        qp = list_entry(h8_freeq.next, h8_cmd_q_t, link);
-        list_del(&qp->link);
-
-        restore_flags(flags);
-
-        /* fill it in */
-        for (i = 0; i < cmd_size; i++)
-            qp->cmdbuf[i] = cmd[i];
-        qp->ncmd = cmd_size;
-        qp->nrsp = resp_size;
-
-        /* queue it at the end of the cmd queue */
-        save_flags(flags); cli();
-
-        /* XXX this actually puts it at the start of cmd queue, bug? */
-        list_add(&qp->link, &h8_cmdq);
-
-        restore_flags(flags);
-
-        h8_start_new_cmd();
-}
-
-void
-h8_start_new_cmd(void)
-{
-        unsigned long flags;
-        h8_cmd_q_t *qp;
-
-       save_flags(flags); cli();
-        if (h8_state != H8_IDLE) {
-                if (h8_debug & 0x1)
-                        Dprintk("h8_start_new_cmd: not idle\n");
-                restore_flags(flags);
-                return;
-        }
-
-        if (!list_empty(&h8_actq)) {
-                Dprintk("h8_start_new_cmd: inconsistency: IDLE with non-empty active queue!\n");
-                restore_flags(flags);
-                return;
-        }
-
-        if (list_empty(&h8_cmdq)) {
-                Dprintk("h8_start_new_cmd: no command to dequeue\n");
-                restore_flags(flags);
-                return;
-        }
-        /*
-         * Take first command off of the command queue and put
-         * it on the active queue.
-         */
-        qp = list_entry(h8_cmdq.next, h8_cmd_q_t, link);
-        list_del(&qp->link);
-        /* XXX should this go to the end of the active queue? */
-        list_add(&qp->link, &h8_actq);
-        h8_state = H8_XMIT;
-        if (h8_debug & 0x1)
-                Dprintk("h8_start_new_cmd: Starting a command\n");
-
-        qp->cnt = 1;
-        WRITE_CMD(qp->cmdbuf[0]);               /* Kick it off */
-
-        restore_flags(flags);
-        return;
-}
-
-void
-h8_send_next_cmd_byte(void)
-{
-        h8_cmd_q_t      *qp = list_entry(h8_actq.next, h8_cmd_q_t, link);
-        int cnt;
-
-        cnt = qp->cnt;
-        qp->cnt++;
-
-        if (h8_debug & 0x1)
-                Dprintk("h8 sending next cmd byte 0x%x (0x%x)\n",
-                       cnt, qp->cmdbuf[cnt]);
-
-        if (cnt) {
-                WRITE_DATA(qp->cmdbuf[cnt]);
-        } else {
-                WRITE_CMD(qp->cmdbuf[cnt]);
-        }
-        return;
-}
-
-/*
- * Synchronize H8 communications channel for command transmission.
- */
-void
-h8_sync(void)
-{
-        u_char  buf[H8_MAX_CMD_SIZE];
-
-        buf[0] = H8_SYNC;
-        buf[1] = H8_SYNC_BYTE;
-        h8_q_cmd(buf, 2, 1);
-}
-
-/*
- * Responds to external interrupt. Reads event status word and 
- * decodes type of interrupt. 
- */
-void
-h8_read_event_status(void)
-{
-
-        if(h8_debug & 0x200)
-                printk(KERN_DEBUG "h8_read_event_status: value 0x%x\n", intrbuf.word);
-
-        /*
-         * Power related items
-         */
-        if (intrbuf.word & H8_DC_CHANGE) {
-               if(h8_debug & 0x4)
-                   printk(KERN_DEBUG "h8_read_event_status: DC_CHANGE\n");
-                /* see if dc added or removed, set batt/dc flag, send event */
-
-                h8_set_event_mask(H8_MANAGE_BATTERY);
-                wake_up(&h8_monitor_wait);
-        }
-
-        if (intrbuf.word & H8_POWER_BUTTON) {
-                printk(KERN_CRIT "Power switch pressed - please wait - preparing to power 
-off\n");
-                h8_set_event_mask(H8_POWER_BUTTON);
-                wake_up(&h8_monitor_wait);
-        }
-
-        /*
-         * Thermal related items
-         */
-        if (intrbuf.word & H8_THERMAL_THRESHOLD) {
-               if(h8_debug & 0x4)
-                   printk(KERN_DEBUG "h8_read_event_status: THERMAL_THRESHOLD\n");
-                h8_set_event_mask(H8_MANAGE_UTHERM);
-                wake_up(&h8_monitor_wait);
-        }
-
-        /*
-         * nops -for now
-         */
-        if (intrbuf.word & H8_DOCKING_STATION_STATUS) {
-               if(h8_debug & 0x4)
-                   printk(KERN_DEBUG "h8_read_event_status: DOCKING_STATION_STATUS\n");
-                /* read_ext_status */
-        }
-        if (intrbuf.word & H8_EXT_BATT_STATUS) {
-               if(h8_debug & 0x4)
-                   printk(KERN_DEBUG "h8_read_event_status: EXT_BATT_STATUS\n");
-
-        }
-        if (intrbuf.word & H8_EXT_BATT_CHARGE_STATE) {
-               if(h8_debug & 0x4)
-                   printk(KERN_DEBUG "h8_read_event_status: EXT_BATT_CHARGE_STATE\n");
-
-        }
-        if (intrbuf.word & H8_BATT_CHANGE_OVER) {
-               if(h8_debug & 0x4)
-                   printk(KERN_DEBUG "h8_read_event_status: BATT_CHANGE_OVER\n");
-
-        }
-        if (intrbuf.word & H8_WATCHDOG) {
-               if(h8_debug & 0x4)
-                   printk(KERN_DEBUG "h8_read_event_status: WATCHDOG\n");
-                /* nop */
-        }
-        if (intrbuf.word & H8_SHUTDOWN) {
-               if(h8_debug & 0x4)
-                   printk(KERN_DEBUG "h8_read_event_status: SHUTDOWN\n");
-                /* nop */
-        }
-        if (intrbuf.word & H8_KEYBOARD) {
-               if(h8_debug & 0x4)
-                   printk(KERN_DEBUG "h8_read_event_status: KEYBOARD\n");
-                /* nop */
-        }
-        if (intrbuf.word & H8_EXT_MOUSE_OR_CASE_SWITCH) {
-               if(h8_debug & 0x4)
-                   printk(KERN_DEBUG "h8_read_event_status: EXT_MOUSE_OR_CASE_SWITCH\n");
-                /* read_ext_status*/
-        }
-        if (intrbuf.word & H8_INT_BATT_LOW) {
-               if(h8_debug & 0x4)
-                   printk(KERN_DEBUG "h8_read_event_status: INT_BATT_LOW\n"); post
-                /* event, warn user */
-        }
-        if (intrbuf.word & H8_INT_BATT_CHARGE_STATE) {
-               if(h8_debug & 0x4)
-                   printk(KERN_DEBUG "h8_read_event_status: INT_BATT_CHARGE_STATE\n");
-                /* nop - happens often */
-        }
-        if (intrbuf.word & H8_INT_BATT_STATUS) {
-               if(h8_debug & 0x4)
-                   printk(KERN_DEBUG "h8_read_event_status: INT_BATT_STATUS\n");
-
-        }
-        if (intrbuf.word & H8_INT_BATT_CHARGE_THRESHOLD) {
-               if(h8_debug & 0x4)
-                   printk(KERN_DEBUG "h8_read_event_status: INT_BATT_CHARGE_THRESHOLD\n");
-                /* nop - happens often */
-        }
-        if (intrbuf.word & H8_EXT_BATT_LOW) {
-               if(h8_debug & 0x4)
-                   printk(KERN_DEBUG "h8_read_event_status: EXT_BATT_LOW\n");
-                /*if no internal, post event, warn user */
-                /* else nop */
-        }
-
-        return;
-}
-
-/*
- * Function called when H8 has performed requested command.
- */
-static void
-h8_cmd_done(h8_cmd_q_t *qp)
-{
-
-        /* what to do */
-        switch (qp->cmdbuf[0]) {
-       case H8_SYNC:
-           if (h8_debug & 0x40000) 
-               printk(KERN_DEBUG "H8: Sync command done - byte returned was 0x%x\n", 
-                      qp->rcvbuf[0]);
-           list_add(&qp->link, &h8_freeq);
-           break;
-
-       case H8_RD_SN:
-       case H8_RD_ENET_ADDR:
-           printk(KERN_DEBUG "H8: read Ethernet address: command done - address: %x - %x - %x - %x - %x - %x \n", 
-                  qp->rcvbuf[0], qp->rcvbuf[1], qp->rcvbuf[2],
-                  qp->rcvbuf[3], qp->rcvbuf[4], qp->rcvbuf[5]);
-           list_add(&qp->link, &h8_freeq);
-           break;
-
-       case H8_RD_HW_VER:
-       case H8_RD_MIC_VER:
-       case H8_RD_MAX_TEMP:
-           printk(KERN_DEBUG "H8: Max recorded CPU temp %d, Sys temp %d\n",
-                  qp->rcvbuf[0], qp->rcvbuf[1]);
-           list_add(&qp->link, &h8_freeq);
-           break;
-
-       case H8_RD_MIN_TEMP:
-           printk(KERN_DEBUG "H8: Min recorded CPU temp %d, Sys temp %d\n",
-                  qp->rcvbuf[0], qp->rcvbuf[1]);
-           list_add(&qp->link, &h8_freeq);
-           break;
-
-       case H8_RD_CURR_TEMP:
-           h8_sync_channel |= H8_RD_CURR_TEMP;
-           xx.byte[0] = qp->rcvbuf[0];
-           xx.byte[1] = qp->rcvbuf[1];
-           wake_up(&h8_sync_wait); 
-           list_add(&qp->link, &h8_freeq);
-           break;
-
-       case H8_RD_SYS_VARIENT:
-       case H8_RD_PWR_ON_CYCLES:
-           printk(KERN_DEBUG " H8: RD_PWR_ON_CYCLES command done\n");
-           break;
-
-       case H8_RD_PWR_ON_SECS:
-           printk(KERN_DEBUG "H8: RD_PWR_ON_SECS command done\n");
-           break;
-
-       case H8_RD_RESET_STATUS:
-       case H8_RD_PWR_DN_STATUS:
-       case H8_RD_EVENT_STATUS:
-       case H8_RD_ROM_CKSM:
-       case H8_RD_EXT_STATUS:
-           xx.byte[1] = qp->rcvbuf[0];
-           xx.byte[0] = qp->rcvbuf[1];
-           h8_sync_channel |= H8_GET_EXT_STATUS;
-           wake_up(&h8_sync_wait); 
-           list_add(&qp->link, &h8_freeq);
-           break;
-
-       case H8_RD_USER_CFG:
-       case H8_RD_INT_BATT_VOLT:
-       case H8_RD_DC_INPUT_VOLT:
-       case H8_RD_HORIZ_PTR_VOLT:
-       case H8_RD_VERT_PTR_VOLT:
-       case H8_RD_EEPROM_STATUS:
-       case H8_RD_ERR_STATUS:
-       case H8_RD_NEW_BUSY_SPEED:
-       case H8_RD_CONFIG_INTERFACE:
-       case H8_RD_INT_BATT_STATUS:
-           printk(KERN_DEBUG "H8: Read int batt status cmd done - returned was %x %x %x\n",
-                  qp->rcvbuf[0], qp->rcvbuf[1], qp->rcvbuf[2]);
-           list_add(&qp->link, &h8_freeq);
-           break;
-
-       case H8_RD_EXT_BATT_STATUS:
-       case H8_RD_PWR_UP_STATUS:
-       case H8_RD_EVENT_STATUS_MASK:
-       case H8_CTL_EMU_BITPORT:
-       case H8_DEVICE_CONTROL:
-           if(h8_debug & 0x20000) {
-               printk(KERN_DEBUG "H8: Device control cmd done - byte returned was 0x%x\n",
-                      qp->rcvbuf[0]);
-           }
-           list_add(&qp->link, &h8_freeq);
-           break;
-
-       case H8_CTL_TFT_BRT_DC:
-       case H8_CTL_WATCHDOG:
-       case H8_CTL_MIC_PROT:
-       case H8_CTL_INT_BATT_CHG:
-       case H8_CTL_EXT_BATT_CHG:
-       case H8_CTL_MARK_SPACE:
-       case H8_CTL_MOUSE_SENSITIVITY:
-       case H8_CTL_DIAG_MODE:
-       case H8_CTL_IDLE_AND_BUSY_SPDS:
-           printk(KERN_DEBUG "H8: Idle and busy speed command done\n");
-           break;
-
-       case H8_CTL_TFT_BRT_BATT:
-       case H8_CTL_UPPER_TEMP:
-           if(h8_debug & 0x10) {
-               XDprintk("H8: ctl upper thermal thresh cmd done - returned was %d\n",
-                      qp->rcvbuf[0]);
-           }
-           list_add(&qp->link, &h8_freeq);
-           break;
-
-       case H8_CTL_LOWER_TEMP:
-       case H8_CTL_TEMP_CUTOUT:
-       case H8_CTL_WAKEUP:
-       case H8_CTL_CHG_THRESHOLD:
-       case H8_CTL_TURBO_MODE:
-       case H8_SET_DIAG_STATUS:
-       case H8_SOFTWARE_RESET:
-       case H8_RECAL_PTR:
-       case H8_SET_INT_BATT_PERCENT:
-       case H8_WRT_CFG_INTERFACE_REG:
-       case H8_WRT_EVENT_STATUS_MASK:
-       case H8_ENTER_POST_MODE:
-       case H8_EXIT_POST_MODE:
-       case H8_RD_EEPROM:
-       case H8_WRT_EEPROM:
-       case H8_WRT_TO_STATUS_DISP:
-           printk("H8: Write IO status display command done\n");
-           break;
-
-       case H8_DEFINE_SPC_CHAR:
-       case H8_DEFINE_TABLE_STRING_ENTRY:
-       case H8_PERFORM_EMU_CMD:
-       case H8_EMU_RD_REG:
-       case H8_EMU_WRT_REG:
-       case H8_EMU_RD_RAM:
-       case H8_EMU_WRT_RAM:
-       case H8_BQ_RD_REG:
-       case H8_BQ_WRT_REG:
-       case H8_PWR_OFF:
-           printk (KERN_DEBUG "H8: misc command completed\n");
-           break;
-        }
-        return;
-}
-
-/*
- * Retrieve the current CPU temperature and case temperature.  Provides
- * the feedback for the thermal control algorithm.  Synchcronized via 
- * sleep() for priority so that no other actions in the process will take
- * place before the data becomes available.
- */
-int
-h8_get_curr_temp(u_char curr_temp[])
-{
-        u_char  buf[H8_MAX_CMD_SIZE];
-        unsigned long flags;
-
-        memset(buf, 0, H8_MAX_CMD_SIZE); 
-        buf[0] = H8_RD_CURR_TEMP;
-
-        h8_q_cmd(buf, 1, 2);
-
-       save_flags(flags); cli();
-
-        while((h8_sync_channel & H8_RD_CURR_TEMP) == 0)
-                sleep_on(&h8_sync_wait); 
-
-        restore_flags(flags);
-
-        h8_sync_channel &= ~H8_RD_CURR_TEMP;
-        curr_temp[0] = xx.byte[0];
-        curr_temp[1] = xx.byte[1];
-        xx.word = 0;
-
-        if(h8_debug & 0x8) 
-                printk("H8: curr CPU temp %d, Sys temp %d\n",
-                      curr_temp[0], curr_temp[1]);
-        return 0;
-}
-
-static void
-h8_get_max_temp(void)
-{
-        u_char  buf[H8_MAX_CMD_SIZE];
-
-        buf[0] = H8_RD_MAX_TEMP;
-        h8_q_cmd(buf, 1, 2);
-}
-
-/*
- * Assigns an upper limit to the value of the H8 thermal interrupt.
- * As an example setting a value of 115 F here will cause the 
- * interrupt to trigger when the CPU temperature reaches 115 F.
- */
-static void
-h8_set_upper_therm_thold(int thold)
-{
-        u_char  buf[H8_MAX_CMD_SIZE];
-
-        /* write 0 to reinitialize interrupt */
-        buf[0] = H8_CTL_UPPER_TEMP;
-        buf[1] = 0x0;
-        buf[2] = 0x0;
-        h8_q_cmd(buf, 3, 1); 
-
-        /* Do it for real */
-        buf[0] = H8_CTL_UPPER_TEMP;
-        buf[1] = 0x0;
-        buf[2] = thold;
-        h8_q_cmd(buf, 3, 1); 
-}
-
-static void
-h8_get_upper_therm_thold(void)
-{
-        u_char  buf[H8_MAX_CMD_SIZE];
-
-        buf[0] = H8_CTL_UPPER_TEMP;
-        buf[1] = 0xff;
-        buf[2] = 0;
-        h8_q_cmd(buf, 3, 1); 
-}
-
-/*
- * The external status word contains information on keyboard controller,
- * power button, changes in external batt status, change in DC state,
- * docking station, etc. General purpose querying use.
- */
-int
-h8_get_ext_status(u_char stat_word[])
-{
-        u_char  buf[H8_MAX_CMD_SIZE];
-       unsigned long flags;
-
-        memset(buf, 0, H8_MAX_CMD_SIZE); 
-        buf[0] = H8_RD_EXT_STATUS;
-
-        h8_q_cmd(buf, 1, 2);
-
-       save_flags(flags); cli();
-
-        while((h8_sync_channel & H8_GET_EXT_STATUS) == 0)
-                sleep_on(&h8_sync_wait); 
-
-        restore_flags(flags);
-
-        h8_sync_channel &= ~H8_GET_EXT_STATUS;
-        stat_word[0] = xx.byte[0];
-        stat_word[1] = xx.byte[1];
-        xx.word = 0;
-
-        if(h8_debug & 0x8) 
-                printk("H8: curr ext status %x,  %x\n",
-                      stat_word[0], stat_word[1]);
-
-        return 0;
-}
-
-/*
- * Thread attached to task 0 manages thermal/physcial state of Alphabook. 
- * When a condition is detected by the interrupt service routine, the
- * isr does a wakeup() on h8_monitor_wait.  The mask value is then
- * screened for the appropriate action.
- */
-
-int
-h8_monitor_thread(void * unused)
-{
-        u_char curr_temp[2];
-
-        /*
-         * Need a logic based safety valve here. During boot when this thread is
-         * started and the thermal interrupt is not yet initialized this logic 
-         * checks the temperature and acts accordingly.  When this path is acted
-         * upon system boot is painfully slow, however, the priority associated 
-         * with overheating is high enough to warrant this action.
-         */
-        h8_get_curr_temp(curr_temp);
-
-        printk(KERN_INFO "H8: Initial CPU temp: %d\n", curr_temp[0]);
-
-        if(curr_temp[0] >= h8_uthermal_threshold) {
-                h8_set_event_mask(H8_MANAGE_UTHERM);
-                h8_manage_therm();
-        } else {
-                /*
-                 * Arm the upper thermal limit of the H8 so that any temp in
-                 * excess will trigger the thermal control mechanism.
-                 */
-                h8_set_upper_therm_thold(h8_uthermal_threshold);
-        }
-
-        for(;;) {
-               sleep_on(&h8_monitor_wait);
-
-                if(h8_debug & 0x2)
-                        printk(KERN_DEBUG "h8_monitor_thread awakened, mask:%x\n",
-                                h8_event_mask);
-
-                if (h8_event_mask & (H8_MANAGE_UTHERM|H8_MANAGE_LTHERM)) {
-                        h8_manage_therm();
-                }
-
-#if 0
-                if (h8_event_mask & H8_POWER_BUTTON) {
-                        h8_system_down();
-                }
-
-               /*
-                * If an external DC supply is removed or added make 
-                * appropriate CPU speed adjustments.
-                */
-                if (h8_event_mask & H8_MANAGE_BATTERY) {
-                          h8_run_level_3_manage(H8_RUN); 
-                          h8_clear_event_mask(H8_MANAGE_BATTERY);
-                }
-#endif
-        }
-}
-
-/* 
- * Function implements the following policy. When the machine is booted
- * the system is set to run at full clock speed. When the upper thermal
- * threshold is reached as a result of full clock a damping factor is 
- * applied to cool off the cpu.  The default value is one quarter clock
- * (57 Mhz).  When as a result of this cooling a temperature lower by
- * hmc_uthermal_window is reached, the machine is reset to a higher 
- * speed, one half clock (115 Mhz).  One half clock is maintained until
- * the upper thermal threshold is again reached restarting the cycle.
- */
-
-int
-h8_manage_therm(void)
-{
-        u_char curr_temp[2];
-
-        if(h8_event_mask & H8_MANAGE_UTHERM) {
-               /* Upper thermal interrupt received, need to cool down. */
-               if(h8_debug & 0x10)
-                        printk(KERN_WARNING "H8: Thermal threshold %d F reached\n",
-                              h8_uthermal_threshold);
-               h8_set_cpu_speed(h8_udamp); 
-                h8_clear_event_mask(H8_MANAGE_UTHERM);
-                h8_set_event_mask(H8_MANAGE_LTHERM);
-                /* Check again in 30 seconds for CPU temperature */
-                h8_start_monitor_timer(H8_TIMEOUT_INTERVAL); 
-        } else if (h8_event_mask & H8_MANAGE_LTHERM) {
-               /* See how cool the system has become as a result
-                  of the reduction in speed. */
-                h8_get_curr_temp(curr_temp);
-                last_temp = curr_temp[0];
-                if (curr_temp[0] < (h8_uthermal_threshold - h8_uthermal_window))
-               {
-                       /* System cooling has progressed to a point
-                          that the CPU may be sped up. */
-                        h8_set_upper_therm_thold(h8_uthermal_threshold);
-                        h8_set_cpu_speed(h8_ldamp); /* adjustable */ 
-                        if(h8_debug & 0x10)
-                            printk(KERN_WARNING "H8: CPU cool, applying cpu_divisor: %d \n",
-                                  h8_ldamp);
-                        h8_clear_event_mask(H8_MANAGE_LTHERM);
-                }
-               else /* Not cool enough yet, check again in 30 seconds. */
-                        h8_start_monitor_timer(H8_TIMEOUT_INTERVAL);
-        } else {
-                
-        }
-       return 0;
-}
-
-/* 
- * Function conditions the value of global_rpb_counter before
- * calling the primitive which causes the actual speed change.
- */
-void
-h8_set_cpu_speed(int speed_divisor)
-{
-
-#ifdef NOT_YET
-/*
- * global_rpb_counter is consumed by alpha_delay() in determining just
- * how much time to delay.  It is necessary that the number of microseconds
- * in DELAY(n) be kept consistent over a variety of CPU clock speeds.
- * To that end global_rpb_counter is here adjusted.
- */ 
-        
-        switch (speed_divisor) {
-                case 0:
-                        global_rpb_counter = rpb->rpb_counter * 2L;
-                        break;
-                case 1:
-                        global_rpb_counter = rpb->rpb_counter * 4L / 3L ;
-                        break;
-                case 3:
-                        global_rpb_counter = rpb->rpb_counter / 2L;
-                        break;
-                case 4:
-                        global_rpb_counter = rpb->rpb_counter / 4L;
-                        break;
-                case 5:
-                        global_rpb_counter = rpb->rpb_counter / 8L;
-                        break;
-                /* 
-                 * This case most commonly needed for cpu_speed_divisor 
-                 * of 2 which is the value assigned by the firmware. 
-                 */
-                default:
-                        global_rpb_counter = rpb->rpb_counter;
-                break;
-        }
-#endif /* NOT_YET */
-
-        if(h8_debug & 0x8)
-                printk(KERN_DEBUG "H8: Setting CPU speed to %d MHz\n",
-                      speed_tab[speed_divisor]); 
-
-         /* Make the actual speed change */
-        lca_clock_fiddle(speed_divisor);
-}
-
-/*
- * Gets value stored in rpb representing CPU clock speed and adjusts this
- * value based on the current clock speed divisor.
- */
-u_long
-h8_get_cpu_speed(void)
-{
-        u_long speed = 0;
-        u_long counter;
-
-#ifdef NOT_YET
-        counter = rpb->rpb_counter / 1000000L;
-
-        switch (alphabook_get_clock()) {
-                case 0:
-                        speed = counter * 2L;
-                        break;
-                case 1:
-                        speed = counter * 4L / 3L ;
-                        break;
-                case 2:
-                        speed = counter;
-                        break;
-                case 3:
-                        speed = counter / 2L;
-                        break;
-                case 4:
-                        speed = counter / 4L;
-                        break;
-                case 5:
-                        speed = counter / 8L;
-                        break;
-                default:
-                break;
-        }
-        if(h8_debug & 0x8)
-                printk(KERN_DEBUG "H8: CPU speed current setting: %d MHz\n", speed); 
-#endif  /* NOT_YET */
-       return speed;
-}
-
-static void
-h8_activate_monitor(unsigned long unused)
-{
-       unsigned long flags;
-
-       save_flags(flags); cli();
-       h8_monitor_timer_active = 0;
-       restore_flags(flags);
-
-       wake_up(&h8_monitor_wait);
-}
-
-static void
-h8_start_monitor_timer(unsigned long secs)
-{
-       unsigned long flags;
-
-       if (h8_monitor_timer_active)
-           return;
-
-       save_flags(flags); cli();
-       h8_monitor_timer_active = 1;
-       restore_flags(flags);
-
-        init_timer(&h8_monitor_timer);
-        h8_monitor_timer.function = h8_activate_monitor;
-        h8_monitor_timer.expires = secs * HZ + jiffies;
-        add_timer(&h8_monitor_timer);
-}
-
-static void h8_set_event_mask(int mask)
-{
-       unsigned long flags;
-
-       save_flags(flags); cli();
-       h8_event_mask |= mask;
-       restore_flags(flags);
-}
-
-static void h8_clear_event_mask(int mask)
-{
-       unsigned long flags;
-
-       save_flags(flags); cli();
-       h8_event_mask &= (~mask);
-       restore_flags(flags);
-}
-
-MODULE_LICENSE("GPL");
diff --git a/drivers/char/h8.h b/drivers/char/h8.h
deleted file mode 100644 (file)
index 986eef5..0000000
+++ /dev/null
@@ -1,246 +0,0 @@
-/*
- */
-
-#ifndef __H8_H__
-#define __H8_H__
-
-/*
- * Register address and offsets
- */
-#define H8_BASE_ADDR                   0x170            /* default */
-#define H8_IRQ                        9                /* default */
-#define H8_STATUS_REG_OFF              0x4              
-#define H8_CMD_REG_OFF                 0x4
-#define H8_DATA_REG_OFF                0x0
-
-
-/* H8 register bit definitions */
-/* status register */
-#define H8_OFULL                       0x1              /* output data register full */
-#define H8_IFULL                       0x2              /* input data register full */
-#define H8_CMD                         0x8              /* command / not data */
-
-#define H8_INTR                        0xfa
-#define H8_NACK                        0xfc
-#define H8_BYTE_LEVEL_ACK              0xfd
-#define H8_CMD_ACK                     0xfe
-#define H8_SYNC_BYTE                   0x99
-
-/*
- * H8 command definitions
- */
-/* System info commands */
-#define H8_SYNC                         0x0
-#define H8_RD_SN                        0x1
-#define H8_RD_ENET_ADDR                 0x2
-#define H8_RD_HW_VER                    0x3
-#define H8_RD_MIC_VER                   0x4
-#define H8_RD_MAX_TEMP                  0x5
-#define H8_RD_MIN_TEMP                  0x6
-#define H8_RD_CURR_TEMP                 0x7
-#define H8_RD_SYS_VARIENT               0x8
-#define H8_RD_PWR_ON_CYCLES             0x9
-#define H8_RD_PWR_ON_SECS               0xa
-#define H8_RD_RESET_STATUS              0xb
-#define H8_RD_PWR_DN_STATUS             0xc
-#define H8_RD_EVENT_STATUS              0xd
-#define H8_RD_ROM_CKSM                  0xe
-#define H8_RD_EXT_STATUS                0xf
-#define H8_RD_USER_CFG                  0x10
-#define H8_RD_INT_BATT_VOLT             0x11
-#define H8_RD_DC_INPUT_VOLT             0x12
-#define H8_RD_HORIZ_PTR_VOLT            0x13
-#define H8_RD_VERT_PTR_VOLT             0x14
-#define H8_RD_EEPROM_STATUS             0x15
-#define H8_RD_ERR_STATUS                0x16
-#define H8_RD_NEW_BUSY_SPEED            0x17
-#define H8_RD_CONFIG_INTERFACE          0x18
-#define H8_RD_INT_BATT_STATUS           0x19
-#define H8_RD_EXT_BATT_STATUS           0x1a
-#define H8_RD_PWR_UP_STATUS             0x1b
-#define H8_RD_EVENT_STATUS_MASK         0x56
-
-/* Read/write/modify commands */
-#define H8_CTL_EMU_BITPORT              0x32
-#define H8_DEVICE_CONTROL               0x21
-#define H8_CTL_TFT_BRT_DC               0x22
-#define H8_CTL_WATCHDOG                 0x23
-#define H8_CTL_MIC_PROT                 0x24
-#define H8_CTL_INT_BATT_CHG             0x25
-#define H8_CTL_EXT_BATT_CHG             0x26
-#define H8_CTL_MARK_SPACE               0x27
-#define H8_CTL_MOUSE_SENSITIVITY        0x28
-#define H8_CTL_DIAG_MODE                0x29
-#define H8_CTL_IDLE_AND_BUSY_SPDS       0x2a
-#define H8_CTL_TFT_BRT_BATT             0x2b
-#define H8_CTL_UPPER_TEMP               0x2c
-#define H8_CTL_LOWER_TEMP               0x2d
-#define H8_CTL_TEMP_CUTOUT              0x2e
-#define H8_CTL_WAKEUP                   0x2f
-#define H8_CTL_CHG_THRESHOLD            0x30
-#define H8_CTL_TURBO_MODE               0x31
-#define H8_SET_DIAG_STATUS              0x40
-#define H8_SOFTWARE_RESET               0x41
-#define H8_RECAL_PTR                    0x42
-#define H8_SET_INT_BATT_PERCENT         0x43
-#define H8_WRT_CFG_INTERFACE_REG        0x45
-#define H8_WRT_EVENT_STATUS_MASK        0x57
-#define H8_ENTER_POST_MODE              0x46
-#define H8_EXIT_POST_MODE               0x47
-
-/* Block transfer commands */
-#define H8_RD_EEPROM                    0x50
-#define H8_WRT_EEPROM                   0x51
-#define H8_WRT_TO_STATUS_DISP           0x52
-#define H8_DEFINE_SPC_CHAR              0x53
-/* Generic commands */
-#define H8_DEFINE_TABLE_STRING_ENTRY    0x60
-
-/* Battery control commands */
-#define H8_PERFORM_EMU_CMD              0x70
-#define H8_EMU_RD_REG                   0x71
-#define H8_EMU_WRT_REG                  0x72
-#define H8_EMU_RD_RAM                   0x73
-#define H8_EMU_WRT_RAM                  0x74
-#define H8_BQ_RD_REG                    0x75
-#define H8_BQ_WRT_REG                   0x76
-
-/* System admin commands */
-#define H8_PWR_OFF                      0x80
-
-/*
- * H8 command related definitions
- */
-
-/* device control argument bits */
-#define H8_ENAB_EXTSMI                  0x1
-#define H8_DISAB_IRQ                    0x2
-#define H8_ENAB_FLASH_WRT               0x4
-#define H8_ENAB_THERM                   0x8
-#define H8_ENAB_INT_PTR                 0x10
-#define H8_ENAB_LOW_SPD_IND             0x20
-#define H8_ENAB_EXT_PTR                 0x40
-#define H8_DISAB_PWR_OFF_SW             0x80
-#define H8_POWER_OFF                   0x80
-
-/* H8 read event status bits */
-#define H8_DC_CHANGE                    0x1
-#define H8_INT_BATT_LOW                 0x2
-#define H8_INT_BATT_CHARGE_THRESHOLD    0x4
-#define H8_INT_BATT_CHARGE_STATE        0x8
-#define H8_INT_BATT_STATUS              0x10
-#define H8_EXT_BATT_CHARGE_STATE        0x20
-#define H8_EXT_BATT_LOW                 0x40
-#define H8_EXT_BATT_STATUS              0x80
-#define H8_THERMAL_THRESHOLD            0x100
-#define H8_WATCHDOG                     0x200
-#define H8_DOCKING_STATION_STATUS       0x400
-#define H8_EXT_MOUSE_OR_CASE_SWITCH     0x800
-#define H8_KEYBOARD                     0x1000
-#define H8_BATT_CHANGE_OVER             0x2000
-#define H8_POWER_BUTTON                 0x4000
-#define H8_SHUTDOWN                     0x8000
-
-/* H8 control idle and busy speeds */
-#define H8_SPEED_LOW                    0x1
-#define H8_SPEED_MED                    0x2
-#define H8_SPEED_HI                     0x3
-#define H8_SPEED_LOCKED                 0x80
-
-#define H8_MAX_CMD_SIZE                 18      
-#define H8_Q_ALLOC_AMOUNT               10      
-
-/* H8 state field values */
-#define H8_IDLE                         1
-#define H8_XMIT                         2
-#define H8_RCV                          3
-#define H8_RESYNC                       4
-#define H8_INTR_MODE                    5
-
-/* Mask values for control functions */
-#define UTH_HYSTERESIS                  5
-#define DEFAULT_UTHERMAL_THRESHOLD      115
-#define H8_TIMEOUT_INTERVAL            30
-#define H8_RUN                          4
-
-#define H8_GET_MAX_TEMP                 0x1
-#define H8_GET_CURR_TEMP                0x2
-#define H8_GET_UPPR_THRMAL_THOLD        0x4
-#define H8_GET_ETHERNET_ADDR            0x8
-#define H8_SYNC_OP                      0x10 
-#define H8_SET_UPPR_THRMAL_THOLD        0x20
-#define H8_GET_INT_BATT_STAT            0x40
-#define H8_GET_CPU_SPD                  0x80
-#define H8_MANAGE_UTHERM                0x100 
-#define H8_MANAGE_LTHERM                0x200 
-#define H8_HALT                         0x400 
-#define H8_CRASH                        0x800 
-#define H8_GET_EXT_STATUS               0x10000
-#define H8_MANAGE_QUIET                 0x20000
-#define H8_MANAGE_SPEEDUP               0x40000
-#define H8_MANAGE_BATTERY               0x80000
-#define H8_SYSTEM_DELAY_TEST            0x100000
-#define H8_POWER_SWITCH_TEST            0x200000
-
-/* CPU speeds and clock divisor values */
-#define MHZ_14                           5
-#define MHZ_28                           4
-#define MHZ_57                           3
-#define MHZ_115                          2
-#define MHZ_230                          0 
-
-/*
- * H8 data
- */
-struct h8_data {
-        u_int           ser_num;
-        u_char          ether_add[6];
-        u_short         hw_ver;
-        u_short         mic_ver;
-        u_short         max_tmp;
-        u_short         min_tmp;
-        u_short         cur_tmp;
-        u_int           sys_var;
-        u_int           pow_on;
-        u_int           pow_on_secs;
-        u_char          reset_status;
-        u_char          pwr_dn_status;
-        u_short         event_status;
-        u_short         rom_cksm;
-        u_short         ext_status;
-        u_short         u_cfg;
-        u_char          ibatt_volt;
-        u_char          dc_volt;
-        u_char          ptr_horiz;
-        u_char          ptr_vert;
-        u_char          eeprom_status;
-        u_char          error_status;
-        u_char          new_busy_speed;
-        u_char          cfg_interface;
-        u_short         int_batt_status;
-        u_short         ext_batt_status;
-        u_char          pow_up_status;
-        u_char          event_status_mask;
-};
-
-
-/*
- * H8 command buffers
- */
-typedef struct h8_cmd_q {
-        struct list_head link;          /* double linked list */
-        int             ncmd;           /* number of bytes in command */
-        int             nrsp;           /* number of bytes in response */
-        int             cnt;            /* number of bytes sent/received */
-        int             nacks;          /* number of byte level acks */
-        u_char          cmdbuf[H8_MAX_CMD_SIZE]; /* buffer to store command */
-        u_char          rcvbuf[H8_MAX_CMD_SIZE]; /* buffer to store response */
-} h8_cmd_q_t;
-
-union   intr_buf {
-        u_char  byte[2];
-        u_int   word;
-};
-
-#endif /* __H8_H_ */
diff --git a/drivers/char/hvcs.c b/drivers/char/hvcs.c
deleted file mode 100644 (file)
index 96ca634..0000000
+++ /dev/null
@@ -1,1579 +0,0 @@
-/*
- * IBM eServer Hypervisor Virtual Console Server Device Driver
- * Copyright (C) 2003, 2004 IBM Corp.
- *  Ryan S. Arnold (rsa@us.ibm.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
- *  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
- *
- * Author(s) :  Ryan S. Arnold <rsa@us.ibm.com>
- *
- * This is the device driver for the IBM Hypervisor Virtual Console Server,
- * "hvcs".  The IBM hvcs provides a tty driver interface to allow Linux
- * user space applications access to the system consoles of logically
- * partitioned operating systems, e.g. Linux, running on the same partitioned
- * Power5 ppc64 system.  Physical hardware consoles per partition are not
- * practical on this hardware so system consoles are accessed by this driver
- * using inter-partition firmware interfaces to virtual terminal devices.
- *
- * A vty is known to the HMC as a "virtual serial server adapter".  It is a
- * virtual terminal device that is created by firmware upon partition creation
- * to act as a partitioned OS's console device.
- *
- * Firmware dynamically (via hotplug) exposes vty-servers to a running ppc64
- * Linux system upon their creation by the HMC or their exposure during boot.
- * The non-user interactive backend of this driver is implemented as a vio
- * device driver so that it can receive notification of vty-server lifetimes
- * after it registers with the vio bus to handle vty-server probe and remove
- * callbacks.
- *
- * Many vty-servers can be configured to connect to one vty, but a vty can
- * only be actively connected to by a single vty-server, in any manner, at one
- * time.  If the HMC is currently hosting the console for a target Linux
- * partition; attempts to open the tty device to the partition's console using
- * the hvcs on any partition will return -EBUSY with every open attempt until
- * the HMC frees the connection between its vty-server and the desired
- * partition's vty device.  Conversely, a vty-server may only be connected to
- * a single vty at one time even though it may have several configured vty
- * partner possibilities.
- *
- * Firmware does not provide notification of vty partner changes to this
- * driver.  This means that an HMC Super Admin may add or remove partner vtys
- * from a vty-server's partner list but the changes will not be signaled to
- * the vty-server.  Firmware only notifies the driver when a vty-server is
- * added or removed from the system.  To compensate for this deficiency, this
- * driver implements a sysfs update attribute which provides a method for
- * rescanning partner information upon a user's request.
- *
- * Each vty-server, prior to being exposed to this driver is reference counted
- * using the 2.6 Linux kernel kobject construct.  This kobject is also used by
- * the vio bus to provide a vio device sysfs entry that this driver attaches
- * device specific attributes to, including partner information.  The vio bus
- * framework also provides a sysfs entry for each vio driver.  The hvcs driver
- * provides driver attributes in this entry.
- *
- * For direction on installation and usage of this driver please reference
- * Documentation/powerpc/hvcs.txt.
- */
-
-#include <linux/device.h>
-#include <linux/init.h>
-#include <linux/interrupt.h>
-#include <linux/kernel.h>
-#include <linux/kobject.h>
-#include <linux/kthread.h>
-#include <linux/list.h>
-#include <linux/major.h>
-#include <linux/module.h>
-#include <linux/moduleparam.h>
-#include <linux/sched.h>
-#include <linux/spinlock.h>
-#include <linux/stat.h>
-#include <linux/tty.h>
-#include <linux/tty_flip.h>
-#include <asm/hvconsole.h>
-#include <asm/hvcserver.h>
-#include <asm/uaccess.h>
-#include <asm/vio.h>
-
-/*
- * 1.0.0 -> 1.1.0 Added kernel_thread scheduling methodology to driver to
- * replace wait_task constructs.
- *
- * 1.1.0 -> 1.2.0 Moved pi_buff initialization out of arch code into driver code
- * and added locking to share this buffer between hvcs_struct instances.  This
- * is because the page_size kmalloc can't be done with a spin_lock held.
- *
- * Also added sysfs attribute to manually disconnect the vty-server from the vty
- * due to stupid firmware behavior when opening the connection then sending data
- * then then quickly closing the connection would cause data loss on the
- * receiving side.  This required some reordering of the termination code.
- *
- * Fixed the hangup scenario and fixed memory leaks on module_exit.
- *
- * 1.2.0 -> 1.3.0 Moved from manual kernel thread creation & execution to
- * kthread construct which replaced in-kernel IPC for thread termination with
- * kthread_stop and kthread_should_stop.  Explicit wait_queue handling was
- * removed because kthread handles this.  Minor bug fix to postpone partner_info
- * clearing on hvcs_close until adapter removal to preserve context data for
- * printk on partner connection free.  Added lock to protect hvcs_structs so
- * that hvcs_struct instances aren't added or removed during list traversal.
- * Cleaned up comment style, added spaces after commas, and broke function
- * declaration lines to be under 80 columns.
- */
-#define HVCS_DRIVER_VERSION "1.3.0"
-
-MODULE_AUTHOR("Ryan S. Arnold <rsa@us.ibm.com>");
-MODULE_DESCRIPTION("IBM hvcs (Hypervisor Virtual Console Server) Driver");
-MODULE_LICENSE("GPL");
-MODULE_VERSION(HVCS_DRIVER_VERSION);
-
-/*
- * Since the Linux TTY code does not currently (2-04-2004) support dynamic
- * addition of tty derived devices and we shouldn't allocate thousands of
- * tty_device pointers when the number of vty-server & vty partner connections
- * will most often be much lower than this, we'll arbitrarily allocate
- * HVCS_DEFAULT_SERVER_ADAPTERS tty_structs and cdev's by default when we
- * register the tty_driver. This can be overridden using an insmod parameter.
- */
-#define HVCS_DEFAULT_SERVER_ADAPTERS   64
-
-/*
- * The user can't insmod with more than HVCS_MAX_SERVER_ADAPTERS hvcs device
- * nodes as a sanity check.  Theoretically there can be over 1 Billion
- * vty-server & vty partner connections.
- */
-#define HVCS_MAX_SERVER_ADAPTERS       1024
-
-/*
- * We let Linux assign us a major number and we start the minors at zero.  There
- * is no intuitive mapping between minor number and the target partition.  The
- * mapping of minor number is related to the order the vty-servers are exposed
- * to this driver via the hvcs_probe function.
- */
-#define HVCS_MINOR_START       0
-
-/*
- * The hcall interface involves putting 8 chars into each of two registers.
- * We load up those 2 registers (in arch/ppc64/hvconsole.c) by casting char[16]
- * to long[2].  It would work without __ALIGNED__, but a little (tiny) bit
- * slower because an unaligned load is slower than aligned load.
- */
-#define __ALIGNED__    __attribute__((__aligned__(8)))
-
-/* Converged location code string length + 1 null terminator */
-#define CLC_LENGTH             80
-
-/*
- * How much data can firmware send with each hvc_put_chars()?  Maybe this
- * should be moved into an architecture specific area.
- */
-#define HVCS_BUFF_LEN  16
-
-/*
- * This is the maximum amount of data we'll let the user send us (hvcs_write) at
- * once in a chunk as a sanity check.
- */
-#define HVCS_MAX_FROM_USER     4096
-
-/*
- * Be careful when adding flags to this line discipline.  Don't add anything
- * that will cause echoing or we'll go into recursive loop echoing chars back
- * and forth with the console drivers.
- */
-static struct termios hvcs_tty_termios = {
-       .c_iflag = IGNBRK | IGNPAR,
-       .c_oflag = OPOST,
-       .c_cflag = B38400 | CS8 | CREAD | HUPCL,
-       .c_cc = INIT_C_CC
-};
-
-/*
- * This value is used to take the place of a command line parameter when the
- * module is inserted.  It starts as -1 and stays as such if the user doesn't
- * specify a module insmod parameter.  If they DO specify one then it is set to
- * the value of the integer passed in.
- */
-static int hvcs_parm_num_devs = -1;
-module_param(hvcs_parm_num_devs, int, 0);
-
-char hvcs_driver_name[] = "hvcs";
-char hvcs_device_node[] = "hvcs";
-char hvcs_driver_string[]
-       = "IBM hvcs (Hypervisor Virtual Console Server) Driver";
-
-/* Status of partner info rescan triggered via sysfs. */
-static int hvcs_rescan_status = 0;
-
-static struct tty_driver *hvcs_tty_driver;
-
-/*
- * This is used to associate a vty-server, as it is exposed to this driver, with
- * a preallocated tty_struct.index.  The dev node and hvcs index numbers are not
- * re-used after device removal otherwise removing and adding a new one would
- * link a /dev/hvcs* entry to a different vty-server than it did before the
- * removal.  Incidentally, a newly exposed vty-server will always map to an
- * incrementally higher /dev/hvcs* entry than the last exposed vty-server.
- */
-static int hvcs_struct_count = -1;
-
-/*
- * Used by the khvcsd to pick up I/O operations when the kernel_thread is
- * already awake but potentially shifted to TASK_INTERRUPTIBLE state.
- */
-static int hvcs_kicked = 0;
-
-/* Used the the kthread construct for task operations */
-static struct task_struct *hvcs_task;
-
-/*
- * We allocate this for the use of all of the hvcs_structs when they fetch
- * partner info.
- */
-static unsigned long *hvcs_pi_buff;
-
-static spinlock_t hvcs_pi_lock;
-
-/* One vty-server per hvcs_struct */
-struct hvcs_struct {
-       spinlock_t lock;
-
-       /*
-        * This index identifies this hvcs device as the complement to a
-        * specific tty index.
-        */
-       unsigned int index;
-
-       struct tty_struct *tty;
-       unsigned int open_count;
-
-       /*
-        * Used to tell the driver kernel_thread what operations need to take
-        * place upon this hvcs_struct instance.
-        */
-       int todo_mask;
-
-       /*
-        * This buffer is required so that when hvcs_write_room() reports that
-        * it can send HVCS_BUFF_LEN characters that it will buffer the full
-        * HVCS_BUFF_LEN characters if need be.  This is essential for opost
-        * writes since they do not do high level buffering and expect to be
-        * able to send what the driver commits to sending buffering
-        * [e.g. tab to space conversions in n_tty.c opost()].
-        */
-       char buffer[HVCS_BUFF_LEN];
-       int chars_in_buffer;
-
-       /*
-        * Any variable below the kobject is valid before a tty is connected and
-        * stays valid after the tty is disconnected.  These shouldn't be
-        * whacked until the koject refcount reaches zero though some entries
-        * may be changed via sysfs initiatives.
-        */
-       struct kobject kobj; /* ref count & hvcs_struct lifetime */
-       int connected; /* is the vty-server currently connected to a vty? */
-       unsigned int p_unit_address; /* partner unit address */
-       unsigned int p_partition_ID; /* partner partition ID */
-       char p_location_code[CLC_LENGTH];
-       struct list_head next; /* list management */
-       struct vio_dev *vdev;
-};
-
-/* Required to back map a kobject to its containing object */
-#define from_kobj(kobj) container_of(kobj, struct hvcs_struct, kobj)
-
-static struct list_head hvcs_structs = LIST_HEAD_INIT(hvcs_structs);
-static spinlock_t hvcs_structs_lock;
-
-static void hvcs_unthrottle(struct tty_struct *tty);
-static void hvcs_throttle(struct tty_struct *tty);
-static irqreturn_t hvcs_handle_interrupt(int irq, void *dev_instance,
-               struct pt_regs *regs);
-
-static int hvcs_write(struct tty_struct *tty, int from_user,
-               const unsigned char *buf, int count);
-static int hvcs_write_room(struct tty_struct *tty);
-static int hvcs_chars_in_buffer(struct tty_struct *tty);
-
-static int hvcs_has_pi(struct hvcs_struct *hvcsd);
-static void hvcs_set_pi(struct hvcs_partner_info *pi,
-               struct hvcs_struct *hvcsd);
-static int hvcs_get_pi(struct hvcs_struct *hvcsd);
-static int hvcs_rescan_devices_list(void);
-
-static int hvcs_partner_connect(struct hvcs_struct *hvcsd);
-static void hvcs_partner_free(struct hvcs_struct *hvcsd);
-
-static int hvcs_enable_device(struct hvcs_struct *hvcsd,
-               uint32_t unit_address, unsigned int irq, struct vio_dev *dev);
-static void hvcs_final_close(struct hvcs_struct *hvcsd);
-
-static void destroy_hvcs_struct(struct kobject *kobj);
-static int hvcs_open(struct tty_struct *tty, struct file *filp);
-static void hvcs_close(struct tty_struct *tty, struct file *filp);
-static void hvcs_hangup(struct tty_struct * tty);
-
-static void hvcs_create_device_attrs(struct hvcs_struct *hvcsd);
-static void hvcs_remove_device_attrs(struct vio_dev *vdev);
-static void hvcs_create_driver_attrs(void);
-static void hvcs_remove_driver_attrs(void);
-
-static int __devinit hvcs_probe(struct vio_dev *dev,
-               const struct vio_device_id *id);
-static int __devexit hvcs_remove(struct vio_dev *dev);
-static int __init hvcs_module_init(void);
-static void __exit hvcs_module_exit(void);
-
-#define HVCS_SCHED_READ        0x00000001
-#define HVCS_QUICK_READ        0x00000002
-#define HVCS_TRY_WRITE 0x00000004
-#define HVCS_READ_MASK (HVCS_SCHED_READ | HVCS_QUICK_READ)
-
-static void hvcs_kick(void)
-{
-       hvcs_kicked = 1;
-       wmb();
-       wake_up_process(hvcs_task);
-}
-
-static void hvcs_unthrottle(struct tty_struct *tty)
-{
-       struct hvcs_struct *hvcsd = tty->driver_data;
-       unsigned long flags;
-
-       spin_lock_irqsave(&hvcsd->lock, flags);
-       hvcsd->todo_mask |= HVCS_SCHED_READ;
-       spin_unlock_irqrestore(&hvcsd->lock, flags);
-       hvcs_kick();
-}
-
-static void hvcs_throttle(struct tty_struct *tty)
-{
-       struct hvcs_struct *hvcsd = tty->driver_data;
-       unsigned long flags;
-
-       spin_lock_irqsave(&hvcsd->lock, flags);
-       vio_disable_interrupts(hvcsd->vdev);
-       spin_unlock_irqrestore(&hvcsd->lock, flags);
-}
-
-/*
- * If the device is being removed we don't have to worry about this interrupt
- * handler taking any further interrupts because they are disabled which means
- * the hvcs_struct will always be valid in this handler.
- */
-static irqreturn_t hvcs_handle_interrupt(int irq, void *dev_instance,
-               struct pt_regs *regs)
-{
-       struct hvcs_struct *hvcsd = dev_instance;
-       unsigned long flags;
-
-       spin_lock_irqsave(&hvcsd->lock, flags);
-       vio_disable_interrupts(hvcsd->vdev);
-       hvcsd->todo_mask |= HVCS_SCHED_READ;
-       spin_unlock_irqrestore(&hvcsd->lock, flags);
-       hvcs_kick();
-
-       return IRQ_HANDLED;
-}
-
-/* This function must be called with the hvcsd->lock held */
-static void hvcs_try_write(struct hvcs_struct *hvcsd)
-{
-       unsigned int unit_address = hvcsd->vdev->unit_address;
-       struct tty_struct *tty = hvcsd->tty;
-       int sent;
-
-       if (hvcsd->todo_mask & HVCS_TRY_WRITE) {
-               /* won't send partial writes */
-               sent = hvc_put_chars(unit_address,
-                               &hvcsd->buffer[0],
-                               hvcsd->chars_in_buffer );
-               if (sent > 0) {
-                       hvcsd->chars_in_buffer = 0;
-                       wmb();
-                       hvcsd->todo_mask &= ~(HVCS_TRY_WRITE);
-                       wmb();
-
-                       /*
-                        * We are still obligated to deliver the data to the
-                        * hypervisor even if the tty has been closed because
-                        * we commited to delivering it.  But don't try to wake
-                        * a non-existent tty.
-                        */
-                       if (tty) {
-                               if ((tty->flags & (1 << TTY_DO_WRITE_WAKEUP))
-                                               && tty->ldisc.write_wakeup)
-                                       (tty->ldisc.write_wakeup) (tty);
-                               wake_up_interruptible(&tty->write_wait);
-                       }
-               }
-       }
-}
-
-static int hvcs_io(struct hvcs_struct *hvcsd)
-{
-       unsigned int unit_address;
-       struct tty_struct *tty;
-       char buf[HVCS_BUFF_LEN] __ALIGNED__;
-       unsigned long flags;
-       int got;
-       int i;
-
-       spin_lock_irqsave(&hvcsd->lock, flags);
-
-       unit_address = hvcsd->vdev->unit_address;
-       tty = hvcsd->tty;
-
-       hvcs_try_write(hvcsd);
-
-       if (!tty || test_bit(TTY_THROTTLED, &tty->flags)) {
-               hvcsd->todo_mask &= ~(HVCS_READ_MASK);
-               goto bail;
-       } else if (!(hvcsd->todo_mask & (HVCS_READ_MASK)))
-               goto bail;
-
-       /* remove the read masks */
-       hvcsd->todo_mask &= ~(HVCS_READ_MASK);
-
-       if ((tty->flip.count + HVCS_BUFF_LEN) < TTY_FLIPBUF_SIZE) {
-               got = hvc_get_chars(unit_address,
-                               &buf[0],
-                               HVCS_BUFF_LEN);
-               for (i=0;got && i<got;i++)
-                       tty_insert_flip_char(tty, buf[i], TTY_NORMAL);
-       }
-
-       /* Give the TTY time to process the data we just sent. */
-       if (got)
-               hvcsd->todo_mask |= HVCS_QUICK_READ;
-
-       spin_unlock_irqrestore(&hvcsd->lock, flags);
-       if (tty->flip.count) {
-               /* This is synch because tty->low_latency == 1 */
-               tty_flip_buffer_push(tty);
-       }
-
-       if (!got) {
-               /* Do this _after_ the flip_buffer_push */
-               spin_lock_irqsave(&hvcsd->lock, flags);
-               vio_enable_interrupts(hvcsd->vdev);
-               spin_unlock_irqrestore(&hvcsd->lock, flags);
-       }
-
-       return hvcsd->todo_mask;
-
- bail:
-       spin_unlock_irqrestore(&hvcsd->lock, flags);
-       return hvcsd->todo_mask;
-}
-
-static int khvcsd(void *unused)
-{
-       struct hvcs_struct *hvcsd = NULL;
-       struct list_head *element;
-       struct list_head *safe_temp;
-       int hvcs_todo_mask;
-       unsigned long structs_flags;
-
-       __set_current_state(TASK_RUNNING);
-
-       do {
-               hvcs_todo_mask = 0;
-               hvcs_kicked = 0;
-               wmb();
-
-               spin_lock_irqsave(&hvcs_structs_lock, structs_flags);
-               list_for_each_safe(element, safe_temp, &hvcs_structs) {
-                       hvcsd = list_entry(element, struct hvcs_struct, next);
-                               hvcs_todo_mask |= hvcs_io(hvcsd);
-               }
-               spin_unlock_irqrestore(&hvcs_structs_lock, structs_flags);
-
-               /*
-                * If any of the hvcs adapters want to try a write or quick read
-                * don't schedule(), yield a smidgen then execute the hvcs_io
-                * thread again for those that want the write.
-                */
-                if (hvcs_todo_mask & (HVCS_TRY_WRITE | HVCS_QUICK_READ)) {
-                       yield();
-                       continue;
-               }
-
-               set_current_state(TASK_INTERRUPTIBLE);
-               if (!hvcs_kicked)
-                       schedule();
-               __set_current_state(TASK_RUNNING);
-       } while (!kthread_should_stop());
-
-       return 0;
-}
-
-static struct vio_device_id hvcs_driver_table[] __devinitdata= {
-       {"serial-server", "hvterm2"},
-       { 0, }
-};
-MODULE_DEVICE_TABLE(vio, hvcs_driver_table);
-
-/* callback when the kboject ref count reaches zero */
-static void destroy_hvcs_struct(struct kobject *kobj)
-{
-       struct hvcs_struct *hvcsd = from_kobj(kobj);
-       struct vio_dev *vdev;
-       unsigned long flags;
-
-       spin_lock_irqsave(&hvcsd->lock, flags);
-
-       /* the list_del poisons the pointers */
-       list_del(&(hvcsd->next));
-
-       if (hvcsd->connected == 1) {
-               hvcs_partner_free(hvcsd);
-               printk(KERN_INFO "HVCS: Closed vty-server@%X and"
-                               " partner vty@%X:%d connection.\n",
-                               hvcsd->vdev->unit_address,
-                               hvcsd->p_unit_address,
-                               (unsigned int)hvcsd->p_partition_ID);
-       }
-       printk(KERN_INFO "HVCS: Destroyed hvcs_struct for vty-server@%X.\n",
-                       hvcsd->vdev->unit_address);
-
-       vdev = hvcsd->vdev;
-       hvcsd->vdev = NULL;
-
-       hvcsd->p_unit_address = 0;
-       hvcsd->p_partition_ID = 0;
-       memset(&hvcsd->p_location_code[0], 0x00, CLC_LENGTH);
-
-       spin_unlock_irqrestore(&hvcsd->lock, flags);
-
-       hvcs_remove_device_attrs(vdev);
-
-       kfree(hvcsd);
-}
-
-/* This function must be called with hvcsd->lock held. */
-static void hvcs_final_close(struct hvcs_struct *hvcsd)
-{
-       vio_disable_interrupts(hvcsd->vdev);
-       free_irq(hvcsd->vdev->irq, hvcsd);
-
-       hvcsd->todo_mask = 0;
-
-       /* These two may be redundant if the operation was a close. */
-       if (hvcsd->tty) {
-               hvcsd->tty->driver_data = NULL;
-               hvcsd->tty = NULL;
-       }
-
-       hvcsd->open_count = 0;
-
-       memset(&hvcsd->buffer[0], 0x00, HVCS_BUFF_LEN);
-       hvcsd->chars_in_buffer = 0;
-}
-
-static struct kobj_type hvcs_kobj_type = {
-       .release = destroy_hvcs_struct,
-};
-
-static int __devinit hvcs_probe(
-       struct vio_dev *dev,
-       const struct vio_device_id *id)
-{
-       struct hvcs_struct *hvcsd;
-       unsigned long structs_flags;
-
-       if (!dev || !id) {
-               printk(KERN_ERR "HVCS: probed with invalid parameter.\n");
-               return -EPERM;
-       }
-
-       hvcsd = kmalloc(sizeof(*hvcsd), GFP_KERNEL);
-       if (!hvcsd) {
-               return -ENODEV;
-       }
-
-       /* hvcsd->tty is zeroed out with the memset */
-       memset(hvcsd, 0x00, sizeof(*hvcsd));
-
-       hvcsd->lock = SPIN_LOCK_UNLOCKED;
-       /* Automatically incs the refcount the first time */
-       kobject_init(&hvcsd->kobj);
-       /* Set up the callback for terminating the hvcs_struct's life */
-       hvcsd->kobj.ktype = &hvcs_kobj_type;
-
-       hvcsd->vdev = dev;
-       dev->dev.driver_data = hvcsd;
-
-       hvcsd->index = ++hvcs_struct_count;
-       hvcsd->chars_in_buffer = 0;
-       hvcsd->todo_mask = 0;
-       hvcsd->connected = 0;
-
-       /*
-        * This will populate the hvcs_struct's partner info fields for the
-        * first time.
-        */
-       if (hvcs_get_pi(hvcsd)) {
-               printk(KERN_ERR "HVCS: Failed to fetch partner"
-                       " info for vty-server@%X on device probe.\n",
-                       hvcsd->vdev->unit_address);
-       }
-
-       /*
-        * If a user app opens a tty that corresponds to this vty-server before
-        * the hvcs_struct has been added to the devices list then the user app
-        * will get -ENODEV.
-        */
-
-       spin_lock_irqsave(&hvcs_structs_lock, structs_flags);
-
-       list_add_tail(&(hvcsd->next), &hvcs_structs);
-
-       spin_unlock_irqrestore(&hvcs_structs_lock, structs_flags);
-
-       hvcs_create_device_attrs(hvcsd);
-
-       printk(KERN_INFO "HVCS: Added vty-server@%X.\n", dev->unit_address);
-
-       /*
-        * DON'T enable interrupts here because there is no user to receive the
-        * data.
-        */
-       return 0;
-}
-
-static int __devexit hvcs_remove(struct vio_dev *dev)
-{
-       struct hvcs_struct *hvcsd = dev->dev.driver_data;
-       unsigned long flags;
-       struct kobject *kobjp;
-       struct tty_struct *tty;
-
-       if (!hvcsd)
-               return -ENODEV;
-
-       /* By this time the vty-server won't be getting any more interrups */
-
-       spin_lock_irqsave(&hvcsd->lock, flags);
-
-       tty = hvcsd->tty;
-
-       kobjp = &hvcsd->kobj;
-
-       spin_unlock_irqrestore(&hvcsd->lock, flags);
-
-       /*
-        * Let the last holder of this object cause it to be removed, which
-        * would probably be tty_hangup below.
-        */
-       kobject_put (kobjp);
-
-       /*
-        * The hangup is a scheduled function which will auto chain call
-        * hvcs_hangup.  The tty should always be valid at this time unless a
-        * simultaneous tty close already cleaned up the hvcs_struct.
-        */
-       if (tty)
-               tty_hangup(tty);
-
-       printk(KERN_INFO "HVCS: vty-server@%X removed from the"
-                       " vio bus.\n", dev->unit_address);
-       return 0;
-};
-
-static struct vio_driver hvcs_vio_driver = {
-       .name           = hvcs_driver_name,
-       .id_table       = hvcs_driver_table,
-       .probe          = hvcs_probe,
-       .remove         = hvcs_remove,
-};
-
-/* Only called from hvcs_get_pi please */
-static void hvcs_set_pi(struct hvcs_partner_info *pi, struct hvcs_struct *hvcsd)
-{
-       int clclength;
-
-       hvcsd->p_unit_address = pi->unit_address;
-       hvcsd->p_partition_ID  = pi->partition_ID;
-       clclength = strlen(&pi->location_code[0]);
-       if (clclength > CLC_LENGTH - 1)
-               clclength = CLC_LENGTH - 1;
-
-       /* copy the null-term char too */
-       strncpy(&hvcsd->p_location_code[0],
-                       &pi->location_code[0], clclength + 1);
-}
-
-/*
- * Traverse the list and add the partner info that is found to the hvcs_struct
- * struct entry. NOTE: At this time I know that partner info will return a
- * single entry but in the future there may be multiple partner info entries per
- * vty-server and you'll want to zero out that list and reset it.  If for some
- * reason you have an old version of this driver but there IS more than one
- * partner info then hvcsd->p_* will hold the last partner info data from the
- * firmware query.  A good way to update this code would be to replace the three
- * partner info fields in hvcs_struct with a list of hvcs_partner_info
- * instances.
- *
- * This function must be called with the hvcsd->lock held.
- */
-static int hvcs_get_pi(struct hvcs_struct *hvcsd)
-{
-       /* struct hvcs_partner_info *head_pi = NULL; */
-       struct hvcs_partner_info *pi = NULL;
-       unsigned int unit_address = hvcsd->vdev->unit_address;
-       struct list_head head;
-       unsigned long flags;
-       int retval;
-
-       spin_lock_irqsave(&hvcs_pi_lock, flags);
-       if (!hvcs_pi_buff) {
-               spin_unlock_irqrestore(&hvcs_pi_lock, flags);
-               return -EFAULT;
-       }
-       retval = hvcs_get_partner_info(unit_address, &head, hvcs_pi_buff);
-       spin_unlock_irqrestore(&hvcs_pi_lock, flags);
-       if (retval) {
-               printk(KERN_ERR "HVCS: Failed to fetch partner"
-                       " info for vty-server@%x.\n", unit_address);
-               return retval;
-       }
-
-       /* nixes the values if the partner vty went away */
-       hvcsd->p_unit_address = 0;
-       hvcsd->p_partition_ID = 0;
-
-       list_for_each_entry(pi, &head, node)
-               hvcs_set_pi(pi, hvcsd);
-
-       hvcs_free_partner_info(&head);
-       return 0;
-}
-
-/*
- * This function is executed by the driver "rescan" sysfs entry.  It shouldn't
- * be executed elsewhere, in order to prevent deadlock issues.
- */
-static int hvcs_rescan_devices_list(void)
-{
-       struct hvcs_struct *hvcsd = NULL;
-       unsigned long flags;
-       unsigned long structs_flags;
-
-       spin_lock_irqsave(&hvcs_structs_lock, structs_flags);
-
-       list_for_each_entry(hvcsd, &hvcs_structs, next) {
-               spin_lock_irqsave(&hvcsd->lock, flags);
-               hvcs_get_pi(hvcsd);
-               spin_unlock_irqrestore(&hvcsd->lock, flags);
-       }
-
-       spin_unlock_irqrestore(&hvcs_structs_lock, structs_flags);
-
-       return 0;
-}
-
-/*
- * Farm this off into its own function because it could be more complex once
- * multiple partners support is added. This function should be called with
- * the hvcsd->lock held.
- */
-static int hvcs_has_pi(struct hvcs_struct *hvcsd)
-{
-       if ((!hvcsd->p_unit_address) || (!hvcsd->p_partition_ID))
-               return 0;
-       return 1;
-}
-
-/*
- * NOTE: It is possible that the super admin removed a partner vty and then
- * added a different vty as the new partner.
- *
- * This function must be called with the hvcsd->lock held.
- */
-static int hvcs_partner_connect(struct hvcs_struct *hvcsd)
-{
-       int retval;
-       unsigned int unit_address = hvcsd->vdev->unit_address;
-
-       /*
-        * If there wasn't any pi when the device was added it doesn't meant
-        * there isn't any now.  This driver isn't notified when a new partner
-        * vty is added to a vty-server so we discover changes on our own.
-        * Please see comments in hvcs_register_connection() for justification
-        * of this bizarre code.
-        */
-       retval = hvcs_register_connection(unit_address,
-                       hvcsd->p_partition_ID,
-                       hvcsd->p_unit_address);
-       if (!retval) {
-               hvcsd->connected = 1;
-               return 0;
-       } else if (retval != -EINVAL)
-               return retval;
-
-       /*
-        * As per the spec re-get the pi and try again if -EINVAL after the
-        * first connection attempt.
-        */
-       if (hvcs_get_pi(hvcsd))
-               return -ENOMEM;
-
-       if (!hvcs_has_pi(hvcsd))
-               return -ENODEV;
-
-       retval = hvcs_register_connection(unit_address,
-                       hvcsd->p_partition_ID,
-                       hvcsd->p_unit_address);
-       if (retval != -EINVAL) {
-               hvcsd->connected = 1;
-               return retval;
-       }
-
-       /*
-        * EBUSY is the most likely scenario though the vty could have been
-        * removed or there really could be an hcall error due to the parameter
-        * data but thanks to ambiguous firmware return codes we can't really
-        * tell.
-        */
-       printk(KERN_INFO "HVCS: vty-server or partner"
-                       " vty is busy.  Try again later.\n");
-       return -EBUSY;
-}
-
-/* This function must be called with the hvcsd->lock held */
-static void hvcs_partner_free(struct hvcs_struct *hvcsd)
-{
-       int retval;
-       do {
-               retval = hvcs_free_connection(hvcsd->vdev->unit_address);
-       } while (retval == -EBUSY);
-       hvcsd->connected = 0;
-}
-
-/* This helper function must be called WITHOUT the hvcsd->lock held */
-static int hvcs_enable_device(struct hvcs_struct *hvcsd, uint32_t unit_address,
-               unsigned int irq, struct vio_dev *vdev)
-{
-       unsigned long flags;
-
-       /*
-        * It is possible that the vty-server was removed between the time that
-        * the conn was registered and now.
-        */
-       if (!request_irq(irq, &hvcs_handle_interrupt,
-                               SA_INTERRUPT, "ibmhvcs", hvcsd)) {
-               /*
-                * It is possible the vty-server was removed after the irq was
-                * requested but before we have time to enable interrupts.
-                */
-               if (vio_enable_interrupts(vdev) == H_Success)
-                       return 0;
-               else {
-                       printk(KERN_ERR "HVCS: int enable failed for"
-                                       " vty-server@%X.\n", unit_address);
-                       free_irq(irq, hvcsd);
-               }
-       } else
-               printk(KERN_ERR "HVCS: irq req failed for"
-                               " vty-server@%X.\n", unit_address);
-
-       spin_lock_irqsave(&hvcsd->lock, flags);
-       hvcs_partner_free(hvcsd);
-       spin_unlock_irqrestore(&hvcsd->lock, flags);
-
-       return -ENODEV;
-
-}
-
-/*
- * This always increments the kobject ref count if the call is successful.
- * Please remember to dec when you are done with the instance.
- *
- * NOTICE: Do NOT hold either the hvcs_struct.lock or hvcs_structs_lock when
- * calling this function or you will get deadlock.
- */
-struct hvcs_struct *hvcs_get_by_index(int index)
-{
-       struct hvcs_struct *hvcsd = NULL;
-       struct list_head *element;
-       struct list_head *safe_temp;
-       unsigned long flags;
-       unsigned long structs_flags;
-
-       spin_lock_irqsave(&hvcs_structs_lock, structs_flags);
-       /* We can immediately discard OOB requests */
-       if (index >= 0 && index < HVCS_MAX_SERVER_ADAPTERS) {
-               list_for_each_safe(element, safe_temp, &hvcs_structs) {
-                       hvcsd = list_entry(element, struct hvcs_struct, next);
-                       spin_lock_irqsave(&hvcsd->lock, flags);
-                       if (hvcsd->index == index) {
-                               kobject_get(&hvcsd->kobj);
-                               spin_unlock_irqrestore(&hvcsd->lock, flags);
-                               spin_unlock_irqrestore(&hvcs_structs_lock,
-                                               structs_flags);
-                               return hvcsd;
-                       }
-                       spin_unlock_irqrestore(&hvcsd->lock, flags);
-               }
-               hvcsd = NULL;
-       }
-
-       spin_unlock_irqrestore(&hvcs_structs_lock, structs_flags);
-       return hvcsd;
-}
-
-/*
- * This is invoked via the tty_open interface when a user app connects to the
- * /dev node.
- */
-static int hvcs_open(struct tty_struct *tty, struct file *filp)
-{
-       struct hvcs_struct *hvcsd = NULL;
-       int retval = 0;
-       unsigned long flags;
-       unsigned int irq;
-       struct vio_dev *vdev;
-       unsigned long unit_address;
-
-       if (tty->driver_data)
-               goto fast_open;
-
-       /*
-        * Is there a vty-server that shares the same index?
-        * This function increments the kobject index.
-        */
-       if (!(hvcsd = hvcs_get_by_index(tty->index))) {
-               printk(KERN_WARNING "HVCS: open failed, no index.\n");
-               return -ENODEV;
-       }
-
-       spin_lock_irqsave(&hvcsd->lock, flags);
-
-       if (hvcsd->connected == 0)
-               if ((retval = hvcs_partner_connect(hvcsd)))
-                       goto error_release;
-
-       hvcsd->open_count = 1;
-       hvcsd->tty = tty;
-       tty->driver_data = hvcsd;
-
-       /*
-        * Set this driver to low latency so that we actually have a chance at
-        * catching a throttled TTY after we flip_buffer_push.  Otherwise the
-        * flush_to_async may not execute until after the kernel_thread has
-        * yielded and resumed the next flip_buffer_push resulting in data
-        * loss.
-        */
-       tty->low_latency = 1;
-
-       memset(&hvcsd->buffer[0], 0x3F, HVCS_BUFF_LEN);
-
-       /*
-        * Save these in the spinlock for the enable operations that need them
-        * outside of the spinlock.
-        */
-       irq = hvcsd->vdev->irq;
-       vdev = hvcsd->vdev;
-       unit_address = hvcsd->vdev->unit_address;
-
-       hvcsd->todo_mask |= HVCS_SCHED_READ;
-       spin_unlock_irqrestore(&hvcsd->lock, flags);
-
-       /*
-        * This must be done outside of the spinlock because it requests irqs
-        * and will grab the spinlcok and free the connection if it fails.
-        */
-       if ((hvcs_enable_device(hvcsd, unit_address, irq, vdev))) {
-               kobject_put(&hvcsd->kobj);
-               printk(KERN_WARNING "HVCS: enable device failed.\n");
-               return -ENODEV;
-       }
-
-       goto open_success;
-
-fast_open:
-       hvcsd = tty->driver_data;
-
-       spin_lock_irqsave(&hvcsd->lock, flags);
-       if (!kobject_get(&hvcsd->kobj)) {
-               spin_unlock_irqrestore(&hvcsd->lock, flags);
-               printk(KERN_ERR "HVCS: Kobject of open"
-                       " hvcs doesn't exist.\n");
-               return -EFAULT; /* Is this the right return value? */
-       }
-
-       hvcsd->open_count++;
-
-       hvcsd->todo_mask |= HVCS_SCHED_READ;
-       spin_unlock_irqrestore(&hvcsd->lock, flags);
-open_success:
-       hvcs_kick();
-
-       printk(KERN_INFO "HVCS: vty-server@%X opened.\n",
-               hvcsd->vdev->unit_address );
-
-       return 0;
-
-error_release:
-       spin_unlock_irqrestore(&hvcsd->lock, flags);
-       kobject_put(&hvcsd->kobj);
-
-       printk(KERN_WARNING "HVCS: HVCS partner connect failed.\n");
-       return retval;
-}
-
-static void hvcs_close(struct tty_struct *tty, struct file *filp)
-{
-       struct hvcs_struct *hvcsd;
-       unsigned long flags;
-       struct kobject *kobjp;
-
-       /*
-        * Is someone trying to close the file associated with this device after
-        * we have hung up?  If so tty->driver_data wouldn't be valid.
-        */
-       if (tty_hung_up_p(filp))
-               return;
-
-       /*
-        * No driver_data means that this close was probably issued after a
-        * failed hvcs_open by the tty layer's release_dev() api and we can just
-        * exit cleanly.
-        */
-       if (!tty->driver_data)
-               return;
-
-       hvcsd = tty->driver_data;
-
-       spin_lock_irqsave(&hvcsd->lock, flags);
-       if (--hvcsd->open_count == 0) {
-
-               /*
-                * This line is important because it tells hvcs_open that this
-                * device needs to be re-configured the next time hvcs_open is
-                * called.
-                */
-               hvcsd->tty->driver_data = NULL;
-
-               /*
-                * NULL this early so that the kernel_thread doesn't try to
-                * execute any operations on the TTY even though it is obligated
-                * to deliver any pending I/O to the hypervisor.
-                */
-               hvcsd->tty = NULL;
-
-               /*
-                * Block the close until all the buffered data has been
-                * delivered.
-                */
-               while(hvcsd->chars_in_buffer) {
-                       spin_unlock_irqrestore(&hvcsd->lock, flags);
-
-                       /*
-                        * Give the kernel thread the hvcs_struct so that it can
-                        * try to deliver the remaining data but block the close
-                        * operation by spinning in this function so that other
-                        * tty operations have to wait.
-                        */
-                       yield();
-                       spin_lock_irqsave(&hvcsd->lock, flags);
-               }
-
-               hvcs_final_close(hvcsd);
-
-       } else if (hvcsd->open_count < 0) {
-               printk(KERN_ERR "HVCS: vty-server@%X open_count: %d"
-                               " is missmanaged.\n",
-                       hvcsd->vdev->unit_address, hvcsd->open_count);
-       }
-       kobjp = &hvcsd->kobj;
-
-       spin_unlock_irqrestore(&hvcsd->lock, flags);
-
-       kobject_put(kobjp);
-}
-
-static void hvcs_hangup(struct tty_struct * tty)
-{
-       struct hvcs_struct *hvcsd = tty->driver_data;
-       unsigned long flags;
-       int temp_open_count;
-       struct kobject *kobjp;
-
-       spin_lock_irqsave(&hvcsd->lock, flags);
-       /* Preserve this so that we know how many kobject refs to put */
-       temp_open_count = hvcsd->open_count;
-
-       /*
-        * Don't kobject put inside the spinlock because the destruction
-        * callback may use the spinlock and it may get called before the
-        * spinlock has been released.  Get a pointer to the kobject and
-        * kobject_put on that instead.
-        */
-       kobjp = &hvcsd->kobj;
-
-       /* Calling this will drop any buffered data on the floor. */
-       hvcs_final_close(hvcsd);
-
-       spin_unlock_irqrestore(&hvcsd->lock, flags);
-
-       /*
-        * We need to kobject_put() for every open_count we have since the
-        * tty_hangup() function doesn't invoke a close per open connection on a
-        * non-console device.
-        */
-       while(temp_open_count) {
-               --temp_open_count;
-               /*
-                * The final put will trigger destruction of the hvcs_struct.
-                * NOTE:  If this hangup was signaled from user space then the
-                * final put will never happen.
-                */
-               kobject_put(kobjp);
-       }
-}
-
-/*
- * NOTE: This is almost always from_user since user level apps interact with the
- * /dev nodes. I'm trusting that if hvcs_write gets called and interrupted by
- * hvcs_remove (which removes the target device and executes tty_hangup()) that
- * tty_hangup will allow hvcs_write time to complete execution before it
- * terminates our device.
- */
-static int hvcs_write(struct tty_struct *tty, int from_user,
-               const unsigned char *buf, int count)
-{
-       struct hvcs_struct *hvcsd = tty->driver_data;
-       unsigned int unit_address;
-       unsigned char *charbuf;
-       unsigned long flags;
-       int total_sent = 0;
-       int tosend = 0;
-       int result = 0;
-
-       /*
-        * If they don't check the return code off of their open they may
-        * attempt this even if there is no connected device.
-        */
-       if (!hvcsd)
-               return -ENODEV;
-
-       /* Reasonable size to prevent user level flooding */
-       if (count > HVCS_MAX_FROM_USER) {
-               printk(KERN_WARNING "HVCS write: count being truncated to"
-                               " HVCS_MAX_FROM_USER.\n");
-               count = HVCS_MAX_FROM_USER;
-       }
-
-       if (!from_user)
-               charbuf = (unsigned char *)buf;
-       else {
-               charbuf = kmalloc(count, GFP_KERNEL);
-               if (!charbuf) {
-                       printk(KERN_WARNING "HVCS: write -ENOMEM.\n");
-                       return -ENOMEM;
-               }
-
-               if (copy_from_user(charbuf, buf, count)) {
-                       kfree(charbuf);
-                       printk(KERN_WARNING "HVCS: write -EFAULT.\n");
-                       return -EFAULT;
-               }
-       }
-
-       spin_lock_irqsave(&hvcsd->lock, flags);
-
-       /*
-        * Somehow an open succedded but the device was removed or the
-        * connection terminated between the vty-server and partner vty during
-        * the middle of a write operation?  This is a crummy place to do this
-        * but we want to keep it all in the spinlock.
-        */
-       if (hvcsd->open_count <= 0) {
-               spin_unlock_irqrestore(&hvcsd->lock, flags);
-               if (from_user)
-                       kfree(charbuf);
-               return -ENODEV;
-       }
-
-       unit_address = hvcsd->vdev->unit_address;
-
-       while (count > 0) {
-               tosend = min(count, (HVCS_BUFF_LEN - hvcsd->chars_in_buffer));
-               /*
-                * No more space, this probably means that the last call to
-                * hvcs_write() didn't succeed and the buffer was filled up.
-                */
-               if (!tosend)
-                       break;
-
-               memcpy(&hvcsd->buffer[hvcsd->chars_in_buffer],
-                               &charbuf[total_sent],
-                               tosend);
-
-               hvcsd->chars_in_buffer += tosend;
-
-               result = 0;
-
-               /*
-                * If this is true then we don't want to try writing to the
-                * hypervisor because that is the kernel_threads job now.  We'll
-                * just add to the buffer.
-                */
-               if (!(hvcsd->todo_mask & HVCS_TRY_WRITE))
-                       /* won't send partial writes */
-                       result = hvc_put_chars(unit_address,
-                                       &hvcsd->buffer[0],
-                                       hvcsd->chars_in_buffer);
-
-               /*
-                * Since we know we have enough room in hvcsd->buffer for
-                * tosend we record that it was sent regardless of whether the
-                * hypervisor actually took it because we have it buffered.
-                */
-               total_sent+=tosend;
-               count-=tosend;
-               if (result == 0) {
-                       hvcsd->todo_mask |= HVCS_TRY_WRITE;
-                       hvcs_kick();
-                       break;
-               }
-
-               hvcsd->chars_in_buffer = 0;
-               /*
-                * Test after the chars_in_buffer reset otherwise this could
-                * deadlock our writes if hvc_put_chars fails.
-                */
-               if (result < 0)
-                       break;
-       }
-
-       spin_unlock_irqrestore(&hvcsd->lock, flags);
-       if (from_user)
-               kfree(charbuf);
-
-       if (result == -1)
-               return -EIO;
-       else
-               return total_sent;
-}
-
-/*
- * This is really asking how much can we guarentee that we can send or that we
- * absolutely WILL BUFFER if we can't send it.  This driver MUST honor the
- * return value, hence the reason for hvcs_struct buffering.
- */
-static int hvcs_write_room(struct tty_struct *tty)
-{
-       struct hvcs_struct *hvcsd = tty->driver_data;
-       unsigned long flags;
-       int retval;
-
-       if (!hvcsd || hvcsd->open_count <= 0)
-               return 0;
-
-       spin_lock_irqsave(&hvcsd->lock, flags);
-       retval = HVCS_BUFF_LEN - hvcsd->chars_in_buffer;
-       spin_unlock_irqrestore(&hvcsd->lock, flags);
-       return retval;
-}
-
-static int hvcs_chars_in_buffer(struct tty_struct *tty)
-{
-       struct hvcs_struct *hvcsd = tty->driver_data;
-       unsigned long flags;
-       int retval;
-
-       spin_lock_irqsave(&hvcsd->lock, flags);
-       retval = hvcsd->chars_in_buffer;
-       spin_unlock_irqrestore(&hvcsd->lock, flags);
-       return retval;
-}
-
-static struct tty_operations hvcs_ops = {
-       .open = hvcs_open,
-       .close = hvcs_close,
-       .hangup = hvcs_hangup,
-       .write = hvcs_write,
-       .write_room = hvcs_write_room,
-       .chars_in_buffer = hvcs_chars_in_buffer,
-       .unthrottle = hvcs_unthrottle,
-       .throttle = hvcs_throttle,
-};
-
-static int __init hvcs_module_init(void)
-{
-       int rc;
-       int num_ttys_to_alloc;
-
-       printk(KERN_INFO "Initializing %s\n", hvcs_driver_string);
-
-       /* Has the user specified an overload with an insmod param? */
-       if (hvcs_parm_num_devs <= 0 ||
-               (hvcs_parm_num_devs > HVCS_MAX_SERVER_ADAPTERS)) {
-               num_ttys_to_alloc = HVCS_DEFAULT_SERVER_ADAPTERS;
-       } else
-               num_ttys_to_alloc = hvcs_parm_num_devs;
-
-       hvcs_tty_driver = alloc_tty_driver(num_ttys_to_alloc);
-       if (!hvcs_tty_driver)
-               return -ENOMEM;
-
-       hvcs_tty_driver->owner = THIS_MODULE;
-
-       hvcs_tty_driver->driver_name = hvcs_driver_name;
-       hvcs_tty_driver->name = hvcs_device_node;
-
-       /*
-        * We'll let the system assign us a major number, indicated by leaving
-        * it blank.
-        */
-
-       hvcs_tty_driver->minor_start = HVCS_MINOR_START;
-       hvcs_tty_driver->type = TTY_DRIVER_TYPE_SYSTEM;
-
-       /*
-        * We role our own so that we DONT ECHO.  We can't echo because the
-        * device we are connecting to already echoes by default and this would
-        * throw us into a horrible recursive echo-echo-echo loop.
-        */
-       hvcs_tty_driver->init_termios = hvcs_tty_termios;
-       hvcs_tty_driver->flags = TTY_DRIVER_REAL_RAW;
-
-       tty_set_operations(hvcs_tty_driver, &hvcs_ops);
-
-       /*
-        * The following call will result in sysfs entries that denote the
-        * dynamically assigned major and minor numbers for our devices.
-        */
-       if (tty_register_driver(hvcs_tty_driver)) {
-               printk(KERN_ERR "HVCS: registration "
-                       " as a tty driver failed.\n");
-               put_tty_driver(hvcs_tty_driver);
-               return rc;
-       }
-
-       hvcs_structs_lock = SPIN_LOCK_UNLOCKED;
-
-       hvcs_pi_lock = SPIN_LOCK_UNLOCKED;
-       hvcs_pi_buff = kmalloc(PAGE_SIZE, GFP_KERNEL);
-
-       hvcs_task = kthread_run(khvcsd, NULL, "khvcsd");
-       if (IS_ERR(hvcs_task)) {
-               printk("khvcsd creation failed.  Driver not loaded.\n");
-               kfree(hvcs_pi_buff);
-               put_tty_driver(hvcs_tty_driver);
-               return -EIO;
-       }
-
-       rc = vio_register_driver(&hvcs_vio_driver);
-
-       /*
-        * This needs to be done AFTER the vio_register_driver() call or else
-        * the kobjects won't be initialized properly.
-        */
-       hvcs_create_driver_attrs();
-
-       printk(KERN_INFO "HVCS: driver module inserted.\n");
-
-       return rc;
-}
-
-static void __exit hvcs_module_exit(void)
-{
-       unsigned long flags;
-
-       /*
-        * This driver receives hvcs_remove callbacks for each device upon
-        * module removal.
-        */
-
-       /*
-        * This synchronous operation  will wake the khvcsd kthread if it is
-        * asleep and will return when khvcsd has terminated.
-        */
-       kthread_stop(hvcs_task);
-
-       spin_lock_irqsave(&hvcs_pi_lock, flags);
-       kfree(hvcs_pi_buff);
-       hvcs_pi_buff = NULL;
-       spin_unlock_irqrestore(&hvcs_pi_lock, flags);
-
-       hvcs_remove_driver_attrs();
-
-       vio_unregister_driver(&hvcs_vio_driver);
-
-       tty_unregister_driver(hvcs_tty_driver);
-
-       put_tty_driver(hvcs_tty_driver);
-
-       printk(KERN_INFO "HVCS: driver module removed.\n");
-}
-
-module_init(hvcs_module_init);
-module_exit(hvcs_module_exit);
-
-static inline struct hvcs_struct *from_vio_dev(struct vio_dev *viod)
-{
-       return viod->dev.driver_data;
-}
-/* The sysfs interface for the driver and devices */
-
-static ssize_t hvcs_partner_vtys_show(struct device *dev, char *buf)
-{
-       struct vio_dev *viod = to_vio_dev(dev);
-       struct hvcs_struct *hvcsd = from_vio_dev(viod);
-       unsigned long flags;
-       int retval;
-
-       spin_lock_irqsave(&hvcsd->lock, flags);
-       retval = sprintf(buf, "%X\n", hvcsd->p_unit_address);
-       spin_unlock_irqrestore(&hvcsd->lock, flags);
-       return retval;
-}
-static DEVICE_ATTR(partner_vtys, S_IRUGO, hvcs_partner_vtys_show, NULL);
-
-static ssize_t hvcs_partner_clcs_show(struct device *dev, char *buf)
-{
-       struct vio_dev *viod = to_vio_dev(dev);
-       struct hvcs_struct *hvcsd = from_vio_dev(viod);
-       unsigned long flags;
-       int retval;
-
-       spin_lock_irqsave(&hvcsd->lock, flags);
-       retval = sprintf(buf, "%s\n", &hvcsd->p_location_code[0]);
-       spin_unlock_irqrestore(&hvcsd->lock, flags);
-       return retval;
-}
-static DEVICE_ATTR(partner_clcs, S_IRUGO, hvcs_partner_clcs_show, NULL);
-
-static ssize_t hvcs_current_vty_store(struct device *dev, const char * buf,
-               size_t count)
-{
-       /*
-        * Don't need this feature at the present time because firmware doesn't
-        * yet support multiple partners.
-        */
-       printk(KERN_INFO "HVCS: Denied current_vty change: -EPERM.\n");
-       return -EPERM;
-}
-
-static ssize_t hvcs_current_vty_show(struct device *dev, char *buf)
-{
-       struct vio_dev *viod = to_vio_dev(dev);
-       struct hvcs_struct *hvcsd = from_vio_dev(viod);
-       unsigned long flags;
-       int retval;
-
-       spin_lock_irqsave(&hvcsd->lock, flags);
-       retval = sprintf(buf, "%s\n", &hvcsd->p_location_code[0]);
-       spin_unlock_irqrestore(&hvcsd->lock, flags);
-       return retval;
-}
-
-static DEVICE_ATTR(current_vty,
-       S_IRUGO | S_IWUSR, hvcs_current_vty_show, hvcs_current_vty_store);
-
-static ssize_t hvcs_vterm_state_store(struct device *dev, const char *buf,
-               size_t count)
-{
-       struct vio_dev *viod = to_vio_dev(dev);
-       struct hvcs_struct *hvcsd = from_vio_dev(viod);
-       unsigned long flags;
-
-       /* writing a '0' to this sysfs entry will result in the disconnect. */
-       if (simple_strtol(buf, NULL, 0) != 0)
-               return -EINVAL;
-
-       spin_lock_irqsave(&hvcsd->lock, flags);
-
-       if (hvcsd->open_count > 0) {
-               spin_unlock_irqrestore(&hvcsd->lock, flags);
-               printk(KERN_INFO "HVCS: vterm state unchanged.  "
-                               "The hvcs device node is still in use.\n");
-               return -EPERM;
-       }
-
-       if (hvcsd->connected == 0) {
-               spin_unlock_irqrestore(&hvcsd->lock, flags);
-               printk(KERN_INFO "HVCS: vterm state unchanged. The"
-                               " vty-server is not connected to a vty.\n");
-               return -EPERM;
-       }
-
-       hvcs_partner_free(hvcsd);
-       printk(KERN_INFO "HVCS: Closed vty-server@%X and"
-                       " partner vty@%X:%d connection.\n",
-                       hvcsd->vdev->unit_address,
-                       hvcsd->p_unit_address,
-                       (unsigned int)hvcsd->p_partition_ID);
-
-       spin_unlock_irqrestore(&hvcsd->lock, flags);
-       return count;
-}
-
-static ssize_t hvcs_vterm_state_show(struct device *dev, char *buf)
-{
-       struct vio_dev *viod = to_vio_dev(dev);
-       struct hvcs_struct *hvcsd = from_vio_dev(viod);
-       unsigned long flags;
-       int retval;
-
-       spin_lock_irqsave(&hvcsd->lock, flags);
-       retval = sprintf(buf, "%d\n", hvcsd->connected);
-       spin_unlock_irqrestore(&hvcsd->lock, flags);
-       return retval;
-}
-static DEVICE_ATTR(vterm_state, S_IRUGO | S_IWUSR,
-               hvcs_vterm_state_show, hvcs_vterm_state_store);
-
-static struct attribute *hvcs_attrs[] = {
-       &dev_attr_partner_vtys.attr,
-       &dev_attr_partner_clcs.attr,
-       &dev_attr_current_vty.attr,
-       &dev_attr_vterm_state.attr,
-       NULL,
-};
-
-static struct attribute_group hvcs_attr_group = {
-       .attrs = hvcs_attrs,
-};
-
-static void hvcs_create_device_attrs(struct hvcs_struct *hvcsd)
-{
-       struct vio_dev *vdev = hvcsd->vdev;
-       sysfs_create_group(&vdev->dev.kobj, &hvcs_attr_group);
-}
-
-static void hvcs_remove_device_attrs(struct vio_dev *vdev)
-{
-       sysfs_remove_group(&vdev->dev.kobj, &hvcs_attr_group);
-}
-
-static ssize_t hvcs_rescan_show(struct device_driver *ddp, char *buf)
-{
-       /* A 1 means it is updating, a 0 means it is done updating */
-       return snprintf(buf, PAGE_SIZE, "%d\n", hvcs_rescan_status);
-}
-
-static ssize_t hvcs_rescan_store(struct device_driver *ddp, const char * buf,
-               size_t count)
-{
-       if ((simple_strtol(buf, NULL, 0) != 1)
-               && (hvcs_rescan_status != 0))
-               return -EINVAL;
-
-       hvcs_rescan_status = 1;
-       printk(KERN_INFO "HVCS: rescanning partner info for all"
-               " vty-servers.\n");
-       hvcs_rescan_devices_list();
-       hvcs_rescan_status = 0;
-       return count;
-}
-static DRIVER_ATTR(rescan,
-       S_IRUGO | S_IWUSR, hvcs_rescan_show, hvcs_rescan_store);
-
-static void hvcs_create_driver_attrs(void)
-{
-       struct device_driver *driverfs = &(hvcs_vio_driver.driver);
-       driver_create_file(driverfs, &driver_attr_rescan);
-}
-
-static void hvcs_remove_driver_attrs(void)
-{
-       struct device_driver *driverfs = &(hvcs_vio_driver.driver);
-       driver_remove_file(driverfs, &driver_attr_rescan);
-}
diff --git a/drivers/char/lp_old98.c b/drivers/char/lp_old98.c
deleted file mode 100644 (file)
index 895ca1d..0000000
+++ /dev/null
@@ -1,537 +0,0 @@
-/*
- *     linux/drivers/char/lp_old98.c
- *
- * printer port driver for ancient PC-9800s with no bidirectional port support
- *
- * Copyright (C)  1998,99  Kousuke Takai <tak@kmc.kyoto-u.ac.jp>,
- *                        Kyoto University Microcomputer Club
- *
- * This driver is based on and has compatibility with `lp.c',
- * generic PC printer port driver.
- */
-
-#include <linux/module.h>
-#include <linux/init.h>
-#include <linux/config.h>
-#include <linux/errno.h>
-#include <linux/kernel.h>
-#include <linux/major.h>
-#include <linux/sched.h>
-#include <linux/slab.h>
-#include <linux/spinlock.h>
-#include <linux/ioport.h>
-#include <linux/fcntl.h>
-#include <linux/delay.h>
-#include <linux/console.h>
-#include <linux/fs.h>
-
-#include <asm/io.h>
-#include <asm/uaccess.h>
-#include <asm/system.h>
-
-#include <linux/lp.h>
-
-/*
- *  I/O port numbers
- */
-#define        LP_PORT_DATA    0x40
-#define        LP_PORT_STATUS  (LP_PORT_DATA + 2)
-#define        LP_PORT_STROBE  (LP_PORT_DATA + 4)
-#define LP_PORT_CONTROL        (LP_PORT_DATA + 6)
-
-#define        LP_PORT_H98MODE 0x0448
-#define        LP_PORT_EXTMODE 0x0149
-
-/*
- *  bit mask for I/O
- */
-#define        LP_MASK_nBUSY   (1 << 2)
-#define        LP_MASK_nSTROBE (1 << 7)
-
-#define LP_CONTROL_ASSERT_STROBE       (0x0e)
-#define LP_CONTROL_NEGATE_STROBE       (0x0f)
-
-/*
- *  Acceptable maximum value for non-privileged user for LPCHARS ioctl.
- */
-#define LP_CHARS_NOPRIV_MAX    65535
-
-#define        DC1     '\x11'
-#define        DC3     '\x13'
-
-/* PC-9800s have at least and at most one old-style printer port. */
-static struct lp_struct lp = {
-       .flags  = LP_EXIST | LP_ABORTOPEN,
-       .chars  = LP_INIT_CHAR,
-       .time   = LP_INIT_TIME,
-       .wait   = LP_INIT_WAIT,
-};
-
-static int     dc1_check;
-static spinlock_t lp_old98_lock = SPIN_LOCK_UNLOCKED;
-
-
-#undef LP_OLD98_DEBUG
-
-#ifdef CONFIG_PC9800_OLDLP_CONSOLE
-static struct console lp_old98_console;                /* defined later */
-static short saved_console_flags;
-#endif
-
-static DECLARE_WAIT_QUEUE_HEAD (lp_old98_waitq);
-
-static void lp_old98_timer_function(unsigned long data)
-{
-       if (inb(LP_PORT_STATUS) & LP_MASK_nBUSY)
-               wake_up_interruptible(&lp_old98_waitq);
-       else {
-               struct timer_list *t = (struct timer_list *) data;
-
-               t->expires = jiffies + 1;
-               add_timer(t);
-       }
-}
-
-static inline int lp_old98_wait_ready(void)
-{
-       struct timer_list timer;
-
-       init_timer(&timer);
-       timer.function = lp_old98_timer_function;
-       timer.expires = jiffies + 1;
-       timer.data = (unsigned long)&timer;
-       add_timer(&timer);
-       interruptible_sleep_on(&lp_old98_waitq);
-       del_timer(&timer);
-       return signal_pending(current);
-}
-
-static inline int lp_old98_char(char lpchar)
-{
-       unsigned long count = 0;
-#ifdef LP_STATS
-       int tmp;
-#endif
-
-       while (!(inb(LP_PORT_STATUS) & LP_MASK_nBUSY)) {
-               count++;
-               if (count >= lp.chars)
-                       return 0;
-       }
-
-       outb(lpchar, LP_PORT_DATA);
-
-#ifdef LP_STATS
-       /*
-        *  Update lp statsistics here (and between next two outb()'s).
-        *  Time to compute it is part of storobe delay.
-        */
-       if (count > lp.stats.maxwait) {
-#ifdef LP_OLD98_DEBUG
-               printk(KERN_DEBUG "lp_old98: success after %d counts.\n",
-                      count);
-#endif
-               lp.stats.maxwait = count;
-       }
-       count *= 256;
-       tmp = count - lp.stats.meanwait;
-       if (tmp < 0)
-               tmp = -tmp;
-#endif
-       ndelay(lp.wait);
-    
-       /* negate PSTB# (activate strobe)       */
-       outb(LP_CONTROL_ASSERT_STROBE, LP_PORT_CONTROL);
-
-#ifdef LP_STATS
-       lp.stats.meanwait = (255 * lp.stats.meanwait + count + 128) / 256;
-       lp.stats.mdev = (127 * lp.stats.mdev + tmp + 64) / 128;
-       lp.stats.chars ++;
-#endif
-
-       ndelay(lp.wait);
-
-       /* assert PSTB# (deactivate strobe)     */
-       outb(LP_CONTROL_NEGATE_STROBE, LP_PORT_CONTROL);
-
-       return 1;
-}
-
-static ssize_t lp_old98_write(struct file * file,
-                             const char * buf, size_t count,
-                             loff_t *dummy)
-{
-       unsigned long total_bytes_written = 0;
-
-       if (!access_ok(VERIFY_READ, buf, count))
-               return -EFAULT;
-
-#ifdef LP_STATS
-       if (jiffies - lp.lastcall > lp.time)
-               lp.runchars = 0;
-       lp.lastcall = jiffies;
-#endif
-
-       do {
-               unsigned long bytes_written = 0;
-               unsigned long copy_size
-                       = (count < LP_BUFFER_SIZE ? count : LP_BUFFER_SIZE);
-
-               if (__copy_from_user(lp.lp_buffer, buf, copy_size))
-                       return -EFAULT;
-
-               while (bytes_written < copy_size) {
-                       if (lp_old98_char(lp.lp_buffer[bytes_written]))
-                               bytes_written ++;
-                       else {
-#ifdef LP_STATS
-                               int rc = lp.runchars + bytes_written;
-
-                               if (rc > lp.stats.maxrun)
-                                       lp.stats.maxrun = rc;
-
-                               lp.stats.sleeps ++;
-#endif
-#ifdef LP_OLD98_DEBUG
-                               printk(KERN_DEBUG
-                                      "lp_old98: sleeping at %d characters"
-                                      " for %d jiffies\n",
-                                      lp.runchars, lp.time);
-                               lp.runchars = 0;
-#endif
-                               if (lp_old98_wait_ready())
-                                       return ((total_bytes_written
-                                                + bytes_written)
-                                               ? : -EINTR);
-                       }
-               }
-               total_bytes_written += bytes_written;
-               buf += bytes_written;
-#ifdef LP_STATS
-               lp.runchars += bytes_written;
-#endif
-               count -= bytes_written;
-       } while (count > 0);
-
-       return total_bytes_written;
-}
-
-static int lp_old98_open(struct inode * inode, struct file * file)
-{
-       if (iminor(inode) != 0)
-               return -ENXIO;
-
-       if (lp.flags & LP_BUSY)
-               return -EBUSY;
-
-       if (dc1_check && (lp.flags & LP_ABORTOPEN)
-           && !(file->f_flags & O_NONBLOCK)) {
-               /*
-                *  Check whether printer is on-line.
-                *  PC-9800's old style port have only BUSY# as status input,
-                *  so that it is impossible to distinguish that the printer is
-                *  ready and that the printer is off-line or not connected
-                *  (in both case BUSY# is in the same state). So:
-                *
-                *    (1) output DC1 (0x11) to printer port and do strobe.
-                *    (2) watch BUSY# line for a while. If BUSY# is pulled
-                *        down, the printer will be ready. Otherwise,
-                *        it will be off-line (or not connected, or power-off,
-                *         ...).
-                *
-                *  The source of this procedure:
-                *      Terumasa KODAKA, Kazufumi SHIMIZU, Yu HAYAMI:
-                *              `PC-9801 Super Technique', Ascii, 1992.
-                */
-               int count;
-               unsigned long flags;
-
-               /* interrupts while check is fairly bad */
-               spin_lock_irqsave(&lp_old98_lock, flags);
-
-               if (!lp_old98_char(DC1)) {
-                       spin_unlock_irqrestore(&lp_old98_lock, flags);
-                       return -EBUSY;
-               }
-               count = (unsigned int)dc1_check > 10000 ? 10000 : dc1_check;
-               while (inb(LP_PORT_STATUS) & LP_MASK_nBUSY) {
-                       if (--count == 0) {
-                               spin_unlock_irqrestore(&lp_old98_lock, flags);
-                               return -ENODEV;
-                       }
-               }
-               spin_unlock_irqrestore(&lp_old98_lock, flags);
-       }
-
-       if ((lp.lp_buffer = kmalloc(LP_BUFFER_SIZE, GFP_KERNEL)) == NULL)
-               return -ENOMEM;
-
-       lp.flags |= LP_BUSY;
-
-#ifdef CONFIG_PC9800_OLDLP_CONSOLE
-       saved_console_flags = lp_old98_console.flags;
-       lp_old98_console.flags &= ~CON_ENABLED;
-#endif
-       return 0;
-}
-
-static int lp_old98_release(struct inode * inode, struct file * file)
-{
-       kfree(lp.lp_buffer);
-       lp.lp_buffer = NULL;
-       lp.flags &= ~LP_BUSY;
-#ifdef CONFIG_PC9800_OLDLP_CONSOLE
-       lp_old98_console.flags = saved_console_flags;
-#endif
-       return 0;
-}
-
-static int lp_old98_init_device(void)
-{
-       unsigned char data;
-
-       if ((data = inb(LP_PORT_EXTMODE)) != 0xFF && (data & 0x10)) {
-               printk(KERN_INFO
-                      "lp_old98: shutting down extended parallel port mode...\n");
-               outb(data & ~0x10, LP_PORT_EXTMODE);
-       }
-#ifdef PC98_HW_H98
-       if ((pc98_hw_flags & PC98_HW_H98)
-           && ((data = inb(LP_PORT_H98MODE)) & 0x01)) {
-               printk(KERN_INFO
-                      "lp_old98: shutting down H98 full centronics mode...\n");
-               outb(data & ~0x01, LP_PORT_H98MODE);
-       }
-#endif
-       return 0;
-}
-
-static int lp_old98_ioctl(struct inode *inode, struct file *file,
-                         unsigned int command, unsigned long arg)
-{
-       int retval = 0;
-
-       switch (command) {
-       case LPTIME:
-               lp.time = arg * HZ/100;
-               break;
-       case LPCHAR:
-               lp.chars = arg;
-               break;
-       case LPABORT:
-               if (arg)
-                       lp.flags |= LP_ABORT;
-               else
-                       lp.flags &= ~LP_ABORT;
-               break;
-       case LPABORTOPEN:
-               if (arg)
-                       lp.flags |= LP_ABORTOPEN;
-               else
-                       lp.flags &= ~LP_ABORTOPEN;
-               break;
-       case LPCAREFUL:
-               /* do nothing */
-               break;
-       case LPWAIT:
-               lp.wait = arg;
-               break;
-       case LPGETIRQ:
-               retval = put_user(0, (int *)arg);
-               break;
-       case LPGETSTATUS:
-               /*
-                * convert PC-9800's status to IBM PC's one, so that tunelp(8)
-                * works in the same way on this driver.
-                */
-               retval = put_user((inb(LP_PORT_STATUS) & LP_MASK_nBUSY)
-                                       ? (LP_PBUSY | LP_PERRORP) : LP_PERRORP,
-                                       (int *)arg);
-               break;
-       case LPRESET:
-               retval = lp_old98_init_device();
-               break;
-#ifdef LP_STATS
-       case LPGETSTATS:
-               if (copy_to_user((struct lp_stats *)arg, &lp.stats,
-                                sizeof(struct lp_stats)))
-                       retval = -EFAULT;
-               else if (suser())
-                       memset(&lp.stats, 0, sizeof(struct lp_stats));
-               break;
-#endif
-       case LPGETFLAGS:
-               retval = put_user(lp.flags, (int *)arg);
-               break;
-       case LPSETIRQ: 
-       default:
-               retval = -EINVAL;
-       }
-       return retval;
-}
-
-static struct file_operations lp_old98_fops = {
-       .owner          = THIS_MODULE,
-       .write          = lp_old98_write,
-       .ioctl          = lp_old98_ioctl,
-       .open           = lp_old98_open,
-       .release        = lp_old98_release,
-};
-
-/*
- *  Support for console on lp_old98
- */
-#ifdef CONFIG_PC9800_OLDLP_CONSOLE
-
-static inline void io_delay(void)
-{
-       unsigned char dummy;    /* actually not output */
-
-       asm volatile ("out%B0 %0,%1" : "=a"(dummy) : "N"(0x5f));
-}
-
-static void lp_old98_console_write(struct console *console,
-                                   const char *s, unsigned int count)
-{
-       int i;
-       static unsigned int timeout_run = 0;
-
-       while (count) {
-               /* wait approx 1.2 seconds */
-               for (i = 2000000; !(inb(LP_PORT_STATUS) & LP_MASK_nBUSY);
-                                                               io_delay())
-                       if (!--i) {
-                               if (++timeout_run >= 10)
-                                       /* disable forever... */
-                                       console->flags &= ~CON_ENABLED;
-                               return;
-                       }
-
-               timeout_run = 0;
-
-               if (*s == '\n') {
-                       outb('\r', LP_PORT_DATA);
-                       io_delay();
-                       io_delay();
-                       outb(LP_CONTROL_ASSERT_STROBE, LP_PORT_CONTROL);
-                       io_delay();
-                       io_delay();
-                       outb(LP_CONTROL_NEGATE_STROBE, LP_PORT_CONTROL);
-                       io_delay();
-                       io_delay();
-                       for (i = 1000000;
-                                       !(inb(LP_PORT_STATUS) & LP_MASK_nBUSY);
-                                       io_delay())
-                               if (!--i)
-                                       return;
-               }
-
-               outb(*s++, LP_PORT_DATA);
-               io_delay();
-               io_delay();
-               outb(LP_CONTROL_ASSERT_STROBE, LP_PORT_CONTROL);
-               io_delay();
-               io_delay();
-               outb(LP_CONTROL_NEGATE_STROBE, LP_PORT_CONTROL);
-               io_delay();
-               io_delay();
-
-               --count;
-       }
-}
-
-static struct console lp_old98_console = {
-       .name   = "lp_old98",
-       .write  = lp_old98_console_write,
-       .flags  = CON_PRINTBUFFER,
-       .index  = -1,
-};
-
-#endif /* console on lp_old98 */
-
-static int __init lp_old98_init(void)
-{
-       char *errmsg = "I/O ports already occupied, giving up.";
-
-#ifdef PC98_HW_H98
-       if (pc98_hw_flags & PC98_HW_H98)
-           if (!request_region(LP_PORT_H98MODE, 1, "lp_old98")
-               goto err1;
-#endif
-       if (!request_region(LP_PORT_DATA,   1, "lp_old98"))
-               goto err2;
-       if (!request_region(LP_PORT_STATUS, 1, "lp_old98"))
-               goto err3;
-       if (!request_region(LP_PORT_STROBE, 1, "lp_old98"))
-               goto err4;
-       if (!request_region(LP_PORT_EXTMODE, 1, "lp_old98"))
-               goto err5;
-       if (!register_chrdev(LP_MAJOR, "lp", &lp_old98_fops)) {
-#ifdef CONFIG_PC9800_OLDLP_CONSOLE
-               register_console(&lp_old98_console);
-               printk(KERN_INFO "lp_old98: console ready\n");
-#endif
-               /*
-                * rest are not needed by this driver,
-                * but for locking out other printer drivers...
-                */
-               lp_old98_init_device();
-               return 0;
-       } else
-               errmsg = "unable to register device";
-
-       release_region(LP_PORT_EXTMODE, 1);
-err5:
-       release_region(LP_PORT_STROBE, 1);
-err4:
-       release_region(LP_PORT_STATUS, 1);
-err3:
-       release_region(LP_PORT_DATA, 1);
-err2:
-#ifdef PC98_HW_H98
-       if (pc98_hw_flags & PC98_HW_H98)
-           release_region(LP_PORT_H98MODE, 1);
-
-err1:
-#endif
-       printk(KERN_ERR "lp_old98: %s\n", errmsg);
-       return -EBUSY;
-}
-
-static void __exit lp_old98_exit(void)
-{
-#ifdef CONFIG_PC9800_OLDLP_CONSOLE
-       unregister_console(&lp_old98_console);
-#endif
-       unregister_chrdev(LP_MAJOR, "lp");
-
-       release_region(LP_PORT_DATA,   1);
-       release_region(LP_PORT_STATUS, 1);
-       release_region(LP_PORT_STROBE, 1);
-#ifdef PC98_HW_H98
-       if (pc98_hw_flags & PC98_HW_H98)
-               release_region(LP_PORT_H98MODE, 1);
-#endif
-       release_region(LP_PORT_EXTMODE, 1);
-}
-
-#ifndef MODULE
-static int __init lp_old98_setup(char *str)
-{
-        int ints[4];
-
-        str = get_options(str, ARRAY_SIZE(ints), ints);
-        if (ints[0] > 0)
-               dc1_check = ints[1];
-        return 1;
-}
-__setup("lp_old98_dc1_check=", lp_old98_setup);
-#endif
-
-MODULE_PARM(dc1_check, "i");
-MODULE_AUTHOR("Kousuke Takai <tak@kmc.kyoto-u.ac.jp>");
-MODULE_DESCRIPTION("PC-9800 old printer port driver");
-MODULE_LICENSE("GPL");
-
-module_init(lp_old98_init);
-module_exit(lp_old98_exit);
diff --git a/drivers/char/upd4990a.c b/drivers/char/upd4990a.c
deleted file mode 100644 (file)
index f06f509..0000000
+++ /dev/null
@@ -1,432 +0,0 @@
-/*
- * NEC PC-9800 Real Time Clock interface for Linux     
- *
- * Copyright (C) 1997-2001  Linux/98 project,
- *                         Kyoto University Microcomputer Club.
- *
- * Based on:
- *     drivers/char/rtc.c by Paul Gortmaker
- *
- * Changes:
- *  2001-02-09 Call check_region on rtc_init and do not request I/O 0033h.
- *             Call del_timer and release_region on rtc_exit. -- tak
- *  2001-07-14 Rewrite <linux/upd4990a.h> and split to <linux/upd4990a.h>
- *             and <asm-i386/upd4990a.h>.
- *             Introduce a lot of spin_lock/unlock (&rtc_lock).
- */
-
-#define RTC98_VERSION  "1.2"
-
-#include <linux/module.h>
-#include <linux/kernel.h>
-#include <linux/types.h>
-#include <linux/miscdevice.h>
-#include <linux/ioport.h>
-#include <linux/fcntl.h>
-#include <linux/rtc.h>
-#include <linux/bcd.h>
-#include <linux/upd4990a.h>
-#include <linux/init.h>
-#include <linux/poll.h>
-#include <linux/proc_fs.h>
-#include <linux/spinlock.h>
-
-#include <asm/io.h>
-#include <asm/uaccess.h>
-#include <asm/system.h>
-
-/*
- *     We sponge a minor off of the misc major. No need slurping
- *     up another valuable major dev number for this. If you add
- *     an ioctl, make sure you don't conflict with SPARC's RTC
- *     ioctls.
- */
-
-static struct fasync_struct *rtc_async_queue;
-
-static DECLARE_WAIT_QUEUE_HEAD(rtc_wait);
-
-static struct timer_list rtc_uie_timer;
-static u8 old_refclk;
-
-static int rtc_ioctl(struct inode *inode, struct file *file,
-                       unsigned int cmd, unsigned long arg);
-
-static int rtc_read_proc(char *page, char **start, off_t off,
-                         int count, int *eof, void *data);
-
-/*
- *     Bits in rtc_status. (5 bits of room for future expansion)
- */
-
-#define RTC_IS_OPEN            0x01    /* means /dev/rtc is in use     */
-#define RTC_TIMER_ON            0x02    /* not used */
-#define RTC_UIE_TIMER_ON        0x04   /* UIE emulation timer is active */
-
-/*
- * rtc_status is never changed by rtc_interrupt, and ioctl/open/close is
- * protected by the big kernel lock. However, ioctl can still disable the timer
- * in rtc_status and then with del_timer after the interrupt has read
- * rtc_status but before mod_timer is called, which would then reenable the
- * timer (but you would need to have an awful timing before you'd trip on it)
- */
-static unsigned char rtc_status;       /* bitmapped status byte.       */
-static unsigned long rtc_irq_data;     /* our output to the world      */
-
-static const unsigned char days_in_mo[] = 
-{31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31};
-
-extern spinlock_t rtc_lock;    /* defined in arch/i386/kernel/time.c */
-
-static void rtc_uie_intr(unsigned long data)
-{
-       u8 refclk, tmp;
-
-       /* Kernel timer does del_timer internally before calling
-          each timer entry, so this is unnecessary.
-          del_timer(&rtc_uie_timer);  */
-       spin_lock(&rtc_lock);
-
-       /* Detect rising edge of 1Hz reference clock.  */
-       refclk = UPD4990A_READ_DATA();
-       tmp = old_refclk & refclk;
-       old_refclk = ~refclk;
-       if (!(tmp & 1))
-               rtc_irq_data += 0x100;
-
-       spin_unlock(&rtc_lock);
-
-       if (!(tmp & 1)) {
-               /* Now do the rest of the actions */
-               wake_up_interruptible(&rtc_wait);
-               kill_fasync(&rtc_async_queue, SIGIO, POLL_IN);
-       }
-
-       rtc_uie_timer.expires = jiffies + 1;
-       add_timer(&rtc_uie_timer);
-}
-
-/*
- *     Now all the various file operations that we export.
- */
-
-static ssize_t rtc_read(struct file *file, char *buf,
-                       size_t count, loff_t *ppos)
-{
-       DECLARE_WAITQUEUE(wait, current);
-       unsigned long data;
-       ssize_t retval = 0;
-       
-       if (count < sizeof(unsigned long))
-               return -EINVAL;
-
-       add_wait_queue(&rtc_wait, &wait);
-
-       set_current_state(TASK_INTERRUPTIBLE);
-
-       do {
-               /* First make it right. Then make it fast. Putting this whole
-                * block within the parentheses of a while would be too
-                * confusing. And no, xchg() is not the answer. */
-               spin_lock_irq(&rtc_lock);
-               data = rtc_irq_data;
-               rtc_irq_data = 0;
-               spin_unlock_irq(&rtc_lock);
-
-               if (data != 0)
-                       break;
-               if (file->f_flags & O_NONBLOCK) {
-                       retval = -EAGAIN;
-                       goto out;
-               }
-               if (signal_pending(current)) {
-                       retval = -ERESTARTSYS;
-                       goto out;
-               }
-               schedule();
-       } while (1);
-
-       retval = put_user(data, (unsigned long *)buf);
-       if (!retval)
-               retval = sizeof(unsigned long); 
- out:
-       set_current_state(TASK_RUNNING);
-       remove_wait_queue(&rtc_wait, &wait);
-
-       return retval;
-}
-
-static int rtc_ioctl(struct inode *inode, struct file *file, unsigned int cmd,
-                    unsigned long arg)
-{
-       struct rtc_time wtime; 
-       struct upd4990a_raw_data raw;
-
-       switch (cmd) {
-       case RTC_UIE_OFF:       /* Mask ints from RTC updates.  */
-               spin_lock_irq(&rtc_lock);
-               if (rtc_status & RTC_UIE_TIMER_ON) {
-                       rtc_status &= ~RTC_UIE_TIMER_ON;
-                       del_timer(&rtc_uie_timer);
-               }
-               spin_unlock_irq(&rtc_lock);
-               return 0;
-
-       case RTC_UIE_ON:        /* Allow ints for RTC updates.  */
-               spin_lock_irq(&rtc_lock);
-               rtc_irq_data = 0;
-               if (!(rtc_status & RTC_UIE_TIMER_ON)) {
-                       rtc_status |= RTC_UIE_TIMER_ON;
-                       rtc_uie_timer.expires = jiffies + 1;
-                       add_timer(&rtc_uie_timer);
-               }
-               /* Just in case... */
-               upd4990a_serial_command(UPD4990A_REGISTER_HOLD);
-               old_refclk = ~UPD4990A_READ_DATA();
-               spin_unlock_irq(&rtc_lock);
-               return 0;
-
-       case RTC_RD_TIME:       /* Read the time/date from RTC  */
-               spin_lock_irq(&rtc_lock);
-               upd4990a_get_time(&raw, 0);
-               spin_unlock_irq(&rtc_lock);
-
-               wtime.tm_sec    = BCD2BIN(raw.sec);
-               wtime.tm_min    = BCD2BIN(raw.min);
-               wtime.tm_hour   = BCD2BIN(raw.hour);
-               wtime.tm_mday   = BCD2BIN(raw.mday);
-               wtime.tm_mon    = raw.mon - 1; /* convert to 0-base */
-               wtime.tm_wday   = raw.wday;
-
-               /*
-                * Account for differences between how the RTC uses the values
-                * and how they are defined in a struct rtc_time;
-                */
-               if ((wtime.tm_year = BCD2BIN(raw.year)) < 95)
-                       wtime.tm_year += 100;
-
-               wtime.tm_isdst = 0;
-               break;
-
-       case RTC_SET_TIME:      /* Set the RTC */
-       {
-               int leap_yr;
-
-               if (!capable(CAP_SYS_TIME))
-                       return -EACCES;
-
-               if (copy_from_user(&wtime, (struct rtc_time *) arg,
-                                   sizeof (struct rtc_time)))
-                       return -EFAULT;
-
-               /* Valid year is 1995 - 2094, inclusive.  */
-               if (wtime.tm_year < 95 || wtime.tm_year > 194)
-                       return -EINVAL;
-
-               if (wtime.tm_mon > 11 || wtime.tm_mday == 0)
-                       return -EINVAL;
-
-               /* For acceptable year domain (1995 - 2094),
-                  this IS sufficient.  */
-               leap_yr = !(wtime.tm_year % 4);
-
-               if (wtime.tm_mday > (days_in_mo[wtime.tm_mon]
-                                    + (wtime.tm_mon == 2 && leap_yr)))
-                       return -EINVAL;
-                       
-               if (wtime.tm_hour >= 24
-                   || wtime.tm_min >= 60 || wtime.tm_sec >= 60)
-                       return -EINVAL;
-
-               if (wtime.tm_wday > 6)
-                       return -EINVAL;
-
-               raw.sec  = BIN2BCD(wtime.tm_sec);
-               raw.min  = BIN2BCD(wtime.tm_min);
-               raw.hour = BIN2BCD(wtime.tm_hour);
-               raw.mday = BIN2BCD(wtime.tm_mday);
-               raw.mon  = wtime.tm_mon + 1;
-               raw.wday = wtime.tm_wday;
-               raw.year = BIN2BCD(wtime.tm_year % 100);
-
-               spin_lock_irq(&rtc_lock);
-               upd4990a_set_time(&raw, 0);
-               spin_unlock_irq(&rtc_lock);
-
-               return 0;
-       }
-       default:
-               return -EINVAL;
-       }
-       return copy_to_user((void *)arg, &wtime, sizeof wtime) ? -EFAULT : 0;
-}
-
-/*
- *     We enforce only one user at a time here with the open/close.
- *     Also clear the previous interrupt data on an open, and clean
- *     up things on a close.
- */
-
-static int rtc_open(struct inode *inode, struct file *file)
-{
-       spin_lock_irq(&rtc_lock);
-
-       if(rtc_status & RTC_IS_OPEN)
-               goto out_busy;
-
-       rtc_status |= RTC_IS_OPEN;
-
-       rtc_irq_data = 0;
-       spin_unlock_irq(&rtc_lock);
-       return 0;
-
- out_busy:
-       spin_unlock_irq(&rtc_lock);
-       return -EBUSY;
-}
-
-static int rtc_fasync(int fd, struct file *filp, int on)
-{
-       return fasync_helper(fd, filp, on, &rtc_async_queue);
-}
-
-static int rtc_release(struct inode *inode, struct file *file)
-{
-       del_timer(&rtc_uie_timer);
-
-       if (file->f_flags & FASYNC)
-               rtc_fasync(-1, file, 0);
-
-       rtc_irq_data = 0;
-
-       /* No need for locking -- nobody else can do anything until this rmw is
-        * committed, and no timer is running. */
-       rtc_status &= ~(RTC_IS_OPEN | RTC_UIE_TIMER_ON);
-       return 0;
-}
-
-static unsigned int rtc_poll(struct file *file, poll_table *wait)
-{
-       unsigned long l;
-
-       poll_wait(file, &rtc_wait, wait);
-
-       spin_lock_irq(&rtc_lock);
-       l = rtc_irq_data;
-       spin_unlock_irq(&rtc_lock);
-
-       if (l != 0)
-               return POLLIN | POLLRDNORM;
-       return 0;
-}
-
-/*
- *     The various file operations we support.
- */
-
-static struct file_operations rtc_fops = {
-       .owner          = THIS_MODULE,
-       .read           = rtc_read,
-       .poll           = rtc_poll,
-       .ioctl          = rtc_ioctl,
-       .open           = rtc_open,
-       .release        = rtc_release,
-       .fasync         = rtc_fasync,
-};
-
-static struct miscdevice rtc_dev=
-{
-       .minor  = RTC_MINOR,
-       .name   = "rtc",
-       .fops   = &rtc_fops,
-};
-
-static int __init rtc_init(void)
-{
-       int err = 0;
-
-       if (!request_region(UPD4990A_IO, 1, "rtc")) {
-               printk(KERN_ERR "upd4990a: could not acquire I/O port %#x\n",
-                       UPD4990A_IO);
-               return -EBUSY;
-       }
-
-       err = misc_register(&rtc_dev);
-       if (err) {
-               printk(KERN_ERR "upd4990a: can't misc_register() on minor=%d\n",
-                       RTC_MINOR);
-               release_region(UPD4990A_IO, 1);
-               return err;
-       }
-               
-#if 0
-       printk(KERN_INFO "\xB6\xDA\xDD\xC0\xDE \xC4\xDE\xB9\xB2 Driver\n");  /* Calender Clock Driver */
-#else
-       printk(KERN_INFO
-              "Real Time Clock driver for NEC PC-9800 v" RTC98_VERSION "\n");
-#endif
-       create_proc_read_entry("driver/rtc", 0, NULL, rtc_read_proc, NULL);
-
-       init_timer(&rtc_uie_timer);
-       rtc_uie_timer.function = rtc_uie_intr;
-
-       return 0;
-}
-
-module_init (rtc_init);
-
-static void __exit rtc_exit(void)
-{
-       del_timer(&rtc_uie_timer);
-       release_region(UPD4990A_IO, 1);
-       remove_proc_entry("driver/rtc", NULL);
-       misc_deregister(&rtc_dev);
-}
-
-module_exit (rtc_exit);
-
-/*
- *     Info exported via "/proc/driver/rtc".
- */
-
-static inline int rtc_get_status(char *buf)
-{
-       char *p;
-       unsigned int year;
-       struct upd4990a_raw_data data;
-
-       p = buf;
-
-       upd4990a_get_time(&data, 0);
-
-       /*
-        * There is no way to tell if the luser has the RTC set for local
-        * time or for Universal Standard Time (GMT). Probably local though.
-        */
-       if ((year = BCD2BIN(data.year) + 1900) < 1995)
-               year += 100;
-       p += sprintf(p,
-                    "rtc_time\t: %02d:%02d:%02d\n"
-                    "rtc_date\t: %04d-%02d-%02d\n",
-                    BCD2BIN(data.hour), BCD2BIN(data.min),
-                    BCD2BIN(data.sec),
-                    year, data.mon, BCD2BIN(data.mday));
-
-       return  p - buf;
-}
-
-static int rtc_read_proc(char *page, char **start, off_t off,
-                        int count, int *eof, void *data)
-{
-       int len = rtc_get_status(page);
-
-       if (len <= off + count)
-               *eof = 1;
-       *start = page + off;
-       len -= off;
-       if (len > count)
-               len = count;
-       if (len < 0)
-               len = 0;
-       return len;
-}
diff --git a/drivers/char/watchdog/ixp2000_wdt.c b/drivers/char/watchdog/ixp2000_wdt.c
deleted file mode 100644 (file)
index ebcaf79..0000000
+++ /dev/null
@@ -1,219 +0,0 @@
-/*
- * drivers/watchdog/ixp2000_wdt.c
- *
- * Watchdog driver for Intel IXP2000 network processors
- *
- * Adapted from the IXP4xx watchdog driver by Lennert Buytenhek.
- * The original version carries these notices:
- *
- * Author: Deepak Saxena <dsaxena@plexity.net>
- *
- * Copyright 2004 (c) MontaVista, Software, Inc.
- * Based on sa1100 driver, Copyright (C) 2000 Oleg Drokin <green@crimea.edu>
- *
- * This file is licensed under  the terms of the GNU General Public
- * License version 2. This program is licensed "as is" without any
- * warranty of any kind, whether express or implied.
- */
-
-#include <linux/config.h>
-#include <linux/module.h>
-#include <linux/moduleparam.h>
-#include <linux/types.h>
-#include <linux/kernel.h>
-#include <linux/fs.h>
-#include <linux/miscdevice.h>
-#include <linux/watchdog.h>
-#include <linux/init.h>
-
-#include <asm/hardware.h>
-#include <asm/bitops.h>
-#include <asm/uaccess.h>
-
-#ifdef CONFIG_WATCHDOG_NOWAYOUT
-static int nowayout = 1;
-#else
-static int nowayout = 0;
-#endif
-static unsigned int heartbeat = 60;    /* (secs) Default is 1 minute */
-static unsigned long wdt_status;
-
-#define        WDT_IN_USE              0
-#define        WDT_OK_TO_CLOSE         1
-
-static unsigned long wdt_tick_rate;
-
-static void
-wdt_enable(void)
-{
-       ixp2000_reg_write(IXP2000_RESET0, *(IXP2000_RESET0) | WDT_RESET_ENABLE);
-       ixp2000_reg_write(IXP2000_TWDE, WDT_ENABLE);
-       ixp2000_reg_write(IXP2000_T4_CLD, heartbeat * wdt_tick_rate);
-       ixp2000_reg_write(IXP2000_T4_CTL, TIMER_DIVIDER_256 | TIMER_ENABLE);
-}
-
-static void
-wdt_disable(void)
-{
-       ixp2000_reg_write(IXP2000_T4_CTL, 0);
-}
-
-static void
-wdt_keepalive(void)
-{
-       ixp2000_reg_write(IXP2000_T4_CLD, heartbeat * wdt_tick_rate);
-}
-
-static int
-ixp2000_wdt_open(struct inode *inode, struct file *file)
-{
-       if (test_and_set_bit(WDT_IN_USE, &wdt_status))
-               return -EBUSY;
-
-       clear_bit(WDT_OK_TO_CLOSE, &wdt_status);
-
-       wdt_enable();
-
-       return nonseekable_open(inode, file);
-}
-
-static ssize_t
-ixp2000_wdt_write(struct file *file, const char *data, size_t len, loff_t *ppos)
-{
-       if (len) {
-               if (!nowayout) {
-                       size_t i;
-
-                       clear_bit(WDT_OK_TO_CLOSE, &wdt_status);
-
-                       for (i = 0; i != len; i++) {
-                               char c;
-
-                               if (get_user(c, data + i))
-                                       return -EFAULT;
-                               if (c == 'V')
-                                       set_bit(WDT_OK_TO_CLOSE, &wdt_status);
-                       }
-               }
-               wdt_keepalive();
-       }
-
-       return len;
-}
-
-
-static struct watchdog_info ident = {
-       .options        = WDIOF_MAGICCLOSE | WDIOF_SETTIMEOUT |
-                               WDIOF_KEEPALIVEPING,
-       .identity       = "IXP2000 Watchdog",
-};
-
-static int
-ixp2000_wdt_ioctl(struct inode *inode, struct file *file, unsigned int cmd,
-                       unsigned long arg)
-{
-       int ret = -ENOIOCTLCMD;
-       int time;
-
-       switch (cmd) {
-       case WDIOC_GETSUPPORT:
-               ret = copy_to_user((struct watchdog_info *)arg, &ident,
-                                  sizeof(ident)) ? -EFAULT : 0;
-               break;
-
-       case WDIOC_GETSTATUS:
-               ret = put_user(0, (int *)arg);
-               break;
-
-       case WDIOC_GETBOOTSTATUS:
-               ret = put_user(0, (int *)arg);
-               break;
-
-       case WDIOC_SETTIMEOUT:
-               ret = get_user(time, (int *)arg);
-               if (ret)
-                       break;
-
-               if (time <= 0 || time > 60) {
-                       ret = -EINVAL;
-                       break;
-               }
-
-               heartbeat = time;
-               wdt_keepalive();
-               /* Fall through */
-
-       case WDIOC_GETTIMEOUT:
-               ret = put_user(heartbeat, (int *)arg);
-               break;
-
-       case WDIOC_KEEPALIVE:
-               wdt_enable();
-               ret = 0;
-               break;
-       }
-
-       return ret;
-}
-
-static int
-ixp2000_wdt_release(struct inode *inode, struct file *file)
-{
-       if (test_bit(WDT_OK_TO_CLOSE, &wdt_status)) {
-               wdt_disable();
-       } else {
-               printk(KERN_CRIT "WATCHDOG: Device closed unexpectdly - "
-                                       "timer will not stop\n");
-       }
-
-       clear_bit(WDT_IN_USE, &wdt_status);
-       clear_bit(WDT_OK_TO_CLOSE, &wdt_status);
-
-       return 0;
-}
-
-
-static struct file_operations ixp2000_wdt_fops =
-{
-       .owner          = THIS_MODULE,
-       .llseek         = no_llseek,
-       .write          = ixp2000_wdt_write,
-       .ioctl          = ixp2000_wdt_ioctl,
-       .open           = ixp2000_wdt_open,
-       .release        = ixp2000_wdt_release,
-};
-
-static struct miscdevice ixp2000_wdt_miscdev =
-{
-       .minor          = WATCHDOG_MINOR,
-       .name           = "IXP2000 Watchdog",
-       .fops           = &ixp2000_wdt_fops,
-};
-
-static int __init ixp2000_wdt_init(void)
-{
-       wdt_tick_rate = (*IXP2000_T1_CLD * HZ)/ 256;;
-
-       return misc_register(&ixp2000_wdt_miscdev);
-}
-
-static void __exit ixp2000_wdt_exit(void)
-{
-       misc_deregister(&ixp2000_wdt_miscdev);
-}
-
-module_init(ixp2000_wdt_init);
-module_exit(ixp2000_wdt_exit);
-
-MODULE_AUTHOR("Deepak Saxena <dsaxena@plexity.net">);
-MODULE_DESCRIPTION("IXP2000 Network Processor Watchdog");
-
-module_param(heartbeat, int, 0);
-MODULE_PARM_DESC(heartbeat, "Watchdog heartbeat in seconds (default 60s)");
-
-module_param(nowayout, int, 0);
-MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started");
-
-MODULE_LICENSE("GPL");
-MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR);
-
diff --git a/drivers/ide/ide-tcq.c b/drivers/ide/ide-tcq.c
deleted file mode 100644 (file)
index 4284fba..0000000
+++ /dev/null
@@ -1,808 +0,0 @@
-/*
- * Copyright (C) 2001, 2002 Jens Axboe <axboe@suse.de>
- *
- * 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.
- *
- * 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
- */
-
-/*
- * Support for the DMA queued protocol, which enables ATA disk drives to
- * use tagged command queueing.
- */
-#include <linux/config.h>
-#include <linux/types.h>
-#include <linux/kernel.h>
-#include <linux/init.h>
-#include <linux/ide.h>
-
-#include <asm/io.h>
-#include <asm/delay.h>
-
-/*
- * warning: it will be _very_ verbose if defined
- */
-#undef IDE_TCQ_DEBUG
-
-#ifdef IDE_TCQ_DEBUG
-#define TCQ_PRINTK printk
-#else
-#define TCQ_PRINTK(x...)
-#endif
-
-/*
- * use nIEN or not
- */
-#undef IDE_TCQ_NIEN
-
-/*
- * we are leaving the SERVICE interrupt alone, IBM drives have it
- * on per default and it can't be turned off. Doesn't matter, this
- * is the sane config.
- */
-#undef IDE_TCQ_FIDDLE_SI
-
-/*
- * bad drive blacklist, for drives that raport tcq capability but don't
- * work reliably with the default config. initially from freebsd table.
- */
-struct ide_tcq_blacklist {
-       char *model;
-       char works;
-       unsigned int max_sectors;
-};
-
-static struct ide_tcq_blacklist ide_tcq_blacklist[] = {
-       {
-               .model =        "IBM-DTTA",
-               .works =        1,
-               .max_sectors =  128,
-       },
-       {
-               .model =        "IBM-DJNA",
-               .works =        0,
-       },
-       {
-               .model =        "WDC AC",
-               .works =        0,
-       },
-       {
-               .model =        NULL,
-       },
-};
-
-ide_startstop_t ide_dmaq_intr(ide_drive_t *drive);
-ide_startstop_t ide_service(ide_drive_t *drive);
-
-static struct ide_tcq_blacklist *ide_find_drive_blacklist(ide_drive_t *drive)
-{
-       struct ide_tcq_blacklist *itb;
-       int i = 0;
-
-       do {
-               itb = &ide_tcq_blacklist[i];
-
-               if (!itb->model)
-                       break;
-
-               if (!strncmp(drive->id->model, itb->model, strlen(itb->model)))
-                       return itb;
-
-               i++;
-       } while (1);
-
-       return NULL;
-}
-
-static inline void drive_ctl_nien(ide_drive_t *drive, int set)
-{
-#ifdef IDE_TCQ_NIEN
-       if (IDE_CONTROL_REG) {
-               int mask = set ? 0x02 : 0x00;
-
-               hwif->OUTB(drive->ctl | mask, IDE_CONTROL_REG);
-       }
-#endif
-}
-
-static ide_startstop_t ide_tcq_nop_handler(ide_drive_t *drive)
-{
-       ide_task_t *args = HWGROUP(drive)->rq->special;
-       ide_hwif_t *hwif = HWIF(drive);
-       int auto_poll_check = 0;
-       u8 stat, err;
-
-       if (args->tfRegister[IDE_FEATURE_OFFSET] & 0x01)
-               auto_poll_check = 1;
-
-       local_irq_enable();
-
-       stat = hwif->INB(IDE_STATUS_REG);
-       err = hwif->INB(IDE_ERROR_REG);
-       ide_end_drive_cmd(drive, stat, err);
-
-       /*
-        * do taskfile and check ABRT bit -- intelligent adapters will not
-        * pass NOP with sub-code 0x01 to device, so the command will not
-        * fail there
-        */
-       if (auto_poll_check) {
-               if (!(args->tfRegister[IDE_FEATURE_OFFSET] & ABRT_ERR)) {
-                       HWIF(drive)->auto_poll = 1;
-                       printk("%s: NOP Auto-poll enabled\n",HWIF(drive)->name);
-               }
-       }
-
-       kfree(args);
-       return ide_stopped;
-}
-
-/*
- * if we encounter _any_ error doing I/O to one of the tags, we must
- * invalidate the pending queue. clear the software busy queue and requeue
- * on the request queue for restart. issue a WIN_NOP to clear hardware queue
- */
-static void ide_tcq_invalidate_queue(ide_drive_t *drive)
-{
-       ide_hwgroup_t *hwgroup = HWGROUP(drive);
-       request_queue_t *q = drive->queue;
-       struct request *rq;
-       unsigned long flags;
-
-       printk("%s: invalidating tag queue (%d commands)\n", drive->name, ata_pending_commands(drive));
-
-       /*
-        * first kill timer and block queue
-        */
-       spin_lock_irqsave(&ide_lock, flags);
-
-       del_timer(&hwgroup->timer);
-
-       if (HWIF(drive)->dma)
-               HWIF(drive)->ide_dma_end(drive);
-
-       blk_queue_invalidate_tags(q);
-
-       drive->using_tcq = 0;
-       drive->queue_depth = 1;
-       hwgroup->busy = 0;
-       hwgroup->handler = NULL;
-
-       spin_unlock_irqrestore(&ide_lock, flags);
-
-       /*
-        * now kill hardware queue with a NOP
-        */
-       rq = &hwgroup->wrq;
-       ide_init_drive_cmd(rq);
-       rq->buffer = hwgroup->cmd_buf;
-       memset(rq->buffer, 0, sizeof(hwgroup->cmd_buf));
-       rq->buffer[0] = WIN_NOP;
-       ide_do_drive_cmd(drive, rq, ide_preempt);
-}
-
-void ide_tcq_intr_timeout(unsigned long data)
-{
-       ide_drive_t *drive = (ide_drive_t *) data;
-       ide_hwgroup_t *hwgroup = HWGROUP(drive);
-       ide_hwif_t *hwif = HWIF(drive);
-       unsigned long flags;
-
-       printk(KERN_ERR "ide_tcq_intr_timeout: timeout waiting for %s interrupt\n", hwgroup->rq ? "completion" : "service");
-
-       spin_lock_irqsave(&ide_lock, flags);
-
-       if (!hwgroup->busy)
-               printk(KERN_ERR "ide_tcq_intr_timeout: hwgroup not busy\n");
-       if (hwgroup->handler == NULL)
-               printk(KERN_ERR "ide_tcq_intr_timeout: missing isr!\n");
-
-       hwgroup->busy = 1;
-       spin_unlock_irqrestore(&ide_lock, flags);
-
-       /*
-        * if pending commands, try service before giving up
-        */
-       if (ata_pending_commands(drive)) {
-               u8 stat = hwif->INB(IDE_STATUS_REG);
-
-               if ((stat & SRV_STAT) && (ide_service(drive) == ide_started))
-                       return;
-       }
-
-       if (drive)
-               ide_tcq_invalidate_queue(drive);
-}
-
-void __ide_tcq_set_intr(ide_hwgroup_t *hwgroup, ide_handler_t *handler)
-{
-       /*
-        * always just bump the timer for now, the timeout handling will
-        * have to be changed to be per-command
-        */
-       hwgroup->timer.function = ide_tcq_intr_timeout;
-       hwgroup->timer.data = (unsigned long) hwgroup->drive;
-       mod_timer(&hwgroup->timer, jiffies + 5 * HZ);
-
-       hwgroup->handler = handler;
-}
-
-void ide_tcq_set_intr(ide_hwgroup_t *hwgroup, ide_handler_t *handler)
-{
-       unsigned long flags;
-
-       spin_lock_irqsave(&ide_lock, flags);
-       __ide_tcq_set_intr(hwgroup, handler);
-       spin_unlock_irqrestore(&ide_lock, flags);
-}
-
-/*
- * wait 400ns, then poll for busy_mask to clear from alt status
- */
-#define IDE_TCQ_WAIT   (10000)
-int ide_tcq_wait_altstat(ide_drive_t *drive, byte *stat, byte busy_mask)
-{
-       ide_hwif_t *hwif = HWIF(drive);
-       int i = 0;
-
-       udelay(1);
-
-       do {
-               *stat = hwif->INB(IDE_ALTSTATUS_REG);
-
-               if (!(*stat & busy_mask))
-                       break;
-
-               if (unlikely(i++ > IDE_TCQ_WAIT))
-                       return 1;
-
-               udelay(10);
-       } while (1);
-
-       return 0;
-}
-
-/*
- * issue SERVICE command to drive -- drive must have been selected first,
- * and it must have reported a need for service (status has SRV_STAT set)
- *
- * Also, nIEN must be set as not to need protection against ide_dmaq_intr
- */
-ide_startstop_t ide_service(ide_drive_t *drive)
-{
-       ide_hwif_t *hwif = HWIF(drive);
-       unsigned long flags;
-       struct request *rq;
-       byte feat, stat;
-       int tag;
-
-       TCQ_PRINTK("%s: started service\n", drive->name);
-
-       /*
-        * could be called with IDE_DMA in-progress from invalidate
-        * handler, refuse to do anything
-        */
-       if (hwif->dma)
-               return ide_stopped;
-
-       /*
-        * need to select the right drive first...
-        */
-       if (drive != HWGROUP(drive)->drive) {
-               SELECT_DRIVE(drive);
-               udelay(10);
-       }
-
-       drive_ctl_nien(drive, 1);
-
-       /*
-        * send SERVICE, wait 400ns, wait for BUSY_STAT to clear
-        */
-       hwif->OUTB(WIN_QUEUED_SERVICE, IDE_COMMAND_REG);
-
-       if (ide_tcq_wait_altstat(drive, &stat, BUSY_STAT)) {
-               printk(KERN_ERR "ide_service: BUSY clear took too long\n");
-               ide_dump_status(drive, "ide_service", stat);
-               ide_tcq_invalidate_queue(drive);
-               return ide_stopped;
-       }
-
-       drive_ctl_nien(drive, 0);
-
-       /*
-        * FIXME, invalidate queue
-        */
-       if (stat & ERR_STAT) {
-               ide_dump_status(drive, "ide_service", stat);
-               ide_tcq_invalidate_queue(drive);
-               return ide_stopped;
-       }
-
-       /*
-        * should not happen, a buggy device could introduce loop
-        */
-       feat = hwif->INB(IDE_NSECTOR_REG);
-       if (feat & REL) {
-               HWGROUP(drive)->rq = NULL;
-               printk(KERN_ERR "%s: release in service\n", drive->name);
-               return ide_stopped;
-       }
-
-       tag = feat >> 3;
-
-       TCQ_PRINTK("ide_service: stat %x, feat %x\n", stat, feat);
-
-       spin_lock_irqsave(&ide_lock, flags);
-
-       if ((rq = blk_queue_find_tag(drive->queue, tag))) {
-               HWGROUP(drive)->rq = rq;
-
-               /*
-                * we'll start a dma read or write, device will trigger
-                * interrupt to indicate end of transfer, release is not
-                * allowed
-                */
-               TCQ_PRINTK("ide_service: starting command, stat=%x\n", stat);
-               spin_unlock_irqrestore(&ide_lock, flags);
-               return __ide_dma_queued_start(drive);
-       }
-
-       printk(KERN_ERR "ide_service: missing request for tag %d\n", tag);
-       spin_unlock_irqrestore(&ide_lock, flags);
-       return ide_stopped;
-}
-
-ide_startstop_t ide_check_service(ide_drive_t *drive)
-{
-       ide_hwif_t *hwif = HWIF(drive);
-       byte stat;
-
-       TCQ_PRINTK("%s: ide_check_service\n", drive->name);
-
-       if (!ata_pending_commands(drive))
-               return ide_stopped;
-
-       stat = hwif->INB(IDE_STATUS_REG);
-       if (stat & SRV_STAT)
-               return ide_service(drive);
-
-       /*
-        * we have pending commands, wait for interrupt
-        */
-       TCQ_PRINTK("%s: wait for service interrupt\n", drive->name);
-       ide_tcq_set_intr(HWGROUP(drive), ide_dmaq_intr);
-       return ide_started;
-}
-
-ide_startstop_t ide_dmaq_complete(ide_drive_t *drive, struct request *rq, byte stat)
-{
-       byte dma_stat;
-
-       /*
-        * transfer was in progress, stop DMA engine
-        */
-       dma_stat = HWIF(drive)->ide_dma_end(drive);
-
-       /*
-        * must be end of I/O, check status and complete as necessary
-        */
-       if (unlikely(!OK_STAT(stat, READY_STAT, drive->bad_wstat | DRQ_STAT))) {
-               printk(KERN_ERR "ide_dmaq_intr: %s: error status %x\n",drive->name,stat);
-               ide_dump_status(drive, "ide_dmaq_complete", stat);
-               ide_tcq_invalidate_queue(drive);
-               return ide_stopped;
-       }
-
-       if (dma_stat)
-               printk(KERN_WARNING "%s: bad DMA status (dma_stat=%x)\n", drive->name, dma_stat);
-
-       TCQ_PRINTK("ide_dmaq_complete: ending %p, tag %d\n", rq, rq->tag);
-       ide_end_request(drive, 1, rq->nr_sectors);
-
-       /*
-        * we completed this command, check if we can service a new command
-        */
-       return ide_check_service(drive);
-}
-
-/*
- * intr handler for queued dma operations. this can be entered for two
- * reasons:
- *
- * 1) device has completed dma transfer
- * 2) service request to start a command
- *
- * if the drive has an active tag, we first complete that request before
- * processing any pending SERVICE.
- */
-ide_startstop_t ide_dmaq_intr(ide_drive_t *drive)
-{
-       struct request *rq = HWGROUP(drive)->rq;
-       ide_hwif_t *hwif = HWIF(drive);
-       byte stat = hwif->INB(IDE_STATUS_REG);
-
-       TCQ_PRINTK("ide_dmaq_intr: stat=%x\n", stat);
-
-       /*
-        * if a command completion interrupt is pending, do that first and
-        * check service afterwards
-        */
-       if (rq) {
-               TCQ_PRINTK("ide_dmaq_intr: completion\n");
-               return ide_dmaq_complete(drive, rq, stat);
-       }
-
-       /*
-        * service interrupt
-        */
-       if (stat & SRV_STAT) {
-               TCQ_PRINTK("ide_dmaq_intr: SERV (stat=%x)\n", stat);
-               return ide_service(drive);
-       }
-
-       printk("ide_dmaq_intr: stat=%x, not expected\n", stat);
-       return ide_check_service(drive);
-}
-
-/*
- * check if the ata adapter this drive is attached to supports the
- * NOP auto-poll for multiple tcq enabled drives on one channel
- */
-static int ide_tcq_check_autopoll(ide_drive_t *drive)
-{
-       ide_task_t *args;
-       int i, drives;
-
-       /*
-        * only need to probe if both drives on a channel support tcq
-        */
-       for (i = 0, drives = 0; i < MAX_DRIVES; i++)
-               if (HWIF(drive)->drives[i].present && drive->media == ide_disk)
-                       drives++;
-
-       if (drives <= 1)
-               return 0;
-
-       /*
-        * what a mess...
-        */
-       args = kmalloc(sizeof(*args), GFP_ATOMIC);
-       if (!args)
-               return 1;
-
-       memset(args, 0, sizeof(*args));
-
-       args->tfRegister[IDE_FEATURE_OFFSET] = 0x01;
-       args->tfRegister[IDE_COMMAND_OFFSET] = WIN_NOP;
-       args->command_type = IDE_DRIVE_TASK_NO_DATA;
-       args->handler = ide_tcq_nop_handler;
-       return ide_raw_taskfile(drive, args, NULL);
-}
-
-/*
- * configure the drive for tcq
- */
-static int ide_tcq_configure(ide_drive_t *drive)
-{
-       int tcq_mask = 1 << 1 | 1 << 14;
-       int tcq_bits = tcq_mask | 1 << 15;
-       ide_task_t *args;
-
-       /*
-        * bit 14 and 1 must be set in word 83 of the device id to indicate
-        * support for dma queued protocol, and bit 15 must be cleared
-        */
-       if ((drive->id->command_set_2 & tcq_bits) ^ tcq_mask) {
-               printk(KERN_INFO "%s: TCQ not supported\n", drive->name);
-               return -EIO;
-       }
-
-       args = kmalloc(sizeof(*args), GFP_ATOMIC);
-       if (!args)
-               return -ENOMEM;
-
-       memset(args, 0, sizeof(ide_task_t));
-       args->tfRegister[IDE_COMMAND_OFFSET] = WIN_SETFEATURES;
-       args->tfRegister[IDE_FEATURE_OFFSET] = SETFEATURES_EN_WCACHE;
-       args->command_type = IDE_DRIVE_TASK_NO_DATA;
-       args->handler      = &task_no_data_intr;
-
-       if (ide_raw_taskfile(drive, args, NULL)) {
-               printk(KERN_WARNING "%s: failed to enable write cache\n", drive->name);
-               goto err;
-       }
-
-       /*
-        * disable RELease interrupt, it's quicker to poll this after
-        * having sent the command opcode
-        */
-       memset(args, 0, sizeof(ide_task_t));
-       args->tfRegister[IDE_COMMAND_OFFSET] = WIN_SETFEATURES;
-       args->tfRegister[IDE_FEATURE_OFFSET] = SETFEATURES_DIS_RI;
-       args->command_type = IDE_DRIVE_TASK_NO_DATA;
-       args->handler      = &task_no_data_intr;
-
-       if (ide_raw_taskfile(drive, args, NULL)) {
-               printk(KERN_ERR "%s: disabling release interrupt fail\n", drive->name);
-               goto err;
-       }
-
-#ifdef IDE_TCQ_FIDDLE_SI
-       /*
-        * enable SERVICE interrupt
-        */
-       memset(args, 0, sizeof(ide_task_t));
-       args->tfRegister[IDE_COMMAND_OFFSET] = WIN_SETFEATURES;
-       args->tfRegister[IDE_FEATURE_OFFSET] = SETFEATURES_EN_SI;
-       args->command_type = IDE_DRIVE_TASK_NO_DATA;
-       args->handler      = &task_no_data_intr;
-
-       if (ide_raw_taskfile(drive, args, NULL)) {
-               printk(KERN_ERR "%s: enabling service interrupt fail\n", drive->name);
-               goto err;
-       }
-#endif
-
-       kfree(args);
-       return 0;
-err:
-       kfree(args);
-       return -EIO;
-}
-
-/*
- * for now assume that command list is always as big as we need and don't
- * attempt to shrink it on tcq disable
- */
-static int ide_enable_queued(ide_drive_t *drive, int on)
-{
-       struct ide_tcq_blacklist *itb;
-       int depth = drive->using_tcq ? drive->queue_depth : 0;
-
-       /*
-        * disable or adjust queue depth
-        */
-       if (!on) {
-               if (drive->using_tcq)
-                       printk(KERN_INFO "%s: TCQ disabled\n", drive->name);
-
-               drive->using_tcq = 0;
-               return 0;
-       }
-
-       if (ide_tcq_configure(drive)) {
-               drive->using_tcq = 0;
-               return 1;
-       }
-
-       /*
-        * some drives need limited transfer size in tcq
-        */
-       itb = ide_find_drive_blacklist(drive);
-       if (itb && itb->max_sectors) {
-               if (itb->max_sectors > HWIF(drive)->rqsize)
-                       itb->max_sectors = HWIF(drive)->rqsize;
-
-               blk_queue_max_sectors(drive->queue, itb->max_sectors);
-       }
-
-       /*
-        * enable block tagging
-        */
-       if (!blk_queue_tagged(drive->queue))
-               blk_queue_init_tags(drive->queue, IDE_MAX_TAG, NULL);
-
-       /*
-        * check auto-poll support
-        */
-       ide_tcq_check_autopoll(drive);
-
-       if (depth != drive->queue_depth)
-               printk(KERN_INFO "%s: tagged command queueing enabled, command queue depth %d\n", drive->name, drive->queue_depth);
-
-       drive->using_tcq = 1;
-       return 0;
-}
-
-int ide_tcq_wait_dataphase(ide_drive_t *drive)
-{
-       ide_hwif_t *hwif = HWIF(drive);
-       byte stat;
-       int i;
-
-       do {
-               stat = hwif->INB(IDE_STATUS_REG);
-               if (!(stat & BUSY_STAT))
-                       break;
-
-               udelay(10);
-       } while (1);
-
-       if (OK_STAT(stat, READY_STAT | DRQ_STAT, drive->bad_wstat))
-               return 0;
-
-       i = 0;
-       udelay(1);
-       do {
-               stat = hwif->INB(IDE_STATUS_REG);
-
-               if (OK_STAT(stat, READY_STAT | DRQ_STAT, drive->bad_wstat))
-                       break;
-
-               ++i;
-               if (unlikely(i >= IDE_TCQ_WAIT))
-                       return 1;
-
-               udelay(10);
-       } while (1);
-
-       return 0;
-}
-
-static int ide_tcq_check_blacklist(ide_drive_t *drive)
-{
-       struct ide_tcq_blacklist *itb = ide_find_drive_blacklist(drive);
-
-       if (!itb)
-               return 0;
-
-       return !itb->works;
-}
-
-int __ide_dma_queued_on(ide_drive_t *drive)
-{
-       ide_hwif_t *hwif = HWIF(drive);
-
-       if (drive->media != ide_disk)
-               return 1;
-       if (!drive->using_dma)
-               return 1;
-       if (hwif->chipset == ide_pdc4030)
-               return 1;
-       if (ide_tcq_check_blacklist(drive)) {
-               printk(KERN_WARNING "%s: tcq forbidden by blacklist\n",
-                                       drive->name);
-               return 1;
-       }
-       if (hwif->drives[0].present && hwif->drives[1].present) {
-               printk(KERN_WARNING "%s: only one drive on a channel supported"
-                                       " for tcq\n", drive->name);
-               return 1;
-       }
-       if (ata_pending_commands(drive)) {
-               printk(KERN_WARNING "ide-tcq; can't toggle tcq feature on "
-                                       "busy drive\n");
-               return 1;
-       }
-
-       return ide_enable_queued(drive, 1);
-}
-
-int __ide_dma_queued_off(ide_drive_t *drive)
-{
-       if (drive->media != ide_disk)
-               return 1;
-       if (ata_pending_commands(drive)) {
-               printk("ide-tcq; can't toggle tcq feature on busy drive\n");
-               return 1;
-       }
-
-       return ide_enable_queued(drive, 0);
-}
-
-static ide_startstop_t ide_dma_queued_rw(ide_drive_t *drive, u8 command)
-{
-       ide_hwif_t *hwif = HWIF(drive);
-       unsigned long flags;
-       byte stat, feat;
-
-       TCQ_PRINTK("%s: starting tag\n", drive->name);
-
-       /*
-        * set nIEN, tag start operation will enable again when
-        * it is safe
-        */
-       drive_ctl_nien(drive, 1);
-
-       TCQ_PRINTK("%s: sending cmd=%x\n", drive->name, command);
-       hwif->OUTB(command, IDE_COMMAND_REG);
-
-       if (ide_tcq_wait_altstat(drive, &stat, BUSY_STAT)) {
-               printk("%s: alt stat timeout\n", drive->name);
-               goto err;
-       }
-
-       drive_ctl_nien(drive, 0);
-
-       if (stat & ERR_STAT)
-               goto err;
-
-       /*
-        * bus not released, start dma
-        */
-       feat = hwif->INB(IDE_NSECTOR_REG);
-       if (!(feat & REL)) {
-               TCQ_PRINTK("IMMED in queued_start, feat=%x\n", feat);
-               return __ide_dma_queued_start(drive);
-       }
-
-       /*
-        * drive released the bus, clear active request and check for service
-        */
-       spin_lock_irqsave(&ide_lock, flags);
-       HWGROUP(drive)->rq = NULL;
-       __ide_tcq_set_intr(HWGROUP(drive), ide_dmaq_intr);
-       spin_unlock_irqrestore(&ide_lock, flags);
-
-       TCQ_PRINTK("REL in queued_start\n");
-
-       stat = hwif->INB(IDE_STATUS_REG);
-       if (stat & SRV_STAT)
-               return ide_service(drive);
-
-       return ide_released;
-err:
-       ide_dump_status(drive, "rw_queued", stat);
-       ide_tcq_invalidate_queue(drive);
-       return ide_stopped;
-}
-
-ide_startstop_t __ide_dma_queued_read(ide_drive_t *drive)
-{
-       u8 command = WIN_READDMA_QUEUED;
-
-       if (drive->addressing == 1)
-                command = WIN_READDMA_QUEUED_EXT;
-
-       return ide_dma_queued_rw(drive, command);
-}
-
-ide_startstop_t __ide_dma_queued_write(ide_drive_t *drive)
-{
-       u8 command = WIN_WRITEDMA_QUEUED;
-
-       if (drive->addressing == 1)
-                command = WIN_WRITEDMA_QUEUED_EXT;
-
-       return ide_dma_queued_rw(drive, command);
-}
-
-ide_startstop_t __ide_dma_queued_start(ide_drive_t *drive)
-{
-       ide_hwgroup_t *hwgroup = HWGROUP(drive);
-       struct request *rq = hwgroup->rq;
-       ide_hwif_t *hwif = HWIF(drive);
-       unsigned int reading = 0;
-
-       TCQ_PRINTK("ide_dma: setting up queued tag=%d\n", rq->tag);
-
-       if (!hwgroup->busy)
-               printk(KERN_ERR "queued_rw: hwgroup not busy\n");
-
-       if (ide_tcq_wait_dataphase(drive)) {
-               printk(KERN_WARNING "timeout waiting for data phase\n");
-               return ide_stopped;
-       }
-
-       if (rq_data_dir(rq) == READ)
-               reading = 1 << 3;
-
-       if (ide_start_dma(hwif, drive, reading))
-               return ide_stopped;
-
-       ide_tcq_set_intr(hwgroup, ide_dmaq_intr);
-
-       if (!hwif->ide_dma_begin(drive))
-               return ide_started;
-
-       return ide_stopped;
-}
diff --git a/drivers/ide/legacy/hd98.c b/drivers/ide/legacy/hd98.c
deleted file mode 100644 (file)
index 8028b57..0000000
+++ /dev/null
@@ -1,883 +0,0 @@
-/*
- *  Copyright (C) 1991, 1992  Linus Torvalds
- *
- * This is the low-level hd interrupt support. It traverses the
- * request-list, using interrupts to jump between functions. As
- * all the functions are called within interrupts, we may not
- * sleep. Special care is recommended.
- *
- *  modified by Drew Eckhardt to check nr of hd's from the CMOS.
- *
- *  Thanks to Branko Lankester, lankeste@fwi.uva.nl, who found a bug
- *  in the early extended-partition checks and added DM partitions
- *
- *  IRQ-unmask, drive-id, multiple-mode, support for ">16 heads",
- *  and general streamlining by Mark Lord.
- *
- *  Removed 99% of above. Use Mark's ide driver for those options.
- *  This is now a lightweight ST-506 driver. (Paul Gortmaker)
- *
- *  Modified 1995 Russell King for ARM processor.
- *
- *  Bugfix: max_sectors must be <= 255 or the wheels tend to come
- *  off in a hurry once you queue things up - Paul G. 02/2001
- */
-
-/* Uncomment the following if you want verbose error reports. */
-/* #define VERBOSE_ERRORS */
-
-#include <linux/errno.h>
-#include <linux/signal.h>
-#include <linux/sched.h>
-#include <linux/timer.h>
-#include <linux/fs.h>
-#include <linux/kernel.h>
-#include <linux/genhd.h>
-#include <linux/slab.h>
-#include <linux/string.h>
-#include <linux/ioport.h>
-#include <linux/mc146818rtc.h> /* CMOS defines */
-#include <linux/init.h>
-#include <linux/blkpg.h>
-#include <linux/hdreg.h>
-
-#define REALLY_SLOW_IO
-#include <asm/system.h>
-#include <asm/io.h>
-#include <asm/uaccess.h>
-
-#include "io_ports.h"
-
-#ifdef __arm__
-#undef  HD_IRQ
-#endif
-#include <asm/irq.h>
-#ifdef __arm__
-#define HD_IRQ IRQ_HARDDISK
-#endif
-
-/* Hd controller regster ports */
-
-#define HD_DATA                0x640   /* _CTL when writing */
-#define HD_ERROR       0x642   /* see err-bits */
-#define HD_NSECTOR     0x644   /* nr of sectors to read/write */
-#define HD_SECTOR      0x646   /* starting sector */
-#define HD_LCYL                0x648   /* starting cylinder */
-#define HD_HCYL                0x64a   /* high byte of starting cyl */
-#define HD_CURRENT     0x64c   /* 101dhhhh , d=drive, hhhh=head */
-#define HD_STATUS      0x64e   /* see status-bits */
-#define HD_FEATURE     HD_ERROR        /* same io address, read=error, write=feature */
-#define HD_PRECOMP     HD_FEATURE      /* obsolete use of this port - predates IDE */
-#define HD_COMMAND     HD_STATUS       /* same io address, read=status, write=cmd */
-
-#define HD_CMD         0x74c   /* used for resets */
-#define HD_ALTSTATUS   0x74c   /* same as HD_STATUS but doesn't clear irq */
-
-/* Bits of HD_STATUS */
-#define ERR_STAT               0x01
-#define INDEX_STAT             0x02
-#define ECC_STAT               0x04    /* Corrected error */
-#define DRQ_STAT               0x08
-#define SEEK_STAT              0x10
-#define SERVICE_STAT           SEEK_STAT
-#define WRERR_STAT             0x20
-#define READY_STAT             0x40
-#define BUSY_STAT              0x80
-
-/* Bits for HD_ERROR */
-#define MARK_ERR               0x01    /* Bad address mark */
-#define TRK0_ERR               0x02    /* couldn't find track 0 */
-#define ABRT_ERR               0x04    /* Command aborted */
-#define MCR_ERR                        0x08    /* media change request */
-#define ID_ERR                 0x10    /* ID field not found */
-#define MC_ERR                 0x20    /* media changed */
-#define ECC_ERR                        0x40    /* Uncorrectable ECC error */
-#define BBD_ERR                        0x80    /* pre-EIDE meaning:  block marked bad */
-#define ICRC_ERR               0x80    /* new meaning:  CRC error during transfer */
-
-static spinlock_t hd_lock = SPIN_LOCK_UNLOCKED;
-static struct request_queue *hd_queue;
-
-#define CURRENT elv_next_request(hd_queue)
-
-#define TIMEOUT_VALUE  (6*HZ)
-#define        HD_DELAY        0
-
-#define MAX_ERRORS     16      /* Max read/write errors/sector */
-#define RESET_FREQ      8      /* Reset controller every 8th retry */
-#define RECAL_FREQ      4      /* Recalibrate every 4th retry */
-#define MAX_HD         2
-
-#define STAT_OK                (READY_STAT|SEEK_STAT)
-#define OK_STATUS(s)   (((s)&(STAT_OK|(BUSY_STAT|WRERR_STAT|ERR_STAT)))==STAT_OK)
-
-static void recal_intr(void);
-static void bad_rw_intr(void);
-
-static int reset;
-static int hd_error;
-
-/*
- *  This struct defines the HD's and their types.
- */
-struct hd_i_struct {
-       unsigned int head,sect,cyl,wpcom,lzone,ctl;
-       int unit;
-       int recalibrate;
-       int special_op;
-};
-       
-#ifdef HD_TYPE
-static struct hd_i_struct hd_info[] = { HD_TYPE };
-static int NR_HD = ((sizeof (hd_info))/(sizeof (struct hd_i_struct)));
-#else
-static struct hd_i_struct hd_info[MAX_HD];
-static int NR_HD;
-#endif
-
-static struct gendisk *hd_gendisk[MAX_HD];
-
-static struct timer_list device_timer;
-
-#define TIMEOUT_VALUE (6*HZ)
-
-#define SET_TIMER                                                      \
-       do {                                                            \
-               mod_timer(&device_timer, jiffies + TIMEOUT_VALUE);      \
-       } while (0)
-
-static void (*do_hd)(void) = NULL;
-#define SET_HANDLER(x) \
-if ((do_hd = (x)) != NULL) \
-       SET_TIMER; \
-else \
-       del_timer(&device_timer);
-
-
-#if (HD_DELAY > 0)
-unsigned long last_req;
-
-unsigned long read_timer(void)
-{
-        extern spinlock_t i8253_lock;
-       unsigned long t, flags;
-       int i;
-
-       spin_lock_irqsave(&i8253_lock, flags);
-       t = jiffies * 11932;
-       outb_p(0, PIT_MODE);
-       i = inb_p(PIT_CH0);
-       i |= inb(PIT_CH0) << 8;
-       spin_unlock_irqrestore(&i8253_lock, flags);
-       return(t - i);
-}
-#endif
-
-void __init hd_setup(char *str, int *ints)
-{
-       int hdind = 0;
-
-       if (ints[0] != 3)
-               return;
-       if (hd_info[0].head != 0)
-               hdind=1;
-       hd_info[hdind].head = ints[2];
-       hd_info[hdind].sect = ints[3];
-       hd_info[hdind].cyl = ints[1];
-       hd_info[hdind].wpcom = 0;
-       hd_info[hdind].lzone = ints[1];
-       hd_info[hdind].ctl = (ints[2] > 8 ? 8 : 0);
-       NR_HD = hdind+1;
-}
-
-static void dump_status (const char *msg, unsigned int stat)
-{
-       char *name = CURRENT ?
-                       CURRENT->rq_dev->bd_disk->disk_name :
-                       "hd?";
-#ifdef VERBOSE_ERRORS
-       printk("%s: %s: status=0x%02x { ", name, msg, stat & 0xff);
-       if (stat & BUSY_STAT)   printk("Busy ");
-       if (stat & READY_STAT)  printk("DriveReady ");
-       if (stat & WRERR_STAT)  printk("WriteFault ");
-       if (stat & SEEK_STAT)   printk("SeekComplete ");
-       if (stat & DRQ_STAT)    printk("DataRequest ");
-       if (stat & ECC_STAT)    printk("CorrectedError ");
-       if (stat & INDEX_STAT)  printk("Index ");
-       if (stat & ERR_STAT)    printk("Error ");
-       printk("}\n");
-       if ((stat & ERR_STAT) == 0) {
-               hd_error = 0;
-       } else {
-               hd_error = inb(HD_ERROR);
-               printk("%s: %s: error=0x%02x { ", name, msg, hd_error & 0xff);
-               if (hd_error & BBD_ERR)         printk("BadSector ");
-               if (hd_error & ECC_ERR)         printk("UncorrectableError ");
-               if (hd_error & ID_ERR)          printk("SectorIdNotFound ");
-               if (hd_error & ABRT_ERR)        printk("DriveStatusError ");
-               if (hd_error & TRK0_ERR)        printk("TrackZeroNotFound ");
-               if (hd_error & MARK_ERR)        printk("AddrMarkNotFound ");
-               printk("}");
-               if (hd_error & (BBD_ERR|ECC_ERR|ID_ERR|MARK_ERR)) {
-                       printk(", CHS=%d/%d/%d", (inb(HD_HCYL)<<8) + inb(HD_LCYL),
-                               inb(HD_CURRENT) & 0xf, inb(HD_SECTOR));
-                       if (CURRENT)
-                               printk(", sector=%ld", CURRENT->sector);
-               }
-               printk("\n");
-       }
-#else
-       printk("%s: %s: status=0x%02x.\n", name, msg, stat & 0xff);
-       if ((stat & ERR_STAT) == 0) {
-               hd_error = 0;
-       } else {
-               hd_error = inb(HD_ERROR);
-               printk("%s: %s: error=0x%02x.\n", name, msg, hd_error & 0xff);
-       }
-#endif
-}
-
-void check_status(void)
-{
-       int i = inb(HD_STATUS);
-
-       if (!OK_STATUS(i)) {
-               dump_status("check_status", i);
-               bad_rw_intr();
-       }
-}
-
-static int controller_busy(void)
-{
-       int retries = 100000;
-       unsigned char status;
-
-       do {
-               status = inb(HD_STATUS);
-       } while ((status & BUSY_STAT) && --retries);
-       return status;
-}
-
-static int status_ok(void)
-{
-       unsigned char status = inb(HD_STATUS);
-
-       if (status & BUSY_STAT)
-               return 1;       /* Ancient, but does it make sense??? */
-       if (status & WRERR_STAT)
-               return 0;
-       if (!(status & READY_STAT))
-               return 0;
-       if (!(status & SEEK_STAT))
-               return 0;
-       return 1;
-}
-
-static int controller_ready(unsigned int drive, unsigned int head)
-{
-       int retry = 100;
-
-       do {
-               if (controller_busy() & BUSY_STAT)
-                       return 0;
-               outb(0xA0 | (drive<<4) | head, HD_CURRENT);
-               if (status_ok())
-                       return 1;
-       } while (--retry);
-       return 0;
-}
-
-static void hd_out(struct hd_i_struct *disk,
-                  unsigned int nsect,
-                  unsigned int sect,
-                  unsigned int head,
-                  unsigned int cyl,
-                  unsigned int cmd,
-                  void (*intr_addr)(void))
-{
-       unsigned short port;
-
-#if (HD_DELAY > 0)
-       while (read_timer() - last_req < HD_DELAY)
-               /* nothing */;
-#endif
-       if (reset)
-               return;
-       if (!controller_ready(disk->unit, head)) {
-               reset = 1;
-               return;
-       }
-       SET_HANDLER(intr_addr);
-       outb(disk->ctl,HD_CMD);
-       port=HD_DATA + 2;
-       outb(disk->wpcom>>2, port); port += 2;
-       outb(nsect, port); port += 2;
-       outb(sect, port); port += 2;
-       outb(cyl, port); port += 2;
-       outb(cyl>>8, port); port += 2;
-       outb(0xA0|(disk->unit<<4)|head, port); port += 2;
-       outb(cmd, port);
-}
-
-static void hd_request (void);
-
-static int drive_busy(void)
-{
-       unsigned int i;
-       unsigned char c;
-
-       for (i = 0; i < 500000 ; i++) {
-               c = inb(HD_STATUS);
-               if ((c & (BUSY_STAT | READY_STAT | SEEK_STAT)) == STAT_OK)
-                       return 0;
-       }
-       dump_status("reset timed out", c);
-       return 1;
-}
-
-static void reset_controller(void)
-{
-       int     i;
-
-       outb(4,HD_CMD);
-       for(i = 0; i < 1000; i++) barrier();
-       outb(hd_info[0].ctl & 0x0f,HD_CMD);
-       for(i = 0; i < 1000; i++) barrier();
-       if (drive_busy())
-               printk("hd: controller still busy\n");
-       else if ((hd_error = inb(HD_ERROR)) != 1)
-               printk("hd: controller reset failed: %02x\n",hd_error);
-}
-
-static void reset_hd(void)
-{
-       static int i;
-
-repeat:
-       if (reset) {
-               reset = 0;
-               i = -1;
-               reset_controller();
-       } else {
-               check_status();
-               if (reset)
-                       goto repeat;
-       }
-       if (++i < NR_HD) {
-               struct hd_i_struct *disk = &hd_info[i];
-               disk->special_op = disk->recalibrate = 1;
-               hd_out(disk, disk->sect, disk->sect, disk->head-1,
-                       disk->cyl, WIN_SPECIFY, &reset_hd);
-               if (reset)
-                       goto repeat;
-       } else
-               hd_request();
-}
-
-/*
- * Ok, don't know what to do with the unexpected interrupts: on some machines
- * doing a reset and a retry seems to result in an eternal loop. Right now I
- * ignore it, and just set the timeout.
- *
- * On laptops (and "green" PCs), an unexpected interrupt occurs whenever the
- * drive enters "idle", "standby", or "sleep" mode, so if the status looks
- * "good", we just ignore the interrupt completely.
- */
-void unexpected_hd_interrupt(void)
-{
-       unsigned int stat = inb(HD_STATUS);
-
-       if (stat & (BUSY_STAT|DRQ_STAT|ECC_STAT|ERR_STAT)) {
-               dump_status ("unexpected interrupt", stat);
-               SET_TIMER;
-       }
-}
-
-/*
- * bad_rw_intr() now tries to be a bit smarter and does things
- * according to the error returned by the controller.
- * -Mika Liljeberg (liljeber@cs.Helsinki.FI)
- */
-static void bad_rw_intr(void)
-{
-       struct request *req = CURRENT;
-       struct hd_i_struct *disk;
-
-       if (!req)
-               return;
-       disk = req->rq_disk->private_data;
-       if (++req->errors >= MAX_ERRORS || (hd_error & BBD_ERR)) {
-               end_request(req, 0);
-               disk->special_op = disk->recalibrate = 1;
-       } else if (req->errors % RESET_FREQ == 0)
-               reset = 1;
-       else if ((hd_error & TRK0_ERR) || req->errors % RECAL_FREQ == 0)
-               disk->special_op = disk->recalibrate = 1;
-       /* Otherwise just retry */
-}
-
-static inline int wait_DRQ(void)
-{
-       int retries = 100000, stat;
-
-       while (--retries > 0)
-               if ((stat = inb(HD_STATUS)) & DRQ_STAT)
-                       return 0;
-       dump_status("wait_DRQ", stat);
-       return -1;
-}
-
-static void read_intr(void)
-{
-       int i, retries = 100000;
-       struct request *req;
-
-       do {
-               i = (unsigned) inb(HD_STATUS);
-               if (i & BUSY_STAT)
-                       continue;
-               if (!OK_STATUS(i))
-                       break;
-               if (i & DRQ_STAT)
-                       goto ok_to_read;
-       } while (--retries > 0);
-       dump_status("read_intr", i);
-       bad_rw_intr();
-       hd_request();
-       return;
-ok_to_read:
-       req = CURRENT;
-       insw(HD_DATA,req->buffer,256);
-       req->sector++;
-       req->buffer += 512;
-       req->errors = 0;
-       i = --req->nr_sectors;
-       --req->current_nr_sectors;
-#ifdef DEBUG
-       printk("%s: read: sector %ld, remaining = %ld, buffer=%p\n",
-               req->rq_disk->disk_name, req->sector, req->nr_sectors,
-               req->buffer+512);
-#endif
-       if (req->current_nr_sectors <= 0)
-               end_request(req, 1);
-       if (i > 0) {
-               SET_HANDLER(&read_intr);
-               return;
-       }
-       (void) inb(HD_STATUS);
-#if (HD_DELAY > 0)
-       last_req = read_timer();
-#endif
-       if (CURRENT)
-               hd_request();
-       return;
-}
-
-static void write_intr(void)
-{
-       int i;
-       int retries = 100000;
-       struct request *req = CURRENT;
-
-       do {
-               i = (unsigned) inb(HD_STATUS);
-               if (i & BUSY_STAT)
-                       continue;
-               if (!OK_STATUS(i))
-                       break;
-               if ((req->nr_sectors <= 1) || (i & DRQ_STAT))
-                       goto ok_to_write;
-       } while (--retries > 0);
-       dump_status("write_intr", i);
-       bad_rw_intr();
-       hd_request();
-       return;
-ok_to_write:
-       req->sector++;
-       i = --req->nr_sectors;
-       --req->current_nr_sectors;
-       req->buffer += 512;
-       if (!i || (req->bio && req->current_nr_sectors < 1))
-               end_request(req, 1);
-       if (i > 0) {
-               SET_HANDLER(&write_intr);
-               outsw(HD_DATA,req->buffer,256);
-               local_irq_enable();
-       } else {
-#if (HD_DELAY > 0)
-               last_req = read_timer();
-#endif
-               hd_request();
-       }
-       return;
-}
-
-static void recal_intr(void)
-{
-       check_status();
-#if (HD_DELAY > 0)
-       last_req = read_timer();
-#endif
-       hd_request();
-}
-
-/*
- * This is another of the error-routines I don't know what to do with. The
- * best idea seems to just set reset, and start all over again.
- */
-static void hd_times_out(unsigned long dummy)
-{
-       do_hd = NULL;
-
-       if (!CURRENT)
-               return;
-
-       disable_irq(HD_IRQ);
-       local_irq_enable();
-       reset = 1;
-       printk("%s: timeout\n", CURRENT->rq_disk->disk_name);
-       if (++CURRENT->errors >= MAX_ERRORS) {
-#ifdef DEBUG
-               printk("%s: too many errors\n", CURRENT->rq_disk->disk_name);
-#endif
-               end_request(CURRENT, 0);
-       }
-       local_irq_disable();
-       hd_request();
-       enable_irq(HD_IRQ);
-}
-
-int do_special_op(struct hd_i_struct *disk, struct request *req)
-{
-       if (disk->recalibrate) {
-               disk->recalibrate = 0;
-               hd_out(disk, disk->sect,0,0,0,WIN_RESTORE,&recal_intr);
-               return reset;
-       }
-       if (disk->head > 16) {
-               printk ("%s: cannot handle device with more than 16 heads - giving up\n", req->rq_disk->disk_name);
-               end_request(req, 0);
-       }
-       disk->special_op = 0;
-       return 1;
-}
-
-/*
- * The driver enables interrupts as much as possible.  In order to do this,
- * (a) the device-interrupt is disabled before entering hd_request(),
- * and (b) the timeout-interrupt is disabled before the sti().
- *
- * Interrupts are still masked (by default) whenever we are exchanging
- * data/cmds with a drive, because some drives seem to have very poor
- * tolerance for latency during I/O. The IDE driver has support to unmask
- * interrupts for non-broken hardware, so use that driver if required.
- */
-static void hd_request(void)
-{
-       unsigned int block, nsect, sec, track, head, cyl;
-       struct hd_i_struct *disk;
-       struct request *req;
-
-       if (do_hd)
-               return;
-repeat:
-       del_timer(&device_timer);
-       local_irq_enable();
-
-       if (!CURRENT) {
-               do_hd = NULL;
-               return;
-       }
-       req = CURRENT;
-
-       if (reset) {
-               local_irq_disable();
-               reset_hd();
-               return;
-       }
-       disk = req->rq_disk->private_data;
-       block = req->sector;
-       nsect = req->nr_sectors;
-       if (block >= get_capacity(req->rq_disk) ||
-           ((block+nsect) > get_capacity(req->rq_disk))) {
-               printk("%s: bad access: block=%d, count=%d\n",
-                       req->rq_disk->disk_name, block, nsect);
-               end_request(req, 0);
-               goto repeat;
-       }
-
-       if (disk->special_op) {
-               if (do_special_op(disk, req))
-                       goto repeat;
-               return;
-       }
-       sec   = block % disk->sect + 1;
-       track = block / disk->sect;
-       head  = track % disk->head;
-       cyl   = track / disk->head;
-#ifdef DEBUG
-       printk("%s: %sing: CHS=%d/%d/%d, sectors=%d, buffer=%p\n",
-               req->rq_disk->disk_name, (req->cmd == READ)?"read":"writ",
-               cyl, head, sec, nsect, req->buffer);
-#endif
-       if (req->flags & REQ_CMD) {
-               switch (rq_data_dir(req)) {
-               case READ:
-                       hd_out(disk,nsect,sec,head,cyl,WIN_READ,&read_intr);
-                       if (reset)
-                               goto repeat;
-                       break;
-               case WRITE:
-                       hd_out(disk,nsect,sec,head,cyl,WIN_WRITE,&write_intr);
-                       if (reset)
-                               goto repeat;
-                       if (wait_DRQ()) {
-                               bad_rw_intr();
-                               goto repeat;
-                       }
-                       outsw(HD_DATA,req->buffer,256);
-                       break;
-               default:
-                       printk("unknown hd-command\n");
-                       end_request(req, 0);
-                       break;
-               }
-       }
-}
-
-static void do_hd_request (request_queue_t * q)
-{
-       disable_irq(HD_IRQ);
-       hd_request();
-       enable_irq(HD_IRQ);
-}
-
-static int hd_ioctl(struct inode * inode, struct file * file,
-       unsigned int cmd, unsigned long arg)
-{
-       struct hd_i_struct *disk = inode->i_bdev->bd_disk->private_data;
-       struct hd_geometry *loc = (struct hd_geometry *) arg;
-       struct hd_geometry g; 
-
-       if (cmd != HDIO_GETGEO)
-               return -EINVAL;
-       if (!loc)
-               return -EINVAL;
-       g.heads = disk->head;
-       g.sectors = disk->sect;
-       g.cylinders = disk->cyl;
-       g.start = get_start_sect(inode->i_bdev);
-       return copy_to_user(loc, &g, sizeof g) ? -EFAULT : 0; 
-}
-
-/*
- * Releasing a block device means we sync() it, so that it can safely
- * be forgotten about...
- */
-
-static void hd_interrupt(int irq, void *dev_id, struct pt_regs *regs)
-{
-       void (*handler)(void) = do_hd;
-
-       do_hd = NULL;
-       del_timer(&device_timer);
-       if (!handler)
-               handler = unexpected_hd_interrupt;
-       handler();
-       local_irq_enable();
-}
-
-static struct block_device_operations hd_fops = {
-       .ioctl =        hd_ioctl,
-};
-
-/*
- * This is the hard disk IRQ description. The SA_INTERRUPT in sa_flags
- * means we run the IRQ-handler with interrupts disabled:  this is bad for
- * interrupt latency, but anything else has led to problems on some
- * machines.
- *
- * We enable interrupts in some of the routines after making sure it's
- * safe.
- */
-
-static int __init hd_init(void)
-{
-       int drive;
-       if (register_blkdev(HD_MAJOR,"hd")) {
-               printk("hd: unable to get major %d for hard disk\n",HD_MAJOR);
-               return -1;
-       }
-       hd_queue = blk_init_queue(do_hd_request, &hd_lock);
-       if (!hd_queue) {
-               unregister_blkdev(HD_MAJOR,"hd");
-               return -1;
-       }
-       blk_queue_max_sectors(hd_queue, 255);
-       init_timer(&device_timer);
-       device_timer.function = hd_times_out;
-       blk_queue_hardsect_size(hd_queue, 512);
-
-#ifdef __i386__
-       if (!NR_HD) {
-               extern struct drive_info drive_info;
-               unsigned char *BIOS = (unsigned char *) &drive_info;
-               unsigned long flags;
-#ifndef CONFIG_X86_PC9800
-               int cmos_disks;
-#endif
-
-               for (drive=0 ; drive<2 ; drive++) {
-                       hd_info[drive].cyl = *(unsigned short *) BIOS;
-                       hd_info[drive].head = *(3+BIOS);
-                       hd_info[drive].sect = *(2+BIOS);
-                       hd_info[drive].wpcom = 0;
-                       hd_info[drive].ctl = *(3+BIOS) > 8 ? 8 : 0;
-                       hd_info[drive].lzone = *(unsigned short *) BIOS;
-                       if (hd_info[drive].cyl && NR_HD == drive)
-                               NR_HD++;
-                       BIOS += 6;
-               }
-
-       }
-#endif /* __i386__ */
-#ifdef __arm__
-       if (!NR_HD) {
-               /* We don't know anything about the drive.  This means
-                * that you *MUST* specify the drive parameters to the
-                * kernel yourself.
-                */
-               printk("hd: no drives specified - use hd=cyl,head,sectors"
-                       " on kernel command line\n");
-       }
-#endif
-       if (!NR_HD)
-               goto out;
-
-       for (drive=0 ; drive < NR_HD ; drive++) {
-               struct gendisk *disk = alloc_disk(64);
-               struct hd_i_struct *p = &hd_info[drive];
-               if (!disk)
-                       goto Enomem;
-               disk->major = HD_MAJOR;
-               disk->first_minor = drive << 6;
-               disk->fops = &hd_fops;
-               sprintf(disk->disk_name, "hd%c", 'a'+drive);
-               disk->private_data = p;
-               set_capacity(disk, p->head * p->sect * p->cyl);
-               disk->queue = hd_queue;
-               p->unit = drive;
-               hd_gendisk[drive] = disk;
-               printk ("%s: %luMB, CHS=%d/%d/%d\n",
-                       disk->disk_name, (unsigned long)get_capacity(disk)/2048,
-                       p->cyl, p->head, p->sect);
-       }
-
-       if (request_irq(HD_IRQ, hd_interrupt, SA_INTERRUPT, "hd", NULL)) {
-               printk("hd: unable to get IRQ%d for the hard disk driver\n",
-                       HD_IRQ);
-               goto out1;
-       }
-
-       if (!request_region(HD_DATA, 2, "hd(data)")) {
-               printk(KERN_WARNING "hd: port 0x%x busy\n", HD_DATA);
-               NR_HD = 0;
-               free_irq(HD_IRQ, NULL);
-               return;
-       }
-
-       if (!request_region(HD_DATA + 2, 1, "hd"))
-       {
-               printk(KERN_WARNING "hd: port 0x%x busy\n", HD_DATA);
-               goto out2;
-       }
-
-       if (!request_region(HD_DATA + 4, 1, "hd"))
-       {
-               printk(KERN_WARNING "hd: port 0x%x busy\n", HD_DATA);
-               goto out3;
-       }
-
-       if (!request_region(HD_DATA + 6, 1, "hd"))
-       {
-               printk(KERN_WARNING "hd: port 0x%x busy\n", HD_DATA);
-               goto out4;
-       }
-
-       if (!request_region(HD_DATA + 8, 1, "hd"))
-       {
-               printk(KERN_WARNING "hd: port 0x%x busy\n", HD_DATA);
-               goto out5;
-       }
-
-       if (!request_region(HD_DATA + 10, 1, "hd"))
-       {
-               printk(KERN_WARNING "hd: port 0x%x busy\n", HD_DATA);
-               goto out6;
-       }
-
-       if (!request_region(HD_DATA + 12, 1, "hd"))
-       {
-               printk(KERN_WARNING "hd: port 0x%x busy\n", HD_DATA);
-               goto out7;
-       }
-
-       if (!request_region(HD_CMD, 1, "hd(cmd)"))
-       {
-               printk(KERN_WARNING "hd: port 0x%x busy\n", HD_CMD);
-               goto out8;
-       }
-
-       if (!request_region(HD_CMD + 2, 1, "hd(cmd)"))
-       {
-               printk(KERN_WARNING "hd: port 0x%x busy\n", HD_CMD);
-               goto out9;
-       }
-
-       for(drive=0; drive < NR_HD; drive++)
-               add_disk(hd_gendisk[drive]);
-       return 0;
-
-out9:
-       release_region(HD_CMD, 1);
-out8:
-       release_region(HD_DATA + 12, 1);
-out7:
-       release_region(HD_DATA + 10, 1);
-out6:
-       release_region(HD_DATA + 8, 1);
-out5:
-       release_region(HD_DATA + 6, 1);
-out4:
-       release_region(HD_DATA + 4, 1);
-out3:
-       release_region(HD_DATA + 2, 1);
-out2:
-       release_region(HD_DATA, 2);
-       free_irq(HD_IRQ, NULL);
-out1:
-       for (drive = 0; drive < NR_HD; drive++)
-               put_disk(hd_gendisk[drive]);
-       NR_HD = 0;
-out:
-       del_timer(&device_timer);
-       unregister_blkdev(HD_MAJOR,"hd");
-       blk_cleanup_queue(hd_queue);
-       return -1;
-Enomem:
-       while (drive--)
-               put_disk(hd_gendisk[drive]);
-       goto out;
-}
-
-static int parse_hd_setup (char *line) {
-       int ints[6];
-
-       (void) get_options(line, ARRAY_SIZE(ints), ints);
-       hd_setup(NULL, ints);
-
-       return 1;
-}
-__setup("hd=", parse_hd_setup);
-
-module_init(hd_init);
diff --git a/drivers/ide/legacy/pc9800.c b/drivers/ide/legacy/pc9800.c
deleted file mode 100644 (file)
index 6b91a18..0000000
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
- *  ide_pc9800.c
- *
- *  Copyright (C) 1997-2000  Linux/98 project,
- *                          Kyoto University Microcomputer Club.
- */
-
-#include <linux/config.h>
-#include <linux/kernel.h>
-#include <linux/ioport.h>
-#include <linux/ide.h>
-#include <linux/init.h>
-
-#include <asm/io.h>
-#include <asm/pc9800.h>
-
-#define PC9800_IDE_BANKSELECT  0x432
-
-#undef PC9800_IDE_DEBUG
-
-static void pc9800_select(ide_drive_t *drive)
-{
-#ifdef PC9800_IDE_DEBUG
-       byte old;
-
-       /* Too noisy: */
-       /* printk(KERN_DEBUG "pc9800_select(%s)\n", drive->name); */
-
-       outb(0x80, PC9800_IDE_BANKSELECT);
-       old = inb(PC9800_IDE_BANKSELECT);
-       if (old != HWIF(drive)->index)
-               printk(KERN_DEBUG "ide-pc9800: switching bank #%d -> #%d\n",
-                       old, HWIF(drive)->index);
-#endif
-       outb(HWIF(drive)->index, PC9800_IDE_BANKSELECT);
-}
-
-void __init ide_probe_for_pc9800(void)
-{
-       u8 saved_bank;
-
-       if (!PC9800_9821_P() /* || !PC9821_IDEIF_DOUBLE_P() */)
-               return;
-
-       if (!request_region(PC9800_IDE_BANKSELECT, 1, "ide0/1 bank")) {
-               printk(KERN_ERR
-                       "ide: bank select port (%#x) is already occupied!\n",
-                       PC9800_IDE_BANKSELECT);
-               return;
-       }
-
-       /* Do actual probing. */
-       if ((saved_bank = inb(PC9800_IDE_BANKSELECT)) == (u8) ~0
-           || (outb(saved_bank ^ 1, PC9800_IDE_BANKSELECT),
-               /* Next outb is dummy for reading status. */
-               outb(0x80, PC9800_IDE_BANKSELECT),
-               inb(PC9800_IDE_BANKSELECT) != (saved_bank ^ 1))) {
-               printk(KERN_INFO
-                       "ide: pc9800 type bank selecting port not found\n");
-               release_region(PC9800_IDE_BANKSELECT, 1);
-               return;
-       }
-
-       /* Restore original value, just in case. */
-       outb(saved_bank, PC9800_IDE_BANKSELECT);
-
-       /* These ports are reseved by IDE I/F.  */
-       if (!request_region(0x430, 1, "ide") ||
-           !request_region(0x435, 1, "ide")) {
-               printk(KERN_WARNING
-                       "ide: IO port 0x430 and 0x435 are reserved for IDE"
-                       " the card using these ports may not work\n");
-       }
-
-       if (ide_hwifs[0].io_ports[IDE_DATA_OFFSET] == HD_DATA &&
-           ide_hwifs[1].io_ports[IDE_DATA_OFFSET] == HD_DATA) {
-               ide_hwifs[0].chipset = ide_pc9800;
-               ide_hwifs[0].mate = &ide_hwifs[1];
-               ide_hwifs[0].selectproc = pc9800_select;
-               ide_hwifs[1].chipset = ide_pc9800;
-               ide_hwifs[1].mate = &ide_hwifs[0];
-               ide_hwifs[1].selectproc = pc9800_select;
-       }
-}
diff --git a/drivers/ide/pci/alim15x3.h b/drivers/ide/pci/alim15x3.h
deleted file mode 100644 (file)
index 989bb9b..0000000
+++ /dev/null
@@ -1,27 +0,0 @@
-#ifndef ALI15X3_H
-#define ALI15X3_H
-
-#include <linux/config.h>
-#include <linux/pci.h>
-#include <linux/ide.h>
-
-#define DISPLAY_ALI_TIMINGS
-
-static unsigned int init_chipset_ali15x3(struct pci_dev *, const char *);
-static void init_hwif_common_ali15x3(ide_hwif_t *);
-static void init_hwif_ali15x3(ide_hwif_t *);
-static void init_dma_ali15x3(ide_hwif_t *, unsigned long);
-
-static ide_pci_device_t ali15x3_chipsets[] __devinitdata = {
-       {       /* 0 */
-               .name           = "ALI15X3",
-               .init_chipset   = init_chipset_ali15x3,
-               .init_hwif      = init_hwif_ali15x3,
-               .init_dma       = init_dma_ali15x3,
-               .channels       = 2,
-               .autodma        = AUTODMA,
-               .bootable       = ON_BOARD,
-       }
-};
-
-#endif /* ALI15X3 */
diff --git a/drivers/ide/pci/amd74xx.h b/drivers/ide/pci/amd74xx.h
deleted file mode 100644 (file)
index 376f862..0000000
+++ /dev/null
@@ -1,155 +0,0 @@
-#ifndef AMD74XX_H
-#define AMD74XX_H
-
-#include <linux/config.h>
-#include <linux/pci.h>
-#include <linux/ide.h>
-
-#define DISPLAY_AMD_TIMINGS
-
-static unsigned int init_chipset_amd74xx(struct pci_dev *, const char *);
-static void init_hwif_amd74xx(ide_hwif_t *);
-
-static ide_pci_device_t amd74xx_chipsets[] __devinitdata = {
-       {       /* 0 */
-               .vendor         = PCI_VENDOR_ID_AMD,
-               .device         = PCI_DEVICE_ID_AMD_COBRA_7401,
-               .name           = "AMD7401",
-               .init_chipset   = init_chipset_amd74xx,
-               .init_hwif      = init_hwif_amd74xx,
-               .channels       = 2,
-               .autodma        = AUTODMA,
-               .enablebits     = {{0x40,0x02,0x02}, {0x40,0x01,0x01}},
-               .bootable       = ON_BOARD,
-       },{     /* 1 */
-               .vendor         = PCI_VENDOR_ID_AMD,
-               .device         = PCI_DEVICE_ID_AMD_VIPER_7409,
-               .name           = "AMD7409",
-               .init_chipset   = init_chipset_amd74xx,
-               .init_hwif      = init_hwif_amd74xx,
-               .channels       = 2,
-               .autodma        = AUTODMA,
-               .enablebits     = {{0x40,0x02,0x02}, {0x40,0x01,0x01}},
-               .bootable       = ON_BOARD,
-       },{     /* 2 */
-               .vendor         = PCI_VENDOR_ID_AMD,
-               .device         = PCI_DEVICE_ID_AMD_VIPER_7411,
-               .name           = "AMD7411",
-               .init_chipset   = init_chipset_amd74xx,
-               .init_hwif      = init_hwif_amd74xx,
-               .channels       = 2,
-               .autodma        = AUTODMA,
-               .enablebits     = {{0x40,0x02,0x02}, {0x40,0x01,0x01}},
-               .bootable       = ON_BOARD,
-       },{     /* 3 */
-               .vendor         = PCI_VENDOR_ID_AMD,
-               .device         = PCI_DEVICE_ID_AMD_OPUS_7441,
-               .name           = "AMD7441",
-               .init_chipset   = init_chipset_amd74xx,
-               .init_hwif      = init_hwif_amd74xx,
-               .channels       = 2,
-               .autodma        = AUTODMA,
-               .enablebits     = {{0x40,0x02,0x02}, {0x40,0x01,0x01}},
-               .bootable       = ON_BOARD,
-       },{     /* 4 */
-               .vendor         = PCI_VENDOR_ID_AMD,
-               .device         = PCI_DEVICE_ID_AMD_8111_IDE,
-               .name           = "AMD8111",
-               .init_chipset   = init_chipset_amd74xx,
-               .init_hwif      = init_hwif_amd74xx,
-               .autodma        = AUTODMA,
-               .channels       = 2,
-               .enablebits     = {{0x40,0x02,0x02}, {0x40,0x01,0x01}},
-               .bootable       = ON_BOARD,
-       },
-       {       /* 5 */
-               .vendor         = PCI_VENDOR_ID_NVIDIA,
-               .device         = PCI_DEVICE_ID_NVIDIA_NFORCE_IDE,
-               .name           = "NFORCE",
-               .init_chipset   = init_chipset_amd74xx,
-               .init_hwif      = init_hwif_amd74xx,
-               .channels       = 2,
-               .autodma        = AUTODMA,
-               .enablebits     = {{0x50,0x02,0x02}, {0x50,0x01,0x01}},
-               .bootable       = ON_BOARD,
-       },
-       {       /* 6 */
-               .vendor         = PCI_VENDOR_ID_NVIDIA,
-               .device         = PCI_DEVICE_ID_NVIDIA_NFORCE2_IDE,
-               .name           = "NFORCE2",
-               .init_chipset   = init_chipset_amd74xx,
-               .init_hwif      = init_hwif_amd74xx,
-               .channels       = 2,
-               .autodma        = AUTODMA,
-               .enablebits     = {{0x50,0x02,0x02}, {0x50,0x01,0x01}},
-               .bootable       = ON_BOARD,
-       },
-       {       /* 7 */
-               .vendor         = PCI_VENDOR_ID_NVIDIA,
-               .device         = PCI_DEVICE_ID_NVIDIA_NFORCE2S_IDE,
-               .name           = "NFORCE2S",
-               .init_chipset   = init_chipset_amd74xx,
-               .init_hwif      = init_hwif_amd74xx,
-               .channels       = 2,
-               .autodma        = AUTODMA,
-               .enablebits     = {{0x50,0x02,0x02}, {0x50,0x01,0x01}},
-               .bootable       = ON_BOARD,
-       },
-       {       /* 8 */
-               .vendor         = PCI_VENDOR_ID_NVIDIA,
-               .device         = PCI_DEVICE_ID_NVIDIA_NFORCE2S_SATA,
-               .name           = "NFORCE2S-SATA",
-               .init_chipset   = init_chipset_amd74xx,
-               .init_hwif      = init_hwif_amd74xx,
-               .channels       = 2,
-               .autodma        = AUTODMA,
-               .enablebits     = {{0x50,0x02,0x02}, {0x50,0x01,0x01}},
-               .bootable       = ON_BOARD,
-       },
-       {       /* 9 */
-               .vendor         = PCI_VENDOR_ID_NVIDIA,
-               .device         = PCI_DEVICE_ID_NVIDIA_NFORCE3_IDE,
-               .name           = "NFORCE3",
-               .init_chipset   = init_chipset_amd74xx,
-               .init_hwif      = init_hwif_amd74xx,
-               .channels       = 2,
-               .autodma        = AUTODMA,
-               .enablebits     = {{0x50,0x02,0x02}, {0x50,0x01,0x01}},
-               .bootable       = ON_BOARD,
-       },
-       {       /* 10 */
-               .vendor         = PCI_VENDOR_ID_NVIDIA,
-               .device         = PCI_DEVICE_ID_NVIDIA_NFORCE3S_IDE,
-               .name           = "NFORCE3S",
-               .init_chipset   = init_chipset_amd74xx,
-               .init_hwif      = init_hwif_amd74xx,
-               .channels       = 2,
-               .autodma        = AUTODMA,
-               .enablebits     = {{0x50,0x02,0x02}, {0x50,0x01,0x01}},
-               .bootable       = ON_BOARD,
-       },
-       {       /* 11 */
-               .vendor         = PCI_VENDOR_ID_NVIDIA,
-               .device         = PCI_DEVICE_ID_NVIDIA_NFORCE3S_SATA,
-               .name           = "NFORCE3S-SATA",
-               .init_chipset   = init_chipset_amd74xx,
-               .init_hwif      = init_hwif_amd74xx,
-               .channels       = 2,
-               .autodma        = AUTODMA,
-               .enablebits     = {{0x50,0x02,0x02}, {0x50,0x01,0x01}},
-               .bootable       = ON_BOARD,
-       },
-       {       /* 12 */
-               .vendor         = PCI_VENDOR_ID_NVIDIA,
-               .device         = PCI_DEVICE_ID_NVIDIA_NFORCE3S_SATA2,
-               .name           = "NFORCE3S-SATA2",
-               .init_chipset   = init_chipset_amd74xx,
-               .init_hwif      = init_hwif_amd74xx,
-               .channels       = 2,
-               .autodma        = AUTODMA,
-               .enablebits     = {{0x50,0x02,0x02}, {0x50,0x01,0x01}},
-               .bootable       = ON_BOARD,
-       }
-};
-
-#endif /* AMD74XX_H */
diff --git a/drivers/ide/pci/cs5520.h b/drivers/ide/pci/cs5520.h
deleted file mode 100644 (file)
index f2cdc53..0000000
+++ /dev/null
@@ -1,40 +0,0 @@
-#ifndef CS5520_H
-#define CS5520_H
-
-#include <linux/config.h>
-#include <linux/pci.h>
-#include <linux/ide.h>
-
-#define DISPLAY_CS5520_TIMINGS
-
-static unsigned int init_chipset_cs5520(struct pci_dev *, const char *);
-static void init_hwif_cs5520(ide_hwif_t *);
-static void cs5520_init_setup_dma(struct pci_dev *dev, struct ide_pci_device_s *d, ide_hwif_t *hwif);
-
-static ide_pci_device_t cyrix_chipsets[] __devinitdata = {
-       {
-               .name           = "Cyrix 5510",
-               .init_chipset   = init_chipset_cs5520,
-               .init_setup_dma = cs5520_init_setup_dma,
-               .init_hwif      = init_hwif_cs5520,
-               .channels       = 2,
-               .autodma        = AUTODMA,
-               .bootable       = ON_BOARD,
-               .flags          = IDEPCI_FLAG_ISA_PORTS,
-       },
-       {
-               .name           = "Cyrix 5520",
-               .init_chipset   = init_chipset_cs5520,
-               .init_setup_dma = cs5520_init_setup_dma,
-               .init_hwif      = init_hwif_cs5520,
-               .channels       = 2,
-               .autodma        = AUTODMA,
-               .bootable       = ON_BOARD,
-               .flags          = IDEPCI_FLAG_ISA_PORTS,
-       }
-};
-
-
-#endif /* CS5520_H */
-
-
diff --git a/drivers/ide/pci/cs5530.h b/drivers/ide/pci/cs5530.h
deleted file mode 100644 (file)
index 08fe18a..0000000
+++ /dev/null
@@ -1,25 +0,0 @@
-#ifndef CS5530_H
-#define CS5530_H
-
-#include <linux/config.h>
-#include <linux/pci.h>
-#include <linux/ide.h>
-
-#define DISPLAY_CS5530_TIMINGS
-
-static unsigned int init_chipset_cs5530(struct pci_dev *, const char *);
-static void init_hwif_cs5530(ide_hwif_t *);
-
-static ide_pci_device_t cs5530_chipsets[] __devinitdata = {
-       {       /* 0 */
-               .name           = "CS5530",
-               .init_chipset   = init_chipset_cs5530,
-               .init_hwif      = init_hwif_cs5530,
-               .channels       = 2,
-               .autodma        = AUTODMA,
-               .bootable       = ON_BOARD,
-               .flags          = IDEPCI_FLAG_FORCE_MASTER,
-       }
-};
-
-#endif /* CS5530_H */
diff --git a/drivers/ide/pci/ns87415.h b/drivers/ide/pci/ns87415.h
deleted file mode 100644 (file)
index a2594c7..0000000
+++ /dev/null
@@ -1,20 +0,0 @@
-#ifndef NS87415_H
-#define NS87415_H
-
-#include <linux/config.h>
-#include <linux/pci.h>
-#include <linux/ide.h>
-
-static void init_hwif_ns87415(ide_hwif_t *);
-
-static ide_pci_device_t ns87415_chipsets[] __devinitdata = {
-       {       /* 0 */
-               .name           = "NS87415",
-               .init_hwif      = init_hwif_ns87415,
-               .channels       = 2,
-               .autodma        = AUTODMA,
-               .bootable       = ON_BOARD,
-       }
-};
-
-#endif /* NS87415_H */
diff --git a/drivers/ide/pci/rz1000.h b/drivers/ide/pci/rz1000.h
deleted file mode 100644 (file)
index 5c7c611..0000000
+++ /dev/null
@@ -1,26 +0,0 @@
-#ifndef RZ100X_H
-#define RZ100X_H
-
-#include <linux/config.h>
-#include <linux/pci.h>
-#include <linux/ide.h>
-
-static void init_hwif_rz1000(ide_hwif_t *);
-
-static ide_pci_device_t rz1000_chipsets[] __devinitdata = {
-       {
-               .name           = "RZ1000",
-               .init_hwif      = init_hwif_rz1000,
-               .channels       = 2,
-               .autodma        = NODMA,
-               .bootable       = ON_BOARD,
-       },{
-               .name           = "RZ1001",
-               .init_hwif      = init_hwif_rz1000,
-               .channels       = 2,
-               .autodma        = NODMA,
-               .bootable       = ON_BOARD,
-       }
-};
-
-#endif /* RZ100X_H */
diff --git a/drivers/ide/pci/sc1200.h b/drivers/ide/pci/sc1200.h
deleted file mode 100644 (file)
index c58e689..0000000
+++ /dev/null
@@ -1,24 +0,0 @@
-#ifndef SC1200_H
-#define SC1200_H
-
-#include <linux/config.h>
-#include <linux/pci.h>
-#include <linux/ide.h>
-
-#define DISPLAY_SC1200_TIMINGS
-
-static unsigned int init_chipset_sc1200(struct pci_dev *, const char *);
-static void init_hwif_sc1200(ide_hwif_t *);
-
-static ide_pci_device_t sc1200_chipsets[] __devinitdata = {
-       {       /* 0 */
-               .name           = "SC1200",
-               .init_chipset   = init_chipset_sc1200,
-               .init_hwif      = init_hwif_sc1200,
-               .channels       = 2,
-               .autodma        = AUTODMA,
-               .bootable       = ON_BOARD,
-       }
-};
-
-#endif /* SC1200_H */
diff --git a/drivers/ide/pci/siimage.h b/drivers/ide/pci/siimage.h
deleted file mode 100644 (file)
index b83b4c3..0000000
+++ /dev/null
@@ -1,53 +0,0 @@
-#ifndef SIIMAGE_H
-#define SIIMAGE_H
-
-#include <linux/pci.h>
-#include <linux/ide.h>
-
-#include <asm/io.h>
-
-#undef SIIMAGE_VIRTUAL_DMAPIO
-#undef SIIMAGE_BUFFERED_TASKFILE
-#undef SIIMAGE_LARGE_DMA
-
-#define SII_DEBUG 0
-
-#if SII_DEBUG
-#define siiprintk(x...)        printk(x)
-#else
-#define siiprintk(x...)
-#endif
-
-static unsigned int init_chipset_siimage(struct pci_dev *, const char *);
-static void init_iops_siimage(ide_hwif_t *);
-static void init_hwif_siimage(ide_hwif_t *);
-
-static ide_pci_device_t siimage_chipsets[] __devinitdata = {
-       {       /* 0 */
-               .name           = "SiI680",
-               .init_chipset   = init_chipset_siimage,
-               .init_iops      = init_iops_siimage,
-               .init_hwif      = init_hwif_siimage,
-               .channels       = 2,
-               .autodma        = AUTODMA,
-               .bootable       = ON_BOARD,
-       },{     /* 1 */
-               .name           = "SiI3112 Serial ATA",
-               .init_chipset   = init_chipset_siimage,
-               .init_iops      = init_iops_siimage,
-               .init_hwif      = init_hwif_siimage,
-               .channels       = 2,
-               .autodma        = AUTODMA,
-               .bootable       = ON_BOARD,
-       },{     /* 2 */
-               .name           = "Adaptec AAR-1210SA",
-               .init_chipset   = init_chipset_siimage,
-               .init_iops      = init_iops_siimage,
-               .init_hwif      = init_hwif_siimage,
-               .channels       = 2,
-               .autodma        = AUTODMA,
-               .bootable       = ON_BOARD,
-       }
-};
-
-#endif /* SIIMAGE_H */
diff --git a/drivers/ide/pci/sis5513.h b/drivers/ide/pci/sis5513.h
deleted file mode 100644 (file)
index d66e9a7..0000000
+++ /dev/null
@@ -1,25 +0,0 @@
-#ifndef SIS5513_H
-#define SIS5513_H
-
-#include <linux/config.h>
-#include <linux/pci.h>
-#include <linux/ide.h>
-
-#define DISPLAY_SIS_TIMINGS
-
-static unsigned int init_chipset_sis5513(struct pci_dev *, const char *);
-static void init_hwif_sis5513(ide_hwif_t *);
-
-static ide_pci_device_t sis5513_chipsets[] __devinitdata = {
-       {       /* 0 */
-               .name           = "SIS5513",
-               .init_chipset   = init_chipset_sis5513,
-               .init_hwif      = init_hwif_sis5513,
-               .channels       = 2,
-               .autodma        = NOAUTODMA,
-               .enablebits     = {{0x4a,0x02,0x02}, {0x4a,0x04,0x04}},
-               .bootable       = ON_BOARD,
-       }
-};
-
-#endif /* SIS5513_H */
diff --git a/drivers/ide/pci/sl82c105.h b/drivers/ide/pci/sl82c105.h
deleted file mode 100644 (file)
index f2d34a2..0000000
+++ /dev/null
@@ -1,25 +0,0 @@
-#ifndef W82C105_H
-#define W82C105_H
-
-#include <linux/config.h>
-#include <linux/pci.h>
-#include <linux/ide.h>
-
-static unsigned int init_chipset_sl82c105(struct pci_dev *, const char *);
-static void init_hwif_sl82c105(ide_hwif_t *);
-static void init_dma_sl82c105(ide_hwif_t *, unsigned long);
-
-static ide_pci_device_t sl82c105_chipsets[] __devinitdata = {
-       {       /* 0 */
-               .name           = "W82C105",
-               .init_chipset   = init_chipset_sl82c105,
-               .init_hwif      = init_hwif_sl82c105,
-               .init_dma       = init_dma_sl82c105,
-               .channels       = 2,
-               .autodma        = NOAUTODMA,
-               .enablebits     = {{0x40,0x01,0x01}, {0x40,0x10,0x10}},
-               .bootable       = ON_BOARD,
-       }
-};
-
-#endif /* W82C105_H */
diff --git a/drivers/ide/pci/slc90e66.h b/drivers/ide/pci/slc90e66.h
deleted file mode 100644 (file)
index 5701795..0000000
+++ /dev/null
@@ -1,27 +0,0 @@
-#ifndef SLC90E66_H
-#define SLC90E66_H
-
-#include <linux/config.h>
-#include <linux/pci.h>
-#include <linux/ide.h>
-
-#define DISPLAY_SLC90E66_TIMINGS
-
-#define SLC90E66_DEBUG_DRIVE_INFO      0
-
-static unsigned int init_chipset_slc90e66(struct pci_dev *, const char *);
-static void init_hwif_slc90e66(ide_hwif_t *);
-
-static ide_pci_device_t slc90e66_chipsets[] __devinitdata = {
-       {       /* 0 */
-               .name           = "SLC90E66",
-               .init_chipset   = init_chipset_slc90e66,
-               .init_hwif      = init_hwif_slc90e66,
-               .channels       = 2,
-               .autodma        = AUTODMA,
-               .enablebits     = {{0x41,0x80,0x80}, {0x43,0x80,0x80}},
-               .bootable       = ON_BOARD,
-       }
-};
-
-#endif /* SLC90E66_H */
diff --git a/drivers/ide/pci/triflex.h b/drivers/ide/pci/triflex.h
deleted file mode 100644 (file)
index f826608..0000000
+++ /dev/null
@@ -1,37 +0,0 @@
-/* 
- * triflex.h
- *
- * Copyright (C) 2002 Hewlett-Packard Development Group, L.P.
- * Author: Torben Mathiasen <torben.mathiasen@hp.com>
- *
- */
-#ifndef TRIFLEX_H
-#define TRIFLEX_H
-
-#include <linux/config.h>
-#include <linux/pci.h>
-#include <linux/ide.h>
-
-static unsigned int __devinit init_chipset_triflex(struct pci_dev *, const char *);
-static void init_hwif_triflex(ide_hwif_t *);
-
-static ide_pci_device_t triflex_devices[] __devinitdata = {
-       {
-               .name           = "TRIFLEX",
-               .init_chipset   = init_chipset_triflex,
-               .init_hwif      = init_hwif_triflex,
-               .channels       = 2,
-               .autodma        = AUTODMA,
-               .enablebits     = {{0x80, 0x01, 0x01}, {0x80, 0x02, 0x02}},
-               .bootable       = ON_BOARD,
-       }
-};
-
-static struct pci_device_id triflex_pci_tbl[] = {
-       { PCI_VENDOR_ID_COMPAQ, PCI_DEVICE_ID_COMPAQ_TRIFLEX_IDE, PCI_ANY_ID, 
-               PCI_ANY_ID, 0, 0, 0 },
-       { 0, },
-};
-MODULE_DEVICE_TABLE(pci, triflex_pci_tbl);
-
-#endif /* TRIFLEX_H */
diff --git a/drivers/ide/pci/trm290.h b/drivers/ide/pci/trm290.h
deleted file mode 100644 (file)
index 6c001d4..0000000
+++ /dev/null
@@ -1,20 +0,0 @@
-#ifndef TRM290_H
-#define TRM290_H
-
-#include <linux/config.h>
-#include <linux/pci.h>
-#include <linux/ide.h>
-
-extern void init_hwif_trm290(ide_hwif_t *);
-
-static ide_pci_device_t trm290_chipsets[] __devinitdata = {
-       {       /* 0 */
-               .name           = "TRM290",
-               .init_hwif      = init_hwif_trm290,
-               .channels       = 2,
-               .autodma        = NOAUTODMA,
-               .bootable       = ON_BOARD,
-       }
-};
-
-#endif /* TRM290_H */
diff --git a/drivers/ide/pci/via82cxxx.h b/drivers/ide/pci/via82cxxx.h
deleted file mode 100644 (file)
index 6504ca0..0000000
+++ /dev/null
@@ -1,25 +0,0 @@
-#ifndef VIA82CXXX_H
-#define VIA82CXXX_H
-
-#include <linux/config.h>
-#include <linux/pci.h>
-#include <linux/ide.h>
-
-#define DISPLAY_VIA_TIMINGS
-
-static unsigned int init_chipset_via82cxxx(struct pci_dev *, const char *);
-static void init_hwif_via82cxxx(ide_hwif_t *);
-
-static ide_pci_device_t via82cxxx_chipsets[] __devinitdata = {
-       {       /* 0 */
-               .name           = "VP_IDE",
-               .init_chipset   = init_chipset_via82cxxx,
-               .init_hwif      = init_hwif_via82cxxx,
-               .channels       = 2,
-               .autodma        = NOAUTODMA,
-               .enablebits     = {{0x40,0x02,0x02}, {0x40,0x01,0x01}},
-               .bootable       = ON_BOARD,
-       }
-};
-
-#endif /* VIA82CXXX_H */
diff --git a/drivers/input/keyboard/98kbd.c b/drivers/input/keyboard/98kbd.c
deleted file mode 100644 (file)
index 803df0d..0000000
+++ /dev/null
@@ -1,387 +0,0 @@
-/*
- *  drivers/input/keyboard/98kbd.c
- *
- *  PC-9801 keyboard driver for Linux
- *
- *    Based on atkbd.c and xtkbd.c written by Vojtech Pavlik
- *
- *  Copyright (c) 2002 Osamu Tomita
- *  Copyright (c) 1999-2001 Vojtech Pavlik
- */
-
-/*
- * 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
- * 
- */
-
-#include <linux/delay.h>
-#include <linux/slab.h>
-#include <linux/module.h>
-#include <linux/input.h>
-#include <linux/init.h>
-#include <linux/serio.h>
-
-#include <asm/io.h>
-#include <asm/pc9800.h>
-
-MODULE_AUTHOR("Osamu Tomita <tomita@cinet.co.jp>");
-MODULE_DESCRIPTION("PC-9801 keyboard driver");
-MODULE_LICENSE("GPL");
-
-#define KBD98_KEY      0x7f
-#define KBD98_RELEASE  0x80
-
-static unsigned char kbd98_keycode[256] = {     
-         1,  2,  3,  4,  5,  6,  7,  8,  9, 10, 11, 12, 13, 43, 14, 15,
-        16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 41, 26, 28, 30, 31, 32,
-        33, 34, 35, 36, 37, 38, 39, 40, 27, 44, 45, 46, 47, 48, 49, 50,
-        51, 52, 53, 12, 57, 92,109,104,110,111,103,105,106,108,102,107,
-        74, 98, 71, 72, 73, 55, 75, 76, 77, 78, 79, 80, 81,117, 82,121,
-        83, 94, 87, 88,183,184,185,  0,  0,  0,  0,  0,  0,  0,102,  0,
-        99,133, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68,  0,  0,  0,  0,
-        54, 58, 42, 56, 29
-};
-
-struct jis_kbd_conv {
-       unsigned char scancode;
-       struct {
-               unsigned char shift;
-               unsigned char keycode;
-       } emul[2];
-};
-
-static struct jis_kbd_conv kbd98_jis[] = {
-       {0x02, {{0,   3}, {1,  40}}},
-       {0x06, {{0,   7}, {1,   8}}},
-       {0x07, {{0,   8}, {0,  40}}},
-       {0x08, {{0,   9}, {1,  10}}},
-       {0x09, {{0,  10}, {1,  11}}},
-       {0x0a, {{0,  11}, {1, 255}}},
-       {0x0b, {{0,  12}, {0,  13}}},
-       {0x0c, {{1,   7}, {0,  41}}},
-       {0x1a, {{1,   3}, {1,  41}}},
-       {0x26, {{0,  39}, {1,  13}}},
-       {0x27, {{1,  39}, {1,   9}}},
-       {0x33, {{0, 255}, {1,  12}}},
-       {0xff, {{0, 255}, {1, 255}}}    /* terminater */
-};
-
-#define KBD98_CMD_SETEXKEY     0x1095  /* Enable/Disable Windows, Appli key */
-#define KBD98_CMD_SETRATE      0x109c  /* Set typematic rate */
-#define KBD98_CMD_SETLEDS      0x109d  /* Set keyboard leds */
-#define KBD98_CMD_GETLEDS      0x119d  /* Get keyboard leds */
-#define KBD98_CMD_GETID                0x019f
-
-#define KBD98_RET_ACK          0xfa
-#define KBD98_RET_NAK          0xfc    /* Command NACK, send the cmd again */
-
-#define KBD98_KEY_JIS_EMUL     253
-#define KBD98_KEY_UNKNOWN      254
-#define KBD98_KEY_NULL         255
-
-static char *kbd98_name = "PC-9801 Keyboard";
-
-struct kbd98 {
-       unsigned char keycode[256];
-       struct input_dev dev;
-       struct serio *serio;
-       char phys[32];
-       unsigned char cmdbuf[4];
-       unsigned char cmdcnt;
-       signed char ack;
-       unsigned char shift;
-       struct {
-               unsigned char scancode;
-               unsigned char keycode;
-       } emul;
-       struct jis_kbd_conv jis[16];
-};
-
-void kbd98_interrupt(struct serio *serio, unsigned char data,
-                       unsigned int flags, struct pt_regs *regs)
-{
-       struct kbd98 *kbd98 = serio->private;
-       unsigned char scancode, keycode;
-       int press, i;
-
-       switch (data) {
-               case KBD98_RET_ACK:
-                       kbd98->ack = 1;
-                       return;
-               case KBD98_RET_NAK:
-                       kbd98->ack = -1;
-                       return;
-       }
-
-       if (kbd98->cmdcnt) {
-               kbd98->cmdbuf[--kbd98->cmdcnt] = data;
-               return;
-       }
-
-       scancode = data & KBD98_KEY;
-       keycode = kbd98->keycode[scancode];
-       press = !(data & KBD98_RELEASE);
-       if (kbd98->emul.scancode != KBD98_KEY_UNKNOWN
-           && scancode != kbd98->emul.scancode) {
-               input_report_key(&kbd98->dev, kbd98->emul.keycode, 0);
-               kbd98->emul.scancode = KBD98_KEY_UNKNOWN;
-       }
-
-       if (keycode == KEY_RIGHTSHIFT)
-               kbd98->shift = press;
-
-       switch (keycode) {
-               case KEY_2:
-               case KEY_6:
-               case KEY_7:
-               case KEY_8:
-               case KEY_9:
-               case KEY_0:
-               case KEY_MINUS:
-               case KEY_EQUAL:
-               case KEY_GRAVE:
-               case KEY_SEMICOLON:
-               case KEY_APOSTROPHE:
-                       /* emulation: JIS keyboard to US101 keyboard */
-                       i = 0;
-                       while (kbd98->jis[i].scancode != 0xff) {
-                               if (scancode == kbd98->jis[i].scancode)
-                                       break;
-                               i ++;
-                       }
-
-                       keycode = kbd98->jis[i].emul[kbd98->shift].keycode;
-                       if (keycode == KBD98_KEY_NULL)
-                               return;
-
-                       if (press) {
-                               kbd98->emul.scancode = scancode;
-                               kbd98->emul.keycode = keycode;
-                               if (kbd98->jis[i].emul[kbd98->shift].shift
-                                                               != kbd98->shift)
-                                       input_report_key(&kbd98->dev,
-                                                       KEY_RIGHTSHIFT,
-                                                       !(kbd98->shift));
-                       }
-
-                       input_report_key(&kbd98->dev, keycode, press);
-                       if (!press) {
-                               if (kbd98->jis[i].emul[kbd98->shift].shift
-                                                               != kbd98->shift)
-                                       input_report_key(&kbd98->dev,
-                                                       KEY_RIGHTSHIFT,
-                                                       kbd98->shift);
-                               kbd98->emul.scancode = KBD98_KEY_UNKNOWN;
-                       }
-
-                       input_sync(&kbd98->dev);
-                       return;
-
-               case KEY_CAPSLOCK:
-                       input_report_key(&kbd98->dev, keycode, 1);
-                       input_sync(&kbd98->dev);
-                       input_report_key(&kbd98->dev, keycode, 0);
-                       input_sync(&kbd98->dev);
-                       return;
-
-               case KBD98_KEY_NULL:
-                       return;
-
-               case 0:
-                       printk(KERN_WARNING "kbd98.c: Unknown key (scancode %#x) %s.\n",
-                               data & KBD98_KEY, data & KBD98_RELEASE ? "released" : "pressed");
-                       return;
-
-               default:
-                       input_report_key(&kbd98->dev, keycode, press);
-                       input_sync(&kbd98->dev);
-               }
-}
-
-/*
- * kbd98_sendbyte() sends a byte to the keyboard, and waits for
- * acknowledge. It doesn't handle resends according to the keyboard
- * protocol specs, because if these are needed, the keyboard needs
- * replacement anyway, and they only make a mess in the protocol.
- */
-
-static int kbd98_sendbyte(struct kbd98 *kbd98, unsigned char byte)
-{
-       int timeout = 10000; /* 100 msec */
-       kbd98->ack = 0;
-
-       if (serio_write(kbd98->serio, byte))
-               return -1;
-
-       while (!kbd98->ack && timeout--) udelay(10);
-
-       return -(kbd98->ack <= 0);
-}
-
-/*
- * kbd98_command() sends a command, and its parameters to the keyboard,
- * then waits for the response and puts it in the param array.
- */
-
-static int kbd98_command(struct kbd98 *kbd98, unsigned char *param, int command)
-{
-       int timeout = 50000; /* 500 msec */
-       int send = (command >> 12) & 0xf;
-       int receive = (command >> 8) & 0xf;
-       int i;
-
-       kbd98->cmdcnt = receive;
-       
-       if (command & 0xff)
-               if (kbd98_sendbyte(kbd98, command & 0xff))
-                       return (kbd98->cmdcnt = 0) - 1;
-
-       for (i = 0; i < send; i++)
-               if (kbd98_sendbyte(kbd98, param[i]))
-                       return (kbd98->cmdcnt = 0) - 1;
-
-       while (kbd98->cmdcnt && timeout--) udelay(10);
-
-       if (param)
-               for (i = 0; i < receive; i++)
-                       param[i] = kbd98->cmdbuf[(receive - 1) - i];
-
-       if (kbd98->cmdcnt) 
-               return (kbd98->cmdcnt = 0) - 1;
-
-       return 0;
-}
-
-/*
- * Event callback from the input module. Events that change the state of
- * the hardware are processed here.
- */
-
-static int kbd98_event(struct input_dev *dev, unsigned int type, unsigned int code, int value)
-{
-       struct kbd98 *kbd98 = dev->private;
-       char param[2];
-
-       switch (type) {
-
-               case EV_LED:
-
-                       if (__PC9800SCA_TEST_BIT(0x481, 3)) {
-                               /* 98note with Num Lock key */
-                               /* keep Num Lock status     */
-                               *param = 0x60;
-                               if (kbd98_command(kbd98, param,
-                                                       KBD98_CMD_GETLEDS))
-                                       printk(KERN_DEBUG
-                                               "kbd98: Get keyboard LED"
-                                               " status Error\n");
-
-                               *param &= 1;
-                       } else {
-                               /* desktop PC-9801 */
-                               *param = 1;     /* Always set Num Lock */
-                       }
-
-                       *param |= 0x70
-                              | (test_bit(LED_CAPSL,   dev->led) ? 4 : 0)
-                              | (test_bit(LED_KANA,    dev->led) ? 8 : 0);
-                       kbd98_command(kbd98, param, KBD98_CMD_SETLEDS);
-
-                       return 0;
-       }
-
-       return -1;
-}
-
-void kbd98_connect(struct serio *serio, struct serio_dev *dev)
-{
-       struct kbd98 *kbd98;
-       int i;
-
-       if ((serio->type & SERIO_TYPE) != SERIO_PC9800)
-               return;
-
-       if (!(kbd98 = kmalloc(sizeof(struct kbd98), GFP_KERNEL)))
-               return;
-
-       memset(kbd98, 0, sizeof(struct kbd98));
-       kbd98->emul.scancode = KBD98_KEY_UNKNOWN;
-       
-       kbd98->dev.evbit[0] = BIT(EV_KEY) | BIT(EV_LED) | BIT(EV_REP);
-       kbd98->dev.ledbit[0] = BIT(LED_NUML) | BIT(LED_CAPSL) | BIT(LED_KANA);
-
-       kbd98->serio = serio;
-
-       init_input_dev(&kbd98->dev);
-       kbd98->dev.keycode = kbd98->keycode;
-       kbd98->dev.keycodesize = sizeof(unsigned char);
-       kbd98->dev.keycodemax = ARRAY_SIZE(kbd98_keycode);
-       kbd98->dev.event = kbd98_event;
-       kbd98->dev.private = kbd98;
-
-       serio->private = kbd98;
-
-       if (serio_open(serio, dev)) {
-               kfree(kbd98);
-               return;
-       }
-
-       memcpy(kbd98->jis, kbd98_jis, sizeof(kbd98_jis));
-       memcpy(kbd98->keycode, kbd98_keycode, sizeof(kbd98->keycode));
-       for (i = 0; i < 255; i++)
-               set_bit(kbd98->keycode[i], kbd98->dev.keybit);
-       clear_bit(0, kbd98->dev.keybit);
-
-       sprintf(kbd98->phys, "%s/input0", serio->phys);
-
-       kbd98->dev.name = kbd98_name;
-       kbd98->dev.phys = kbd98->phys;
-       kbd98->dev.id.bustype = BUS_XTKBD;
-       kbd98->dev.id.vendor = 0x0002;
-       kbd98->dev.id.product = 0x0001;
-       kbd98->dev.id.version = 0x0100;
-
-       input_register_device(&kbd98->dev);
-
-       printk(KERN_INFO "input: %s on %s\n", kbd98_name, serio->phys);
-}
-
-void kbd98_disconnect(struct serio *serio)
-{
-       struct kbd98 *kbd98 = serio->private;
-       input_unregister_device(&kbd98->dev);
-       serio_close(serio);
-       kfree(kbd98);
-}
-
-struct serio_dev kbd98_dev = {
-       .interrupt =    kbd98_interrupt,
-       .connect =      kbd98_connect,
-       .disconnect =   kbd98_disconnect
-};
-
-int __init kbd98_init(void)
-{
-       serio_register_device(&kbd98_dev);
-       return 0;
-}
-
-void __exit kbd98_exit(void)
-{
-       serio_unregister_device(&kbd98_dev);
-}
-
-module_init(kbd98_init);
-module_exit(kbd98_exit);
diff --git a/drivers/input/misc/98spkr.c b/drivers/input/misc/98spkr.c
deleted file mode 100644 (file)
index 80fc6ee..0000000
+++ /dev/null
@@ -1,96 +0,0 @@
-/*
- *  PC-9800 Speaker beeper driver for Linux
- *
- *  Copyright (c) 2002 Osamu Tomita
- *  Copyright (c) 2002 Vojtech Pavlik
- *  Copyright (c) 1992 Orest Zborowski
- *
- */
-
-/*
- * 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
- */
-
-#include <linux/kernel.h>
-#include <linux/module.h>
-#include <linux/init.h>
-#include <linux/input.h>
-#include <asm/8253pit.h>
-#include <asm/io.h>
-
-MODULE_AUTHOR("Osamu Tomita <tomita@cinet.co.jp>");
-MODULE_DESCRIPTION("PC-9800 Speaker beeper driver");
-MODULE_LICENSE("GPL");
-
-static char spkr98_name[] = "PC-9801 Speaker";
-static char spkr98_phys[] = "isa3fdb/input0";
-static struct input_dev spkr98_dev;
-
-spinlock_t i8253_beep_lock = SPIN_LOCK_UNLOCKED;
-
-static int spkr98_event(struct input_dev *dev, unsigned int type, unsigned int code, int value)
-{
-       unsigned int count = 0;
-       unsigned long flags;
-
-       if (type != EV_SND)
-               return -1;
-
-       switch (code) {
-               case SND_BELL: if (value) value = 1000;
-               case SND_TONE: break;
-               default: return -1;
-       } 
-
-       if (value > 20 && value < 32767)
-               count = PIT_TICK_RATE / value;
-       
-       spin_lock_irqsave(&i8253_beep_lock, flags);
-
-       if (count) {
-               outb(0x76, 0x3fdf);
-               outb(0, 0x5f);
-               outb(count & 0xff, 0x3fdb);
-               outb(0, 0x5f);
-               outb((count >> 8) & 0xff, 0x3fdb);
-               /* beep on */
-               outb(6, 0x37);
-       } else {
-               /* beep off */
-               outb(7, 0x37);
-       }
-
-       spin_unlock_irqrestore(&i8253_beep_lock, flags);
-
-       return 0;
-}
-
-static int __init spkr98_init(void)
-{
-       spkr98_dev.evbit[0] = BIT(EV_SND);
-       spkr98_dev.sndbit[0] = BIT(SND_BELL) | BIT(SND_TONE);
-       spkr98_dev.event = spkr98_event;
-
-       spkr98_dev.name = spkr98_name;
-       spkr98_dev.phys = spkr98_phys;
-       spkr98_dev.id.bustype = BUS_ISA;
-       spkr98_dev.id.vendor = 0x001f;
-       spkr98_dev.id.product = 0x0001;
-       spkr98_dev.id.version = 0x0100;
-
-       input_register_device(&spkr98_dev);
-
-        printk(KERN_INFO "input: %s\n", spkr98_name);
-
-       return 0;
-}
-
-static void __exit spkr98_exit(void)
-{
-        input_unregister_device(&spkr98_dev);
-}
-
-module_init(spkr98_init);
-module_exit(spkr98_exit);
diff --git a/drivers/input/mouse/98busmouse.c b/drivers/input/mouse/98busmouse.c
deleted file mode 100644 (file)
index fed160f..0000000
+++ /dev/null
@@ -1,197 +0,0 @@
-/*
- *
- *  Copyright (c) 2002 Osamu Tomita
- *
- *  Based on the work of:
- *     James Banks             Matthew Dillon
- *     David Giller            Nathan Laredo
- *     Linus Torvalds          Johan Myreen
- *     Cliff Matthews          Philip Blundell
- *     Russell King            Vojtech Pavlik
- */
-
-/*
- * NEC PC-9801 Bus Mouse Driver for Linux
- */
-
-/*
- * 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
- * 
- */
-
-#include <linux/config.h>
-#include <linux/module.h>
-#include <linux/moduleparam.h>
-#include <linux/delay.h>
-#include <linux/ioport.h>
-#include <linux/init.h>
-#include <linux/input.h>
-#include <linux/interrupt.h>
-
-#include <asm/io.h>
-#include <asm/irq.h>
-
-MODULE_AUTHOR("Osamu Tomita <tomita@cinet.co.jp>");
-MODULE_DESCRIPTION("PC-9801 busmouse driver");
-MODULE_LICENSE("GPL");
-
-#define        PC98BM_BASE             0x7fd9
-#define        PC98BM_DATA_PORT        PC98BM_BASE + 0
-/*     PC98BM_SIGNATURE_PORT   does not exist */
-#define        PC98BM_CONTROL_PORT     PC98BM_BASE + 4
-/*     PC98BM_INTERRUPT_PORT   does not exist */
-#define        PC98BM_CONFIG_PORT      PC98BM_BASE + 6
-
-#define        PC98BM_ENABLE_IRQ       0x00
-#define        PC98BM_DISABLE_IRQ      0x10
-#define        PC98BM_READ_X_LOW       0x80
-#define        PC98BM_READ_X_HIGH      0xa0
-#define        PC98BM_READ_Y_LOW       0xc0
-#define        PC98BM_READ_Y_HIGH      0xe0
-
-#define PC98BM_DEFAULT_MODE    0x93
-/*     PC98BM_CONFIG_BYTE      is not used */
-/*     PC98BM_SIGNATURE_BYTE   is not used */
-
-#define PC98BM_TIMER_PORT      0xbfdb
-#define PC98BM_DEFAULT_TIMER_VAL       0x00
-
-#define PC98BM_IRQ             13
-
-static int pc98bm_irq = PC98BM_IRQ;
-module_param_named(irq, pc98bm_irq, uint, 0);
-MODULE_PARM_DESC(irq, "IRQ number (13=default)");
-
-__obsolete_setup("pc98bm_irq=");
-
-static int pc98bm_used = 0;
-
-static irqreturn_t pc98bm_interrupt(int irq, void *dev_id, struct pt_regs *regs);
-
-static int pc98bm_open(struct input_dev *dev)
-{
-       if (pc98bm_used++)
-               return 0;
-       if (request_irq(pc98bm_irq, pc98bm_interrupt, 0, "98busmouse", NULL)) {
-               pc98bm_used--;
-               printk(KERN_ERR "98busmouse.c: Can't allocate irq %d\n", pc98bm_irq);
-               return -EBUSY;
-       }
-       outb(PC98BM_ENABLE_IRQ, PC98BM_CONTROL_PORT);
-       return 0;
-}
-
-static void pc98bm_close(struct input_dev *dev)
-{
-       if (--pc98bm_used)
-               return;
-       outb(PC98BM_DISABLE_IRQ, PC98BM_CONTROL_PORT);
-       free_irq(pc98bm_irq, NULL);
-}
-
-static struct input_dev pc98bm_dev = {
-       .evbit  = { BIT(EV_KEY) | BIT(EV_REL) },
-       .keybit = { [LONG(BTN_LEFT)] = BIT(BTN_LEFT) | BIT(BTN_MIDDLE) | BIT(BTN_RIGHT) },
-       .relbit = { BIT(REL_X) | BIT(REL_Y) },
-       .open   = pc98bm_open,
-       .close  = pc98bm_close,
-       .name   = "PC-9801 bus mouse",
-       .phys   = "isa7fd9/input0",
-       .id     = {
-               .bustype = BUS_ISA,
-               .vendor  = 0x0004,
-               .product = 0x0001,
-               .version = 0x0100,
-       },
-};
-
-static irqreturn_t pc98bm_interrupt(int irq, void *dev_id, struct pt_regs *regs)
-{
-       char dx, dy;
-       unsigned char buttons;
-
-       outb(PC98BM_READ_X_LOW, PC98BM_CONTROL_PORT);
-       dx = (inb(PC98BM_DATA_PORT) & 0xf);
-       outb(PC98BM_READ_X_HIGH, PC98BM_CONTROL_PORT);
-       dx |= (inb(PC98BM_DATA_PORT) & 0xf) << 4;
-       outb(PC98BM_READ_Y_LOW, PC98BM_CONTROL_PORT);
-       dy = (inb(PC98BM_DATA_PORT) & 0xf);
-       outb(PC98BM_READ_Y_HIGH, PC98BM_CONTROL_PORT);
-       buttons = inb(PC98BM_DATA_PORT);
-       dy |= (buttons & 0xf) << 4;
-       buttons = ~buttons >> 5;
-
-       input_report_rel(&pc98bm_dev, REL_X, dx);
-       input_report_rel(&pc98bm_dev, REL_Y, dy);
-       input_report_key(&pc98bm_dev, BTN_RIGHT,  buttons & 1);
-       input_report_key(&pc98bm_dev, BTN_MIDDLE, buttons & 2);
-       input_report_key(&pc98bm_dev, BTN_LEFT,   buttons & 4);
-       input_sync(&pc98bm_dev);
-
-       outb(PC98BM_ENABLE_IRQ, PC98BM_CONTROL_PORT);
-
-       return IRQ_HANDLED;
-}
-
-static int __init pc98bm_init(void)
-{
-       int i;
-
-       for (i = 0; i <= 6; i += 2) {
-               if (!request_region(PC98BM_BASE + i, 1, "98busmouse")) {
-                       printk(KERN_ERR "98busmouse.c: Can't allocate ports at %#x\n", PC98BM_BASE + i);
-                       while (i > 0) {
-                               i -= 2;
-                               release_region(PC98BM_BASE + i, 1);
-                       }
-
-                       return -EBUSY;
-               }
-
-       }
-
-       if (!request_region(PC98BM_TIMER_PORT, 1, "98busmouse")) {
-               printk(KERN_ERR "98busmouse.c: Can't allocate ports at %#x\n", PC98BM_TIMER_PORT);
-               for (i = 0; i <= 6; i += 2)
-                       release_region(PC98BM_BASE + i, 1);
-
-               return -EBUSY;
-       }
-
-       outb(PC98BM_DEFAULT_MODE, PC98BM_CONFIG_PORT);
-       outb(PC98BM_DISABLE_IRQ, PC98BM_CONTROL_PORT);
-
-       outb(PC98BM_DEFAULT_TIMER_VAL, PC98BM_TIMER_PORT);
-
-       input_register_device(&pc98bm_dev);
-       
-       printk(KERN_INFO "input: PC-9801 bus mouse at %#x irq %d\n", PC98BM_BASE, pc98bm_irq);
-
-       return 0;
-}
-
-static void __exit pc98bm_exit(void)
-{
-       int i;
-
-       input_unregister_device(&pc98bm_dev);
-       for (i = 0; i <= 6; i += 2)
-               release_region(PC98BM_BASE + i, 1);
-
-       release_region(PC98BM_TIMER_PORT, 1);
-}
-
-module_init(pc98bm_init);
-module_exit(pc98bm_exit);
diff --git a/drivers/input/serio/98kbd-io.c b/drivers/input/serio/98kbd-io.c
deleted file mode 100644 (file)
index 25f64c9..0000000
+++ /dev/null
@@ -1,178 +0,0 @@
-/*
- *  NEC PC-9801 keyboard controller driver for Linux
- *
- *  Copyright (c) 1999-2002 Osamu Tomita <tomita@cinet.co.jp>
- *    Based on i8042.c written by Vojtech Pavlik
- */
-
-/*
- * 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.
- */
-
-#include <linux/config.h>
-#include <linux/delay.h>
-#include <linux/module.h>
-#include <linux/interrupt.h>
-#include <linux/ioport.h>
-#include <linux/init.h>
-#include <linux/serio.h>
-#include <linux/sched.h>
-
-#include <asm/io.h>
-
-MODULE_AUTHOR("Osamu Tomita <tomita@cinet.co.jp>");
-MODULE_DESCRIPTION("NEC PC-9801 keyboard controller driver");
-MODULE_LICENSE("GPL");
-
-/*
- * Names.
- */
-
-#define KBD98_PHYS_DESC "isa0041/serio0"
-
-/*
- * IRQs.
- */
-
-#define KBD98_IRQ      1
-
-/*
- * Register numbers.
- */
-
-#define KBD98_COMMAND_REG      0x43    
-#define KBD98_STATUS_REG       0x43    
-#define KBD98_DATA_REG         0x41
-
-spinlock_t kbd98io_lock = SPIN_LOCK_UNLOCKED;
-
-static struct serio kbd98_port;
-extern struct pt_regs *kbd_pt_regs;
-
-static void kbd98io_interrupt(int irq, void *dev_id, struct pt_regs *regs);
-
-/*
- * kbd98_flush() flushes all data that may be in the keyboard buffers
- */
-
-static int kbd98_flush(void)
-{
-       unsigned long flags;
-
-       spin_lock_irqsave(&kbd98io_lock, flags);
-
-       while (inb(KBD98_STATUS_REG) & 0x02) /* RxRDY */
-               inb(KBD98_DATA_REG);
-
-       if (inb(KBD98_STATUS_REG) & 0x38)
-               printk("98kbd-io: Keyboard error!\n");
-
-       spin_unlock_irqrestore(&kbd98io_lock, flags);
-
-       return 0;
-}
-
-/*
- * kbd98_write() sends a byte out through the keyboard interface.
- */
-
-static int kbd98_write(struct serio *port, unsigned char c)
-{
-       unsigned long flags;
-
-       spin_lock_irqsave(&kbd98io_lock, flags);
-
-       outb(0, 0x5f);                  /* wait */
-       outb(0x17, KBD98_COMMAND_REG);  /* enable send command */
-       outb(0, 0x5f);                  /* wait */
-       outb(c, KBD98_DATA_REG);
-       outb(0, 0x5f);                  /* wait */
-       outb(0x16, KBD98_COMMAND_REG);  /* disable send command */
-       outb(0, 0x5f);                  /* wait */
-
-       spin_unlock_irqrestore(&kbd98io_lock, flags);
-
-       return 0;
-}
-
-/*
- * kbd98_open() is called when a port is open by the higher layer.
- * It allocates the interrupt and enables in in the chip.
- */
-
-static int kbd98_open(struct serio *port)
-{
-       kbd98_flush();
-
-       if (request_irq(KBD98_IRQ, kbd98io_interrupt, 0, "kbd98", NULL)) {
-               printk(KERN_ERR "98kbd-io.c: Can't get irq %d for %s, unregistering the port.\n", KBD98_IRQ, "KBD");
-               serio_unregister_port(port);
-               return -1;
-       }
-
-       return 0;
-}
-
-static void kbd98_close(struct serio *port)
-{
-       free_irq(KBD98_IRQ, NULL);
-
-       kbd98_flush();
-}
-
-/*
- * Structures for registering the devices in the serio.c module.
- */
-
-static struct serio kbd98_port =
-{
-       .type =         SERIO_PC9800,
-       .write =        kbd98_write,
-       .open =         kbd98_open,
-       .close =        kbd98_close,
-       .driver =       NULL,
-       .name =         "PC-9801 Kbd Port",
-       .phys =         KBD98_PHYS_DESC,
-};
-
-/*
- * kbd98io_interrupt() is the most important function in this driver -
- * it handles the interrupts from keyboard, and sends incoming bytes
- * to the upper layers.
- */
-
-static void kbd98io_interrupt(int irq, void *dev_id, struct pt_regs *regs)
-{
-       unsigned long flags;
-       unsigned char data;
-
-       spin_lock_irqsave(&kbd98io_lock, flags);
-
-       data = inb(KBD98_DATA_REG);
-       spin_unlock_irqrestore(&kbd98io_lock, flags);
-       serio_interrupt(&kbd98_port, data, 0, regs);
-
-}
-
-int __init kbd98io_init(void)
-{
-       serio_register_port(&kbd98_port);
-
-       printk(KERN_INFO "serio: PC-9801 %s port at %#lx,%#lx irq %d\n",
-              "KBD",
-              (unsigned long) KBD98_DATA_REG,
-              (unsigned long) KBD98_COMMAND_REG,
-              KBD98_IRQ);
-
-       return 0;
-}
-
-void __exit kbd98io_exit(void)
-{
-       serio_unregister_port(&kbd98_port);
-}
-
-module_init(kbd98io_init);
-module_exit(kbd98io_exit);
diff --git a/drivers/mtd/chips/cfi_util.c b/drivers/mtd/chips/cfi_util.c
deleted file mode 100644 (file)
index d1a7856..0000000
+++ /dev/null
@@ -1,92 +0,0 @@
-/*
- * Common Flash Interface support:
- *   Generic utility functions not dependant on command set
- *
- * Copyright (C) 2002 Red Hat
- * Copyright (C) 2003 STMicroelectronics Limited
- *
- * This code is covered by the GPL.
- *
- * $Id: cfi_util.c,v 1.4 2004/07/14 08:38:44 dwmw2 Exp $
- *
- */
-
-#include <linux/module.h>
-#include <linux/types.h>
-#include <linux/kernel.h>
-#include <linux/sched.h>
-#include <asm/io.h>
-#include <asm/byteorder.h>
-
-#include <linux/errno.h>
-#include <linux/slab.h>
-#include <linux/delay.h>
-#include <linux/interrupt.h>
-#include <linux/mtd/map.h>
-#include <linux/mtd/cfi.h>
-#include <linux/mtd/compatmac.h>
-
-struct cfi_extquery *
-cfi_read_pri(struct map_info *map, __u16 adr, __u16 size, const char* name)
-{
-       struct cfi_private *cfi = map->fldrv_priv;
-       __u32 base = 0; // cfi->chips[0].start;
-       int ofs_factor = cfi->interleave * cfi->device_type;
-       int i;
-       struct cfi_extquery *extp = NULL;
-
-       printk(" %s Extended Query Table at 0x%4.4X\n", name, adr);
-       if (!adr)
-               goto out;
-
-       /* Switch it into Query Mode */
-       cfi_send_gen_cmd(0x98, 0x55, base, map, cfi, cfi->device_type, NULL);
-
-       extp = kmalloc(size, GFP_KERNEL);
-       if (!extp) {
-               printk(KERN_ERR "Failed to allocate memory\n");
-               goto out;
-       }
-               
-       /* Read in the Extended Query Table */
-       for (i=0; i<size; i++) {
-               ((unsigned char *)extp)[i] = 
-                       cfi_read_query(map, base+((adr+i)*ofs_factor));
-       }
-
-       if (extp->MajorVersion != '1' || 
-           (extp->MinorVersion < '0' || extp->MinorVersion > '3')) {
-               printk(KERN_WARNING "  Unknown %s Extended Query "
-                      "version %c.%c.\n",  name, extp->MajorVersion,
-                      extp->MinorVersion);
-               kfree(extp);
-               extp = NULL;
-               goto out;
-       }
-
-out:
-       /* Make sure it's in read mode */
-       cfi_send_gen_cmd(0xf0, 0, base, map, cfi, cfi->device_type, NULL);
-       cfi_send_gen_cmd(0xff, 0, base, map, cfi, cfi->device_type, NULL);
-
-       return extp;
-}
-
-EXPORT_SYMBOL(cfi_read_pri);
-
-void cfi_fixup(struct map_info *map, struct cfi_fixup* fixups)
-{
-       struct cfi_private *cfi = map->fldrv_priv;
-       struct cfi_fixup *f;
-
-       for (f=fixups; f->fixup; f++) {
-               if (((f->mfr == CFI_MFR_ANY) || (f->mfr == cfi->mfr)) &&
-                   ((f->id  == CFI_ID_ANY)  || (f->id  == cfi->id))) {
-                       f->fixup(map, f->param);
-               }
-       }
-}
-
-EXPORT_SYMBOL(cfi_fixup);
-
-MODULE_LICENSE("GPL");
diff --git a/drivers/mtd/devices/phram.c b/drivers/mtd/devices/phram.c
deleted file mode 100644 (file)
index 5f66e9b..0000000
+++ /dev/null
@@ -1,362 +0,0 @@
-/**
- *
- * $Id: phram.c,v 1.1 2003/08/21 17:52:30 joern Exp $
- *
- * Copyright (c) Jochen Schaeuble <psionic@psionic.de>
- * 07/2003     rewritten by Joern Engel <joern@wh.fh-wedel.de>
- *
- * DISCLAIMER:  This driver makes use of Rusty's excellent module code,
- * so it will not work for 2.4 without changes and it wont work for 2.4
- * as a module without major changes.  Oh well!
- *
- * Usage:
- *
- * one commend line parameter per device, each in the form:
- *   phram=<name>,<start>,<len>
- * <name> may be up to 63 characters.
- * <start> and <len> can be octal, decimal or hexadecimal.  If followed
- * by "k", "M" or "G", the numbers will be interpreted as kilo, mega or
- * gigabytes.
- *
- */
-
-#include <asm/io.h>
-#include <linux/init.h>
-#include <linux/kernel.h>
-#include <linux/list.h>
-#include <linux/module.h>
-#include <linux/moduleparam.h>
-#include <linux/mtd/mtd.h>
-
-#define ERROR(fmt, args...) printk(KERN_ERR "phram: " fmt , ## args)
-
-struct phram_mtd_list {
-       struct list_head list;
-       struct mtd_info *mtdinfo;
-};
-
-static LIST_HEAD(phram_list);
-
-
-
-int phram_erase(struct mtd_info *mtd, struct erase_info *instr)
-{
-       u_char *start = (u_char *)mtd->priv;
-
-       if (instr->addr + instr->len > mtd->size)
-               return -EINVAL;
-       
-       memset(start + instr->addr, 0xff, instr->len);
-
-       /* This'll catch a few races. Free the thing before returning :) 
-        * I don't feel at all ashamed. This kind of thing is possible anyway
-        * with flash, but unlikely.
-        */
-
-       instr->state = MTD_ERASE_DONE;
-
-       if (instr->callback)
-               (*(instr->callback))(instr);
-       else
-               kfree(instr);
-
-       return 0;
-}
-
-int phram_point(struct mtd_info *mtd, loff_t from, size_t len,
-               size_t *retlen, u_char **mtdbuf)
-{
-       u_char *start = (u_char *)mtd->priv;
-
-       if (from + len > mtd->size)
-               return -EINVAL;
-       
-       *mtdbuf = start + from;
-       *retlen = len;
-       return 0;
-}
-
-void phram_unpoint(struct mtd_info *mtd, u_char *addr, loff_t from, size_t len)
-{
-}
-
-int phram_read(struct mtd_info *mtd, loff_t from, size_t len,
-               size_t *retlen, u_char *buf)
-{
-       u_char *start = (u_char *)mtd->priv;
-
-       if (from + len > mtd->size)
-               return -EINVAL;
-       
-       memcpy(buf, start + from, len);
-
-       *retlen = len;
-       return 0;
-}
-
-int phram_write(struct mtd_info *mtd, loff_t to, size_t len,
-               size_t *retlen, const u_char *buf)
-{
-       u_char *start = (u_char *)mtd->priv;
-
-       if (to + len > mtd->size)
-               return -EINVAL;
-       
-       memcpy(start + to, buf, len);
-
-       *retlen = len;
-       return 0;
-}
-
-
-
-static void unregister_devices(void)
-{
-       struct phram_mtd_list *this;
-
-       list_for_each_entry(this, &phram_list, list) {
-               del_mtd_device(this->mtdinfo);
-               iounmap(this->mtdinfo->priv);
-               kfree(this->mtdinfo);
-               kfree(this);
-       }
-}
-
-static int register_device(char *name, unsigned long start, unsigned long len)
-{
-       struct phram_mtd_list *new;
-       int ret = -ENOMEM;
-
-       new = kmalloc(sizeof(*new), GFP_KERNEL);
-       if (!new)
-               goto out0;
-
-       new->mtdinfo = kmalloc(sizeof(struct mtd_info), GFP_KERNEL);
-       if (!new->mtdinfo)
-               goto out1;
-       
-       memset(new->mtdinfo, 0, sizeof(struct mtd_info));
-
-       ret = -EIO;
-       new->mtdinfo->priv = ioremap(start, len);
-       if (!new->mtdinfo->priv) {
-               ERROR("ioremap failed\n");
-               goto out2;
-       }
-
-
-       new->mtdinfo->name = name;
-       new->mtdinfo->size = len;
-       new->mtdinfo->flags = MTD_CAP_RAM | MTD_ERASEABLE | MTD_VOLATILE;
-        new->mtdinfo->erase = phram_erase;
-       new->mtdinfo->point = phram_point;
-       new->mtdinfo->unpoint = phram_unpoint;
-       new->mtdinfo->read = phram_read;
-       new->mtdinfo->write = phram_write;
-       new->mtdinfo->owner = THIS_MODULE;
-       new->mtdinfo->type = MTD_RAM;
-       new->mtdinfo->erasesize = 0x0;
-
-       ret = -EAGAIN;
-       if (add_mtd_device(new->mtdinfo)) {
-               ERROR("Failed to register new device\n");
-               goto out3;
-       }
-
-       list_add_tail(&new->list, &phram_list);
-       return 0;       
-
-out3:
-       iounmap(new->mtdinfo->priv);
-out2:
-       kfree(new->mtdinfo);
-out1:
-       kfree(new);
-out0:
-       return ret;
-}
-
-static int ustrtoul(const char *cp, char **endp, unsigned int base)
-{
-       unsigned long result = simple_strtoul(cp, endp, base);
-
-       switch (**endp) {
-       case 'G':
-               result *= 1024;
-       case 'M':
-               result *= 1024;
-       case 'k':
-               result *= 1024;
-               endp++;
-       }
-       return result;
-}
-
-static int parse_num32(uint32_t *num32, const char *token)
-{
-       char *endp;
-       unsigned long n;
-
-       n = ustrtoul(token, &endp, 0);
-       if (*endp)
-               return -EINVAL;
-
-       *num32 = n;
-       return 0;
-}
-
-static int parse_name(char **pname, const char *token)
-{
-       size_t len;
-       char *name;
-
-       len = strlen(token) + 1;
-       if (len > 64)
-               return -ENOSPC;
-
-       name = kmalloc(len, GFP_KERNEL);
-       if (!name)
-               return -ENOMEM;
-
-       strcpy(name, token);
-
-       *pname = name;
-       return 0;
-}
-
-#define parse_err(fmt, args...) do {   \
-       ERROR(fmt , ## args);   \
-       return 0;               \
-} while (0)
-
-static int phram_setup(const char *val, struct kernel_param *kp)
-{
-       char buf[64+12+12], *str = buf;
-       char *token[3];
-       char *name;
-       uint32_t start;
-       uint32_t len;
-       int i, ret;
-
-       if (strnlen(val, sizeof(str)) >= sizeof(str))
-               parse_err("parameter too long\n");
-
-       strcpy(str, val);
-
-       for (i=0; i<3; i++)
-               token[i] = strsep(&str, ",");
-
-       if (str)
-               parse_err("too many arguments\n");
-
-       if (!token[2])
-               parse_err("not enough arguments\n");
-
-       ret = parse_name(&name, token[0]);
-       if (ret == -ENOMEM)
-               parse_err("out of memory\n");
-       if (ret == -ENOSPC)
-               parse_err("name too long\n");
-       if (ret)
-               return 0;
-
-       ret = parse_num32(&start, token[1]);
-       if (ret)
-               parse_err("illegal start address\n");
-
-       ret = parse_num32(&len, token[2]);
-       if (ret)
-               parse_err("illegal device length\n");
-
-       register_device(name, start, len);
-
-       return 0;
-}
-
-module_param_call(phram, phram_setup, NULL, NULL, 000);
-MODULE_PARM_DESC(phram, "Memory region to map. \"map=<name>,<start><length>\"");
-
-/*
- * Just for compatibility with slram, this is horrible and should go someday.
- */
-static int __init slram_setup(const char *val, struct kernel_param *kp)
-{
-       char buf[256], *str = buf;
-
-       if (!val || !val[0])
-               parse_err("no arguments to \"slram=\"\n");
-
-       if (strnlen(val, sizeof(str)) >= sizeof(str))
-               parse_err("parameter too long\n");
-
-       strcpy(str, val);
-
-       while (str) {
-               char *token[3];
-               char *name;
-               uint32_t start;
-               uint32_t len;
-               int i, ret;
-
-               for (i=0; i<3; i++) {
-                       token[i] = strsep(&str, ",");
-                       if (token[i])
-                               continue;
-                       parse_err("wrong number of arguments to \"slram=\"\n");
-               }
-
-               /* name */
-               ret = parse_name(&name, token[0]);
-               if (ret == -ENOMEM)
-                       parse_err("of memory\n");
-               if (ret == -ENOSPC)
-                       parse_err("too long\n");
-               if (ret)
-                       return 1;
-
-               /* start */
-               ret = parse_num32(&start, token[1]);
-               if (ret)
-                       parse_err("illegal start address\n");
-
-               /* len */
-               if (token[2][0] == '+')
-                       ret = parse_num32(&len, token[2] + 1);
-               else
-                       ret = parse_num32(&len, token[2]);
-
-               if (ret)
-                       parse_err("illegal device length\n");
-
-               if (token[2][0] != '+') {
-                       if (len < start)
-                               parse_err("end < start\n");
-                       len -= start;
-               }
-
-               register_device(name, start, len);
-       }
-       return 1;
-}
-
-module_param_call(slram, slram_setup, NULL, NULL, 000);
-MODULE_PARM_DESC(slram, "List of memory regions to map. \"map=<name>,<start><length/end>\"");
-
-
-int __init init_phram(void)
-{
-       printk(KERN_ERR "phram loaded\n");
-       return 0;
-}
-
-static void __exit cleanup_phram(void)
-{
-       unregister_devices();
-}
-
-module_init(init_phram);
-module_exit(cleanup_phram);
-
-MODULE_LICENSE("GPL");
-MODULE_AUTHOR("Jörn Engel <joern@wh.fh-wedel.de>");
-MODULE_DESCRIPTION("MTD driver for physical RAM");
diff --git a/drivers/mtd/maps/db1550-flash.c b/drivers/mtd/maps/db1550-flash.c
deleted file mode 100644 (file)
index b250404..0000000
+++ /dev/null
@@ -1,188 +0,0 @@
-/*
- * Flash memory access on Alchemy Db1550 board
- * 
- * $Id: db1550-flash.c,v 1.3 2004/07/14 17:45:40 dwmw2 Exp $
- *
- * (C) 2004 Embedded Edge, LLC, based on db1550-flash.c:
- * (C) 2003 Pete Popov <pete_popov@yahoo.com>
- * 
- */
-
-#include <linux/config.h>
-#include <linux/init.h>
-#include <linux/module.h>
-#include <linux/types.h>
-#include <linux/kernel.h>
-
-#include <linux/mtd/mtd.h>
-#include <linux/mtd/map.h>
-#include <linux/mtd/partitions.h>
-
-#include <asm/io.h>
-#include <asm/au1000.h>
-
-#ifdef         DEBUG_RW
-#define        DBG(x...)       printk(x)
-#else
-#define        DBG(x...)       
-#endif
-
-static unsigned long window_addr;
-static unsigned long window_size;
-
-
-static struct map_info db1550_map = {
-       .name = "Db1550 flash",
-};
-
-static unsigned char flash_bankwidth = 4;
-
-/* 
- * Support only 64MB NOR Flash parts
- */
-
-#if defined(CONFIG_MTD_DB1550_BOOT) && defined(CONFIG_MTD_DB1550_USER)
-#define DB1550_BOTH_BANKS
-#elif defined(CONFIG_MTD_DB1550_BOOT) && !defined(CONFIG_MTD_DB1550_USER)
-#define DB1550_BOOT_ONLY
-#elif !defined(CONFIG_MTD_DB1550_BOOT) && defined(CONFIG_MTD_DB1550_USER)
-#define DB1550_USER_ONLY
-#endif
-
-#ifdef DB1550_BOTH_BANKS
-/* both banks will be used. Combine the first bank and the first 
- * part of the second bank together into a single jffs/jffs2
- * partition.
- */
-static struct mtd_partition db1550_partitions[] = {
-       /* assume boot[2:0]:swap is '0000' or '1000', which translates to:
-        * 1C00 0000 1FFF FFFF CE0 64MB Boot NOR Flash
-        * 1800 0000 1BFF FFFF CE0 64MB Param NOR Flash
-        */
-        {
-                .name = "User FS",
-                .size =   (0x1FC00000 - 0x18000000),
-                .offset = 0x0000000
-        },{
-                .name = "yamon",
-                .size = 0x0100000,
-               .offset = MTDPART_OFS_APPEND,
-                .mask_flags = MTD_WRITEABLE
-        },{
-                .name = "raw kernel",
-               .size = (0x300000 - 0x40000), /* last 256KB is yamon env */
-               .offset = MTDPART_OFS_APPEND,
-        }
-};
-#elif defined(DB1550_BOOT_ONLY)
-static struct mtd_partition db1550_partitions[] = {
-       /* assume boot[2:0]:swap is '0000' or '1000', which translates to:
-        * 1C00 0000 1FFF FFFF CE0 64MB Boot NOR Flash
-        */
-        {
-                .name = "User FS",
-                .size =   0x03c00000,
-                .offset = 0x0000000
-        },{
-                .name = "yamon",
-                .size = 0x0100000,
-               .offset = MTDPART_OFS_APPEND,
-                .mask_flags = MTD_WRITEABLE
-        },{
-                .name = "raw kernel",
-               .size = (0x300000-0x40000), /* last 256KB is yamon env */
-               .offset = MTDPART_OFS_APPEND,
-        }
-};
-#elif defined(DB1550_USER_ONLY)
-static struct mtd_partition db1550_partitions[] = {
-       /* assume boot[2:0]:swap is '0000' or '1000', which translates to:
-        * 1800 0000 1BFF FFFF CE0 64MB Param NOR Flash
-        */
-        {
-                .name = "User FS",
-                .size = (0x4000000 - 0x200000), /* reserve 2MB for raw kernel */
-                .offset = 0x0000000
-        },{
-                .name = "raw kernel",
-               .size = MTDPART_SIZ_FULL,
-               .offset = MTDPART_OFS_APPEND,
-        }
-};
-#else
-#error MTD_DB1550 define combo error /* should never happen */
-#endif
-
-#define NB_OF(x)  (sizeof(x)/sizeof(x[0]))
-
-static struct mtd_info *mymtd;
-
-/*
- * Probe the flash density and setup window address and size
- * based on user CONFIG options. There are times when we don't
- * want the MTD driver to be probing the boot or user flash,
- * so having the option to enable only one bank is important.
- */
-int setup_flash_params(void)
-{
-#if defined(DB1550_BOTH_BANKS)
-                       window_addr = 0x18000000;
-                       window_size = 0x8000000; 
-#elif defined(DB1550_BOOT_ONLY)
-                       window_addr = 0x1C000000;
-                       window_size = 0x4000000; 
-#else /* USER ONLY */
-                       window_addr = 0x1E000000;
-                       window_size = 0x4000000; 
-#endif
-       return 0;
-}
-
-int __init db1550_mtd_init(void)
-{
-       struct mtd_partition *parts;
-       int nb_parts = 0;
-       
-       /* Default flash bankwidth */
-       db1550_map.bankwidth = flash_bankwidth;
-
-       if (setup_flash_params()) 
-               return -ENXIO;
-
-       /*
-        * Static partition definition selection
-        */
-       parts = db1550_partitions;
-       nb_parts = NB_OF(db1550_partitions);
-       db1550_map.size = window_size;
-
-       /*
-        * Now let's probe for the actual flash.  Do it here since
-        * specific machine settings might have been set above.
-        */
-       printk(KERN_NOTICE "Pb1550 flash: probing %d-bit flash bus\n", 
-                       db1550_map.bankwidth*8);
-       db1550_map.virt = 
-               (unsigned long)ioremap(window_addr, window_size);
-       mymtd = do_map_probe("cfi_probe", &db1550_map);
-       if (!mymtd) return -ENXIO;
-       mymtd->owner = THIS_MODULE;
-
-       add_mtd_partitions(mymtd, parts, nb_parts);
-       return 0;
-}
-
-static void __exit db1550_mtd_cleanup(void)
-{
-       if (mymtd) {
-               del_mtd_partitions(mymtd);
-               map_destroy(mymtd);
-       }
-}
-
-module_init(db1550_mtd_init);
-module_exit(db1550_mtd_cleanup);
-
-MODULE_AUTHOR("Embedded Edge, LLC");
-MODULE_DESCRIPTION("Db1550 mtd map driver");
-MODULE_LICENSE("GPL");
diff --git a/drivers/mtd/maps/db1x00-flash.c b/drivers/mtd/maps/db1x00-flash.c
deleted file mode 100644 (file)
index 388e14b..0000000
+++ /dev/null
@@ -1,219 +0,0 @@
-/*
- * Flash memory access on Alchemy Db1xxx boards
- * 
- * $Id: db1x00-flash.c,v 1.3 2004/07/14 17:45:40 dwmw2 Exp $
- *
- * (C) 2003 Pete Popov <ppopov@pacbell.net>
- * 
- */
-
-#include <linux/config.h>
-#include <linux/module.h>
-#include <linux/types.h>
-#include <linux/init.h>
-#include <linux/kernel.h>
-
-#include <linux/mtd/mtd.h>
-#include <linux/mtd/map.h>
-#include <linux/mtd/partitions.h>
-
-#include <asm/io.h>
-#include <asm/au1000.h>
-#include <asm/db1x00.h>
-
-#ifdef         DEBUG_RW
-#define        DBG(x...)       printk(x)
-#else
-#define        DBG(x...)       
-#endif
-
-static unsigned long window_addr;
-static unsigned long window_size;
-static unsigned long flash_size;
-
-static BCSR * const bcsr = (BCSR *)0xAE000000;
-static unsigned char flash_bankwidth = 4;
-
-/* 
- * The Db1x boards support different flash densities. We setup
- * the mtd_partition structures below for default of 64Mbit 
- * flash densities, and override the partitions sizes, if
- * necessary, after we check the board status register.
- */
-
-#ifdef DB1X00_BOTH_BANKS
-/* both banks will be used. Combine the first bank and the first 
- * part of the second bank together into a single jffs/jffs2
- * partition.
- */
-static struct mtd_partition db1x00_partitions[] = {
-        {
-                .name         =  "User FS",
-                .size         =  0x1c00000,
-                .offset       =  0x0000000
-        },{
-                .name         =  "yamon",
-                .size         =  0x0100000,
-               .offset       =  MTDPART_OFS_APPEND,
-                .mask_flags   =  MTD_WRITEABLE
-        },{
-                .name         =  "raw kernel",
-               .size         =  (0x300000-0x40000), /* last 256KB is env */
-               .offset       =  MTDPART_OFS_APPEND,
-        }
-};
-#elif defined(DB1X00_BOOT_ONLY)
-static struct mtd_partition db1x00_partitions[] = {
-        {
-                .name         =  "User FS",
-                .size         =  0x00c00000,
-                .offset       =  0x0000000
-        },{
-                .name         =  "yamon",
-                .size         =  0x0100000,
-               .offset       =  MTDPART_OFS_APPEND,
-                .mask_flags   =  MTD_WRITEABLE
-        },{
-                .name         =  "raw kernel",
-               .size         =  (0x300000-0x40000), /* last 256KB is env */
-               .offset       =  MTDPART_OFS_APPEND,
-        }
-};
-#elif defined(DB1X00_USER_ONLY)
-static struct mtd_partition db1x00_partitions[] = {
-        {
-                .name         =  "User FS",
-                .size         =  0x0e00000,
-                .offset       =  0x0000000
-        },{
-                .name         =  "raw kernel",
-               .size         =  MTDPART_SIZ_FULL,
-               .offset       =  MTDPART_OFS_APPEND,
-        }
-};
-#else
-#error MTD_DB1X00 define combo error /* should never happen */
-#endif
-#define NB_OF(x)  (sizeof(x)/sizeof(x[0]))
-
-#define NAME           "Db1x00 Linux Flash"
-
-static struct map_info db1xxx_mtd_map = {
-       .name           = NAME,
-};
-
-static struct mtd_partition *parsed_parts;
-static struct mtd_info *db1xxx_mtd;
-
-/*
- * Probe the flash density and setup window address and size
- * based on user CONFIG options. There are times when we don't
- * want the MTD driver to be probing the boot or user flash,
- * so having the option to enable only one bank is important.
- */
-int setup_flash_params(void)
-{
-       switch ((bcsr->status >> 14) & 0x3) {
-               case 0: /* 64Mbit devices */
-                       flash_size = 0x800000; /* 8MB per part */
-#if defined(DB1X00_BOTH_BANKS)
-                       window_addr = 0x1E000000;
-                       window_size = 0x2000000; 
-#elif defined(DB1X00_BOOT_ONLY)
-                       window_addr = 0x1F000000;
-                       window_size = 0x1000000; 
-#else /* USER ONLY */
-                       window_addr = 0x1E000000;
-                       window_size = 0x1000000; 
-#endif
-                       break;
-               case 1:
-                       /* 128 Mbit devices */
-                       flash_size = 0x1000000; /* 16MB per part */
-#if defined(DB1X00_BOTH_BANKS)
-                       window_addr = 0x1C000000;
-                       window_size = 0x4000000;
-                       /* USERFS from 0x1C00 0000 to 0x1FC0 0000 */
-                       db1x00_partitions[0].size = 0x3C00000;
-#elif defined(DB1X00_BOOT_ONLY)
-                       window_addr = 0x1E000000;
-                       window_size = 0x2000000;
-                       /* USERFS from 0x1E00 0000 to 0x1FC0 0000 */
-                       db1x00_partitions[0].size = 0x1C00000;
-#else /* USER ONLY */
-                       window_addr = 0x1C000000;
-                       window_size = 0x2000000;
-                       /* USERFS from 0x1C00 0000 to 0x1DE00000 */
-                       db1x00_partitions[0].size = 0x1DE0000;
-#endif
-                       break;
-               case 2:
-                       /* 256 Mbit devices */
-                       flash_size = 0x4000000; /* 64MB per part */
-#if defined(DB1X00_BOTH_BANKS)
-                       return 1;
-#elif defined(DB1X00_BOOT_ONLY)
-                       /* Boot ROM flash bank only; no user bank */
-                       window_addr = 0x1C000000;
-                       window_size = 0x4000000;
-                       /* USERFS from 0x1C00 0000 to 0x1FC00000 */
-                       db1x00_partitions[0].size = 0x3C00000;
-#else /* USER ONLY */
-                       return 1;
-#endif
-                       break;
-               default:
-                       return 1;
-       }
-       db1xxx_mtd_map.size = window_size;
-       db1xxx_mtd_map.bankwidth = flash_bankwidth;
-       db1xxx_mtd_map.phys = window_addr;
-       db1xxx_mtd_map.bankwidth = flash_bankwidth;
-       return 0;
-}
-
-int __init db1x00_mtd_init(void)
-{
-       struct mtd_partition *parts;
-       int nb_parts = 0;
-       
-       if (setup_flash_params()) 
-               return -ENXIO;
-
-       /*
-        * Static partition definition selection
-        */
-       parts = db1x00_partitions;
-       nb_parts = NB_OF(db1x00_partitions);
-
-       /*
-        * Now let's probe for the actual flash.  Do it here since
-        * specific machine settings might have been set above.
-        */
-       printk(KERN_NOTICE "Db1xxx flash: probing %d-bit flash bus\n", 
-                       db1xxx_mtd_map.bankwidth*8);
-       db1xxx_mtd_map.virt = (unsigned long)ioremap(window_addr, window_size);
-       db1xxx_mtd = do_map_probe("cfi_probe", &db1xxx_mtd_map);
-       if (!db1xxx_mtd) return -ENXIO;
-       db1xxx_mtd->owner = THIS_MODULE;
-
-       add_mtd_partitions(db1xxx_mtd, parts, nb_parts);
-       return 0;
-}
-
-static void __exit db1x00_mtd_cleanup(void)
-{
-       if (db1xxx_mtd) {
-               del_mtd_partitions(db1xxx_mtd);
-               map_destroy(db1xxx_mtd);
-               if (parsed_parts)
-                       kfree(parsed_parts);
-       }
-}
-
-module_init(db1x00_mtd_init);
-module_exit(db1x00_mtd_cleanup);
-
-MODULE_AUTHOR("Pete Popov");
-MODULE_DESCRIPTION("Db1x00 mtd map driver");
-MODULE_LICENSE("GPL");
diff --git a/drivers/mtd/maps/dmv182.c b/drivers/mtd/maps/dmv182.c
deleted file mode 100644 (file)
index cdb9c1b..0000000
+++ /dev/null
@@ -1,150 +0,0 @@
-
-/*
- * drivers/mtd/maps/svme182.c
- * 
- * Flash map driver for the Dy4 SVME182 board
- * 
- * $Id: dmv182.c,v 1.3 2004/07/14 17:45:40 dwmw2 Exp $
- *
- * Copyright 2003-2004, TimeSys Corporation
- *
- * Based on the SVME181 flash map, by Tom Nelson, Dot4, Inc. for TimeSys Corp.
- *
- * 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/init.h>
-#include <linux/types.h>
-#include <linux/kernel.h>
-#include <asm/io.h>
-#include <linux/mtd/mtd.h>
-#include <linux/mtd/map.h>
-#include <linux/mtd/partitions.h>
-#include <linux/errno.h>
-
-/*
- * This driver currently handles only the 16MiB user flash bank 1 on the
- * board.  It does not provide access to bank 0 (contains the Dy4 FFW), bank 2
- * (VxWorks boot), or the optional 48MiB expansion flash.
- *
- * scott.wood@timesys.com: On the newer boards with 128MiB flash, it
- * now supports the first 96MiB (the boot flash bank containing FFW
- * is excluded).  The VxWorks loader is in partition 1.
- */
-
-#define FLASH_BASE_ADDR 0xf0000000
-#define FLASH_BANK_SIZE (128*1024*1024)
-
-MODULE_AUTHOR("Scott Wood, TimeSys Corporation <scott.wood@timesys.com>");
-MODULE_DESCRIPTION("User-programmable flash device on the Dy4 SVME182 board");
-MODULE_LICENSE("GPL");
-
-static struct map_info svme182_map = {
-       .name           = "Dy4 SVME182",
-       .bankwidth      = 32,
-       .size           =  128 * 1024 * 1024
-};
-
-#define BOOTIMAGE_PART_SIZE            ((6*1024*1024)-RESERVED_PART_SIZE)
-
-// Allow 6MiB for the kernel
-#define NEW_BOOTIMAGE_PART_SIZE  (6 * 1024 * 1024)
-// Allow 1MiB for the bootloader
-#define NEW_BOOTLOADER_PART_SIZE (1024 * 1024)
-// Use the remaining 9MiB at the end of flash for the RFS
-#define NEW_RFS_PART_SIZE        (0x01000000 - NEW_BOOTLOADER_PART_SIZE - \
-                                  NEW_BOOTIMAGE_PART_SIZE)
-
-static struct mtd_partition svme182_partitions[] = {
-       // The Lower PABS is only 128KiB, but the partition code doesn't
-       // like partitions that don't end on the largest erase block
-       // size of the device, even if all of the erase blocks in the
-       // partition are small ones.  The hardware should prevent
-       // writes to the actual PABS areas.
-       {
-               name:       "Lower PABS and CPU 0 bootloader or kernel",
-               size:       6*1024*1024,
-               offset:     0,
-       },
-       {
-               name:       "Root Filesystem",
-               size:       10*1024*1024,
-               offset:     MTDPART_OFS_NXTBLK
-       },
-       {
-               name:       "CPU1 Bootloader",
-               size:       1024*1024,
-               offset:     MTDPART_OFS_NXTBLK,
-       },
-       {
-               name:       "Extra",
-               size:       110*1024*1024,
-               offset:     MTDPART_OFS_NXTBLK
-       },
-       {
-               name:       "Foundation Firmware and Upper PABS",
-               size:       1024*1024,
-               offset:     MTDPART_OFS_NXTBLK,
-               mask_flags: MTD_WRITEABLE // read-only
-       }
-};
-
-static struct mtd_info *this_mtd;
-
-static int __init init_svme182(void)
-{
-       struct mtd_partition *partitions;
-       int num_parts = sizeof(svme182_partitions) / sizeof(struct mtd_partition);
-
-       partitions = svme182_partitions;
-
-       svme182_map.virt = 
-               (unsigned long)ioremap(FLASH_BASE_ADDR, svme182_map.size);
-               
-       if (svme182_map.virt == 0) {
-               printk("Failed to ioremap FLASH memory area.\n");
-               return -EIO;
-       }
-
-       simple_map_init(&svme182_map);
-
-       this_mtd = do_map_probe("cfi_probe", &svme182_map);
-       if (!this_mtd)
-       {
-               iounmap((void *)svme182_map.virt);
-               return -ENXIO;
-       }
-
-       printk(KERN_NOTICE "SVME182 flash device: %dMiB at 0x%08x\n",
-                  this_mtd->size >> 20, FLASH_BASE_ADDR);
-
-       this_mtd->owner = THIS_MODULE;
-       add_mtd_partitions(this_mtd, partitions, num_parts);
-
-       return 0;
-}
-
-static void __exit cleanup_svme182(void)
-{
-       if (this_mtd)
-       {
-               del_mtd_partitions(this_mtd);
-               map_destroy(this_mtd);
-       }
-
-       if (svme182_map.virt)
-       {
-               iounmap((void *)svme182_map.virt);
-               svme182_map.virt = 0;
-       }
-
-       return;
-}
-
-module_init(init_svme182);
-module_exit(cleanup_svme182);
diff --git a/drivers/mtd/maps/ichxrom.c b/drivers/mtd/maps/ichxrom.c
deleted file mode 100644 (file)
index ec2612b..0000000
+++ /dev/null
@@ -1,407 +0,0 @@
-/*
- * ichxrom.c
- *
- * Normal mappings of chips in physical memory
- * $Id: ichxrom.c,v 1.7 2004/07/14 18:14:09 eric Exp $
- */
-
-#include <linux/module.h>
-#include <linux/types.h>
-#include <linux/kernel.h>
-#include <linux/init.h>
-#include <asm/io.h>
-#include <linux/mtd/mtd.h>
-#include <linux/mtd/map.h>
-#include <linux/config.h>
-#include <linux/pci.h>
-#include <linux/pci_ids.h>
-#include <linux/mtd/cfi.h>
-
-#define xstr(s) str(s)
-#define str(s) #s
-#define MOD_NAME xstr(KBUILD_BASENAME)
-
-#define MTD_DEV_NAME_LENGTH 16
-
-#define RESERVE_MEM_REGION 0
-
-
-#define MANUFACTURER_INTEL     0x0089
-#define I82802AB       0x00ad
-#define I82802AC       0x00ac
-
-#define ICHX_FWH_REGION_START  0xFF000000UL
-#define ICHX_FWH_REGION_SIZE   0x01000000UL
-#define BIOS_CNTL      0x4e
-#define FWH_DEC_EN1    0xE3
-#define FWH_DEC_EN2    0xF0
-#define FWH_SEL1       0xE8
-#define FWH_SEL2       0xEE
-
-struct ichxrom_map_info {
-       struct map_info map;
-       struct mtd_info *mtd;
-       unsigned long window_addr;
-       struct pci_dev *pdev;
-       struct resource window_rsrc;
-       struct resource rom_rsrc;
-       char mtd_name[MTD_DEV_NAME_LENGTH];
-};
-
-static inline unsigned long addr(struct map_info *map, unsigned long ofs)
-{
-       unsigned long offset;
-       offset = ((8*1024*1024) - map->size) + ofs;
-       if (offset >= (4*1024*1024)) {
-               offset += 0x400000;
-       }
-       return map->map_priv_1 + 0x400000 + offset;
-}
-
-static inline unsigned long dbg_addr(struct map_info *map, unsigned long addr)
-{
-       return addr - map->map_priv_1 + ICHX_FWH_REGION_START;
-}
-       
-static map_word ichxrom_read(struct map_info *map, unsigned long ofs)
-{
-       map_word val;
-       int i;
-       switch(map->bankwidth) {
-       case 1:  val.x[0] = __raw_readb(addr(map, ofs)); break;
-       case 2:  val.x[0] = __raw_readw(addr(map, ofs)); break;
-       case 4:  val.x[0] = __raw_readl(addr(map, ofs)); break;
-#if BITS_PER_LONG >= 64
-       case 8:  val.x[0] = __raw_readq(addr(map, ofs)); break;
-#endif
-       default: val.x[0] = 0; break;
-       }
-       for(i = 1; i < map_words(map); i++) {
-               val.x[i] = 0;
-       }
-       return val;
-}
-
-static void ichxrom_copy_from(struct map_info *map, void *to, unsigned long from, ssize_t len)
-{
-       memcpy_fromio(to, addr(map, from), len);
-}
-
-static void ichxrom_write(struct map_info *map, map_word d, unsigned long ofs)
-{
-       switch(map->bankwidth) {
-       case 1: __raw_writeb(d.x[0], addr(map,ofs)); break;
-       case 2: __raw_writew(d.x[0], addr(map,ofs)); break;
-       case 4: __raw_writel(d.x[0], addr(map,ofs)); break;
-#if BITS_PER_LONG >= 64
-       case 8: __raw_writeq(d.x[0], addr(map,ofs)); break;
-#endif
-       }
-       mb();
-}
-
-static void ichxrom_copy_to(struct map_info *map, unsigned long to, const void *from, ssize_t len)
-{
-       memcpy_toio(addr(map, to), from, len);
-}
-
-static struct ichxrom_map_info ichxrom_map = {
-       .map = {
-               .name = MOD_NAME,
-               .phys = NO_XIP,
-               .size = 0,
-               .bankwidth = 1,
-               .read = ichxrom_read,
-               .copy_from = ichxrom_copy_from,
-               .write = ichxrom_write,
-               .copy_to = ichxrom_copy_to,
-               /* Firmware hubs only use vpp when being programmed
-                * in a factory setting.  So in-place programming
-                * needs to use a different method.
-                */
-       },
-       /* remaining fields of structure are initialized to 0 */
-};
-
-enum fwh_lock_state {
-       FWH_DENY_WRITE = 1,
-       FWH_IMMUTABLE  = 2,
-       FWH_DENY_READ  = 4,
-};
-
-static void ichxrom_cleanup(struct ichxrom_map_info *info)
-{
-       u16 word;
-
-       /* Disable writes through the rom window */
-       pci_read_config_word(info->pdev, BIOS_CNTL, &word);
-       pci_write_config_word(info->pdev, BIOS_CNTL, word & ~1);
-
-       if (info->mtd) {
-               del_mtd_device(info->mtd);
-               map_destroy(info->mtd);
-               info->mtd = NULL;
-               info->map.virt = 0;
-       }
-       if (info->rom_rsrc.parent)
-               release_resource(&info->rom_rsrc);
-       if (info->window_rsrc.parent)
-               release_resource(&info->window_rsrc);
-
-       if (info->window_addr) {
-               iounmap((void *)(info->window_addr));
-               info->window_addr = 0;
-       }
-}
-
-
-static int ichxrom_set_lock_state(struct mtd_info *mtd, loff_t ofs, size_t len,
-       enum fwh_lock_state state)
-{
-       struct map_info *map = mtd->priv;
-       unsigned long start = ofs;
-       unsigned long end = start + len -1;
-
-       /* FIXME do I need to guard against concurrency here? */
-       /* round down to 64K boundaries */
-       start = start & ~0xFFFF;
-       end = end & ~0xFFFF;
-       while (start <= end) {
-               unsigned long ctrl_addr;
-               ctrl_addr = addr(map, start) - 0x400000 + 2;
-               writeb(state, ctrl_addr);
-               start = start + 0x10000;
-       }
-       return 0;
-}
-
-static int ichxrom_lock(struct mtd_info *mtd, loff_t ofs, size_t len)
-{
-       return ichxrom_set_lock_state(mtd, ofs, len, FWH_DENY_WRITE);
-}
-
-static int ichxrom_unlock(struct mtd_info *mtd, loff_t ofs, size_t len)
-{
-       return ichxrom_set_lock_state(mtd, ofs, len, 0);
-}
-
-static int __devinit ichxrom_init_one (struct pci_dev *pdev,
-       const struct pci_device_id *ent)
-{
-       u16 word;
-       struct ichxrom_map_info *info = &ichxrom_map;
-       unsigned long map_size;
-       static char *probes[] = { "cfi_probe", "jedec_probe" };
-       struct cfi_private *cfi;
-
-       /* For now I just handle the ichx and I assume there
-        * are not a lot of resources up at the top of the address
-        * space.  It is possible to handle other devices in the
-        * top 16MB but it is very painful.  Also since
-        * you can only really attach a FWH to an ICHX there
-        * a number of simplifications you can make.
-        *
-        * Also you can page firmware hubs if an 8MB window isn't enough 
-        * but don't currently handle that case either.
-        */
-
-       info->pdev = pdev;
-
-       /*
-        * Try to reserve the window mem region.  If this fails then
-        * it is likely due to the window being "reseved" by the BIOS.
-        */
-       info->window_rsrc.name = MOD_NAME;
-       info->window_rsrc.start = ICHX_FWH_REGION_START;
-       info->window_rsrc.end = ICHX_FWH_REGION_START + ICHX_FWH_REGION_SIZE - 1;
-       info->window_rsrc.flags = IORESOURCE_MEM | IORESOURCE_BUSY;
-       if (request_resource(&iomem_resource, &info->window_rsrc)) {
-               info->window_rsrc.parent = NULL;
-               printk(KERN_ERR MOD_NAME
-                      " %s(): Unable to register resource"
-                      " 0x%.08lx-0x%.08lx - kernel bug?\n",
-                      __func__,
-                      info->window_rsrc.start, info->window_rsrc.end);
-       }
-       
-       /* Enable writes through the rom window */
-       pci_read_config_word(pdev, BIOS_CNTL, &word);
-       if (!(word & 1)  && (word & (1<<1))) {
-               /* The BIOS will generate an error if I enable
-                * this device, so don't even try.
-                */
-               printk(KERN_ERR MOD_NAME ": firmware access control, I can't enable writes\n");
-               goto failed;
-       }
-       pci_write_config_word(pdev, BIOS_CNTL, word | 1);
-
-
-       /* Map the firmware hub into my address space. */
-       /* Does this use too much virtual address space? */
-       info->window_addr = (unsigned long)ioremap(
-               ICHX_FWH_REGION_START, ICHX_FWH_REGION_SIZE);
-       if (!info->window_addr) {
-               printk(KERN_ERR "Failed to ioremap\n");
-               goto failed;
-       }
-
-       /* For now assume the firmware has setup all relevant firmware
-        * windows.  We don't have enough information to handle this case
-        * intelligently.
-        */
-
-       /* FIXME select the firmware hub and enable a window to it. */
-
-       info->mtd = NULL;
-       info->map.map_priv_1 = info->window_addr;
-
-       /* Loop through the possible bankwidths */
-       for(ichxrom_map.map.bankwidth = 4; ichxrom_map.map.bankwidth; ichxrom_map.map.bankwidth >>= 1) {
-               map_size = ICHX_FWH_REGION_SIZE;
-               while(!info->mtd && (map_size > 0)) {
-                       int i;
-                       info->map.size = map_size;
-                       for(i = 0; i < sizeof(probes)/sizeof(char *); i++) {
-                               info->mtd = do_map_probe(probes[i], &ichxrom_map.map);
-                               if (info->mtd)
-                                       break;
-                       }
-                       map_size -= 512*1024;
-               }
-               if (info->mtd)
-                       break;
-       }
-       if (!info->mtd) {
-               goto failed;
-       }
-       cfi = ichxrom_map.map.fldrv_priv;
-       if ((cfi->mfr == MANUFACTURER_INTEL) && (
-                   (cfi->id == I82802AB) ||
-                   (cfi->id == I82802AC))) 
-       {
-               /* If it is a firmware hub put in the special lock
-                * and unlock routines.
-                */
-               info->mtd->lock = ichxrom_lock;
-               info->mtd->unlock = ichxrom_unlock;
-       }
-       if (info->mtd->size > info->map.size) {
-               printk(KERN_WARNING MOD_NAME " rom(%u) larger than window(%u). fixing...\n",
-                      info->mtd->size, info->map.size);
-               info->mtd->size = info->map.size;
-       }
-               
-       info->mtd->owner = THIS_MODULE;
-       add_mtd_device(info->mtd);
-
-       if (info->window_rsrc.parent) {
-               /*
-                * Registering the MTD device in iomem may not be possible
-                * if there is a BIOS "reserved" and BUSY range.  If this
-                * fails then continue anyway.
-                */
-               snprintf(info->mtd_name, MTD_DEV_NAME_LENGTH,
-                        "mtd%d", info->mtd->index);
-
-               info->rom_rsrc.name = info->mtd_name;
-               info->rom_rsrc.start = ICHX_FWH_REGION_START
-                       + ICHX_FWH_REGION_SIZE - map_size;
-               info->rom_rsrc.end = ICHX_FWH_REGION_START
-                       + ICHX_FWH_REGION_SIZE;
-               info->rom_rsrc.flags = IORESOURCE_MEM | IORESOURCE_BUSY;
-               if (request_resource(&info->window_rsrc, &info->rom_rsrc)) {
-                       printk(KERN_ERR MOD_NAME
-                              ": cannot reserve MTD resource\n");
-                       info->rom_rsrc.parent = NULL;
-               }
-       }
-
-       return 0;
-
- failed:
-       ichxrom_cleanup(info);
-       return -ENODEV;
-}
-
-
-static void __devexit ichxrom_remove_one (struct pci_dev *pdev)
-{
-       struct ichxrom_map_info *info = &ichxrom_map;
-       u16 word;
-
-       del_mtd_device(info->mtd);
-       map_destroy(info->mtd);
-       info->mtd = NULL;
-       info->map.map_priv_1 = 0;
-
-       iounmap((void *)(info->window_addr));
-       info->window_addr = 0;
-
-       /* Disable writes through the rom window */
-       pci_read_config_word(pdev, BIOS_CNTL, &word);
-       pci_write_config_word(pdev, BIOS_CNTL, word & ~1);
-
-#if RESERVE_MEM_REGION 
-       release_mem_region(ICHX_FWH_REGION_START, ICHX_FWH_REGION_SIZE);
-#endif
-}
-
-static struct pci_device_id ichxrom_pci_tbl[] __devinitdata = {
-       { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801BA_0, 
-         PCI_ANY_ID, PCI_ANY_ID, },
-       { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801CA_0, 
-         PCI_ANY_ID, PCI_ANY_ID, },
-       { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801DB_0, 
-         PCI_ANY_ID, PCI_ANY_ID, },
-       { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801EB_0,
-         PCI_ANY_ID, PCI_ANY_ID, },
-       { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ESB_1,
-         PCI_ANY_ID, PCI_ANY_ID, },
-       { 0, },
-};
-
-MODULE_DEVICE_TABLE(pci, ichxrom_pci_tbl);
-
-#if 0
-static struct pci_driver ichxrom_driver = {
-       .name =         MOD_NAME,
-       .id_table =     ichxrom_pci_tbl,
-       .probe =        ichxrom_init_one,
-       .remove =       ichxrom_remove_one,
-};
-#endif
-
-static struct pci_dev *mydev;
-int __init init_ichxrom(void)
-{
-       struct pci_dev *pdev;
-       struct pci_device_id *id;
-
-       pdev = NULL;
-       for (id = ichxrom_pci_tbl; id->vendor; id++) {
-               pdev = pci_find_device(id->vendor, id->device, NULL);
-               if (pdev) {
-                       break;
-               }
-       }
-       if (pdev) {
-               mydev = pdev;
-               return ichxrom_init_one(pdev, &ichxrom_pci_tbl[0]);
-       }
-       return -ENXIO;
-#if 0
-       return pci_module_init(&ichxrom_driver);
-#endif
-}
-
-static void __exit cleanup_ichxrom(void)
-{
-       ichxrom_remove_one(mydev);
-}
-
-module_init(init_ichxrom);
-module_exit(cleanup_ichxrom);
-
-MODULE_LICENSE("GPL");
-MODULE_AUTHOR("Eric Biederman <ebiederman@lnxi.com>");
-MODULE_DESCRIPTION("MTD map driver for BIOS chips on the ICHX southbridge");
diff --git a/drivers/mtd/maps/integrator-flash-v24.c b/drivers/mtd/maps/integrator-flash-v24.c
deleted file mode 100644 (file)
index 945d7c9..0000000
+++ /dev/null
@@ -1,258 +0,0 @@
-/*======================================================================
-
-    drivers/mtd/maps/armflash.c: ARM Flash Layout/Partitioning
-  
-    Copyright (C) 2000 ARM Limited
-  
-   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
-  
-   This is access code for flashes using ARM's flash partitioning 
-   standards.
-
-   $Id: integrator-flash-v24.c,v 1.13 2004/07/12 21:59:44 dwmw2 Exp $
-
-======================================================================*/
-
-#include <linux/config.h>
-#include <linux/module.h>
-#include <linux/types.h>
-#include <linux/kernel.h>
-#include <linux/slab.h>
-#include <linux/ioport.h>
-#include <linux/init.h>
-
-#include <linux/mtd/mtd.h>
-#include <linux/mtd/map.h>
-#include <linux/mtd/partitions.h>
-
-#include <asm/hardware.h>
-#include <asm/io.h>
-#include <asm/system.h>
-
-// board specific stuff - sorry, it should be in arch/arm/mach-*.
-#ifdef CONFIG_ARCH_INTEGRATOR
-
-#define FLASH_BASE     INTEGRATOR_FLASH_BASE
-#define FLASH_SIZE     INTEGRATOR_FLASH_SIZE
-
-#define FLASH_PART_SIZE 0x400000
-
-#define SC_CTRLC       (IO_ADDRESS(INTEGRATOR_SC_BASE) + INTEGRATOR_SC_CTRLC_OFFSET)
-#define SC_CTRLS       (IO_ADDRESS(INTEGRATOR_SC_BASE) + INTEGRATOR_SC_CTRLS_OFFSET)
-#define EBI_CSR1       (IO_ADDRESS(INTEGRATOR_EBI_BASE) + INTEGRATOR_EBI_CSR1_OFFSET)
-#define EBI_LOCK       (IO_ADDRESS(INTEGRATOR_EBI_BASE) + INTEGRATOR_EBI_LOCK_OFFSET)
-
-/*
- * Initialise the flash access systems:
- *  - Disable VPP
- *  - Assert WP
- *  - Set write enable bit in EBI reg
- */
-static void armflash_flash_init(void)
-{
-       unsigned int tmp;
-
-       __raw_writel(INTEGRATOR_SC_CTRL_nFLVPPEN | INTEGRATOR_SC_CTRL_nFLWP, SC_CTRLC);
-
-       tmp = __raw_readl(EBI_CSR1) | INTEGRATOR_EBI_WRITE_ENABLE;
-       __raw_writel(tmp, EBI_CSR1);
-
-       if (!(__raw_readl(EBI_CSR1) & INTEGRATOR_EBI_WRITE_ENABLE)) {
-               __raw_writel(0xa05f, EBI_LOCK);
-               __raw_writel(tmp, EBI_CSR1);
-               __raw_writel(0, EBI_LOCK);
-       }
-}
-
-/*
- * Shutdown the flash access systems:
- *  - Disable VPP
- *  - Assert WP
- *  - Clear write enable bit in EBI reg
- */
-static void armflash_flash_exit(void)
-{
-       unsigned int tmp;
-
-       __raw_writel(INTEGRATOR_SC_CTRL_nFLVPPEN | INTEGRATOR_SC_CTRL_nFLWP, SC_CTRLC);
-
-       /*
-        * Clear the write enable bit in system controller EBI register.
-        */
-       tmp = __raw_readl(EBI_CSR1) & ~INTEGRATOR_EBI_WRITE_ENABLE;
-       __raw_writel(tmp, EBI_CSR1);
-
-       if (__raw_readl(EBI_CSR1) & INTEGRATOR_EBI_WRITE_ENABLE) {
-               __raw_writel(0xa05f, EBI_LOCK);
-               __raw_writel(tmp, EBI_CSR1);
-               __raw_writel(0, EBI_LOCK);
-       }
-}
-
-static void armflash_flash_wp(int on)
-{
-       unsigned int reg;
-
-       if (on)
-               reg = SC_CTRLC;
-       else
-               reg = SC_CTRLS;
-
-       __raw_writel(INTEGRATOR_SC_CTRL_nFLWP, reg);
-}
-
-static void armflash_set_vpp(struct map_info *map, int on)
-{
-       unsigned int reg;
-
-       if (on)
-               reg = SC_CTRLS;
-       else
-               reg = SC_CTRLC;
-
-       __raw_writel(INTEGRATOR_SC_CTRL_nFLVPPEN, reg);
-}
-#endif
-
-#ifdef CONFIG_ARCH_P720T
-
-#define FLASH_BASE             (0x04000000)
-#define FLASH_SIZE             (64*1024*1024)
-
-#define FLASH_PART_SIZE        (4*1024*1024)
-#define FLASH_BLOCK_SIZE       (128*1024)
-
-static void armflash_flash_init(void)
-{
-}
-
-static void armflash_flash_exit(void)
-{
-}
-
-static void armflash_flash_wp(int on)
-{
-}
-
-static void armflash_set_vpp(struct map_info *map, int on)
-{
-}
-#endif
-
-
-static struct map_info armflash_map =
-{
-       .name =         "AFS",
-       .set_vpp =      armflash_set_vpp,
-       .phys =         FLASH_BASE,
-};
-
-static struct mtd_info *mtd;
-static struct mtd_partition *parts;
-static const char *probes[] = { "RedBoot", "afs", NULL };
-
-static int __init armflash_cfi_init(void *base, u_int size)
-{
-       int ret;
-
-       armflash_flash_init();
-       armflash_flash_wp(1);
-
-       /*
-        * look for CFI based flash parts fitted to this board
-        */
-       armflash_map.size       = size;
-       armflash_map.bankwidth   = 4;
-       armflash_map.virt = (unsigned long) base;
-
-       simple_map_init(&armflash_map);
-
-       /*
-        * Also, the CFI layer automatically works out what size
-        * of chips we have, and does the necessary identification
-        * for us automatically.
-        */
-       mtd = do_map_probe("cfi_probe", &armflash_map);
-       if (!mtd)
-               return -ENXIO;
-
-       mtd->owner = THIS_MODULE;
-
-       ret = parse_mtd_partitions(mtd, probes, &parts, (void *)0);
-       if (ret > 0) {
-               ret = add_mtd_partitions(mtd, parts, ret);
-               if (ret)
-                       printk(KERN_ERR "mtd partition registration "
-                               "failed: %d\n", ret);
-       }
-
-       /*
-        * If we got an error, free all resources.
-        */
-       if (ret < 0) {
-               del_mtd_partitions(mtd);
-               map_destroy(mtd);
-       }
-
-       return ret;
-}
-
-static void armflash_cfi_exit(void)
-{
-       if (mtd) {
-               del_mtd_partitions(mtd);
-               map_destroy(mtd);
-       }
-       if (parts)
-               kfree(parts);
-}
-
-static int __init armflash_init(void)
-{
-       int err = -EBUSY;
-       void *base;
-
-       if (request_mem_region(FLASH_BASE, FLASH_SIZE, "flash") == NULL)
-               goto out;
-
-       base = ioremap(FLASH_BASE, FLASH_SIZE);
-       err = -ENOMEM;
-       if (base == NULL)
-               goto release;
-
-       err = armflash_cfi_init(base, FLASH_SIZE);
-       if (err) {
-               iounmap(base);
-release:
-               release_mem_region(FLASH_BASE, FLASH_SIZE);
-       }
-out:
-       return err;
-}
-
-static void __exit armflash_exit(void)
-{
-       armflash_cfi_exit();
-       iounmap((void *)armflash_map.virt);
-       release_mem_region(FLASH_BASE, FLASH_SIZE);
-       armflash_flash_exit();
-}
-
-module_init(armflash_init);
-module_exit(armflash_exit);
-
-MODULE_AUTHOR("ARM Ltd");
-MODULE_DESCRIPTION("ARM Integrator CFI map driver");
-MODULE_LICENSE("GPL");
diff --git a/drivers/mtd/maps/mpc1211.c b/drivers/mtd/maps/mpc1211.c
deleted file mode 100644 (file)
index cc55200..0000000
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- * Flash on MPC-1211
- *
- * $Id: mpc1211.c,v 1.3 2004/07/14 17:45:40 dwmw2 Exp $
- *
- * (C) 2002 Interface, Saito.K & Jeanne
- *
- * GPL'd
- */
-
-#include <linux/module.h>
-#include <linux/types.h>
-#include <linux/kernel.h>
-#include <asm/io.h>
-#include <linux/mtd/mtd.h>
-#include <linux/mtd/map.h>
-#include <linux/mtd/partitions.h>
-#include <linux/config.h>
-
-static struct mtd_info *flash_mtd;
-static struct mtd_partition *parsed_parts;
-
-struct map_info mpc1211_flash_map = {
-       .name           = "MPC-1211 FLASH",
-       .size           = 0x80000,
-       .bankwidth      = 1,
-};
-
-static struct mtd_partition mpc1211_partitions[] = {
-       {
-               .name   = "IPL & ETH-BOOT",
-               .offset = 0x00000000,
-               .size   = 0x10000,
-       },
-       {
-               .name   = "Flash FS",
-               .offset = 0x00010000,
-               .size   = MTDPART_SIZ_FULL,
-       }
-};
-
-static int __init init_mpc1211_maps(void)
-{
-       int nr_parts;
-
-       mpc1211_flash_map.phys = 0;
-       mpc1211_flash_map.virt = P2SEGADDR(0);
-
-       simple_map_init(&mpc1211_flash_map);
-
-       printk(KERN_NOTICE "Probing for flash chips at 0x00000000:\n");
-       flash_mtd = do_map_probe("jedec_probe", &mpc1211_flash_map);
-       if (!flash_mtd) {
-               printk(KERN_NOTICE "Flash chips not detected at either possible location.\n");
-               return -ENXIO;
-       }
-       printk(KERN_NOTICE "MPC-1211: Flash at 0x%08lx\n", mpc1211_flash_map.virt & 0x1fffffff);
-       flash_mtd->module = THIS_MODULE;
-
-       parsed_parts = mpc1211_partitions;
-       nr_parts = ARRAY_SIZE(mpc1211_partitions);
-
-       add_mtd_partitions(flash_mtd, parsed_parts, nr_parts);
-       return 0;
-}
-
-static void __exit cleanup_mpc1211_maps(void)
-{
-       if (parsed_parts)
-               del_mtd_partitions(flash_mtd);
-       else
-               del_mtd_device(flash_mtd);
-       map_destroy(flash_mtd);
-}
-
-module_init(init_mpc1211_maps);
-module_exit(cleanup_mpc1211_maps);
-
-MODULE_LICENSE("GPL");
-MODULE_AUTHOR("Saito.K & Jeanne <ksaito@interface.co.jp>");
-MODULE_DESCRIPTION("MTD map driver for MPC-1211 boards. Interface");
diff --git a/drivers/mtd/maps/omap-toto-flash.c b/drivers/mtd/maps/omap-toto-flash.c
deleted file mode 100644 (file)
index 4262f1c..0000000
+++ /dev/null
@@ -1,137 +0,0 @@
-/*
- * NOR Flash memory access on TI Toto board
- *
- * jzhang@ti.com (C) 2003 Texas Instruments.
- *
- *  (C) 2002 MontVista Software, Inc.
- *
- * $Id: omap-toto-flash.c,v 1.2 2004/07/12 21:59:44 dwmw2 Exp $
- */
-
-#include <linux/config.h>
-#include <linux/module.h>
-#include <linux/types.h>
-#include <linux/kernel.h>
-
-#include <linux/errno.h>
-#include <linux/init.h>
-
-#include <linux/mtd/mtd.h>
-#include <linux/mtd/map.h>
-#include <linux/mtd/partitions.h>
-
-#include <asm/hardware.h>
-#include <asm/io.h>
-
-
-#ifndef CONFIG_ARCH_OMAP
-#error This is for OMAP architecture only
-#endif
-
-//these lines need be moved to a hardware header file
-#define OMAP_TOTO_FLASH_BASE 0xd8000000
-#define OMAP_TOTO_FLASH_SIZE 0x80000
-
-static struct map_info omap_toto_map_flash = {
-       .name =         "OMAP Toto flash",
-       .bankwidth =    2,
-       .virt =         OMAP_TOTO_FLASH_BASE,
-};
-
-static struct mtd_partition toto_flash_partitions[] = {
-       {
-               .name =         "BootLoader",
-               .size =         0x00040000,     /* hopefully u-boot will stay 128k + 128*/
-               .offset =       0,
-               .mask_flags =   MTD_WRITEABLE,  /* force read-only */
-       }, {
-               .name =         "ReservedSpace",
-               .size =         0x00030000,
-               .offset =       MTDPART_OFS_APPEND,
-               //mask_flags:   MTD_WRITEABLE,  /* force read-only */
-       }, {
-               .name =         "EnvArea",      /* bottom 64KiB for env vars */
-               .size =         MTDPART_SIZ_FULL,
-               .offset =       MTDPART_OFS_APPEND,
-       } 
-};
-
-static struct mtd_partition *parsed_parts;
-
-static struct mtd_info *flash_mtd;
-static int __init init_flash (void)   
-{
-
-       struct mtd_partition *parts;
-       int nb_parts = 0;
-       int parsed_nr_parts = 0;
-       const char *part_type;
-       /*
-        * Static partition definition selection
-        */
-       part_type = "static";
-
-       parts = toto_flash_partitions;
-       nb_parts = ARRAY_SIZE(toto_flash_partitions);
-       omap_toto_map_flash.size = OMAP_TOTO_FLASH_SIZE;
-       omap_toto_map_flash.phys = virt_to_phys(OMAP_TOTO_FLASH_BASE);
-
-       simple_map_init(&omap_toto_map_flash);
-       /*
-        * Now let's probe for the actual flash.  Do it here since
-        * specific machine settings might have been set above.
-        */
-       printk(KERN_NOTICE "OMAP toto flash: probing %d-bit flash bus\n",
-               omap_toto_map_flash.bankwidth*8);
-       flash_mtd = do_map_probe("jedec_probe", &omap_toto_map_flash);
-       if (!flash_mtd)
-               return -ENXIO;
-       if (parsed_nr_parts > 0) {
-               parts = parsed_parts;
-               nb_parts = parsed_nr_parts;
-       }
-
-       if (nb_parts == 0) {
-               printk(KERN_NOTICE "OMAP toto flash: no partition info available,"
-                       "registering whole flash at once\n");
-               if (add_mtd_device(flash_mtd)){
-            return -ENXIO;
-        }
-       } else {
-               printk(KERN_NOTICE "Using %s partition definition\n",
-                       part_type);
-               return add_mtd_partitions(flash_mtd, parts, nb_parts);
-       }
-       return 0;
-}
-int __init omap_toto_mtd_init(void)  
-{
-       int status;
-
-       if (status = init_flash()) {
-               printk(KERN_ERR "OMAP Toto Flash: unable to init map for toto flash\n");
-       }
-    return status;
-}
-
-static void  __exit omap_toto_mtd_cleanup(void)  
-{
-       if (flash_mtd) {
-               del_mtd_partitions(flash_mtd);
-               map_destroy(flash_mtd);
-               if (parsed_parts)
-                       kfree(parsed_parts);
-       }
-}
-
-module_init(omap_toto_mtd_init);
-module_exit(omap_toto_mtd_cleanup);
-
-MODULE_AUTHOR("Jian Zhang");
-MODULE_DESCRIPTION("OMAP Toto board map driver");
-MODULE_LICENSE("GPL");
diff --git a/drivers/mtd/maps/pb1550-flash.c b/drivers/mtd/maps/pb1550-flash.c
deleted file mode 100644 (file)
index 4747fbc..0000000
+++ /dev/null
@@ -1,204 +0,0 @@
-/*
- * Flash memory access on Alchemy Pb1550 board
- * 
- * $Id: pb1550-flash.c,v 1.4 2004/07/14 17:45:40 dwmw2 Exp $
- *
- * (C) 2004 Embedded Edge, LLC, based on pb1550-flash.c:
- * (C) 2003 Pete Popov <ppopov@pacbell.net>
- * 
- */
-
-#include <linux/config.h>
-#include <linux/init.h>
-#include <linux/module.h>
-#include <linux/types.h>
-#include <linux/kernel.h>
-
-#include <linux/mtd/mtd.h>
-#include <linux/mtd/map.h>
-#include <linux/mtd/partitions.h>
-
-#include <asm/io.h>
-#include <asm/au1000.h>
-#include <asm/pb1550.h>
-
-#ifdef         DEBUG_RW
-#define        DBG(x...)       printk(x)
-#else
-#define        DBG(x...)       
-#endif
-
-static unsigned long window_addr;
-static unsigned long window_size;
-
-
-static struct map_info pb1550_map = {
-       .name = "Pb1550 flash",
-};
-
-static unsigned char flash_bankwidth = 4;
-
-/* 
- * Support only 64MB NOR Flash parts
- */
-
-#ifdef PB1550_BOTH_BANKS
-/* both banks will be used. Combine the first bank and the first 
- * part of the second bank together into a single jffs/jffs2
- * partition.
- */
-static struct mtd_partition pb1550_partitions[] = {
-       /* assume boot[2:0]:swap is '0000' or '1000', which translates to:
-        * 1C00 0000 1FFF FFFF CE0 64MB Boot NOR Flash
-        * 1800 0000 1BFF FFFF CE0 64MB Param NOR Flash
-        */
-        {
-                .name = "User FS",
-                .size =   (0x1FC00000 - 0x18000000),
-                .offset = 0x0000000
-        },{
-                .name = "yamon",
-                .size = 0x0100000,
-               .offset = MTDPART_OFS_APPEND,
-                .mask_flags = MTD_WRITEABLE
-        },{
-                .name = "raw kernel",
-               .size = (0x300000 - 0x40000), /* last 256KB is yamon env */
-               .offset = MTDPART_OFS_APPEND,
-        }
-};
-#elif defined(PB1550_BOOT_ONLY)
-static struct mtd_partition pb1550_partitions[] = {
-       /* assume boot[2:0]:swap is '0000' or '1000', which translates to:
-        * 1C00 0000 1FFF FFFF CE0 64MB Boot NOR Flash
-        */
-        {
-                .name = "User FS",
-                .size =   0x03c00000,
-                .offset = 0x0000000
-        },{
-                .name = "yamon",
-                .size = 0x0100000,
-               .offset = MTDPART_OFS_APPEND,
-                .mask_flags = MTD_WRITEABLE
-        },{
-                .name = "raw kernel",
-               .size = (0x300000-0x40000), /* last 256KB is yamon env */
-               .offset = MTDPART_OFS_APPEND,
-        }
-};
-#elif defined(PB1550_USER_ONLY)
-static struct mtd_partition pb1550_partitions[] = {
-       /* assume boot[2:0]:swap is '0000' or '1000', which translates to:
-        * 1800 0000 1BFF FFFF CE0 64MB Param NOR Flash
-        */
-        {
-                .name = "User FS",
-                .size = (0x4000000 - 0x200000), /* reserve 2MB for raw kernel */
-                .offset = 0x0000000
-        },{
-                .name = "raw kernel",
-               .size = MTDPART_SIZ_FULL,
-               .offset = MTDPART_OFS_APPEND,
-        }
-};
-#else
-#error MTD_PB1550 define combo error /* should never happen */
-#endif
-
-#define NB_OF(x)  (sizeof(x)/sizeof(x[0]))
-
-static struct mtd_info *mymtd;
-
-/*
- * Probe the flash density and setup window address and size
- * based on user CONFIG options. There are times when we don't
- * want the MTD driver to be probing the boot or user flash,
- * so having the option to enable only one bank is important.
- */
-int setup_flash_params(void)
-{
-       u16 boot_swapboot;
-       boot_swapboot = (au_readl(MEM_STSTAT) & (0x7<<1)) | 
-               ((bcsr->status >> 6)  & 0x1);
-       printk("Pb1550 MTD: boot:swap %d\n", boot_swapboot);
-
-       switch (boot_swapboot) {
-               case 0: /* 512Mbit devices, both enabled */
-               case 1: 
-               case 8:
-               case 9: 
-#if defined(PB1550_BOTH_BANKS)
-                       window_addr = 0x18000000;
-                       window_size = 0x8000000; 
-#elif defined(PB1550_BOOT_ONLY)
-                       window_addr = 0x1C000000;
-                       window_size = 0x4000000; 
-#else /* USER ONLY */
-                       window_addr = 0x1E000000;
-                       window_size = 0x4000000; 
-#endif
-                       break;
-               case 0xC:
-               case 0xD:
-               case 0xE:
-               case 0xF: 
-                       /* 64 MB Boot NOR Flash is disabled */
-                       /* and the start address is moved to 0x0C00000 */
-                       window_addr = 0x0C000000;
-                       window_size = 0x4000000; 
-               default:
-                       printk("Pb1550 MTD: unsupported boot:swap setting\n");
-                       return 1;
-       }
-       return 0;
-}
-
-int __init pb1550_mtd_init(void)
-{
-       struct mtd_partition *parts;
-       int nb_parts = 0;
-       
-       /* Default flash bankwidth */
-       pb1550_map.bankwidth = flash_bankwidth;
-
-       if (setup_flash_params()) 
-               return -ENXIO;
-
-       /*
-        * Static partition definition selection
-        */
-       parts = pb1550_partitions;
-       nb_parts = NB_OF(pb1550_partitions);
-       pb1550_map.size = window_size;
-
-       /*
-        * Now let's probe for the actual flash.  Do it here since
-        * specific machine settings might have been set above.
-        */
-       printk(KERN_NOTICE "Pb1550 flash: probing %d-bit flash bus\n", 
-                       pb1550_map.bankwidth*8);
-       pb1550_map.virt = 
-               (unsigned long)ioremap(window_addr, window_size);
-       mymtd = do_map_probe("cfi_probe", &pb1550_map);
-       if (!mymtd) return -ENXIO;
-       mymtd->owner = THIS_MODULE;
-
-       add_mtd_partitions(mymtd, parts, nb_parts);
-       return 0;
-}
-
-static void __exit pb1550_mtd_cleanup(void)
-{
-       if (mymtd) {
-               del_mtd_partitions(mymtd);
-               map_destroy(mymtd);
-       }
-}
-
-module_init(pb1550_mtd_init);
-module_exit(pb1550_mtd_cleanup);
-
-MODULE_AUTHOR("Embedded Edge, LLC");
-MODULE_DESCRIPTION("Pb1550 mtd map driver");
-MODULE_LICENSE("GPL");
diff --git a/drivers/mtd/maps/sbc8240.c b/drivers/mtd/maps/sbc8240.c
deleted file mode 100644 (file)
index da684d3..0000000
+++ /dev/null
@@ -1,247 +0,0 @@
-/*
- * Handle mapping of the flash memory access routines on the SBC8240 board.
- *
- * Carolyn Smith, Tektronix, Inc.
- *
- * This code is GPLed
- *
- * $Id: sbc8240.c,v 1.4 2004/07/12 22:38:29 dwmw2 Exp $
- *
- */
-
-/*
- * The SBC8240 has 2 flash banks.
- * Bank 0 is a 512 KiB AMD AM29F040B; 8 x 64 KiB sectors.
- * It contains the U-Boot code (7 sectors) and the environment (1 sector).
- * Bank 1 is 4 x 1 MiB AMD AM29LV800BT; 15 x 64 KiB sectors, 1 x 32 KiB sector,
- * 2 x 8 KiB sectors, 1 x 16 KiB sectors.
- * Both parts are JEDEC compatible.
- */
-
-#include <linux/config.h>
-#include <linux/module.h>
-#include <linux/types.h>
-#include <linux/kernel.h>
-#include <asm/io.h>
-
-#include <linux/mtd/mtd.h>
-#include <linux/mtd/map.h>
-#include <linux/mtd/cfi.h>
-
-#ifdef CONFIG_MTD_PARTITIONS
-#include <linux/mtd/partitions.h>
-#endif
-
-#define        DEBUG
-
-#ifdef DEBUG
-# define debugk(fmt,args...)   printk(fmt ,##args)
-#else
-# define debugk(fmt,args...)
-#endif
-
-
-#define WINDOW_ADDR0   0xFFF00000              /* 512 KiB */
-#define WINDOW_SIZE0   0x00080000
-#define BUSWIDTH0      1
-
-#define WINDOW_ADDR1   0xFF000000              /* 4 MiB */
-#define WINDOW_SIZE1   0x00400000
-#define BUSWIDTH1      8
-
-#define MSG_PREFIX "sbc8240:"  /* prefix for our printk()'s */
-#define MTDID     "sbc8240-%d" /* for mtdparts= partitioning */
-
-
-static struct map_info sbc8240_map[2] = {
-       {
-               .name           = "sbc8240 Flash Bank #0",
-               .size           = WINDOW_SIZE0,
-               .bankwidth       = BUSWIDTH0,
-       },
-       {
-               .name           = "sbc8240 Flash Bank #1",
-               .size           = WINDOW_SIZE1,
-               .bankwidth       = BUSWIDTH1,
-       }
-};
-
-#define NUM_FLASH_BANKS        (sizeof(sbc8240_map) / sizeof(struct map_info))
-
-/*
- * The following defines the partition layout of SBC8240 boards.
- *
- * See include/linux/mtd/partitions.h for definition of the
- * mtd_partition structure.
- *
- * The *_max_flash_size is the maximum possible mapped flash size
- * which is not necessarily the actual flash size. It must correspond
- * to the value specified in the mapping definition defined by the
- * "struct map_desc *_io_desc" for the corresponding machine.
- */
-
-#ifdef CONFIG_MTD_PARTITIONS
-
-static struct mtd_partition sbc8240_uboot_partitions [] = {
-       /* Bank 0 */
-       {
-               .name = "U-boot",                       /* U-Boot Firmware      */
-               .offset =       0,
-               .size = 0x00070000,                     /*  7 x 64 KiB sectors  */
-               .mask_flags = MTD_WRITEABLE,            /*  force read-only     */
-       },
-       {
-               .name = "environment",                  /* U-Boot environment   */
-               .offset =       0x00070000,
-               .size = 0x00010000,                     /*  1 x 64 KiB sector   */
-       },
-};
-
-static struct mtd_partition sbc8240_fs_partitions [] = {
-       {
-               .name = "jffs",                         /* JFFS  filesystem     */
-               .offset =       0,
-               .size = 0x003C0000,                     /*  4 * 15 * 64KiB      */
-       },
-       {
-               .name = "tmp32",
-               .offset =       0x003C0000,
-               .size = 0x00020000,                     /*  4 * 32KiB           */
-       },
-       {
-               .name = "tmp8a",
-               .offset =       0x003E0000,
-               .size = 0x00008000,                     /*  4 * 8KiB            */
-       },
-       {
-               .name = "tmp8b",
-               .offset =       0x003E8000,
-               .size = 0x00008000,                     /*  4 * 8KiB            */
-       },
-       {
-               .name = "tmp16",
-               .offset =       0x003F0000,
-               .size = 0x00010000,                     /*  4 * 16KiB           */
-       }
-};
-
-#define NB_OF(x) (sizeof (x) / sizeof (x[0]))
-
-/* trivial struct to describe partition information */
-struct mtd_part_def
-{
-       int nums;
-       unsigned char *type;
-       struct mtd_partition* mtd_part;
-};
-
-static struct mtd_info *sbc8240_mtd[NUM_FLASH_BANKS];
-static struct mtd_part_def sbc8240_part_banks[NUM_FLASH_BANKS];
-
-
-#endif /* CONFIG_MTD_PARTITIONS */
-
-
-int __init init_sbc8240_mtd (void)
-{
-       static struct _cjs {
-               u_long addr;
-               u_long size;
-       } pt[NUM_FLASH_BANKS] = {
-               {
-                       .addr = WINDOW_ADDR0,
-                       .size = WINDOW_SIZE0
-               },
-               {
-                       .addr = WINDOW_ADDR1,
-                       .size = WINDOW_SIZE1
-               },
-       };
-
-       int devicesfound = 0;
-       int i;
-
-       for (i = 0; i < NUM_FLASH_BANKS; i++) {
-               printk (KERN_NOTICE MSG_PREFIX
-                       "Probing 0x%08lx at 0x%08lx\n", pt[i].size, pt[i].addr);
-
-               sbc8240_map[i].map_priv_1 =
-                       (unsigned long) ioremap (pt[i].addr, pt[i].size);
-               if (!sbc8240_map[i].map_priv_1) {
-                       printk (MSG_PREFIX "failed to ioremap\n");
-                       return -EIO;
-               }
-               simple_map_init(&sbc8240_mtd[i]);
-
-               sbc8240_mtd[i] = do_map_probe("jedec_probe", &sbc8240_map[i]);
-
-               if (sbc8240_mtd[i]) {
-                       sbc8240_mtd[i]->module = THIS_MODULE;
-                       devicesfound++;
-               }
-       }
-
-       if (!devicesfound) {
-               printk(KERN_NOTICE MSG_PREFIX
-                      "No suppported flash chips found!\n");
-               return -ENXIO;
-       }
-
-#ifdef CONFIG_MTD_PARTITIONS
-       sbc8240_part_banks[0].mtd_part   = sbc8240_uboot_partitions;
-       sbc8240_part_banks[0].type       = "static image";
-       sbc8240_part_banks[0].nums       = NB_OF(sbc8240_uboot_partitions);
-       sbc8240_part_banks[1].mtd_part   = sbc8240_fs_partitions;
-       sbc8240_part_banks[1].type       = "static file system";
-       sbc8240_part_banks[1].nums       = NB_OF(sbc8240_fs_partitions);
-
-       for (i = 0; i < NUM_FLASH_BANKS; i++) {
-
-               if (!sbc8240_mtd[i]) continue;
-               if (sbc8240_part_banks[i].nums == 0) {
-                       printk (KERN_NOTICE MSG_PREFIX
-                               "No partition info available, registering whole device\n");
-                       add_mtd_device(sbc8240_mtd[i]);
-               } else {
-                       printk (KERN_NOTICE MSG_PREFIX
-                               "Using %s partition definition\n", sbc8240_part_banks[i].mtd_part->name);
-                       add_mtd_partitions (sbc8240_mtd[i], 
-                                           sbc8240_part_banks[i].mtd_part,
-                                           sbc8240_part_banks[i].nums);
-               }
-       }
-#else
-       printk(KERN_NOTICE MSG_PREFIX
-              "Registering %d flash banks at once\n", devicesfound);
-
-       for (i = 0; i < devicesfound; i++) {
-               add_mtd_device(sbc8240_mtd[i]);
-       }
-#endif /* CONFIG_MTD_PARTITIONS */
-
-       return devicesfound == 0 ? -ENXIO : 0;
-}
-
-static void __exit cleanup_sbc8240_mtd (void)
-{
-       int i;
-
-       for (i = 0; i < NUM_FLASH_BANKS; i++) {
-               if (sbc8240_mtd[i]) {
-                       del_mtd_device (sbc8240_mtd[i]);
-                       map_destroy (sbc8240_mtd[i]);
-               }
-               if (sbc8240_map[i].map_priv_1) {
-                       iounmap ((void *) sbc8240_map[i].map_priv_1);
-                       sbc8240_map[i].map_priv_1 = 0;
-               }
-       }
-}
-
-module_init (init_sbc8240_mtd);
-module_exit (cleanup_sbc8240_mtd);
-
-MODULE_LICENSE ("GPL");
-MODULE_AUTHOR ("Carolyn Smith <carolyn.smith@tektronix.com>");
-MODULE_DESCRIPTION ("MTD map driver for SBC8240 boards");
-
diff --git a/drivers/mtd/nand/au1550nd.c b/drivers/mtd/nand/au1550nd.c
deleted file mode 100644 (file)
index 8e4da65..0000000
+++ /dev/null
@@ -1,394 +0,0 @@
-/*
- *  drivers/mtd/nand/au1550nd.c
- *
- *  Copyright (C) 2004 Embedded Edge, LLC
- *
- * $Id: au1550nd.c,v 1.5 2004/05/17 07:19:35 ppopov Exp $
- *
- * 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.
- *
- */
-
-#include <linux/slab.h>
-#include <linux/init.h>
-#include <linux/module.h>
-#include <linux/mtd/mtd.h>
-#include <linux/mtd/nand.h>
-#include <linux/mtd/partitions.h>
-#include <asm/io.h>
-#include <asm/au1000.h>
-#ifdef CONFIG_MIPS_PB1550
-#include <asm/pb1550.h> 
-#endif
-#ifdef CONFIG_MIPS_DB1550
-#include <asm/db1x00.h> 
-#endif
-
-
-/*
- * MTD structure for NAND controller
- */
-static struct mtd_info *au1550_mtd = NULL;
-static volatile u32 p_nand;
-static int nand_width = 1; /* default, only x8 supported for now */
-
-/* Internal buffers. Page buffer and oob buffer for one block*/
-static u_char data_buf[512 + 16];
-static u_char oob_buf[16 * 32];
-
-/*
- * Define partitions for flash device
- */
-const static struct mtd_partition partition_info[] = {
-#ifdef CONFIG_MIPS_PB1550
-#define NUM_PARTITIONS            2
-       { 
-               .name = "Pb1550 NAND FS 0",
-               .offset = 0,
-               .size = 8*1024*1024 
-       },
-       { 
-               .name = "Pb1550 NAND FS 1",
-               .offset =  MTDPART_OFS_APPEND,
-               .size =    MTDPART_SIZ_FULL
-       }
-#endif
-#ifdef CONFIG_MIPS_DB1550
-#define NUM_PARTITIONS            2
-       { 
-               .name = "Db1550 NAND FS 0",
-               .offset = 0,
-               .size = 8*1024*1024 
-       },
-       { 
-               .name = "Db1550 NAND FS 1",
-               .offset =  MTDPART_OFS_APPEND,
-               .size =    MTDPART_SIZ_FULL
-       }
-#endif
-};
-
-static inline void write_cmd_reg(u8 cmd)
-{
-       if (nand_width)
-               *((volatile u8 *)(p_nand + MEM_STNAND_CMD)) = cmd;
-       else
-               *((volatile u16 *)(p_nand + MEM_STNAND_CMD)) = cmd;
-       au_sync();
-}
-
-static inline void write_addr_reg(u8 addr)
-{
-       if (nand_width)
-               *((volatile u8 *)(p_nand + MEM_STNAND_ADDR)) = addr;
-       else
-               *((volatile u16 *)(p_nand + MEM_STNAND_ADDR)) = addr;
-       au_sync();
-}
-
-static inline void write_data_reg(u8 data)
-{
-       if (nand_width)
-               *((volatile u8 *)(p_nand + MEM_STNAND_DATA)) = data;
-       else
-               *((volatile u16 *)(p_nand + MEM_STNAND_DATA)) = data;
-       au_sync();
-}
-
-static inline u32 read_data_reg(void)
-{
-       u32 data;
-       if (nand_width) {
-               data = *((volatile u8 *)(p_nand + MEM_STNAND_DATA));
-               au_sync();
-       }
-       else {
-               data = *((volatile u16 *)(p_nand + MEM_STNAND_DATA));
-               au_sync();
-       }
-       return data;
-}
-
-void au1550_hwcontrol(struct mtd_info *mtd, int cmd)
-{
-}
-
-int au1550_device_ready(struct mtd_info *mtd)
-{
-       int ready;
-       ready = (au_readl(MEM_STSTAT) & 0x1) ? 1 : 0;
-       return ready;
-}
-
-static u_char au1550_nand_read_byte(struct mtd_info *mtd)
-{
-       u_char ret;
-       ret = read_data_reg();
-       return ret;
-}
-
-static void au1550_nand_write_byte(struct mtd_info *mtd, u_char byte)
-{
-       write_data_reg((u8)byte);
-}
-
-static void 
-au1550_nand_write_buf(struct mtd_info *mtd, const u_char *buf, int len)
-{
-       int i;
-
-       for (i=0; i<len; i++)
-               write_data_reg(buf[i]);
-}
-
-static void 
-au1550_nand_read_buf(struct mtd_info *mtd, u_char *buf, int len)
-{
-       int i;
-
-       for (i=0; i<len; i++)
-               buf[i] = (u_char)read_data_reg();
-}
-
-static int 
-au1550_nand_verify_buf(struct mtd_info *mtd, const u_char *buf, int len)
-{
-       int i;
-
-       for (i=0; i<len; i++)
-               if (buf[i] != (u_char)read_data_reg())
-                       return -EFAULT;
-
-       return 0;
-}
-
-static void au1550_nand_select_chip(struct mtd_info *mtd, int chip)
-{
-       switch(chip) {
-       case -1:
-               /* deassert chip enable */
-               au_writel(au_readl(MEM_STNDCTL) & ~0x20 , MEM_STNDCTL);
-               break;
-       case 0:
-               /* assert (force assert) chip enable */
-               au_writel(au_readl(MEM_STNDCTL) | 0x20 , MEM_STNDCTL);
-               break;
-
-       default:
-               BUG();
-       }
-}
-
-static void au1550_nand_command (struct mtd_info *mtd, unsigned command, 
-               int column, int page_addr)
-{
-       register struct nand_chip *this = mtd->priv;
-
-       /*
-        * Write out the command to the device.
-        */
-       if (command == NAND_CMD_SEQIN) {
-               int readcmd;
-
-               if (column >= mtd->oobblock) {
-                       /* OOB area */
-                       column -= mtd->oobblock;
-                       readcmd = NAND_CMD_READOOB;
-               } else if (column < 256) {
-                       /* First 256 bytes --> READ0 */
-                       readcmd = NAND_CMD_READ0;
-               } else {
-                       column -= 256;
-                       readcmd = NAND_CMD_READ1;
-               }
-               write_cmd_reg(readcmd);
-       }
-       write_cmd_reg(command);
-
-       if (column != -1 || page_addr != -1) {
-
-               /* Serially input address */
-               if (column != -1)
-                       write_addr_reg(column);
-               if (page_addr != -1) {
-                       write_addr_reg((unsigned char) (page_addr & 0xff));
-                       write_addr_reg(((page_addr >> 8) & 0xff));
-                       /* One more address cycle for higher density devices */
-                       if (mtd->size & 0x0c000000) 
-                               write_addr_reg((unsigned char) ((page_addr >> 16) & 0x0f));
-               }
-       }
-       
-       switch (command) {
-                       
-       case NAND_CMD_PAGEPROG:
-       case NAND_CMD_ERASE1:
-       case NAND_CMD_ERASE2:
-       case NAND_CMD_SEQIN:
-       case NAND_CMD_STATUS:
-               break;
-
-       case NAND_CMD_RESET:
-               if (this->dev_ready)    
-                       break;
-               udelay(this->chip_delay);
-               write_cmd_reg(NAND_CMD_STATUS);
-               while ( !(read_data_reg() & 0x40));
-               return;
-
-       /* This applies to read commands */     
-       default:
-               udelay (this->chip_delay);
-       }
-       
-       /* wait until command is processed */
-       while (!this->dev_ready(mtd));
-}
-
-
-/*
- * Main initialization routine
- */
-int __init au1550_init (void)
-{
-       struct nand_chip *this;
-       u16 boot_swapboot = 0; /* default value */
-       u32 mem_time;
-
-       /* Allocate memory for MTD device structure and private data */
-       au1550_mtd = kmalloc (sizeof(struct mtd_info) + 
-                       sizeof (struct nand_chip), GFP_KERNEL);
-       if (!au1550_mtd) {
-               printk ("Unable to allocate NAND MTD dev structure.\n");
-               return -ENOMEM;
-       }
-
-       /* Get pointer to private data */
-       this = (struct nand_chip *) (&au1550_mtd[1]);
-
-       /* Initialize structures */
-       memset((char *) au1550_mtd, 0, sizeof(struct mtd_info));
-       memset((char *) this, 0, sizeof(struct nand_chip));
-
-       /* Link the private data with the MTD structure */
-       au1550_mtd->priv = this;
-
-       /* disable interrupts */
-       au_writel(au_readl(MEM_STNDCTL) & ~(1<<8), MEM_STNDCTL);
-
-       /* disable NAND boot */
-       au_writel(au_readl(MEM_STNDCTL) & ~(1<<0), MEM_STNDCTL);
-
-#ifdef CONFIG_MIPS_PB1550
-       /* set gpio206 high */
-       au_writel(au_readl(GPIO2_DIR) & ~(1<<6), GPIO2_DIR);
-
-       boot_swapboot = (au_readl(MEM_STSTAT) & (0x7<<1)) | 
-               ((bcsr->status >> 6)  & 0x1);
-       switch (boot_swapboot) {
-               case 0:
-               case 2:
-               case 8:
-               case 0xC:
-               case 0xD:
-                       /* x16 NAND Flash */
-                       nand_width = 0;
-                       printk("Pb1550 NAND: 16-bit NAND not supported by MTD\n");
-                       break;
-               case 1:
-               case 9:
-               case 3:
-               case 0xE:
-               case 0xF:
-                       /* x8 NAND Flash */
-                       nand_width = 1;
-                       break;
-               default:
-                       printk("Pb1550 NAND: bad boot:swap\n");
-                       kfree(au1550_mtd);
-                       return 1;
-       }
-
-       /* Configure RCE1 - should be done by YAMON */
-       au_writel(0x5 | (nand_width << 22), MEM_STCFG1);
-       au_writel(NAND_TIMING, MEM_STTIME1);
-       mem_time = au_readl(MEM_STTIME1);
-       au_sync();
-
-       /* setup and enable chip select */
-       /* we really need to decode offsets only up till 0x20 */
-       au_writel((1<<28) | (NAND_PHYS_ADDR>>4) | 
-                       (((NAND_PHYS_ADDR + 0x1000)-1) & (0x3fff<<18)>>18), 
-                       MEM_STADDR1);
-       au_sync();
-#endif
-
-#ifdef CONFIG_MIPS_DB1550
-       /* Configure RCE1 - should be done by YAMON */
-       au_writel(0x00400005, MEM_STCFG1);
-       au_writel(0x00007774, MEM_STTIME1);
-       au_writel(0x12000FFF, MEM_STADDR1);
-#endif
-
-       p_nand = (volatile struct nand_regs *)ioremap(NAND_PHYS_ADDR, 0x1000);
-
-       /* Set address of hardware control function */
-       this->hwcontrol = au1550_hwcontrol;
-       this->dev_ready = au1550_device_ready;
-       /* 30 us command delay time */
-       this->chip_delay = 30;          
-
-       this->cmdfunc = au1550_nand_command;
-       this->select_chip = au1550_nand_select_chip;
-       this->write_byte = au1550_nand_write_byte;
-       this->read_byte = au1550_nand_read_byte;
-       this->write_buf = au1550_nand_write_buf;
-       this->read_buf = au1550_nand_read_buf;
-       this->verify_buf = au1550_nand_verify_buf;
-       this->eccmode = NAND_ECC_SOFT;
-
-       /* Set internal data buffer */
-       this->data_buf = data_buf;
-       this->oob_buf = oob_buf;
-
-       /* Scan to find existence of the device */
-       if (nand_scan (au1550_mtd, 1)) {
-               kfree (au1550_mtd);
-               return -ENXIO;
-       }
-
-       /* Register the partitions */
-       add_mtd_partitions(au1550_mtd, partition_info, NUM_PARTITIONS);
-
-       return 0;
-}
-
-module_init(au1550_init);
-
-/*
- * Clean up routine
- */
-#ifdef MODULE
-static void __exit au1550_cleanup (void)
-{
-       struct nand_chip *this = (struct nand_chip *) &au1550_mtd[1];
-
-       iounmap ((void *)p_nand);
-
-       /* Unregister partitions */
-       del_mtd_partitions(au1550_mtd);
-
-       /* Unregister the device */
-       del_mtd_device (au1550_mtd);
-
-       /* Free the MTD device structure */
-       kfree (au1550_mtd);
-}
-module_exit(au1550_cleanup);
-#endif
-
-MODULE_LICENSE("GPL");
-MODULE_AUTHOR("Embedded Edge, LLC");
-MODULE_DESCRIPTION("Board-specific glue layer for NAND flash on Pb1550 board");
diff --git a/drivers/mtd/nand/diskonchip.c b/drivers/mtd/nand/diskonchip.c
deleted file mode 100644 (file)
index 677c216..0000000
+++ /dev/null
@@ -1,1237 +0,0 @@
-/* 
- * drivers/mtd/nand/diskonchip.c
- *
- * (C) 2003 Red Hat, Inc.
- *
- * Author: David Woodhouse <dwmw2@infradead.org>
- *
- * Interface to generic NAND code for M-Systems DiskOnChip devices
- *
- * $Id: diskonchip.c,v 1.23 2004/07/13 00:14:35 dbrown Exp $
- */
-
-#include <linux/kernel.h>
-#include <linux/init.h>
-#include <linux/sched.h>
-#include <linux/delay.h>
-#include <asm/io.h>
-
-#include <linux/mtd/mtd.h>
-#include <linux/mtd/nand.h>
-#include <linux/mtd/doc2000.h>
-#include <linux/mtd/compatmac.h>
-#include <linux/mtd/partitions.h>
-#include <linux/mtd/inftl.h>
-
-/* Where to look for the devices? */
-#ifndef CONFIG_MTD_DOCPROBE_ADDRESS
-#define CONFIG_MTD_DOCPROBE_ADDRESS 0
-#endif
-
-static unsigned long __initdata doc_locations[] = {
-#if defined (__alpha__) || defined(__i386__) || defined(__x86_64__)
-#ifdef CONFIG_MTD_DOCPROBE_HIGH
-       0xfffc8000, 0xfffca000, 0xfffcc000, 0xfffce000, 
-       0xfffd0000, 0xfffd2000, 0xfffd4000, 0xfffd6000,
-       0xfffd8000, 0xfffda000, 0xfffdc000, 0xfffde000, 
-       0xfffe0000, 0xfffe2000, 0xfffe4000, 0xfffe6000, 
-       0xfffe8000, 0xfffea000, 0xfffec000, 0xfffee000,
-#else /*  CONFIG_MTD_DOCPROBE_HIGH */
-       0xc8000, 0xca000, 0xcc000, 0xce000, 
-       0xd0000, 0xd2000, 0xd4000, 0xd6000,
-       0xd8000, 0xda000, 0xdc000, 0xde000, 
-       0xe0000, 0xe2000, 0xe4000, 0xe6000, 
-       0xe8000, 0xea000, 0xec000, 0xee000,
-#endif /*  CONFIG_MTD_DOCPROBE_HIGH */
-#elif defined(__PPC__)
-       0xe4000000,
-#elif defined(CONFIG_MOMENCO_OCELOT)
-       0x2f000000,
-        0xff000000,
-#elif defined(CONFIG_MOMENCO_OCELOT_G) || defined (CONFIG_MOMENCO_OCELOT_C)
-        0xff000000,
-##else
-#warning Unknown architecture for DiskOnChip. No default probe locations defined
-#endif
-       0xffffffff };
-
-static struct mtd_info *doclist = NULL;
-
-struct doc_priv {
-       unsigned long virtadr;
-       unsigned long physadr;
-       u_char ChipID;
-       u_char CDSNControl;
-       int chips_per_floor; /* The number of chips detected on each floor */
-       int curfloor;
-       int curchip;
-       int mh0_page;
-       int mh1_page;
-       struct mtd_info *nextdoc;
-};
-
-/* Max number of eraseblocks to scan (from start of device) for the (I)NFTL
-   MediaHeader.  The spec says to just keep going, I think, but that's just
-   silly. */
-#define MAX_MEDIAHEADER_SCAN 8
-
-/* This is the syndrome computed by the HW ecc generator upon reading an empty
-   page, one with all 0xff for data and stored ecc code. */
-static u_char empty_read_syndrome[6] = { 0x26, 0xff, 0x6d, 0x47, 0x73, 0x7a };
-/* This is the ecc value computed by the HW ecc generator upon writing an empty
-   page, one with all 0xff for data. */
-static u_char empty_write_ecc[6] = { 0x4b, 0x00, 0xe2, 0x0e, 0x93, 0xf7 };
-
-#define INFTL_BBT_RESERVED_BLOCKS 4
-
-#define DoC_is_Millennium(doc) ((doc)->ChipID == DOC_ChipID_DocMil)
-#define DoC_is_2000(doc) ((doc)->ChipID == DOC_ChipID_Doc2k)
-
-static void doc200x_hwcontrol(struct mtd_info *mtd, int cmd);
-static void doc200x_select_chip(struct mtd_info *mtd, int chip);
-
-static int debug=0;
-MODULE_PARM(debug, "i");
-
-static int try_dword=1;
-MODULE_PARM(try_dword, "i");
-
-static int no_ecc_failures=0;
-MODULE_PARM(no_ecc_failures, "i");
-
-static int no_autopart=0;
-MODULE_PARM(no_autopart, "i");
-
-#ifdef MTD_NAND_DISKONCHIP_BBTWRITE
-static int inftl_bbt_write=1;
-#else
-static int inftl_bbt_write=0;
-#endif
-MODULE_PARM(inftl_bbt_write, "i");
-
-static unsigned long doc_config_location = CONFIG_MTD_DOCPROBE_ADDRESS;
-MODULE_PARM(doc_config_location, "l");
-MODULE_PARM_DESC(doc_config_location, "Physical memory address at which to probe for DiskOnChip");
-
-static void DoC_Delay(struct doc_priv *doc, unsigned short cycles)
-{
-       volatile char dummy;
-       int i;
-       
-       for (i = 0; i < cycles; i++) {
-               if (DoC_is_Millennium(doc))
-                       dummy = ReadDOC(doc->virtadr, NOP);
-               else
-                       dummy = ReadDOC(doc->virtadr, DOCStatus);
-       }
-       
-}
-/* DOC_WaitReady: Wait for RDY line to be asserted by the flash chip */
-static int _DoC_WaitReady(struct doc_priv *doc)
-{
-       unsigned long docptr = doc->virtadr;
-       unsigned long timeo = jiffies + (HZ * 10);
-
-       if(debug) printk("_DoC_WaitReady...\n");
-       /* Out-of-line routine to wait for chip response */
-       while (!(ReadDOC(docptr, CDSNControl) & CDSN_CTRL_FR_B)) {
-               if (time_after(jiffies, timeo)) {
-                       printk("_DoC_WaitReady timed out.\n");
-                       return -EIO;
-               }
-               udelay(1);
-               cond_resched();
-       }
-
-       return 0;
-}
-
-static inline int DoC_WaitReady(struct doc_priv *doc)
-{
-       unsigned long docptr = doc->virtadr;
-       int ret = 0;
-
-       DoC_Delay(doc, 4);
-
-       if (!(ReadDOC(docptr, CDSNControl) & CDSN_CTRL_FR_B))
-               /* Call the out-of-line routine to wait */
-               ret = _DoC_WaitReady(doc);
-
-       DoC_Delay(doc, 2);
-       if(debug) printk("DoC_WaitReady OK\n");
-       return ret;
-}
-
-static void doc2000_write_byte(struct mtd_info *mtd, u_char datum)
-{
-       struct nand_chip *this = mtd->priv;
-       struct doc_priv *doc = (void *)this->priv;
-       unsigned long docptr = doc->virtadr;
-
-       if(debug)printk("write_byte %02x\n", datum);
-       WriteDOC(datum, docptr, CDSNSlowIO);
-       WriteDOC(datum, docptr, 2k_CDSN_IO);
-}
-
-static u_char doc2000_read_byte(struct mtd_info *mtd)
-{
-       struct nand_chip *this = mtd->priv;
-       struct doc_priv *doc = (void *)this->priv;
-       unsigned long docptr = doc->virtadr;
-       u_char ret;
-
-       ReadDOC(docptr, CDSNSlowIO);
-       DoC_Delay(doc, 2);
-       ret = ReadDOC(docptr, 2k_CDSN_IO);
-       if (debug) printk("read_byte returns %02x\n", ret);
-       return ret;
-}
-
-static void doc2000_writebuf(struct mtd_info *mtd, 
-                            const u_char *buf, int len)
-{
-       struct nand_chip *this = mtd->priv;
-       struct doc_priv *doc = (void *)this->priv;
-       unsigned long docptr = doc->virtadr;
-       int i;
-       if (debug)printk("writebuf of %d bytes: ", len);
-       for (i=0; i < len; i++) {
-               WriteDOC_(buf[i], docptr, DoC_2k_CDSN_IO + i);
-               if (debug && i < 16)
-                       printk("%02x ", buf[i]);
-       }
-       if (debug) printk("\n");
-}
-
-static void doc2000_readbuf(struct mtd_info *mtd, 
-                           u_char *buf, int len)
-{
-       struct nand_chip *this = mtd->priv;
-       struct doc_priv *doc = (void *)this->priv;
-       unsigned long docptr = doc->virtadr;
-       int i;
-
-       if (debug)printk("readbuf of %d bytes: ", len);
-
-       for (i=0; i < len; i++) {
-               buf[i] = ReadDOC(docptr, 2k_CDSN_IO + i);
-       }
-}
-
-static void doc2000_readbuf_dword(struct mtd_info *mtd, 
-                           u_char *buf, int len)
-{
-       struct nand_chip *this = mtd->priv;
-       struct doc_priv *doc = (void *)this->priv;
-       unsigned long docptr = doc->virtadr;
-       int i;
-
-       if (debug) printk("readbuf_dword of %d bytes: ", len);
-
-       if (unlikely((((unsigned long)buf)|len) & 3)) {
-               for (i=0; i < len; i++) {
-                       *(uint8_t *)(&buf[i]) = ReadDOC(docptr, 2k_CDSN_IO + i);
-               }
-       } else {
-               for (i=0; i < len; i+=4) {
-                       *(uint32_t*)(&buf[i]) = readl(docptr + DoC_2k_CDSN_IO + i);
-               }
-       }
-}
-
-static int doc2000_verifybuf(struct mtd_info *mtd, 
-                             const u_char *buf, int len)
-{
-       struct nand_chip *this = mtd->priv;
-       struct doc_priv *doc = (void *)this->priv;
-       unsigned long docptr = doc->virtadr;
-       int i;
-
-       for (i=0; i < len; i++)
-               if (buf[i] != ReadDOC(docptr, 2k_CDSN_IO))
-                       return -EFAULT;
-       return 0;
-}
-
-static uint16_t __init doc200x_ident_chip(struct mtd_info *mtd, int nr)
-{
-       struct nand_chip *this = mtd->priv;
-       struct doc_priv *doc = (void *)this->priv;
-       uint16_t ret;
-
-       doc200x_select_chip(mtd, nr);
-       doc200x_hwcontrol(mtd, NAND_CTL_SETCLE);
-       this->write_byte(mtd, NAND_CMD_READID);
-       doc200x_hwcontrol(mtd, NAND_CTL_CLRCLE);
-       doc200x_hwcontrol(mtd, NAND_CTL_SETALE);
-       this->write_byte(mtd, 0);
-       doc200x_hwcontrol(mtd, NAND_CTL_CLRALE);
-
-       ret = this->read_byte(mtd) << 8;
-       ret |= this->read_byte(mtd);
-
-       if (doc->ChipID == DOC_ChipID_Doc2k && try_dword && !nr) {
-               /* First chip probe. See if we get same results by 32-bit access */
-               union {
-                       uint32_t dword;
-                       uint8_t byte[4];
-               } ident;
-               unsigned long docptr = doc->virtadr;
-
-               doc200x_hwcontrol(mtd, NAND_CTL_SETCLE);
-               doc2000_write_byte(mtd, NAND_CMD_READID);
-               doc200x_hwcontrol(mtd, NAND_CTL_CLRCLE);
-               doc200x_hwcontrol(mtd, NAND_CTL_SETALE);
-               doc2000_write_byte(mtd, 0);
-               doc200x_hwcontrol(mtd, NAND_CTL_CLRALE);
-
-               ident.dword = readl(docptr + DoC_2k_CDSN_IO);
-               if (((ident.byte[0] << 8) | ident.byte[1]) == ret) {
-                       printk(KERN_INFO "DiskOnChip 2000 responds to DWORD access\n");
-                       this->read_buf = &doc2000_readbuf_dword;
-               }
-       }
-               
-       return ret;
-}
-
-static void __init doc2000_count_chips(struct mtd_info *mtd)
-{
-       struct nand_chip *this = mtd->priv;
-       struct doc_priv *doc = (void *)this->priv;
-       uint16_t mfrid;
-       int i;
-
-       /* Max 4 chips per floor on DiskOnChip 2000 */
-       doc->chips_per_floor = 4;
-
-       /* Find out what the first chip is */
-       mfrid = doc200x_ident_chip(mtd, 0);
-
-       /* Find how many chips in each floor. */
-       for (i = 1; i < 4; i++) {
-               if (doc200x_ident_chip(mtd, i) != mfrid)
-                       break;
-       }
-       doc->chips_per_floor = i;
-       printk(KERN_DEBUG "Detected %d chips per floor.\n", i);
-}
-
-static int doc200x_wait(struct mtd_info *mtd, struct nand_chip *this, int state)
-{
-       struct doc_priv *doc = (void *)this->priv;
-
-       int status;
-       
-       DoC_WaitReady(doc);
-       this->cmdfunc(mtd, NAND_CMD_STATUS, -1, -1);
-       DoC_WaitReady(doc);
-       status = (int)this->read_byte(mtd);
-
-       return status;
-}
-
-static void doc2001_write_byte(struct mtd_info *mtd, u_char datum)
-{
-       struct nand_chip *this = mtd->priv;
-       struct doc_priv *doc = (void *)this->priv;
-       unsigned long docptr = doc->virtadr;
-
-       WriteDOC(datum, docptr, CDSNSlowIO);
-       WriteDOC(datum, docptr, Mil_CDSN_IO);
-       WriteDOC(datum, docptr, WritePipeTerm);
-}
-
-static u_char doc2001_read_byte(struct mtd_info *mtd)
-{
-       struct nand_chip *this = mtd->priv;
-       struct doc_priv *doc = (void *)this->priv;
-       unsigned long docptr = doc->virtadr;
-
-       //ReadDOC(docptr, CDSNSlowIO);
-       /* 11.4.5 -- delay twice to allow extended length cycle */
-       DoC_Delay(doc, 2);
-       ReadDOC(docptr, ReadPipeInit);
-       //return ReadDOC(docptr, Mil_CDSN_IO);
-       return ReadDOC(docptr, LastDataRead);
-}
-
-static void doc2001_writebuf(struct mtd_info *mtd, 
-                            const u_char *buf, int len)
-{
-       struct nand_chip *this = mtd->priv;
-       struct doc_priv *doc = (void *)this->priv;
-       unsigned long docptr = doc->virtadr;
-       int i;
-
-       for (i=0; i < len; i++)
-               WriteDOC_(buf[i], docptr, DoC_Mil_CDSN_IO + i);
-       /* Terminate write pipeline */
-       WriteDOC(0x00, docptr, WritePipeTerm);
-}
-
-static void doc2001_readbuf(struct mtd_info *mtd, 
-                           u_char *buf, int len)
-{
-       struct nand_chip *this = mtd->priv;
-       struct doc_priv *doc = (void *)this->priv;
-       unsigned long docptr = doc->virtadr;
-       int i;
-
-       /* Start read pipeline */
-       ReadDOC(docptr, ReadPipeInit);
-
-       for (i=0; i < len-1; i++)
-               buf[i] = ReadDOC(docptr, Mil_CDSN_IO);
-
-       /* Terminate read pipeline */
-       buf[i] = ReadDOC(docptr, LastDataRead);
-}
-
-static int doc2001_verifybuf(struct mtd_info *mtd, 
-                            const u_char *buf, int len)
-{
-       struct nand_chip *this = mtd->priv;
-       struct doc_priv *doc = (void *)this->priv;
-       unsigned long docptr = doc->virtadr;
-       int i;
-
-       /* Start read pipeline */
-       ReadDOC(docptr, ReadPipeInit);
-
-       for (i=0; i < len-1; i++)
-               if (buf[i] != ReadDOC(docptr, Mil_CDSN_IO)) {
-                       ReadDOC(docptr, LastDataRead);
-                       return i;
-               }
-       if (buf[i] != ReadDOC(docptr, LastDataRead))
-               return i;
-       return 0;
-}
-
-static void doc200x_select_chip(struct mtd_info *mtd, int chip)
-{
-       struct nand_chip *this = mtd->priv;
-       struct doc_priv *doc = (void *)this->priv;
-       unsigned long docptr = doc->virtadr;
-       int floor = 0;
-
-       /* 11.4.4 -- deassert CE before changing chip */
-       doc200x_hwcontrol(mtd, NAND_CTL_CLRNCE);
-
-       if(debug)printk("select chip (%d)\n", chip);
-
-       if (chip == -1)
-               return;
-
-       floor = chip / doc->chips_per_floor;
-       chip -= (floor *  doc->chips_per_floor);
-
-       WriteDOC(floor, docptr, FloorSelect);
-       WriteDOC(chip, docptr, CDSNDeviceSelect);
-
-       doc200x_hwcontrol(mtd, NAND_CTL_SETNCE);
-
-       doc->curchip = chip;
-       doc->curfloor = floor;
-}
-
-static void doc200x_hwcontrol(struct mtd_info *mtd, int cmd)
-{
-       struct nand_chip *this = mtd->priv;
-       struct doc_priv *doc = (void *)this->priv;
-       unsigned long docptr = doc->virtadr;
-
-       switch(cmd) {
-       case NAND_CTL_SETNCE:
-               doc->CDSNControl |= CDSN_CTRL_CE;
-               break;
-       case NAND_CTL_CLRNCE:
-               doc->CDSNControl &= ~CDSN_CTRL_CE;
-               break;
-       case NAND_CTL_SETCLE:
-               doc->CDSNControl |= CDSN_CTRL_CLE;
-               break;
-       case NAND_CTL_CLRCLE:
-               doc->CDSNControl &= ~CDSN_CTRL_CLE;
-               break;
-       case NAND_CTL_SETALE:
-               doc->CDSNControl |= CDSN_CTRL_ALE;
-               break;
-       case NAND_CTL_CLRALE:
-               doc->CDSNControl &= ~CDSN_CTRL_ALE;
-               break;
-       case NAND_CTL_SETWP:
-               doc->CDSNControl |= CDSN_CTRL_WP;
-               break;
-       case NAND_CTL_CLRWP:
-               doc->CDSNControl &= ~CDSN_CTRL_WP;
-               break;
-       }
-       if (debug)printk("hwcontrol(%d): %02x\n", cmd, doc->CDSNControl);
-       WriteDOC(doc->CDSNControl, docptr, CDSNControl);
-       /* 11.4.3 -- 4 NOPs after CSDNControl write */
-       DoC_Delay(doc, 4);
-}
-
-static int doc200x_dev_ready(struct mtd_info *mtd)
-{
-       struct nand_chip *this = mtd->priv;
-       struct doc_priv *doc = (void *)this->priv;
-       unsigned long docptr = doc->virtadr;
-
-       /* 11.4.2 -- must NOP four times before checking FR/B# */
-       DoC_Delay(doc, 4);
-       if (!(ReadDOC(docptr, CDSNControl) & CDSN_CTRL_FR_B)) {
-               if(debug)
-                       printk("not ready\n");
-               return 0;
-       }
-       /* 11.4.2 -- Must NOP twice if it's ready */
-       DoC_Delay(doc, 2);
-       if (debug)printk("was ready\n");
-       return 1; 
-}      
-
-static int doc200x_block_bad(struct mtd_info *mtd, loff_t ofs, int getchip)
-{
-       /* This is our last resort if we couldn't find or create a BBT.  Just
-          pretend all blocks are good. */
-       return 0;
-}
-
-static void doc200x_enable_hwecc(struct mtd_info *mtd, int mode)
-{
-       struct nand_chip *this = mtd->priv;
-       struct doc_priv *doc = (void *)this->priv;
-       unsigned long docptr = doc->virtadr;
-
-       /* Prime the ECC engine */
-       switch(mode) {
-       case NAND_ECC_READ:
-               WriteDOC(DOC_ECC_RESET, docptr, ECCConf);
-               WriteDOC(DOC_ECC_EN, docptr, ECCConf);
-               break;
-       case NAND_ECC_WRITE:
-               WriteDOC(DOC_ECC_RESET, docptr, ECCConf);
-               WriteDOC(DOC_ECC_EN | DOC_ECC_RW, docptr, ECCConf);
-               break;
-       }       
-}
-
-/* This code is only called on write */
-static int doc200x_calculate_ecc(struct mtd_info *mtd, const u_char *dat,
-                                unsigned char *ecc_code)
-{
-       struct nand_chip *this = mtd->priv;
-       struct doc_priv *doc = (void *)this->priv;
-       unsigned long docptr = doc->virtadr;
-       int i;
-       int emptymatch = 1;
-
-       /* flush the pipeline */
-       if (DoC_is_2000(doc)) {
-               WriteDOC(doc->CDSNControl & ~CDSN_CTRL_FLASH_IO, docptr, CDSNControl);
-               WriteDOC(0, docptr, 2k_CDSN_IO);
-               WriteDOC(0, docptr, 2k_CDSN_IO);
-               WriteDOC(0, docptr, 2k_CDSN_IO);
-               WriteDOC(doc->CDSNControl, docptr, CDSNControl);
-       } else {
-               WriteDOC(0, docptr, NOP);
-               WriteDOC(0, docptr, NOP);
-               WriteDOC(0, docptr, NOP);
-       }
-
-       for (i = 0; i < 6; i++) {
-               ecc_code[i] = ReadDOC_(docptr, DoC_ECCSyndrome0 + i);
-               if (ecc_code[i] != empty_write_ecc[i])
-                       emptymatch = 0;
-       }
-       WriteDOC(DOC_ECC_DIS, docptr, ECCConf);
-#if 0
-       /* If emptymatch=1, we might have an all-0xff data buffer.  Check. */
-       if (emptymatch) {
-               /* Note: this somewhat expensive test should not be triggered
-                  often.  It could be optimized away by examining the data in
-                  the writebuf routine, and remembering the result. */
-               for (i = 0; i < 512; i++) {
-                       if (dat[i] == 0xff) continue;
-                       emptymatch = 0;
-                       break;
-               }
-       }
-       /* If emptymatch still =1, we do have an all-0xff data buffer.
-          Return all-0xff ecc value instead of the computed one, so
-          it'll look just like a freshly-erased page. */
-       if (emptymatch) memset(ecc_code, 0xff, 6);
-#endif
-       return 0;
-}
-
-static int doc200x_correct_data(struct mtd_info *mtd, u_char *dat, u_char *read_ecc, u_char *calc_ecc)
-{
-       int i, ret = 0;
-       struct nand_chip *this = mtd->priv;
-       struct doc_priv *doc = (void *)this->priv;
-       unsigned long docptr = doc->virtadr;
-       volatile u_char dummy;
-       int emptymatch = 1;
-       
-       /* flush the pipeline */
-       if (DoC_is_2000(doc)) {
-               dummy = ReadDOC(docptr, 2k_ECCStatus);
-               dummy = ReadDOC(docptr, 2k_ECCStatus);
-               dummy = ReadDOC(docptr, 2k_ECCStatus);
-       } else {
-               dummy = ReadDOC(docptr, ECCConf);
-               dummy = ReadDOC(docptr, ECCConf);
-               dummy = ReadDOC(docptr, ECCConf);
-       }
-       
-       /* Error occured ? */
-       if (dummy & 0x80) {
-               for (i = 0; i < 6; i++) {
-                       calc_ecc[i] = ReadDOC_(docptr, DoC_ECCSyndrome0 + i);
-                       if (calc_ecc[i] != empty_read_syndrome[i])
-                               emptymatch = 0;
-               }
-               /* If emptymatch=1, the read syndrome is consistent with an
-                  all-0xff data and stored ecc block.  Check the stored ecc. */
-               if (emptymatch) {
-                       for (i = 0; i < 6; i++) {
-                               if (read_ecc[i] == 0xff) continue;
-                               emptymatch = 0;
-                               break;
-                       }
-               }
-               /* If emptymatch still =1, check the data block. */
-               if (emptymatch) {
-               /* Note: this somewhat expensive test should not be triggered
-                  often.  It could be optimized away by examining the data in
-                  the readbuf routine, and remembering the result. */
-                       for (i = 0; i < 512; i++) {
-                               if (dat[i] == 0xff) continue;
-                               emptymatch = 0;
-                               break;
-                       }
-               }
-               /* If emptymatch still =1, this is almost certainly a freshly-
-                  erased block, in which case the ECC will not come out right.
-                  We'll suppress the error and tell the caller everything's
-                  OK.  Because it is. */
-               if (!emptymatch) ret = doc_decode_ecc (dat, calc_ecc);
-               if (ret > 0)
-                       printk(KERN_ERR "doc200x_correct_data corrected %d errors\n", ret);
-       }       
-       WriteDOC(DOC_ECC_DIS, docptr, ECCConf);
-       if (no_ecc_failures && (ret == -1)) {
-               printk(KERN_ERR "suppressing ECC failure\n");
-               ret = 0;
-       }
-       return ret;
-}
-               
-//u_char mydatabuf[528];
-
-static struct nand_oobinfo doc200x_oobinfo = {
-        .useecc = MTD_NANDECC_AUTOPLACE,
-        .eccbytes = 6,
-        .eccpos = {0, 1, 2, 3, 4, 5},
-        .oobfree = { {8, 8} }
-};
-/* Find the (I)NFTL Media Header, and optionally also the mirror media header.
-   On sucessful return, buf will contain a copy of the media header for
-   further processing.  id is the string to scan for, and will presumably be
-   either "ANAND" or "BNAND".  If findmirror=1, also look for the mirror media
-   header.  The page #s of the found media headers are placed in mh0_page and
-   mh1_page in the DOC private structure. */
-static int __init find_media_headers(struct mtd_info *mtd, u_char *buf,
-                                    const char *id, int findmirror)
-{
-       struct nand_chip *this = mtd->priv;
-       struct doc_priv *doc = (void *)this->priv;
-       int offs, end = (MAX_MEDIAHEADER_SCAN << this->phys_erase_shift);
-       int ret, retlen;
-
-       end = min(end, mtd->size); // paranoia
-       for (offs = 0; offs < end; offs += mtd->erasesize) {
-               ret = mtd->read(mtd, offs, mtd->oobblock, &retlen, buf);
-               if (retlen != mtd->oobblock) continue;
-               if (ret) {
-                       printk(KERN_WARNING "ECC error scanning DOC at 0x%x\n",
-                               offs);
-               }
-               if (memcmp(buf, id, 6)) continue;
-               printk(KERN_INFO "Found DiskOnChip %s Media Header at 0x%x\n", id, offs);
-               if (doc->mh0_page == -1) {
-                       doc->mh0_page = offs >> this->page_shift;
-                       if (!findmirror) return 1;
-                       continue;
-               }
-               doc->mh1_page = offs >> this->page_shift;
-               return 2;
-       }
-       if (doc->mh0_page == -1) {
-               printk(KERN_WARNING "DiskOnChip %s Media Header not found.\n", id);
-               return 0;
-       }
-       /* Only one mediaheader was found.  We want buf to contain a
-          mediaheader on return, so we'll have to re-read the one we found. */
-       offs = doc->mh0_page << this->page_shift;
-       ret = mtd->read(mtd, offs, mtd->oobblock, &retlen, buf);
-       if (retlen != mtd->oobblock) {
-               /* Insanity.  Give up. */
-               printk(KERN_ERR "Read DiskOnChip Media Header once, but can't reread it???\n");
-               return 0;
-       }
-       return 1;
-}
-
-static inline int __init nftl_partscan(struct mtd_info *mtd,
-                               struct mtd_partition *parts)
-{
-       struct nand_chip *this = mtd->priv;
-       struct doc_priv *doc = (void *)this->priv;
-       u_char *buf = this->data_buf;
-       struct NFTLMediaHeader *mh = (struct NFTLMediaHeader *) buf;
-       const int psize = 1 << this->page_shift;
-       int blocks, maxblocks;
-       int offs, numheaders;
-
-       if (!(numheaders=find_media_headers(mtd, buf, "ANAND", 1))) return 0;
-
-//#ifdef CONFIG_MTD_DEBUG_VERBOSE
-//     if (CONFIG_MTD_DEBUG_VERBOSE >= 2)
-       printk(KERN_INFO "    DataOrgID        = %s\n"
-                        "    NumEraseUnits    = %d\n"
-                        "    FirstPhysicalEUN = %d\n"
-                        "    FormattedSize    = %d\n"
-                        "    UnitSizeFactor   = %d\n",
-               mh->DataOrgID, mh->NumEraseUnits,
-               mh->FirstPhysicalEUN, mh->FormattedSize,
-               mh->UnitSizeFactor);
-//#endif
-
-       blocks = mtd->size >> this->phys_erase_shift;
-       maxblocks = min(32768, mtd->erasesize - psize);
-
-       if (mh->UnitSizeFactor == 0x00) {
-               /* Auto-determine UnitSizeFactor.  The constraints are:
-                  - There can be at most 32768 virtual blocks.
-                  - There can be at most (virtual block size - page size)
-                    virtual blocks (because MediaHeader+BBT must fit in 1).
-               */
-               mh->UnitSizeFactor = 0xff;
-               while (blocks > maxblocks) {
-                       blocks >>= 1;
-                       maxblocks = min(32768, (maxblocks << 1) + psize);
-                       mh->UnitSizeFactor--;
-               }
-               printk(KERN_WARNING "UnitSizeFactor=0x00 detected.  Correct value is assumed to be 0x%02x.\n", mh->UnitSizeFactor);
-       }
-
-       /* NOTE: The lines below modify internal variables of the NAND and MTD
-          layers; variables with have already been configured by nand_scan.
-          Unfortunately, we didn't know before this point what these values
-          should be.  Thus, this code is somewhat dependant on the exact
-          implementation of the NAND layer.  */
-       if (mh->UnitSizeFactor != 0xff) {
-               this->bbt_erase_shift += (0xff - mh->UnitSizeFactor);
-               mtd->erasesize <<= (0xff - mh->UnitSizeFactor);
-               printk(KERN_INFO "Setting virtual erase size to %d\n", mtd->erasesize);
-               blocks = mtd->size >> this->bbt_erase_shift;
-               maxblocks = min(32768, mtd->erasesize - psize);
-       }
-
-       if (blocks > maxblocks) {
-               printk(KERN_ERR "UnitSizeFactor of 0x%02x is inconsistent with device size.  Aborting.\n", mh->UnitSizeFactor);
-               return 0;
-       }
-
-       /* Skip past the media headers. */
-       offs = max(doc->mh0_page, doc->mh1_page);
-       offs <<= this->page_shift;
-       offs += mtd->erasesize;
-
-       //parts[0].name = " DiskOnChip Boot / Media Header partition";
-       //parts[0].offset = 0;
-       //parts[0].size = offs;
-
-       parts[0].name = " DiskOnChip BDTL partition";
-       parts[0].offset = offs;
-       parts[0].size = (mh->NumEraseUnits - numheaders) << this->bbt_erase_shift;
-
-       offs += parts[0].size;
-       if (offs < mtd->size) {
-               parts[1].name = " DiskOnChip Remainder partition";
-               parts[1].offset = offs;
-               parts[1].size = mtd->size - offs;
-               return 2;
-       }
-       return 1;
-}
-
-/* This is a stripped-down copy of the code in inftlmount.c */
-static inline int __init inftl_partscan(struct mtd_info *mtd,
-                                struct mtd_partition *parts)
-{
-       struct nand_chip *this = mtd->priv;
-       struct doc_priv *doc = (void *)this->priv;
-       u_char *buf = this->data_buf;
-       struct INFTLMediaHeader *mh = (struct INFTLMediaHeader *) buf;
-       struct INFTLPartition *ip;
-       int numparts = 0;
-       int blocks;
-       int vshift, lastvunit = 0;
-       int i;
-       int end = mtd->size;
-
-       if (inftl_bbt_write)
-               end -= (INFTL_BBT_RESERVED_BLOCKS << this->phys_erase_shift);
-
-       if (!find_media_headers(mtd, buf, "BNAND", 0)) return 0;
-       doc->mh1_page = doc->mh0_page + (4096 >> this->page_shift);
-
-       mh->NoOfBootImageBlocks = le32_to_cpu(mh->NoOfBootImageBlocks);
-       mh->NoOfBinaryPartitions = le32_to_cpu(mh->NoOfBinaryPartitions);
-       mh->NoOfBDTLPartitions = le32_to_cpu(mh->NoOfBDTLPartitions);
-       mh->BlockMultiplierBits = le32_to_cpu(mh->BlockMultiplierBits);
-       mh->FormatFlags = le32_to_cpu(mh->FormatFlags);
-       mh->PercentUsed = le32_to_cpu(mh->PercentUsed);
-//#ifdef CONFIG_MTD_DEBUG_VERBOSE
-//     if (CONFIG_MTD_DEBUG_VERBOSE >= 2)
-       printk(KERN_INFO "    bootRecordID          = %s\n"
-                        "    NoOfBootImageBlocks   = %d\n"
-                        "    NoOfBinaryPartitions  = %d\n"
-                        "    NoOfBDTLPartitions    = %d\n"
-                        "    BlockMultiplerBits    = %d\n"
-                        "    FormatFlgs            = %d\n"
-                        "    OsakVersion           = 0x%x\n"
-                        "    PercentUsed           = %d\n",
-               mh->bootRecordID, mh->NoOfBootImageBlocks,
-               mh->NoOfBinaryPartitions,
-               mh->NoOfBDTLPartitions,
-               mh->BlockMultiplierBits, mh->FormatFlags,
-               mh->OsakVersion, mh->PercentUsed);
-//#endif
-
-       vshift = this->phys_erase_shift + mh->BlockMultiplierBits;
-
-       blocks = mtd->size >> vshift;
-       if (blocks > 32768) {
-               printk(KERN_ERR "BlockMultiplierBits=%d is inconsistent with device size.  Aborting.\n", mh->BlockMultiplierBits);
-               return 0;
-       }
-
-       blocks = doc->chips_per_floor << (this->chip_shift - this->phys_erase_shift);
-       if (inftl_bbt_write && (blocks > mtd->erasesize)) {
-               printk(KERN_ERR "Writeable BBTs spanning more than one erase block are not yet supported.  FIX ME!\n");
-               return 0;
-       }
-
-       /* Scan the partitions */
-       for (i = 0; (i < 4); i++) {
-               ip = &(mh->Partitions[i]);
-               ip->virtualUnits = le32_to_cpu(ip->virtualUnits);
-               ip->firstUnit = le32_to_cpu(ip->firstUnit);
-               ip->lastUnit = le32_to_cpu(ip->lastUnit);
-               ip->flags = le32_to_cpu(ip->flags);
-               ip->spareUnits = le32_to_cpu(ip->spareUnits);
-               ip->Reserved0 = le32_to_cpu(ip->Reserved0);
-
-//#ifdef CONFIG_MTD_DEBUG_VERBOSE
-//             if (CONFIG_MTD_DEBUG_VERBOSE >= 2)
-               printk(KERN_INFO        "    PARTITION[%d] ->\n"
-                       "        virtualUnits    = %d\n"
-                       "        firstUnit       = %d\n"
-                       "        lastUnit        = %d\n"
-                       "        flags           = 0x%x\n"
-                       "        spareUnits      = %d\n",
-                       i, ip->virtualUnits, ip->firstUnit,
-                       ip->lastUnit, ip->flags,
-                       ip->spareUnits);
-//#endif
-
-/*
-               if ((i == 0) && (ip->firstUnit > 0)) {
-                       parts[0].name = " DiskOnChip IPL / Media Header partition";
-                       parts[0].offset = 0;
-                       parts[0].size = mtd->erasesize * ip->firstUnit;
-                       numparts = 1;
-               }
-*/
-
-               if (ip->flags & INFTL_BINARY)
-                       parts[numparts].name = " DiskOnChip BDK partition";
-               else
-                       parts[numparts].name = " DiskOnChip BDTL partition";
-               parts[numparts].offset = ip->firstUnit << vshift;
-               parts[numparts].size = (1 + ip->lastUnit - ip->firstUnit) << vshift;
-               numparts++;
-               if (ip->lastUnit > lastvunit) lastvunit = ip->lastUnit;
-               if (ip->flags & INFTL_LAST) break;
-       }
-       lastvunit++;
-       if ((lastvunit << vshift) < end) {
-               parts[numparts].name = " DiskOnChip Remainder partition";
-               parts[numparts].offset = lastvunit << vshift;
-               parts[numparts].size = end - parts[numparts].offset;
-               numparts++;
-       }
-       return numparts;
-}
-
-static int __init nftl_scan_bbt(struct mtd_info *mtd)
-{
-       int ret, numparts;
-       struct nand_chip *this = mtd->priv;
-       struct doc_priv *doc = (void *)this->priv;
-       struct mtd_partition parts[2];
-
-       memset((char *) parts, 0, sizeof(parts));
-       /* On NFTL, we have to find the media headers before we can read the
-          BBTs, since they're stored in the media header eraseblocks. */
-       numparts = nftl_partscan(mtd, parts);
-       if (!numparts) return -EIO;
-       this->bbt_td->options = NAND_BBT_ABSPAGE | NAND_BBT_8BIT |
-                               NAND_BBT_SAVECONTENT | NAND_BBT_WRITE |
-                               NAND_BBT_VERSION;
-       this->bbt_td->veroffs = 7;
-       this->bbt_td->pages[0] = doc->mh0_page + 1;
-       if (doc->mh1_page != -1) {
-               this->bbt_md->options = NAND_BBT_ABSPAGE | NAND_BBT_8BIT |
-                                       NAND_BBT_SAVECONTENT | NAND_BBT_WRITE |
-                                       NAND_BBT_VERSION;
-               this->bbt_md->veroffs = 7;
-               this->bbt_md->pages[0] = doc->mh1_page + 1;
-       } else {
-               this->bbt_md = NULL;
-       }
-
-       /* It's safe to set bd=NULL below because NAND_BBT_CREATE is not set.
-          At least as nand_bbt.c is currently written. */
-       if ((ret = nand_scan_bbt(mtd, NULL)))
-               return ret;
-       add_mtd_device(mtd);
-#if defined(CONFIG_MTD_PARTITIONS) || defined(CONFIG_MTD_PARTITIONS_MODULE)
-       if (!no_autopart) add_mtd_partitions(mtd, parts, numparts);
-#endif
-       return 0;
-}
-
-static int __init inftl_scan_bbt(struct mtd_info *mtd)
-{
-       int ret, numparts;
-       struct nand_chip *this = mtd->priv;
-       struct doc_priv *doc = (void *)this->priv;
-       struct mtd_partition parts[5];
-
-       if (this->numchips > doc->chips_per_floor) {
-               printk(KERN_ERR "Multi-floor INFTL devices not yet supported.\n");
-               return -EIO;
-       }
-
-       if (mtd->size == (8<<20)) {
-#if 0
-/* This doesn't seem to work for me.  I get ECC errors on every page. */
-               /* The Millennium 8MiB is actually an NFTL device! */
-               mtd->name = "DiskOnChip Millennium 8MiB (NFTL)";
-               return nftl_scan_bbt(mtd);
-#endif
-               printk(KERN_ERR "DiskOnChip Millennium 8MiB is not supported.\n");
-               return -EIO;
-       }
-
-       this->bbt_td->options = NAND_BBT_LASTBLOCK | NAND_BBT_8BIT |
-                               NAND_BBT_VERSION;
-       if (inftl_bbt_write)
-               this->bbt_td->options |= NAND_BBT_WRITE;
-       this->bbt_td->offs = 8;
-       this->bbt_td->len = 8;
-       this->bbt_td->veroffs = 7;
-       this->bbt_td->maxblocks = INFTL_BBT_RESERVED_BLOCKS;
-       this->bbt_td->reserved_block_code = 0x01;
-       this->bbt_td->pattern = "MSYS_BBT";
-
-       this->bbt_md->options = NAND_BBT_LASTBLOCK | NAND_BBT_8BIT |
-                               NAND_BBT_VERSION;
-       if (inftl_bbt_write)
-               this->bbt_md->options |= NAND_BBT_WRITE;
-       this->bbt_md->offs = 8;
-       this->bbt_md->len = 8;
-       this->bbt_md->veroffs = 7;
-       this->bbt_md->maxblocks = INFTL_BBT_RESERVED_BLOCKS;
-       this->bbt_md->reserved_block_code = 0x01;
-       this->bbt_md->pattern = "TBB_SYSM";
-
-       /* It's safe to set bd=NULL below because NAND_BBT_CREATE is not set.
-          At least as nand_bbt.c is currently written. */
-       if ((ret = nand_scan_bbt(mtd, NULL)))
-               return ret;
-       memset((char *) parts, 0, sizeof(parts));
-       numparts = inftl_partscan(mtd, parts);
-       /* At least for now, require the INFTL Media Header.  We could probably
-          do without it for non-INFTL use, since all it gives us is
-          autopartitioning, but I want to give it more thought. */
-       if (!numparts) return -EIO;
-       add_mtd_device(mtd);
-#if defined(CONFIG_MTD_PARTITIONS) || defined(CONFIG_MTD_PARTITIONS_MODULE)
-       if (!no_autopart) add_mtd_partitions(mtd, parts, numparts);
-#endif
-       return 0;
-}
-
-static inline int __init doc2000_init(struct mtd_info *mtd)
-{
-       struct nand_chip *this = mtd->priv;
-       struct doc_priv *doc = (void *)this->priv;
-
-       this->write_byte = doc2000_write_byte;
-       this->read_byte = doc2000_read_byte;
-       this->write_buf = doc2000_writebuf;
-       this->read_buf = doc2000_readbuf;
-       this->verify_buf = doc2000_verifybuf;
-       this->scan_bbt = nftl_scan_bbt;
-
-       doc->CDSNControl = CDSN_CTRL_FLASH_IO | CDSN_CTRL_ECC_IO;
-       doc2000_count_chips(mtd);
-       mtd->name = "DiskOnChip 2000 (NFTL Model)";
-       return (4 * doc->chips_per_floor);
-}
-
-static inline int __init doc2001_init(struct mtd_info *mtd)
-{
-       struct nand_chip *this = mtd->priv;
-       struct doc_priv *doc = (void *)this->priv;
-
-       this->write_byte = doc2001_write_byte;
-       this->read_byte = doc2001_read_byte;
-       this->write_buf = doc2001_writebuf;
-       this->read_buf = doc2001_readbuf;
-       this->verify_buf = doc2001_verifybuf;
-       this->scan_bbt = inftl_scan_bbt;
-
-       ReadDOC(doc->virtadr, ChipID);
-       ReadDOC(doc->virtadr, ChipID);
-       ReadDOC(doc->virtadr, ChipID);
-       if (ReadDOC(doc->virtadr, ChipID) != DOC_ChipID_DocMil) {
-               /* It's not a Millennium; it's one of the newer
-                  DiskOnChip 2000 units with a similar ASIC. 
-                  Treat it like a Millennium, except that it
-                  can have multiple chips. */
-               doc2000_count_chips(mtd);
-               mtd->name = "DiskOnChip 2000 (INFTL Model)";
-               return (4 * doc->chips_per_floor);
-       } else {
-               /* Bog-standard Millennium */
-               doc->chips_per_floor = 1;
-               mtd->name = "DiskOnChip Millennium";
-               return 1;
-       }
-}
-
-static inline int __init doc_probe(unsigned long physadr)
-{
-       unsigned char ChipID;
-       struct mtd_info *mtd;
-       struct nand_chip *nand;
-       struct doc_priv *doc;
-       unsigned long virtadr;
-       unsigned char save_control;
-       unsigned char tmp, tmpb, tmpc;
-       int reg, len, numchips;
-       int ret = 0;
-
-       virtadr = (unsigned long)ioremap(physadr, DOC_IOREMAP_LEN);
-       if (!virtadr) {
-               printk(KERN_ERR "Diskonchip ioremap failed: 0x%x bytes at 0x%lx\n", DOC_IOREMAP_LEN, physadr);
-               return -EIO;
-       }
-
-       /* It's not possible to cleanly detect the DiskOnChip - the
-        * bootup procedure will put the device into reset mode, and
-        * it's not possible to talk to it without actually writing
-        * to the DOCControl register. So we store the current contents
-        * of the DOCControl register's location, in case we later decide
-        * that it's not a DiskOnChip, and want to put it back how we
-        * found it. 
-        */
-       save_control = ReadDOC(virtadr, DOCControl);
-
-       /* Reset the DiskOnChip ASIC */
-       WriteDOC(DOC_MODE_CLR_ERR | DOC_MODE_MDWREN | DOC_MODE_RESET, 
-                virtadr, DOCControl);
-       WriteDOC(DOC_MODE_CLR_ERR | DOC_MODE_MDWREN | DOC_MODE_RESET, 
-                virtadr, DOCControl);
-
-       /* Enable the DiskOnChip ASIC */
-       WriteDOC(DOC_MODE_CLR_ERR | DOC_MODE_MDWREN | DOC_MODE_NORMAL, 
-                virtadr, DOCControl);
-       WriteDOC(DOC_MODE_CLR_ERR | DOC_MODE_MDWREN | DOC_MODE_NORMAL, 
-                virtadr, DOCControl);
-
-       ChipID = ReadDOC(virtadr, ChipID);
-
-       switch(ChipID) {
-       case DOC_ChipID_Doc2k:
-               reg = DoC_2k_ECCStatus;
-               break;
-       case DOC_ChipID_DocMil:
-               reg = DoC_ECCConf;
-               break;
-       default:
-               ret = -ENODEV;
-               goto notfound;
-       }
-       /* Check the TOGGLE bit in the ECC register */
-       tmp  = ReadDOC_(virtadr, reg) & DOC_TOGGLE_BIT;
-       tmpb = ReadDOC_(virtadr, reg) & DOC_TOGGLE_BIT;
-       tmpc = ReadDOC_(virtadr, reg) & DOC_TOGGLE_BIT;
-       if ((tmp == tmpb) || (tmp != tmpc)) {
-               printk(KERN_WARNING "Possible DiskOnChip at 0x%lx failed TOGGLE test, dropping.\n", physadr);
-               ret = -ENODEV;
-               goto notfound;
-       }
-
-       for (mtd = doclist; mtd; mtd = doc->nextdoc) {
-               nand = mtd->priv;
-               doc = (void *)nand->priv;
-               /* Use the alias resolution register to determine if this is
-                  in fact the same DOC aliased to a new address.  If writes
-                  to one chip's alias resolution register change the value on
-                  the other chip, they're the same chip. */
-               unsigned char oldval = ReadDOC(doc->virtadr, AliasResolution);
-               unsigned char newval = ReadDOC(virtadr, AliasResolution);
-               if (oldval != newval)
-                       continue;
-               WriteDOC(~newval, virtadr, AliasResolution);
-               oldval = ReadDOC(doc->virtadr, AliasResolution);
-               WriteDOC(newval, virtadr, AliasResolution); // restore it
-               newval = ~newval;
-               if (oldval == newval) {
-                       //printk(KERN_DEBUG "Found alias of DOC at 0x%lx to 0x%lx\n", doc->physadr, physadr);
-                       goto notfound;
-               }
-       }
-
-       printk(KERN_NOTICE "DiskOnChip found at 0x%lx\n", physadr);
-
-       len = sizeof(struct mtd_info) +
-             sizeof(struct nand_chip) +
-             sizeof(struct doc_priv) +
-             (2 * sizeof(struct nand_bbt_descr));
-       mtd = kmalloc(len, GFP_KERNEL);
-       if (!mtd) {
-               printk(KERN_ERR "DiskOnChip kmalloc (%d bytes) failed!\n", len);
-               ret = -ENOMEM;
-               goto fail;
-       }
-       memset(mtd, 0, len);
-
-       nand                    = (struct nand_chip *) (mtd + 1);
-       doc                     = (struct doc_priv *) (nand + 1);
-       nand->bbt_td            = (struct nand_bbt_descr *) (doc + 1);
-       nand->bbt_md            = nand->bbt_td + 1;
-
-       mtd->priv               = (void *) nand;
-       mtd->owner              = THIS_MODULE;
-
-       nand->priv              = (void *) doc;
-       nand->select_chip       = doc200x_select_chip;
-       nand->hwcontrol         = doc200x_hwcontrol;
-       nand->dev_ready         = doc200x_dev_ready;
-       nand->waitfunc          = doc200x_wait;
-       nand->block_bad         = doc200x_block_bad;
-       nand->enable_hwecc      = doc200x_enable_hwecc;
-       nand->calculate_ecc     = doc200x_calculate_ecc;
-       nand->correct_data      = doc200x_correct_data;
-       //nand->data_buf
-       nand->autooob           = &doc200x_oobinfo;
-       nand->eccmode           = NAND_ECC_HW6_512;
-       nand->options           = NAND_USE_FLASH_BBT | NAND_HWECC_SYNDROME;
-
-       doc->physadr            = physadr;
-       doc->virtadr            = virtadr;
-       doc->ChipID             = ChipID;
-       doc->curfloor           = -1;
-       doc->curchip            = -1;
-       doc->mh0_page           = -1;
-       doc->mh1_page           = -1;
-       doc->nextdoc            = doclist;
-
-       if (ChipID == DOC_ChipID_Doc2k)
-               numchips = doc2000_init(mtd);
-       else
-               numchips = doc2001_init(mtd);
-
-       if ((ret = nand_scan(mtd, numchips))) {
-               /* DBB note: i believe nand_release is necessary here, as
-                  buffers may have been allocated in nand_base.  Check with
-                  Thomas. FIX ME! */
-               /* nand_release will call del_mtd_device, but we haven't yet
-                  added it.  This is handled without incident by
-                  del_mtd_device, as far as I can tell. */
-               nand_release(mtd);
-               kfree(mtd);
-               goto fail;
-       }
-
-       /* Success! */
-       doclist = mtd;
-       return 0;
-
-notfound:
-       /* Put back the contents of the DOCControl register, in case it's not
-          actually a DiskOnChip.  */
-       WriteDOC(save_control, virtadr, DOCControl);
-fail:
-       iounmap((void *)virtadr);
-       return ret;
-}
-
-int __init init_nanddoc(void)
-{
-       int i;
-
-       if (doc_config_location) {
-               printk(KERN_INFO "Using configured DiskOnChip probe address 0x%lx\n", doc_config_location);
-               return doc_probe(doc_config_location);
-       } else {
-               for (i=0; (doc_locations[i] != 0xffffffff); i++) {
-                       doc_probe(doc_locations[i]);
-               }
-       }
-       /* No banner message any more. Print a message if no DiskOnChip
-          found, so the user knows we at least tried. */
-       if (!doclist) {
-               printk(KERN_INFO "No valid DiskOnChip devices found\n");
-               return -ENODEV;
-       }
-       return 0;
-}
-
-void __exit cleanup_nanddoc(void)
-{
-       struct mtd_info *mtd, *nextmtd;
-       struct nand_chip *nand;
-       struct doc_priv *doc;
-
-       for (mtd = doclist; mtd; mtd = nextmtd) {
-               nand = mtd->priv;
-               doc = (void *)nand->priv;
-
-               nextmtd = doc->nextdoc;
-               nand_release(mtd);
-               iounmap((void *)doc->virtadr);
-               kfree(mtd);
-       }
-}
-       
-module_init(init_nanddoc);
-module_exit(cleanup_nanddoc);
-
-MODULE_LICENSE("GPL");
-MODULE_AUTHOR("David Woodhouse <dwmw2@infradead.org>");
-MODULE_DESCRIPTION("M-Systems DiskOnChip 2000 and Millennium device driver\n");
diff --git a/drivers/mtd/nand/nand_base.c b/drivers/mtd/nand/nand_base.c
deleted file mode 100644 (file)
index 596bc8f..0000000
+++ /dev/null
@@ -1,2581 +0,0 @@
-/*
- *  drivers/mtd/nand.c
- *
- *  Overview:
- *   This is the generic MTD driver for NAND flash devices. It should be
- *   capable of working with almost all NAND chips currently available.
- *   Basic support for AG-AND chips is provided.
- *   
- *     Additional technical information is available on
- *     http://www.linux-mtd.infradead.org/tech/nand.html
- *     
- *  Copyright (C) 2000 Steven J. Hill (sjhill@realitydiluted.com)
- *               2002 Thomas Gleixner (tglx@linutronix.de)
- *
- *  02-08-2004  tglx: support for strange chips, which cannot auto increment 
- *             pages on read / read_oob
- *
- *  03-17-2004  tglx: Check ready before auto increment check. Simon Bayes
- *             pointed this out, as he marked an auto increment capable chip
- *             as NOAUTOINCR in the board driver.
- *             Make reads over block boundaries work too
- *
- *  04-14-2004 tglx: first working version for 2k page size chips
- *  
- *  05-19-2004  tglx: Basic support for Renesas AG-AND chips
- *
- * Credits:
- *     David Woodhouse for adding multichip support  
- *     
- *     Aleph One Ltd. and Toby Churchill Ltd. for supporting the
- *     rework for 2K page size chips
- *
- * TODO:
- *     Enable cached programming for 2k page size chips
- *     Check, if mtd->ecctype should be set to MTD_ECC_HW
- *     if we have HW ecc support.
- *     The AG-AND chips have nice features for speed improvement,
- *     which are not supported yet. Read / program 4 pages in one go.
- *
- * $Id: nand_base.c,v 1.113 2004/07/14 16:31:31 gleixner Exp $
- *
- * 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.
- *
- */
-
-#include <linux/delay.h>
-#include <linux/errno.h>
-#include <linux/sched.h>
-#include <linux/slab.h>
-#include <linux/types.h>
-#include <linux/mtd/mtd.h>
-#include <linux/mtd/nand.h>
-#include <linux/mtd/nand_ecc.h>
-#include <linux/mtd/compatmac.h>
-#include <linux/interrupt.h>
-#include <linux/bitops.h>
-#include <asm/io.h>
-
-#if defined(CONFIG_MTD_PARTITIONS) || defined(CONFIG_MTD_PARTITIONS_MODULE)
-#include <linux/mtd/partitions.h>
-#endif
-
-/* Define default oob placement schemes for large and small page devices */
-static struct nand_oobinfo nand_oob_8 = {
-       .useecc = MTD_NANDECC_AUTOPLACE,
-       .eccbytes = 3,
-       .eccpos = {0, 1, 2},
-       .oobfree = { {3, 2}, {6, 2} }
-};
-
-static struct nand_oobinfo nand_oob_16 = {
-       .useecc = MTD_NANDECC_AUTOPLACE,
-       .eccbytes = 6,
-       .eccpos = {0, 1, 2, 3, 6, 7},
-       .oobfree = { {8, 8} }
-};
-
-static struct nand_oobinfo nand_oob_64 = {
-       .useecc = MTD_NANDECC_AUTOPLACE,
-       .eccbytes = 24,
-       .eccpos = {
-               40, 41, 42, 43, 44, 45, 46, 47, 
-               48, 49, 50, 51, 52, 53, 54, 55, 
-               56, 57, 58, 59, 60, 61, 62, 63},
-       .oobfree = { {2, 38} }
-};
-
-/* This is used for padding purposes in nand_write_oob */
-static u_char ffchars[] = {
-       0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-       0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-       0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-       0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-       0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-       0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-       0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-       0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-};
-
-/*
- * NAND low-level MTD interface functions
- */
-static void nand_write_buf(struct mtd_info *mtd, const u_char *buf, int len);
-static void nand_read_buf(struct mtd_info *mtd, u_char *buf, int len);
-static int nand_verify_buf(struct mtd_info *mtd, const u_char *buf, int len);
-
-static int nand_read (struct mtd_info *mtd, loff_t from, size_t len, size_t * retlen, u_char * buf);
-static int nand_read_ecc (struct mtd_info *mtd, loff_t from, size_t len,
-                         size_t * retlen, u_char * buf, u_char * eccbuf, struct nand_oobinfo *oobsel);
-static int nand_read_oob (struct mtd_info *mtd, loff_t from, size_t len, size_t * retlen, u_char * buf);
-static int nand_write (struct mtd_info *mtd, loff_t to, size_t len, size_t * retlen, const u_char * buf);
-static int nand_write_ecc (struct mtd_info *mtd, loff_t to, size_t len,
-                          size_t * retlen, const u_char * buf, u_char * eccbuf, struct nand_oobinfo *oobsel);
-static int nand_write_oob (struct mtd_info *mtd, loff_t to, size_t len, size_t * retlen, const u_char *buf);
-static int nand_writev (struct mtd_info *mtd, const struct kvec *vecs,
-                       unsigned long count, loff_t to, size_t * retlen);
-static int nand_writev_ecc (struct mtd_info *mtd, const struct kvec *vecs,
-                       unsigned long count, loff_t to, size_t * retlen, u_char *eccbuf, struct nand_oobinfo *oobsel);
-static int nand_erase (struct mtd_info *mtd, struct erase_info *instr);
-static void nand_sync (struct mtd_info *mtd);
-
-/* Some internal functions */
-static int nand_write_page (struct mtd_info *mtd, struct nand_chip *this, int page, u_char *oob_buf,
-               struct nand_oobinfo *oobsel, int mode);
-#ifdef CONFIG_MTD_NAND_VERIFY_WRITE
-static int nand_verify_pages (struct mtd_info *mtd, struct nand_chip *this, int page, int numpages, 
-       u_char *oob_buf, struct nand_oobinfo *oobsel, int chipnr, int oobmode);
-#else
-#define nand_verify_pages(...) (0)
-#endif
-               
-static void nand_get_chip (struct nand_chip *this, struct mtd_info *mtd, int new_state);
-
-/**
- * nand_release_chip - [GENERIC] release chip
- * @mtd:       MTD device structure
- * 
- * Deselect, release chip lock and wake up anyone waiting on the device 
- */
-static void nand_release_chip (struct mtd_info *mtd)
-{
-       struct nand_chip *this = mtd->priv;
-
-       /* De-select the NAND device */
-       this->select_chip(mtd, -1);
-       /* Release the chip */
-       spin_lock_bh (&this->chip_lock);
-       this->state = FL_READY;
-       wake_up (&this->wq);
-       spin_unlock_bh (&this->chip_lock);
-}
-
-/**
- * nand_read_byte - [DEFAULT] read one byte from the chip
- * @mtd:       MTD device structure
- *
- * Default read function for 8bit buswith
- */
-static u_char nand_read_byte(struct mtd_info *mtd)
-{
-       struct nand_chip *this = mtd->priv;
-       return readb(this->IO_ADDR_R);
-}
-
-/**
- * nand_write_byte - [DEFAULT] write one byte to the chip
- * @mtd:       MTD device structure
- * @byte:      pointer to data byte to write
- *
- * Default write function for 8it buswith
- */
-static void nand_write_byte(struct mtd_info *mtd, u_char byte)
-{
-       struct nand_chip *this = mtd->priv;
-       writeb(byte, this->IO_ADDR_W);
-}
-
-/**
- * nand_read_byte16 - [DEFAULT] read one byte endianess aware from the chip
- * @mtd:       MTD device structure
- *
- * Default read function for 16bit buswith with 
- * endianess conversion
- */
-static u_char nand_read_byte16(struct mtd_info *mtd)
-{
-       struct nand_chip *this = mtd->priv;
-       return (u_char) cpu_to_le16(readw(this->IO_ADDR_R));
-}
-
-/**
- * nand_write_byte16 - [DEFAULT] write one byte endianess aware to the chip
- * @mtd:       MTD device structure
- * @byte:      pointer to data byte to write
- *
- * Default write function for 16bit buswith with
- * endianess conversion
- */
-static void nand_write_byte16(struct mtd_info *mtd, u_char byte)
-{
-       struct nand_chip *this = mtd->priv;
-       writew(le16_to_cpu((u16) byte), this->IO_ADDR_W);
-}
-
-/**
- * nand_read_word - [DEFAULT] read one word from the chip
- * @mtd:       MTD device structure
- *
- * Default read function for 16bit buswith without 
- * endianess conversion
- */
-static u16 nand_read_word(struct mtd_info *mtd)
-{
-       struct nand_chip *this = mtd->priv;
-       return readw(this->IO_ADDR_R);
-}
-
-/**
- * nand_write_word - [DEFAULT] write one word to the chip
- * @mtd:       MTD device structure
- * @word:      data word to write
- *
- * Default write function for 16bit buswith without 
- * endianess conversion
- */
-static void nand_write_word(struct mtd_info *mtd, u16 word)
-{
-       struct nand_chip *this = mtd->priv;
-       writew(word, this->IO_ADDR_W);
-}
-
-/**
- * nand_select_chip - [DEFAULT] control CE line
- * @mtd:       MTD device structure
- * @chip:      chipnumber to select, -1 for deselect
- *
- * Default select function for 1 chip devices.
- */
-static void nand_select_chip(struct mtd_info *mtd, int chip)
-{
-       struct nand_chip *this = mtd->priv;
-       switch(chip) {
-       case -1:
-               this->hwcontrol(mtd, NAND_CTL_CLRNCE);  
-               break;
-       case 0:
-               this->hwcontrol(mtd, NAND_CTL_SETNCE);
-               break;
-
-       default:
-               BUG();
-       }
-}
-
-/**
- * nand_write_buf - [DEFAULT] write buffer to chip
- * @mtd:       MTD device structure
- * @buf:       data buffer
- * @len:       number of bytes to write
- *
- * Default write function for 8bit buswith
- */
-static void nand_write_buf(struct mtd_info *mtd, const u_char *buf, int len)
-{
-       int i;
-       struct nand_chip *this = mtd->priv;
-
-       for (i=0; i<len; i++)
-               writeb(buf[i], this->IO_ADDR_W);
-}
-
-/**
- * nand_read_buf - [DEFAULT] read chip data into buffer 
- * @mtd:       MTD device structure
- * @buf:       buffer to store date
- * @len:       number of bytes to read
- *
- * Default read function for 8bit buswith
- */
-static void nand_read_buf(struct mtd_info *mtd, u_char *buf, int len)
-{
-       int i;
-       struct nand_chip *this = mtd->priv;
-
-       for (i=0; i<len; i++)
-               buf[i] = readb(this->IO_ADDR_R);
-}
-
-/**
- * nand_verify_buf - [DEFAULT] Verify chip data against buffer 
- * @mtd:       MTD device structure
- * @buf:       buffer containing the data to compare
- * @len:       number of bytes to compare
- *
- * Default verify function for 8bit buswith
- */
-static int nand_verify_buf(struct mtd_info *mtd, const u_char *buf, int len)
-{
-       int i;
-       struct nand_chip *this = mtd->priv;
-
-       for (i=0; i<len; i++)
-               if (buf[i] != readb(this->IO_ADDR_R))
-                       return -EFAULT;
-
-       return 0;
-}
-
-/**
- * nand_write_buf16 - [DEFAULT] write buffer to chip
- * @mtd:       MTD device structure
- * @buf:       data buffer
- * @len:       number of bytes to write
- *
- * Default write function for 16bit buswith
- */
-static void nand_write_buf16(struct mtd_info *mtd, const u_char *buf, int len)
-{
-       int i;
-       struct nand_chip *this = mtd->priv;
-       u16 *p = (u16 *) buf;
-       len >>= 1;
-       
-       for (i=0; i<len; i++)
-               writew(p[i], this->IO_ADDR_W);
-               
-}
-
-/**
- * nand_read_buf16 - [DEFAULT] read chip data into buffer 
- * @mtd:       MTD device structure
- * @buf:       buffer to store date
- * @len:       number of bytes to read
- *
- * Default read function for 16bit buswith
- */
-static void nand_read_buf16(struct mtd_info *mtd, u_char *buf, int len)
-{
-       int i;
-       struct nand_chip *this = mtd->priv;
-       u16 *p = (u16 *) buf;
-       len >>= 1;
-
-       for (i=0; i<len; i++)
-               p[i] = readw(this->IO_ADDR_R);
-}
-
-/**
- * nand_verify_buf16 - [DEFAULT] Verify chip data against buffer 
- * @mtd:       MTD device structure
- * @buf:       buffer containing the data to compare
- * @len:       number of bytes to compare
- *
- * Default verify function for 16bit buswith
- */
-static int nand_verify_buf16(struct mtd_info *mtd, const u_char *buf, int len)
-{
-       int i;
-       struct nand_chip *this = mtd->priv;
-       u16 *p = (u16 *) buf;
-       len >>= 1;
-
-       for (i=0; i<len; i++)
-               if (p[i] != readw(this->IO_ADDR_R))
-                       return -EFAULT;
-
-       return 0;
-}
-
-/**
- * nand_block_bad - [DEFAULT] Read bad block marker from the chip
- * @mtd:       MTD device structure
- * @ofs:       offset from device start
- * @getchip:   0, if the chip is already selected
- *
- * Check, if the block is bad. 
- */
-static int nand_block_bad(struct mtd_info *mtd, loff_t ofs, int getchip)
-{
-       int page, chipnr, res = 0;
-       struct nand_chip *this = mtd->priv;
-       u16 bad;
-
-       if (getchip) {
-               page = (int)(ofs >> this->page_shift);
-               chipnr = (int)(ofs >> this->chip_shift);
-
-               /* Grab the lock and see if the device is available */
-               nand_get_chip (this, mtd, FL_READING);
-
-               /* Select the NAND device */
-               this->select_chip(mtd, chipnr);
-       } else 
-               page = (int) ofs;       
-
-       if (this->options & NAND_BUSWIDTH_16) {
-               this->cmdfunc (mtd, NAND_CMD_READOOB, this->badblockpos & 0xFE, page & this->pagemask);
-               bad = cpu_to_le16(this->read_word(mtd));
-               if (this->badblockpos & 0x1)
-                       bad >>= 1;
-               if ((bad & 0xFF) != 0xff)
-                       res = 1;
-       } else {
-               this->cmdfunc (mtd, NAND_CMD_READOOB, this->badblockpos, page & this->pagemask);
-               if (this->read_byte(mtd) != 0xff)
-                       res = 1;
-       }
-               
-       if (getchip) {
-               /* Deselect and wake up anyone waiting on the device */
-               nand_release_chip(mtd);
-       }       
-       
-       return res;
-}
-
-/**
- * nand_default_block_markbad - [DEFAULT] mark a block bad
- * @mtd:       MTD device structure
- * @ofs:       offset from device start
- *
- * This is the default implementation, which can be overridden by
- * a hardware specific driver.
-*/
-static int nand_default_block_markbad(struct mtd_info *mtd, loff_t ofs)
-{
-       struct nand_chip *this = mtd->priv;
-       u_char buf[2] = {0, 0};
-       size_t  retlen;
-       int block;
-       
-       /* Get block number */
-       block = ((int) ofs) >> this->bbt_erase_shift;
-       this->bbt[block >> 2] |= 0x01 << ((block & 0x03) << 1);
-
-       /* Do we have a flash based bad block table ? */
-       if (this->options & NAND_USE_FLASH_BBT)
-               return nand_update_bbt (mtd, ofs);
-               
-       /* We write two bytes, so we dont have to mess with 16 bit access */
-       ofs += mtd->oobsize + (this->badblockpos & ~0x01);
-       return nand_write_oob (mtd, ofs , 2, &retlen, buf);
-}
-
-/** 
- * nand_check_wp - [GENERIC] check if the chip is write protected
- * @mtd:       MTD device structure
- * Check, if the device is write protected 
- *
- * The function expects, that the device is already selected 
- */
-static int nand_check_wp (struct mtd_info *mtd)
-{
-       struct nand_chip *this = mtd->priv;
-       /* Check the WP bit */
-       this->cmdfunc (mtd, NAND_CMD_STATUS, -1, -1);
-       return (this->read_byte(mtd) & 0x80) ? 0 : 1; 
-}
-
-/**
- * nand_block_checkbad - [GENERIC] Check if a block is marked bad
- * @mtd:       MTD device structure
- * @ofs:       offset from device start
- * @getchip:   0, if the chip is already selected
- * @allowbbt:  1, if its allowed to access the bbt area
- *
- * Check, if the block is bad. Either by reading the bad block table or
- * calling of the scan function.
- */
-static int nand_block_checkbad (struct mtd_info *mtd, loff_t ofs, int getchip, int allowbbt)
-{
-       struct nand_chip *this = mtd->priv;
-       
-       if (!this->bbt)
-               return this->block_bad(mtd, ofs, getchip);
-       
-       /* Return info from the table */
-       return nand_isbad_bbt (mtd, ofs, allowbbt);
-}
-
-/**
- * nand_command - [DEFAULT] Send command to NAND device
- * @mtd:       MTD device structure
- * @command:   the command to be sent
- * @column:    the column address for this command, -1 if none
- * @page_addr: the page address for this command, -1 if none
- *
- * Send command to NAND device. This function is used for small page
- * devices (256/512 Bytes per page)
- */
-static void nand_command (struct mtd_info *mtd, unsigned command, int column, int page_addr)
-{
-       register struct nand_chip *this = mtd->priv;
-
-       /* Begin command latch cycle */
-       this->hwcontrol(mtd, NAND_CTL_SETCLE);
-       /*
-        * Write out the command to the device.
-        */
-       if (command == NAND_CMD_SEQIN) {
-               int readcmd;
-
-               if (column >= mtd->oobblock) {
-                       /* OOB area */
-                       column -= mtd->oobblock;
-                       readcmd = NAND_CMD_READOOB;
-               } else if (column < 256) {
-                       /* First 256 bytes --> READ0 */
-                       readcmd = NAND_CMD_READ0;
-               } else {
-                       column -= 256;
-                       readcmd = NAND_CMD_READ1;
-               }
-               this->write_byte(mtd, readcmd);
-       }
-       this->write_byte(mtd, command);
-
-       /* Set ALE and clear CLE to start address cycle */
-       this->hwcontrol(mtd, NAND_CTL_CLRCLE);
-
-       if (column != -1 || page_addr != -1) {
-               this->hwcontrol(mtd, NAND_CTL_SETALE);
-
-               /* Serially input address */
-               if (column != -1) {
-                       /* Adjust columns for 16 bit buswidth */
-                       if (this->options & NAND_BUSWIDTH_16)
-                               column >>= 1;
-                       this->write_byte(mtd, column);
-               }
-               if (page_addr != -1) {
-                       this->write_byte(mtd, (unsigned char) (page_addr & 0xff));
-                       this->write_byte(mtd, (unsigned char) ((page_addr >> 8) & 0xff));
-                       /* One more address cycle for higher density devices */
-                       if (this->chipsize & 0x0c000000) 
-                               this->write_byte(mtd, (unsigned char) ((page_addr >> 16) & 0x0f));
-               }
-               /* Latch in address */
-               this->hwcontrol(mtd, NAND_CTL_CLRALE);
-       }
-       
-       /* 
-        * program and erase have their own busy handlers 
-        * status and sequential in needs no delay
-       */
-       switch (command) {
-                       
-       case NAND_CMD_PAGEPROG:
-       case NAND_CMD_ERASE1:
-       case NAND_CMD_ERASE2:
-       case NAND_CMD_SEQIN:
-       case NAND_CMD_STATUS:
-               return;
-
-       case NAND_CMD_RESET:
-               if (this->dev_ready)    
-                       break;
-               udelay(this->chip_delay);
-               this->hwcontrol(mtd, NAND_CTL_SETCLE);
-               this->write_byte(mtd, NAND_CMD_STATUS);
-               this->hwcontrol(mtd, NAND_CTL_CLRCLE);
-               while ( !(this->read_byte(mtd) & 0x40));
-               return;
-
-       /* This applies to read commands */     
-       default:
-               /* 
-                * If we don't have access to the busy pin, we apply the given
-                * command delay
-               */
-               if (!this->dev_ready) {
-                       udelay (this->chip_delay);
-                       return;
-               }       
-       }
-       
-       /* Apply this short delay always to ensure that we do wait tWB in
-        * any case on any machine. */
-       ndelay (100);
-       /* wait until command is processed */
-       while (!this->dev_ready(mtd));
-}
-
-/**
- * nand_command_lp - [DEFAULT] Send command to NAND large page device
- * @mtd:       MTD device structure
- * @command:   the command to be sent
- * @column:    the column address for this command, -1 if none
- * @page_addr: the page address for this command, -1 if none
- *
- * Send command to NAND device. This is the version for the new large page devices
- * We dont have the seperate regions as we have in the small page devices.
- * We must emulate NAND_CMD_READOOB to keep the code compatible.
- *
- */
-static void nand_command_lp (struct mtd_info *mtd, unsigned command, int column, int page_addr)
-{
-       register struct nand_chip *this = mtd->priv;
-
-       /* Emulate NAND_CMD_READOOB */
-       if (command == NAND_CMD_READOOB) {
-               column += mtd->oobblock;
-               command = NAND_CMD_READ0;
-       }
-       
-               
-       /* Begin command latch cycle */
-       this->hwcontrol(mtd, NAND_CTL_SETCLE);
-       /* Write out the command to the device. */
-       this->write_byte(mtd, command);
-       /* End command latch cycle */
-       this->hwcontrol(mtd, NAND_CTL_CLRCLE);
-
-       if (column != -1 || page_addr != -1) {
-               this->hwcontrol(mtd, NAND_CTL_SETALE);
-
-               /* Serially input address */
-               if (column != -1) {
-                       /* Adjust columns for 16 bit buswidth */
-                       if (this->options & NAND_BUSWIDTH_16)
-                               column >>= 1;
-                       this->write_byte(mtd, column & 0xff);
-                       this->write_byte(mtd, column >> 8);
-               }       
-               if (page_addr != -1) {
-                       this->write_byte(mtd, (unsigned char) (page_addr & 0xff));
-                       this->write_byte(mtd, (unsigned char) ((page_addr >> 8) & 0xff));
-                       /* One more address cycle for devices > 128MiB */
-                       if (this->chipsize > (128 << 20))
-                               this->write_byte(mtd, (unsigned char) ((page_addr >> 16) & 0xff));
-               }
-               /* Latch in address */
-               this->hwcontrol(mtd, NAND_CTL_CLRALE);
-       }
-       
-       /* 
-        * program and erase have their own busy handlers 
-        * status and sequential in needs no delay
-       */
-       switch (command) {
-                       
-       case NAND_CMD_CACHEDPROG:
-       case NAND_CMD_PAGEPROG:
-       case NAND_CMD_ERASE1:
-       case NAND_CMD_ERASE2:
-       case NAND_CMD_SEQIN:
-       case NAND_CMD_STATUS:
-               return;
-
-
-       case NAND_CMD_RESET:
-               if (this->dev_ready)    
-                       break;
-               udelay(this->chip_delay);
-               this->hwcontrol(mtd, NAND_CTL_SETCLE);
-               this->write_byte(mtd, NAND_CMD_STATUS);
-               this->hwcontrol(mtd, NAND_CTL_CLRCLE);
-               while ( !(this->read_byte(mtd) & 0x40));
-               return;
-
-       case NAND_CMD_READ0:
-               /* Begin command latch cycle */
-               this->hwcontrol(mtd, NAND_CTL_SETCLE);
-               /* Write out the start read command */
-               this->write_byte(mtd, NAND_CMD_READSTART);
-               /* End command latch cycle */
-               this->hwcontrol(mtd, NAND_CTL_CLRCLE);
-               /* Fall through into ready check */
-               
-       /* This applies to read commands */     
-       default:
-               /* 
-                * If we don't have access to the busy pin, we apply the given
-                * command delay
-               */
-               if (!this->dev_ready) {
-                       udelay (this->chip_delay);
-                       return;
-               }       
-       }
-       
-       /* Apply this short delay always to ensure that we do wait tWB in
-        * any case on any machine. */
-       ndelay (100);
-       /* wait until command is processed */
-       while (!this->dev_ready(mtd));
-}
-
-/**
- * nand_get_chip - [GENERIC] Get chip for selected access
- * @this:      the nand chip descriptor
- * @mtd:       MTD device structure
- * @new_state: the state which is requested 
- *
- * Get the device and lock it for exclusive access
- */
-static void nand_get_chip (struct nand_chip *this, struct mtd_info *mtd, int new_state)
-{
-
-       DECLARE_WAITQUEUE (wait, current);
-
-       /* 
-        * Grab the lock and see if the device is available 
-       */
-retry:
-       spin_lock_bh (&this->chip_lock);
-
-       if (this->state == FL_READY) {
-               this->state = new_state;
-               spin_unlock_bh (&this->chip_lock);
-               return;
-       }
-
-       set_current_state (TASK_UNINTERRUPTIBLE);
-       add_wait_queue (&this->wq, &wait);
-       spin_unlock_bh (&this->chip_lock);
-       schedule ();
-       remove_wait_queue (&this->wq, &wait);
-       goto retry;
-}
-
-/**
- * nand_wait - [DEFAULT]  wait until the command is done
- * @mtd:       MTD device structure
- * @this:      NAND chip structure
- * @state:     state to select the max. timeout value
- *
- * Wait for command done. This applies to erase and program only
- * Erase can take up to 400ms and program up to 20ms according to 
- * general NAND and SmartMedia specs
- *
-*/
-static int nand_wait(struct mtd_info *mtd, struct nand_chip *this, int state)
-{
-
-       unsigned long   timeo = jiffies;
-       int     status;
-       
-       if (state == FL_ERASING)
-                timeo += (HZ * 400) / 1000;
-       else
-                timeo += (HZ * 20) / 1000;
-
-       /* Apply this short delay always to ensure that we do wait tWB in
-        * any case on any machine. */
-       ndelay (100);
-
-       spin_lock_bh (&this->chip_lock);
-       if ((state == FL_ERASING) && (this->options & NAND_IS_AND))
-               this->cmdfunc (mtd, NAND_CMD_STATUS_MULTI, -1, -1);
-       else    
-               this->cmdfunc (mtd, NAND_CMD_STATUS, -1, -1);
-
-       while (time_before(jiffies, timeo)) {           
-               /* Check, if we were interrupted */
-               if (this->state != state) {
-                       spin_unlock_bh (&this->chip_lock);
-                       return 0;
-               }
-               if (this->dev_ready) {
-                       if (this->dev_ready(mtd))
-                               break;
-               }
-               if (this->read_byte(mtd) & NAND_STATUS_READY)
-                       break;
-                                               
-               spin_unlock_bh (&this->chip_lock);
-               yield ();
-               spin_lock_bh (&this->chip_lock);
-       }
-       status = (int) this->read_byte(mtd);
-       spin_unlock_bh (&this->chip_lock);
-
-       return status;
-}
-
-/**
- * nand_write_page - [GENERIC] write one page
- * @mtd:       MTD device structure
- * @this:      NAND chip structure
- * @page:      startpage inside the chip, must be called with (page & this->pagemask)
- * @oob_buf:   out of band data buffer
- * @oobsel:    out of band selecttion structre
- * @cached:    1 = enable cached programming if supported by chip
- *
- * Nand_page_program function is used for write and writev !
- * This function will always program a full page of data
- * If you call it with a non page aligned buffer, you're lost :)
- *
- * Cached programming is not supported yet.
- */
-static int nand_write_page (struct mtd_info *mtd, struct nand_chip *this, int page, 
-       u_char *oob_buf,  struct nand_oobinfo *oobsel, int cached)
-{
-       int     i, status;
-       u_char  ecc_code[8];
-       int     eccmode = oobsel->useecc ? this->eccmode : NAND_ECC_NONE;
-       int     *oob_config = oobsel->eccpos;
-       int     datidx = 0, eccidx = 0, eccsteps = this->eccsteps;
-       int     eccbytes = 0;
-       
-       /* FIXME: Enable cached programming */
-       cached = 0;
-       
-       /* Send command to begin auto page programming */
-       this->cmdfunc (mtd, NAND_CMD_SEQIN, 0x00, page);
-
-       /* Write out complete page of data, take care of eccmode */
-       switch (eccmode) {
-       /* No ecc, write all */
-       case NAND_ECC_NONE:
-               printk (KERN_WARNING "Writing data without ECC to NAND-FLASH is not recommended\n");
-               this->write_buf(mtd, this->data_poi, mtd->oobblock);
-               break;
-               
-       /* Software ecc 3/256, write all */
-       case NAND_ECC_SOFT:
-               for (; eccsteps; eccsteps--) {
-                       this->calculate_ecc(mtd, &this->data_poi[datidx], ecc_code);
-                       for (i = 0; i < 3; i++, eccidx++)
-                               oob_buf[oob_config[eccidx]] = ecc_code[i];
-                       datidx += this->eccsize;
-               }
-               this->write_buf(mtd, this->data_poi, mtd->oobblock);
-               break;
-               
-       /* Hardware ecc 8 byte / 512 byte data */       
-       case NAND_ECC_HW8_512:  
-               eccbytes += 2;
-       /* Hardware ecc 6 byte / 512 byte data */       
-       case NAND_ECC_HW6_512:  
-               eccbytes += 3;
-       /* Hardware ecc 3 byte / 256 data */    
-       /* Hardware ecc 3 byte / 512 byte data */       
-       case NAND_ECC_HW3_256:          
-       case NAND_ECC_HW3_512:
-               eccbytes += 3;
-               for (; eccsteps; eccsteps--) {
-                       /* enable hardware ecc logic for write */
-                       this->enable_hwecc(mtd, NAND_ECC_WRITE);
-                       this->write_buf(mtd, &this->data_poi[datidx], this->eccsize);
-                       this->calculate_ecc(mtd, &this->data_poi[datidx], ecc_code);
-                       for (i = 0; i < eccbytes; i++, eccidx++)
-                               oob_buf[oob_config[eccidx]] = ecc_code[i];
-                       /* If the hardware ecc provides syndromes then
-                        * the ecc code must be written immidiately after
-                        * the data bytes (words) */
-                       if (this->options & NAND_HWECC_SYNDROME)
-                               this->write_buf(mtd, ecc_code, eccbytes);
-
-                       datidx += this->eccsize;
-               }
-               break;
-
-       default:
-               printk (KERN_WARNING "Invalid NAND_ECC_MODE %d\n", this->eccmode);
-               BUG();  
-       }
-                                                                               
-       /* Write out OOB data */
-       if (this->options & NAND_HWECC_SYNDROME)
-               this->write_buf(mtd, &oob_buf[oobsel->eccbytes], mtd->oobsize - oobsel->eccbytes);
-       else 
-               this->write_buf(mtd, oob_buf, mtd->oobsize);
-
-       /* Send command to actually program the data */
-       this->cmdfunc (mtd, cached ? NAND_CMD_CACHEDPROG : NAND_CMD_PAGEPROG, -1, -1);
-
-       if (!cached) {
-               /* call wait ready function */
-               status = this->waitfunc (mtd, this, FL_WRITING);
-               /* See if device thinks it succeeded */
-               if (status & 0x01) {
-                       DEBUG (MTD_DEBUG_LEVEL0, "%s: " "Failed write, page 0x%08x, ", __FUNCTION__, page);
-                       return -EIO;
-               }
-       } else {
-               /* FIXME: Implement cached programming ! */
-               /* wait until cache is ready*/
-               // status = this->waitfunc (mtd, this, FL_CACHEDRPG);
-       }
-       return 0;       
-}
-
-#ifdef CONFIG_MTD_NAND_VERIFY_WRITE
-/**
- * nand_verify_pages - [GENERIC] verify the chip contents after a write
- * @mtd:       MTD device structure
- * @this:      NAND chip structure
- * @page:      startpage inside the chip, must be called with (page & this->pagemask)
- * @numpages:  number of pages to verify
- * @oob_buf:   out of band data buffer
- * @oobsel:    out of band selecttion structre
- * @chipnr:    number of the current chip
- * @oobmode:   1 = full buffer verify, 0 = ecc only
- *
- * The NAND device assumes that it is always writing to a cleanly erased page.
- * Hence, it performs its internal write verification only on bits that 
- * transitioned from 1 to 0. The device does NOT verify the whole page on a
- * byte by byte basis. It is possible that the page was not completely erased 
- * or the page is becoming unusable due to wear. The read with ECC would catch 
- * the error later when the ECC page check fails, but we would rather catch 
- * it early in the page write stage. Better to write no data than invalid data.
- */
-static int nand_verify_pages (struct mtd_info *mtd, struct nand_chip *this, int page, int numpages, 
-       u_char *oob_buf, struct nand_oobinfo *oobsel, int chipnr, int oobmode)
-{
-       int     i, j, datidx = 0, oobofs = 0, res = -EIO;
-       int     eccsteps = this->eccsteps;
-       int     hweccbytes; 
-       u_char  oobdata[64];
-
-       hweccbytes = (this->options & NAND_HWECC_SYNDROME) ? (oobsel->eccbytes / eccsteps) : 0;
-
-       /* Send command to read back the first page */
-       this->cmdfunc (mtd, NAND_CMD_READ0, 0, page);
-
-       for(;;) {
-               for (j = 0; j < eccsteps; j++) {
-                       /* Loop through and verify the data */
-                       if (this->verify_buf(mtd, &this->data_poi[datidx], mtd->eccsize)) {
-                               DEBUG (MTD_DEBUG_LEVEL0, "%s: " "Failed write verify, page 0x%08x ", __FUNCTION__, page);
-                               goto out;
-                       }
-                       datidx += mtd->eccsize;
-                       /* Have we a hw generator layout ? */
-                       if (!hweccbytes)
-                               continue;
-                       if (this->verify_buf(mtd, &this->oob_buf[oobofs], hweccbytes)) {
-                               DEBUG (MTD_DEBUG_LEVEL0, "%s: " "Failed write verify, page 0x%08x ", __FUNCTION__, page);
-                               goto out;
-                       }
-                       oobofs += hweccbytes;
-               }
-
-               /* check, if we must compare all data or if we just have to
-                * compare the ecc bytes
-                */
-               if (oobmode) {
-                       if (this->verify_buf(mtd, &oob_buf[oobofs], mtd->oobsize - hweccbytes * eccsteps)) {
-                               DEBUG (MTD_DEBUG_LEVEL0, "%s: " "Failed write verify, page 0x%08x ", __FUNCTION__, page);
-                               goto out;
-                       }
-               } else {
-                       /* Read always, else autoincrement fails */
-                       this->read_buf(mtd, oobdata, mtd->oobsize - hweccbytes * eccsteps);
-
-                       if (oobsel->useecc != MTD_NANDECC_OFF && !hweccbytes) {
-                               int ecccnt = oobsel->eccbytes;
-               
-                               for (i = 0; i < ecccnt; i++) {
-                                       int idx = oobsel->eccpos[i];
-                                       if (oobdata[idx] != oob_buf[oobofs + idx] ) {
-                                               DEBUG (MTD_DEBUG_LEVEL0,
-                                               "%s: Failed ECC write "
-                                               "verify, page 0x%08x, " "%6i bytes were succesful\n", __FUNCTION__, page, i);
-                                               goto out;
-                                       }
-                               }
-                       }       
-               }
-               oobofs += mtd->oobsize - hweccbytes * eccsteps;
-               page++;
-               numpages--;
-
-               /* Apply delay or wait for ready/busy pin 
-                * Do this before the AUTOINCR check, so no problems
-                * arise if a chip which does auto increment
-                * is marked as NOAUTOINCR by the board driver.
-                * Do this also before returning, so the chip is
-                * ready for the next command.
-               */
-               if (!this->dev_ready) 
-                       udelay (this->chip_delay);
-               else
-                       while (!this->dev_ready(mtd));  
-
-               /* All done, return happy */
-               if (!numpages)
-                       return 0;
-               
-                       
-               /* Check, if the chip supports auto page increment */ 
-               if (!NAND_CANAUTOINCR(this))
-                       this->cmdfunc (mtd, NAND_CMD_READ0, 0x00, page);
-       }
-       /* 
-        * Terminate the read command. We come here in case of an error
-        * So we must issue a reset command.
-        */
-out:    
-       this->cmdfunc (mtd, NAND_CMD_RESET, -1, -1);
-       return res;
-}
-#endif
-
-/**
- * nand_read - [MTD Interface] MTD compability function for nand_read_ecc
- * @mtd:       MTD device structure
- * @from:      offset to read from
- * @len:       number of bytes to read
- * @retlen:    pointer to variable to store the number of read bytes
- * @buf:       the databuffer to put data
- *
- * This function simply calls nand_read_ecc with oob buffer and oobsel = NULL
-*/
-static int nand_read (struct mtd_info *mtd, loff_t from, size_t len, size_t * retlen, u_char * buf)
-{
-       return nand_read_ecc (mtd, from, len, retlen, buf, NULL, NULL);
-}                         
-
-
-/**
- * nand_read_ecc - [MTD Interface] Read data with ECC
- * @mtd:       MTD device structure
- * @from:      offset to read from
- * @len:       number of bytes to read
- * @retlen:    pointer to variable to store the number of read bytes
- * @buf:       the databuffer to put data
- * @oob_buf:   filesystem supplied oob data buffer
- * @oobsel:    oob selection structure
- *
- * NAND read with ECC
- */
-static int nand_read_ecc (struct mtd_info *mtd, loff_t from, size_t len,
-                         size_t * retlen, u_char * buf, u_char * oob_buf, struct nand_oobinfo *oobsel)
-{
-       int i, j, col, realpage, page, end, ecc, chipnr, sndcmd = 1;
-       int read = 0, oob = 0, ecc_status = 0, ecc_failed = 0;
-       struct nand_chip *this = mtd->priv;
-       u_char *data_poi, *oob_data = oob_buf;
-       u_char ecc_calc[32];
-       u_char ecc_code[32];
-        int eccmode, eccsteps;
-       int     *oob_config, datidx;
-       int     blockcheck = (1 << (this->phys_erase_shift - this->page_shift)) - 1;
-       int     eccbytes = 3;
-       int     compareecc = 1;
-       int     oobreadlen;
-
-
-       DEBUG (MTD_DEBUG_LEVEL3, "nand_read_ecc: from = 0x%08x, len = %i\n", (unsigned int) from, (int) len);
-
-       /* Do not allow reads past end of device */
-       if ((from + len) > mtd->size) {
-               DEBUG (MTD_DEBUG_LEVEL0, "nand_read_ecc: Attempt read beyond end of device\n");
-               *retlen = 0;
-               return -EINVAL;
-       }
-
-       /* Grab the lock and see if the device is available */
-       nand_get_chip (this, mtd ,FL_READING);
-
-       /* use userspace supplied oobinfo, if zero */
-       if (oobsel == NULL)
-               oobsel = &mtd->oobinfo;
-       
-       /* Autoplace of oob data ? Use the default placement scheme */
-       if (oobsel->useecc == MTD_NANDECC_AUTOPLACE)
-               oobsel = this->autooob;
-               
-       eccmode = oobsel->useecc ? this->eccmode : NAND_ECC_NONE;
-       oob_config = oobsel->eccpos;
-
-       /* Select the NAND device */
-       chipnr = (int)(from >> this->chip_shift);
-       this->select_chip(mtd, chipnr);
-
-       /* First we calculate the starting page */
-       realpage = (int) (from >> this->page_shift);
-       page = realpage & this->pagemask;
-
-       /* Get raw starting column */
-       col = from & (mtd->oobblock - 1);
-
-       end = mtd->oobblock;
-       ecc = this->eccsize;
-       switch (eccmode) {
-       case NAND_ECC_HW6_512: /* Hardware ECC 6 byte / 512 byte data  */
-               eccbytes = 6;
-               break;                                          
-       case NAND_ECC_HW8_512: /* Hardware ECC 8 byte / 512 byte data  */
-               eccbytes = 8;
-               break;
-       case NAND_ECC_NONE:
-               compareecc = 0;
-               break;                                          
-       }        
-
-       if (this->options & NAND_HWECC_SYNDROME)
-               compareecc = 0;
-
-       oobreadlen = mtd->oobsize;
-       if (this->options & NAND_HWECC_SYNDROME) 
-               oobreadlen -= oobsel->eccbytes;
-
-       /* Loop until all data read */
-       while (read < len) {
-               
-               int aligned = (!col && (len - read) >= end);
-               /* 
-                * If the read is not page aligned, we have to read into data buffer
-                * due to ecc, else we read into return buffer direct
-                */
-               if (aligned)
-                       data_poi = &buf[read];
-               else 
-                       data_poi = this->data_buf;
-               
-               /* Check, if we have this page in the buffer 
-                *
-                * FIXME: Make it work when we must provide oob data too,
-                * check the usage of data_buf oob field
-                */
-               if (realpage == this->pagebuf && !oob_buf) {
-                       /* aligned read ? */
-                       if (aligned)
-                               memcpy (data_poi, this->data_buf, end);
-                       goto readdata;
-               }
-
-               /* Check, if we must send the read command */
-               if (sndcmd) {
-                       this->cmdfunc (mtd, NAND_CMD_READ0, 0x00, page);
-                       sndcmd = 0;
-               }       
-
-               /* get oob area, if we have no oob buffer from fs-driver */
-               if (!oob_buf || oobsel->useecc == MTD_NANDECC_AUTOPLACE)
-                       oob_data = &this->data_buf[end];
-
-               eccsteps = this->eccsteps;
-               
-               switch (eccmode) {
-               case NAND_ECC_NONE: {   /* No ECC, Read in a page */
-                       static unsigned long lastwhinge = 0;
-                       if ((lastwhinge / HZ) != (jiffies / HZ)) {
-                               printk (KERN_WARNING "Reading data from NAND FLASH without ECC is not recommended\n");
-                               lastwhinge = jiffies;
-                       }
-                       this->read_buf(mtd, data_poi, end);
-                       break;
-               }
-                       
-               case NAND_ECC_SOFT:     /* Software ECC 3/256: Read in a page + oob data */
-                       this->read_buf(mtd, data_poi, end);
-                       for (i = 0, datidx = 0; eccsteps; eccsteps--, i+=3, datidx += ecc) 
-                               this->calculate_ecc(mtd, &data_poi[datidx], &ecc_calc[i]);
-                       break;  
-                       
-               case NAND_ECC_HW3_256: /* Hardware ECC 3 byte /256 byte data */
-               case NAND_ECC_HW3_512: /* Hardware ECC 3 byte /512 byte data */ 
-               case NAND_ECC_HW6_512: /* Hardware ECC 6 byte / 512 byte data  */
-               case NAND_ECC_HW8_512: /* Hardware ECC 8 byte / 512 byte data  */
-                       for (i = 0, datidx = 0; eccsteps; eccsteps--, i+=eccbytes, datidx += ecc) {
-                               this->enable_hwecc(mtd, NAND_ECC_READ); 
-                               this->read_buf(mtd, &data_poi[datidx], ecc);
-
-                               /* HW ecc with syndrome calculation must read the
-                                * syndrome from flash immidiately after the data */
-                               if (!compareecc) {
-                                       /* Some hw ecc generators need to know when the
-                                        * syndrome is read from flash */
-                                       this->enable_hwecc(mtd, NAND_ECC_READSYN);
-                                       this->read_buf(mtd, &oob_data[i], eccbytes);
-                                       /* We calc error correction directly, it checks the hw
-                                        * generator for an error, reads back the syndrome and
-                                        * does the error correction on the fly */
-                                       if (this->correct_data(mtd, &data_poi[datidx], &oob_data[i], &ecc_code[i]) == -1) {
-                                               DEBUG (MTD_DEBUG_LEVEL0, "nand_read_ecc: " 
-                                                       "Failed ECC read, page 0x%08x on chip %d\n", page, chipnr);
-                                               ecc_failed++;
-                                       }
-                               } else {
-                                       this->calculate_ecc(mtd, &data_poi[datidx], &ecc_calc[i]);
-                               }       
-                       }
-                       break;                                          
-
-               default:
-                       printk (KERN_WARNING "Invalid NAND_ECC_MODE %d\n", this->eccmode);
-                       BUG();  
-               }
-
-               /* read oobdata */
-               this->read_buf(mtd, &oob_data[mtd->oobsize - oobreadlen], oobreadlen);
-
-               /* Skip ECC check, if not requested (ECC_NONE or HW_ECC with syndromes) */
-               if (!compareecc)
-                       goto readoob;   
-               
-               /* Pick the ECC bytes out of the oob data */
-               for (j = 0; j < oobsel->eccbytes; j++)
-                       ecc_code[j] = oob_data[oob_config[j]];
-
-               /* correct data, if neccecary */
-               for (i = 0, j = 0, datidx = 0; i < this->eccsteps; i++, datidx += ecc) {
-                       ecc_status = this->correct_data(mtd, &data_poi[datidx], &ecc_code[j], &ecc_calc[j]);
-                       
-                       /* Get next chunk of ecc bytes */
-                       j += eccbytes;
-                       
-                       /* Check, if we have a fs supplied oob-buffer, 
-                        * This is the legacy mode. Used by YAFFS1
-                        * Should go away some day
-                        */
-                       if (oob_buf && oobsel->useecc == MTD_NANDECC_PLACE) { 
-                               int *p = (int *)(&oob_data[mtd->oobsize]);
-                               p[i] = ecc_status;
-                       }
-                       
-                       if (ecc_status == -1) { 
-                               DEBUG (MTD_DEBUG_LEVEL0, "nand_read_ecc: " "Failed ECC read, page 0x%08x\n", page);
-                               ecc_failed++;
-                       }
-               }               
-
-       readoob:
-               /* check, if we have a fs supplied oob-buffer */
-               if (oob_buf) {
-                       /* without autoplace. Legacy mode used by YAFFS1 */
-                       switch(oobsel->useecc) {
-                       case MTD_NANDECC_AUTOPLACE:
-                               /* Walk through the autoplace chunks */
-                               for (i = 0, j = 0; j < mtd->oobavail; i++) {
-                                       int from = oobsel->oobfree[i][0];
-                                       int num = oobsel->oobfree[i][1];
-                                       memcpy(&oob_buf[oob], &oob_data[from], num);
-                                       j+= num;
-                               }
-                               oob += mtd->oobavail;
-                               break;
-                       case MTD_NANDECC_PLACE:
-                               /* YAFFS1 legacy mode */
-                               oob_data += this->eccsteps * sizeof (int);
-                       default:
-                               oob_data += mtd->oobsize;
-                       }
-               }
-       readdata:
-               /* Partial page read, transfer data into fs buffer */
-               if (!aligned) { 
-                       for (j = col; j < end && read < len; j++)
-                               buf[read++] = data_poi[j];
-                       this->pagebuf = realpage;       
-               } else          
-                       read += mtd->oobblock;
-
-               /* Apply delay or wait for ready/busy pin 
-                * Do this before the AUTOINCR check, so no problems
-                * arise if a chip which does auto increment
-                * is marked as NOAUTOINCR by the board driver.
-               */
-               if (!this->dev_ready) 
-                       udelay (this->chip_delay);
-               else
-                       while (!this->dev_ready(mtd));  
-                       
-               if (read == len)
-                       break;  
-
-               /* For subsequent reads align to page boundary. */
-               col = 0;
-               /* Increment page address */
-               realpage++;
-
-               page = realpage & this->pagemask;
-               /* Check, if we cross a chip boundary */
-               if (!page) {
-                       chipnr++;
-                       this->select_chip(mtd, -1);
-                       this->select_chip(mtd, chipnr);
-               }
-               /* Check, if the chip supports auto page increment 
-                * or if we have hit a block boundary. 
-               */ 
-               if (!NAND_CANAUTOINCR(this) || !(page & blockcheck))
-                       sndcmd = 1;                             
-       }
-
-       /* Deselect and wake up anyone waiting on the device */
-       nand_release_chip(mtd);
-
-       /*
-        * Return success, if no ECC failures, else -EIO
-        * fs driver will take care of that, because
-        * retlen == desired len and result == -EIO
-        */
-       *retlen = read;
-       return ecc_failed ? -EIO : 0;
-}
-
-/**
- * nand_read_oob - [MTD Interface] NAND read out-of-band
- * @mtd:       MTD device structure
- * @from:      offset to read from
- * @len:       number of bytes to read
- * @retlen:    pointer to variable to store the number of read bytes
- * @buf:       the databuffer to put data
- *
- * NAND read out-of-band data from the spare area
- */
-static int nand_read_oob (struct mtd_info *mtd, loff_t from, size_t len, size_t * retlen, u_char * buf)
-{
-       int i, col, page, chipnr;
-       struct nand_chip *this = mtd->priv;
-       int     blockcheck = (1 << (this->phys_erase_shift - this->page_shift)) - 1;
-
-       DEBUG (MTD_DEBUG_LEVEL3, "nand_read_oob: from = 0x%08x, len = %i\n", (unsigned int) from, (int) len);
-
-       /* Shift to get page */
-       page = (int)(from >> this->page_shift);
-       chipnr = (int)(from >> this->chip_shift);
-       
-       /* Mask to get column */
-       col = from & (mtd->oobsize - 1);
-
-       /* Initialize return length value */
-       *retlen = 0;
-
-       /* Do not allow reads past end of device */
-       if ((from + len) > mtd->size) {
-               DEBUG (MTD_DEBUG_LEVEL0, "nand_read_oob: Attempt read beyond end of device\n");
-               *retlen = 0;
-               return -EINVAL;
-       }
-
-       /* Grab the lock and see if the device is available */
-       nand_get_chip (this, mtd , FL_READING);
-
-       /* Select the NAND device */
-       this->select_chip(mtd, chipnr);
-
-       /* Send the read command */
-       this->cmdfunc (mtd, NAND_CMD_READOOB, col, page & this->pagemask);
-       /* 
-        * Read the data, if we read more than one page
-        * oob data, let the device transfer the data !
-        */
-       i = 0;
-       while (i < len) {
-               int thislen = mtd->oobsize - col;
-               thislen = min_t(int, thislen, len);
-               this->read_buf(mtd, &buf[i], thislen);
-               i += thislen;
-               
-               /* Apply delay or wait for ready/busy pin 
-                * Do this before the AUTOINCR check, so no problems
-                * arise if a chip which does auto increment
-                * is marked as NOAUTOINCR by the board driver.
-               */
-               if (!this->dev_ready) 
-                       udelay (this->chip_delay);
-               else
-                       while (!this->dev_ready(mtd));  
-
-               /* Read more ? */
-               if (i < len) {
-                       page++;
-                       col = 0;
-
-                       /* Check, if we cross a chip boundary */
-                       if (!(page & this->pagemask)) {
-                               chipnr++;
-                               this->select_chip(mtd, -1);
-                               this->select_chip(mtd, chipnr);
-                       }
-                               
-                       /* Check, if the chip supports auto page increment 
-                        * or if we have hit a block boundary. 
-                       */ 
-                       if (!NAND_CANAUTOINCR(this) || !(page & blockcheck)) {
-                               /* For subsequent page reads set offset to 0 */
-                               this->cmdfunc (mtd, NAND_CMD_READOOB, 0x0, page & this->pagemask);
-                       }
-               }
-       }
-
-       /* Deselect and wake up anyone waiting on the device */
-       nand_release_chip(mtd);
-
-       /* Return happy */
-       *retlen = len;
-       return 0;
-}
-
-/**
- * nand_read_raw - [GENERIC] Read raw data including oob into buffer
- * @mtd:       MTD device structure
- * @buf:       temporary buffer
- * @from:      offset to read from
- * @len:       number of bytes to read
- * @ooblen:    number of oob data bytes to read
- *
- * Read raw data including oob into buffer
- */
-int nand_read_raw (struct mtd_info *mtd, uint8_t *buf, loff_t from, size_t len, size_t ooblen)
-{
-       struct nand_chip *this = mtd->priv;
-       int page = (int) (from >> this->page_shift);
-       int chip = (int) (from >> this->chip_shift);
-       int sndcmd = 1;
-       int cnt = 0;
-       int pagesize = mtd->oobblock + mtd->oobsize;
-       int     blockcheck = (1 << (this->phys_erase_shift - this->page_shift)) - 1;
-
-       /* Do not allow reads past end of device */
-       if ((from + len) > mtd->size) {
-               DEBUG (MTD_DEBUG_LEVEL0, "nand_read_raw: Attempt read beyond end of device\n");
-               return -EINVAL;
-       }
-
-       /* Grab the lock and see if the device is available */
-       nand_get_chip (this, mtd , FL_READING);
-
-       this->select_chip (mtd, chip);
-       
-       /* Add requested oob length */
-       len += ooblen;
-       
-       while (len) {
-               if (sndcmd)
-                       this->cmdfunc (mtd, NAND_CMD_READ0, 0, page & this->pagemask);
-               sndcmd = 0;     
-
-               this->read_buf (mtd, &buf[cnt], pagesize);
-
-               len -= pagesize;
-               cnt += pagesize;
-               page++;
-               
-               if (!this->dev_ready) 
-                       udelay (this->chip_delay);
-               else
-                       while (!this->dev_ready(mtd));  
-                       
-               /* Check, if the chip supports auto page increment */ 
-               if (!NAND_CANAUTOINCR(this) || !(page & blockcheck))
-                       sndcmd = 1;
-       }
-
-       /* Deselect and wake up anyone waiting on the device */
-       nand_release_chip(mtd);
-       return 0;
-}
-
-
-/** 
- * nand_prepare_oobbuf - [GENERIC] Prepare the out of band buffer 
- * @mtd:       MTD device structure
- * @fsbuf:     buffer given by fs driver
- * @oobsel:    out of band selection structre
- * @autoplace: 1 = place given buffer into the oob bytes
- * @numpages:  number of pages to prepare
- *
- * Return:
- * 1. Filesystem buffer available and autoplacement is off,
- *    return filesystem buffer
- * 2. No filesystem buffer or autoplace is off, return internal
- *    buffer
- * 3. Filesystem buffer is given and autoplace selected
- *    put data from fs buffer into internal buffer and
- *    retrun internal buffer
- *
- * Note: The internal buffer is filled with 0xff. This must
- * be done only once, when no autoplacement happens
- * Autoplacement sets the buffer dirty flag, which
- * forces the 0xff fill before using the buffer again.
- *
-*/
-static u_char * nand_prepare_oobbuf (struct mtd_info *mtd, u_char *fsbuf, struct nand_oobinfo *oobsel,
-               int autoplace, int numpages)
-{
-       struct nand_chip *this = mtd->priv;
-       int i, len, ofs;
-
-       /* Zero copy fs supplied buffer */
-       if (fsbuf && !autoplace) 
-               return fsbuf;
-
-       /* Check, if the buffer must be filled with ff again */
-       if (this->oobdirty) {   
-               memset (this->oob_buf, 0xff, 
-                       mtd->oobsize << (this->phys_erase_shift - this->page_shift));
-               this->oobdirty = 0;
-       }       
-       
-       /* If we have no autoplacement or no fs buffer use the internal one */
-       if (!autoplace || !fsbuf)
-               return this->oob_buf;
-       
-       /* Walk through the pages and place the data */
-       this->oobdirty = 1;
-       ofs = 0;
-       while (numpages--) {
-               for (i = 0, len = 0; len < mtd->oobavail; i++) {
-                       int to = ofs + oobsel->oobfree[i][0];
-                       int num = oobsel->oobfree[i][1];
-                       memcpy (&this->oob_buf[to], fsbuf, num);
-                       len += num;
-                       fsbuf += num;
-               }
-               ofs += mtd->oobavail;
-       }
-       return this->oob_buf;
-}
-
-#define NOTALIGNED(x) (x & (mtd->oobblock-1)) != 0
-
-/**
- * nand_write - [MTD Interface] compability function for nand_write_ecc
- * @mtd:       MTD device structure
- * @to:                offset to write to
- * @len:       number of bytes to write
- * @retlen:    pointer to variable to store the number of written bytes
- * @buf:       the data to write
- *
- * This function simply calls nand_write_ecc with oob buffer and oobsel = NULL
- *
-*/
-static int nand_write (struct mtd_info *mtd, loff_t to, size_t len, size_t * retlen, const u_char * buf)
-{
-       return (nand_write_ecc (mtd, to, len, retlen, buf, NULL, NULL));
-}
-                          
-/**
- * nand_write_ecc - [MTD Interface] NAND write with ECC
- * @mtd:       MTD device structure
- * @to:                offset to write to
- * @len:       number of bytes to write
- * @retlen:    pointer to variable to store the number of written bytes
- * @buf:       the data to write
- * @eccbuf:    filesystem supplied oob data buffer
- * @oobsel:    oob selection structure
- *
- * NAND write with ECC
- */
-static int nand_write_ecc (struct mtd_info *mtd, loff_t to, size_t len,
-                          size_t * retlen, const u_char * buf, u_char * eccbuf, struct nand_oobinfo *oobsel)
-{
-       int startpage, page, ret = -EIO, oob = 0, written = 0, chipnr;
-       int autoplace = 0, numpages, totalpages;
-       struct nand_chip *this = mtd->priv;
-       u_char *oobbuf, *bufstart;
-       int     ppblock = (1 << (this->phys_erase_shift - this->page_shift));
-
-       DEBUG (MTD_DEBUG_LEVEL3, "nand_write_ecc: to = 0x%08x, len = %i\n", (unsigned int) to, (int) len);
-
-       /* Initialize retlen, in case of early exit */
-       *retlen = 0;
-
-       /* Do not allow write past end of device */
-       if ((to + len) > mtd->size) {
-               DEBUG (MTD_DEBUG_LEVEL0, "nand_write_ecc: Attempt to write past end of page\n");
-               return -EINVAL;
-       }
-
-       /* reject writes, which are not page aligned */ 
-       if (NOTALIGNED (to) || NOTALIGNED(len)) {
-               printk (KERN_NOTICE "nand_write_ecc: Attempt to write not page aligned data\n");
-               return -EINVAL;
-       }
-
-       /* Grab the lock and see if the device is available */
-       nand_get_chip (this, mtd, FL_WRITING);
-
-       /* Calculate chipnr */
-       chipnr = (int)(to >> this->chip_shift);
-       /* Select the NAND device */
-       this->select_chip(mtd, chipnr);
-
-       /* Check, if it is write protected */
-       if (nand_check_wp(mtd))
-               goto out;
-
-       /* if oobsel is NULL, use chip defaults */
-       if (oobsel == NULL) 
-               oobsel = &mtd->oobinfo;         
-               
-       /* Autoplace of oob data ? Use the default placement scheme */
-       if (oobsel->useecc == MTD_NANDECC_AUTOPLACE) {
-               oobsel = this->autooob;
-               autoplace = 1;
-       }       
-
-       /* Setup variables and oob buffer */
-       totalpages = len >> this->page_shift;
-       page = (int) (to >> this->page_shift);
-       /* Invalidate the page cache, if we write to the cached page */
-       if (page <= this->pagebuf && this->pagebuf < (page + totalpages))  
-               this->pagebuf = -1;
-       
-       /* Set it relative to chip */
-       page &= this->pagemask;
-       startpage = page;
-       /* Calc number of pages we can write in one go */
-       numpages = min (ppblock - (startpage  & (ppblock - 1)), totalpages);
-       oobbuf = nand_prepare_oobbuf (mtd, eccbuf, oobsel, autoplace, numpages);
-       bufstart = (u_char *)buf;
-
-       /* Loop until all data is written */
-       while (written < len) {
-
-               this->data_poi = (u_char*) &buf[written];
-               /* Write one page. If this is the last page to write
-                * or the last page in this block, then use the
-                * real pageprogram command, else select cached programming
-                * if supported by the chip.
-                */
-               ret = nand_write_page (mtd, this, page, &oobbuf[oob], oobsel, (--numpages > 0));
-               if (ret) {
-                       DEBUG (MTD_DEBUG_LEVEL0, "nand_write_ecc: write_page failed %d\n", ret);
-                       goto out;
-               }       
-               /* Next oob page */
-               oob += mtd->oobsize;
-               /* Update written bytes count */
-               written += mtd->oobblock;
-               if (written == len) 
-                       goto cmp;
-               
-               /* Increment page address */
-               page++;
-
-               /* Have we hit a block boundary ? Then we have to verify and
-                * if verify is ok, we have to setup the oob buffer for
-                * the next pages.
-               */
-               if (!(page & (ppblock - 1))){
-                       int ofs;
-                       this->data_poi = bufstart;
-                       ret = nand_verify_pages (mtd, this, startpage, 
-                               page - startpage,
-                               oobbuf, oobsel, chipnr, (eccbuf != NULL));
-                       if (ret) {
-                               DEBUG (MTD_DEBUG_LEVEL0, "nand_write_ecc: verify_pages failed %d\n", ret);
-                               goto out;
-                       }       
-                       *retlen = written;
-
-                       ofs = autoplace ? mtd->oobavail : mtd->oobsize;
-                       if (eccbuf)
-                               eccbuf += (page - startpage) * ofs;
-                       totalpages -= page - startpage;
-                       numpages = min (totalpages, ppblock);
-                       page &= this->pagemask;
-                       startpage = page;
-                       oobbuf = nand_prepare_oobbuf (mtd, eccbuf, oobsel, 
-                                       autoplace, numpages);
-                       /* Check, if we cross a chip boundary */
-                       if (!page) {
-                               chipnr++;
-                               this->select_chip(mtd, -1);
-                               this->select_chip(mtd, chipnr);
-                       }
-               }
-       }
-       /* Verify the remaining pages */
-cmp:
-       this->data_poi = bufstart;
-       ret = nand_verify_pages (mtd, this, startpage, totalpages,
-               oobbuf, oobsel, chipnr, (eccbuf != NULL));
-       if (!ret)
-               *retlen = written;
-       else    
-               DEBUG (MTD_DEBUG_LEVEL0, "nand_write_ecc: verify_pages failed %d\n", ret);
-
-out:
-       /* Deselect and wake up anyone waiting on the device */
-       nand_release_chip(mtd);
-
-       return ret;
-}
-
-
-/**
- * nand_write_oob - [MTD Interface] NAND write out-of-band
- * @mtd:       MTD device structure
- * @to:                offset to write to
- * @len:       number of bytes to write
- * @retlen:    pointer to variable to store the number of written bytes
- * @buf:       the data to write
- *
- * NAND write out-of-band
- */
-static int nand_write_oob (struct mtd_info *mtd, loff_t to, size_t len, size_t * retlen, const u_char * buf)
-{
-       int column, page, status, ret = -EIO, chipnr;
-       struct nand_chip *this = mtd->priv;
-
-       DEBUG (MTD_DEBUG_LEVEL3, "nand_write_oob: to = 0x%08x, len = %i\n", (unsigned int) to, (int) len);
-
-       /* Shift to get page */
-       page = (int) (to >> this->page_shift);
-       chipnr = (int) (to >> this->chip_shift);
-
-       /* Mask to get column */
-       column = to & (mtd->oobsize - 1);
-
-       /* Initialize return length value */
-       *retlen = 0;
-
-       /* Do not allow write past end of page */
-       if ((column + len) > mtd->oobsize) {
-               DEBUG (MTD_DEBUG_LEVEL0, "nand_write_oob: Attempt to write past end of page\n");
-               return -EINVAL;
-       }
-
-       /* Grab the lock and see if the device is available */
-       nand_get_chip (this, mtd, FL_WRITING);
-
-       /* Select the NAND device */
-       this->select_chip(mtd, chipnr);
-
-       /* Reset the chip. Some chips (like the Toshiba TC5832DC found
-          in one of my DiskOnChip 2000 test units) will clear the whole
-          data page too if we don't do this. I have no clue why, but
-          I seem to have 'fixed' it in the doc2000 driver in
-          August 1999.  dwmw2. */
-       this->cmdfunc(mtd, NAND_CMD_RESET, -1, -1);
-
-       /* Check, if it is write protected */
-       if (nand_check_wp(mtd))
-               goto out;
-       
-       /* Invalidate the page cache, if we write to the cached page */
-       if (page == this->pagebuf)
-               this->pagebuf = -1;
-
-       if (NAND_MUST_PAD(this)) {
-               /* Write out desired data */
-               this->cmdfunc (mtd, NAND_CMD_SEQIN, mtd->oobblock, page & this->pagemask);
-               /* prepad 0xff for partial programming */
-               this->write_buf(mtd, ffchars, column);
-               /* write data */
-               this->write_buf(mtd, buf, len);
-               /* postpad 0xff for partial programming */
-               this->write_buf(mtd, ffchars, mtd->oobsize - (len+column));
-       } else {
-               /* Write out desired data */
-               this->cmdfunc (mtd, NAND_CMD_SEQIN, mtd->oobblock + column, page & this->pagemask);
-               /* write data */
-               this->write_buf(mtd, buf, len);
-       }
-       /* Send command to program the OOB data */
-       this->cmdfunc (mtd, NAND_CMD_PAGEPROG, -1, -1);
-
-       status = this->waitfunc (mtd, this, FL_WRITING);
-
-       /* See if device thinks it succeeded */
-       if (status & 0x01) {
-               DEBUG (MTD_DEBUG_LEVEL0, "nand_write_oob: " "Failed write, page 0x%08x\n", page);
-               ret = -EIO;
-               goto out;
-       }
-       /* Return happy */
-       *retlen = len;
-
-#ifdef CONFIG_MTD_NAND_VERIFY_WRITE
-       /* Send command to read back the data */
-       this->cmdfunc (mtd, NAND_CMD_READOOB, column, page & this->pagemask);
-
-       if (this->verify_buf(mtd, buf, len)) {
-               DEBUG (MTD_DEBUG_LEVEL0, "nand_write_oob: " "Failed write verify, page 0x%08x\n", page);
-               ret = -EIO;
-               goto out;
-       }
-#endif
-       ret = 0;
-out:
-       /* Deselect and wake up anyone waiting on the device */
-       nand_release_chip(mtd);
-
-       return ret;
-}
-
-
-/**
- * nand_writev - [MTD Interface] compabilty function for nand_writev_ecc
- * @mtd:       MTD device structure
- * @vecs:      the iovectors to write
- * @count:     number of vectors
- * @to:                offset to write to
- * @retlen:    pointer to variable to store the number of written bytes
- *
- * NAND write with kvec. This just calls the ecc function
- */
-static int nand_writev (struct mtd_info *mtd, const struct kvec *vecs, unsigned long count, 
-               loff_t to, size_t * retlen)
-{
-       return (nand_writev_ecc (mtd, vecs, count, to, retlen, NULL, NULL));    
-}
-
-/**
- * nand_writev_ecc - [MTD Interface] write with iovec with ecc
- * @mtd:       MTD device structure
- * @vecs:      the iovectors to write
- * @count:     number of vectors
- * @to:                offset to write to
- * @retlen:    pointer to variable to store the number of written bytes
- * @eccbuf:    filesystem supplied oob data buffer
- * @oobsel:    oob selection structure
- *
- * NAND write with iovec with ecc
- */
-static int nand_writev_ecc (struct mtd_info *mtd, const struct kvec *vecs, unsigned long count, 
-               loff_t to, size_t * retlen, u_char *eccbuf, struct nand_oobinfo *oobsel)
-{
-       int i, page, len, total_len, ret = -EIO, written = 0, chipnr;
-       int oob, numpages, autoplace = 0, startpage;
-       struct nand_chip *this = mtd->priv;
-       int     ppblock = (1 << (this->phys_erase_shift - this->page_shift));
-       u_char *oobbuf, *bufstart;
-
-       /* Preset written len for early exit */
-       *retlen = 0;
-
-       /* Calculate total length of data */
-       total_len = 0;
-       for (i = 0; i < count; i++)
-               total_len += (int) vecs[i].iov_len;
-
-       DEBUG (MTD_DEBUG_LEVEL3,
-              "nand_writev: to = 0x%08x, len = %i, count = %ld\n", (unsigned int) to, (unsigned int) total_len, count);
-
-       /* Do not allow write past end of page */
-       if ((to + total_len) > mtd->size) {
-               DEBUG (MTD_DEBUG_LEVEL0, "nand_writev: Attempted write past end of device\n");
-               return -EINVAL;
-       }
-
-       /* reject writes, which are not page aligned */ 
-       if (NOTALIGNED (to) || NOTALIGNED(total_len)) {
-               printk (KERN_NOTICE "nand_write_ecc: Attempt to write not page aligned data\n");
-               return -EINVAL;
-       }
-
-       /* Grab the lock and see if the device is available */
-       nand_get_chip (this, mtd, FL_WRITING);
-
-       /* Get the current chip-nr */
-       chipnr = (int) (to >> this->chip_shift);
-       /* Select the NAND device */
-       this->select_chip(mtd, chipnr);
-
-       /* Check, if it is write protected */
-       if (nand_check_wp(mtd))
-               goto out;
-
-       /* if oobsel is NULL, use chip defaults */
-       if (oobsel == NULL) 
-               oobsel = &mtd->oobinfo;         
-
-       /* Autoplace of oob data ? Use the default placement scheme */
-       if (oobsel->useecc == MTD_NANDECC_AUTOPLACE) {
-               oobsel = this->autooob;
-               autoplace = 1;
-       }       
-
-       /* Setup start page */
-       page = (int) (to >> this->page_shift);
-       /* Invalidate the page cache, if we write to the cached page */
-       if (page <= this->pagebuf && this->pagebuf < ((to + total_len) >> this->page_shift))  
-               this->pagebuf = -1;
-
-       startpage = page & this->pagemask;
-
-       /* Loop until all kvec' data has been written */
-       len = 0;
-       while (count) {
-               /* If the given tuple is >= pagesize then
-                * write it out from the iov
-                */
-               if ((vecs->iov_len - len) >= mtd->oobblock) {
-                       /* Calc number of pages we can write
-                        * out of this iov in one go */
-                       numpages = (vecs->iov_len - len) >> this->page_shift;
-                       /* Do not cross block boundaries */
-                       numpages = min (ppblock - (startpage & (ppblock - 1)), numpages);
-                       oobbuf = nand_prepare_oobbuf (mtd, NULL, oobsel, autoplace, numpages);
-                       bufstart = (u_char *)vecs->iov_base;
-                       bufstart += len;
-                       this->data_poi = bufstart;
-                       oob = 0;
-                       for (i = 1; i <= numpages; i++) {
-                               /* Write one page. If this is the last page to write
-                                * then use the real pageprogram command, else select 
-                                * cached programming if supported by the chip.
-                                */
-                               ret = nand_write_page (mtd, this, page & this->pagemask, 
-                                       &oobbuf[oob], oobsel, i != numpages);
-                               if (ret)
-                                       goto out;
-                               this->data_poi += mtd->oobblock;
-                               len += mtd->oobblock;
-                               oob += mtd->oobsize;
-                               page++;
-                       }
-                       /* Check, if we have to switch to the next tuple */
-                       if (len >= (int) vecs->iov_len) {
-                               vecs++;
-                               len = 0;
-                               count--;
-                       }
-               } else {
-                       /* We must use the internal buffer, read data out of each 
-                        * tuple until we have a full page to write
-                        */
-                       int cnt = 0;
-                       while (cnt < mtd->oobblock) {
-                               if (vecs->iov_base != NULL && vecs->iov_len) 
-                                       this->data_buf[cnt++] = ((u_char *) vecs->iov_base)[len++];
-                               /* Check, if we have to switch to the next tuple */
-                               if (len >= (int) vecs->iov_len) {
-                                       vecs++;
-                                       len = 0;
-                                       count--;
-                               }
-                       }
-                       this->pagebuf = page;   
-                       this->data_poi = this->data_buf;        
-                       bufstart = this->data_poi;
-                       numpages = 1;           
-                       oobbuf = nand_prepare_oobbuf (mtd, NULL, oobsel, autoplace, numpages);
-                       ret = nand_write_page (mtd, this, page & this->pagemask,
-                               oobbuf, oobsel, 0);
-                       if (ret)
-                               goto out;
-                       page++;
-               }
-
-               this->data_poi = bufstart;
-               ret = nand_verify_pages (mtd, this, startpage, numpages, oobbuf, oobsel, chipnr, 0);
-               if (ret)
-                       goto out;
-                       
-               written += mtd->oobblock * numpages;
-               /* All done ? */
-               if (!count)
-                       break;
-
-               startpage = page & this->pagemask;
-               /* Check, if we cross a chip boundary */
-               if (!startpage) {
-                       chipnr++;
-                       this->select_chip(mtd, -1);
-                       this->select_chip(mtd, chipnr);
-               }
-       }
-       ret = 0;
-out:
-       /* Deselect and wake up anyone waiting on the device */
-       nand_release_chip(mtd);
-
-       *retlen = written;
-       return ret;
-}
-
-/**
- * single_erease_cmd - [GENERIC] NAND standard block erase command function
- * @mtd:       MTD device structure
- * @page:      the page address of the block which will be erased
- *
- * Standard erase command for NAND chips
- */
-static void single_erase_cmd (struct mtd_info *mtd, int page)
-{
-       struct nand_chip *this = mtd->priv;
-       /* Send commands to erase a block */
-       this->cmdfunc (mtd, NAND_CMD_ERASE1, -1, page);
-       this->cmdfunc (mtd, NAND_CMD_ERASE2, -1, -1);
-}
-
-/**
- * multi_erease_cmd - [GENERIC] AND specific block erase command function
- * @mtd:       MTD device structure
- * @page:      the page address of the block which will be erased
- *
- * AND multi block erase command function
- * Erase 4 consecutive blocks
- */
-static void multi_erase_cmd (struct mtd_info *mtd, int page)
-{
-       struct nand_chip *this = mtd->priv;
-       /* Send commands to erase a block */
-       this->cmdfunc (mtd, NAND_CMD_ERASE1, -1, page++);
-       this->cmdfunc (mtd, NAND_CMD_ERASE1, -1, page++);
-       this->cmdfunc (mtd, NAND_CMD_ERASE1, -1, page++);
-       this->cmdfunc (mtd, NAND_CMD_ERASE1, -1, page);
-       this->cmdfunc (mtd, NAND_CMD_ERASE2, -1, -1);
-}
-
-/**
- * nand_erase - [MTD Interface] erase block(s)
- * @mtd:       MTD device structure
- * @instr:     erase instruction
- *
- * Erase one ore more blocks
- */
-static int nand_erase (struct mtd_info *mtd, struct erase_info *instr)
-{
-       return nand_erase_nand (mtd, instr, 0);
-}
-/**
- * nand_erase_intern - [NAND Interface] erase block(s)
- * @mtd:       MTD device structure
- * @instr:     erase instruction
- * @allowbbt:  allow erasing the bbt area
- *
- * Erase one ore more blocks
- */
-int nand_erase_nand (struct mtd_info *mtd, struct erase_info *instr, int allowbbt)
-{
-       int page, len, status, pages_per_block, ret, chipnr;
-       struct nand_chip *this = mtd->priv;
-
-       DEBUG (MTD_DEBUG_LEVEL3,
-              "nand_erase: start = 0x%08x, len = %i\n", (unsigned int) instr->addr, (unsigned int) instr->len);
-
-       /* Start address must align on block boundary */
-       if (instr->addr & ((1 << this->phys_erase_shift) - 1)) {
-               DEBUG (MTD_DEBUG_LEVEL0, "nand_erase: Unaligned address\n");
-               return -EINVAL;
-       }
-
-       /* Length must align on block boundary */
-       if (instr->len & ((1 << this->phys_erase_shift) - 1)) {
-               DEBUG (MTD_DEBUG_LEVEL0, "nand_erase: Length not block aligned\n");
-               return -EINVAL;
-       }
-
-       /* Do not allow erase past end of device */
-       if ((instr->len + instr->addr) > mtd->size) {
-               DEBUG (MTD_DEBUG_LEVEL0, "nand_erase: Erase past end of device\n");
-               return -EINVAL;
-       }
-
-       instr->fail_addr = 0xffffffff;
-
-       /* Grab the lock and see if the device is available */
-       nand_get_chip (this, mtd, FL_ERASING);
-
-       /* Shift to get first page */
-       page = (int) (instr->addr >> this->page_shift);
-       chipnr = (int) (instr->addr >> this->chip_shift);
-
-       /* Calculate pages in each block */
-       pages_per_block = 1 << (this->phys_erase_shift - this->page_shift);
-
-       /* Select the NAND device */
-       this->select_chip(mtd, chipnr);
-
-       /* Check the WP bit */
-       /* Check, if it is write protected */
-       if (nand_check_wp(mtd)) {
-               DEBUG (MTD_DEBUG_LEVEL0, "nand_erase: Device is write protected!!!\n");
-               instr->state = MTD_ERASE_FAILED;
-               goto erase_exit;
-       }
-
-       /* Loop through the pages */
-       len = instr->len;
-
-       instr->state = MTD_ERASING;
-
-       while (len) {
-               /* Check if we have a bad block, we do not erase bad blocks ! */
-               if (nand_block_checkbad(mtd, ((loff_t) page) << this->page_shift, 0, allowbbt)) {
-                       printk (KERN_WARNING "nand_erase: attempt to erase a bad block at page 0x%08x\n", page);
-                       instr->state = MTD_ERASE_FAILED;
-                       goto erase_exit;
-               }
-               
-               /* Invalidate the page cache, if we erase the block which contains 
-                  the current cached page */
-               if (page <= this->pagebuf && this->pagebuf < (page + pages_per_block))
-                       this->pagebuf = -1;
-
-               this->erase_cmd (mtd, page & this->pagemask);
-               
-               status = this->waitfunc (mtd, this, FL_ERASING);
-
-               /* See if block erase succeeded */
-               if (status & 0x01) {
-                       DEBUG (MTD_DEBUG_LEVEL0, "nand_erase: " "Failed erase, page 0x%08x\n", page);
-                       instr->state = MTD_ERASE_FAILED;
-                       instr->fail_addr = (page << this->page_shift);
-                       goto erase_exit;
-               }
-               
-               /* Increment page address and decrement length */
-               len -= (1 << this->phys_erase_shift);
-               page += pages_per_block;
-
-               /* Check, if we cross a chip boundary */
-               if (len && !(page & this->pagemask)) {
-                       chipnr++;
-                       this->select_chip(mtd, -1);
-                       this->select_chip(mtd, chipnr);
-               }
-       }
-       instr->state = MTD_ERASE_DONE;
-
-erase_exit:
-
-       ret = instr->state == MTD_ERASE_DONE ? 0 : -EIO;
-       /* Do call back function */
-       if (!ret && instr->callback)
-               instr->callback (instr);
-
-       /* Deselect and wake up anyone waiting on the device */
-       nand_release_chip(mtd);
-
-       /* Return more or less happy */
-       return ret;
-}
-
-/**
- * nand_sync - [MTD Interface] sync
- * @mtd:       MTD device structure
- *
- * Sync is actually a wait for chip ready function
- */
-static void nand_sync (struct mtd_info *mtd)
-{
-       struct nand_chip *this = mtd->priv;
-       DECLARE_WAITQUEUE (wait, current);
-
-       DEBUG (MTD_DEBUG_LEVEL3, "nand_sync: called\n");
-
-retry:
-       /* Grab the spinlock */
-       spin_lock_bh (&this->chip_lock);
-
-       /* See what's going on */
-       switch (this->state) {
-       case FL_READY:
-       case FL_SYNCING:
-               this->state = FL_SYNCING;
-               spin_unlock_bh (&this->chip_lock);
-               break;
-
-       default:
-               /* Not an idle state */
-               add_wait_queue (&this->wq, &wait);
-               spin_unlock_bh (&this->chip_lock);
-               schedule ();
-
-               remove_wait_queue (&this->wq, &wait);
-               goto retry;
-       }
-
-       /* Lock the device */
-       spin_lock_bh (&this->chip_lock);
-
-       /* Set the device to be ready again */
-       if (this->state == FL_SYNCING) {
-               this->state = FL_READY;
-               wake_up (&this->wq);
-       }
-
-       /* Unlock the device */
-       spin_unlock_bh (&this->chip_lock);
-}
-
-
-/**
- * nand_block_isbad - [MTD Interface] Check whether the block at the given offset is bad
- * @mtd:       MTD device structure
- * @ofs:       offset relative to mtd start
- */
-static int nand_block_isbad (struct mtd_info *mtd, loff_t ofs)
-{
-       /* Check for invalid offset */
-       if (ofs > mtd->size) 
-               return -EINVAL;
-       
-       return nand_block_checkbad (mtd, ofs, 1, 0);
-}
-
-/**
- * nand_block_markbad - [MTD Interface] Mark the block at the given offset as bad
- * @mtd:       MTD device structure
- * @ofs:       offset relative to mtd start
- */
-static int nand_block_markbad (struct mtd_info *mtd, loff_t ofs)
-{
-       struct nand_chip *this = mtd->priv;
-       int ret;
-
-        if ((ret = nand_block_isbad(mtd, ofs))) {
-               /* If it was bad already, return success and do nothing. */
-               if (ret > 0)
-                       return 0;
-               return ret;
-        }
-
-       return this->block_markbad(mtd, ofs);
-}
-
-/**
- * nand_scan - [NAND Interface] Scan for the NAND device
- * @mtd:       MTD device structure
- * @maxchips:  Number of chips to scan for
- *
- * This fills out all the not initialized function pointers
- * with the defaults.
- * The flash ID is read and the mtd/chip structures are
- * filled with the appropriate values. Buffers are allocated if
- * they are not provided by the board driver
- *
- */
-int nand_scan (struct mtd_info *mtd, int maxchips)
-{
-       int i, j, nand_maf_id, nand_dev_id, busw;
-       struct nand_chip *this = mtd->priv;
-
-       /* Get buswidth to select the correct functions*/
-       busw = this->options & NAND_BUSWIDTH_16;
-
-       /* check for proper chip_delay setup, set 20us if not */
-       if (!this->chip_delay)
-               this->chip_delay = 20;
-
-       /* check, if a user supplied command function given */
-       if (this->cmdfunc == NULL)
-               this->cmdfunc = nand_command;
-
-       /* check, if a user supplied wait function given */
-       if (this->waitfunc == NULL)
-               this->waitfunc = nand_wait;
-
-       if (!this->select_chip)
-               this->select_chip = nand_select_chip;
-       if (!this->write_byte)
-               this->write_byte = busw ? nand_write_byte16 : nand_write_byte;
-       if (!this->read_byte)
-               this->read_byte = busw ? nand_read_byte16 : nand_read_byte;
-       if (!this->write_word)
-               this->write_word = nand_write_word;
-       if (!this->read_word)
-               this->read_word = nand_read_word;
-       if (!this->block_bad)
-               this->block_bad = nand_block_bad;
-       if (!this->block_markbad)
-               this->block_markbad = nand_default_block_markbad;
-       if (!this->write_buf)
-               this->write_buf = busw ? nand_write_buf16 : nand_write_buf;
-       if (!this->read_buf)
-               this->read_buf = busw ? nand_read_buf16 : nand_read_buf;
-       if (!this->verify_buf)
-               this->verify_buf = busw ? nand_verify_buf16 : nand_verify_buf;
-       if (!this->scan_bbt)
-               this->scan_bbt = nand_default_bbt;
-
-       /* Select the device */
-       this->select_chip(mtd, 0);
-
-       /* Send the command for reading device ID */
-       this->cmdfunc (mtd, NAND_CMD_READID, 0x00, -1);
-
-       /* Read manufacturer and device IDs */
-       nand_maf_id = this->read_byte(mtd);
-       nand_dev_id = this->read_byte(mtd);
-
-       /* Print and store flash device information */
-       for (i = 0; nand_flash_ids[i].name != NULL; i++) {
-                               
-               if (nand_dev_id != nand_flash_ids[i].id) 
-                       continue;
-
-               if (!mtd->name) mtd->name = nand_flash_ids[i].name;
-               this->chipsize = nand_flash_ids[i].chipsize << 20;
-               
-               /* New devices have all the information in additional id bytes */
-               if (!nand_flash_ids[i].pagesize) {
-                       int extid;
-                       /* The 3rd id byte contains non relevant data ATM */
-                       extid = this->read_byte(mtd);
-                       /* The 4th id byte is the important one */
-                       extid = this->read_byte(mtd);
-                       /* Calc pagesize */
-                       mtd->oobblock = 1024 << (extid & 0x3);
-                       extid >>= 2;
-                       /* Calc oobsize */
-                       mtd->oobsize = (8 << (extid & 0x03)) * (mtd->oobblock / 512);
-                       extid >>= 2;
-                       /* Calc blocksize. Blocksize is multiples of 64KiB */
-                       mtd->erasesize = (64 * 1024)  << (extid & 0x03);
-                       extid >>= 2;
-                       /* Get buswidth information */
-                       busw = (extid & 0x01) ? NAND_BUSWIDTH_16 : 0;
-               
-               } else {
-                       /* Old devices have this data hardcoded in the
-                        * device id table */
-                       mtd->erasesize = nand_flash_ids[i].erasesize;
-                       mtd->oobblock = nand_flash_ids[i].pagesize;
-                       mtd->oobsize = mtd->oobblock / 32;
-                       busw = nand_flash_ids[i].options & NAND_BUSWIDTH_16;
-               }
-
-               /* Check, if buswidth is correct. Hardware drivers should set
-                * this correct ! */
-               if (busw != (this->options & NAND_BUSWIDTH_16)) {
-                       printk (KERN_INFO "NAND device: Manufacturer ID:"
-                               " 0x%02x, Chip ID: 0x%02x (%s %s)\n", nand_maf_id, nand_dev_id, 
-                               nand_manuf_ids[i].name , mtd->name);
-                       printk (KERN_WARNING 
-                               "NAND bus width %d instead %d bit\n", 
-                                       (this->options & NAND_BUSWIDTH_16) ? 16 : 8,
-                                       busw ? 16 : 8);
-                       this->select_chip(mtd, -1);
-                       return 1;       
-               }
-               
-               /* Calculate the address shift from the page size */    
-               this->page_shift = ffs(mtd->oobblock) - 1;
-               this->bbt_erase_shift = this->phys_erase_shift = ffs(mtd->erasesize) - 1;
-               this->chip_shift = ffs(this->chipsize) - 1;
-
-               /* Set the bad block position */
-               this->badblockpos = mtd->oobblock > 512 ? 
-                       NAND_LARGE_BADBLOCK_POS : NAND_SMALL_BADBLOCK_POS;
-
-               /* Get chip options, preserve non chip based options */
-               this->options &= ~NAND_CHIPOPTIONS_MSK;
-               this->options |= nand_flash_ids[i].options & NAND_CHIPOPTIONS_MSK;
-               /* Set this as a default. Board drivers can override it, if neccecary */
-               this->options |= NAND_NO_AUTOINCR;
-               /* Check if this is a not a samsung device. Do not clear the options
-                * for chips which are not having an extended id.
-                */     
-               if (nand_maf_id != NAND_MFR_SAMSUNG && !nand_flash_ids[i].pagesize)
-                       this->options &= ~NAND_SAMSUNG_LP_OPTIONS;
-               
-               /* Check for AND chips with 4 page planes */
-               if (this->options & NAND_4PAGE_ARRAY)
-                       this->erase_cmd = multi_erase_cmd;
-               else
-                       this->erase_cmd = single_erase_cmd;
-
-               /* Do not replace user supplied command function ! */
-               if (mtd->oobblock > 512 && this->cmdfunc == nand_command)
-                       this->cmdfunc = nand_command_lp;
-                               
-               /* Try to identify manufacturer */
-               for (j = 0; nand_manuf_ids[j].id != 0x0; j++) {
-                       if (nand_manuf_ids[j].id == nand_maf_id)
-                               break;
-               }
-               printk (KERN_INFO "NAND device: Manufacturer ID:"
-                       " 0x%02x, Chip ID: 0x%02x (%s %s)\n", nand_maf_id, nand_dev_id, 
-                       nand_manuf_ids[j].name , nand_flash_ids[i].name);
-               break;
-       }
-
-       if (!nand_flash_ids[i].name) {
-               printk (KERN_WARNING "No NAND device found!!!\n");
-               this->select_chip(mtd, -1);
-               return 1;
-       }
-
-       for (i=1; i < maxchips; i++) {
-               this->select_chip(mtd, i);
-
-               /* Send the command for reading device ID */
-               this->cmdfunc (mtd, NAND_CMD_READID, 0x00, -1);
-
-               /* Read manufacturer and device IDs */
-               if (nand_maf_id != this->read_byte(mtd) ||
-                   nand_dev_id != this->read_byte(mtd))
-                       break;
-       }
-       if (i > 1)
-               printk(KERN_INFO "%d NAND chips detected\n", i);
-       
-       /* Allocate buffers, if neccecary */
-       if (!this->oob_buf) {
-               size_t len;
-               len = mtd->oobsize << (this->phys_erase_shift - this->page_shift);
-               this->oob_buf = kmalloc (len, GFP_KERNEL);
-               if (!this->oob_buf) {
-                       printk (KERN_ERR "nand_scan(): Cannot allocate oob_buf\n");
-                       return -ENOMEM;
-               }
-               this->options |= NAND_OOBBUF_ALLOC;
-       }
-       
-       if (!this->data_buf) {
-               size_t len;
-               len = mtd->oobblock + mtd->oobsize;
-               this->data_buf = kmalloc (len, GFP_KERNEL);
-               if (!this->data_buf) {
-                       if (this->options & NAND_OOBBUF_ALLOC)
-                               kfree (this->oob_buf);
-                       printk (KERN_ERR "nand_scan(): Cannot allocate data_buf\n");
-                       return -ENOMEM;
-               }
-               this->options |= NAND_DATABUF_ALLOC;
-       }
-
-       /* Store the number of chips and calc total size for mtd */
-       this->numchips = i;
-       mtd->size = i * this->chipsize;
-       /* Convert chipsize to number of pages per chip -1. */
-       this->pagemask = (this->chipsize >> this->page_shift) - 1;
-       /* Preset the internal oob buffer */
-       memset(this->oob_buf, 0xff, mtd->oobsize << (this->phys_erase_shift - this->page_shift));
-
-       /* If no default placement scheme is given, select an
-        * appropriate one */
-       if (!this->autooob) {
-               /* Select the appropriate default oob placement scheme for
-                * placement agnostic filesystems */
-               switch (mtd->oobsize) { 
-               case 8:
-                       this->autooob = &nand_oob_8;
-                       break;
-               case 16:
-                       this->autooob = &nand_oob_16;
-                       break;
-               case 64:
-                       this->autooob = &nand_oob_64;
-                       break;
-               default:
-                       printk (KERN_WARNING "No oob scheme defined for oobsize %d\n",
-                               mtd->oobsize);
-                       BUG();
-               }
-       }
-       
-       /* The number of bytes available for the filesystem to place fs dependend
-        * oob data */
-       if (this->options & NAND_BUSWIDTH_16) {
-               mtd->oobavail = mtd->oobsize - (this->autooob->eccbytes + 2);
-               if (this->autooob->eccbytes & 0x01)
-                       mtd->oobavail--;
-       } else
-               mtd->oobavail = mtd->oobsize - (this->autooob->eccbytes + 1);
-
-       /* 
-        * check ECC mode, default to software
-        * if 3byte/512byte hardware ECC is selected and we have 256 byte pagesize
-        * fallback to software ECC 
-       */
-       this->eccsize = 256;    /* set default eccsize */       
-
-       switch (this->eccmode) {
-
-       case NAND_ECC_HW3_512: 
-       case NAND_ECC_HW6_512: 
-       case NAND_ECC_HW8_512: 
-               if (mtd->oobblock == 256) {
-                       printk (KERN_WARNING "512 byte HW ECC not possible on 256 Byte pagesize, fallback to SW ECC \n");
-                       this->eccmode = NAND_ECC_SOFT;
-                       this->calculate_ecc = nand_calculate_ecc;
-                       this->correct_data = nand_correct_data;
-                       break;          
-               } else 
-                       this->eccsize = 512; /* set eccsize to 512 and fall through for function check */
-
-       case NAND_ECC_HW3_256:
-               if (this->calculate_ecc && this->correct_data && this->enable_hwecc)
-                       break;
-               printk (KERN_WARNING "No ECC functions supplied, Hardware ECC not possible\n");
-               BUG();  
-
-       case NAND_ECC_NONE: 
-               printk (KERN_WARNING "NAND_ECC_NONE selected by board driver. This is not recommended !!\n");
-               this->eccmode = NAND_ECC_NONE;
-               break;
-
-       case NAND_ECC_SOFT:     
-               this->calculate_ecc = nand_calculate_ecc;
-               this->correct_data = nand_correct_data;
-               break;
-
-       default:
-               printk (KERN_WARNING "Invalid NAND_ECC_MODE %d\n", this->eccmode);
-               BUG();  
-       }       
-       
-       mtd->eccsize = this->eccsize;
-       
-       /* Set the number of read / write steps for one page to ensure ECC generation */
-       switch (this->eccmode) {
-       case NAND_ECC_HW3_512:
-       case NAND_ECC_HW6_512:
-       case NAND_ECC_HW8_512:
-               this->eccsteps = mtd->oobblock / 512;
-               break;
-       case NAND_ECC_HW3_256:
-       case NAND_ECC_SOFT:     
-               this->eccsteps = mtd->oobblock / 256;
-               break;
-               
-       case NAND_ECC_NONE: 
-               this->eccsteps = 1;
-               break;
-       }
-       
-       /* Initialize state, waitqueue and spinlock */
-       this->state = FL_READY;
-       init_waitqueue_head (&this->wq);
-       spin_lock_init (&this->chip_lock);
-
-       /* De-select the device */
-       this->select_chip(mtd, -1);
-
-       /* Invalidate the pagebuffer reference */
-       this->pagebuf = -1;
-
-       /* Fill in remaining MTD driver data */
-       mtd->type = MTD_NANDFLASH;
-       mtd->flags = MTD_CAP_NANDFLASH | MTD_ECC;
-       mtd->ecctype = MTD_ECC_SW;
-       mtd->erase = nand_erase;
-       mtd->point = NULL;
-       mtd->unpoint = NULL;
-       mtd->read = nand_read;
-       mtd->write = nand_write;
-       mtd->read_ecc = nand_read_ecc;
-       mtd->write_ecc = nand_write_ecc;
-       mtd->read_oob = nand_read_oob;
-       mtd->write_oob = nand_write_oob;
-       mtd->readv = NULL;
-       mtd->writev = nand_writev;
-       mtd->writev_ecc = nand_writev_ecc;
-       mtd->sync = nand_sync;
-       mtd->lock = NULL;
-       mtd->unlock = NULL;
-       mtd->suspend = NULL;
-       mtd->resume = NULL;
-       mtd->block_isbad = nand_block_isbad;
-       mtd->block_markbad = nand_block_markbad;
-
-       /* and make the autooob the default one */
-       memcpy(&mtd->oobinfo, this->autooob, sizeof(mtd->oobinfo));
-
-       mtd->owner = THIS_MODULE;
-
-       /* Build bad block table */
-       return this->scan_bbt (mtd);
-}
-
-/**
- * nand_release - [NAND Interface] Free resources held by the NAND device 
- * @mtd:       MTD device structure
-*/
-void nand_release (struct mtd_info *mtd)
-{
-       struct nand_chip *this = mtd->priv;
-
-#if defined(CONFIG_MTD_PARTITIONS) || defined(CONFIG_MTD_PARTITIONS_MODULE)
-       /* Unregister partitions */
-       del_mtd_partitions (mtd);
-#endif
-       /* Unregister the device */
-       del_mtd_device (mtd);
-
-       /* Free bad block table memory, if allocated */
-       if (this->bbt)
-               kfree (this->bbt);
-       /* Buffer allocated by nand_scan ? */
-       if (this->options & NAND_OOBBUF_ALLOC)
-               kfree (this->oob_buf);
-       /* Buffer allocated by nand_scan ? */
-       if (this->options & NAND_DATABUF_ALLOC)
-               kfree (this->data_buf);
-}
-
-EXPORT_SYMBOL (nand_scan);
-EXPORT_SYMBOL (nand_release);
-
-MODULE_LICENSE ("GPL");
-MODULE_AUTHOR ("Steven J. Hill <sjhill@realitydiluted.com>, Thomas Gleixner <tglx@linutronix.de>");
-MODULE_DESCRIPTION ("Generic NAND flash driver code");
diff --git a/drivers/mtd/nand/nand_bbt.c b/drivers/mtd/nand/nand_bbt.c
deleted file mode 100644 (file)
index 2642e11..0000000
+++ /dev/null
@@ -1,1053 +0,0 @@
-/*
- *  drivers/mtd/nand_bbt.c
- *
- *  Overview:
- *   Bad block table support for the NAND driver
- *   
- *  Copyright (C) 2004 Thomas Gleixner (tglx@linutronix.de)
- *
- * $Id: nand_bbt.c,v 1.24 2004/06/28 08:25:35 gleixner Exp $
- *
- * 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.
- *
- * Description:
- *
- * When nand_scan_bbt is called, then it tries to find the bad block table 
- * depending on the options in the bbt descriptor(s). If a bbt is found 
- * then the contents are read and the memory based bbt is created. If a 
- * mirrored bbt is selected then the mirror is searched too and the
- * versions are compared. If the mirror has a greater version number 
- * than the mirror bbt is used to build the memory based bbt.
- * If the tables are not versioned, then we "or" the bad block information.
- * If one of the bbt's is out of date or does not exist it is (re)created. 
- * If no bbt exists at all then the device is scanned for factory marked 
- * good / bad blocks and the bad block tables are created. 
- *
- * For manufacturer created bbts like the one found on M-SYS DOC devices 
- * the bbt is searched and read but never created
- *
- * The autogenerated bad block table is located in the last good blocks 
- * of the device. The table is mirrored, so it can be updated eventually. 
- * The table is marked in the oob area with an ident pattern and a version 
- * number which indicates which of both tables is more up to date.
- *
- * The table uses 2 bits per block
- * 11b:        block is good
- * 00b:        block is factory marked bad
- * 01b, 10b:   block is marked bad due to wear
- *
- * The memory bad block table uses the following scheme:
- * 00b:                block is good
- * 01b:                block is marked bad due to wear
- * 10b:                block is reserved (to protect the bbt area)
- * 11b:                block is factory marked bad
- * 
- * Multichip devices like DOC store the bad block info per floor.
- *
- * Following assumptions are made:
- * - bbts start at a page boundary, if autolocated on a block boundary
- * - the space neccecary for a bbt in FLASH does not exceed a block boundary
- * 
- */
-
-#include <linux/slab.h>
-#include <linux/types.h>
-#include <linux/mtd/mtd.h>
-#include <linux/mtd/nand.h>
-#include <linux/mtd/nand_ecc.h>
-#include <linux/mtd/compatmac.h>
-#include <linux/bitops.h>
-#include <linux/delay.h>
-
-
-/** 
- * check_pattern - [GENERIC] check if a pattern is in the buffer
- * @buf:       the buffer to search
- * @len:       the length of buffer to search
- * @paglen:    the pagelength
- * @td:                search pattern descriptor
- *
- * Check for a pattern at the given place. Used to search bad block
- * tables and good / bad block identifiers.
- * If the SCAN_EMPTY option is set then check, if all bytes except the
- * pattern area contain 0xff
- *
-*/
-static int check_pattern (uint8_t *buf, int len, int paglen, struct nand_bbt_descr *td)
-{
-       int i, end;
-       uint8_t *p = buf;
-
-       end = paglen + td->offs;
-       if (td->options & NAND_BBT_SCANEMPTY) {
-               for (i = 0; i < end; i++) {
-                       if (p[i] != 0xff)
-                               return -1;
-               }
-       }       
-       p += end;
-       
-       /* Compare the pattern */
-       for (i = 0; i < td->len; i++) {
-               if (p[i] != td->pattern[i])
-                       return -1;
-       }
-
-       p += td->len;
-       end += td->len;
-       if (td->options & NAND_BBT_SCANEMPTY) {
-               for (i = end; i < len; i++) {
-                       if (*p++ != 0xff)
-                               return -1;
-               }
-       }
-       return 0;
-}
-
-/**
- * read_bbt - [GENERIC] Read the bad block table starting from page
- * @mtd:       MTD device structure
- * @buf:       temporary buffer
- * @page:      the starting page
- * @num:       the number of bbt descriptors to read
- * @bits:      number of bits per block
- * @offs:      offset in the memory table
- *
- * Read the bad block table starting from page.
- *
- */
-static int read_bbt (struct mtd_info *mtd, uint8_t *buf, int page, int num, 
-       int bits, int offs, int reserved_block_code)
-{
-       int res, i, j, act = 0;
-       struct nand_chip *this = mtd->priv;
-       size_t retlen, len, totlen;
-       loff_t from;
-       uint8_t msk = (uint8_t) ((1 << bits) - 1);
-
-       totlen = (num * bits) >> 3;
-       from = ((loff_t)page) << this->page_shift;
-       
-       while (totlen) {
-               len = min (totlen, (size_t) (1 << this->bbt_erase_shift));
-               res = mtd->read_ecc (mtd, from, len, &retlen, buf, NULL, this->autooob);
-               if (res < 0) {
-                       if (retlen != len) {
-                               printk (KERN_INFO "nand_bbt: Error reading bad block table\n");
-                               return res;
-                       }
-                       printk (KERN_WARNING "nand_bbt: ECC error while reading bad block table\n");
-               }       
-
-               /* Analyse data */
-               for (i = 0; i < len; i++) {
-                       uint8_t dat = buf[i];
-                       for (j = 0; j < 8; j += bits, act += 2) {
-                               uint8_t tmp = (dat >> j) & msk;
-                               if (tmp == msk)
-                                       continue;
-                               if (reserved_block_code &&
-                                   (tmp == reserved_block_code)) {
-                                       printk (KERN_DEBUG "nand_read_bbt: Reserved block at 0x%08x\n",
-                                               ((offs << 2) + (act >> 1)) << this->bbt_erase_shift);
-                                       this->bbt[offs + (act >> 3)] |= 0x2 << (act & 0x06);
-                                       continue;
-                               }
-                               /* Leave it for now, if its matured we can move this
-                                * message to MTD_DEBUG_LEVEL0 */
-                               printk (KERN_DEBUG "nand_read_bbt: Bad block at 0x%08x\n",
-                                       ((offs << 2) + (act >> 1)) << this->bbt_erase_shift);
-                               /* Factory marked bad or worn out ? */  
-                               if (tmp == 0)
-                                       this->bbt[offs + (act >> 3)] |= 0x3 << (act & 0x06);
-                               else
-                                       this->bbt[offs + (act >> 3)] |= 0x1 << (act & 0x06);
-                       }       
-               }
-               totlen -= len;
-               from += len;
-       }
-       return 0;
-}
-
-/**
- * read_abs_bbt - [GENERIC] Read the bad block table starting at a given page
- * @mtd:       MTD device structure
- * @buf:       temporary buffer
- * @td:                descriptor for the bad block table 
- * @chip:      read the table for a specific chip, -1 read all chips.
- *             Applies only if NAND_BBT_PERCHIP option is set
- *
- * Read the bad block table for all chips starting at a given page
- * We assume that the bbt bits are in consecutive order.
-*/
-static int read_abs_bbt (struct mtd_info *mtd, uint8_t *buf, struct nand_bbt_descr *td, int chip)
-{
-       struct nand_chip *this = mtd->priv;
-       int res = 0, i;
-       int bits;
-
-       bits = td->options & NAND_BBT_NRBITS_MSK;
-       if (td->options & NAND_BBT_PERCHIP) {
-               int offs = 0;
-               for (i = 0; i < this->numchips; i++) {
-                       if (chip == -1 || chip == i)
-                               res = read_bbt (mtd, buf, td->pages[i], this->chipsize >> this->bbt_erase_shift, bits, offs, td->reserved_block_code);
-                       if (res)
-                               return res;
-                       offs += this->chipsize >> (this->bbt_erase_shift + 2);
-               }
-       } else {
-               res = read_bbt (mtd, buf, td->pages[0], mtd->size >> this->bbt_erase_shift, bits, 0, td->reserved_block_code);
-               if (res)
-                       return res;
-       }
-       return 0;
-}
-
-/**
- * read_abs_bbts - [GENERIC] Read the bad block table(s) for all chips starting at a given page
- * @mtd:       MTD device structure
- * @buf:       temporary buffer
- * @td:                descriptor for the bad block table 
- * @md:                descriptor for the bad block table mirror
- *
- * Read the bad block table(s) for all chips starting at a given page
- * We assume that the bbt bits are in consecutive order.
- *
-*/
-static int read_abs_bbts (struct mtd_info *mtd, uint8_t *buf, struct nand_bbt_descr *td,
-       struct nand_bbt_descr *md)
-{
-       struct nand_chip *this = mtd->priv;
-
-       /* Read the primary version, if available */    
-       if (td->options & NAND_BBT_VERSION) {
-               nand_read_raw (mtd, buf, td->pages[0] << this->page_shift, mtd->oobblock, mtd->oobsize); 
-               td->version[0] = buf[mtd->oobblock + td->veroffs];
-               printk (KERN_DEBUG "Bad block table at page %d, version 0x%02X\n", td->pages[0], td->version[0]);
-       }
-
-       /* Read the mirror version, if available */     
-       if (md && (md->options & NAND_BBT_VERSION)) {
-               nand_read_raw (mtd, buf, md->pages[0] << this->page_shift, mtd->oobblock, mtd->oobsize); 
-               md->version[0] = buf[mtd->oobblock + md->veroffs];
-               printk (KERN_DEBUG "Bad block table at page %d, version 0x%02X\n", md->pages[0], md->version[0]);
-       }
-
-       return 1;
-}
-
-/**
- * create_bbt - [GENERIC] Create a bad block table by scanning the device
- * @mtd:       MTD device structure
- * @buf:       temporary buffer
- * @bd:                descriptor for the good/bad block search pattern
- * @chip:      create the table for a specific chip, -1 read all chips.
- *             Applies only if NAND_BBT_PERCHIP option is set
- *
- * Create a bad block table by scanning the device
- * for the given good/bad block identify pattern
- */
-static void create_bbt (struct mtd_info *mtd, uint8_t *buf, struct nand_bbt_descr *bd, int chip)
-{
-       struct nand_chip *this = mtd->priv;
-       int i, j, numblocks, len, scanlen;
-       int startblock;
-       loff_t from;
-       size_t readlen, ooblen;
-
-       printk (KERN_INFO "Scanning device for bad blocks\n");
-
-       if (bd->options & NAND_BBT_SCANALLPAGES)
-               len = 1 << (this->bbt_erase_shift - this->page_shift);
-       else {
-               if (bd->options & NAND_BBT_SCAN2NDPAGE)
-                       len = 2;
-               else    
-                       len = 1;
-       }
-       scanlen = mtd->oobblock + mtd->oobsize;
-       readlen = len * mtd->oobblock;
-       ooblen = len * mtd->oobsize;
-
-       if (chip == -1) {
-               /* Note that numblocks is 2 * (real numblocks) here, see i+=2 below as it
-                * makes shifting and masking less painful */
-               numblocks = mtd->size >> (this->bbt_erase_shift - 1);
-               startblock = 0;
-               from = 0;
-       } else {
-               if (chip >= this->numchips) {
-                       printk (KERN_WARNING "create_bbt(): chipnr (%d) > available chips (%d)\n",
-                               chip + 1, this->numchips);
-                       return; 
-               }
-               numblocks = this->chipsize >> (this->bbt_erase_shift - 1);
-               startblock = chip * numblocks;
-               numblocks += startblock;
-               from = startblock << (this->bbt_erase_shift - 1);
-       }
-       
-       for (i = startblock; i < numblocks;) {
-               nand_read_raw (mtd, buf, from, readlen, ooblen);
-               for (j = 0; j < len; j++) {
-                       if (check_pattern (&buf[j * scanlen], scanlen, mtd->oobblock, bd)) {
-                               this->bbt[i >> 3] |= 0x03 << (i & 0x6);
-                               printk (KERN_WARNING "Bad eraseblock %d at 0x%08x\n", 
-                                       i >> 1, (unsigned int) from);
-                               break;
-                       }
-               }
-               i += 2;
-               from += (1 << this->bbt_erase_shift);
-       }
-}
-
-/**
- * search_bbt - [GENERIC] scan the device for a specific bad block table
- * @mtd:       MTD device structure
- * @buf:       temporary buffer
- * @td:                descriptor for the bad block table
- *
- * Read the bad block table by searching for a given ident pattern.
- * Search is preformed either from the beginning up or from the end of 
- * the device downwards. The search starts always at the start of a
- * block.
- * If the option NAND_BBT_PERCHIP is given, each chip is searched 
- * for a bbt, which contains the bad block information of this chip.
- * This is neccecary to provide support for certain DOC devices.
- *
- * The bbt ident pattern resides in the oob area of the first page 
- * in a block. 
- */
-static int search_bbt (struct mtd_info *mtd, uint8_t *buf, struct nand_bbt_descr *td)
-{
-       struct nand_chip *this = mtd->priv;
-       int i, chips;
-       int bits, startblock, block, dir;
-       int scanlen = mtd->oobblock + mtd->oobsize;
-       int bbtblocks;
-
-       /* Search direction top -> down ? */
-       if (td->options & NAND_BBT_LASTBLOCK) {
-               startblock = (mtd->size >> this->bbt_erase_shift) -1;
-               dir = -1;
-       } else {
-               startblock = 0; 
-               dir = 1;
-       }       
-       
-       /* Do we have a bbt per chip ? */
-       if (td->options & NAND_BBT_PERCHIP) {
-               chips = this->numchips;
-               bbtblocks = this->chipsize >> this->bbt_erase_shift;
-               startblock &= bbtblocks - 1;
-       } else {
-               chips = 1;
-               bbtblocks = mtd->size >> this->bbt_erase_shift;
-       }
-       
-       /* Number of bits for each erase block in the bbt */
-       bits = td->options & NAND_BBT_NRBITS_MSK;
-       
-       for (i = 0; i < chips; i++) {
-               /* Reset version information */
-               td->version[i] = 0;     
-               td->pages[i] = -1;
-               /* Scan the maximum number of blocks */
-               for (block = 0; block < td->maxblocks; block++) {
-                       int actblock = startblock + dir * block;
-                       /* Read first page */
-                       nand_read_raw (mtd, buf, actblock << this->bbt_erase_shift, mtd->oobblock, mtd->oobsize); 
-                       if (!check_pattern(buf, scanlen, mtd->oobblock, td)) {
-                               td->pages[i] = actblock << (this->bbt_erase_shift - this->page_shift);
-                               if (td->options & NAND_BBT_VERSION) {
-                                       td->version[i] = buf[mtd->oobblock + td->veroffs];
-                               }
-                               break;
-                       }
-               }
-               startblock += this->chipsize >> this->bbt_erase_shift;
-       }
-       /* Check, if we found a bbt for each requested chip */
-       for (i = 0; i < chips; i++) {
-               if (td->pages[i] == -1)
-                       printk (KERN_WARNING "Bad block table not found for chip %d\n", i);
-               else
-                       printk (KERN_DEBUG "Bad block table found at page %d, version 0x%02X\n", td->pages[i], td->version[i]);
-       }
-       return 0;       
-}
-
-/**
- * search_read_bbts - [GENERIC] scan the device for bad block table(s)
- * @mtd:       MTD device structure
- * @buf:       temporary buffer
- * @td:                descriptor for the bad block table 
- * @md:                descriptor for the bad block table mirror
- *
- * Search and read the bad block table(s)
-*/
-static int search_read_bbts (struct mtd_info *mtd, uint8_t *buf, 
-       struct nand_bbt_descr *td, struct nand_bbt_descr *md)
-{
-       /* Search the primary table */
-       search_bbt (mtd, buf, td);
-               
-       /* Search the mirror table */
-       if (md)
-               search_bbt (mtd, buf, md);
-       
-       /* Force result check */
-       return 1;       
-}
-       
-
-/** 
- * write_bbt - [GENERIC] (Re)write the bad block table
- *
- * @mtd:       MTD device structure
- * @buf:       temporary buffer
- * @td:                descriptor for the bad block table 
- * @md:                descriptor for the bad block table mirror
- * @chipsel:   selector for a specific chip, -1 for all
- *
- * (Re)write the bad block table
- *
-*/
-static int write_bbt (struct mtd_info *mtd, uint8_t *buf, 
-       struct nand_bbt_descr *td, struct nand_bbt_descr *md, int chipsel)
-{
-       struct nand_chip *this = mtd->priv;
-       struct nand_oobinfo oobinfo;
-       struct erase_info einfo;
-       int i, j, res, chip = 0;
-       int bits, startblock, dir, page, offs, numblocks, sft, sftmsk;
-       int nrchips, bbtoffs, pageoffs;
-       uint8_t msk[4];
-       uint8_t rcode = td->reserved_block_code;
-       size_t retlen, len = 0;
-       loff_t to;
-
-       if (!rcode)
-               rcode = 0xff;
-       /* Write bad block table per chip rather than per device ? */
-       if (td->options & NAND_BBT_PERCHIP) {
-               numblocks = (int) (this->chipsize >> this->bbt_erase_shift);
-               /* Full device write or specific chip ? */      
-               if (chipsel == -1) {
-                       nrchips = this->numchips;
-               } else {
-                       nrchips = chipsel + 1;
-                       chip = chipsel;
-               }
-       } else {
-               numblocks = (int) (mtd->size >> this->bbt_erase_shift);
-               nrchips = 1;
-       }       
-       
-       /* Loop through the chips */
-       for (; chip < nrchips; chip++) {
-               
-               /* There was already a version of the table, reuse the page 
-                * This applies for absolute placement too, as we have the 
-                * page nr. in td->pages.
-                */
-               if (td->pages[chip] != -1) {
-                       page = td->pages[chip];
-                       goto write;
-               }       
-
-               /* Automatic placement of the bad block table */
-               /* Search direction top -> down ? */
-               if (td->options & NAND_BBT_LASTBLOCK) {
-                       startblock = numblocks * (chip + 1) - 1;
-                       dir = -1;
-               } else {
-                       startblock = chip * numblocks;
-                       dir = 1;
-               }       
-
-               for (i = 0; i < td->maxblocks; i++) {
-                       int block = startblock + dir * i;
-                       /* Check, if the block is bad */
-                       switch ((this->bbt[block >> 2] >> (2 * (block & 0x03))) & 0x03) {
-                       case 0x01:
-                       case 0x03:
-                               continue;
-                       }
-                       page = block << (this->bbt_erase_shift - this->page_shift);
-                       /* Check, if the block is used by the mirror table */
-                       if (!md || md->pages[chip] != page)
-                               goto write;
-               }
-               printk (KERN_ERR "No space left to write bad block table\n");
-               return -ENOSPC;
-write: 
-
-               /* Set up shift count and masks for the flash table */
-               bits = td->options & NAND_BBT_NRBITS_MSK;
-               switch (bits) {
-               case 1: sft = 3; sftmsk = 0x07; msk[0] = 0x00; msk[1] = 0x01; msk[2] = ~rcode; msk[3] = 0x01; break;
-               case 2: sft = 2; sftmsk = 0x06; msk[0] = 0x00; msk[1] = 0x01; msk[2] = ~rcode; msk[3] = 0x03; break;
-               case 4: sft = 1; sftmsk = 0x04; msk[0] = 0x00; msk[1] = 0x0C; msk[2] = ~rcode; msk[3] = 0x0f; break;
-               case 8: sft = 0; sftmsk = 0x00; msk[0] = 0x00; msk[1] = 0x0F; msk[2] = ~rcode; msk[3] = 0xff; break;
-               default: return -EINVAL;
-               }
-               
-               bbtoffs = chip * (numblocks >> 2);
-               
-               to = ((loff_t) page) << this->page_shift;
-
-               memcpy (&oobinfo, this->autooob, sizeof(oobinfo));
-               oobinfo.useecc = MTD_NANDECC_PLACEONLY;
-               
-               /* Must we save the block contents ? */
-               if (td->options & NAND_BBT_SAVECONTENT) {
-                       /* Make it block aligned */
-                       to &= ~((loff_t) ((1 << this->bbt_erase_shift) - 1));
-                       len = 1 << this->bbt_erase_shift;
-                       res = mtd->read_ecc (mtd, to, len, &retlen, buf, &buf[len], &oobinfo);
-                       if (res < 0) {
-                               if (retlen != len) {
-                                       printk (KERN_INFO "nand_bbt: Error reading block for writing the bad block table\n");
-                                       return res;
-                               }
-                               printk (KERN_WARNING "nand_bbt: ECC error while reading block for writing bad block table\n");
-                       }
-                       /* Calc the byte offset in the buffer */
-                       pageoffs = page - (int)(to >> this->page_shift);
-                       offs = pageoffs << this->page_shift;
-                       /* Preset the bbt area with 0xff */
-                       memset (&buf[offs], 0xff, (size_t)(numblocks >> sft));
-                       /* Preset the bbt's oob area with 0xff */
-                       memset (&buf[len + pageoffs * mtd->oobsize], 0xff,
-                               ((len >> this->page_shift) - pageoffs) * mtd->oobsize);
-                       if (td->options & NAND_BBT_VERSION) {
-                               buf[len + (pageoffs * mtd->oobsize) + td->veroffs] = td->version[chip];
-                       }
-               } else {
-                       /* Calc length */
-                       len = (size_t) (numblocks >> sft);
-                       /* Make it page aligned ! */
-                       len = (len + (mtd->oobblock-1)) & ~(mtd->oobblock-1);
-                       /* Preset the buffer with 0xff */
-                       memset (buf, 0xff, len + (len >> this->page_shift) * mtd->oobsize);
-                       offs = 0;
-                       /* Pattern is located in oob area of first page */
-                       memcpy (&buf[len + td->offs], td->pattern, td->len);
-                       if (td->options & NAND_BBT_VERSION) {
-                               buf[len + td->veroffs] = td->version[chip];
-                       }
-               }
-       
-               /* walk through the memory table */
-               for (i = 0; i < numblocks; ) {
-                       uint8_t dat;
-                       dat = this->bbt[bbtoffs + (i >> 2)];
-                       for (j = 0; j < 4; j++ , i++) {
-                               int sftcnt = (i << (3 - sft)) & sftmsk;
-                               /* Do not store the reserved bbt blocks ! */
-                               buf[offs + (i >> sft)] &= ~(msk[dat & 0x03] << sftcnt);
-                               dat >>= 2;
-                       }
-               }
-               
-               memset (&einfo, 0, sizeof (einfo));
-               einfo.mtd = mtd;
-               einfo.addr = (unsigned long) to;
-               einfo.len = 1 << this->bbt_erase_shift;
-               res = nand_erase_nand (mtd, &einfo, 1);
-               if (res < 0) {
-                       printk (KERN_WARNING "nand_bbt: Error during block erase: %d\n", res);
-                       return res;
-               }
-       
-               res = mtd->write_ecc (mtd, to, len, &retlen, buf, &buf[len], &oobinfo);
-               if (res < 0) {
-                       printk (KERN_WARNING "nand_bbt: Error while writing bad block table %d\n", res);
-                       return res;
-               }
-               printk (KERN_DEBUG "Bad block table written to 0x%08x, version 0x%02X\n", 
-                       (unsigned int) to, td->version[chip]);
-       
-               /* Mark it as used */
-               td->pages[chip] = page;
-       }       
-       return 0;
-}
-
-/**
- * nand_memory_bbt - [GENERIC] create a memory based bad block table
- * @mtd:       MTD device structure
- * @bd:                descriptor for the good/bad block search pattern
- *
- * The function creates a memory based bbt by scanning the device 
- * for manufacturer / software marked good / bad blocks
-*/
-static int nand_memory_bbt (struct mtd_info *mtd, struct nand_bbt_descr *bd)
-{
-       struct nand_chip *this = mtd->priv;
-
-       /* Ensure that we only scan for the pattern and nothing else */
-       bd->options = 0;
-       create_bbt (mtd, this->data_buf, bd, -1);
-       return 0;
-}
-
-/**
- * check_create - [GENERIC] create and write bbt(s) if neccecary
- * @mtd:       MTD device structure
- * @buf:       temporary buffer
- * @bd:                descriptor for the good/bad block search pattern
- *
- * The function checks the results of the previous call to read_bbt
- * and creates / updates the bbt(s) if neccecary
- * Creation is neccecary if no bbt was found for the chip/device
- * Update is neccecary if one of the tables is missing or the
- * version nr. of one table is less than the other
-*/
-static int check_create (struct mtd_info *mtd, uint8_t *buf, struct nand_bbt_descr *bd)
-{
-       int i, chips, writeops, chipsel, res;
-       struct nand_chip *this = mtd->priv;
-       struct nand_bbt_descr *td = this->bbt_td;
-       struct nand_bbt_descr *md = this->bbt_md;
-       struct nand_bbt_descr *rd, *rd2;
-
-       /* Do we have a bbt per chip ? */
-       if (td->options & NAND_BBT_PERCHIP) 
-               chips = this->numchips;
-       else 
-               chips = 1;
-       
-       for (i = 0; i < chips; i++) {
-               writeops = 0;
-               rd = NULL;
-               rd2 = NULL;
-               /* Per chip or per device ? */
-               chipsel = (td->options & NAND_BBT_PERCHIP) ? i : -1;
-               /* Mirrored table avilable ? */
-               if (md) {
-                       if (td->pages[i] == -1 && md->pages[i] == -1) {
-                               writeops = 0x03;
-                               goto create;
-                       }
-
-                       if (td->pages[i] == -1) {
-                               rd = md;                                
-                               td->version[i] = md->version[i];
-                               writeops = 1;
-                               goto writecheck;
-                       }
-
-                       if (md->pages[i] == -1) {
-                               rd = td;
-                               md->version[i] = td->version[i];
-                               writeops = 2;
-                               goto writecheck;
-                       }
-
-                       if (td->version[i] == md->version[i]) {
-                               rd = td;
-                               if (!(td->options & NAND_BBT_VERSION))
-                                       rd2 = md;
-                               goto writecheck;
-                       }       
-
-                       if (((int8_t) (td->version[i] - md->version[i])) > 0) {
-                               rd = td;
-                               md->version[i] = td->version[i];
-                               writeops = 2;
-                       } else {
-                               rd = md;
-                               td->version[i] = md->version[i];
-                               writeops = 1;
-                       }
-
-                       goto writecheck;
-
-               } else {
-                       if (td->pages[i] == -1) {
-                               writeops = 0x01;
-                               goto create;
-                       }
-                       rd = td;
-                       goto writecheck;
-               }
-create:
-               /* Create the bad block table by scanning the device ? */
-               if (!(td->options & NAND_BBT_CREATE))
-                       continue;       
-               
-               /* Create the table in memory by scanning the chip(s) */
-               create_bbt (mtd, buf, bd, chipsel);
-               
-               td->version[i] = 1;
-               if (md)
-                       md->version[i] = 1;     
-writecheck:    
-               /* read back first ? */
-               if (rd)
-                       read_abs_bbt (mtd, buf, rd, chipsel);
-               /* If they weren't versioned, read both. */
-               if (rd2)
-                       read_abs_bbt (mtd, buf, rd2, chipsel);
-
-               /* Write the bad block table to the device ? */
-               if ((writeops & 0x01) && (td->options & NAND_BBT_WRITE)) {
-                       res = write_bbt (mtd, buf, td, md, chipsel);
-                       if (res < 0)
-                               return res;
-               }
-               
-               /* Write the mirror bad block table to the device ? */
-               if ((writeops & 0x02) && md && (md->options & NAND_BBT_WRITE)) {
-                       res = write_bbt (mtd, buf, md, td, chipsel);
-                       if (res < 0)
-                               return res;
-               }
-       }
-       return 0;       
-}
-
-/**
- * mark_bbt_regions - [GENERIC] mark the bad block table regions 
- * @mtd:       MTD device structure
- * @td:                bad block table descriptor
- *
- * The bad block table regions are marked as "bad" to prevent
- * accidental erasures / writes. The regions are identified by
- * the mark 0x02.
-*/
-static void mark_bbt_region (struct mtd_info *mtd, struct nand_bbt_descr *td)
-{
-       struct nand_chip *this = mtd->priv;
-       int i, j, chips, block, nrblocks, update;
-       uint8_t oldval, newval;
-
-       /* Do we have a bbt per chip ? */
-       if (td->options & NAND_BBT_PERCHIP) {
-               chips = this->numchips;
-               nrblocks = (int)(this->chipsize >> this->bbt_erase_shift);
-       } else {
-               chips = 1;
-               nrblocks = (int)(mtd->size >> this->bbt_erase_shift);
-       }       
-       
-       for (i = 0; i < chips; i++) {
-               if ((td->options & NAND_BBT_ABSPAGE) ||
-                   !(td->options & NAND_BBT_WRITE)) {
-                       if (td->pages[i] == -1) continue;
-                       block = td->pages[i] >> (this->bbt_erase_shift - this->page_shift);
-                       block <<= 1;            
-                       oldval = this->bbt[(block >> 3)];
-                       newval = oldval | (0x2 << (block & 0x06));
-                       this->bbt[(block >> 3)] = newval;
-                       if ((oldval != newval) && td->reserved_block_code)
-                               nand_update_bbt(mtd, block << (this->bbt_erase_shift - 1));
-                       continue;
-               }
-               update = 0;
-               if (td->options & NAND_BBT_LASTBLOCK)
-                       block = ((i + 1) * nrblocks) - td->maxblocks;
-               else    
-                       block = i * nrblocks;
-               block <<= 1;    
-               for (j = 0; j < td->maxblocks; j++) {
-                       oldval = this->bbt[(block >> 3)];
-                       newval = oldval | (0x2 << (block & 0x06));
-                       this->bbt[(block >> 3)] = newval;
-                       if (oldval != newval) update = 1;
-                       block += 2;
-               }       
-               /* If we want reserved blocks to be recorded to flash, and some
-                  new ones have been marked, then we need to update the stored
-                  bbts.  This should only happen once. */
-               if (update && td->reserved_block_code)
-                       nand_update_bbt(mtd, (block - 2) << (this->bbt_erase_shift - 1));
-       }
-}
-
-/**
- * nand_scan_bbt - [NAND Interface] scan, find, read and maybe create bad block table(s)
- * @mtd:       MTD device structure
- * @bd:                descriptor for the good/bad block search pattern
- *
- * The function checks, if a bad block table(s) is/are already 
- * available. If not it scans the device for manufacturer
- * marked good / bad blocks and writes the bad block table(s) to
- * the selected place.
- *
- * The bad block table memory is allocated here. It must be freed
- * by calling the nand_free_bbt function.
- *
-*/
-int nand_scan_bbt (struct mtd_info *mtd, struct nand_bbt_descr *bd)
-{
-       struct nand_chip *this = mtd->priv;
-       int len, res = 0;
-       uint8_t *buf;
-       struct nand_bbt_descr *td = this->bbt_td;
-       struct nand_bbt_descr *md = this->bbt_md;
-
-       len = mtd->size >> (this->bbt_erase_shift + 2);
-       /* Allocate memory (2bit per block) */
-       this->bbt = (uint8_t *) kmalloc (len, GFP_KERNEL);
-       if (!this->bbt) {
-               printk (KERN_ERR "nand_scan_bbt: Out of memory\n");
-               return -ENOMEM;
-       }
-       /* Clear the memory bad block table */
-       memset (this->bbt, 0x00, len);
-
-       /* If no primary table decriptor is given, scan the device
-        * to build a memory based bad block table
-        */
-       if (!td)
-               return nand_memory_bbt(mtd, bd);
-
-       /* Allocate a temporary buffer for one eraseblock incl. oob */
-       len = (1 << this->bbt_erase_shift);
-       len += (len >> this->page_shift) * mtd->oobsize;
-       buf = kmalloc (len, GFP_KERNEL);
-       if (!buf) {
-               printk (KERN_ERR "nand_bbt: Out of memory\n");
-               kfree (this->bbt);
-               this->bbt = NULL;
-               return -ENOMEM;
-       }
-       
-       /* Is the bbt at a given page ? */
-       if (td->options & NAND_BBT_ABSPAGE) {
-               res = read_abs_bbts (mtd, buf, td, md);
-       } else {        
-               /* Search the bad block table using a pattern in oob */
-               res = search_read_bbts (mtd, buf, td, md);
-       }       
-
-       if (res) 
-               res = check_create (mtd, buf, bd);
-       
-       /* Prevent the bbt regions from erasing / writing */
-       mark_bbt_region (mtd, td);
-       if (md)
-               mark_bbt_region (mtd, md);
-       
-       kfree (buf);
-       return res;
-}
-
-
-/**
- * nand_update_bbt - [NAND Interface] update bad block table(s) 
- * @mtd:       MTD device structure
- * @offs:      the offset of the newly marked block
- *
- * The function updates the bad block table(s)
-*/
-int nand_update_bbt (struct mtd_info *mtd, loff_t offs)
-{
-       struct nand_chip *this = mtd->priv;
-       int len, res = 0, writeops = 0;
-       int chip, chipsel;
-       uint8_t *buf;
-       struct nand_bbt_descr *td = this->bbt_td;
-       struct nand_bbt_descr *md = this->bbt_md;
-
-       if (!this->bbt || !td)
-               return -EINVAL;
-
-       len = mtd->size >> (this->bbt_erase_shift + 2);
-       /* Allocate a temporary buffer for one eraseblock incl. oob */
-       len = (1 << this->bbt_erase_shift);
-       len += (len >> this->page_shift) * mtd->oobsize;
-       buf = kmalloc (len, GFP_KERNEL);
-       if (!buf) {
-               printk (KERN_ERR "nand_update_bbt: Out of memory\n");
-               return -ENOMEM;
-       }
-       
-       writeops = md != NULL ? 0x03 : 0x01;
-
-       /* Do we have a bbt per chip ? */
-       if (td->options & NAND_BBT_PERCHIP) {
-               chip = (int) (offs >> this->chip_shift);
-               chipsel = chip;
-       } else {
-               chip = 0;
-               chipsel = -1;
-       }
-
-       td->version[chip]++;
-       if (md)
-               md->version[chip]++;    
-
-       /* Write the bad block table to the device ? */
-       if ((writeops & 0x01) && (td->options & NAND_BBT_WRITE)) {
-               res = write_bbt (mtd, buf, td, md, chipsel);
-               if (res < 0)
-                       goto out;
-       }
-       /* Write the mirror bad block table to the device ? */
-       if ((writeops & 0x02) && md && (md->options & NAND_BBT_WRITE)) {
-               res = write_bbt (mtd, buf, md, td, chipsel);
-       }
-
-out:   
-       kfree (buf);
-       return res;
-}
-
-/* Define some generic bad / good block scan pattern which are used 
- * while scanning a device for factory marked good / bad blocks
- * 
- * The memory based patterns just 
- */
-static uint8_t scan_ff_pattern[] = { 0xff, 0xff };
-
-static struct nand_bbt_descr smallpage_memorybased = {
-       .options = 0,
-       .offs = 5,
-       .len = 1,
-       .pattern = scan_ff_pattern
-};
-
-static struct nand_bbt_descr largepage_memorybased = {
-       .options = 0,
-       .offs = 0,
-       .len = 2,
-       .pattern = scan_ff_pattern
-};
-
-static struct nand_bbt_descr smallpage_flashbased = {
-       .options = NAND_BBT_SCANEMPTY | NAND_BBT_SCANALLPAGES,
-       .offs = 5,
-       .len = 1,
-       .pattern = scan_ff_pattern
-};
-
-static struct nand_bbt_descr largepage_flashbased = {
-       .options = NAND_BBT_SCANEMPTY | NAND_BBT_SCANALLPAGES,
-       .offs = 0,
-       .len = 2,
-       .pattern = scan_ff_pattern
-};
-
-static uint8_t scan_agand_pattern[] = { 0x1C, 0x71, 0xC7, 0x1C, 0x71, 0xC7 };
-
-static struct nand_bbt_descr agand_flashbased = {
-       .options = NAND_BBT_SCANEMPTY | NAND_BBT_SCANALLPAGES,
-       .offs = 0x20,
-       .len = 6,
-       .pattern = scan_agand_pattern
-};
-
-/* Generic flash bbt decriptors
-*/
-static uint8_t bbt_pattern[] = {'B', 'b', 't', '0' };
-static uint8_t mirror_pattern[] = {'1', 't', 'b', 'B' };
-
-static struct nand_bbt_descr bbt_main_descr = {
-       .options = NAND_BBT_LASTBLOCK | NAND_BBT_CREATE | NAND_BBT_WRITE 
-               | NAND_BBT_2BIT | NAND_BBT_VERSION | NAND_BBT_PERCHIP,
-       .offs = 8,
-       .len = 4,
-       .veroffs = 12,
-       .maxblocks = 4,
-       .pattern = bbt_pattern
-};
-
-static struct nand_bbt_descr bbt_mirror_descr = {
-       .options = NAND_BBT_LASTBLOCK | NAND_BBT_CREATE | NAND_BBT_WRITE 
-               | NAND_BBT_2BIT | NAND_BBT_VERSION | NAND_BBT_PERCHIP,
-       .offs = 8,
-       .len = 4,
-       .veroffs = 12,
-       .maxblocks = 4,
-       .pattern = mirror_pattern
-};
-
-/**
- * nand_default_bbt - [NAND Interface] Select a default bad block table for the device 
- * @mtd:       MTD device structure
- *
- * This function selects the default bad block table
- * support for the device and calls the nand_scan_bbt function
- *
-*/
-int nand_default_bbt (struct mtd_info *mtd)
-{
-       struct nand_chip *this = mtd->priv;
-       
-       /* Default for AG-AND. We must use a flash based 
-        * bad block table as the devices have factory marked
-        * _good_ blocks. Erasing those blocks leads to loss
-        * of the good / bad information, so we _must_ store
-        * this information in a good / bad table during 
-        * startup
-       */
-       if (this->options & NAND_IS_AND) {
-               /* Use the default pattern descriptors */
-               if (!this->bbt_td) {    
-                       this->bbt_td = &bbt_main_descr;
-                       this->bbt_md = &bbt_mirror_descr;
-               }       
-               this->options |= NAND_USE_FLASH_BBT;
-               return nand_scan_bbt (mtd, &agand_flashbased);
-       }
-       
-       /* Is a flash based bad block table requested ? */
-       if (this->options & NAND_USE_FLASH_BBT) {
-               /* Use the default pattern descriptors */       
-               if (!this->bbt_td) {    
-                       this->bbt_td = &bbt_main_descr;
-                       this->bbt_md = &bbt_mirror_descr;
-               }       
-               if (mtd->oobblock > 512)
-                       return nand_scan_bbt (mtd, &largepage_flashbased);
-               else    
-                       return nand_scan_bbt (mtd, &smallpage_flashbased);                      
-       } else {
-               this->bbt_td = NULL;
-               this->bbt_md = NULL;
-               if (mtd->oobblock > 512)
-                       return nand_scan_bbt (mtd, &largepage_memorybased);
-               else
-                       return nand_scan_bbt (mtd, &smallpage_memorybased);
-       }
-}
-
-/**
- * nand_isbad_bbt - [NAND Interface] Check if a block is bad 
- * @mtd:       MTD device structure
- * @offs:      offset in the device
- * @allowbbt:  allow access to bad block table region
- *
-*/
-int nand_isbad_bbt (struct mtd_info *mtd, loff_t offs, int allowbbt)
-{
-       struct nand_chip *this = mtd->priv;
-       int block;
-       uint8_t res;
-       
-       /* Get block number * 2 */
-       block = (int) (offs >> (this->bbt_erase_shift - 1));
-       res = (this->bbt[block >> 3] >> (block & 0x06)) & 0x03;
-
-       DEBUG (MTD_DEBUG_LEVEL2, "nand_isbad_bbt(): bbt info for offs 0x%08x: (block %d) 0x%02x\n", 
-               (unsigned int)offs, res, block >> 1);
-
-       switch ((int)res) {
-       case 0x00:      return 0;
-       case 0x01:      return 1;
-       case 0x02:      return allowbbt ? 0 : 1;
-       }
-       return 1;
-}
-
-EXPORT_SYMBOL (nand_scan_bbt);
-EXPORT_SYMBOL (nand_default_bbt);
diff --git a/drivers/mtd/nand/ppchameleonevb.c b/drivers/mtd/nand/ppchameleonevb.c
deleted file mode 100644 (file)
index 9c356a0..0000000
+++ /dev/null
@@ -1,430 +0,0 @@
-/*
- *  drivers/mtd/nand/ppchameleonevb.c
- *
- *  Copyright (C) 2003 DAVE Srl (info@wawnet.biz)
- *
- *  Derived from drivers/mtd/nand/edb7312.c
- *
- *
- * $Id: ppchameleonevb.c,v 1.2 2004/05/05 22:09:54 gleixner Exp $
- *
- * 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.
- *
- *  Overview:
- *   This is a device driver for the NAND flash devices found on the
- *   PPChameleon/PPChameleonEVB system.
- *   PPChameleon options (autodetected):
- *   - BA model: no NAND
- *   - ME model: 32MB (Samsung K9F5608U0B)
- *   - HI model: 128MB (Samsung K9F1G08UOM)
- *   PPChameleonEVB options:
- *   - 32MB (Samsung K9F5608U0B)
- */
-
-#include <linux/init.h>
-#include <linux/slab.h>
-#include <linux/module.h>
-#include <linux/mtd/mtd.h>
-#include <linux/mtd/nand.h>
-#include <linux/mtd/partitions.h>
-#include <asm/io.h>
-#include <platforms/PPChameleonEVB.h>
-
-#undef USE_READY_BUSY_PIN
-#define USE_READY_BUSY_PIN
-/* see datasheets (tR) */
-#define NAND_BIG_DELAY_US              25
-#define NAND_SMALL_DELAY_US            10
-
-/* handy sizes */
-#define SZ_4M                           0x00400000
-#define NAND_SMALL_SIZE                 0x02000000
-#define NAND_MTD_NAME          "ppchameleon-nand"
-#define NAND_EVB_MTD_NAME      "ppchameleonevb-nand"
-
-/* GPIO pins used to drive NAND chip mounted on processor module */
-#define NAND_nCE_GPIO_PIN              (0x80000000 >> 1)
-#define NAND_CLE_GPIO_PIN              (0x80000000 >> 2)
-#define NAND_ALE_GPIO_PIN              (0x80000000 >> 3)
-#define NAND_RB_GPIO_PIN               (0x80000000 >> 4)
-/* GPIO pins used to drive NAND chip mounted on EVB */
-#define NAND_EVB_nCE_GPIO_PIN  (0x80000000 >> 14)
-#define NAND_EVB_CLE_GPIO_PIN  (0x80000000 >> 15)
-#define NAND_EVB_ALE_GPIO_PIN  (0x80000000 >> 16)
-#define NAND_EVB_RB_GPIO_PIN   (0x80000000 >> 31)
-
-/*
- * MTD structure for PPChameleonEVB board
- */
-static struct mtd_info *ppchameleon_mtd        = NULL;
-static struct mtd_info *ppchameleonevb_mtd = NULL;
-
-/*
- * Module stuff
- */
-static int ppchameleon_fio_pbase       = CFG_NAND0_PADDR;
-static int ppchameleonevb_fio_pbase = CFG_NAND1_PADDR;
-
-#ifdef MODULE
-MODULE_PARM(ppchameleon_fio_pbase, "i");
-__setup("ppchameleon_fio_pbase=",ppchameleon_fio_pbase);
-MODULE_PARM(ppchameleonevb_fio_pbase, "i");
-__setup("ppchameleonevb_fio_pbase=",ppchameleonevb_fio_pbase);
-#endif
-
-/* Internal buffers. Page buffer and oob buffer for one block */
-static u_char data_buf[2048 + 64];
-static u_char oob_buf[64 * 64];
-static u_char data_buf_evb[512 + 16];
-static u_char oob_buf_evb[16 * 32];
-
-#ifdef CONFIG_MTD_PARTITIONS
-/*
- * Define static partitions for flash devices
- */
-static struct mtd_partition partition_info_hi[] = {
-       { name: "PPChameleon HI Nand Flash",
-                 offset: 0,
-                 size: 128*1024*1024 }
-};
-
-static struct mtd_partition partition_info_me[] = {
-       { name: "PPChameleon ME Nand Flash",
-                 offset: 0,
-                 size: 32*1024*1024 }
-};
-
-static struct mtd_partition partition_info_evb[] = {
-       { name: "PPChameleonEVB Nand Flash",
-                 offset: 0,
-                 size: 32*1024*1024 }
-};
-
-#define NUM_PARTITIONS 1
-
-extern int parse_cmdline_partitions(struct mtd_info *master,
-                                   struct mtd_partition **pparts,
-                                   const char *mtd_id);
-#endif
-
-
-/*
- *     hardware specific access to control-lines
- */
-static void ppchameleon_hwcontrol(struct mtd_info *mtdinfo, int cmd)
-{
-       switch(cmd) {
-
-       case NAND_CTL_SETCLE:
-               MACRO_NAND_CTL_SETCLE((unsigned long)CFG_NAND0_PADDR);
-               break;
-       case NAND_CTL_CLRCLE:
-               MACRO_NAND_CTL_CLRCLE((unsigned long)CFG_NAND0_PADDR);
-               break;
-       case NAND_CTL_SETALE:
-               MACRO_NAND_CTL_SETALE((unsigned long)CFG_NAND0_PADDR);
-               break;
-       case NAND_CTL_CLRALE:
-               MACRO_NAND_CTL_CLRALE((unsigned long)CFG_NAND0_PADDR);
-               break;
-       case NAND_CTL_SETNCE:
-                       MACRO_NAND_ENABLE_CE((unsigned long)CFG_NAND0_PADDR);
-               break;
-       case NAND_CTL_CLRNCE:
-                       MACRO_NAND_DISABLE_CE((unsigned long)CFG_NAND0_PADDR);
-               break;
-       }
-}
-
-static void ppchameleonevb_hwcontrol(struct mtd_info *mtdinfo, int cmd)
-{
-       switch(cmd) {
-
-       case NAND_CTL_SETCLE:
-               MACRO_NAND_CTL_SETCLE((unsigned long)CFG_NAND1_PADDR);
-               break;
-       case NAND_CTL_CLRCLE:
-               MACRO_NAND_CTL_CLRCLE((unsigned long)CFG_NAND1_PADDR);
-               break;
-       case NAND_CTL_SETALE:
-               MACRO_NAND_CTL_SETALE((unsigned long)CFG_NAND1_PADDR);
-               break;
-       case NAND_CTL_CLRALE:
-               MACRO_NAND_CTL_CLRALE((unsigned long)CFG_NAND1_PADDR);
-               break;
-       case NAND_CTL_SETNCE:
-               MACRO_NAND_ENABLE_CE((unsigned long)CFG_NAND1_PADDR);
-               break;
-       case NAND_CTL_CLRNCE:
-               MACRO_NAND_DISABLE_CE((unsigned long)CFG_NAND1_PADDR);
-               break;
-       }
-}
-
-#ifdef USE_READY_BUSY_PIN
-/*
- *     read device ready pin
- */
-static int ppchameleon_device_ready(struct mtd_info *minfo)
-{
-       if (in_be32((volatile unsigned*)GPIO0_IR) & NAND_RB_GPIO_PIN)
-               return 1;
-       return 0;
-}
-
-static int ppchameleonevb_device_ready(struct mtd_info *minfo)
-{
-       if (in_be32((volatile unsigned*)GPIO0_IR) & NAND_EVB_RB_GPIO_PIN)
-       return 1;
-       return 0;
-}
-#endif
-
-#ifdef CONFIG_MTD_PARTITIONS
-const char *part_probes[] = { "cmdlinepart", NULL };
-const char *part_probes_evb[] = { "cmdlinepart", NULL };
-#endif
-
-/*
- * Main initialization routine
- */
-static int __init ppchameleonevb_init (void)
-{
-       struct nand_chip *this;
-       const char *part_type = 0;
-       int mtd_parts_nb = 0;
-       struct mtd_partition *mtd_parts = 0;
-       int ppchameleon_fio_base;
-       int ppchameleonevb_fio_base;
-
-
-       /*********************************
-       * Processor module NAND (if any) *
-       *********************************/
-       /* Allocate memory for MTD device structure and private data */
-       ppchameleon_mtd = kmalloc(sizeof(struct mtd_info) +
-                            sizeof(struct nand_chip),
-                            GFP_KERNEL);
-       if (!ppchameleon_mtd) {
-               printk("Unable to allocate PPChameleon NAND MTD device structure.\n");
-               return -ENOMEM;
-       }
-
-       /* map physical address */
-       ppchameleon_fio_base = (unsigned long)ioremap(ppchameleon_fio_pbase, SZ_4M);
-       if(!ppchameleon_fio_base) {
-               printk("ioremap PPChameleon NAND flash failed\n");
-               kfree(ppchameleon_mtd);
-               return -EIO;
-       }
-
-       /* Get pointer to private data */
-       this = (struct nand_chip *) (&ppchameleon_mtd[1]);
-
-       /* Initialize structures */
-       memset((char *) ppchameleon_mtd, 0, sizeof(struct mtd_info));
-       memset((char *) this, 0, sizeof(struct nand_chip));
-
-       /* Link the private data with the MTD structure */
-       ppchameleon_mtd->priv = this;
-
-        /* Initialize GPIOs */
-       /* Pin mapping for NAND chip */
-       /*
-               CE      GPIO_01
-               CLE     GPIO_02
-               ALE     GPIO_03
-               R/B     GPIO_04
-       */
-       /* output select */
-       out_be32((volatile unsigned*)GPIO0_OSRH, in_be32((volatile unsigned*)GPIO0_OSRH) & 0xC0FFFFFF);
-       /* three-state select */
-       out_be32((volatile unsigned*)GPIO0_TSRH, in_be32((volatile unsigned*)GPIO0_TSRH) & 0xC0FFFFFF);
-       /* enable output driver */
-       out_be32((volatile unsigned*)GPIO0_TCR, in_be32((volatile unsigned*)GPIO0_TCR) | NAND_nCE_GPIO_PIN | NAND_CLE_GPIO_PIN | NAND_ALE_GPIO_PIN);
-#ifdef USE_READY_BUSY_PIN
-       /* three-state select */
-       out_be32((volatile unsigned*)GPIO0_TSRH, in_be32((volatile unsigned*)GPIO0_TSRH) & 0xFF3FFFFF);
-       /* high-impedecence */
-       out_be32((volatile unsigned*)GPIO0_TCR, in_be32((volatile unsigned*)GPIO0_TCR) & (~NAND_RB_GPIO_PIN));
-       /* input select */
-       out_be32((volatile unsigned*)GPIO0_ISR1H, (in_be32((volatile unsigned*)GPIO0_ISR1H) & 0xFF3FFFFF) | 0x00400000);
-#endif
-
-       /* insert callbacks */
-       this->IO_ADDR_R = ppchameleon_fio_base;
-       this->IO_ADDR_W = ppchameleon_fio_base;
-       this->hwcontrol = ppchameleon_hwcontrol;
-#ifdef USE_READY_BUSY_PIN
-       this->dev_ready = ppchameleon_device_ready;
-#endif
-       this->chip_delay = NAND_BIG_DELAY_US;
-       /* ECC mode */
-       this->eccmode = NAND_ECC_SOFT;
-
-       /* Set internal data buffer */
-       this->data_buf = data_buf;
-       this->oob_buf = oob_buf;
-
-       /* Scan to find existence of the device (it could not be mounted) */
-       if (nand_scan (ppchameleon_mtd, 1)) {
-               iounmap((void *)ppchameleon_fio_base);
-               kfree (ppchameleon_mtd);
-               goto nand_evb_init;
-       }
-
-#ifndef USE_READY_BUSY_PIN
-       /* Adjust delay if necessary */
-       if (ppchameleon_mtd->size == NAND_SMALL_SIZE)
-               this->chip_delay = NAND_SMALL_DELAY_US;
-#endif
-
-#ifdef CONFIG_MTD_PARTITIONS
-       ppchameleon_mtd->name = "ppchameleon-nand";
-       mtd_parts_nb = parse_mtd_partitions(ppchameleon_mtd, part_probes, &mtd_parts, 0);
-       if (mtd_parts_nb > 0)
-         part_type = "command line";
-       else
-         mtd_parts_nb = 0;
-#endif
-       if (mtd_parts_nb == 0)
-       {
-               if (ppchameleon_mtd->size == NAND_SMALL_SIZE)
-                       mtd_parts = partition_info_me;
-               else
-                       mtd_parts = partition_info_hi;
-               mtd_parts_nb = NUM_PARTITIONS;
-               part_type = "static";
-       }
-
-       /* Register the partitions */
-       printk(KERN_NOTICE "Using %s partition definition\n", part_type);
-       add_mtd_partitions(ppchameleon_mtd, mtd_parts, mtd_parts_nb);
-
-nand_evb_init:
-       /****************************
-       * EVB NAND (always present) *
-       ****************************/
-       /* Allocate memory for MTD device structure and private data */
-       ppchameleonevb_mtd = kmalloc(sizeof(struct mtd_info) +
-                            sizeof(struct nand_chip),
-                            GFP_KERNEL);
-       if (!ppchameleonevb_mtd) {
-               printk("Unable to allocate PPChameleonEVB NAND MTD device structure.\n");
-               return -ENOMEM;
-       }
-
-       /* map physical address */
-       ppchameleonevb_fio_base = (unsigned long)ioremap(ppchameleonevb_fio_pbase, SZ_4M);
-       if(!ppchameleonevb_fio_base) {
-               printk("ioremap PPChameleonEVB NAND flash failed\n");
-               kfree(ppchameleonevb_mtd);
-               return -EIO;
-       }
-
-       /* Get pointer to private data */
-       this = (struct nand_chip *) (&ppchameleonevb_mtd[1]);
-
-       /* Initialize structures */
-       memset((char *) ppchameleonevb_mtd, 0, sizeof(struct mtd_info));
-       memset((char *) this, 0, sizeof(struct nand_chip));
-
-       /* Link the private data with the MTD structure */
-       ppchameleonevb_mtd->priv = this;
-
-        /* Initialize GPIOs */
-       /* Pin mapping for NAND chip */
-       /*
-               CE      GPIO_14
-               CLE     GPIO_15
-               ALE     GPIO_16
-               R/B     GPIO_31
-       */
-       /* output select */
-       out_be32((volatile unsigned*)GPIO0_OSRH, in_be32((volatile unsigned*)GPIO0_OSRH) & 0xFFFFFFF0);
-       out_be32((volatile unsigned*)GPIO0_OSRL, in_be32((volatile unsigned*)GPIO0_OSRL) & 0x3FFFFFFF);
-       /* three-state select */
-       out_be32((volatile unsigned*)GPIO0_TSRH, in_be32((volatile unsigned*)GPIO0_TSRH) & 0xFFFFFFF0);
-       out_be32((volatile unsigned*)GPIO0_TSRL, in_be32((volatile unsigned*)GPIO0_TSRL) & 0x3FFFFFFF);
-       /* enable output driver */
-       out_be32((volatile unsigned*)GPIO0_TCR, in_be32((volatile unsigned*)GPIO0_TCR) | NAND_EVB_nCE_GPIO_PIN | NAND_EVB_CLE_GPIO_PIN | NAND_EVB_ALE_GPIO_PIN);
-#ifdef USE_READY_BUSY_PIN
-       /* three-state select */
-       out_be32((volatile unsigned*)GPIO0_TSRL, in_be32((volatile unsigned*)GPIO0_TSRL) & 0xFFFFFFFC);
-       /* high-impedecence */
-       out_be32((volatile unsigned*)GPIO0_TCR, in_be32((volatile unsigned*)GPIO0_TCR) & (~NAND_EVB_RB_GPIO_PIN));
-       /* input select */
-       out_be32((volatile unsigned*)GPIO0_ISR1L, (in_be32((volatile unsigned*)GPIO0_ISR1L) & 0xFFFFFFFC) | 0x00000001);
-#endif
-
-
-       /* insert callbacks */
-       this->IO_ADDR_R = ppchameleonevb_fio_base;
-       this->IO_ADDR_W = ppchameleonevb_fio_base;
-       this->hwcontrol = ppchameleonevb_hwcontrol;
-#ifdef USE_READY_BUSY_PIN
-       this->dev_ready = ppchameleonevb_device_ready;
-#endif
-       this->chip_delay = NAND_SMALL_DELAY_US;
-
-       /* ECC mode */
-       this->eccmode = NAND_ECC_SOFT;
-
-       /* Set internal data buffer */
-       this->data_buf = data_buf_evb;
-       this->oob_buf = oob_buf_evb;
-
-       /* Scan to find existence of the device */
-       if (nand_scan (ppchameleonevb_mtd, 1)) {
-               iounmap((void *)ppchameleonevb_fio_base);
-               kfree (ppchameleonevb_mtd);
-               return -ENXIO;
-       }
-
-#ifdef CONFIG_MTD_PARTITIONS
-       ppchameleonevb_mtd->name = NAND_EVB_MTD_NAME;
-       mtd_parts_nb = parse_mtd_partitions(ppchameleonevb_mtd, part_probes_evb, &mtd_parts, 0);
-       if (mtd_parts_nb > 0)
-         part_type = "command line";
-       else
-         mtd_parts_nb = 0;
-#endif
-       if (mtd_parts_nb == 0)
-       {
-               mtd_parts = partition_info_evb;
-               mtd_parts_nb = NUM_PARTITIONS;
-               part_type = "static";
-       }
-
-       /* Register the partitions */
-       printk(KERN_NOTICE "Using %s partition definition\n", part_type);
-       add_mtd_partitions(ppchameleonevb_mtd, mtd_parts, mtd_parts_nb);
-
-       /* Return happy */
-       return 0;
-}
-module_init(ppchameleonevb_init);
-
-/*
- * Clean up routine
- */
-static void __exit ppchameleonevb_cleanup (void)
-{
-       struct nand_chip *this = (struct nand_chip *) &ppchameleonevb_mtd[1];
-
-       /* Unregister the device */
-       del_mtd_device (ppchameleonevb_mtd);
-
-       /* Free internal data buffer */
-       kfree (this->data_buf);
-
-       /* Free the MTD device structure */
-       kfree (ppchameleonevb_mtd);
-}
-module_exit(ppchameleonevb_cleanup);
-
-MODULE_LICENSE("GPL");
-MODULE_AUTHOR("DAVE Srl <support-ppchameleon@dave-tech.it>");
-MODULE_DESCRIPTION("MTD map driver for DAVE Srl PPChameleonEVB board");
diff --git a/drivers/mtd/nand/toto.c b/drivers/mtd/nand/toto.c
deleted file mode 100644 (file)
index ecb9f3d..0000000
+++ /dev/null
@@ -1,221 +0,0 @@
-/*
- *  drivers/mtd/nand/toto.c
- *
- *  Copyright (c) 2003 Texas Instruments
- *
- *  Derived from drivers/mtd/autcpu12.c
- *
- *  Copyright (c) 2002 Thomas Gleixner <tgxl@linutronix.de>
- *
- * 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.
- *
- *  Overview:
- *   This is a device driver for the NAND flash device found on the
- *   TI fido board. It supports 32MiB and 64MiB cards
- *
- * $Id: toto.c,v 1.2 2003/10/21 10:04:58 dwmw2 Exp $
- */
-
-#include <linux/slab.h>
-#include <linux/init.h>
-#include <linux/module.h>
-#include <linux/delay.h>
-#include <linux/mtd/mtd.h>
-#include <linux/mtd/nand.h>
-#include <linux/mtd/partitions.h>
-#include <asm/io.h>
-#include <asm/arch/hardware.h>
-#include <asm/sizes.h>
-#include <asm/arch/toto.h>
-#include <asm/arch-omap1510/hardware.h>
-#include <asm/arch/gpio.h>
-
-/*
- * MTD structure for TOTO board
- */
-static struct mtd_info *toto_mtd = NULL;
-
-static int toto_io_base = OMAP_FLASH_1_BASE;
-
-#define CONFIG_NAND_WORKAROUND 1
-
-#define NAND_NCE 0x4000
-#define NAND_CLE 0x1000
-#define NAND_ALE 0x0002
-#define NAND_MASK (NAND_CLE | NAND_ALE | NAND_NCE)
-
-#define T_NAND_CTL_CLRALE(iob)  gpiosetout(NAND_ALE, 0)
-#define T_NAND_CTL_SETALE(iob)  gpiosetout(NAND_ALE, NAND_ALE)
-#ifdef CONFIG_NAND_WORKAROUND     /* "some" dev boards busted, blue wired to rts2 :( */
-#define T_NAND_CTL_CLRCLE(iob)  gpiosetout(NAND_CLE, 0); rts2setout(2, 2)
-#define T_NAND_CTL_SETCLE(iob)  gpiosetout(NAND_CLE, NAND_CLE); rts2setout(2, 0)
-#else
-#define T_NAND_CTL_CLRCLE(iob)  gpiosetout(NAND_CLE, 0)
-#define T_NAND_CTL_SETCLE(iob)  gpiosetout(NAND_CLE, NAND_CLE)
-#endif
-#define T_NAND_CTL_SETNCE(iob)  gpiosetout(NAND_NCE, 0)
-#define T_NAND_CTL_CLRNCE(iob)  gpiosetout(NAND_NCE, NAND_NCE)
-                
-/*
- * Define partitions for flash devices
- */
-
-static struct mtd_partition partition_info64M[] = {
-       { .name =       "toto kernel partition 1",
-         .offset =     0,
-         .size =       2 * SZ_1M },
-       { .name =       "toto file sys partition 2",
-         .offset =     2 * SZ_1M,
-         .size =       14 * SZ_1M },
-       { .name =       "toto user partition 3",
-         .offset =     16 * SZ_1M,
-         .size =       16 * SZ_1M },
-       { .name =       "toto devboard extra partition 4",
-         .offset =     32 * SZ_1M,
-         .size =       32 * SZ_1M },
-};
-
-static struct mtd_partition partition_info32M[] = {
-       { .name =       "toto kernel partition 1",
-         .offset =     0,
-         .size =       2 * SZ_1M },
-       { .name =       "toto file sys partition 2",
-         .offset =     2 * SZ_1M,
-         .size =       14 * SZ_1M },
-       { .name =       "toto user partition 3",
-         .offset =     16 * SZ_1M,
-         .size =       16 * SZ_1M },
-};
-
-#define NUM_PARTITIONS32M 3
-#define NUM_PARTITIONS64M 4
-/* 
- *     hardware specific access to control-lines
-*/
-
-static void toto_hwcontrol(struct mtd_info *mtd, int cmd)
-{
-
-       udelay(1); /* hopefully enough time for tc make proceding write to clear */
-       switch(cmd){
-
-               case NAND_CTL_SETCLE: T_NAND_CTL_SETCLE(cmd); break;
-               case NAND_CTL_CLRCLE: T_NAND_CTL_CLRCLE(cmd); break;
-
-               case NAND_CTL_SETALE: T_NAND_CTL_SETALE(cmd); break;
-               case NAND_CTL_CLRALE: T_NAND_CTL_CLRALE(cmd); break;
-
-               case NAND_CTL_SETNCE: T_NAND_CTL_SETNCE(cmd); break;
-               case NAND_CTL_CLRNCE: T_NAND_CTL_CLRNCE(cmd); break;
-       }
-       udelay(1); /* allow time to ensure gpio state to over take memory write */
-}
-
-/*
- * Main initialization routine
- */
-int __init toto_init (void)
-{
-       struct nand_chip *this;
-       int err = 0;
-
-       /* Allocate memory for MTD device structure and private data */
-       toto_mtd = kmalloc (sizeof(struct mtd_info) + sizeof (struct nand_chip),
-                               GFP_KERNEL);
-       if (!toto_mtd) {
-               printk (KERN_WARNING "Unable to allocate toto NAND MTD device structure.\n");
-               err = -ENOMEM;
-               goto out;
-       }
-
-       /* Get pointer to private data */
-       this = (struct nand_chip *) (&toto_mtd[1]);
-
-       /* Initialize structures */
-       memset((char *) toto_mtd, 0, sizeof(struct mtd_info));
-       memset((char *) this, 0, sizeof(struct nand_chip));
-
-       /* Link the private data with the MTD structure */
-       toto_mtd->priv = this;
-
-       /* Set address of NAND IO lines */
-       this->IO_ADDR_R = toto_io_base;
-       this->IO_ADDR_W = toto_io_base;
-       this->hwcontrol = toto_hwcontrol;
-       this->dev_ready = NULL;
-       /* 25 us command delay time */
-       this->chip_delay = 30;          
-       this->eccmode = NAND_ECC_SOFT;
-
-        /* Scan to find existance of the device */
-       if (nand_scan (toto_mtd, 1)) {
-               err = -ENXIO;
-               goto out_mtd;
-       }
-
-       /* Allocate memory for internal data buffer */
-       this->data_buf = kmalloc (sizeof(u_char) * (toto_mtd->oobblock + toto_mtd->oobsize), GFP_KERNEL);
-       if (!this->data_buf) {
-               printk (KERN_WARNING "Unable to allocate NAND data buffer for toto.\n");
-               err = -ENOMEM;
-               goto out_mtd;
-       }
-
-       /* Register the partitions */
-       switch(toto_mtd->size){
-               case SZ_64M: add_mtd_partitions(toto_mtd, partition_info64M, NUM_PARTITIONS64M); break; 
-               case SZ_32M: add_mtd_partitions(toto_mtd, partition_info32M, NUM_PARTITIONS32M); break; 
-               default: {
-                       printk (KERN_WARNING "Unsupported Nand device\n"); 
-                       err = -ENXIO;
-                       goto out_buf;
-               }
-       }
-
-       gpioreserve(NAND_MASK);  /* claim our gpios */
-       archflashwp(0,0);        /* open up flash for writing */
-
-       goto out;
-    
-out_buf:
-       kfree (this->data_buf);    
-out_mtd:
-       kfree (toto_mtd);
-out:
-       return err;
-}
-
-module_init(toto_init);
-
-/*
- * Clean up routine
- */
-static void __exit toto_cleanup (void)
-{
-       struct nand_chip *this = (struct nand_chip *) &toto_mtd[1];
-
-       /* Unregister partitions */
-       del_mtd_partitions(toto_mtd);
-       
-       /* Unregister the device */
-       del_mtd_device (toto_mtd);
-
-       /* Free internal data buffers */
-       kfree (this->data_buf);
-
-       /* Free the MTD device structure */
-       kfree (toto_mtd);
-
-       /* stop flash writes */
-        archflashwp(0,1);
-       
-       /* release gpios to system */
-        gpiorelease(NAND_MASK);
-}
-module_exit(toto_cleanup);
-
-MODULE_LICENSE("GPL");
-MODULE_AUTHOR("Richard Woodruff <r-woodruff2@ti.com>");
-MODULE_DESCRIPTION("Glue layer for NAND flash on toto board");
diff --git a/drivers/mtd/nand/tx4925ndfmc.c b/drivers/mtd/nand/tx4925ndfmc.c
deleted file mode 100644 (file)
index 94a6165..0000000
+++ /dev/null
@@ -1,442 +0,0 @@
-/*
- *  drivers/mtd/tx4925ndfmc.c
- *
- *  Overview:
- *   This is a device driver for the NAND flash device found on the
- *   Toshiba RBTX4925 reference board, which is a SmartMediaCard. It supports 
- *   16MiB, 32MiB and 64MiB cards.
- *
- * Author: MontaVista Software, Inc.  source@mvista.com
- *
- * Derived from drivers/mtd/autcpu12.c
- *       Copyright (c) 2001 Thomas Gleixner (gleixner@autronix.de)
- *
- * $Id: tx4925ndfmc.c,v 1.2 2004/03/27 19:55:53 gleixner Exp $
- *
- * Copyright (C) 2001 Toshiba Corporation 
- * 
- * 2003 (c) MontaVista Software, Inc. This file is licensed under
- * the terms of the GNU General Public License version 2. This program
- * is licensed "as is" without any warranty of any kind, whether express
- * or implied.
- *
- */
-
-#include <linux/slab.h>
-#include <linux/init.h>
-#include <linux/module.h>
-#include <linux/mtd/mtd.h>
-#include <linux/mtd/nand.h>
-#include <linux/mtd/partitions.h>
-#include <linux/delay.h>
-#include <asm/io.h>
-#include <asm/tx4925/tx4925_nand.h>
-
-extern struct nand_oobinfo jffs2_oobinfo;
-
-/*
- * MTD structure for RBTX4925 board
- */
-static struct mtd_info *tx4925ndfmc_mtd = NULL;
-
-/*
- * Module stuff
- */
-#if LINUX_VERSION_CODE < 0x20212 && defined(MODULE)
-#define tx4925ndfmc_init init_module
-#define tx4925ndfmc_cleanup cleanup_module
-#endif
-
-/*
- * Define partitions for flash devices
- */
-
-static struct mtd_partition partition_info16k[] = {
-       { .name = "RBTX4925 flash partition 1",
-         .offset =  0,
-         .size =    8 * 0x00100000 },
-       { .name = "RBTX4925 flash partition 2",
-         .offset =  8 * 0x00100000,
-         .size =    8 * 0x00100000 },
-};
-
-static struct mtd_partition partition_info32k[] = {
-       { .name = "RBTX4925 flash partition 1",
-         .offset =  0,
-         .size =    8 * 0x00100000 },
-       { .name = "RBTX4925 flash partition 2",
-         .offset = 8 * 0x00100000,
-         .size =  24 * 0x00100000 },
-};
-
-static struct mtd_partition partition_info64k[] = {
-       { .name = "User FS",
-         .offset =  0,
-         .size =   16 * 0x00100000 },
-       { .name = "RBTX4925 flash partition 2",
-         .offset = 16 * 0x00100000,
-         .size =   48 * 0x00100000},
-};
-
-static struct mtd_partition partition_info128k[] = {
-       { .name = "Skip bad section",
-         .offset =  0,
-         .size =   16 * 0x00100000 },
-       { .name = "User FS",
-         .offset = 16 * 0x00100000,
-         .size =   112 * 0x00100000 },
-};
-#define NUM_PARTITIONS16K  2
-#define NUM_PARTITIONS32K  2
-#define NUM_PARTITIONS64K  2
-#define NUM_PARTITIONS128K 2
-
-/* 
- *     hardware specific access to control-lines
-*/
-static void tx4925ndfmc_hwcontrol(struct mtd_info *mtd, int cmd)
-{
-
-       switch(cmd){
-
-               case NAND_CTL_SETCLE: 
-                       tx4925_ndfmcptr->mcr |= TX4925_NDFMCR_CLE;
-                       break;
-               case NAND_CTL_CLRCLE:
-                       tx4925_ndfmcptr->mcr &= ~TX4925_NDFMCR_CLE;
-                       break;
-               case NAND_CTL_SETALE:
-                       tx4925_ndfmcptr->mcr |= TX4925_NDFMCR_ALE;
-                       break;
-               case NAND_CTL_CLRALE: 
-                       tx4925_ndfmcptr->mcr &= ~TX4925_NDFMCR_ALE;
-                       break;
-               case NAND_CTL_SETNCE:
-                       tx4925_ndfmcptr->mcr |= TX4925_NDFMCR_CE;
-                       break;
-               case NAND_CTL_CLRNCE:
-                       tx4925_ndfmcptr->mcr &= ~TX4925_NDFMCR_CE;
-                       break;
-               case NAND_CTL_SETWP:
-                       tx4925_ndfmcptr->mcr |= TX4925_NDFMCR_WE;
-                       break;
-               case NAND_CTL_CLRWP:
-                       tx4925_ndfmcptr->mcr &= ~TX4925_NDFMCR_WE;
-                       break;
-       }
-}
-
-/*
-*      read device ready pin
-*/
-static int tx4925ndfmc_device_ready(struct mtd_info *mtd)
-{
-       int ready;
-       ready = (tx4925_ndfmcptr->sr & TX4925_NDSFR_BUSY) ? 0 : 1;
-       return ready;
-}
-void tx4925ndfmc_enable_hwecc(struct mtd_info *mtd, int mode)
-{
-       /* reset first */
-       tx4925_ndfmcptr->mcr |= TX4925_NDFMCR_ECC_CNTL_MASK;
-       tx4925_ndfmcptr->mcr &= ~TX4925_NDFMCR_ECC_CNTL_MASK;
-       tx4925_ndfmcptr->mcr |= TX4925_NDFMCR_ECC_CNTL_ENAB;
-}
-static void tx4925ndfmc_disable_ecc(void)
-{
-       tx4925_ndfmcptr->mcr &= ~TX4925_NDFMCR_ECC_CNTL_MASK;
-}
-static void tx4925ndfmc_enable_read_ecc(void)
-{
-       tx4925_ndfmcptr->mcr &= ~TX4925_NDFMCR_ECC_CNTL_MASK;
-       tx4925_ndfmcptr->mcr |= TX4925_NDFMCR_ECC_CNTL_READ;
-}
-void tx4925ndfmc_readecc(struct mtd_info *mtd, const u_char *dat, u_char *ecc_code){
-       int i;
-       u_char *ecc = ecc_code;
-        tx4925ndfmc_enable_read_ecc();
-       for (i = 0;i < 6;i++,ecc++)
-               *ecc = tx4925_read_nfmc(&(tx4925_ndfmcptr->dtr));
-        tx4925ndfmc_disable_ecc();
-}
-void tx4925ndfmc_device_setup(void)
-{
-
-       *(unsigned char *)0xbb005000 &= ~0x08;
-
-        /* reset NDFMC */
-        tx4925_ndfmcptr->rstr |= TX4925_NDFRSTR_RST;
-       while (tx4925_ndfmcptr->rstr & TX4925_NDFRSTR_RST);       
-
-       /* setup BusSeparete, Hold Time, Strobe Pulse Width */
-       tx4925_ndfmcptr->mcr = TX4925_BSPRT ? TX4925_NDFMCR_BSPRT : 0;
-       tx4925_ndfmcptr->spr = TX4925_HOLD << 4 | TX4925_SPW;             
-}
-static u_char tx4925ndfmc_nand_read_byte(struct mtd_info *mtd)
-{
-        struct nand_chip *this = mtd->priv;
-        return tx4925_read_nfmc(this->IO_ADDR_R);
-}
-
-static void tx4925ndfmc_nand_write_byte(struct mtd_info *mtd, u_char byte)
-{
-        struct nand_chip *this = mtd->priv;
-        tx4925_write_nfmc(byte, this->IO_ADDR_W);
-}
-
-static void tx4925ndfmc_nand_write_buf(struct mtd_info *mtd, const u_char *buf, int len)
-{
-       int i;
-       struct nand_chip *this = mtd->priv;
-
-       for (i=0; i<len; i++)
-               tx4925_write_nfmc(buf[i], this->IO_ADDR_W);
-}
-
-static void tx4925ndfmc_nand_read_buf(struct mtd_info *mtd, u_char *buf, int len)
-{
-       int i;
-       struct nand_chip *this = mtd->priv;
-
-       for (i=0; i<len; i++)
-               buf[i] = tx4925_read_nfmc(this->IO_ADDR_R);
-}
-
-static int tx4925ndfmc_nand_verify_buf(struct mtd_info *mtd, const u_char *buf, int len)
-{
-       int i;
-       struct nand_chip *this = mtd->priv;
-
-       for (i=0; i<len; i++)
-               if (buf[i] != tx4925_read_nfmc(this->IO_ADDR_R))
-                       return -EFAULT;
-
-       return 0;
-}
-
-/*
- * Send command to NAND device
- */
-static void tx4925ndfmc_nand_command (struct mtd_info *mtd, unsigned command, int column, int page_addr)
-{
-       register struct nand_chip *this = mtd->priv;
-
-       /* Begin command latch cycle */
-       this->hwcontrol(mtd, NAND_CTL_SETCLE);
-       /*
-        * Write out the command to the device.
-        */
-       if (command == NAND_CMD_SEQIN) {
-               int readcmd;
-
-               if (column >= mtd->oobblock) {
-                       /* OOB area */
-                       column -= mtd->oobblock;
-                       readcmd = NAND_CMD_READOOB;
-               } else if (column < 256) {
-                       /* First 256 bytes --> READ0 */
-                       readcmd = NAND_CMD_READ0;
-               } else {
-                       column -= 256;
-                       readcmd = NAND_CMD_READ1;
-               }
-               this->write_byte(mtd, readcmd);
-       }
-       this->write_byte(mtd, command);
-
-       /* Set ALE and clear CLE to start address cycle */
-       this->hwcontrol(mtd, NAND_CTL_CLRCLE);
-
-       if (column != -1 || page_addr != -1) {
-               this->hwcontrol(mtd, NAND_CTL_SETALE);
-
-               /* Serially input address */
-               if (column != -1)
-                       this->write_byte(mtd, column);
-               if (page_addr != -1) {
-                       this->write_byte(mtd, (unsigned char) (page_addr & 0xff));
-                       this->write_byte(mtd, (unsigned char) ((page_addr >> 8) & 0xff));
-                       /* One more address cycle for higher density devices */
-                       if (mtd->size & 0x0c000000) 
-                               this->write_byte(mtd, (unsigned char) ((page_addr >> 16) & 0x0f));
-               }
-               /* Latch in address */
-               this->hwcontrol(mtd, NAND_CTL_CLRALE);
-       }
-       
-       /* 
-        * program and erase have their own busy handlers 
-        * status and sequential in needs no delay
-       */
-       switch (command) {
-                       
-       case NAND_CMD_PAGEPROG:
-               /* Turn off WE */
-               this->hwcontrol (mtd, NAND_CTL_CLRWP);
-                return;
-
-       case NAND_CMD_SEQIN:
-               /* Turn on WE */
-               this->hwcontrol (mtd, NAND_CTL_SETWP);
-                return;
-
-       case NAND_CMD_ERASE1:
-       case NAND_CMD_ERASE2:
-       case NAND_CMD_STATUS:
-               return;
-
-       case NAND_CMD_RESET:
-               if (this->dev_ready)    
-                       break;
-               this->hwcontrol(mtd, NAND_CTL_SETCLE);
-               this->write_byte(mtd, NAND_CMD_STATUS);
-               this->hwcontrol(mtd, NAND_CTL_CLRCLE);
-               while ( !(this->read_byte(mtd) & 0x40));
-               return;
-
-       /* This applies to read commands */     
-       default:
-               /* 
-                * If we don't have access to the busy pin, we apply the given
-                * command delay
-               */
-               if (!this->dev_ready) {
-                       udelay (this->chip_delay);
-                       return;
-               }       
-       }
-       
-       /* wait until command is processed */
-       while (!this->dev_ready(mtd));
-}
-
-#ifdef CONFIG_MTD_CMDLINE_PARTS
-extern int parse_cmdline_partitions(struct mtd_info *master, struct mtd_partitio
-n **pparts, char *);
-#endif
-
-/*
- * Main initialization routine
- */
-extern int nand_correct_data(struct mtd_info *mtd, u_char *dat, u_char *read_ecc, u_char *calc_ecc);
-int __init tx4925ndfmc_init (void)
-{
-       struct nand_chip *this;
-       int err = 0;
-
-       /* Allocate memory for MTD device structure and private data */
-       tx4925ndfmc_mtd = kmalloc (sizeof(struct mtd_info) + sizeof (struct nand_chip),
-                               GFP_KERNEL);
-       if (!tx4925ndfmc_mtd) {
-               printk ("Unable to allocate RBTX4925 NAND MTD device structure.\n");
-               err = -ENOMEM;
-               goto out;
-       }
-
-        tx4925ndfmc_device_setup();
-
-       /* io is indirect via a register so don't need to ioremap address */
-
-       /* Get pointer to private data */
-       this = (struct nand_chip *) (&tx4925ndfmc_mtd[1]);
-
-       /* Initialize structures */
-       memset((char *) tx4925ndfmc_mtd, 0, sizeof(struct mtd_info));
-       memset((char *) this, 0, sizeof(struct nand_chip));
-
-       /* Link the private data with the MTD structure */
-       tx4925ndfmc_mtd->priv = this;
-
-       /* Set address of NAND IO lines */
-       this->IO_ADDR_R = (unsigned long)&(tx4925_ndfmcptr->dtr);
-       this->IO_ADDR_W = (unsigned long)&(tx4925_ndfmcptr->dtr);
-       this->hwcontrol = tx4925ndfmc_hwcontrol;
-       this->enable_hwecc = tx4925ndfmc_enable_hwecc;
-       this->calculate_ecc = tx4925ndfmc_readecc;
-       this->correct_data = nand_correct_data;
-       this->eccmode = NAND_ECC_HW6_512;       
-       this->dev_ready = tx4925ndfmc_device_ready;
-       /* 20 us command delay time */
-       this->chip_delay = 20;          
-        this->read_byte = tx4925ndfmc_nand_read_byte;
-        this->write_byte = tx4925ndfmc_nand_write_byte;
-       this->cmdfunc = tx4925ndfmc_nand_command;
-       this->write_buf = tx4925ndfmc_nand_write_buf;
-       this->read_buf = tx4925ndfmc_nand_read_buf;
-       this->verify_buf = tx4925ndfmc_nand_verify_buf;
-
-       /* Scan to find existance of the device */
-       if (nand_scan (tx4925ndfmc_mtd, 1)) {
-               err = -ENXIO;
-               goto out_ior;
-       }
-
-       /* Allocate memory for internal data buffer */
-       this->data_buf = kmalloc (sizeof(u_char) * (tx4925ndfmc_mtd->oobblock + tx4925ndfmc_mtd->oobsize), GFP_KERNEL);
-       if (!this->data_buf) {
-               printk ("Unable to allocate NAND data buffer for RBTX4925.\n");
-               err = -ENOMEM;
-               goto out_ior;
-       }
-
-       /* Register the partitions */
-#ifdef CONFIG_MTD_CMDLINE_PARTS
-        {
-                int mtd_parts_nb = 0;
-                struct mtd_partition *mtd_parts = 0;
-                mtd_parts_nb = parse_cmdline_partitions(tx4925ndfmc_mtd, &mtd_parts, "tx4925ndfmc");
-                if (mtd_parts_nb > 0)
-                        add_mtd_partitions(tx4925ndfmc_mtd, mtd_parts, mtd_parts_nb);
-                else
-                        add_mtd_device(tx4925ndfmc_mtd);
-        }
-#else /* ifdef CONFIG_MTD_CMDLINE_PARTS */
-       switch(tx4925ndfmc_mtd->size){
-               case 0x01000000: add_mtd_partitions(tx4925ndfmc_mtd, partition_info16k, NUM_PARTITIONS16K); break;
-               case 0x02000000: add_mtd_partitions(tx4925ndfmc_mtd, partition_info32k, NUM_PARTITIONS32K); break;
-               case 0x04000000: add_mtd_partitions(tx4925ndfmc_mtd, partition_info64k, NUM_PARTITIONS64K); break; 
-               case 0x08000000: add_mtd_partitions(tx4925ndfmc_mtd, partition_info128k, NUM_PARTITIONS128K); break; 
-               default: {
-                       printk ("Unsupported SmartMedia device\n"); 
-                       err = -ENXIO;
-                       goto out_buf;
-               }
-       }
-#endif /* ifdef CONFIG_MTD_CMDLINE_PARTS */
-       goto out;
-
-out_buf:
-       kfree (this->data_buf);    
-out_ior:
-out:
-       return err;
-}
-
-module_init(tx4925ndfmc_init);
-
-/*
- * Clean up routine
- */
-#ifdef MODULE
-static void __exit tx4925ndfmc_cleanup (void)
-{
-       struct nand_chip *this = (struct nand_chip *) &tx4925ndfmc_mtd[1];
-
-       /* Unregister partitions */
-       del_mtd_partitions(tx4925ndfmc_mtd);
-       
-       /* Unregister the device */
-       del_mtd_device (tx4925ndfmc_mtd);
-
-       /* Free internal data buffers */
-       kfree (this->data_buf);
-
-       /* Free the MTD device structure */
-       kfree (tx4925ndfmc_mtd);
-}
-module_exit(tx4925ndfmc_cleanup);
-#endif
-
-MODULE_LICENSE("GPL");
-MODULE_AUTHOR("Alice Hennessy <ahennessy@mvista.com>");
-MODULE_DESCRIPTION("Glue layer for SmartMediaCard on Toshiba RBTX4925");
diff --git a/drivers/mtd/nand/tx4938ndfmc.c b/drivers/mtd/nand/tx4938ndfmc.c
deleted file mode 100644 (file)
index f2375b2..0000000
+++ /dev/null
@@ -1,422 +0,0 @@
-/*
- * drivers/mtd/nand/tx4938ndfmc.c
- *
- *  Overview:
- *   This is a device driver for the NAND flash device connected to
- *   TX4938 internal NAND Memory Controller.
- *   TX4938 NDFMC is almost same as TX4925 NDFMC, but register size are 64 bit.
- *
- * Author: source@mvista.com
- *
- * Based on spia.c by Steven J. Hill
- *
- * $Id: tx4938ndfmc.c,v 1.2 2004/03/27 19:55:53 gleixner Exp $
- *
- * Copyright (C) 2000-2001 Toshiba Corporation 
- *
- * 2003 (c) MontaVista Software, Inc. This file is licensed under the
- * terms of the GNU General Public License version 2. This program is
- * licensed "as is" without any warranty of any kind, whether express
- * or implied.
- */
-#include <linux/config.h>
-#include <linux/slab.h>
-#include <linux/init.h>
-#include <linux/module.h>
-#include <linux/mtd/mtd.h>
-#include <linux/mtd/nand.h>
-#include <linux/mtd/nand_ecc.h>
-#include <linux/mtd/partitions.h>
-#include <asm/io.h>
-#include <asm/bootinfo.h>
-#include <linux/delay.h>
-#include <asm/tx4938/rbtx4938.h>
-
-extern struct nand_oobinfo jffs2_oobinfo;
-
-/*
- * MTD structure for TX4938 NDFMC
- */
-static struct mtd_info *tx4938ndfmc_mtd;
-
-/*
- * Define partitions for flash device
- */
-#define flush_wb()     (void)tx4938_ndfmcptr->mcr;
-
-#define NUM_PARTITIONS         3
-#define NUMBER_OF_CIS_BLOCKS   24
-#define SIZE_OF_BLOCK          0x00004000
-#define NUMBER_OF_BLOCK_PER_ZONE 1024
-#define SIZE_OF_ZONE           (NUMBER_OF_BLOCK_PER_ZONE * SIZE_OF_BLOCK)
-#ifndef CONFIG_MTD_CMDLINE_PARTS
-/*
- * You can use the following sample of MTD partitions 
- * on the NAND Flash Memory 32MB or more.
- *
- * The following figure shows the image of the sample partition on
- * the 32MB NAND Flash Memory. 
- *
- *   Block No.
- *    0 +-----------------------------+ ------
- *      |             CIS             |   ^
- *   24 +-----------------------------+   |
- *      |         kernel image        |   | Zone 0
- *      |                             |   |
- *      +-----------------------------+   |
- * 1023 |         unused area         |   v
- *      +-----------------------------+ ------
- * 1024 |            JFFS2            |   ^
- *      |                             |   |
- *      |                             |   | Zone 1
- *      |                             |   |
- *      |                             |   |
- *      |                             |   v
- * 2047 +-----------------------------+ ------
- *
- */
-static struct mtd_partition partition_info[NUM_PARTITIONS] = {
-       {
-               .name = "RBTX4938 CIS Area",
-               .offset =  0,
-               .size =    (NUMBER_OF_CIS_BLOCKS * SIZE_OF_BLOCK),
-               .mask_flags  = MTD_WRITEABLE    /* This partition is NOT writable */
-       },
-       {
-               .name = "RBTX4938 kernel image",
-               .offset =  MTDPART_OFS_APPEND,
-               .size =    8 * 0x00100000,      /* 8MB (Depends on size of kernel image) */
-               .mask_flags  = MTD_WRITEABLE    /* This partition is NOT writable */
-       },
-       {
-               .name = "Root FS (JFFS2)",
-               .offset =  (0 + SIZE_OF_ZONE),    /* start address of next zone */
-               .size =    MTDPART_SIZ_FULL
-       },
-};
-#endif
-
-static void tx4938ndfmc_hwcontrol(struct mtd_info *mtd, int cmd)
-{
-       switch (cmd) {
-               case NAND_CTL_SETCLE:
-                       tx4938_ndfmcptr->mcr |= TX4938_NDFMCR_CLE;
-                       break;
-               case NAND_CTL_CLRCLE:
-                       tx4938_ndfmcptr->mcr &= ~TX4938_NDFMCR_CLE;
-                       break;
-               case NAND_CTL_SETALE:
-                       tx4938_ndfmcptr->mcr |= TX4938_NDFMCR_ALE;
-                       break;
-               case NAND_CTL_CLRALE:
-                       tx4938_ndfmcptr->mcr &= ~TX4938_NDFMCR_ALE;
-                       break;
-               /* TX4938_NDFMCR_CE bit is 0:high 1:low */
-               case NAND_CTL_SETNCE:
-                       tx4938_ndfmcptr->mcr |= TX4938_NDFMCR_CE;
-                       break;
-               case NAND_CTL_CLRNCE:
-                       tx4938_ndfmcptr->mcr &= ~TX4938_NDFMCR_CE;
-                       break;
-               case NAND_CTL_SETWP:
-                       tx4938_ndfmcptr->mcr |= TX4938_NDFMCR_WE;
-                       break;
-               case NAND_CTL_CLRWP:
-                       tx4938_ndfmcptr->mcr &= ~TX4938_NDFMCR_WE;
-                       break;
-       }
-}
-static int tx4938ndfmc_dev_ready(struct mtd_info *mtd)
-{
-       flush_wb();
-       return !(tx4938_ndfmcptr->sr & TX4938_NDFSR_BUSY);
-}
-static void tx4938ndfmc_calculate_ecc(struct mtd_info *mtd, const u_char *dat, u_char *ecc_code)
-{
-       u32 mcr = tx4938_ndfmcptr->mcr;
-       mcr &= ~TX4938_NDFMCR_ECC_ALL;
-       tx4938_ndfmcptr->mcr = mcr | TX4938_NDFMCR_ECC_OFF;
-       tx4938_ndfmcptr->mcr = mcr | TX4938_NDFMCR_ECC_READ;
-       ecc_code[1] = tx4938_ndfmcptr->dtr;
-       ecc_code[0] = tx4938_ndfmcptr->dtr;
-       ecc_code[2] = tx4938_ndfmcptr->dtr;
-       tx4938_ndfmcptr->mcr = mcr | TX4938_NDFMCR_ECC_OFF;
-}
-static void tx4938ndfmc_enable_hwecc(struct mtd_info *mtd, int mode)
-{
-       u32 mcr = tx4938_ndfmcptr->mcr;
-       mcr &= ~TX4938_NDFMCR_ECC_ALL;
-       tx4938_ndfmcptr->mcr = mcr | TX4938_NDFMCR_ECC_RESET;
-       tx4938_ndfmcptr->mcr = mcr | TX4938_NDFMCR_ECC_OFF;
-       tx4938_ndfmcptr->mcr = mcr | TX4938_NDFMCR_ECC_ON;
-}
-
-static u_char tx4938ndfmc_nand_read_byte(struct mtd_info *mtd)
-{
-       struct nand_chip *this = mtd->priv;
-       return tx4938_read_nfmc(this->IO_ADDR_R);
-}
-
-static void tx4938ndfmc_nand_write_byte(struct mtd_info *mtd, u_char byte)
-{
-       struct nand_chip *this = mtd->priv;
-       tx4938_write_nfmc(byte, this->IO_ADDR_W);
-}
-
-static void tx4938ndfmc_nand_write_buf(struct mtd_info *mtd, const u_char *buf, int len)
-{
-       int i;
-       struct nand_chip *this = mtd->priv;
-
-       for (i=0; i<len; i++)
-               tx4938_write_nfmc(buf[i], this->IO_ADDR_W);
-}
-
-static void tx4938ndfmc_nand_read_buf(struct mtd_info *mtd, u_char *buf, int len)
-{
-       int i;
-       struct nand_chip *this = mtd->priv;
-
-       for (i=0; i<len; i++)
-               buf[i] = tx4938_read_nfmc(this->IO_ADDR_R);
-}
-
-static int tx4938ndfmc_nand_verify_buf(struct mtd_info *mtd, const u_char *buf, int len)
-{
-       int i;
-       struct nand_chip *this = mtd->priv;
-
-       for (i=0; i<len; i++)
-               if (buf[i] != tx4938_read_nfmc(this->IO_ADDR_R))
-                       return -EFAULT;
-
-       return 0;
-}
-
-/*
- * Send command to NAND device
- */
-static void tx4938ndfmc_nand_command (struct mtd_info *mtd, unsigned command, int column, int page_addr)
-{
-       register struct nand_chip *this = mtd->priv;
-
-       /* Begin command latch cycle */
-       this->hwcontrol(mtd, NAND_CTL_SETCLE);
-       /*
-        * Write out the command to the device.
-        */
-       if (command == NAND_CMD_SEQIN) {
-               int readcmd;
-
-               if (column >= mtd->oobblock) {
-                       /* OOB area */
-                       column -= mtd->oobblock;
-                       readcmd = NAND_CMD_READOOB;
-               } else if (column < 256) {
-                       /* First 256 bytes --> READ0 */
-                       readcmd = NAND_CMD_READ0;
-               } else {
-                       column -= 256;
-                       readcmd = NAND_CMD_READ1;
-               }
-               this->write_byte(mtd, readcmd);
-       }
-       this->write_byte(mtd, command);
-
-       /* Set ALE and clear CLE to start address cycle */
-       this->hwcontrol(mtd, NAND_CTL_CLRCLE);
-
-       if (column != -1 || page_addr != -1) {
-               this->hwcontrol(mtd, NAND_CTL_SETALE);
-
-               /* Serially input address */
-               if (column != -1)
-                       this->write_byte(mtd, column);
-               if (page_addr != -1) {
-                       this->write_byte(mtd, (unsigned char) (page_addr & 0xff));
-                       this->write_byte(mtd, (unsigned char) ((page_addr >> 8) & 0xff));
-                       /* One more address cycle for higher density devices */
-                       if (mtd->size & 0x0c000000) 
-                               this->write_byte(mtd, (unsigned char) ((page_addr >> 16) & 0x0f));
-               }
-               /* Latch in address */
-               this->hwcontrol(mtd, NAND_CTL_CLRALE);
-       }
-       
-       /* 
-        * program and erase have their own busy handlers 
-        * status and sequential in needs no delay
-       */
-       switch (command) {
-                       
-       case NAND_CMD_PAGEPROG:
-               /* Turn off WE */
-               this->hwcontrol (mtd, NAND_CTL_CLRWP);
-                return;
-
-       case NAND_CMD_SEQIN:
-               /* Turn on WE */
-               this->hwcontrol (mtd, NAND_CTL_SETWP);
-                return;
-
-       case NAND_CMD_ERASE1:
-       case NAND_CMD_ERASE2:
-       case NAND_CMD_STATUS:
-               return;
-
-       case NAND_CMD_RESET:
-               if (this->dev_ready)    
-                       break;
-               this->hwcontrol(mtd, NAND_CTL_SETCLE);
-               this->write_byte(mtd, NAND_CMD_STATUS);
-               this->hwcontrol(mtd, NAND_CTL_CLRCLE);
-               while ( !(this->read_byte(mtd) & 0x40));
-               return;
-
-       /* This applies to read commands */     
-       default:
-               /* 
-                * If we don't have access to the busy pin, we apply the given
-                * command delay
-               */
-               if (!this->dev_ready) {
-                       udelay (this->chip_delay);
-                       return;
-               }       
-       }
-       
-       /* wait until command is processed */
-       while (!this->dev_ready(mtd));
-}
-
-#ifdef CONFIG_MTD_CMDLINE_PARTS
-extern int parse_cmdline_partitions(struct mtd_info *master, struct mtd_partition **pparts, char *);
-#endif
-/*
- * Main initialization routine
- */
-int __init tx4938ndfmc_init (void)
-{
-       struct nand_chip *this;
-       int bsprt = 0, hold = 0xf, spw = 0xf;
-       int protected = 0;
-
-       if ((*rbtx4938_piosel_ptr & 0x0c) != 0x08) {
-               printk("TX4938 NDFMC: disabled by IOC PIOSEL\n");
-               return -ENODEV;
-       }
-       bsprt = 1;
-       hold = 2;
-       spw = 9 - 1;    /* 8 GBUSCLK = 80ns (@ GBUSCLK 100MHz) */
-
-       if ((tx4938_ccfgptr->pcfg &
-            (TX4938_PCFG_ATA_SEL|TX4938_PCFG_ISA_SEL|TX4938_PCFG_NDF_SEL))
-           != TX4938_PCFG_NDF_SEL) {
-               printk("TX4938 NDFMC: disabled by PCFG.\n");
-               return -ENODEV;
-       }
-
-       /* reset NDFMC */
-       tx4938_ndfmcptr->rstr |= TX4938_NDFRSTR_RST;
-       while (tx4938_ndfmcptr->rstr & TX4938_NDFRSTR_RST)
-               ;
-       /* setup BusSeparete, Hold Time, Strobe Pulse Width */
-       tx4938_ndfmcptr->mcr = bsprt ? TX4938_NDFMCR_BSPRT : 0;
-       tx4938_ndfmcptr->spr = hold << 4 | spw;
-
-       /* Allocate memory for MTD device structure and private data */
-       tx4938ndfmc_mtd = kmalloc (sizeof(struct mtd_info) + sizeof (struct nand_chip),
-                                     GFP_KERNEL);
-       if (!tx4938ndfmc_mtd) {
-               printk ("Unable to allocate TX4938 NDFMC MTD device structure.\n");
-               return -ENOMEM;
-       }
-
-       /* Get pointer to private data */
-       this = (struct nand_chip *) (&tx4938ndfmc_mtd[1]);
-
-       /* Initialize structures */
-       memset((char *) tx4938ndfmc_mtd, 0, sizeof(struct mtd_info));
-       memset((char *) this, 0, sizeof(struct nand_chip));
-
-       /* Link the private data with the MTD structure */
-       tx4938ndfmc_mtd->priv = this;
-
-       /* Set address of NAND IO lines */
-       this->IO_ADDR_R = (unsigned long)&tx4938_ndfmcptr->dtr;
-       this->IO_ADDR_W = (unsigned long)&tx4938_ndfmcptr->dtr;
-       this->hwcontrol = tx4938ndfmc_hwcontrol;
-       this->dev_ready = tx4938ndfmc_dev_ready;
-       this->calculate_ecc = tx4938ndfmc_calculate_ecc;
-       this->correct_data = nand_correct_data;
-       this->enable_hwecc = tx4938ndfmc_enable_hwecc;
-       this->eccmode = NAND_ECC_HW3_256;
-       this->chip_delay = 100;
-       this->read_byte = tx4938ndfmc_nand_read_byte;
-       this->write_byte = tx4938ndfmc_nand_write_byte;
-       this->cmdfunc = tx4938ndfmc_nand_command;
-       this->write_buf = tx4938ndfmc_nand_write_buf;
-       this->read_buf = tx4938ndfmc_nand_read_buf;
-       this->verify_buf = tx4938ndfmc_nand_verify_buf;
-
-       /* Scan to find existance of the device */
-       if (nand_scan (tx4938ndfmc_mtd, 1)) {
-               kfree (tx4938ndfmc_mtd);
-               return -ENXIO;
-       }
-
-       /* Allocate memory for internal data buffer */
-       this->data_buf = kmalloc (sizeof(u_char) * (tx4938ndfmc_mtd->oobblock + tx4938ndfmc_mtd->oobsize), GFP_KERNEL);
-       if (!this->data_buf) {
-               printk ("Unable to allocate NAND data buffer for TX4938.\n");
-               kfree (tx4938ndfmc_mtd);
-               return -ENOMEM;
-       }
-
-       if (protected) {
-               printk(KERN_INFO "TX4938 NDFMC: write protected.\n");
-               tx4938ndfmc_mtd->flags &= ~(MTD_WRITEABLE | MTD_ERASEABLE);
-       }
-
-#ifdef CONFIG_MTD_CMDLINE_PARTS
-       {
-               int mtd_parts_nb = 0;
-               struct mtd_partition *mtd_parts = 0;
-               mtd_parts_nb = parse_cmdline_partitions(tx4938ndfmc_mtd, &mtd_parts, "tx4938ndfmc");
-               if (mtd_parts_nb > 0)
-                       add_mtd_partitions(tx4938ndfmc_mtd, mtd_parts, mtd_parts_nb);
-               else
-                       add_mtd_device(tx4938ndfmc_mtd);
-       }
-#else
-       add_mtd_partitions(tx4938ndfmc_mtd, partition_info, NUM_PARTITIONS );
-#endif
-
-       return 0;
-}
-module_init(tx4938ndfmc_init);
-
-/*
- * Clean up routine
- */
-static void __exit tx4938ndfmc_cleanup (void)
-{
-       struct nand_chip *this = (struct nand_chip *) tx4938ndfmc_mtd->priv;
-
-       /* Unregister the device */
-#ifdef CONFIG_MTD_CMDLINE_PARTS
-       del_mtd_partitions(tx4938ndfmc_mtd);
-#endif
-       del_mtd_device (tx4938ndfmc_mtd);
-
-       /* Free the MTD device structure */
-       kfree (tx4938ndfmc_mtd);
-
-       /* Free internal data buffer */
-       kfree (this->data_buf);
-}
-module_exit(tx4938ndfmc_cleanup);
-
-MODULE_LICENSE("GPL");
-MODULE_AUTHOR("Alice Hennessy <ahennessy@mvista.com>");
-MODULE_DESCRIPTION("Board-specific glue layer for NAND flash on TX4938 NDFMC");
diff --git a/drivers/net/arm/smc91x.c b/drivers/net/arm/smc91x.c
deleted file mode 100644 (file)
index 3968a1c..0000000
+++ /dev/null
@@ -1,2171 +0,0 @@
-/*
- * smc91x.c
- * This is a driver for SMSC's 91C9x/91C1xx single-chip Ethernet devices.
- *
- * Copyright (C) 1996 by Erik Stahlman
- * Copyright (C) 2001 Standard Microsystems Corporation
- *     Developed by Simple Network Magic Corporation
- * Copyright (C) 2003 Monta Vista Software, Inc.
- *     Unified SMC91x driver by Nicolas Pitre
- *
- * 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
- *
- * Arguments:
- *     io      = for the base address
- *     irq     = for the IRQ
- *     nowait  = 0 for normal wait states, 1 eliminates additional wait states
- *
- * original author:
- *     Erik Stahlman <erik@vt.edu>
- *
- * hardware multicast code:
- *    Peter Cammaert <pc@denkart.be>
- *
- * contributors:
- *     Daris A Nevil <dnevil@snmc.com>
- *      Nicolas Pitre <nico@cam.org>
- *     Russell King <rmk@arm.linux.org.uk>
- *
- * History:
- *   08/20/00  Arnaldo Melo       fix kfree(skb) in smc_hardware_send_packet
- *   12/15/00  Christian Jullien  fix "Warning: kfree_skb on hard IRQ"
- *   03/16/01  Daris A Nevil      modified smc9194.c for use with LAN91C111
- *   08/22/01  Scott Anderson     merge changes from smc9194 to smc91111
- *   08/21/01  Pramod B Bhardwaj  added support for RevB of LAN91C111
- *   12/20/01  Jeff Sutherland    initial port to Xscale PXA with DMA support
- *   04/07/03  Nicolas Pitre      unified SMC91x driver, killed irq races,
- *                                more bus abstraction, big cleanup, etc.
- *   29/09/03  Russell King       - add driver model support
- *                                - ethtool support
- *                                - convert to use generic MII interface
- *                                - add link up/down notification
- *                                - don't try to handle full negotiation in
- *                                  smc_phy_configure
- *                                - clean up (and fix stack overrun) in PHY
- *                                  MII read/write functions
- */
-static const char version[] =
-       "smc91x.c: v1.0, mar 07 2003 by Nicolas Pitre <nico@cam.org>\n";
-
-/* Debugging level */
-#ifndef SMC_DEBUG
-#define SMC_DEBUG              0
-#endif
-
-
-#include <linux/config.h>
-#include <linux/init.h>
-#include <linux/module.h>
-#include <linux/kernel.h>
-#include <linux/sched.h>
-#include <linux/slab.h>
-#include <linux/delay.h>
-#include <linux/timer.h>
-#include <linux/errno.h>
-#include <linux/ioport.h>
-#include <linux/crc32.h>
-#include <linux/device.h>
-#include <linux/spinlock.h>
-#include <linux/ethtool.h>
-#include <linux/mii.h>
-
-#include <linux/netdevice.h>
-#include <linux/etherdevice.h>
-#include <linux/skbuff.h>
-
-#include <asm/io.h>
-#include <asm/hardware.h>
-#include <asm/irq.h>
-
-#include "smc91x.h"
-
-#ifdef CONFIG_ISA
-/*
- * the LAN91C111 can be at any of the following port addresses.  To change,
- * for a slightly different card, you can add it to the array.  Keep in
- * mind that the array must end in zero.
- */
-static unsigned int smc_portlist[] __initdata = {
-       0x200, 0x220, 0x240, 0x260, 0x280, 0x2A0, 0x2C0, 0x2E0,
-       0x300, 0x320, 0x340, 0x360, 0x380, 0x3A0, 0x3C0, 0x3E0, 0
-};
-
-#ifndef SMC_IOADDR
-# define SMC_IOADDR            -1
-#endif
-static unsigned long io = SMC_IOADDR;
-module_param(io, ulong, 0400);
-MODULE_PARM_DESC(io, "I/O base address");
-
-#ifndef SMC_IRQ
-# define SMC_IRQ               -1
-#endif
-static int irq = SMC_IRQ;
-module_param(irq, int, 0400);
-MODULE_PARM_DESC(irq, "IRQ number");
-
-#endif  /* CONFIG_ISA */
-
-#ifndef SMC_NOWAIT
-# define SMC_NOWAIT            0
-#endif
-static int nowait = SMC_NOWAIT;
-module_param(nowait, int, 0400);
-MODULE_PARM_DESC(nowait, "set to 1 for no wait state");
-
-/*
- * Transmit timeout, default 5 seconds.
- */
-static int watchdog = 5000;
-module_param(watchdog, int, 0400);
-MODULE_PARM_DESC(watchdog, "transmit timeout in milliseconds");
-
-MODULE_LICENSE("GPL");
-
-/*
- * The internal workings of the driver.  If you are changing anything
- * here with the SMC stuff, you should have the datasheet and know
- * what you are doing.
- */
-#define CARDNAME "smc91x"
-
-/*
- * Use power-down feature of the chip
- */
-#define POWER_DOWN             1
-
-/*
- * Wait time for memory to be free.  This probably shouldn't be
- * tuned that much, as waiting for this means nothing else happens
- * in the system
- */
-#define MEMORY_WAIT_TIME       16
-
-/*
- * This selects whether TX packets are sent one by one to the SMC91x internal
- * memory and throttled until transmission completes.  This may prevent
- * RX overruns a litle by keeping much of the memory free for RX packets
- * but to the expense of reduced TX throughput and increased IRQ overhead.
- * Note this is not a cure for a too slow data bus or too high IRQ latency.
- */
-#define THROTTLE_TX_PKTS       0
-
-/*
- * The MII clock high/low times.  2x this number gives the MII clock period
- * in microseconds. (was 50, but this gives 6.4ms for each MII transaction!)
- */
-#define MII_DELAY              1
-
-/* store this information for the driver.. */
-struct smc_local {
-       /*
-        * If I have to wait until memory is available to send a
-        * packet, I will store the skbuff here, until I get the
-        * desired memory.  Then, I'll send it out and free it.
-        */
-       struct sk_buff *saved_skb;
-
-       /*
-        * these are things that the kernel wants me to keep, so users
-        * can find out semi-useless statistics of how well the card is
-        * performing
-        */
-       struct net_device_stats stats;
-
-       /* version/revision of the SMC91x chip */
-       int     version;
-
-       /* Contains the current active transmission mode */
-       int     tcr_cur_mode;
-
-       /* Contains the current active receive mode */
-       int     rcr_cur_mode;
-
-       /* Contains the current active receive/phy mode */
-       int     rpc_cur_mode;
-       int     ctl_rfduplx;
-       int     ctl_rspeed;
-
-       u32     msg_enable;
-       u32     phy_type;
-       struct mii_if_info mii;
-       spinlock_t lock;
-
-#ifdef SMC_USE_PXA_DMA
-       /* DMA needs the physical address of the chip */
-       u_long physaddr;
-#endif
-};
-
-#if SMC_DEBUG > 0
-#define DBG(n, args...)                                        \
-       do {                                            \
-               if (SMC_DEBUG >= (n))                   \
-                       printk(KERN_DEBUG args);        \
-       } while (0)
-
-#define PRINTK(args...)   printk(args)
-#else
-#define DBG(n, args...)   do { } while(0)
-#define PRINTK(args...)   printk(KERN_DEBUG args)
-#endif
-
-#if SMC_DEBUG > 3
-static void PRINT_PKT(u_char *buf, int length)
-{
-       int i;
-       int remainder;
-       int lines;
-
-       lines = length / 16;
-       remainder = length % 16;
-
-       for (i = 0; i < lines ; i ++) {
-               int cur;
-               for (cur = 0; cur < 8; cur++) {
-                       u_char a, b;
-                       a = *buf++;
-                       b = *buf++;
-                       printk("%02x%02x ", a, b);
-               }
-               printk("\n");
-       }
-       for (i = 0; i < remainder/2 ; i++) {
-               u_char a, b;
-               a = *buf++;
-               b = *buf++;
-               printk("%02x%02x ", a, b);
-       }
-       printk("\n");
-}
-#else
-#define PRINT_PKT(x...)  do { } while(0)
-#endif
-
-
-/* this enables an interrupt in the interrupt mask register */
-#define SMC_ENABLE_INT(x) do {                                         \
-       unsigned long flags;                                            \
-       unsigned char mask;                                             \
-       spin_lock_irqsave(&lp->lock, flags);                            \
-       mask = SMC_GET_INT_MASK();                                      \
-       mask |= (x);                                                    \
-       SMC_SET_INT_MASK(mask);                                         \
-       spin_unlock_irqrestore(&lp->lock, flags);                       \
-} while (0)
-
-/* this disables an interrupt from the interrupt mask register */
-#define SMC_DISABLE_INT(x) do {                                                \
-       unsigned long flags;                                            \
-       unsigned char mask;                                             \
-       spin_lock_irqsave(&lp->lock, flags);                            \
-       mask = SMC_GET_INT_MASK();                                      \
-       mask &= ~(x);                                                   \
-       SMC_SET_INT_MASK(mask);                                         \
-       spin_unlock_irqrestore(&lp->lock, flags);                       \
-} while (0)
-
-/*
- * Wait while MMU is busy.  This is usually in the order of a few nanosecs
- * if at all, but let's avoid deadlocking the system if the hardware
- * decides to go south.
- */
-#define SMC_WAIT_MMU_BUSY() do {                                       \
-       if (unlikely(SMC_GET_MMU_CMD() & MC_BUSY)) {                    \
-               unsigned long timeout = jiffies + 2;                    \
-               while (SMC_GET_MMU_CMD() & MC_BUSY) {                   \
-                       if (time_after(jiffies, timeout)) {             \
-                               printk("%s: timeout %s line %d\n",      \
-                                       dev->name, __FILE__, __LINE__); \
-                               break;                                  \
-                       }                                               \
-                       cpu_relax();                                    \
-               }                                                       \
-       }                                                               \
-} while (0)
-
-
-/*
- * this does a soft reset on the device
- */
-static void smc_reset(struct net_device *dev)
-{
-       unsigned long ioaddr = dev->base_addr;
-       unsigned int ctl, cfg;
-
-       DBG(2, "%s: %s\n", dev->name, __FUNCTION__);
-
-       /*
-        * This resets the registers mostly to defaults, but doesn't
-        * affect EEPROM.  That seems unnecessary
-        */
-       SMC_SELECT_BANK(0);
-       SMC_SET_RCR(RCR_SOFTRST);
-
-       /*
-        * Setup the Configuration Register
-        * This is necessary because the CONFIG_REG is not affected
-        * by a soft reset
-        */
-       SMC_SELECT_BANK(1);
-
-       cfg = CONFIG_DEFAULT;
-
-       /*
-        * Setup for fast accesses if requested.  If the card/system
-        * can't handle it then there will be no recovery except for
-        * a hard reset or power cycle
-        */
-       if (nowait)
-               cfg |= CONFIG_NO_WAIT;
-
-       /*
-        * Release from possible power-down state
-        * Configuration register is not affected by Soft Reset
-        */
-       cfg |= CONFIG_EPH_POWER_EN;
-
-       SMC_SET_CONFIG(cfg);
-
-       /* this should pause enough for the chip to be happy */
-       /*
-        * elaborate?  What does the chip _need_? --jgarzik
-        *
-        * This seems to be undocumented, but something the original
-        * driver(s) have always done.  Suspect undocumented timing
-        * info/determined empirically. --rmk
-        */
-       udelay(1);
-
-       /* Disable transmit and receive functionality */
-       SMC_SELECT_BANK(0);
-       SMC_SET_RCR(RCR_CLEAR);
-       SMC_SET_TCR(TCR_CLEAR);
-
-       SMC_SELECT_BANK(1);
-       ctl = SMC_GET_CTL() | CTL_LE_ENABLE;
-
-       /*
-        * Set the control register to automatically release successfully
-        * transmitted packets, to make the best use out of our limited
-        * memory
-        */
-#if ! THROTTLE_TX_PKTS
-       ctl |= CTL_AUTO_RELEASE;
-#else
-       ctl &= ~CTL_AUTO_RELEASE;
-#endif
-       SMC_SET_CTL(ctl);
-
-       /* Disable all interrupts */
-       SMC_SELECT_BANK(2);
-       SMC_SET_INT_MASK(0);
-
-       /* Reset the MMU */
-       SMC_SET_MMU_CMD(MC_RESET);
-       SMC_WAIT_MMU_BUSY();
-}
-
-/*
- * Enable Interrupts, Receive, and Transmit
- */
-static void smc_enable(struct net_device *dev)
-{
-       unsigned long ioaddr = dev->base_addr;
-       struct smc_local *lp = netdev_priv(dev);
-       int mask;
-
-       DBG(2, "%s: %s\n", dev->name, __FUNCTION__);
-
-       /* see the header file for options in TCR/RCR DEFAULT */
-       SMC_SELECT_BANK(0);
-       SMC_SET_TCR(lp->tcr_cur_mode);
-       SMC_SET_RCR(lp->rcr_cur_mode);
-
-       /* now, enable interrupts */
-       mask = IM_EPH_INT|IM_RX_OVRN_INT|IM_RCV_INT;
-       if (lp->version >= (CHIP_91100 << 4))
-               mask |= IM_MDINT;
-       SMC_SELECT_BANK(2);
-       SMC_SET_INT_MASK(mask);
-}
-
-/*
- * this puts the device in an inactive state
- */
-static void smc_shutdown(unsigned long ioaddr)
-{
-       DBG(2, "%s: %s\n", CARDNAME, __FUNCTION__);
-
-       /* no more interrupts for me */
-       SMC_SELECT_BANK(2);
-       SMC_SET_INT_MASK(0);
-
-       /* and tell the card to stay away from that nasty outside world */
-       SMC_SELECT_BANK(0);
-       SMC_SET_RCR(RCR_CLEAR);
-       SMC_SET_TCR(TCR_CLEAR);
-
-#ifdef POWER_DOWN
-       /* finally, shut the chip down */
-       SMC_SELECT_BANK(1);
-       SMC_SET_CONFIG(SMC_GET_CONFIG() & ~CONFIG_EPH_POWER_EN);
-#endif
-}
-
-/*
- * This is the procedure to handle the receipt of a packet.
- */
-static inline void  smc_rcv(struct net_device *dev)
-{
-       struct smc_local *lp = netdev_priv(dev);
-       unsigned long ioaddr = dev->base_addr;
-       unsigned int packet_number, status, packet_len;
-
-       DBG(3, "%s: %s\n", dev->name, __FUNCTION__);
-
-       packet_number = SMC_GET_RXFIFO();
-       if (unlikely(packet_number & RXFIFO_REMPTY)) {
-               PRINTK("%s: smc_rcv with nothing on FIFO.\n", dev->name);
-               return;
-       }
-
-       /* read from start of packet */
-       SMC_SET_PTR(PTR_READ | PTR_RCV | PTR_AUTOINC);
-
-       /* First two words are status and packet length */
-       SMC_GET_PKT_HDR(status, packet_len);
-       packet_len &= 0x07ff;  /* mask off top bits */
-       DBG(2, "%s: RX PNR 0x%x STATUS 0x%04x LENGTH 0x%04x (%d)\n",
-               dev->name, packet_number, status,
-               packet_len, packet_len);
-
-       if (unlikely(status & RS_ERRORS)) {
-               lp->stats.rx_errors++;
-               if (status & RS_ALGNERR)
-                       lp->stats.rx_frame_errors++;
-               if (status & (RS_TOOSHORT | RS_TOOLONG))
-                       lp->stats.rx_length_errors++;
-               if (status & RS_BADCRC)
-                       lp->stats.rx_crc_errors++;
-       } else {
-               struct sk_buff *skb;
-               unsigned char *data;
-               unsigned int data_len;
-
-               /* set multicast stats */
-               if (status & RS_MULTICAST)
-                       lp->stats.multicast++;
-
-               /*
-                * Actual payload is packet_len - 4 (or 3 if odd byte).
-                * We want skb_reserve(2) and the final ctrl word
-                * (2 bytes, possibly containing the payload odd byte).
-                * Ence packet_len - 4 + 2 + 2.
-                */
-               skb = dev_alloc_skb(packet_len);
-               if (unlikely(skb == NULL)) {
-                       printk(KERN_NOTICE "%s: Low memory, packet dropped.\n",
-                               dev->name);
-                       lp->stats.rx_dropped++;
-                       goto done;
-               }
-
-               /* Align IP header to 32 bits */
-               skb_reserve(skb, 2);
-
-               /* BUG: the LAN91C111 rev A never sets this bit. Force it. */
-               if (lp->version == 0x90)
-                       status |= RS_ODDFRAME;
-
-               /*
-                * If odd length: packet_len - 3,
-                * otherwise packet_len - 4.
-                */
-               data_len = packet_len - ((status & RS_ODDFRAME) ? 3 : 4);
-               data = skb_put(skb, data_len);
-               SMC_PULL_DATA(data, packet_len - 2);
-
-               PRINT_PKT(data, packet_len - 2);
-
-               dev->last_rx = jiffies;
-               skb->dev = dev;
-               skb->protocol = eth_type_trans(skb, dev);
-               netif_rx(skb);
-               lp->stats.rx_packets++;
-               lp->stats.rx_bytes += data_len;
-       }
-
-done:
-       SMC_WAIT_MMU_BUSY();
-       SMC_SET_MMU_CMD(MC_RELEASE);
-}
-
-/*
- * This is called to actually send a packet to the chip.
- * Returns non-zero when successful.
- */
-static void smc_hardware_send_packet(struct net_device *dev)
-{
-       struct smc_local *lp = netdev_priv(dev);
-       unsigned long ioaddr = dev->base_addr;
-       struct sk_buff *skb = lp->saved_skb;
-       unsigned int packet_no, len;
-       unsigned char *buf;
-
-       DBG(3, "%s: %s\n", dev->name, __FUNCTION__);
-
-       packet_no = SMC_GET_AR();
-       if (unlikely(packet_no & AR_FAILED)) {
-               printk("%s: Memory allocation failed.\n", dev->name);
-               lp->saved_skb = NULL;
-               lp->stats.tx_errors++;
-               lp->stats.tx_fifo_errors++;
-               dev_kfree_skb_any(skb);
-               return;
-       }
-
-       /* point to the beginning of the packet */
-       SMC_SET_PN(packet_no);
-       SMC_SET_PTR(PTR_AUTOINC);
-
-       buf = skb->data;
-       len = skb->len;
-       DBG(2, "%s: TX PNR 0x%x LENGTH 0x%04x (%d) BUF 0x%p\n",
-               dev->name, packet_no, len, len, buf);
-       PRINT_PKT(buf, len);
-
-       /*
-        * Send the packet length (+6 for status words, length, and ctl.
-        * The card will pad to 64 bytes with zeroes if packet is too small.
-        */
-       SMC_PUT_PKT_HDR(0, len + 6);
-
-       /* send the actual data */
-       SMC_PUSH_DATA(buf, len & ~1);
-
-       /* Send final ctl word with the last byte if there is one */
-       SMC_outw(((len & 1) ? (0x2000 | buf[len-1]) : 0), ioaddr, DATA_REG);
-
-       /* and let the chipset deal with it */
-       SMC_SET_MMU_CMD(MC_ENQUEUE);
-       SMC_ACK_INT(IM_TX_EMPTY_INT);
-
-       dev->trans_start = jiffies;
-       dev_kfree_skb_any(skb);
-       lp->saved_skb = NULL;
-       lp->stats.tx_packets++;
-       lp->stats.tx_bytes += len;
-}
-
-/*
- * Since I am not sure if I will have enough room in the chip's ram
- * to store the packet, I call this routine which either sends it
- * now, or set the card to generates an interrupt when ready
- * for the packet.
- */
-static int smc_hard_start_xmit(struct sk_buff *skb, struct net_device *dev)
-{
-       struct smc_local *lp = netdev_priv(dev);
-       unsigned long ioaddr = dev->base_addr;
-       unsigned int numPages, poll_count, status, saved_bank;
-
-       DBG(3, "%s: %s\n", dev->name, __FUNCTION__);
-
-       BUG_ON(lp->saved_skb != NULL);
-       lp->saved_skb = skb;
-
-       /*
-        * The MMU wants the number of pages to be the number of 256 bytes
-        * 'pages', minus 1 (since a packet can't ever have 0 pages :))
-        *
-        * The 91C111 ignores the size bits, but earlier models don't.
-        *
-        * Pkt size for allocating is data length +6 (for additional status
-        * words, length and ctl)
-        *
-        * If odd size then last byte is included in ctl word.
-        */
-       numPages = ((skb->len & ~1) + (6 - 1)) >> 8;
-       if (unlikely(numPages > 7)) {
-               printk("%s: Far too big packet error.\n", dev->name);
-               lp->saved_skb = NULL;
-               lp->stats.tx_errors++;
-               lp->stats.tx_dropped++;
-               dev_kfree_skb(skb);
-               return 0;
-       }
-
-       /* now, try to allocate the memory */
-       saved_bank = SMC_CURRENT_BANK();
-       SMC_SELECT_BANK(2);
-       SMC_SET_MMU_CMD(MC_ALLOC | numPages);
-
-       /*
-        * Poll the chip for a short amount of time in case the
-        * allocation succeeds quickly.
-        */
-       poll_count = MEMORY_WAIT_TIME;
-       do {
-               status = SMC_GET_INT();
-               if (status & IM_ALLOC_INT) {
-                       SMC_ACK_INT(IM_ALLOC_INT);
-                       break;
-               }
-       } while (--poll_count);
-
-       if (!poll_count) {
-               /* oh well, wait until the chip finds memory later */
-               netif_stop_queue(dev);
-               DBG(2, "%s: TX memory allocation deferred.\n", dev->name);
-               SMC_ENABLE_INT(IM_ALLOC_INT);
-       } else {
-               /*
-                * Allocation succeeded: push packet to the chip's own memory
-                * immediately.
-                *
-                * If THROTTLE_TX_PKTS is selected that means we don't want
-                * more than a single TX packet taking up space in the chip's
-                * internal memory at all time, in which case we stop the
-                * queue right here until we're notified of TX completion.
-                *
-                * Otherwise we're quite happy to feed more TX packets right
-                * away for better TX throughput, in which case the queue is
-                * left active.
-                */  
-#if THROTTLE_TX_PKTS
-               netif_stop_queue(dev);
-#endif
-               smc_hardware_send_packet(dev);
-               SMC_ENABLE_INT(IM_TX_INT | IM_TX_EMPTY_INT);
-       }
-
-       SMC_SELECT_BANK(saved_bank);
-       return 0;
-}
-
-/*
- * This handles a TX interrupt, which is only called when:
- * - a TX error occurred, or
- * - CTL_AUTO_RELEASE is not set and TX of a packet completed.
- */
-static void smc_tx(struct net_device *dev)
-{
-       unsigned long ioaddr = dev->base_addr;
-       struct smc_local *lp = netdev_priv(dev);
-       unsigned int saved_packet, packet_no, tx_status, pkt_len;
-
-       DBG(3, "%s: %s\n", dev->name, __FUNCTION__);
-
-       /* If the TX FIFO is empty then nothing to do */
-       packet_no = SMC_GET_TXFIFO();
-       if (unlikely(packet_no & TXFIFO_TEMPTY)) {
-               PRINTK("%s: smc_tx with nothing on FIFO.\n", dev->name);
-               return;
-       }
-
-       /* select packet to read from */
-       saved_packet = SMC_GET_PN();
-       SMC_SET_PN(packet_no);
-
-       /* read the first word (status word) from this packet */
-       SMC_SET_PTR(PTR_AUTOINC | PTR_READ);
-       SMC_GET_PKT_HDR(tx_status, pkt_len);
-       DBG(2, "%s: TX STATUS 0x%04x PNR 0x%02x\n",
-               dev->name, tx_status, packet_no);
-
-       if (!(tx_status & TS_SUCCESS))
-               lp->stats.tx_errors++;
-       if (tx_status & TS_LOSTCAR)
-               lp->stats.tx_carrier_errors++;
-
-       SMC_WAIT_MMU_BUSY();
-
-       if (tx_status & TS_LATCOL) {
-               PRINTK("%s: late collision occurred on last xmit\n", dev->name);
-               lp->stats.tx_window_errors++;
-               /* It's really cheap to requeue the pkt here */
-               SMC_SET_MMU_CMD( MC_ENQUEUE );
-       } else {
-               /* kill the packet */
-               SMC_SET_MMU_CMD(MC_FREEPKT);
-       }
-
-       /* Don't restore Packet Number Reg until busy bit is cleared */
-       SMC_WAIT_MMU_BUSY();
-       SMC_SET_PN(saved_packet);
-
-       /* re-enable transmit */
-       SMC_SELECT_BANK(0);
-       SMC_SET_TCR(lp->tcr_cur_mode);
-       SMC_SELECT_BANK(2);
-}
-
-
-/*---PHY CONTROL AND CONFIGURATION-----------------------------------------*/
-
-static void smc_mii_out(struct net_device *dev, unsigned int val, int bits)
-{
-       unsigned long ioaddr = dev->base_addr;
-       unsigned int mii_reg, mask;
-
-       mii_reg = SMC_GET_MII() & ~(MII_MCLK | MII_MDOE | MII_MDO);
-       mii_reg |= MII_MDOE;
-
-       for (mask = 1 << (bits - 1); mask; mask >>= 1) {
-               if (val & mask)
-                       mii_reg |= MII_MDO;
-               else
-                       mii_reg &= ~MII_MDO;
-
-               SMC_SET_MII(mii_reg);
-               udelay(MII_DELAY);
-               SMC_SET_MII(mii_reg | MII_MCLK);
-               udelay(MII_DELAY);
-       }
-}
-
-static unsigned int smc_mii_in(struct net_device *dev, int bits)
-{
-       unsigned long ioaddr = dev->base_addr;
-       unsigned int mii_reg, mask, val;
-
-       mii_reg = SMC_GET_MII() & ~(MII_MCLK | MII_MDOE | MII_MDO);
-       SMC_SET_MII(mii_reg);
-
-       for (mask = 1 << (bits - 1), val = 0; mask; mask >>= 1) {
-               if (SMC_GET_MII() & MII_MDI)
-                       val |= mask;
-
-               SMC_SET_MII(mii_reg);
-               udelay(MII_DELAY);
-               SMC_SET_MII(mii_reg | MII_MCLK);
-               udelay(MII_DELAY);
-       }
-
-       return val;
-}
-
-/*
- * Reads a register from the MII Management serial interface
- */
-static int smc_phy_read(struct net_device *dev, int phyaddr, int phyreg)
-{
-       unsigned long ioaddr = dev->base_addr;
-       unsigned int phydata, old_bank;
-
-       /* Save the current bank, and select bank 3 */
-       old_bank = SMC_CURRENT_BANK();
-       SMC_SELECT_BANK(3);
-
-       /* Idle - 32 ones */
-       smc_mii_out(dev, 0xffffffff, 32);
-
-       /* Start code (01) + read (10) + phyaddr + phyreg */
-       smc_mii_out(dev, 6 << 10 | phyaddr << 5 | phyreg, 14);
-
-       /* Turnaround (2bits) + phydata */
-       phydata = smc_mii_in(dev, 18);
-
-       /* Return to idle state */
-       SMC_SET_MII(SMC_GET_MII() & ~(MII_MCLK|MII_MDOE|MII_MDO));
-
-       /* And select original bank */
-       SMC_SELECT_BANK(old_bank);
-
-       DBG(3, "%s: phyaddr=0x%x, phyreg=0x%x, phydata=0x%x\n",
-               __FUNCTION__, phyaddr, phyreg, phydata);
-
-       return phydata;
-}
-
-/*
- * Writes a register to the MII Management serial interface
- */
-static void smc_phy_write(struct net_device *dev, int phyaddr, int phyreg,
-                         int phydata)
-{
-       unsigned long ioaddr = dev->base_addr;
-       unsigned int old_bank;
-
-       /* Save the current bank, and select bank 3 */
-       old_bank = SMC_CURRENT_BANK();
-       SMC_SELECT_BANK(3);
-
-       /* Idle - 32 ones */
-       smc_mii_out(dev, 0xffffffff, 32);
-
-       /* Start code (01) + write (01) + phyaddr + phyreg + turnaround + phydata */
-       smc_mii_out(dev, 5 << 28 | phyaddr << 23 | phyreg << 18 | 2 << 16 | phydata, 32);
-
-       /* Return to idle state */
-       SMC_SET_MII(SMC_GET_MII() & ~(MII_MCLK|MII_MDOE|MII_MDO));
-
-       /* And select original bank */
-       SMC_SELECT_BANK(old_bank);
-
-       DBG(3, "%s: phyaddr=0x%x, phyreg=0x%x, phydata=0x%x\n",
-               __FUNCTION__, phyaddr, phyreg, phydata);
-}
-
-/*
- * Finds and reports the PHY address
- */
-static void smc_detect_phy(struct net_device *dev)
-{
-       struct smc_local *lp = netdev_priv(dev);
-       int phyaddr;
-
-       DBG(2, "%s: %s\n", dev->name, __FUNCTION__);
-
-       lp->phy_type = 0;
-
-       /*
-        * Scan all 32 PHY addresses if necessary, starting at
-        * PHY#1 to PHY#31, and then PHY#0 last.
-        */
-       for (phyaddr = 1; phyaddr < 33; ++phyaddr) {
-               unsigned int id1, id2;
-
-               /* Read the PHY identifiers */
-               id1 = smc_phy_read(dev, phyaddr & 31, MII_PHYSID1);
-               id2 = smc_phy_read(dev, phyaddr & 31, MII_PHYSID2);
-
-               DBG(3, "%s: phy_id1=0x%x, phy_id2=0x%x\n",
-                       dev->name, id1, id2);
-
-               /* Make sure it is a valid identifier */
-               if (id1 != 0x0000 && id1 != 0xffff && id1 != 0x8000 &&
-                   id2 != 0x0000 && id2 != 0xffff && id2 != 0x8000) {
-                       /* Save the PHY's address */
-                       lp->mii.phy_id = phyaddr & 31;
-                       lp->phy_type = id1 << 16 | id2;
-                       break;
-               }
-       }
-}
-
-/*
- * Sets the PHY to a configuration as determined by the user
- */
-static int smc_phy_fixed(struct net_device *dev)
-{
-       struct smc_local *lp = netdev_priv(dev);
-       unsigned long ioaddr = dev->base_addr;
-       int phyaddr = lp->mii.phy_id;
-       int bmcr, cfg1;
-
-       DBG(3, "%s: %s\n", dev->name, __FUNCTION__);
-
-       /* Enter Link Disable state */
-       cfg1 = smc_phy_read(dev, phyaddr, PHY_CFG1_REG);
-       cfg1 |= PHY_CFG1_LNKDIS;
-       smc_phy_write(dev, phyaddr, PHY_CFG1_REG, cfg1);
-
-       /*
-        * Set our fixed capabilities
-        * Disable auto-negotiation
-        */
-       bmcr = 0;
-
-       if (lp->ctl_rfduplx)
-               bmcr |= BMCR_FULLDPLX;
-
-       if (lp->ctl_rspeed == 100)
-               bmcr |= BMCR_SPEED100;
-
-       /* Write our capabilities to the phy control register */
-       smc_phy_write(dev, phyaddr, MII_BMCR, bmcr);
-
-       /* Re-Configure the Receive/Phy Control register */
-       SMC_SET_RPC(lp->rpc_cur_mode);
-
-       return 1;
-}
-
-/*
- * smc_phy_reset - reset the phy
- * @dev: net device
- * @phy: phy address
- *
- * Issue a software reset for the specified PHY and
- * wait up to 100ms for the reset to complete.  We should
- * not access the PHY for 50ms after issuing the reset.
- *
- * The time to wait appears to be dependent on the PHY.
- *
- * Must be called with lp->lock locked.
- */
-static int smc_phy_reset(struct net_device *dev, int phy)
-{
-       struct smc_local *lp = netdev_priv(dev);
-       unsigned int bmcr;
-       int timeout;
-
-       smc_phy_write(dev, phy, MII_BMCR, BMCR_RESET);
-
-       for (timeout = 2; timeout; timeout--) {
-               spin_unlock_irq(&lp->lock);
-               msleep(50);
-               spin_lock_irq(&lp->lock);
-
-               bmcr = smc_phy_read(dev, phy, MII_BMCR);
-               if (!(bmcr & BMCR_RESET))
-                       break;
-       }
-
-       return bmcr & BMCR_RESET;
-}
-
-/*
- * smc_phy_powerdown - powerdown phy
- * @dev: net device
- * @phy: phy address
- *
- * Power down the specified PHY
- */
-static void smc_phy_powerdown(struct net_device *dev, int phy)
-{
-       struct smc_local *lp = netdev_priv(dev);
-       unsigned int bmcr;
-
-       spin_lock_irq(&lp->lock);
-       bmcr = smc_phy_read(dev, phy, MII_BMCR);
-       smc_phy_write(dev, phy, MII_BMCR, bmcr | BMCR_PDOWN);
-       spin_unlock_irq(&lp->lock);
-}
-
-/*
- * smc_phy_check_media - check the media status and adjust TCR
- * @dev: net device
- * @init: set true for initialisation
- *
- * Select duplex mode depending on negotiation state.  This
- * also updates our carrier state.
- */
-static void smc_phy_check_media(struct net_device *dev, int init)
-{
-       struct smc_local *lp = netdev_priv(dev);
-       unsigned long ioaddr = dev->base_addr;
-
-       if (mii_check_media(&lp->mii, netif_msg_link(lp), init)) {
-               unsigned int old_bank;
-
-               /* duplex state has changed */
-               if (lp->mii.full_duplex) {
-                       lp->tcr_cur_mode |= TCR_SWFDUP;
-               } else {
-                       lp->tcr_cur_mode &= ~TCR_SWFDUP;
-               }
-
-               old_bank = SMC_CURRENT_BANK();
-               SMC_SELECT_BANK(0);
-               SMC_SET_TCR(lp->tcr_cur_mode);
-               SMC_SELECT_BANK(old_bank);
-       }
-}
-
-/*
- * Configures the specified PHY through the MII management interface
- * using Autonegotiation.
- * Calls smc_phy_fixed() if the user has requested a certain config.
- * If RPC ANEG bit is set, the media selection is dependent purely on
- * the selection by the MII (either in the MII BMCR reg or the result
- * of autonegotiation.)  If the RPC ANEG bit is cleared, the selection
- * is controlled by the RPC SPEED and RPC DPLX bits.
- */
-static void smc_phy_configure(struct net_device *dev)
-{
-       struct smc_local *lp = netdev_priv(dev);
-       unsigned long ioaddr = dev->base_addr;
-       int phyaddr = lp->mii.phy_id;
-       int my_phy_caps; /* My PHY capabilities */
-       int my_ad_caps; /* My Advertised capabilities */
-       int status;
-
-       DBG(3, "%s:smc_program_phy()\n", dev->name);
-
-       spin_lock_irq(&lp->lock);
-
-       /*
-        * We should not be called if phy_type is zero.
-        */
-       if (lp->phy_type == 0)
-               goto smc_phy_configure_exit;
-
-       if (smc_phy_reset(dev, phyaddr)) {
-               printk("%s: PHY reset timed out\n", dev->name);
-               goto smc_phy_configure_exit;
-       }
-
-       /*
-        * Enable PHY Interrupts (for register 18)
-        * Interrupts listed here are disabled
-        */
-       smc_phy_write(dev, phyaddr, PHY_MASK_REG,
-               PHY_INT_LOSSSYNC | PHY_INT_CWRD | PHY_INT_SSD |
-               PHY_INT_ESD | PHY_INT_RPOL | PHY_INT_JAB |
-               PHY_INT_SPDDET | PHY_INT_DPLXDET);
-
-       /* Configure the Receive/Phy Control register */
-       SMC_SELECT_BANK(0);
-       SMC_SET_RPC(lp->rpc_cur_mode);
-
-       /* If the user requested no auto neg, then go set his request */
-       if (lp->mii.force_media) {
-               smc_phy_fixed(dev);
-               goto smc_phy_configure_exit;
-       }
-
-       /* Copy our capabilities from MII_BMSR to MII_ADVERTISE */
-       my_phy_caps = smc_phy_read(dev, phyaddr, MII_BMSR);
-
-       if (!(my_phy_caps & BMSR_ANEGCAPABLE)) {
-               printk(KERN_INFO "Auto negotiation NOT supported\n");
-               smc_phy_fixed(dev);
-               goto smc_phy_configure_exit;
-       }
-
-       my_ad_caps = ADVERTISE_CSMA; /* I am CSMA capable */
-
-       if (my_phy_caps & BMSR_100BASE4)
-               my_ad_caps |= ADVERTISE_100BASE4;
-       if (my_phy_caps & BMSR_100FULL)
-               my_ad_caps |= ADVERTISE_100FULL;
-       if (my_phy_caps & BMSR_100HALF)
-               my_ad_caps |= ADVERTISE_100HALF;
-       if (my_phy_caps & BMSR_10FULL)
-               my_ad_caps |= ADVERTISE_10FULL;
-       if (my_phy_caps & BMSR_10HALF)
-               my_ad_caps |= ADVERTISE_10HALF;
-
-       /* Disable capabilities not selected by our user */
-       if (lp->ctl_rspeed != 100)
-               my_ad_caps &= ~(ADVERTISE_100BASE4|ADVERTISE_100FULL|ADVERTISE_100HALF);
-
-       if (!lp->ctl_rfduplx)
-               my_ad_caps &= ~(ADVERTISE_100FULL|ADVERTISE_10FULL);
-
-       /* Update our Auto-Neg Advertisement Register */
-       smc_phy_write(dev, phyaddr, MII_ADVERTISE, my_ad_caps);
-       lp->mii.advertising = my_ad_caps;
-
-       /*
-        * Read the register back.  Without this, it appears that when
-        * auto-negotiation is restarted, sometimes it isn't ready and
-        * the link does not come up.
-        */
-       status = smc_phy_read(dev, phyaddr, MII_ADVERTISE);
-
-       DBG(2, "%s: phy caps=%x\n", dev->name, my_phy_caps);
-       DBG(2, "%s: phy advertised caps=%x\n", dev->name, my_ad_caps);
-
-       /* Restart auto-negotiation process in order to advertise my caps */
-       smc_phy_write(dev, phyaddr, MII_BMCR, BMCR_ANENABLE | BMCR_ANRESTART);
-
-       smc_phy_check_media(dev, 1);
-
-smc_phy_configure_exit:
-       spin_unlock_irq(&lp->lock);
-}
-
-/*
- * smc_phy_interrupt
- *
- * Purpose:  Handle interrupts relating to PHY register 18. This is
- *  called from the "hard" interrupt handler under our private spinlock.
- */
-static void smc_phy_interrupt(struct net_device *dev)
-{
-       struct smc_local *lp = netdev_priv(dev);
-       int phyaddr = lp->mii.phy_id;
-       int phy18;
-
-       DBG(2, "%s: %s\n", dev->name, __FUNCTION__);
-
-       if (lp->phy_type == 0)
-               return;
-
-       for(;;) {
-               smc_phy_check_media(dev, 0);
-
-               /* Read PHY Register 18, Status Output */
-               phy18 = smc_phy_read(dev, phyaddr, PHY_INT_REG);
-               if ((phy18 & PHY_INT_INT) == 0)
-                       break;
-       }
-}
-
-/*--- END PHY CONTROL AND CONFIGURATION-------------------------------------*/
-
-static void smc_10bt_check_media(struct net_device *dev, int init)
-{
-       struct smc_local *lp = netdev_priv(dev);
-       unsigned long ioaddr = dev->base_addr;
-       unsigned int old_carrier, new_carrier, old_bank;
-
-       old_bank = SMC_CURRENT_BANK();
-       SMC_SELECT_BANK(0);
-       old_carrier = netif_carrier_ok(dev) ? 1 : 0;
-       new_carrier = SMC_inw(ioaddr, EPH_STATUS_REG) & ES_LINK_OK ? 1 : 0;
-
-       if (init || (old_carrier != new_carrier)) {
-               if (!new_carrier) {
-                       netif_carrier_off(dev);
-               } else {
-                       netif_carrier_on(dev);
-               }
-               if (netif_msg_link(lp))
-                       printk(KERN_INFO "%s: link %s\n", dev->name,
-                              new_carrier ? "up" : "down");
-       }
-       SMC_SELECT_BANK(old_bank);
-}
-
-static void smc_eph_interrupt(struct net_device *dev)
-{
-       unsigned long ioaddr = dev->base_addr;
-       unsigned int old_bank, ctl;
-
-       smc_10bt_check_media(dev, 0);
-
-       old_bank = SMC_CURRENT_BANK();
-       SMC_SELECT_BANK(1);
-
-       ctl = SMC_GET_CTL();
-       SMC_SET_CTL(ctl & ~CTL_LE_ENABLE);
-       SMC_SET_CTL(ctl);
-
-       SMC_SELECT_BANK(old_bank);
-}
-
-/*
- * This is the main routine of the driver, to handle the device when
- * it needs some attention.
- */
-static irqreturn_t smc_interrupt(int irq, void *dev_id, struct pt_regs *regs)
-{
-       struct net_device *dev = dev_id;
-       unsigned long ioaddr = dev->base_addr;
-       struct smc_local *lp = netdev_priv(dev);
-       int status, mask, timeout, card_stats;
-       int saved_bank, saved_pointer;
-
-       DBG(3, "%s: %s\n", dev->name, __FUNCTION__);
-
-       saved_bank = SMC_CURRENT_BANK();
-       SMC_SELECT_BANK(2);
-       saved_pointer = SMC_GET_PTR();
-       mask = SMC_GET_INT_MASK();
-       SMC_SET_INT_MASK(0);
-
-       /* set a timeout value, so I don't stay here forever */
-       timeout = 8;
-
-       do {
-               status = SMC_GET_INT();
-
-               DBG(2, "%s: IRQ 0x%02x MASK 0x%02x MEM 0x%04x FIFO 0x%04x\n",
-                       dev->name, status, mask,
-                       ({ int meminfo; SMC_SELECT_BANK(0);
-                          meminfo = SMC_GET_MIR();
-                          SMC_SELECT_BANK(2); meminfo; }),
-                       SMC_GET_FIFO());
-
-               status &= mask;
-               if (!status)
-                       break;
-
-               spin_lock(&lp->lock);
-
-               if (status & IM_RCV_INT) {
-                       DBG(3, "%s: RX irq\n", dev->name);
-                       smc_rcv(dev);
-               } else if (status & IM_TX_INT) {
-                       DBG(3, "%s: TX int\n", dev->name);
-                       smc_tx(dev);
-                       SMC_ACK_INT(IM_TX_INT);
-#if THROTTLE_TX_PKTS
-                       netif_wake_queue(dev);
-#endif
-               } else if (status & IM_ALLOC_INT) {
-                       DBG(3, "%s: Allocation irq\n", dev->name);
-                       smc_hardware_send_packet(dev);
-                       mask |= (IM_TX_INT | IM_TX_EMPTY_INT);
-                       mask &= ~IM_ALLOC_INT;
-#if ! THROTTLE_TX_PKTS
-                       netif_wake_queue(dev);
-#endif
-               } else if (status & IM_TX_EMPTY_INT) {
-                       DBG(3, "%s: TX empty\n", dev->name);
-                       mask &= ~IM_TX_EMPTY_INT;
-
-                       /* update stats */
-                       SMC_SELECT_BANK(0);
-                       card_stats = SMC_GET_COUNTER();
-                       SMC_SELECT_BANK(2);
-
-                       /* single collisions */
-                       lp->stats.collisions += card_stats & 0xF;
-                       card_stats >>= 4;
-
-                       /* multiple collisions */
-                       lp->stats.collisions += card_stats & 0xF;
-               } else if (status & IM_RX_OVRN_INT) {
-                       DBG(1, "%s: RX overrun\n", dev->name);
-                       SMC_ACK_INT(IM_RX_OVRN_INT);
-                       lp->stats.rx_errors++;
-                       lp->stats.rx_fifo_errors++;
-               } else if (status & IM_EPH_INT) {
-                       smc_eph_interrupt(dev);
-               } else if (status & IM_MDINT) {
-                       SMC_ACK_INT(IM_MDINT);
-                       smc_phy_interrupt(dev);
-               } else if (status & IM_ERCV_INT) {
-                       SMC_ACK_INT(IM_ERCV_INT);
-                       PRINTK("%s: UNSUPPORTED: ERCV INTERRUPT \n", dev->name);
-               }
-
-               spin_unlock(&lp->lock);
-       } while (--timeout);
-
-       /* restore register states */
-       SMC_SET_INT_MASK(mask);
-       SMC_SET_PTR(saved_pointer);
-       SMC_SELECT_BANK(saved_bank);
-
-       DBG(3, "%s: Interrupt done (%d loops)\n", dev->name, 8-timeout);
-
-       /*
-        * We return IRQ_HANDLED unconditionally here even if there was
-        * nothing to do.  There is a possibility that a packet might
-        * get enqueued into the chip right after TX_EMPTY_INT is raised
-        * but just before the CPU acknowledges the IRQ.
-        * Better take an unneeded IRQ in some occasions than complexifying
-        * the code for all cases.
-        */
-       return IRQ_HANDLED;
-}
-
-/* Our watchdog timed out. Called by the networking layer */
-static void smc_timeout(struct net_device *dev)
-{
-       struct smc_local *lp = netdev_priv(dev);
-
-       DBG(2, "%s: %s\n", dev->name, __FUNCTION__);
-
-       smc_reset(dev);
-       smc_enable(dev);
-
-#if 0
-       /*
-        * Reconfiguring the PHY doesn't seem like a bad idea here, but
-        * it introduced a problem.  Now that this is a timeout routine,
-        * we are getting called from within an interrupt context.
-        * smc_phy_configure() calls msleep() which calls
-        * schedule_timeout() which calls schedule().  When schedule()
-        * is called from an interrupt context, it prints out
-        * "Scheduling in interrupt" and then calls BUG().  This is
-        * obviously not desirable.  This was worked around by removing
-        * the call to smc_phy_configure() here because it didn't seem
-        * absolutely necessary.  Ultimately, if msleep() is
-        * supposed to be usable from an interrupt context (which it
-        * looks like it thinks it should handle), it should be fixed.
-        */
-       if (lp->phy_type != 0)
-               smc_phy_configure(dev);
-#endif
-
-       /* clear anything saved */
-       if (lp->saved_skb != NULL) {
-               dev_kfree_skb (lp->saved_skb);
-               lp->saved_skb = NULL;
-               lp->stats.tx_errors++;
-               lp->stats.tx_aborted_errors++;
-       }
-       /* We can accept TX packets again */
-       dev->trans_start = jiffies;
-       netif_wake_queue(dev);
-}
-
-/*
- *    This sets the internal hardware table to filter out unwanted multicast
- *    packets before they take up memory.
- *
- *    The SMC chip uses a hash table where the high 6 bits of the CRC of
- *    address are the offset into the table.  If that bit is 1, then the
- *    multicast packet is accepted.  Otherwise, it's dropped silently.
- *
- *    To use the 6 bits as an offset into the table, the high 3 bits are the
- *    number of the 8 bit register, while the low 3 bits are the bit within
- *    that register.
- *
- *    This routine is based very heavily on the one provided by Peter Cammaert.
- */
-static void
-smc_setmulticast(unsigned long ioaddr, int count, struct dev_mc_list *addrs)
-{
-       int i;
-       unsigned char multicast_table[8];
-       struct dev_mc_list *cur_addr;
-
-       /* table for flipping the order of 3 bits */
-       static unsigned char invert3[] = { 0, 4, 2, 6, 1, 5, 3, 7 };
-
-       /* start with a table of all zeros: reject all */
-       memset(multicast_table, 0, sizeof(multicast_table));
-
-       cur_addr = addrs;
-       for (i = 0; i < count; i++, cur_addr = cur_addr->next) {
-               int position;
-
-               /* do we have a pointer here? */
-               if (!cur_addr)
-                       break;
-               /* make sure this is a multicast address - shouldn't this
-                  be a given if we have it here ? */
-               if (!(*cur_addr->dmi_addr & 1))
-                       continue;
-
-               /* only use the low order bits */
-               position = crc32_le(~0, cur_addr->dmi_addr, 6) & 0x3f;
-
-               /* do some messy swapping to put the bit in the right spot */
-               multicast_table[invert3[position&7]] |=
-                                       (1<<invert3[(position>>3)&7]);
-
-       }
-       /* now, the table can be loaded into the chipset */
-       SMC_SELECT_BANK(3);
-       SMC_SET_MCAST(multicast_table);
-}
-
-/*
- * This routine will, depending on the values passed to it,
- * either make it accept multicast packets, go into
- * promiscuous mode (for TCPDUMP and cousins) or accept
- * a select set of multicast packets
- */
-static void smc_set_multicast_list(struct net_device *dev)
-{
-       struct smc_local *lp = netdev_priv(dev);
-       unsigned long ioaddr = dev->base_addr;
-
-       DBG(2, "%s: %s\n", dev->name, __FUNCTION__);
-
-       SMC_SELECT_BANK(0);
-       if (dev->flags & IFF_PROMISC) {
-               DBG(2, "%s: RCR_PRMS\n", dev->name);
-               lp->rcr_cur_mode |= RCR_PRMS;
-               SMC_SET_RCR(lp->rcr_cur_mode);
-       }
-
-/* BUG?  I never disable promiscuous mode if multicasting was turned on.
-   Now, I turn off promiscuous mode, but I don't do anything to multicasting
-   when promiscuous mode is turned on.
-*/
-
-       /*
-        * Here, I am setting this to accept all multicast packets.
-        * I don't need to zero the multicast table, because the flag is
-        * checked before the table is
-        */
-       else if (dev->flags & IFF_ALLMULTI || dev->mc_count > 16) {
-               lp->rcr_cur_mode |= RCR_ALMUL;
-               SMC_SET_RCR(lp->rcr_cur_mode);
-               DBG(2, "%s: RCR_ALMUL\n", dev->name);
-       }
-
-       /*
-        * We just get all multicast packets even if we only want them
-        * from one source.  This will be changed at some future point.
-        */
-       else if (dev->mc_count)  {
-               /* support hardware multicasting */
-
-               /* be sure I get rid of flags I might have set */
-               lp->rcr_cur_mode &= ~(RCR_PRMS | RCR_ALMUL);
-               SMC_SET_RCR(lp->rcr_cur_mode);
-               /*
-                * NOTE: this has to set the bank, so make sure it is the
-                * last thing called.  The bank is set to zero at the top
-                */
-               smc_setmulticast(ioaddr, dev->mc_count, dev->mc_list);
-       } else  {
-               DBG(2, "%s: ~(RCR_PRMS|RCR_ALMUL)\n", dev->name);
-               lp->rcr_cur_mode &= ~(RCR_PRMS | RCR_ALMUL);
-               SMC_SET_RCR(lp->rcr_cur_mode);
-
-               /*
-                * since I'm disabling all multicast entirely, I need to
-                * clear the multicast list
-                */
-               SMC_SELECT_BANK(3);
-               SMC_CLEAR_MCAST();
-       }
-}
-
-
-/*
- * Open and Initialize the board
- *
- * Set up everything, reset the card, etc..
- */
-static int
-smc_open(struct net_device *dev)
-{
-       struct smc_local *lp = netdev_priv(dev);
-       unsigned long ioaddr = dev->base_addr;
-
-       DBG(2, "%s: %s\n", dev->name, __FUNCTION__);
-
-       /*
-        * Check that the address is valid.  If its not, refuse
-        * to bring the device up.  The user must specify an
-        * address using ifconfig eth0 hw ether xx:xx:xx:xx:xx:xx
-        */
-       if (!is_valid_ether_addr(dev->dev_addr)) {
-               DBG(2, (KERN_DEBUG "smc_open: no valid ethernet hw addr\n"));
-               return -EINVAL;
-       }
-
-       /* clear out all the junk that was put here before... */
-       lp->saved_skb = NULL;
-
-       /* Setup the default Register Modes */
-       lp->tcr_cur_mode = TCR_DEFAULT;
-       lp->rcr_cur_mode = RCR_DEFAULT;
-       lp->rpc_cur_mode = RPC_DEFAULT;
-
-       /*
-        * If we are not using a MII interface, we need to
-        * monitor our own carrier signal to detect faults.
-        */
-       if (lp->phy_type == 0)
-               lp->tcr_cur_mode |= TCR_MON_CSN;
-
-       /* reset the hardware */
-       smc_reset(dev);
-       smc_enable(dev);
-
-       SMC_SELECT_BANK(1);
-       SMC_SET_MAC_ADDR(dev->dev_addr);
-
-       /* Configure the PHY */
-       if (lp->phy_type != 0)
-               smc_phy_configure(dev);
-       else {
-               spin_lock_irq(&lp->lock);
-               smc_10bt_check_media(dev, 1);
-               spin_unlock_irq(&lp->lock);
-       }
-
-       /*
-        * make sure to initialize the link state with netif_carrier_off()
-        * somewhere, too --jgarzik
-        *
-        * smc_phy_configure() and smc_10bt_check_media() does that. --rmk
-        */
-       netif_start_queue(dev);
-       return 0;
-}
-
-/*
- * smc_close
- *
- * this makes the board clean up everything that it can
- * and not talk to the outside world.   Caused by
- * an 'ifconfig ethX down'
- */
-static int smc_close(struct net_device *dev)
-{
-       struct smc_local *lp = netdev_priv(dev);
-
-       DBG(2, "%s: %s\n", dev->name, __FUNCTION__);
-
-       netif_stop_queue(dev);
-       netif_carrier_off(dev);
-
-       /* clear everything */
-       smc_shutdown(dev->base_addr);
-
-       if (lp->phy_type != 0)
-               smc_phy_powerdown(dev, lp->mii.phy_id);
-
-       return 0;
-}
-
-/*
- * Get the current statistics.
- * This may be called with the card open or closed.
- */
-static struct net_device_stats *smc_query_statistics(struct net_device *dev)
-{
-       struct smc_local *lp = netdev_priv(dev);
-
-       DBG(2, "%s: %s\n", dev->name, __FUNCTION__);
-
-       return &lp->stats;
-}
-
-/*
- * Ethtool support
- */
-static int
-smc_ethtool_getsettings(struct net_device *dev, struct ethtool_cmd *cmd)
-{
-       struct smc_local *lp = netdev_priv(dev);
-       int ret;
-
-       cmd->maxtxpkt = 1;
-       cmd->maxrxpkt = 1;
-
-       if (lp->phy_type != 0) {
-               spin_lock_irq(&lp->lock);
-               ret = mii_ethtool_gset(&lp->mii, cmd);
-               spin_unlock_irq(&lp->lock);
-       } else {
-               cmd->supported = SUPPORTED_10baseT_Half |
-                                SUPPORTED_10baseT_Full |
-                                SUPPORTED_TP | SUPPORTED_AUI;
-
-               if (lp->ctl_rspeed == 10)
-                       cmd->speed = SPEED_10;
-               else if (lp->ctl_rspeed == 100)
-                       cmd->speed = SPEED_100;
-
-               cmd->autoneg = AUTONEG_DISABLE;
-               cmd->transceiver = XCVR_INTERNAL;
-               cmd->port = 0;
-               cmd->duplex = lp->tcr_cur_mode & TCR_SWFDUP ? DUPLEX_FULL : DUPLEX_HALF;
-
-               ret = 0;
-       }
-
-       return ret;
-}
-
-static int
-smc_ethtool_setsettings(struct net_device *dev, struct ethtool_cmd *cmd)
-{
-       struct smc_local *lp = netdev_priv(dev);
-       int ret;
-
-       if (lp->phy_type != 0) {
-               spin_lock_irq(&lp->lock);
-               ret = mii_ethtool_sset(&lp->mii, cmd);
-               spin_unlock_irq(&lp->lock);
-       } else {
-               if (cmd->autoneg != AUTONEG_DISABLE ||
-                   cmd->speed != SPEED_10 ||
-                   (cmd->duplex != DUPLEX_HALF && cmd->duplex != DUPLEX_FULL) ||
-                   (cmd->port != PORT_TP && cmd->port != PORT_AUI))
-                       return -EINVAL;
-
-//             lp->port = cmd->port;
-               lp->ctl_rfduplx = cmd->duplex == DUPLEX_FULL;
-
-//             if (netif_running(dev))
-//                     smc_set_port(dev);
-
-               ret = 0;
-       }
-
-       return ret;
-}
-
-static void
-smc_ethtool_getdrvinfo(struct net_device *dev, struct ethtool_drvinfo *info)
-{
-       strncpy(info->driver, CARDNAME, sizeof(info->driver));
-       strncpy(info->version, version, sizeof(info->version));
-       strncpy(info->bus_info, dev->class_dev.dev->bus_id, sizeof(info->bus_info));
-}
-
-static int smc_ethtool_nwayreset(struct net_device *dev)
-{
-       struct smc_local *lp = netdev_priv(dev);
-       int ret = -EINVAL;
-
-       if (lp->phy_type != 0) {
-               spin_lock_irq(&lp->lock);
-               ret = mii_nway_restart(&lp->mii);
-               spin_unlock_irq(&lp->lock);
-       }
-
-       return ret;
-}
-
-static u32 smc_ethtool_getmsglevel(struct net_device *dev)
-{
-       struct smc_local *lp = netdev_priv(dev);
-       return lp->msg_enable;
-}
-
-static void smc_ethtool_setmsglevel(struct net_device *dev, u32 level)
-{
-       struct smc_local *lp = netdev_priv(dev);
-       lp->msg_enable = level;
-}
-
-static struct ethtool_ops smc_ethtool_ops = {
-       .get_settings   = smc_ethtool_getsettings,
-       .set_settings   = smc_ethtool_setsettings,
-       .get_drvinfo    = smc_ethtool_getdrvinfo,
-
-       .get_msglevel   = smc_ethtool_getmsglevel,
-       .set_msglevel   = smc_ethtool_setmsglevel,
-       .nway_reset     = smc_ethtool_nwayreset,
-       .get_link       = ethtool_op_get_link,
-//     .get_eeprom     = smc_ethtool_geteeprom,
-//     .set_eeprom     = smc_ethtool_seteeprom,
-};
-
-/*
- * smc_findirq
- *
- * This routine has a simple purpose -- make the SMC chip generate an
- * interrupt, so an auto-detect routine can detect it, and find the IRQ,
- */
-/*
- * does this still work?
- *
- * I just deleted auto_irq.c, since it was never built...
- *   --jgarzik
- */
-static int __init smc_findirq(unsigned long ioaddr)
-{
-       int timeout = 20;
-       unsigned long cookie;
-
-       DBG(2, "%s: %s\n", CARDNAME, __FUNCTION__);
-
-       cookie = probe_irq_on();
-
-       /*
-        * What I try to do here is trigger an ALLOC_INT. This is done
-        * by allocating a small chunk of memory, which will give an interrupt
-        * when done.
-        */
-       /* enable ALLOCation interrupts ONLY */
-       SMC_SELECT_BANK(2);
-       SMC_SET_INT_MASK(IM_ALLOC_INT);
-
-       /*
-        * Allocate 512 bytes of memory.  Note that the chip was just
-        * reset so all the memory is available
-        */
-       SMC_SET_MMU_CMD(MC_ALLOC | 1);
-
-       /*
-        * Wait until positive that the interrupt has been generated
-        */
-       do {
-               int int_status;
-               udelay(10);
-               int_status = SMC_GET_INT();
-               if (int_status & IM_ALLOC_INT)
-                       break;          /* got the interrupt */
-       } while (--timeout);
-
-       /*
-        * there is really nothing that I can do here if timeout fails,
-        * as autoirq_report will return a 0 anyway, which is what I
-        * want in this case.   Plus, the clean up is needed in both
-        * cases.
-        */
-
-       /* and disable all interrupts again */
-       SMC_SET_INT_MASK(0);
-
-       /* and return what I found */
-       return probe_irq_off(cookie);
-}
-
-/*
- * Function: smc_probe(unsigned long ioaddr)
- *
- * Purpose:
- *     Tests to see if a given ioaddr points to an SMC91x chip.
- *     Returns a 0 on success
- *
- * Algorithm:
- *     (1) see if the high byte of BANK_SELECT is 0x33
- *     (2) compare the ioaddr with the base register's address
- *     (3) see if I recognize the chip ID in the appropriate register
- *
- * Here I do typical initialization tasks.
- *
- * o  Initialize the structure if needed
- * o  print out my vanity message if not done so already
- * o  print out what type of hardware is detected
- * o  print out the ethernet address
- * o  find the IRQ
- * o  set up my private data
- * o  configure the dev structure with my subroutines
- * o  actually GRAB the irq.
- * o  GRAB the region
- */
-static int __init smc_probe(struct net_device *dev, unsigned long ioaddr)
-{
-       struct smc_local *lp = netdev_priv(dev);
-       static int version_printed = 0;
-       int i, retval;
-       unsigned int val, revision_register;
-       const char *version_string;
-
-       DBG(2, "%s: %s\n", CARDNAME, __FUNCTION__);
-
-       /* First, see if the high byte is 0x33 */
-       val = SMC_CURRENT_BANK();
-       DBG(2, "%s: bank signature probe returned 0x%04x\n", CARDNAME, val);
-       if ((val & 0xFF00) != 0x3300) {
-               if ((val & 0xFF) == 0x33) {
-                       printk(KERN_WARNING
-                               "%s: Detected possible byte-swapped interface"
-                               " at IOADDR 0x%lx\n", CARDNAME, ioaddr);
-               }
-               retval = -ENODEV;
-               goto err_out;
-       }
-
-       /*
-        * The above MIGHT indicate a device, but I need to write to
-        * further test this.
-        */
-       SMC_SELECT_BANK(0);
-       val = SMC_CURRENT_BANK();
-       if ((val & 0xFF00) != 0x3300) {
-               retval = -ENODEV;
-               goto err_out;
-       }
-
-       /*
-        * well, we've already written once, so hopefully another
-        * time won't hurt.  This time, I need to switch the bank
-        * register to bank 1, so I can access the base address
-        * register
-        */
-       SMC_SELECT_BANK(1);
-       val = SMC_GET_BASE();
-       val = ((val & 0x1F00) >> 3) << SMC_IO_SHIFT;
-       if ((ioaddr & ((PAGE_SIZE-1)<<SMC_IO_SHIFT)) != val) {
-               printk("%s: IOADDR %lx doesn't match configuration (%x).\n",
-                       CARDNAME, ioaddr, val);
-       }
-
-       /*
-        * check if the revision register is something that I
-        * recognize.  These might need to be added to later,
-        * as future revisions could be added.
-        */
-       SMC_SELECT_BANK(3);
-       revision_register = SMC_GET_REV();
-       DBG(2, "%s: revision = 0x%04x\n", CARDNAME, revision_register);
-       version_string = chip_ids[ (revision_register >> 4) & 0xF];
-       if (!version_string || (revision_register & 0xff00) != 0x3300) {
-               /* I don't recognize this chip, so... */
-               printk("%s: IO 0x%lx: Unrecognized revision register 0x%04x"
-                       ", Contact author.\n", CARDNAME,
-                       ioaddr, revision_register);
-
-               retval = -ENODEV;
-               goto err_out;
-       }
-
-       /* At this point I'll assume that the chip is an SMC91x. */
-       if (version_printed++ == 0)
-               printk("%s", version);
-
-       /* fill in some of the fields */
-       dev->base_addr = ioaddr;
-       lp->version = revision_register & 0xff;
-
-       /* Get the MAC address */
-       SMC_SELECT_BANK(1);
-       SMC_GET_MAC_ADDR(dev->dev_addr);
-
-       /* now, reset the chip, and put it into a known state */
-       smc_reset(dev);
-
-       /*
-        * If dev->irq is 0, then the device has to be banged on to see
-        * what the IRQ is.
-        *
-        * This banging doesn't always detect the IRQ, for unknown reasons.
-        * a workaround is to reset the chip and try again.
-        *
-        * Interestingly, the DOS packet driver *SETS* the IRQ on the card to
-        * be what is requested on the command line.   I don't do that, mostly
-        * because the card that I have uses a non-standard method of accessing
-        * the IRQs, and because this _should_ work in most configurations.
-        *
-        * Specifying an IRQ is done with the assumption that the user knows
-        * what (s)he is doing.  No checking is done!!!!
-        */
-       if (dev->irq < 1) {
-               int trials;
-
-               trials = 3;
-               while (trials--) {
-                       dev->irq = smc_findirq(ioaddr);
-                       if (dev->irq)
-                               break;
-                       /* kick the card and try again */
-                       smc_reset(dev);
-               }
-       }
-       if (dev->irq == 0) {
-               printk("%s: Couldn't autodetect your IRQ. Use irq=xx.\n",
-                       dev->name);
-               retval = -ENODEV;
-               goto err_out;
-       }
-       dev->irq = irq_canonicalize(dev->irq);
-
-       /* Fill in the fields of the device structure with ethernet values. */
-       ether_setup(dev);
-
-       dev->open = smc_open;
-       dev->stop = smc_close;
-       dev->hard_start_xmit = smc_hard_start_xmit;
-       dev->tx_timeout = smc_timeout;
-       dev->watchdog_timeo = msecs_to_jiffies(watchdog);
-       dev->get_stats = smc_query_statistics;
-       dev->set_multicast_list = smc_set_multicast_list;
-       dev->ethtool_ops = &smc_ethtool_ops;
-
-       spin_lock_init(&lp->lock);
-       lp->mii.phy_id_mask = 0x1f;
-       lp->mii.reg_num_mask = 0x1f;
-       lp->mii.force_media = 0;
-       lp->mii.full_duplex = 0;
-       lp->mii.dev = dev;
-       lp->mii.mdio_read = smc_phy_read;
-       lp->mii.mdio_write = smc_phy_write;
-
-       /*
-        * Locate the phy, if any.
-        */
-       if (lp->version >= (CHIP_91100 << 4))
-               smc_detect_phy(dev);
-
-       /* Set default parameters */
-       lp->msg_enable = NETIF_MSG_LINK;
-       lp->ctl_rfduplx = 0;
-       lp->ctl_rspeed = 10;
-
-       if (lp->version >= (CHIP_91100 << 4)) {
-               lp->ctl_rfduplx = 1;
-               lp->ctl_rspeed = 100;
-       }
-
-       /* Grab the IRQ */
-       retval = request_irq(dev->irq, &smc_interrupt, 0, dev->name, dev);
-       if (retval)
-               goto err_out;
-
-       set_irq_type(dev->irq, IRQT_RISING);
-#ifdef SMC_USE_PXA_DMA
-       {
-               int dma = pxa_request_dma(dev->name, DMA_PRIO_LOW,
-                                         smc_pxa_dma_irq, NULL);
-               if (dma >= 0)
-                       dev->dma = dma;
-       }
-#endif
-
-       retval = register_netdev(dev);
-       if (retval == 0) {
-               /* now, print out the card info, in a short format.. */
-               printk("%s: %s (rev %d) at %#lx IRQ %d",
-                       dev->name, version_string, revision_register & 0x0f,
-                       dev->base_addr, dev->irq);
-
-               if (dev->dma != (unsigned char)-1)
-                       printk(" DMA %d", dev->dma);
-
-               printk("%s%s\n", nowait ? " [nowait]" : "",
-                       THROTTLE_TX_PKTS ? " [throttle_tx]" : "");
-
-               if (!is_valid_ether_addr(dev->dev_addr)) {
-                       printk("%s: Invalid ethernet MAC address.  Please "
-                              "set using ifconfig\n", dev->name);
-               } else {
-                       /* Print the Ethernet address */
-                       printk("%s: Ethernet addr: ", dev->name);
-                       for (i = 0; i < 5; i++)
-                               printk("%2.2x:", dev->dev_addr[i]);
-                       printk("%2.2x\n", dev->dev_addr[5]);
-               }
-
-               if (lp->phy_type == 0) {
-                       PRINTK("%s: No PHY found\n", dev->name);
-               } else if ((lp->phy_type & 0xfffffff0) == 0x0016f840) {
-                       PRINTK("%s: PHY LAN83C183 (LAN91C111 Internal)\n", dev->name);
-               } else if ((lp->phy_type & 0xfffffff0) == 0x02821c50) {
-                       PRINTK("%s: PHY LAN83C180\n", dev->name);
-               }
-       }
-
-err_out:
-#ifdef SMC_USE_PXA_DMA
-       if (retval && dev->dma != (unsigned char)-1)
-               pxa_free_dma(dev->dma);
-#endif
-       return retval;
-}
-
-static int smc_enable_device(unsigned long attrib_phys)
-{
-       unsigned long flags;
-       unsigned char ecor, ecsr;
-       void *addr;
-
-       /*
-        * Map the attribute space.  This is overkill, but clean.
-        */
-       addr = ioremap(attrib_phys, ATTRIB_SIZE);
-       if (!addr)
-               return -ENOMEM;
-
-       /*
-        * Reset the device.  We must disable IRQs around this
-        * since a reset causes the IRQ line become active.
-        */
-       local_irq_save(flags);
-       ecor = readb(addr + (ECOR << SMC_IO_SHIFT)) & ~ECOR_RESET;
-       writeb(ecor | ECOR_RESET, addr + (ECOR << SMC_IO_SHIFT));
-       readb(addr + (ECOR << SMC_IO_SHIFT));
-
-       /*
-        * Wait 100us for the chip to reset.
-        */
-       udelay(100);
-
-       /*
-        * The device will ignore all writes to the enable bit while
-        * reset is asserted, even if the reset bit is cleared in the
-        * same write.  Must clear reset first, then enable the device.
-        */
-       writeb(ecor, addr + (ECOR << SMC_IO_SHIFT));
-       writeb(ecor | ECOR_ENABLE, addr + (ECOR << SMC_IO_SHIFT));
-
-       /*
-        * Set the appropriate byte/word mode.
-        */
-       ecsr = readb(addr + (ECSR << SMC_IO_SHIFT)) & ~ECSR_IOIS8;
-#ifndef SMC_CAN_USE_16BIT
-       ecsr |= ECSR_IOIS8;
-#endif
-       writeb(ecsr, addr + (ECSR << SMC_IO_SHIFT));
-       local_irq_restore(flags);
-
-       iounmap(addr);
-
-       /*
-        * Wait for the chip to wake up.  We could poll the control
-        * register in the main register space, but that isn't mapped
-        * yet.  We know this is going to take 750us.
-        */
-       msleep(1);
-
-       return 0;
-}
-
-/*
- * smc_init(void)
- *   Input parameters:
- *     dev->base_addr == 0, try to find all possible locations
- *     dev->base_addr > 0x1ff, this is the address to check
- *     dev->base_addr == <anything else>, return failure code
- *
- *   Output:
- *     0 --> there is a device
- *     anything else, error
- */
-static int smc_drv_probe(struct device *dev)
-{
-       struct platform_device *pdev = to_platform_device(dev);
-       struct net_device *ndev;
-       struct resource *res, *ext = NULL;
-       unsigned int *addr;
-       int ret;
-
-       res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-       if (!res) {
-               ret = -ENODEV;
-               goto out;
-       }
-
-       /*
-        * Request the regions.
-        */
-       if (!request_mem_region(res->start, SMC_IO_EXTENT, "smc91x")) {
-               ret = -EBUSY;
-               goto out;
-       }
-
-       ndev = alloc_etherdev(sizeof(struct smc_local));
-       if (!ndev) {
-               printk("%s: could not allocate device.\n", CARDNAME);
-               ret = -ENOMEM;
-               goto release_1;
-       }
-       SET_MODULE_OWNER(ndev);
-       SET_NETDEV_DEV(ndev, dev);
-
-       ndev->dma = (unsigned char)-1;
-       ndev->irq = platform_get_irq(pdev, 0);
-
-       ext = platform_get_resource(pdev, IORESOURCE_MEM, 1);
-       if (ext) {
-               if (!request_mem_region(ext->start, ATTRIB_SIZE, ndev->name)) {
-                       ret = -EBUSY;
-                       goto release_1;
-               }
-
-#if defined(CONFIG_SA1100_ASSABET)
-               NCR_0 |= NCR_ENET_OSC_EN;
-#endif
-
-               ret = smc_enable_device(ext->start);
-               if (ret)
-                       goto release_both;
-       }
-
-       addr = ioremap(res->start, SMC_IO_EXTENT);
-       if (!addr) {
-               ret = -ENOMEM;
-               goto release_both;
-       }
-
-       dev_set_drvdata(dev, ndev);
-       ret = smc_probe(ndev, (unsigned long)addr);
-       if (ret != 0) {
-               dev_set_drvdata(dev, NULL);
-               iounmap(addr);
- release_both:
-               if (ext)
-                       release_mem_region(ext->start, ATTRIB_SIZE);
-               free_netdev(ndev);
- release_1:
-               release_mem_region(res->start, SMC_IO_EXTENT);
- out:
-               printk("%s: not found (%d).\n", CARDNAME, ret);
-       }
-#ifdef SMC_USE_PXA_DMA
-       else {
-               struct smc_local *lp = netdev_priv(ndev);
-               lp->physaddr = res->start;
-       }
-#endif
-
-       return ret;
-}
-
-static int smc_drv_remove(struct device *dev)
-{
-       struct platform_device *pdev = to_platform_device(dev);
-       struct net_device *ndev = dev_get_drvdata(dev);
-       struct resource *res;
-
-       dev_set_drvdata(dev, NULL);
-
-       unregister_netdev(ndev);
-
-       free_irq(ndev->irq, ndev);
-
-#ifdef SMC_USE_PXA_DMA
-       if (ndev->dma != (unsigned char)-1)
-               pxa_free_dma(ndev->dma);
-#endif
-       iounmap((void *)ndev->base_addr);
-       res = platform_get_resource(pdev, IORESOURCE_MEM, 1);
-       if (res)
-               release_mem_region(res->start, ATTRIB_SIZE);
-       res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-       release_mem_region(res->start, SMC_IO_EXTENT);
-
-       free_netdev(ndev);
-
-       return 0;
-}
-
-static int smc_drv_suspend(struct device *dev, u32 state, u32 level)
-{
-       struct net_device *ndev = dev_get_drvdata(dev);
-
-       if (ndev && level == SUSPEND_DISABLE) {
-               if (netif_running(ndev)) {
-                       netif_device_detach(ndev);
-                       smc_shutdown(ndev->base_addr);
-               }
-       }
-       return 0;
-}
-
-static int smc_drv_resume(struct device *dev, u32 level)
-{
-       struct platform_device *pdev = to_platform_device(dev);
-       struct net_device *ndev = dev_get_drvdata(dev);
-
-       if (ndev && level == RESUME_ENABLE) {
-               struct smc_local *lp = netdev_priv(ndev);
-               unsigned long ioaddr = ndev->base_addr;
-
-               if (pdev->num_resources == 3)
-                       smc_enable_device(pdev->resource[2].start);
-               if (netif_running(ndev)) {
-                       smc_reset(ndev);
-                       smc_enable(ndev);
-                       SMC_SELECT_BANK(1);
-                       SMC_SET_MAC_ADDR(ndev->dev_addr);
-                       if (lp->phy_type != 0)
-                               smc_phy_configure(ndev);
-                       netif_device_attach(ndev);
-               }
-       }
-       return 0;
-}
-
-static struct device_driver smc_driver = {
-       .name           = CARDNAME,
-       .bus            = &platform_bus_type,
-       .probe          = smc_drv_probe,
-       .remove         = smc_drv_remove,
-       .suspend        = smc_drv_suspend,
-       .resume         = smc_drv_resume,
-};
-
-static int __init smc_init(void)
-{
-#ifdef MODULE
-       if (io == -1)
-               printk(KERN_WARNING 
-                       "%s: You shouldn't use auto-probing with insmod!\n",
-                       CARDNAME);
-#endif
-
-       return driver_register(&smc_driver);
-}
-
-static void __exit smc_cleanup(void)
-{
-       driver_unregister(&smc_driver);
-}
-
-module_init(smc_init);
-module_exit(smc_cleanup);
diff --git a/drivers/net/arm/smc91x.h b/drivers/net/arm/smc91x.h
deleted file mode 100644 (file)
index 5212e37..0000000
+++ /dev/null
@@ -1,829 +0,0 @@
-/*------------------------------------------------------------------------
- . smc91x.h - macros for SMSC's 91C9x/91C1xx single-chip Ethernet device.
- .
- . Copyright (C) 1996 by Erik Stahlman
- . Copyright (C) 2001 Standard Microsystems Corporation
- .     Developed by Simple Network Magic Corporation
- . Copyright (C) 2003 Monta Vista Software, Inc.
- .     Unified SMC91x driver by Nicolas Pitre
- .
- . 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
- .
- . Information contained in this file was obtained from the LAN91C111
- . manual from SMC.  To get a copy, if you really want one, you can find
- . information under www.smsc.com.
- .
- . Authors
- .     Erik Stahlman           <erik@vt.edu>
- .     Daris A Nevil           <dnevil@snmc.com>
- .     Nicolas Pitre           <nico@cam.org>
- .
- ---------------------------------------------------------------------------*/
-#ifndef _SMC91X_H_
-#define _SMC91X_H_
-
-
-/*
- * Define your architecture specific bus configuration parameters here.
- */
-
-#if    defined(CONFIG_SA1100_GRAPHICSCLIENT) || \
-       defined(CONFIG_SA1100_PFS168) || \
-       defined(CONFIG_SA1100_FLEXANET) || \
-       defined(CONFIG_SA1100_GRAPHICSMASTER) || \
-       defined(CONFIG_ARCH_LUBBOCK)
-
-/* We can only do 16-bit reads and writes in the static memory space. */
-#define SMC_CAN_USE_8BIT       0
-#define SMC_CAN_USE_16BIT      1
-#define SMC_CAN_USE_32BIT      0
-#define SMC_NOWAIT             1
-
-/* The first two address lines aren't connected... */
-#define SMC_IO_SHIFT           2
-
-#define SMC_inw(a, r)          readw((a) + (r))
-#define SMC_outw(v, a, r)      writew(v, (a) + (r))
-#define SMC_insw(a, r, p, l)   readsw((a) + (r), p, l)
-#define SMC_outsw(a, r, p, l)  writesw((a) + (r), p, l)
-
-#elif defined(CONFIG_SA1100_ASSABET)
-
-#include <asm/arch/neponset.h>
-
-/* We can only do 8-bit reads and writes in the static memory space. */
-#define SMC_CAN_USE_8BIT       1
-#define SMC_CAN_USE_16BIT      0
-#define SMC_CAN_USE_32BIT      0
-#define SMC_NOWAIT             1
-
-/* The first two address lines aren't connected... */
-#define SMC_IO_SHIFT           2
-
-#define SMC_inb(a, r)          readb((a) + (r))
-#define SMC_outb(v, a, r)      writeb(v, (a) + (r))
-#define SMC_insb(a, r, p, l)   readsb((a) + (r), p, (l))
-#define SMC_outsb(a, r, p, l)  writesb((a) + (r), p, (l))
-
-#elif  defined(CONFIG_ARCH_INNOKOM) || \
-       defined(CONFIG_MACH_MAINSTONE) || \
-       defined(CONFIG_ARCH_PXA_IDP) || \
-       defined(CONFIG_ARCH_RAMSES)
-
-#define SMC_CAN_USE_8BIT       1
-#define SMC_CAN_USE_16BIT      1
-#define SMC_CAN_USE_32BIT      1
-#define SMC_IO_SHIFT           0
-#define SMC_NOWAIT             1
-#define SMC_USE_PXA_DMA                1
-
-#define SMC_inb(a, r)          readb((a) + (r))
-#define SMC_inw(a, r)          readw((a) + (r))
-#define SMC_inl(a, r)          readl((a) + (r))
-#define SMC_outb(v, a, r)      writeb(v, (a) + (r))
-#define SMC_outl(v, a, r)      writel(v, (a) + (r))
-#define SMC_insl(a, r, p, l)   readsl((a) + (r), p, l)
-#define SMC_outsl(a, r, p, l)  writesl((a) + (r), p, l)
-
-/* We actually can't write halfwords properly if not word aligned */
-static inline void
-SMC_outw(u16 val, unsigned long ioaddr, int reg)
-{
-       if (reg & 2) {
-               unsigned int v = val << 16;
-               v |= readl(ioaddr + (reg & ~2)) & 0xffff;
-               writel(v, ioaddr + (reg & ~2));
-       } else {
-               writew(val, ioaddr + reg);
-       }
-}
-
-#elif  defined(CONFIG_ISA)
-
-#define SMC_CAN_USE_8BIT       1
-#define SMC_CAN_USE_16BIT      1
-#define SMC_CAN_USE_32BIT      0
-
-#define SMC_inb(a, r)          inb((a) + (r))
-#define SMC_inw(a, r)          inw((a) + (r))
-#define SMC_outb(v, a, r)      outb(v, (a) + (r))
-#define SMC_outw(v, a, r)      outw(v, (a) + (r))
-#define SMC_insw(a, r, p, l)   insw((a) + (r), p, l)
-#define SMC_outsw(a, r, p, l)  outsw((a) + (r), p, l)
-
-#else
-
-#define SMC_CAN_USE_8BIT       1
-#define SMC_CAN_USE_16BIT      1
-#define SMC_CAN_USE_32BIT      1
-#define SMC_NOWAIT             1
-
-#define SMC_inb(a, r)          readb((a) + (r))
-#define SMC_inw(a, r)          readw((a) + (r))
-#define SMC_inl(a, r)          readl((a) + (r))
-#define SMC_outb(v, a, r)      writeb(v, (a) + (r))
-#define SMC_outw(v, a, r)      writew(v, (a) + (r))
-#define SMC_outl(v, a, r)      writel(v, (a) + (r))
-#define SMC_insl(a, r, p, l)   readsl((a) + (r), p, l)
-#define SMC_outsl(a, r, p, l)  writesl((a) + (r), p, l)
-
-#define RPC_LSA_DEFAULT                RPC_LED_100_10
-#define RPC_LSB_DEFAULT                RPC_LED_TX_RX
-
-#endif
-
-
-#ifdef SMC_USE_PXA_DMA
-/*
- * Let's use the DMA engine on the XScale PXA2xx for RX packets. This is
- * always happening in irq context so no need to worry about races.  TX is
- * different and probably not worth it for that reason, and not as critical
- * as RX which can overrun memory and lose packets.
- */
-#include <linux/pci.h>
-#include <asm/dma.h>
-
-#ifdef SMC_insl
-#undef SMC_insl
-#define SMC_insl(a, r, p, l) \
-       smc_pxa_dma_insl(a, lp->physaddr, r, dev->dma, p, l)
-static inline void
-smc_pxa_dma_insl(u_long ioaddr, u_long physaddr, int reg, int dma,
-                u_char *buf, int len)
-{
-       dma_addr_t dmabuf;
-
-       /* fallback if no DMA available */
-       if (dma == (unsigned char)-1) {
-               readsl(ioaddr + reg, buf, len);
-               return;
-       }
-
-       /* 64 bit alignment is required for memory to memory DMA */
-       if ((long)buf & 4) {
-               *((u32 *)buf)++ = SMC_inl(ioaddr, reg);
-               len--;
-       }
-
-       len *= 4;
-       dmabuf = dma_map_single(NULL, buf, len, PCI_DMA_FROMDEVICE);
-       DCSR(dma) = DCSR_NODESC;
-       DTADR(dma) = dmabuf;
-       DSADR(dma) = physaddr + reg;
-       DCMD(dma) = (DCMD_INCTRGADDR | DCMD_BURST32 |
-                    DCMD_WIDTH4 | (DCMD_LENGTH & len));
-       DCSR(dma) = DCSR_NODESC | DCSR_RUN;
-       while (!(DCSR(dma) & DCSR_STOPSTATE));
-       DCSR(dma) = 0;
-       dma_unmap_single(NULL, dmabuf, len, PCI_DMA_FROMDEVICE);
-}
-#endif
-
-#ifdef SMC_insw
-#undef SMC_insw
-#define SMC_insw(a, r, p, l) \
-       smc_pxa_dma_insw(a, lp->physaddr, r, dev->dma, p, l)
-static inline void
-smc_pxa_dma_insw(u_long ioaddr, u_long physaddr, int reg, int dma,
-                u_char *buf, int len)
-{
-       dma_addr_t dmabuf;
-
-       /* fallback if no DMA available */
-       if (dma == (unsigned char)-1) {
-               readsw(ioaddr + reg, buf, len);
-               return;
-       }
-
-       /* 64 bit alignment is required for memory to memory DMA */
-       while ((long)buf & 6) {
-               *((u16 *)buf)++ = SMC_inw(ioaddr, reg);
-               len--;
-       }
-
-       len *= 2;
-       dmabuf = dma_map_single(NULL, buf, len, PCI_DMA_FROMDEVICE);
-       DCSR(dma) = DCSR_NODESC;
-       DTADR(dma) = dmabuf;
-       DSADR(dma) = physaddr + reg;
-       DCMD(dma) = (DCMD_INCTRGADDR | DCMD_BURST32 |
-                    DCMD_WIDTH2 | (DCMD_LENGTH & len));
-       DCSR(dma) = DCSR_NODESC | DCSR_RUN;
-       while (!(DCSR(dma) & DCSR_STOPSTATE));
-       DCSR(dma) = 0;
-       dma_unmap_single(NULL, dmabuf, len, PCI_DMA_FROMDEVICE);
-}
-#endif
-
-static void
-smc_pxa_dma_irq(int dma, void *dummy, struct pt_regs *regs)
-{
-       DCSR(dma) = 0;
-}
-#endif  /* SMC_USE_PXA_DMA */
-
-
-/* Because of bank switching, the LAN91x uses only 16 I/O ports */
-#ifndef SMC_IO_SHIFT
-#define SMC_IO_SHIFT   0
-#endif
-#define SMC_IO_EXTENT  (16 << SMC_IO_SHIFT)
-
-
-/*
- . Bank Select Register:
- .
- .             yyyy yyyy 0000 00xx
- .             xx              = bank number
- .             yyyy yyyy       = 0x33, for identification purposes.
-*/
-#define BANK_SELECT            (14 << SMC_IO_SHIFT)
-
-
-// Transmit Control Register
-/* BANK 0  */
-#define TCR_REG        SMC_REG(0x0000, 0)
-#define TCR_ENABLE     0x0001  // When 1 we can transmit
-#define TCR_LOOP       0x0002  // Controls output pin LBK
-#define TCR_FORCOL     0x0004  // When 1 will force a collision
-#define TCR_PAD_EN     0x0080  // When 1 will pad tx frames < 64 bytes w/0
-#define TCR_NOCRC      0x0100  // When 1 will not append CRC to tx frames
-#define TCR_MON_CSN    0x0400  // When 1 tx monitors carrier
-#define TCR_FDUPLX     0x0800  // When 1 enables full duplex operation
-#define TCR_STP_SQET   0x1000  // When 1 stops tx if Signal Quality Error
-#define TCR_EPH_LOOP   0x2000  // When 1 enables EPH block loopback
-#define TCR_SWFDUP     0x8000  // When 1 enables Switched Full Duplex mode
-
-#define TCR_CLEAR      0       /* do NOTHING */
-/* the default settings for the TCR register : */
-#define TCR_DEFAULT    (TCR_ENABLE | TCR_PAD_EN)
-
-
-// EPH Status Register
-/* BANK 0  */
-#define EPH_STATUS_REG SMC_REG(0x0002, 0)
-#define ES_TX_SUC      0x0001  // Last TX was successful
-#define ES_SNGL_COL    0x0002  // Single collision detected for last tx
-#define ES_MUL_COL     0x0004  // Multiple collisions detected for last tx
-#define ES_LTX_MULT    0x0008  // Last tx was a multicast
-#define ES_16COL       0x0010  // 16 Collisions Reached
-#define ES_SQET                0x0020  // Signal Quality Error Test
-#define ES_LTXBRD      0x0040  // Last tx was a broadcast
-#define ES_TXDEFR      0x0080  // Transmit Deferred
-#define ES_LATCOL      0x0200  // Late collision detected on last tx
-#define ES_LOSTCARR    0x0400  // Lost Carrier Sense
-#define ES_EXC_DEF     0x0800  // Excessive Deferral
-#define ES_CTR_ROL     0x1000  // Counter Roll Over indication
-#define ES_LINK_OK     0x4000  // Driven by inverted value of nLNK pin
-#define ES_TXUNRN      0x8000  // Tx Underrun
-
-
-// Receive Control Register
-/* BANK 0  */
-#define RCR_REG                SMC_REG(0x0004, 0)
-#define RCR_RX_ABORT   0x0001  // Set if a rx frame was aborted
-#define RCR_PRMS       0x0002  // Enable promiscuous mode
-#define RCR_ALMUL      0x0004  // When set accepts all multicast frames
-#define RCR_RXEN       0x0100  // IFF this is set, we can receive packets
-#define RCR_STRIP_CRC  0x0200  // When set strips CRC from rx packets
-#define RCR_ABORT_ENB  0x0200  // When set will abort rx on collision
-#define RCR_FILT_CAR   0x0400  // When set filters leading 12 bit s of carrier
-#define RCR_SOFTRST    0x8000  // resets the chip
-
-/* the normal settings for the RCR register : */
-#define RCR_DEFAULT    (RCR_STRIP_CRC | RCR_RXEN)
-#define RCR_CLEAR      0x0     // set it to a base state
-
-
-// Counter Register
-/* BANK 0  */
-#define COUNTER_REG    SMC_REG(0x0006, 0)
-
-
-// Memory Information Register
-/* BANK 0  */
-#define MIR_REG                SMC_REG(0x0008, 0)
-
-
-// Receive/Phy Control Register
-/* BANK 0  */
-#define RPC_REG                SMC_REG(0x000A, 0)
-#define RPC_SPEED      0x2000  // When 1 PHY is in 100Mbps mode.
-#define RPC_DPLX       0x1000  // When 1 PHY is in Full-Duplex Mode
-#define RPC_ANEG       0x0800  // When 1 PHY is in Auto-Negotiate Mode
-#define RPC_LSXA_SHFT  5       // Bits to shift LS2A,LS1A,LS0A to lsb
-#define RPC_LSXB_SHFT  2       // Bits to get LS2B,LS1B,LS0B to lsb
-#define RPC_LED_100_10 (0x00)  // LED = 100Mbps OR's with 10Mbps link detect
-#define RPC_LED_RES    (0x01)  // LED = Reserved
-#define RPC_LED_10     (0x02)  // LED = 10Mbps link detect
-#define RPC_LED_FD     (0x03)  // LED = Full Duplex Mode
-#define RPC_LED_TX_RX  (0x04)  // LED = TX or RX packet occurred
-#define RPC_LED_100    (0x05)  // LED = 100Mbps link dectect
-#define RPC_LED_TX     (0x06)  // LED = TX packet occurred
-#define RPC_LED_RX     (0x07)  // LED = RX packet occurred
-
-#ifndef RPC_LSA_DEFAULT
-#define RPC_LSA_DEFAULT        RPC_LED_100
-#endif
-#ifndef RPC_LSB_DEFAULT
-#define RPC_LSB_DEFAULT RPC_LED_FD
-#endif
-
-#define RPC_DEFAULT (RPC_ANEG | (RPC_LSA_DEFAULT << RPC_LSXA_SHFT) | (RPC_LSB_DEFAULT << RPC_LSXB_SHFT) | RPC_SPEED | RPC_DPLX)
-
-
-/* Bank 0 0x0C is reserved */
-
-// Bank Select Register
-/* All Banks */
-#define BSR_REG                0x000E
-
-
-// Configuration Reg
-/* BANK 1 */
-#define CONFIG_REG     SMC_REG(0x0000, 1)
-#define CONFIG_EXT_PHY 0x0200  // 1=external MII, 0=internal Phy
-#define CONFIG_GPCNTRL 0x0400  // Inverse value drives pin nCNTRL
-#define CONFIG_NO_WAIT 0x1000  // When 1 no extra wait states on ISA bus
-#define CONFIG_EPH_POWER_EN 0x8000 // When 0 EPH is placed into low power mode.
-
-// Default is powered-up, Internal Phy, Wait States, and pin nCNTRL=low
-#define CONFIG_DEFAULT (CONFIG_EPH_POWER_EN)
-
-
-// Base Address Register
-/* BANK 1 */
-#define BASE_REG       SMC_REG(0x0002, 1)
-
-
-// Individual Address Registers
-/* BANK 1 */
-#define ADDR0_REG      SMC_REG(0x0004, 1)
-#define ADDR1_REG      SMC_REG(0x0006, 1)
-#define ADDR2_REG      SMC_REG(0x0008, 1)
-
-
-// General Purpose Register
-/* BANK 1 */
-#define GP_REG         SMC_REG(0x000A, 1)
-
-
-// Control Register
-/* BANK 1 */
-#define CTL_REG                SMC_REG(0x000C, 1)
-#define CTL_RCV_BAD    0x4000 // When 1 bad CRC packets are received
-#define CTL_AUTO_RELEASE 0x0800 // When 1 tx pages are released automatically
-#define CTL_LE_ENABLE  0x0080 // When 1 enables Link Error interrupt
-#define CTL_CR_ENABLE  0x0040 // When 1 enables Counter Rollover interrupt
-#define CTL_TE_ENABLE  0x0020 // When 1 enables Transmit Error interrupt
-#define CTL_EEPROM_SELECT 0x0004 // Controls EEPROM reload & store
-#define CTL_RELOAD     0x0002 // When set reads EEPROM into registers
-#define CTL_STORE      0x0001 // When set stores registers into EEPROM
-
-
-// MMU Command Register
-/* BANK 2 */
-#define MMU_CMD_REG    SMC_REG(0x0000, 2)
-#define MC_BUSY                1       // When 1 the last release has not completed
-#define MC_NOP         (0<<5)  // No Op
-#define MC_ALLOC       (1<<5)  // OR with number of 256 byte packets
-#define MC_RESET       (2<<5)  // Reset MMU to initial state
-#define MC_REMOVE      (3<<5)  // Remove the current rx packet
-#define MC_RELEASE     (4<<5)  // Remove and release the current rx packet
-#define MC_FREEPKT     (5<<5)  // Release packet in PNR register
-#define MC_ENQUEUE     (6<<5)  // Enqueue the packet for transmit
-#define MC_RSTTXFIFO   (7<<5)  // Reset the TX FIFOs
-
-
-// Packet Number Register
-/* BANK 2 */
-#define PN_REG         SMC_REG(0x0002, 2)
-
-
-// Allocation Result Register
-/* BANK 2 */
-#define AR_REG         SMC_REG(0x0003, 2)
-#define AR_FAILED      0x80    // Alocation Failed
-
-
-// TX FIFO Ports Register
-/* BANK 2 */
-#define TXFIFO_REG     SMC_REG(0x0004, 2)
-#define TXFIFO_TEMPTY  0x80    // TX FIFO Empty
-
-// RX FIFO Ports Register
-/* BANK 2 */
-#define RXFIFO_REG     SMC_REG(0x0005, 2)
-#define RXFIFO_REMPTY  0x80    // RX FIFO Empty
-
-#define FIFO_REG       SMC_REG(0x0004, 2)
-
-// Pointer Register
-/* BANK 2 */
-#define PTR_REG                SMC_REG(0x0006, 2)
-#define PTR_RCV                0x8000 // 1=Receive area, 0=Transmit area
-#define PTR_AUTOINC    0x4000 // Auto increment the pointer on each access
-#define PTR_READ       0x2000 // When 1 the operation is a read
-
-
-// Data Register
-/* BANK 2 */
-#define DATA_REG       SMC_REG(0x0008, 2)
-
-
-// Interrupt Status/Acknowledge Register
-/* BANK 2 */
-#define INT_REG                SMC_REG(0x000C, 2)
-
-
-// Interrupt Mask Register
-/* BANK 2 */
-#define IM_REG         SMC_REG(0x000D, 2)
-#define IM_MDINT       0x80 // PHY MI Register 18 Interrupt
-#define IM_ERCV_INT    0x40 // Early Receive Interrupt
-#define IM_EPH_INT     0x20 // Set by Ethernet Protocol Handler section
-#define IM_RX_OVRN_INT 0x10 // Set by Receiver Overruns
-#define IM_ALLOC_INT   0x08 // Set when allocation request is completed
-#define IM_TX_EMPTY_INT        0x04 // Set if the TX FIFO goes empty
-#define IM_TX_INT      0x02 // Transmit Interrupt
-#define IM_RCV_INT     0x01 // Receive Interrupt
-
-
-// Multicast Table Registers
-/* BANK 3 */
-#define MCAST_REG1     SMC_REG(0x0000, 3)
-#define MCAST_REG2     SMC_REG(0x0002, 3)
-#define MCAST_REG3     SMC_REG(0x0004, 3)
-#define MCAST_REG4     SMC_REG(0x0006, 3)
-
-
-// Management Interface Register (MII)
-/* BANK 3 */
-#define MII_REG                SMC_REG(0x0008, 3)
-#define MII_MSK_CRS100 0x4000 // Disables CRS100 detection during tx half dup
-#define MII_MDOE       0x0008 // MII Output Enable
-#define MII_MCLK       0x0004 // MII Clock, pin MDCLK
-#define MII_MDI                0x0002 // MII Input, pin MDI
-#define MII_MDO                0x0001 // MII Output, pin MDO
-
-
-// Revision Register
-/* BANK 3 */
-/* ( hi: chip id   low: rev # ) */
-#define REV_REG                SMC_REG(0x000A, 3)
-
-
-// Early RCV Register
-/* BANK 3 */
-/* this is NOT on SMC9192 */
-#define ERCV_REG       SMC_REG(0x000C, 3)
-#define ERCV_RCV_DISCRD        0x0080 // When 1 discards a packet being received
-#define ERCV_THRESHOLD 0x001F // ERCV Threshold Mask
-
-
-// External Register
-/* BANK 7 */
-#define EXT_REG                SMC_REG(0x0000, 7)
-
-
-#define CHIP_9192      3
-#define CHIP_9194      4
-#define CHIP_9195      5
-#define CHIP_9196      6
-#define CHIP_91100     7
-#define CHIP_91100FD   8
-#define CHIP_91111FD   9
-
-static const char * chip_ids[ 16 ] =  {
-       NULL, NULL, NULL,
-       /* 3 */ "SMC91C90/91C92",
-       /* 4 */ "SMC91C94",
-       /* 5 */ "SMC91C95",
-       /* 6 */ "SMC91C96",
-       /* 7 */ "SMC91C100",
-       /* 8 */ "SMC91C100FD",
-       /* 9 */ "SMC91C11xFD",
-       NULL, NULL, NULL,
-       NULL, NULL, NULL};
-
-
-/*
- . Transmit status bits
-*/
-#define TS_SUCCESS 0x0001
-#define TS_LOSTCAR 0x0400
-#define TS_LATCOL  0x0200
-#define TS_16COL   0x0010
-
-/*
- . Receive status bits
-*/
-#define RS_ALGNERR     0x8000
-#define RS_BRODCAST    0x4000
-#define RS_BADCRC      0x2000
-#define RS_ODDFRAME    0x1000
-#define RS_TOOLONG     0x0800
-#define RS_TOOSHORT    0x0400
-#define RS_MULTICAST   0x0001
-#define RS_ERRORS      (RS_ALGNERR | RS_BADCRC | RS_TOOLONG | RS_TOOSHORT)
-
-
-/*
- * PHY IDs
- *  LAN83C183 == LAN91C111 Internal PHY
- */
-#define PHY_LAN83C183  0x0016f840
-#define PHY_LAN83C180  0x02821c50
-
-/*
- * PHY Register Addresses (LAN91C111 Internal PHY)
- *
- * Generic PHY registers can be found in <linux/mii.h>
- *
- * These phy registers are specific to our on-board phy.
- */
-
-// PHY Configuration Register 1
-#define PHY_CFG1_REG           0x10
-#define PHY_CFG1_LNKDIS                0x8000  // 1=Rx Link Detect Function disabled
-#define PHY_CFG1_XMTDIS                0x4000  // 1=TP Transmitter Disabled
-#define PHY_CFG1_XMTPDN                0x2000  // 1=TP Transmitter Powered Down
-#define PHY_CFG1_BYPSCR                0x0400  // 1=Bypass scrambler/descrambler
-#define PHY_CFG1_UNSCDS                0x0200  // 1=Unscramble Idle Reception Disable
-#define PHY_CFG1_EQLZR         0x0100  // 1=Rx Equalizer Disabled
-#define PHY_CFG1_CABLE         0x0080  // 1=STP(150ohm), 0=UTP(100ohm)
-#define PHY_CFG1_RLVL0         0x0040  // 1=Rx Squelch level reduced by 4.5db
-#define PHY_CFG1_TLVL_SHIFT    2       // Transmit Output Level Adjust
-#define PHY_CFG1_TLVL_MASK     0x003C
-#define PHY_CFG1_TRF_MASK      0x0003  // Transmitter Rise/Fall time
-
-
-// PHY Configuration Register 2
-#define PHY_CFG2_REG           0x11
-#define PHY_CFG2_APOLDIS       0x0020  // 1=Auto Polarity Correction disabled
-#define PHY_CFG2_JABDIS                0x0010  // 1=Jabber disabled
-#define PHY_CFG2_MREG          0x0008  // 1=Multiple register access (MII mgt)
-#define PHY_CFG2_INTMDIO       0x0004  // 1=Interrupt signaled with MDIO pulseo
-
-// PHY Status Output (and Interrupt status) Register
-#define PHY_INT_REG            0x12    // Status Output (Interrupt Status)
-#define PHY_INT_INT            0x8000  // 1=bits have changed since last read
-#define PHY_INT_LNKFAIL                0x4000  // 1=Link Not detected
-#define PHY_INT_LOSSSYNC       0x2000  // 1=Descrambler has lost sync
-#define PHY_INT_CWRD           0x1000  // 1=Invalid 4B5B code detected on rx
-#define PHY_INT_SSD            0x0800  // 1=No Start Of Stream detected on rx
-#define PHY_INT_ESD            0x0400  // 1=No End Of Stream detected on rx
-#define PHY_INT_RPOL           0x0200  // 1=Reverse Polarity detected
-#define PHY_INT_JAB            0x0100  // 1=Jabber detected
-#define PHY_INT_SPDDET         0x0080  // 1=100Base-TX mode, 0=10Base-T mode
-#define PHY_INT_DPLXDET                0x0040  // 1=Device in Full Duplex
-
-// PHY Interrupt/Status Mask Register
-#define PHY_MASK_REG           0x13    // Interrupt Mask
-// Uses the same bit definitions as PHY_INT_REG
-
-
-/*
- * SMC91C96 ethernet config and status registers.
- * These are in the "attribute" space.
- */
-#define ECOR                   0x8000
-#define ECOR_RESET             0x80
-#define ECOR_LEVEL_IRQ         0x40
-#define ECOR_WR_ATTRIB         0x04
-#define ECOR_ENABLE            0x01
-
-#define ECSR                   0x8002
-#define ECSR_IOIS8             0x20
-#define ECSR_PWRDWN            0x04
-#define ECSR_INT               0x02
-
-#define ATTRIB_SIZE            ((64*1024) << SMC_IO_SHIFT)
-
-
-/*
- * Macros to abstract register access according to the data bus
- * capabilities.  Please use those and not the in/out primitives.
- * Note: the following macros do *not* select the bank -- this must
- * be done separately as needed in the main code.  The SMC_REG() macro
- * only uses the bank argument for debugging purposes (when enabled).
- */
-
-#if SMC_DEBUG > 0
-#define SMC_REG(reg, bank)                                             \
-       ({                                                              \
-               int __b = SMC_CURRENT_BANK();                           \
-               if (unlikely((__b & ~0xf0) != (0x3300 | bank))) {       \
-                       printk( "%s: bank reg screwed (0x%04x)\n",      \
-                               CARDNAME, __b );                        \
-                       BUG();                                          \
-               }                                                       \
-               reg<<SMC_IO_SHIFT;                                      \
-       })
-#else
-#define SMC_REG(reg, bank)     (reg<<SMC_IO_SHIFT)
-#endif
-
-#if SMC_CAN_USE_8BIT
-#define SMC_GET_PN()           SMC_inb( ioaddr, PN_REG )
-#define SMC_SET_PN(x)          SMC_outb( x, ioaddr, PN_REG )
-#define SMC_GET_AR()           SMC_inb( ioaddr, AR_REG )
-#define SMC_GET_TXFIFO()       SMC_inb( ioaddr, TXFIFO_REG )
-#define SMC_GET_RXFIFO()       SMC_inb( ioaddr, RXFIFO_REG )
-#define SMC_GET_INT()          SMC_inb( ioaddr, INT_REG )
-#define SMC_ACK_INT(x)         SMC_outb( x, ioaddr, INT_REG )
-#define SMC_GET_INT_MASK()     SMC_inb( ioaddr, IM_REG )
-#define SMC_SET_INT_MASK(x)    SMC_outb( x, ioaddr, IM_REG )
-#else
-#define SMC_GET_PN()           (SMC_inw( ioaddr, PN_REG ) & 0xFF)
-#define SMC_SET_PN(x)          SMC_outw( x, ioaddr, PN_REG )
-#define SMC_GET_AR()           (SMC_inw( ioaddr, PN_REG ) >> 8)
-#define SMC_GET_TXFIFO()       (SMC_inw( ioaddr, TXFIFO_REG ) & 0xFF)
-#define SMC_GET_RXFIFO()       (SMC_inw( ioaddr, TXFIFO_REG ) >> 8)
-#define SMC_GET_INT()          (SMC_inw( ioaddr, INT_REG ) & 0xFF)
-#define SMC_ACK_INT(x)                                                 \
-       do {                                                            \
-               unsigned long __flags;                                  \
-               int __mask;                                             \
-               local_irq_save(__flags);                                \
-               __mask = SMC_inw( ioaddr, INT_REG ) & ~0xff;            \
-               SMC_outw( __mask | (x), ioaddr, INT_REG );              \
-               local_irq_restore(__flags);                             \
-       } while (0)
-#define SMC_GET_INT_MASK()     (SMC_inw( ioaddr, INT_REG ) >> 8)
-#define SMC_SET_INT_MASK(x)    SMC_outw( (x) << 8, ioaddr, INT_REG )
-#endif
-
-#define SMC_CURRENT_BANK()     SMC_inw( ioaddr, BANK_SELECT )
-#define SMC_SELECT_BANK(x)     SMC_outw( x, ioaddr, BANK_SELECT )
-#define SMC_GET_BASE()         SMC_inw( ioaddr, BASE_REG )
-#define SMC_SET_BASE(x)                SMC_outw( x, ioaddr, BASE_REG )
-#define SMC_GET_CONFIG()       SMC_inw( ioaddr, CONFIG_REG )
-#define SMC_SET_CONFIG(x)      SMC_outw( x, ioaddr, CONFIG_REG )
-#define SMC_GET_COUNTER()      SMC_inw( ioaddr, COUNTER_REG )
-#define SMC_GET_CTL()          SMC_inw( ioaddr, CTL_REG )
-#define SMC_SET_CTL(x)         SMC_outw( x, ioaddr, CTL_REG )
-#define SMC_GET_MII()          SMC_inw( ioaddr, MII_REG )
-#define SMC_SET_MII(x)         SMC_outw( x, ioaddr, MII_REG )
-#define SMC_GET_MIR()          SMC_inw( ioaddr, MIR_REG )
-#define SMC_SET_MIR(x)         SMC_outw( x, ioaddr, MIR_REG )
-#define SMC_GET_MMU_CMD()      SMC_inw( ioaddr, MMU_CMD_REG )
-#define SMC_SET_MMU_CMD(x)     SMC_outw( x, ioaddr, MMU_CMD_REG )
-#define SMC_GET_FIFO()         SMC_inw( ioaddr, FIFO_REG )
-#define SMC_GET_PTR()          SMC_inw( ioaddr, PTR_REG )
-#define SMC_SET_PTR(x)         SMC_outw( x, ioaddr, PTR_REG )
-#define SMC_GET_RCR()          SMC_inw( ioaddr, RCR_REG )
-#define SMC_SET_RCR(x)         SMC_outw( x, ioaddr, RCR_REG )
-#define SMC_GET_REV()          SMC_inw( ioaddr, REV_REG )
-#define SMC_GET_RPC()          SMC_inw( ioaddr, RPC_REG )
-#define SMC_SET_RPC(x)         SMC_outw( x, ioaddr, RPC_REG )
-#define SMC_GET_TCR()          SMC_inw( ioaddr, TCR_REG )
-#define SMC_SET_TCR(x)         SMC_outw( x, ioaddr, TCR_REG )
-
-#ifndef SMC_GET_MAC_ADDR
-#define SMC_GET_MAC_ADDR(addr)                                         \
-       do {                                                            \
-               unsigned int __v;                                       \
-               __v = SMC_inw( ioaddr, ADDR0_REG );                     \
-               addr[0] = __v; addr[1] = __v >> 8;                      \
-               __v = SMC_inw( ioaddr, ADDR1_REG );                     \
-               addr[2] = __v; addr[3] = __v >> 8;                      \
-               __v = SMC_inw( ioaddr, ADDR2_REG );                     \
-               addr[4] = __v; addr[5] = __v >> 8;                      \
-       } while (0)
-#endif
-
-#define SMC_SET_MAC_ADDR(addr)                                         \
-       do {                                                            \
-               SMC_outw( addr[0]|(addr[1] << 8), ioaddr, ADDR0_REG );  \
-               SMC_outw( addr[2]|(addr[3] << 8), ioaddr, ADDR1_REG );  \
-               SMC_outw( addr[4]|(addr[5] << 8), ioaddr, ADDR2_REG );  \
-       } while (0)
-
-#define SMC_CLEAR_MCAST()                                              \
-       do {                                                            \
-               SMC_outw( 0, ioaddr, MCAST_REG1 );                      \
-               SMC_outw( 0, ioaddr, MCAST_REG2 );                      \
-               SMC_outw( 0, ioaddr, MCAST_REG3 );                      \
-               SMC_outw( 0, ioaddr, MCAST_REG4 );                      \
-       } while (0)
-#define SMC_SET_MCAST(x)                                               \
-       do {                                                            \
-               unsigned char *mt = (x);                                \
-               SMC_outw( mt[0] | (mt[1] << 8), ioaddr, MCAST_REG1 );   \
-               SMC_outw( mt[2] | (mt[3] << 8), ioaddr, MCAST_REG2 );   \
-               SMC_outw( mt[4] | (mt[5] << 8), ioaddr, MCAST_REG3 );   \
-               SMC_outw( mt[6] | (mt[7] << 8), ioaddr, MCAST_REG4 );   \
-       } while (0)
-
-#if SMC_CAN_USE_32BIT
-/*
- * Some setups just can't write 8 or 16 bits reliably when not aligned
- * to a 32 bit boundary.  I tell you that exists!
- * We re-do the ones here that can be easily worked around if they can have
- * their low parts written to 0 without adverse effects.
- */
-#undef SMC_SELECT_BANK
-#define SMC_SELECT_BANK(x)     SMC_outl( (x)<<16, ioaddr, 12<<SMC_IO_SHIFT )
-#undef SMC_SET_RPC
-#define SMC_SET_RPC(x)         SMC_outl( (x)<<16, ioaddr, SMC_REG(8, 0) )
-#undef SMC_SET_PN
-#define SMC_SET_PN(x)          SMC_outl( (x)<<16, ioaddr, SMC_REG(0, 2) )
-#undef SMC_SET_PTR
-#define SMC_SET_PTR(x)         SMC_outl( (x)<<16, ioaddr, SMC_REG(4, 2) )
-#endif
-
-#if SMC_CAN_USE_32BIT
-#define SMC_PUT_PKT_HDR(status, length)                                        \
-       SMC_outl( (status) | (length) << 16, ioaddr, DATA_REG )
-#define SMC_GET_PKT_HDR(status, length)                                        \
-       do {                                                            \
-               unsigned int __val = SMC_inl( ioaddr, DATA_REG );       \
-               (status) = __val & 0xffff;                              \
-               (length) = __val >> 16;                                 \
-       } while (0)
-#else
-#define SMC_PUT_PKT_HDR(status, length)                                        \
-       do {                                                            \
-               SMC_outw( status, ioaddr, DATA_REG );                   \
-               SMC_outw( length, ioaddr, DATA_REG );                   \
-       } while (0)
-#define SMC_GET_PKT_HDR(status, length)                                        \
-       do {                                                            \
-               (status) = SMC_inw( ioaddr, DATA_REG );                 \
-               (length) = SMC_inw( ioaddr, DATA_REG );                 \
-       } while (0)
-#endif
-
-#if SMC_CAN_USE_32BIT
-#define SMC_PUSH_DATA(p, l)                                            \
-       do {                                                            \
-               char *__ptr = (p);                                      \
-               int __len = (l);                                        \
-               if (__len >= 2 && (long)__ptr & 2) {                    \
-                       __len -= 2;                                     \
-                       SMC_outw( *((u16 *)__ptr)++, ioaddr, DATA_REG );\
-               }                                                       \
-               SMC_outsl( ioaddr, DATA_REG, __ptr, __len >> 2);        \
-               if (__len & 2) {                                        \
-                       __ptr += (__len & ~3);                          \
-                       SMC_outw( *((u16 *)__ptr), ioaddr, DATA_REG );  \
-               }                                                       \
-       } while (0)
-#define SMC_PULL_DATA(p, l)                                            \
-       do {                                                            \
-               char *__ptr = (p);                                      \
-               int __len = (l);                                        \
-               if ((long)__ptr & 2) {                                  \
-                       /*                                              \
-                        * We want 32bit alignment here.                \
-                        * Since some buses perform a full 32bit        \
-                        * fetch even for 16bit data we can't use       \
-                        * SMC_inw() here.  Back both source (on chip   \
-                        * and destination) pointers of 2 bytes.        \
-                        */                                             \
-                       (long)__ptr &= ~2;                              \
-                       __len += 2;                                     \
-                       SMC_SET_PTR( 2|PTR_READ|PTR_RCV|PTR_AUTOINC );  \
-               }                                                       \
-               __len += 2;                                             \
-               SMC_insl( ioaddr, DATA_REG, __ptr, __len >> 2);         \
-       } while (0)
-#elif SMC_CAN_USE_16BIT
-#define SMC_PUSH_DATA(p, l)    SMC_outsw( ioaddr, DATA_REG, p, (l) >> 1 )
-#define SMC_PULL_DATA(p, l)    SMC_insw ( ioaddr, DATA_REG, p, (l) >> 1 )
-#elif SMC_CAN_USE_8BIT
-#define SMC_PUSH_DATA(p, l)    SMC_outsb( ioaddr, DATA_REG, p, l )
-#define SMC_PULL_DATA(p, l)    SMC_insb ( ioaddr, DATA_REG, p, l )
-#endif
-
-#if ! SMC_CAN_USE_16BIT
-#define SMC_outw(x, ioaddr, reg)                                       \
-       do {                                                            \
-               unsigned int __val16 = (x);                             \
-               SMC_outb( __val16, ioaddr, reg );                       \
-               SMC_outb( __val16 >> 8, ioaddr, reg + (1 << SMC_IO_SHIFT));\
-       } while (0)
-#define SMC_inw(ioaddr, reg)                                           \
-       ({                                                              \
-               unsigned int __val16;                                   \
-               __val16 =  SMC_inb( ioaddr, reg );                      \
-               __val16 |= SMC_inb( ioaddr, reg + (1 << SMC_IO_SHIFT)) << 8; \
-               __val16;                                                \
-       })
-#endif
-
-
-#endif  /* _SMC91X_H_ */
diff --git a/drivers/net/gianfar.c b/drivers/net/gianfar.c
deleted file mode 100644 (file)
index 5005c1c..0000000
+++ /dev/null
@@ -1,1926 +0,0 @@
-/* 
- * drivers/net/gianfar.c
- *
- * Gianfar Ethernet Driver
- * Driver for FEC on MPC8540 and TSEC on MPC8540/MPC8560
- * Based on 8260_io/fcc_enet.c
- *
- * Author: Andy Fleming
- * Maintainer: Kumar Gala (kumar.gala@freescale.com)
- *
- * Copyright 2004 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.
- *
- *  Gianfar:  AKA Lambda Draconis, "Dragon"
- *  RA 11 31 24.2
- *  Dec +69 19 52
- *  V 3.84
- *  B-V +1.62
- *
- *  Theory of operation
- *  This driver is designed for the Triple-speed Ethernet
- *  controllers on the Freescale 8540/8560 integrated processors,
- *  as well as the Fast Ethernet Controller on the 8540.  
- *  
- *  The driver is initialized through OCP.  Structures which
- *  define the configuration needed by the board are defined in a
- *  board structure in arch/ppc/platforms (though I do not
- *  discount the possibility that other architectures could one
- *  day be supported.  One assumption the driver currently makes
- *  is that the PHY is configured in such a way to advertise all
- *  capabilities.  This is a sensible default, and on certain
- *  PHYs, changing this default encounters substantial errata
- *  issues.  Future versions may remove this requirement, but for
- *  now, it is best for the firmware to ensure this is the case.
- *
- *  The Gianfar Ethernet Controller uses a ring of buffer
- *  descriptors.  The beginning is indicated by a register
- *  pointing to the physical address of the start of the ring. 
- *  The end is determined by a "wrap" bit being set in the 
- *  last descriptor of the ring.
- *
- *  When a packet is received, the RXF bit in the
- *  IEVENT register is set, triggering an interrupt when the 
- *  corresponding bit in the IMASK register is also set (if
- *  interrupt coalescing is active, then the interrupt may not
- *  happen immediately, but will wait until either a set number
- *  of frames or amount of time have passed.).  In NAPI, the
- *  interrupt handler will signal there is work to be done, and
- *  exit.  Without NAPI, the packet(s) will be handled
- *  immediately.  Both methods will start at the last known empty
- *  descriptor, and process every subsequent descriptor until there 
- *  are none left with data (NAPI will stop after a set number of
- *  packets to give time to other tasks, but will eventually
- *  process all the packets).  The data arrives inside a
- *  pre-allocated skb, and so after the skb is passed up to the
- *  stack, a new skb must be allocated, and the address field in
- *  the buffer descriptor must be updated to indicate this new
- *  skb.
- *
- *  When the kernel requests that a packet be transmitted, the
- *  driver starts where it left off last time, and points the
- *  descriptor at the buffer which was passed in.  The driver
- *  then informs the DMA engine that there are packets ready to
- *  be transmitted.  Once the controller is finished transmitting
- *  the packet, an interrupt may be triggered (under the same
- *  conditions as for reception, but depending on the TXF bit).
- *  The driver then cleans up the buffer.
- */
-
-#include <linux/config.h>
-#include <linux/kernel.h>
-#include <linux/sched.h>
-#include <linux/string.h>
-#include <linux/errno.h>
-#include <linux/slab.h>
-#include <linux/interrupt.h>
-#include <linux/init.h>
-#include <linux/delay.h>
-#include <linux/netdevice.h>
-#include <linux/etherdevice.h>
-#include <linux/skbuff.h>
-#include <linux/spinlock.h>
-#include <linux/mm.h>
-
-#include <asm/io.h>
-#include <asm/irq.h>
-#include <asm/uaccess.h>
-#include <linux/module.h>
-#include <linux/version.h>
-#include <linux/dma-mapping.h>
-#include <linux/crc32.h>
-
-#include "gianfar.h"
-#include "gianfar_phy.h"
-#ifdef CONFIG_NET_FASTROUTE
-#include <linux/if_arp.h>
-#include <net/ip.h>
-#endif
-
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,41)
-#define irqreturn_t void
-#define IRQ_HANDLED 
-#endif
-
-#define TX_TIMEOUT      (1*HZ)
-#define SKB_ALLOC_TIMEOUT 1000000
-#undef BRIEF_GFAR_ERRORS
-#define VERBOSE_GFAR_ERRORS
-
-#ifdef CONFIG_GFAR_NAPI
-#define RECEIVE(x) netif_receive_skb(x)
-#else
-#define RECEIVE(x) netif_rx(x)
-#endif
-
-#define DEVICE_NAME "%s: Gianfar Ethernet Controller Version 1.0, "
-char gfar_driver_name[] = "Gianfar Ethernet";
-char gfar_driver_version[] = "1.0";
-
-int startup_gfar(struct net_device *dev);
-static int gfar_enet_open(struct net_device *dev);
-static int gfar_start_xmit(struct sk_buff *skb, struct net_device *dev);
-static void gfar_timeout(struct net_device *dev);
-static int gfar_close(struct net_device *dev);
-struct sk_buff *gfar_new_skb(struct net_device *dev, struct rxbd8 *bdp);
-static struct net_device_stats *gfar_get_stats(struct net_device *dev);
-static int gfar_set_mac_address(struct net_device *dev);
-static int gfar_change_mtu(struct net_device *dev, int new_mtu);
-static irqreturn_t gfar_error(int irq, void *dev_id, struct pt_regs *regs);
-static irqreturn_t gfar_transmit(int irq, void *dev_id, struct pt_regs *regs);
-irqreturn_t gfar_receive(int irq, void *dev_id, struct pt_regs *regs);
-static irqreturn_t gfar_interrupt(int irq, void *dev_id, struct pt_regs *regs);
-static irqreturn_t phy_interrupt(int irq, void *dev_id, struct pt_regs *regs);
-static void gfar_phy_change(void *data);
-static void gfar_phy_timer(unsigned long data);
-static void adjust_link(struct net_device *dev);
-static void init_registers(struct net_device *dev);
-static int init_phy(struct net_device *dev);
-static int gfar_probe(struct ocp_device *ocpdev);
-static void gfar_remove(struct ocp_device *ocpdev);
-void free_skb_resources(struct gfar_private *priv);
-static void gfar_set_multi(struct net_device *dev);
-static void gfar_set_hash_for_addr(struct net_device *dev, u8 *addr);
-#ifdef CONFIG_GFAR_NAPI
-static int gfar_poll(struct net_device *dev, int *budget);
-#endif
-#ifdef CONFIG_NET_FASTROUTE
-static int gfar_accept_fastpath(struct net_device *dev, struct dst_entry *dst);
-#endif
-static inline int try_fastroute(struct sk_buff *skb, struct net_device *dev, int length);
-#ifdef CONFIG_GFAR_NAPI
-static int gfar_clean_rx_ring(struct net_device *dev, int rx_work_limit);
-#else
-static int gfar_clean_rx_ring(struct net_device *dev);
-#endif
-static int gfar_process_frame(struct net_device *dev, struct sk_buff *skb, int length);
-
-extern struct ethtool_ops gfar_ethtool_ops;
-extern void gfar_gstrings_normon(struct net_device *dev, u32 stringset, 
-               u8 * buf);
-extern void gfar_fill_stats_normon(struct net_device *dev, 
-               struct ethtool_stats *dummy, u64 * buf);
-extern int gfar_stats_count_normon(struct net_device *dev);
-
-
-MODULE_AUTHOR("Freescale Semiconductor, Inc");
-MODULE_DESCRIPTION("Gianfar Ethernet Driver");
-MODULE_LICENSE("GPL");
-
-/* Called by the ocp code to initialize device data structures
- * required for bringing up the device
- * returns 0 on success */
-static int gfar_probe(struct ocp_device *ocpdev)
-{
-       u32 tempval;
-       struct ocp_device *mdiodev;
-       struct net_device *dev = NULL;
-       struct gfar_private *priv = NULL;
-       struct ocp_gfar_data *einfo;
-       int idx;
-       int err = 0;
-       struct ethtool_ops *dev_ethtool_ops;
-
-       einfo = (struct ocp_gfar_data *) ocpdev->def->additions;
-
-       if (einfo == NULL) {
-               printk(KERN_ERR "gfar %d: Missing additional data!\n",
-                      ocpdev->def->index);
-
-               return -ENODEV;
-       }
-
-       /* get a pointer to the register memory which can
-        * configure the PHYs.  If it's different from this set,
-        * get the device which has those regs */
-       if ((einfo->phyregidx >= 0) && (einfo->phyregidx != ocpdev->def->index)) {
-               mdiodev = ocp_find_device(OCP_ANY_ID,
-                                         OCP_FUNC_GFAR, einfo->phyregidx);
-
-               /* If the device which holds the MDIO regs isn't
-                * up, wait for it to come up */
-               if (mdiodev == NULL)
-                       return -EAGAIN;
-       } else {
-               mdiodev = ocpdev;
-       }
-
-       /* Create an ethernet device instance */
-       dev = alloc_etherdev(sizeof (*priv));
-
-       if (dev == NULL)
-               return -ENOMEM;
-
-       priv = netdev_priv(dev);
-
-       /* Set the info in the priv to the current info */
-       priv->einfo = einfo;
-
-       /* get a pointer to the register memory */
-       priv->regs = (struct gfar *)
-           ioremap(ocpdev->def->paddr, sizeof (struct gfar));
-
-       if (priv->regs == NULL) {
-               err = -ENOMEM;
-               goto regs_fail;
-       }
-
-       /* Set the PHY base address */
-       priv->phyregs = (struct gfar *)
-           ioremap(mdiodev->def->paddr, sizeof (struct gfar));
-
-       if (priv->phyregs == NULL) {
-               err = -ENOMEM;
-               goto phy_regs_fail;
-       }
-
-       ocp_set_drvdata(ocpdev, dev);
-
-       /* Stop the DMA engine now, in case it was running before */
-       /* (The firmware could have used it, and left it running). */
-       /* To do this, we write Graceful Receive Stop and Graceful */
-       /* Transmit Stop, and then wait until the corresponding bits */
-       /* in IEVENT indicate the stops have completed. */
-       tempval = gfar_read(&priv->regs->dmactrl);
-       tempval &= ~(DMACTRL_GRS | DMACTRL_GTS);
-       gfar_write(&priv->regs->dmactrl, tempval);
-
-       tempval = gfar_read(&priv->regs->dmactrl);
-       tempval |= (DMACTRL_GRS | DMACTRL_GTS);
-       gfar_write(&priv->regs->dmactrl, tempval);
-
-       while (!(gfar_read(&priv->regs->ievent) & (IEVENT_GRSC | IEVENT_GTSC)))
-               cpu_relax();
-
-       /* Reset MAC layer */
-       gfar_write(&priv->regs->maccfg1, MACCFG1_SOFT_RESET);
-
-       tempval = (MACCFG1_TX_FLOW | MACCFG1_RX_FLOW);
-       gfar_write(&priv->regs->maccfg1, tempval);
-
-       /* Initialize MACCFG2. */
-       gfar_write(&priv->regs->maccfg2, MACCFG2_INIT_SETTINGS);
-
-       /* Initialize ECNTRL */
-       gfar_write(&priv->regs->ecntrl, ECNTRL_INIT_SETTINGS);
-
-       /* Copy the station address into the dev structure, */
-       /* and into the address registers MAC_STNADDR1,2. */
-       /* Backwards, because little endian MACs are dumb. */
-       /* Don't set the regs if the firmware already did */
-       memcpy(dev->dev_addr, einfo->mac_addr, MAC_ADDR_LEN);
-
-       /* Set the dev->base_addr to the gfar reg region */
-       dev->base_addr = (unsigned long) (priv->regs);
-
-       SET_MODULE_OWNER(dev);
-
-       /* Fill in the dev structure */
-       dev->open = gfar_enet_open;
-       dev->hard_start_xmit = gfar_start_xmit;
-       dev->tx_timeout = gfar_timeout;
-       dev->watchdog_timeo = TX_TIMEOUT;
-#ifdef CONFIG_GFAR_NAPI
-       dev->poll = gfar_poll;
-       dev->weight = GFAR_DEV_WEIGHT;
-#endif
-       dev->stop = gfar_close;
-       dev->get_stats = gfar_get_stats;
-       dev->change_mtu = gfar_change_mtu;
-       dev->mtu = 1500;
-       dev->set_multicast_list = gfar_set_multi;
-       dev->flags |= IFF_MULTICAST;
-
-       dev_ethtool_ops = 
-               (struct ethtool_ops *)kmalloc(sizeof(struct ethtool_ops), 
-                                             GFP_KERNEL);
-
-       if(dev_ethtool_ops == NULL) {
-               err = -ENOMEM;
-               goto ethtool_fail;
-       }
-
-       memcpy(dev_ethtool_ops, &gfar_ethtool_ops, sizeof(gfar_ethtool_ops));
-
-       /* If there is no RMON support in this device, we don't
-        * want to expose non-existant statistics */
-       if((priv->einfo->flags & GFAR_HAS_RMON) == 0) {
-               dev_ethtool_ops->get_strings = gfar_gstrings_normon;
-               dev_ethtool_ops->get_stats_count = gfar_stats_count_normon;
-               dev_ethtool_ops->get_ethtool_stats = gfar_fill_stats_normon;
-       }
-
-       if((priv->einfo->flags & GFAR_HAS_COALESCE) == 0) {
-               dev_ethtool_ops->set_coalesce = NULL;
-               dev_ethtool_ops->get_coalesce = NULL;
-       }
-
-       dev->ethtool_ops = dev_ethtool_ops;
-
-#ifdef CONFIG_NET_FASTROUTE
-       dev->accept_fastpath = gfar_accept_fastpath;
-#endif
-
-       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;
-
-       /* Initially, coalescing is disabled */
-       priv->txcoalescing = 0;
-       priv->txcount = 0;
-       priv->txtime = 0;
-       priv->rxcoalescing = 0;
-       priv->rxcount = 0;
-       priv->rxtime = 0;
-
-       err = register_netdev(dev);
-
-       if (err) {
-               printk(KERN_ERR "%s: Cannot register net device, aborting.\n",
-                      dev->name);
-               goto register_fail;
-       }
-
-       /* Print out the device info */
-       printk(DEVICE_NAME, dev->name);
-       for (idx = 0; idx < 6; idx++)
-               printk("%2.2x%c", dev->dev_addr[idx], idx == 5 ? ' ' : ':');
-       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 */
-#ifdef CONFIG_GFAR_NAPI
-       printk(KERN_INFO "%s: Running with NAPI enabled\n", dev->name);
-#else
-       printk(KERN_INFO "%s: Running with NAPI disabled\n", dev->name);
-#endif
-       printk(KERN_INFO "%s: %d/%d RX/TX BD ring size\n",
-              dev->name, priv->rx_ring_size, priv->tx_ring_size);
-
-       return 0;
-
-
-register_fail:
-       kfree(dev_ethtool_ops);
-ethtool_fail:
-       iounmap((void *) priv->phyregs);
-phy_regs_fail:
-       iounmap((void *) priv->regs);
-regs_fail:
-       free_netdev(dev);
-       return -ENOMEM;
-}
-
-static void gfar_remove(struct ocp_device *ocpdev)
-{
-       struct net_device *dev = ocp_get_drvdata(ocpdev);
-       struct gfar_private *priv = netdev_priv(dev);
-
-       ocp_set_drvdata(ocpdev, NULL);
-
-       kfree(dev->ethtool_ops);
-       iounmap((void *) priv->regs);
-       iounmap((void *) priv->phyregs);
-       free_netdev(dev);
-}
-
-/* Configure the PHY for dev.
- * returns 0 if success.  -1 if failure
- */
-static int init_phy(struct net_device *dev)
-{
-       struct gfar_private *priv = netdev_priv(dev);
-       struct phy_info *curphy;
-
-       priv->link = 1;
-       priv->oldlink = 0;
-       priv->oldspeed = 0;
-       priv->olddplx = -1;
-
-       /* get info for this PHY */
-       curphy = get_phy_info(dev);
-
-       if (curphy == NULL) {
-               printk(KERN_ERR "%s: No PHY found\n", dev->name);
-               return -1;
-       }
-
-       priv->phyinfo = curphy;
-
-       /* Run the commands which configure the PHY */
-       phy_run_commands(dev, curphy->config);
-
-       return 0;
-}
-
-static void init_registers(struct net_device *dev)
-{
-       struct gfar_private *priv = netdev_priv(dev);
-
-       /* Clear IEVENT */
-       gfar_write(&priv->regs->ievent, IEVENT_INIT_CLEAR);
-
-       /* Initialize IMASK */
-       gfar_write(&priv->regs->imask, IMASK_INIT_CLEAR);
-
-       /* Init hash registers to zero */
-       gfar_write(&priv->regs->iaddr0, 0);
-       gfar_write(&priv->regs->iaddr1, 0);
-       gfar_write(&priv->regs->iaddr2, 0);
-       gfar_write(&priv->regs->iaddr3, 0);
-       gfar_write(&priv->regs->iaddr4, 0);
-       gfar_write(&priv->regs->iaddr5, 0);
-       gfar_write(&priv->regs->iaddr6, 0);
-       gfar_write(&priv->regs->iaddr7, 0);
-
-       gfar_write(&priv->regs->gaddr0, 0);
-       gfar_write(&priv->regs->gaddr1, 0);
-       gfar_write(&priv->regs->gaddr2, 0);
-       gfar_write(&priv->regs->gaddr3, 0);
-       gfar_write(&priv->regs->gaddr4, 0);
-       gfar_write(&priv->regs->gaddr5, 0);
-       gfar_write(&priv->regs->gaddr6, 0);
-       gfar_write(&priv->regs->gaddr7, 0);
-
-       /* Zero out rctrl */
-       gfar_write(&priv->regs->rctrl, 0x00000000);
-
-       /* Zero out the rmon mib registers if it has them */
-       if (priv->einfo->flags & GFAR_HAS_RMON) {
-               memset((void *) &(priv->regs->rmon), 0,
-                      sizeof (struct rmon_mib));
-
-               /* Mask off the CAM interrupts */
-               gfar_write(&priv->regs->rmon.cam1, 0xffffffff);
-               gfar_write(&priv->regs->rmon.cam2, 0xffffffff);
-       }
-
-       /* 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);
-}
-
-void stop_gfar(struct net_device *dev)
-{
-       struct gfar_private *priv = netdev_priv(dev);
-       struct gfar *regs = priv->regs;
-       unsigned long flags;
-       u32 tempval;
-
-       /* Lock it down */
-       spin_lock_irqsave(&priv->lock, flags);
-
-       /* Tell the kernel the link is down */
-       priv->link = 0;
-       adjust_link(dev);
-
-       /* Mask all interrupts */
-       gfar_write(&regs->imask, IMASK_INIT_CLEAR);
-
-       /* Clear all interrupts */
-       gfar_write(&regs->ievent, IEVENT_INIT_CLEAR);
-
-       /* Stop the DMA, and wait for it to stop */
-       tempval = gfar_read(&priv->regs->dmactrl);
-       if ((tempval & (DMACTRL_GRS | DMACTRL_GTS))
-           != (DMACTRL_GRS | DMACTRL_GTS)) {
-               tempval |= (DMACTRL_GRS | DMACTRL_GTS);
-               gfar_write(&priv->regs->dmactrl, tempval);
-
-               while (!(gfar_read(&priv->regs->ievent) &
-                        (IEVENT_GRSC | IEVENT_GTSC)))
-                       cpu_relax();
-       }
-
-       /* Disable Rx and Tx */
-       tempval = gfar_read(&regs->maccfg1);
-       tempval &= ~(MACCFG1_RX_EN | MACCFG1_TX_EN);
-       gfar_write(&regs->maccfg1, tempval);
-
-       if (priv->einfo->flags & GFAR_HAS_PHY_INTR) {
-               phy_run_commands(dev, priv->phyinfo->shutdown);
-       }
-
-       spin_unlock_irqrestore(&priv->lock, flags);
-
-       /* Free the IRQs */
-       if (priv->einfo->flags & GFAR_HAS_MULTI_INTR) {
-               free_irq(priv->einfo->interruptError, dev);
-               free_irq(priv->einfo->interruptTransmit, dev);
-               free_irq(priv->einfo->interruptReceive, dev);
-       } else {
-               free_irq(priv->einfo->interruptTransmit, dev);
-       }
-
-       if (priv->einfo->flags & GFAR_HAS_PHY_INTR) {
-               free_irq(priv->einfo->interruptPHY, dev);
-       } else {
-               del_timer_sync(&priv->phy_info_timer);
-       }
-
-       free_skb_resources(priv);
-
-       dma_unmap_single(NULL, gfar_read(&regs->tbase),
-                       sizeof(struct txbd)*priv->tx_ring_size,
-                       DMA_BIDIRECTIONAL);
-       dma_unmap_single(NULL, gfar_read(&regs->rbase),
-                       sizeof(struct rxbd)*priv->rx_ring_size,
-                       DMA_BIDIRECTIONAL);
-
-       /* Free the buffer descriptors */
-       kfree(priv->tx_bd_base);
-}
-
-/* If there are any tx skbs or rx skbs still around, free them.
- * Then free tx_skbuff and rx_skbuff */
-void free_skb_resources(struct gfar_private *priv)
-{
-       struct rxbd8 *rxbdp;
-       struct txbd8 *txbdp;
-       int i;
-
-       /* Go through all the buffer descriptors and free their data buffers */
-       txbdp = priv->tx_bd_base;
-
-       for (i = 0; i < priv->tx_ring_size; i++) {
-
-               if (priv->tx_skbuff[i]) {
-                       dma_unmap_single(NULL, txbdp->bufPtr,
-                                       txbdp->length,
-                                       DMA_TO_DEVICE);
-                       dev_kfree_skb_any(priv->tx_skbuff[i]);
-                       priv->tx_skbuff[i] = NULL;
-               }
-       }
-
-       kfree(priv->tx_skbuff);
-
-       rxbdp = priv->rx_bd_base;
-
-       /* rx_skbuff is not guaranteed to be allocated, so only
-        * free it and its contents if it is allocated */
-       if(priv->rx_skbuff != NULL) {
-               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,
-                                               DMA_FROM_DEVICE);
-
-                               dev_kfree_skb_any(priv->rx_skbuff[i]);
-                               priv->rx_skbuff[i] = NULL;
-                       }
-
-                       rxbdp->status = 0;
-                       rxbdp->length = 0;
-                       rxbdp->bufPtr = 0;
-
-                       rxbdp++;
-               }
-
-               kfree(priv->rx_skbuff);
-       }
-}
-
-/* Bring the controller up and running */
-int startup_gfar(struct net_device *dev)
-{
-       struct txbd8 *txbdp;
-       struct rxbd8 *rxbdp;
-       unsigned long addr;
-       int i;
-       struct gfar_private *priv = netdev_priv(dev);
-       struct gfar *regs = priv->regs;
-       u32 tempval;
-       int err = 0;
-
-       gfar_write(&regs->imask, IMASK_INIT_CLEAR);
-
-       /* Allocate memory for the buffer descriptors */
-       addr =
-           (unsigned int) kmalloc(sizeof (struct txbd8) * priv->tx_ring_size +
-                                  sizeof (struct rxbd8) * priv->rx_ring_size,
-                                  GFP_KERNEL);
-
-       if (addr == 0) {
-               printk(KERN_ERR "%s: Could not allocate buffer descriptors!\n",
-                      dev->name);
-               return -ENOMEM;
-       }
-
-       priv->tx_bd_base = (struct txbd8 *) addr;
-
-       /* enet DMA only understands physical addresses */
-       gfar_write(&regs->tbase, 
-                       dma_map_single(NULL, (void *)addr, 
-                               sizeof(struct txbd8) * priv->tx_ring_size,
-                               DMA_BIDIRECTIONAL));
-
-       /* Start the rx descriptor ring where the tx ring leaves off */
-       addr = addr + sizeof (struct txbd8) * priv->tx_ring_size;
-       priv->rx_bd_base = (struct rxbd8 *) addr;
-       gfar_write(&regs->rbase, 
-                       dma_map_single(NULL, (void *)addr, 
-                               sizeof(struct rxbd8) * priv->rx_ring_size,
-                               DMA_BIDIRECTIONAL));
-
-       /* Setup the skbuff rings */
-       priv->tx_skbuff =
-           (struct sk_buff **) kmalloc(sizeof (struct sk_buff *) *
-                                       priv->tx_ring_size, GFP_KERNEL);
-
-       if (priv->tx_skbuff == NULL) {
-               printk(KERN_ERR "%s: Could not allocate tx_skbuff\n",
-                      dev->name);
-               err = -ENOMEM;
-               goto tx_skb_fail;
-       }
-
-       for (i = 0; i < priv->tx_ring_size; i++)
-               priv->tx_skbuff[i] = NULL;
-
-       priv->rx_skbuff =
-           (struct sk_buff **) kmalloc(sizeof (struct sk_buff *) *
-                                       priv->rx_ring_size, GFP_KERNEL);
-
-       if (priv->rx_skbuff == NULL) {
-               printk(KERN_ERR "%s: Could not allocate rx_skbuff\n",
-                      dev->name);
-               err = -ENOMEM;
-               goto rx_skb_fail;
-       }
-
-       for (i = 0; i < priv->rx_ring_size; i++)
-               priv->rx_skbuff[i] = NULL;
-
-       /* Initialize some variables in our dev structure */
-       priv->dirty_tx = priv->cur_tx = priv->tx_bd_base;
-       priv->cur_rx = priv->rx_bd_base;
-       priv->skb_curtx = priv->skb_dirtytx = 0;
-       priv->skb_currx = 0;
-
-       /* Initialize Transmit Descriptor Ring */
-       txbdp = priv->tx_bd_base;
-       for (i = 0; i < priv->tx_ring_size; i++) {
-               txbdp->status = 0;
-               txbdp->length = 0;
-               txbdp->bufPtr = 0;
-               txbdp++;
-       }
-
-       /* Set the last descriptor in the ring to indicate wrap */
-       txbdp--;
-       txbdp->status |= TXBD_WRAP;
-
-       rxbdp = priv->rx_bd_base;
-       for (i = 0; i < priv->rx_ring_size; i++) {
-               struct sk_buff *skb = NULL;
-
-               rxbdp->status = 0;
-
-               skb = gfar_new_skb(dev, rxbdp);
-
-               priv->rx_skbuff[i] = skb;
-
-               rxbdp++;
-       }
-
-       /* Set the last descriptor in the ring to wrap */
-       rxbdp--;
-       rxbdp->status |= RXBD_WRAP;
-
-       /* If the device has multiple interrupts, register for
-        * them.  Otherwise, only register for the one */
-       if (priv->einfo->flags & GFAR_HAS_MULTI_INTR) {
-               /* Install our interrupt handlers for Error, 
-                * Transmit, and Receive */
-               if (request_irq(priv->einfo->interruptError, gfar_error,
-                               SA_SHIRQ, "enet_error", dev) < 0) {
-                       printk(KERN_ERR "%s: Can't get IRQ %d\n",
-                              dev->name, priv->einfo->interruptError);
-
-                       err = -1;
-                       goto err_irq_fail;
-               }
-
-               if (request_irq(priv->einfo->interruptTransmit, gfar_transmit,
-                               SA_SHIRQ, "enet_tx", dev) < 0) {
-                       printk(KERN_ERR "%s: Can't get IRQ %d\n",
-                              dev->name, priv->einfo->interruptTransmit);
-
-                       err = -1;
-
-                       goto tx_irq_fail;
-               }
-
-               if (request_irq(priv->einfo->interruptReceive, gfar_receive,
-                               SA_SHIRQ, "enet_rx", dev) < 0) {
-                       printk(KERN_ERR "%s: Can't get IRQ %d (receive0)\n",
-                              dev->name, priv->einfo->interruptReceive);
-
-                       err = -1;
-                       goto rx_irq_fail;
-               }
-       } else {
-               if (request_irq(priv->einfo->interruptTransmit, gfar_interrupt,
-                               SA_SHIRQ, "gfar_interrupt", dev) < 0) {
-                       printk(KERN_ERR "%s: Can't get IRQ %d\n",
-                              dev->name, priv->einfo->interruptError);
-
-                       err = -1;
-                       goto err_irq_fail;
-               }
-       }
-
-       /* Grab the PHY interrupt */
-       if (priv->einfo->flags & GFAR_HAS_PHY_INTR) {
-               if (request_irq(priv->einfo->interruptPHY, phy_interrupt,
-                               SA_SHIRQ, "phy_interrupt", dev) < 0) {
-                       printk(KERN_ERR "%s: Can't get IRQ %d (PHY)\n",
-                              dev->name, priv->einfo->interruptPHY);
-
-                       err = -1;
-
-                       if (priv->einfo->flags & GFAR_HAS_MULTI_INTR)
-                               goto phy_irq_fail;
-                       else
-                               goto tx_irq_fail;
-               }
-       } else {
-               init_timer(&priv->phy_info_timer);
-               priv->phy_info_timer.function = &gfar_phy_timer;
-               priv->phy_info_timer.data = (unsigned long) dev;
-               mod_timer(&priv->phy_info_timer, jiffies + 2 * HZ);
-       }
-
-       /* Set up the bottom half queue */
-       INIT_WORK(&priv->tq, (void (*)(void *))gfar_phy_change, dev);
-
-       /* Configure the PHY interrupt */
-       phy_run_commands(dev, priv->phyinfo->startup);
-
-       /* Tell the kernel the link is up, and determine the
-        * negotiated features (speed, duplex) */
-       adjust_link(dev);
-
-       if (priv->link == 0)
-               printk(KERN_INFO "%s: No link detected\n", dev->name);
-
-       /* Configure the coalescing support */
-       if (priv->txcoalescing)
-               gfar_write(&regs->txic,
-                          mk_ic_value(priv->txcount, priv->txtime));
-       else
-               gfar_write(&regs->txic, 0);
-
-       if (priv->rxcoalescing)
-               gfar_write(&regs->rxic,
-                          mk_ic_value(priv->rxcount, priv->rxtime));
-       else
-               gfar_write(&regs->rxic, 0);
-
-       init_waitqueue_head(&priv->rxcleanupq);
-
-       /* Enable Rx and Tx in MACCFG1 */
-       tempval = gfar_read(&regs->maccfg1);
-       tempval |= (MACCFG1_RX_EN | MACCFG1_TX_EN);
-       gfar_write(&regs->maccfg1, tempval);
-
-       /* Initialize DMACTRL to have WWR and WOP */
-       tempval = gfar_read(&priv->regs->dmactrl);
-       tempval |= DMACTRL_INIT_SETTINGS;
-       gfar_write(&priv->regs->dmactrl, tempval);
-
-       /* Clear THLT, so that the DMA starts polling now */
-       gfar_write(&regs->tstat, TSTAT_CLEAR_THALT);
-
-       /* Make sure we aren't stopped */
-       tempval = gfar_read(&priv->regs->dmactrl);
-       tempval &= ~(DMACTRL_GRS | DMACTRL_GTS);
-       gfar_write(&priv->regs->dmactrl, tempval);
-
-       /* Unmask the interrupts we look for */
-       gfar_write(&regs->imask, IMASK_DEFAULT);
-
-       return 0;
-
-phy_irq_fail:
-       free_irq(priv->einfo->interruptReceive, dev);
-rx_irq_fail:
-       free_irq(priv->einfo->interruptTransmit, dev);
-tx_irq_fail:
-       free_irq(priv->einfo->interruptError, dev);
-err_irq_fail:
-rx_skb_fail:
-       free_skb_resources(priv);
-tx_skb_fail:
-       kfree(priv->tx_bd_base);
-       return err;
-}
-
-/* Called when something needs to use the ethernet device */
-/* Returns 0 for success. */
-static int gfar_enet_open(struct net_device *dev)
-{
-       int err;
-
-       /* Initialize a bunch of registers */
-       init_registers(dev);
-
-       gfar_set_mac_address(dev);
-
-       err = init_phy(dev);
-
-       if (err)
-               return err;
-
-       err = startup_gfar(dev);
-
-       netif_start_queue(dev);
-
-       return err;
-}
-
-/* This is called by the kernel when a frame is ready for transmission. */
-/* It is pointed to by the dev->hard_start_xmit function pointer */
-static int gfar_start_xmit(struct sk_buff *skb, struct net_device *dev)
-{
-       struct gfar_private *priv = netdev_priv(dev);
-       struct txbd8 *txbdp;
-
-       /* Update transmit stats */
-       priv->stats.tx_bytes += skb->len;
-
-       /* Lock priv now */
-       spin_lock_irq(&priv->lock);
-
-       /* Point at the first free tx descriptor */
-       txbdp = priv->cur_tx;
-
-       /* Clear all but the WRAP status flags */
-       txbdp->status &= TXBD_WRAP;
-
-       /* Set buffer length and pointer */
-       txbdp->length = skb->len;
-       txbdp->bufPtr = dma_map_single(NULL, skb->data, 
-                       skb->len, DMA_TO_DEVICE);
-
-       /* Save the skb pointer so we can free it later */
-       priv->tx_skbuff[priv->skb_curtx] = skb;
-
-       /* Update the current skb pointer (wrapping if this was the last) */
-       priv->skb_curtx =
-           (priv->skb_curtx + 1) & TX_RING_MOD_MASK(priv->tx_ring_size);
-
-       /* Flag the BD as interrupt-causing */
-       txbdp->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);
-
-       dev->trans_start = jiffies;
-
-       /* If this was the last BD in the ring, the next one */
-       /* is at the beginning of the ring */
-       if (txbdp->status & TXBD_WRAP)
-               txbdp = priv->tx_bd_base;
-       else
-               txbdp++;
-
-       /* If the next BD still needs to be cleaned up, then the bds
-          are full.  We need to tell the kernel to stop sending us stuff. */
-       if (txbdp == priv->dirty_tx) {
-               netif_stop_queue(dev);
-
-               priv->stats.tx_fifo_errors++;
-       }
-
-       /* Update the current txbd to the next one */
-       priv->cur_tx = txbdp;
-
-       /* Tell the DMA to go go go */
-       gfar_write(&priv->regs->tstat, TSTAT_CLEAR_THALT);
-
-       /* Unlock priv */
-       spin_unlock_irq(&priv->lock);
-
-       return 0;
-}
-
-/* Stops the kernel queue, and halts the controller */
-static int gfar_close(struct net_device *dev)
-{
-       stop_gfar(dev);
-
-       netif_stop_queue(dev);
-
-       return 0;
-}
-
-/* returns a net_device_stats structure pointer */
-static struct net_device_stats * gfar_get_stats(struct net_device *dev)
-{
-       struct gfar_private *priv = netdev_priv(dev);
-
-       return &(priv->stats);
-}
-
-/* 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);
-
-       return 0;
-}
-
-/**********************************************************************
- * gfar_accept_fastpath
- *
- * Used to authenticate to the kernel that a fast path entry can be
- * added to device's routing table cache
- *
- * Input : pointer to ethernet interface network device structure and
- *         a pointer to the designated entry to be added to the cache.
- * Output : zero upon success, negative upon failure
- **********************************************************************/
-#ifdef CONFIG_NET_FASTROUTE
-static int gfar_accept_fastpath(struct net_device *dev, struct dst_entry *dst)
-{
-       struct net_device *odev = dst->dev;
-
-       if ((dst->ops->protocol != __constant_htons(ETH_P_IP))
-                       || (odev->type != ARPHRD_ETHER) 
-                       || (odev->accept_fastpath == NULL)) {
-               return -1;
-       }
-
-       return 0;
-}
-#endif
-
-/* try_fastroute() -- Checks the fastroute cache to see if a given packet
- *   can be routed immediately to another device.  If it can, we send it.
- *   If we used a fastroute, we return 1.  Otherwise, we return 0.
- *   Returns 0 if CONFIG_NET_FASTROUTE is not on
- */
-static inline int try_fastroute(struct sk_buff *skb, struct net_device *dev, int length)
-{
-#ifdef CONFIG_NET_FASTROUTE
-       struct ethhdr *eth;
-       struct iphdr *iph;
-       unsigned int hash;
-       struct rtable *rt;
-       struct net_device *odev;
-       struct gfar_private *priv = netdev_priv(dev);
-       unsigned int CPU_ID = smp_processor_id();
-
-       eth = (struct ethhdr *) (skb->data);
-
-       /* Only route ethernet IP packets */
-       if (eth->h_proto == __constant_htons(ETH_P_IP)) {
-               iph = (struct iphdr *) (skb->data + ETH_HLEN);
-
-               /* Generate the hash value */
-               hash = ((*(u8 *) &iph->daddr) ^ (*(u8 *) & iph->saddr)) & NETDEV_FASTROUTE_HMASK;
-
-               rt = (struct rtable *) (dev->fastpath[hash]);
-               if (rt != NULL 
-                               && ((*(u32 *) &iph->daddr) == (*(u32 *) &rt->key.dst))
-                               && ((*(u32 *) &iph->saddr) == (*(u32 *) &rt->key.src))
-                               && !(rt->u.dst.obsolete)) {
-                       odev = rt->u.dst.dev;
-                       netdev_rx_stat[CPU_ID].fastroute_hit++;
-
-                       /* Make sure the packet is:
-                        * 1) IPv4
-                        * 2) without any options (header length of 5)
-                        * 3) Not a multicast packet
-                        * 4) going to a valid destination
-                        * 5) Not out of time-to-live
-                        */
-                       if (iph->version == 4 
-                                       && iph->ihl == 5 
-                                       && (!(eth->h_dest[0] & 0x01)) 
-                                       && neigh_is_valid(rt->u.dst.neighbour) 
-                                       && iph->ttl > 1) {
-
-                               /* Fast Route Path: Taken if the outgoing device is ready to transmit the packet now */
-                               if ((!netif_queue_stopped(odev)) 
-                                               && (!spin_is_locked(odev->xmit_lock)) 
-                                               && (skb->len <= (odev->mtu + ETH_HLEN + 2 + 4))) {
-
-                                       skb->pkt_type = PACKET_FASTROUTE;
-                                       skb->protocol = __constant_htons(ETH_P_IP);
-                                       ip_decrease_ttl(iph);
-                                       memcpy(eth->h_source, odev->dev_addr, MAC_ADDR_LEN);
-                                       memcpy(eth->h_dest, rt->u.dst.neighbour->ha, MAC_ADDR_LEN);
-                                       skb->dev = odev;
-
-                                       /* Prep the skb for the packet */
-                                       skb_put(skb, length);
-
-                                       if (odev->hard_start_xmit(skb, odev) != 0) {
-                                               panic("%s: FastRoute path corrupted", dev->name);
-                                       }
-                                       netdev_rx_stat[CPU_ID].fastroute_success++;
-                               }
-
-                               /* Semi Fast Route Path: Mark the packet as needing fast routing, but let the
-                                * stack handle getting it to the device */
-                               else {
-                                       skb->pkt_type = PACKET_FASTROUTE;
-                                       skb->nh.raw = skb->data + ETH_HLEN;
-                                       skb->protocol = __constant_htons(ETH_P_IP);
-                                       netdev_rx_stat[CPU_ID].fastroute_defer++;
-
-                                       /* Prep the skb for the packet */
-                                       skb_put(skb, length);
-
-                                       if(RECEIVE(skb) == NET_RX_DROP) {
-                                               priv->extra_stats.kernel_dropped++;
-                                       }
-                               }
-
-                               return 1;
-                       }
-               }
-       }
-#endif /* CONFIG_NET_FASTROUTE */
-       return 0;
-}
-
-static int gfar_change_mtu(struct net_device *dev, int new_mtu)
-{
-       int tempsize, tempval;
-       struct gfar_private *priv = netdev_priv(dev);
-       int oldsize = priv->rx_buffer_size;
-       int frame_size = new_mtu + 18;
-
-       if ((frame_size < 64) || (frame_size > JUMBO_FRAME_SIZE)) {
-               printk(KERN_ERR "%s: Invalid MTU setting\n", dev->name);
-               return -EINVAL;
-       }
-
-       tempsize =
-           (frame_size & ~(INCREMENTAL_BUFFER_SIZE - 1)) +
-           INCREMENTAL_BUFFER_SIZE;
-
-       /* Only stop and start the controller if it isn't already
-        * stopped */
-       if ((oldsize != tempsize) && (dev->flags & IFF_UP))
-               stop_gfar(dev);
-
-       priv->rx_buffer_size = tempsize;
-
-       dev->mtu = new_mtu;
-
-       gfar_write(&priv->regs->mrblr, priv->rx_buffer_size);
-       gfar_write(&priv->regs->maxfrm, priv->rx_buffer_size);
-
-       /* If the mtu is larger than the max size for standard
-        * ethernet frames (ie, a jumbo frame), then set maccfg2
-        * to allow huge frames, and to check the length */
-       tempval = gfar_read(&priv->regs->maccfg2);
-
-       if (priv->rx_buffer_size > DEFAULT_RX_BUFFER_SIZE)
-               tempval |= (MACCFG2_HUGEFRAME | MACCFG2_LENGTHCHECK);
-       else
-               tempval &= ~(MACCFG2_HUGEFRAME | MACCFG2_LENGTHCHECK);
-
-       gfar_write(&priv->regs->maccfg2, tempval);
-
-       if ((oldsize != tempsize) && (dev->flags & IFF_UP))
-               startup_gfar(dev);
-
-       return 0;
-}
-
-/* gfar_timeout gets called when a packet has not been
- * transmitted after a set amount of time.
- * For now, assume that clearing out all the structures, and
- * starting over will fix the problem. */
-static void gfar_timeout(struct net_device *dev)
-{
-       struct gfar_private *priv = netdev_priv(dev);
-
-       priv->stats.tx_errors++;
-
-       if (dev->flags & IFF_UP) {
-               stop_gfar(dev);
-               startup_gfar(dev);
-       }
-
-       if (!netif_queue_stopped(dev))
-               netif_schedule(dev);
-}
-
-/* Interrupt Handler for Transmit complete */
-static irqreturn_t gfar_transmit(int irq, void *dev_id, struct pt_regs *regs)
-{
-       struct net_device *dev = (struct net_device *) dev_id;
-       struct gfar_private *priv = netdev_priv(dev);
-       struct txbd8 *bdp;
-
-       /* Clear IEVENT */
-       gfar_write(&priv->regs->ievent, IEVENT_TX_MASK);
-
-       /* Lock priv */
-       spin_lock(&priv->lock);
-       bdp = priv->dirty_tx;
-       while ((bdp->status & TXBD_READY) == 0) {
-               /* If dirty_tx and cur_tx are the same, then either the */
-               /* ring is empty or full now (it could only be full in the beginning, */
-               /* obviously).  If it is empty, we are done. */
-               if ((bdp == priv->cur_tx) && (netif_queue_stopped(dev) == 0))
-                       break;
-
-               priv->stats.tx_packets++;
-
-               /* Deferred means some collisions occurred during transmit, */
-               /* but we eventually sent the packet. */
-               if (bdp->status & TXBD_DEF)
-                       priv->stats.collisions++;
-
-               /* Free the sk buffer associated with this TxBD */
-               dev_kfree_skb_irq(priv->tx_skbuff[priv->skb_dirtytx]);
-               priv->tx_skbuff[priv->skb_dirtytx] = NULL;
-               priv->skb_dirtytx =
-                   (priv->skb_dirtytx +
-                    1) & TX_RING_MOD_MASK(priv->tx_ring_size);
-
-               /* update bdp to point at next bd in the ring (wrapping if necessary) */
-               if (bdp->status & TXBD_WRAP)
-                       bdp = priv->tx_bd_base;
-               else
-                       bdp++;
-
-               /* Move dirty_tx to be the next bd */
-               priv->dirty_tx = bdp;
-
-               /* We freed a buffer, so now we can restart transmission */
-               if (netif_queue_stopped(dev))
-                       netif_wake_queue(dev);
-       } /* while ((bdp->status & TXBD_READY) == 0) */
-
-       /* If we are coalescing the interrupts, reset the timer */
-       /* Otherwise, clear it */
-       if (priv->txcoalescing)
-               gfar_write(&priv->regs->txic,
-                          mk_ic_value(priv->txcount, priv->txtime));
-       else
-               gfar_write(&priv->regs->txic, 0);
-
-       spin_unlock(&priv->lock);
-
-       return IRQ_HANDLED;
-}
-
-struct sk_buff * gfar_new_skb(struct net_device *dev, struct rxbd8 *bdp)
-{
-       struct gfar_private *priv = netdev_priv(dev);
-       struct sk_buff *skb = NULL;
-       unsigned int timeout = SKB_ALLOC_TIMEOUT;
-
-       /* We have to allocate the skb, so keep trying till we succeed */
-       while ((!skb) && timeout--)
-               skb = dev_alloc_skb(priv->rx_buffer_size + RXBUF_ALIGNMENT);
-
-       if (skb == NULL)
-               return NULL;
-
-       /* 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->dev = dev;
-
-       bdp->bufPtr = dma_map_single(NULL, skb->data,
-                       priv->rx_buffer_size + RXBUF_ALIGNMENT, 
-                       DMA_FROM_DEVICE);
-
-       bdp->length = 0;
-
-       /* Mark the buffer empty */
-       bdp->status |= (RXBD_EMPTY | RXBD_INTERRUPT);
-
-       return skb;
-}
-
-static inline void count_errors(unsigned short status, struct gfar_private *priv)
-{
-       struct net_device_stats *stats = &priv->stats;
-       struct gfar_extra_stats *estats = &priv->extra_stats;
-
-       /* If the packet was truncated, none of the other errors
-        * matter */
-       if (status & RXBD_TRUNCATED) {
-               stats->rx_length_errors++;
-
-               estats->rx_trunc++;
-
-               return;
-       }
-       /* Count the errors, if there were any */
-       if (status & (RXBD_LARGE | RXBD_SHORT)) {
-               stats->rx_length_errors++;
-
-               if (status & RXBD_LARGE)
-                       estats->rx_large++;
-               else
-                       estats->rx_short++;
-       }
-       if (status & RXBD_NONOCTET) {
-               stats->rx_frame_errors++;
-               estats->rx_nonoctet++;
-       }
-       if (status & RXBD_CRCERR) {
-               estats->rx_crcerr++;
-               stats->rx_crc_errors++;
-       }
-       if (status & RXBD_OVERRUN) {
-               estats->rx_overrun++;
-               stats->rx_crc_errors++;
-       }
-}
-
-irqreturn_t gfar_receive(int irq, void *dev_id, struct pt_regs *regs)
-{
-       struct net_device *dev = (struct net_device *) dev_id;
-       struct gfar_private *priv = netdev_priv(dev);
-
-#ifdef CONFIG_GFAR_NAPI
-       u32 tempval;
-#endif
-
-       /* Clear IEVENT, so rx interrupt isn't called again
-        * because of this interrupt */
-       gfar_write(&priv->regs->ievent, IEVENT_RX_MASK);
-
-       /* support NAPI */
-#ifdef CONFIG_GFAR_NAPI
-       if (netif_rx_schedule_prep(dev)) {
-               tempval = gfar_read(&priv->regs->imask);
-               tempval &= IMASK_RX_DISABLED;
-               gfar_write(&priv->regs->imask, tempval);
-
-               __netif_rx_schedule(dev);
-       } else {
-#ifdef VERBOSE_GFAR_ERRORS
-               printk(KERN_DEBUG "%s: receive called twice (%x)[%x]\n",
-                      dev->name, gfar_read(priv->regs->ievent),
-                      gfar_read(priv->regs->imask));
-#endif
-       }
-#else
-
-       spin_lock(&priv->lock);
-       gfar_clean_rx_ring(dev);
-
-       /* If we are coalescing interrupts, update the timer */
-       /* Otherwise, clear it */
-       if (priv->rxcoalescing)
-               gfar_write(&priv->regs->rxic,
-                          mk_ic_value(priv->rxcount, priv->rxtime));
-       else
-               gfar_write(&priv->regs->rxic, 0);
-
-       /* Just in case we need to wake the ring param changer */
-       priv->rxclean = 1;
-
-       spin_unlock(&priv->lock);
-#endif
-
-       return IRQ_HANDLED;
-}
-
-
-/* gfar_process_frame() -- handle one incoming packet if skb
- * isn't NULL.  Try the fastroute before using the stack */
-static int gfar_process_frame(struct net_device *dev, struct sk_buff *skb,
-               int length)
-{
-       struct gfar_private *priv = netdev_priv(dev);
-
-       if (skb == NULL) {
-#ifdef BRIEF_GFAR_ERRORS
-               printk(KERN_WARNING "%s: Missing skb!!.\n",
-                               dev->name);
-#endif
-               priv->stats.rx_dropped++;
-               priv->extra_stats.rx_skbmissing++;
-       } else {
-               if(try_fastroute(skb, dev, length) == 0) {
-                       /* Prep the skb for the packet */
-                       skb_put(skb, length);
-
-                       /* Tell the skb what kind of packet this is */
-                       skb->protocol = eth_type_trans(skb, dev);
-
-                       /* Send the packet up the stack */
-                       if (RECEIVE(skb) == NET_RX_DROP) {
-                               priv->extra_stats.kernel_dropped++;
-                       }
-               }
-       }
-
-       return 0;
-}
-
-/* gfar_clean_rx_ring() -- Processes each frame in the rx ring
- *   until all are gone (or, in the case of NAPI, the budget/quota
- *   has been reached). Returns the number of frames handled
- */
-#ifdef CONFIG_GFAR_NAPI
-static int gfar_clean_rx_ring(struct net_device *dev, int rx_work_limit)
-#else
-static int gfar_clean_rx_ring(struct net_device *dev)
-#endif
-{
-       struct rxbd8 *bdp;
-       struct sk_buff *skb;
-       u16 pkt_len;
-       int howmany = 0;
-       struct gfar_private *priv = netdev_priv(dev);
-
-       /* Get the first full descriptor */
-       bdp = priv->cur_rx;
-
-#ifdef CONFIG_GFAR_NAPI
-#define GFAR_RXDONE() ((bdp->status & RXBD_EMPTY) || (--rx_work_limit < 0))
-#else
-#define GFAR_RXDONE() (bdp->status & RXBD_EMPTY)
-#endif
-       while (!GFAR_RXDONE()) {
-               skb = priv->rx_skbuff[priv->skb_currx];
-
-               if (!(bdp->status &
-                     (RXBD_LARGE | RXBD_SHORT | RXBD_NONOCTET
-                      | RXBD_CRCERR | RXBD_OVERRUN | RXBD_TRUNCATED))) {
-                       /* Increment the number of packets */
-                       priv->stats.rx_packets++;
-                       howmany++;
-
-                       /* Remove the FCS from the packet length */
-                       pkt_len = bdp->length - 4;
-
-                       gfar_process_frame(dev, skb, pkt_len);
-
-                       priv->stats.rx_bytes += pkt_len;
-
-               } else {
-                       count_errors(bdp->status, priv);
-
-                       if (skb)
-                               dev_kfree_skb_any(skb);
-
-                       priv->rx_skbuff[priv->skb_currx] = NULL;
-               }
-
-               dev->last_rx = jiffies;
-
-               /* Clear the status flags for this buffer */
-               bdp->status &= ~RXBD_STATS;
-
-               /* Add another skb for the future */
-               skb = gfar_new_skb(dev, bdp);
-               priv->rx_skbuff[priv->skb_currx] = skb;
-
-               /* Update to the next pointer */
-               if (bdp->status & RXBD_WRAP)
-                       bdp = priv->rx_bd_base;
-               else
-                       bdp++;
-
-               /* update to point at the next skb */
-               priv->skb_currx =
-                   (priv->skb_currx +
-                    1) & RX_RING_MOD_MASK(priv->rx_ring_size);
-
-       }
-
-       /* Update the current rxbd pointer to be the next one */
-       priv->cur_rx = bdp;
-
-       /* If no packets have arrived since the
-        * last one we processed, clear the IEVENT RX and
-        * BSY bits so that another interrupt won't be
-        * generated when we set IMASK */
-       if (bdp->status & RXBD_EMPTY)
-               gfar_write(&priv->regs->ievent, IEVENT_RX_MASK);
-
-       return howmany;
-}
-
-#ifdef CONFIG_GFAR_NAPI
-static int gfar_poll(struct net_device *dev, int *budget)
-{
-       int howmany;
-       struct gfar_private *priv = netdev_priv(dev);
-       int rx_work_limit = *budget;
-
-       if (rx_work_limit > dev->quota)
-               rx_work_limit = dev->quota;
-
-       spin_lock(&priv->lock);
-       howmany = gfar_clean_rx_ring(dev, rx_work_limit);
-
-       dev->quota -= howmany;
-       rx_work_limit -= howmany;
-       *budget -= howmany;
-
-       if (rx_work_limit >= 0) {
-               netif_rx_complete(dev);
-
-               /* Clear the halt bit in RSTAT */
-               gfar_write(&priv->regs->rstat, RSTAT_CLEAR_RHALT);
-
-               gfar_write(&priv->regs->imask, IMASK_DEFAULT);
-
-               /* If we are coalescing interrupts, update the timer */
-               /* Otherwise, clear it */
-               if (priv->rxcoalescing)
-                       gfar_write(&priv->regs->rxic,
-                                  mk_ic_value(priv->rxcount, priv->rxtime));
-               else
-                       gfar_write(&priv->regs->rxic, 0);
-
-               /* Signal to the ring size changer that it's safe to go */
-               priv->rxclean = 1;
-       }
-
-       spin_unlock(priv->lock);
-
-       return (rx_work_limit < 0) ? 1 : 0;
-}
-#endif
-
-/* The interrupt handler for devices with one interrupt */
-static irqreturn_t gfar_interrupt(int irq, void *dev_id, struct pt_regs *regs)
-{
-       struct net_device *dev = dev_id;
-       struct gfar_private *priv = netdev_priv(dev);
-
-       /* Save ievent for future reference */
-       u32 events = gfar_read(&priv->regs->ievent);
-
-       /* Clear IEVENT */
-       gfar_write(&priv->regs->ievent, events);
-
-       /* Check for reception */
-       if ((events & IEVENT_RXF0) || (events & IEVENT_RXB0))
-               gfar_receive(irq, dev_id, regs);
-
-       /* Check for transmit completion */
-       if ((events & IEVENT_TXF) || (events & IEVENT_TXB))
-               gfar_transmit(irq, dev_id, regs);
-
-       /* Update error statistics */
-       if (events & IEVENT_TXE) {
-               priv->stats.tx_errors++;
-
-               if (events & IEVENT_LC)
-                       priv->stats.tx_window_errors++;
-               if (events & IEVENT_CRL)
-                       priv->stats.tx_aborted_errors++;
-               if (events & IEVENT_XFUN) {
-#ifdef VERBOSE_GFAR_ERRORS
-                       printk(KERN_WARNING "%s: tx underrun. dropped packet\n",
-                              dev->name);
-#endif
-                       priv->stats.tx_dropped++;
-                       priv->extra_stats.tx_underrun++;
-
-                       /* Reactivate the Tx Queues */
-                       gfar_write(&priv->regs->tstat, TSTAT_CLEAR_THALT);
-               }
-       }
-       if (events & IEVENT_BSY) {
-               priv->stats.rx_errors++;
-               priv->extra_stats.rx_bsy++;
-
-               gfar_receive(irq, dev_id, regs);
-
-#ifndef CONFIG_GFAR_NAPI
-               /* Clear the halt bit in RSTAT */
-               gfar_write(&priv->regs->rstat, RSTAT_CLEAR_RHALT);
-#endif
-
-#ifdef VERBOSE_GFAR_ERRORS
-               printk(KERN_DEBUG "%s: busy error (rhalt: %x)\n", dev->name,
-                      gfar_read(priv->regs->rstat));
-#endif
-       }
-       if (events & IEVENT_BABR) {
-               priv->stats.rx_errors++;
-               priv->extra_stats.rx_babr++;
-
-#ifdef VERBOSE_GFAR_ERRORS
-               printk(KERN_DEBUG "%s: babbling error\n", dev->name);
-#endif
-       }
-       if (events & IEVENT_EBERR) {
-               priv->extra_stats.eberr++;
-#ifdef VERBOSE_GFAR_ERRORS
-               printk(KERN_DEBUG "%s: EBERR\n", dev->name);
-#endif
-       }
-       if (events & IEVENT_RXC) {
-#ifdef VERBOSE_GFAR_ERRORS
-               printk(KERN_DEBUG "%s: control frame\n", dev->name);
-#endif
-       }
-
-       if (events & IEVENT_BABT) {
-               priv->extra_stats.tx_babt++;
-#ifdef VERBOSE_GFAR_ERRORS
-               printk(KERN_DEBUG "%s: babt error\n", dev->name);
-#endif
-       }
-
-       return IRQ_HANDLED;
-}
-
-static irqreturn_t phy_interrupt(int irq, void *dev_id, struct pt_regs *regs)
-{
-       struct net_device *dev = (struct net_device *) dev_id;
-       struct gfar_private *priv = netdev_priv(dev);
-
-       /* Run the commands which acknowledge the interrupt */
-       phy_run_commands(dev, priv->phyinfo->ack_int);
-
-       /* Schedule the bottom half */
-       schedule_work(&priv->tq);
-
-       return IRQ_HANDLED;
-}
-
-/* Scheduled by the phy_interrupt/timer to handle PHY changes */
-static void gfar_phy_change(void *data)
-{
-       struct net_device *dev = (struct net_device *) data;
-       struct gfar_private *priv = netdev_priv(dev);
-       int timeout = HZ / 1000 + 1;
-
-       /* Delay to give the PHY a chance to change the
-        * register state */
-       set_current_state(TASK_UNINTERRUPTIBLE);
-       schedule_timeout(timeout);
-
-       /* Run the commands which check the link state */
-       phy_run_commands(dev, priv->phyinfo->handle_int);
-
-       /* React to the change in state */
-       adjust_link(dev);
-}
-
-/* Called every so often on systems that don't interrupt
- * the core for PHY changes */
-static void gfar_phy_timer(unsigned long data)
-{
-       struct net_device *dev = (struct net_device *) data;
-       struct gfar_private *priv = netdev_priv(dev);
-
-       schedule_work(&priv->tq);
-
-       mod_timer(&priv->phy_info_timer, jiffies + 2 * HZ);
-}
-
-/* Called every time the controller might need to be made
- * aware of new link state.  The PHY code conveys this
- * information through variables in the priv structure, and this
- * function converts those variables into the appropriate
- * register values, and can bring down the device if needed.
- */
-static void adjust_link(struct net_device *dev)
-{
-       struct gfar_private *priv = netdev_priv(dev);
-       struct gfar *regs = priv->regs;
-       u32 tempval;
-
-       if (priv->link) {
-               /* Now we make sure that we can be in full duplex mode.
-                * If not, we operate in half-duplex mode. */
-               if (priv->duplexity != priv->olddplx) {
-                       if (!(priv->duplexity)) {
-                               tempval = gfar_read(&regs->maccfg2);
-                               tempval &= ~(MACCFG2_FULL_DUPLEX);
-                               gfar_write(&regs->maccfg2, tempval);
-
-                               printk(KERN_INFO "%s: Half Duplex\n",
-                                      dev->name);
-                       } else {
-                               tempval = gfar_read(&regs->maccfg2);
-                               tempval |= MACCFG2_FULL_DUPLEX;
-                               gfar_write(&regs->maccfg2, tempval);
-
-                               printk(KERN_INFO "%s: Full Duplex\n",
-                                      dev->name);
-                       }
-
-                       priv->olddplx = priv->duplexity;
-               }
-
-               if (priv->speed != priv->oldspeed) {
-                       switch (priv->speed) {
-                       case 1000:
-                               tempval = gfar_read(&regs->maccfg2);
-                               tempval =
-                                   ((tempval & ~(MACCFG2_IF)) | MACCFG2_GMII);
-                               gfar_write(&regs->maccfg2, tempval);
-                               break;
-                       case 100:
-                       case 10:
-                               tempval = gfar_read(&regs->maccfg2);
-                               tempval =
-                                   ((tempval & ~(MACCFG2_IF)) | MACCFG2_MII);
-                               gfar_write(&regs->maccfg2, tempval);
-                               break;
-                       default:
-                               printk(KERN_WARNING
-                                      "%s: Ack!  Speed (%d) is not 10/100/1000!\n",
-                                      dev->name, priv->speed);
-                               break;
-                       }
-
-                       printk(KERN_INFO "%s: Speed %dBT\n", dev->name,
-                              priv->speed);
-
-                       priv->oldspeed = priv->speed;
-               }
-
-               if (!priv->oldlink) {
-                       printk(KERN_INFO "%s: Link is up\n", dev->name);
-                       priv->oldlink = 1;
-                       netif_carrier_on(dev);
-                       netif_schedule(dev);
-               }
-       } else {
-               if (priv->oldlink) {
-                       printk(KERN_INFO "%s: Link is down\n", dev->name);
-                       priv->oldlink = 0;
-                       priv->oldspeed = 0;
-                       priv->olddplx = -1;
-                       netif_carrier_off(dev);
-               }
-       }
-
-#ifdef VERBOSE_GFAR_ERRORS
-       printk(KERN_INFO "%s: Link now %s; %dBT %s-duplex\n",
-              dev->name, priv->link ? "up" : "down", priv->speed, priv->duplexity ? "full" : "half");
-#endif
-}
-
-
-/* Update the hash table based on the current list of multicast
- * addresses we subscribe to.  Also, change the promiscuity of
- * the device based on the flags (this function is called
- * whenever dev->flags is changed */
-static void gfar_set_multi(struct net_device *dev)
-{
-       struct dev_mc_list *mc_ptr;
-       struct gfar_private *priv = netdev_priv(dev);
-       struct gfar *regs = priv->regs;
-       u32 tempval;
-
-       if(dev->flags & IFF_PROMISC) {
-               printk(KERN_INFO "%s: Entering promiscuous mode.\n",
-                               dev->name);
-               /* Set RCTRL to PROM */
-               tempval = gfar_read(&regs->rctrl);
-               tempval |= RCTRL_PROM;
-               gfar_write(&regs->rctrl, tempval);
-       } else {
-               /* Set RCTRL to not PROM */
-               tempval = gfar_read(&regs->rctrl);
-               tempval &= ~(RCTRL_PROM);
-               gfar_write(&regs->rctrl, tempval);
-       }
-       
-       if(dev->flags & IFF_ALLMULTI) {
-               /* Set the hash to rx all multicast frames */
-               gfar_write(&regs->gaddr0, 0xffffffff);
-               gfar_write(&regs->gaddr1, 0xffffffff);
-               gfar_write(&regs->gaddr2, 0xffffffff);
-               gfar_write(&regs->gaddr3, 0xffffffff);
-               gfar_write(&regs->gaddr4, 0xffffffff);
-               gfar_write(&regs->gaddr5, 0xffffffff);
-               gfar_write(&regs->gaddr6, 0xffffffff);
-               gfar_write(&regs->gaddr7, 0xffffffff);
-       } else {
-               /* zero out the hash */
-               gfar_write(&regs->gaddr0, 0x0);
-               gfar_write(&regs->gaddr1, 0x0);
-               gfar_write(&regs->gaddr2, 0x0);
-               gfar_write(&regs->gaddr3, 0x0);
-               gfar_write(&regs->gaddr4, 0x0);
-               gfar_write(&regs->gaddr5, 0x0);
-               gfar_write(&regs->gaddr6, 0x0);
-               gfar_write(&regs->gaddr7, 0x0);
-
-               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);
-               }
-       }
-
-       return;
-}
-
-/* Set the appropriate hash bit for the given addr */
-/* The algorithm works like so:
- * 1) Take the Destination Address (ie the multicast address), and
- * do a CRC on it (little endian), and reverse the bits of the
- * result.
- * 2) Use the 8 most significant bits as a hash into a 256-entry
- * table.  The table is controlled through 8 32-bit registers:
- * gaddr0-7.  gaddr0's MSB is entry 0, and gaddr7's LSB is
- * gaddr7.  This means that the 3 most significant bits in the
- * hash index which gaddr register to use, and the 5 other bits
- * indicate which bit (assuming an IBM numbering scheme, which
- * for PowerPC (tm) is usually the case) in the register holds
- * the entry. */
-static void gfar_set_hash_for_addr(struct net_device *dev, u8 *addr)
-{
-       u32 tempval;
-       struct gfar_private *priv = netdev_priv(dev);
-       struct gfar *regs = priv->regs;
-       u32 *hash = &regs->gaddr0;
-       u32 result = ether_crc(MAC_ADDR_LEN, addr);
-       u8 whichreg = ((result >> 29) & 0x7);
-       u8 whichbit = ((result >> 24) & 0x1f);
-       u32 value = (1 << (31-whichbit));
-
-       tempval = gfar_read(&hash[whichreg]);
-       tempval |= value;
-       gfar_write(&hash[whichreg], tempval);
-
-       return;
-}
-
-/* GFAR error interrupt handler */
-static irqreturn_t gfar_error(int irq, void *dev_id, struct pt_regs *regs)
-{
-       struct net_device *dev = dev_id;
-       struct gfar_private *priv = netdev_priv(dev);
-
-       /* Save ievent for future reference */
-       u32 events = gfar_read(&priv->regs->ievent);
-
-       /* Clear IEVENT */
-       gfar_write(&priv->regs->ievent, IEVENT_ERR_MASK);
-
-       /* Hmm... */
-#if defined (BRIEF_GFAR_ERRORS) || defined (VERBOSE_GFAR_ERRORS)
-       printk(KERN_DEBUG "%s: error interrupt (ievent=0x%08x imask=0x%08x)\n",
-              dev->name, events, gfar_read(priv->regs->imask));
-#endif
-
-       /* Update the error counters */
-       if (events & IEVENT_TXE) {
-               priv->stats.tx_errors++;
-
-               if (events & IEVENT_LC)
-                       priv->stats.tx_window_errors++;
-               if (events & IEVENT_CRL)
-                       priv->stats.tx_aborted_errors++;
-               if (events & IEVENT_XFUN) {
-#ifdef VERBOSE_GFAR_ERRORS
-                       printk(KERN_DEBUG "%s: underrun.  packet dropped.\n",
-                              dev->name);
-#endif
-                       priv->stats.tx_dropped++;
-                       priv->extra_stats.tx_underrun++;
-
-                       /* Reactivate the Tx Queues */
-                       gfar_write(&priv->regs->tstat, TSTAT_CLEAR_THALT);
-               }
-#ifdef VERBOSE_GFAR_ERRORS
-               printk(KERN_DEBUG "%s: Transmit Error\n", dev->name);
-#endif
-       }
-       if (events & IEVENT_BSY) {
-               priv->stats.rx_errors++;
-               priv->extra_stats.rx_bsy++;
-
-               gfar_receive(irq, dev_id, regs);
-
-#ifndef CONFIG_GFAR_NAPI
-               /* Clear the halt bit in RSTAT */
-               gfar_write(&priv->regs->rstat, RSTAT_CLEAR_RHALT);
-#endif
-
-#ifdef VERBOSE_GFAR_ERRORS
-               printk(KERN_DEBUG "%s: busy error (rhalt: %x)\n", dev->name,
-                      gfar_read(priv->regs->rstat));
-#endif
-       }
-       if (events & IEVENT_BABR) {
-               priv->stats.rx_errors++;
-               priv->extra_stats.rx_babr++;
-
-#ifdef VERBOSE_GFAR_ERRORS
-               printk(KERN_DEBUG "%s: babbling error\n", dev->name);
-#endif
-       }
-       if (events & IEVENT_EBERR) {
-               priv->extra_stats.eberr++;
-#ifdef VERBOSE_GFAR_ERRORS
-               printk(KERN_DEBUG "%s: EBERR\n", dev->name);
-#endif
-       }
-       if (events & IEVENT_RXC)
-#ifdef VERBOSE_GFAR_ERRORS
-               printk(KERN_DEBUG "%s: control frame\n", dev->name);
-#endif
-
-       if (events & IEVENT_BABT) {
-               priv->extra_stats.tx_babt++;
-#ifdef VERBOSE_GFAR_ERRORS
-               printk(KERN_DEBUG "%s: babt error\n", dev->name);
-#endif
-       }
-       return IRQ_HANDLED;
-}
-
-/* Structure for a device driver */
-static struct ocp_device_id gfar_ids[] = {
-       {.vendor = OCP_ANY_ID,.function = OCP_FUNC_GFAR},
-       {.vendor = OCP_VENDOR_INVALID}
-};
-
-static struct ocp_driver gfar_driver = {
-       .name = "gianfar",
-       .id_table = gfar_ids,
-
-       .probe = gfar_probe,
-       .remove = gfar_remove,
-};
-
-static int __init gfar_init(void)
-{
-       int rc;
-
-       rc = ocp_register_driver(&gfar_driver);
-#if LINUX_VERSION_CODE > KERNEL_VERSION(2,5,41)
-       if (rc != 0) {
-#else
-       if (rc == 0) {
-#endif
-               ocp_unregister_driver(&gfar_driver);
-               return -ENODEV;
-       }
-
-       return 0;
-}
-
-static void __exit gfar_exit(void)
-{
-       ocp_unregister_driver(&gfar_driver);
-}
-
-module_init(gfar_init);
-module_exit(gfar_exit);
diff --git a/drivers/net/gianfar.h b/drivers/net/gianfar.h
deleted file mode 100644 (file)
index f7af346..0000000
+++ /dev/null
@@ -1,537 +0,0 @@
-/* 
- * drivers/net/gianfar.h
- *
- * Gianfar Ethernet Driver
- * Driver for FEC on MPC8540 and TSEC on MPC8540/MPC8560
- * Based on 8260_io/fcc_enet.c
- *
- * Author: Andy Fleming
- * Maintainer: Kumar Gala (kumar.gala@freescale.com)
- *
- * Copyright 2004 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.
- *
- *  Still left to do:
- *      -Add support for module parameters
- */
-#ifndef __GIANFAR_H
-#define __GIANFAR_H
-
-#include <linux/config.h>
-#include <linux/kernel.h>
-#include <linux/sched.h>
-#include <linux/string.h>
-#include <linux/errno.h>
-#include <linux/slab.h>
-#include <linux/interrupt.h>
-#include <linux/init.h>
-#include <linux/delay.h>
-#include <linux/netdevice.h>
-#include <linux/etherdevice.h>
-#include <linux/skbuff.h>
-#include <linux/spinlock.h>
-#include <linux/mm.h>
-
-#include <asm/io.h>
-#include <asm/irq.h>
-#include <asm/uaccess.h>
-#include <linux/module.h>
-#include <linux/version.h>
-#include <linux/crc32.h>
-
-#if LINUX_VERSION_CODE > KERNEL_VERSION(2,5,41)
-#include <linux/workqueue.h>
-#else
-#include <linux/tqueue.h>
-#define work_struct tq_struct
-#define schedule_work schedule_task
-#endif
-
-#include <linux/ethtool.h>
-#include <linux/netdevice.h>
-#include <asm/ocp.h>
-#include "gianfar_phy.h"
-
-/* The maximum number of packets to be handled in one call of gfar_poll */
-#define GFAR_DEV_WEIGHT 64
-
-/* Number of bytes to align the rx bufs to */
-#define RXBUF_ALIGNMENT 64
-
-/* The number of bytes which composes a unit for the purpose of
- * allocating data buffers.  ie-for any given MTU, the data buffer
- * will be the next highest multiple of 512 bytes. */
-#define INCREMENTAL_BUFFER_SIZE 512
-
-
-#define MAC_ADDR_LEN 6
-
-extern char gfar_driver_name[];
-extern char gfar_driver_version[];
-
-/* These need to be powers of 2 for this driver */
-#ifdef CONFIG_GFAR_NAPI
-#define DEFAULT_TX_RING_SIZE   256
-#define DEFAULT_RX_RING_SIZE   256
-#else
-#define DEFAULT_TX_RING_SIZE    64
-#define DEFAULT_RX_RING_SIZE    64
-#endif
-
-#define GFAR_RX_MAX_RING_SIZE   256
-#define GFAR_TX_MAX_RING_SIZE   256
-
-#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
-
-/* Latency of interface clock in nanoseconds */
-/* Interface clock latency , in this case, means the 
- * time described by a value of 1 in the interrupt
- * coalescing registers' time fields.  Since those fields
- * refer to the time it takes for 64 clocks to pass, the
- * latencies are as such:
- * GBIT = 125MHz => 8ns/clock => 8*64 ns / tick
- * 100 = 25 MHz => 40ns/clock => 40*64 ns / tick
- * 10 = 2.5 MHz => 400ns/clock => 400*64 ns / tick
- */
-#define GFAR_GBIT_TIME  512
-#define GFAR_100_TIME   2560
-#define GFAR_10_TIME    25600
-
-#define DEFAULT_TXCOUNT        16
-#define DEFAULT_TXTIME 32768
-
-#define DEFAULT_RXCOUNT        16
-#define DEFAULT_RXTIME 32768
-
-#define TBIPA_VALUE            0x1f
-#define MIIMCFG_INIT_VALUE     0x00000007
-#define MIIMCFG_RESET           0x80000000
-#define MIIMIND_BUSY            0x00000001
-
-/* MAC register bits */
-#define MACCFG1_SOFT_RESET     0x80000000
-#define MACCFG1_RESET_RX_MC    0x00080000
-#define MACCFG1_RESET_TX_MC    0x00040000
-#define MACCFG1_RESET_RX_FUN   0x00020000
-#define        MACCFG1_RESET_TX_FUN    0x00010000
-#define MACCFG1_LOOPBACK       0x00000100
-#define MACCFG1_RX_FLOW                0x00000020
-#define MACCFG1_TX_FLOW                0x00000010
-#define MACCFG1_SYNCD_RX_EN    0x00000008
-#define MACCFG1_RX_EN          0x00000004
-#define MACCFG1_SYNCD_TX_EN    0x00000002
-#define MACCFG1_TX_EN          0x00000001
-
-#define MACCFG2_INIT_SETTINGS  0x00007205
-#define MACCFG2_FULL_DUPLEX    0x00000001
-#define MACCFG2_IF              0x00000300
-#define MACCFG2_MII             0x00000100
-#define MACCFG2_GMII            0x00000200
-#define MACCFG2_HUGEFRAME      0x00000020
-#define MACCFG2_LENGTHCHECK    0x00000010
-
-#define ECNTRL_INIT_SETTINGS   0x00001000
-#define ECNTRL_TBI_MODE         0x00000020
-
-#define MRBLR_INIT_SETTINGS    DEFAULT_RX_BUFFER_SIZE
-
-#define MINFLR_INIT_SETTINGS   0x00000040
-
-/* Init to do tx snooping for buffers and descriptors */
-#define DMACTRL_INIT_SETTINGS   0x000000c3
-#define DMACTRL_GRS             0x00000010
-#define DMACTRL_GTS             0x00000008
-
-#define TSTAT_CLEAR_THALT       0x80000000
-
-/* Interrupt coalescing macros */
-#define IC_ICEN                        0x80000000
-#define IC_ICFT_MASK           0x1fe00000
-#define IC_ICFT_SHIFT          21
-#define mk_ic_icft(x)          \
-       (((unsigned int)x << IC_ICFT_SHIFT)&IC_ICFT_MASK)
-#define IC_ICTT_MASK           0x0000ffff
-#define mk_ic_ictt(x)          (x&IC_ICTT_MASK)
-
-#define mk_ic_value(count, time) (IC_ICEN | \
-                               mk_ic_icft(count) | \
-                               mk_ic_ictt(time))
-
-#define RCTRL_PROM             0x00000008
-#define RSTAT_CLEAR_RHALT       0x00800000
-
-#define IEVENT_INIT_CLEAR      0xffffffff
-#define IEVENT_BABR            0x80000000
-#define IEVENT_RXC             0x40000000
-#define IEVENT_BSY             0x20000000
-#define IEVENT_EBERR           0x10000000
-#define IEVENT_MSRO            0x04000000
-#define IEVENT_GTSC            0x02000000
-#define IEVENT_BABT            0x01000000
-#define IEVENT_TXC             0x00800000
-#define IEVENT_TXE             0x00400000
-#define IEVENT_TXB             0x00200000
-#define IEVENT_TXF             0x00100000
-#define IEVENT_LC              0x00040000
-#define IEVENT_CRL             0x00020000
-#define IEVENT_XFUN            0x00010000
-#define IEVENT_RXB0            0x00008000
-#define IEVENT_GRSC            0x00000100
-#define IEVENT_RXF0            0x00000080
-#define IEVENT_RX_MASK          (IEVENT_RXB0 | IEVENT_RXF0)
-#define IEVENT_TX_MASK          (IEVENT_TXB | IEVENT_TXF)
-#define IEVENT_ERR_MASK         \
-(IEVENT_RXC | IEVENT_BSY | IEVENT_EBERR | IEVENT_MSRO | \
- IEVENT_BABT | IEVENT_TXC | IEVENT_TXE | IEVENT_LC \
- | IEVENT_CRL | IEVENT_XFUN)
-
-#define IMASK_INIT_CLEAR       0x00000000
-#define IMASK_BABR              0x80000000
-#define IMASK_RXC               0x40000000
-#define IMASK_BSY               0x20000000
-#define IMASK_EBERR             0x10000000
-#define IMASK_MSRO             0x04000000
-#define IMASK_GRSC              0x02000000
-#define IMASK_BABT             0x01000000
-#define IMASK_TXC               0x00800000
-#define IMASK_TXEEN            0x00400000
-#define IMASK_TXBEN            0x00200000
-#define IMASK_TXFEN             0x00100000
-#define IMASK_LC               0x00040000
-#define IMASK_CRL              0x00020000
-#define IMASK_XFUN             0x00010000
-#define IMASK_RXB0              0x00008000
-#define IMASK_GTSC              0x00000100
-#define IMASK_RXFEN0           0x00000080
-#define IMASK_RX_DISABLED ~(IMASK_RXFEN0 | IMASK_BSY)
-#define IMASK_DEFAULT  (IMASK_TXEEN | IMASK_TXFEN | IMASK_TXBEN | \
-               IMASK_RXFEN0 | IMASK_BSY | IMASK_EBERR | IMASK_BABR | \
-               IMASK_XFUN | IMASK_RXC | IMASK_BABT)
-
-
-/* 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 ATTRELI_INIT_SETTINGS   0x0
-
-
-/* TxBD status field bits */
-#define TXBD_READY             0x8000
-#define TXBD_PADCRC            0x4000
-#define TXBD_WRAP              0x2000
-#define TXBD_INTERRUPT         0x1000
-#define TXBD_LAST              0x0800
-#define TXBD_CRC               0x0400
-#define TXBD_DEF               0x0200
-#define TXBD_HUGEFRAME         0x0080
-#define TXBD_LATECOLLISION     0x0080
-#define TXBD_RETRYLIMIT                0x0040
-#define        TXBD_RETRYCOUNTMASK     0x003c
-#define TXBD_UNDERRUN          0x0002
-
-/* RxBD status field bits */
-#define RXBD_EMPTY             0x8000
-#define RXBD_RO1               0x4000
-#define RXBD_WRAP              0x2000
-#define RXBD_INTERRUPT         0x1000
-#define RXBD_LAST              0x0800
-#define RXBD_FIRST             0x0400
-#define RXBD_MISS              0x0100
-#define RXBD_BROADCAST         0x0080
-#define RXBD_MULTICAST         0x0040
-#define RXBD_LARGE             0x0020
-#define RXBD_NONOCTET          0x0010
-#define RXBD_SHORT             0x0008
-#define RXBD_CRCERR            0x0004
-#define RXBD_OVERRUN           0x0002
-#define RXBD_TRUNCATED         0x0001
-#define RXBD_STATS             0x01ff
-
-struct txbd8
-{
-       u16     status; /* Status Fields */
-       u16     length; /* Buffer length */
-       u32     bufPtr; /* Buffer Pointer */
-};
-
-struct rxbd8
-{
-       u16     status; /* Status Fields */
-       u16     length; /* Buffer Length */
-       u32     bufPtr; /* Buffer Pointer */
-};
-
-struct rmon_mib
-{
-       u32     tr64;   /* 0x.680 - Transmit and Receive 64-byte Frame Counter */
-       u32     tr127;  /* 0x.684 - Transmit and Receive 65-127 byte Frame Counter */
-       u32     tr255;  /* 0x.688 - Transmit and Receive 128-255 byte Frame Counter */
-       u32     tr511;  /* 0x.68c - Transmit and Receive 256-511 byte Frame Counter */
-       u32     tr1k;   /* 0x.690 - Transmit and Receive 512-1023 byte Frame Counter */
-       u32     trmax;  /* 0x.694 - Transmit and Receive 1024-1518 byte Frame Counter */
-       u32     trmgv;  /* 0x.698 - Transmit and Receive 1519-1522 byte Good VLAN Frame */
-       u32     rbyt;   /* 0x.69c - Receive Byte Counter */
-       u32     rpkt;   /* 0x.6a0 - Receive Packet Counter */
-       u32     rfcs;   /* 0x.6a4 - Receive FCS Error Counter */
-       u32     rmca;   /* 0x.6a8 - Receive Multicast Packet Counter */
-       u32     rbca;   /* 0x.6ac - Receive Broadcast Packet Counter */
-       u32     rxcf;   /* 0x.6b0 - Receive Control Frame Packet Counter */
-       u32     rxpf;   /* 0x.6b4 - Receive Pause Frame Packet Counter */
-       u32     rxuo;   /* 0x.6b8 - Receive Unknown OP Code Counter */
-       u32     raln;   /* 0x.6bc - Receive Alignment Error Counter */
-       u32     rflr;   /* 0x.6c0 - Receive Frame Length Error Counter */
-       u32     rcde;   /* 0x.6c4 - Receive Code Error Counter */
-       u32     rcse;   /* 0x.6c8 - Receive Carrier Sense Error Counter */
-       u32     rund;   /* 0x.6cc - Receive Undersize Packet Counter */
-       u32     rovr;   /* 0x.6d0 - Receive Oversize Packet Counter */
-       u32     rfrg;   /* 0x.6d4 - Receive Fragments Counter */
-       u32     rjbr;   /* 0x.6d8 - Receive Jabber Counter */
-       u32     rdrp;   /* 0x.6dc - Receive Drop Counter */
-       u32     tbyt;   /* 0x.6e0 - Transmit Byte Counter Counter */
-       u32     tpkt;   /* 0x.6e4 - Transmit Packet Counter */
-       u32     tmca;   /* 0x.6e8 - Transmit Multicast Packet Counter */
-       u32     tbca;   /* 0x.6ec - Transmit Broadcast Packet Counter */
-       u32     txpf;   /* 0x.6f0 - Transmit Pause Control Frame Counter */
-       u32     tdfr;   /* 0x.6f4 - Transmit Deferral Packet Counter */
-       u32     tedf;   /* 0x.6f8 - Transmit Excessive Deferral Packet Counter */
-       u32     tscl;   /* 0x.6fc - Transmit Single Collision Packet Counter */
-       u32     tmcl;   /* 0x.700 - Transmit Multiple Collision Packet Counter */
-       u32     tlcl;   /* 0x.704 - Transmit Late Collision Packet Counter */
-       u32     txcl;   /* 0x.708 - Transmit Excessive Collision Packet Counter */
-       u32     tncl;   /* 0x.70c - Transmit Total Collision Counter */
-       u8      res1[4];
-       u32     tdrp;   /* 0x.714 - Transmit Drop Frame Counter */
-       u32     tjbr;   /* 0x.718 - Transmit Jabber Frame Counter */
-       u32     tfcs;   /* 0x.71c - Transmit FCS Error Counter */
-       u32     txcf;   /* 0x.720 - Transmit Control Frame Counter */
-       u32     tovr;   /* 0x.724 - Transmit Oversize Frame Counter */
-       u32     tund;   /* 0x.728 - Transmit Undersize Frame Counter */
-       u32     tfrg;   /* 0x.72c - Transmit Fragments Frame Counter */
-       u32     car1;   /* 0x.730 - Carry Register One */
-       u32     car2;   /* 0x.734 - Carry Register Two */
-       u32     cam1;   /* 0x.738 - Carry Mask Register One */
-       u32     cam2;   /* 0x.73c - Carry Mask Register Two */
-};
-
-struct gfar_extra_stats {
-       u64 kernel_dropped;
-       u64 rx_large;
-       u64 rx_short;
-       u64 rx_nonoctet;
-       u64 rx_crcerr;
-       u64 rx_overrun;
-       u64 rx_bsy;
-       u64 rx_babr;
-       u64 rx_trunc;
-       u64 eberr;
-       u64 tx_babt;
-       u64 tx_underrun;
-       u64 rx_skbmissing;
-       u64 tx_timeout;
-};
-
-#define GFAR_RMON_LEN ((sizeof(struct rmon_mib) - 16)/sizeof(u32))
-#define GFAR_EXTRA_STATS_LEN (sizeof(struct gfar_extra_stats)/sizeof(u64))
-
-/* Number of stats in the stats structure (ignore car and cam regs)*/
-#define GFAR_STATS_LEN (GFAR_RMON_LEN + GFAR_EXTRA_STATS_LEN)
-
-#define GFAR_INFOSTR_LEN 32
-
-struct gfar_stats {
-       u64 extra[GFAR_EXTRA_STATS_LEN];
-       u64 rmon[GFAR_RMON_LEN];
-};
-
-
-struct gfar {
-       u8      res1[16];
-       u32     ievent;                 /* 0x.010 - Interrupt Event Register */
-       u32     imask;                  /* 0x.014 - Interrupt Mask Register */
-       u32     edis;                   /* 0x.018 - Error Disabled Register */
-       u8      res2[4];
-       u32     ecntrl;                 /* 0x.020 - Ethernet Control Register */
-       u32     minflr;                 /* 0x.024 - Minimum Frame Length Register */
-       u32     ptv;                    /* 0x.028 - Pause Time Value Register */
-       u32     dmactrl;                /* 0x.02c - DMA Control Register */
-       u32     tbipa;                  /* 0x.030 - TBI PHY Address Register */
-       u8      res3[88];
-       u32     fifo_tx_thr;            /* 0x.08c - FIFO transmit threshold register */
-       u8      res4[8];
-       u32     fifo_tx_starve;         /* 0x.098 - FIFO transmit starve register */
-       u32     fifo_tx_starve_shutoff; /* 0x.09c - FIFO transmit starve shutoff register */
-       u8      res5[96];
-       u32     tctrl;                  /* 0x.100 - Transmit Control Register */
-       u32     tstat;                  /* 0x.104 - Transmit Status Register */
-       u8      res6[4];
-       u32     tbdlen;                 /* 0x.10c - Transmit Buffer Descriptor Data Length Register */
-       u32     txic;                   /* 0x.110 - Transmit Interrupt Coalescing Configuration Register */
-       u8      res7[16];
-       u32     ctbptr;                 /* 0x.124 - Current Transmit Buffer Descriptor Pointer Register */
-       u8      res8[92];
-       u32     tbptr;                  /* 0x.184 - Transmit Buffer Descriptor Pointer Low Register */
-       u8      res9[124];
-       u32     tbase;                  /* 0x.204 - Transmit Descriptor Base Address Register */
-       u8      res10[168];
-       u32     ostbd;                  /* 0x.2b0 - Out-of-Sequence Transmit Buffer Descriptor Register */
-       u32     ostbdp;                 /* 0x.2b4 - Out-of-Sequence Transmit Data Buffer Pointer Register */
-       u8      res11[72];
-       u32     rctrl;                  /* 0x.300 - Receive Control Register */
-       u32     rstat;                  /* 0x.304 - Receive Status Register */
-       u8      res12[4];
-       u32     rbdlen;                 /* 0x.30c - RxBD Data Length Register */
-       u32     rxic;                   /* 0x.310 - Receive Interrupt Coalescing Configuration Register */
-       u8      res13[16];
-       u32     crbptr;                 /* 0x.324 - Current Receive Buffer Descriptor Pointer */
-       u8      res14[24];
-       u32     mrblr;                  /* 0x.340 - Maximum Receive Buffer Length Register */
-       u8      res15[64];
-       u32     rbptr;                  /* 0x.384 - Receive Buffer Descriptor Pointer */
-       u8      res16[124];
-       u32     rbase;                  /* 0x.404 - Receive Descriptor Base Address */
-       u8      res17[248];
-       u32     maccfg1;                /* 0x.500 - MAC Configuration 1 Register */
-       u32     maccfg2;                /* 0x.504 - MAC Configuration 2 Register */
-       u32     ipgifg;                 /* 0x.508 - Inter Packet Gap/Inter Frame Gap Register */
-       u32     hafdup;                 /* 0x.50c - Half Duplex Register */
-       u32     maxfrm;                 /* 0x.510 - Maximum Frame Length Register */
-       u8      res18[12];
-       u32     miimcfg;                /* 0x.520 - MII Management Configuration Register */
-       u32     miimcom;                /* 0x.524 - MII Management Command Register */
-       u32     miimadd;                /* 0x.528 - MII Management Address Register */
-       u32     miimcon;                /* 0x.52c - MII Management Control Register */
-       u32     miimstat;               /* 0x.530 - MII Management Status Register */
-       u32     miimind;                /* 0x.534 - MII Management Indicator Register */
-       u8      res19[4];
-       u32     ifstat;                 /* 0x.53c - Interface Status Register */
-       u32     macstnaddr1;            /* 0x.540 - Station Address Part 1 Register */
-       u32     macstnaddr2;            /* 0x.544 - Station Address Part 2 Register */
-       u8      res20[312];
-       struct rmon_mib rmon;
-       u8      res21[192];
-       u32     iaddr0;                 /* 0x.800 - Indivdual address register 0 */
-       u32     iaddr1;                 /* 0x.804 - Indivdual address register 1 */
-       u32     iaddr2;                 /* 0x.808 - Indivdual address register 2 */
-       u32     iaddr3;                 /* 0x.80c - Indivdual address register 3 */
-       u32     iaddr4;                 /* 0x.810 - Indivdual address register 4 */
-       u32     iaddr5;                 /* 0x.814 - Indivdual address register 5 */
-       u32     iaddr6;                 /* 0x.818 - Indivdual address register 6 */
-       u32     iaddr7;                 /* 0x.81c - Indivdual address register 7 */
-       u8      res22[96];
-       u32     gaddr0;                 /* 0x.880 - Global address register 0 */
-       u32     gaddr1;                 /* 0x.884 - Global address register 1 */
-       u32     gaddr2;                 /* 0x.888 - Global address register 2 */
-       u32     gaddr3;                 /* 0x.88c - Global address register 3 */
-       u32     gaddr4;                 /* 0x.890 - Global address register 4 */
-       u32     gaddr5;                 /* 0x.894 - Global address register 5 */
-       u32     gaddr6;                 /* 0x.898 - Global address register 6 */
-       u32     gaddr7;                 /* 0x.89c - Global address register 7 */
-       u8      res23[856];
-       u32     attr;                   /* 0x.bf8 - Attributes Register */
-       u32     attreli;                /* 0x.bfc - Attributes Extract Length and Extract Index Register */
-       u8      res24[1024];
-
-};
-
-/* Struct stolen almost completely (and shamelessly) from the FCC enet source
- * (Ok, that's not so true anymore, but there is a family resemblence)
- * The GFAR buffer descriptors track the ring buffers.  The rx_bd_base
- * and tx_bd_base always point to the currently available buffer.
- * The dirty_tx tracks the current buffer that is being sent by the
- * controller.  The cur_tx and dirty_tx are equal under both completely
- * empty and completely full conditions.  The empty/ready indicator in
- * the buffer descriptor determines the actual condition.
- */
-struct gfar_private
-{
-       /* pointers to arrays of skbuffs for tx and rx */
-       struct sk_buff ** tx_skbuff;
-       struct sk_buff ** rx_skbuff;
-
-       /* indices pointing to the next free sbk in skb arrays */
-       u16 skb_curtx;
-       u16 skb_currx;
-
-       /* index of the first skb which hasn't been transmitted
-        * yet. */
-       u16 skb_dirtytx;
-
-       /* Configuration info for the coalescing features */
-       unsigned char txcoalescing;
-       unsigned short txcount;
-       unsigned short txtime;
-       unsigned char rxcoalescing;
-       unsigned short rxcount;
-       unsigned short rxtime;
-
-       /* GFAR addresses */
-       struct rxbd8 *rx_bd_base;       /* Base addresses of Rx and Tx Buffers */
-       struct txbd8 *tx_bd_base;
-       struct rxbd8 *cur_rx;           /* Next free rx ring entry */
-       struct txbd8 *cur_tx;           /* Next free ring entry */
-       struct txbd8 *dirty_tx;         /* The Ring entry to be freed. */
-       struct gfar *regs;      /* Pointer to the GFAR memory mapped Registers */
-       struct phy_info *phyinfo;
-       struct gfar *phyregs;
-       struct work_struct tq;
-       struct timer_list phy_info_timer;
-       struct net_device_stats stats; /* linux network statistics */
-       struct gfar_extra_stats extra_stats;
-       spinlock_t lock;
-       unsigned int rx_buffer_size;
-       unsigned int rx_stash_size;
-       unsigned int tx_ring_size;
-       unsigned int rx_ring_size;
-       wait_queue_head_t rxcleanupq;
-       unsigned int rxclean;
-       int link;       /* current link state */
-       int oldlink;
-       int duplexity; /* Indicates negotiated duplex state */
-       int olddplx;
-       int speed;      /* Indicates negotiated speed */
-       int oldspeed;
-       
-       /* Info structure initialized by board setup code */
-       struct ocp_gfar_data *einfo;
-};
-
-extern inline u32 gfar_read(volatile unsigned *addr)
-{
-       u32 val;
-       val = in_be32(addr);
-       return val;
-}
-
-extern inline void gfar_write(volatile unsigned *addr, u32 val)
-{
-       out_be32(addr, val);
-}
-
-
-
-#endif /* __GIANFAR_H */
diff --git a/drivers/net/gianfar_ethtool.c b/drivers/net/gianfar_ethtool.c
deleted file mode 100644 (file)
index 4ccb5af..0000000
+++ /dev/null
@@ -1,484 +0,0 @@
-/*
- * drivers/net/gianfar_ethtool.c
- *
- * Gianfar Ethernet Driver
- * Ethtool support for Gianfar Enet
- * Based on e1000 ethtool support
- *
- * Author: Andy Fleming
- * Maintainer: Kumar Gala (kumar.gala@freescale.com)
- *
- * Copyright 2004 Freescale Semiconductor, Inc
- *
- * This software may be used and distributed according to 
- * the terms of the GNU Public License, Version 2, incorporated herein 
- * by reference.
- */
-
-#include <linux/config.h>
-#include <linux/kernel.h>
-#include <linux/sched.h>
-#include <linux/string.h>
-#include <linux/errno.h>
-#include <linux/slab.h>
-#include <linux/interrupt.h>
-#include <linux/init.h>
-#include <linux/delay.h>
-#include <linux/netdevice.h>
-#include <linux/etherdevice.h>
-#include <linux/skbuff.h>
-#include <linux/spinlock.h>
-#include <linux/mm.h>
-
-#include <asm/io.h>
-#include <asm/irq.h>
-#include <asm/uaccess.h>
-#include <linux/module.h>
-#include <linux/version.h>
-#include <linux/crc32.h>
-#include <asm/types.h>
-#include <asm/uaccess.h>
-#include <linux/ethtool.h>
-
-#include "gianfar.h"
-
-#define is_power_of_2(x)        ((x) != 0 && (((x) & ((x) - 1)) == 0))
-
-extern int startup_gfar(struct net_device *dev);
-extern void stop_gfar(struct net_device *dev);
-extern void gfar_receive(int irq, void *dev_id, struct pt_regs *regs);
-
-void gfar_fill_stats(struct net_device *dev, struct ethtool_stats *dummy,
-                    u64 * buf);
-void gfar_gstrings(struct net_device *dev, u32 stringset, u8 * buf);
-int gfar_gcoalesce(struct net_device *dev, struct ethtool_coalesce *cvals);
-int gfar_scoalesce(struct net_device *dev, struct ethtool_coalesce *cvals);
-void gfar_gringparam(struct net_device *dev, struct ethtool_ringparam *rvals);
-int gfar_sringparam(struct net_device *dev, struct ethtool_ringparam *rvals);
-void gfar_gdrvinfo(struct net_device *dev, struct ethtool_drvinfo *drvinfo);
-
-static char stat_gstrings[][ETH_GSTRING_LEN] = {
-       "RX Dropped by Kernel",
-       "RX Large Frame Errors",
-       "RX Short Frame Errors",
-       "RX Non-Octet Errors",
-       "RX CRC Errors",
-       "RX Overrun Errors",
-       "RX Busy Errors",
-       "RX Babbling Errors",
-       "RX Truncated Frames",
-       "Ethernet Bus Error",
-       "TX Babbling Errors",
-       "TX Underrun Errors",
-       "RX SKB Missing Errors",
-       "TX Timeout Errors",
-       "tx&rx 64B frames",
-       "tx&rx 65-127B frames",
-       "tx&rx 128-255B frames",
-       "tx&rx 256-511B frames",
-       "tx&rx 512-1023B frames",
-       "tx&rx 1024-1518B frames",
-       "tx&rx 1519-1522B Good VLAN",
-       "RX bytes",
-       "RX Packets",
-       "RX FCS Errors",
-       "Receive Multicast Packet",
-       "Receive Broadcast Packet",
-       "RX Control Frame Packets",
-       "RX Pause Frame Packets",
-       "RX Unknown OP Code",
-       "RX Alignment Error",
-       "RX Frame Length Error",
-       "RX Code Error",
-       "RX Carrier Sense Error",
-       "RX Undersize Packets",
-       "RX Oversize Packets",
-       "RX Fragmented Frames",
-       "RX Jabber Frames",
-       "RX Dropped Frames",
-       "TX Byte Counter",
-       "TX Packets",
-       "TX Multicast Packets",
-       "TX Broadcast Packets",
-       "TX Pause Control Frames",
-       "TX Deferral Packets",
-       "TX Excessive Deferral Packets",
-       "TX Single Collision Packets",
-       "TX Multiple Collision Packets",
-       "TX Late Collision Packets",
-       "TX Excessive Collision Packets",
-       "TX Total Collision",
-       "RESERVED",
-       "TX Dropped Frames",
-       "TX Jabber Frames",
-       "TX FCS Errors",
-       "TX Control Frames",
-       "TX Oversize Frames",
-       "TX Undersize Frames",
-       "TX Fragmented Frames",
-};
-
-/* Fill in an array of 64-bit statistics from various sources.
- * This array will be appended to the end of the ethtool_stats
- * structure, and returned to user space
- */
-void gfar_fill_stats(struct net_device *dev, struct ethtool_stats *dummy, u64 * buf)
-{
-       int i;
-       struct gfar_private *priv = (struct gfar_private *) dev->priv;
-       u32 *rmon = (u32 *) & priv->regs->rmon;
-       u64 *extra = (u64 *) & priv->extra_stats;
-       struct gfar_stats *stats = (struct gfar_stats *) buf;
-
-       for (i = 0; i < GFAR_RMON_LEN; i++) {
-               stats->rmon[i] = (u64) (rmon[i]);
-       }
-
-       for (i = 0; i < GFAR_EXTRA_STATS_LEN; i++) {
-               stats->extra[i] = extra[i];
-       }
-}
-
-/* Returns the number of stats (and their corresponding strings) */
-int gfar_stats_count(struct net_device *dev)
-{
-       return GFAR_STATS_LEN;
-}
-
-void gfar_gstrings_normon(struct net_device *dev, u32 stringset, u8 * buf)
-{
-       memcpy(buf, stat_gstrings, GFAR_EXTRA_STATS_LEN * ETH_GSTRING_LEN);
-}
-
-void gfar_fill_stats_normon(struct net_device *dev, 
-               struct ethtool_stats *dummy, u64 * buf)
-{
-       int i;
-       struct gfar_private *priv = (struct gfar_private *) dev->priv;
-       u64 *extra = (u64 *) & priv->extra_stats;
-
-       for (i = 0; i < GFAR_EXTRA_STATS_LEN; i++) {
-               buf[i] = extra[i];
-       }
-}
-
-
-int gfar_stats_count_normon(struct net_device *dev)
-{
-       return GFAR_EXTRA_STATS_LEN;
-}
-/* Fills in the drvinfo structure with some basic info */
-void gfar_gdrvinfo(struct net_device *dev, struct
-             ethtool_drvinfo *drvinfo)
-{
-       strncpy(drvinfo->driver, gfar_driver_name, GFAR_INFOSTR_LEN);
-       strncpy(drvinfo->version, gfar_driver_version, GFAR_INFOSTR_LEN);
-       strncpy(drvinfo->fw_version, "N/A", GFAR_INFOSTR_LEN);
-       strncpy(drvinfo->bus_info, "N/A", GFAR_INFOSTR_LEN);
-       drvinfo->n_stats = GFAR_STATS_LEN;
-       drvinfo->testinfo_len = 0;
-       drvinfo->regdump_len = 0;
-       drvinfo->eedump_len = 0;
-}
-
-/* Return the current settings in the ethtool_cmd structure */
-int gfar_gsettings(struct net_device *dev, struct ethtool_cmd *cmd)
-{
-       struct gfar_private *priv = (struct gfar_private *) dev->priv;
-       uint gigabit_support = 
-               priv->einfo->flags & GFAR_HAS_GIGABIT ? SUPPORTED_1000baseT_Full : 0;
-       uint gigabit_advert = 
-               priv->einfo->flags & GFAR_HAS_GIGABIT ? ADVERTISED_1000baseT_Full: 0;
-
-       cmd->supported = (SUPPORTED_10baseT_Half
-                         | SUPPORTED_100baseT_Half
-                         | SUPPORTED_100baseT_Full
-                         | gigabit_support | SUPPORTED_Autoneg);
-
-       /* For now, we always advertise everything */
-       cmd->advertising = (ADVERTISED_10baseT_Half
-                           | ADVERTISED_100baseT_Half
-                           | ADVERTISED_100baseT_Full
-                           | gigabit_advert | ADVERTISED_Autoneg);
-
-       cmd->speed = priv->speed;
-       cmd->duplex = priv->duplexity;
-       cmd->port = PORT_MII;
-       cmd->phy_address = priv->einfo->phyid;
-       cmd->transceiver = XCVR_EXTERNAL;
-       cmd->autoneg = AUTONEG_ENABLE;
-       cmd->maxtxpkt = priv->txcount;
-       cmd->maxrxpkt = priv->rxcount;
-
-       return 0;
-}
-
-/* Return the length of the register structure */
-int gfar_reglen(struct net_device *dev)
-{
-       return sizeof (struct gfar);
-}
-
-/* Return a dump of the GFAR register space */
-void gfar_get_regs(struct net_device *dev, struct ethtool_regs *regs, void *regbuf)
-{
-       int i;
-       struct gfar_private *priv = (struct gfar_private *) dev->priv;
-       u32 *theregs = (u32 *) priv->regs;
-       u32 *buf = (u32 *) regbuf;
-
-       for (i = 0; i < sizeof (struct gfar) / sizeof (u32); i++)
-               buf[i] = theregs[i];
-}
-
-/* Return the link state 1 is up, 0 is down */
-u32 gfar_get_link(struct net_device *dev)
-{
-       struct gfar_private *priv = (struct gfar_private *) dev->priv;
-       return (u32) priv->link;
-}
-
-/* Fill in a buffer with the strings which correspond to the
- * stats */
-void gfar_gstrings(struct net_device *dev, u32 stringset, u8 * buf)
-{
-       memcpy(buf, stat_gstrings, GFAR_STATS_LEN * ETH_GSTRING_LEN);
-}
-
-/* Convert microseconds to ethernet clock ticks, which changes
- * depending on what speed the controller is running at */
-static unsigned int gfar_usecs2ticks(struct gfar_private *priv, unsigned int usecs)
-{
-       unsigned int count;
-
-       /* The timer is different, depending on the interface speed */
-       switch (priv->speed) {
-       case 1000:
-               count = GFAR_GBIT_TIME;
-               break;
-       case 100:
-               count = GFAR_100_TIME;
-               break;
-       case 10:
-       default:
-               count = GFAR_10_TIME;
-               break;
-       }
-
-       /* Make sure we return a number greater than 0
-        * if usecs > 0 */
-       return ((usecs * 1000 + count - 1) / count);
-}
-
-/* Convert ethernet clock ticks to microseconds */
-static unsigned int gfar_ticks2usecs(struct gfar_private *priv, unsigned int ticks)
-{
-       unsigned int count;
-
-       /* The timer is different, depending on the interface speed */
-       switch (priv->speed) {
-       case 1000:
-               count = GFAR_GBIT_TIME;
-               break;
-       case 100:
-               count = GFAR_100_TIME;
-               break;
-       case 10:
-       default:
-               count = GFAR_10_TIME;
-               break;
-       }
-
-       /* Make sure we return a number greater than 0 */
-       /* if ticks is > 0 */
-       return ((ticks * count) / 1000);
-}
-
-/* Get the coalescing parameters, and put them in the cvals
- * structure.  */
-int gfar_gcoalesce(struct net_device *dev, struct ethtool_coalesce *cvals)
-{
-       struct gfar_private *priv = (struct gfar_private *) dev->priv;
-
-       cvals->rx_coalesce_usecs = gfar_ticks2usecs(priv, priv->rxtime);
-       cvals->rx_max_coalesced_frames = priv->rxcount;
-
-       cvals->tx_coalesce_usecs = gfar_ticks2usecs(priv, priv->txtime);
-       cvals->tx_max_coalesced_frames = priv->txcount;
-
-       cvals->use_adaptive_rx_coalesce = 0;
-       cvals->use_adaptive_tx_coalesce = 0;
-
-       cvals->pkt_rate_low = 0;
-       cvals->rx_coalesce_usecs_low = 0;
-       cvals->rx_max_coalesced_frames_low = 0;
-       cvals->tx_coalesce_usecs_low = 0;
-       cvals->tx_max_coalesced_frames_low = 0;
-
-       /* When the packet rate is below pkt_rate_high but above
-        * pkt_rate_low (both measured in packets per second) the
-        * normal {rx,tx}_* coalescing parameters are used.
-        */
-
-       /* When the packet rate is (measured in packets per second)
-        * is above pkt_rate_high, the {rx,tx}_*_high parameters are
-        * used.
-        */
-       cvals->pkt_rate_high = 0;
-       cvals->rx_coalesce_usecs_high = 0;
-       cvals->rx_max_coalesced_frames_high = 0;
-       cvals->tx_coalesce_usecs_high = 0;
-       cvals->tx_max_coalesced_frames_high = 0;
-
-       /* How often to do adaptive coalescing packet rate sampling,
-        * measured in seconds.  Must not be zero.
-        */
-       cvals->rate_sample_interval = 0;
-
-       return 0;
-}
-
-/* Change the coalescing values.
- * Both cvals->*_usecs and cvals->*_frames have to be > 0
- * in order for coalescing to be active
- */
-int gfar_scoalesce(struct net_device *dev, struct ethtool_coalesce *cvals)
-{
-       struct gfar_private *priv = (struct gfar_private *) dev->priv;
-
-       /* Set up rx coalescing */
-       if ((cvals->rx_coalesce_usecs == 0) ||
-           (cvals->rx_max_coalesced_frames == 0))
-               priv->rxcoalescing = 0;
-       else
-               priv->rxcoalescing = 1;
-
-       priv->rxtime = gfar_usecs2ticks(priv, cvals->rx_coalesce_usecs);
-       priv->rxcount = cvals->rx_max_coalesced_frames;
-
-       /* Set up tx coalescing */
-       if ((cvals->tx_coalesce_usecs == 0) ||
-           (cvals->tx_max_coalesced_frames == 0))
-               priv->txcoalescing = 0;
-       else
-               priv->txcoalescing = 1;
-
-       priv->txtime = gfar_usecs2ticks(priv, cvals->tx_coalesce_usecs);
-       priv->txcount = cvals->tx_max_coalesced_frames;
-
-       if (priv->rxcoalescing)
-               gfar_write(&priv->regs->rxic,
-                          mk_ic_value(priv->rxcount, priv->rxtime));
-       else
-               gfar_write(&priv->regs->rxic, 0);
-
-       if (priv->txcoalescing)
-               gfar_write(&priv->regs->txic,
-                          mk_ic_value(priv->txcount, priv->txtime));
-       else
-               gfar_write(&priv->regs->txic, 0);
-
-       return 0;
-}
-
-/* Fills in rvals with the current ring parameters.  Currently,
- * rx, rx_mini, and rx_jumbo rings are the same size, as mini and
- * jumbo are ignored by the driver */
-void gfar_gringparam(struct net_device *dev, struct ethtool_ringparam *rvals)
-{
-       struct gfar_private *priv = (struct gfar_private *) dev->priv;
-
-       rvals->rx_max_pending = GFAR_RX_MAX_RING_SIZE;
-       rvals->rx_mini_max_pending = GFAR_RX_MAX_RING_SIZE;
-       rvals->rx_jumbo_max_pending = GFAR_RX_MAX_RING_SIZE;
-       rvals->tx_max_pending = GFAR_TX_MAX_RING_SIZE;
-
-       /* Values changeable by the user.  The valid values are
-        * in the range 1 to the "*_max_pending" counterpart above.
-        */
-       rvals->rx_pending = priv->rx_ring_size;
-       rvals->rx_mini_pending = priv->rx_ring_size;
-       rvals->rx_jumbo_pending = priv->rx_ring_size;
-       rvals->tx_pending = priv->tx_ring_size;
-}
-
-/* Change the current ring parameters, stopping the controller if
- * necessary so that we don't mess things up while we're in
- * motion.  We wait for the ring to be clean before reallocating
- * the rings. */
-int gfar_sringparam(struct net_device *dev, struct ethtool_ringparam *rvals)
-{
-       u32 tempval;
-       struct gfar_private *priv = (struct gfar_private *) dev->priv;
-       int err = 0;
-
-       if (rvals->rx_pending > GFAR_RX_MAX_RING_SIZE)
-               return -EINVAL;
-
-       if (!is_power_of_2(rvals->rx_pending)) {
-               printk("%s: Ring sizes must be a power of 2\n",
-                               dev->name);
-               return -EINVAL;
-       }
-
-       if (rvals->tx_pending > GFAR_TX_MAX_RING_SIZE)
-               return -EINVAL;
-
-       if (!is_power_of_2(rvals->tx_pending)) {
-               printk("%s: Ring sizes must be a power of 2\n",
-                               dev->name);
-               return -EINVAL;
-       }
-
-       /* Stop the controller so we don't rx any more frames */
-       /* But first, make sure we clear the bits */
-       tempval = gfar_read(&priv->regs->dmactrl);
-       tempval &= ~(DMACTRL_GRS | DMACTRL_GTS);
-       gfar_write(&priv->regs->dmactrl, tempval);
-
-       tempval = gfar_read(&priv->regs->dmactrl);
-       tempval |= (DMACTRL_GRS | DMACTRL_GTS);
-       gfar_write(&priv->regs->dmactrl, tempval);
-
-       while (!(gfar_read(&priv->regs->ievent) & (IEVENT_GRSC | IEVENT_GTSC)))
-               cpu_relax();
-
-       /* Note that rx is not clean right now */
-       priv->rxclean = 0;
-
-       if (dev->flags & IFF_UP) {
-               /* Tell the driver to process the rest of the frames */
-               gfar_receive(0, (void *) dev, NULL);
-
-               /* Now wait for it to be done */
-               wait_event_interruptible(priv->rxcleanupq, priv->rxclean);
-
-               /* Ok, all packets have been handled.  Now we bring it down,
-                * change the ring size, and bring it up */
-
-               stop_gfar(dev);
-       }
-
-       priv->rx_ring_size = rvals->rx_pending;
-       priv->tx_ring_size = rvals->tx_pending;
-
-       if (dev->flags & IFF_UP)
-               err = startup_gfar(dev);
-
-       return err;
-}
-
-struct ethtool_ops gfar_ethtool_ops = {
-       .get_settings = gfar_gsettings,
-       .get_drvinfo = gfar_gdrvinfo,
-       .get_regs_len = gfar_reglen,
-       .get_regs = gfar_get_regs,
-       .get_link = gfar_get_link,
-       .get_coalesce = gfar_gcoalesce,
-       .set_coalesce = gfar_scoalesce,
-       .get_ringparam = gfar_gringparam,
-       .set_ringparam = gfar_sringparam,
-       .get_strings = gfar_gstrings,
-       .get_stats_count = gfar_stats_count,
-       .get_ethtool_stats = gfar_fill_stats,
-};
diff --git a/drivers/net/gianfar_phy.c b/drivers/net/gianfar_phy.c
deleted file mode 100644 (file)
index ea02e5d..0000000
+++ /dev/null
@@ -1,622 +0,0 @@
-/* 
- * drivers/net/gianfar_phy.c
- *
- * Gianfar Ethernet Driver -- PHY handling
- * Driver for FEC on MPC8540 and TSEC on MPC8540/MPC8560
- * Based on 8260_io/fcc_enet.c
- *
- * Author: Andy Fleming
- * Maintainer: Kumar Gala (kumar.gala@freescale.com)
- *
- * Copyright 2004 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.
- *
- */
-
-#include <linux/config.h>
-#include <linux/kernel.h>
-#include <linux/sched.h>
-#include <linux/string.h>
-#include <linux/errno.h>
-#include <linux/slab.h>
-#include <linux/interrupt.h>
-#include <linux/init.h>
-#include <linux/delay.h>
-#include <linux/netdevice.h>
-#include <linux/etherdevice.h>
-#include <linux/skbuff.h>
-#include <linux/spinlock.h>
-#include <linux/mm.h>
-#include <linux/mii.h>
-
-#include <asm/io.h>
-#include <asm/irq.h>
-#include <asm/uaccess.h>
-#include <linux/module.h>
-#include <linux/version.h>
-#include <linux/crc32.h>
-
-#include "gianfar.h"
-#include "gianfar_phy.h"
-
-/* Write value to the PHY for this device to the register at regnum, */
-/* waiting until the write is done before it returns.  All PHY */
-/* configuration has to be done through the TSEC1 MIIM regs */
-void write_phy_reg(struct net_device *dev, u16 regnum, u16 value)
-{
-       struct gfar_private *priv = (struct gfar_private *) dev->priv;
-       struct gfar *regbase = priv->phyregs;
-       struct ocp_gfar_data *einfo = priv->einfo;
-
-       /* Set the PHY address and the register address we want to write */
-       gfar_write(&regbase->miimadd, ((einfo->phyid) << 8) | regnum);
-
-       /* Write out the value we want */
-       gfar_write(&regbase->miimcon, value);
-
-       /* Wait for the transaction to finish */
-       while (gfar_read(&regbase->miimind) & MIIMIND_BUSY)
-               cpu_relax();
-}
-
-/* Reads from register regnum in the PHY for device dev, */
-/* returning the value.  Clears miimcom first.  All PHY */
-/* configuration has to be done through the TSEC1 MIIM regs */
-u16 read_phy_reg(struct net_device *dev, u16 regnum)
-{
-       struct gfar_private *priv = (struct gfar_private *) dev->priv;
-       struct gfar *regbase = priv->phyregs;
-       struct ocp_gfar_data *einfo = priv->einfo;
-       u16 value;
-
-       /* Set the PHY address and the register address we want to read */
-       gfar_write(&regbase->miimadd, ((einfo->phyid) << 8) | regnum);
-
-       /* Clear miimcom, and then initiate a read */
-       gfar_write(&regbase->miimcom, 0);
-       gfar_write(&regbase->miimcom, MIIM_READ_COMMAND);
-
-       /* Wait for the transaction to finish */
-       while (gfar_read(&regbase->miimind) & (MIIMIND_NOTVALID | MIIMIND_BUSY))
-               cpu_relax();
-
-       /* Grab the value of the register from miimstat */
-       value = gfar_read(&regbase->miimstat);
-
-       return value;
-}
-
-/* returns which value to write to the control register. */
-/* For 10/100 the value is slightly different. */
-u16 mii_cr_init(u16 mii_reg, struct net_device * dev)
-{
-       struct gfar_private *priv = (struct gfar_private *) dev->priv;
-       struct ocp_gfar_data *einfo = priv->einfo;
-
-       if (einfo->flags & GFAR_HAS_GIGABIT)
-               return MIIM_CONTROL_INIT;
-       else
-               return MIIM_CR_INIT;
-}
-
-#define BRIEF_GFAR_ERRORS
-/* Wait for auto-negotiation to complete */
-u16 mii_parse_sr(u16 mii_reg, struct net_device * dev)
-{
-       struct gfar_private *priv = (struct gfar_private *) dev->priv;
-
-       unsigned int timeout = GFAR_AN_TIMEOUT;
-
-       if (mii_reg & MIIM_STATUS_LINK)
-               priv->link = 1;
-       else
-               priv->link = 0;
-
-       /* Only auto-negotiate if the link has just gone up */
-       if (priv->link && !priv->oldlink) {
-               while ((!(mii_reg & MIIM_STATUS_AN_DONE)) && timeout--)
-                       mii_reg = read_phy_reg(dev, MIIM_STATUS);
-
-#if defined(BRIEF_GFAR_ERRORS)
-               if (mii_reg & MIIM_STATUS_AN_DONE)
-                       printk(KERN_INFO "%s: Auto-negotiation done\n",
-                              dev->name);
-               else
-                       printk(KERN_INFO "%s: Auto-negotiation timed out\n",
-                              dev->name);
-#endif
-       }
-
-       return 0;
-}
-
-/* Determine the speed and duplex which was negotiated */
-u16 mii_parse_88E1011_psr(u16 mii_reg, struct net_device * dev)
-{
-       struct gfar_private *priv = (struct gfar_private *) dev->priv;
-       unsigned int speed;
-
-       if (priv->link) {
-               if (mii_reg & MIIM_88E1011_PHYSTAT_DUPLEX)
-                       priv->duplexity = 1;
-               else
-                       priv->duplexity = 0;
-
-               speed = (mii_reg & MIIM_88E1011_PHYSTAT_SPEED);
-
-               switch (speed) {
-               case MIIM_88E1011_PHYSTAT_GBIT:
-                       priv->speed = 1000;
-                       break;
-               case MIIM_88E1011_PHYSTAT_100:
-                       priv->speed = 100;
-                       break;
-               default:
-                       priv->speed = 10;
-                       break;
-               }
-       } else {
-               priv->speed = 0;
-               priv->duplexity = 0;
-       }
-
-       return 0;
-}
-
-u16 mii_parse_cis8201(u16 mii_reg, struct net_device * dev)
-{
-       struct gfar_private *priv = (struct gfar_private *) dev->priv;
-       unsigned int speed;
-
-       if (priv->link) {
-               if (mii_reg & MIIM_CIS8201_AUXCONSTAT_DUPLEX)
-                       priv->duplexity = 1;
-               else
-                       priv->duplexity = 0;
-
-               speed = mii_reg & MIIM_CIS8201_AUXCONSTAT_SPEED;
-
-               switch (speed) {
-               case MIIM_CIS8201_AUXCONSTAT_GBIT:
-                       priv->speed = 1000;
-                       break;
-               case MIIM_CIS8201_AUXCONSTAT_100:
-                       priv->speed = 100;
-                       break;
-               default:
-                       priv->speed = 10;
-                       break;
-               }
-       } else {
-               priv->speed = 0;
-               priv->duplexity = 0;
-       }
-
-       return 0;
-}
-
-u16 mii_parse_dm9161_scsr(u16 mii_reg, struct net_device * dev)
-{
-       struct gfar_private *priv = (struct gfar_private *) dev->priv;
-
-       if (mii_reg & (MIIM_DM9161_SCSR_100F | MIIM_DM9161_SCSR_100H))
-               priv->speed = 100;
-       else
-               priv->speed = 10;
-
-       if (mii_reg & (MIIM_DM9161_SCSR_100F | MIIM_DM9161_SCSR_10F))
-               priv->duplexity = 1;
-       else
-               priv->duplexity = 0;
-
-       return 0;
-}
-
-u16 dm9161_wait(u16 mii_reg, struct net_device *dev)
-{
-       int timeout = HZ;
-       int secondary = 10;
-       u16 temp;
-
-       do {
-
-               /* Davicom takes a bit to come up after a reset,
-                * so wait here for a bit */
-               set_current_state(TASK_UNINTERRUPTIBLE);
-               schedule_timeout(timeout);
-
-               temp = read_phy_reg(dev, MIIM_STATUS);
-
-               secondary--;
-       } while ((!(temp & MIIM_STATUS_AN_DONE)) && secondary);
-
-       return 0;
-}
-
-/*
- * consult the BCM54xx auxilliary status register to find the link settings
- */
-u16 mii_parse_bcm54xx_sr(u16 mii_reg, struct net_device * dev)
-{
-       struct gfar_private *priv = (struct gfar_private *) dev->priv;
-
-       /* Link modes of the BCM5400 PHY */
-       static const uint16_t link_table[8][3] = {
-               { 0, 0          },      /* No link */
-               { 0, 10         },      /* 10BT Half Duplex */
-               { 1, 10         },      /* 10BT Full Duplex */
-               { 0, 100        },      /* 100BT Half Duplex */
-               { 0, 100        },      /* 100BT Half Duplex */
-               { 1, 100        },      /* 100BT Full Duplex*/
-               { 1, 1000       },      /* 1000BT */
-               { 1, 1000       },      /* 1000BT */
-       };
-
-       uint16_t link_mode;
-
-       link_mode = mii_reg & MIIM_BCM54xx_AUXSTATUS_LINKMODE_MASK;
-       link_mode >>= MIIM_BCM54xx_AUXSTATUS_LINKMODE_SHIFT;
-
-       priv->duplexity = link_table[link_mode][0];
-       priv->speed = link_table[link_mode][1];
-
-       return 0;
-}
-
-static struct phy_info phy_info_M88E1011S = {
-       0x01410c6,
-       "Marvell 88E1011S",
-       4,
-       (const struct phy_cmd[]) {      /* config */
-               /* Reset and configure the PHY */
-               {MIIM_CONTROL, MIIM_CONTROL_INIT, mii_cr_init},
-               {miim_end,}
-       },
-       (const struct phy_cmd[]) {      /* startup */
-               /* Status is read once to clear old link state */
-               {MIIM_STATUS, miim_read, NULL},
-               /* Auto-negotiate */
-               {MIIM_STATUS, miim_read, mii_parse_sr},
-               /* Read the status */
-               {MIIM_88E1011_PHY_STATUS, miim_read, mii_parse_88E1011_psr},
-               /* Clear the IEVENT register */
-               {MIIM_88E1011_IEVENT, miim_read, NULL},
-               /* Set up the mask */
-               {MIIM_88E1011_IMASK, MIIM_88E1011_IMASK_INIT, NULL},
-               {miim_end,}
-       },
-       (const struct phy_cmd[]) {      /* ack_int */
-               /* Clear the interrupt */
-               {MIIM_88E1011_IEVENT, miim_read, NULL},
-               /* Disable interrupts */
-               {MIIM_88E1011_IMASK, MIIM_88E1011_IMASK_CLEAR, NULL},
-               {miim_end,}
-       },
-       (const struct phy_cmd[]) {      /* handle_int */
-               /* Read the Status (2x to make sure link is right) */
-               {MIIM_STATUS, miim_read, NULL},
-               /* Check the status */
-               {MIIM_STATUS, miim_read, mii_parse_sr},
-               {MIIM_88E1011_PHY_STATUS, miim_read, mii_parse_88E1011_psr},
-                       /* Enable Interrupts */
-               {MIIM_88E1011_IMASK, MIIM_88E1011_IMASK_INIT, NULL},
-               {miim_end,}
-       },
-       (const struct phy_cmd[]) {      /* shutdown */
-               {MIIM_88E1011_IEVENT, miim_read, NULL},
-               {MIIM_88E1011_IMASK, MIIM_88E1011_IMASK_CLEAR, NULL},
-               {miim_end,}
-       },
-};
-
-/* Cicada 8204 */
-static struct phy_info phy_info_cis8204 = {
-       0x3f11,
-       "Cicada Cis8204",
-       6,
-       (const struct phy_cmd[]) {      /* config */
-               /* Override PHY config settings */
-               {MIIM_CIS8201_AUX_CONSTAT, MIIM_CIS8201_AUXCONSTAT_INIT, NULL},
-               /* Set up the interface mode */
-               {MIIM_CIS8201_EXT_CON1, MIIM_CIS8201_EXTCON1_INIT, NULL},
-               /* Configure some basic stuff */
-               {MIIM_CONTROL, MIIM_CONTROL_INIT, mii_cr_init},
-               {miim_end,}
-       },
-       (const struct phy_cmd[]) {      /* startup */
-               /* Read the Status (2x to make sure link is right) */
-               {MIIM_STATUS, miim_read, NULL},
-               /* Auto-negotiate */
-               {MIIM_STATUS, miim_read, mii_parse_sr},
-               /* Read the status */
-               {MIIM_CIS8201_AUX_CONSTAT, miim_read, mii_parse_cis8201},
-               /* Clear the status register */
-               {MIIM_CIS8204_ISTAT, miim_read, NULL},
-               /* Enable interrupts */
-               {MIIM_CIS8204_IMASK, MIIM_CIS8204_IMASK_MASK, NULL},
-               {miim_end,}
-       },
-       (const struct phy_cmd[]) {      /* ack_int */
-               /* Clear the status register */
-               {MIIM_CIS8204_ISTAT, miim_read, NULL},
-               /* Disable interrupts */
-               {MIIM_CIS8204_IMASK, 0x0, NULL},
-               {miim_end,}
-       },
-       (const struct phy_cmd[]) {      /* handle_int */
-               /* Read the Status (2x to make sure link is right) */
-               {MIIM_STATUS, miim_read, NULL},
-               /* Auto-negotiate */
-               {MIIM_STATUS, miim_read, mii_parse_sr},
-               /* Read the status */
-               {MIIM_CIS8201_AUX_CONSTAT, miim_read, mii_parse_cis8201},
-               /* Enable interrupts */
-               {MIIM_CIS8204_IMASK, MIIM_CIS8204_IMASK_MASK, NULL},
-               {miim_end,}
-       },
-       (const struct phy_cmd[]) {      /* shutdown */
-               /* Clear the status register */
-               {MIIM_CIS8204_ISTAT, miim_read, NULL},
-               /* Disable interrupts */
-               {MIIM_CIS8204_IMASK, 0x0, NULL},
-               {miim_end,}
-       },
-};
-
-/* Cicada 8201 */
-static struct phy_info phy_info_cis8201 = {
-       0xfc41,
-       "CIS8201",
-       4,
-       (const struct phy_cmd[]) {      /* config */
-               /* Override PHY config settings */
-               {MIIM_CIS8201_AUX_CONSTAT, MIIM_CIS8201_AUXCONSTAT_INIT, NULL},
-               /* Set up the interface mode */
-               {MIIM_CIS8201_EXT_CON1, MIIM_CIS8201_EXTCON1_INIT, NULL},
-               /* Configure some basic stuff */
-               {MIIM_CONTROL, MIIM_CONTROL_INIT, mii_cr_init},
-               {miim_end,}
-       },
-       (const struct phy_cmd[]) {      /* startup */
-               /* Read the Status (2x to make sure link is right) */
-               {MIIM_STATUS, miim_read, NULL},
-               /* Auto-negotiate */
-               {MIIM_STATUS, miim_read, mii_parse_sr},
-               /* Read the status */
-               {MIIM_CIS8201_AUX_CONSTAT, miim_read, mii_parse_cis8201},
-               {miim_end,}
-       },
-       (const struct phy_cmd[]) {      /* ack_int */
-               {miim_end,}
-       },
-       (const struct phy_cmd[]) {      /* handle_int */
-               {miim_end,}
-       },
-       (const struct phy_cmd[]) {      /* shutdown */
-               {miim_end,}
-       },
-};
-
-static struct phy_info phy_info_dm9161 = {
-       0x0181b88,
-       "Davicom DM9161E",
-       4,
-       (const struct phy_cmd[]) {      /* config */
-               {MIIM_CONTROL, MIIM_DM9161_CR_STOP, NULL},
-               /* Do not bypass the scrambler/descrambler */
-               {MIIM_DM9161_SCR, MIIM_DM9161_SCR_INIT, NULL},
-               /* Clear 10BTCSR to default */
-               {MIIM_DM9161_10BTCSR, MIIM_DM9161_10BTCSR_INIT, NULL},
-               /* Configure some basic stuff */
-               {MIIM_CONTROL, MIIM_CR_INIT, NULL},
-               {miim_end,}
-       },
-       (const struct phy_cmd[]) {      /* startup */
-               /* Restart Auto Negotiation */
-               {MIIM_CONTROL, MIIM_DM9161_CR_RSTAN, NULL},
-               /* Status is read once to clear old link state */
-               {MIIM_STATUS, miim_read, dm9161_wait},
-               /* Auto-negotiate */
-               {MIIM_STATUS, miim_read, mii_parse_sr},
-               /* Read the status */
-               {MIIM_DM9161_SCSR, miim_read, mii_parse_dm9161_scsr},
-               /* Clear any pending interrupts */
-               {MIIM_DM9161_INTR, miim_read, NULL},
-               {miim_end,}
-       },
-       (const struct phy_cmd[]) {      /* ack_int */
-               {MIIM_DM9161_INTR, miim_read, NULL},
-               {miim_end,}
-       },
-       (const struct phy_cmd[]) {      /* handle_int */
-               {MIIM_STATUS, miim_read, NULL},
-               {MIIM_STATUS, miim_read, mii_parse_sr},
-               {MIIM_DM9161_SCSR, miim_read, mii_parse_dm9161_scsr},
-               {miim_end,}
-       },
-       (const struct phy_cmd[]) {      /* shutdown */
-               {MIIM_DM9161_INTR, miim_read, NULL},
-               {miim_end,}
-       },
-};
-
-/* Broadcom BCM5421S PHY */
-static struct phy_info phy_info_bcm5421s = {
-       .id = 0x2060E1,
-       .name = "Broadcom BCM5421S",
-       .shift = 0,
-       .config = (const struct phy_cmd[]) {
-               /* Configure some basic stuff */
-               {MIIM_CONTROL, MIIM_CR_INIT, NULL},
-#if 0 /* 5421 only */
-               miim_write(MII_BCM5400_AUXCONTROL, 0x1007),
-               miim_set_bits(MII_BCM5400_AUXCONTROL, 0x0400),
-               miim_write(MII_BCM5400_AUXCONTROL, 0x0007),
-               miim_set_bits(MII_BCM5400_AUXCONTROL, 0x0800),
-               miim_write(0x17, 0x000a),
-               miim_set_bits(MII_RERRCOUNTER, 0x0200),
-#endif
-#if 0 /* enable automatic low power */
-               miim_write(MII_NCONFIG, 0x9002),
-               miim_write(MII_NCONFIG, 0xa821),
-               miim_write(MII_NCONFIG, 0x941d),
-#endif
-               {miim_end,}
-       },
-       .startup = (const struct phy_cmd[]) {
-               /* Restart Auto Negotiation */
-               miim_set_bits(MIIM_CONTROL, BMCR_ANENABLE | BMCR_ANRESTART),
-#if 0
-               /* Status is read once to clear old link state */
-               {MIIM_STATUS, miim_read, dm9161_wait},
-#endif
-               /* Auto-negotiate */
-               {MIIM_STATUS, miim_read, mii_parse_sr},
-
-               /* Read the link status */
-               {MIIM_BCM54xx_AUXSTATUS, miim_read, mii_parse_bcm54xx_sr},
-
-               {miim_end,}
-       },
-       .ack_int = (const struct phy_cmd[]) {
-               {miim_end,}
-       },
-       .handle_int = (const struct phy_cmd[]) {
-               {MIIM_STATUS, miim_read, NULL},
-               {MIIM_STATUS, miim_read, mii_parse_sr},
-               {miim_end,}
-       },
-       .shutdown = (const struct phy_cmd[]) {
-               {miim_end,}
-       },
-};
-
-static struct phy_info *phy_info[] = {
-       &phy_info_cis8201,
-       &phy_info_cis8204,
-       &phy_info_M88E1011S,
-       &phy_info_dm9161,
-       &phy_info_bcm5421s,
-       NULL
-};
-
-/* Use the PHY ID registers to determine what type of PHY is attached
- * to device dev.  return a struct phy_info structure describing that PHY
- */
-struct phy_info * get_phy_info(struct net_device *dev)
-{
-       u16 phy_reg;
-       u32 phy_ID;
-       int i;
-       struct phy_info *theInfo = NULL;
-
-       /* Grab the bits from PHYIR1, and put them in the upper half */
-       phy_reg = read_phy_reg(dev, MIIM_PHYIR1);
-       phy_ID = (phy_reg & 0xffff) << 16;
-
-       /* Grab the bits from PHYIR2, and put them in the lower half */
-       phy_reg = read_phy_reg(dev, MIIM_PHYIR2);
-       phy_ID |= (phy_reg & 0xffff);
-
-       /* loop through all the known PHY types, and find one that */
-       /* matches the ID we read from the PHY. */
-       for (i = 0; phy_info[i]; i++)
-               if (phy_info[i]->id == (phy_ID >> phy_info[i]->shift))
-                       theInfo = phy_info[i];
-
-       if (theInfo == NULL) {
-               printk("%s: PHY id %x is not supported!\n", dev->name, phy_ID);
-               return NULL;
-       } else {
-               printk("%s: PHY is %s (%x)\n", dev->name, theInfo->name,
-                      phy_ID);
-       }
-
-       return theInfo;
-}
-
-/* Take a list of struct phy_cmd, and, depending on the values, either */
-/* read or write, using a helper function if provided */
-/* It is assumed that all lists of struct phy_cmd will be terminated by */
-/* mii_end. */
-void phy_run_commands(struct net_device *dev, const struct phy_cmd *cmd)
-{
-       int i;
-       u16 result;
-       struct gfar_private *priv = (struct gfar_private *) dev->priv;
-       struct gfar *phyregs = priv->phyregs;
-
-       /* Reset the management interface */
-       gfar_write(&phyregs->miimcfg, MIIMCFG_RESET);
-
-       /* Setup the MII Mgmt clock speed */
-       gfar_write(&phyregs->miimcfg, MIIMCFG_INIT_VALUE);
-
-       /* Wait until the bus is free */
-       while (gfar_read(&phyregs->miimind) & MIIMIND_BUSY)
-               cpu_relax();
-
-       for (i = 0; cmd->mii_reg != miim_end; i++) {
-               switch (cmd->mii_data >> 16) {
-               case 0x0000:
-                       /* Otherwise, it's a write */
-                       /* If a function was supplied, it will provide 
-                        * the value to write */
-                       /* Otherwise, the value was supplied in cmd->mii_data */
-                       if (cmd->funct != NULL)
-                               result = (*(cmd->funct)) (0, dev);
-                       else
-                               result = cmd->mii_data;
-
-                       write_phy_reg(dev, cmd->mii_reg, result);
-                       break;
-
-               case 0x0001:
-                       /* Read the value of the PHY reg */
-                       result = read_phy_reg(dev, cmd->mii_reg);
-
-                       /* If a function was supplied, we need to let it process */
-                       /* the result. */
-                       if (cmd->funct != NULL)
-                               (*(cmd->funct)) (result, dev);
-                       break;
-
-               case 0x0002:
-                       /* read the value, clear some bits and write it back */
-                       BUG_ON(cmd->funct);
-
-                       result = read_phy_reg(dev, cmd->mii_reg);
-                       result &= cmd->mii_data;
-                       write_phy_reg(dev, cmd->mii_reg, result);
-                       break;
-
-               case 0x0003:
-                       /* read the value, set some bits and write it back */
-                       BUG_ON(cmd->funct);
-
-                       result = read_phy_reg(dev, cmd->mii_reg);
-                       result &= cmd->mii_data;
-                       write_phy_reg(dev, cmd->mii_reg, result);
-                       break;
-
-               case 0x0004:
-                       /* read the value, flip some bits and write it back */
-                       BUG_ON(cmd->funct);
-
-                       result = read_phy_reg(dev, cmd->mii_reg);
-                       result &= cmd->mii_data;
-                       write_phy_reg(dev, cmd->mii_reg, result);
-                       break;
-
-               default:
-                       printk("GIANFAR: Unknown MII command %08x\n",
-                              cmd->mii_data);
-                       BUG();
-               }
-               cmd++;
-       }
-}
diff --git a/drivers/net/gianfar_phy.h b/drivers/net/gianfar_phy.h
deleted file mode 100644 (file)
index df4c0ec..0000000
+++ /dev/null
@@ -1,202 +0,0 @@
-/* 
- * drivers/net/gianfar_phy.h
- *
- * Gianfar Ethernet Driver -- PHY handling
- * Driver for FEC on MPC8540 and TSEC on MPC8540/MPC8560
- * Based on 8260_io/fcc_enet.c
- *
- * Author: Andy Fleming
- * Maintainer: Kumar Gala (kumar.gala@freescale.com)
- *
- * Copyright 2004 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.
- *
- */
-#ifndef __GIANFAR_PHY_H
-#define __GIANFAR_PHY_H
-
-/* simple datum processing commands */
-#define miim_end               (0xffff0000U)
-#define miim_read              (0x00010000U)
-#define miim_clear_bits(reg,x) { reg, (0x00020000U | ~(u32)(x)), NULL }
-#define miim_set_bits(reg,x)   { reg, (0x00030000U | (u32)(x)),  NULL }
-#define miim_flip_bits(reg,x)  { reg, (0x00040000U | (u32)(x)),  NULL }
-#define miim_write(reg, x)     { reg, (0x0000ffffU & (u32)(x)),  NULL }
-
-#define MIIMIND_BUSY            0x00000001
-#define MIIMIND_NOTVALID        0x00000004
-
-#define MIIM_CONTROL           0x00
-#define MIIM_CONTROL_RESET     0x00008000
-#define MIIM_CONTROL_INIT      0x00001140
-#define MIIM_ANEN              0x00001000
-
-#define MIIM_CR                 0x00
-#define MIIM_CR_RST            0x00008000
-#define MIIM_CR_INIT           0x00001000
-
-#define MIIM_STATUS            0x1
-#define MIIM_STATUS_AN_DONE    0x00000020
-#define MIIM_STATUS_LINK       0x0004
-
-#define MIIM_PHYIR1            0x2
-#define MIIM_PHYIR2            0x3
-
-#define GFAR_AN_TIMEOUT         0x000fffff
-
-#define MIIM_ANLPBPA   0x5
-#define MIIM_ANLPBPA_HALF      0x00000040
-#define MIIM_ANLPBPA_FULL      0x00000020
-
-#define MIIM_ANEX              0x6
-#define MIIM_ANEX_NP           0x00000004
-#define MIIM_ANEX_PRX          0x00000002
-
-
-/* Cicada Extended Control Register 1 */
-#define MIIM_CIS8201_EXT_CON1           0x17
-#define MIIM_CIS8201_EXTCON1_INIT       0x0000
-
-/* Cicada Interrupt Mask Register */
-#define MIIM_CIS8204_IMASK             0x19
-#define MIIM_CIS8204_IMASK_IEN         0x8000
-#define MIIM_CIS8204_IMASK_SPEED       0x4000
-#define MIIM_CIS8204_IMASK_LINK                0x2000
-#define MIIM_CIS8204_IMASK_DUPLEX      0x1000
-#define MIIM_CIS8204_IMASK_MASK                0xf000
-
-/* Cicada Interrupt Status Register */
-#define MIIM_CIS8204_ISTAT             0x1a
-#define MIIM_CIS8204_ISTAT_STATUS      0x8000
-#define MIIM_CIS8204_ISTAT_SPEED       0x4000
-#define MIIM_CIS8204_ISTAT_LINK                0x2000
-#define MIIM_CIS8204_ISTAT_DUPLEX      0x1000
-
-/* Cicada Auxiliary Control/Status Register */
-#define MIIM_CIS8201_AUX_CONSTAT        0x1c
-#define MIIM_CIS8201_AUXCONSTAT_INIT    0x0004
-#define MIIM_CIS8201_AUXCONSTAT_DUPLEX  0x0020
-#define MIIM_CIS8201_AUXCONSTAT_SPEED   0x0018
-#define MIIM_CIS8201_AUXCONSTAT_GBIT    0x0010
-#define MIIM_CIS8201_AUXCONSTAT_100     0x0008
-                                                                                
-/* 88E1011 PHY Status Register */
-#define MIIM_88E1011_PHY_STATUS         0x11
-#define MIIM_88E1011_PHYSTAT_SPEED      0xc000
-#define MIIM_88E1011_PHYSTAT_GBIT       0x8000
-#define MIIM_88E1011_PHYSTAT_100        0x4000
-#define MIIM_88E1011_PHYSTAT_DUPLEX     0x2000
-#define MIIM_88E1011_PHYSTAT_LINK      0x0400
-
-#define MIIM_88E1011_IEVENT            0x13
-#define MIIM_88E1011_IEVENT_CLEAR      0x0000
-
-#define MIIM_88E1011_IMASK             0x12
-#define MIIM_88E1011_IMASK_INIT                0x6400
-#define MIIM_88E1011_IMASK_CLEAR       0x0000
-
-/* DM9161 Control register values */
-#define MIIM_DM9161_CR_STOP    0x0400
-#define MIIM_DM9161_CR_RSTAN   0x1200
-
-#define MIIM_DM9161_SCR                0x10
-#define MIIM_DM9161_SCR_INIT   0x0610
-
-/* DM9161 Specified Configuration and Status Register */
-#define MIIM_DM9161_SCSR       0x11
-#define MIIM_DM9161_SCSR_100F  0x8000
-#define MIIM_DM9161_SCSR_100H  0x4000
-#define MIIM_DM9161_SCSR_10F   0x2000
-#define MIIM_DM9161_SCSR_10H   0x1000
-
-/* DM9161 Interrupt Register */
-#define MIIM_DM9161_INTR       0x15
-#define MIIM_DM9161_INTR_PEND          0x8000
-#define MIIM_DM9161_INTR_DPLX_MASK     0x0800
-#define MIIM_DM9161_INTR_SPD_MASK      0x0400
-#define MIIM_DM9161_INTR_LINK_MASK     0x0200
-#define MIIM_DM9161_INTR_MASK          0x0100
-#define MIIM_DM9161_INTR_DPLX_CHANGE   0x0010
-#define MIIM_DM9161_INTR_SPD_CHANGE    0x0008
-#define MIIM_DM9161_INTR_LINK_CHANGE   0x0004
-#define MIIM_DM9161_INTR_INIT          0x0000
-#define MIIM_DM9161_INTR_STOP  \
-(MIIM_DM9161_INTR_DPLX_MASK | MIIM_DM9161_INTR_SPD_MASK \
- | MIIM_DM9161_INTR_LINK_MASK | MIIM_DM9161_INTR_MASK)
-
-/* DM9161 10BT Configuration/Status */
-#define MIIM_DM9161_10BTCSR    0x12
-#define MIIM_DM9161_10BTCSR_INIT       0x7800
-
-/* BCM54xx regs */
-#define MIIM_BCM54xx_AUXCONTROL        0x18
-#define MIIM_BCM54xx_AUXSTATUS 0x19
-#define MIIM_BCM54xx_AUXSTATUS_LINKMODE_MASK     0x0700
-#define MIIM_BCM54xx_AUXSTATUS_LINKMODE_SHIFT    8  
-
-#define MIIM_READ_COMMAND       0x00000001
-
-/*
- * struct phy_cmd:  A command for reading or writing a PHY register
- *
- * mii_reg:  The register to read or write
- *
- * mii_data:  For writes, the value to put in the register.
- *     A value of -1 indicates this is a read.
- *
- * funct: A function pointer which is invoked for each command.
- *     For reads, this function will be passed the value read
- *     from the PHY, and process it.
- *     For writes, the result of this function will be written
- *     to the PHY register
- */
-struct phy_cmd {
-    u32 mii_reg;
-    u32 mii_data;
-    u16 (*funct) (u16 mii_reg, struct net_device * dev);
-};
-
-/* struct phy_info: a structure which defines attributes for a PHY
- *
- * id will contain a number which represents the PHY.  During
- * startup, the driver will poll the PHY to find out what its
- * UID--as defined by registers 2 and 3--is.  The 32-bit result
- * gotten from the PHY will be shifted right by "shift" bits to
- * discard any bits which may change based on revision numbers
- * unimportant to functionality
- *
- * The struct phy_cmd entries represent pointers to an arrays of
- * commands which tell the driver what to do to the PHY.
- */
-struct phy_info {
-    u32 id;
-    char *name;
-    unsigned int shift;
-    /* Called to configure the PHY, and modify the controller
-     * based on the results */
-    const struct phy_cmd *config;
-
-    /* Called when starting up the controller.  Usually sets
-     * up the interrupt for state changes */
-    const struct phy_cmd *startup;
-
-    /* Called inside the interrupt handler to acknowledge
-     * the interrupt */
-    const struct phy_cmd *ack_int;
-
-    /* Called in the bottom half to handle the interrupt */
-    const struct phy_cmd *handle_int;
-
-    /* Called when bringing down the controller.  Usually stops
-     * the interrupts from being generated */
-    const struct phy_cmd *shutdown;
-};
-
-struct phy_info *get_phy_info(struct net_device *dev);
-void phy_run_commands(struct net_device *dev, const struct phy_cmd *cmd);
-
-#endif /* GIANFAR_PHY_H */
diff --git a/drivers/net/ne2k_cbus.c b/drivers/net/ne2k_cbus.c
deleted file mode 100644 (file)
index 4fc68d9..0000000
+++ /dev/null
@@ -1,887 +0,0 @@
-/*
-
-  ne2k_cbus.c: A driver for the NE2000 like ethernet on NEC PC-9800.
-
-       This is a copy of the 2.5.66 Linux ISA NE2000 driver "ne.c" 
-       (Donald Becker/Paul Gortmaker) with the NEC PC-9800 specific
-       changes added by Osamu Tomita. 
-
-From ne.c:
------------
-    Copyright 1993 United States Government as represented by the
-    Director, National Security Agency.
-
-    This software may be used and distributed according to the terms
-    of the GNU General Public License, incorporated herein by reference.
------------
-
-*/
-
-/* Routines for the NatSemi-based designs (NE[12]000). */
-
-static const char version[] =
-"ne2k_cbus.c:v1.0 3/24/03 Osamu Tomita\n";
-
-#include <linux/module.h>
-#include <linux/kernel.h>
-#include <linux/errno.h>
-#include <linux/isapnp.h>
-#include <linux/init.h>
-#include <linux/interrupt.h>
-#include <linux/delay.h>
-#include <linux/netdevice.h>
-#include <linux/etherdevice.h>
-
-#include <asm/system.h>
-#include <asm/io.h>
-
-#include "8390.h"
-
-/* Some defines that people can play with if so inclined. */
-
-/* Do we support clones that don't adhere to 14,15 of the SAprom ? */
-#define SUPPORT_NE_BAD_CLONES
-
-/* Do we perform extra sanity checks on stuff ? */
-/* #define NE_SANITY_CHECK */
-
-/* Do we implement the read before write bugfix ? */
-/* #define NE_RW_BUGFIX */
-
-/* Do we have a non std. amount of memory? (in units of 256 byte pages) */
-/* #define PACKETBUF_MEMSIZE   0x40 */
-
-#ifdef SUPPORT_NE_BAD_CLONES
-/* A list of bad clones that we none-the-less recognize. */
-static struct { const char *name8, *name16; unsigned char SAprefix[4];}
-bad_clone_list[] __initdata = {
-    {"LA/T-98?", "LA/T-98", {0x00, 0xa0, 0xb0}},       /* I/O Data */
-    {"EGY-98?", "EGY-98", {0x00, 0x40, 0x26}},         /* Melco EGY98 */
-    {"ICM?", "ICM-27xx-ET", {0x00, 0x80, 0xc8}},       /* ICM IF-27xx-ET */
-    {"CNET-98/EL?", "CNET(98)E/L", {0x00, 0x80, 0x4C}},        /* Contec CNET-98/EL */
-    {0,}
-};
-#endif
-
-/* ---- No user-serviceable parts below ---- */
-
-#define NE_BASE         (dev->base_addr)
-#define NE_CMD         EI_SHIFT(0x00)
-#define NE_DATAPORT    EI_SHIFT(0x10)  /* NatSemi-defined port window offset. */
-#define NE_RESET       EI_SHIFT(0x1f) /* Issue a read to reset, a write to clear. */
-#define NE_IO_EXTENT   0x20
-
-#define NE1SM_START_PG 0x20    /* First page of TX buffer */
-#define NE1SM_STOP_PG  0x40    /* Last page +1 of RX ring */
-#define NESM_START_PG  0x40    /* First page of TX buffer */
-#define NESM_STOP_PG   0x80    /* Last page +1 of RX ring */
-
-#include "ne2k_cbus.h"
-
-static int ne_probe1(struct net_device *dev, int ioaddr);
-static int ne_open(struct net_device *dev);
-static int ne_close(struct net_device *dev);
-
-static void ne_reset_8390(struct net_device *dev);
-static void ne_get_8390_hdr(struct net_device *dev, struct e8390_pkt_hdr *hdr,
-                         int ring_page);
-static void ne_block_input(struct net_device *dev, int count,
-                         struct sk_buff *skb, int ring_offset);
-static void ne_block_output(struct net_device *dev, const int count,
-               const unsigned char *buf, const int start_page);
-
-\f
-/*  Probe for various non-shared-memory ethercards.
-
-   NEx000-clone boards have a Station Address PROM (SAPROM) in the packet
-   buffer memory space.  NE2000 clones have 0x57,0x57 in bytes 0x0e,0x0f of
-   the SAPROM, while other supposed NE2000 clones must be detected by their
-   SA prefix.
-
-   Reading the SAPROM from a word-wide card with the 8390 set in byte-wide
-   mode results in doubled values, which can be detected and compensated for.
-
-   The probe is also responsible for initializing the card and filling
-   in the 'dev' and 'ei_status' structures.
-
-   We use the minimum memory size for some ethercard product lines, iff we can't
-   distinguish models.  You can increase the packet buffer size by setting
-   PACKETBUF_MEMSIZE.  Reported Cabletron packet buffer locations are:
-       E1010   starts at 0x100 and ends at 0x2000.
-       E1010-x starts at 0x100 and ends at 0x8000. ("-x" means "more memory")
-       E2010    starts at 0x100 and ends at 0x4000.
-       E2010-x starts at 0x100 and ends at 0xffff.  */
-
-static int __init do_ne_probe(struct net_device *dev)
-{
-       unsigned int base_addr = dev->base_addr;
-       int irq = dev->irq;
-
-       SET_MODULE_OWNER(dev);
-
-       if (ei_debug > 2)
-               printk(KERN_DEBUG "ne_probe(): entered.\n");
-
-       /* If CONFIG_NET_CBUS,
-          we need dev->priv->reg_offset BEFORE to probe */
-       if (ne2k_cbus_init(dev) != 0)
-               return -ENOMEM;
-
-       /* First check any supplied i/o locations. User knows best. <cough> */
-       if (base_addr > 0) {
-               int result;
-               const struct ne2k_cbus_hwinfo *hw = ne2k_cbus_get_hwinfo((int)(dev->mem_start & NE2K_CBUS_HARDWARE_TYPE_MASK));
-
-               if (ei_debug > 2)
-                       printk(KERN_DEBUG "ne_probe(): call ne_probe_cbus(base_addr=0x%x)\n", base_addr);
-
-               result = ne_probe_cbus(dev, hw, base_addr, irq);
-               if (result != 0)
-                       ne2k_cbus_destroy(dev);
-
-               return result;
-       }
-
-       if (ei_debug > 2)
-               printk(KERN_DEBUG "ne_probe(): base_addr is not specified.\n");
-
-#ifndef MODULE
-       /* Last resort. The semi-risky C-Bus auto-probe. */
-       if (ei_debug > 2)
-               printk(KERN_DEBUG "ne_probe(): auto-probe start.\n");
-
-       {
-               const struct ne2k_cbus_hwinfo *hw = ne2k_cbus_get_hwinfo((int)(dev->mem_start & NE2K_CBUS_HARDWARE_TYPE_MASK));
-
-               if (hw && hw->hwtype) {
-                       const unsigned short *plist;
-                       for (plist = hw->portlist; *plist; plist++)
-                               if (ne_probe_cbus(dev, hw, *plist, irq) == 0)
-                                       return 0;
-               } else {
-                       for (hw = &ne2k_cbus_hwinfo_list[0]; hw->hwtype; hw++) {
-                               const unsigned short *plist;
-                               for (plist = hw->portlist; *plist; plist++)
-                                       if (ne_probe_cbus(dev, hw, *plist, irq) == 0)
-                                               return 0;
-                       }
-               }
-       }
-#endif
-
-       ne2k_cbus_destroy(dev);
-
-       return -ENODEV;
-}
-
-static void cleanup_card(struct net_device *dev)
-{
-       const struct ne2k_cbus_region *rlist;
-       const struct ne2k_cbus_hwinfo *hw = ne2k_cbus_get_hwinfo((int)(dev->mem_start & NE2K_CBUS_HARDWARE_TYPE_MASK));
-
-       free_irq(dev->irq, dev);
-       for (rlist = hw->regionlist; rlist->range; rlist++) {
-               release_region(dev->base_addr + rlist->start,
-                               rlist->range);
-       }
-       ne2k_cbus_destroy(dev);
-}
-
-struct net_device * __init ne_probe(int unit)
-{
-       struct net_device *dev = alloc_ei_netdev();
-       int err;
-
-       if (!dev)
-               return ERR_PTR(-ENOMEM);
-
-       sprintf(dev->name, "eth%d", unit);
-       netdev_boot_setup_check(dev);
-
-       err = do_ne_probe(dev);
-       if (err)
-               goto out;
-       err = register_netdev(dev);
-       if (err)
-               goto out1;
-       return dev;
-out1:
-       cleanup_card(dev);
-out:
-       free_netdev(dev);
-       return ERR_PTR(err);
-}
-
-static int __init ne_probe_cbus(struct net_device *dev, const struct ne2k_cbus_hwinfo *hw, int ioaddr, int irq)
-{
-       if (ei_debug > 2)
-               printk(KERN_DEBUG "ne_probe_cbus(): entered. (called from %p)\n",
-                      __builtin_return_address(0));
-
-       if (hw && hw->hwtype) {
-               ne2k_cbus_set_hwtype(dev, hw, ioaddr);
-               dev->irq = irq;
-               return ne_probe1(dev, ioaddr);
-       } else {
-               /* auto detect */
-
-               printk(KERN_DEBUG "ne_probe_cbus(): try to determine hardware types.\n");
-               for (hw = &ne2k_cbus_hwinfo_list[0]; hw->hwtype; hw++) {
-                       ne2k_cbus_set_hwtype(dev, hw, ioaddr);
-                       dev->irq = irq;
-                       if (ne_probe1(dev, ioaddr) == 0)
-                               return 0;
-               }
-       }
-       return -ENODEV;
-}
-
-static int __init ne_probe1(struct net_device *dev, int ioaddr)
-{
-       int i;
-       unsigned char SA_prom[32];
-       int wordlength = 2;
-       const char *name = NULL;
-       int start_page, stop_page;
-       int neX000, bad_card;
-       int reg0, ret;
-       static unsigned version_printed;
-       const struct ne2k_cbus_region *rlist;
-       const struct ne2k_cbus_hwinfo *hw = ne2k_cbus_get_hwinfo((int)(dev->mem_start & NE2K_CBUS_HARDWARE_TYPE_MASK));
-       struct ei_device *ei_local = (struct ei_device *)(dev->priv);
-
-#ifdef CONFIG_NE2K_CBUS_CNET98EL
-       if (hw->hwtype == NE2K_CBUS_HARDWARE_TYPE_CNET98EL) {
-               outb_p(0, CONFIG_NE2K_CBUS_CNET98EL_IO_BASE);
-               /* udelay(5000);        */
-               outb_p(1, CONFIG_NE2K_CBUS_CNET98EL_IO_BASE);
-               /* udelay(5000);        */
-               outb_p((ioaddr & 0xf000) >> 8 | 0x08 | 0x01, CONFIG_NE2K_CBUS_CNET98EL_IO_BASE + 2);
-               /* udelay(5000); */
-       }
-#endif
-
-       for (rlist = hw->regionlist; rlist->range; rlist++)
-               if (!request_region(ioaddr + rlist->start,
-                                       rlist->range, dev->name)) {
-                       ret = -EBUSY;
-                       goto err_out;
-               }
-
-       reg0 = inb_p(ioaddr + EI_SHIFT(0));
-       if (reg0 == 0xFF) {
-               ret = -ENODEV;
-               goto err_out;
-       }
-
-       /* Do a preliminary verification that we have a 8390. */
-#ifdef CONFIG_NE2K_CBUS_CNET98EL
-       if (hw->hwtype != NE2K_CBUS_HARDWARE_TYPE_CNET98EL)
-#endif
-       {
-               int regd;
-               outb_p(E8390_NODMA+E8390_PAGE1+E8390_STOP, ioaddr + E8390_CMD);
-               regd = inb_p(ioaddr + EI_SHIFT(0x0d));
-               outb_p(0xff, ioaddr + EI_SHIFT(0x0d));
-               outb_p(E8390_NODMA+E8390_PAGE0, ioaddr + E8390_CMD);
-               inb_p(ioaddr + EN0_COUNTER0); /* Clear the counter by reading. */
-               if (inb_p(ioaddr + EN0_COUNTER0) != 0) {
-                       outb_p(reg0, ioaddr);
-                       outb_p(regd, ioaddr + EI_SHIFT(0x0d));  /* Restore the old values. */
-                       ret = -ENODEV;
-                       goto err_out;
-               }
-       }
-
-       if (ei_debug  &&  version_printed++ == 0)
-               printk(KERN_INFO "%s", version);
-
-       printk(KERN_INFO "NE*000 ethercard probe at %#3x:", ioaddr);
-
-       /* A user with a poor card that fails to ack the reset, or that
-          does not have a valid 0x57,0x57 signature can still use this
-          without having to recompile. Specifying an i/o address along
-          with an otherwise unused dev->mem_end value of "0xBAD" will
-          cause the driver to skip these parts of the probe. */
-
-       bad_card = ((dev->base_addr != 0) && (dev->mem_end == 0xbad));
-
-       /* Reset card. Who knows what dain-bramaged state it was left in. */
-
-       {
-               unsigned long reset_start_time = jiffies;
-
-               /* derived from CNET98EL-patch for bad clones */
-               outb_p(E8390_NODMA | E8390_STOP, ioaddr + E8390_CMD);
-
-               /* DON'T change these to inb_p/outb_p or reset will fail on clones. */
-               outb(inb(ioaddr + NE_RESET), ioaddr + NE_RESET);
-
-               while ((inb_p(ioaddr + EN0_ISR) & ENISR_RESET) == 0)
-               if (jiffies - reset_start_time > 2*HZ/100) {
-                       if (bad_card) {
-                               printk(" (warning: no reset ack)");
-                               break;
-                       } else {
-                               printk(" not found (no reset ack).\n");
-                               ret = -ENODEV;
-                               goto err_out;
-                       }
-               }
-
-               outb_p(0xff, ioaddr + EN0_ISR);         /* Ack all intr. */
-       }
-
-#ifdef CONFIG_NE2K_CBUS_CNET98EL
-       if (hw->hwtype == NE2K_CBUS_HARDWARE_TYPE_CNET98EL) {
-               static const char pat[32] ="AbcdeFghijKlmnoPqrstUvwxyZ789012";
-               char buf[32];
-               int maxwait = 200;
-
-               if (ei_debug > 2)
-                       printk(" [CNET98EL-specific initialize...");
-               outb_p(E8390_NODMA | E8390_STOP, ioaddr + E8390_CMD); /* 0x20|0x1 */
-               ret = -ENODEV;
-               i = inb(ioaddr);
-               if ((i & ~0x2) != (0x20 | 0x01))
-                       goto err_out;
-               if ((inb(ioaddr + 0x7) & 0x80) != 0x80)
-                       goto err_out;
-               outb_p(E8390_RXOFF, ioaddr + EN0_RXCR); /* out(ioaddr+0xc, 0x20) */
-               /* outb_p(ENDCFG_WTS|ENDCFG_FT1|ENDCFG_LS, ioaddr+EN0_DCFG); */
-               outb_p(ENDCFG_WTS | 0x48, ioaddr + EN0_DCFG); /* 0x49 */
-               outb_p(CNET98EL_START_PG, ioaddr + EN0_STARTPG);
-               outb_p(CNET98EL_STOP_PG, ioaddr + EN0_STOPPG);
-               if (ei_debug > 2)
-                       printk("memory check");
-               for (i = 0; i < 65536; i += 1024) {
-                       if (ei_debug > 2)
-                               printk(" %04x", i);
-                       ne2k_cbus_writemem(dev, ioaddr, i, pat, 32);
-                       while (((inb(ioaddr + EN0_ISR) & ENISR_RDC) != ENISR_RDC) && --maxwait)
-                               ;
-                       ne2k_cbus_readmem(dev, ioaddr, i, buf, 32);
-                       if (memcmp(pat, buf, 32)) {
-                               if (ei_debug > 2)
-                                       printk(" failed.");
-                               break;
-                       }
-               }
-               if (i != 16384) {
-                       if (ei_debug > 2)
-                               printk("] ");
-                       printk("memory failure at %x\n", i);
-                       goto err_out;
-               }
-               if (ei_debug > 2)
-                       printk(" good...");
-               if (!dev->irq) {
-                       if (ei_debug > 2)
-                               printk("] ");
-                       printk("IRQ must be specified for C-NET(98)E/L. probe failed.\n");
-                       goto err_out;
-               }
-               outb((dev->irq > 5) ? (dev->irq & 4):(dev->irq >> 1), ioaddr + (0x2 | 0x400));
-               outb(0x7e, ioaddr + (0x4 | 0x400));
-               ne2k_cbus_readmem(dev, ioaddr, 16384, SA_prom, 32);
-               outb(0xff, ioaddr + EN0_ISR);
-               if (ei_debug > 2)
-                       printk("done]");
-       } else
-#endif /* CONFIG_NE2K_CBUS_CNET98EL */
-       /* Read the 16 bytes of station address PROM.
-          We must first initialize registers, similar to NS8390_init(eifdev, 0).
-          We can't reliably read the SAPROM address without this.
-          (I learned the hard way!). */
-       {
-               struct {unsigned char value; unsigned short offset;} program_seq[] = 
-               {
-                       {E8390_NODMA+E8390_PAGE0+E8390_STOP, E8390_CMD}, /* Select page 0*/
-                       /* NEC PC-9800: some board can only handle word-wide access? */
-                       {0x48 | ENDCFG_WTS,     EN0_DCFG},      /* Set word-wide (0x48) access. */
-                       {16384 / 256, EN0_STARTPG},
-                       {32768 / 256, EN0_STOPPG},
-                       {0x00,  EN0_RCNTLO},    /* Clear the count regs. */
-                       {0x00,  EN0_RCNTHI},
-                       {0x00,  EN0_IMR},       /* Mask completion irq. */
-                       {0xFF,  EN0_ISR},
-                       {E8390_RXOFF, EN0_RXCR},        /* 0x20  Set to monitor */
-                       {E8390_TXOFF, EN0_TXCR},        /* 0x02  and loopback mode. */
-                       {32,    EN0_RCNTLO},
-                       {0x00,  EN0_RCNTHI},
-                       {0x00,  EN0_RSARLO},    /* DMA starting at 0x0000. */
-                       {0x00,  EN0_RSARHI},
-                       {E8390_RREAD+E8390_START, E8390_CMD},
-               };
-
-               for (i = 0; i < sizeof(program_seq)/sizeof(program_seq[0]); i++)
-                       outb_p(program_seq[i].value, ioaddr + program_seq[i].offset);
-               insw(ioaddr + NE_DATAPORT, SA_prom, 32 >> 1);
-
-       }
-
-       if (wordlength == 2)
-       {
-               for (i = 0; i < 16; i++)
-                       SA_prom[i] = SA_prom[i+i];
-               start_page = NESM_START_PG;
-               stop_page = NESM_STOP_PG;
-#ifdef CONFIG_NE2K_CBUS_CNET98EL
-               if (hw->hwtype == NE2K_CBUS_HARDWARE_TYPE_CNET98EL) {
-                       start_page = CNET98EL_START_PG;
-                       stop_page = CNET98EL_STOP_PG;
-               }
-#endif
-       } else {
-               start_page = NE1SM_START_PG;
-               stop_page = NE1SM_STOP_PG;
-       }
-
-       neX000 = (SA_prom[14] == 0x57  &&  SA_prom[15] == 0x57);
-       if (neX000) {
-               name = "C-Bus-NE2K-compat";
-       }
-       else
-       {
-#ifdef SUPPORT_NE_BAD_CLONES
-               /* Ack!  Well, there might be a *bad* NE*000 clone there.
-                  Check for total bogus addresses. */
-               for (i = 0; bad_clone_list[i].name8; i++)
-               {
-                       if (SA_prom[0] == bad_clone_list[i].SAprefix[0] &&
-                               SA_prom[1] == bad_clone_list[i].SAprefix[1] &&
-                               SA_prom[2] == bad_clone_list[i].SAprefix[2])
-                       {
-                               if (wordlength == 2)
-                               {
-                                       name = bad_clone_list[i].name16;
-                               } else {
-                                       name = bad_clone_list[i].name8;
-                               }
-                               break;
-                       }
-               }
-               if (bad_clone_list[i].name8 == NULL)
-               {
-                       printk(" not found (invalid signature %2.2x %2.2x).\n",
-                               SA_prom[14], SA_prom[15]);
-                       ret = -ENXIO;
-                       goto err_out;
-               }
-#else
-               printk(" not found.\n");
-               ret = -ENXIO;
-               goto err_out;
-#endif
-       }
-
-       if (dev->irq < 2)
-       {
-               unsigned long cookie = probe_irq_on();
-               outb_p(0x50, ioaddr + EN0_IMR); /* Enable one interrupt. */
-               outb_p(0x00, ioaddr + EN0_RCNTLO);
-               outb_p(0x00, ioaddr + EN0_RCNTHI);
-               outb_p(E8390_RREAD+E8390_START, ioaddr); /* Trigger it... */
-               mdelay(10);             /* wait 10ms for interrupt to propagate */
-               outb_p(0x00, ioaddr + EN0_IMR);                 /* Mask it again. */
-               dev->irq = probe_irq_off(cookie);
-               if (ei_debug > 2)
-                       printk(" autoirq is %d\n", dev->irq);
-       } else if (dev->irq == 7)
-               /* Fixup for users that don't know that IRQ 7 is really IRQ 11,
-                  or don't know which one to set. */
-               dev->irq = 11;
-
-       if (! dev->irq) {
-               printk(" failed to detect IRQ line.\n");
-               ret = -EAGAIN;
-               goto err_out;
-       }
-
-       /* Snarf the interrupt now.  There's no point in waiting since we cannot
-          share and the board will usually be enabled. */
-       ret = request_irq(dev->irq, ei_interrupt, 0, name, dev);
-       if (ret) {
-               printk (" unable to get IRQ %d (errno=%d).\n", dev->irq, ret);
-               goto err_out_kfree;
-       }
-
-       dev->base_addr = ioaddr;
-
-       for(i = 0; i < ETHER_ADDR_LEN; i++) {
-               printk(" %2.2x", SA_prom[i]);
-               dev->dev_addr[i] = SA_prom[i];
-       }
-
-       printk("\n%s: %s found at %#x, hardware type %d(%s), using IRQ %d.\n",
-                  dev->name, name, ioaddr, hw->hwtype, hw->hwident, dev->irq);
-
-       ei_status.name = name;
-       ei_status.tx_start_page = start_page;
-       ei_status.stop_page = stop_page;
-       ei_status.word16 = (wordlength == 2);
-
-       ei_status.rx_start_page = start_page + TX_PAGES;
-#ifdef PACKETBUF_MEMSIZE
-        /* Allow the packet buffer size to be overridden by know-it-alls. */
-       ei_status.stop_page = ei_status.tx_start_page + PACKETBUF_MEMSIZE;
-#endif
-
-       ei_status.reset_8390 = &ne_reset_8390;
-       ei_status.block_input = &ne_block_input;
-       ei_status.block_output = &ne_block_output;
-       ei_status.get_8390_hdr = &ne_get_8390_hdr;
-       ei_status.priv = 0;
-       dev->open = &ne_open;
-       dev->stop = &ne_close;
-#ifdef CONFIG_NET_POLL_CONTROLLER
-       dev->poll_controller = ei_poll;
-#endif
-       NS8390_init(dev, 0);
-       return 0;
-
-err_out_kfree:
-       ne2k_cbus_destroy(dev);
-err_out:
-       while (rlist > hw->regionlist) {
-               rlist --;
-               release_region(ioaddr + rlist->start, rlist->range);
-       }
-       return ret;
-}
-
-static int ne_open(struct net_device *dev)
-{
-       ei_open(dev);
-       return 0;
-}
-
-static int ne_close(struct net_device *dev)
-{
-       if (ei_debug > 1)
-               printk(KERN_DEBUG "%s: Shutting down ethercard.\n", dev->name);
-       ei_close(dev);
-       return 0;
-}
-
-/* Hard reset the card.  This used to pause for the same period that a
-   8390 reset command required, but that shouldn't be necessary. */
-
-static void ne_reset_8390(struct net_device *dev)
-{
-       unsigned long reset_start_time = jiffies;
-       struct ei_device *ei_local = (struct ei_device *)(dev->priv);
-
-       if (ei_debug > 1)
-               printk(KERN_DEBUG "resetting the 8390 t=%ld...", jiffies);
-
-       /* derived from CNET98EL-patch for bad clones... */
-       outb_p(E8390_NODMA | E8390_STOP, NE_BASE + E8390_CMD);  /* 0x20 | 0x1 */
-
-       /* DON'T change these to inb_p/outb_p or reset will fail on clones. */
-       outb(inb(NE_BASE + NE_RESET), NE_BASE + NE_RESET);
-
-       ei_status.txing = 0;
-       ei_status.dmaing = 0;
-
-       /* This check _should_not_ be necessary, omit eventually. */
-       while ((inb_p(NE_BASE+EN0_ISR) & ENISR_RESET) == 0)
-               if (jiffies - reset_start_time > 2*HZ/100) {
-                       printk(KERN_WARNING "%s: ne_reset_8390() did not complete.\n", dev->name);
-                       break;
-               }
-       outb_p(ENISR_RESET, NE_BASE + EN0_ISR); /* Ack intr. */
-}
-
-/* Grab the 8390 specific header. Similar to the block_input routine, but
-   we don't need to be concerned with ring wrap as the header will be at
-   the start of a page, so we optimize accordingly. */
-
-static void ne_get_8390_hdr(struct net_device *dev, struct e8390_pkt_hdr *hdr, int ring_page)
-{
-       int nic_base = dev->base_addr;
-       struct ei_device *ei_local = (struct ei_device *)(dev->priv);
-
-       /* This *shouldn't* happen. If it does, it's the last thing you'll see */
-
-       if (ei_status.dmaing)
-       {
-               printk(KERN_EMERG "%s: DMAing conflict in ne_get_8390_hdr "
-                       "[DMAstat:%d][irqlock:%d].\n",
-                       dev->name, ei_status.dmaing, ei_status.irqlock);
-               return;
-       }
-
-       ei_status.dmaing |= 0x01;
-       outb_p(E8390_NODMA+E8390_PAGE0+E8390_START, nic_base+ NE_CMD);
-       outb_p(sizeof(struct e8390_pkt_hdr), nic_base + EN0_RCNTLO);
-       outb_p(0, nic_base + EN0_RCNTHI);
-       outb_p(0, nic_base + EN0_RSARLO);               /* On page boundary */
-       outb_p(ring_page, nic_base + EN0_RSARHI);
-       outb_p(E8390_RREAD+E8390_START, nic_base + NE_CMD);
-
-       if (ei_status.word16)
-               insw(NE_BASE + NE_DATAPORT, hdr, sizeof(struct e8390_pkt_hdr)>>1);
-       else
-               insb(NE_BASE + NE_DATAPORT, hdr, sizeof(struct e8390_pkt_hdr));
-
-       outb_p(ENISR_RDC, nic_base + EN0_ISR);  /* Ack intr. */
-       ei_status.dmaing &= ~0x01;
-
-       le16_to_cpus(&hdr->count);
-}
-
-/* Block input and output, similar to the Crynwr packet driver.  If you
-   are porting to a new ethercard, look at the packet driver source for hints.
-   The NEx000 doesn't share the on-board packet memory -- you have to put
-   the packet out through the "remote DMA" dataport using outb. */
-
-static void ne_block_input(struct net_device *dev, int count, struct sk_buff *skb, int ring_offset)
-{
-#ifdef NE_SANITY_CHECK
-       int xfer_count = count;
-#endif
-       int nic_base = dev->base_addr;
-       char *buf = skb->data;
-       struct ei_device *ei_local = (struct ei_device *)(dev->priv);
-
-       /* This *shouldn't* happen. If it does, it's the last thing you'll see */
-       if (ei_status.dmaing)
-       {
-               printk(KERN_EMERG "%s: DMAing conflict in ne_block_input "
-                       "[DMAstat:%d][irqlock:%d].\n",
-                       dev->name, ei_status.dmaing, ei_status.irqlock);
-               return;
-       }
-       ei_status.dmaing |= 0x01;
-
-       /* round up count to a word (derived from ICM-patch) */
-       count = (count + 1) & ~1;
-
-       outb_p(E8390_NODMA+E8390_PAGE0+E8390_START, nic_base+ NE_CMD);
-       outb_p(count & 0xff, nic_base + EN0_RCNTLO);
-       outb_p(count >> 8, nic_base + EN0_RCNTHI);
-       outb_p(ring_offset & 0xff, nic_base + EN0_RSARLO);
-       outb_p(ring_offset >> 8, nic_base + EN0_RSARHI);
-       outb_p(E8390_RREAD+E8390_START, nic_base + NE_CMD);
-       if (ei_status.word16)
-       {
-               insw(NE_BASE + NE_DATAPORT,buf,count>>1);
-               if (count & 0x01)
-               {
-                       buf[count-1] = inb(NE_BASE + NE_DATAPORT);
-#ifdef NE_SANITY_CHECK
-                       xfer_count++;
-#endif
-               }
-       } else {
-               insb(NE_BASE + NE_DATAPORT, buf, count);
-       }
-
-#ifdef NE_SANITY_CHECK
-       /* This was for the ALPHA version only, but enough people have
-          been encountering problems so it is still here.  If you see
-          this message you either 1) have a slightly incompatible clone
-          or 2) have noise/speed problems with your bus. */
-
-       if (ei_debug > 1)
-       {
-               /* DMA termination address check... */
-               int addr, tries = 20;
-               do {
-                       /* DON'T check for 'inb_p(EN0_ISR) & ENISR_RDC' here
-                          -- it's broken for Rx on some cards! */
-                       int high = inb_p(nic_base + EN0_RSARHI);
-                       int low = inb_p(nic_base + EN0_RSARLO);
-                       addr = (high << 8) + low;
-                       if (((ring_offset + xfer_count) & 0xff) == low)
-                               break;
-               } while (--tries > 0);
-               if (tries <= 0)
-                       printk(KERN_WARNING "%s: RX transfer address mismatch,"
-                               "%#4.4x (expected) vs. %#4.4x (actual).\n",
-                               dev->name, ring_offset + xfer_count, addr);
-       }
-#endif
-       outb_p(ENISR_RDC, nic_base + EN0_ISR);  /* Ack intr. */
-       ei_status.dmaing &= ~0x01;
-}
-
-static void ne_block_output(struct net_device *dev, int count,
-               const unsigned char *buf, const int start_page)
-{
-       int nic_base = NE_BASE;
-       unsigned long dma_start;
-#ifdef NE_SANITY_CHECK
-       int retries = 0;
-#endif
-       struct ei_device *ei_local = (struct ei_device *)(dev->priv);
-
-       /* Round the count up for word writes.  Do we need to do this?
-          What effect will an odd byte count have on the 8390?
-          I should check someday. */
-
-       if (ei_status.word16 && (count & 0x01))
-               count++;
-
-       /* This *shouldn't* happen. If it does, it's the last thing you'll see */
-       if (ei_status.dmaing)
-       {
-               printk(KERN_EMERG "%s: DMAing conflict in ne_block_output."
-                       "[DMAstat:%d][irqlock:%d]\n",
-                       dev->name, ei_status.dmaing, ei_status.irqlock);
-               return;
-       }
-       ei_status.dmaing |= 0x01;
-       /* We should already be in page 0, but to be safe... */
-       outb_p(E8390_PAGE0+E8390_START+E8390_NODMA, nic_base + NE_CMD);
-
-#ifdef NE_SANITY_CHECK
-retry:
-#endif
-
-#ifdef NE8390_RW_BUGFIX
-       /* Handle the read-before-write bug the same way as the
-          Crynwr packet driver -- the NatSemi method doesn't work.
-          Actually this doesn't always work either, but if you have
-          problems with your NEx000 this is better than nothing! */
-
-       outb_p(0x42, nic_base + EN0_RCNTLO);
-       outb_p(0x00,   nic_base + EN0_RCNTHI);
-       outb_p(0x42, nic_base + EN0_RSARLO);
-       outb_p(0x00, nic_base + EN0_RSARHI);
-       outb_p(E8390_RREAD+E8390_START, nic_base + NE_CMD);
-       /* Make certain that the dummy read has occurred. */
-       udelay(6);
-#endif
-
-       outb_p(ENISR_RDC, nic_base + EN0_ISR);
-
-       /* Now the normal output. */
-       outb_p(count & 0xff, nic_base + EN0_RCNTLO);
-       outb_p(count >> 8,   nic_base + EN0_RCNTHI);
-       outb_p(0x00, nic_base + EN0_RSARLO);
-       outb_p(start_page, nic_base + EN0_RSARHI);
-
-       outb_p(E8390_RWRITE+E8390_START, nic_base + NE_CMD);
-       if (ei_status.word16) {
-               outsw(NE_BASE + NE_DATAPORT, buf, count>>1);
-       } else {
-               outsb(NE_BASE + NE_DATAPORT, buf, count);
-       }
-
-       dma_start = jiffies;
-
-#ifdef NE_SANITY_CHECK
-       /* This was for the ALPHA version only, but enough people have
-          been encountering problems so it is still here. */
-
-       if (ei_debug > 1)
-       {
-               /* DMA termination address check... */
-               int addr, tries = 20;
-               do {
-                       int high = inb_p(nic_base + EN0_RSARHI);
-                       int low = inb_p(nic_base + EN0_RSARLO);
-                       addr = (high << 8) + low;
-                       if ((start_page << 8) + count == addr)
-                               break;
-               } while (--tries > 0);
-
-               if (tries <= 0)
-               {
-                       printk(KERN_WARNING "%s: Tx packet transfer address mismatch,"
-                               "%#4.4x (expected) vs. %#4.4x (actual).\n",
-                               dev->name, (start_page << 8) + count, addr);
-                       if (retries++ == 0)
-                               goto retry;
-               }
-       }
-#endif
-
-       while ((inb_p(nic_base + EN0_ISR) & ENISR_RDC) == 0)
-               if (jiffies - dma_start > 2*HZ/100) {           /* 20ms */
-                       printk(KERN_WARNING "%s: timeout waiting for Tx RDC.\n", dev->name);
-                       ne_reset_8390(dev);
-                       NS8390_init(dev,1);
-                       break;
-               }
-
-       outb_p(ENISR_RDC, nic_base + EN0_ISR);  /* Ack intr. */
-       ei_status.dmaing &= ~0x01;
-       return;
-}
-
-\f
-#ifdef MODULE
-#define MAX_NE_CARDS   4       /* Max number of NE cards per module */
-static struct net_device *dev_ne[MAX_NE_CARDS];
-static int io[MAX_NE_CARDS];
-static int irq[MAX_NE_CARDS];
-static int bad[MAX_NE_CARDS];  /* 0xbad = bad sig or no reset ack */
-static int hwtype[MAX_NE_CARDS] = { 0, }; /* board type */
-
-MODULE_PARM(io, "1-" __MODULE_STRING(MAX_NE_CARDS) "i");
-MODULE_PARM(irq, "1-" __MODULE_STRING(MAX_NE_CARDS) "i");
-MODULE_PARM(bad, "1-" __MODULE_STRING(MAX_NE_CARDS) "i");
-MODULE_PARM(hwtype, "1-" __MODULE_STRING(MAX_NE_CARDS) "i");
-MODULE_PARM_DESC(io, "I/O base address(es),required");
-MODULE_PARM_DESC(irq, "IRQ number(s)");
-MODULE_PARM_DESC(bad, "Accept card(s) with bad signatures");
-MODULE_PARM_DESC(hwtype, "Board type of PC-9800 C-Bus NIC");
-MODULE_DESCRIPTION("NE1000/NE2000 PC-9800 C-bus Ethernet driver");
-MODULE_LICENSE("GPL");
-
-/* This is set up so that no ISA autoprobe takes place. We can't guarantee
-that the ne2k probe is the last 8390 based probe to take place (as it
-is at boot) and so the probe will get confused by any other 8390 cards.
-ISA device autoprobes on a running machine are not recommended anyway. */
-
-int init_module(void)
-{
-       int this_dev, found = 0;
-
-       for (this_dev = 0; this_dev < MAX_NE_CARDS; this_dev++) {
-               struct net_device *dev = alloc_ei_netdev();
-               if (!dev)
-                       break;
-               dev->irq = irq[this_dev];
-               dev->mem_end = bad[this_dev];
-               dev->base_addr = io[this_dev];
-               dev->mem_start = hwtype[this_dev];
-               if (do_ne_probe(dev) == 0) {
-                       if (register_netdev(dev) == 0) {
-                               dev_ne[found++] = dev;
-                               continue;
-                       }
-                       cleanup_card(dev);
-               }
-               free_netdev(dev);
-               if (found)
-                       break;
-               if (io[this_dev] != 0)
-                       printk(KERN_WARNING "ne2k_cbus: No NE*000 card found at i/o = %#x\n", io[this_dev]);
-               else
-                       printk(KERN_NOTICE "ne.c: You must supply \"io=0xNNN\" value(s) for ISA cards.\n");
-               return -ENXIO;
-       }
-       if (found)
-               return 0;
-       return -ENODEV;
-}
-
-void cleanup_module(void)
-{
-       int this_dev;
-
-       for (this_dev = 0; this_dev < MAX_NE_CARDS; this_dev++) {
-               struct net_device *dev = dev_ne[this_dev];
-               if (dev) {
-                       unregister_netdev(dev);
-                       cleanup_card(dev);
-                       free_netdev(dev);
-               }
-       }
-}
-#endif /* MODULE */
-
diff --git a/drivers/net/ne2k_cbus.h b/drivers/net/ne2k_cbus.h
deleted file mode 100644 (file)
index adf2cbc..0000000
+++ /dev/null
@@ -1,481 +0,0 @@
-/* ne2k_cbus.h: 
-   vender-specific information definition for NEC PC-9800
-   C-bus Ethernet Cards
-   Used in ne.c 
-
-   (C)1998,1999 KITAGWA Takurou & Linux/98 project
-*/
-
-#include <linux/config.h>
-
-#undef NE_RESET
-#define NE_RESET EI_SHIFT(0x11) /* Issue a read to reset, a write to clear. */
-
-#ifdef CONFIG_NE2K_CBUS_CNET98EL
-#ifndef CONFIG_NE2K_CBUS_CNET98EL_IO_BASE
-#warning CONFIG_NE2K_CBUS_CNET98EL_IO_BASE is not defined(config error?)
-#warning use 0xaaed as default
-#define CONFIG_NE2K_CBUS_CNET98EL_IO_BASE 0xaaed /* or 0x55ed */
-#endif
-#define CNET98EL_START_PG 0x00
-#define CNET98EL_STOP_PG 0x40
-#endif
-
-/* Hardware type definition (derived from *BSD) */
-#define NE2K_CBUS_HARDWARE_TYPE_MASK 0xff
-
-/* 0: reserved for auto-detect */
-/* 1: (not tested)
-   Allied Telesis CentreCom LA-98-T */
-#define NE2K_CBUS_HARDWARE_TYPE_ATLA98 1
-/* 2: (not tested)
-   ELECOM Laneed
-   LD-BDN[123]A
-   PLANET SMART COM 98 EN-2298-C
-   MACNICA ME98 */
-#define NE2K_CBUS_HARDWARE_TYPE_BDN 2
-/* 3:
-   Melco EGY-98
-   Contec C-NET(98)E*A/L*A,C-NET(98)P */
-#define NE2K_CBUS_HARDWARE_TYPE_EGY98 3
-/* 4:
-   Melco LGY-98,IND-SP,IND-SS
-   MACNICA NE2098 */
-#define NE2K_CBUS_HARDWARE_TYPE_LGY98 4
-/* 5:
-   ICM DT-ET-25,DT-ET-T5,IF-2766ET,IF-2771ET
-   PLANET SMART COM 98 EN-2298-T,EN-2298P-T
-   D-Link DE-298PT,DE-298PCAT
-   ELECOM Laneed LD-98P */
-#define NE2K_CBUS_HARDWARE_TYPE_ICM 5
-/* 6: (reserved for SIC-98, which is not supported in this driver.) */
-/* 7: (unused in *BSD?)
-   <Original NE2000 compatible>
-   <for PCI/PCMCIA cards>
-*/
-#define NE2K_CBUS_HARDWARE_TYPE_NE2K 7
-/* 8:
-   NEC PC-9801-108 */
-#define NE2K_CBUS_HARDWARE_TYPE_NEC108 8
-/* 9:
-   I-O DATA LA-98,LA/T-98 */
-#define NE2K_CBUS_HARDWARE_TYPE_IOLA98 9
-/* 10: (reserved for C-NET(98), which is not supported in this driver.) */
-/* 11:
-   Contec C-NET(98)E,L */
-#define NE2K_CBUS_HARDWARE_TYPE_CNET98EL 11
-
-#define NE2K_CBUS_HARDWARE_TYPE_MAX 11
-
-/* HARDWARE TYPE ID 12-31: reserved */
-
-struct ne2k_cbus_offsetinfo {
-       unsigned short skip;
-       unsigned short offset8; /* +0x8 - +0xf */
-       unsigned short offset10; /* +0x10 */
-       unsigned short offset1f; /* +0x1f */
-};
-
-struct ne2k_cbus_region {
-       unsigned short start;
-       short range;
-};
-
-struct ne2k_cbus_hwinfo {
-       const unsigned short hwtype;
-       const unsigned char *hwident;
-#ifndef MODULE
-       const unsigned short *portlist;
-#endif
-       const struct ne2k_cbus_offsetinfo *offsetinfo;
-       const struct ne2k_cbus_region *regionlist;
-};
-
-#ifdef CONFIG_NE2K_CBUS_ATLA98
-#ifndef MODULE
-static unsigned short atla98_portlist[] __initdata = {
-       0xd0,
-       0
-};
-#endif
-#define atla98_offsetinfo ne2k_offsetinfo
-#define atla98_regionlist ne2k_regionlist
-#endif /* CONFIG_NE2K_CBUS_ATLA98 */
-
-#ifdef CONFIG_NE2K_CBUS_BDN
-#ifndef MODULE
-static unsigned short bdn_portlist[] __initdata = {
-       0xd0,
-       0
-};
-#endif
-static struct ne2k_cbus_offsetinfo bdn_offsetinfo __initdata = {
-#if 0
-       /* comes from FreeBSD(98) ed98.h */
-       0x1000, 0x8000, 0x100, 0xc200 /* ??? */
-#else
-       /* comes from NetBSD/pc98 if_ne_isa.c */
-       0x1000, 0x8000, 0x100, 0x7f00 /* ??? */
-#endif
-};
-static struct ne2k_cbus_region bdn_regionlist[] __initdata = {
-       {0x0, 1}, {0x1000, 1}, {0x2000, 1}, {0x3000,1},
-       {0x4000, 1}, {0x5000, 1}, {0x6000, 1}, {0x7000, 1},
-       {0x8000, 1}, {0x9000, 1}, {0xa000, 1}, {0xb000, 1},
-       {0xc000, 1}, {0xd000, 1}, {0xe000, 1}, {0xf000, 1},
-       {0x100, 1}, {0x7f00, 1},
-       {0x0, 0}
-};
-#endif /* CONFIG_NE2K_CBUS_BDN */
-
-#ifdef CONFIG_NE2K_CBUS_EGY98
-#ifndef MODULE
-static unsigned short egy98_portlist[] __initdata = {
-       0xd0,
-       0
-};
-#endif
-static struct ne2k_cbus_offsetinfo egy98_offsetinfo __initdata = {
-       0x02, 0x100, 0x200, 0x300
-};
-static struct ne2k_cbus_region egy98_regionlist[] __initdata = {
-       {0x0, 1}, {0x2, 1}, {0x4, 1}, {0x6, 1},
-       {0x8, 1}, {0xa, 1}, {0xc, 1}, {0xe, 1},
-       {0x100, 1}, {0x102, 1}, {0x104, 1}, {0x106, 1},
-       {0x108, 1}, {0x10a, 1}, {0x10c, 1}, {0x10e, 1},
-       {0x200, 1}, {0x300, 1},
-       {0x0, 0}
-};
-#endif /* CONFIG_NE2K_CBUS_EGY98 */
-
-#ifdef CONFIG_NE2K_CBUS_LGY98
-#ifndef MODULE
-static unsigned short lgy98_portlist[] __initdata = {
-       0xd0, 0x10d0, 0x20d0, 0x30d0, 0x40d0, 0x50d0, 0x60d0, 0x70d0,
-       0
-};
-#endif
-static struct ne2k_cbus_offsetinfo lgy98_offsetinfo __initdata = {
-       0x01, 0x08, 0x200, 0x300
-};
-static struct ne2k_cbus_region lgy98_regionlist[] __initdata = {
-       {0x0, 16}, {0x200, 1}, {0x300, 1},
-       {0x0, 0}
-};
-#endif /* CONFIG_NE2K_CBUS_LGY98 */
-
-#ifdef CONFIG_NE2K_CBUS_ICM
-#ifndef MODULE
-static unsigned short icm_portlist[] __initdata = {
-       /* ICM */
-       0x56d0,
-       /* LD-98PT */
-       0x46d0, 0x66d0, 0x76d0, 0x86d0, 0x96d0, 0xa6d0, 0xb6d0, 0xc6d0,
-       0
-};
-#endif
-static struct ne2k_cbus_offsetinfo icm_offsetinfo __initdata = {
-       0x01, 0x08, 0x100, 0x10f
-};
-static struct ne2k_cbus_region icm_regionlist[] __initdata = {
-       {0x0, 16}, {0x100, 16},
-       {0x0, 0}
-};
-#endif /* CONFIG_NE2K_CBUS_ICM */
-
-#if defined(CONFIG_NE2K_CBUS_NE2K) && !defined(MODULE)
-static unsigned short ne2k_portlist[] __initdata = {
-       0xd0, 0x300, 0x280, 0x320, 0x340, 0x360, 0x380,
-       0
-};
-#endif
-#if defined(CONFIG_NE2K_CBUS_NE2K) || defined(CONFIG_NE2K_CBUS_ATLA98)
-static struct ne2k_cbus_offsetinfo ne2k_offsetinfo __initdata = {
-       0x01, 0x08, 0x10, 0x1f
-};
-static struct ne2k_cbus_region ne2k_regionlist[] __initdata = {
-       {0x0, 32},
-       {0x0, 0}
-};
-#endif
-
-#ifdef CONFIG_NE2K_CBUS_NEC108
-#ifndef MODULE
-static unsigned short nec108_portlist[] __initdata = {
-       0x770, 0x2770, 0x4770, 0x6770,
-       0
-};
-#endif
-static struct ne2k_cbus_offsetinfo nec108_offsetinfo __initdata = {
-       0x02, 0x1000, 0x888, 0x88a
-};
-static struct ne2k_cbus_region nec108_regionlist[] __initdata = {
-       {0x0, 1}, {0x2, 1}, {0x4, 1}, {0x6, 1},
-       {0x8, 1}, {0xa, 1}, {0xc, 1}, {0xe, 1},
-       {0x1000, 1}, {0x1002, 1}, {0x1004, 1}, {0x1006, 1},
-       {0x1008, 1}, {0x100a, 1}, {0x100c, 1}, {0x100e, 1},
-       {0x888, 1}, {0x88a, 1}, {0x88c, 1}, {0x88e, 1},
-       {0x0, 0}
-};
-#endif
-
-#ifdef CONFIG_NE2K_CBUS_IOLA98
-#ifndef MODULE
-static unsigned short iola98_portlist[] __initdata = {
-       0xd0, 0xd2, 0xd4, 0xd6, 0xd8, 0xda, 0xdc, 0xde,
-       0
-};
-#endif
-static struct ne2k_cbus_offsetinfo iola98_offsetinfo __initdata = {
-       0x1000, 0x8000, 0x100, 0xf100
-};
-static struct ne2k_cbus_region iola98_regionlist[] __initdata = {
-       {0x0, 1}, {0x1000, 1}, {0x2000, 1}, {0x3000, 1},
-       {0x4000, 1}, {0x5000, 1}, {0x6000, 1}, {0x7000, 1},
-       {0x8000, 1}, {0x9000, 1}, {0xa000, 1}, {0xb000, 1},
-       {0xc000, 1}, {0xd000, 1}, {0xe000, 1}, {0xf000, 1},
-       {0x100, 1}, {0xf100, 1},
-       {0x0,0}
-};
-#endif /* CONFIG_NE2K_CBUS_IOLA98 */
-
-#ifdef CONFIG_NE2K_CBUS_CNET98EL
-#ifndef MODULE
-static unsigned short cnet98el_portlist[] __initdata = {
-       0x3d0, 0x13d0, 0x23d0, 0x33d0, 0x43d0, 0x53d0, 0x60d0, 0x70d0,
-       0
-};
-#endif
-static struct ne2k_cbus_offsetinfo cnet98el_offsetinfo __initdata = {
-       0x01, 0x08, 0x40e, 0x400
-};
-static struct ne2k_cbus_region cnet98el_regionlist[] __initdata = {
-       {0x0, 16}, {0x400, 16},
-       {0x0, 0}
-};
-#endif
-
-
-/* port information table (for ne.c initialize/probe process) */
-
-static struct ne2k_cbus_hwinfo ne2k_cbus_hwinfo_list[] __initdata = {
-#ifdef CONFIG_NE2K_CBUS_ATLA98
-/* NOT TESTED */
-       {
-               NE2K_CBUS_HARDWARE_TYPE_ATLA98,
-               "LA-98-T",
-#ifndef MODULE
-               atla98_portlist,
-#endif
-               &atla98_offsetinfo, atla98_regionlist
-       },
-#endif
-#ifdef CONFIG_NE2K_CBUS_BDN
-/* NOT TESTED */
-       {
-               NE2K_CBUS_HARDWARE_TYPE_BDN,
-               "LD-BDN[123]A",
-#ifndef MODULE
-               bdn_portlist,
-#endif
-               &bdn_offsetinfo, bdn_regionlist
-       },
-#endif
-#ifdef CONFIG_NE2K_CBUS_ICM
-       {
-               NE2K_CBUS_HARDWARE_TYPE_ICM,
-               "IF-27xxET",
-#ifndef MODULE
-               icm_portlist,
-#endif
-               &icm_offsetinfo, icm_regionlist
-       },
-#endif
-#ifdef CONFIG_NE2K_CBUS_NE2K
-       {
-               NE2K_CBUS_HARDWARE_TYPE_NE2K,
-               "NE2000 compat.",
-#ifndef MODULE
-               ne2k_portlist,
-#endif
-               &ne2k_offsetinfo, ne2k_regionlist
-       },
-#endif
-#ifdef CONFIG_NE2K_CBUS_NEC108
-       {
-               NE2K_CBUS_HARDWARE_TYPE_NEC108,
-               "PC-9801-108",
-#ifndef MODULE
-               nec108_portlist,
-#endif
-               &nec108_offsetinfo, nec108_regionlist
-       },
-#endif
-#ifdef CONFIG_NE2K_CBUS_IOLA98
-       {
-               NE2K_CBUS_HARDWARE_TYPE_IOLA98,
-               "LA-98",
-#ifndef MODULE
-               iola98_portlist,
-#endif
-               &iola98_offsetinfo, iola98_regionlist
-       },
-#endif
-#ifdef CONFIG_NE2K_CBUS_CNET98EL
-       {
-               NE2K_CBUS_HARDWARE_TYPE_CNET98EL,
-               "C-NET(98)E/L",
-#ifndef MODULE
-               cnet98el_portlist,
-#endif
-               &cnet98el_offsetinfo, cnet98el_regionlist
-       },
-#endif
-/* NOTE: LGY98 must be probed before EGY98, or system stalled!? */
-#ifdef CONFIG_NE2K_CBUS_LGY98
-       {
-               NE2K_CBUS_HARDWARE_TYPE_LGY98,
-               "LGY-98",
-#ifndef MODULE
-               lgy98_portlist,
-#endif
-               &lgy98_offsetinfo, lgy98_regionlist
-       },
-#endif
-#ifdef CONFIG_NE2K_CBUS_EGY98
-       {
-               NE2K_CBUS_HARDWARE_TYPE_EGY98,
-               "EGY-98",
-#ifndef MODULE
-               egy98_portlist,
-#endif
-               &egy98_offsetinfo, egy98_regionlist
-       },
-#endif
-       {
-               0,
-               "unsupported hardware",
-#ifndef MODULE
-               NULL,
-#endif
-               NULL, NULL
-       }
-};
-
-static int __init ne2k_cbus_init(struct net_device *dev)
-{
-       struct ei_device *ei_local;
-       if (dev->priv == NULL) {
-               ei_local = kmalloc(sizeof(struct ei_device), GFP_KERNEL);
-               if (ei_local == NULL)
-                       return -ENOMEM;
-               memset(ei_local, 0, sizeof(struct ei_device));
-               ei_local->reg_offset = kmalloc(sizeof(typeof(*ei_local->reg_offset))*18, GFP_KERNEL);
-               if (ei_local->reg_offset == NULL) {
-                       kfree(ei_local);
-                       return -ENOMEM;
-               }
-               spin_lock_init(&ei_local->page_lock);
-               dev->priv = ei_local;
-       }
-       return 0;
-}
-
-static void ne2k_cbus_destroy(struct net_device *dev)
-{
-       struct ei_device *ei_local = (struct ei_device *)(dev->priv);
-       if (ei_local != NULL) {
-               if (ei_local->reg_offset)
-                       kfree(ei_local->reg_offset);
-               kfree(dev->priv);
-               dev->priv = NULL;
-       }
-}
-
-static const struct ne2k_cbus_hwinfo * __init ne2k_cbus_get_hwinfo(int hwtype)
-{
-       const struct ne2k_cbus_hwinfo *hw;
-
-       for (hw = &ne2k_cbus_hwinfo_list[0]; hw->hwtype; hw++) {
-               if (hw->hwtype == hwtype) break;
-       }
-       return hw;
-}
-
-static void __init ne2k_cbus_set_hwtype(struct net_device *dev, const struct ne2k_cbus_hwinfo *hw, int ioaddr)
-{
-       struct ei_device *ei_local = (struct ei_device *)(dev->priv);
-       int i;
-       int hwtype_old = dev->mem_start & NE2K_CBUS_HARDWARE_TYPE_MASK;
-
-       if (!ei_local)
-               panic("Gieee! ei_local == NULL!! (from %p)",
-                      __builtin_return_address(0));
-
-       dev->mem_start &= ~NE2K_CBUS_HARDWARE_TYPE_MASK;
-       dev->mem_start |= hw->hwtype & NE2K_CBUS_HARDWARE_TYPE_MASK;
-
-       if (ei_debug > 2) {
-               printk(KERN_DEBUG "hwtype changed: %d -> %d\n",hwtype_old,(int)(dev->mem_start & NE2K_CBUS_HARDWARE_TYPE_MASK));
-       }
-
-       if (hw->offsetinfo) {
-               for (i = 0; i < 8; i++) {
-                       ei_local->reg_offset[i] = hw->offsetinfo->skip * i;
-               }
-               for (i = 8; i < 16; i++) {
-                       ei_local->reg_offset[i] =
-                               hw->offsetinfo->skip*(i-8) + hw->offsetinfo->offset8;
-               }
-#ifdef CONFIG_NE2K_CBUS_NEC108
-               if (hw->hwtype == NE2K_CBUS_HARDWARE_TYPE_NEC108) {
-                       int adj = (ioaddr & 0xf000) /2;
-                       ei_local->reg_offset[16] = 
-                               (hw->offsetinfo->offset10 | adj) - ioaddr;
-                       ei_local->reg_offset[17] = 
-                               (hw->offsetinfo->offset1f | adj) - ioaddr;
-               } else {
-#endif /* CONFIG_NE2K_CBUS_NEC108 */
-                       ei_local->reg_offset[16] = hw->offsetinfo->offset10;
-                       ei_local->reg_offset[17] = hw->offsetinfo->offset1f;
-#ifdef CONFIG_NE2K_CBUS_NEC108
-               }
-#endif
-       } else {
-               /* make dummmy offset list */
-               for (i = 0; i < 16; i++) {
-                       ei_local->reg_offset[i] = i;
-               }
-               ei_local->reg_offset[16] = 0x10;
-               ei_local->reg_offset[17] = 0x1f;
-       }
-}
-
-#if defined(CONFIG_NE2K_CBUS_ICM) || defined(CONFIG_NE2K_CBUS_CNET98EL)
-static void __init ne2k_cbus_readmem(struct net_device *dev, int ioaddr, unsigned short memaddr, char *buf, unsigned short len)
-{
-       struct ei_device *ei_local = (struct ei_device *)(dev->priv);
-       outb_p(E8390_NODMA | E8390_START, ioaddr+E8390_CMD);
-       outb_p(len & 0xff, ioaddr+EN0_RCNTLO);
-       outb_p(len >> 8, ioaddr+EN0_RCNTHI);
-       outb_p(memaddr & 0xff, ioaddr+EN0_RSARLO);
-       outb_p(memaddr >> 8, ioaddr+EN0_RSARHI);
-       outb_p(E8390_RREAD | E8390_START, ioaddr+E8390_CMD);
-       insw(ioaddr+NE_DATAPORT, buf, len >> 1);
-}
-static void __init ne2k_cbus_writemem(struct net_device *dev, int ioaddr, unsigned short memaddr, const char *buf, unsigned short len)
-{
-       struct ei_device *ei_local = (struct ei_device *)(dev->priv);
-       outb_p(E8390_NODMA | E8390_START, ioaddr+E8390_CMD);
-       outb_p(ENISR_RDC, ioaddr+EN0_ISR);
-       outb_p(len & 0xff, ioaddr+EN0_RCNTLO);
-       outb_p(len >> 8, ioaddr+EN0_RCNTHI);
-       outb_p(memaddr & 0xff, ioaddr+EN0_RSARLO);
-       outb_p(memaddr >> 8, ioaddr+EN0_RSARHI);
-       outb_p(E8390_RWRITE | E8390_START, ioaddr+E8390_CMD);
-       outsw(ioaddr+NE_DATAPORT, buf, len >> 1);
-}
-#endif
-
-static int ne_probe_cbus(struct net_device *dev, const struct ne2k_cbus_hwinfo *hw, int ioaddr, int irq);
-/* End of ne2k_cbus.h */
diff --git a/drivers/net/wan/wanxlfw.inc b/drivers/net/wan/wanxlfw.inc
deleted file mode 100644 (file)
index 73da688..0000000
+++ /dev/null
@@ -1,158 +0,0 @@
-static u8 firmware[]={
-0x60,0x00,0x00,0x16,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x06,0xB9,0x40,0x00,0x00,0x00,0x00,0x00,
-0x10,0x14,0x42,0x80,0x4A,0xB0,0x09,0xB0,0x00,0x00,0x10,0x04,0x67,0x00,0x00,0x0E,
-0x06,0xB0,0x40,0x00,0x00,0x00,0x09,0xB0,0x00,0x00,0x10,0x04,0x58,0x80,0x0C,0x80,
-0x00,0x00,0x00,0x10,0x66,0x00,0xFF,0xDE,0x21,0xFC,0x00,0x00,0x16,0xBC,0x00,0x6C,
-0x21,0xFC,0x00,0x00,0x17,0x5E,0x01,0x00,0x21,0xFC,0x00,0x00,0x16,0xDE,0x01,0x78,
-0x21,0xFC,0x00,0x00,0x16,0xFE,0x01,0x74,0x21,0xFC,0x00,0x00,0x17,0x1E,0x01,0x70,
-0x21,0xFC,0x00,0x00,0x17,0x3E,0x01,0x6C,0x21,0xFC,0x00,0x00,0x18,0x4C,0x02,0x00,
-0x23,0xFC,0x78,0x00,0x00,0x00,0xFF,0xFC,0x15,0x48,0x33,0xFC,0x04,0x80,0xFF,0xFC,
-0x10,0x26,0x33,0xFC,0x01,0x10,0xFF,0xFC,0x10,0x2A,0x23,0xFC,0x00,0xD4,0x9F,0x40,
-0xFF,0xFC,0x15,0x40,0x23,0xFC,0x00,0x00,0x05,0x43,0xFF,0xF9,0x01,0x00,0x23,0xFC,
-0x00,0x00,0x05,0x43,0xFF,0xF9,0x01,0x14,0x23,0xFC,0x00,0x00,0x00,0x00,0xFF,0xF9,
-0x01,0x10,0x23,0xFC,0x00,0x00,0x00,0x08,0xFF,0xF9,0x01,0x24,0x23,0xFC,0x00,0x00,
-0x01,0x01,0xFF,0xF9,0x01,0x28,0x00,0xB9,0x00,0x0F,0x03,0x00,0xFF,0xF9,0x00,0xE8,
-0x23,0xFC,0x00,0x00,0x00,0x01,0xFF,0xF9,0x00,0xD4,0x61,0x00,0x06,0x74,0x33,0xFC,
-0xFF,0xFF,0xFF,0xFC,0x15,0x52,0x42,0x79,0xFF,0xFC,0x15,0x50,0x42,0x79,0xFF,0xFC,
-0x15,0x64,0x2E,0x3A,0x08,0x50,0x42,0xB9,0x00,0x00,0x19,0x54,0x4A,0x87,0x66,0x00,
-0x00,0x0E,0x4E,0x72,0x22,0x00,0x46,0xFC,0x27,0x00,0x60,0x00,0xFF,0xE6,0x42,0x80,
-0x42,0x86,0x08,0x07,0x00,0x04,0x67,0x00,0x00,0x0A,0x08,0x87,0x00,0x00,0x61,0x00,
-0x02,0xA0,0x08,0x07,0x00,0x00,0x67,0x00,0x00,0x06,0x61,0x00,0x00,0x36,0x08,0x07,
-0x00,0x08,0x67,0x00,0x00,0x06,0x61,0x00,0x02,0xB8,0x08,0x07,0x00,0x0C,0x67,0x00,
-0x00,0x0A,0x61,0x00,0x04,0x94,0x61,0x00,0x03,0x60,0xE2,0x8F,0x58,0x80,0x0C,0x80,
-0x00,0x00,0x00,0x10,0x66,0x00,0xFF,0xBC,0x23,0xC6,0xFF,0xF9,0x00,0xE4,0x60,0x00,
-0xFF,0x92,0x20,0x70,0x09,0xB0,0x00,0x00,0x10,0x04,0x4A,0xA8,0x00,0x00,0x66,0x00,
-0x02,0x4E,0x21,0x7C,0x00,0x00,0x00,0x01,0x00,0x00,0x42,0xB0,0x09,0xB0,0x00,0x00,
-0x19,0x58,0x42,0xB0,0x09,0xB0,0x00,0x00,0x19,0x68,0x42,0xB0,0x09,0xB0,0x00,0x00,
-0x19,0x78,0x42,0xB0,0x09,0xB0,0x00,0x00,0x19,0x88,0x22,0x39,0xFF,0xFC,0x16,0xEC,
-0xC2,0xB0,0x09,0xB0,0x00,0x00,0x18,0xF2,0x0C,0xA8,0x00,0x00,0x00,0x04,0x00,0x18,
-0x66,0x00,0x00,0x0E,0x82,0xB0,0x09,0xB0,0x00,0x00,0x18,0xE2,0x60,0x00,0x00,0x0A,
-0x82,0xB0,0x09,0xB0,0x00,0x00,0x18,0xD2,0x23,0xC1,0xFF,0xFC,0x16,0xEC,0x00,0x70,
-0x10,0x00,0x09,0xB0,0x00,0x00,0x19,0xAA,0x61,0x00,0x05,0x76,0x22,0x30,0x09,0xB0,
-0x00,0x00,0x18,0x92,0x22,0x70,0x09,0xB0,0x00,0x00,0x18,0x72,0x74,0x08,0x26,0x3C,
-0x18,0x00,0x00,0x00,0x0C,0xA8,0x00,0x00,0x00,0x01,0x00,0x10,0x67,0x00,0x00,0x06,
-0x08,0xC3,0x00,0x1A,0x22,0xC3,0x22,0xC1,0x06,0x81,0x00,0x00,0x05,0xFC,0x51,0xCA,
-0xFF,0xF4,0x08,0xC3,0x00,0x1D,0x22,0xC3,0x22,0xC1,0x74,0x1C,0x22,0xFC,0x90,0x00,
-0x00,0x00,0x22,0xC1,0x06,0x81,0x00,0x00,0x05,0xFC,0x51,0xCA,0xFF,0xF0,0x22,0xFC,
-0xB0,0x00,0x00,0x00,0x22,0xC1,0x22,0x70,0x09,0xB0,0x00,0x00,0x18,0x62,0x24,0x70,
-0x09,0xB0,0x00,0x00,0x18,0x52,0x25,0x7C,0x00,0x00,0xFF,0xFF,0x00,0x10,0x25,0x7C,
-0x00,0x00,0x00,0x00,0x00,0x14,0x22,0x30,0x09,0xB0,0x00,0x00,0x18,0x72,0x33,0x41,
-0x00,0x02,0x06,0x81,0x00,0x00,0x00,0x50,0x33,0x41,0x00,0x00,0x13,0x7C,0x00,0x08,
-0x00,0x04,0x13,0x7C,0x00,0x08,0x00,0x05,0x0C,0xA8,0x00,0x00,0x00,0x05,0x00,0x10,
-0x66,0x00,0x00,0x2A,0x42,0x6A,0x00,0x08,0x23,0x7C,0x00,0x00,0xF0,0xB8,0x00,0x34,
-0x23,0x7C,0x00,0x00,0xFF,0xFF,0x00,0x38,0x33,0x7C,0x05,0xFA,0x00,0x46,0x31,0xBC,
-0x00,0x02,0x09,0xB0,0x00,0x00,0x19,0x9C,0x60,0x00,0x00,0xBC,0x0C,0xA8,0x00,0x00,
-0x00,0x07,0x00,0x10,0x66,0x00,0x00,0x2C,0x35,0x7C,0x08,0x00,0x00,0x08,0x23,0x7C,
-0xDE,0xBB,0x20,0xE3,0x00,0x34,0x23,0x7C,0xFF,0xFF,0xFF,0xFF,0x00,0x38,0x33,0x7C,
-0x05,0xFC,0x00,0x46,0x31,0xBC,0x00,0x04,0x09,0xB0,0x00,0x00,0x19,0x9C,0x60,0x00,
-0x00,0x86,0x0C,0xA8,0x00,0x00,0x00,0x04,0x00,0x10,0x66,0x00,0x00,0x26,0x42,0x6A,
-0x00,0x08,0x23,0x7C,0x00,0x00,0xF0,0xB8,0x00,0x34,0x42,0xA9,0x00,0x38,0x33,0x7C,
-0x05,0xFA,0x00,0x46,0x31,0xBC,0x00,0x02,0x09,0xB0,0x00,0x00,0x19,0x9C,0x60,0x00,
-0x00,0x56,0x0C,0xA8,0x00,0x00,0x00,0x06,0x00,0x10,0x66,0x00,0x00,0x28,0x35,0x7C,
-0x08,0x00,0x00,0x08,0x23,0x7C,0xDE,0xBB,0x20,0xE3,0x00,0x34,0x42,0xA9,0x00,0x38,
-0x33,0x7C,0x05,0xFC,0x00,0x46,0x31,0xBC,0x00,0x04,0x09,0xB0,0x00,0x00,0x19,0x9C,
-0x60,0x00,0x00,0x24,0x42,0x6A,0x00,0x08,0x23,0x7C,0x00,0x00,0xF0,0xB8,0x00,0x34,
-0x23,0x7C,0x00,0x00,0xFF,0xFF,0x00,0x38,0x33,0x7C,0x05,0xF8,0x00,0x46,0x42,0x70,
-0x09,0xB0,0x00,0x00,0x19,0x9C,0x25,0x7C,0x00,0x00,0x00,0x03,0x00,0x04,0x0C,0xA8,
-0x00,0x00,0x00,0x02,0x00,0x14,0x66,0x00,0x00,0x0E,0x25,0x7C,0x10,0x04,0x09,0x00,
-0x00,0x00,0x60,0x00,0x00,0x0A,0x25,0x7C,0x10,0x04,0x00,0x00,0x00,0x00,0x33,0x7C,
-0x05,0xFC,0x00,0x06,0x22,0x00,0xE9,0x89,0x00,0x81,0x00,0x00,0x00,0x01,0x33,0xC1,
-0xFF,0xFC,0x15,0xC0,0x08,0x39,0x00,0x00,0xFF,0xFC,0x15,0xC0,0x66,0x00,0xFF,0xF6,
-0x35,0x7C,0x00,0x1F,0x00,0x14,0x00,0xAA,0x00,0x00,0x00,0x30,0x00,0x00,0x4E,0x75,
-0x20,0x70,0x09,0xB0,0x00,0x00,0x18,0x52,0x42,0x68,0x00,0x14,0x02,0xA8,0xFF,0xFF,
-0xFF,0xCF,0x00,0x00,0x02,0x70,0xEF,0xFF,0x09,0xB0,0x00,0x00,0x19,0xAA,0x61,0x00,
-0x03,0x70,0x22,0x30,0x09,0xB0,0x00,0x00,0x10,0x04,0x42,0xB0,0x19,0x90,0x4E,0x75,
-0x0C,0xB0,0x00,0x00,0x00,0x0A,0x09,0xB0,0x00,0x00,0x19,0x78,0x67,0x00,0x00,0xA8,
-0x22,0x30,0x09,0xB0,0x00,0x00,0x19,0x68,0x24,0x01,0x4C,0x3C,0x20,0x00,0x00,0x00,
-0x00,0x0C,0xD4,0xB0,0x09,0xB0,0x00,0x00,0x10,0x04,0x06,0x82,0x00,0x00,0x00,0x1C,
-0x0C,0xB0,0x00,0x00,0x00,0x10,0x29,0x90,0x66,0x00,0x00,0x7C,0x20,0x70,0x29,0xA0,
-0x00,0x04,0xE7,0x89,0xD2,0xB0,0x09,0xB0,0x00,0x00,0x18,0x72,0x22,0x70,0x19,0xA0,
-0x00,0x04,0x24,0x30,0x29,0xA0,0x00,0x08,0x31,0x82,0x19,0xA0,0x00,0x02,0x56,0x82,
-0x02,0x82,0xFF,0xFF,0xFF,0xFC,0x23,0xC8,0xFF,0xF9,0x01,0x04,0x23,0xC9,0xFF,0xF9,
-0x01,0x08,0x23,0xC2,0xFF,0xF9,0x01,0x0C,0x23,0xFC,0x00,0x00,0x01,0x03,0xFF,0xF9,
-0x01,0x28,0x61,0x00,0x01,0xF6,0x08,0xF0,0x00,0x1F,0x19,0x90,0x22,0x30,0x09,0xB0,
-0x00,0x00,0x19,0x68,0x52,0x81,0x0C,0x81,0x00,0x00,0x00,0x0A,0x66,0x00,0x00,0x04,
-0x42,0x81,0x21,0x81,0x09,0xB0,0x00,0x00,0x19,0x68,0x52,0xB0,0x09,0xB0,0x00,0x00,
-0x19,0x78,0x60,0x00,0xFF,0x4C,0x4E,0x75,0x22,0x30,0x09,0xB0,0x00,0x00,0x19,0x88,
-0xE7,0x89,0xD2,0xB0,0x09,0xB0,0x00,0x00,0x18,0x82,0x34,0x30,0x19,0x90,0x08,0x02,
-0x00,0x0F,0x66,0x00,0x01,0x12,0x08,0x02,0x00,0x01,0x66,0x00,0x00,0xE6,0x4A,0x70,
-0x09,0xB0,0x00,0x00,0x19,0x9C,0x66,0x00,0x00,0x06,0x08,0x82,0x00,0x02,0x02,0x42,
-0x0C,0xBC,0x0C,0x42,0x0C,0x00,0x66,0x00,0x00,0xDC,0x42,0x83,0x36,0x30,0x19,0xA0,
-0x00,0x02,0x96,0x70,0x09,0xB0,0x00,0x00,0x19,0x9C,0x0C,0x43,0x05,0xF8,0x6E,0x00,
-0x00,0xC4,0x24,0x3A,0x04,0x84,0x4C,0x3C,0x20,0x00,0x00,0x00,0x00,0x0C,0xD4,0xBA,
-0xFA,0xF4,0x0C,0xB0,0x00,0x00,0x00,0x00,0x29,0x90,0x66,0x00,0x00,0x96,0x21,0x83,
-0x29,0xA0,0x00,0x08,0x20,0x70,0x19,0xA0,0x00,0x04,0x22,0x70,0x29,0xA0,0x00,0x04,
-0x4A,0x89,0x67,0x00,0x00,0x2A,0x56,0x83,0x02,0x83,0xFF,0xFF,0xFF,0xFC,0x23,0xC8,
-0xFF,0xF9,0x01,0x1C,0x23,0xC9,0xFF,0xF9,0x01,0x18,0x23,0xC3,0xFF,0xF9,0x01,0x20,
-0x23,0xFC,0x00,0x00,0x03,0x01,0xFF,0xF9,0x01,0x28,0x61,0x00,0x01,0x2C,0x21,0xB0,
-0x09,0xB0,0x00,0x00,0x18,0xC2,0x29,0x90,0x08,0xC6,0x00,0x04,0x24,0x3A,0x04,0x1A,
-0x52,0x82,0x0C,0x82,0x00,0x00,0x00,0x28,0x66,0x00,0x00,0x04,0x42,0x82,0x23,0xC2,
-0x00,0x00,0x19,0x98,0x02,0x70,0xF0,0x00,0x19,0x90,0x08,0xF0,0x00,0x1F,0x19,0x90,
-0x22,0x30,0x09,0xB0,0x00,0x00,0x19,0x88,0x52,0x81,0x0C,0x81,0x00,0x00,0x00,0x1E,
-0x66,0x00,0x00,0x04,0x42,0x81,0x21,0x81,0x09,0xB0,0x00,0x00,0x19,0x88,0x60,0x00,
-0xFE,0xF8,0x24,0x30,0x09,0xB0,0x00,0x00,0x10,0x04,0x52,0xB0,0x29,0xA0,0x00,0x08,
-0x60,0x00,0xFF,0xC2,0x24,0x30,0x09,0xB0,0x00,0x00,0x10,0x04,0x52,0xB0,0x29,0xA0,
-0x00,0x0C,0x60,0x00,0xFF,0xB0,0x4E,0x75,0x4A,0xB0,0x09,0xB0,0x00,0x00,0x19,0x78,
-0x67,0x00,0x00,0x86,0x22,0x30,0x09,0xB0,0x00,0x00,0x19,0x58,0x24,0x01,0xE7,0x89,
-0xD2,0xB0,0x09,0xB0,0x00,0x00,0x18,0x72,0x36,0x30,0x19,0x90,0x08,0x03,0x00,0x0F,
-0x66,0x00,0x00,0x66,0x8C,0xB0,0x09,0xB0,0x00,0x00,0x18,0xA2,0x53,0xB0,0x09,0xB0,
-0x00,0x00,0x19,0x78,0x22,0x30,0x09,0xB0,0x00,0x00,0x19,0x58,0x52,0x81,0x0C,0x81,
-0x00,0x00,0x00,0x0A,0x66,0x00,0x00,0x04,0x42,0x81,0x21,0x81,0x09,0xB0,0x00,0x00,
-0x19,0x58,0x4C,0x3C,0x20,0x00,0x00,0x00,0x00,0x0C,0xD4,0xB0,0x09,0xB0,0x00,0x00,
-0x10,0x04,0x06,0x82,0x00,0x00,0x00,0x1C,0x08,0x03,0x00,0x01,0x66,0x00,0x00,0x0E,
-0x21,0xBC,0x00,0x00,0x00,0x20,0x29,0x90,0x60,0x00,0xFF,0x7E,0x21,0xBC,0x00,0x00,
-0x00,0x30,0x29,0x90,0x60,0x00,0xFF,0x72,0x4E,0x75,0x2F,0x00,0x40,0xE7,0x20,0x39,
-0xFF,0xF9,0x01,0x28,0x08,0x00,0x00,0x04,0x66,0x00,0x00,0x2C,0x4E,0x72,0x22,0x00,
-0x46,0xFC,0x27,0x00,0x60,0x00,0xFF,0xE8,0x2F,0x00,0x40,0xE7,0x20,0x39,0xFF,0xF9,
-0x01,0x28,0x08,0x00,0x00,0x0C,0x66,0x00,0x00,0x0E,0x4E,0x72,0x22,0x00,0x46,0xFC,
-0x27,0x00,0x60,0x00,0xFF,0xE8,0x46,0xDF,0x20,0x1F,0x4E,0x75,0x2F,0x00,0x20,0x39,
-0xFF,0xF9,0x00,0xE0,0x23,0xC0,0xFF,0xF9,0x00,0xE0,0x81,0xB9,0x00,0x00,0x19,0x54,
-0x23,0xFC,0x00,0x00,0x09,0x09,0xFF,0xF9,0x01,0x28,0x20,0x1F,0x4E,0x73,0x00,0xB9,
-0x00,0x00,0x00,0x00,0xFF,0xFC,0x16,0x10,0x00,0xB9,0x00,0x00,0x10,0x00,0x00,0x00,
-0x19,0x54,0x23,0xFC,0x40,0x00,0x00,0x00,0xFF,0xFC,0x15,0x4C,0x4E,0x73,0x00,0xB9,
-0x00,0x00,0x00,0x00,0xFF,0xFC,0x16,0x30,0x00,0xB9,0x00,0x00,0x20,0x00,0x00,0x00,
-0x19,0x54,0x23,0xFC,0x20,0x00,0x00,0x00,0xFF,0xFC,0x15,0x4C,0x4E,0x73,0x00,0xB9,
-0x00,0x00,0x00,0x00,0xFF,0xFC,0x16,0x50,0x00,0xB9,0x00,0x00,0x40,0x00,0x00,0x00,
-0x19,0x54,0x23,0xFC,0x10,0x00,0x00,0x00,0xFF,0xFC,0x15,0x4C,0x4E,0x73,0x00,0xB9,
-0x00,0x00,0x00,0x00,0xFF,0xFC,0x16,0x70,0x00,0xB9,0x00,0x00,0x80,0x00,0x00,0x00,
-0x19,0x54,0x23,0xFC,0x08,0x00,0x00,0x00,0xFF,0xFC,0x15,0x4C,0x4E,0x73,0x4E,0x73,
-0x2F,0x00,0x2F,0x01,0x2F,0x02,0x2F,0x08,0x2F,0x09,0x42,0x80,0x20,0x7C,0xFF,0xFB,
-0x00,0x00,0x32,0x10,0x02,0x81,0x00,0x00,0x00,0xE7,0x0C,0x41,0x00,0x42,0x66,0x00,
-0x00,0x0A,0x32,0x3C,0x0E,0x08,0x60,0x00,0x00,0x3E,0x0C,0x41,0x00,0x63,0x66,0x00,
-0x00,0x0A,0x32,0x3C,0x04,0x08,0x60,0x00,0x00,0x2E,0x0C,0x41,0x00,0x84,0x66,0x00,
-0x00,0x0A,0x32,0x3C,0x02,0x08,0x60,0x00,0x00,0x1E,0x0C,0x41,0x00,0xA5,0x66,0x00,
-0x00,0x0A,0x32,0x3C,0x0D,0x08,0x60,0x00,0x00,0x0E,0x32,0x3C,0x00,0x08,0x34,0x3C,
-0x80,0xE7,0x60,0x00,0x00,0x14,0x34,0x30,0x09,0xB0,0x00,0x00,0x19,0xAA,0x02,0x42,
-0x30,0x00,0x82,0x42,0x34,0x3C,0x80,0xFF,0xB2,0x70,0x09,0xB0,0x00,0x00,0x19,0xAC,
-0x67,0x00,0x00,0x0C,0x31,0x81,0x09,0xB0,0x00,0x00,0x19,0xAC,0x30,0x81,0x32,0x39,
-0xFF,0xFC,0x15,0x66,0xC2,0x70,0x09,0xB0,0x00,0x00,0x19,0x02,0x67,0x00,0x00,0x0C,
-0x32,0x10,0x02,0x41,0xFF,0xF7,0x60,0x00,0x00,0x08,0x32,0x10,0x00,0x41,0x00,0x08,
-0xC2,0x42,0x22,0x70,0x09,0xB0,0x00,0x00,0x10,0x04,0xB2,0xA9,0x00,0x04,0x67,0x00,
-0x00,0x12,0x23,0x41,0x00,0x04,0x23,0xF0,0x09,0xB0,0x00,0x00,0x18,0xB2,0xFF,0xF9,
-0x00,0xE4,0x54,0x88,0x58,0x80,0x0C,0x80,0x00,0x00,0x00,0x10,0x66,0x00,0xFF,0x34,
-0x22,0x5F,0x20,0x5F,0x24,0x1F,0x22,0x1F,0x20,0x1F,0x4E,0x75,0x61,0x00,0xFF,0x12,
-0x4E,0x73,0xFF,0xFC,0x16,0x00,0xFF,0xFC,0x16,0x20,0xFF,0xFC,0x16,0x40,0xFF,0xFC,
-0x16,0x60,0xFF,0xFC,0x0C,0x00,0xFF,0xFC,0x0D,0x00,0xFF,0xFC,0x0E,0x00,0xFF,0xFC,
-0x0F,0x00,0xFF,0xFC,0x00,0x00,0xFF,0xFC,0x01,0x40,0xFF,0xFC,0x02,0x80,0xFF,0xFC,
-0x03,0xC0,0xFF,0xFC,0x00,0x50,0xFF,0xFC,0x01,0x90,0xFF,0xFC,0x02,0xD0,0xFF,0xFC,
-0x04,0x10,0x00,0x00,0x40,0x00,0x00,0x01,0x2F,0x60,0x00,0x02,0x1E,0xC0,0x00,0x03,
-0x0E,0x20,0x00,0x00,0x00,0x01,0x00,0x00,0x00,0x02,0x00,0x00,0x00,0x04,0x00,0x00,
-0x00,0x08,0x00,0x00,0x00,0x20,0x00,0x00,0x00,0x40,0x00,0x00,0x00,0x80,0x00,0x00,
-0x01,0x00,0x00,0x00,0x00,0x10,0x00,0x00,0x00,0x11,0x00,0x00,0x00,0x12,0x00,0x00,
-0x00,0x13,0x00,0x00,0x00,0x2C,0x00,0x00,0x3E,0x00,0x00,0x2C,0x00,0x00,0x3E,0x00,
-0x00,0x00,0x00,0x00,0x00,0x2D,0x00,0x00,0x3F,0x00,0x00,0x2D,0x00,0x00,0x3F,0x00,
-0x00,0x00,0x00,0x00,0x00,0xFF,0x00,0x00,0xFF,0x00,0x00,0xFF,0x00,0x00,0xFF,0x00,
-0x00,0x00,0x00,0x20,0x00,0x00,0x00,0x80,0x00,0x00,0x02,0x00,0x00,0x00,0x08,0x00,
-0x77,0x61,0x6E,0x58,0x4C,0x20,0x66,0x69,0x72,0x6D,0x77,0x61,0x72,0x65,0x0A,0x43,
-0x6F,0x70,0x79,0x72,0x69,0x67,0x68,0x74,0x20,0x28,0x43,0x29,0x20,0x32,0x30,0x30,
-0x33,0x20,0x4B,0x72,0x7A,0x79,0x73,0x7A,0x74,0x6F,0x66,0x20,0x48,0x61,0x6C,0x61,
-0x73,0x61,0x20,0x3C,0x6B,0x68,0x63,0x40,0x70,0x6D,0x2E,0x77,0x61,0x77,0x2E,0x70,
-0x6C,0x3E,0x0A,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00
-};
diff --git a/drivers/s390/cio/requestirq.c b/drivers/s390/cio/requestirq.c
deleted file mode 100644 (file)
index 0ce71a2..0000000
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- *  drivers/s390/cio/requestirq.c
- *   S/390 common I/O routines -- enabling and disabling of devices
- *   $Revision: 1.46 $
- *
- *    Copyright (C) 1999-2002 IBM Deutschland Entwicklung GmbH,
- *                           IBM Corporation
- *    Author(s): Ingo Adlung (adlung@de.ibm.com)
- *              Cornelia Huck (cohuck@de.ibm.com)
- *              Arnd Bergmann (arndb@de.ibm.com)
- */
-
-#include <linux/module.h>
-#include <linux/config.h>
-#include <linux/device.h>
-#include <linux/init.h>
-#include <asm/lowcore.h>
-
-#include "css.h"
-
-struct pgid global_pgid;
-EXPORT_SYMBOL_GPL(global_pgid);
-
-/*
- * init_IRQ is now only used to set the pgid as early as possible
- */
-void __init
-init_IRQ(void)
-{
-       /*
-        * Let's build our path group ID here.
-        */
-       if (MACHINE_NEW_STIDP)
-               global_pgid.cpu_addr = 0x8000;
-       else {
-#ifdef CONFIG_SMP
-               global_pgid.cpu_addr = hard_smp_processor_id();
-#else
-               global_pgid.cpu_addr = 0;
-#endif
-       }
-       global_pgid.cpu_id = ((cpuid_t *) __LC_CPUID)->ident;
-       global_pgid.cpu_model = ((cpuid_t *) __LC_CPUID)->machine;
-       global_pgid.tod_high = (__u32) (get_clock() >> 32);
-}
diff --git a/drivers/scsi/pc980155.c b/drivers/scsi/pc980155.c
deleted file mode 100644 (file)
index 62b2852..0000000
+++ /dev/null
@@ -1,299 +0,0 @@
-/*
- *
- *  drivers/scsi/pc980155.c
- *
- *  PC-9801-55 SCSI host adapter driver
- *
- *  Copyright (C) 1997-2003  Kyoto University Microcomputer Club
- *                          (Linux/98 project)
- *                          Tomoharu Ugawa <ohirune@kmc.gr.jp>
- *
- */
-
-#include <linux/module.h>
-#include <linux/blkdev.h>
-#include <linux/ioport.h>
-#include <linux/interrupt.h>
-#include <linux/types.h>
-#include <linux/delay.h>
-
-#include <asm/dma.h>
-
-#include "scsi.h"
-#include <scsi/scsi_host.h>
-#include "wd33c93.h"
-#include "pc980155.h"
-
-extern int pc98_bios_param(struct scsi_device *, struct block_device *,
-                               sector_t, int *);
-static int scsi_pc980155_detect(Scsi_Host_Template *);
-static int scsi_pc980155_release(struct Scsi_Host *);
-
-#ifndef CMD_PER_LUN
-#define CMD_PER_LUN 2
-#endif
-
-#ifndef CAN_QUEUE
-#define CAN_QUEUE 16
-#endif
-
-#undef PC_9801_55_DEBUG
-#undef PC_9801_55_DEBUG_VERBOSE
-
-#define NR_BASE_IOS 4
-static int nr_base_ios = NR_BASE_IOS;
-static unsigned int base_ios[NR_BASE_IOS] = {0xcc0, 0xcd0, 0xce0, 0xcf0};
-static wd33c93_regs init_regs;
-static int io;
-
-static struct Scsi_Host *pc980155_host = NULL;
-
-static void pc980155_intr_handle(int irq, void *dev_id, struct pt_regs *regp);
-
-static inline void pc980155_dma_enable(unsigned int base_io)
-{
-       outb(0x01, REG_CWRITE);
-}
-
-static inline void pc980155_dma_disable(unsigned int base_io)
-{
-       outb(0x02, REG_CWRITE);
-}
-
-
-static void pc980155_intr_handle(int irq, void *dev_id, struct pt_regs *regp)
-{
-       wd33c93_intr(pc980155_host);
-}
-
-static int dma_setup(Scsi_Cmnd *sc, int dir_in)
-{
-  /*
-   * sc->SCp.this_residual : transfer count
-   * sc->SCp.ptr : distination address (virtual address)
-   * dir_in : data direction (DATA_OUT_DIR:0 or DATA_IN_DIR:1)
-   *
-   * if success return 0
-   */
-
-   /*
-    * DMA WRITE MODE
-    * bit 7,6 01b single mode (this mode only)
-    * bit 5   inc/dec (default:0 = inc)
-    * bit 4   auto initialize (normaly:0 = off)
-    * bit 3,2 01b memory -> io
-    *         10b io -> memory
-    *         00b verify
-    * bit 1,0 channel
-    */
-       disable_dma(sc->device->host->dma_channel);
-       set_dma_mode(sc->device->host->dma_channel,
-                       0x40 | (dir_in ? 0x04 : 0x08));
-       clear_dma_ff(sc->device->host->dma_channel);
-       set_dma_addr(sc->device->host->dma_channel, virt_to_phys(sc->SCp.ptr));
-       set_dma_count(sc->device->host->dma_channel, sc->SCp.this_residual);
-#ifdef PC_9801_55_DEBUG
-       printk("D%d(%x)D", sc->device->host->dma_channel,
-               sc->SCp.this_residual);
-#endif
-       enable_dma(sc->device->host->dma_channel);
-       pc980155_dma_enable(sc->device->host->io_port);
-       return 0;
-}
-
-static void dma_stop(struct Scsi_Host *instance, Scsi_Cmnd *sc, int status)
-{
-  /*
-   * instance: Hostadapter's instance
-   * sc: scsi command
-   * status: True if success
-   */
-       pc980155_dma_disable(sc->device->host->io_port);
-       disable_dma(sc->device->host->dma_channel);
-}  
-
-/* return non-zero on detection */
-static inline int pc980155_test_port(wd33c93_regs regs)
-{
-       /* Quick and dirty test for presence of the card. */
-       if (inb(regs.SASR) == 0xff)
-               return 0;
-
-       return 1;
-}
-
-static inline int pc980155_getconfig(unsigned int base_io, wd33c93_regs regs,
-                                       unsigned char* irq, unsigned char* dma,
-                                       unsigned char* scsi_id)
-{
-       static unsigned char irqs[] = {3, 5, 6, 9, 12, 13};
-       unsigned char result;
-  
-       printk(KERN_DEBUG "PC-9801-55: base_io=%x SASR=%x SCMD=%x\n",
-               base_io, regs.SASR, regs.SCMD);
-       result = read_pc980155_resetint(regs);
-       printk(KERN_DEBUG "PC-9801-55: getting config (%x)\n", result);
-       *scsi_id = result & 0x07;
-       *irq = (result >> 3) & 0x07;
-       if (*irq > 5) {
-               printk(KERN_ERR "PC-9801-55 (base %#x): impossible IRQ (%d)"
-                       " - other device here?\n", base_io, *irq);
-               return 0;
-       }
-
-       *irq = irqs[*irq];
-       result = inb(REG_STATRD);
-       *dma = result & 0x03;
-       if (*dma == 1) {
-               printk(KERN_ERR
-                       "PC-9801-55 (base %#x): impossible DMA channl (%d)"
-                       " - other device here?\n", base_io, *dma);
-               return 0;
-       }
-#ifdef PC_9801_55_DEBUG
-       printk("PC-9801-55: end of getconfig\n");
-#endif
-       return 1;
-}
-
-/* return non-zero on detection */
-static int scsi_pc980155_detect(Scsi_Host_Template* tpnt)
-{
-       unsigned int base_io;
-       unsigned char irq, dma, scsi_id;
-       int i;
-#ifdef PC_9801_55_DEBUG
-       unsigned char debug;
-#endif
-  
-       if (io) {
-               base_ios[0] = io;
-               nr_base_ios = 1;
-       }
-
-       for (i = 0; i < nr_base_ios; i++) {
-               base_io = base_ios[i];
-               init_regs.SASR = REG_ADDRST;
-               init_regs.SCMD = REG_CONTRL;
-#ifdef PC_9801_55_DEBUG
-               printk("PC-9801-55: SASR(%x = %x)\n", SASR, REG_ADDRST);
-#endif
-               if (!request_region(base_io, 6, "PC-9801-55"))
-                       continue;
-
-               if (pc980155_test_port(init_regs) &&
-                   pc980155_getconfig(base_io, init_regs,
-                                       &irq, &dma, &scsi_id))
-                       goto found;
-
-               release_region(base_io, 6);
-       }
-
-       printk("PC-9801-55: not found\n");
-       return 0;
-
-       found:
-#ifdef PC_9801_55_DEBUG
-       printk("PC-9801-55: config: base io = %x, irq = %d, dma channel = %d, scsi id = %d\n", base_io, irq, dma, scsi_id);
-#endif
-       if (request_irq(irq, pc980155_intr_handle, 0, "PC-9801-55", NULL)) {
-               printk(KERN_ERR "PC-9801-55: unable to allocate IRQ %d\n", irq);
-               goto err1;
-       }
-
-       if (request_dma(dma, "PC-9801-55")) {
-               printk(KERN_ERR "PC-9801-55: unable to allocate DMA channel %d\n", dma);
-               goto err2;
-       }
-
-       pc980155_host = scsi_register(tpnt, sizeof(struct WD33C93_hostdata));
-       if (pc980155_host) {
-               pc980155_host->this_id = scsi_id;
-               pc980155_host->io_port = base_io;
-               pc980155_host->n_io_port = 6;
-               pc980155_host->irq = irq;
-               pc980155_host->dma_channel = dma;
-               printk("PC-9801-55: scsi host found at %x irq = %d, use dma channel %d.\n", base_io, irq, dma);
-               pc980155_int_enable(init_regs);
-               wd33c93_init(pc980155_host, init_regs, dma_setup, dma_stop,
-                               WD33C93_FS_12_15);
-               return 1;
-       }
-
-       printk(KERN_ERR "PC-9801-55: failed to register device\n");
-
-err2:
-       free_irq(irq, NULL);
-err1:
-       release_region(base_io, 6);
-       return 0;
-}
-
-static int scsi_pc980155_release(struct Scsi_Host *shost)
-{
-       struct WD33C93_hostdata *hostdata
-               = (struct WD33C93_hostdata *)shost->hostdata;
-
-       pc980155_int_disable(hostdata->regs);
-       release_region(shost->io_port, shost->n_io_port);
-       free_irq(shost->irq, NULL);
-       free_dma(shost->dma_channel);
-       wd33c93_release();
-       return 1;
-}
-
-static int pc980155_bus_reset(Scsi_Cmnd *cmd)
-{
-       struct WD33C93_hostdata *hostdata
-               = (struct WD33C93_hostdata *)cmd->device->host->hostdata;
-
-       pc980155_int_disable(hostdata->regs);
-       pc980155_assert_bus_reset(hostdata->regs);
-       udelay(50);
-       pc980155_negate_bus_reset(hostdata->regs);
-       (void) inb(hostdata->regs.SASR);
-       (void) read_pc980155(hostdata->regs, WD_SCSI_STATUS);
-       pc980155_int_enable(hostdata->regs);
-       wd33c93_host_reset(cmd);
-       return SUCCESS;
-}
-
-
-#ifndef MODULE
-static int __init pc980155_setup(char *str)
-{
-        int ints[4];
-
-        str = get_options(str, ARRAY_SIZE(ints), ints);
-        if (ints[0] > 0)
-               io = ints[1];
-        return 1;
-}
-__setup("pc980155_io=", pc980155_setup);
-#endif
-
-MODULE_PARM(io, "i");
-MODULE_AUTHOR("Tomoharu Ugawa <ohirune@kmc.gr.jp>");
-MODULE_DESCRIPTION("PC-9801-55 SCSI host adapter driver");
-MODULE_LICENSE("GPL");
-
-static Scsi_Host_Template driver_template = {
-       .proc_info              = wd33c93_proc_info,
-       .name                   = "SCSI PC-9801-55",
-       .detect                 = scsi_pc980155_detect,
-       .release                = scsi_pc980155_release,
-       .queuecommand           = wd33c93_queuecommand,
-       .eh_abort_handler       = wd33c93_abort,
-       .eh_bus_reset_handler   = pc980155_bus_reset,
-       .eh_host_reset_handler  = wd33c93_host_reset,
-       .bios_param             = pc98_bios_param,
-       .can_queue              = CAN_QUEUE,
-       .this_id                = 7,
-       .sg_tablesize           = SG_ALL,
-       .cmd_per_lun            = CMD_PER_LUN, /* dont use link command */
-       .unchecked_isa_dma      = 1, /* use dma **XXXX***/
-       .use_clustering         = ENABLE_CLUSTERING,
-       .proc_name              = "PC_9801_55",
-};
-
-#include "scsi_module.c"
diff --git a/drivers/scsi/pc980155.h b/drivers/scsi/pc980155.h
deleted file mode 100644 (file)
index eef4a80..0000000
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- *
- *  drivers/scsi/pc980155.h
- *
- *  PC-9801-55 SCSI host adapter driver
- *
- *  Copyright (C) 1997-2003  Kyoto University Microcomputer Club
- *                          (Linux/98 project)
- *                          Tomoharu Ugawa <ohirune@kmc.gr.jp>
- *
- */
-
-#ifndef __PC980155_H
-#define __PC980155_H
-
-#include "wd33c93.h"
-
-#define REG_ADDRST (base_io)
-#define REG_CONTRL (base_io + 2)
-#define REG_CWRITE (base_io + 4)
-#define REG_STATRD (base_io + 4)
-
-#define WD_MEMORYBANK  0x30
-#define WD_RESETINT    0x33
-
-static inline uchar read_pc980155(const wd33c93_regs regs, uchar reg_num)
-{
-       outb(reg_num, regs.SASR);
-       return (uchar)inb(regs.SCMD);
-}
-
-static inline void write_memorybank(const wd33c93_regs regs, uchar value)
-{
-      outb(WD_MEMORYBANK, regs.SASR);
-      outb(value, regs.SCMD);
-}
-
-#define read_pc980155_resetint(regs) \
-       read_pc980155((regs), WD_RESETINT)
-#define pc980155_int_enable(regs) \
-       write_memorybank((regs), read_pc980155((regs), WD_MEMORYBANK) | 0x04)
-
-#define pc980155_int_disable(regs) \
-       write_memorybank((regs), read_pc980155((regs), WD_MEMORYBANK) & ~0x04)
-
-#define pc980155_assert_bus_reset(regs) \
-       write_memorybank((regs), read_pc980155((regs), WD_MEMORYBANK) | 0x02)
-
-#define pc980155_negate_bus_reset(regs) \
-       write_memorybank((regs), read_pc980155((regs), WD_MEMORYBANK) & ~0x02)
-
-#endif /* __PC980155_H */
diff --git a/drivers/scsi/qla2xxx/qla_os.h b/drivers/scsi/qla2xxx/qla_os.h
deleted file mode 100644 (file)
index c3ed2a6..0000000
+++ /dev/null
@@ -1,94 +0,0 @@
-/******************************************************************************
- *                  QLOGIC LINUX SOFTWARE
- *
- * QLogic ISP2x00 device driver for Linux 2.6.x
- * Copyright (C) 2003-2004 QLogic Corporation
- * (www.qlogic.com)
- *
- * Portions (C) Arjan van de Ven <arjanv@redhat.com> for Red Hat, 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, 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.
- *
- ******************************************************************************/
-
-#ifndef __QLA_OS_H
-#define __QLA_OS_H
-
-#include <linux/config.h>
-#include <linux/module.h>
-#include <linux/version.h>
-#include <linux/init.h>
-#include <linux/string.h>
-#include <linux/errno.h>
-#include <linux/kernel.h>
-#include <linux/ioport.h>
-#include <linux/delay.h>
-#include <linux/timer.h>
-#include <linux/sched.h>
-#include <linux/pci.h>
-#include <linux/proc_fs.h>
-#include <linux/blkdev.h>
-#include <linux/interrupt.h>
-#include <linux/stat.h>
-#include <linux/slab.h>
-#include <linux/mempool.h>
-#include <linux/vmalloc.h>
-#include <linux/smp_lock.h>
-#include <linux/bio.h>
-#include <linux/moduleparam.h>
-#include <linux/capability.h>
-#include <linux/list.h>
-
-#include <asm/system.h>
-
-#include <asm/io.h>
-#include <asm/irq.h>
-#include <asm/segment.h>
-#include <asm/byteorder.h>
-#include <asm/pgtable.h>
-
-#include <linux/ioctl.h>
-#include <asm/uaccess.h>
-
-#include "scsi.h"
-#include <scsi/scsi_host.h>
-
-#include <scsi/scsicam.h>
-#include <scsi/scsi_ioctl.h>
-#include <scsi/scsi_transport.h>
-#include <scsi/scsi_transport_fc.h>
-
-//TODO Fix this!!!
-/*
-* String arrays
-*/
-#define LINESIZE    256
-#define MAXARGS      26
-
-/***********************************************************************
-* We use the struct scsi_pointer structure that's included with each 
-* command SCSI_Cmnd as a scratchpad. 
-*
-* SCp is defined as follows:
-*  - SCp.ptr  -- > pointer to the SRB
-*  - SCp.this_residual  -- > HBA completion status for ioctl code. 
-*
-* Cmnd->host_scribble --> Used to hold the hba actived handle (1..255).
-***********************************************************************/
-#define        CMD_SP(Cmnd)            ((Cmnd)->SCp.ptr)
-#define CMD_COMPL_STATUS(Cmnd)  ((Cmnd)->SCp.this_residual)
-/* Additional fields used by ioctl passthru */
-#define CMD_RESID_LEN(Cmnd)    ((Cmnd)->SCp.buffers_residual)
-#define CMD_SCSI_STATUS(Cmnd)  ((Cmnd)->SCp.Status)
-#define CMD_ACTUAL_SNSLEN(Cmnd)        ((Cmnd)->SCp.Message)
-#define CMD_ENTRY_STATUS(Cmnd) ((Cmnd)->SCp.have_data_in)
-
-#endif
diff --git a/drivers/scsi/scsi_pc98.c b/drivers/scsi/scsi_pc98.c
deleted file mode 100644 (file)
index 319df01..0000000
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- *  Copyright (C) 2003  Osamu Tomita <tomita@cinet.co.jp>
- *
- *  PC9801 BIOS geometry handling.
- */
-
-#include <linux/module.h>
-#include <linux/fs.h>
-#include <linux/kernel.h>
-#include <linux/genhd.h>
-#include <linux/blkdev.h>
-#include <asm/pc9800.h>
-
-#include "scsi.h"
-#include <scsi/scsi_host.h>
-
-
-static int pc98_first_bios_param(struct scsi_device *sdev, int *ip)
-{
-       const u8 *p = (&__PC9800SCA(u8, PC9800SCA_SCSI_PARAMS) + sdev->id * 4);
-
-       ip[0] = p[1];   /* # of heads */
-       ip[1] = p[0];   /* # of sectors/track */
-       ip[2] = *(u16 *)&p[2] & 0x0fff; /* # of cylinders */
-       if (p[3] & (1 << 6)) { /* #-of-cylinders is 16-bit */
-               ip[2] |= (ip[0] & 0xf0) << 8;
-               ip[0] &= 0x0f;
-       }
-
-       return 0;
-}
-
-int pc98_bios_param(struct scsi_device *sdev, struct block_device *bdev,
-                       sector_t capacity, int *ip)
-{
-       struct Scsi_Host *first_real = first_real_host();
-
-       /*
-        * XXX
-        * XXX This needs to become a sysfs attribute that's set
-        * XXX by code that knows which host is the first one.
-        * XXX
-        * XXX Currently we support only one host on with a
-        * XXX PC98ish HBA.
-        * XXX
-        */
-       if (1 || sdev->host == first_real && sdev->id < 7 &&
-           __PC9800SCA_TEST_BIT(PC9800SCA_DISK_EQUIPS, sdev->id))
-               return pc98_first_bios_param(sdev, ip);
-
-       /* Assume PC-9801-92 compatible parameters for HAs without BIOS.  */
-       ip[0] = 8;
-       ip[1] = 32;
-       ip[2] = capacity / (8 * 32);
-       if (ip[2] > 65535) {    /* if capacity >= 8GB */
-               /* Recent on-board adapters seem to use this parameter. */
-               ip[1] = 128;
-               ip[2] = capacity / (8 * 128);
-               if (ip[2] > 65535) { /* if capacity >= 32GB  */
-                       /* Clip the number of cylinders.  Currently
-                          this is the limit that we deal with.  */
-                       ip[2] = 65535;
-               }
-       }
-
-       return 0;
-}
-
-EXPORT_SYMBOL(pc98_bios_param);
diff --git a/drivers/serial/8250_hcdp.c b/drivers/serial/8250_hcdp.c
deleted file mode 100644 (file)
index 4be2e60..0000000
+++ /dev/null
@@ -1,264 +0,0 @@
-/*
- * linux/drivers/char/hcdp_serial.c
- *
- * Copyright (C) 2002 Hewlett-Packard Co.
- *     Khalid Aziz <khalid_aziz@hp.com>
- *
- * Parse the EFI HCDP table to locate serial console and debug ports and
- * initialize them.
- *
- * 2002/08/29 davidm   Adjust it to new 2.5 serial driver infrastructure.
- */
-
-#include <linux/config.h>
-#include <linux/console.h>
-#include <linux/kernel.h>
-#include <linux/efi.h>
-#include <linux/init.h>
-#include <linux/tty.h>
-#include <linux/serial.h>
-#include <linux/serial_core.h>
-#include <linux/types.h>
-#include <linux/acpi.h>
-
-#include <asm/io.h>
-#include <asm/serial.h>
-#include <asm/acpi.h>
-
-#include "8250_hcdp.h"
-
-#undef SERIAL_DEBUG_HCDP
-
-/*
- * Parse the HCDP table to find descriptions for headless console and debug
- * serial ports and add them to rs_table[]. A pointer to HCDP table is
- * passed as parameter. This function should be called before
- * serial_console_init() is called to make sure the HCDP serial console will
- * be available for use. IA-64 kernel calls this function from setup_arch()
- * after the EFI and ACPI tables have been parsed.
- */
-void __init
-setup_serial_hcdp(void *tablep)
-{
-       hcdp_dev_t *hcdp_dev;
-       struct uart_port port;
-       unsigned long iobase;
-       hcdp_t hcdp;
-       int gsi, nr;
-       static char options[16];
-#if 0
-       static int shift_once = 1;
-#endif
-
-#ifdef SERIAL_DEBUG_HCDP
-       printk("Entering setup_serial_hcdp()\n");
-#endif
-
-       /* Verify we have a valid table pointer */
-       if (!tablep)
-               return;
-
-       memset(&port, 0, sizeof(port));
-
-       /*
-        * Don't trust firmware to give us a table starting at an aligned
-        * address. Make a local copy of the HCDP table with aligned
-        * structures.
-        */
-       memcpy(&hcdp, tablep, sizeof(hcdp));
-
-       /*
-        * Perform a sanity check on the table. Table should have a signature
-        * of "HCDP" and it should be atleast 82 bytes long to have any
-        * useful information.
-        */
-       if ((strncmp(hcdp.signature, HCDP_SIGNATURE, HCDP_SIG_LEN) != 0))
-               return;
-       if (hcdp.len < 82)
-               return;
-
-#ifdef SERIAL_DEBUG_HCDP
-       printk("setup_serial_hcdp(): table pointer = 0x%p, sig = '%.4s'\n",
-              tablep, hcdp.signature);
-       printk(" length = %d, rev = %d, ", hcdp.len, hcdp.rev);
-       printk("OEM ID = %.6s, # of entries = %d\n", hcdp.oemid,
-                       hcdp.num_entries);
-#endif
-
-       /*
-        * Parse each device entry
-        */
-       for (nr = 0; nr < hcdp.num_entries; nr++) {
-               hcdp_dev = hcdp.hcdp_dev + nr;
-               /*
-                * We will parse only the primary console device which is
-                * the first entry for these devices. We will ignore rest
-                * of the entries for the same type device that has already
-                * been parsed and initialized
-                */
-               if (hcdp_dev->type != HCDP_DEV_CONSOLE)
-                       continue;
-
-               iobase = ((u64) hcdp_dev->base_addr.addrhi << 32) |
-                                       hcdp_dev->base_addr.addrlo;
-               gsi = hcdp_dev->global_int;
-
-               /* See PCI spec v2.2, Appendix D (Class Codes): */
-               switch (hcdp_dev->pci_prog_intfc) {
-               case 0x00:
-                       port.type = PORT_8250;
-                       break;
-               case 0x01:
-                       port.type = PORT_16450;
-                       break;
-               case 0x02:
-                       port.type = PORT_16550;
-                       break;
-               case 0x03:
-                       port.type = PORT_16650;
-                       break;
-               case 0x04:
-                       port.type = PORT_16750;
-                       break;
-               case 0x05:
-                       port.type = PORT_16850;
-                       break;
-               case 0x06:
-                       port.type = PORT_16C950;
-                       break;
-               default:
-                       printk(KERN_WARNING "warning: EFI HCDP table reports "
-                               "unknown serial programming interface 0x%02x; "
-                               "will autoprobe.\n", hcdp_dev->pci_prog_intfc);
-                       port.type = PORT_UNKNOWN;
-                       break;
-               }
-
-#ifdef SERIAL_DEBUG_HCDP
-               printk("  type = %s, uart = %d\n",
-                       ((hcdp_dev->type == HCDP_DEV_CONSOLE) ?
-                       "Headless Console" :
-                       ((hcdp_dev->type == HCDP_DEV_DEBUG) ?
-                       "Debug port" : "Huh????")), port.type);
-               printk("  base address space = %s, base address = 0x%lx\n",
-                      ((hcdp_dev->base_addr.space_id == ACPI_MEM_SPACE) ?
-                      "Memory Space" :
-                       ((hcdp_dev->base_addr.space_id == ACPI_IO_SPACE) ?
-                       "I/O space" : "PCI space")),
-                      iobase);
-               printk("  gsi = %d, baud rate = %lu, bits = %d, clock = %d\n",
-                      gsi, (unsigned long) hcdp_dev->baud, hcdp_dev->bits,
-                      hcdp_dev->clock_rate);
-               if (HCDP_PCI_UART(hcdp_dev))
-                       printk(" PCI id: %02x:%02x:%02x, vendor ID=0x%x, "
-                               "dev ID=0x%x\n", hcdp_dev->pci_seg,
-                               hcdp_dev->pci_bus, hcdp_dev->pci_dev,
-                               hcdp_dev->pci_vendor_id, hcdp_dev->pci_dev_id);
-#endif
-               /*
-                * Now fill in a port structure to update the 8250 port table..
-                */
-               if (hcdp_dev->clock_rate)
-                       port.uartclk = hcdp_dev->clock_rate;
-               else
-                       port.uartclk = BASE_BAUD * 16;
-
-               /*
-                * Check if this is an I/O mapped address or a memory mapped
-                * address
-                */
-               if (hcdp_dev->base_addr.space_id == ACPI_MEM_SPACE) {
-                       port.iobase = 0;
-                       port.mapbase = iobase;
-                       port.membase = ioremap(iobase, 64);
-                       port.iotype = SERIAL_IO_MEM;
-               } else if (hcdp_dev->base_addr.space_id == ACPI_IO_SPACE) {
-                       port.iobase = iobase;
-                       port.mapbase = 0;
-                       port.membase = NULL;
-                       port.iotype = SERIAL_IO_PORT;
-               } else if (hcdp_dev->base_addr.space_id == ACPI_PCICONF_SPACE) {
-                       printk(KERN_WARNING"warning: No support for PCI serial console\n");
-                       return;
-               }
-
-               if (HCDP_IRQ_SUPPORTED(hcdp_dev)) {
-                       if (HCDP_PCI_UART(hcdp_dev))
-                               port.irq = acpi_register_gsi(gsi,
-                                       ACPI_LEVEL_SENSITIVE, ACPI_ACTIVE_LOW);
-                       else
-                               port.irq = acpi_register_gsi(gsi,
-                                       ACPI_EDGE_SENSITIVE, ACPI_ACTIVE_HIGH);
-                       port.flags |= UPF_AUTO_IRQ;
-
-                       if (HCDP_PCI_UART(hcdp_dev))
-                               port.flags |= UPF_SHARE_IRQ;
-               }
-
-               port.flags |= UPF_SKIP_TEST | UPF_BOOT_AUTOCONF | UPF_RESOURCES;
-
-               /*
-                * Note: the above memset() initializes port.line to 0,
-                * so we register this port as ttyS0.
-                */
-               if (early_serial_setup(&port) < 0) {
-                       printk("setup_serial_hcdp(): early_serial_setup() "
-                               "for HCDP serial console port failed. "
-                               "Will try any additional consoles in HCDP.\n");
-                       memset(&port, 0, sizeof(port));
-                       continue;
-               }
-
-               if (efi_uart_console_only()) {
-                       snprintf(options, sizeof(options), "%lun%d",
-                               hcdp_dev->baud, hcdp_dev->bits);
-                       add_preferred_console("ttyS", port.line, options);
-               }
-               break;
-       }
-
-#ifdef SERIAL_DEBUG_HCDP
-       printk("Leaving setup_serial_hcdp()\n");
-#endif
-}
-
-#ifdef CONFIG_IA64_EARLY_PRINTK_UART
-unsigned long
-hcdp_early_uart (void)
-{
-       efi_system_table_t *systab;
-       efi_config_table_t *config_tables;
-       unsigned long addr = 0;
-       hcdp_t *hcdp = 0;
-       hcdp_dev_t *dev;
-       int i;
-
-       systab = (efi_system_table_t *) ia64_boot_param->efi_systab;
-       if (!systab)
-               return 0;
-       systab = __va(systab);
-
-       config_tables = (efi_config_table_t *) systab->tables;
-       if (!config_tables)
-               return 0;
-       config_tables = __va(config_tables);
-
-       for (i = 0; i < systab->nr_tables; i++) {
-               if (efi_guidcmp(config_tables[i].guid, HCDP_TABLE_GUID) == 0) {
-                       hcdp = (hcdp_t *) config_tables[i].table;
-                       break;
-               }
-       }
-       if (!hcdp)
-               return 0;
-       hcdp = __va(hcdp);
-
-       for (i = 0, dev = hcdp->hcdp_dev; i < hcdp->num_entries; i++, dev++) {
-               if (dev->type == HCDP_DEV_CONSOLE) {
-                       addr = (u64) dev->base_addr.addrhi << 32 | dev->base_addr.addrlo;
-                       break;
-               }
-       }
-       return addr;
-}
-#endif /* CONFIG_IA64_EARLY_PRINTK_UART */
diff --git a/drivers/serial/8250_hcdp.h b/drivers/serial/8250_hcdp.h
deleted file mode 100644 (file)
index fa956a1..0000000
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
- * drivers/serial/8250_hcdp.h
- *
- * Copyright (C) 2002 Hewlett-Packard Co.
- *     Khalid Aziz <khalid_aziz@hp.com>
- *
- * Definitions for HCDP defined serial ports (Serial console and debug
- * ports)
- */
-
-/* ACPI table signatures */
-#define HCDP_SIG_LEN           4
-#define HCDP_SIGNATURE         "HCDP"
-
-/* Space ID as defined in ACPI generic address structure */
-#define ACPI_MEM_SPACE         0
-#define ACPI_IO_SPACE          1
-#define ACPI_PCICONF_SPACE     2
-
-/*
- * Maximum number of HCDP devices we want to read in
- */
-#define MAX_HCDP_DEVICES       6
-
-/*
- * Default UART clock rate if clock rate is 0 in HCDP table.
- */
-#define DEFAULT_UARTCLK                115200
-
-/*
- * ACPI Generic Address Structure
- */
-typedef struct {
-       u8  space_id;
-       u8  bit_width;
-       u8  bit_offset;
-       u8  resv;
-       u32 addrlo;
-       u32 addrhi;
-} acpi_gen_addr;
-
-/* HCDP Device descriptor entry types */
-#define HCDP_DEV_CONSOLE       0
-#define HCDP_DEV_DEBUG         1
-
-/* HCDP Device descriptor type */
-typedef struct {
-       u8      type;
-       u8      bits;
-       u8      parity;
-       u8      stop_bits;
-       u8      pci_seg;
-       u8      pci_bus;
-       u8      pci_dev;
-       u8      pci_func;
-       u64     baud;
-       acpi_gen_addr   base_addr;
-       u16     pci_dev_id;
-       u16     pci_vendor_id;
-       u32     global_int;
-       u32     clock_rate;
-       u8      pci_prog_intfc;
-       u8      resv;
-} hcdp_dev_t;
-
-/* HCDP Table format */
-typedef struct {
-       u8      signature[4];
-       u32     len;
-       u8      rev;
-       u8      chksum;
-       u8      oemid[6];
-       u8      oem_tabid[8];
-       u32     oem_rev;
-       u8      creator_id[4];
-       u32     creator_rev;
-       u32     num_entries;
-       hcdp_dev_t      hcdp_dev[MAX_HCDP_DEVICES];
-} hcdp_t;
-
-#define HCDP_PCI_UART(x) (x->pci_func & 1UL<<7)
-#define HCDP_IRQ_SUPPORTED(x) (x->pci_func & 1UL<<6)
diff --git a/drivers/serial/mpc52xx_uart.c b/drivers/serial/mpc52xx_uart.c
deleted file mode 100644 (file)
index 3feba05..0000000
+++ /dev/null
@@ -1,869 +0,0 @@
-/*
- * drivers/serial/mpc52xx_uart.c
- *
- * Driver for the PSC of the Freescale MPC52xx PSCs configured as UARTs.
- *
- * FIXME According to the usermanual the status bits in the status register
- * are only updated when the peripherals access the FIFO and not when the
- * CPU access them. So since we use this bits to know when we stop writing
- * and reading, they may not be updated in-time and a race condition may
- * exists. But I haven't be able to prove this and I don't care. But if
- * any problem arises, it might worth checking. The TX/RX FIFO Stats
- * registers should be used in addition.
- * Update: Actually, they seem updated ... At least the bits we use.
- *
- *
- * Maintainer : Sylvain Munaut <tnt@246tNt.com>
- * 
- * Some of the code has been inspired/copied from the 2.4 code written
- * by Dale Farnsworth <dfarnsworth@mvista.com>.
- * 
- * Copyright (C) 2004 Sylvain Munaut <tnt@246tNt.com>
- * Copyright (C) 2003 MontaVista, Software, Inc.
- * 
- * This file is licensed under the terms of the GNU General Public License
- * version 2. This program is licensed "as is" without any warranty of any
- * kind, whether express or implied.
- */
-/* OCP Usage :
- *
- * This drivers uses the OCP model. To load the serial driver for one of the
- * PSCs, just add this to the core_ocp table :
- *
- * {
- *     .vendor         = OCP_VENDOR_FREESCALE,
- *     .function       = OCP_FUNC_PSC_UART,
- *     .index          = 0,
- *     .paddr          = MPC52xx_PSC1,
- *     .irq            = MPC52xx_PSC1_IRQ,
- *     .pm             = OCP_CPM_NA,
- * },
- *
- * This is for PSC1, replace the paddr and irq according to the PSC you want to
- * use. The driver all necessary registers to place the PSC in uart mode without
- * DCD. However, the pin multiplexing aren't changed and should be set either
- * by the bootloader or in the platform init code.
- * The index field must be equal to the PSC index ( e.g. 0 for PSC1, 1 for PSC2,
- * and so on). So the PSC1 is mapped to /dev/ttyS0, PSC2 to /dev/ttyS1 and so
- * on. But be warned, it's an ABSOLUTE REQUIREMENT ! This is needed mainly for
- * the console code : without this 1:1 mapping, at early boot time, when we are
- * parsing the kernel args console=ttyS?, we wouldn't know wich PSC it will be
- * mapped to because OCP stuff is not yet initialized.
- */
-
-#include <linux/config.h>
-#include <linux/module.h>
-#include <linux/tty.h>
-#include <linux/serial.h>
-#include <linux/sysrq.h>
-#include <linux/console.h>
-
-#include <asm/delay.h>
-#include <asm/io.h>
-#include <asm/ocp.h>
-
-#include <asm/mpc52xx.h>
-#include <asm/mpc52xx_psc.h>
-
-#if defined(CONFIG_SERIAL_MPC52xx_CONSOLE) && defined(CONFIG_MAGIC_SYSRQ)
-#define SUPPORT_SYSRQ
-#endif
-
-#include <linux/serial_core.h>
-
-
-
-#define ISR_PASS_LIMIT 256     /* Max number of iteration in the interrupt */
-
-
-static struct uart_port mpc52xx_uart_ports[MPC52xx_PSC_MAXNUM];
-       /* Rem: - We use the read_status_mask as a shadow of
-        *        psc->mpc52xx_psc_imr
-        *      - It's important that is array is all zero on start as we
-        *        use it to know if it's initialized or not ! If it's not sure
-        *        it's cleared, then a memset(...,0,...) should be added to
-        *        the console_init
-        */
-
-#define PSC(port) ((struct mpc52xx_psc *)((port)->membase))
-
-
-/* Forward declaration of the interruption handling routine */
-static irqreturn_t mpc52xx_uart_int(int irq,void *dev_id,struct pt_regs *regs);
-
-
-/* Simple macro to test if a port is console or not. This one is taken
- * for serial_core.c and maybe should be moved to serial_core.h ? */
-#ifdef CONFIG_SERIAL_CORE_CONSOLE
-#define uart_console(port)     ((port)->cons && (port)->cons->index == (port)->line)
-#else
-#define uart_console(port)     (0)
-#endif
-
-
-/* ======================================================================== */
-/* UART operations                                                          */
-/* ======================================================================== */
-
-static unsigned int 
-mpc52xx_uart_tx_empty(struct uart_port *port)
-{
-       int status = in_be16(&PSC(port)->mpc52xx_psc_status);
-       return (status & MPC52xx_PSC_SR_TXEMP) ? TIOCSER_TEMT : 0;
-}
-
-static void 
-mpc52xx_uart_set_mctrl(struct uart_port *port, unsigned int mctrl)
-{
-       /* Not implemented */
-}
-
-static unsigned int 
-mpc52xx_uart_get_mctrl(struct uart_port *port)
-{
-       /* Not implemented */
-       return TIOCM_CTS | TIOCM_DSR | TIOCM_CAR;
-}
-
-static void 
-mpc52xx_uart_stop_tx(struct uart_port *port, unsigned int tty_stop)
-{
-       /* port->lock taken by caller */
-       port->read_status_mask &= ~MPC52xx_PSC_IMR_TXRDY;
-       out_be16(&PSC(port)->mpc52xx_psc_imr,port->read_status_mask);
-}
-
-static void 
-mpc52xx_uart_start_tx(struct uart_port *port, unsigned int tty_start)
-{
-       /* port->lock taken by caller */
-       port->read_status_mask |= MPC52xx_PSC_IMR_TXRDY;
-       out_be16(&PSC(port)->mpc52xx_psc_imr,port->read_status_mask);
-}
-
-static void 
-mpc52xx_uart_send_xchar(struct uart_port *port, char ch)
-{
-       unsigned long flags;
-       spin_lock_irqsave(&port->lock, flags);
-       
-       port->x_char = ch;
-       if (ch) {
-               /* Make sure tx interrupts are on */
-               /* Truly necessary ??? They should be anyway */
-               port->read_status_mask |= MPC52xx_PSC_IMR_TXRDY;
-               out_be16(&PSC(port)->mpc52xx_psc_imr,port->read_status_mask);
-       }
-       
-       spin_unlock_irqrestore(&port->lock, flags);
-}
-
-static void
-mpc52xx_uart_stop_rx(struct uart_port *port)
-{
-       /* port->lock taken by caller */
-       port->read_status_mask &= ~MPC52xx_PSC_IMR_RXRDY;
-       out_be16(&PSC(port)->mpc52xx_psc_imr,port->read_status_mask);
-}
-
-static void
-mpc52xx_uart_enable_ms(struct uart_port *port)
-{
-       /* Not implemented */
-}
-
-static void
-mpc52xx_uart_break_ctl(struct uart_port *port, int ctl)
-{
-       unsigned long flags;
-       spin_lock_irqsave(&port->lock, flags);
-
-       if ( ctl == -1 )
-               out_8(&PSC(port)->command,MPC52xx_PSC_START_BRK);
-       else
-               out_8(&PSC(port)->command,MPC52xx_PSC_STOP_BRK);
-       
-       spin_unlock_irqrestore(&port->lock, flags);
-}
-
-static int
-mpc52xx_uart_startup(struct uart_port *port)
-{
-       struct mpc52xx_psc *psc = PSC(port);
-
-       /* Reset/activate the port, clear and enable interrupts */
-       out_8(&psc->command,MPC52xx_PSC_RST_RX);
-       out_8(&psc->command,MPC52xx_PSC_RST_TX);
-       
-       out_be32(&psc->sicr,0); /* UART mode DCD ignored */
-
-       out_be16(&psc->mpc52xx_psc_clock_select, 0xdd00); /* /16 prescaler on */
-       
-       out_8(&psc->rfcntl, 0x00);
-       out_be16(&psc->rfalarm, 0x1ff);
-       out_8(&psc->tfcntl, 0x07);
-       out_be16(&psc->tfalarm, 0x80);
-
-       port->read_status_mask |= MPC52xx_PSC_IMR_RXRDY | MPC52xx_PSC_IMR_TXRDY;
-       out_be16(&psc->mpc52xx_psc_imr,port->read_status_mask);
-       
-       out_8(&psc->command,MPC52xx_PSC_TX_ENABLE);
-       out_8(&psc->command,MPC52xx_PSC_RX_ENABLE);
-               
-       return 0;
-}
-
-static void
-mpc52xx_uart_shutdown(struct uart_port *port)
-{
-       struct mpc52xx_psc *psc = PSC(port);
-       
-       /* Shut down the port, interrupt and all */
-       out_8(&psc->command,MPC52xx_PSC_RST_RX);
-       out_8(&psc->command,MPC52xx_PSC_RST_TX);
-       
-       port->read_status_mask = 0; 
-       out_be16(&psc->mpc52xx_psc_imr,port->read_status_mask);
-}
-
-static void 
-mpc52xx_uart_set_termios(struct uart_port *port, struct termios *new,
-                         struct termios *old)
-{
-       struct mpc52xx_psc *psc = PSC(port);
-       unsigned long flags;
-       unsigned char mr1, mr2;
-       unsigned short ctr;
-       unsigned int j, baud, quot;
-       
-       /* Prepare what we're gonna write */
-       mr1 = 0;
-       
-       switch (new->c_cflag & CSIZE) {
-               case CS5:       mr1 |= MPC52xx_PSC_MODE_5_BITS;
-                               break;
-               case CS6:       mr1 |= MPC52xx_PSC_MODE_6_BITS;
-                               break;
-               case CS7:       mr1 |= MPC52xx_PSC_MODE_7_BITS;
-                               break;
-               case CS8:
-               default:        mr1 |= MPC52xx_PSC_MODE_8_BITS;
-       }
-
-       if (new->c_cflag & PARENB) {
-               mr1 |= (new->c_cflag & PARODD) ?
-                       MPC52xx_PSC_MODE_PARODD : MPC52xx_PSC_MODE_PAREVEN;
-       } else
-               mr1 |= MPC52xx_PSC_MODE_PARNONE;
-       
-       
-       mr2 = 0;
-
-       if (new->c_cflag & CSTOPB)
-               mr2 |= MPC52xx_PSC_MODE_TWO_STOP;
-       else
-               mr2 |= ((new->c_cflag & CSIZE) == CS5) ?
-                       MPC52xx_PSC_MODE_ONE_STOP_5_BITS :
-                       MPC52xx_PSC_MODE_ONE_STOP;
-
-
-       baud = uart_get_baud_rate(port, new, old, 0, port->uartclk/16);
-       quot = uart_get_divisor(port, baud);
-       ctr = quot & 0xffff;
-       
-       /* Get the lock */
-       spin_lock_irqsave(&port->lock, flags);
-
-       /* Update the per-port timeout */
-       uart_update_timeout(port, new->c_cflag, baud);
-
-       /* Do our best to flush TX & RX, so we don't loose anything */
-       /* But we don't wait indefinitly ! */
-       j = 5000000;    /* Maximum wait */
-       /* FIXME Can't receive chars since set_termios might be called at early
-        * boot for the console, all stuff is not yet ready to receive at that
-        * time and that just makes the kernel oops */
-       /* while (j-- && mpc52xx_uart_int_rx_chars(port)); */
-       while (!(in_be16(&psc->mpc52xx_psc_status) & MPC52xx_PSC_SR_TXEMP) && 
-              --j)
-               udelay(1);
-
-       if (!j)
-               printk( KERN_ERR "mpc52xx_uart.c: "
-                       "Unable to flush RX & TX fifos in-time in set_termios."
-                       "Some chars may have been lost.\n" ); 
-
-       /* Reset the TX & RX */
-       out_8(&psc->command,MPC52xx_PSC_RST_RX);
-       out_8(&psc->command,MPC52xx_PSC_RST_TX);
-
-       /* Send new mode settings */
-       out_8(&psc->command,MPC52xx_PSC_SEL_MODE_REG_1);
-       out_8(&psc->mode,mr1);
-       out_8(&psc->mode,mr2);
-       out_8(&psc->ctur,ctr >> 8);
-       out_8(&psc->ctlr,ctr & 0xff);
-       
-       /* Reenable TX & RX */
-       out_8(&psc->command,MPC52xx_PSC_TX_ENABLE);
-       out_8(&psc->command,MPC52xx_PSC_RX_ENABLE);
-
-       /* We're all set, release the lock */
-       spin_unlock_irqrestore(&port->lock, flags);
-}
-
-static const char *
-mpc52xx_uart_type(struct uart_port *port)
-{
-       return port->type == PORT_MPC52xx ? "MPC52xx PSC" : NULL;
-}
-
-static void
-mpc52xx_uart_release_port(struct uart_port *port)
-{
-       if (port->flags & UPF_IOREMAP) { /* remapped by us ? */
-               iounmap(port->membase);
-               port->membase = NULL;
-       }
-}
-
-static int
-mpc52xx_uart_request_port(struct uart_port *port)
-{
-       if (port->flags & UPF_IOREMAP) /* Need to remap ? */
-               port->membase = ioremap(port->mapbase, sizeof(struct mpc52xx_psc));
-       
-       return port->membase != NULL ? 0 : -EBUSY;
-}
-
-static void
-mpc52xx_uart_config_port(struct uart_port *port, int flags)
-{
-       if ( (flags & UART_CONFIG_TYPE) &&
-            (mpc52xx_uart_request_port(port) == 0) )
-               port->type = PORT_MPC52xx;
-}
-
-static int
-mpc52xx_uart_verify_port(struct uart_port *port, struct serial_struct *ser)
-{
-       if ( ser->type != PORT_UNKNOWN && ser->type != PORT_MPC52xx )
-               return -EINVAL;
-
-       if ( (ser->irq != port->irq) ||
-            (ser->io_type != SERIAL_IO_MEM) ||
-            (ser->baud_base != port->uartclk)  || 
-            // FIXME Should check addresses/irq as well ?
-            (ser->hub6 != 0 ) )
-               return -EINVAL;
-
-       return 0;
-}
-
-
-static struct uart_ops mpc52xx_uart_ops = {
-       .tx_empty       = mpc52xx_uart_tx_empty,
-       .set_mctrl      = mpc52xx_uart_set_mctrl,
-       .get_mctrl      = mpc52xx_uart_get_mctrl,
-       .stop_tx        = mpc52xx_uart_stop_tx,
-       .start_tx       = mpc52xx_uart_start_tx,
-       .send_xchar     = mpc52xx_uart_send_xchar,
-       .stop_rx        = mpc52xx_uart_stop_rx,
-       .enable_ms      = mpc52xx_uart_enable_ms,
-       .break_ctl      = mpc52xx_uart_break_ctl,
-       .startup        = mpc52xx_uart_startup,
-       .shutdown       = mpc52xx_uart_shutdown,
-       .set_termios    = mpc52xx_uart_set_termios,
-/*     .pm             = mpc52xx_uart_pm,              Not supported yet */
-/*     .set_wake       = mpc52xx_uart_set_wake,        Not supported yet */
-       .type           = mpc52xx_uart_type,
-       .release_port   = mpc52xx_uart_release_port,
-       .request_port   = mpc52xx_uart_request_port,
-       .config_port    = mpc52xx_uart_config_port,
-       .verify_port    = mpc52xx_uart_verify_port
-};
-
-       
-/* ======================================================================== */
-/* Interrupt handling                                                       */
-/* ======================================================================== */
-       
-static inline int
-mpc52xx_uart_int_rx_chars(struct uart_port *port, struct pt_regs *regs)
-{
-       struct tty_struct *tty = port->info->tty;
-       unsigned char ch;
-       unsigned short status;
-
-       /* While we can read, do so ! */
-       while ( (status = in_be16(&PSC(port)->mpc52xx_psc_status)) &
-               MPC52xx_PSC_SR_RXRDY) {
-
-               /* If we are full, just stop reading */
-               if (tty->flip.count >= TTY_FLIPBUF_SIZE)
-                       break;
-               
-               /* Get the char */
-               ch = in_8(&PSC(port)->mpc52xx_psc_buffer_8);
-
-               /* Handle sysreq char */
-#ifdef SUPPORT_SYSRQ
-               if (uart_handle_sysrq_char(port, ch, regs)) {
-                       port->sysrq = 0;
-                       continue;
-               }
-#endif
-
-               /* Store it */
-               *tty->flip.char_buf_ptr = ch;
-               *tty->flip.flag_buf_ptr = 0;
-               port->icount.rx++;
-       
-               if ( status & (MPC52xx_PSC_SR_PE |
-                              MPC52xx_PSC_SR_FE |
-                              MPC52xx_PSC_SR_RB |
-                              MPC52xx_PSC_SR_OE) ) {
-                       
-                       if (status & MPC52xx_PSC_SR_RB) {
-                               *tty->flip.flag_buf_ptr = TTY_BREAK;
-                               uart_handle_break(port);
-                       } else if (status & MPC52xx_PSC_SR_PE)
-                               *tty->flip.flag_buf_ptr = TTY_PARITY;
-                       else if (status & MPC52xx_PSC_SR_FE)
-                               *tty->flip.flag_buf_ptr = TTY_FRAME;
-                       if (status & MPC52xx_PSC_SR_OE) {
-                               /*
-                                * Overrun is special, since it's
-                                * reported immediately, and doesn't
-                                * affect the current character
-                                */
-                               if (tty->flip.count < (TTY_FLIPBUF_SIZE-1)) {
-                                       tty->flip.flag_buf_ptr++;
-                                       tty->flip.char_buf_ptr++;
-                                       tty->flip.count++;
-                               }
-                               *tty->flip.flag_buf_ptr = TTY_OVERRUN;
-                       }
-
-                       /* Clear error condition */
-                       out_8(&PSC(port)->command,MPC52xx_PSC_RST_ERR_STAT);
-
-               }
-
-               tty->flip.char_buf_ptr++;
-               tty->flip.flag_buf_ptr++;
-               tty->flip.count++;
-
-       }
-
-       tty_flip_buffer_push(tty);
-       
-       return in_be16(&PSC(port)->mpc52xx_psc_status) & MPC52xx_PSC_SR_RXRDY;
-}
-
-static inline int
-mpc52xx_uart_int_tx_chars(struct uart_port *port)
-{
-       struct circ_buf *xmit = &port->info->xmit;
-
-       /* Process out of band chars */
-       if (port->x_char) {
-               out_8(&PSC(port)->mpc52xx_psc_buffer_8, port->x_char);
-               port->icount.tx++;
-               port->x_char = 0;
-               return 1;
-       }
-
-       /* Nothing to do ? */
-       if (uart_circ_empty(xmit) || uart_tx_stopped(port)) {
-               mpc52xx_uart_stop_tx(port,0);
-               return 0;
-       }
-
-       /* Send chars */
-       while (in_be16(&PSC(port)->mpc52xx_psc_status) & MPC52xx_PSC_SR_TXRDY) {
-               out_8(&PSC(port)->mpc52xx_psc_buffer_8, xmit->buf[xmit->tail]);
-               xmit->tail = (xmit->tail + 1) & (UART_XMIT_SIZE - 1);
-               port->icount.tx++;
-               if (uart_circ_empty(xmit))
-                       break;
-       }
-
-       /* Wake up */
-       if (uart_circ_chars_pending(xmit) < WAKEUP_CHARS)
-               uart_write_wakeup(port);
-
-       /* Maybe we're done after all */
-       if (uart_circ_empty(xmit)) {
-               mpc52xx_uart_stop_tx(port,0);
-               return 0;
-       }
-
-       return 1;
-}
-
-static irqreturn_t 
-mpc52xx_uart_int(int irq, void *dev_id, struct pt_regs *regs)
-{
-       struct uart_port *port = (struct uart_port *) dev_id;
-       unsigned long pass = ISR_PASS_LIMIT;
-       unsigned int keepgoing;
-       unsigned short status;
-       
-       if ( irq != port->irq ) {
-               printk( KERN_WARNING
-                       "mpc52xx_uart_int : " \
-                       "Received wrong int %d. Waiting for %d\n",
-                      irq, port->irq);
-               return IRQ_NONE;
-       }
-       
-       spin_lock(&port->lock);
-       
-       /* While we have stuff to do, we continue */
-       do {
-               /* If we don't find anything to do, we stop */
-               keepgoing = 0; 
-               
-               /* Read status */
-               status = in_be16(&PSC(port)->mpc52xx_psc_isr);
-               status &= port->read_status_mask;
-                       
-               /* Do we need to receive chars ? */
-               /* For this RX interrupts must be on and some chars waiting */
-               if ( status & MPC52xx_PSC_IMR_RXRDY )
-                       keepgoing |= mpc52xx_uart_int_rx_chars(port, regs);
-
-               /* Do we need to send chars ? */
-               /* For this, TX must be ready and TX interrupt enabled */
-               if ( status & MPC52xx_PSC_IMR_TXRDY )
-                       keepgoing |= mpc52xx_uart_int_tx_chars(port);
-               
-               /* Limit number of iteration */
-               if ( !(--pass) )
-                       keepgoing = 0;
-
-       } while (keepgoing);
-       
-       spin_unlock(&port->lock);
-       
-       return IRQ_HANDLED;
-}
-
-
-/* ======================================================================== */
-/* Console ( if applicable )                                                */
-/* ======================================================================== */
-
-#ifdef CONFIG_SERIAL_MPC52xx_CONSOLE
-
-static void __init
-mpc52xx_console_get_options(struct uart_port *port,
-                            int *baud, int *parity, int *bits, int *flow)
-{
-       struct mpc52xx_psc *psc = PSC(port);
-       unsigned char mr1;
-
-       /* Read the mode registers */
-       out_8(&psc->command,MPC52xx_PSC_SEL_MODE_REG_1);
-       mr1 = in_8(&psc->mode);
-       
-       /* CT{U,L}R are write-only ! */
-       *baud = __res.bi_baudrate ?
-               __res.bi_baudrate : CONFIG_SERIAL_MPC52xx_CONSOLE_BAUD;
-
-       /* Parse them */
-       switch (mr1 & MPC52xx_PSC_MODE_BITS_MASK) {
-               case MPC52xx_PSC_MODE_5_BITS:   *bits = 5; break;
-               case MPC52xx_PSC_MODE_6_BITS:   *bits = 6; break;
-               case MPC52xx_PSC_MODE_7_BITS:   *bits = 7; break;
-               case MPC52xx_PSC_MODE_8_BITS:
-               default:                        *bits = 8;
-       }
-       
-       if (mr1 & MPC52xx_PSC_MODE_PARNONE)
-               *parity = 'n';
-       else
-               *parity = mr1 & MPC52xx_PSC_MODE_PARODD ? 'o' : 'e';
-}
-
-static void  
-mpc52xx_console_write(struct console *co, const char *s, unsigned int count)
-{
-       struct uart_port *port = &mpc52xx_uart_ports[co->index];
-       struct mpc52xx_psc *psc = PSC(port);
-       unsigned int i, j;
-       
-       /* Disable interrupts */
-       out_be16(&psc->mpc52xx_psc_imr, 0);
-
-       /* Wait the TX buffer to be empty */
-       j = 5000000;    /* Maximum wait */      
-       while (!(in_be16(&psc->mpc52xx_psc_status) & MPC52xx_PSC_SR_TXEMP) && 
-              --j)
-               udelay(1);
-
-       /* Write all the chars */
-       for ( i=0 ; i<count ; i++ ) {
-       
-               /* Send the char */
-               out_8(&psc->mpc52xx_psc_buffer_8, *s);
-
-               /* Line return handling */
-               if ( *s++ == '\n' )
-                       out_8(&psc->mpc52xx_psc_buffer_8, '\r');
-               
-               /* Wait the TX buffer to be empty */
-               j = 20000;      /* Maximum wait */      
-               while (!(in_be16(&psc->mpc52xx_psc_status) & 
-                        MPC52xx_PSC_SR_TXEMP) && --j)
-                       udelay(1);
-       }
-
-       /* Restore interrupt state */
-       out_be16(&psc->mpc52xx_psc_imr, port->read_status_mask);
-}
-
-static int __init
-mpc52xx_console_setup(struct console *co, char *options)
-{
-       struct uart_port *port = &mpc52xx_uart_ports[co->index];
-
-       int baud = 9600;
-       int bits = 8;
-       int parity = 'n';
-       int flow = 'n';
-
-       if (co->index < 0 || co->index >= MPC52xx_PSC_MAXNUM)
-               return -EINVAL;
-       
-       /* Basic port init. Needed since we use some uart_??? func before
-        * real init for early access */
-       port->lock      = SPIN_LOCK_UNLOCKED;
-       port->uartclk   = __res.bi_ipbfreq / 2; /* Look at CTLR doc */
-       port->ops       = &mpc52xx_uart_ops;
-       port->mapbase   = MPC52xx_PSCx(co->index);
-
-               /* We ioremap ourself */
-       port->membase = ioremap(port->mapbase, sizeof(struct mpc52xx_psc));
-       if (port->membase == NULL) {
-               release_mem_region(port->mapbase, sizeof(struct mpc52xx_psc));
-               return -EBUSY;
-       }
-
-       /* Setup the port parameters accoding to options */
-       if (options)
-               uart_parse_options(options, &baud, &parity, &bits, &flow);
-       else
-               mpc52xx_console_get_options(port, &baud, &parity, &bits, &flow);
-
-       return uart_set_options(port, co, baud, parity, bits, flow);
-}
-
-
-extern struct uart_driver mpc52xx_uart_driver;
-
-static struct console mpc52xx_console = {
-       .name   = "ttyS",
-       .write  = mpc52xx_console_write,
-       .device = uart_console_device,
-       .setup  = mpc52xx_console_setup,
-       .flags  = CON_PRINTBUFFER,
-       .index  = -1,   /* Specified on the cmdline (e.g. console=ttyS0 ) */
-       .data   = &mpc52xx_uart_driver,
-};
-
-       
-static int __init 
-mpc52xx_console_init(void)
-{
-       register_console(&mpc52xx_console);
-       return 0;
-}
-
-console_initcall(mpc52xx_console_init);
-
-#define MPC52xx_PSC_CONSOLE &mpc52xx_console
-#else
-#define MPC52xx_PSC_CONSOLE NULL
-#endif
-
-
-/* ======================================================================== */
-/* UART Driver                                                              */
-/* ======================================================================== */
-
-static struct uart_driver mpc52xx_uart_driver = {
-       .owner          = THIS_MODULE,
-       .driver_name    = "mpc52xx_psc_uart",
-       .dev_name       = "ttyS",
-       .devfs_name     = "ttyS",
-       .major          = TTY_MAJOR,
-       .minor          = 64,
-       .nr             = MPC52xx_PSC_MAXNUM,
-       .cons           = MPC52xx_PSC_CONSOLE,
-};
-
-
-/* ======================================================================== */
-/* OCP Driver                                                               */
-/* ======================================================================== */
-
-static int __devinit
-mpc52xx_uart_probe(struct ocp_device *ocp)
-{
-       struct uart_port *port = NULL;
-       int idx, ret;
-
-       /* Get the corresponding port struct */
-       idx = ocp->def->index;
-       if (idx < 0 || idx >= MPC52xx_PSC_MAXNUM)
-               return -EINVAL;
-       
-       port = &mpc52xx_uart_ports[idx];
-
-       /* Init the port structure */
-       port->lock      = SPIN_LOCK_UNLOCKED;
-       port->mapbase   = ocp->def->paddr;
-       port->irq       = ocp->def->irq;
-       port->uartclk   = __res.bi_ipbfreq / 2; /* Look at CTLR doc */
-       port->fifosize  = 255; /* Should be 512 ! But it can't be */
-                              /* stored in a unsigned char       */
-       port->iotype    = UPIO_MEM;
-       port->flags     = UPF_BOOT_AUTOCONF |
-                         ( uart_console(port) ? 0 : UPF_IOREMAP );
-       port->line      = idx;
-       port->ops       = &mpc52xx_uart_ops;
-       port->read_status_mask = 0;
-       
-       /* Requests the mem & irqs */
-       /* Unlike other serial drivers, we reserve the resources here, so we
-        * can detect early if multiple drivers uses the same PSC. Special
-        * care must be taken with the console PSC
-        */
-       ret = request_irq(
-               port->irq, mpc52xx_uart_int,
-               SA_INTERRUPT | SA_SAMPLE_RANDOM, "mpc52xx_psc_uart", port);
-       if (ret)
-               goto error;
-
-       ret = request_mem_region(port->mapbase, sizeof(struct mpc52xx_psc),
-                                "mpc52xx_psc_uart") != NULL ? 0 : -EBUSY;
-       if (ret)
-               goto free_irq;
-
-       /* Add the port to the uart sub-system */
-       ret = uart_add_one_port(&mpc52xx_uart_driver, port);
-       if (ret)
-               goto release_mem;
-
-       ocp_set_drvdata(ocp, (void*)port);
-
-       return 0;
-
-
-free_irq:
-       free_irq(port->irq, mpc52xx_uart_int);
-
-release_mem:
-       release_mem_region(port->mapbase, sizeof(struct mpc52xx_psc));
-
-error:
-       if (uart_console(port))
-               printk( "mpc52xx_uart.c: Error during resource alloction for "
-                       "the console port !!! Check that the console PSC is "
-                       "not used by another OCP driver !!!\n" );
-
-       return ret;
-}
-
-static void
-mpc52xx_uart_remove(struct ocp_device *ocp)
-{
-       struct uart_port *port = (struct uart_port *) ocp_get_drvdata(ocp);
-
-       ocp_set_drvdata(ocp, NULL);
-
-       if (port) {
-               uart_remove_one_port(&mpc52xx_uart_driver, port);
-               release_mem_region(port->mapbase, sizeof(struct mpc52xx_psc));
-               free_irq(port->irq, mpc52xx_uart_int);
-       }
-}
-
-#ifdef CONFIG_PM
-static int
-mpc52xx_uart_suspend(struct ocp_device *ocp, u32 state)
-{
-       struct uart_port *port = (struct uart_port *) ocp_get_drvdata(ocp);
-
-       uart_suspend_port(&mpc52xx_uart_driver, port);
-
-       return 0;
-}
-
-static int
-mpc52xx_uart_resume(struct ocp_device *ocp)
-{
-       struct uart_port *port = (struct uart_port *) ocp_get_drvdata(ocp);
-
-       uart_resume_port(&mpc52xx_uart_driver, port);
-
-       return 0;
-}
-#endif
-
-static struct ocp_device_id mpc52xx_uart_ids[] __devinitdata = {
-       { .vendor = OCP_VENDOR_FREESCALE, .function = OCP_FUNC_PSC_UART },
-       { .vendor = OCP_VENDOR_INVALID /* Terminating entry */ }
-};
-
-MODULE_DEVICE_TABLE(ocp, mpc52xx_uart_ids);
-
-static struct ocp_driver mpc52xx_uart_ocp_driver = {
-       .name           = "mpc52xx_psc_uart",
-       .id_table       = mpc52xx_uart_ids,
-       .probe          = mpc52xx_uart_probe,
-       .remove         = mpc52xx_uart_remove,
-#ifdef CONFIG_PM
-       .suspend        = mpc52xx_uart_suspend,
-       .resume         = mpc52xx_uart_resume,
-#endif
-};
-
-
-/* ======================================================================== */
-/* Module                                                                   */
-/* ======================================================================== */
-
-static int __init
-mpc52xx_uart_init(void)
-{
-       int ret;
-
-       printk(KERN_INFO "Serial: MPC52xx PSC driver\n");
-
-       ret = uart_register_driver(&mpc52xx_uart_driver);
-       if (ret)
-               return ret;
-
-       ret = ocp_register_driver(&mpc52xx_uart_ocp_driver);
-
-       return ret;
-}
-
-static void __exit
-mpc52xx_uart_exit(void)
-{
-       ocp_unregister_driver(&mpc52xx_uart_ocp_driver);
-       uart_unregister_driver(&mpc52xx_uart_driver);
-}
-
-
-module_init(mpc52xx_uart_init);
-module_exit(mpc52xx_uart_exit);
-
-MODULE_AUTHOR("Sylvain Munaut <tnt@246tNt.com>");
-MODULE_DESCRIPTION("Freescale MPC52xx PSC UART");
-MODULE_LICENSE("GPL");
diff --git a/drivers/serial/mpsc/Makefile b/drivers/serial/mpsc/Makefile
deleted file mode 100644 (file)
index 7d9054d..0000000
+++ /dev/null
@@ -1,6 +0,0 @@
-#
-# Make file for the Marvell MPSC driver.
-#
-
-obj-$(CONFIG_SERIAL_MPSC)      += mpsc.o
-obj-$(CONFIG_PPC32)            += mpsc_ppc32.o
diff --git a/drivers/serial/mpsc/mpsc.c b/drivers/serial/mpsc/mpsc.c
deleted file mode 100644 (file)
index de7f97c..0000000
+++ /dev/null
@@ -1,1455 +0,0 @@
-/*
- * drivers/serial/mpsc/mpsc.c
- *
- * Generic driver for the MPSC (UART mode) on Marvell parts (e.g., GT64240,
- * GT64260, MV64340, MV64360, GT96100, ... ).
- *
- * Author: Mark A. Greer <mgreer@mvista.com>
- *
- * Based on an old MPSC driver that was in the linuxppc tree.  It appears to
- * have been created by Chris Zankel (formerly of MontaVista) but there
- * is no proper Copyright so I'm not sure.  Parts were, apparently, also
- * taken from PPCBoot (now U-Boot).  Also based on drivers/serial/8250.c
- * by Russell King.
- *
- * 2004 (c) MontaVista, Software, Inc.  This file is licensed under
- * the terms of the GNU General Public License version 2.  This program
- * is licensed "as is" without any warranty of any kind, whether express
- * or implied.
- */
-/*
- * The MPSC interface is much like a typical network controller's interface.
- * That is, you set up separate rings of descriptors for transmitting and
- * receiving data.  There is also a pool of buffers with (one buffer per
- * descriptor) that incoming data are dma'd into or outgoing data are dma'd
- * out of.
- *
- * The MPSC requires two other controllers to be able to work.  The Baud Rate
- * Generator (BRG) provides a clock at programmable frequencies which determines
- * the baud rate.  The Serial DMA Controller (SDMA) takes incoming data from the
- * MPSC and DMA's it into memory or DMA's outgoing data and passes it to the
- * MPSC.  It is actually the SDMA interrupt that the driver uses to keep the
- * transmit and receive "engines" going (i.e., indicate data has been
- * transmitted or received).
- *
- * NOTES:
- *
- * 1) Some chips have an erratum where several regs cannot be
- * read.  To work around that, we keep a local copy of those regs in
- * 'mpsc_port_info_t' and use the *_M macros when accessing those regs.
- *
- * 2) Some chips have an erratum where the chip will hang when the SDMA ctlr
- * accesses system mem in a cache coherent region.  This *should* be a
- * show-stopper when coherency is turned on but it seems to work okay as
- * long as there are no snoop hits.  Therefore, there are explicit cache
- * management macros in addition to the dma_* calls--the dma_* calls don't
- * do cache mgmt on coherent systems--to manage the cache ensuring there
- * are no snoop hits.
- *
- * 3) AFAICT, hardware flow control isn't supported by the controller --MAG.
- */
-
-#include "mpsc.h"
-
-/*
- * Define how this driver is known to the outside (we've been assigned a
- * range on the "Low-density serial ports" major).
- */
-#define MPSC_MAJOR             204
-#define MPSC_MINOR_START       5       /* XXXX */
-#define        MPSC_DRIVER_NAME        "MPSC"
-#define        MPSC_DEVFS_NAME         "ttym/"
-#define        MPSC_DEV_NAME           "ttyM"
-#define        MPSC_VERSION            "1.00"
-
-static mpsc_port_info_t        mpsc_ports[MPSC_NUM_CTLRS];
-
-
-#undef DEBUG
-
-#ifdef DEBUG
-#define DBG(x...) printk(x)
-#else
-#define DBG(x...)
-#endif
-
-/*
- ******************************************************************************
- *
- * Baud Rate Generator Routines (BRG)
- *
- ******************************************************************************
- */
-static void
-mpsc_brg_init(mpsc_port_info_t *pi, u32 clk_src)
-{
-       if (pi->brg_can_tune) {
-               MPSC_MOD_FIELD_M(pi, brg, BRG_BCR, 1, 25, 0);
-       }
-
-       MPSC_MOD_FIELD_M(pi, brg, BRG_BCR, 4, 18, clk_src);
-       MPSC_MOD_FIELD(pi, brg, BRG_BTR, 16, 0, 0);
-       return;
-}
-
-static void
-mpsc_brg_enable(mpsc_port_info_t *pi)
-{
-       MPSC_MOD_FIELD_M(pi, brg, BRG_BCR, 1, 16, 1);
-       return;
-}
-
-static void
-mpsc_brg_disable(mpsc_port_info_t *pi)
-{
-       MPSC_MOD_FIELD_M(pi, brg, BRG_BCR, 1, 16, 0);
-       return;
-}
-
-static inline void
-mpsc_set_baudrate(mpsc_port_info_t *pi, u32 baud)
-{
-       /*
-        * To set the baud, we adjust the CDV field in the BRG_BCR reg.
-        * From manual: Baud = clk / ((CDV+1)*2) ==> CDV = (clk / (baud*2)) - 1.
-        * However, the input clock is divided by 16 in the MPSC b/c of how
-        * 'MPSC_MMCRH' was set up so we have to divide 'clk' used in our
-        * calculation by 16 to account for that.  So the real calculation
-        * that accounts for the way the mpsc is set up is:
-        * CDV = (clk / (baud*32)) - 1 ==> CDV = (clk / (baud << 5)) -1.
-        */
-       u32     cdv = (pi->port.uartclk/(baud << 5)) - 1;
-
-       mpsc_brg_disable(pi);
-       MPSC_MOD_FIELD_M(pi, brg, BRG_BCR, 16, 0, cdv);
-       mpsc_brg_enable(pi);
-
-       return;
-}
-
-/*
- ******************************************************************************
- *
- * Serial DMA Routines (SDMA)
- *
- ******************************************************************************
- */
-
-static void
-mpsc_sdma_burstsize(mpsc_port_info_t *pi, u32 burst_size)
-{
-       u32     v;
-
-       DBG("mpsc_sdma_burstsize[%d]: burst_size: %d\n",
-               pi->port.line, burst_size);
-
-       burst_size >>= 3; /* Divide by 8 b/c reg values are 8-byte chunks */
-
-       if (burst_size < 2) v = 0x0;            /* 1 64-bit word */
-       else if (burst_size < 4) v = 0x1;       /* 2 64-bit words */
-       else if (burst_size < 8) v = 0x2;       /* 4 64-bit words */
-       else v = 0x3;                           /* 8 64-bit words */
-
-       MPSC_MOD_FIELD(pi, sdma, SDMA_SDC, 2, 12, v);
-       return;
-}
-
-static void
-mpsc_sdma_init(mpsc_port_info_t *pi, u32 burst_size)
-{
-       DBG("mpsc_sdma_init[%d]: burst_size: %d\n", pi->port.line, burst_size);
-
-       MPSC_MOD_FIELD(pi, sdma, SDMA_SDC, 10, 0, 0x03f);
-       mpsc_sdma_burstsize(pi, burst_size);
-       return;
-}
-
-static inline u32
-mpsc_sdma_intr_mask(mpsc_port_info_t *pi, u32 mask)
-{
-       u32     old, v;
-
-       DBG("mpsc_sdma_intr_mask[%d]: mask: 0x%x\n", pi->port.line, mask);
-
-       old = v = MPSC_READ_M(pi, sdma_intr, SDMA_INTR_MASK);
-       mask &= 0xf;
-       if (pi->port.line) mask <<= 8;
-       v &= ~mask;
-       MPSC_WRITE_M(pi, sdma_intr, SDMA_INTR_MASK, v);
-
-       if (pi->port.line) old >>= 8;
-       return old & 0xf;
-}
-
-static inline void
-mpsc_sdma_intr_unmask(mpsc_port_info_t *pi, u32 mask)
-{
-       u32     v;
-
-       DBG("mpsc_sdma_intr_unmask[%d]: clk_src: 0x%x\n", pi->port.line, mask);
-
-       v = MPSC_READ_M(pi, sdma_intr, SDMA_INTR_MASK);
-       mask &= 0xf;
-       if (pi->port.line) mask <<= 8;
-       v |= mask;
-       MPSC_WRITE_M(pi, sdma_intr, SDMA_INTR_MASK, v);
-       return;
-}
-
-static inline void
-mpsc_sdma_intr_ack(mpsc_port_info_t *pi)
-{
-       DBG("mpsc_sdma_intr_ack[%d]: Acknowledging IRQ\n", pi->port.line);
-       MPSC_WRITE(pi, sdma_intr, SDMA_INTR_CAUSE, 0);
-       return;
-}
-
-static inline void
-mpsc_sdma_set_rx_ring(mpsc_port_info_t *pi, mpsc_rx_desc_t *rxre_p)
-{
-       DBG("mpsc_sdma_set_rx_ring[%d]: rxre_p: 0x%x\n",
-               pi->port.line, (uint)rxre_p);
-
-       MPSC_WRITE(pi, sdma, SDMA_SCRDP, (u32)rxre_p);
-       return;
-}
-
-static inline void
-mpsc_sdma_set_tx_ring(mpsc_port_info_t *pi, volatile mpsc_tx_desc_t *txre_p)
-{
-       MPSC_WRITE(pi, sdma, SDMA_SFTDP, (int)txre_p);
-       MPSC_WRITE(pi, sdma, SDMA_SCTDP, (int)txre_p);
-       return;
-}
-
-static inline void
-mpsc_sdma_cmd(mpsc_port_info_t *pi, u32 val)
-{
-       u32     v;
-
-       v = MPSC_READ(pi, sdma, SDMA_SDCM);
-       if (val)
-               v |= val;
-       else
-               v = 0;
-       MPSC_WRITE(pi, sdma, SDMA_SDCM, v);
-       return;
-}
-
-static inline void
-mpsc_sdma_start_tx(mpsc_port_info_t *pi, volatile mpsc_tx_desc_t *txre_p)
-{
-       mpsc_sdma_set_tx_ring(pi, txre_p);
-       mpsc_sdma_cmd(pi, SDMA_SDCM_TXD);
-       return;
-}
-
-static inline void
-mpsc_sdma_stop(mpsc_port_info_t *pi)
-{
-       DBG("mpsc_sdma_stop[%d]: Stopping SDMA\n", pi->port.line);
-
-       /* Abort any SDMA transfers */
-       mpsc_sdma_cmd(pi, 0);
-       mpsc_sdma_cmd(pi, SDMA_SDCM_AR | SDMA_SDCM_AT);
-
-       /* Clear the SDMA current and first TX and RX pointers */
-       mpsc_sdma_set_tx_ring(pi, 0);
-       mpsc_sdma_set_rx_ring(pi, 0);
-       /* udelay(100); XXXX was in original gt64260 driver */
-
-       /* Disable interrupts */
-       mpsc_sdma_intr_mask(pi, 0xf);
-       mpsc_sdma_intr_ack(pi);
-        udelay(1000);
-
-       return;
-}
-
-/*
- ******************************************************************************
- *
- * Multi-Protocol Serial Controller Routines (MPSC)
- *
- ******************************************************************************
- */
-
-static void
-mpsc_hw_init(mpsc_port_info_t *pi)
-{
-       DBG("mpsc_hw_init[%d]: Initializing hardware\n", pi->port.line);
-
-       /* Set up clock routing */
-       MPSC_MOD_FIELD_M(pi, mpsc_routing, MPSC_MRR, 3, 0, 0);
-       MPSC_MOD_FIELD_M(pi, mpsc_routing, MPSC_MRR, 3, 6, 0);
-       MPSC_MOD_FIELD_M(pi, mpsc_routing, MPSC_RCRR, 4, 0, 0);
-       MPSC_MOD_FIELD_M(pi, mpsc_routing, MPSC_RCRR, 4, 8, 1);
-       MPSC_MOD_FIELD_M(pi, mpsc_routing, MPSC_TCRR, 4, 0, 0);
-       MPSC_MOD_FIELD_M(pi, mpsc_routing, MPSC_TCRR, 4, 8, 1);
-
-       /* Put MPSC in UART mode & enabel Tx/Rx egines */
-       MPSC_WRITE(pi, mpsc, MPSC_MMCRL, 0x000004c4);
-
-       /* No preamble, 16x divider, low-latency,  */
-       MPSC_WRITE(pi, mpsc, MPSC_MMCRH, 0x04400400);
-
-       MPSC_WRITE_M(pi, mpsc, MPSC_CHR_1, 0);
-       MPSC_WRITE_M(pi, mpsc, MPSC_CHR_2, 0);
-       MPSC_WRITE(pi, mpsc, MPSC_CHR_3, pi->mpsc_max_idle);
-       MPSC_WRITE(pi, mpsc, MPSC_CHR_4, 0);
-       MPSC_WRITE(pi, mpsc, MPSC_CHR_5, 0);
-       MPSC_WRITE(pi, mpsc, MPSC_CHR_6, 0);
-       MPSC_WRITE(pi, mpsc, MPSC_CHR_7, 0);
-       MPSC_WRITE(pi, mpsc, MPSC_CHR_8, 0);
-       MPSC_WRITE(pi, mpsc, MPSC_CHR_9, 0);
-       MPSC_WRITE(pi, mpsc, MPSC_CHR_10, 0);
-
-       return;
-}
-
-static inline void
-mpsc_enter_hunt(mpsc_port_info_t *pi)
-{
-       u32     v;
-
-       DBG("mpsc_enter_hunt[%d]: Hunting...\n", pi->port.line);
-
-       MPSC_MOD_FIELD_M(pi, mpsc, MPSC_CHR_2, 1, 31, 1);
-
-       if (pi->mirror_regs) {
-               udelay(100);
-       }
-       else
-               do {
-                       v = MPSC_READ_M(pi, mpsc, MPSC_CHR_2);
-               } while (v & MPSC_CHR_2_EH);
-
-       return;
-}
-
-static void
-mpsc_freeze(mpsc_port_info_t *pi)
-{
-       DBG("mpsc_freeze[%d]: Freezing\n", pi->port.line);
-
-       MPSC_MOD_FIELD_M(pi, mpsc, MPSC_MPCR, 1, 9, 1);
-       return;
-}
-
-static inline void
-mpsc_unfreeze(mpsc_port_info_t *pi)
-{
-       MPSC_MOD_FIELD_M(pi, mpsc, MPSC_MPCR, 1, 9, 0);
-
-       DBG("mpsc_unfreeze[%d]: Unfrozen\n", pi->port.line);
-       return;
-}
-
-static inline void
-mpsc_set_char_length(mpsc_port_info_t *pi, u32 len)
-{
-       DBG("mpsc_set_char_length[%d]: char len: %d\n", pi->port.line, len);
-
-       MPSC_MOD_FIELD_M(pi, mpsc, MPSC_MPCR, 2, 12, len);
-       return;
-}
-
-static inline void
-mpsc_set_stop_bit_length(mpsc_port_info_t *pi, u32 len)
-{
-       DBG("mpsc_set_stop_bit_length[%d]: stop bits: %d\n",pi->port.line,len);
-
-       MPSC_MOD_FIELD_M(pi, mpsc, MPSC_MPCR, 1, 14, len);
-       return;
-}
-
-static inline void
-mpsc_set_parity(mpsc_port_info_t *pi, u32 p)
-{
-       DBG("mpsc_set_parity[%d]: parity bits: 0x%x\n", pi->port.line, p);
-
-       MPSC_MOD_FIELD_M(pi, mpsc, MPSC_CHR_2, 2, 2, p);        /* TPM */
-       MPSC_MOD_FIELD_M(pi, mpsc, MPSC_CHR_2, 2, 18, p);       /* RPM */
-       return;
-}
-
-/*
- ******************************************************************************
- *
- * Driver Init Routines
- *
- ******************************************************************************
- */
-
-static void
-mpsc_init_hw(mpsc_port_info_t *pi)
-{
-       DBG("mpsc_init_hw[%d]: Initializing\n", pi->port.line);
-
-       mpsc_brg_init(pi, pi->brg_clk_src);
-       mpsc_brg_enable(pi);
-       mpsc_sdma_init(pi, dma_get_cache_alignment());/* burst a cacheline */
-       mpsc_sdma_stop(pi); 
-       mpsc_hw_init(pi);
-
-       return;
-}
-
-static int
-mpsc_alloc_ring_mem(mpsc_port_info_t *pi)
-{
-       int     rc = 0;
-       static void mpsc_free_ring_mem(mpsc_port_info_t *pi);
-
-       DBG("mpsc_alloc_ring_mem[%d]: Allocating ring mem\n", pi->port.line);
-
-       pi->desc_region_size = MPSC_TXR_SIZE + MPSC_RXR_SIZE +
-               (2 * MPSC_DESC_ALIGN);
-       pi->buf_region_size = MPSC_TXB_SIZE + MPSC_RXB_SIZE +
-               (2 * MPSC_BUF_ALIGN);
-
-       if (!pi->desc_region) {
-               if (!dma_supported(pi->port.dev, 0xffffffff)) {
-                       printk(KERN_ERR "MPSC: inadequate DMA support\n");
-                       rc = -ENXIO;
-               }
-               else if ((pi->desc_region = dma_alloc_coherent(pi->port.dev,
-                       pi->desc_region_size, &pi->desc_region_p,
-                       GFP_KERNEL)) == NULL) {
-
-                       printk(KERN_ERR "MPSC: can't alloc Desc region\n");
-                       rc = -ENOMEM;
-               }
-               else if ((pi->buf_region = kmalloc(pi->buf_region_size,
-                       GFP_KERNEL)) == NULL) {
-
-                       printk(KERN_ERR "MPSC: can't alloc bufs\n");
-                       mpsc_free_ring_mem(pi);
-                       rc = -ENOMEM;
-               }
-       }
-
-       return rc;
-}
-
-static void
-mpsc_free_ring_mem(mpsc_port_info_t *pi)
-{
-       DBG("mpsc_free_ring_mem[%d]: Freeing ring mem\n", pi->port.line);
-
-       if (pi->desc_region) {
-               MPSC_CACHE_INVALIDATE(pi, pi->desc_region,
-                       pi->desc_region + pi->desc_region_size);
-               dma_free_coherent(pi->port.dev, pi->desc_region_size,
-                       pi->desc_region, pi->desc_region_p);
-               pi->desc_region = NULL;
-               pi->desc_region_p = (dma_addr_t)NULL;
-       }
-
-       if (pi->buf_region) {
-               MPSC_CACHE_INVALIDATE(pi, pi->buf_region,
-                       pi->buf_region + pi->buf_region_size);
-               kfree(pi->buf_region);
-               pi->buf_region = NULL;
-       }
-
-       return;
-}
-
-static void
-mpsc_init_rings(mpsc_port_info_t *pi)
-{
-       mpsc_rx_desc_t  *rxre, *rxre_p;
-       mpsc_tx_desc_t  *txre, *txre_p;
-       u32             bp_p, save_first, i;
-       u8              *bp;
-
-       DBG("mpsc_init_rings[%d]: Initializing rings\n", pi->port.line);
-
-       BUG_ON((pi->desc_region == NULL) || (pi->buf_region == NULL));
-
-       memset(pi->desc_region, 0, pi->desc_region_size);
-       memset(pi->buf_region, 0, pi->buf_region_size);
-
-       pi->rxr = (mpsc_rx_desc_t *)ALIGN((u32)pi->desc_region,
-               (u32)MPSC_DESC_ALIGN);
-       pi->rxr_p = (mpsc_rx_desc_t *)ALIGN((u32)pi->desc_region_p,
-               (u32)MPSC_DESC_ALIGN);
-       pi->rxb = (u8 *)ALIGN((u32)pi->buf_region, (u32)MPSC_BUF_ALIGN);
-       pi->rxb_p = __pa(pi->rxb);
-
-       rxre = pi->rxr;
-       rxre_p = pi->rxr_p;
-       save_first = (u32)rxre_p;
-       bp = pi->rxb;
-       bp_p = pi->rxb_p;
-       for (i=0; i<MPSC_RXR_ENTRIES; i++,rxre++,rxre_p++) {
-               rxre->bufsize = cpu_to_be16(MPSC_RXBE_SIZE);
-               rxre->bytecnt = cpu_to_be16(0);
-               rxre->cmdstat = cpu_to_be32(SDMA_DESC_CMDSTAT_O |
-                       SDMA_DESC_CMDSTAT_EI | SDMA_DESC_CMDSTAT_F |
-                       SDMA_DESC_CMDSTAT_L);
-               rxre->link = cpu_to_be32(rxre_p + 1);
-               rxre->buf_ptr = cpu_to_be32(bp_p);
-               MPSC_CACHE_FLUSH(pi, rxre, rxre + 1);
-               dma_map_single(pi->port.dev, bp, MPSC_RXBE_SIZE,
-                       DMA_FROM_DEVICE);
-               MPSC_CACHE_INVALIDATE(pi, bp, bp + MPSC_RXBE_SIZE);
-               bp += MPSC_RXBE_SIZE;
-               bp_p += MPSC_RXBE_SIZE;
-       }
-       (--rxre)->link = cpu_to_be32(save_first); /* Wrap last back to first */
-       MPSC_CACHE_FLUSH(pi, rxre, rxre + 1);
-
-       pi->txr = (mpsc_tx_desc_t *)ALIGN((u32)&pi->rxr[MPSC_RXR_ENTRIES],
-               (u32)MPSC_DESC_ALIGN);
-       pi->txr_p = (mpsc_tx_desc_t *)ALIGN((u32)&pi->rxr_p[MPSC_RXR_ENTRIES],
-               (u32)MPSC_DESC_ALIGN);
-       pi->txb = (u8 *)ALIGN((u32)(pi->rxb + MPSC_RXB_SIZE),
-               (u32)MPSC_BUF_ALIGN);
-       pi->txb_p = __pa(pi->txb);
-
-       txre = pi->txr;
-       txre_p = pi->txr_p;
-       save_first = (u32)txre_p;
-       bp = pi->txb;
-       bp_p = pi->txb_p;
-       for (i=0; i<MPSC_TXR_ENTRIES; i++,txre++,txre_p++) {
-               txre->link = cpu_to_be32(txre_p + 1);
-               txre->buf_ptr = cpu_to_be32(bp_p);
-               MPSC_CACHE_FLUSH(pi, txre, txre + 1);
-               dma_map_single(pi->port.dev, bp, MPSC_TXBE_SIZE, DMA_TO_DEVICE);
-               bp += MPSC_TXBE_SIZE;
-               bp_p += MPSC_TXBE_SIZE;
-       }
-       (--txre)->link = cpu_to_be32(save_first); /* Wrap last back to first */
-       MPSC_CACHE_FLUSH(pi, txre, txre + 1);
-
-       return;
-}
-
-static void
-mpsc_uninit_rings(mpsc_port_info_t *pi)
-{
-       u32             bp_p, i;
-
-       DBG("mpsc_uninit_rings[%d]: Uninitializing rings\n", pi->port.line);
-
-       BUG_ON((pi->desc_region == NULL) || (pi->buf_region == NULL));
-
-       bp_p = pi->rxb_p;
-       for (i=0; i<MPSC_RXR_ENTRIES; i++) {
-               dma_unmap_single(pi->port.dev, bp_p, MPSC_RXBE_SIZE,
-                       DMA_FROM_DEVICE);
-               bp_p += MPSC_RXBE_SIZE;
-       }
-       pi->rxr = NULL;
-       pi->rxr_p = NULL;
-       pi->rxr_posn = 0;
-       pi->rxb = NULL;
-       pi->rxb_p = 0;
-
-       bp_p = pi->txb_p;
-       for (i=0; i<MPSC_TXR_ENTRIES; i++) {
-               dma_unmap_single(pi->port.dev, bp_p, MPSC_TXBE_SIZE,
-                       DMA_TO_DEVICE);
-               bp_p += MPSC_TXBE_SIZE;
-       }
-       pi->txr = NULL;
-       pi->txr_p = NULL;
-       pi->txr_posn = 0;
-       pi->txb = NULL;
-       pi->txb_p = 0;
-
-       return;
-}
-
-static int
-mpsc_make_ready(mpsc_port_info_t *pi)
-{
-       int     rc;
-
-       DBG("mpsc_make_ready[%d]: Making cltr ready\n", pi->port.line);
-
-       if (!pi->ready) {
-               mpsc_init_hw(pi);
-               if ((rc = mpsc_alloc_ring_mem(pi)))
-                       return rc;
-               mpsc_init_rings(pi);
-               pi->ready = 1;
-       }
-
-       return 0;
-}
-
-/*
- ******************************************************************************
- *
- * Interrupt Handling Routines
- *
- ******************************************************************************
- */
-
-static inline void
-mpsc_rx_intr(mpsc_port_info_t *pi, struct pt_regs *regs)
-{
-       volatile mpsc_rx_desc_t *rxre = &pi->rxr[pi->rxr_posn];
-       struct tty_struct       *tty = pi->port.info->tty;
-       u32                     cmdstat, bytes_in;
-       u8                      *bp;
-       dma_addr_t              bp_p;
-       static void mpsc_start_rx(mpsc_port_info_t *pi);
-
-       DBG("mpsc_rx_intr[%d]: Handling Rx intr\n", pi->port.line);
-
-       /*
-        * Loop through Rx descriptors handling ones that have been completed.
-        */
-       MPSC_CACHE_INVALIDATE(pi, rxre, rxre + 1);
-
-       while (!((cmdstat = be32_to_cpu(rxre->cmdstat)) & SDMA_DESC_CMDSTAT_O)){
-               bytes_in = be16_to_cpu(rxre->bytecnt);
-
-               if (unlikely((tty->flip.count + bytes_in) >= TTY_FLIPBUF_SIZE)){
-                       tty->flip.work.func((void *)tty);
-
-                       if ((tty->flip.count + bytes_in) >= TTY_FLIPBUF_SIZE) {
-                               /* Take what we can, throw away the rest */
-                               bytes_in = TTY_FLIPBUF_SIZE - tty->flip.count;
-                               cmdstat &= ~SDMA_DESC_CMDSTAT_PE;
-                       }
-               }
-
-               bp = pi->rxb + (pi->rxr_posn * MPSC_RXBE_SIZE);
-               bp_p = pi->txb_p + (pi->rxr_posn * MPSC_RXBE_SIZE);
-
-               dma_sync_single_for_cpu(pi->port.dev, bp_p, MPSC_RXBE_SIZE,
-                       DMA_FROM_DEVICE);
-               MPSC_CACHE_INVALIDATE(pi, bp, bp + MPSC_RXBE_SIZE);
-
-               /*
-                * Other than for parity error, the manual provides little
-                * info on what data will be in a frame flagged by any of
-                * these errors.  For parity error, it is the last byte in
-                * the buffer that had the error.  As for the rest, I guess
-                * we'll assume there is no data in the buffer.
-                * If there is...it gets lost.
-                */
-               if (cmdstat & (SDMA_DESC_CMDSTAT_BR | SDMA_DESC_CMDSTAT_FR |
-                       SDMA_DESC_CMDSTAT_OR)) {
-
-                       pi->port.icount.rx++;
-
-                       if (cmdstat & SDMA_DESC_CMDSTAT_BR) { /* Break */
-                               pi->port.icount.brk++;
-
-                               if (uart_handle_break(&pi->port))
-                                       goto next_frame;
-                       }
-                       else if (cmdstat & SDMA_DESC_CMDSTAT_FR) /* Framing */
-                               pi->port.icount.frame++;
-                       else if (cmdstat & SDMA_DESC_CMDSTAT_OR) /* Overrun */
-                               pi->port.icount.overrun++;
-
-                       cmdstat &= pi->port.read_status_mask;
-
-                       if (!(cmdstat & pi->port.ignore_status_mask)) {
-                               if (cmdstat & SDMA_DESC_CMDSTAT_BR)
-                                       *tty->flip.flag_buf_ptr = TTY_BREAK;
-                               else if (cmdstat & SDMA_DESC_CMDSTAT_FR)
-                                       *tty->flip.flag_buf_ptr = TTY_FRAME;
-                               else if (cmdstat & SDMA_DESC_CMDSTAT_OR)
-                                       *tty->flip.flag_buf_ptr = TTY_OVERRUN;
-
-                               tty->flip.flag_buf_ptr++;
-                               *tty->flip.char_buf_ptr = '\0';
-                               tty->flip.char_buf_ptr++;
-                               tty->flip.count++;
-                       }
-               }
-               else {
-                       if (uart_handle_sysrq_char(&pi->port, *bp, regs)) {
-                               bp++;
-                               bytes_in--;
-                       }
-
-                       memcpy(tty->flip.char_buf_ptr, bp, bytes_in);
-                       memset(tty->flip.flag_buf_ptr, TTY_NORMAL, bytes_in);
-
-                       tty->flip.char_buf_ptr += bytes_in;
-                       tty->flip.flag_buf_ptr += bytes_in;
-                       tty->flip.count += bytes_in;
-                       pi->port.icount.rx += bytes_in;
-
-                       cmdstat &= SDMA_DESC_CMDSTAT_PE;
-
-                       if (cmdstat) {  /* Parity */
-                               pi->port.icount.parity++;
-
-                               if (!(cmdstat & pi->port.read_status_mask))
-                                       *(tty->flip.flag_buf_ptr-1) = TTY_FRAME;
-                       }
-               }
-
-next_frame:
-               dma_sync_single_for_device(pi->port.dev, bp_p,
-                       MPSC_RXBE_SIZE, DMA_FROM_DEVICE);
-               rxre->bytecnt = cpu_to_be16(0);
-               wmb(); /* ensure other writes done before cmdstat update */
-               rxre->cmdstat = cpu_to_be32(SDMA_DESC_CMDSTAT_O |
-                       SDMA_DESC_CMDSTAT_EI | SDMA_DESC_CMDSTAT_F |
-                       SDMA_DESC_CMDSTAT_L);
-               MPSC_CACHE_FLUSH(pi, rxre, rxre + 1);
-
-               /* Advance to next descriptor */
-               pi->rxr_posn = (pi->rxr_posn + 1) & (MPSC_RXR_ENTRIES - 1);
-               rxre = &pi->rxr[pi->rxr_posn];
-               MPSC_CACHE_INVALIDATE(pi, rxre, rxre + 1);
-       }
-
-       /* Restart rx engine, if its stopped */
-       if ((MPSC_READ(pi, sdma, SDMA_SDCM) & SDMA_SDCM_ERD) == 0) {
-               mpsc_start_rx(pi);
-       }
-
-       tty_flip_buffer_push(tty);
-       return;
-}
-
-static inline void
-mpsc_send_tx_data(mpsc_port_info_t *pi, volatile mpsc_tx_desc_t *txre,
-       volatile mpsc_tx_desc_t *txre_p, void *bp, u32 count, u32 intr)
-{
-       dma_sync_single_for_device(pi->port.dev, be32_to_cpu(txre->buf_ptr),
-                       MPSC_TXBE_SIZE, DMA_TO_DEVICE);
-       MPSC_CACHE_FLUSH(pi, bp, bp + MPSC_TXBE_SIZE);
-
-       txre->bytecnt = cpu_to_be16(count);
-       txre->shadow = txre->bytecnt;
-       wmb(); /* ensure cmdstat is last field updated */
-       txre->cmdstat = cpu_to_be32(SDMA_DESC_CMDSTAT_O | SDMA_DESC_CMDSTAT_F |
-               SDMA_DESC_CMDSTAT_L | ((intr) ? SDMA_DESC_CMDSTAT_EI : 0));
-       MPSC_CACHE_FLUSH(pi, txre, txre + 1);
-
-       /* Start Tx engine, if its stopped */
-       if ((MPSC_READ(pi, sdma, SDMA_SDCM) & SDMA_SDCM_TXD) == 0) {
-               mpsc_sdma_start_tx(pi, txre_p);
-       }
-
-       return;
-}
-
-static inline void
-mpsc_tx_intr(mpsc_port_info_t *pi)
-{
-       volatile mpsc_tx_desc_t *txre = &pi->txr[pi->txr_posn];
-       volatile mpsc_tx_desc_t *txre_p = &pi->txr_p[pi->txr_posn];
-       struct circ_buf         *xmit = &pi->port.info->xmit;
-       u8                      *bp;
-       u32                     i;
-
-       MPSC_CACHE_INVALIDATE(pi, txre, txre + 1);
-
-       while (!(be32_to_cpu(txre->cmdstat) & SDMA_DESC_CMDSTAT_O)) {
-               bp = &pi->txb[pi->txr_posn * MPSC_TXBE_SIZE];
-
-               dma_sync_single_for_cpu(pi->port.dev,be32_to_cpu(txre->buf_ptr),
-                       MPSC_TXBE_SIZE, DMA_TO_DEVICE);
-
-               if (pi->port.x_char) {
-                       /*
-                        * Ideally, we should use the TCS field in CHR_1 to
-                        * put the x_char out immediately but errata prevents
-                        * us from being able to read CHR_2 to know that its
-                        * safe to write to CHR_1.  Instead, just put it
-                        * in-band with all the other Tx data.
-                        */
-                       *bp = pi->port.x_char;
-                       pi->port.x_char = 0;
-                       i = 1;
-               }
-               else if (!uart_circ_empty(xmit) && !uart_tx_stopped(&pi->port)){
-                       i = MIN(MPSC_TXBE_SIZE, uart_circ_chars_pending(xmit));
-                       i = MIN(i, CIRC_CNT_TO_END(xmit->head, xmit->tail,
-                                                       UART_XMIT_SIZE));
-                       memcpy(bp, &xmit->buf[xmit->tail], i);
-                       xmit->tail = (xmit->tail + i) & (UART_XMIT_SIZE - 1);
-               }
-               else { /* No more data to transmit or tx engine is stopped */
-                       MPSC_CACHE_INVALIDATE(pi, txre, txre + 1);
-                       return;
-               }
-
-               mpsc_send_tx_data(pi, txre, txre_p, bp, i, 1);
-               pi->port.icount.tx += i;
-
-               if (uart_circ_chars_pending(xmit) < WAKEUP_CHARS)
-                       uart_write_wakeup(&pi->port);
-
-               /* Advance to next descriptor */
-               pi->txr_posn = (pi->txr_posn + 1) & (MPSC_TXR_ENTRIES - 1);
-               txre = &pi->txr[pi->txr_posn];
-               txre_p = &pi->txr_p[pi->txr_posn];
-               MPSC_CACHE_INVALIDATE(pi, txre, txre + 1);
-       }
-
-       return;
-}
-
-/*
- * This is the driver's interrupt handler.  To avoid a race, we first clear
- * the interrupt, then handle any completed Rx/Tx descriptors.  When done
- * handling those descriptors, we restart the Rx/Tx engines if they're stopped.
- */
-static irqreturn_t
-mpsc_sdma_intr(int irq, void *dev_id, struct pt_regs *regs)
-{
-       mpsc_port_info_t        *pi = dev_id;
-       ulong                   iflags;
-
-       DBG("mpsc_sdma_intr[%d]: SDMA Interrupt Received\n", pi->port.line);
-
-       spin_lock_irqsave(&pi->port.lock, iflags);
-       mpsc_sdma_intr_ack(pi);
-       mpsc_rx_intr(pi, regs);
-       mpsc_tx_intr(pi);
-       spin_unlock_irqrestore(&pi->port.lock, iflags);
-
-       DBG("mpsc_sdma_intr[%d]: SDMA Interrupt Handled\n", pi->port.line);
-       return IRQ_HANDLED;
-}
-
-/*
- ******************************************************************************
- *
- * serial_core.c Interface routines
- *
- ******************************************************************************
- */
-
-static uint
-_mpsc_tx_empty(mpsc_port_info_t *pi)
-{
-       return (((MPSC_READ(pi, sdma, SDMA_SDCM) & SDMA_SDCM_TXD) == 0) ?
-                                                       TIOCSER_TEMT : 0);
-}
-
-static uint
-mpsc_tx_empty(struct uart_port *port)
-{
-       mpsc_port_info_t        *pi = (mpsc_port_info_t *)port;
-       ulong                   iflags;
-       uint                    rc;
-
-       spin_lock_irqsave(&pi->port.lock, iflags);
-       rc = _mpsc_tx_empty(pi);
-       spin_unlock_irqrestore(&pi->port.lock, iflags);
-
-       return rc;
-}
-
-static void
-mpsc_set_mctrl(struct uart_port *port, uint mctrl)
-{
-       /* Have no way to set modem control lines AFAICT */
-       return;
-}
-
-static uint
-mpsc_get_mctrl(struct uart_port *port)
-{
-       mpsc_port_info_t        *pi = (mpsc_port_info_t *)port;
-       u32                     mflags, status;
-       ulong                   iflags;
-
-       spin_lock_irqsave(&pi->port.lock, iflags);
-       status = MPSC_READ_M(pi, mpsc, MPSC_CHR_10);
-       spin_unlock_irqrestore(&pi->port.lock, iflags);
-
-       mflags = 0;
-       if (status & 0x1)
-               mflags |= TIOCM_CTS;
-       if (status & 0x2)
-               mflags |= TIOCM_CAR;
-
-       return mflags | TIOCM_DSR;      /* No way to tell if DSR asserted */
-}
-
-static void
-mpsc_stop_tx(struct uart_port *port, uint tty_start)
-{
-       mpsc_port_info_t *pi = (mpsc_port_info_t *)port;
-
-       DBG("mpsc_stop_tx[%d]: tty_start: %d\n", port->line, tty_start);
-
-       mpsc_freeze(pi);
-       return;
-}
-
-static void
-mpsc_start_tx(struct uart_port *port, uint tty_start)
-{
-       mpsc_port_info_t *pi = (mpsc_port_info_t *)port;
-
-       mpsc_unfreeze(pi);
-       mpsc_tx_intr(pi); /* Load Tx data into Tx ring bufs & go */
-
-       DBG("mpsc_start_tx[%d]: tty_start: %d\n", port->line, tty_start);
-       return;
-}
-
-static void
-mpsc_start_rx(mpsc_port_info_t *pi)
-{
-       DBG("mpsc_start_rx[%d]: Starting...\n", pi->port.line);
-
-       if (pi->rcv_data) {
-               mb();
-               mpsc_enter_hunt(pi);
-               mpsc_sdma_cmd(pi, SDMA_SDCM_ERD);
-       }
-       return;
-}
-
-static void
-mpsc_stop_rx(struct uart_port *port)
-{
-       mpsc_port_info_t *pi = (mpsc_port_info_t *)port;
-
-       DBG("mpsc_stop_rx[%d]: Stopping...\n", port->line);
-
-       mpsc_sdma_cmd(pi, SDMA_SDCM_AR);
-       return;
-}
-
-static void
-mpsc_enable_ms(struct uart_port *port)
-{
-       return;         /* Not supported */
-}
-
-static void
-mpsc_break_ctl(struct uart_port *port, int ctl)
-{
-       mpsc_port_info_t        *pi = (mpsc_port_info_t *)port;
-       ulong                   flags;
-
-       spin_lock_irqsave(&pi->port.lock, flags);
-       if (ctl) {
-               /* Send as many BRK chars as we can */
-               MPSC_WRITE_M(pi, mpsc, MPSC_CHR_1, 0x00ff0000);
-       }
-       else {
-               /* Stop sending BRK chars */
-               MPSC_WRITE_M(pi, mpsc, MPSC_CHR_1, 0);
-       }
-       spin_unlock_irqrestore(&pi->port.lock, flags);
-
-       return;
-}
-
-static int
-mpsc_startup(struct uart_port *port)
-{
-       mpsc_port_info_t        *pi = (mpsc_port_info_t *)port;
-       int                     rc;
-
-       DBG("mpsc_startup[%d]: Starting up MPSC, irq: %d\n",
-               port->line, pi->port.irq);
-
-       if ((rc = mpsc_make_ready(pi)) == 0) {
-               /* Setup IRQ handler */
-               mpsc_sdma_intr_ack(pi);
-               mpsc_sdma_intr_unmask(pi, 0xf);
-
-               if (request_irq(pi->port.irq, mpsc_sdma_intr, 0, "MPSC/SDMA",
-                                                                       pi)) {
-                       printk(KERN_ERR "MPSC: Can't get SDMA IRQ");
-                       printk("MPSC: Can't get SDMA IRQ %d\n", pi->port.irq);
-               }
-
-               mpsc_sdma_set_rx_ring(pi, &pi->rxr_p[pi->rxr_posn]);
-               mpsc_start_rx(pi);
-       }
-
-       return rc;
-}
-
-static void
-mpsc_shutdown(struct uart_port *port)
-{
-       mpsc_port_info_t *pi = (mpsc_port_info_t *)port;
-       static void mpsc_release_port(struct uart_port *port);
-
-       DBG("mpsc_shutdown[%d]: Shutting down MPSC\n", port->line);
-
-       mpsc_sdma_stop(pi);
-       free_irq(pi->port.irq, pi);
-       return;
-}
-
-static void
-mpsc_set_termios(struct uart_port *port, struct termios *termios,
-                      struct termios *old)
-{
-       mpsc_port_info_t        *pi = (mpsc_port_info_t *)port;
-       u32                     baud, quot;
-       ulong                   flags;
-       u32                     chr_bits, stop_bits, par;
-
-       pi->c_iflag = termios->c_iflag;
-       pi->c_cflag = termios->c_cflag;
-
-       switch (termios->c_cflag & CSIZE) {
-               case CS5:
-                       chr_bits = MPSC_MPCR_CL_5;
-                       break;
-               case CS6:
-                       chr_bits = MPSC_MPCR_CL_6;
-                       break;
-               case CS7:
-                       chr_bits = MPSC_MPCR_CL_7;
-                       break;
-               default:
-               case CS8:
-                       chr_bits = MPSC_MPCR_CL_8;
-                       break;
-       }
-
-       if (termios->c_cflag & CSTOPB)
-               stop_bits = MPSC_MPCR_SBL_2;
-       else
-               stop_bits = MPSC_MPCR_SBL_1;
-
-       if (termios->c_cflag & PARENB) {
-               if (termios->c_cflag & PARODD)
-                       par = MPSC_CHR_2_PAR_ODD;
-               else
-                       par = MPSC_CHR_2_PAR_EVEN;
-#ifdef CMSPAR
-               if (termios->c_cflag & CMSPAR) {
-                       if (termios->c_cflag & PARODD)
-                               par = MPSC_CHR_2_PAR_MARK;
-                       else
-                               par = MPSC_CHR_2_PAR_SPACE;
-               }
-#endif
-       }
-
-       baud = uart_get_baud_rate(port, termios, old, 0, port->uartclk); 
-       quot = uart_get_divisor(port, baud);
-
-       spin_lock_irqsave(&pi->port.lock, flags);
-
-       uart_update_timeout(port, termios->c_cflag, baud);
-
-       mpsc_set_char_length(pi, chr_bits);
-       mpsc_set_stop_bit_length(pi, stop_bits);
-       mpsc_set_parity(pi, par);
-       mpsc_set_baudrate(pi, baud);
-
-       /* Characters/events to read */
-       pi->rcv_data = 1;
-       pi->port.read_status_mask = SDMA_DESC_CMDSTAT_OR;
-
-       if (termios->c_iflag & INPCK)
-               pi->port.read_status_mask |= SDMA_DESC_CMDSTAT_PE |
-                       SDMA_DESC_CMDSTAT_FR;
-
-       if (termios->c_iflag & (BRKINT | PARMRK))
-               pi->port.read_status_mask |= SDMA_DESC_CMDSTAT_BR;
-
-       /* Characters/events to ignore */
-       pi->port.ignore_status_mask = 0;
-
-       if (termios->c_iflag & IGNPAR)
-               pi->port.ignore_status_mask |= SDMA_DESC_CMDSTAT_PE |
-                       SDMA_DESC_CMDSTAT_FR;
-
-       if (termios->c_iflag & IGNBRK) {
-               pi->port.ignore_status_mask |= SDMA_DESC_CMDSTAT_BR;
-
-               if (termios->c_iflag & IGNPAR)
-                       pi->port.ignore_status_mask |= SDMA_DESC_CMDSTAT_OR;
-       }
-
-       /* Ignore all chars if CREAD not set */
-       if (!(termios->c_cflag & CREAD))
-               pi->rcv_data = 0;
-
-       spin_unlock_irqrestore(&pi->port.lock, flags);
-       return;
-}
-
-static const char *
-mpsc_type(struct uart_port *port)
-{
-       DBG("mpsc_type[%d]: port type: %s\n", port->line, MPSC_DRIVER_NAME);
-       return MPSC_DRIVER_NAME;
-}
-
-static int
-mpsc_request_port(struct uart_port *port)
-{
-       /* Should make chip/platform specific call */
-       return 0;
-}
-
-static void
-mpsc_release_port(struct uart_port *port)
-{
-       mpsc_port_info_t *pi = (mpsc_port_info_t *)port;
-
-       mpsc_uninit_rings(pi);
-       mpsc_free_ring_mem(pi);
-       pi->ready = 0;
-
-       return;
-}
-
-static void
-mpsc_config_port(struct uart_port *port, int flags)
-{
-       return;
-}
-
-static int
-mpsc_verify_port(struct uart_port *port, struct serial_struct *ser)
-{
-       mpsc_port_info_t *pi = (mpsc_port_info_t *)port;
-       int     rc = 0;
-
-       DBG("mpsc_verify_port[%d]: Verifying port data\n", pi->port.line);
-
-       if (ser->type != PORT_UNKNOWN && ser->type != PORT_MPSC)
-               rc = -EINVAL;
-       if (pi->port.irq != ser->irq)
-               rc = -EINVAL;
-       if (ser->io_type != SERIAL_IO_MEM)
-               rc = -EINVAL;
-       if (pi->port.uartclk / 16 != ser->baud_base) /* XXXX Not sure */
-               rc = -EINVAL;
-       if ((void *)pi->port.mapbase != ser->iomem_base)
-               rc = -EINVAL;
-       if (pi->port.iobase != ser->port)
-               rc = -EINVAL;
-       if (ser->hub6 != 0)
-               rc = -EINVAL;
-
-       return rc;
-}
-
-static struct uart_ops mpsc_pops = {
-       .tx_empty       = mpsc_tx_empty,
-       .set_mctrl      = mpsc_set_mctrl,
-       .get_mctrl      = mpsc_get_mctrl,
-       .stop_tx        = mpsc_stop_tx,
-       .start_tx       = mpsc_start_tx,
-       .stop_rx        = mpsc_stop_rx,
-       .enable_ms      = mpsc_enable_ms,
-       .break_ctl      = mpsc_break_ctl,
-       .startup        = mpsc_startup,
-       .shutdown       = mpsc_shutdown,
-       .set_termios    = mpsc_set_termios,
-       .type           = mpsc_type,
-       .release_port   = mpsc_release_port,
-       .request_port   = mpsc_request_port,
-       .config_port    = mpsc_config_port,
-       .verify_port    = mpsc_verify_port,
-};
-
-/*
- ******************************************************************************
- *
- * Console Interface Routines
- *
- ******************************************************************************
- */
-
-#ifdef CONFIG_SERIAL_MPSC_CONSOLE
-static void
-mpsc_console_write(struct console *co, const char *s, uint count)
-{
-       mpsc_port_info_t        *pi = &mpsc_ports[co->index];
-       volatile mpsc_tx_desc_t *txre = &pi->txr[pi->txr_posn];
-       volatile mpsc_tx_desc_t *txre_p = &pi->txr_p[pi->txr_posn];
-       u8                      *bp, *dp, add_cr = 0;
-       int                     i;
-
-       /*
-        * Step thru tx ring one entry at a time, filling up its buf, sending
-        * the data out and moving to the next ring entry until its all out.
-        */
-       MPSC_CACHE_INVALIDATE(pi, txre, txre + 1);
-
-       while (count > 0) {
-               while (_mpsc_tx_empty(pi) != TIOCSER_TEMT);
-
-               BUG_ON(be32_to_cpu(txre->cmdstat) & SDMA_DESC_CMDSTAT_O);
-
-               bp = dp = &pi->txb[pi->txr_posn * MPSC_TXBE_SIZE];
-
-               dma_sync_single_for_cpu(pi->port.dev,be32_to_cpu(txre->buf_ptr),
-                       MPSC_TXBE_SIZE, DMA_TO_DEVICE);
-
-               for (i=0; i<MPSC_TXBE_SIZE; i++) {
-                       if (count == 0)
-                               break;
-
-                       if (add_cr) {
-                               *(dp++) = '\r';
-                               add_cr = 0;
-                       }
-                       else {
-                               *(dp++) = *s;
-
-                               if (*(s++) == '\n') { /* add '\r' after '\n' */
-                                       add_cr = 1;
-                                       count++;
-                               }
-                       }
-
-                       count--;
-               }
-
-               mpsc_send_tx_data(pi, txre, txre_p, bp, i, 0);
-
-               /* Advance to next descriptor */
-               pi->txr_posn = (pi->txr_posn + 1) & (MPSC_TXR_ENTRIES - 1);
-               txre = &pi->txr[pi->txr_posn];
-               txre_p = &pi->txr_p[pi->txr_posn];
-               MPSC_CACHE_INVALIDATE(pi, txre, txre + 1);
-       }
-
-       while (_mpsc_tx_empty(pi) != TIOCSER_TEMT);
-       return;
-}
-
-static int __init
-mpsc_console_setup(struct console *co, char *options)
-{
-       mpsc_port_info_t        *pi;
-       int                     baud, bits, parity, flow;
-
-       DBG("mpsc_console_setup[%d]: options: %s\n", co->index, options);
-
-       if (co->index >= MPSC_NUM_CTLRS)
-               co->index = 0;
-
-       pi = &mpsc_ports[co->index];
-
-       baud = pi->default_baud;
-       bits = pi->default_bits;
-       parity = pi->default_parity;
-       flow = pi->default_flow;
-
-       if (!pi->port.ops)
-               return -ENODEV;
-
-       spin_lock_init(&pi->port.lock); /* Temporary fix--copied from 8250.c */
-
-       if (options)
-               uart_parse_options(options, &baud, &parity, &bits, &flow);
-
-       return uart_set_options(&pi->port, co, baud, parity, bits, flow);
-}
-
-extern struct uart_driver mpsc_reg;
-static struct console mpsc_console = {
-       .name           = MPSC_DEV_NAME,
-       .write          = mpsc_console_write,
-       .device         = uart_console_device,
-       .setup          = mpsc_console_setup,
-       .flags          = CON_PRINTBUFFER,
-       .index          = -1,
-       .data           = &mpsc_reg,
-};
-
-static int __init
-mpsc_console_init(void)
-{
-       DBG("mpsc_console_init: Enter\n");
-       register_console(&mpsc_console);
-       return 0;
-}
-console_initcall(mpsc_console_init);
-
-static int __init
-mpsc_late_console_init(void)
-{
-       DBG("mpsc_late_console_init: Enter\n");
-
-       if (!(mpsc_console.flags & CON_ENABLED))
-               register_console(&mpsc_console);
-       return 0;
-}
-late_initcall(mpsc_late_console_init);
-
-#define MPSC_CONSOLE   &mpsc_console
-#else
-#define MPSC_CONSOLE   NULL
-#endif
-
-/*
- ******************************************************************************
- *
- * Driver Interface Routines
- *
- ******************************************************************************
- */
-
-static void
-mpsc_map_regs(mpsc_port_info_t *pi)
-{
-       pi->mpsc_base = (u32)ioremap(pi->mpsc_base_p, MPSC_REG_BLOCK_SIZE);
-       pi->mpsc_routing_base = (u32)ioremap(pi->mpsc_routing_base_p,
-                                               MPSC_ROUTING_REG_BLOCK_SIZE);
-       pi->sdma_base = (u32)ioremap(pi->sdma_base_p, SDMA_REG_BLOCK_SIZE);
-       pi->sdma_intr_base = (u32)ioremap(pi->sdma_intr_base_p,
-                                               SDMA_INTR_REG_BLOCK_SIZE);
-       pi->brg_base = (u32)ioremap(pi->brg_base_p, BRG_REG_BLOCK_SIZE);
-
-       return;
-}
-
-static void
-mpsc_unmap_regs(mpsc_port_info_t *pi)
-{
-       iounmap((void *)pi->mpsc_base);
-       iounmap((void *)pi->mpsc_routing_base);
-       iounmap((void *)pi->sdma_base);
-       iounmap((void *)pi->sdma_intr_base);
-       iounmap((void *)pi->brg_base);
-
-       pi->mpsc_base = 0;
-       pi->mpsc_routing_base = 0;
-       pi->sdma_base = 0;
-       pi->sdma_intr_base = 0;
-       pi->brg_base = 0;
-
-       return;
-}
-
-/* Called from platform specific device probe routine */
-mpsc_port_info_t *
-mpsc_device_probe(int index)
-{
-       mpsc_port_info_t        *pi = NULL;
-
-       if ((index >= 0) && (index < MPSC_NUM_CTLRS))
-               pi = &mpsc_ports[index];
-
-       return pi;
-}
-
-/* Called from platform specific device remove routine */
-mpsc_port_info_t *
-mpsc_device_remove(int index)
-{
-       mpsc_port_info_t        *pi = NULL;
-
-       if ((index >= 0) && (index < MPSC_NUM_CTLRS))
-               pi = &mpsc_ports[index];
-
-       return pi;
-}
-
-static struct uart_driver mpsc_reg = {
-       .owner                  = THIS_MODULE,
-       .driver_name            = MPSC_DRIVER_NAME,
-       .devfs_name             = MPSC_DEVFS_NAME,
-       .dev_name               = MPSC_DEV_NAME,
-       .major                  = MPSC_MAJOR,
-       .minor                  = MPSC_MINOR_START,
-       .nr                     = MPSC_NUM_CTLRS,
-       .cons                   = MPSC_CONSOLE,
-};
-
-static int __init
-mpsc_init(void)
-{
-       mpsc_port_info_t        *pi;
-       int                     i, j, rc;
-
-       printk(KERN_INFO "Serial: MPSC driver $Revision: 1.00 $\n");
-
-       if ((rc = mpsc_platform_register_driver()) >= 0) {
-               if ((rc = uart_register_driver(&mpsc_reg)) < 0) {
-                       mpsc_platform_unregister_driver();
-               }
-               else {
-                       for (i=0; i<MPSC_NUM_CTLRS; i++) {
-                               pi = &mpsc_ports[i];
-
-                               pi->port.line = i;
-                               pi->port.type = PORT_MPSC;
-                               pi->port.fifosize = MPSC_TXBE_SIZE;
-                               pi->port.membase = (char *)pi->mpsc_base;
-                               pi->port.mapbase = (ulong)pi->mpsc_base;
-                               pi->port.ops = &mpsc_pops;
-
-                               mpsc_map_regs(pi);
-
-                               if ((rc = mpsc_make_ready(pi)) >= 0) {
-                                       uart_add_one_port(&mpsc_reg, &pi->port);
-                               }
-                               else { /* on failure, undo everything */
-                                       for (j=0; j<i; j++) {
-                                               mpsc_unmap_regs(&mpsc_ports[j]);
-                                               uart_remove_one_port(&mpsc_reg,
-                                                       &mpsc_ports[j].port);
-                                       }
-
-                                       uart_unregister_driver(&mpsc_reg);
-                                       mpsc_platform_unregister_driver();
-                                       break;
-                               }
-                       }
-               }
-       }
-
-       return rc;
-}
-
-static void __exit
-mpsc_exit(void)
-{
-       int     i;
-
-       DBG("mpsc_exit: Exiting\n");
-
-       for (i=0; i<MPSC_NUM_CTLRS; i++) {
-               mpsc_unmap_regs(&mpsc_ports[i]);
-               uart_remove_one_port(&mpsc_reg, &mpsc_ports[i].port);
-       }
-
-       uart_unregister_driver(&mpsc_reg);
-       mpsc_platform_unregister_driver();
-
-       return;
-}
-
-int
-register_serial(struct serial_struct *req)
-{
-       return uart_register_port(&mpsc_reg, &mpsc_ports[req->line].port);
-}
-
-void
-unregister_serial(int line)
-{
-       uart_unregister_port(&mpsc_reg, line);
-       return;
-}
-
-module_init(mpsc_init);
-module_exit(mpsc_exit);
-
-EXPORT_SYMBOL(register_serial);
-EXPORT_SYMBOL(unregister_serial);
-
-MODULE_AUTHOR("Mark A. Greer <mgreer@mvista.com>");
-MODULE_DESCRIPTION("Generic Marvell MPSC serial/UART driver $Revision: 1.00 $");
-MODULE_VERSION(MPSC_VERSION);
-MODULE_LICENSE("GPL");
-MODULE_ALIAS_CHARDEV_MAJOR(MPSC_MAJOR);
diff --git a/drivers/serial/mpsc/mpsc.h b/drivers/serial/mpsc/mpsc.h
deleted file mode 100644 (file)
index 400629e..0000000
+++ /dev/null
@@ -1,257 +0,0 @@
-/*
- * drivers/serial/mpsc/mpsc.h
- *
- * Author: Mark A. Greer <mgreer@mvista.com>
- *
- * 2004 (c) MontaVista, Software, Inc.  This file is licensed under
- * the terms of the GNU General Public License version 2.  This program
- * is licensed "as is" without any warranty of any kind, whether express
- * or implied.
- */
-
-#ifndef        __MPSC_H__
-#define        __MPSC_H__
-
-#include <linux/config.h>
-#include <linux/module.h>
-#include <linux/moduleparam.h>
-#include <linux/tty.h>
-#include <linux/ioport.h>
-#include <linux/init.h>
-#include <linux/console.h>
-#include <linux/sysrq.h>
-#include <linux/serial.h>
-#include <linux/delay.h>
-#include <linux/device.h>
-#include <linux/dma-mapping.h>
-
-#include <asm/io.h>
-#include <asm/irq.h>
-
-#if defined(CONFIG_SERIAL_MPSC_CONSOLE) && defined(CONFIG_MAGIC_SYSRQ)
-#define SUPPORT_SYSRQ
-#endif
-
-#include <linux/serial_core.h>
-#include "mpsc_defs.h"
-
-
-/*
- * Descriptors and buffers must be cache line aligned.
- * Buffers lengths must be multiple of cache line size.
- * Number of Tx & Rx descriptors must be power of 2.
- */
-#define        MPSC_DESC_ALIGN         dma_get_cache_alignment()
-#define MPSC_BUF_ALIGN         dma_get_cache_alignment()
-
-#define        MPSC_RXR_ENTRIES        32
-#define        MPSC_RXRE_SIZE          sizeof(mpsc_rx_desc_t)
-#define        MPSC_RXR_SIZE           (MPSC_RXR_ENTRIES * MPSC_RXRE_SIZE)
-#define        MPSC_RXBE_SIZE          dma_get_cache_alignment()
-#define        MPSC_RXB_SIZE           (MPSC_RXR_ENTRIES * MPSC_RXBE_SIZE)
-
-#define        MPSC_TXR_ENTRIES        32
-#define        MPSC_TXRE_SIZE          sizeof(mpsc_tx_desc_t)
-#define        MPSC_TXR_SIZE           (MPSC_TXR_ENTRIES * MPSC_TXRE_SIZE)
-#define        MPSC_TXBE_SIZE          dma_get_cache_alignment()
-#define        MPSC_TXB_SIZE           (MPSC_TXR_ENTRIES * MPSC_TXBE_SIZE)
-
-typedef struct {
-        u16   bufsize;
-       u16   bytecnt;
-        u32   cmdstat;
-        u32   link;
-        u32   buf_ptr;
-} mpsc_rx_desc_t __attribute((packed));
-
-/* Tx and Rx Ring entry descriptors */
-typedef struct {
-        u16   bytecnt;
-        u16   shadow;
-        u32   cmdstat;
-        u32   link;
-        u32   buf_ptr;
-} mpsc_tx_desc_t __attribute((packed));
-
-/* The main driver data structure */
-typedef struct {
-       struct uart_port        port;   /* Overlay uart_port structure */
-
-       /* Internal driver state for this ctlr */
-       u8                      ready;
-       u8                      rcv_data;
-       tcflag_t                c_iflag;        /* save termios->c_iflag */
-       tcflag_t                c_cflag;        /* save termios->c_cflag */
-
-       /* Info passed in from platform */
-       u8                      mirror_regs;    /* Need to mirror regs? */
-       u8                      cache_mgmt;     /* Need manual cache mgmt? */
-       u8                      brg_can_tune;   /* BRG has baud tuning? */
-       u32                     brg_clk_src;
-       u16                     mpsc_max_idle;
-       int                     default_baud;
-       int                     default_bits;
-       int                     default_parity;
-       int                     default_flow;
-
-       /* Physical addresses of various blocks of registers (from platform) */
-       u32                     mpsc_base_p;
-       u32                     mpsc_routing_base_p;
-       u32                     sdma_base_p;
-       u32                     sdma_intr_base_p;
-       u32                     brg_base_p;
-
-       /* Virtual addresses of various blocks of registers (from platform) */
-       u32                     mpsc_base;
-       u32                     mpsc_routing_base;
-       u32                     sdma_base;
-       u32                     sdma_intr_base;
-       u32                     brg_base;
-
-       /* Descriptor ring and buffer allocations */
-       void                    *desc_region;   /* Region for desc rings */
-       dma_addr_t              desc_region_p;
-       u32                     desc_region_size;
-
-       void                    *buf_region;    /* kmalloc region for bufs */
-       u32                     buf_region_size;
-
-       mpsc_rx_desc_t          *rxr;           /* Rx descriptor ring */
-       mpsc_rx_desc_t          *rxr_p;         /* Phys addr of rxr */
-       u32                     rxr_posn;       /* First desc w/ Rx data */
-       u8                      *rxb;           /* Rx Ring I/O buf */
-       dma_addr_t              rxb_p;          /* Phys addr of rxb */
-
-       mpsc_tx_desc_t          *txr;           /* Tx descriptor ring */
-       mpsc_tx_desc_t          *txr_p;         /* Phys addr of txr */
-       u32                     txr_posn;       /* First unused desc */
-       u8                      *txb;           /* Tx Ring I/O buf */
-       dma_addr_t              txb_p;          /* Phys addr of txb */
-
-       /* Mirrored values of regs we can't read (if 'mirror_regs' set) */
-       u32                     MPSC_CHR_1_m;
-       u32                     MPSC_CHR_2_m;
-       u32                     MPSC_CHR_10_m;
-       u32                     MPSC_MPCR_m;
-       u32                     MPSC_MRR_m;
-       u32                     MPSC_RCRR_m;
-       u32                     MPSC_TCRR_m;
-       u32                     SDMA_INTR_MASK_m;
-       u32                     BRG_BCR_m;
-} mpsc_port_info_t;
-
-/*
- * Some MPSC ctlrs have an erratum where they aren't supposed to access
- * cache coherent memory regions.  From practical experience, the erratum
- * is not triggered as long as there isn't a snoop hit.  Therefore, if
- * the MPSC in used has this erratum and coherency is enabled on the platform,
- * we must manually manage the cache for ring descriptors and the I/O buffers.
- */
-#if defined(CONFIG_PPC32) && !defined(CONFIG_NOT_COHERENT_CACHE)
-#define        MPSC_CACHE_FLUSH(pi, s, e) {                    \
-       if (pi->cache_mgmt) {                           \
-               /* 64x60 erratum: can't use dcbst/clean_dcache_range() */ \
-               flush_dcache_range((ulong)s, (ulong)e); \
-               mb();                                   \
-       }                                               \
-}
-
-#define        MPSC_CACHE_INVALIDATE(pi, s, e) {                       \
-       if (pi->cache_mgmt) {                                   \
-               invalidate_dcache_range((ulong)s, (ulong)e);    \
-               mb();                                           \
-       }                                                       \
-}
-
-#define        MPSC_CACHE_FLUSH_INVALIDATE(pi, s, e) {         \
-       if (pi->cache_mgmt) {                           \
-               flush_dcache_range((ulong)s, (ulong)e); \
-               mb();                                   \
-       }                                               \
-}
-#else
-#define        MPSC_CACHE_FLUSH(pi, s, e)
-#define        MPSC_CACHE_INVALIDATE(pi, s, e)
-#define        MPSC_CACHE_FLUSH_INVALIDATE(pi, s, e)
-#endif
-
-/*
- * 'MASK_INSERT' takes the low-order 'n' bits of 'i', shifts it 'b' bits to
- * the left, and inserts it into the target 't'.  The corresponding bits in
- * 't' will have been cleared before the bits in 'i' are inserted.
- */
-#ifdef CONFIG_PPC32
-#define MASK_INSERT(t, i, n, b) ({                             \
-       u32     rval = (t);                                     \
-        __asm__ __volatile__(                                  \
-               "rlwimi %0,%2,%4,32-(%3+%4),31-%4\n"            \
-               : "=r" (rval)                                   \
-               : "0" (rval), "r" (i), "i" (n), "i" (b));       \
-       rval;                                                   \
-})
-#else
-/* These macros are really just examples.  Feel free to change them --MAG */
-#define GEN_MASK(n, b)                 \
-({                                     \
-       u32     m, sl, sr;              \
-       sl = 32 - (n);                  \
-       sr = sl - (b);                  \
-       m = (0xffffffff << sl) >> sr;   \
-})
-
-#define MASK_INSERT(t, i, n, b)                \
-({                                     \
-       u32     m, rval = (t);          \
-       m = GEN_MASK((n), (b));         \
-       rval &= ~m;                     \
-       rval |= (((i) << (b)) & m);     \
-})
-#endif
-
-/* I/O macros for regs that you can read */
-#define        MPSC_READ(pi, unit, offset)     readl((pi)->unit##_base + (offset))
-#define        MPSC_WRITE(pi, unit, offset, v) writel(v, (pi)->unit##_base + (offset))
-#define        MPSC_MOD_FIELD(pi, unit, offset, num_bits, shift, val)  \
-{                                                              \
-       u32     v;                                              \
-       v = readl((pi)->unit##_base + (offset));                \
-       writel(MASK_INSERT(v,val,num_bits,shift), (pi)->unit##_base+(offset));\
-}
-
-#define        MPSC_READ_M(pi, unit, offset)                   \
-({                                                     \
-       u32     v;                                      \
-       if ((pi)->mirror_regs) v = (pi)->offset##_m;    \
-       else v = readl((pi)->unit##_base + (offset));   \
-       v;                                              \
-})
-
-#define        MPSC_WRITE_M(pi, unit, offset, v)               \
-({                                                     \
-       if ((pi)->mirror_regs) (pi)->offset##_m = v;    \
-       writel(v, (pi)->unit##_base + (offset));        \
-})
-
-#define        MPSC_MOD_FIELD_M(pi, unit, offset, num_bits, shift, val)        \
-({                                                                     \
-       u32     v;                                                      \
-       if ((pi)->mirror_regs) v = (pi)->offset##_m;                    \
-       else v = readl((pi)->unit##_base + (offset));                   \
-       v = MASK_INSERT(v, val, num_bits, shift);                       \
-       if ((pi)->mirror_regs) (pi)->offset##_m = v;                    \
-       writel(v, (pi)->unit##_base + (offset));                        \
-})
-
-#if !defined(MIN)
-#define        MIN(a, b)       (((a) < (b)) ? (a) : (b))
-#endif
-
-/* Hooks to platform-specific code */
-int mpsc_platform_register_driver(void);
-void mpsc_platform_unregister_driver(void);
-
-/* Hooks back in to mpsc common to be called by platform-specific code */
-mpsc_port_info_t *mpsc_device_probe(int index);
-mpsc_port_info_t *mpsc_device_remove(int index);
-
-#endif /* __MPSC_H__ */
diff --git a/drivers/serial/mpsc/mpsc_defs.h b/drivers/serial/mpsc/mpsc_defs.h
deleted file mode 100644 (file)
index 7bf095a..0000000
+++ /dev/null
@@ -1,153 +0,0 @@
-/*
- * drivers/serial/mpsc/mpsc_defs.h
- * 
- * Register definitions for the Marvell Multi-Protocol Serial Controller (MPSC),
- * Serial DMA Controller (SDMA), and Baud Rate Generator (BRG).
- *
- * Author: Mark A. Greer <mgreer@mvista.com>
- *
- * 2004 (c) MontaVista, Software, Inc.  This file is licensed under
- * the terms of the GNU General Public License version 2.  This program
- * is licensed "as is" without any warranty of any kind, whether express
- * or implied.
- */
-#ifndef        __MPSC_DEFS_H__
-#define        __MPSC_DEFS_H__
-
-#define        MPSC_NUM_CTLRS          2
-
-
-/*
- *****************************************************************************
- *
- *     Multi-Protocol Serial Controller Interface Registers
- *
- *****************************************************************************
- */
-
-/* Main Configuratino Register Offsets */
-#define        MPSC_MMCRL                      0x0000
-#define        MPSC_MMCRH                      0x0004
-#define        MPSC_MPCR                       0x0008
-#define        MPSC_CHR_1                      0x000c
-#define        MPSC_CHR_2                      0x0010
-#define        MPSC_CHR_3                      0x0014
-#define        MPSC_CHR_4                      0x0018
-#define        MPSC_CHR_5                      0x001c
-#define        MPSC_CHR_6                      0x0020
-#define        MPSC_CHR_7                      0x0024
-#define        MPSC_CHR_8                      0x0028
-#define        MPSC_CHR_9                      0x002c
-#define        MPSC_CHR_10                     0x0030
-#define        MPSC_CHR_11                     0x0034
-#define        MPSC_REG_BLOCK_SIZE             0x0038
-
-
-#define        MPSC_MPCR_CL_5                  0
-#define        MPSC_MPCR_CL_6                  1
-#define        MPSC_MPCR_CL_7                  2
-#define        MPSC_MPCR_CL_8                  3
-#define        MPSC_MPCR_SBL_1                 0
-#define        MPSC_MPCR_SBL_2                 3
-
-#define        MPSC_CHR_2_TEV                  (1<<1)
-#define        MPSC_CHR_2_TA                   (1<<7)
-#define        MPSC_CHR_2_TTCS                 (1<<9)
-#define        MPSC_CHR_2_REV                  (1<<17)
-#define        MPSC_CHR_2_RA                   (1<<23)
-#define        MPSC_CHR_2_CRD                  (1<<25)
-#define        MPSC_CHR_2_EH                   (1<<31)
-#define        MPSC_CHR_2_PAR_ODD              0
-#define        MPSC_CHR_2_PAR_SPACE            1
-#define        MPSC_CHR_2_PAR_EVEN             2
-#define        MPSC_CHR_2_PAR_MARK             3
-
-/* MPSC Signal Routing */
-#define        MPSC_MRR                        0x0000
-#define        MPSC_RCRR                       0x0004
-#define        MPSC_TCRR                       0x0008
-#define        MPSC_ROUTING_REG_BLOCK_SIZE     0x000c
-
-/*
- *****************************************************************************
- *
- *     Serial DMA Controller Interface Registers
- *
- *****************************************************************************
- */
-
-#define        SDMA_SDC                        0x0000
-#define        SDMA_SDCM                       0x0008
-#define        SDMA_RX_DESC                    0x0800
-#define        SDMA_RX_BUF_PTR                 0x0808
-#define        SDMA_SCRDP                      0x0810
-#define        SDMA_TX_DESC                    0x0c00
-#define        SDMA_SCTDP                      0x0c10
-#define        SDMA_SFTDP                      0x0c14
-#define        SDMA_REG_BLOCK_SIZE             0x0c18
-
-#define        SDMA_DESC_CMDSTAT_PE            (1<<0)
-#define        SDMA_DESC_CMDSTAT_CDL           (1<<1)
-#define        SDMA_DESC_CMDSTAT_FR            (1<<3)
-#define        SDMA_DESC_CMDSTAT_OR            (1<<6)
-#define        SDMA_DESC_CMDSTAT_BR            (1<<9)
-#define        SDMA_DESC_CMDSTAT_MI            (1<<10)
-#define        SDMA_DESC_CMDSTAT_A             (1<<11)
-#define        SDMA_DESC_CMDSTAT_AM            (1<<12)
-#define        SDMA_DESC_CMDSTAT_CT            (1<<13)
-#define        SDMA_DESC_CMDSTAT_C             (1<<14)
-#define        SDMA_DESC_CMDSTAT_ES            (1<<15)
-#define        SDMA_DESC_CMDSTAT_L             (1<<16)
-#define        SDMA_DESC_CMDSTAT_F             (1<<17)
-#define        SDMA_DESC_CMDSTAT_P             (1<<18)
-#define        SDMA_DESC_CMDSTAT_EI            (1<<23)
-#define        SDMA_DESC_CMDSTAT_O             (1<<31)
-
-#define SDMA_DESC_DFLT                 (SDMA_DESC_CMDSTAT_O |  \
-                                       SDMA_DESC_CMDSTAT_EI)
-
-#define        SDMA_SDC_RFT                    (1<<0)
-#define        SDMA_SDC_SFM                    (1<<1)
-#define        SDMA_SDC_BLMR                   (1<<6)
-#define        SDMA_SDC_BLMT                   (1<<7)
-#define        SDMA_SDC_POVR                   (1<<8)
-#define        SDMA_SDC_RIFB                   (1<<9)
-
-#define        SDMA_SDCM_ERD                   (1<<7)
-#define        SDMA_SDCM_AR                    (1<<15)
-#define        SDMA_SDCM_STD                   (1<<16)
-#define        SDMA_SDCM_TXD                   (1<<23)
-#define        SDMA_SDCM_AT                    (1<<31)
-
-#define        SDMA_0_CAUSE_RXBUF              (1<<0)
-#define        SDMA_0_CAUSE_RXERR              (1<<1)
-#define        SDMA_0_CAUSE_TXBUF              (1<<2)
-#define        SDMA_0_CAUSE_TXEND              (1<<3)
-#define        SDMA_1_CAUSE_RXBUF              (1<<8)
-#define        SDMA_1_CAUSE_RXERR              (1<<9)
-#define        SDMA_1_CAUSE_TXBUF              (1<<10)
-#define        SDMA_1_CAUSE_TXEND              (1<<11)
-
-#define        SDMA_CAUSE_RX_MASK      (SDMA_0_CAUSE_RXBUF | SDMA_0_CAUSE_RXERR | \
-       SDMA_1_CAUSE_RXBUF | SDMA_1_CAUSE_RXERR)
-#define        SDMA_CAUSE_TX_MASK      (SDMA_0_CAUSE_TXBUF | SDMA_0_CAUSE_TXEND | \
-       SDMA_1_CAUSE_TXBUF | SDMA_1_CAUSE_TXEND)
-
-/* SDMA Interrupt registers */
-#define        SDMA_INTR_CAUSE                 0x0000
-#define        SDMA_INTR_MASK                  0x0080
-#define        SDMA_INTR_REG_BLOCK_SIZE        0x0084
-
-/*
- *****************************************************************************
- *
- *     Baud Rate Generator Interface Registers
- *
- *****************************************************************************
- */
-
-#define        BRG_BCR                         0x0000
-#define        BRG_BTR                         0x0004
-#define        BRG_REG_BLOCK_SIZE              0x0008
-
-#endif /*__MPSC_DEFS_H__ */
diff --git a/drivers/serial/mpsc/mpsc_ppc32.c b/drivers/serial/mpsc/mpsc_ppc32.c
deleted file mode 100644 (file)
index 53b1dd4..0000000
+++ /dev/null
@@ -1,110 +0,0 @@
-/*
- * drivers/serial/mpsc/mpsc_ppc32.c
- *
- * Middle layer that sucks data from the ppc32 OCP--that is, chip &
- * platform-specific data--and puts it into the mpsc_port_info_t structure
- * for the mpsc driver to use.
- *
- * Author: Mark A. Greer <mgreer@mvista.com>
- *
- * 2004 (c) MontaVista, Software, Inc.  This file is licensed under
- * the terms of the GNU General Public License version 2.  This program
- * is licensed "as is" without any warranty of any kind, whether express
- * or implied.
- */
-#include "mpsc.h"
-#include <asm/ocp.h>
-#include <asm/mv64x60.h>
-
-static void mpsc_ocp_remove(struct ocp_device *ocpdev);
-
-static int
-mpsc_ocp_probe(struct ocp_device *ocpdev)
-{
-       mpsc_port_info_t        *pi;
-       mv64x60_ocp_mpsc_data_t *dp;
-       u32                     base;
-       int                     rc = -ENODEV;
-
-       if ((pi = mpsc_device_probe(ocpdev->def->index)) != NULL) {
-               dp = (mv64x60_ocp_mpsc_data_t *)ocpdev->def->additions;
-
-               pi->mpsc_base_p = ocpdev->def->paddr;
-
-               if (ocpdev->def->index == 0) {
-                       base = pi->mpsc_base_p - MV64x60_MPSC_0_OFFSET;
-                       pi->sdma_base_p = base + MV64x60_SDMA_0_OFFSET;
-                       pi->brg_base_p = base + MV64x60_BRG_0_OFFSET;
-               }
-               else { /* Must be 1 */
-                       base = pi->mpsc_base_p - MV64x60_MPSC_1_OFFSET;
-                       pi->sdma_base_p = base + MV64x60_SDMA_1_OFFSET;
-                       pi->brg_base_p = base + MV64x60_BRG_1_OFFSET;
-               }
-
-               pi->mpsc_routing_base_p = base + MV64x60_MPSC_ROUTING_OFFSET;
-               pi->sdma_intr_base_p = base + MV64x60_SDMA_INTR_OFFSET;
-
-               pi->port.irq = dp->sdma_irq;
-               pi->port.uartclk = dp->brg_clk_freq;
-
-               pi->mirror_regs = dp->mirror_regs;
-               pi->cache_mgmt = dp->cache_mgmt;
-               pi->brg_can_tune = dp->brg_can_tune;
-               pi->brg_clk_src = dp->brg_clk_src;
-               pi->mpsc_max_idle = dp->max_idle;
-               pi->default_baud = dp->default_baud;
-               pi->default_bits = dp->default_bits;
-               pi->default_parity = dp->default_parity;
-               pi->default_flow = dp->default_flow;
-
-               /* Initial values of mirrored regs */
-               pi->MPSC_CHR_1_m = dp->chr_1_val;
-               pi->MPSC_CHR_2_m = dp->chr_2_val;
-               pi->MPSC_CHR_10_m = dp->chr_10_val;
-               pi->MPSC_MPCR_m = dp->mpcr_val;
-               pi->MPSC_MRR_m = dp->mrr_val;
-               pi->MPSC_RCRR_m = dp->rcrr_val;
-               pi->MPSC_TCRR_m = dp->tcrr_val;
-               pi->SDMA_INTR_MASK_m = dp->intr_mask_val;
-               pi->BRG_BCR_m = dp->bcr_val;
-
-               pi->port.iotype = UPIO_MEM;
-
-               rc = 0;
-       }
-
-       return rc;
-}
-
-static void
-mpsc_ocp_remove(struct ocp_device *ocpdev)
-{
-       (void)mpsc_device_remove(ocpdev->def->index);
-       return;
-}
-
-static struct ocp_device_id mpsc_ocp_ids[] = {
-       {.vendor = OCP_VENDOR_MARVELL, .function = OCP_FUNC_MPSC},
-       {.vendor = OCP_VENDOR_INVALID}
-};
-
-static struct ocp_driver mpsc_ocp_driver = {
-       .name = "mpsc",
-       .id_table = mpsc_ocp_ids,
-       .probe = mpsc_ocp_probe,
-       .remove = mpsc_ocp_remove,
-};
-
-int
-mpsc_platform_register_driver(void)
-{
-       return ocp_register_driver(&mpsc_ocp_driver);
-}
-
-void
-mpsc_platform_unregister_driver(void)
-{
-       ocp_unregister_driver(&mpsc_ocp_driver);
-       return;
-}
diff --git a/drivers/serial/serial98.c b/drivers/serial/serial98.c
deleted file mode 100644 (file)
index c34f899..0000000
+++ /dev/null
@@ -1,1120 +0,0 @@
-/*
- *  linux/drivers/serial/serial98.c
- *
- *  Driver for NEC PC-9801/PC-9821 standard serial ports
- *
- *  Based on drivers/serial/8250.c, by Russell King.
- *  Based on drivers/char/serial.c, by Linus Torvalds, Theodore Ts'o.
- *
- *  Copyright (C) 2002 Osamu Tomita <tomita@cinet.co.jp>
- *
- * 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/tty.h>
-#include <linux/ioport.h>
-#include <linux/init.h>
-#include <linux/serial.h>
-#include <linux/console.h>
-#include <linux/sysrq.h>
-#include <linux/serial_reg.h>
-#include <linux/delay.h>
-
-#include <asm/io.h>
-#include <asm/irq.h>
-#include <asm/pc9800.h>
-#include <asm/pc9800_sca.h>
-
-#if defined(CONFIG_SERIAL98_CONSOLE) && defined(CONFIG_MAGIC_SYSRQ)
-#define SUPPORT_SYSRQ
-#endif
-
-#include <linux/serial_core.h>
-
-#define SERIAL98_NR            1
-#define SERIAL98_ISR_PASS_LIMIT        256
-#define SERIAL98_EXT           0x434
-
-//#define RX_8251F             0x130   /* In: Receive buffer */
-//#define TX_8251F             0x130   /* Out: Transmit buffer */
-//#define LSR_8251F            0x132   /* In: Line Status Register */
-//#define MSR_8251F            0x134   /* In: Modem Status Register */
-#define IIR_8251F              0x136   /* In: Interrupt ID Register */
-#define FCR_8251F              0x138   /* I/O: FIFO Control Register */
-#define VFAST_8251F            0x13a   /* I/O: VFAST mode Register */
-
-#define CMD_8251F              0x32    /* Out: 8251 Command Resister */
-#define IER2_8251F             0x34    /* I/O: Interrupt Enable Register */
-#define IER1_8251F             0x35    /* I/O: Interrupt Enable Register */
-#define IER1_CTL               0x37    /* Out: Interrupt Enable Register */
-#define DIS_RXR_INT            0x00    /* disable RxRDY Interrupt */
-#define ENA_RXR_INT            0x01    /* enable RxRDY Interrupt */
-#define DIS_TXE_INT            0x02    /* disable TxEMPTY Interrupt */
-#define ENA_TXE_INT            0x03    /* enable TxEMPTY Interrupt */
-#define DIS_TXR_INT            0x04    /* disable TxRDY Interrupt */
-#define ENA_TXR_INT            0x05    /* enable TxRDY Interrupt */
-
-#define CMD_RESET              0x40    /* Reset Command */
-#define CMD_RTS                        0x20    /* Set RTS line */
-#define CMD_CLR_ERR            0x10    /* Clear error flag */
-#define CMD_BREAK              0x08    /* Send Break */
-#define CMD_RXE                        0x04    /* Enable receive */
-#define CMD_DTR                        0x02    /* Set DTR line */
-#define CMD_TXE                        0x01    /* Enable send */
-#define CMD_DUMMY              0x00    /* Dummy Command */
-
-#define VFAST_ENABLE           0x80    /* V.Fast mode Enable */
-
-/* Interrupt masks */
-#define INTR_8251_TXRE         0x04
-#define INTR_8251_TXEE         0x02
-#define INTR_8251_RXRE         0x01
-/* I/O Port */
-//#define PORT_8251_DATA       0
-//#define PORT_8251_CMD                2
-//#define PORT_8251_MOD                2
-//#define PORT_8251_STS                2
-/* status read */
-#define STAT_8251_TXRDY                0x01
-#define STAT_8251_RXRDY                0x02
-#define STAT_8251_TXEMP                0x04
-#define STAT_8251_PER          0x08
-#define STAT_8251_OER          0x10
-#define STAT_8251_FER          0x20
-#define STAT_8251_BRK          0x40
-#define STAT_8251_DSR          0x80
-#if 1
-#define STAT_8251F_TXEMP       0x01
-#define STAT_8251F_TXRDY       0x02
-#define STAT_8251F_RXRDY       0x04
-#define STAT_8251F_DSR         0x08
-#define STAT_8251F_OER         0x10
-#define STAT_8251F_PER         0x20
-#define STAT_8251F_FER         0x40
-#define STAT_8251F_BRK         0x80
-#else
-#define STAT_8251F_TXEMP       0x01
-#define STAT_8251F_TEMT                0x01
-#define STAT_8251F_TXRDY       0x02
-#define STAT_8251F_THRE                0x02
-#define STAT_8251F_RXRDY       0x04
-#define STAT_8251F_DSR         0x04
-#define STAT_8251F_PER         0x08
-#define STAT_8251F_OER         0x10
-#define STAT_8251F_FER         0x20
-#define STAT_8251F_BRK         0x40
-#endif
-
-/*
- * We wrap our port structure around the generic uart_port.
- */
-struct serial98_port {
-       struct uart_port        port;
-       unsigned int            type;
-       unsigned int            ext;
-       unsigned int            lsr_break_flag;
-       unsigned char           cmd;
-       unsigned char           mode;
-       unsigned char           msr;
-       unsigned char           ier;
-       unsigned char           rxchk;
-       unsigned char           txemp;
-       unsigned char           txrdy;
-       unsigned char           rxrdy;
-       unsigned char           brk;
-       unsigned char           fe;
-       unsigned char           oe;
-       unsigned char           pe;
-       unsigned char           dr;
-};
-
-#ifdef CONFIG_SERIAL98_CONSOLE
-static void
-serial98_console_write(struct console *co, const char *s, unsigned int count);
-static int __init serial98_console_setup(struct console *co, char *options);
-
-extern struct uart_driver serial98_reg;
-static struct console serial98_console = {
-       .name           = "ttyS",
-       .write          = serial98_console_write,
-       .device         = uart_console_device,
-       .setup          = serial98_console_setup,
-       .flags          = CON_PRINTBUFFER,
-       .index          = -1,
-       .data           = &serial98_reg,
-};
-
-#define SERIAL98_CONSOLE       &serial98_console
-#else
-#define SERIAL98_CONSOLE       NULL
-#endif
-
-static struct uart_driver serial98_reg = {
-       .owner                  = THIS_MODULE,
-       .driver_name            = "serial98",
-       .dev_name               = "ttyS",
-       .major                  = TTY_MAJOR,
-       .minor                  = 64,
-       .nr                     = SERIAL98_NR,
-       .cons                   = SERIAL98_CONSOLE,
-};
-
-static int serial98_clk;
-static char type_str[48];
-
-#define PORT98 ((struct serial98_port *)port)
-#define PORT (PORT98->port)
-
-static void serial98_fifo_enable(struct uart_port *port, int enable)
-{
-       unsigned char fcr;
-
-       if (PORT.type == PORT_FIFO_PC98 || PORT.type == PORT_VFAST_PC98) {
-               fcr = inb(FCR_8251F);
-               if (enable)
-                       fcr |= UART_FCR_ENABLE_FIFO;
-               else
-                       fcr &= ~UART_FCR_ENABLE_FIFO;
-               outb(fcr, FCR_8251F);
-       }
-
-       if (!enable)
-               return;
-
-       outb(0, 0x5f);  /* wait */
-       outb(0, 0x5f);
-       outb(0, 0x5f);
-       outb(0, 0x5f);
-}
-
-static void serial98_cmd_out(struct uart_port *port, unsigned char cmd)
-{
-       serial98_fifo_enable(port, 0);
-       outb(cmd, CMD_8251F);
-       serial98_fifo_enable(port, 1);
-}
-
-static void serial98_mode_set(struct uart_port *port)
-{
-       serial98_cmd_out(port, CMD_DUMMY);
-       serial98_cmd_out(port, CMD_DUMMY);
-       serial98_cmd_out(port, CMD_DUMMY);
-       serial98_cmd_out(port, CMD_RESET);
-       serial98_cmd_out(port, PORT98->mode);
-}
-
-static unsigned char serial98_msr_in(struct uart_port *port)
-{
-       unsigned long flags;
-       unsigned int ms, st;
-       unsigned int tmp;
-
-       spin_lock_irqsave(&PORT.lock, flags);
-       if (PORT.type == PORT_FIFO_PC98 || PORT.type == PORT_VFAST_PC98) {
-               PORT98->msr = inb(PORT.iobase + 4);
-       } else {
-               ms = inb(0x33);
-               st = inb(0x32);
-               tmp = 0;
-               if(!(ms & 0x20))
-                       tmp |= UART_MSR_DCD;
-               if(!(ms & 0x80)) {
-                       tmp |= UART_MSR_RI;
-                       PORT98->msr |= UART_MSR_RI;
-               }
-               if(!(ms & 0x40))
-                       tmp |= UART_MSR_CTS;
-               if(st & 0x80)
-                       tmp |= UART_MSR_DSR;
-               PORT98->msr = ((PORT98->msr ^ tmp) >> 4) | tmp;
-       }
-
-       spin_unlock_irqrestore(&PORT.lock, flags);
-       return PORT98->msr;
-}
-
-static void serial98_stop_tx(struct uart_port *port, unsigned int tty_stop)
-{
-       unsigned int ier = inb(IER1_8251F);
-
-       ier &= ~(INTR_8251_TXRE | INTR_8251_TXEE);
-       outb(ier, IER1_8251F);
-}
-
-static void serial98_start_tx(struct uart_port *port, unsigned int tty_start)
-{
-       unsigned int ier = inb(IER1_8251F);
-
-       ier |= INTR_8251_TXRE | INTR_8251_TXEE;
-       outb(ier, IER1_8251F);
-}
-
-static void serial98_stop_rx(struct uart_port *port)
-{
-       PORT.read_status_mask &= ~PORT98->dr;
-       outb(DIS_RXR_INT, IER1_CTL);
-}
-
-static void serial98_enable_ms(struct uart_port *port)
-{
-       outb(PORT98->ier | 0x80, IER2_8251F);
-}
-
-static void serial98_rx_chars(struct uart_port *port, int *status,
-                               struct pt_regs *regs)
-{
-       struct tty_struct *tty = PORT.info->tty;
-       unsigned char ch;
-       int max_count = 256;
-
-       do {
-               if (unlikely(tty->flip.count >= TTY_FLIPBUF_SIZE)) {
-                       tty->flip.work.func((void *)tty);
-                       if (tty->flip.count >= TTY_FLIPBUF_SIZE)
-                               return; // if TTY_DONT_FLIP is set
-               }
-               ch = inb(PORT.iobase);
-               *tty->flip.char_buf_ptr = ch;
-               *tty->flip.flag_buf_ptr = TTY_NORMAL;
-               PORT.icount.rx++;
-
-               if (unlikely(*status & (PORT98->brk | PORT98->pe |
-                                      PORT98->fe | PORT98->oe))) {
-                       /*
-                        * For statistics only
-                        */
-                       if (*status & PORT98->brk) {
-                               *status &= ~(PORT98->fe | PORT98->pe);
-                               PORT.icount.brk++;
-                               /*
-                                * We do the SysRQ and SAK checking
-                                * here because otherwise the break
-                                * may get masked by ignore_status_mask
-                                * or read_status_mask.
-                                */
-                               if (uart_handle_break(&PORT))
-                                       goto ignore_char;
-                       } else if (*status & PORT98->pe)
-                               PORT.icount.parity++;
-                       else if (*status & PORT98->fe)
-                               PORT.icount.frame++;
-                       if (*status & PORT98->oe)
-                               PORT.icount.overrun++;
-
-                       /*
-                        * Mask off conditions which should be ingored.
-                        */
-                       *status &= PORT.read_status_mask;
-
-#ifdef CONFIG_SERIAL98_CONSOLE
-                       if (PORT.line == PORT.cons->index) {
-                               /* Recover the break flag from console xmit */
-                               *status |= PORT98->lsr_break_flag;
-                               PORT98->lsr_break_flag = 0;
-                       }
-#endif
-                       if (*status & PORT98->brk) {
-                               *tty->flip.flag_buf_ptr = TTY_BREAK;
-                       } else if (*status & PORT98->pe)
-                               *tty->flip.flag_buf_ptr = TTY_PARITY;
-                       else if (*status & PORT98->fe)
-                               *tty->flip.flag_buf_ptr = TTY_FRAME;
-               }
-               if (uart_handle_sysrq_char(&PORT, ch, regs))
-                       goto ignore_char;
-               if ((*status & PORT.ignore_status_mask) == 0) {
-                       tty->flip.flag_buf_ptr++;
-                       tty->flip.char_buf_ptr++;
-                       tty->flip.count++;
-               }
-               if ((*status & PORT98->oe) &&
-                   tty->flip.count < TTY_FLIPBUF_SIZE) {
-                       /*
-                        * Overrun is special, since it's reported
-                        * immediately, and doesn't affect the current
-                        * character.
-                        */
-                       *tty->flip.flag_buf_ptr = TTY_OVERRUN;
-                       tty->flip.flag_buf_ptr++;
-                       tty->flip.char_buf_ptr++;
-                       tty->flip.count++;
-               }
-       ignore_char:
-               *status = inb(PORT.iobase + 2);
-       } while ((*status & PORT98->rxchk) && (max_count-- > 0));
-       tty_flip_buffer_push(tty);
-}
-
-static void serial98_tx_chars(struct uart_port *port)
-{
-       struct circ_buf *xmit = &PORT.info->xmit;
-       int count;
-
-       if (PORT.x_char) {
-               outb(PORT.x_char, PORT.iobase);
-               PORT.icount.tx++;
-               PORT.x_char = 0;
-               return;
-       }
-       if (uart_circ_empty(xmit) || uart_tx_stopped(&PORT)) {
-               serial98_stop_tx(port, 0);
-               return;
-       }
-
-       count = PORT.fifosize;
-       do {
-               outb(xmit->buf[xmit->tail], PORT.iobase);
-               xmit->tail = (xmit->tail + 1) & (UART_XMIT_SIZE - 1);
-               PORT.icount.tx++;
-               if (uart_circ_empty(xmit))
-                       break;
-       } while (--count > 0);
-
-       if (uart_circ_chars_pending(xmit) < WAKEUP_CHARS)
-               uart_write_wakeup(&PORT);
-
-       if (uart_circ_empty(xmit))
-               serial98_stop_tx(&PORT, 0);
-}
-
-static void serial98_modem_status(struct uart_port *port)
-{
-       int status;
-
-       status = serial98_msr_in(port);
-
-       if ((status & UART_MSR_ANY_DELTA) == 0)
-               return;
-
-       if (status & UART_MSR_TERI)
-               PORT.icount.rng++;
-       if (status & UART_MSR_DDSR)
-               PORT.icount.dsr++;
-       if (status & UART_MSR_DDCD)
-               uart_handle_dcd_change(&PORT, status & UART_MSR_DCD);
-       if (status & UART_MSR_DCTS)
-               uart_handle_cts_change(&PORT, status & UART_MSR_CTS);
-
-       wake_up_interruptible(&PORT.info->delta_msr_wait);
-}
-
-static void serial98_int(int irq, void *port, struct pt_regs *regs)
-{
-       unsigned int status;
-
-       spin_lock(&PORT.lock);
-       status = inb(PORT.iobase + 2);
-       if (status & PORT98->rxrdy) {
-               serial98_rx_chars(port, &status, regs);
-       }
-       serial98_modem_status(port);
-       if (status & PORT98->txrdy) {
-               serial98_tx_chars(port);
-       }
-       spin_unlock(&PORT.lock);
-}
-
-static unsigned int serial98_tx_empty(struct uart_port *port)
-{
-       unsigned long flags;
-       unsigned int ret = 0;
-
-       spin_lock_irqsave(&PORT.lock, flags);
-       if (inb(PORT.iobase + 2) & PORT98->txemp)
-                       ret = TIOCSER_TEMT;
-
-       spin_unlock_irqrestore(&PORT.lock, flags);
-       return ret;
-}
-
-static unsigned int serial98_get_mctrl(struct uart_port *port)
-{
-       unsigned char status;
-       unsigned int ret = 0;
-
-       status = serial98_msr_in(port);
-       if (status & UART_MSR_DCD)
-               ret |= TIOCM_CAR;
-       if (status & UART_MSR_RI)
-               ret |= TIOCM_RNG;
-       if (status & UART_MSR_DSR)
-               ret |= TIOCM_DSR;
-       if (status & UART_MSR_CTS)
-               ret |= TIOCM_CTS;
-       return ret;
-}
-
-static void serial98_set_mctrl(struct uart_port *port, unsigned int mctrl)
-{
-       PORT98->cmd &= 0xdd;
-       if (mctrl & TIOCM_RTS)
-               PORT98->cmd |= CMD_RTS;
-
-       if (mctrl & TIOCM_DTR)
-               PORT98->cmd |= CMD_DTR;
-
-       serial98_cmd_out(port, PORT98->cmd);
-}
-
-static void serial98_break_ctl(struct uart_port *port, int break_state)
-{
-       unsigned long flags;
-
-       spin_lock_irqsave(&PORT.lock, flags);
-       if (break_state == -1)
-               PORT98->cmd |= CMD_BREAK;
-       else
-               PORT98->cmd &= ~CMD_BREAK;
-
-       serial98_cmd_out(port, PORT98->cmd);
-       spin_unlock_irqrestore(&PORT.lock, flags);
-}
-
-static int serial98_startup(struct uart_port *port)
-{
-       int retval;
-
-       if (PORT.type == PORT_8251_PC98) {
-               /* Wake up UART */
-               PORT98->mode = 0xfc;
-               serial98_mode_set(port);
-               outb(DIS_RXR_INT, IER1_CTL);
-               outb(DIS_TXE_INT, IER1_CTL);
-               outb(DIS_TXR_INT, IER1_CTL);
-               PORT98->mode = 0;
-               serial98_mode_set(port);
-       }
-
-       /*
-        * Clear the FIFO buffers and disable them.
-        * (they will be reeanbled in set_termios())
-        */
-       if (PORT.type == PORT_FIFO_PC98 || PORT.type == PORT_VFAST_PC98) {
-               outb(UART_FCR_ENABLE_FIFO, FCR_8251F);
-               outb((UART_FCR_ENABLE_FIFO
-                       | UART_FCR_CLEAR_RCVR
-                       | UART_FCR_CLEAR_XMIT), FCR_8251F);
-               outb(0, FCR_8251F);
-       }
-
-       /* Clear the interrupt registers. */
-       inb(0x30);
-       inb(0x32);
-       if (PORT.type == PORT_FIFO_PC98 || PORT.type == PORT_VFAST_PC98) {
-               inb(PORT.iobase);
-               inb(PORT.iobase + 2);
-               inb(PORT.iobase + 4);
-               inb(PORT.iobase + 6);
-       }
-
-       /* Allocate the IRQ */
-       retval = request_irq(PORT.irq, serial98_int, 0,
-                               serial98_reg.driver_name, port);
-       if (retval)
-               return retval;
-
-       /*
-        * Now, initialize the UART
-        */
-       PORT98->mode = 0x4e;
-       serial98_mode_set(port);
-       PORT98->cmd = 0x15;
-       serial98_cmd_out(port, PORT98->cmd);
-       PORT98->cmd = 0x05;
-
-       /*
-        * Finally, enable interrupts
-        */
-       outb(0x00, IER2_8251F);
-       outb(ENA_RXR_INT, IER1_CTL);
-
-       /*
-        * And clear the interrupt registers again for luck.
-        */
-       inb(0x30);
-       inb(0x32);
-       if (PORT.type == PORT_FIFO_PC98 || PORT.type == PORT_VFAST_PC98) {
-               inb(PORT.iobase);
-               inb(PORT.iobase + 2);
-               inb(PORT.iobase + 4);
-               inb(PORT.iobase + 6);
-       }
-
-       return 0;
-}
-
-static void serial98_shutdown(struct uart_port *port)
-{
-       unsigned long flags;
-
-       /*
-        * disable all interrupts
-        */
-       spin_lock_irqsave(&PORT.lock, flags);
-       if (PORT.type == PORT_VFAST_PC98)
-               outb(0, VFAST_8251F);           /* V.FAST mode off */
-
-       /* disnable all modem status interrupt */
-       outb(0x80, IER2_8251F);
-
-       /* disnable TX/RX interrupt */
-       outb(0x00, IER2_8251F);
-       outb(DIS_RXR_INT, IER1_CTL);
-       outb(DIS_TXE_INT, IER1_CTL);
-       outb(DIS_TXR_INT, IER1_CTL);
-       PORT98->ier = 0;
-
-       spin_unlock_irqrestore(&PORT.lock, flags);
-
-       /*
-        * Free the interrupt
-        */
-       free_irq(PORT.irq, port);
-
-       /* disable break condition and disable the port */
-       serial98_mode_set(port);
-
-       /* disable FIFO's */    
-       if (PORT.type == PORT_FIFO_PC98 || PORT.type == PORT_VFAST_PC98) {
-               outb((UART_FCR_ENABLE_FIFO
-                       | UART_FCR_CLEAR_RCVR
-                       | UART_FCR_CLEAR_XMIT), FCR_8251F);
-               outb(0, FCR_8251F);
-       }
-
-       inb(PORT.iobase);
-}
-
-static void
-serial98_set_termios(struct uart_port *port, struct termios *termios,
-                      struct termios *old)
-{
-       unsigned char stopbit, cval, fcr = 0, ier = 0;
-       unsigned long flags;
-       unsigned int baud, quot;
-
-       stopbit = 0x80;
-       switch (termios->c_cflag & CSIZE) {
-               case CS5:
-                       cval = 0x42;
-                       stopbit = 0xc0;
-                       break;
-               case CS6:
-                       cval = 0x46;
-                       break;
-               case CS7:
-                       cval = 0x4a;
-                       break;
-               default:
-               case CS8:
-                       cval = 0x4e;
-                       break;
-       }
-
-       if (termios->c_cflag & CSTOPB)
-               cval ^= stopbit;
-       if (termios->c_cflag & PARENB)
-               cval |= 0x10;
-       if (!(termios->c_cflag & PARODD))
-               cval |= 0x20;
-
-       /*
-        * Ask the core to calculate the divisor for us.
-        */
-       baud = uart_get_baud_rate(port, termios, old, 0, port->uartclk/16); 
-       quot = uart_get_divisor(port, baud);
-
-       if (PORT.type == PORT_FIFO_PC98 || PORT.type == PORT_VFAST_PC98) {
-               if ((PORT.uartclk / quot) < (2400 * 16))
-                       fcr = UART_FCR_ENABLE_FIFO | UART_FCR_TRIGGER_1;
-               else
-                       fcr = UART_FCR_ENABLE_FIFO | UART_FCR_TRIGGER_8;
-       }
-
-       /*
-        * Ok, we're now changing the port state.  Do it with
-        * interrupts disabled.
-        */
-       spin_lock_irqsave(&PORT.lock, flags);
-
-       /*
-        * Update the per-port timeout.
-        */
-       uart_update_timeout(port, termios->c_cflag, baud);
-
-       PORT.read_status_mask = PORT98->oe | PORT98->txemp | PORT98->dr;
-       if (termios->c_iflag & INPCK)
-               PORT.read_status_mask |= PORT98->fe | PORT98->pe;
-
-       if (termios->c_iflag & (BRKINT | PARMRK))
-               PORT.read_status_mask |= PORT98->brk;
-       /*
-        * Characters to ignore
-        */
-       PORT.ignore_status_mask = 0;
-       if (termios->c_iflag & IGNPAR)
-               PORT.ignore_status_mask |= PORT98->fe | PORT98->pe;
-
-       if (termios->c_iflag & IGNBRK) {
-               PORT.ignore_status_mask |= PORT98->brk;
-               /*
-                * If we're ignoring parity and break indicators,
-                * ignore overruns too (for real raw support).
-                */
-               if (termios->c_iflag & IGNPAR)
-                       PORT.ignore_status_mask |= PORT98->oe;
-       }
-
-       /*
-        * ignore all characters if CREAD is not set
-        */
-       if ((termios->c_cflag & CREAD) == 0)
-               PORT.ignore_status_mask |= PORT98->dr;
-
-       /*
-        * CTS flow control flag and modem status interrupts
-        */
-       if (PORT.flags & UPF_HARDPPS_CD)
-               ier |= 0x80;    /* enable modem status interrupt */
-       if (termios->c_cflag & CRTSCTS) {
-               ier |= 0x08;    /* enable CTS interrupt */
-               ier |= 0x80;    /* enable modem status interrupt */
-       }
-       if (!(termios->c_cflag & CLOCAL)) {
-               ier |= 0x20;    /* enable CD interrupt */
-               ier |= 0x80;    /* enable modem status interrupt */
-       }
-       PORT98->ier = ier;
-
-       PORT98->mode = cval;
-       serial98_mode_set(port);
-       if (PORT.type == PORT_VFAST_PC98 && quot <= 48) {
-               quot /= 4;
-               if (quot < 1)
-                       quot = 1;
-               outb(quot | VFAST_ENABLE, VFAST_8251F);
-       } else {
-               quot /= 3;
-               if (quot < 1)
-                       quot = 1;
-               if (PORT.type == PORT_VFAST_PC98)
-                       outb(0, VFAST_8251F);           /* V.FAST mode off */
-               outb(0xb6, 0x77);
-               outb(quot & 0xff, 0x75);                /* LS of divisor */
-               outb(quot >> 8, 0x75);                  /* MS of divisor */
-       }
-
-       if (fcr & UART_FCR_ENABLE_FIFO) {
-               outb(UART_FCR_ENABLE_FIFO, FCR_8251F);
-               outb(fcr, FCR_8251F);
-       }
-
-       /* enable RX/TX */
-       PORT98->cmd = 0x15;
-       serial98_cmd_out(port, PORT98->cmd);
-       PORT98->cmd = 0x05;
-       /* enable interrupts */
-       outb(0x00, IER2_8251F);
-       outb(ENA_RXR_INT, IER1_CTL);
-       spin_unlock_irqrestore(&PORT.lock, flags);
-}
-
-static const char *serial98_type(struct uart_port *port)
-{
-       char *p;
-
-       switch (PORT.type) {
-               case PORT_8251_PC98:
-                       p = "PC98 onboard legacy 8251";
-                       break;
-               case PORT_19K_PC98:
-                       p =  "PC98 onboard max 19200bps";
-                       break;
-               case PORT_FIFO_PC98:
-                       p = "PC98 onboard with FIFO";
-                       break;
-               case PORT_VFAST_PC98:
-                       p = "PC98 onboard V.FAST";
-                       break;
-               case PORT_PC9861:
-                       p = "PC-9861K RS-232C ext. board";
-                       break;
-               case PORT_PC9801_101:
-                       p = "PC-9801-101 RS-232C ext. board";
-                       break;
-               default:
-                       return NULL;
-       }
-
-       sprintf(type_str, "%s  Clock %dMHz", p, serial98_clk);
-       return type_str;
-}
-
-/* Release the region(s) being used by 'port' */
-static void serial98_release_port(struct uart_port *port)
-{
-       switch (PORT.type) {
-               case PORT_VFAST_PC98:
-                       release_region(PORT.iobase + 0xa, 1);
-               case PORT_FIFO_PC98:
-                       release_region(PORT.iobase + 8, 1);
-                       release_region(PORT.iobase + 6, 1);
-                       release_region(PORT.iobase + 4, 1);
-                       release_region(PORT.iobase + 2, 1);
-                       release_region(PORT.iobase, 1);
-               case PORT_19K_PC98:
-                       release_region(SERIAL98_EXT, 1);
-                       release_region(0x34, 1);
-               case PORT_8251_PC98:
-                       release_region(0x32, 1);
-                       release_region(0x30, 1);
-       }
-}
-
-/* Request the region(s) being used by 'port' */
-#define REQ_REGION98(base) (request_region((base), 1, serial98_reg.driver_name))
-static int serial98_request_region(unsigned int type)
-{
-       if (!REQ_REGION98(0x30))
-               return -EBUSY;
-       if (REQ_REGION98(0x32)) {
-               if (type == PORT_8251_PC98)
-                       return 0;
-               if (REQ_REGION98(0x34)) {
-                       if (REQ_REGION98(SERIAL98_EXT)) {
-                               unsigned long base;
-
-                               if (type == PORT_19K_PC98)
-                                       return 0;
-                               for (base = 0x130; base <= 0x138; base += 2) {
-                                       if (!REQ_REGION98(base)) {
-                                               base -= 2;
-                                               goto err;
-                                       }
-                               }
-                               if (type == PORT_FIFO_PC98)
-                                       return 0;
-                               if (type == PORT_VFAST_PC98) {
-                                       if (REQ_REGION98(0x13a))
-                                               return 0;
-                               }
-                               err:
-                               while (base >= 0x130) {
-                                       release_region(base, 1);
-                                       base -= 2;
-                               }
-                               release_region(SERIAL98_EXT, 1);
-                       }
-                       release_region(0x34, 1);
-               }
-               release_region(0x32, 1);
-       }
-       release_region(0x30, 1);
-       return -EBUSY;
-}
-
-static int serial98_request_port(struct uart_port *port)
-{
-       return serial98_request_region(PORT.type);
-}
-
-/*
- * Configure/autoconfigure the port.
- */
-static void serial98_config_port(struct uart_port *port, int flags)
-{
-       if (flags & UART_CONFIG_TYPE)
-               PORT.type = PORT98->type;
-}
-
-/*
- * verify the new serial_struct (for TIOCSSERIAL).
- */
-static int serial98_verify_port(struct uart_port *port, struct serial_struct *ser)
-{
-       switch (ser->type) {
-               case PORT_VFAST_PC98:
-               case PORT_FIFO_PC98:
-               case PORT_19K_PC98:
-               case PORT_8251_PC98:
-               /* not implemented yet
-               case PORT_PC9861:
-               case PORT_PC9801_101:
-               */
-               case PORT_UNKNOWN:
-                       break;
-               default:
-                       return -EINVAL;
-       }
-       if (ser->irq < 0 || ser->irq >= NR_IRQS)
-               return -EINVAL;
-       if (ser->baud_base < 9600)
-               return -EINVAL;
-       return 0;
-}
-
-static struct uart_ops serial98_ops = {
-       .tx_empty       = serial98_tx_empty,
-       .set_mctrl      = serial98_set_mctrl,
-       .get_mctrl      = serial98_get_mctrl,
-       .stop_tx        = serial98_stop_tx,
-       .start_tx       = serial98_start_tx,
-       .stop_rx        = serial98_stop_rx,
-       .enable_ms      = serial98_enable_ms,
-       .break_ctl      = serial98_break_ctl,
-       .startup        = serial98_startup,
-       .shutdown       = serial98_shutdown,
-       .set_termios    = serial98_set_termios,
-       .type           = serial98_type,
-       .release_port   = serial98_release_port,
-       .request_port   = serial98_request_port,
-       .config_port    = serial98_config_port,
-       .verify_port    = serial98_verify_port,
-};
-
-static struct serial98_port serial98_ports[SERIAL98_NR] = {
-       {
-               .port = {
-                               .iobase         = 0x30,
-                               .iotype         = SERIAL_IO_PORT,
-                               .irq            = 4,
-                               .fifosize       = 1,
-                               .ops            = &serial98_ops,
-                               .flags          = ASYNC_BOOT_AUTOCONF,
-                               .line           = 0,
-                       },
-               .rxchk = STAT_8251_RXRDY,
-               .txemp = STAT_8251_TXEMP,
-               .txrdy = STAT_8251_TXRDY,
-               .rxrdy = STAT_8251_RXRDY,
-               .brk = STAT_8251_BRK,
-               .fe = STAT_8251_FER,
-               .oe = STAT_8251_OER,
-               .pe = STAT_8251_PER,
-               .dr = STAT_8251_DSR,
-       },
-};
-
-#ifdef CONFIG_SERIAL98_CONSOLE
-
-#define BOTH_EMPTY (PORT98->txemp | PORT98->txrdy)
-
-/*
- *     Wait for transmitter & holding register to empty
- */
-static inline void wait_for_xmitr(struct uart_port *port)
-{
-       unsigned int status, tmout = 10000;
-
-       /* Wait up to 10ms for the character(s) to be sent. */
-       do {
-               status = inb(PORT.iobase + 2);
-
-               if (status & PORT98->brk)
-                       PORT98->lsr_break_flag = PORT98->brk;
-
-               if (--tmout == 0)
-                       break;
-               udelay(1);
-       } while ((status & BOTH_EMPTY) != BOTH_EMPTY);
-
-       /* Wait up to 1s for flow control if necessary */
-       if (PORT.flags & UPF_CONS_FLOW) {
-               tmout = 1000000;
-               while (--tmout &&
-                      ((serial98_msr_in(port) & UART_MSR_CTS) == 0))
-                       udelay(1);
-       }
-}
-
-/*
- *     Print a string to the serial port trying not to disturb
- *     any possible real use of the port...
- *
- *     The console_lock must be held when we get here.
- */
-static void
-serial98_console_write(struct console *co, const char *s, unsigned int count)
-{
-       struct uart_port *port = (struct uart_port *)&serial98_ports[co->index];
-       unsigned int ier1, ier2;
-       int i;
-
-       /*
-        *      First save the UER then disable the interrupts
-        */
-       ier1 = inb(IER1_8251F);
-       ier2 = inb(IER2_8251F);
-       /* disnable all modem status interrupt */
-       outb(0x80, IER2_8251F);
-
-       /* disnable TX/RX interrupt */
-       outb(0x00, IER2_8251F);
-       outb(DIS_RXR_INT, IER1_CTL);
-       outb(DIS_TXE_INT, IER1_CTL);
-       outb(DIS_TXR_INT, IER1_CTL);
-
-       /*
-        *      Now, do each character
-        */
-       for (i = 0; i < count; i++, s++) {
-               wait_for_xmitr(port);
-
-               /*
-                *      Send the character out.
-                *      If a LF, also do CR...
-                */
-               outb(*s, PORT.iobase);
-               if (*s == 10) {
-                       wait_for_xmitr(port);
-                       outb(13, PORT.iobase);
-               }
-       }
-
-       /*
-        *      Finally, wait for transmitter to become empty
-        *      and restore the IER
-        */
-       wait_for_xmitr(port);
-
-       /* restore TX/RX interrupt */
-       outb(0x00, IER2_8251F);
-       if (ier1 & 0x01)
-               outb(ENA_RXR_INT, IER1_CTL);
-       if (ier1 & 0x02)
-               outb(ENA_TXE_INT, IER1_CTL);
-       if (ier1 & 0x04)
-               outb(ENA_TXR_INT, IER1_CTL);
-
-       /* restore modem status interrupt */
-       outb(ier2, IER2_8251F);
-}
-
-static int __init serial98_console_setup(struct console *co, char *options)
-{
-       struct uart_port *port;
-       int baud = 9600;
-       int bits = 8;
-       int parity = 'n';
-       int flow = 'n';
-
-       /*
-        * Check whether an invalid uart number has been specified, and
-        * if so, search for the first available port that does have
-        * console support.
-        */
-       if (co->index >= SERIAL98_NR)
-               co->index = 0;
-       port = &serial98_ports[co->index].port;
-
-       /*
-        * Temporary fix.
-        */
-       spin_lock_init(&port->lock);
-
-       if (options)
-               uart_parse_options(options, &baud, &parity, &bits, &flow);
-
-       return uart_set_options(port, co, baud, parity, bits, flow);
-}
-
-void __init serial98_console_init(void)
-{
-       register_console(&serial98_console);
-}
-
-#endif /* CONFIG_SERIAL98_CONSOLE */
-
-
-static int __init serial98_init(void)
-{
-       int ret;
-       unsigned char iir1, iir2;
-
-       if (PC9800_8MHz_P()) {
-               serial98_clk = 8;
-               serial98_ports[0].port.uartclk = 374400 * 16;
-       } else {
-               serial98_clk = 5;
-               serial98_ports[0].port.uartclk = 460800 * 16;
-       }
-
-       printk(KERN_INFO "serial98: PC-9801 standard serial port driver Version 0.1alpha\n");
-       serial98_ports[0].type = PORT_8251_PC98;
-       /* Check FIFO exist */
-       iir1 = inb(IIR_8251F);
-       iir2 = inb(IIR_8251F);
-       if ((iir1 & 0x40) != (iir2 & 0x40) && (iir1 & 0x20) == (iir2 & 0x20)) {
-               serial98_ports[0].port.iobase = 0x130;
-               serial98_ports[0].port.fifosize = 16;
-               serial98_ports[0].rxchk = STAT_8251F_DSR;
-               serial98_ports[0].txemp = STAT_8251F_TXEMP;
-               serial98_ports[0].txrdy = STAT_8251F_TXRDY;
-               serial98_ports[0].rxrdy = STAT_8251F_RXRDY;
-               serial98_ports[0].brk = STAT_8251F_BRK;
-               serial98_ports[0].fe = STAT_8251F_FER;
-               serial98_ports[0].oe = STAT_8251F_OER;
-               serial98_ports[0].pe = STAT_8251F_PER;
-               serial98_ports[0].dr = STAT_8251F_DSR;
-
-               if (*(unsigned char*)__va(PC9821SCA_RSFLAGS) & 0x10)
-                       serial98_ports[0].type = PORT_VFAST_PC98;
-               else {
-                       outb(serial98_ports[0].ext | 0x40, SERIAL98_EXT);
-                       serial98_ports[0].port.uartclk *= 4;
-                       serial98_ports[0].type = PORT_FIFO_PC98;
-               }
-       } else if ((serial98_ports[0].ext = inb(SERIAL98_EXT)) != 0xff) {
-               outb(serial98_ports[0].ext | 0x40, SERIAL98_EXT);
-               if (inb(SERIAL98_EXT) == (serial98_ports[0].ext | 0x40)) {
-                       serial98_ports[0].port.uartclk *= 4;
-                       serial98_ports[0].type = PORT_19K_PC98;
-               } else {
-                       serial98_ops.enable_ms = NULL;
-                       outb(serial98_ports[0].ext, SERIAL98_EXT);
-               }
-       }
-
-       if (serial98_request_region(serial98_ports[0].type))
-               return -EBUSY;
-
-       ret = uart_register_driver(&serial98_reg);
-       if (ret == 0) {
-               int i;
-
-               for (i = 0; i < SERIAL98_NR; i++) {
-                       uart_add_one_port(&serial98_reg,
-                                       (struct uart_port *)&serial98_ports[i]);
-               }
-       }
-
-       return ret;
-}
-
-static void __exit serial98_exit(void)
-{
-       int i;
-
-       if (serial98_ports[0].type == PORT_19K_PC98
-                       || serial98_ports[0].type == PORT_FIFO_PC98)
-               outb(serial98_ports[0].ext, SERIAL98_EXT);
-
-       for (i = 0; i < SERIAL98_NR; i++) {
-               uart_remove_one_port(&serial98_reg,
-                                       (struct uart_port *)&serial98_ports[i]);
-       }
-
-       uart_unregister_driver(&serial98_reg);
-}
-
-module_init(serial98_init);
-module_exit(serial98_exit);
-
-MODULE_AUTHOR("Osamu Tomita <tomita@cinet.co.jp>");
-MODULE_DESCRIPTION("PC-9801 standard serial port driver Version 0.1alpha");
-MODULE_LICENSE("GPL");
diff --git a/drivers/serial/sn_console.c b/drivers/serial/sn_console.c
deleted file mode 100644 (file)
index 98b96c5..0000000
+++ /dev/null
@@ -1,1194 +0,0 @@
-/*
- * C-Brick Serial Port (and console) driver for SGI Altix machines.
- *
- * This driver is NOT suitable for talking to the l1-controller for
- * anything other than 'console activities' --- please use the l1
- * driver for that.
- *
- *
- * Copyright (c) 2004 Silicon Graphics, Inc.  All Rights Reserved.
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of version 2 of the GNU General Public License
- * as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it would be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- *
- * Further, this software is distributed without any warranty that it is
- * free of the rightful claim of any third person regarding infringement
- * or the like.  Any license provided herein, whether implied or
- * otherwise, applies only to this software file.  Patent licenses, if
- * any, provided herein do not apply to combinations of this program with
- * other software, or any other product whatsoever.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston MA 02111-1307, USA.
- *
- * Contact information:  Silicon Graphics, Inc., 1500 Crittenden Lane,
- * Mountain View, CA  94043, or:
- *
- * http://www.sgi.com
- *
- * For further information regarding this notice, see:
- *
- * http://oss.sgi.com/projects/GenInfo/NoticeExplan
- */
-
-#include <linux/config.h>
-#include <linux/interrupt.h>
-#include <linux/tty.h>
-#include <linux/serial.h>
-#include <linux/console.h>
-#include <linux/module.h>
-#include <linux/sysrq.h>
-#include <linux/circ_buf.h>
-#include <linux/serial_reg.h>
-#include <linux/delay.h> /* for mdelay */
-#include <linux/miscdevice.h>
-#include <linux/serial_core.h>
-
-#include <asm/sn/simulator.h>
-#include <asm/sn/sn2/sn_private.h>
-#include <asm/sn/sn_sal.h>
-
-/* number of characters we can transmit to the SAL console at a time */
-#define SN_SAL_MAX_CHARS 120
-
-/* 64K, when we're asynch, it must be at least printk's LOG_BUF_LEN to
- * avoid losing chars, (always has to be a power of 2) */
-#define SN_SAL_BUFFER_SIZE (64 * (1 << 10))
-
-#define SN_SAL_UART_FIFO_DEPTH 16
-#define SN_SAL_UART_FIFO_SPEED_CPS 9600/10
-
-/* sn_transmit_chars() calling args */
-#define TRANSMIT_BUFFERED      0
-#define TRANSMIT_RAW           1
-
-/* To use dynamic numbers only and not use the assigned major and minor,
- * define the following.. */
-/* #define USE_DYNAMIC_MINOR 1 */ /* use dynamic minor number */
-#define USE_DYNAMIC_MINOR 0 /* Don't rely on misc_register dynamic minor */
-
-/* Device name we're using */
-#define DEVICE_NAME "ttySG"
-#define DEVICE_NAME_DYNAMIC "ttySG0"  /* need full name for misc_register */
-/* The major/minor we are using, ignored for USE_DYNAMIC_MINOR */
-#define DEVICE_MAJOR 204
-#define DEVICE_MINOR 40
-
-/*
- * Port definition - this kinda drives it all
- */
-struct sn_cons_port {
-       struct timer_list sc_timer;
-       struct uart_port sc_port;
-       struct sn_sal_ops {
-               int (*sal_puts_raw) (const char *s, int len);
-               int (*sal_puts) (const char *s, int len);
-               int (*sal_getc) (void);
-               int (*sal_input_pending) (void);
-               void (*sal_wakeup_transmit) (struct sn_cons_port *, int);
-       } *sc_ops;
-       unsigned long sc_interrupt_timeout;
-       int sc_is_asynch;
-};
-
-static struct sn_cons_port sal_console_port;
-
-/* Only used if USE_DYNAMIC_MINOR is set to 1 */
-static struct miscdevice misc; /* used with misc_register for dynamic */
-
-extern u64 master_node_bedrock_address;
-extern void early_sn_setup(void);
-
-#undef DEBUG
-#ifdef DEBUG
-static int sn_debug_printf(const char *fmt, ...);
-#define DPRINTF(x...) sn_debug_printf(x)
-#else
-#define DPRINTF(x...) do { } while (0)
-#endif
-
-/* Prototypes */
-static int snt_hw_puts_raw(const char *, int);
-static int snt_hw_puts_buffered(const char *, int);
-static int snt_poll_getc(void);
-static int snt_poll_input_pending(void);
-static int snt_sim_puts(const char *, int);
-static int snt_sim_getc(void);
-static int snt_sim_input_pending(void);
-static int snt_intr_getc(void);
-static int snt_intr_input_pending(void);
-static void sn_transmit_chars(struct sn_cons_port *, int);
-
-/* A table for polling:
- */
-static struct sn_sal_ops poll_ops = {
-       .sal_puts_raw = snt_hw_puts_raw,
-       .sal_puts = snt_hw_puts_raw,
-       .sal_getc = snt_poll_getc,
-       .sal_input_pending = snt_poll_input_pending
-};
-
-/* A table for the simulator */
-static struct sn_sal_ops sim_ops = {
-       .sal_puts_raw = snt_sim_puts,
-       .sal_puts = snt_sim_puts,
-       .sal_getc = snt_sim_getc,
-       .sal_input_pending = snt_sim_input_pending
-};
-
-/* A table for interrupts enabled */
-static struct sn_sal_ops intr_ops = {
-       .sal_puts_raw = snt_hw_puts_raw,
-       .sal_puts = snt_hw_puts_buffered,
-       .sal_getc = snt_intr_getc,
-       .sal_input_pending = snt_intr_input_pending,
-       .sal_wakeup_transmit = sn_transmit_chars
-};
-
-/* the console does output in two distinctly different ways:
- * synchronous (raw) and asynchronous (buffered).  initally, early_printk
- * does synchronous output.  any data written goes directly to the SAL
- * to be output (incidentally, it is internally buffered by the SAL)
- * after interrupts and timers are initialized and available for use,
- * the console init code switches to asynchronous output.  this is
- * also the earliest opportunity to begin polling for console input.
- * after console initialization, console output and tty (serial port)
- * output is buffered and sent to the SAL asynchronously (either by
- * timer callback or by UART interrupt) */
-
-
-/* routines for running the console in polling mode */
-
-/**
- * snt_poll_getc - Get a character from the console in polling mode
- *
- */
-static int
-snt_poll_getc(void)
-{
-       int ch;
-
-       ia64_sn_console_getc(&ch);
-       return ch;
-}
-
-/**
- * snt_poll_input_pending - Check if any input is waiting - polling mode.
- *
- */
-static int
-snt_poll_input_pending(void)
-{
-       int status, input;
-
-       status = ia64_sn_console_check(&input);
-       return !status && input;
-}
-
-/* routines for running the console on the simulator */
-
-/**
- * snt_sim_puts - send to the console, used in simulator mode
- * @str: String to send
- * @count: length of string
- *
- */
-static int
-snt_sim_puts(const char *str, int count)
-{
-       int counter = count;
-
-#ifdef FLAG_DIRECT_CONSOLE_WRITES
-       /* This is an easy way to pre-pend the output to know whether the output
-        * was done via sal or directly */
-       writeb('[', master_node_bedrock_address + (UART_TX << 3));
-       writeb('+', master_node_bedrock_address + (UART_TX << 3));
-       writeb(']', master_node_bedrock_address + (UART_TX << 3));
-       writeb(' ', master_node_bedrock_address + (UART_TX << 3));
-#endif                         /* FLAG_DIRECT_CONSOLE_WRITES */
-       while (counter > 0) {
-               writeb(*str, master_node_bedrock_address + (UART_TX << 3));
-               counter--;
-               str++;
-       }
-       return count;
-}
-
-/**
- * snt_sim_getc - Get character from console in simulator mode
- *
- */
-static int
-snt_sim_getc(void)
-{
-       return readb(master_node_bedrock_address + (UART_RX << 3));
-}
-
-/**
- * snt_sim_input_pending - Check if there is input pending in simulator mode
- *
- */
-static int
-snt_sim_input_pending(void)
-{
-       return readb(master_node_bedrock_address +
-                    (UART_LSR << 3)) & UART_LSR_DR;
-}
-
-/* routines for an interrupt driven console (normal) */
-
-/**
- * snt_intr_getc - Get a character from the console, interrupt mode
- *
- */
-static int
-snt_intr_getc(void)
-{
-       return ia64_sn_console_readc();
-}
-
-/**
- * snt_intr_input_pending - Check if input is pending, interrupt mode
- *
- */
-static int
-snt_intr_input_pending(void)
-{
-       return ia64_sn_console_intr_status() & SAL_CONSOLE_INTR_RECV;
-}
-
-/* these functions are polled and interrupt */
-
-/**
- * snt_hw_puts_raw - Send raw string to the console, polled or interrupt mode
- * @s: String
- * @len: Length
- *
- */
-static int
-snt_hw_puts_raw(const char *s, int len)
-{
-       /* this will call the PROM and not return until this is done */
-       return ia64_sn_console_putb(s, len);
-}
-
-/**
- * snt_hw_puts_buffered - Send string to console, polled or interrupt mode
- * @s: String
- * @len: Length
- *
- */
-static int
-snt_hw_puts_buffered(const char *s, int len)
-{
-       /* queue data to the PROM */
-       return ia64_sn_console_xmit_chars((char *)s, len);
-}
-
-/* uart interface structs
- * These functions are associated with the uart_port that the serial core
- * infrastructure calls.
- *
- * Note: Due to how the console works, many routines are no-ops.
- */
-
-/**
- * snp_type - What type of console are we?
- * @port: Port to operate with (we ignore since we only have one port)
- *
- */
-static const char *
-snp_type(struct uart_port *port)
-{
-       return ("SGI SN L1");
-}
-
-/**
- * snp_tx_empty - Is the transmitter empty?  We pretend we're always empty
- * @port: Port to operate on (we ignore since we only have one port)
- *
- */
-static unsigned int
-snp_tx_empty(struct uart_port *port)
-{
-       return 1;
-}
-
-/**
- * snp_stop_tx - stop the transmitter - no-op for us
- * @port: Port to operat eon - we ignore - no-op function
- * @tty_stop: Set to 1 if called via uart_stop
- *
- */
-static void
-snp_stop_tx(struct uart_port *port, unsigned int tty_stop)
-{
-}
-
-/**
- * snp_release_port - Free i/o and resources for port - no-op for us
- * @port: Port to operate on - we ignore - no-op function
- *
- */
-static void
-snp_release_port(struct uart_port *port)
-{
-}
-
-/**
- * snp_enable_ms - Force modem status interrupts on - no-op for us
- * @port: Port to operate on - we ignore - no-op function
- *
- */
-static void
-snp_enable_ms(struct uart_port *port)
-{
-}
-
-/**
- * snp_shutdown - shut down the port - free irq and disable - no-op for us
- * @port: Port to shut down - we ignore
- *
- */
-static void
-snp_shutdown(struct uart_port *port)
-{
-}
-
-/**
- * snp_set_mctrl - set control lines (dtr, rts, etc) - no-op for our console
- * @port: Port to operate on - we ignore
- * @mctrl: Lines to set/unset - we ignore
- *
- */
-static void
-snp_set_mctrl(struct uart_port *port, unsigned int mctrl)
-{
-}
-
-/**
- * snp_get_mctrl - get contorl line info, we just return a static value
- * @port: port to operate on - we only have one port so we ignore this
- *
- */
-static unsigned int
-snp_get_mctrl(struct uart_port *port)
-{
-       return TIOCM_CAR | TIOCM_RNG | TIOCM_DSR | TIOCM_CTS;
-}
-
-/**
- * snp_stop_rx - Stop the receiver - we ignor ethis
- * @port: Port to operate on - we ignore
- *
- */
-static void
-snp_stop_rx(struct uart_port *port)
-{
-}
-
-/**
- * snp_start_tx - Start transmitter
- * @port: Port to operate on
- * @tty_stop: Set to 1 if called via uart_start
- *
- */
-static void
-snp_start_tx(struct uart_port *port, unsigned int tty_stop)
-{
-       if (sal_console_port.sc_ops->sal_wakeup_transmit)
-               sal_console_port.sc_ops->sal_wakeup_transmit(&sal_console_port, TRANSMIT_BUFFERED);
-
-}
-
-/**
- * snp_break_ctl - handle breaks - ignored by us
- * @port: Port to operate on
- * @break_state: Break state
- *
- */
-static void
-snp_break_ctl(struct uart_port *port, int break_state)
-{
-}
-
-/**
- * snp_startup - Start up the serial port - always return 0 (We're always on)
- * @port: Port to operate on
- *
- */
-static int
-snp_startup(struct uart_port *port)
-{
-       return 0;
-}
-
-/**
- * snp_set_termios - set termios stuff - we ignore these
- * @port: port to operate on
- * @termios: New settings
- * @termios: Old
- *
- */
-static void
-snp_set_termios(struct uart_port *port, struct termios *termios,
-               struct termios *old)
-{
-}
-
-/**
- * snp_request_port - allocate resources for port - ignored by us
- * @port: port to operate on
- *
- */
-static int
-snp_request_port(struct uart_port *port)
-{
-       return 0;
-}
-
-/**
- * snp_config_port - allocate resources, set up - we ignore,  we're always on
- * @port: Port to operate on
- * @flags: flags used for port setup
- *
- */
-static void
-snp_config_port(struct uart_port *port, int flags)
-{
-}
-
-/* Associate the uart functions above - given to serial core */
-
-static struct uart_ops sn_console_ops = {
-       .tx_empty = snp_tx_empty,
-       .set_mctrl = snp_set_mctrl,
-       .get_mctrl = snp_get_mctrl,
-       .stop_tx = snp_stop_tx,
-       .start_tx = snp_start_tx,
-       .stop_rx = snp_stop_rx,
-       .enable_ms = snp_enable_ms,
-       .break_ctl = snp_break_ctl,
-       .startup = snp_startup,
-       .shutdown = snp_shutdown,
-       .set_termios = snp_set_termios,
-       .pm = NULL,
-       .type = snp_type,
-       .release_port = snp_release_port,
-       .request_port = snp_request_port,
-       .config_port = snp_config_port,
-       .verify_port = NULL,
-};
-
-/* End of uart struct functions and defines */
-
-#ifdef DEBUG
-
-/**
- * sn_debug_printf - close to hardware debugging printf
- * @fmt: printf format
- *
- * This is as "close to the metal" as we can get, used when the driver
- * itself may be broken.
- *
- */
-static int
-sn_debug_printf(const char *fmt, ...)
-{
-       static char printk_buf[1024];
-       int printed_len;
-       va_list args;
-
-       va_start(args, fmt);
-       printed_len = vsnprintf(printk_buf, sizeof (printk_buf), fmt, args);
-
-       if (!sal_console_port.sc_ops) {
-               if (IS_RUNNING_ON_SIMULATOR())
-                       sal_console_port.sc_ops = &sim_ops;
-               else
-                       sal_console_port.sc_ops = &poll_ops;
-
-               early_sn_setup();
-       }
-       sal_console_port.sc_ops->sal_puts_raw(printk_buf, printed_len);
-
-       va_end(args);
-       return printed_len;
-}
-#endif /* DEBUG */
-
-/*
- * Interrupt handling routines.
- */
-
-
-/**
- * sn_receive_chars - Grab characters, pass them to tty layer
- * @port: Port to operate on
- * @regs: Saved registers (needed by uart_handle_sysrq_char)
- *
- * Note: If we're not registered with the serial core infrastructure yet,
- * we don't try to send characters to it...
- *
- */
-static void
-sn_receive_chars(struct sn_cons_port *port, struct pt_regs *regs)
-{
-       int ch;
-       struct tty_struct *tty;
-
-       if (!port) {
-               printk(KERN_ERR "sn_receive_chars - port NULL so can't receieve\n");
-               return;
-       }
-
-       if (!port->sc_ops) {
-               printk(KERN_ERR "sn_receive_chars - port->sc_ops  NULL so can't receieve\n");
-               return;
-       }
-
-       if (port->sc_port.info) {
-               /* The serial_core stuffs are initilized, use them */
-               tty = port->sc_port.info->tty;
-       }
-       else {
-               /* Not registered yet - can't pass to tty layer.  */
-               tty = NULL;
-       }
-
-       while (port->sc_ops->sal_input_pending()) {
-               ch = port->sc_ops->sal_getc();
-               if (ch < 0) {
-                       printk(KERN_ERR "sn_console: An error occured while "
-                              "obtaining data from the console (0x%0x)\n", ch);
-                       break;
-               }
-#if defined(CONFIG_SERIAL_SGI_L1_CONSOLE) && defined(CONFIG_MAGIC_SYSRQ)
-               if (uart_handle_sysrq_char(&port->sc_port, ch, regs))
-                       continue;
-#endif                         /* CONFIG_SERIAL_SGI_L1_CONSOLE && CONFIG_MAGIC_SYSRQ */
-
-               /* record the character to pass up to the tty layer */
-               if (tty) {
-                       *tty->flip.char_buf_ptr = ch;
-                       *tty->flip.flag_buf_ptr = TTY_NORMAL;
-                       tty->flip.char_buf_ptr++;
-                       tty->flip.count++;
-                       if (tty->flip.count == TTY_FLIPBUF_SIZE)
-                               break;
-               }
-               else {
-               }
-               port->sc_port.icount.rx++;
-       }
-
-       if (tty)
-               tty_flip_buffer_push(tty);
-}
-
-/**
- * sn_transmit_chars - grab characters from serial core, send off
- * @port: Port to operate on
- * @raw: Transmit raw or buffered
- *
- * Note: If we're early, before we're registered with serial core, the
- * writes are going through sn_sal_console_write because that's how
- * register_console has been set up.  We currently could have asynch
- * polls calling this function due to sn_sal_switch_to_asynch but we can
- * ignore them until we register with the serial core stuffs.
- *
- */
-static void
-sn_transmit_chars(struct sn_cons_port *port, int raw)
-{
-       int xmit_count, tail, head, loops, ii;
-       int result;
-       char *start;
-       struct circ_buf *xmit;
-
-       if (!port)
-               return;
-
-       BUG_ON(!port->sc_is_asynch);
-
-       if (port->sc_port.info) {
-               /* We're initilized, using serial core infrastructure */
-               xmit = &port->sc_port.info->xmit;
-       }
-       else {
-               /* Probably sn_sal_switch_to_asynch has been run but serial core isn't
-                * initilized yet.  Just return.  Writes are going through
-                * sn_sal_console_write (due to register_console) at this time.
-                */
-               return;
-       }
-
-       if (uart_circ_empty(xmit) || uart_tx_stopped(&port->sc_port)) {
-               /* Nothing to do. */
-               return;
-       }
-
-       head = xmit->head;
-       tail = xmit->tail;
-       start = &xmit->buf[tail];
-
-       /* twice around gets the tail to the end of the buffer and
-        * then to the head, if needed */
-       loops = (head < tail) ? 2 : 1;
-
-       for (ii = 0; ii < loops; ii++) {
-               xmit_count = (head < tail) ?
-                   (UART_XMIT_SIZE - tail) : (head - tail);
-
-               if (xmit_count > 0) {
-                       if (raw == TRANSMIT_RAW)
-                               result =
-                                   port->sc_ops->sal_puts_raw(start,
-                                                              xmit_count);
-                       else
-                               result =
-                                   port->sc_ops->sal_puts(start, xmit_count);
-#ifdef DEBUG
-                       if (!result)
-                               DPRINTF("`");
-#endif
-                       if (result > 0) {
-                               xmit_count -= result;
-                               port->sc_port.icount.tx += result;
-                               tail += result;
-                               tail &= UART_XMIT_SIZE - 1;
-                               xmit->tail = tail;
-                               start = &xmit->buf[tail];
-                       }
-               }
-       }
-
-       if (uart_circ_chars_pending(xmit) < WAKEUP_CHARS)
-               uart_write_wakeup(&port->sc_port);
-
-       if (uart_circ_empty(xmit))
-               snp_stop_tx(&port->sc_port, 0); /* no-op for us */
-}
-
-/**
- * sn_sal_interrupt - Handle console interrupts
- * @irq: irq #, useful for debug statements
- * @dev_id: our pointer to our port (sn_cons_port which contains the uart port)
- * @regs: Saved registers, used by sn_receive_chars for uart_handle_sysrq_char
- *
- */
-static irqreturn_t
-sn_sal_interrupt(int irq, void *dev_id, struct pt_regs *regs)
-{
-       struct sn_cons_port *port = (struct sn_cons_port *) dev_id;
-       unsigned long flags;
-       int status = ia64_sn_console_intr_status();
-
-       if (!port)
-               return IRQ_NONE;
-
-       spin_lock_irqsave(&port->sc_port.lock, flags);
-       if (status & SAL_CONSOLE_INTR_RECV) {
-               sn_receive_chars(port, regs);
-       }
-       if (status & SAL_CONSOLE_INTR_XMIT) {
-               sn_transmit_chars(port, TRANSMIT_BUFFERED);
-       }
-       spin_unlock_irqrestore(&port->sc_port.lock, flags);
-       return IRQ_HANDLED;
-}
-
-/**
- * sn_sal_connect_interrupt - Request interrupt, handled by sn_sal_interrupt
- * @port: Our sn_cons_port (which contains the uart port)
- *
- * returns the console irq if interrupt is successfully registered, else 0
- *
- */
-static int
-sn_sal_connect_interrupt(struct sn_cons_port *port)
-{
-       if (request_irq(SGI_UART_VECTOR, sn_sal_interrupt, SA_INTERRUPT,
-                       "SAL console driver", port) >= 0) {
-               return SGI_UART_VECTOR;
-       }
-
-       printk(KERN_INFO "sn_console: console proceeding in polled mode\n");
-       return 0;
-}
-
-/**
- * sn_sal_timer_poll - this function handles polled console mode
- * @data: A pointer to our sn_cons_port (which contains the uart port)
- *
- * data is the pointer that init_timer will store for us.  This function is
- * associated with init_timer to see if there is any console traffic.
- * Obviously not used in interrupt mode
- *
- */
-static void
-sn_sal_timer_poll(unsigned long data)
-{
-       struct sn_cons_port *port = (struct sn_cons_port *) data;
-       unsigned long flags;
-
-       if (!port)
-               return;
-
-       if (!port->sc_port.irq) {
-               spin_lock_irqsave(&port->sc_port.lock, flags);
-               sn_receive_chars(port, NULL);
-               sn_transmit_chars(port, TRANSMIT_RAW);
-               spin_unlock_irqrestore(&port->sc_port.lock, flags);
-               mod_timer(&port->sc_timer,
-                         jiffies + port->sc_interrupt_timeout);
-       }
-}
-
-/*
- * Boot-time initialization code
- */
-
-/**
- * sn_sal_switch_to_asynch - Switch to async mode (as opposed to synch)
- * @port: Our sn_cons_port (which contains the uart port)
- *
- * So this is used by sn_sal_serial_console_init (early on, before we're
- * registered with serial core).  It's also used by sn_sal_module_init
- * right after we've registered with serial core.  The later only happens
- * if we didn't already come through here via sn_sal_serial_console_init.
- *
- */
-static void __init
-sn_sal_switch_to_asynch(struct sn_cons_port *port)
-{
-       unsigned long flags;
-
-       if (!port)
-               return;
-
-       DPRINTF("sn_console: about to switch to asynchronous console\n");
-
-       /* without early_printk, we may be invoked late enough to race
-        * with other cpus doing console IO at this point, however
-        * console interrupts will never be enabled */
-       spin_lock_irqsave(&port->sc_port.lock, flags);
-
-       /* early_printk invocation may have done this for us */
-       if (!port->sc_ops) {
-               if (IS_RUNNING_ON_SIMULATOR())
-                       port->sc_ops = &sim_ops;
-               else
-                       port->sc_ops = &poll_ops;
-       }
-
-       /* we can't turn on the console interrupt (as request_irq
-        * calls kmalloc, which isn't set up yet), so we rely on a
-        * timer to poll for input and push data from the console
-        * buffer.
-        */
-       init_timer(&port->sc_timer);
-       port->sc_timer.function = sn_sal_timer_poll;
-       port->sc_timer.data = (unsigned long) port;
-
-       if (IS_RUNNING_ON_SIMULATOR())
-               port->sc_interrupt_timeout = 6;
-       else {
-               /* 960cps / 16 char FIFO = 60HZ
-                * HZ / (SN_SAL_FIFO_SPEED_CPS / SN_SAL_FIFO_DEPTH) */
-               port->sc_interrupt_timeout =
-                   HZ * SN_SAL_UART_FIFO_DEPTH / SN_SAL_UART_FIFO_SPEED_CPS;
-       }
-       mod_timer(&port->sc_timer, jiffies + port->sc_interrupt_timeout);
-
-       port->sc_is_asynch = 1;
-       spin_unlock_irqrestore(&port->sc_port.lock, flags);
-}
-
-/**
- * sn_sal_switch_to_interrupts - Switch to interrupt driven mode
- * @port: Our sn_cons_port (which contains the uart port)
- *
- * In sn_sal_module_init, after we're registered with serial core and
- * the port is added, this function is called to switch us to interrupt
- * mode.  We were previously in asynch/polling mode (using init_timer).
- *
- * We attempt to switch to interrupt mode here by calling
- * sn_sal_connect_interrupt.  If that works out, we enable receive interrupts.
- */
-static void __init
-sn_sal_switch_to_interrupts(struct sn_cons_port *port)
-{
-       int irq;
-       unsigned long flags;
-
-       if (!port)
-               return;
-
-       DPRINTF("sn_console: switching to interrupt driven console\n");
-
-       spin_lock_irqsave(&port->sc_port.lock, flags);
-
-       irq = sn_sal_connect_interrupt(port);
-
-       if (irq) {
-               port->sc_port.irq = irq;
-               port->sc_ops = &intr_ops;
-
-               /* turn on receive interrupts */
-               ia64_sn_console_intr_enable(SAL_CONSOLE_INTR_RECV);
-       }
-       spin_unlock_irqrestore(&port->sc_port.lock, flags);
-}
-
-/*
- * Kernel console definitions
- */
-
-#ifdef CONFIG_SERIAL_SGI_L1_CONSOLE
-static void sn_sal_console_write(struct console *, const char *, unsigned);
-static int __init sn_sal_console_setup(struct console *, char *);
-extern struct uart_driver sal_console_uart;
-extern struct tty_driver *uart_console_device(struct console *, int *);
-
-static struct console sal_console = {
-       .name = DEVICE_NAME,
-       .write = sn_sal_console_write,
-       .device = uart_console_device,
-       .setup = sn_sal_console_setup,
-       .index = -1, /* unspecified */
-       .data = &sal_console_uart,
-};
-
-#define SAL_CONSOLE    &sal_console
-#else
-#define SAL_CONSOLE    0
-#endif                         /* CONFIG_SERIAL_SGI_L1_CONSOLE */
-
-static struct uart_driver sal_console_uart = {
-       .owner = THIS_MODULE,
-       .driver_name = "sn_console",
-       .dev_name = DEVICE_NAME,
-       .major = 0, /* major/minor set at registration time per USE_DYNAMIC_MINOR */
-       .minor = 0,
-       .nr = 1,        /* one port */
-       .cons = SAL_CONSOLE,
-};
-
-/**
- * sn_sal_module_init - When the kernel loads us, get us rolling w/ serial core
- *
- * Before this is called, we've been printing kernel messages in a special
- * early mode not making use of the serial core infrastructure.  When our
- * driver is loaded for real, we register the driver and port with serial
- * core and try to enable interrupt driven mode.
- *
- */
-static int __init
-sn_sal_module_init(void)
-{
-       int retval;
-
-       printk(KERN_INFO "sn_console: Console driver init\n");
-
-       if (!ia64_platform_is("sn2"))
-               return -ENODEV;
-
-       if (USE_DYNAMIC_MINOR == 1) {
-               misc.minor = MISC_DYNAMIC_MINOR;
-               misc.name = DEVICE_NAME_DYNAMIC;
-               retval = misc_register(&misc);
-               if (retval != 0) {
-                       printk("Failed to register console device using misc_register.\n");
-                       return -ENODEV;
-               }
-               sal_console_uart.major = MISC_MAJOR;
-               sal_console_uart.minor = misc.minor;
-       }
-       else {
-               sal_console_uart.major = DEVICE_MAJOR;
-               sal_console_uart.minor = DEVICE_MINOR;
-       }
-
-       /* We register the driver and the port before switching to interrupts
-    * or async above so the proper uart structures are populated */
-
-       if (uart_register_driver(&sal_console_uart) < 0) {
-               printk("ERROR sn_sal_module_init failed uart_register_driver, line %d\n",
-                 __LINE__);
-               return -ENODEV;
-       }
-
-       sal_console_port.sc_port.lock = SPIN_LOCK_UNLOCKED;
-
-       /* Setup the port struct with the minimum needed */
-       sal_console_port.sc_port.membase = (char *)1;   /* just needs to be non-zero */
-       sal_console_port.sc_port.type = PORT_16550A;
-       sal_console_port.sc_port.fifosize = SN_SAL_MAX_CHARS;
-       sal_console_port.sc_port.ops = &sn_console_ops;
-       sal_console_port.sc_port.line = 0;
-
-       if (uart_add_one_port(&sal_console_uart, &sal_console_port.sc_port) < 0) {
-               /* error - not sure what I'd do - so I'll do nothing */
-               printk(KERN_ERR "%s: unable to add port\n", __FUNCTION__);
-       }
-
-       /* when this driver is compiled in, the console initialization
-        * will have already switched us into asynchronous operation
-        * before we get here through the module initcalls */
-       if (!sal_console_port.sc_is_asynch) {
-               sn_sal_switch_to_asynch(&sal_console_port);
-       }
-
-       /* at this point (module_init) we can try to turn on interrupts */
-       if (!IS_RUNNING_ON_SIMULATOR()) {
-               sn_sal_switch_to_interrupts(&sal_console_port);
-       }
-       return 0;
-}
-
-/**
- * sn_sal_module_exit - When we're unloaded, remove the driver/port
- *
- */
-static void __exit
-sn_sal_module_exit(void)
-{
-       del_timer_sync(&sal_console_port.sc_timer);
-       uart_remove_one_port(&sal_console_uart, &sal_console_port.sc_port);
-       uart_unregister_driver(&sal_console_uart);
-       misc_deregister(&misc);
-}
-
-module_init(sn_sal_module_init);
-module_exit(sn_sal_module_exit);
-
-#ifdef CONFIG_SERIAL_SGI_L1_CONSOLE
-
-/**
- * puts_raw_fixed - sn_sal_console_write helper for adding \r's as required
- * @puts_raw : puts function to do the writing
- * @s: input string
- * @count: length
- *
- * We need a \r ahead of every \n for direct writes through
- * ia64_sn_console_putb (what sal_puts_raw below actually does).
- *
- */
-
-static void puts_raw_fixed(int (*puts_raw) (const char *s, int len), const char *s, int count)
-{
-       const char *s1;
-
-       /* Output '\r' before each '\n' */
-       while ((s1 = memchr(s, '\n', count)) != NULL) {
-               puts_raw(s, s1 - s);
-               puts_raw("\r\n", 2);
-               count -= s1 + 1 - s;
-               s = s1 + 1;
-       }
-       puts_raw(s, count);
-}
-
-/**
- * sn_sal_console_write - Print statements before serial core available
- * @console: Console to operate on - we ignore since we have just one
- * @s: String to send
- * @count: length
- *
- * This is referenced in the console struct.  It is used for early
- * console printing before we register with serial core and for things
- * such as kdb.  The console_lock must be held when we get here.
- *
- * This function has some code for trying to print output even if the lock
- * is held.  We try to cover the case where a lock holder could have died.
- * We don't use this special case code if we're not registered with serial
- * core yet.  After we're registered with serial core, the only time this
- * function would be used is for high level kernel output like magic sys req,
- * kdb, and printk's.
- */
-static void
-sn_sal_console_write(struct console *co, const char *s, unsigned count)
-{
-       unsigned long flags = 0;
-       struct sn_cons_port *port = &sal_console_port;
-#if defined(CONFIG_SMP) || defined(CONFIG_PREEMPT)
-       static int stole_lock = 0;
-#endif
-
-       BUG_ON(!port->sc_is_asynch);
-
-       /* We can't look at the xmit buffer if we're not registered with serial core
-        *  yet.  So only do the fancy recovery after registering
-        */
-       if (port->sc_port.info) {
-
-               /* somebody really wants this output, might be an
-               * oops, kdb, panic, etc.  make sure they get it. */
-#if defined(CONFIG_SMP) || defined(CONFIG_PREEMPT)
-               if (spin_is_locked(&port->sc_port.lock)) {
-                       int lhead = port->sc_port.info->xmit.head;
-                       int ltail = port->sc_port.info->xmit.tail;
-                       int counter, got_lock = 0;
-
-                       /*
-                        * We attempt to determine if someone has died with the
-                        * lock. We wait ~20 secs after the head and tail ptrs
-                        * stop moving and assume the lock holder is not functional
-                        * and plow ahead. If the lock is freed within the time out
-                        * period we re-get the lock and go ahead normally. We also
-                        * remember if we have plowed ahead so that we don't have
-                        * to wait out the time out period again - the asumption
-                        * is that we will time out again.
-                        */
-
-                       for (counter = 0; counter < 150; mdelay(125), counter++) {
-                               if (!spin_is_locked(&port->sc_port.lock) || stole_lock) {
-                                       if (!stole_lock) {
-                                               spin_lock_irqsave(&port->sc_port.lock, flags);
-                                               got_lock = 1;
-                                       }
-                                       break;
-                               }
-                               else {
-                                       /* still locked */
-                                       if ((lhead != port->sc_port.info->xmit.head) || (ltail != port->sc_port.info->xmit.tail)) {
-                                               lhead = port->sc_port.info->xmit.head;
-                                               ltail = port->sc_port.info->xmit.tail;
-                                               counter = 0;
-                                       }
-                               }
-                       }
-                       /* flush anything in the serial core xmit buffer, raw */
-                       sn_transmit_chars(port, 1);
-                       if (got_lock) {
-                               spin_unlock_irqrestore(&port->sc_port.lock, flags);
-                               stole_lock = 0;
-                       }
-                       else {
-                               /* fell thru */
-                               stole_lock = 1;
-                       }
-                       puts_raw_fixed(port->sc_ops->sal_puts_raw, s, count);
-               }
-               else {
-                       stole_lock = 0;
-#endif
-                       spin_lock_irqsave(&port->sc_port.lock, flags);
-                       sn_transmit_chars(port, 1);
-                       spin_unlock_irqrestore(&port->sc_port.lock, flags);
-
-                       puts_raw_fixed(port->sc_ops->sal_puts_raw, s, count);
-               }
-       }
-       else {
-               /* Not yet registered with serial core - simple case */
-               puts_raw_fixed(port->sc_ops->sal_puts_raw, s, count);
-       }
-}
-
-
-/**
- * sn_sal_console_setup - Set up console for early printing
- * @co: Console to work with
- * @options: Options to set
- *
- * Altix console doesn't do anything with baud rates, etc, anyway.
- *
- * This isn't required since not providing the setup function in the
- * console struct is ok.  However, other patches like KDB plop something
- * here so providing it is easier.
- *
- */
-static int __init
-sn_sal_console_setup(struct console *co, char *options)
-{
-       return 0;
-}
-
-/**
- * sn_sal_console_write_early - simple early output routine
- * @co - console struct
- * @s - string to print
- * @count - count
- *
- * Simple function to provide early output, before even
- * sn_sal_serial_console_init is called.  Referenced in the
- * console struct registerd in sn_serial_console_early_setup.
- *
- */
-static void __init
-sn_sal_console_write_early(struct console *co, const char *s, unsigned count)
-{
-       puts_raw_fixed(sal_console_port.sc_ops->sal_puts_raw, s, count);
-}
-
-/* Used for very early console printing - again, before
- * sn_sal_serial_console_init is run */
-static struct console sal_console_early __initdata = {
-       .name = "sn_sal",
-       .write = sn_sal_console_write_early,
-       .flags = CON_PRINTBUFFER,
-       .index  = -1,
-};
-
-/**
- * sn_serial_console_early_setup - Sets up early console output support
- *
- * Register a console early on...  This is for output before even
- * sn_sal_serial_cosnole_init is called.  This function is called from
- * setup.c.  This allows us to do really early polled writes. When
- * sn_sal_serial_console_init is called, this console is unregistered
- * and a new one registered.
- */
-int __init
-sn_serial_console_early_setup(void)
-{
-       if (!ia64_platform_is("sn2"))
-               return -1;
-
-       if (IS_RUNNING_ON_SIMULATOR())
-               sal_console_port.sc_ops = &sim_ops;
-       else
-               sal_console_port.sc_ops = &poll_ops;
-
-       early_sn_setup(); /* Find SAL entry points */
-       register_console(&sal_console_early);
-
-       return 0;
-}
-
-
-/**
- * sn_sal_serial_console_init - Early console output - set up for register
- *
- * This function is called when regular console init happens.  Because we
- * support even earlier console output with sn_serial_console_early_setup
- * (called from setup.c directly), this function unregisters the really
- * early console.
- *
- * Note: Even if setup.c doesn't register sal_console_early, unregistering
- * it here doesn't hurt anything.
- *
- */
-static int __init
-sn_sal_serial_console_init(void)
-{
-       if (ia64_platform_is("sn2")) {
-               sn_sal_switch_to_asynch(&sal_console_port);
-               DPRINTF ("sn_sal_serial_console_init : register console\n");
-               register_console(&sal_console);
-               unregister_console(&sal_console_early);
-       }
-       return 0;
-}
-
-console_initcall(sn_sal_serial_console_init);
-
-#endif                         /* CONFIG_SERIAL_SGI_L1_CONSOLE */
diff --git a/drivers/usb/media/w9968cf_externaldef.h b/drivers/usb/media/w9968cf_externaldef.h
deleted file mode 100644 (file)
index 6817356..0000000
+++ /dev/null
@@ -1,94 +0,0 @@
-/***************************************************************************
- * Various definitions for compatibility with OVCAMCHIP external module.   *
- * This file is part of the W996[87]CF driver for Linux.                   *
- *                                                                         *
- * The definitions have been taken from the OVCAMCHIP module written by    *
- * Mark McClelland.                                                        *
- *                                                                         *
- * 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.               *
- ***************************************************************************/
-
-#ifndef _W9968CF_EXTERNALDEF_H_
-#define _W9968CF_EXTERNALDEF_H_
-
-#include <linux/videodev.h>
-#include <linux/i2c.h>
-#include <asm/ioctl.h>
-#include <asm/types.h>
-
-#ifndef I2C_DRIVERID_OVCAMCHIP
-#      define I2C_DRIVERID_OVCAMCHIP 0xf00f
-#endif
-
-/* Controls */
-enum {
-       OVCAMCHIP_CID_CONT,       /* Contrast */
-       OVCAMCHIP_CID_BRIGHT,     /* Brightness */
-       OVCAMCHIP_CID_SAT,        /* Saturation */
-       OVCAMCHIP_CID_HUE,        /* Hue */
-       OVCAMCHIP_CID_EXP,        /* Exposure */
-       OVCAMCHIP_CID_FREQ,       /* Light frequency */
-       OVCAMCHIP_CID_BANDFILT,   /* Banding filter */
-       OVCAMCHIP_CID_AUTOBRIGHT, /* Auto brightness */
-       OVCAMCHIP_CID_AUTOEXP,    /* Auto exposure */
-       OVCAMCHIP_CID_BACKLIGHT,  /* Back light compensation */
-       OVCAMCHIP_CID_MIRROR,     /* Mirror horizontally */
-};
-
-/* I2C addresses */
-#define OV7xx0_SID   (0x42 >> 1)
-#define OV6xx0_SID   (0xC0 >> 1)
-
-/* Sensor types */
-enum {
-       CC_UNKNOWN,
-       CC_OV76BE,
-       CC_OV7610,
-       CC_OV7620,
-       CC_OV7620AE,
-       CC_OV6620,
-       CC_OV6630,
-       CC_OV6630AE,
-       CC_OV6630AF,
-};
-
-/* API */
-struct ovcamchip_control {
-       __u32 id;
-       __s32 value;
-};
-
-struct ovcamchip_window {
-       int x;
-       int y;
-       int width;
-       int height;
-       int format;
-       int quarter;  /* Scale width and height down 2x */
-
-       /* This stuff will be removed eventually */
-       int clockdiv; /* Clock divisor setting */
-};
-
-/* Commands. 
-   You must call OVCAMCHIP_CMD_INITIALIZE before any of other commands */
-#define OVCAMCHIP_CMD_Q_SUBTYPE  _IOR  (0x88, 0x00, int)
-#define OVCAMCHIP_CMD_INITIALIZE _IOW  (0x88, 0x01, int)
-#define OVCAMCHIP_CMD_S_CTRL     _IOW  (0x88, 0x02, struct ovcamchip_control)
-#define OVCAMCHIP_CMD_G_CTRL     _IOWR (0x88, 0x03, struct ovcamchip_control)
-#define OVCAMCHIP_CMD_S_MODE     _IOW  (0x88, 0x04, struct ovcamchip_window)
-#define OVCAMCHIP_MAX_CMD        _IO   (0x88, 0x3f)
-
-#endif /* _W9968CF_EXTERNALDEF_H_ */
diff --git a/fs/ext3/resize.c b/fs/ext3/resize.c
deleted file mode 100644 (file)
index d1fe21d..0000000
+++ /dev/null
@@ -1,956 +0,0 @@
-/*
- *  linux/fs/ext3/resize.c
- *
- * Support for resizing an ext3 filesystem while it is mounted.
- *
- * Copyright (C) 2001, 2002 Andreas Dilger <adilger@clusterfs.com>
- *
- * This could probably be made into a module, because it is not often in use.
- */
-
-#include <linux/config.h>
-
-#define EXT3FS_DEBUG
-
-#include <linux/sched.h>
-#include <linux/smp_lock.h>
-#include <linux/ext3_jbd.h>
-
-#include <linux/errno.h>
-#include <linux/slab.h>
-
-
-#define outside(b, first, last)        ((b) < (first) || (b) >= (last))
-#define inside(b, first, last) ((b) >= (first) && (b) < (last))
-
-static int verify_group_input(struct super_block *sb,
-                             struct ext3_new_group_data *input)
-{
-       struct ext3_sb_info *sbi = EXT3_SB(sb);
-       struct ext3_super_block *es = sbi->s_es;
-       unsigned start = le32_to_cpu(es->s_blocks_count);
-       unsigned end = start + input->blocks_count;
-       unsigned group = input->group;
-       unsigned itend = input->inode_table + EXT3_SB(sb)->s_itb_per_group;
-       unsigned overhead = ext3_bg_has_super(sb, group) ?
-               (1 + ext3_bg_num_gdb(sb, group) +
-                le16_to_cpu(es->s_reserved_gdt_blocks)) : 0;
-       unsigned metaend = start + overhead;
-       struct buffer_head *bh;
-       int free_blocks_count;
-       int err = -EINVAL;
-
-       input->free_blocks_count = free_blocks_count =
-               input->blocks_count - 2 - overhead - sbi->s_itb_per_group;
-
-       if (test_opt(sb, DEBUG))
-               printk("EXT3-fs: adding %s group %u: %u blocks "
-                      "(%d free, %u reserved)\n",
-                      ext3_bg_has_super(sb, input->group) ? "normal" :
-                      "no-super", input->group, input->blocks_count,
-                      free_blocks_count, input->reserved_blocks);
-
-       if (group != sbi->s_groups_count)
-               ext3_warning(sb, __FUNCTION__,
-                            "Cannot add at group %u (only %lu groups)",
-                            input->group, sbi->s_groups_count);
-       else if ((start - le32_to_cpu(es->s_first_data_block)) %
-                EXT3_BLOCKS_PER_GROUP(sb))
-               ext3_warning(sb, __FUNCTION__, "Last group not full");
-       else if (input->reserved_blocks > input->blocks_count / 5)
-               ext3_warning(sb, __FUNCTION__, "Reserved blocks too high (%u)",
-                            input->reserved_blocks);
-       else if (free_blocks_count < 0)
-               ext3_warning(sb, __FUNCTION__, "Bad blocks count %u",
-                            input->blocks_count);
-       else if (!(bh = sb_bread(sb, end - 1)))
-               ext3_warning(sb, __FUNCTION__, "Cannot read last block (%u)",
-                            end - 1);
-       else if (outside(input->block_bitmap, start, end))
-               ext3_warning(sb, __FUNCTION__,
-                            "Block bitmap not in group (block %u)",
-                            input->block_bitmap);
-       else if (outside(input->inode_bitmap, start, end))
-               ext3_warning(sb, __FUNCTION__,
-                            "Inode bitmap not in group (block %u)",
-                            input->inode_bitmap);
-       else if (outside(input->inode_table, start, end) ||
-                outside(itend - 1, start, end))
-               ext3_warning(sb, __FUNCTION__,
-                            "Inode table not in group (blocks %u-%u)",
-                            input->inode_table, itend - 1);
-       else if (input->inode_bitmap == input->block_bitmap)
-               ext3_warning(sb, __FUNCTION__,
-                            "Block bitmap same as inode bitmap (%u)",
-                            input->block_bitmap);
-       else if (inside(input->block_bitmap, input->inode_table, itend))
-               ext3_warning(sb, __FUNCTION__,
-                            "Block bitmap (%u) in inode table (%u-%u)",
-                            input->block_bitmap, input->inode_table, itend-1);
-       else if (inside(input->inode_bitmap, input->inode_table, itend))
-               ext3_warning(sb, __FUNCTION__,
-                            "Inode bitmap (%u) in inode table (%u-%u)",
-                            input->inode_bitmap, input->inode_table, itend-1);
-       else if (inside(input->block_bitmap, start, metaend))
-               ext3_warning(sb, __FUNCTION__,
-                            "Block bitmap (%u) in GDT table (%u-%u)",
-                            input->block_bitmap, start, metaend - 1);
-       else if (inside(input->inode_bitmap, start, metaend))
-               ext3_warning(sb, __FUNCTION__,
-                            "Inode bitmap (%u) in GDT table (%u-%u)",
-                            input->inode_bitmap, start, metaend - 1);
-       else if (inside(input->inode_table, start, metaend) ||
-                inside(itend - 1, start, metaend))
-               ext3_warning(sb, __FUNCTION__,
-                            "Inode table (%u-%u) overlaps GDT table (%u-%u)",
-                            input->inode_table, itend - 1, start, metaend - 1);
-       else {
-               brelse(bh);
-               err = 0;
-       }
-
-       return err;
-}
-
-static struct buffer_head *bclean(handle_t *handle, struct super_block *sb,
-                                 unsigned long blk)
-{
-       struct buffer_head *bh;
-       int err;
-
-       bh = sb_getblk(sb, blk);
-       set_buffer_uptodate(bh);
-       if ((err = ext3_journal_get_write_access(handle, bh))) {
-               brelse(bh);
-               bh = ERR_PTR(err);
-       } else
-               memset(bh->b_data, 0, sb->s_blocksize);
-
-       return bh;
-}
-
-/*
- * To avoid calling the atomic setbit hundreds or thousands of times, we only
- * need to use it within a single byte (to ensure we get endianness right).
- * We can use memset for the rest of the bitmap as there are no other users.
- */
-static void mark_bitmap_end(int start_bit, int end_bit, char *bitmap)
-{
-       int i;
-
-       if (start_bit >= end_bit)
-               return;
-
-       ext3_debug("mark end bits +%d through +%d used\n", start_bit, end_bit);
-       for (i = start_bit; i < ((start_bit + 7) & ~7UL); i++)
-               ext3_set_bit(i, bitmap);
-       if (i < end_bit)
-               memset(bitmap + (i >> 3), 0xff, (end_bit - i) >> 3);
-}
-
-/*
- * Set up the block and inode bitmaps, and the inode table for the new group.
- * This doesn't need to be part of the main transaction, since we are only
- * changing blocks outside the actual filesystem.  We still do journaling to
- * ensure the recovery is correct in case of a failure just after resize.
- * If any part of this fails, we simply abort the resize.
- *
- * We only pass inode because of the ext3 journal wrappers.
- */
-static int setup_new_group_blocks(struct super_block *sb, struct inode *inode,
-                                 struct ext3_new_group_data *input)
-{
-       struct ext3_sb_info *sbi = EXT3_SB(sb);
-       unsigned long start = input->group * sbi->s_blocks_per_group +
-               le32_to_cpu(sbi->s_es->s_first_data_block);
-       int reserved_gdb = ext3_bg_has_super(sb, input->group) ?
-               le16_to_cpu(sbi->s_es->s_reserved_gdt_blocks) : 0;
-       unsigned long gdblocks = ext3_bg_num_gdb(sb, input->group);
-       struct buffer_head *bh;
-       handle_t *handle;
-       unsigned long block;
-       int bit;
-       int i;
-       int err = 0, err2;
-
-       handle = ext3_journal_start(inode, reserved_gdb + gdblocks +
-                                   2 + sbi->s_itb_per_group);
-       if (IS_ERR(handle))
-               return PTR_ERR(handle);
-
-       lock_super(sb);
-       if (input->group != sbi->s_groups_count) {
-               err = -EBUSY;
-               goto exit_journal;
-       }
-
-       if (IS_ERR(bh = bclean(handle, sb, input->block_bitmap))) {
-               err = PTR_ERR(bh);
-               goto exit_journal;
-       }
-
-       if (ext3_bg_has_super(sb, input->group)) {
-               ext3_debug("mark backup superblock %#04lx (+0)\n", start);
-               ext3_set_bit(0, bh->b_data);
-       }
-
-       /* Copy all of the GDT blocks into the backup in this group */
-       for (i = 0, bit = 1, block = start + 1;
-            i < gdblocks; i++, block++, bit++) {
-               struct buffer_head *gdb;
-
-               ext3_debug("update backup group %#04lx (+%d)\n", block, bit);
-
-               gdb = sb_getblk(sb, block);
-               set_buffer_uptodate(gdb);
-               if ((err = ext3_journal_get_write_access(handle, gdb))) {
-                       brelse(gdb);
-                       goto exit_bh;
-               }
-               memcpy(gdb->b_data, sbi->s_group_desc[i], bh->b_size);
-               ext3_journal_dirty_metadata(handle, gdb);
-               ext3_set_bit(bit, bh->b_data);
-               brelse(gdb);
-       }
-
-       /* Zero out all of the reserved backup group descriptor table blocks */
-       for (i = 0, bit = gdblocks + 1, block = start + bit;
-            i < reserved_gdb; i++, block++, bit++) {
-               struct buffer_head *gdb;
-
-               ext3_debug("clear reserved block %#04lx (+%d)\n", block, bit);
-
-               if (IS_ERR(gdb = bclean(handle, sb, block))) {
-                       err = PTR_ERR(bh);
-                       goto exit_bh;
-               }
-               ext3_journal_dirty_metadata(handle, gdb);
-               ext3_set_bit(bit, bh->b_data);
-               brelse(gdb);
-       }
-       ext3_debug("mark block bitmap %#04x (+%ld)\n", input->block_bitmap,
-                  input->block_bitmap - start);
-       ext3_set_bit(input->block_bitmap - start, bh->b_data);
-       ext3_debug("mark inode bitmap %#04x (+%ld)\n", input->inode_bitmap,
-                  input->inode_bitmap - start);
-       ext3_set_bit(input->inode_bitmap - start, bh->b_data);
-
-       /* Zero out all of the inode table blocks */
-       for (i = 0, block = input->inode_table, bit = block - start;
-            i < sbi->s_itb_per_group; i++, bit++, block++) {
-               struct buffer_head *it;
-
-               ext3_debug("clear inode block %#04x (+%ld)\n", block, bit);
-               if (IS_ERR(it = bclean(handle, sb, block))) {
-                       err = PTR_ERR(it);
-                       goto exit_bh;
-               }
-               ext3_journal_dirty_metadata(handle, it);
-               brelse(it);
-               ext3_set_bit(bit, bh->b_data);
-       }
-       mark_bitmap_end(input->blocks_count, EXT3_BLOCKS_PER_GROUP(sb),
-                       bh->b_data);
-       ext3_journal_dirty_metadata(handle, bh);
-       brelse(bh);
-
-       /* Mark unused entries in inode bitmap used */
-       ext3_debug("clear inode bitmap %#04x (+%ld)\n",
-                  input->inode_bitmap, input->inode_bitmap - start);
-       if (IS_ERR(bh = bclean(handle, sb, input->inode_bitmap))) {
-               err = PTR_ERR(bh);
-               goto exit_journal;
-       }
-
-       mark_bitmap_end(EXT3_INODES_PER_GROUP(sb), EXT3_BLOCKS_PER_GROUP(sb),
-                       bh->b_data);
-       ext3_journal_dirty_metadata(handle, bh);
-exit_bh:
-       brelse(bh);
-
-exit_journal:
-       unlock_super(sb);
-       if ((err2 = ext3_journal_stop(handle)) && !err)
-               err = err2;
-
-       return err;
-}
-
-/*
- * Iterate through the groups which hold BACKUP superblock/GDT copies in an
- * ext3 filesystem.  The counters should be initialized to 1, 5, and 7 before
- * calling this for the first time.  In a sparse filesystem it will be the
- * sequence of powers of 3, 5, and 7: 1, 3, 5, 7, 9, 25, 27, 49, 81, ...
- * For a non-sparse filesystem it will be every group: 1, 2, 3, 4, ...
- */
-unsigned ext3_list_backups(struct super_block *sb, unsigned *three,
-                          unsigned *five, unsigned *seven)
-{
-       unsigned *min = three;
-       int mult = 3;
-       unsigned ret;
-
-       if (!EXT3_HAS_RO_COMPAT_FEATURE(sb,
-                                       EXT3_FEATURE_RO_COMPAT_SPARSE_SUPER)) {
-               ret = *min;
-               *min += 1;
-               return ret;
-       }
-
-       if (*five < *min) {
-               min = five;
-               mult = 5;
-       }
-       if (*seven < *min) {
-               min = seven;
-               mult = 7;
-       }
-
-       ret = *min;
-       *min *= mult;
-
-       return ret;
-}
-
-/*
- * Check that all of the backup GDT blocks are held in the primary GDT block.
- * It is assumed that they are stored in group order.  Returns the number of
- * groups in current filesystem that have BACKUPS, or -ve error code.
- */
-static int verify_reserved_gdb(struct super_block *sb,
-                              struct buffer_head *primary)
-{
-       const unsigned long blk = primary->b_blocknr;
-       const unsigned long end = EXT3_SB(sb)->s_groups_count;
-       unsigned three = 1;
-       unsigned five = 5;
-       unsigned seven = 7;
-       unsigned grp;
-       __u32 *p = (__u32 *)primary->b_data;
-       int gdbackups = 0;
-
-       while ((grp = ext3_list_backups(sb, &three, &five, &seven)) < end) {
-               if (le32_to_cpu(*p++) != grp * EXT3_BLOCKS_PER_GROUP(sb) + blk){
-                       ext3_warning(sb, __FUNCTION__,
-                                    "reserved GDT %ld missing grp %d (%ld)\n",
-                                    blk, grp,
-                                    grp * EXT3_BLOCKS_PER_GROUP(sb) + blk);
-                       return -EINVAL;
-               }
-               if (++gdbackups > EXT3_ADDR_PER_BLOCK(sb))
-                       return -EFBIG;
-       }
-
-       return gdbackups;
-}
-
-/*
- * Called when we need to bring a reserved group descriptor table block into
- * use from the resize inode.  The primary copy of the new GDT block currently
- * is an indirect block (under the double indirect block in the resize inode).
- * The new backup GDT blocks will be stored as leaf blocks in this indirect
- * block, in group order.  Even though we know all the block numbers we need,
- * we check to ensure that the resize inode has actually reserved these blocks.
- *
- * Don't need to update the block bitmaps because the blocks are still in use.
- *
- * We get all of the error cases out of the way, so that we are sure to not
- * fail once we start modifying the data on disk, because JBD has no rollback.
- */
-static int add_new_gdb(handle_t *handle, struct inode *inode,
-                      struct ext3_new_group_data *input,
-                      struct buffer_head **primary)
-{
-       struct super_block *sb = inode->i_sb;
-       struct ext3_super_block *es = EXT3_SB(sb)->s_es;
-       unsigned long gdb_num = input->group / EXT3_DESC_PER_BLOCK(sb);
-       unsigned long gdb_off = input->group % EXT3_DESC_PER_BLOCK(sb);
-       unsigned long gdblock = EXT3_SB(sb)->s_sbh->b_blocknr + 1 + gdb_num;
-       struct buffer_head **o_group_desc, **n_group_desc;
-       struct buffer_head *dind;
-       int gdbackups;
-       struct ext3_iloc iloc;
-       __u32 *data;
-       int err;
-
-       if (test_opt(sb, DEBUG))
-               printk("EXT3-fs: ext3_add_new_gdb: adding group block %lu\n",
-                      gdb_num);
-
-       /*
-        * If we are not using the primary superblock/GDT copy don't resize,
-        * because the user tools have no way of handling this.  Probably a
-        * bad time to do it anyways.
-        */
-       if (EXT3_SB(sb)->s_sbh->b_blocknr !=
-           le32_to_cpu(EXT3_SB(sb)->s_es->s_first_data_block)) {
-               ext3_warning(sb, __FUNCTION__,
-                            "won't resize using backup superblock at %lu\n",
-                            EXT3_SB(sb)->s_sbh->b_blocknr);
-               return -EPERM;
-       }
-
-       *primary = sb_bread(sb, gdblock);
-       if (!*primary)
-               return -EIO;
-
-       if ((gdbackups = verify_reserved_gdb(sb, *primary)) < 0) {
-               err = gdbackups;
-               goto exit_bh;
-       }
-
-       data = EXT3_I(inode)->i_data + EXT3_DIND_BLOCK;
-       dind = sb_bread(sb, le32_to_cpu(*data));
-       if (!dind) {
-               err = -EIO;
-               goto exit_bh;
-       }
-
-       data = (__u32 *)dind->b_data;
-       if (le32_to_cpu(data[gdb_num % EXT3_ADDR_PER_BLOCK(sb)]) != gdblock) {
-               ext3_warning(sb, __FUNCTION__,
-                            "new group %u GDT block %lu not reserved\n",
-                            input->group, gdblock);
-               err = -EINVAL;
-               goto exit_dind;
-       }
-
-       if ((err = ext3_journal_get_write_access(handle, EXT3_SB(sb)->s_sbh)))
-               goto exit_dind;
-
-       if ((err = ext3_journal_get_write_access(handle, *primary)))
-               goto exit_sbh;
-
-       if ((err = ext3_journal_get_write_access(handle, dind)))
-               goto exit_primary;
-
-       /* ext3_reserve_inode_write() gets a reference on the iloc */
-       if ((err = ext3_reserve_inode_write(handle, inode, &iloc)))
-               goto exit_dindj;
-
-       n_group_desc = (struct buffer_head **)kmalloc((gdb_num + 1) *
-                               sizeof(struct buffer_head *), GFP_KERNEL);
-       if (!n_group_desc) {
-               err = -ENOMEM;
-               ext3_warning (sb, __FUNCTION__,
-                             "not enough memory for %lu groups", gdb_num + 1);
-               goto exit_inode;
-       }
-
-       /*
-        * Finally, we have all of the possible failures behind us...
-        *
-        * Remove new GDT block from inode double-indirect block and clear out
-        * the new GDT block for use (which also "frees" the backup GDT blocks
-        * from the reserved inode).  We don't need to change the bitmaps for
-        * these blocks, because they are marked as in-use from being in the
-        * reserved inode, and will become GDT blocks (primary and backup).
-        */
-       /*
-       printk("removing block %d = %ld from dindir %ld[%ld]\n",
-              ((__u32 *)(dind->b_data))[gdb_off], gdblock, dind->b_blocknr,
-              gdb_num); */
-       data[gdb_num % EXT3_ADDR_PER_BLOCK(sb)] = 0;
-       ext3_journal_dirty_metadata(handle, dind);
-       brelse(dind);
-       inode->i_blocks -= (gdbackups + 1) * sb->s_blocksize >> 9;
-       ext3_mark_iloc_dirty(handle, inode, &iloc);
-       memset((*primary)->b_data, 0, sb->s_blocksize);
-       ext3_journal_dirty_metadata(handle, *primary);
-
-       o_group_desc = EXT3_SB(sb)->s_group_desc;
-       memcpy(n_group_desc, o_group_desc,
-              EXT3_SB(sb)->s_gdb_count * sizeof(struct buffer_head *));
-       n_group_desc[gdb_num] = *primary;
-       EXT3_SB(sb)->s_group_desc = n_group_desc;
-       EXT3_SB(sb)->s_gdb_count++;
-       kfree(o_group_desc);
-
-       es->s_reserved_gdt_blocks =
-               cpu_to_le16(le16_to_cpu(es->s_reserved_gdt_blocks) - 1);
-       ext3_journal_dirty_metadata(handle, EXT3_SB(sb)->s_sbh);
-
-       return 0;
-
-exit_inode:
-       //ext3_journal_release_buffer(handle, iloc.bh);
-       brelse(iloc.bh);
-exit_dindj:
-       //ext3_journal_release_buffer(handle, dind);
-exit_primary:
-       //ext3_journal_release_buffer(handle, *primary);
-exit_sbh:
-       //ext3_journal_release_buffer(handle, *primary);
-exit_dind:
-       brelse(dind);
-exit_bh:
-       brelse(*primary);
-
-       ext3_debug("leaving with error %d\n", err);
-       return err;
-}
-
-/*
- * Called when we are adding a new group which has a backup copy of each of
- * the GDT blocks (i.e. sparse group) and there are reserved GDT blocks.
- * We need to add these reserved backup GDT blocks to the resize inode, so
- * that they are kept for future resizing and not allocated to files.
- *
- * Each reserved backup GDT block will go into a different indirect block.
- * The indirect blocks are actually the primary reserved GDT blocks,
- * so we know in advance what their block numbers are.  We only get the
- * double-indirect block to verify it is pointing to the primary reserved
- * GDT blocks so we don't overwrite a data block by accident.  The reserved
- * backup GDT blocks are stored in their reserved primary GDT block.
- */
-static int reserve_backup_gdb(handle_t *handle, struct inode *inode,
-                             struct ext3_new_group_data *input)
-{
-       struct super_block *sb = inode->i_sb;
-       int reserved_gdb =le16_to_cpu(EXT3_SB(sb)->s_es->s_reserved_gdt_blocks);
-       struct buffer_head **primary;
-       struct buffer_head *dind;
-       struct ext3_iloc iloc;
-       unsigned long blk;
-       __u32 *data, *end;
-       int gdbackups = 0;
-       int res, i;
-       int err;
-
-       primary = kmalloc(reserved_gdb * sizeof(*primary), GFP_KERNEL);
-       if (!primary)
-               return -ENOMEM;
-
-       data = EXT3_I(inode)->i_data + EXT3_DIND_BLOCK;
-       dind = sb_bread(sb, le32_to_cpu(*data));
-       if (!dind) {
-               err = -EIO;
-               goto exit_free;
-       }
-
-       blk = EXT3_SB(sb)->s_sbh->b_blocknr + 1 + EXT3_SB(sb)->s_gdb_count;
-       data = (__u32 *)dind->b_data + EXT3_SB(sb)->s_gdb_count;
-       end = (__u32 *)dind->b_data + EXT3_ADDR_PER_BLOCK(sb);
-
-       /* Get each reserved primary GDT block and verify it holds backups */
-       for (res = 0; res < reserved_gdb; res++, blk++) {
-               if (le32_to_cpu(*data) != blk) {
-                       ext3_warning(sb, __FUNCTION__,
-                                    "reserved block %lu not at offset %ld\n",
-                                    blk, (long)(data - (__u32 *)dind->b_data));
-                       err = -EINVAL;
-                       goto exit_bh;
-               }
-               primary[res] = sb_bread(sb, blk);
-               if (!primary[res]) {
-                       err = -EIO;
-                       goto exit_bh;
-               }
-               if ((gdbackups = verify_reserved_gdb(sb, primary[res])) < 0) {
-                       brelse(primary[res]);
-                       err = gdbackups;
-                       goto exit_bh;
-               }
-               if (++data >= end)
-                       data = (__u32 *)dind->b_data;
-       }
-
-       for (i = 0; i < reserved_gdb; i++) {
-               if ((err = ext3_journal_get_write_access(handle, primary[i]))) {
-                       /*
-                       int j;
-                       for (j = 0; j < i; j++)
-                               ext3_journal_release_buffer(handle, primary[j]);
-                        */
-                       goto exit_bh;
-               }
-       }
-
-       if ((err = ext3_reserve_inode_write(handle, inode, &iloc)))
-               goto exit_bh;
-
-       /*
-        * Finally we can add each of the reserved backup GDT blocks from
-        * the new group to its reserved primary GDT block.
-        */
-       blk = input->group * EXT3_BLOCKS_PER_GROUP(sb);
-       for (i = 0; i < reserved_gdb; i++) {
-               int err2;
-               data = (__u32 *)primary[i]->b_data;
-               /* printk("reserving backup %lu[%u] = %lu\n",
-                      primary[i]->b_blocknr, gdbackups,
-                      blk + primary[i]->b_blocknr); */
-               data[gdbackups] = cpu_to_le32(blk + primary[i]->b_blocknr);
-               err2 = ext3_journal_dirty_metadata(handle, primary[i]);
-               if (!err)
-                       err = err2;
-       }
-       inode->i_blocks += reserved_gdb * sb->s_blocksize >> 9;
-       ext3_mark_iloc_dirty(handle, inode, &iloc);
-
-exit_bh:
-       while (--res >= 0)
-               brelse(primary[res]);
-       brelse(dind);
-
-exit_free:
-       kfree(primary);
-
-       return err;
-}
-
-/*
- * Update the backup copies of the ext3 metadata.  These don't need to be part
- * of the main resize transaction, because e2fsck will re-write them if there
- * is a problem (basically only OOM will cause a problem).  However, we
- * _should_ update the backups if possible, in case the primary gets trashed
- * for some reason and we need to run e2fsck from a backup superblock.  The
- * important part is that the new block and inode counts are in the backup
- * superblocks, and the location of the new group metadata in the GDT backups.
- *
- * We do not need lock_super() for this, because these blocks are not
- * otherwise touched by the filesystem code when it is mounted.  We don't
- * need to worry about last changing from sbi->s_groups_count, because the
- * worst that can happen is that we do not copy the full number of backups
- * at this time.  The resize which changed s_groups_count will backup again.
- *
- * We only pass inode because of the ext3 journal wrappers.
- */
-static void update_backups(struct super_block *sb, struct inode *inode,
-                          int blk_off, char *data, int size)
-{
-       struct ext3_sb_info *sbi = EXT3_SB(sb);
-       const unsigned long last = sbi->s_groups_count;
-       const int bpg = EXT3_BLOCKS_PER_GROUP(sb);
-       unsigned three = 1;
-       unsigned five = 5;
-       unsigned seven = 7;
-       unsigned group;
-       int rest = sb->s_blocksize - size;
-       handle_t *handle;
-       int err = 0, err2;
-
-       handle = ext3_journal_start(inode, EXT3_MAX_TRANS_DATA);
-       if (IS_ERR(handle)) {
-               group = 1;
-               err = PTR_ERR(handle);
-               goto exit_err;
-       }
-
-       while ((group = ext3_list_backups(sb, &three, &five, &seven)) < last) {
-               struct buffer_head *bh;
-
-               /* Out of journal space, and can't get more - abort - so sad */
-               if (handle->h_buffer_credits == 0 &&
-                   ext3_journal_extend(handle, EXT3_MAX_TRANS_DATA) &&
-                   (err = ext3_journal_restart(handle, EXT3_MAX_TRANS_DATA)))
-                       break;
-
-               bh = sb_getblk(sb, group * bpg + blk_off);
-               set_buffer_uptodate(bh);
-               ext3_debug(sb, __FUNCTION__, "update metadata backup %#04lx\n",
-                          bh->b_blocknr);
-               if ((err = ext3_journal_get_write_access(handle, bh)))
-                       break;
-               memcpy(bh->b_data, data, size);
-               if (rest)
-                       memset(bh->b_data + size, 0, rest);
-               ext3_journal_dirty_metadata(handle, bh);
-               brelse(bh);
-       }
-       if ((err2 = ext3_journal_stop(handle)) && !err)
-               err = err2;
-
-       /*
-        * Ugh! Need to have e2fsck write the backup copies.  It is too
-        * late to revert the resize, we shouldn't fail just because of
-        * the backup copies (they are only needed in case of corruption).
-        *
-        * However, if we got here we have a journal problem too, so we
-        * can't really start a transaction to mark the superblock.
-        * Chicken out and just set the flag on the hope it will be written
-        * to disk, and if not - we will simply wait until next fsck.
-        */
-exit_err:
-       if (err) {
-               ext3_warning(sb, __FUNCTION__,
-                            "can't update backup for group %d (err %d), "
-                            "forcing fsck on next reboot\n", group, err);
-               sbi->s_mount_state &= ~EXT3_VALID_FS;
-               sbi->s_es->s_state &= ~cpu_to_le16(EXT3_VALID_FS);
-               mark_buffer_dirty(sbi->s_sbh);
-       }
-}
-
-/* Add group descriptor data to an existing or new group descriptor block.
- * Ensure we handle all possible error conditions _before_ we start modifying
- * the filesystem, because we cannot abort the transaction and not have it
- * write the data to disk.
- *
- * If we are on a GDT block boundary, we need to get the reserved GDT block.
- * Otherwise, we may need to add backup GDT blocks for a sparse group.
- *
- * We only need to hold the superblock lock while we are actually adding
- * in the new group's counts to the superblock.  Prior to that we have
- * not really "added" the group at all.  We re-check that we are still
- * adding in the last group in case things have changed since verifying.
- */
-int ext3_group_add(struct super_block *sb, struct ext3_new_group_data *input)
-{
-       struct ext3_sb_info *sbi = EXT3_SB(sb);
-       struct ext3_super_block *es = sbi->s_es;
-       int reserved_gdb = ext3_bg_has_super(sb, input->group) ?
-               le16_to_cpu(es->s_reserved_gdt_blocks) : 0;
-       struct buffer_head *primary = NULL;
-       struct ext3_group_desc *gdp;
-       struct inode *inode = NULL;
-       struct inode bogus;
-       handle_t *handle;
-       int gdb_off, gdb_num;
-       int err, err2;
-
-       gdb_num = input->group / EXT3_DESC_PER_BLOCK(sb);
-       gdb_off = input->group % EXT3_DESC_PER_BLOCK(sb);
-
-       if (gdb_off == 0 && !EXT3_HAS_RO_COMPAT_FEATURE(sb,
-                                       EXT3_FEATURE_RO_COMPAT_SPARSE_SUPER)) {
-               ext3_warning(sb, __FUNCTION__,
-                            "Can't resize non-sparse filesystem further\n");
-               return -EPERM;
-       }
-
-       if (reserved_gdb || gdb_off == 0) {
-               if (!EXT3_HAS_COMPAT_FEATURE(sb,
-                                            EXT3_FEATURE_COMPAT_RESIZE_INODE)){
-                       ext3_warning(sb, __FUNCTION__,
-                                    "No reserved GDT blocks, can't resize\n");
-                       return -EPERM;
-               }
-               inode = iget(sb, EXT3_RESIZE_INO);
-               if (!inode || is_bad_inode(inode)) {
-                       ext3_warning(sb, __FUNCTION__,
-                                    "Error opening resize inode\n");
-                       iput(inode);
-                       return -ENOENT;
-               }
-       } else {
-               /* Used only for ext3 journal wrapper functions to get sb */
-               inode = &bogus;
-               bogus.i_sb = sb;
-       }
-
-       if ((err = verify_group_input(sb, input)))
-               goto exit_put;
-
-       if ((err = setup_new_group_blocks(sb, inode, input)))
-               goto exit_put;
-
-       /*
-        * We will always be modifying at least the superblock and a GDT
-        * block.  If we are adding a group past the last current GDT block,
-        * we will also modify the inode and the dindirect block.  If we
-        * are adding a group with superblock/GDT backups  we will also
-        * modify each of the reserved GDT dindirect blocks.
-        */
-       handle = ext3_journal_start(inode, ext3_bg_has_super(sb, input->group) ?
-                                   3 + reserved_gdb : 4);
-       if (IS_ERR(handle)) {
-               err = PTR_ERR(handle);
-               goto exit_put;
-       }
-
-       lock_super(sb);
-       if (input->group != EXT3_SB(sb)->s_groups_count) {
-               ext3_warning(sb, __FUNCTION__,
-                            "multiple resizers run on filesystem!\n");
-               goto exit_journal;
-       }
-
-       if ((err = ext3_journal_get_write_access(handle, sbi->s_sbh)))
-               goto exit_journal;
-
-       /*
-        * We will only either add reserved group blocks to a backup group
-        * or remove reserved blocks for the first group in a new group block.
-        * Doing both would be mean more complex code, and sane people don't
-        * use non-sparse filesystems anymore.  This is already checked above.
-        */
-       if (gdb_off) {
-               primary = sbi->s_group_desc[gdb_num];
-               if ((err = ext3_journal_get_write_access(handle, primary)))
-                       goto exit_journal;
-
-               if (reserved_gdb && ext3_bg_num_gdb(sb, input->group) &&
-                   (err = reserve_backup_gdb(handle, inode, input)))
-                       goto exit_journal;
-       } else if ((err = add_new_gdb(handle, inode, input, &primary)))
-               goto exit_journal;
-
-       /* Finally update group descriptor block for new group */
-       gdp = (struct ext3_group_desc *)primary->b_data + gdb_off;
-
-       gdp->bg_block_bitmap = cpu_to_le32(input->block_bitmap);
-       gdp->bg_inode_bitmap = cpu_to_le32(input->inode_bitmap);
-       gdp->bg_inode_table = cpu_to_le32(input->inode_table);
-       gdp->bg_free_blocks_count = cpu_to_le16(input->free_blocks_count);
-       gdp->bg_free_inodes_count = cpu_to_le16(EXT3_INODES_PER_GROUP(sb));
-
-       EXT3_SB(sb)->s_groups_count++;
-       ext3_journal_dirty_metadata(handle, primary);
-
-       /* Update superblock with new block counts */
-       es->s_blocks_count = cpu_to_le32(le32_to_cpu(es->s_blocks_count) +
-               input->blocks_count);
-       es->s_free_blocks_count =
-               cpu_to_le32(le32_to_cpu(es->s_free_blocks_count) +
-                           input->free_blocks_count);
-       es->s_r_blocks_count = cpu_to_le32(le32_to_cpu(es->s_r_blocks_count) +
-               input->reserved_blocks);
-       es->s_inodes_count = cpu_to_le32(le32_to_cpu(es->s_inodes_count) +
-               EXT3_INODES_PER_GROUP(sb));
-       es->s_free_inodes_count =
-               cpu_to_le32(le32_to_cpu(es->s_free_inodes_count) +
-                           EXT3_INODES_PER_GROUP(sb));
-       ext3_journal_dirty_metadata(handle, EXT3_SB(sb)->s_sbh);
-       sb->s_dirt = 1;
-
-exit_journal:
-       unlock_super(sb);
-       handle->h_sync = 1;
-       if ((err2 = ext3_journal_stop(handle)) && !err)
-               err = err2;
-       if (!err) {
-               update_backups(sb, inode, sbi->s_sbh->b_blocknr, (char *)es,
-                              sizeof(struct ext3_super_block));
-               update_backups(sb, inode, primary->b_blocknr, primary->b_data,
-                              primary->b_size);
-       }
-exit_put:
-       if (inode != &bogus)
-               iput(inode);
-       return err;
-} /* ext3_group_add */
-
-/* Extend the filesystem to the new number of blocks specified.  This entry
- * point is only used to extend the current filesystem to the end of the last
- * existing group.  It can be accessed via ioctl, or by "remount,resize=<size>"
- * for emergencies (because it has no dependencies on reserved blocks).
- *
- * If we _really_ wanted, we could use default values to call ext3_group_add()
- * allow the "remount" trick to work for arbitrary resizing, assuming enough
- * GDT blocks are reserved to grow to the desired size.
- */
-int ext3_group_extend(struct super_block *sb, struct ext3_super_block *es,
-                     unsigned long n_blocks_count)
-{
-       unsigned long o_blocks_count;
-       unsigned long o_groups_count;
-       unsigned long last;
-       int add;
-       struct inode *inode;
-       struct buffer_head * bh;
-       handle_t *handle;
-       int err;
-
-       o_blocks_count = le32_to_cpu(es->s_blocks_count);
-       o_groups_count = EXT3_SB(sb)->s_groups_count;
-
-       if (test_opt(sb, DEBUG))
-               printk("EXT3-fs: extending last group from %lu to %lu blocks\n",
-                      o_blocks_count, n_blocks_count);
-
-       if (n_blocks_count == 0 || n_blocks_count == o_blocks_count)
-               return 0;
-
-       if (n_blocks_count < o_blocks_count) {
-               ext3_warning(sb, __FUNCTION__,
-                            "can't shrink FS - resize aborted");
-               return -EBUSY;
-       }
-
-       /* Handle the remaining blocks in the last group only. */
-       last = (o_blocks_count - le32_to_cpu(es->s_first_data_block)) %
-               EXT3_BLOCKS_PER_GROUP(sb);
-
-       if (last == 0) {
-               ext3_warning(sb, __FUNCTION__,
-                            "need to use ext2online to resize further\n");
-               return -EPERM;
-       }
-
-       add = EXT3_BLOCKS_PER_GROUP(sb) - last;
-
-       if (o_blocks_count + add > n_blocks_count)
-               add = n_blocks_count - o_blocks_count;
-
-       if (o_blocks_count + add < n_blocks_count)
-               ext3_warning(sb, __FUNCTION__,
-                            "will only finish group (%lu blocks, %u new)",
-                            o_blocks_count + add, add);
-
-       /* See if the device is actually as big as what was requested */
-       bh = sb_bread(sb, o_blocks_count + add -1);
-       if (!bh) {
-               ext3_warning(sb, __FUNCTION__,
-                            "can't read last block, resize aborted");
-               return -ENOSPC;
-       }
-       brelse(bh);
-
-       /* Get a bogus inode to "free" the new blocks in this group. */
-       if (!(inode = new_inode(sb))) {
-               ext3_warning(sb, __FUNCTION__,
-                            "error getting dummy resize inode");
-               return -ENOMEM;
-       }
-       inode->i_ino = 0;
-
-       EXT3_I(inode)->i_state = EXT3_STATE_RESIZE;
-
-       /* We will update the superblock, one block bitmap, and
-        * one group descriptor via ext3_free_blocks().
-        */
-       handle = ext3_journal_start(inode, 3);
-       if (IS_ERR(handle)) {
-               err = PTR_ERR(handle);
-               ext3_warning(sb, __FUNCTION__, "error %d on journal start",err);
-               goto exit_put;
-       }
-
-       lock_super(sb);
-       if (o_blocks_count != le32_to_cpu(es->s_blocks_count)) {
-               ext3_warning(sb, __FUNCTION__,
-                            "multiple resizers run on filesystem!\n");
-               err = -EBUSY;
-               goto exit_put;
-       }
-
-       if ((err = ext3_journal_get_write_access(handle,
-                                                EXT3_SB(sb)->s_sbh))) {
-               ext3_warning(sb, __FUNCTION__,
-                            "error %d on journal write access", err);
-               unlock_super(sb);
-               ext3_journal_stop(handle);
-               goto exit_put;
-       }
-       es->s_blocks_count = cpu_to_le32(o_blocks_count + add);
-       ext3_journal_dirty_metadata(handle, EXT3_SB(sb)->s_sbh);
-       sb->s_dirt = 1;
-       unlock_super(sb);
-       ext3_debug("freeing blocks %ld through %ld\n", o_blocks_count,
-                  o_blocks_count + add);
-       ext3_free_blocks(handle, inode, o_blocks_count, add);
-       ext3_debug("freed blocks %ld through %ld\n", o_blocks_count,
-                  o_blocks_count + add);
-       if ((err = ext3_journal_stop(handle)))
-               goto exit_put;
-       if (test_opt(sb, DEBUG))
-               printk("EXT3-fs: extended group to %u blocks\n",
-                      le32_to_cpu(es->s_blocks_count));
-       update_backups(sb, inode, EXT3_SB(sb)->s_sbh->b_blocknr, (char *)es,
-                      sizeof(struct ext3_super_block));
-exit_put:
-       iput(inode);
-
-       return err;
-} /* ext3_group_extend */
diff --git a/fs/hostfs/Makefile b/fs/hostfs/Makefile
deleted file mode 100644 (file)
index 794292e..0000000
+++ /dev/null
@@ -1,26 +0,0 @@
-# 
-# Copyright (C) 2000 Jeff Dike (jdike@karaya.com)
-# Licensed under the GPL
-#
-
-# struct stat64 changed the inode field name between 2.2 and 2.4 from st_ino
-# to __st_ino.  It stayed in the same place, so as long as the correct name
-# is used, hostfs compiled on 2.2 should work on 2.4 and vice versa.
-
-STAT64_INO_FIELD := $(shell grep -q __st_ino /usr/include/bits/stat.h && \
-                               echo __)st_ino
-
-hostfs-objs := hostfs_kern.o hostfs_user.o
-
-obj-y = 
-obj-$(CONFIG_HOSTFS) += hostfs.o
-
-SINGLE_OBJS = $(foreach f,$(patsubst %.o,%,$(obj-y) $(obj-m)),$($(f)-objs))
-
-USER_OBJS := $(filter %_user.o,$(obj-y) $(obj-m) $(SINGLE_OBJS))
-USER_OBJS := $(foreach file,$(USER_OBJS),$(obj)/$(file))
-
-USER_CFLAGS += -DSTAT64_INO_FIELD=$(STAT64_INO_FIELD)
-
-$(USER_OBJS) : %.o: %.c
-       $(CC) $(CFLAGS_$(notdir $@)) $(USER_CFLAGS) -c -o $@ $<
diff --git a/fs/hostfs/hostfs.h b/fs/hostfs/hostfs.h
deleted file mode 100644 (file)
index d1f6c33..0000000
+++ /dev/null
@@ -1,79 +0,0 @@
-#ifndef __UM_FS_HOSTFS
-#define __UM_FS_HOSTFS
-
-#include "os.h"
-
-/* These are exactly the same definitions as in fs.h, but the names are 
- * changed so that this file can be included in both kernel and user files.
- */
-
-#define HOSTFS_ATTR_MODE       1
-#define HOSTFS_ATTR_UID        2
-#define HOSTFS_ATTR_GID        4
-#define HOSTFS_ATTR_SIZE       8
-#define HOSTFS_ATTR_ATIME      16
-#define HOSTFS_ATTR_MTIME      32
-#define HOSTFS_ATTR_CTIME      64
-#define HOSTFS_ATTR_ATIME_SET  128
-#define HOSTFS_ATTR_MTIME_SET  256
-#define HOSTFS_ATTR_FORCE      512     /* Not a change, but a change it */
-#define HOSTFS_ATTR_ATTR_FLAG  1024
-
-struct hostfs_iattr {
-       unsigned int    ia_valid;
-       mode_t          ia_mode;
-       uid_t           ia_uid;
-       gid_t           ia_gid;
-       loff_t          ia_size;
-       struct timespec ia_atime;
-       struct timespec ia_mtime;
-       struct timespec ia_ctime;
-       unsigned int    ia_attr_flags;
-};
-
-extern int stat_file(const char *path, unsigned long long *inode_out, 
-                    int *mode_out, int *nlink_out, int *uid_out, int *gid_out,
-                    unsigned long long *size_out, struct timespec *atime_out, 
-                    struct timespec *mtime_out, struct timespec *ctime_out, 
-                    int *blksize_out, unsigned long long *blocks_out);
-extern int access_file(char *path, int r, int w, int x);
-extern int open_file(char *path, int r, int w, int append);
-extern int file_type(const char *path, int *rdev);
-extern void *open_dir(char *path, int *err_out);
-extern char *read_dir(void *stream, unsigned long long *pos, 
-                     unsigned long long *ino_out, int *len_out);
-extern void close_file(void *stream);
-extern void close_dir(void *stream);
-extern int read_file(int fd, unsigned long long *offset, char *buf, int len);
-extern int write_file(int fd, unsigned long long *offset, const char *buf,
-                     int len);
-extern int lseek_file(int fd, long long offset, int whence);
-extern int file_create(char *name, int ur, int uw, int ux, int gr, 
-                      int gw, int gx, int or, int ow, int ox);
-extern int set_attr(const char *file, struct hostfs_iattr *attrs);
-extern int make_symlink(const char *from, const char *to);
-extern int unlink_file(const char *file);
-extern int do_mkdir(const char *file, int mode);
-extern int do_rmdir(const char *file);
-extern int do_mknod(const char *file, int mode, int dev);
-extern int link_file(const char *from, const char *to);
-extern int do_readlink(char *file, char *buf, int size);
-extern int rename_file(char *from, char *to);
-extern int do_statfs(char *root, long *bsize_out, long long *blocks_out, 
-                    long long *bfree_out, long long *bavail_out, 
-                    long long *files_out, long long *ffree_out, 
-                    void *fsid_out, int fsid_size, long *namelen_out, 
-                    long *spare_out);
-
-#endif
-
-/*
- * Overrides for Emacs so that we follow Linus's tabbing style.
- * Emacs will notice this stuff at the end of the file and automatically
- * adjust the settings for this buffer only.  This must remain at the end
- * of the file.
- * ---------------------------------------------------------------------------
- * Local variables:
- * c-file-style: "linux"
- * End:
- */
diff --git a/fs/hostfs/hostfs_kern.c b/fs/hostfs/hostfs_kern.c
deleted file mode 100644 (file)
index ef5d5d1..0000000
+++ /dev/null
@@ -1,1008 +0,0 @@
-/* 
- * Copyright (C) 2000, 2001, 2002 Jeff Dike (jdike@karaya.com)
- * Licensed under the GPL
- *
- * Ported the filesystem routines to 2.5.
- * 2003-02-10 Petr Baudis <pasky@ucw.cz>
- */
-
-#include <linux/stddef.h>
-#include <linux/fs.h>
-#include <linux/version.h>
-#include <linux/module.h>
-#include <linux/init.h>
-#include <linux/slab.h>
-#include <linux/pagemap.h>
-#include <linux/blkdev.h>
-#include <linux/list.h>
-#include <linux/buffer_head.h>
-#include <linux/root_dev.h>
-#include <linux/statfs.h>
-#include <asm/uaccess.h>
-#include "hostfs.h"
-#include "kern_util.h"
-#include "kern.h"
-#include "user_util.h"
-#include "2_5compat.h"
-#include "init.h"
-
-struct hostfs_inode_info {
-       char *host_filename;
-       int fd;
-       int mode;
-       struct inode vfs_inode;
-};
-
-static inline struct hostfs_inode_info *HOSTFS_I(struct inode *inode)
-{
-       return(list_entry(inode, struct hostfs_inode_info, vfs_inode));
-}
-
-#define FILE_HOSTFS_I(file) HOSTFS_I((file)->f_dentry->d_inode)
-
-int hostfs_d_delete(struct dentry *dentry)
-{
-       return(1);
-}
-
-struct dentry_operations hostfs_dentry_ops = {
-       .d_delete               = hostfs_d_delete,
-};
-
-/* Changed in hostfs_args before the kernel starts running */
-static char *root_ino = "/";
-static int append = 0;
-
-#define HOSTFS_SUPER_MAGIC 0x00c0ffee
-
-static struct inode_operations hostfs_iops;
-static struct inode_operations hostfs_dir_iops;
-static struct address_space_operations hostfs_link_aops;
-
-static int __init hostfs_args(char *options, int *add)
-{
-       char *ptr;
-
-       ptr = strchr(options, ',');
-       if(ptr != NULL)
-               *ptr++ = '\0';
-       if(*options != '\0')
-               root_ino = options;
-
-       options = ptr;
-       while(options){
-               ptr = strchr(options, ',');
-               if(ptr != NULL)
-                       *ptr++ = '\0';
-               if(*options != '\0'){
-                       if(!strcmp(options, "append"))
-                               append = 1;
-                       else printf("hostfs_args - unsupported option - %s\n",
-                                   options);
-               }
-               options = ptr;
-       }
-       return(0);
-}
-
-__uml_setup("hostfs=", hostfs_args,
-"hostfs=<root dir>,<flags>,...\n"
-"    This is used to set hostfs parameters.  The root directory argument\n"
-"    is used to confine all hostfs mounts to within the specified directory\n"
-"    tree on the host.  If this isn't specified, then a user inside UML can\n"
-"    mount anything on the host that's accessible to the user that's running\n"
-"    it.\n"
-"    The only flag currently supported is 'append', which specifies that all\n"
-"    files opened by hostfs will be opened in append mode.\n\n"
-);
-
-static char *dentry_name(struct dentry *dentry, int extra)
-{
-       struct dentry *parent;
-       char *root, *name;
-       int len;
-
-       len = 0;
-       parent = dentry;
-       while(parent->d_parent != parent){
-               len += parent->d_name.len + 1;
-               parent = parent->d_parent;
-       }
-       
-       root = HOSTFS_I(parent->d_inode)->host_filename;
-       len += strlen(root);
-       name = kmalloc(len + extra + 1, GFP_KERNEL);
-       if(name == NULL) return(NULL);
-
-       name[len] = '\0';
-       parent = dentry;
-       while(parent->d_parent != parent){
-               len -= parent->d_name.len + 1;
-               name[len] = '/';
-               strncpy(&name[len + 1], parent->d_name.name, 
-                       parent->d_name.len);
-               parent = parent->d_parent;
-       }
-       strncpy(name, root, strlen(root));
-       return(name);
-}
-
-static char *inode_name(struct inode *ino, int extra)
-{
-       struct dentry *dentry;
-
-       dentry = list_entry(ino->i_dentry.next, struct dentry, d_alias);
-       return(dentry_name(dentry, extra));
-}
-
-static int read_name(struct inode *ino, char *name)
-{
-       /* The non-int inode fields are copied into ints by stat_file and
-        * then copied into the inode because passing the actual pointers
-        * in and having them treated as int * breaks on big-endian machines
-        */
-       int err;
-       int i_mode, i_nlink, i_blksize;
-       unsigned long long i_size;
-       unsigned long long i_ino;
-       unsigned long long i_blocks;
-
-       err = stat_file(name, &i_ino, &i_mode, &i_nlink, &ino->i_uid, 
-                       &ino->i_gid, &i_size, &ino->i_atime, &ino->i_mtime, 
-                       &ino->i_ctime, &i_blksize, &i_blocks);
-       if(err) 
-               return(err);
-
-       ino->i_ino = i_ino;
-       ino->i_mode = i_mode;
-       ino->i_nlink = i_nlink;
-       ino->i_size = i_size;
-       ino->i_blksize = i_blksize;
-       ino->i_blocks = i_blocks;
-       if((ino->i_sb->s_dev == ROOT_DEV) && (ino->i_uid == getuid()))
-               ino->i_uid = 0;
-       return(0);
-}
-
-static char *follow_link(char *link)
-{
-       int len, n;
-       char *name, *resolved, *end;
-
-       len = 64;
-       while(1){
-               n = -ENOMEM;
-               name = kmalloc(len, GFP_KERNEL);
-               if(name == NULL)
-                       goto out;
-
-               n = do_readlink(link, name, len);
-               if(n < len)
-                       break;
-               len *= 2;
-               kfree(name);
-       }
-       if(n < 0)
-               goto out_free;
-
-       if(*name == '/')
-               return(name);
-
-       end = strrchr(link, '/');
-       if(end == NULL)
-               return(name);
-
-       *(end + 1) = '\0';
-       len = strlen(link) + strlen(name) + 1;
-
-       resolved = kmalloc(len, GFP_KERNEL);
-       if(resolved == NULL){
-               n = -ENOMEM;
-               goto out_free;
-       }
-
-       sprintf(resolved, "%s%s", link, name);
-       kfree(name);
-       kfree(link);
-       return(resolved);
-
- out_free:
-       kfree(name);
- out:
-       return(ERR_PTR(n));
-}
-
-static int read_inode(struct inode *ino)
-{
-       char *name;
-       int err = 0;
-
-       /* Unfortunately, we are called from iget() when we don't have a dentry
-        * allocated yet.
-        */
-       if(list_empty(&ino->i_dentry))
-               goto out;
-       err = -ENOMEM;
-       name = inode_name(ino, 0);
-       if(name == NULL) 
-               goto out;
-
-       if(file_type(name, NULL) == OS_TYPE_SYMLINK){
-               name = follow_link(name);
-               if(IS_ERR(name)){
-                       err = PTR_ERR(name);
-                       goto out;
-               }
-       }
-       
-       err = read_name(ino, name);
-       kfree(name);
- out:
-       return(err);
-}
-
-int hostfs_statfs(struct super_block *sb, struct kstatfs *sf)
-{
-       /* do_statfs uses struct statfs64 internally, but the linux kernel
-        * struct statfs still has 32-bit versions for most of these fields,
-        * so we convert them here
-        */
-       int err;
-       long long f_blocks;
-       long long f_bfree;
-       long long f_bavail;
-       long long f_files;
-       long long f_ffree;
-
-       err = do_statfs(HOSTFS_I(sb->s_root->d_inode)->host_filename,
-                       &sf->f_bsize, &f_blocks, &f_bfree, &f_bavail, &f_files,
-                       &f_ffree, &sf->f_fsid, sizeof(sf->f_fsid), 
-                       &sf->f_namelen, sf->f_spare);
-       if(err) return(err);
-       sf->f_blocks = f_blocks;
-       sf->f_bfree = f_bfree;
-       sf->f_bavail = f_bavail;
-       sf->f_files = f_files;
-       sf->f_ffree = f_ffree;
-       sf->f_type = HOSTFS_SUPER_MAGIC;
-       return(0);
-}
-
-static struct inode *hostfs_alloc_inode(struct super_block *sb)
-{
-       struct hostfs_inode_info *hi;
-
-       hi = kmalloc(sizeof(*hi), GFP_KERNEL);
-       if(hi == NULL) 
-               return(NULL);
-
-       *hi = ((struct hostfs_inode_info) { .host_filename      = NULL,
-                                           .fd                 = -1,
-                                           .mode               = 0 });
-       inode_init_once(&hi->vfs_inode);
-       return(&hi->vfs_inode);
-}
-
-static void hostfs_destroy_inode(struct inode *inode)
-{
-       if(HOSTFS_I(inode)->host_filename) 
-               kfree(HOSTFS_I(inode)->host_filename);
-
-       if(HOSTFS_I(inode)->fd != -1) 
-               close_file(&HOSTFS_I(inode)->fd);
-
-       kfree(HOSTFS_I(inode));
-}
-
-static void hostfs_read_inode(struct inode *inode)
-{
-       read_inode(inode);
-}
-
-static struct super_operations hostfs_sbops = { 
-       .alloc_inode    = hostfs_alloc_inode,
-       .destroy_inode  = hostfs_destroy_inode,
-       .read_inode     = hostfs_read_inode,
-       .statfs         = hostfs_statfs,
-};
-
-int hostfs_readdir(struct file *file, void *ent, filldir_t filldir)
-{
-       void *dir;
-       char *name;
-       unsigned long long next, ino;
-       int error, len;
-
-       name = dentry_name(file->f_dentry, 0);
-       if(name == NULL) return(-ENOMEM);
-       dir = open_dir(name, &error);
-       kfree(name);
-       if(dir == NULL) return(-error);
-       next = file->f_pos;
-       while((name = read_dir(dir, &next, &ino, &len)) != NULL){
-               error = (*filldir)(ent, name, len, file->f_pos, 
-                                  ino, DT_UNKNOWN);
-               if(error) break;
-               file->f_pos = next;
-       }
-       close_dir(dir);
-       return(0);
-}
-
-int hostfs_file_open(struct inode *ino, struct file *file)
-{
-       char *name;
-       int mode = 0, r = 0, w = 0, fd;
-
-       mode = file->f_mode & (FMODE_READ | FMODE_WRITE);
-       if((mode & HOSTFS_I(ino)->mode) == mode)
-               return(0);
-
-       /* The file may already have been opened, but with the wrong access,
-        * so this resets things and reopens the file with the new access.
-        */
-       if(HOSTFS_I(ino)->fd != -1){
-               close_file(&HOSTFS_I(ino)->fd);
-               HOSTFS_I(ino)->fd = -1;
-       }
-
-       HOSTFS_I(ino)->mode |= mode;
-       if(HOSTFS_I(ino)->mode & FMODE_READ) 
-               r = 1;
-       if(HOSTFS_I(ino)->mode & FMODE_WRITE) 
-               w = 1;
-       if(w) 
-               r = 1;
-
-       name = dentry_name(file->f_dentry, 0);
-       if(name == NULL) 
-               return(-ENOMEM);
-
-       fd = open_file(name, r, w, append);
-       kfree(name);
-       if(fd < 0) return(fd);
-       FILE_HOSTFS_I(file)->fd = fd;
-
-       return(0);
-}
-
-int hostfs_fsync(struct file *file, struct dentry *dentry, int datasync)
-{
-       return(0);
-}
-
-static struct file_operations hostfs_file_fops = {
-       .llseek         = generic_file_llseek,
-       .read           = generic_file_read,
-       .write          = generic_file_write,
-       .mmap           = generic_file_mmap,
-       .open           = hostfs_file_open,
-       .release        = NULL,
-       .fsync          = hostfs_fsync,
-};
-
-static struct file_operations hostfs_dir_fops = {
-       .readdir        = hostfs_readdir,
-       .read           = generic_read_dir,
-};
-
-int hostfs_writepage(struct page *page, struct writeback_control *wbc)
-{
-       struct address_space *mapping = page->mapping;
-       struct inode *inode = mapping->host;
-       char *buffer;
-       unsigned long long base;
-       int count = PAGE_CACHE_SIZE;
-       int end_index = inode->i_size >> PAGE_CACHE_SHIFT;
-       int err;
-
-       if (page->index >= end_index)
-               count = inode->i_size & (PAGE_CACHE_SIZE-1);
-
-       buffer = kmap(page);
-       base = ((unsigned long long) page->index) << PAGE_CACHE_SHIFT;
-
-       err = write_file(HOSTFS_I(inode)->fd, &base, buffer, count);
-       if(err != count){
-               ClearPageUptodate(page);
-               goto out;
-       }
-
-       if (base > inode->i_size)
-               inode->i_size = base;
-
-       if (PageError(page))
-               ClearPageError(page);   
-       err = 0;
-
- out:  
-       kunmap(page);
-
-       unlock_page(page);
-       return err; 
-}
-
-int hostfs_readpage(struct file *file, struct page *page)
-{
-       char *buffer;
-       long long start;
-       int err = 0;
-
-       start = (long long) page->index << PAGE_CACHE_SHIFT;
-       buffer = kmap(page);
-       err = read_file(FILE_HOSTFS_I(file)->fd, &start, buffer,
-                       PAGE_CACHE_SIZE);
-       if(err < 0) goto out;
-
-       memset(&buffer[err], 0, PAGE_CACHE_SIZE - err);
-
-       flush_dcache_page(page);
-       SetPageUptodate(page);
-       if (PageError(page)) ClearPageError(page);
-       err = 0;
- out:
-       kunmap(page);
-       unlock_page(page);
-       return(err);
-}
-
-int hostfs_prepare_write(struct file *file, struct page *page, 
-                        unsigned int from, unsigned int to)
-{
-       char *buffer;
-       long long start, tmp;
-       int err;
-
-       start = (long long) page->index << PAGE_CACHE_SHIFT;
-       buffer = kmap(page);
-       if(from != 0){
-               tmp = start;
-               err = read_file(FILE_HOSTFS_I(file)->fd, &tmp, buffer,
-                               from);
-               if(err < 0) goto out;
-       }
-       if(to != PAGE_CACHE_SIZE){
-               start += to;
-               err = read_file(FILE_HOSTFS_I(file)->fd, &start, buffer + to,
-                               PAGE_CACHE_SIZE - to);
-               if(err < 0) goto out;           
-       }
-       err = 0;
- out:
-       kunmap(page);
-       return(err);
-}
-
-int hostfs_commit_write(struct file *file, struct page *page, unsigned from,
-                unsigned to)
-{
-       struct address_space *mapping = page->mapping;
-       struct inode *inode = mapping->host;
-       char *buffer;
-       long long start;
-       int err = 0;
-
-       start = (long long) (page->index << PAGE_CACHE_SHIFT) + from;
-       buffer = kmap(page);
-       err = write_file(FILE_HOSTFS_I(file)->fd, &start, buffer + from, 
-                        to - from);
-       if(err > 0) err = 0;
-       if(!err && (start > inode->i_size))
-               inode->i_size = start;
-
-       kunmap(page);
-       return(err);
-}
-
-static struct address_space_operations hostfs_aops = {
-       .writepage      = hostfs_writepage,
-       .readpage       = hostfs_readpage,
-/*     .set_page_dirty = __set_page_dirty_nobuffers, */
-       .prepare_write  = hostfs_prepare_write,
-       .commit_write   = hostfs_commit_write
-};
-
-static int init_inode(struct inode *inode, struct dentry *dentry)
-{
-       char *name;
-       int type, err = -ENOMEM, rdev;
-
-       if(dentry){
-               name = dentry_name(dentry, 0);
-               if(name == NULL)
-                       goto out;
-               type = file_type(name, &rdev);
-               kfree(name);
-       }
-       else type = OS_TYPE_DIR;
-
-       err = 0;
-       if(type == OS_TYPE_SYMLINK)
-               inode->i_op = &page_symlink_inode_operations;
-       else if(type == OS_TYPE_DIR)
-               inode->i_op = &hostfs_dir_iops;
-       else inode->i_op = &hostfs_iops;
-
-       if(type == OS_TYPE_DIR) inode->i_fop = &hostfs_dir_fops;
-       else inode->i_fop = &hostfs_file_fops;
-
-       if(type == OS_TYPE_SYMLINK) 
-               inode->i_mapping->a_ops = &hostfs_link_aops;
-       else inode->i_mapping->a_ops = &hostfs_aops;
-
-       switch (type) {
-       case OS_TYPE_CHARDEV:
-               init_special_inode(inode, S_IFCHR, rdev);
-               break;
-       case OS_TYPE_BLOCKDEV:
-               init_special_inode(inode, S_IFBLK, rdev);
-               break;
-       case OS_TYPE_FIFO:
-               init_special_inode(inode, S_IFIFO, 0);
-               break;
-       case OS_TYPE_SOCK:
-               init_special_inode(inode, S_IFSOCK, 0);
-               break;
-       }
- out:
-       return(err);
-}
-
-int hostfs_create(struct inode *dir, struct dentry *dentry, int mode, 
-                 struct nameidata *nd)
-{
-       struct inode *inode;
-       char *name;
-       int error, fd;
-
-       error = -ENOMEM;
-       inode = iget(dir->i_sb, 0);
-       if(inode == NULL) goto out;
-
-       error = init_inode(inode, dentry);
-       if(error) 
-               goto out_put;
-       
-       error = -ENOMEM;
-       name = dentry_name(dentry, 0);
-       if(name == NULL)
-               goto out_put;
-
-       fd = file_create(name, 
-                        mode & S_IRUSR, mode & S_IWUSR, mode & S_IXUSR, 
-                        mode & S_IRGRP, mode & S_IWGRP, mode & S_IXGRP, 
-                        mode & S_IROTH, mode & S_IWOTH, mode & S_IXOTH);
-       if(fd < 0) 
-               error = fd;
-       else error = read_name(inode, name);
-
-       kfree(name);
-       if(error)
-               goto out_put;
-
-       HOSTFS_I(inode)->fd = fd;
-       HOSTFS_I(inode)->mode = FMODE_READ | FMODE_WRITE;
-       d_instantiate(dentry, inode);
-       return(0);
-
- out_put:
-       iput(inode);
- out:
-       return(error);
-}
-
-struct dentry *hostfs_lookup(struct inode *ino, struct dentry *dentry, 
-                            struct nameidata *nd)
-{
-       struct inode *inode;
-       char *name;
-       int err;
-
-       err = -ENOMEM;
-       inode = iget(ino->i_sb, 0);
-       if(inode == NULL) 
-               goto out;
-       err = init_inode(inode, dentry);
-       if(err) 
-               goto out_put;
-
-       err = -ENOMEM;
-       name = dentry_name(dentry, 0);
-       if(name == NULL)
-               goto out_put;
-
-       err = read_name(inode, name);
-       kfree(name);
-       if(err == -ENOENT){
-               iput(inode);
-               inode = NULL;
-       }
-       else if(err)
-               goto out_put;
-
-       d_add(dentry, inode);
-       dentry->d_op = &hostfs_dentry_ops;
-       return(NULL);
-
- out_put:
-       iput(inode);
- out:
-       return(ERR_PTR(err));
-}
-
-static char *inode_dentry_name(struct inode *ino, struct dentry *dentry)
-{
-        char *file;
-       int len;
-
-       file = inode_name(ino, dentry->d_name.len + 1);
-       if(file == NULL) return(NULL);
-        strcat(file, "/");
-       len = strlen(file);
-        strncat(file, dentry->d_name.name, dentry->d_name.len);
-       file[len + dentry->d_name.len] = '\0';
-        return(file);
-}
-
-int hostfs_link(struct dentry *to, struct inode *ino, struct dentry *from)
-{
-        char *from_name, *to_name;
-        int err;
-
-        if((from_name = inode_dentry_name(ino, from)) == NULL) 
-                return(-ENOMEM);
-        to_name = dentry_name(to, 0);
-       if(to_name == NULL){
-               kfree(from_name);
-               return(-ENOMEM);
-       }
-        err = link_file(to_name, from_name);
-        kfree(from_name);
-        kfree(to_name);
-        return(err);
-}
-
-int hostfs_unlink(struct inode *ino, struct dentry *dentry)
-{
-       char *file;
-       int err;
-
-       if((file = inode_dentry_name(ino, dentry)) == NULL) return(-ENOMEM);
-       if(append)
-               return(-EPERM);
-
-       err = unlink_file(file);
-       kfree(file);
-       return(err);
-}
-
-int hostfs_symlink(struct inode *ino, struct dentry *dentry, const char *to)
-{
-       char *file;
-       int err;
-
-       if((file = inode_dentry_name(ino, dentry)) == NULL) return(-ENOMEM);
-       err = make_symlink(file, to);
-       kfree(file);
-       return(err);
-}
-
-int hostfs_mkdir(struct inode *ino, struct dentry *dentry, int mode)
-{
-       char *file;
-       int err;
-
-       if((file = inode_dentry_name(ino, dentry)) == NULL) return(-ENOMEM);
-       err = do_mkdir(file, mode);
-       kfree(file);
-       return(err);
-}
-
-int hostfs_rmdir(struct inode *ino, struct dentry *dentry)
-{
-       char *file;
-       int err;
-
-       if((file = inode_dentry_name(ino, dentry)) == NULL) return(-ENOMEM);
-       err = do_rmdir(file);
-       kfree(file);
-       return(err);
-}
-
-int hostfs_mknod(struct inode *dir, struct dentry *dentry, int mode, dev_t dev)
-{
-       struct inode *inode;
-       char *name;
-       int err = -ENOMEM;
-       inode = iget(dir->i_sb, 0);
-       if(inode == NULL) 
-               goto out;
-
-       err = init_inode(inode, dentry);
-       if(err) 
-               goto out_put;
-
-       err = -ENOMEM;
-       name = dentry_name(dentry, 0);
-       if(name == NULL)
-               goto out_put;
-
-       init_special_inode(inode, mode, dev);
-       err = do_mknod(name, mode, dev);
-       if(err)
-               goto out_free;
-
-       err = read_name(inode, name);
-       kfree(name);
-       if(err)
-               goto out_put;
-
-       d_instantiate(dentry, inode);
-       return(0);
-
- out_free:
-       kfree(name);
- out_put:
-       iput(inode);
- out:
-       return(err);
-}
-
-int hostfs_rename(struct inode *from_ino, struct dentry *from,
-                 struct inode *to_ino, struct dentry *to)
-{
-       char *from_name, *to_name;
-       int err;
-
-       if((from_name = inode_dentry_name(from_ino, from)) == NULL)
-               return(-ENOMEM);
-       if((to_name = inode_dentry_name(to_ino, to)) == NULL){
-               kfree(from_name);
-               return(-ENOMEM);
-       }
-       err = rename_file(from_name, to_name);
-       kfree(from_name);
-       kfree(to_name);
-       return(err);
-}
-
-void hostfs_truncate(struct inode *ino)
-{
-       not_implemented();
-}
-
-int hostfs_permission(struct inode *ino, int desired, struct nameidata *nd)
-{
-       char *name;
-       int r = 0, w = 0, x = 0, err;
-
-       if(desired & MAY_READ) r = 1;
-       if(desired & MAY_WRITE) w = 1;
-       if(desired & MAY_EXEC) x = 1;
-       name = inode_name(ino, 0);
-       if(name == NULL) return(-ENOMEM);
-       err = access_file(name, r, w, x);
-       kfree(name);
-       if(!err) err = vfs_permission(ino, desired);
-       return(err);
-}
-
-int hostfs_setattr(struct dentry *dentry, struct iattr *attr)
-{
-       struct hostfs_iattr attrs;
-       char *name;
-       int err;
-       
-       if(append) 
-               attr->ia_valid &= ~ATTR_SIZE;
-
-       attrs.ia_valid = 0;
-       if(attr->ia_valid & ATTR_MODE){
-               attrs.ia_valid |= HOSTFS_ATTR_MODE;
-               attrs.ia_mode = attr->ia_mode;
-       }
-       if(attr->ia_valid & ATTR_UID){
-               if((dentry->d_inode->i_sb->s_dev == ROOT_DEV) && 
-                  (attr->ia_uid == 0))
-                       attr->ia_uid = getuid();
-               attrs.ia_valid |= HOSTFS_ATTR_UID;
-               attrs.ia_uid = attr->ia_uid;
-       }
-       if(attr->ia_valid & ATTR_GID){
-               if((dentry->d_inode->i_sb->s_dev == ROOT_DEV) && 
-                  (attr->ia_gid == 0))
-                       attr->ia_gid = getuid();
-               attrs.ia_valid |= HOSTFS_ATTR_GID;
-               attrs.ia_gid = attr->ia_gid;
-       }
-       if(attr->ia_valid & ATTR_SIZE){
-               attrs.ia_valid |= HOSTFS_ATTR_SIZE;
-               attrs.ia_size = attr->ia_size;
-       }
-       if(attr->ia_valid & ATTR_ATIME){
-               attrs.ia_valid |= HOSTFS_ATTR_ATIME;
-               attrs.ia_atime = attr->ia_atime;
-       }
-       if(attr->ia_valid & ATTR_MTIME){
-               attrs.ia_valid |= HOSTFS_ATTR_MTIME;
-               attrs.ia_mtime = attr->ia_mtime;
-       }
-       if(attr->ia_valid & ATTR_CTIME){
-               attrs.ia_valid |= HOSTFS_ATTR_CTIME;
-               attrs.ia_ctime = attr->ia_ctime;
-       }
-       if(attr->ia_valid & ATTR_ATIME_SET){
-               attrs.ia_valid |= HOSTFS_ATTR_ATIME_SET;
-       }
-       if(attr->ia_valid & ATTR_MTIME_SET){
-               attrs.ia_valid |= HOSTFS_ATTR_MTIME_SET;
-       }
-       name = dentry_name(dentry, 0);
-       if(name == NULL) return(-ENOMEM);
-       err = set_attr(name, &attrs);
-       kfree(name);
-       if(err)
-               return(err);
-
-       return(inode_setattr(dentry->d_inode, attr));
-}
-
-int hostfs_getattr(struct vfsmount *mnt, struct dentry *dentry, 
-          struct kstat *stat)
-{
-       generic_fillattr(dentry->d_inode, stat);
-       return(0);
-}
-
-static struct inode_operations hostfs_iops = {
-       .create         = hostfs_create,
-       .link           = hostfs_link,
-       .unlink         = hostfs_unlink,
-       .symlink        = hostfs_symlink,
-       .mkdir          = hostfs_mkdir,
-       .rmdir          = hostfs_rmdir,
-       .mknod          = hostfs_mknod,
-       .rename         = hostfs_rename,
-       .truncate       = hostfs_truncate,
-       .permission     = hostfs_permission,
-       .setattr        = hostfs_setattr,
-       .getattr        = hostfs_getattr,
-};
-
-static struct inode_operations hostfs_dir_iops = {
-       .create         = hostfs_create,
-       .lookup         = hostfs_lookup,
-       .link           = hostfs_link,
-       .unlink         = hostfs_unlink,
-       .symlink        = hostfs_symlink,
-       .mkdir          = hostfs_mkdir,
-       .rmdir          = hostfs_rmdir,
-       .mknod          = hostfs_mknod,
-       .rename         = hostfs_rename,
-       .truncate       = hostfs_truncate,
-       .permission     = hostfs_permission,
-       .setattr        = hostfs_setattr,
-       .getattr        = hostfs_getattr,
-};
-
-int hostfs_link_readpage(struct file *file, struct page *page)
-{
-       char *buffer, *name;
-       long long start;
-       int err;
-
-       start = page->index << PAGE_CACHE_SHIFT;
-       buffer = kmap(page);
-       name = inode_name(page->mapping->host, 0);
-       if(name == NULL) return(-ENOMEM);
-       err = do_readlink(name, buffer, PAGE_CACHE_SIZE);
-       kfree(name);
-       if(err == PAGE_CACHE_SIZE)
-               err = -E2BIG;
-       else if(err > 0){
-               flush_dcache_page(page);
-               SetPageUptodate(page);
-               if (PageError(page)) ClearPageError(page);
-               err = 0;
-       }
-       kunmap(page);
-       unlock_page(page);
-       return(err);
-}
-
-static struct address_space_operations hostfs_link_aops = {
-       .readpage       = hostfs_link_readpage,
-};
-
-static int hostfs_fill_sb_common(struct super_block *sb, void *d, int silent)
-{
-       struct inode *root_inode;
-       char *name, *data = d;
-       int err;
-
-       sb->s_blocksize = 1024;
-       sb->s_blocksize_bits = 10;
-       sb->s_magic = HOSTFS_SUPER_MAGIC;
-       sb->s_op = &hostfs_sbops;
-
-       if((data == NULL) || (*data == '\0')) 
-               data = root_ino;
-
-       err = -ENOMEM;
-       name = kmalloc(strlen(data) + 1, GFP_KERNEL);
-       if(name == NULL) 
-               goto out;
-
-       strcpy(name, data);
-
-       root_inode = iget(sb, 0);
-       if(root_inode == NULL)
-               goto out_free;
-
-       err = init_inode(root_inode, NULL);
-       if(err)
-               goto out_put;
-
-       HOSTFS_I(root_inode)->host_filename = name;
-
-       err = -ENOMEM;
-       sb->s_root = d_alloc_root(root_inode);
-       if(sb->s_root == NULL)
-               goto out_put;
-
-       err = read_inode(root_inode);
-       if(err)
-               goto out_put;
-
-       return(0);
-
- out_put:
-       iput(root_inode);
- out_free:
-       kfree(name);
- out:
-       return(err);
-}
-
-static struct super_block *hostfs_read_sb(struct file_system_type *type,
-                                            int flags, const char *dev_name,
-                                            void *data)
-{
-       return(get_sb_nodev(type, flags, data, hostfs_fill_sb_common));
-}
-
-static struct file_system_type hostfs_type = {
-       .owner          = THIS_MODULE,
-       .name           = "hostfs",
-       .get_sb         = hostfs_read_sb,
-       .kill_sb        = kill_anon_super,
-       .fs_flags       = 0,
-};
-
-static int __init init_hostfs(void)
-{
-       return(register_filesystem(&hostfs_type));
-}
-
-static void __exit exit_hostfs(void)
-{
-       unregister_filesystem(&hostfs_type);
-}
-
-module_init(init_hostfs)
-module_exit(exit_hostfs)
-MODULE_LICENSE("GPL");
-
-/*
- * Overrides for Emacs so that we follow Linus's tabbing style.
- * Emacs will notice this stuff at the end of the file and automatically
- * adjust the settings for this buffer only.  This must remain at the end
- * of the file.
- * ---------------------------------------------------------------------------
- * Local variables:
- * c-file-style: "linux"
- * End:
- */
diff --git a/fs/hostfs/hostfs_user.c b/fs/hostfs/hostfs_user.c
deleted file mode 100644 (file)
index c406266..0000000
+++ /dev/null
@@ -1,361 +0,0 @@
-/* 
- * Copyright (C) 2000 Jeff Dike (jdike@karaya.com)
- * Licensed under the GPL
- */
-
-#include <unistd.h>
-#include <stdio.h>
-#include <fcntl.h>
-#include <dirent.h>
-#include <errno.h>
-#include <utime.h>
-#include <string.h>
-#include <sys/stat.h>
-#include <sys/time.h>
-#include <sys/vfs.h>
-#include "hostfs.h"
-#include "kern_util.h"
-#include "user.h"
-
-int stat_file(const char *path, unsigned long long *inode_out, int *mode_out,
-             int *nlink_out, int *uid_out, int *gid_out, 
-             unsigned long long *size_out, struct timespec *atime_out,
-             struct timespec *mtime_out, struct timespec *ctime_out,
-             int *blksize_out, unsigned long long *blocks_out)
-{
-       struct stat64 buf;
-
-       if(lstat64(path, &buf) < 0) 
-               return(-errno);
-
-       /* See the Makefile for why STAT64_INO_FIELD is passed in
-        * by the build
-        */
-       if(inode_out != NULL) *inode_out = buf.STAT64_INO_FIELD;
-       if(mode_out != NULL) *mode_out = buf.st_mode;
-       if(nlink_out != NULL) *nlink_out = buf.st_nlink;
-       if(uid_out != NULL) *uid_out = buf.st_uid;
-       if(gid_out != NULL) *gid_out = buf.st_gid;
-       if(size_out != NULL) *size_out = buf.st_size;
-       if(atime_out != NULL) {
-               atime_out->tv_sec = buf.st_atime;
-               atime_out->tv_nsec = 0;
-       }
-       if(mtime_out != NULL) {
-               mtime_out->tv_sec = buf.st_mtime;
-               mtime_out->tv_nsec = 0;
-       }
-       if(ctime_out != NULL) {
-               ctime_out->tv_sec = buf.st_ctime;
-               ctime_out->tv_nsec = 0;
-       }
-       if(blksize_out != NULL) *blksize_out = buf.st_blksize;
-       if(blocks_out != NULL) *blocks_out = buf.st_blocks;
-       return(0);
-}
-
-int file_type(const char *path, int *rdev)
-{
-       struct stat64 buf;
-
-       if(lstat64(path, &buf) < 0) 
-               return(-errno);
-       if(rdev != NULL) 
-               *rdev = buf.st_rdev;
-
-       if(S_ISDIR(buf.st_mode)) return(OS_TYPE_DIR);
-       else if(S_ISLNK(buf.st_mode)) return(OS_TYPE_SYMLINK);
-       else if(S_ISCHR(buf.st_mode)) return(OS_TYPE_CHARDEV);
-       else if(S_ISBLK(buf.st_mode)) return(OS_TYPE_BLOCKDEV);
-       else if(S_ISFIFO(buf.st_mode))return(OS_TYPE_FIFO);
-       else if(S_ISSOCK(buf.st_mode))return(OS_TYPE_SOCK);
-       else return(OS_TYPE_FILE);
-}
-
-int access_file(char *path, int r, int w, int x)
-{
-       int mode = 0;
-
-       if(r) mode = R_OK;
-       if(w) mode |= W_OK;
-       if(x) mode |= X_OK;
-       if(access(path, mode) != 0) return(-errno);
-       else return(0);
-}
-
-int open_file(char *path, int r, int w, int append)
-{
-       int mode = 0, fd;
-
-       if(r && !w) 
-               mode = O_RDONLY;
-       else if(!r && w) 
-               mode = O_WRONLY;
-       else if(r && w) 
-               mode = O_RDWR;
-       else panic("Impossible mode in open_file");
-
-       if(append)
-               mode |= O_APPEND;
-       fd = open64(path, mode);
-       if(fd < 0) return(-errno);
-       else return(fd);
-}
-
-void *open_dir(char *path, int *err_out)
-{
-       DIR *dir;
-
-       dir = opendir(path);
-       *err_out = errno;
-       if(dir == NULL) return(NULL);
-       return(dir);
-}
-
-char *read_dir(void *stream, unsigned long long *pos, 
-              unsigned long long *ino_out, int *len_out)
-{
-       DIR *dir = stream;
-       struct dirent *ent;
-
-       seekdir(dir, *pos);
-       ent = readdir(dir);
-       if(ent == NULL) return(NULL);
-       *len_out = strlen(ent->d_name);
-       *ino_out = ent->d_ino;
-       *pos = telldir(dir);
-       return(ent->d_name);
-}
-
-int read_file(int fd, unsigned long long *offset, char *buf, int len)
-{
-       int n;
-
-       n = pread64(fd, buf, len, *offset);
-       if(n < 0) return(-errno);
-       *offset += n;
-       return(n);
-}
-
-int write_file(int fd, unsigned long long *offset, const char *buf, int len)
-{
-       int n;
-
-       n = pwrite64(fd, buf, len, *offset);
-       if(n < 0) return(-errno);
-       *offset += n;
-       return(n);
-}
-
-int lseek_file(int fd, long long offset, int whence)
-{
-       int ret;
-
-       ret = lseek64(fd, offset, whence);
-       if(ret < 0) return(-errno);
-       return(0);
-}
-
-void close_file(void *stream)
-{
-       close(*((int *) stream));
-}
-
-void close_dir(void *stream)
-{
-       closedir(stream);
-}
-
-int file_create(char *name, int ur, int uw, int ux, int gr, 
-               int gw, int gx, int or, int ow, int ox)
-{
-       int mode, fd;
-
-       mode = 0;
-       mode |= ur ? S_IRUSR : 0;
-       mode |= uw ? S_IWUSR : 0;
-       mode |= ux ? S_IXUSR : 0;
-       mode |= gr ? S_IRGRP : 0;
-       mode |= gw ? S_IWGRP : 0;
-       mode |= gx ? S_IXGRP : 0;
-       mode |= or ? S_IROTH : 0;
-       mode |= ow ? S_IWOTH : 0;
-       mode |= ox ? S_IXOTH : 0;
-       fd = open64(name, O_CREAT | O_RDWR, mode);
-       if(fd < 0) 
-               return(-errno);
-       return(fd);
-}
-
-int set_attr(const char *file, struct hostfs_iattr *attrs)
-{
-       struct utimbuf buf;
-       int err, ma;
-
-       if(attrs->ia_valid & HOSTFS_ATTR_MODE){
-               if(chmod(file, attrs->ia_mode) != 0) return(-errno);
-       }
-       if(attrs->ia_valid & HOSTFS_ATTR_UID){
-               if(chown(file, attrs->ia_uid, -1)) return(-errno);
-       }
-       if(attrs->ia_valid & HOSTFS_ATTR_GID){
-               if(chown(file, -1, attrs->ia_gid)) return(-errno);
-       }
-       if(attrs->ia_valid & HOSTFS_ATTR_SIZE){
-               if(truncate(file, attrs->ia_size)) return(-errno);
-       }
-       ma = HOSTFS_ATTR_ATIME_SET | HOSTFS_ATTR_MTIME_SET;
-       if((attrs->ia_valid & ma) == ma){
-               buf.actime = attrs->ia_atime.tv_sec;
-               buf.modtime = attrs->ia_mtime.tv_sec;
-               if(utime(file, &buf) != 0) return(-errno);
-       }
-       else {
-               struct timespec ts;
-
-               if(attrs->ia_valid & HOSTFS_ATTR_ATIME_SET){
-                       err = stat_file(file, NULL, NULL, NULL, NULL, NULL, 
-                                       NULL, NULL, &ts, NULL, NULL, NULL);
-                       if(err != 0) 
-                               return(err);
-                       buf.actime = attrs->ia_atime.tv_sec;
-                       buf.modtime = ts.tv_sec;
-                       if(utime(file, &buf) != 0) 
-                               return(-errno);
-               }
-               if(attrs->ia_valid & HOSTFS_ATTR_MTIME_SET){
-                       err = stat_file(file, NULL, NULL, NULL, NULL, NULL, 
-                                       NULL, &ts, NULL, NULL, NULL, NULL);
-                       if(err != 0) 
-                               return(err);
-                       buf.actime = ts.tv_sec;
-                       buf.modtime = attrs->ia_mtime.tv_sec;
-                       if(utime(file, &buf) != 0) 
-                               return(-errno);
-               }
-       }
-       if(attrs->ia_valid & HOSTFS_ATTR_CTIME) ;
-       if(attrs->ia_valid & (HOSTFS_ATTR_ATIME | HOSTFS_ATTR_MTIME)){
-               err = stat_file(file, NULL, NULL, NULL, NULL, NULL, NULL, 
-                               &attrs->ia_atime, &attrs->ia_mtime, NULL, 
-                               NULL, NULL);
-               if(err != 0) return(err);
-       }
-       return(0);
-}
-
-int make_symlink(const char *from, const char *to)
-{
-       int err;
-
-       err = symlink(to, from);
-       if(err) return(-errno);
-       return(0);
-}
-
-int unlink_file(const char *file)
-{
-       int err;
-
-       err = unlink(file);
-       if(err) return(-errno);
-       return(0);
-}
-
-int do_mkdir(const char *file, int mode)
-{
-       int err;
-
-       err = mkdir(file, mode);
-       if(err) return(-errno);
-       return(0);
-}
-
-int do_rmdir(const char *file)
-{
-       int err;
-
-       err = rmdir(file);
-       if(err) return(-errno);
-       return(0);
-}
-
-int do_mknod(const char *file, int mode, int dev)
-{
-       int err;
-
-       err = mknod(file, mode, dev);
-       if(err) return(-errno);
-       return(0);
-}
-
-int link_file(const char *to, const char *from)
-{
-       int err;
-
-       err = link(to, from);
-       if(err) return(-errno);
-       return(0);
-}
-
-int do_readlink(char *file, char *buf, int size)
-{
-       int n;
-
-       n = readlink(file, buf, size);
-       if(n < 0) 
-               return(-errno);
-       if(n < size) 
-               buf[n] = '\0';
-       return(n);
-}
-
-int rename_file(char *from, char *to)
-{
-       int err;
-
-       err = rename(from, to);
-       if(err < 0) return(-errno);
-       return(0);      
-}
-
-int do_statfs(char *root, long *bsize_out, long long *blocks_out, 
-             long long *bfree_out, long long *bavail_out, 
-             long long *files_out, long long *ffree_out,
-             void *fsid_out, int fsid_size, long *namelen_out, 
-             long *spare_out)
-{
-       struct statfs64 buf;
-       int err;
-
-       err = statfs64(root, &buf);
-       if(err < 0) return(-errno);
-       *bsize_out = buf.f_bsize;
-       *blocks_out = buf.f_blocks;
-       *bfree_out = buf.f_bfree;
-       *bavail_out = buf.f_bavail;
-       *files_out = buf.f_files;
-       *ffree_out = buf.f_ffree;
-       memcpy(fsid_out, &buf.f_fsid, 
-              sizeof(buf.f_fsid) > fsid_size ? fsid_size : 
-              sizeof(buf.f_fsid));
-       *namelen_out = buf.f_namelen;
-       spare_out[0] = buf.f_spare[0];
-       spare_out[1] = buf.f_spare[1];
-       spare_out[2] = buf.f_spare[2];
-       spare_out[3] = buf.f_spare[3];
-       spare_out[4] = buf.f_spare[4];
-       spare_out[5] = buf.f_spare[5];
-       return(0);
-}
-
-/*
- * Overrides for Emacs so that we follow Linus's tabbing style.
- * Emacs will notice this stuff at the end of the file and automatically
- * adjust the settings for this buffer only.  This must remain at the end
- * of the file.
- * ---------------------------------------------------------------------------
- * Local variables:
- * c-file-style: "linux"
- * End:
- */
diff --git a/fs/hppfs/Makefile b/fs/hppfs/Makefile
deleted file mode 100644 (file)
index e67f038..0000000
+++ /dev/null
@@ -1,19 +0,0 @@
-# 
-# Copyright (C) 2002, 2003 Jeff Dike (jdike@karaya.com)
-# Licensed under the GPL
-#
-
-hppfs-objs := hppfs_kern.o
-
-obj-y = 
-obj-$(CONFIG_HPPFS) += hppfs.o
-
-clean:
-
-modules:
-
-fastdep:
-
-dep:
-
-archmrproper: clean
diff --git a/fs/hppfs/hppfs_kern.c b/fs/hppfs/hppfs_kern.c
deleted file mode 100644 (file)
index ebf08cb..0000000
+++ /dev/null
@@ -1,811 +0,0 @@
-/* 
- * Copyright (C) 2002 Jeff Dike (jdike@karaya.com)
- * Licensed under the GPL
- */
-
-#include <linux/fs.h>
-#include <linux/module.h>
-#include <linux/init.h>
-#include <linux/slab.h>
-#include <linux/list.h>
-#include <linux/kernel.h>
-#include <linux/ctype.h>
-#include <linux/dcache.h>
-#include <linux/statfs.h>
-#include <asm/uaccess.h>
-#include <asm/fcntl.h>
-#include "os.h"
-
-static int init_inode(struct inode *inode, struct dentry *dentry);
-
-struct hppfs_data {
-       struct list_head list;
-       char contents[PAGE_SIZE - sizeof(struct list_head)];
-};
-
-struct hppfs_private {
-       struct file proc_file;
-       int host_fd;
-       loff_t len;
-       struct hppfs_data *contents;
-};
-
-struct hppfs_inode_info {
-        struct dentry *proc_dentry;
-       struct inode vfs_inode;
-};
-
-static inline struct hppfs_inode_info *HPPFS_I(struct inode *inode)
-{
-       return(list_entry(inode, struct hppfs_inode_info, vfs_inode));
-}
-
-#define HPPFS_SUPER_MAGIC 0xb00000ee
-
-static struct super_operations hppfs_sbops;
-
-static int is_pid(struct dentry *dentry)
-{
-       struct super_block *sb;
-       int i;
-
-       sb = dentry->d_sb;
-       if((sb->s_op != &hppfs_sbops) || (dentry->d_parent != sb->s_root))
-               return(0);
-
-       for(i = 0; i < dentry->d_name.len; i++){
-               if(!isdigit(dentry->d_name.name[i]))
-                       return(0);
-       }
-       return(1);
-}
-
-static char *dentry_name(struct dentry *dentry, int extra)
-{
-       struct dentry *parent;
-       char *root, *name;
-       const char *seg_name;
-       int len, seg_len;
-
-       len = 0;
-       parent = dentry;
-       while(parent->d_parent != parent){
-               if(is_pid(parent))
-                       len += strlen("pid") + 1;
-               else len += parent->d_name.len + 1;
-               parent = parent->d_parent;
-       }
-       
-       root = "proc";
-       len += strlen(root);
-       name = kmalloc(len + extra + 1, GFP_KERNEL);
-       if(name == NULL) return(NULL);
-
-       name[len] = '\0';
-       parent = dentry;
-       while(parent->d_parent != parent){
-               if(is_pid(parent)){
-                       seg_name = "pid";
-                       seg_len = strlen("pid");
-               }
-               else {
-                       seg_name = parent->d_name.name;
-                       seg_len = parent->d_name.len;
-               }
-
-               len -= seg_len + 1;
-               name[len] = '/';
-               strncpy(&name[len + 1], seg_name, seg_len);
-               parent = parent->d_parent;
-       }
-       strncpy(name, root, strlen(root));
-       return(name);
-}
-
-struct dentry_operations hppfs_dentry_ops = {
-};
-
-static int file_removed(struct dentry *dentry, const char *file)
-{
-       char *host_file;
-       int extra, fd;
-
-       extra = 0;
-       if(file != NULL) extra += strlen(file) + 1;
-
-       host_file = dentry_name(dentry, extra + strlen("/remove"));
-       if(host_file == NULL){
-               printk("file_removed : allocation failed\n");
-               return(-ENOMEM);
-       }
-
-       if(file != NULL){
-               strcat(host_file, "/");
-               strcat(host_file, file);
-       }
-       strcat(host_file, "/remove");
-
-       fd = os_open_file(host_file, of_read(OPENFLAGS()), 0);
-       kfree(host_file);
-       if(fd > 0){
-               os_close_file(fd);
-               return(1);
-       }
-       return(0);
-}
-
-static void hppfs_read_inode(struct inode *ino)
-{
-       struct inode *proc_ino;
-
-       if(HPPFS_I(ino)->proc_dentry == NULL)
-               return;
-
-       proc_ino = HPPFS_I(ino)->proc_dentry->d_inode;
-       ino->i_uid = proc_ino->i_uid;
-       ino->i_gid = proc_ino->i_gid;
-       ino->i_atime = proc_ino->i_atime;
-       ino->i_mtime = proc_ino->i_mtime;
-       ino->i_ctime = proc_ino->i_ctime;
-       ino->i_ino = proc_ino->i_ino;
-       ino->i_mode = proc_ino->i_mode;
-       ino->i_nlink = proc_ino->i_nlink;
-       ino->i_size = proc_ino->i_size;
-       ino->i_blksize = proc_ino->i_blksize;
-       ino->i_blocks = proc_ino->i_blocks;
-}
-
-static struct dentry *hppfs_lookup(struct inode *ino, struct dentry *dentry, 
-                                  struct nameidata *nd)
-{
-       struct dentry *proc_dentry, *new, *parent;
-       struct inode *inode;
-       int err, deleted;
-
-       deleted = file_removed(dentry, NULL);
-       if(deleted < 0)
-               return(ERR_PTR(deleted));
-       else if(deleted)
-               return(ERR_PTR(-ENOENT));
-
-       err = -ENOMEM;
-       parent = HPPFS_I(ino)->proc_dentry;
-       down(&parent->d_inode->i_sem);
-       proc_dentry = d_lookup(parent, &dentry->d_name);
-       if(proc_dentry == NULL){
-               proc_dentry = d_alloc(parent, &dentry->d_name);
-               if(proc_dentry == NULL){
-                       up(&parent->d_inode->i_sem);
-                       goto out;
-               }
-               new = (*parent->d_inode->i_op->lookup)(parent->d_inode, 
-                                                      proc_dentry, NULL);
-               if(new){
-                       dput(proc_dentry);
-                       proc_dentry = new;
-               }
-       }
-       up(&parent->d_inode->i_sem);
-
-       if(IS_ERR(proc_dentry))
-               return(proc_dentry);
-
-       inode = iget(ino->i_sb, 0);
-       if(inode == NULL) 
-               goto out_dput;
-
-       err = init_inode(inode, proc_dentry);
-       if(err) 
-               goto out_put;
-       
-       hppfs_read_inode(inode);
-
-       d_add(dentry, inode);
-       dentry->d_op = &hppfs_dentry_ops;
-       return(NULL);
-
- out_put:
-       iput(inode);
- out_dput:
-       dput(proc_dentry);
- out:
-       return(ERR_PTR(err));
-}
-
-static struct inode_operations hppfs_file_iops = {
-};
-
-static ssize_t read_proc(struct file *file, char *buf, ssize_t count, 
-                        loff_t *ppos, int is_user)
-{
-       ssize_t (*read)(struct file *, char *, size_t, loff_t *);
-       ssize_t n;
-
-       read = file->f_dentry->d_inode->i_fop->read;
-
-       if(!is_user)
-               set_fs(KERNEL_DS);
-               
-       n = (*read)(file, buf, count, &file->f_pos);
-
-       if(!is_user)
-               set_fs(USER_DS);
-
-       if(ppos) *ppos = file->f_pos;
-       return(n);
-}
-
-static ssize_t hppfs_read_file(int fd, char *buf, ssize_t count)
-{
-       ssize_t n;
-       int cur, err;
-       char *new_buf;
-
-       n = -ENOMEM;
-       new_buf = kmalloc(PAGE_SIZE, GFP_KERNEL);
-       if(new_buf == NULL){
-               printk("hppfs_read_file : kmalloc failed\n");
-               goto out;
-       }
-       n = 0;
-       while(count > 0){
-               cur = min_t(ssize_t, count, PAGE_SIZE);
-               err = os_read_file(fd, new_buf, cur);
-               if(err < 0){
-                       printk("hppfs_read : read failed, errno = %d\n",
-                              count);
-                       n = err;
-                       goto out_free;
-               }
-               else if(err == 0)
-                       break;
-
-               if(copy_to_user(buf, new_buf, err)){
-                       n = -EFAULT;
-                       goto out_free;
-               }
-               n += err;
-               count -= err;
-       }
- out_free:
-       kfree(new_buf);
- out:
-       return(n);
-}
-
-static ssize_t hppfs_read(struct file *file, char *buf, size_t count, 
-                         loff_t *ppos)
-{
-       struct hppfs_private *hppfs = file->private_data;
-       struct hppfs_data *data;
-       loff_t off;
-       int err;
-
-       if(hppfs->contents != NULL){
-               if(*ppos >= hppfs->len) return(0);
-
-               data = hppfs->contents;
-               off = *ppos;
-               while(off >= sizeof(data->contents)){
-                       data = list_entry(data->list.next, struct hppfs_data,
-                                         list);
-                       off -= sizeof(data->contents);
-               }
-
-               if(off + count > hppfs->len)
-                       count = hppfs->len - off;
-               copy_to_user(buf, &data->contents[off], count);
-               *ppos += count;
-       }
-       else if(hppfs->host_fd != -1){
-               err = os_seek_file(hppfs->host_fd, *ppos);
-               if(err){
-                       printk("hppfs_read : seek failed, errno = %d\n", err);
-                       return(err);
-               }
-               count = hppfs_read_file(hppfs->host_fd, buf, count);
-               if(count > 0)
-                       *ppos += count;
-       }
-       else count = read_proc(&hppfs->proc_file, buf, count, ppos, 1);
-
-       return(count);
-}
-
-static ssize_t hppfs_write(struct file *file, const char *buf, size_t len, 
-                          loff_t *ppos)
-{
-       struct hppfs_private *data = file->private_data;
-       struct file *proc_file = &data->proc_file;
-       ssize_t (*write)(struct file *, const char *, size_t, loff_t *);
-       int err;
-
-       write = proc_file->f_dentry->d_inode->i_fop->write;
-
-       proc_file->f_pos = file->f_pos;
-       err = (*write)(proc_file, buf, len, &proc_file->f_pos);
-       file->f_pos = proc_file->f_pos;
-
-       return(err);
-}
-
-static int open_host_sock(char *host_file, int *filter_out)
-{
-       char *end;
-       int fd;
-
-       end = &host_file[strlen(host_file)];
-       strcpy(end, "/rw");
-       *filter_out = 1;
-       fd = os_connect_socket(host_file);
-       if(fd > 0)
-               return(fd);
-
-       strcpy(end, "/r");
-       *filter_out = 0;
-       fd = os_connect_socket(host_file);
-       return(fd);
-}
-
-static void free_contents(struct hppfs_data *head)
-{
-       struct hppfs_data *data;
-       struct list_head *ele, *next;
-
-       if(head == NULL) return;
-
-       list_for_each_safe(ele, next, &head->list){
-               data = list_entry(ele, struct hppfs_data, list);
-               kfree(data);
-       }
-       kfree(head);
-}
-
-static struct hppfs_data *hppfs_get_data(int fd, int filter, 
-                                        struct file *proc_file, 
-                                        struct file *hppfs_file, 
-                                        loff_t *size_out)
-{
-       struct hppfs_data *data, *new, *head;
-       int n, err;
-
-       err = -ENOMEM;
-       data = kmalloc(sizeof(*data), GFP_KERNEL);
-       if(data == NULL){
-               printk("hppfs_get_data : head allocation failed\n");
-               goto failed;
-       }
-
-       INIT_LIST_HEAD(&data->list);
-
-       head = data;
-       *size_out = 0;
-
-       if(filter){
-               while((n = read_proc(proc_file, data->contents,
-                                    sizeof(data->contents), NULL, 0)) > 0)
-                       os_write_file(fd, data->contents, n);
-               err = os_shutdown_socket(fd, 0, 1);
-               if(err){
-                       printk("hppfs_get_data : failed to shut down "
-                              "socket\n");
-                       goto failed_free;
-               }
-       }
-       while(1){
-               n = os_read_file(fd, data->contents, sizeof(data->contents));
-               if(n < 0){
-                       err = n;
-                       printk("hppfs_get_data : read failed, errno = %d\n",
-                              err);
-                       goto failed_free;
-               }
-               else if(n == 0)
-                       break;
-
-               *size_out += n;
-
-               if(n < sizeof(data->contents))
-                       break;
-
-               new = kmalloc(sizeof(*data), GFP_KERNEL);
-               if(new == 0){
-                       printk("hppfs_get_data : data allocation failed\n");
-                       err = -ENOMEM;
-                       goto failed_free;
-               }
-       
-               INIT_LIST_HEAD(&new->list);
-               list_add(&new->list, &data->list);
-               data = new;
-       }
-       return(head);
-
- failed_free:
-       free_contents(head);
- failed:               
-       return(ERR_PTR(err));
-}
-
-static struct hppfs_private *hppfs_data(void)
-{
-       struct hppfs_private *data;
-
-       data = kmalloc(sizeof(*data), GFP_KERNEL);
-       if(data == NULL)
-               return(data);
-
-       *data = ((struct hppfs_private ) { .host_fd             = -1,
-                                          .len                 = -1,
-                                          .contents            = NULL } );
-       return(data);
-}
-
-static int file_mode(int fmode)
-{
-       if(fmode == (FMODE_READ | FMODE_WRITE))
-               return(O_RDWR);
-       if(fmode == FMODE_READ)
-               return(O_RDONLY);
-       if(fmode == FMODE_WRITE)
-               return(O_WRONLY);
-       return(0);
-}
-
-static int hppfs_open(struct inode *inode, struct file *file)
-{
-       struct hppfs_private *data;
-       struct dentry *proc_dentry;
-       char *host_file;
-       int err, fd, type, filter;
-
-       err = -ENOMEM;
-       data = hppfs_data();
-       if(data == NULL)
-               goto out;
-
-       host_file = dentry_name(file->f_dentry, strlen("/rw"));
-       if(host_file == NULL)
-               goto out_free2;
-
-       proc_dentry = HPPFS_I(inode)->proc_dentry;
-
-       /* XXX This isn't closed anywhere */
-       err = open_private_file(&data->proc_file, proc_dentry, 
-                               file_mode(file->f_mode));
-       if(err)
-               goto out_free1;
-
-       type = os_file_type(host_file);
-       if(type == OS_TYPE_FILE){
-               fd = os_open_file(host_file, of_read(OPENFLAGS()), 0);
-               if(fd >= 0) 
-                       data->host_fd = fd;
-               else printk("hppfs_open : failed to open '%s', errno = %d\n",
-                           host_file, -fd);
-
-               data->contents = NULL;
-       }
-       else if(type == OS_TYPE_DIR){
-               fd = open_host_sock(host_file, &filter);
-               if(fd > 0){
-                       data->contents = hppfs_get_data(fd, filter, 
-                                                       &data->proc_file, 
-                                                       file, &data->len);
-                       if(!IS_ERR(data->contents))
-                               data->host_fd = fd;
-               }
-               else printk("hppfs_open : failed to open a socket in "
-                           "'%s', errno = %d\n", host_file, -fd);
-       }
-       kfree(host_file);
-
-       file->private_data = data;
-       return(0);
-
- out_free1:
-       kfree(host_file);
- out_free2:
-       free_contents(data->contents);
-       kfree(data);
- out:
-       return(err);
-}
-
-static int hppfs_dir_open(struct inode *inode, struct file *file)
-{
-       struct hppfs_private *data;
-       struct dentry *proc_dentry;
-       int err;
-
-       err = -ENOMEM;
-       data = hppfs_data();
-       if(data == NULL)
-               goto out;
-
-       proc_dentry = HPPFS_I(inode)->proc_dentry;
-       err = open_private_file(&data->proc_file, proc_dentry, 
-                               file_mode(file->f_mode));
-       if(err)
-               goto out_free;
-
-       file->private_data = data;
-       return(0);
-
- out_free:
-       kfree(data);
- out:
-       return(err);
-}
-
-static loff_t hppfs_llseek(struct file *file, loff_t off, int where)
-{
-       struct hppfs_private *data = file->private_data;
-       struct file *proc_file = &data->proc_file;
-       loff_t (*llseek)(struct file *, loff_t, int);
-       loff_t ret;
-
-       llseek = proc_file->f_dentry->d_inode->i_fop->llseek;
-       if(llseek != NULL){
-               ret = (*llseek)(proc_file, off, where);
-               if(ret < 0)
-                       return(ret);
-       }
-
-       return(default_llseek(file, off, where));
-}
-
-static struct file_operations hppfs_file_fops = {
-       .owner          = NULL,
-       .llseek         = hppfs_llseek,
-       .read           = hppfs_read,
-       .write          = hppfs_write,
-       .open           = hppfs_open,
-};
-
-struct hppfs_dirent {
-       void *vfs_dirent;
-       filldir_t filldir;
-       struct dentry *dentry;
-};
-
-static int hppfs_filldir(void *d, const char *name, int size, 
-                        loff_t offset, ino_t inode, unsigned int type)
-{
-       struct hppfs_dirent *dirent = d;
-
-       if(file_removed(dirent->dentry, name))
-               return(0);
-
-       return((*dirent->filldir)(dirent->vfs_dirent, name, size, offset, 
-                                 inode, type));
-}
-
-static int hppfs_readdir(struct file *file, void *ent, filldir_t filldir)
-{
-       struct hppfs_private *data = file->private_data;
-       struct file *proc_file = &data->proc_file;
-       int (*readdir)(struct file *, void *, filldir_t);
-       struct hppfs_dirent dirent = ((struct hppfs_dirent)
-                                     { .vfs_dirent     = ent,
-                                       .filldir        = filldir,
-                                       .dentry         = file->f_dentry } );
-       int err;
-
-       readdir = proc_file->f_dentry->d_inode->i_fop->readdir;
-
-       proc_file->f_pos = file->f_pos;
-       err = (*readdir)(proc_file, &dirent, hppfs_filldir);
-       file->f_pos = proc_file->f_pos;
-
-       return(err);
-}
-
-static int hppfs_fsync(struct file *file, struct dentry *dentry, int datasync)
-{
-       return(0);
-}
-
-static struct file_operations hppfs_dir_fops = {
-       .owner          = NULL,
-       .readdir        = hppfs_readdir,
-       .open           = hppfs_dir_open,
-       .fsync          = hppfs_fsync,
-};
-
-static int hppfs_statfs(struct super_block *sb, struct kstatfs *sf)
-{
-       sf->f_blocks = 0;
-       sf->f_bfree = 0;
-       sf->f_bavail = 0;
-       sf->f_files = 0;
-       sf->f_ffree = 0;
-       sf->f_type = HPPFS_SUPER_MAGIC;
-       return(0);
-}
-
-static struct inode *hppfs_alloc_inode(struct super_block *sb)
-{
-       struct hppfs_inode_info *hi;
-
-       hi = kmalloc(sizeof(*hi), GFP_KERNEL);
-       if(hi == NULL) 
-               return(NULL);
-
-       *hi = ((struct hppfs_inode_info) { .proc_dentry = NULL });
-       inode_init_once(&hi->vfs_inode);
-       return(&hi->vfs_inode);
-}
-
-void hppfs_delete_inode(struct inode *ino)
-{
-       clear_inode(ino);
-}
-
-static void hppfs_destroy_inode(struct inode *inode)
-{
-       kfree(HPPFS_I(inode));
-}
-
-static struct super_operations hppfs_sbops = { 
-       .alloc_inode    = hppfs_alloc_inode,
-       .destroy_inode  = hppfs_destroy_inode,
-       .read_inode     = hppfs_read_inode,
-       .delete_inode   = hppfs_delete_inode,
-       .statfs         = hppfs_statfs,
-};
-
-static int hppfs_readlink(struct dentry *dentry, char *buffer, int buflen)
-{
-       struct file proc_file;
-       struct dentry *proc_dentry;
-       int (*readlink)(struct dentry *, char *, int);
-       int err, n;
-
-       proc_dentry = HPPFS_I(dentry->d_inode)->proc_dentry;
-       err = open_private_file(&proc_file, proc_dentry, O_RDONLY);
-       if(err) 
-               return(err);
-
-       readlink = proc_dentry->d_inode->i_op->readlink;
-       n = (*readlink)(proc_dentry, buffer, buflen);
-
-       close_private_file(&proc_file);
-       
-       return(n);
-}
-
-static int hppfs_follow_link(struct dentry *dentry, struct nameidata *nd)
-{
-       struct file proc_file;
-       struct dentry *proc_dentry;
-       int (*follow_link)(struct dentry *, struct nameidata *);
-       int err, n;
-
-       proc_dentry = HPPFS_I(dentry->d_inode)->proc_dentry;
-       err = open_private_file(&proc_file, proc_dentry, O_RDONLY);
-       if(err) 
-               return(err);
-
-       follow_link = proc_dentry->d_inode->i_op->follow_link;
-       n = (*follow_link)(proc_dentry, nd);
-
-       close_private_file(&proc_file);
-       
-       return(n);
-}
-
-static struct inode_operations hppfs_dir_iops = {
-       .lookup         = hppfs_lookup,
-};
-
-static struct inode_operations hppfs_link_iops = {
-       .readlink       = hppfs_readlink,
-       .follow_link    = hppfs_follow_link,
-};
-
-static int init_inode(struct inode *inode, struct dentry *dentry)
-{
-       if(S_ISDIR(dentry->d_inode->i_mode)){
-               inode->i_op = &hppfs_dir_iops;
-               inode->i_fop = &hppfs_dir_fops;
-       }
-       else if(S_ISLNK(dentry->d_inode->i_mode)){
-               inode->i_op = &hppfs_link_iops;
-               inode->i_fop = &hppfs_file_fops;
-       }
-       else {
-               inode->i_op = &hppfs_file_iops;
-               inode->i_fop = &hppfs_file_fops;
-       }
-
-       HPPFS_I(inode)->proc_dentry = dentry;
-
-       return(0);
-}
-
-static int hppfs_fill_super(struct super_block *sb, void *d, int silent)
-{
-       struct inode *root_inode;
-       struct file_system_type *procfs;
-       struct super_block *proc_sb;
-       int err;
-
-       err = -ENOENT;
-       procfs = get_fs_type("proc");
-       if(procfs == NULL) 
-               goto out;
-
-       if(list_empty(&procfs->fs_supers))
-               goto out;
-
-       proc_sb = list_entry(procfs->fs_supers.next, struct super_block,
-                            s_instances);
-       
-       sb->s_blocksize = 1024;
-       sb->s_blocksize_bits = 10;
-       sb->s_magic = HPPFS_SUPER_MAGIC;
-       sb->s_op = &hppfs_sbops;
-
-       root_inode = iget(sb, 0);
-       if(root_inode == NULL)
-               goto out;
-
-       err = init_inode(root_inode, proc_sb->s_root);
-       if(err)
-               goto out_put;
-
-       err = -ENOMEM;
-       sb->s_root = d_alloc_root(root_inode);
-       if(sb->s_root == NULL)
-               goto out_put;
-
-       hppfs_read_inode(root_inode);
-
-       return(0);
-
- out_put:
-       iput(root_inode);
- out:
-       return(err);
-}
-
-static struct super_block *hppfs_read_super(struct file_system_type *type,
-                                            int flags, const char *dev_name,
-                                            void *data)
-{
-       return(get_sb_nodev(type, flags, data, hppfs_fill_super));
-}
-
-static struct file_system_type hppfs_type = {
-       .owner          = THIS_MODULE,
-       .name           = "hppfs",
-       .get_sb         = hppfs_read_super,
-       .kill_sb        = kill_anon_super,
-       .fs_flags       = 0,
-};
-
-static int __init init_hppfs(void)
-{
-       return(register_filesystem(&hppfs_type));
-}
-
-static void __exit exit_hppfs(void)
-{
-       unregister_filesystem(&hppfs_type);
-}
-
-module_init(init_hppfs)
-module_exit(exit_hppfs)
-MODULE_LICENSE("GPL");
-
-/*
- * Overrides for Emacs so that we follow Linus's tabbing style.
- * Emacs will notice this stuff at the end of the file and automatically
- * adjust the settings for this buffer only.  This must remain at the end
- * of the file.
- * ---------------------------------------------------------------------------
- * Local variables:
- * c-file-style: "linux"
- * End:
- */
diff --git a/fs/jffs2/compr.h b/fs/jffs2/compr.h
deleted file mode 100644 (file)
index 5e3445d..0000000
+++ /dev/null
@@ -1,122 +0,0 @@
-/*
- * JFFS2 -- Journalling Flash File System, Version 2.
- *
- * Copyright (C) 2004 Ferenc Havasi <havasi@inf.u-szeged.hu>,
- *                    University of Szeged, Hungary
- *
- * For licensing information, see the file 'LICENCE' in the 
- * jffs2 directory.
- *
- * $Id: compr.h,v 1.5 2004/06/23 16:34:39 havasi Exp $
- *
- */
-
-#ifndef __JFFS2_COMPR_H__
-#define __JFFS2_COMPR_H__
-
-#include <linux/kernel.h>
-#include <linux/vmalloc.h>
-#include <linux/list.h>
-#include <linux/types.h>
-#include <linux/string.h>
-#include <linux/slab.h>
-#include <linux/errno.h>
-#include <linux/fs.h>
-#include <linux/jffs2.h>
-#include <linux/jffs2_fs_i.h>
-#include <linux/jffs2_fs_sb.h>
-#include "nodelist.h"
-
-#define JFFS2_RUBINMIPS_PRIORITY 10
-#define JFFS2_DYNRUBIN_PRIORITY  20
-#define JFFS2_LZARI_PRIORITY     30
-#define JFFS2_LZO_PRIORITY       40
-#define JFFS2_RTIME_PRIORITY     50
-#define JFFS2_ZLIB_PRIORITY      60
-
-#define JFFS2_RUBINMIPS_DISABLED /* RUBINs will be used only */
-#define JFFS2_DYNRUBIN_DISABLED  /*        for decompression */
-
-#define JFFS2_COMPR_MODE_NONE       0
-#define JFFS2_COMPR_MODE_PRIORITY   1
-#define JFFS2_COMPR_MODE_SIZE       2
-
-void jffs2_set_compression_mode(int mode);
-int jffs2_get_compression_mode(void);
-
-struct jffs2_compressor {
-        struct list_head list;
-        int priority;              /* used by prirority comr. mode */
-        char *name;
-        char compr;                /* JFFS2_COMPR_XXX */
-        int (*compress)(unsigned char *data_in, unsigned char *cpage_out,
-                        uint32_t *srclen, uint32_t *destlen, void *model);
-        int (*decompress)(unsigned char *cdata_in, unsigned char *data_out,
-                        uint32_t cdatalen, uint32_t datalen, void *model);
-        int usecount;
-        int disabled;              /* if seted the compressor won't compress */
-        unsigned char *compr_buf;  /* used by size compr. mode */
-        uint32_t compr_buf_size;   /* used by size compr. mode */
-        uint32_t stat_compr_orig_size;
-        uint32_t stat_compr_new_size;
-        uint32_t stat_compr_blocks;
-        uint32_t stat_decompr_blocks;
-};
-
-int jffs2_register_compressor(struct jffs2_compressor *comp);
-int jffs2_unregister_compressor(struct jffs2_compressor *comp);
-
-int jffs2_compressors_init(void);
-int jffs2_compressors_exit(void);
-
-uint16_t jffs2_compress(struct jffs2_sb_info *c, struct jffs2_inode_info *f,
-                             unsigned char *data_in, unsigned char **cpage_out,
-                             uint32_t *datalen, uint32_t *cdatalen);
-
-int jffs2_decompress(struct jffs2_sb_info *c, struct jffs2_inode_info *f,
-                     uint16_t comprtype, unsigned char *cdata_in,
-                     unsigned char *data_out, uint32_t cdatalen, uint32_t datalen);
-
-void jffs2_free_comprbuf(unsigned char *comprbuf, unsigned char *orig);
-
-#ifdef CONFIG_JFFS2_PROC
-int jffs2_enable_compressor_name(const char *name);
-int jffs2_disable_compressor_name(const char *name);
-int jffs2_set_compression_mode_name(const char *mode_name);
-char *jffs2_get_compression_mode_name(void);
-int jffs2_set_compressor_priority(const char *mode_name, int priority);
-char *jffs2_list_compressors(void);
-char *jffs2_stats(void);
-#endif
-
-/* Compressor modules */
-/* These functions will be called by jffs2_compressors_init/exit */
-
-#ifdef CONFIG_JFFS2_RUBIN
-int jffs2_rubinmips_init(void);
-void jffs2_rubinmips_exit(void);
-int jffs2_dynrubin_init(void);
-void jffs2_dynrubin_exit(void);
-#endif
-#ifdef CONFIG_JFFS2_RTIME
-int jffs2_rtime_init(void);
-void jffs2_rtime_exit(void);
-#endif
-#ifdef CONFIG_JFFS2_ZLIB
-int jffs2_zlib_init(void);
-void jffs2_zlib_exit(void);
-#endif
-#ifdef CONFIG_JFFS2_LZARI
-int jffs2_lzari_init(void);
-void jffs2_lzari_exit(void);
-#endif
-#ifdef CONFIG_JFFS2_LZO
-int jffs2_lzo_init(void);
-void jffs2_lzo_exit(void);
-#endif
-
-/* Prototypes from proc.c */
-int jffs2_proc_init(void);
-int jffs2_proc_exit(void);
-
-#endif /* __JFFS2_COMPR_H__ */
diff --git a/fs/jffs2/proc.c b/fs/jffs2/proc.c
deleted file mode 100644 (file)
index 36c0a0e..0000000
+++ /dev/null
@@ -1,217 +0,0 @@
-/*
- * JFFS2 -- Journalling Flash File System, Version 2.
- *
- * Copyright (C) 2004 Ferenc Havasi <havasi@inf.u-szeged.hu>,
- *                    University of Szeged, Hungary
- *
- * For licensing information, see the file 'LICENCE' in this directory.
- *
- * $Id: proc.c,v 1.3 2004/06/24 09:51:38 havasi Exp $
- *
- * Files in /proc/fs/jffs2 directory:
- *   compr_list
- *         read:  shows the list of the loaded compressors 
- *                (name, priority, enadbled/disabled)
- *         write: compressors can be enabled/disabled and
- *                the priority of them can be changed,
- *                required formats:
- *                    enable COMPRESSOR_NAME
- *                    disble COMPRESSOR_NAME
- *                    priority NEW_PRIORITY COMPRESSOR_NAME
- *   compr_mode
- *         read:  shows the name of the actual compression mode
- *         write: sets the actual comperession mode
- *   compr_stat
- *         read:  shows compression statistics
- */
-
-#include <linux/errno.h>
-#include <linux/fs.h>
-#include <linux/jffs.h>
-#include <linux/slab.h>
-#include <linux/proc_fs.h>
-#include <linux/sched.h>
-#include <linux/types.h>
-#include <linux/proc_fs.h>
-#include "compr.h"
-
-extern struct proc_dir_entry *jffs_proc_root;
-
-/* Structure for top-level entry in '/proc/fs' directory */
-static struct proc_dir_entry *jffs2_proc_root;
-
-/* Structure for files in /proc/fs/jffs2 directory */
-static struct proc_dir_entry *jffs2_proc_compr_stat;
-static struct proc_dir_entry *jffs2_proc_compr_mode;
-
-/* Read the JFFS2 'compr_stat' file */
-
-static int jffs2_proc_stat_read (char *page, char **start, off_t off,
-               int count, int *eof, void *data)
-{
-       int len = 0,i;
-        char *stat = jffs2_stats();
-        
-        if (strlen(stat)<off) {
-               *eof = 1;
-                kfree(stat);
-               return len;
-        }        
-        for (i=off;((stat[i]!=0)&&(len<count));i++,len++) {
-                page[len]=stat[i];
-        }
-        if (off+len>=strlen(stat)) *eof = 1;
-        else *eof = 0;
-        kfree(stat);
-       return len;
-}
-
-
-/* Read the JFFS2 'compr_mode' file */
-
-static int jffs2_proc_mode_read (char *page, char **start, off_t off,
-               int count, int *eof, void *data)
-{
-       int len = 0;
-        if (strlen(jffs2_get_compression_mode_name())+1>count) {
-                /* it should not happen */
-               *eof = 1;
-                return 0;
-        }
-       len += sprintf(page, "%s\n",jffs2_get_compression_mode_name());
-       *eof = 1;
-       return len;
-}
-
-/* Write the JFFS2 'compr_mode' file
- *   sets the actual compression mode
- */
-
-static int jffs2_proc_mode_write(struct file *file, const char *buffer,
-                           unsigned long count, void *data)
-{
-        char *compr_name;
-
-        /* collect the name of the compression mode and set it */
-        compr_name = kmalloc(count+1,GFP_KERNEL);
-        if (sscanf(buffer,"%s",compr_name)>0) {
-                if (jffs2_set_compression_mode_name(compr_name)) {
-                        printk(KERN_WARNING "JFFS2: error switching compression mode. Invalid parameter (%s)?\n",compr_name);
-                }
-        }
-        else {
-                printk(KERN_WARNING "JFFS2: error: parameter missing\n");
-        }
-        kfree(compr_name);
-        return count;
-}
-
-/* Read the JFFS2 'compr_list' file */
-
-static int jffs2_proc_list_read (char *page, char **start, off_t off,
-               int count, int *eof, void *data)
-{
-       int len = 0;
-        char *list = jffs2_list_compressors();
-        if (strlen(list)+1>count) {
-                /* it should not happen */
-               *eof = 1;
-                kfree(list);
-                return 0;
-        }
-       len += sprintf(page,"%s",list);
-       *eof = 1;
-        kfree(list);
-       return len;
-}
-
-/* Write the JFFS2 'compr_list' file 
- *   enable/disable a compressor or set the priority of it
- */
-
-static int jffs2_proc_list_write(struct file *file, const char *buffer,
-                           unsigned long count, void *data)
-{
-        int prior;
-        char *compr_name,*compr_cmd;
-
-        compr_name = kmalloc(count+1,GFP_KERNEL);
-        compr_cmd = kmalloc(count+1,GFP_KERNEL);
-        if (!compr_name) {
-                printk(KERN_WARNING "JFFS2: unable to allocate memory\n");
-                goto list_write_end;
-        }
-        compr_name[0] = 0;
-
-        if (sscanf(buffer,"priority %d %s",&prior,compr_name)>1) {
-                jffs2_set_compressor_priority(compr_name, prior);
-                goto list_write_end;
-        }
-        if (sscanf(buffer,"enable %s",compr_name)>0) {
-                jffs2_enable_compressor_name(compr_name);
-                goto list_write_end;
-        }
-        if (sscanf(buffer,"disable %s",compr_name)>0) {
-                jffs2_disable_compressor_name(compr_name);
-                goto list_write_end;
-        }
-        printk(KERN_WARNING "JFFS2: usage of /proc/fs/jffs2/compr_list:\n"
-               "  echo \"enable COMPRESSOR_NAME\"  >/proc/fs/jffs2/compr_list\n"
-               "  echo \"disable COMPRESSOR_NAME\" >/proc/fs/jffs2/compr_list\n"
-               "  echo \"priority NEW_PRIORITY COMPRESSOR_NAME\" >/proc/fs/jffs2/compr_list\n");
-list_write_end:
-        kfree(compr_cmd);
-        kfree(compr_name);
-       return count;
-}
-
-/* Register a JFFS2 proc directory */
-
-int jffs2_proc_init(void)
-{
-       jffs2_proc_root = proc_mkdir("jffs2", proc_root_fs);
-
-       /* create entry for 'compr_stat' file */
-       if ((jffs2_proc_compr_stat = create_proc_entry ("compr_stat", 0, jffs2_proc_root))) {
-               jffs2_proc_compr_stat->read_proc = jffs2_proc_stat_read;
-       }
-       else {
-               return -ENOMEM;
-       }
-       /* create entry for 'compr_mode' file */
-       if ((jffs2_proc_compr_mode = create_proc_entry ("compr_mode", 0, jffs2_proc_root))) {
-               jffs2_proc_compr_mode->read_proc  = jffs2_proc_mode_read;
-               jffs2_proc_compr_mode->write_proc = jffs2_proc_mode_write;
-       }
-       else {
-               return -ENOMEM;
-       }
-       /* create entry for 'compr_list' file */
-       if ((jffs2_proc_compr_mode = create_proc_entry ("compr_list", 0, jffs2_proc_root))) {
-               jffs2_proc_compr_mode->read_proc  = jffs2_proc_list_read;
-               jffs2_proc_compr_mode->write_proc = jffs2_proc_list_write;
-       }
-       else {
-               return -ENOMEM;
-       }
-       return 0;
-}
-
-
-/* Unregister a JFFS2 proc directory */
-
-int jffs2_proc_exit(void)
-{
-#if LINUX_VERSION_CODE < 0x020300
-       remove_proc_entry ("compr_stat", &jffs2_proc_root);
-       remove_proc_entry ("compr_mode", &jffs2_proc_root);
-       remove_proc_entry ("compr_list", &jffs2_proc_root);
-       remove_proc_entry ("jffs2", &proc_root_fs);
-#else
-       remove_proc_entry ("compr_stat", jffs2_proc_root);
-       remove_proc_entry ("compr_mode", jffs2_proc_root);
-       remove_proc_entry ("compr_list", jffs2_proc_root);
-       remove_proc_entry ("jffs2", proc_root_fs);
-#endif
-        return 0;
-}
diff --git a/fs/partitions/nec98.c b/fs/partitions/nec98.c
deleted file mode 100644 (file)
index 08c72ae..0000000
+++ /dev/null
@@ -1,188 +0,0 @@
-/*
- *  NEC PC-9800 series partition supports
- *
- *  Copyright (C) 1999 Kyoto University Microcomputer Club
- */
-
-#include <linux/config.h>
-#include <linux/fs.h>
-#include <linux/genhd.h>
-#include <linux/kernel.h>
-#include <linux/hdreg.h>
-
-#include "check.h"
-#include "nec98.h"
-
-struct nec98_partition {
-       __u8    mid;            /* 0x80 - active */
-       __u8    sid;            /* 0x80 - bootable */
-       __u16   pad1;           /* dummy for padding */
-       __u8    ipl_sector;     /* IPL sector   */
-       __u8    ipl_head;       /* IPL head     */
-       __u16   ipl_cyl;        /* IPL cylinder */
-       __u8    sector;         /* starting sector      */
-       __u8    head;           /* starting head        */
-       __u16   cyl;            /* starting cylinder    */
-       __u8    end_sector;     /* end sector   */
-       __u8    end_head;       /* end head     */
-       __u16   end_cyl;        /* end cylinder */
-       unsigned char name[16];
-} __attribute__((__packed__));
-
-#define NEC98_BSD_PARTITION_MID 0x14
-#define NEC98_BSD_PARTITION_SID 0x44
-#define MID_SID_16(mid, sid)   (((mid) & 0xFF) | (((sid) & 0xFF) << 8))
-#define NEC98_BSD_PARTITION_MID_SID    \
-       MID_SID_16(NEC98_BSD_PARTITION_MID, NEC98_BSD_PARTITION_SID)
-#define NEC98_VALID_PTABLE_ENTRY(P) \
-       (!(P)->pad1 && (P)->cyl <= (P)->end_cyl)
-
-extern int pc98_bios_param(struct block_device *bdev, int *ip);
-
-static inline int
-is_valid_nec98_partition_table(const struct nec98_partition *ptable,
-                               __u8 nsectors, __u8 nheads)
-{
-       int i;
-       int valid = 0;
-
-       for (i = 0; i < 16; i++) {
-               if (!*(__u16 *)&ptable[i])
-                       continue;       /* empty slot */
-               if (ptable[i].pad1      /* `pad1' contains junk */
-                   || ptable[i].ipl_sector     >= nsectors
-                   || ptable[i].sector         >= nsectors
-                   || ptable[i].end_sector     >= nsectors
-                   || ptable[i].ipl_head       >= nheads
-                   || ptable[i].head           >= nheads
-                   || ptable[i].end_head       >= nheads
-                   || ptable[i].cyl > ptable[i].end_cyl)
-                       return 0;
-               valid = 1;      /* We have a valid partition.  */
-       }
-       /* If no valid PC-9800-style partitions found,
-          the disk may have other type of partition table.  */
-       return valid;
-}
-
-int nec98_partition(struct parsed_partitions *state, struct block_device *bdev)
-{
-       unsigned int nr;
-       struct hd_geometry geo;
-       Sector sect;
-       const struct nec98_partition *part;
-       unsigned char *data;
-       int sector_size = bdev_hardsect_size(bdev);
-
-       if (ioctl_by_bdev(bdev, HDIO_GETGEO, (unsigned long)&geo) != 0) {
-               printk(" unsupported disk (%s)\n", bdev->bd_disk->disk_name);
-               return 0;
-       }
-
-#ifdef NEC98_PARTITION_DEBUG
-       printk("ioctl_by_bdev head=%d sect=%d\n", geo.heads, geo.sectors);
-#endif
-       data = read_dev_sector(bdev, 0, &sect);
-       if (!data) {
-               if (warn_no_part)
-                       printk(" unable to read partition table\n");
-               return -1;
-       }
-
-       /* magic(?) check */
-       if (*(__u16 *)(data + sector_size - 2) != NEC98_PTABLE_MAGIC) {
-               put_dev_sector(sect);
-               return 0;
-       }
-
-       put_dev_sector(sect);
-       data = read_dev_sector(bdev, 1, &sect);
-       if (!data) {
-               if (warn_no_part)
-                       printk(" unable to read partition table\n");
-               return -1;
-       }
-
-       if (!is_valid_nec98_partition_table((struct nec98_partition *)data,
-                                            geo.sectors, geo.heads)) {
-#ifdef NEC98_PARTITION_DEBUG
-               if (warn_no_part)
-                       printk(" partition table consistency check failed"
-                               " (not PC-9800 disk?)\n");
-#endif
-               put_dev_sector(sect);
-               return 0;
-       }
-
-       part = (const struct nec98_partition *)data;
-       for (nr = 0; nr < 16; nr++, part++) {
-               unsigned int start_sect, end_sect;
-
-               if (part->mid == 0 || part->sid == 0)
-                       continue;
-
-               if (nr)
-                       printk("     ");
-
-               {       /* Print partition name. Fdisk98 might put NUL
-                          characters in partition name... */
-
-                       int j;
-                       unsigned char *p;
-                       unsigned char buf[sizeof (part->name) * 2 + 1];
-
-                       for (p = buf, j = 0; j < sizeof (part->name); j++, p++)
-                               if ((*p = part->name[j]) < ' ') {
-                                       *p++ = '^';
-                                       *p = part->name[j] + '@';
-                               }
-
-                       *p = 0;
-                       printk(" <%s>", buf);
-               }
-               start_sect = (part->cyl * geo.heads + part->head) * geo.sectors
-                       + part->sector;
-               end_sect = (part->end_cyl + 1) * geo.heads * geo.sectors;
-               if (end_sect <= start_sect) {
-                       printk(" (invalid partition info)\n");
-                       continue;
-               }
-
-               put_partition(state, nr + 1, start_sect, end_sect - start_sect);
-#ifdef CONFIG_BSD_DISKLABEL
-               if ((*(__u16 *)&part->mid & 0x7F7F)
-                   == NEC98_BSD_PARTITION_MID_SID) {
-                       printk("!");
-                       /* NEC98_BSD_PARTITION_MID_SID is not valid SYSIND for
-                          IBM PC's MS-DOS partition table, so we simply pass
-                          it to bsd_disklabel_partition;
-                          it will just print `<bsd: ... >'. */
-                       parse_bsd(state, bdev, start_sect,
-                                       end_sect - start_sect, nr + 1,
-                                       "bsd98", BSD_MAXPARTITIONS);
-               }
-#endif
-               {       /* Pretty size printing. */
-                       /* XXX sector size? */
-                       unsigned int psize = (end_sect - start_sect) / 2;
-                       int unit_char = 'K';
-
-                       if (psize > 99999) {
-                               psize >>= 10;
-                               unit_char = 'M';
-                       }
-                       printk(" %5d%cB (%5d-%5d)\n", 
-                              psize, unit_char, part->cyl, part->end_cyl);
-               }
-       }
-
-       put_dev_sector(sect);
-
-       return nr ? 1 : 0;
-}
-\f
-/*
- * Local variables:
- * c-basic-offset: 8
- * End:
- */
diff --git a/fs/partitions/nec98.h b/fs/partitions/nec98.h
deleted file mode 100644 (file)
index 5ae2da0..0000000
+++ /dev/null
@@ -1,10 +0,0 @@
-/*
- *  NEC PC-9800 series partition supports
- *
- *  Copyright (C) 1998-2000    Kyoto University Microcomputer Club
- */
-
-#define NEC98_PTABLE_MAGIC     0xAA55
-
-extern int nec98_partition(struct parsed_partitions *state,
-                               struct block_device *bdev);
diff --git a/include/asm-alpha/cpumask.h b/include/asm-alpha/cpumask.h
deleted file mode 100644 (file)
index bc3381a..0000000
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef _ASM_ALPHA_CPUMASK_H
-#define _ASM_ALPHA_CPUMASK_H
-
-#include <asm-generic/cpumask.h>
-
-#endif /* _ASM_ALPHA_CPUMASK_H */
diff --git a/include/asm-alpha/init.h b/include/asm-alpha/init.h
deleted file mode 100644 (file)
index 17d2155..0000000
+++ /dev/null
@@ -1 +0,0 @@
-#error "<asm/init.h> should never be used - use <linux/init.h> instead"
diff --git a/include/asm-arm/arch-adifcc/adi_evb.h b/include/asm-arm/arch-adifcc/adi_evb.h
deleted file mode 100644 (file)
index f4b74c6..0000000
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
- * linux/include/asm/arch-80200fcc/adi_evb.h
- *
- * ADI 80200FCC evaluation board definitions
- *
- * Author: Deepak Saxena <dsaxena@mvista.com>
- *
- * Copyright (C) 2001 MontaVista Software 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.
- */
-
-#define ADI_EVB__RAMBASE       0xa0000000
-#define ADI_EVB__UART          0x00400000    /* UART */
-#define ADI_EVB_7SEG_1         0x00500000    /* 7-Segment */
-
diff --git a/include/asm-arm/arch-adifcc/dma.h b/include/asm-arm/arch-adifcc/dma.h
deleted file mode 100644 (file)
index 19aa1db..0000000
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * linux/include/asm-arm/arch-80200fcc/dma.h
- *
- * Copyright (C) 2001 MontaVista Software, Inc.
- *
- * 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.
- */
-#ifndef __ASM_ARCH_DMA_H
-#define __ASM_ARCH_DMA_H
-
-#define MAX_DMA_ADDRESS                0xffffffff
-
-/* No DMA */
-#define MAX_DMA_CHANNELS       0
-
-#endif /* _ASM_ARCH_DMA_H */
diff --git a/include/asm-arm/arch-adifcc/hardware.h b/include/asm-arm/arch-adifcc/hardware.h
deleted file mode 100644 (file)
index 9eeb3cb..0000000
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * linux/include/asm-arm/arch-adifcc/hardware.h
- *
- * Hardware definitions for ADI based systems
- *
- * Author: Deepak Saxena <dsaxena@mvista.com>
- *
- * Copyright (C) 2000-2001 MontaVista Software 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.
- */
-
-#ifndef __ASM_ARCH_HARDWARE_H
-#define __ASM_ARCH_HARDWARE_H
-
-#include <linux/config.h>
-
-#define PCIO_BASE      0
-
-#if defined(CONFIG_ARCH_ADI_EVB)
-#include "adi_evb.h"
-#endif
-
-#endif  /* _ASM_ARCH_HARDWARE_H */
diff --git a/include/asm-arm/arch-adifcc/io.h b/include/asm-arm/arch-adifcc/io.h
deleted file mode 100644 (file)
index bdcaec0..0000000
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * linux/include/asm-arm/arch-adifcc/io.h
- *
- * Author: Deepak Saxena <dsaxena@mvista.com>
- *
- * Copyright (C) 2001  MontaVista Software, Inc.
- *
- * 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.
- */
-
-#ifndef __ASM_ARM_ARCH_IO_H
-#define __ASM_ARM_ARCH_IO_H
-
-#define IO_SPACE_LIMIT 0xffffffff
-
-#define __io(a)                        (PCIO_BASE + (a))
-#define __mem_pci(a)           ((unsigned long)(a))
-#define __mem_isa(a)           ((unsigned long)(a))
-
-#endif
diff --git a/include/asm-arm/arch-adifcc/irqs.h b/include/asm-arm/arch-adifcc/irqs.h
deleted file mode 100644 (file)
index b559ca7..0000000
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * linux/include/asm-arm/arch-80200fcc/irqs.h
- *
- * Author:     Deepak Saxena <dsaxena@mvista.com>
- * Copyright:  (C) 2001 MontaVista Software Inc.
- *
- * 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.
- */
-
-#define IRQ_XS80200_BCU                0       /* Bus Control Unit */
-#define IRQ_XS80200_PMU                1       /* Performance Monitoring Unit */
-#define IRQ_XS80200_EXTIRQ     2       /* external IRQ signal */
-#define IRQ_XS80200_EXTFIQ     3       /* external IRQ signal */
-
-#define NR_XS80200_IRQS                4
-#define NR_IRQS                        NR_XS80200_IRQS
-
-#define        IRQ_XSCALE_PMU          IRQ_XS80200_PMU
diff --git a/include/asm-arm/arch-adifcc/memory.h b/include/asm-arm/arch-adifcc/memory.h
deleted file mode 100644 (file)
index b76187d..0000000
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * linux/include/asm-arm/arch-adifcc/memory.h
- *
- * Copyright (c) 2001 MontaVista Software, Inc.
- */
-
-#ifndef __ASM_ARCH_MEMORY_H
-#define __ASM_ARCH_MEMORY_H
-
-/*
- * Physical DRAM offset.
- */
-#define PHYS_OFFSET    (0xC0000000UL)
-
-/*
- * Virtual view <-> DMA view memory address translations
- * virt_to_bus: Used to translate the virtual address to an
- *             address suitable to be passed to set_dma_addr
- * bus_to_virt: Used to convert an address for DMA operations
- *             to an address that the kernel can use.
- *
- * These are dummies for now.
- */
-#define __virt_to_bus(x)        __virt_to_phys(x)
-#define __bus_to_virt(x)        __phys_to_virt(x)
-
-#endif
diff --git a/include/asm-arm/arch-adifcc/param.h b/include/asm-arm/arch-adifcc/param.h
deleted file mode 100644 (file)
index b1a410e..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-/*
- *  linux/include/asm-arm/arch-adifcc/param.h
- */
diff --git a/include/asm-arm/arch-adifcc/serial.h b/include/asm-arm/arch-adifcc/serial.h
deleted file mode 100644 (file)
index ce4e876..0000000
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * include/asm-arm/arch-adifcc/serial.h
- *
- * Author: Deepak Saxena <dsaxena@mvista.com>
- *
- * Copyright (c) 2001 MontaVista Software, Inc.
- */
-#include <linux/config.h>
-
-/*
- * This assumes you have a 1.8432 MHz clock for your UART.
- *
- * It'd be nice if someone built a serial card with a 24.576 MHz
- * clock, since the 16550A is capable of handling a top speed of 1.5
- * megabits/second; but this requires the faster clock.
- */
-#define BASE_BAUD ( 1852000 / 16 )
-
-/* Standard COM flags */
-#define STD_COM_FLAGS (ASYNC_BOOT_AUTOCONF | ASYNC_SKIP_TEST)
-
-#ifdef CONFIG_ARCH_ADI_EVB
-
-/*
- * One serial port, int goes to FIQ, so we run in polled mode
- */
-#define STD_SERIAL_PORT_DEFNS                  \
-       /* UART CLK      PORT        IRQ        FLAGS        */                 \
-       { 0, BASE_BAUD, 0xff400000, 0,  STD_COM_FLAGS }  /* ttyS0 */
-
-#define EXTRA_SERIAL_PORT_DEFNS
-
-#endif
-
diff --git a/include/asm-arm/arch-adifcc/system.h b/include/asm-arm/arch-adifcc/system.h
deleted file mode 100644 (file)
index 4bffbdc..0000000
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * linux/include/asm-arm/arch-adifcc/system.h
- *
- * Copyright (C) 2001 MontaVista Software, Inc.
- *
- * 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.
- */
-
-static inline void arch_idle(void)
-{
-#if 0
-       cpu_do_idle();
-#endif
-}
-
-
-static inline void arch_reset(char mode)
-{
-       if ( 1 && mode == 's') {
-               /* Jump into ROM at address 0 */
-               cpu_reset(0);
-       } else {
-               /* Use on-chip reset capability */
-       }
-}
-
diff --git a/include/asm-arm/arch-adifcc/time.h b/include/asm-arm/arch-adifcc/time.h
deleted file mode 100644 (file)
index 2237ef0..0000000
+++ /dev/null
@@ -1,9 +0,0 @@
-/*
- * linux/include/asm-arm/arch-adifcc/time.h
- *
- */
-
-/*
- * No on board timer, implementation @ arch/arm/kernel/xscale-time.c
- */
-
diff --git a/include/asm-arm/arch-adifcc/timex.h b/include/asm-arm/arch-adifcc/timex.h
deleted file mode 100644 (file)
index d994c8a..0000000
+++ /dev/null
@@ -1,10 +0,0 @@
-/*
- * linux/include/asm-arm/arch-adifcc/timex.h
- *
- * XScale architecture timex specifications
- */
-
-/* This is for a timer based on the XS80200's PMU counter */
-
-#define CLOCK_TICK_RATE 600000000 /* Underlying HZ */
-
diff --git a/include/asm-arm/arch-adifcc/uncompress.h b/include/asm-arm/arch-adifcc/uncompress.h
deleted file mode 100644 (file)
index 792b4e1..0000000
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * linux/include/asm-arm/arch-adifcc/uncompress.h
- *
- * Author: Deepak Saxena <dsaxena@mvista.com>
- *
- * Copyright (c) 2001 MontaVista Software, Inc.
- *
- */
-
-#define UART_BASE    ((volatile unsigned char *)0x00400000)
-
-static __inline__ void putc(char c)
-{
-       while ((UART_BASE[5] & 0x60) != 0x60);
-       UART_BASE[0] = c;
-}
-
-/*
- * This does not append a newline
- */
-static void puts(const char *s)
-{
-       while (*s) {
-               putc(*s);
-               if (*s == '\n')
-                       putc('\r');
-               s++;
-       }
-}
-
-/*
- * nothing to do
- */
-#define arch_decomp_setup()
-#define arch_decomp_wdog()
diff --git a/include/asm-arm/arch-adifcc/vmalloc.h b/include/asm-arm/arch-adifcc/vmalloc.h
deleted file mode 100644 (file)
index d45b27e..0000000
+++ /dev/null
@@ -1,15 +0,0 @@
-/*
- * linux/include/asm-arm/arch-adifcc/vmalloc.h
- */
-
-/*
- * Just any arbitrary offset to the start of the vmalloc VM area: the
- * current 8MB value just means that there will be a 8MB "hole" after the
- * physical memory until the kernel virtual memory starts.  That means that
- * any out-of-bounds memory accesses will hopefully be caught.
- * The vmalloc() routines leaves a hole of 4kB between each vmalloced
- * area for the same reason. ;)
- */
-#define VMALLOC_OFFSET   (8*1024*1024)
-#define VMALLOC_START    (((unsigned long)high_memory + VMALLOC_OFFSET) & ~(VMALLOC_OFFSET-1))
-#define VMALLOC_END       (0xe8000000)
diff --git a/include/asm-arm/arch-cl7500/time.h b/include/asm-arm/arch-cl7500/time.h
deleted file mode 100644 (file)
index e5e5be5..0000000
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * linux/include/asm-arm/arch-cl7500/time.h
- *
- * Copyright (c) 1996-2000 Russell King.
- *
- * Changelog:
- *  24-Sep-1996        RMK     Created
- *  10-Oct-1996        RMK     Brought up to date with arch-sa110eval
- *  04-Dec-1997        RMK     Updated for new arch/arm/time.c
- */
-
-extern void ioctime_init(void);
-
-static irqreturn_t
-timer_interrupt(int irq, void *dev_id, struct pt_regs *regs)
-{
-       do_timer(regs);
-       do_set_rtc();
-       do_profile(regs);
-
-       {
-               /* Twinkle the lights. */
-               static int count, state = 0xff00;
-               if (count-- == 0) {
-                       state ^= 0x100;
-                       count = 25;
-                       *((volatile unsigned int *)LED_ADDRESS) = state;
-               }
-       }
-       return IRQ_HANDLED;
-}
-
-/*
- * Set up timer interrupt.
- */
-void __init time_init(void)
-{
-       ioctime_init();
-
-       timer_irq.handler = timer_interrupt;
-
-       setup_irq(IRQ_TIMER, &timer_irq);
-}
diff --git a/include/asm-arm/arch-ebsa110/time.h b/include/asm-arm/arch-ebsa110/time.h
deleted file mode 100644 (file)
index c482e37..0000000
+++ /dev/null
@@ -1,118 +0,0 @@
-/*
- *  linux/include/asm-arm/arch-ebsa110/time.h
- *
- *  Copyright (C) 1996,1997,1998 Russell King.
- *
- * 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.
- *
- * No real time clock on the evalulation board!
- *
- * Changelog:
- *  10-Oct-1996        RMK     Created
- *  04-Dec-1997        RMK     Updated for new arch/arm/kernel/time.c
- *  07-Aug-1998        RMK     Updated for arch/arm/kernel/leds.c
- *  28-Dec-1998        APH     Made leds code optional
- */
-
-#include <asm/leds.h>
-#include <asm/io.h>
-
-extern unsigned long (*gettimeoffset)(void);
-
-#define PIT_CTRL               (PIT_BASE + 0x0d)
-#define PIT_T2                 (PIT_BASE + 0x09)
-#define PIT_T1                 (PIT_BASE + 0x05)
-#define PIT_T0                 (PIT_BASE + 0x01)
-
-/*
- * This is the rate at which your MCLK signal toggles (in Hz)
- * This was measured on a 10 digit frequency counter sampling
- * over 1 second.
- */
-#define MCLK   47894000
-
-/*
- * This is the rate at which the PIT timers get clocked
- */
-#define CLKBY7 (MCLK / 7)
-
-/*
- * This is the counter value.  We tick at 200Hz on this platform.
- */
-#define COUNT  ((CLKBY7 + (HZ / 2)) / HZ)
-
-/*
- * Get the time offset from the system PIT.  Note that if we have missed an
- * interrupt, then the PIT counter will roll over (ie, be negative).
- * This actually works out to be convenient.
- */
-static unsigned long ebsa110_gettimeoffset(void)
-{
-       unsigned long offset, count;
-
-       __raw_writeb(0x40, PIT_CTRL);
-       count = __raw_readb(PIT_T1);
-       count |= __raw_readb(PIT_T1) << 8;
-
-       /*
-        * If count > COUNT, make the number negative.
-        */
-       if (count > COUNT)
-               count |= 0xffff0000;
-
-       offset = COUNT;
-       offset -= count;
-
-       /*
-        * `offset' is in units of timer counts.  Convert
-        * offset to units of microseconds.
-        */
-       offset = offset * (1000000 / HZ) / COUNT;
-
-       return offset;
-}
-
-static irqreturn_t
-timer_interrupt(int irq, void *dev_id, struct pt_regs *regs)
-{
-       u32 count;
-
-       /* latch and read timer 1 */
-       __raw_writeb(0x40, PIT_CTRL);
-       count = __raw_readb(PIT_T1);
-       count |= __raw_readb(PIT_T1) << 8;
-
-       count += COUNT;
-
-       __raw_writeb(count & 0xff, PIT_T1);
-       __raw_writeb(count >> 8, PIT_T1);
-
-       do_leds();
-       do_timer(regs);
-       do_profile(regs);
-
-       return IRQ_HANDLED;
-}
-
-/*
- * Set up timer interrupt.
- */
-void __init time_init(void)
-{
-       /*
-        * Timer 1, mode 2, LSB/MSB
-        */
-       __raw_writeb(0x70, PIT_CTRL);
-       __raw_writeb(COUNT & 0xff, PIT_T1);
-       __raw_writeb(COUNT >> 8, PIT_T1);
-
-       gettimeoffset = ebsa110_gettimeoffset;
-
-       timer_irq.handler = timer_interrupt;
-
-       setup_irq(IRQ_EBSA110_TIMER0, &timer_irq);
-}
-
-
diff --git a/include/asm-arm/arch-ebsa285/time.h b/include/asm-arm/arch-ebsa285/time.h
deleted file mode 100644 (file)
index f651eeb..0000000
+++ /dev/null
@@ -1,287 +0,0 @@
-/*
- *  linux/include/asm-arm/arch-ebsa285/time.h
- *
- *  Copyright (C) 1998 Russell King.
- *  Copyright (C) 1998 Phil Blundell
- *
- * CATS has a real-time clock, though the evaluation board doesn't.
- *
- * Changelog:
- *  21-Mar-1998        RMK     Created
- *  27-Aug-1998        PJB     CATS support
- *  28-Dec-1998        APH     Made leds optional
- *  20-Jan-1999        RMK     Started merge of EBSA285, CATS and NetWinder
- *  16-Mar-1999        RMK     More support for EBSA285-like machines with RTCs in
- */
-
-#define RTC_PORT(x)            (rtc_base+(x))
-#define RTC_ALWAYS_BCD         0
-
-#include <linux/mc146818rtc.h>
-#include <linux/bcd.h>
-
-#include <asm/hardware/dec21285.h>
-#include <asm/leds.h>
-#include <asm/mach-types.h>
-
-static int rtc_base;
-
-#define mSEC_10_from_14 ((14318180 + 100) / 200)
-
-static unsigned long isa_gettimeoffset(void)
-{
-       int count;
-
-       static int count_p = (mSEC_10_from_14/6);    /* for the first call after boot */
-       static unsigned long jiffies_p = 0;
-
-       /*
-        * cache volatile jiffies temporarily; we have IRQs turned off. 
-        */
-       unsigned long jiffies_t;
-
-       /* timer count may underflow right here */
-       outb_p(0x00, 0x43);     /* latch the count ASAP */
-
-       count = inb_p(0x40);    /* read the latched count */
-
-       /*
-        * We do this guaranteed double memory access instead of a _p 
-        * postfix in the previous port access. Wheee, hackady hack
-        */
-       jiffies_t = jiffies;
-
-       count |= inb_p(0x40) << 8;
-
-       /* Detect timer underflows.  If we haven't had a timer tick since 
-          the last time we were called, and time is apparently going
-          backwards, the counter must have wrapped during this routine. */
-       if ((jiffies_t == jiffies_p) && (count > count_p))
-               count -= (mSEC_10_from_14/6);
-       else
-               jiffies_p = jiffies_t;
-
-       count_p = count;
-
-       count = (((mSEC_10_from_14/6)-1) - count) * (tick_nsec / 1000);
-       count = (count + (mSEC_10_from_14/6)/2) / (mSEC_10_from_14/6);
-
-       return count;
-}
-
-static irqreturn_t
-isa_timer_interrupt(int irq, void *dev_id, struct pt_regs *regs)
-{
-       if (machine_is_netwinder())
-               do_leds();
-
-       do_timer(regs);
-       do_set_rtc();
-       do_profile(regs);
-
-       return IRQ_HANDLED;
-}
-
-static unsigned long __init get_isa_cmos_time(void)
-{
-       unsigned int year, mon, day, hour, min, sec;
-       int i;
-
-       // check to see if the RTC makes sense.....
-       if ((CMOS_READ(RTC_VALID) & RTC_VRT) == 0)
-               return mktime(1970, 1, 1, 0, 0, 0);
-
-       /* The Linux interpretation of the CMOS clock register contents:
-        * When the Update-In-Progress (UIP) flag goes from 1 to 0, the
-        * RTC registers show the second which has precisely just started.
-        * Let's hope other operating systems interpret the RTC the same way.
-        */
-       /* read RTC exactly on falling edge of update flag */
-       for (i = 0 ; i < 1000000 ; i++) /* may take up to 1 second... */
-               if (CMOS_READ(RTC_FREQ_SELECT) & RTC_UIP)
-                       break;
-
-       for (i = 0 ; i < 1000000 ; i++) /* must try at least 2.228 ms */
-               if (!(CMOS_READ(RTC_FREQ_SELECT) & RTC_UIP))
-                       break;
-
-       do { /* Isn't this overkill ? UIP above should guarantee consistency */
-               sec  = CMOS_READ(RTC_SECONDS);
-               min  = CMOS_READ(RTC_MINUTES);
-               hour = CMOS_READ(RTC_HOURS);
-               day  = CMOS_READ(RTC_DAY_OF_MONTH);
-               mon  = CMOS_READ(RTC_MONTH);
-               year = CMOS_READ(RTC_YEAR);
-       } while (sec != CMOS_READ(RTC_SECONDS));
-
-       if (!(CMOS_READ(RTC_CONTROL) & RTC_DM_BINARY) || RTC_ALWAYS_BCD) {
-               BCD_TO_BIN(sec);
-               BCD_TO_BIN(min);
-               BCD_TO_BIN(hour);
-               BCD_TO_BIN(day);
-               BCD_TO_BIN(mon);
-               BCD_TO_BIN(year);
-       }
-       if ((year += 1900) < 1970)
-               year += 100;
-       return mktime(year, mon, day, hour, min, sec);
-}
-
-static int
-set_isa_cmos_time(void)
-{
-       int retval = 0;
-       int real_seconds, real_minutes, cmos_minutes;
-       unsigned char save_control, save_freq_select;
-       unsigned long nowtime = xtime.tv_sec;
-
-       save_control = CMOS_READ(RTC_CONTROL); /* tell the clock it's being set */
-       CMOS_WRITE((save_control|RTC_SET), RTC_CONTROL);
-
-       save_freq_select = CMOS_READ(RTC_FREQ_SELECT); /* stop and reset prescaler */
-       CMOS_WRITE((save_freq_select|RTC_DIV_RESET2), RTC_FREQ_SELECT);
-
-       cmos_minutes = CMOS_READ(RTC_MINUTES);
-       if (!(save_control & RTC_DM_BINARY) || RTC_ALWAYS_BCD)
-               BCD_TO_BIN(cmos_minutes);
-
-       /*
-        * since we're only adjusting minutes and seconds,
-        * don't interfere with hour overflow. This avoids
-        * messing with unknown time zones but requires your
-        * RTC not to be off by more than 15 minutes
-        */
-       real_seconds = nowtime % 60;
-       real_minutes = nowtime / 60;
-       if (((abs(real_minutes - cmos_minutes) + 15)/30) & 1)
-               real_minutes += 30;             /* correct for half hour time zone */
-       real_minutes %= 60;
-
-       if (abs(real_minutes - cmos_minutes) < 30) {
-               if (!(save_control & RTC_DM_BINARY) || RTC_ALWAYS_BCD) {
-                       BIN_TO_BCD(real_seconds);
-                       BIN_TO_BCD(real_minutes);
-               }
-               CMOS_WRITE(real_seconds,RTC_SECONDS);
-               CMOS_WRITE(real_minutes,RTC_MINUTES);
-       } else
-               retval = -1;
-
-       /* The following flags have to be released exactly in this order,
-        * otherwise the DS12887 (popular MC146818A clone with integrated
-        * battery and quartz) will not reset the oscillator and will not
-        * update precisely 500 ms later. You won't find this mentioned in
-        * the Dallas Semiconductor data sheets, but who believes data
-        * sheets anyway ...                           -- Markus Kuhn
-        */
-       CMOS_WRITE(save_control, RTC_CONTROL);
-       CMOS_WRITE(save_freq_select, RTC_FREQ_SELECT);
-
-       return retval;
-}
-
-
-static unsigned long timer1_latch;
-
-static unsigned long timer1_gettimeoffset (void)
-{
-       unsigned long value = timer1_latch - *CSR_TIMER1_VALUE;
-
-       return ((tick_nsec / 1000) * value) / timer1_latch;
-}
-
-static irqreturn_t
-timer1_interrupt(int irq, void *dev_id, struct pt_regs *regs)
-{
-       *CSR_TIMER1_CLR = 0;
-
-       /* Do the LEDs things */
-       do_leds();
-       do_timer(regs);
-       do_set_rtc();
-       do_profile(regs);
-
-       return IRQ_HANDLED;
-}
-
-/*
- * Set up timer interrupt.
- */
-void __init time_init(void)
-{
-       int irq;
-
-       if (machine_is_co285() ||
-           machine_is_personal_server())
-               /*
-                * Add-in 21285s shouldn't access the RTC
-                */
-               rtc_base = 0;
-       else
-               rtc_base = 0x70;
-
-       if (rtc_base) {
-               int reg_d, reg_b;
-
-               /*
-                * Probe for the RTC.
-                */
-               reg_d = CMOS_READ(RTC_REG_D);
-
-               /*
-                * make sure the divider is set
-                */
-               CMOS_WRITE(RTC_REF_CLCK_32KHZ, RTC_REG_A);
-
-               /*
-                * Set control reg B
-                *   (24 hour mode, update enabled)
-                */
-               reg_b = CMOS_READ(RTC_REG_B) & 0x7f;
-               reg_b |= 2;
-               CMOS_WRITE(reg_b, RTC_REG_B);
-
-               if ((CMOS_READ(RTC_REG_A) & 0x7f) == RTC_REF_CLCK_32KHZ &&
-                   CMOS_READ(RTC_REG_B) == reg_b) {
-                       struct timespec tv;
-
-                       /*
-                        * We have a RTC.  Check the battery
-                        */
-                       if ((reg_d & 0x80) == 0)
-                               printk(KERN_WARNING "RTC: *** warning: CMOS battery bad\n");
-
-                       tv.tv_nsec = 0;
-                       tv.tv_sec = get_isa_cmos_time();
-                       do_settimeofday(&tv);
-                       set_rtc = set_isa_cmos_time;
-               } else
-                       rtc_base = 0;
-       }
-
-       if (machine_is_ebsa285() ||
-           machine_is_co285() ||
-           machine_is_personal_server()) {
-               gettimeoffset = timer1_gettimeoffset;
-
-               timer1_latch = (mem_fclk_21285 + 8 * HZ) / (16 * HZ);
-
-               *CSR_TIMER1_CLR  = 0;
-               *CSR_TIMER1_LOAD = timer1_latch;
-               *CSR_TIMER1_CNTL = TIMER_CNTL_ENABLE | TIMER_CNTL_AUTORELOAD | TIMER_CNTL_DIV16;
-
-               timer_irq.handler = timer1_interrupt;
-               irq = IRQ_TIMER1;
-       } else {
-               /* enable PIT timer */
-               /* set for periodic (4) and LSB/MSB write (0x30) */
-               outb(0x34, 0x43);
-               outb((mSEC_10_from_14/6) & 0xFF, 0x40);
-               outb((mSEC_10_from_14/6) >> 8, 0x40);
-
-               gettimeoffset = isa_gettimeoffset;
-               timer_irq.handler = isa_timer_interrupt;
-               irq = IRQ_ISA_TIMER;
-       }
-       setup_irq(irq, &timer_irq);
-}
diff --git a/include/asm-arm/arch-epxa10db/time.h b/include/asm-arm/arch-epxa10db/time.h
deleted file mode 100644 (file)
index 749770b..0000000
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- *  linux/include/asm-arm/arch-epxa10db/time.h
- *
- *  Copyright (C) 2001 Altera Corporation
- * 
- * 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
- */
-#include <asm/system.h>
-#include <asm/leds.h>
-#include <asm/arch/hardware.h>
-#define TIMER00_TYPE (volatile unsigned int*)
-#include <asm/arch/timer00.h>
-
-
-/*
- * IRQ handler for the timer
- */
-static irqreturn_t
-excalibur_timer_interrupt(int irq, void *dev_id, struct pt_regs *regs)
-{
-
-       // ...clear the interrupt
-       *TIMER0_CR(IO_ADDRESS(EXC_TIMER00_BASE))|=TIMER0_CR_CI_MSK;
-
-       do_leds();
-       do_timer(regs);
-       do_profile(regs);
-
-       return IRQ_HANDLED;
-}
-
-/*
- * Set up timer interrupt, and return the current time in seconds.
- */
-void __init time_init(void)
-{
-       timer_irq.handler = excalibur_timer_interrupt;
-
-       /* 
-        * Make irqs happen for the system timer
-        */
-       setup_irq(IRQ_TIMER0, &timer_irq);
-
-       /* Start the timer */
-       *TIMER0_LIMIT(IO_ADDRESS(EXC_TIMER00_BASE))=(unsigned int)(EXC_AHB2_CLK_FREQUENCY/200);
-       *TIMER0_PRESCALE(IO_ADDRESS(EXC_TIMER00_BASE))=1;
-       *TIMER0_CR(IO_ADDRESS(EXC_TIMER00_BASE))=TIMER0_CR_IE_MSK | TIMER0_CR_S_MSK;
-}
diff --git a/include/asm-arm/arch-iop3xx/time.h b/include/asm-arm/arch-iop3xx/time.h
deleted file mode 100644 (file)
index b58ac84..0000000
+++ /dev/null
@@ -1,12 +0,0 @@
-/*
- * linux/include/asm-arm/arch-iop80310/time.h
- *
- * Author:  Nicolas Pitre
- * Copyright:   (C) 2001 MontaVista Software Inc.
- *
- * 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.
- *
- */
-
diff --git a/include/asm-arm/arch-ixp4xx/time.h b/include/asm-arm/arch-ixp4xx/time.h
deleted file mode 100644 (file)
index e79f4ac..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-/*
- * linux/include/asm-arm/arch-ixp4xx/time.h
- *
- * We implement timer code in arch/arm/mach-ixp4xx/time.c
- *
- */
-
diff --git a/include/asm-arm/arch-lh7a40x/time.h b/include/asm-arm/arch-lh7a40x/time.h
deleted file mode 100644 (file)
index 5f1cf4f..0000000
+++ /dev/null
@@ -1,53 +0,0 @@
-/* include/asm-arm/arch-lh7a40x/time.h
- *
- *  Copyright (C) 2004 Logic Product Development
- *
- *  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.
- *
- */
-
-#if HZ < 100
-# define TIMER_CONTROL TIMER_CONTROL1
-# define TIMER_LOAD    TIMER_LOAD1
-# define TIMER_CONSTANT        (508469/HZ)
-# define TIMER_MODE    (TIMER_C_ENABLE | TIMER_C_PERIODIC | TIMER_C_508KHZ)
-# define TIMER_EOI     TIMER_EOI1
-# define TIMER_IRQ     IRQ_T1UI
-#else
-# define TIMER_CONTROL TIMER_CONTROL3
-# define TIMER_LOAD    TIMER_LOAD3
-# define TIMER_CONSTANT        (3686400/HZ)
-# define TIMER_MODE    (TIMER_C_ENABLE | TIMER_C_PERIODIC)
-# define TIMER_EOI     TIMER_EOI3
-# define TIMER_IRQ     IRQ_T3UI
-#endif
-
-static irqreturn_t
-lh7a40x_timer_interrupt(int irq, void *dev_id, struct pt_regs *regs)
-{
-       TIMER_EOI = 0;
-       do_profile (regs);
-       do_leds();
-       do_set_rtc();
-       do_timer (regs);
-
-       return IRQ_HANDLED;
-}
-
-void __init time_init(void)
-{
-                               /* Stop/disable all timers */
-       TIMER_CONTROL1 = 0;
-       TIMER_CONTROL2 = 0;
-       TIMER_CONTROL3 = 0;
-
-       timer_irq.handler = lh7a40x_timer_interrupt;
-       timer_irq.flags |= SA_INTERRUPT;
-       setup_irq (TIMER_IRQ, &timer_irq);
-
-       TIMER_LOAD = TIMER_CONSTANT;
-       TIMER_CONTROL = TIMER_MODE;
-}
-
diff --git a/include/asm-arm/arch-nexuspci/dma.h b/include/asm-arm/arch-nexuspci/dma.h
deleted file mode 100644 (file)
index dee1ea2..0000000
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * linux/include/asm-arm/arch-nexuspci/dma.h
- *
- * Architecture DMA routines
- *
- * Copyright (C) 1998, 1999 Philip Blundell
- */
-
-/*
- * 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 is the maximum DMA address that can be DMAd to.
- */
-#define MAX_DMA_ADDRESS                0xffffffff
-#define MAX_DMA_CHANNELS       0
diff --git a/include/asm-arm/arch-nexuspci/hardware.h b/include/asm-arm/arch-nexuspci/hardware.h
deleted file mode 100644 (file)
index 303dc2c..0000000
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- * linux/include/asm-arm/arch-nexuspci/hardware.h
- *
- * Copyright (C) 1998, 1999, 2000 FutureTV Labs Ltd.
- *
- * This file contains the hardware definitions of the FTV PCI card.
- */
-
-/*
- * 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 __ASM_ARCH_HARDWARE_H
-#define __ASM_ARCH_HARDWARE_H
-
-/*    Logical    Physical
- * 0xffe00000  0x20000000      INTCONT
- * 0xffd00000  0x30000000      Status
- * 0xffc00000  0x60000000      PLX registers
- * 0xfe000000  0xC0000000      PCI I/O
- * 0xfd000000  0x70000000      cache flush
- * 0xfc000000  0x80000000      PCI/ISA memory
- * 0xe0000000  0x10000000      SCC2691 DUART
- */
-
-/*
- * Mapping areas
- */
-#define INTCONT_BASE           0xffe00000
-#define STATUS_BASE            0xffd00000
-#define PLX_BASE               0xffc00000
-#define PCIO_BASE              0xfe000000
-#define FLUSH_BASE             0xfd000000
-#define DUART_BASE             0xe0000000
-#define PCIMEM_BASE            0xfc000000
-
-#define PLX_IO_START           0xC0000000
-#define PLX_MEM_START          0x80000000
-#define PLX_START              0x60000000
-#define STATUS_START           0x30000000
-#define INTCONT_START          0x20000000
-#define DUART_START            0x10000000
-
-/*
- * RAM definitions
- */
-#define RAM_BASE               0x40000000
-#define FLUSH_BASE_PHYS                0x70000000
-
-/*
- * Miscellaneous INTCONT bits
- */
-#define INTCONT_FIQ_PLX                0x00
-#define INTCONT_FIQ_D          0x02
-#define INTCONT_FIQ_C          0x04
-#define INTCONT_FIQ_B          0x06
-#define INTCONT_FIQ_A          0x08
-#define INTCONT_FIQ_SYSERR     0x0a
-#define INTCONT_IRQ_DUART      0x0c
-#define INTCONT_IRQ_PLX                0x0e
-#define INTCONT_IRQ_D          0x10
-#define INTCONT_IRQ_C          0x12
-#define INTCONT_IRQ_B          0x14
-#define INTCONT_IRQ_A          0x16
-#define INTCONT_IRQ_SYSERR     0x1e
-
-#define INTCONT_WATCHDOG       0x18
-#define INTCONT_LED            0x1a
-#define INTCONT_PCI_RESET      0x1c
-
-#define UNCACHEABLE_ADDR       STATUS_BASE
-
-#endif
diff --git a/include/asm-arm/arch-nexuspci/io.h b/include/asm-arm/arch-nexuspci/io.h
deleted file mode 100644 (file)
index 181bdb5..0000000
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * linux/include/asm-arm/arch-nexuspci/io.h
- *
- * Copyright (C) 1997-1999 Russell King
- * Copyright (C) 2000 FutureTV Labs Ltd.
- */
-#ifndef __ASM_ARM_ARCH_IO_H
-#define __ASM_ARM_ARCH_IO_H
-
-#define IO_SPACE_LIMIT 0xffff
-
-/*
- * Translation of various region addresses to virtual addresses
- */
-#define __io(a)                        (PCIO_BASE + (a))
-#if 1
-#define __mem_pci(a)           ((unsigned long)(a))
-#define __mem_isa(a)           (PCIMEM_BASE + (unsigned long)(a))
-#else
-
-static inline unsigned long ___mem_pci(unsigned long a)
-{
-       /* PCI addresses must have been ioremapped */
-       if (a <= 0xc0000000 || a >= 0xe0000000)
-               *((int *)0) = 0;
-       return a;
-}
-
-static inline unsigned long ___mem_isa(unsigned long a)
-{
-       BUG_ON(a >= 16*1048576);
-       return PCIMEM_BASE + a;
-}
-#define __mem_pci(a)           ___mem_pci((unsigned long)(a))
-#define __mem_isa(a)           ___mem_isa((unsigned long)(a))
-#endif
-
-/*
- * ioremap support - validate a PCI memory address,
- * and convert a PCI memory address to a physical
- * address for the page tables.
- */
-#define iomem_valid_addr(iomem,sz)     \
-       ((iomem) < 0x80000000 && (iomem) + (sz) <= 0x80000000)
-#define iomem_to_phys(iomem)   ((iomem) + PLX_MEM_START)
-
-#define __arch_ioremap(off,sz,nocache)                         \
- ({                                                            \
-       unsigned long _off = (off), _size = (sz);               \
-       void *_ret = (void *)0;                                 \
-       if (iomem_valid_addr(_off, _size))                      \
-               _ret = __ioremap(iomem_to_phys(_off),_size,0);  \
-       _ret;                                                   \
- })
-
-#define __arch_iounmap __iounmap
-
-#endif
diff --git a/include/asm-arm/arch-nexuspci/irqs.h b/include/asm-arm/arch-nexuspci/irqs.h
deleted file mode 100644 (file)
index 006c14b..0000000
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * linux/include/asm-arm/arch-nexuspci/irqs.h
- *
- * Copyright (C) 1997, 1998, 2000 Philip Blundell
- */
-
-/*
- * 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.
- */
-
-/*
- * The hardware is capable of routing any interrupt source (except the
- * DUART) to either IRQ or FIQ.  We ignore FIQ and use IRQ exclusively
- * for simplicity.  
- */
-
-#define IRQ_DUART              0
-#define IRQ_PLX                1
-#define IRQ_PCI_D              2
-#define IRQ_PCI_C              3
-#define IRQ_PCI_B              4
-#define IRQ_PCI_A              5
-#define IRQ_SYSERR             6       /* only from IOSLAVE rev B */
-
-#define FIRST_IRQ              IRQ_DUART
-#define LAST_IRQ               IRQ_SYSERR
-
-/* timer is part of the DUART */
-#define IRQ_TIMER              IRQ_DUART
-
-#define irq_canonicalize(i)    (i)
diff --git a/include/asm-arm/arch-nexuspci/memory.h b/include/asm-arm/arch-nexuspci/memory.h
deleted file mode 100644 (file)
index 85d7c45..0000000
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * linux/include/asm-arm/arch-nexuspci/memory.h
- *
- * Copyright (c) 1997, 1998, 2000 FutureTV Labs Ltd.
- * Copyright (c) 1999 Russell King
- *
- */
-#ifndef __ASM_ARCH_MEMORY_H
-#define __ASM_ARCH_MEMORY_H
-
-/*
- * Physical DRAM offset.
- */
-#define PHYS_OFFSET    (0x40000000UL)
-#define BUS_OFFSET     (0xe0000000UL)
-
-/*
- * On the PCI bus the DRAM appears at address 0xe0000000
- */
-#define __virt_to_bus(x) ((unsigned long)(x) - PAGE_OFFSET + BUS_OFFSET)
-#define __bus_to_virt(x) ((unsigned long)(x) + PAGE_OFFSET - BUS_OFFSET)
-
-#endif
diff --git a/include/asm-arm/arch-nexuspci/param.h b/include/asm-arm/arch-nexuspci/param.h
deleted file mode 100644 (file)
index d57753d..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-/*
- *  linux/include/asm-arm/arch-nexuspci/param.h
- */
diff --git a/include/asm-arm/arch-nexuspci/system.h b/include/asm-arm/arch-nexuspci/system.h
deleted file mode 100644 (file)
index 824a1d7..0000000
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * linux/include/asm-arm/arch-nexuspci/system.h
- *
- * Copyright (c) 1996, 97, 98, 99, 2000 FutureTV Labs Ltd.
- */
-
-/*
- * 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 __ASM_ARCH_SYSTEM_H
-#define __ASM_ARCH_SYSTEM_H
-
-static inline void arch_idle(void)
-{
-       cpu_do_idle();
-}
-
-#define arch_reset(mode)       do { } while (0)
-
-#endif
diff --git a/include/asm-arm/arch-nexuspci/time.h b/include/asm-arm/arch-nexuspci/time.h
deleted file mode 100644 (file)
index c0fd0cd..0000000
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * linux/include/asm-arm/arch-nexuspci/time.h
- *
- * Copyright (c) 1997, 1998, 1999, 2000 FutureTV Labs Ltd.
- *
- * The FTV PCI card has no real-time clock.  We get timer ticks from the
- * SCC chip.
- */
-
-/*
- * 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.
- */
-
-static irqreturn_t
-timer_interrupt(int irq, void *dev_id, struct pt_regs *regs)
-{
-       static int count = 25;
-       unsigned char stat = __raw_readb(DUART_BASE + 0x14);
-       if (!(stat & 0x10))
-               return;         /* Not for us */
-
-       /* Reset counter */
-       __raw_writeb(0x90, DUART_BASE + 8);
-
-       if (--count == 0) {
-               static int state = 1;
-               state ^= 1;
-               __raw_writeb(0x1a + state, INTCONT_BASE);
-               __raw_writeb(0x18 + state, INTCONT_BASE);
-               count = 50;
-       }
-
-       /* Wait for slow rise time */
-       __raw_readb(DUART_BASE + 0x14);
-       __raw_readb(DUART_BASE + 0x14);
-       __raw_readb(DUART_BASE + 0x14);
-       __raw_readb(DUART_BASE + 0x14);
-       __raw_readb(DUART_BASE + 0x14);
-       __raw_readb(DUART_BASE + 0x14);
-
-       do_timer(regs);
-
-       return IRQ_HANDLED;
-}
-
-void __init time_init(void)
-{
-       int tick = 3686400 / 16 / 2 / 100;
-
-       __raw_writeb(tick & 0xff, DUART_BASE + 0x1c);
-       __raw_writeb(tick >> 8, DUART_BASE + 0x18);
-       __raw_writeb(0x80, DUART_BASE + 8);
-       __raw_writeb(0x10, DUART_BASE + 0x14);
-
-       timer_irq.handler = timer_interrupt;
-       timer_irq.flags = SA_SHIRQ;
-
-       setup_irq(IRQ_TIMER, &timer_irq);
-}
diff --git a/include/asm-arm/arch-nexuspci/timex.h b/include/asm-arm/arch-nexuspci/timex.h
deleted file mode 100644 (file)
index 63d4e2c..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-/*
- * linux/include/asm-arm/arch-nexuspci/timex.h
- *
- * NexusPCI StrongARM card timex specifications
- *
- * Copyright (C) 1998 Philip Blundell
- */
-
diff --git a/include/asm-arm/arch-nexuspci/uncompress.h b/include/asm-arm/arch-nexuspci/uncompress.h
deleted file mode 100644 (file)
index dd697a9..0000000
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * linux/include/asm-arm/arch-nexuspci/uncompress.h
- *
- * Copyright (C) 1998, 1999, 2000 Philip Blundell
- */
-
-/*
- * 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 <asm/hardware.h>
-#include <asm/io.h>
-
-/*
- * Write a character to the UART
- */
-void _ll_write_char(char c)
-{
-       while (!(__raw_readb(DUART_START + 0x4) & 0x4))
-               ;
-       __raw_writeb(c, DUART_START + 0xc);
-}
-
-/*
- * This does not append a newline
- */
-static void puts(const char *s)
-{
-       while (*s) {
-               if (*s == '\n')
-                       _ll_write_char('\r');
-               _ll_write_char(*(s++));
-       }
-}
-
-/*
- * Set up for decompression
- */
-static void arch_decomp_setup(void)
-{
-       /* LED off */
-       __raw_writel(INTCONT_LED, INTCONT_START);
-
-       /* Set up SCC */
-       __raw_writeb(42, DUART_START + 8);
-       __raw_writeb(48, DUART_START + 8);
-       __raw_writeb(16, DUART_START + 8);
-       __raw_writeb(0x93, DUART_START);
-       __raw_writeb(0x17, DUART_START);
-       __raw_writeb(0xbb, DUART_START + 4);
-       __raw_writeb(0x78, DUART_START + 16);
-       __raw_writeb(0xa0, DUART_START + 8);
-       __raw_writeb(5, DUART_START + 8);
-}
-
-/*
- * Stroke the watchdog so we don't get reset during decompression.
- */
-static inline void arch_decomp_wdog(void)
-{
-       __raw_writel(INTCONT_WATCHDOG, INTCONT_START);
-       __raw_writel(INTCONT_WATCHDOG | 1, INTCONT_START);
-}
diff --git a/include/asm-arm/arch-nexuspci/vmalloc.h b/include/asm-arm/arch-nexuspci/vmalloc.h
deleted file mode 100644 (file)
index 7e93df2..0000000
+++ /dev/null
@@ -1,15 +0,0 @@
-/*
- * linux/include/asm-arm/arch-nexuspci/vmalloc.h
- */
-
-/*
- * Just any arbitrary offset to the start of the vmalloc VM area: the
- * current 8MB value just means that there will be a 8MB "hole" after the
- * physical memory until the kernel virtual memory starts.  That means that
- * any out-of-bounds memory accesses will hopefully be caught.
- * The vmalloc() routines leaves a hole of 4kB between each vmalloced
- * area for the same reason. ;)
- */
-#define VMALLOC_OFFSET   (8*1024*1024)
-#define VMALLOC_START    (((unsigned long)high_memory + VMALLOC_OFFSET) & ~(VMALLOC_OFFSET-1))
-#define VMALLOC_END       (PAGE_OFFSET + 0x20000000)
diff --git a/include/asm-arm/arch-omap/omap-h2.h b/include/asm-arm/arch-omap/omap-h2.h
deleted file mode 100644 (file)
index 9eeb892..0000000
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * linux/include/asm-arm/arch-omap/omap-h2.h
- *
- * Hardware definitions for TI OMAP1610 H2 board.
- *
- * Cleanup for Linux-2.6 by Dirk Behme <dirk.behme@de.bosch.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 the
- * Free Software Foundation; either version 2 of the License, or (at your
- * option) any later version.
- *
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN
- * NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
- * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * 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.
- */
-
-#ifndef __ASM_ARCH_OMAP_H2_H
-#define __ASM_ARCH_OMAP_H2_H
-
-/* Placeholder for H2 specific defines */
-
-#endif /*  __ASM_ARCH_OMAP_H2_H */
-
diff --git a/include/asm-arm/arch-omap/omap-innovator.h b/include/asm-arm/arch-omap/omap-innovator.h
deleted file mode 100644 (file)
index ccdc313..0000000
+++ /dev/null
@@ -1,214 +0,0 @@
-/*
- * linux/include/asm-arm/arch-omap/omap-innovator.h
- *
- * Copyright (C) 2001 RidgeRun, 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.
- *
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN
- * NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
- * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * 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.
- */
-#ifndef __ASM_ARCH_OMAP_INNOVATOR_H
-#define __ASM_ARCH_OMAP_INNOVATOR_H
-
-#if defined (CONFIG_ARCH_OMAP1510)
-
-/*
- * ---------------------------------------------------------------------------
- *  OMAP-1510 FPGA
- * ---------------------------------------------------------------------------
- */
-#define OMAP1510P1_FPGA_BASE                   0xE8000000      /* Virtual */
-#define OMAP1510P1_FPGA_SIZE                   SZ_4K
-#define OMAP1510P1_FPGA_START                  0x08000000      /* Physical */
-
-/* Revision */
-#define OMAP1510P1_FPGA_REV_LOW                        (OMAP1510P1_FPGA_BASE + 0x0)
-#define OMAP1510P1_FPGA_REV_HIGH               (OMAP1510P1_FPGA_BASE + 0x1)
-
-#define OMAP1510P1_FPGA_LCD_PANEL_CONTROL      (OMAP1510P1_FPGA_BASE + 0x2)
-#define OMAP1510P1_FPGA_LED_DIGIT              (OMAP1510P1_FPGA_BASE + 0x3)
-#define INNOVATOR_FPGA_HID_SPI                 (OMAP1510P1_FPGA_BASE + 0x4)
-#define OMAP1510P1_FPGA_POWER                  (OMAP1510P1_FPGA_BASE + 0x5)
-
-/* Interrupt status */
-#define OMAP1510P1_FPGA_ISR_LO                 (OMAP1510P1_FPGA_BASE + 0x6)
-#define OMAP1510P1_FPGA_ISR_HI                 (OMAP1510P1_FPGA_BASE + 0x7)
-
-/* Interrupt mask */
-#define OMAP1510P1_FPGA_IMR_LO                 (OMAP1510P1_FPGA_BASE + 0x8)
-#define OMAP1510P1_FPGA_IMR_HI                 (OMAP1510P1_FPGA_BASE + 0x9)
-
-/* Reset registers */
-#define OMAP1510P1_FPGA_HOST_RESET             (OMAP1510P1_FPGA_BASE + 0xa)
-#define OMAP1510P1_FPGA_RST                    (OMAP1510P1_FPGA_BASE + 0xb)
-
-#define OMAP1510P1_FPGA_AUDIO                  (OMAP1510P1_FPGA_BASE + 0xc)
-#define OMAP1510P1_FPGA_DIP                    (OMAP1510P1_FPGA_BASE + 0xe)
-#define OMAP1510P1_FPGA_FPGA_IO                        (OMAP1510P1_FPGA_BASE + 0xf)
-#define OMAP1510P1_FPGA_UART1                  (OMAP1510P1_FPGA_BASE + 0x14)
-#define OMAP1510P1_FPGA_UART2                  (OMAP1510P1_FPGA_BASE + 0x15)
-#define OMAP1510P1_FPGA_OMAP1510_STATUS                (OMAP1510P1_FPGA_BASE + 0x16)
-#define OMAP1510P1_FPGA_BOARD_REV              (OMAP1510P1_FPGA_BASE + 0x18)
-#define OMAP1510P1_PPT_DATA                    (OMAP1510P1_FPGA_BASE + 0x100)
-#define OMAP1510P1_PPT_STATUS                  (OMAP1510P1_FPGA_BASE + 0x101)
-#define OMAP1510P1_PPT_CONTROL                 (OMAP1510P1_FPGA_BASE + 0x102)
-
-#define OMAP1510P1_FPGA_TOUCHSCREEN            (OMAP1510P1_FPGA_BASE + 0x204)
-
-#define INNOVATOR_FPGA_INFO                    (OMAP1510P1_FPGA_BASE + 0x205)
-#define INNOVATOR_FPGA_LCD_BRIGHT_LO           (OMAP1510P1_FPGA_BASE + 0x206)
-#define INNOVATOR_FPGA_LCD_BRIGHT_HI           (OMAP1510P1_FPGA_BASE + 0x207)
-#define INNOVATOR_FPGA_LED_GRN_LO              (OMAP1510P1_FPGA_BASE + 0x208)
-#define INNOVATOR_FPGA_LED_GRN_HI              (OMAP1510P1_FPGA_BASE + 0x209)
-#define INNOVATOR_FPGA_LED_RED_LO              (OMAP1510P1_FPGA_BASE + 0x20a)
-#define INNOVATOR_FPGA_LED_RED_HI              (OMAP1510P1_FPGA_BASE + 0x20b)
-#define INNOVATOR_FPGA_CAM_USB_CONTROL         (OMAP1510P1_FPGA_BASE + 0x20c)
-#define INNOVATOR_FPGA_EXP_CONTROL             (OMAP1510P1_FPGA_BASE + 0x20d)
-#define INNOVATOR_FPGA_ISR2                    (OMAP1510P1_FPGA_BASE + 0x20e)
-#define INNOVATOR_FPGA_IMR2                    (OMAP1510P1_FPGA_BASE + 0x210)
-
-#define OMAP1510P1_FPGA_ETHR_START             (OMAP1510P1_FPGA_START + 0x300)
-#define OMAP1510P1_FPGA_ETHR_BASE              (OMAP1510P1_FPGA_BASE + 0x300)
-
-/*
- * Power up Giga UART driver, turn on HID clock.
- * Turn off BT power, since we're not using it and it
- * draws power.
- */
-#define OMAP1510P1_FPGA_RESET_VALUE            0x42
-
-#define OMAP1510P1_FPGA_PCR_IF_PD0             (1 << 7)
-#define OMAP1510P1_FPGA_PCR_COM2_EN            (1 << 6)
-#define OMAP1510P1_FPGA_PCR_COM1_EN            (1 << 5)
-#define OMAP1510P1_FPGA_PCR_EXP_PD0            (1 << 4)
-#define OMAP1510P1_FPGA_PCR_EXP_PD1            (1 << 3)
-#define OMAP1510P1_FPGA_PCR_48MHZ_CLK          (1 << 2)
-#define OMAP1510P1_FPGA_PCR_4MHZ_CLK           (1 << 1)
-#define OMAP1510P1_FPGA_PCR_RSRVD_BIT0         (1 << 0)
-
-/*
- * Innovator/OMAP1510 FPGA HID register bit definitions
- */
-#define FPGA_HID_SCLK  (1<<0)  /* output */
-#define FPGA_HID_MOSI  (1<<1)  /* output */
-#define FPGA_HID_nSS   (1<<2)  /* output 0/1 chip idle/select */
-#define FPGA_HID_nHSUS (1<<3)  /* output 0/1 host active/suspended */
-#define FPGA_HID_MISO  (1<<4)  /* input */
-#define FPGA_HID_ATN   (1<<5)  /* input  0/1 chip idle/ATN */
-#define FPGA_HID_rsrvd (1<<6)
-#define FPGA_HID_RESETn (1<<7) /* output - 0/1 USAR reset/run */
-
-#ifndef OMAP_SDRAM_DEVICE
-#define OMAP_SDRAM_DEVICE                      D256M_1X16_4B
-#endif
-
-#define OMAP1510P1_IMIF_PRI_VALUE              0x00
-#define OMAP1510P1_EMIFS_PRI_VALUE             0x00
-#define OMAP1510P1_EMIFF_PRI_VALUE             0x00
-
-/*
- * These definitions define an area of FLASH set aside
- * for the use of MTD/JFFS2. This is the area of flash
- * that a JFFS2 filesystem will reside which is mounted
- * at boot with the "root=/dev/mtdblock/0 rw"
- * command line option. The flash address used here must
- * fall within the legal range defined by rrload for storing
- * the filesystem component. This address will be sufficiently
- * deep into the overall flash range to avoid the other
- * components also stored in flash such as the bootloader,
- * the bootloader params, and the kernel.
- * The SW2 settings for the map below are:
- * 1 off, 2 off, 3 on, 4 off.
- */
-
-/* Intel flash_0, partitioned as expected by rrload */
-#define OMAP_FLASH_0_BASE      0xD8000000
-#define OMAP_FLASH_0_START     0x00000000
-#define OMAP_FLASH_0_SIZE      SZ_16M
-
-/* Intel flash_1, used for cramfs or other flash file systems */
-#define OMAP_FLASH_1_BASE      0xD9000000
-#define OMAP_FLASH_1_START     0x01000000
-#define OMAP_FLASH_1_SIZE      SZ_16M
-
-/* The FPGA IRQ is cascaded through GPIO_13 */
-#define INT_FPGA               (IH_GPIO_BASE + 13)
-
-/* IRQ Numbers for interrupts muxed through the FPGA */
-#define IH_FPGA_BASE           IH_BOARD_BASE
-#define INT_FPGA_ATN           (IH_FPGA_BASE + 0)
-#define INT_FPGA_ACK           (IH_FPGA_BASE + 1)
-#define INT_FPGA2              (IH_FPGA_BASE + 2)
-#define INT_FPGA3              (IH_FPGA_BASE + 3)
-#define INT_FPGA4              (IH_FPGA_BASE + 4)
-#define INT_FPGA5              (IH_FPGA_BASE + 5)
-#define INT_FPGA6              (IH_FPGA_BASE + 6)
-#define INT_FPGA7              (IH_FPGA_BASE + 7)
-#define INT_FPGA8              (IH_FPGA_BASE + 8)
-#define INT_FPGA9              (IH_FPGA_BASE + 9)
-#define INT_FPGA10             (IH_FPGA_BASE + 10)
-#define INT_FPGA11             (IH_FPGA_BASE + 11)
-#define INT_FPGA12             (IH_FPGA_BASE + 12)
-#define INT_ETHER              (IH_FPGA_BASE + 13)
-#define INT_FPGAUART1          (IH_FPGA_BASE + 14)
-#define INT_FPGAUART2          (IH_FPGA_BASE + 15)
-#define INT_FPGA_TS            (IH_FPGA_BASE + 16)
-#define INT_FPGA17             (IH_FPGA_BASE + 17)
-#define INT_FPGA_CAM           (IH_FPGA_BASE + 18)
-#define INT_FPGA_RTC_A         (IH_FPGA_BASE + 19)
-#define INT_FPGA_RTC_B         (IH_FPGA_BASE + 20)
-#define INT_FPGA_CD            (IH_FPGA_BASE + 21)
-#define INT_FPGA22             (IH_FPGA_BASE + 22)
-#define INT_FPGA23             (IH_FPGA_BASE + 23)
-
-#define NR_FPGA_IRQS            24
-
-#define MAXIRQNUM              (IH_FPGA_BASE + NR_FPGA_IRQS - 1)
-#define MAXFIQNUM              MAXIRQNUM
-#define MAXSWINUM              MAXIRQNUM
-
-#define NR_IRQS                        256
-
-#ifndef __ASSEMBLY__
-void fpga_write(unsigned char val, int reg);
-unsigned char fpga_read(int reg);
-#endif
-
-#elif defined (CONFIG_ARCH_OMAP1610)
-
-/* At OMAP1610 Innovator the Ethernet is directly connected to CS1 */
-#define OMAP1610_ETHR_BASE             0xE8000000
-#define OMAP1610_ETHR_SIZE             SZ_4K
-#define OMAP1610_ETHR_START            0x04000000
-
-/* Intel STRATA NOR flash at CS3 */
-#define OMAP1610_NOR_FLASH_BASE                0xD8000000
-#define OMAP1610_NOR_FLASH_SIZE                SZ_32M
-#define OMAP1610_NOR_FLASH_START       0x0C000000
-
-#define MAXIRQNUM                      (IH_BOARD_BASE)
-#define MAXFIQNUM                      MAXIRQNUM
-#define MAXSWINUM                      MAXIRQNUM
-
-#define NR_IRQS                                (MAXIRQNUM + 1)
-
-#else
-#error "Only OMAP1510 and OMAP1610 Innovator supported!"
-#endif
-#endif
diff --git a/include/asm-arm/arch-omap/omap-perseus2.h b/include/asm-arm/arch-omap/omap-perseus2.h
deleted file mode 100644 (file)
index 41fa2dd..0000000
+++ /dev/null
@@ -1,152 +0,0 @@
-/*
- *  linux/include/asm-arm/arch-omap/omap-perseus2.h
- *
- *  Copyright 2003 by Texas Instruments Incorporated
- *    OMAP730 / P2-sample additions
- *    Author: Jean Pihet
- *
- * Copyright (C) 2001 RidgeRun, Inc. (http://www.ridgerun.com)
- * Author: RidgeRun, 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.
- *
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN
- * NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
- * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * 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.
- */
-#ifndef __ASM_ARCH_OMAP_P2SAMPLE_H
-#define __ASM_ARCH_OMAP_P2SAMPLE_H
-
-#if defined(CONFIG_ARCH_OMAP730) && defined (CONFIG_MACH_OMAP_PERSEUS2)
-
-/*
- * NOTE:  ALL DEFINITIONS IN THIS FILE NEED TO BE PREFIXED BY IDENTIFIER
- *       P2SAMPLE_ since they are specific to the EVM and not the chip.
- */
-
-/* ---------------------------------------------------------------------------
- *  OMAP730 Debug Board FPGA
- * ---------------------------------------------------------------------------
- *
- */
-
-/* maps in the FPGA registers and the ETHR registers */
-#define OMAP730_FPGA_BASE              0xE8000000      /* VA */
-#define OMAP730_FPGA_SIZE              SZ_4K           /* SIZE */
-#define OMAP730_FPGA_START             0x04000000      /* PA */
-
-#define OMAP730_FPGA_ETHR_START                OMAP730_FPGA_START
-#define OMAP730_FPGA_ETHR_BASE         OMAP730_FPGA_BASE
-#define OMAP730_FPGA_FPGA_REV          (OMAP730_FPGA_BASE + 0x10)      /* FPGA Revision */
-#define OMAP730_FPGA_BOARD_REV         (OMAP730_FPGA_BASE + 0x12)      /* Board Revision */
-#define OMAP730_FPGA_GPIO              (OMAP730_FPGA_BASE + 0x14)      /* GPIO outputs */
-#define OMAP730_FPGA_LEDS              (OMAP730_FPGA_BASE + 0x16)      /* LEDs outputs */
-#define OMAP730_FPGA_MISC_INPUTS       (OMAP730_FPGA_BASE + 0x18)      /* Misc inputs */
-#define OMAP730_FPGA_LAN_STATUS                (OMAP730_FPGA_BASE + 0x1A)      /* LAN Status line */
-#define OMAP730_FPGA_LAN_RESET         (OMAP730_FPGA_BASE + 0x1C)      /* LAN Reset line */
-
-// LEDs definition on debug board (16 LEDs)
-#define OMAP730_FPGA_LED_CLAIMRELEASE  (1 << 15)
-#define OMAP730_FPGA_LED_STARTSTOP     (1 << 14)
-#define OMAP730_FPGA_LED_HALTED                (1 << 13)
-#define OMAP730_FPGA_LED_IDLE          (1 << 12)
-#define OMAP730_FPGA_LED_TIMER         (1 << 11)
-// cpu0 load-meter LEDs
-#define OMAP730_FPGA_LOAD_METER                (1 << 0)        // A bit of fun on our board ...
-#define OMAP730_FPGA_LOAD_METER_SIZE   11
-#define OMAP730_FPGA_LOAD_METER_MASK   ((1 << OMAP730_FPGA_LOAD_METER_SIZE) - 1)
-
-#ifndef OMAP_SDRAM_DEVICE
-#define OMAP_SDRAM_DEVICE              D256M_1X16_4B
-#endif
-
-
-/*
- * These definitions define an area of FLASH set aside
- * for the use of MTD/JFFS2. This is the area of flash
- * that a JFFS2 filesystem will reside which is mounted
- * at boot with the "root=/dev/mtdblock/0 rw"
- * command line option.
- */
-
-/* Intel flash_0, partitioned as expected by rrload */
-#define OMAP_FLASH_0_BASE      0xD8000000      /* VA */
-#define OMAP_FLASH_0_START     0x00000000      /* PA */
-#define OMAP_FLASH_0_SIZE      SZ_32M
-
-/* 2.9.6 Traffic Controller Memory Interface Registers */
-#define OMAP_FLASH_CFG_0               0xfffecc10
-#define OMAP_FLASH_ACFG_0              0xfffecc50
-
-#define OMAP_FLASH_CFG_1               0xfffecc14
-#define OMAP_FLASH_ACFG_1              0xfffecc54
-
-/*
- * Configuration Registers
- */
-#define PERSEUS2_CONFIG_BASE      0xfffe1000
-#define PERSEUS2_IO_CONF_0        0xfffe1070
-#define PERSEUS2_IO_CONF_1        0xfffe1074
-#define PERSEUS2_IO_CONF_2        0xfffe1078
-#define PERSEUS2_IO_CONF_3        0xfffe107c
-#define PERSEUS2_IO_CONF_4        0xfffe1080
-#define PERSEUS2_IO_CONF_5        0xfffe1084
-#define PERSEUS2_IO_CONF_6        0xfffe1088
-#define PERSEUS2_IO_CONF_7        0xfffe108c
-#define PERSEUS2_IO_CONF_8        0xfffe1090
-#define PERSEUS2_IO_CONF_9        0xfffe1094
-#define PERSEUS2_IO_CONF_10       0xfffe1098
-#define PERSEUS2_IO_CONF_11       0xfffe109c
-#define PERSEUS2_IO_CONF_12       0xfffe10a0
-#define PERSEUS2_IO_CONF_13       0xfffe10a4
-
-#define PERSEUS2_MODE_1                   0xfffe1010
-#define PERSEUS2_MODE_2                   0xfffe1014
-
-/* CSMI specials: in terms of base + offset */
-#define PERSEUS2_MODE2_OFFSET     0x14
-
-/* DSP control: ICR registers */
-#define ICR_BASE               0xfffbb800
-/* M_CTL */
-#define DSP_M_CTL              ((volatile __u16 *)0xfffbb804)
-/* DSP control: MMU registers */
-#define DSP_MMU_BASE           ((volatile __u16 *)0xfffed200)
-
-/* The Ethernet Controller IRQ is cascaded to MPU_EXT_nIRQ througb the FPGA */
-#define INT_ETHER              INT_730_MPU_EXT_NIRQ
-
-#define MAXIRQNUM              IH_BOARD_BASE
-#define MAXFIQNUM              MAXIRQNUM
-#define MAXSWINUM              MAXIRQNUM
-
-#define NR_IRQS                        (MAXIRQNUM + 1)
-
-#ifndef __ASSEMBLY__
-void fpga_write(unsigned char val, int reg);
-unsigned char fpga_read(int reg);
-#endif
-
-/* PCC_UPLD control register: OMAP730 */
-#define PCC_UPLD_CTRL_REG_BASE (0xfffe0900)
-#define PCC_UPLD_CTRL_REG      (volatile __u16 *)(PCC_UPLD_CTRL_REG_BASE + 0x00)
-
-#else
-#error "Only OMAP730 Perseus2 supported!"
-#endif
-
-#endif
diff --git a/include/asm-arm/arch-omap/time.h b/include/asm-arm/arch-omap/time.h
deleted file mode 100644 (file)
index 85d4812..0000000
+++ /dev/null
@@ -1,212 +0,0 @@
-/*
- * linux/include/asm-arm/arch-omap/time.h
- *
- * 32kHz timer definition
- *
- * Copyright (C) 2000 RidgeRun, Inc.
- * Author: Greg Lonnon <glonnon@ridgerun.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 the
- * Free Software Foundation; either version 2 of the License, or (at your
- * option) any later version.
- *
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN
- * NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
- * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * 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.
- */
-#if !defined(__ASM_ARCH_OMAP_TIME_H)
-#define __ASM_ARCH_OMAP_TIME_H
-
-#include <linux/config.h>
-#include <linux/delay.h>
-#include <asm/system.h>
-#include <asm/hardware.h>
-#include <asm/io.h>
-#include <asm/leds.h>
-#include <asm/irq.h>
-#include <asm/mach/irq.h>
-#include <asm/arch/clocks.h>
-
-#ifndef __instrument
-#define __instrument
-#define __noinstrument __attribute__ ((no_instrument_function))
-#endif
-
-typedef struct {
-       u32 cntl;     /* CNTL_TIMER, R/W */
-       u32 load_tim; /* LOAD_TIM,   W */
-       u32 read_tim; /* READ_TIM,   R */
-} mputimer_regs_t;
-
-#define mputimer_base(n) \
-    ((volatile mputimer_regs_t*)IO_ADDRESS(OMAP_MPUTIMER_BASE + \
-                                (n)*OMAP_MPUTIMER_OFFSET))
-
-static inline unsigned long timer32k_read(int reg) {
-       unsigned long val;
-       val = omap_readw(reg + OMAP_32kHz_TIMER_BASE);
-       return val;
-}
-static inline void timer32k_write(int reg,int val) {
-       omap_writew(val, reg + OMAP_32kHz_TIMER_BASE);
-}
-
-/*
- * How long is the timer interval? 100 HZ, right...
- * IRQ rate = (TVR + 1) / 32768 seconds
- * TVR = 32768 * IRQ_RATE -1
- * IRQ_RATE =  1/100
- * TVR = 326
- */
-#define TIMER32k_PERIOD 326
-//#define TIMER32k_PERIOD 0x7ff
-
-static inline void start_timer32k(void) {
-       timer32k_write(TIMER32k_CR,
-                      TIMER32k_TSS | TIMER32k_TRB |
-                      TIMER32k_INT | TIMER32k_ARL);
-}
-
-#ifdef CONFIG_MACH_OMAP_PERSEUS2
-/*
- * After programming PTV with 0 and setting the MPUTIM_CLOCK_ENABLE
- * (external clock enable)  bit, the timer count rate is 6.5 MHz (13
- * MHZ input/2). !! The divider by 2 is undocumented !!
- */
-#define MPUTICKS_PER_SEC (13000000/2)
-#else
-/*
- * After programming PTV with 0, the timer count rate is 6 MHz.
- * WARNING! this must be an even number, or machinecycles_to_usecs
- * below will break.
- */
-#define MPUTICKS_PER_SEC  (12000000/2)
-#endif
-
-static int mputimer_started[3] = {0,0,0};
-
-static inline void __noinstrument start_mputimer(int n,
-                                                unsigned long load_val)
-{
-       volatile mputimer_regs_t* timer = mputimer_base(n);
-
-       mputimer_started[n] = 0;
-       timer->cntl = MPUTIM_CLOCK_ENABLE;
-       udelay(1);
-
-       timer->load_tim = load_val;
-        udelay(1);
-       timer->cntl = (MPUTIM_CLOCK_ENABLE | MPUTIM_AR | MPUTIM_ST);
-       mputimer_started[n] = 1;
-}
-
-static inline unsigned long __noinstrument
-read_mputimer(int n)
-{
-       volatile mputimer_regs_t* timer = mputimer_base(n);
-       return (mputimer_started[n] ? timer->read_tim : 0);
-}
-
-void __noinstrument start_mputimer1(unsigned long load_val)
-{
-       start_mputimer(0, load_val);
-}
-void __noinstrument start_mputimer2(unsigned long load_val)
-{
-       start_mputimer(1, load_val);
-}
-void __noinstrument start_mputimer3(unsigned long load_val)
-{
-       start_mputimer(2, load_val);
-}
-
-unsigned long __noinstrument read_mputimer1(void)
-{
-       return read_mputimer(0);
-}
-unsigned long __noinstrument read_mputimer2(void)
-{
-       return read_mputimer(1);
-}
-unsigned long __noinstrument read_mputimer3(void)
-{
-       return read_mputimer(2);
-}
-
-unsigned long __noinstrument do_getmachinecycles(void)
-{
-       return 0 - read_mputimer(0);
-}
-
-unsigned long __noinstrument machinecycles_to_usecs(unsigned long mputicks)
-{
-       /* Round up to nearest usec */
-       return ((mputicks * 1000) / (MPUTICKS_PER_SEC / 2 / 1000) + 1) >> 1;
-}
-
-/*
- * This marks the time of the last system timer interrupt
- * that was *processed by the ISR* (timer 2).
- */
-static unsigned long systimer_mark;
-
-static unsigned long omap1510_gettimeoffset(void)
-{
-       /* Return elapsed usecs since last system timer ISR */
-       return machinecycles_to_usecs(do_getmachinecycles() - systimer_mark);
-}
-
-static irqreturn_t
-omap1510_timer_interrupt(int irq, void *dev_id, struct pt_regs *regs)
-{
-       unsigned long now, ilatency;
-
-       /*
-        * Mark the time at which the timer interrupt ocurred using
-        * timer1. We need to remove interrupt latency, which we can
-        * retrieve from the current system timer2 counter. Both the
-        * offset timer1 and the system timer2 are counting at 6MHz,
-        * so we're ok.
-        */
-       now = 0 - read_mputimer1();
-       ilatency = MPUTICKS_PER_SEC / 100 - read_mputimer2();
-       systimer_mark = now - ilatency;
-
-       do_leds();
-       do_timer(regs);
-       do_profile(regs);
-
-       return IRQ_HANDLED;
-}
-
-void __init time_init(void)
-{
-       /* Since we don't call request_irq, we must init the structure */
-       gettimeoffset = omap1510_gettimeoffset;
-
-       timer_irq.handler = omap1510_timer_interrupt;
-       timer_irq.flags = SA_INTERRUPT;
-#ifdef OMAP1510_USE_32KHZ_TIMER
-       timer32k_write(TIMER32k_CR, 0x0);
-       timer32k_write(TIMER32k_TVR,TIMER32k_PERIOD);
-       setup_irq(INT_OS_32kHz_TIMER, &timer_irq);
-       start_timer32k();
-#else
-       setup_irq(INT_TIMER2, &timer_irq);
-       start_mputimer2(MPUTICKS_PER_SEC / 100 - 1);
-#endif
-}
-
-#endif
diff --git a/include/asm-arm/arch-pxa/time.h b/include/asm-arm/arch-pxa/time.h
deleted file mode 100644 (file)
index bc9437a..0000000
+++ /dev/null
@@ -1,105 +0,0 @@
-/*
- * linux/include/asm-arm/arch-pxa/time.h
- *
- * Author:     Nicolas Pitre
- * Created:    Jun 15, 2001
- * Copyright:  MontaVista Software Inc.
- *
- * 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.
- */
-
-
-static inline unsigned long pxa_get_rtc_time(void)
-{
-       return RCNR;
-}
-
-static int pxa_set_rtc(void)
-{
-       unsigned long current_time = xtime.tv_sec;
-
-       if (RTSR & RTSR_ALE) {
-               /* make sure not to forward the clock over an alarm */
-               unsigned long alarm = RTAR;
-               if (current_time >= alarm && alarm >= RCNR)
-                       return -ERESTARTSYS;
-       }
-       RCNR = current_time;
-       return 0;
-}
-
-/* IRQs are disabled before entering here from do_gettimeofday() */
-static unsigned long pxa_gettimeoffset (void)
-{
-       long ticks_to_match, elapsed, usec;
-
-       /* Get ticks before next timer match */
-       ticks_to_match = OSMR0 - OSCR;
-
-       /* We need elapsed ticks since last match */
-       elapsed = LATCH - ticks_to_match;
-
-       /* don't get fooled by the workaround in pxa_timer_interrupt() */
-       if (elapsed <= 0)
-               return 0;
-
-       /* Now convert them to usec */
-       usec = (unsigned long)(elapsed * (tick_nsec / 1000))/LATCH;
-
-       return usec;
-}
-
-static irqreturn_t
-pxa_timer_interrupt(int irq, void *dev_id, struct pt_regs *regs)
-{
-       int next_match;
-
-       do_profile(regs);
-
-       /* Loop until we get ahead of the free running timer.
-        * This ensures an exact clock tick count and time accuracy.
-        * IRQs are disabled inside the loop to ensure coherence between
-        * lost_ticks (updated in do_timer()) and the match reg value, so we
-        * can use do_gettimeofday() from interrupt handlers.
-        *
-        * HACK ALERT: it seems that the PXA timer regs aren't updated right
-        * away in all cases when a write occurs.  We therefore compare with
-        * 8 instead of 0 in the while() condition below to avoid missing a
-        * match if OSCR has already reached the next OSMR value.
-        * Experience has shown that up to 6 ticks are needed to work around
-        * this problem, but let's use 8 to be conservative.  Note that this
-        * affect things only when the timer IRQ has been delayed by nearly
-        * exactly one tick period which should be a pretty rare event.
-        */
-       do {
-               do_leds();
-               do_set_rtc();
-               do_timer(regs);
-               OSSR = OSSR_M0;  /* Clear match on timer 0 */
-               next_match = (OSMR0 += LATCH);
-       } while( (signed long)(next_match - OSCR) <= 8 );
-
-       return IRQ_HANDLED;
-}
-
-void __init time_init(void)
-{
-       struct timespec tv;
-
-       gettimeoffset = pxa_gettimeoffset;
-       set_rtc = pxa_set_rtc;
-
-       tv.tv_nsec = 0;
-       tv.tv_sec = pxa_get_rtc_time();
-       do_settimeofday(&tv);
-
-       timer_irq.handler = pxa_timer_interrupt;
-       OSMR0 = 0;              /* set initial match at 0 */
-       OSSR = 0xf;             /* clear status on all timers */
-       setup_irq(IRQ_OST0, &timer_irq);
-       OIER |= OIER_E0;        /* enable match on timer 0 to cause interrupts */
-       OSCR = 0;               /* initialize free-running timer, force first match */
-}
-
diff --git a/include/asm-arm/arch-rpc/time.h b/include/asm-arm/arch-rpc/time.h
deleted file mode 100644 (file)
index 1df6a12..0000000
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- *  linux/include/asm-arm/arch-rpc/time.h
- *
- *  Copyright (C) 1996-2000 Russell King.
- *
- * 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.
- *
- *  Changelog:
- *   24-Sep-1996 RMK   Created
- *   10-Oct-1996 RMK   Brought up to date with arch-sa110eval
- *   04-Dec-1997 RMK   Updated for new arch/arm/time.c
- */
-extern void ioctime_init(void);
-
-static irqreturn_t
-timer_interrupt(int irq, void *dev_id, struct pt_regs *regs)
-{
-       do_timer(regs);
-       do_set_rtc();
-       do_profile(regs);
-
-       return IRQ_HANDLED;
-}
-
-/*
- * Set up timer interrupt.
- */
-void __init time_init(void)
-{
-       ioctime_init();
-
-       timer_irq.handler = timer_interrupt;
-
-       setup_irq(IRQ_TIMER, &timer_irq);
-}
diff --git a/include/asm-arm/arch-s3c2410/time.h b/include/asm-arm/arch-s3c2410/time.h
deleted file mode 100644 (file)
index 8aab343..0000000
+++ /dev/null
@@ -1,173 +0,0 @@
-/* linux/include/asm-arm/arch-s3c2410/time.h
- *
- *  Copyright (C) 2003 Simtec Electronics <linux@simtec.co.uk>
- *    Ben Dooks, <ben@simtec.co.uk>
- *
- * 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
- */
-
-#include <asm/system.h>
-#include <asm/leds.h>
-#include <asm/mach-types.h>
-
-#include <asm/io.h>
-#include <asm/arch/map.h>
-#include <asm/arch/regs-timer.h>
-
-extern unsigned long (*gettimeoffset)(void);
-
-static unsigned long timer_startval;
-static unsigned long timer_ticks_usec;
-
-#ifdef CONFIG_S3C2410_RTC
-extern void s3c2410_rtc_check();
-#endif
-
-/* with an 12MHz clock, we get 12 ticks per-usec
- */
-
-
-/***
- * Returns microsecond  since last clock interrupt.  Note that interrupts
- * will have been disabled by do_gettimeoffset()
- * IRQs are disabled before entering here from do_gettimeofday()
- */
-static unsigned long s3c2410_gettimeoffset (void)
-{
-       unsigned long tdone;
-       unsigned long usec;
-
-       /* work out how many ticks have gone since last timer interrupt */
-
-       tdone = timer_startval - __raw_readl(S3C2410_TCNTO(4));
-
-       /* currently, tcnt is in 12MHz units, but this may change
-        * for non-bast machines...
-        */
-
-       usec = tdone / timer_ticks_usec;
-
-       return usec;
-}
-
-
-/*
- * IRQ handler for the timer
- */
-static irqreturn_t
-s3c2410_timer_interrupt(int irq, void *dev_id, struct pt_regs *regs)
-{
-       do_leds();
-       do_timer(regs);
-
-       do_set_rtc();
-       //s3c2410_rtc_check();
-       do_profile(regs);
-
-       return IRQ_HANDLED;
-}
-
-/*
- * Set up timer interrupt, and return the current time in seconds.
- */
-
-/* currently we only use timer4, as it is the only timer which has no
- * other function that can be exploited externally
-*/
-
-void __init time_init (void)
-{
-       unsigned long tcon;
-       unsigned long tcnt;
-       unsigned long tcfg1;
-       unsigned long tcfg0;
-
-       gettimeoffset = s3c2410_gettimeoffset;
-       timer_irq.handler = s3c2410_timer_interrupt;
-
-       tcnt = 0xffff;  /* default value for tcnt */
-
-       /* read the current timer configuration bits */
-
-       tcon = __raw_readl(S3C2410_TCON);
-       tcfg1 = __raw_readl(S3C2410_TCFG1);
-       tcfg0 = __raw_readl(S3C2410_TCFG0);
-
-       /* configure the system for whichever machine is in use */
-
-       if (machine_is_bast() || machine_is_vr1000()) {
-               timer_ticks_usec = 12;        /* timer is at 12MHz */
-               tcnt = (timer_ticks_usec * (1000*1000)) / HZ;
-       }
-
-       /* for the h1940, we use the pclk from the core to generate
-        * the timer values. since 67.5MHz is not a value we can directly
-        * generate the timer value from, we need to pre-scale and
-        * divied before using it.
-        *
-        * overall divsior to get 200Hz is 337500
-        *   we can fit tcnt if we pre-scale by 6, producing a tick rate
-        *   of 11.25MHz, and a tcnt of 56250.
-        */
-
-       if (machine_is_h1940() || machine_is_smdk2410() ) {
-               timer_ticks_usec = s3c2410_pclk / (1000*1000);
-               timer_ticks_usec /= 6;
-
-               tcfg1 &= ~S3C2410_TCFG1_MUX4_MASK;
-               tcfg1 |= S3C2410_TCFG1_MUX4_DIV2;
-
-               tcfg0 &= ~S3C2410_TCFG_PRESCALER1_MASK;
-               tcfg0 |= ((6 - 1) / 2) << S3C2410_TCFG_PRESCALER1_SHIFT;
-
-               tcnt = (s3c2410_pclk / 6) / HZ;
-       }
-
-
-       printk("setup_timer tcon=%08lx, tcnt %04lx, tcfg %08lx,%08lx\n",
-              tcon, tcnt, tcfg0, tcfg1);
-
-       /* check to see if timer is within 16bit range... */
-       if (tcnt > 0xffff) {
-               panic("setup_timer: HZ is too small, cannot configure timer!");
-               return;
-       }
-
-       __raw_writel(tcfg1, S3C2410_TCFG1);
-       __raw_writel(tcfg0, S3C2410_TCFG0);
-
-       timer_startval = tcnt;
-       __raw_writel(tcnt, S3C2410_TCNTB(4));
-
-       /* ensure timer is stopped... */
-
-       tcon &= ~(7<<20);
-       tcon |= S3C2410_TCON_T4RELOAD;
-       tcon |= S3C2410_TCON_T4MANUALUPD;
-
-       __raw_writel(tcon, S3C2410_TCON);
-       __raw_writel(tcnt, S3C2410_TCNTB(4));
-       __raw_writel(tcnt, S3C2410_TCMPB(4));
-
-       setup_irq(IRQ_TIMER4, &timer_irq);
-
-       /* start the timer running */
-       tcon |= S3C2410_TCON_T4START;
-       tcon &= ~S3C2410_TCON_T4MANUALUPD;
-       __raw_writel(tcon, S3C2410_TCON);
-}
-
-
-
diff --git a/include/asm-arm/arch-sa1100/time.h b/include/asm-arm/arch-sa1100/time.h
deleted file mode 100644 (file)
index d962626..0000000
+++ /dev/null
@@ -1,111 +0,0 @@
-/*
- * linux/include/asm-arm/arch-sa1100/time.h
- *
- * Copyright (C) 1998 Deborah Wallach.
- * Twiddles  (C) 1999  Hugo Fiennes <hugo@empeg.com>
- * 
- * 2000/03/29 (C) Nicolas Pitre <nico@cam.org>
- *     Rewritten: big cleanup, much simpler, better HZ accuracy.
- *
- */
-
-
-#define RTC_DEF_DIVIDER                (32768 - 1)
-#define RTC_DEF_TRIM            0
-
-static unsigned long __init sa1100_get_rtc_time(void)
-{
-       /*
-        * According to the manual we should be able to let RTTR be zero
-        * and then a default diviser for a 32.768KHz clock is used.
-        * Apparently this doesn't work, at least for my SA1110 rev 5.
-        * If the clock divider is uninitialized then reset it to the
-        * default value to get the 1Hz clock.
-        */
-       if (RTTR == 0) {
-               RTTR = RTC_DEF_DIVIDER + (RTC_DEF_TRIM << 16);
-               printk(KERN_WARNING "Warning: uninitialized Real Time Clock\n");
-               /* The current RTC value probably doesn't make sense either */
-               RCNR = 0;
-               return 0;
-       }
-       return RCNR;
-}
-
-static int sa1100_set_rtc(void)
-{
-       unsigned long current_time = xtime.tv_sec;
-
-       if (RTSR & RTSR_ALE) {
-               /* make sure not to forward the clock over an alarm */
-               unsigned long alarm = RTAR;
-               if (current_time >= alarm && alarm >= RCNR)
-                       return -ERESTARTSYS;
-       }
-       RCNR = current_time;
-       return 0;
-}
-
-/* IRQs are disabled before entering here from do_gettimeofday() */
-static unsigned long sa1100_gettimeoffset (void)
-{
-       unsigned long ticks_to_match, elapsed, usec;
-
-       /* Get ticks before next timer match */
-       ticks_to_match = OSMR0 - OSCR;
-
-       /* We need elapsed ticks since last match */
-       elapsed = LATCH - ticks_to_match;
-
-       /* Now convert them to usec */
-       usec = (unsigned long)(elapsed * (tick_nsec / 1000))/LATCH;
-
-       return usec;
-}
-
-/*
- * We will be entered with IRQs enabled.
- *
- * Loop until we get ahead of the free running timer.
- * This ensures an exact clock tick count and time accuracy.
- * IRQs are disabled inside the loop to ensure coherence between
- * lost_ticks (updated in do_timer()) and the match reg value, so we
- * can use do_gettimeofday() from interrupt handlers.
- */
-static irqreturn_t
-sa1100_timer_interrupt(int irq, void *dev_id, struct pt_regs *regs)
-{
-       unsigned int next_match;
-
-       do {
-               do_leds();
-               do_timer(regs);
-               OSSR = OSSR_M0;  /* Clear match on timer 0 */
-               next_match = (OSMR0 += LATCH);
-               do_set_rtc();
-       } while ((signed long)(next_match - OSCR) <= 0);
-
-       do_profile(regs);
-
-       return IRQ_HANDLED;
-}
-
-void __init time_init(void)
-{
-       struct timespec tv;
-
-       gettimeoffset = sa1100_gettimeoffset;
-       set_rtc = sa1100_set_rtc;
-
-       tv.tv_nsec = 0;
-       tv.tv_sec = sa1100_get_rtc_time();
-       do_settimeofday(&tv);
-
-       timer_irq.handler = sa1100_timer_interrupt;
-       OSMR0 = 0;              /* set initial match at 0 */
-       OSSR = 0xf;             /* clear status on all timers */
-       setup_irq(IRQ_OST0, &timer_irq);
-       OIER |= OIER_E0;        /* enable match on timer 0 to cause interrupts */
-       OSCR = 0;               /* initialize free-running timer, force first match */
-}
-
diff --git a/include/asm-arm/arch-shark/time.h b/include/asm-arm/arch-shark/time.h
deleted file mode 100644 (file)
index 66e4525..0000000
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * linux/include/asm-arm/arch-shark/time.h
- *
- * by Alexander Schulz
- *
- * derived from include/asm-arm/arch-ebsa110/time.h
- * Copyright (c) 1996,1997,1998 Russell King.
- */
-
-#include <asm/leds.h>
-#include <asm/param.h>
-
-#define IRQ_TIMER 0
-#define HZ_TIME ((1193180 + HZ/2) / HZ)
-
-static irqreturn_t
-timer_interrupt(int irq, void *dev_id, struct pt_regs *regs)
-{
-       do_leds();
-       do_timer(regs);
-       do_profile(regs);
-
-       return IRQ_HANDLED;
-}
-
-/*
- * Set up timer interrupt, and return the current time in seconds.
- */
-void __init time_init(void)
-{
-        unsigned long flags;
-
-       outb(0x34, 0x43);               /* binary, mode 0, LSB/MSB, Ch 0 */
-       outb(HZ_TIME & 0xff, 0x40);     /* LSB of count */
-       outb(HZ_TIME >> 8, 0x40);
-
-       timer_irq.handler = timer_interrupt;
-       setup_irq(IRQ_TIMER, &timer_irq);
-}
diff --git a/include/asm-arm/arch-tbox/dma.h b/include/asm-arm/arch-tbox/dma.h
deleted file mode 100644 (file)
index 1d5d391..0000000
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * linux/include/asm-arm/arch-tbox/dma.h
- *
- * Architecture DMA routines.  We have to contend with the bizarre DMA
- * machine built into the Tbox hardware.
- *
- * Copyright (C) 1998 Philip Blundell
- */
-
-/*
- * 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.
- */
-
-/*
- * DMA channel definitions.  Some of these are physically strange but
- * we sort it out inside dma.c so the user never has to care.  The
- * exception is the double-buffering which we can't really abstract
- * away sensibly.
- */
-#define DMA_VIDEO                      0
-#define DMA_MPEG_B                     1
-#define DMA_AUDIO_B                    2
-#define DMA_ASHRX_B                    3
-#define DMA_ASHTX                      4
-#define DMA_MPEG                       5
-#define DMA_AUDIO                      6
-#define DMA_ASHRX                      7
-
-#define MAX_DMA_CHANNELS               0       /* XXX */
-
-/*
- * This is the maximum DMA address that can be DMAd to.
- */
-#define MAX_DMA_ADDRESS                0xffffffff
diff --git a/include/asm-arm/arch-tbox/hardware.h b/include/asm-arm/arch-tbox/hardware.h
deleted file mode 100644 (file)
index 9aa3f45..0000000
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * linux/include/asm-arm/arch-tbox/hardware.h
- *
- * Copyright (C) 1998, 1999, 2000 Philip Blundell
- * Copyright (C) 2000 FutureTV Labs Ltd
- *
- * This file contains the hardware definitions of the Tbox
- */
-
-/*
- * 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 __ASM_ARCH_HARDWARE_H
-#define __ASM_ARCH_HARDWARE_H
-
-/*    Logical    Physical
- * 0xfff00000  0x00100000      I/O
- * 0xfff00000  0x00100000        Expansion CS0
- * 0xfff10000  0x00110000        DMA
- * 0xfff20000  0x00120000        C-Cube
- * 0xfff30000  0x00130000        FPGA 1
- * 0xfff40000  0x00140000        UART 2
- * 0xfff50000  0x00150000        UART 1
- * 0xfff60000  0x00160000        CS8900
- * 0xfff70000  0x00170000        INTCONT
- * 0xfff80000  0x00180000        RAMDAC
- * 0xfff90000  0x00190000        Control 0
- * 0xfffa0000  0x001a0000        Control 1
- * 0xfffb0000  0x001b0000        Control 2
- * 0xfffc0000  0x001c0000        FPGA 2
- * 0xfffd0000  0x001d0000        INTRESET
- * 0xfffe0000  0x001e0000        C-Cube DMA throttle
- * 0xffff0000  0x001f0000        Expansion CS1
- * 0xffe00000  0x82000000      cache flush
- */
-
-/*
- * Mapping areas
- */
-#define IO_BASE                        0xfff00000
-#define IO_START               0x00100000
-#define FLUSH_BASE             0xffe00000
-
-#define INTCONT                        0xfff70000
-
-#define FPGA1CONT              0xffff3000
-
-/*
- * RAM definitions
- */
-#define RAM_BASE               0x80000000
-#define FLUSH_BASE_PHYS                0x82000000
-
-#define UNCACHEABLE_ADDR       INTCONT
-
-#endif
diff --git a/include/asm-arm/arch-tbox/io.h b/include/asm-arm/arch-tbox/io.h
deleted file mode 100644 (file)
index 8697985..0000000
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * linux/include/asm-arm/arch-tbox/io.h
- *
- * Copyright (C) 1996-1999 Russell King
- * Copyright (C) 1998, 1999 Philip Blundell
- *
- */
-#ifndef __ASM_ARM_ARCH_IO_H
-#define __ASM_ARM_ARCH_IO_H
-
-#define IO_SPACE_LIMIT 0xffffffff
-
-#define __io(_x)               ((_x) << 2)
-
-/*
- * Generic virtual read/write
- */
-static inline unsigned int __arch_getw(unsigned long a)
-{
-       unsigned int value;
-       __asm__ __volatile__("ldr%?h    %0, [%1, #0]    @ getw"
-               : "=&r" (value)
-               : "r" (a));
-       return value;
-}
-
-static inline void __arch_putw(unsigned int value, unsigned long a)
-{
-       __asm__ __volatile__("str%?h    %0, [%1, #0]    @ putw"
-               : : "r" (value), "r" (a));
-}
-
-/* Idem, for devices on the upper byte lanes */
-#define inb_u(p)               __arch_getb(__io_pc(p) + 2)
-#define inw_u(p)               __arch_getw(__io_pc(p) + 2)
-
-#define outb_u(v,p)            __arch_putb(v,__io_pc(p) + 2)
-#define outw_u(v,p)            __arch_putw(v,__io_pc(p) + 2)
-
-#endif
diff --git a/include/asm-arm/arch-tbox/irqs.h b/include/asm-arm/arch-tbox/irqs.h
deleted file mode 100644 (file)
index 1ee5eba..0000000
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * linux/include/asm-arm/arch-tbox/irqs.h
- *
- * Copyright (C) 1998, 2000 Philip Blundell
- */
-
-/*
- * 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.
- */
-
-#define IRQ_MPEGDMA            0
-#define IRQ_ASHTX              1
-#define IRQ_ASHRX              2
-#define IRQ_VSYNC              3
-#define IRQ_HSYNC              4
-#define IRQ_MPEG               5
-#define IRQ_UART2              6
-#define IRQ_UART1              7
-#define IRQ_ETHERNET           8
-#define IRQ_TIMER              9
-#define IRQ_AUDIODMA           10
-/* bit 11 used for video field ident */
-#define IRQ_EXPMODCS0          12
-#define IRQ_EXPMODCS1          13
-
-#define irq_canonicalize(i)    (i)
diff --git a/include/asm-arm/arch-tbox/memory.h b/include/asm-arm/arch-tbox/memory.h
deleted file mode 100644 (file)
index a204794..0000000
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * linux/include/asm-arm/arch-tbox/memory.h
- *
- * Copyright (c) 1996-1999 Russell King.
- * Copyright (c) 1998-1999 Phil Blundell
- */
-#ifndef __ASM_ARCH_MEMORY_H
-#define __ASM_ARCH_MEMORY_H
-
-/*
- * Physical DRAM offset.
- */
-#define PHYS_OFFSET            (0x80000000UL)
-
-/*
- * Bus view is the same as physical view
- */
-#define __virt_to_bus(x)       __virt_to_phys(x)
-#define __bus_to_virt(x)       __phys_to_virt(x)
-
-#endif
diff --git a/include/asm-arm/arch-tbox/param.h b/include/asm-arm/arch-tbox/param.h
deleted file mode 100644 (file)
index 4b47fe3..0000000
+++ /dev/null
@@ -1,4 +0,0 @@
-/*
- *  linux/include/asm-arm/arch-tbox/param.h
- */
-#define __KERNEL_HZ 1000
diff --git a/include/asm-arm/arch-tbox/serial.h b/include/asm-arm/arch-tbox/serial.h
deleted file mode 100644 (file)
index 7e4aff9..0000000
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * linux/include/asm-arm/arch-tbox/serial.h
- *
- * Copyright (c) 1996 Russell King.
- * Copyright (c) 1998 Phil Blundell
- *
- * Changelog:
- *  15-10-1996 RMK     Created
- *  09-06-1998  PJB    tbox version
- */
-#ifndef __ASM_ARCH_SERIAL_H
-#define __ASM_ARCH_SERIAL_H
-
-/*
- * This assumes you have a 1.8432 MHz clock for your UART.
- *
- * It'd be nice if someone built a serial card with a 24.576 MHz
- * clock, since the 16550A is capable of handling a top speed of 1.5
- * megabits/second; but this requires the faster clock.
- */
-#define BASE_BAUD (1843200 / 16)
-
-#define STD_COM_FLAGS (ASYNC_BOOT_AUTOCONF | ASYNC_SKIP_TEST)
-
-     /* UART CLK        PORT  IRQ     FLAGS        */
-#define STD_SERIAL_PORT_DEFNS \
-       { 0, BASE_BAUD, 0xffff4000 >> 2, 6, STD_COM_FLAGS }, /* ttyS0 */ \
-       { 0, BASE_BAUD, 0xffff5000 >> 2, 7, STD_COM_FLAGS }, /* ttyS1 */
-
-#define EXTRA_SERIAL_PORT_DEFNS
-
-#endif
diff --git a/include/asm-arm/arch-tbox/system.h b/include/asm-arm/arch-tbox/system.h
deleted file mode 100644 (file)
index da2cb88..0000000
+++ /dev/null
@@ -1,16 +0,0 @@
-/*
- * linux/include/asm-arm/arch-tbox/system.h
- *
- * Copyright (c) 1996-1999 Russell King.
- */
-#ifndef __ASM_ARCH_SYSTEM_H
-#define __ASM_ARCH_SYSTEM_H
-
-static inline void arch_idle(void)
-{
-       cpu_do_idle();
-}
-
-#define arch_reset(mode)       do { } while (0)
-
-#endif
diff --git a/include/asm-arm/arch-tbox/time.h b/include/asm-arm/arch-tbox/time.h
deleted file mode 100644 (file)
index 4617871..0000000
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * linux/include/asm-arm/arch-tbox/time.h
- *
- * Copyright (c) 1997, 1999 Phil Blundell.
- * Copyright (c) 2000 FutureTV Labs Ltd
- *
- * Tbox has no real-time clock -- we get millisecond ticks to update
- * our soft copy.
- */
-
-/*
- * 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 <asm/io.h>
-#include <asm/hardware.h>
-
-#define update_rtc()
-
-static irqreturn_t
-timer_interrupt (int irq, void *dev_id, struct pt_regs *regs)
-{
-       /* Clear irq */
-       __raw_writel(1, FPGA1CONT + 0xc); 
-       __raw_writel(0, FPGA1CONT + 0xc);
-
-       do_timer(regs);
-
-       return IRQ_HANDLED;
-}
-
-void __init time_init(void)
-{
-       timer_irq.handler = timer_interrupt;
-       setup_irq(IRQ_TIMER, &timer_irq);
-}
diff --git a/include/asm-arm/arch-tbox/timex.h b/include/asm-arm/arch-tbox/timex.h
deleted file mode 100644 (file)
index c5489cd..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-/*
- * linux/include/asm-arm/arch-tbox/timex.h
- *
- * Tbox timex specifications
- *
- * Copyright (C) 1999 Philip Blundell
- */
-
diff --git a/include/asm-arm/arch-tbox/uncompress.h b/include/asm-arm/arch-tbox/uncompress.h
deleted file mode 100644 (file)
index 17a5034..0000000
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * linux/include/asm-arm/arch-nexuspci/uncompress.h
- *  from linux/include/asm-arm/arch-ebsa110/uncompress.h
- *
- * Copyright (C) 1996,1997,1998 Russell King
- * Copyright (C) 1998, 1999 Phil Blundell
- */
-
-#include <asm/io.h>
-
-#define UARTBASE 0x00400000
-
-/*
- * This does not append a newline
- */
-static void puts(const char *s)
-{
-  while (*s)
-  {
-    char c = *(s++);
-    while (!(__raw_readb(UARTBASE + 0x14) & 0x20));
-    __raw_writeb(c, UARTBASE);
-    if (c == 10) {
-      while (!(__raw_readb(UARTBASE + 0x14) & 0x20));
-      __raw_writeb(13, UARTBASE);
-    }
-  }
-}
-
-/*
- * nothing to do
- */
-#define arch_decomp_setup()
-
-/*
- * Stroke the watchdog so we don't get reset during decompression.
- */
-#define arch_decomp_wdog()                             \
-       do {                                            \
-       __raw_writel(1, 0xa00000);                      \
-       __raw_writel(0, 0xa00000);                      \
-       } while (0)
diff --git a/include/asm-arm/arch-tbox/vmalloc.h b/include/asm-arm/arch-tbox/vmalloc.h
deleted file mode 100644 (file)
index da4a5c0..0000000
+++ /dev/null
@@ -1,15 +0,0 @@
-/*
- * linux/include/asm-arm/arch-tbox/vmalloc.h
- */
-
-/*
- * Just any arbitrary offset to the start of the vmalloc VM area: the
- * current 8MB value just means that there will be a 8MB "hole" after the
- * physical memory until the kernel virtual memory starts.  That means that
- * any out-of-bounds memory accesses will hopefully be caught.
- * The vmalloc() routines leaves a hole of 4kB between each vmalloced
- * area for the same reason. ;)
- */
-#define VMALLOC_OFFSET   (8*1024*1024)
-#define VMALLOC_START    (((unsigned long)high_memory + VMALLOC_OFFSET) & ~(VMALLOC_OFFSET-1))
-#define VMALLOC_END       (PAGE_OFFSET + 0x10000000)
diff --git a/include/asm-arm/arch-versatile/time.h b/include/asm-arm/arch-versatile/time.h
deleted file mode 100644 (file)
index 7d97d95..0000000
+++ /dev/null
@@ -1,158 +0,0 @@
-/*
- *  linux/include/asm-arm/arch-versatile/time.h
- *
- * 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
- */
-#include <asm/system.h>
-#include <asm/leds.h>
-
-/*
- * Where is the timer (VA)?
- */
-#define TIMER0_VA_BASE          IO_ADDRESS(VERSATILE_TIMER0_1_BASE)
-#define TIMER1_VA_BASE         (IO_ADDRESS(VERSATILE_TIMER0_1_BASE) + 0x20)
-#define TIMER2_VA_BASE          IO_ADDRESS(VERSATILE_TIMER2_3_BASE)
-#define TIMER3_VA_BASE         (IO_ADDRESS(VERSATILE_TIMER2_3_BASE) + 0x20)
-#define VA_IC_BASE              IO_ADDRESS(VERSATILE_VIC_BASE) 
-
-/*
- * How long is the timer interval?
- */
-#define TIMER_INTERVAL (TICKS_PER_uSEC * mSEC_10)
-#if TIMER_INTERVAL >= 0x100000
-#define TIMER_RELOAD   (TIMER_INTERVAL >> 8)           /* Divide by 256 */
-#define TIMER_CTRL     0x88                            /* Enable, Clock / 256 */
-#define TICKS2USECS(x) (256 * (x) / TICKS_PER_uSEC)
-#elif TIMER_INTERVAL >= 0x10000
-#define TIMER_RELOAD   (TIMER_INTERVAL >> 4)           /* Divide by 16 */
-#define TIMER_CTRL     0x84                            /* Enable, Clock / 16 */
-#define TICKS2USECS(x) (16 * (x) / TICKS_PER_uSEC)
-#else
-#define TIMER_RELOAD   (TIMER_INTERVAL)
-#define TIMER_CTRL     0x80                            /* Enable */
-#define TICKS2USECS(x) ((x) / TICKS_PER_uSEC)
-#endif
-
-#define TIMER_CTRL_IE  (1 << 5)        /* Interrupt Enable */
-
-/*
- * What does it look like?
- */
-typedef struct TimerStruct {
-       unsigned long TimerLoad;
-       unsigned long TimerValue;
-       unsigned long TimerControl;
-       unsigned long TimerClear;
-} TimerStruct_t;
-
-extern unsigned long (*gettimeoffset)(void);
-
-/*
- * Returns number of ms since last clock interrupt.  Note that interrupts
- * will have been disabled by do_gettimeoffset()
- */
-static unsigned long versatile_gettimeoffset(void)
-{
-       volatile TimerStruct_t *timer0 = (TimerStruct_t *)TIMER0_VA_BASE;
-       unsigned long ticks1, ticks2, status;
-
-       /*
-        * Get the current number of ticks.  Note that there is a race
-        * condition between us reading the timer and checking for
-        * an interrupt.  We get around this by ensuring that the
-        * counter has not reloaded between our two reads.
-        */
-       ticks2 = timer0->TimerValue & 0xffff;
-       do {
-               ticks1 = ticks2;
-               status = __raw_readl(VA_IC_BASE + VIC_IRQ_RAW_STATUS);
-               ticks2 = timer0->TimerValue & 0xffff;
-       } while (ticks2 > ticks1);
-
-       /*
-        * Number of ticks since last interrupt.
-        */
-       ticks1 = TIMER_RELOAD - ticks2;
-
-       /*
-        * Interrupt pending?  If so, we've reloaded once already.
-        *
-        * FIXME: Need to check this is effectively timer 0 that expires
-        */
-       if (status & IRQMASK_TIMERINT0_1)
-               ticks1 += TIMER_RELOAD;
-
-       /*
-        * Convert the ticks to usecs
-        */
-       return TICKS2USECS(ticks1);
-}
-
-/*
- * IRQ handler for the timer
- */
-static irqreturn_t versatile_timer_interrupt(int irq, void *dev_id, struct pt_regs *regs)
-{
-       volatile TimerStruct_t *timer0 = (volatile TimerStruct_t *)TIMER0_VA_BASE;
-
-       // ...clear the interrupt
-       timer0->TimerClear = 1;
-
-       do_leds();
-       do_timer(regs);
-       do_profile(regs);
-
-       return IRQ_HANDLED;
-}
-
-/*
- * Set up timer interrupt, and return the current time in seconds.
- */
-void __init time_init(void)
-{
-       volatile TimerStruct_t *timer0 = (volatile TimerStruct_t *)TIMER0_VA_BASE;
-       volatile TimerStruct_t *timer1 = (volatile TimerStruct_t *)TIMER1_VA_BASE;
-       volatile TimerStruct_t *timer2 = (volatile TimerStruct_t *)TIMER2_VA_BASE;
-       volatile TimerStruct_t *timer3 = (volatile TimerStruct_t *)TIMER3_VA_BASE;
-
-       /* 
-        * set clock frequency: 
-        *      VERSATILE_REFCLK is 32KHz
-        *      VERSATILE_TIMCLK is 1MHz
-        */
-       *(volatile unsigned int *)IO_ADDRESS(VERSATILE_SCTL_BASE) |= 
-         ((VERSATILE_TIMCLK << VERSATILE_TIMER1_EnSel) | (VERSATILE_TIMCLK << VERSATILE_TIMER2_EnSel) | 
-          (VERSATILE_TIMCLK << VERSATILE_TIMER3_EnSel) | (VERSATILE_TIMCLK << VERSATILE_TIMER4_EnSel));
-
-       timer_irq.handler = versatile_timer_interrupt;
-
-       /*
-        * Initialise to a known state (all timers off)
-        */
-       timer0->TimerControl = 0;
-       timer1->TimerControl = 0;
-       timer2->TimerControl = 0;
-       timer3->TimerControl = 0;
-
-       timer0->TimerLoad    = TIMER_RELOAD;
-       timer0->TimerValue   = TIMER_RELOAD;
-       timer0->TimerControl = TIMER_CTRL | 0x40 | TIMER_CTRL_IE;  /* periodic + IE */
-
-       /* 
-        * Make irqs happen for the system timer
-        */
-       setup_irq(IRQ_TIMERINT0_1, &timer_irq);
-       gettimeoffset = versatile_gettimeoffset;
-}
diff --git a/include/asm-arm/cpumask.h b/include/asm-arm/cpumask.h
deleted file mode 100644 (file)
index e3cf01f..0000000
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef _ASM_ARM_CPUMASK_H
-#define _ASM_ARM_CPUMASK_H
-
-#include <asm-generic/cpumask.h>
-
-#endif /* _ASM_ARM_CPUMASK_H */
diff --git a/include/asm-arm26/cpumask.h b/include/asm-arm26/cpumask.h
deleted file mode 100644 (file)
index d181df4..0000000
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef _ASM_ARM26_CPUMASK_H
-#define _ASM_ARM26_CPUMASK_H
-
-#include <asm-generic/cpumask.h>
-
-#endif /* _ASM_ARM26_CPUMASK_H */
diff --git a/include/asm-cris/cpumask.h b/include/asm-cris/cpumask.h
deleted file mode 100644 (file)
index 123b032..0000000
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef _ASM_CRIS_CPUMASK_H
-#define _ASM_CRIS_CPUMASK_H
-
-#include <asm-generic/cpumask.h>
-
-#endif /* _ASM_CRIS_CPUMASK_H */
diff --git a/include/asm-generic/cpumask.h b/include/asm-generic/cpumask.h
deleted file mode 100644 (file)
index a510325..0000000
+++ /dev/null
@@ -1,40 +0,0 @@
-#ifndef __ASM_GENERIC_CPUMASK_H
-#define __ASM_GENERIC_CPUMASK_H
-
-#include <linux/config.h>
-#include <linux/kernel.h>
-#include <linux/threads.h>
-#include <linux/types.h>
-#include <linux/bitmap.h>
-
-#if NR_CPUS > BITS_PER_LONG && NR_CPUS != 1
-#define CPU_ARRAY_SIZE         BITS_TO_LONGS(NR_CPUS)
-
-struct cpumask
-{
-       unsigned long mask[CPU_ARRAY_SIZE];
-};
-
-typedef struct cpumask cpumask_t;
-
-#else
-typedef unsigned long cpumask_t;
-#endif
-
-#ifdef CONFIG_SMP
-#if NR_CPUS > BITS_PER_LONG
-#include <asm-generic/cpumask_array.h>
-#else
-#include <asm-generic/cpumask_arith.h>
-#endif
-#else
-#include <asm-generic/cpumask_up.h>
-#endif
-
-#if NR_CPUS <= 4*BITS_PER_LONG
-#include <asm-generic/cpumask_const_value.h>
-#else
-#include <asm-generic/cpumask_const_reference.h>
-#endif
-
-#endif /* __ASM_GENERIC_CPUMASK_H */
diff --git a/include/asm-generic/cpumask_arith.h b/include/asm-generic/cpumask_arith.h
deleted file mode 100644 (file)
index b4d25ac..0000000
+++ /dev/null
@@ -1,49 +0,0 @@
-#ifndef __ASM_GENERIC_CPUMASK_ARITH_H
-#define __ASM_GENERIC_CPUMASK_ARITH_H
-
-/*
- * Arithmetic type -based cpu bitmaps. A single unsigned long is used
- * to contain the whole cpu bitmap.
- */
-
-#define cpu_set(cpu, map)              set_bit(cpu, &(map))
-#define cpu_clear(cpu, map)            clear_bit(cpu, &(map))
-#define cpu_isset(cpu, map)            test_bit(cpu, &(map))
-#define cpu_test_and_set(cpu, map)     test_and_set_bit(cpu, &(map))
-
-#define cpus_and(dst,src1,src2)                do { dst = (src1) & (src2); } while (0)
-#define cpus_or(dst,src1,src2)         do { dst = (src1) | (src2); } while (0)
-#define cpus_clear(map)                        do { map = 0; } while (0)
-#define cpus_complement(map)           do { map = ~(map); } while (0)
-#define cpus_equal(map1, map2)         ((map1) == (map2))
-#define cpus_empty(map)                        ((map) == 0)
-#define cpus_addr(map)                 (&(map))
-
-#if BITS_PER_LONG == 32
-#define cpus_weight(map)               hweight32(map)
-#elif BITS_PER_LONG == 64
-#define cpus_weight(map)               hweight64(map)
-#endif
-
-#define cpus_shift_right(dst, src, n)  do { dst = (src) >> (n); } while (0)
-#define cpus_shift_left(dst, src, n)   do { dst = (src) << (n); } while (0)
-
-#define any_online_cpu(map)                    \
-({                                             \
-       cpumask_t __tmp__;                      \
-       cpus_and(__tmp__, map, cpu_online_map); \
-       __tmp__ ? first_cpu(__tmp__) : NR_CPUS; \
-})
-
-#define CPU_MASK_ALL   (~((cpumask_t)0) >> (8*sizeof(cpumask_t) - NR_CPUS))
-#define CPU_MASK_NONE  ((cpumask_t)0)
-
-/* only ever use this for things that are _never_ used on large boxen */
-#define cpus_coerce(map)               ((unsigned long)(map))
-#define cpus_promote(map)              ({ map; })
-#define cpumask_of_cpu(cpu)            ({ ((cpumask_t)1) << (cpu); })
-
-#define first_cpu(map)                 find_first_bit(&(map), NR_CPUS)
-#define next_cpu(cpu, map)             find_next_bit(&(map), NR_CPUS, cpu + 1)
-
-#endif /* __ASM_GENERIC_CPUMASK_ARITH_H */
diff --git a/include/asm-generic/cpumask_array.h b/include/asm-generic/cpumask_array.h
deleted file mode 100644 (file)
index ddd6e11..0000000
+++ /dev/null
@@ -1,54 +0,0 @@
-#ifndef __ASM_GENERIC_CPUMASK_ARRAY_H
-#define __ASM_GENERIC_CPUMASK_ARRAY_H
-
-/*
- * Array-based cpu bitmaps. An array of unsigned longs is used to contain
- * the bitmap, and then contained in a structure so it may be passed by
- * value.
- */
-
-#define CPU_ARRAY_SIZE         BITS_TO_LONGS(NR_CPUS)
-
-#define cpu_set(cpu, map)              set_bit(cpu, (map).mask)
-#define cpu_clear(cpu, map)            clear_bit(cpu, (map).mask)
-#define cpu_isset(cpu, map)            test_bit(cpu, (map).mask)
-#define cpu_test_and_set(cpu, map)     test_and_set_bit(cpu, (map).mask)
-
-#define cpus_and(dst,src1,src2)        bitmap_and((dst).mask,(src1).mask, (src2).mask, NR_CPUS)
-#define cpus_or(dst,src1,src2) bitmap_or((dst).mask, (src1).mask, (src2).mask, NR_CPUS)
-#define cpus_clear(map)                bitmap_zero((map).mask, NR_CPUS)
-#define cpus_complement(map)   bitmap_complement((map).mask, NR_CPUS)
-#define cpus_equal(map1, map2) bitmap_equal((map1).mask, (map2).mask, NR_CPUS)
-#define cpus_empty(map)                bitmap_empty(map.mask, NR_CPUS)
-#define cpus_addr(map)         ((map).mask)
-#define cpus_weight(map)               bitmap_weight((map).mask, NR_CPUS)
-#define cpus_shift_right(d, s, n)      bitmap_shift_right((d).mask, (s).mask, n, NR_CPUS)
-#define cpus_shift_left(d, s, n)       bitmap_shift_left((d).mask, (s).mask, n, NR_CPUS)
-#define first_cpu(map)         find_first_bit((map).mask, NR_CPUS)
-#define next_cpu(cpu, map)     find_next_bit((map).mask, NR_CPUS, cpu + 1)
-
-/* only ever use this for things that are _never_ used on large boxen */
-#define cpus_coerce(map)       ((map).mask[0])
-#define cpus_promote(map)      ({ cpumask_t __cpu_mask = CPU_MASK_NONE;\
-                                       __cpu_mask.mask[0] = map;       \
-                                       __cpu_mask;                     \
-                               })
-#define cpumask_of_cpu(cpu)    ({ cpumask_t __cpu_mask = CPU_MASK_NONE;\
-                                       cpu_set(cpu, __cpu_mask);       \
-                                       __cpu_mask;                     \
-                               })
-#define any_online_cpu(map)                    \
-({                                             \
-       cpumask_t __tmp__;                      \
-       cpus_and(__tmp__, map, cpu_online_map); \
-       find_first_bit(__tmp__.mask, NR_CPUS);  \
-})
-
-
-/*
- * um, these need to be usable as static initializers
- */
-#define CPU_MASK_ALL   ((cpumask_t) { {[0 ... CPU_ARRAY_SIZE-1] = ~0UL} })
-#define CPU_MASK_NONE  ((cpumask_t) { {[0 ... CPU_ARRAY_SIZE-1] =  0UL} })
-
-#endif /* __ASM_GENERIC_CPUMASK_ARRAY_H */
diff --git a/include/asm-generic/cpumask_const_reference.h b/include/asm-generic/cpumask_const_reference.h
deleted file mode 100644 (file)
index e98da01..0000000
+++ /dev/null
@@ -1,29 +0,0 @@
-#ifndef __ASM_GENERIC_CPUMASK_CONST_REFERENCE_H
-#define __ASM_GENERIC_CPUMASK_CONST_REFERENCE_H
-
-struct cpumask_ref {
-       const cpumask_t *val;
-};
-
-typedef const struct cpumask_ref cpumask_const_t;
-
-#define mk_cpumask_const(map)          ((cpumask_const_t){ &(map) })
-#define cpu_isset_const(cpu, map)      cpu_isset(cpu, *(map).val)
-
-#define cpus_and_const(dst,src1,src2)  cpus_and(dst,*(src1).val,*(src2).val)
-#define cpus_or_const(dst,src1,src2)   cpus_or(dst,*(src1).val,*(src2).val)
-
-#define cpus_equal_const(map1, map2)   cpus_equal(*(map1).val, *(map2).val)
-
-#define cpus_copy_const(map1, map2)    bitmap_copy((map1).mask, (map2).val->mask, NR_CPUS)
-
-#define cpus_empty_const(map)          cpus_empty(*(map).val)
-#define cpus_weight_const(map)         cpus_weight(*(map).val)
-#define first_cpu_const(map)           first_cpu(*(map).val)
-#define next_cpu_const(cpu, map)       next_cpu(cpu, *(map).val)
-
-/* only ever use this for things that are _never_ used on large boxen */
-#define cpus_coerce_const(map)         cpus_coerce(*(map).val)
-#define any_online_cpu_const(map)      any_online_cpu(*(map).val)
-
-#endif /* __ASM_GENERIC_CPUMASK_CONST_REFERENCE_H */
diff --git a/include/asm-generic/cpumask_const_value.h b/include/asm-generic/cpumask_const_value.h
deleted file mode 100644 (file)
index 16ca16d..0000000
+++ /dev/null
@@ -1,21 +0,0 @@
-#ifndef __ASM_GENERIC_CPUMASK_CONST_VALUE_H
-#define __ASM_GENERIC_CPUMASK_CONST_VALUE_H
-
-typedef const cpumask_t cpumask_const_t;
-
-#define mk_cpumask_const(map)          (map)
-#define cpu_isset_const(cpu, map)      cpu_isset(cpu, map)
-#define cpus_and_const(dst,src1,src2)  cpus_and(dst, src1, src2)
-#define cpus_or_const(dst,src1,src2)   cpus_or(dst, src1, src2)
-#define cpus_equal_const(map1, map2)   cpus_equal(map1, map2)
-#define cpus_empty_const(map)          cpus_empty(map)
-#define cpus_copy_const(map1, map2)    do { map1 = (cpumask_t)map2; } while (0)
-#define cpus_weight_const(map)         cpus_weight(map)
-#define first_cpu_const(map)           first_cpu(map)
-#define next_cpu_const(cpu, map)       next_cpu(cpu, map)
-
-/* only ever use this for things that are _never_ used on large boxen */
-#define cpus_coerce_const(map)         cpus_coerce(map)
-#define any_online_cpu_const(map)      any_online_cpu(map)
-
-#endif /* __ASM_GENERIC_CPUMASK_CONST_VALUE_H */
diff --git a/include/asm-generic/cpumask_up.h b/include/asm-generic/cpumask_up.h
deleted file mode 100644 (file)
index f55c265..0000000
+++ /dev/null
@@ -1,59 +0,0 @@
-#ifndef __ASM_GENERIC_CPUMASK_UP_H
-#define __ASM_GENERIC_CPUMASK_UP_H
-
-#define cpus_coerce(map)       (map)
-
-#define cpu_set(cpu, map)              do { (void)(cpu); cpus_coerce(map) = 1UL; } while (0)
-#define cpu_clear(cpu, map)            do { (void)(cpu); cpus_coerce(map) = 0UL; } while (0)
-#define cpu_isset(cpu, map)            ((void)(cpu), cpus_coerce(map) != 0UL)
-#define cpu_test_and_set(cpu, map)     ((void)(cpu), test_and_set_bit(0, &(map)))
-
-#define cpus_and(dst, src1, src2)                                      \
-       do {                                                            \
-               if (cpus_coerce(src1) && cpus_coerce(src2))             \
-                       cpus_coerce(dst) = 1UL;                         \
-               else                                                    \
-                       cpus_coerce(dst) = 0UL;                         \
-       } while (0)
-
-#define cpus_or(dst, src1, src2)                                       \
-       do {                                                            \
-               if (cpus_coerce(src1) || cpus_coerce(src2))             \
-                       cpus_coerce(dst) = 1UL;                         \
-               else                                                    \
-                       cpus_coerce(dst) = 0UL;                         \
-       } while (0)
-
-#define cpus_clear(map)                        do { cpus_coerce(map) = 0UL; } while (0)
-
-#define cpus_complement(map)                                           \
-       do {                                                            \
-               cpus_coerce(map) = !cpus_coerce(map);                   \
-       } while (0)
-
-#define cpus_equal(map1, map2)         (cpus_coerce(map1) == cpus_coerce(map2))
-#define cpus_empty(map)                        (cpus_coerce(map) == 0UL)
-#define cpus_addr(map)                 (&(map))
-#define cpus_weight(map)               (cpus_coerce(map) ? 1UL : 0UL)
-#define cpus_shift_right(d, s, n)      do { cpus_coerce(d) = 0UL; } while (0)
-#define cpus_shift_left(d, s, n)       do { cpus_coerce(d) = 0UL; } while (0)
-#define first_cpu(map)                 (cpus_coerce(map) ? 0 : 1)
-#define next_cpu(cpu, map)             1
-
-/* only ever use this for things that are _never_ used on large boxen */
-#define cpus_promote(map)                                              \
-       ({                                                              \
-               cpumask_t __tmp__;                                      \
-               cpus_coerce(__tmp__) = map;                             \
-               __tmp__;                                                \
-       })
-#define cpumask_of_cpu(cpu)            ((void)(cpu), cpus_promote(1))
-#define any_online_cpu(map)            (cpus_coerce(map) ? 0 : 1)
-
-/*
- * um, these need to be usable as static initializers
- */
-#define CPU_MASK_ALL   1UL
-#define CPU_MASK_NONE  0UL
-
-#endif /* __ASM_GENERIC_CPUMASK_UP_H */
diff --git a/include/asm-h8300/cpumask.h b/include/asm-h8300/cpumask.h
deleted file mode 100644 (file)
index 3b40385..0000000
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef _ASM_H8300_CPUMASK_H
-#define _ASM_H8300_CPUMASK_H
-
-#include <asm-generic/cpumask.h>
-
-#endif /* _ASM_H8300_CPUMASK_H */
diff --git a/include/asm-h8300/h8300_ne.h b/include/asm-h8300/h8300_ne.h
deleted file mode 100644 (file)
index c797603..0000000
+++ /dev/null
@@ -1,20 +0,0 @@
-/****************************************************************************/
-
-/*
- *     h8300_ne.h -- NE2000 in H8/300H Evalution Board.
- *      
- *     (C) Copyright 2002, Yoshinori Sato <ysato@users.sourceforge.jp>
- */
-
-/****************************************************************************/
-#ifndef        h8300ne_h
-#define        h8300ne_h
-/****************************************************************************/
-
-#define H8300_NE_DEFINE
-#include <asm/machine-depend.h>
-#define NE2000_IRQ_VECTOR      (12 + NE2000_IRQ)
-#undef  H8300_NE_DEFINE
-
-/****************************************************************************/
-#endif /* h8300ne_h */
diff --git a/include/asm-h8300/init.h b/include/asm-h8300/init.h
deleted file mode 100644 (file)
index 6c90804..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
-#ifndef _H8300_INIT_H
-#define _H8300_INIT_H
-
-#define __init __attribute__ ((__section__ (".text.init")))
-#define __initdata __attribute__ ((__section__ (".data.init")))
-/* For assembly routines */
-#define __INIT         .section        ".text.init",#alloc,#execinstr
-#define __FINIT                .previous
-#define __INITDATA     .section        ".data.init",#alloc,#write
-
-#endif
diff --git a/include/asm-i386/cpumask.h b/include/asm-i386/cpumask.h
deleted file mode 100644 (file)
index 8bf5a82..0000000
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef _ASM_I386_CPUMASK_H
-#define _ASM_I386_CPUMASK_H
-
-#include <asm-generic/cpumask.h>
-
-#endif /* _ASM_I386_CPUMASK_H */
diff --git a/include/asm-i386/init.h b/include/asm-i386/init.h
deleted file mode 100644 (file)
index 17d2155..0000000
+++ /dev/null
@@ -1 +0,0 @@
-#error "<asm/init.h> should never be used - use <linux/init.h> instead"
diff --git a/include/asm-i386/mach-pc9800/apm.h b/include/asm-i386/mach-pc9800/apm.h
deleted file mode 100644 (file)
index 54a8ab2..0000000
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
- *  include/asm-i386/mach-pc9800/apm.h
- *
- *  Machine specific APM BIOS functions for NEC PC9800.
- *  Split out from apm.c by Osamu Tomita <tomita@cinet.co.jp>
- */
-
-#ifndef _ASM_APM_H
-#define _ASM_APM_H
-
-#include <linux/apm_bios.h>
-
-#ifdef APM_ZERO_SEGS
-#      define APM_DO_ZERO_SEGS \
-               "pushl %%ds\n\t" \
-               "pushl %%es\n\t" \
-               "xorl %%edx, %%edx\n\t" \
-               "mov %%dx, %%ds\n\t" \
-               "mov %%dx, %%es\n\t" \
-               "mov %%dx, %%fs\n\t" \
-               "mov %%dx, %%gs\n\t"
-#      define APM_DO_POP_SEGS \
-               "popl %%es\n\t" \
-               "popl %%ds\n\t"
-#else
-#      define APM_DO_ZERO_SEGS
-#      define APM_DO_POP_SEGS
-#endif
-
-static inline void apm_bios_call_asm(u32 func, u32 ebx_in, u32 ecx_in,
-                                       u32 *eax, u32 *ebx, u32 *ecx,
-                                       u32 *edx, u32 *esi)
-{
-       /*
-        * N.B. We do NOT need a cld after the BIOS call
-        * because we always save and restore the flags.
-        */
-       __asm__ __volatile__(APM_DO_ZERO_SEGS
-               "pushl %%edi\n\t"
-               "pushl %%ebp\n\t"
-               "pushfl\n\t"
-               "lcall *%%cs:apm_bios_entry\n\t"
-               "setc %%al\n\t"
-               "popl %%ebp\n\t"
-               "popl %%edi\n\t"
-               APM_DO_POP_SEGS
-               : "=a" (*eax), "=b" (*ebx), "=c" (*ecx), "=d" (*edx),
-                 "=S" (*esi)
-               : "a" (func), "b" (ebx_in), "c" (ecx_in)
-               : "memory", "cc");
-}
-
-static inline u8 apm_bios_call_simple_asm(u32 func, u32 ebx_in,
-                                               u32 ecx_in, u32 *eax)
-{
-       int     cx, dx, si;
-       u8      error;
-
-       /*
-        * N.B. We do NOT need a cld after the BIOS call
-        * because we always save and restore the flags.
-        */
-       __asm__ __volatile__(APM_DO_ZERO_SEGS
-               "pushl %%edi\n\t"
-               "pushl %%ebp\n\t"
-               "pushfl\n\t"
-               "lcall *%%cs:apm_bios_entry\n\t"
-               "setc %%bl\n\t"
-               "popl %%ebp\n\t"
-               "popl %%edi\n\t"
-               APM_DO_POP_SEGS
-               : "=a" (*eax), "=b" (error), "=c" (cx), "=d" (dx),
-                 "=S" (si)
-               : "a" (func), "b" (ebx_in), "c" (ecx_in)
-               : "memory", "cc");
-       if (func == APM_FUNC_VERSION)
-               *eax = (*eax & 0xff00) | ((*eax & 0x00f0) >> 4);
-
-       return error;
-}
-
-#endif /* _ASM_APM_H */
diff --git a/include/asm-i386/mach-pc9800/bios_ebda.h b/include/asm-i386/mach-pc9800/bios_ebda.h
deleted file mode 100644 (file)
index 4e9e064..0000000
+++ /dev/null
@@ -1,14 +0,0 @@
-#ifndef _MACH_BIOS_EBDA_H
-#define _MACH_BIOS_EBDA_H
-
-/*
- * PC-9800 has no EBDA.
- * Its BIOS uses 0x40E for other purpose,
- * Not pointer to 4K EBDA area.
- */
-static inline unsigned int get_bios_ebda(void)
-{
-       return 0;       /* 0 means none */
-}
-
-#endif /* _MACH_BIOS_EBDA_H */
diff --git a/include/asm-i386/mach-pc9800/do_timer.h b/include/asm-i386/mach-pc9800/do_timer.h
deleted file mode 100644 (file)
index 0aefe08..0000000
+++ /dev/null
@@ -1,82 +0,0 @@
-/* defines for inline arch setup functions */
-
-#include <asm/apic.h>
-
-/**
- * do_timer_interrupt_hook - hook into timer tick
- * @regs:      standard registers from interrupt
- *
- * Description:
- *     This hook is called immediately after the timer interrupt is ack'd.
- *     It's primary purpose is to allow architectures that don't possess
- *     individual per CPU clocks (like the CPU APICs supply) to broadcast the
- *     timer interrupt as a means of triggering reschedules etc.
- **/
-
-static inline void do_timer_interrupt_hook(struct pt_regs *regs)
-{
-       do_timer(regs);
-/*
- * In the SMP case we use the local APIC timer interrupt to do the
- * profiling, except when we simulate SMP mode on a uniprocessor
- * system, in that case we have to call the local interrupt handler.
- */
-#ifndef CONFIG_X86_LOCAL_APIC
-       x86_do_profile(regs);
-#else
-       if (!using_apic_timer)
-               smp_local_timer_interrupt(regs);
-#endif
-}
-
-
-/* you can safely undefine this if you don't have the Neptune chipset */
-
-#define BUGGY_NEPTUN_TIMER
-
-/**
- * do_timer_overflow - process a detected timer overflow condition
- * @count:     hardware timer interrupt count on overflow
- *
- * Description:
- *     This call is invoked when the jiffies count has not incremented but
- *     the hardware timer interrupt has.  It means that a timer tick interrupt
- *     came along while the previous one was pending, thus a tick was missed
- **/
-static inline int do_timer_overflow(int count)
-{
-       int i;
-
-       spin_lock(&i8259A_lock);
-       /*
-        * This is tricky when I/O APICs are used;
-        * see do_timer_interrupt().
-        */
-       i = inb(0x00);
-       spin_unlock(&i8259A_lock);
-       
-       /* assumption about timer being IRQ0 */
-       if (i & 0x01) {
-               /*
-                * We cannot detect lost timer interrupts ... 
-                * well, that's why we call them lost, don't we? :)
-                * [hmm, on the Pentium and Alpha we can ... sort of]
-                */
-               count -= LATCH;
-       } else {
-#ifdef BUGGY_NEPTUN_TIMER
-               /*
-                * for the Neptun bug we know that the 'latch'
-                * command doesn't latch the high and low value
-                * of the counter atomically. Thus we have to 
-                * substract 256 from the counter 
-                * ... funny, isnt it? :)
-                */
-               
-               count -= 256;
-#else
-               printk("do_slow_gettimeoffset(): hardware timer problem?\n");
-#endif
-       }
-       return count;
-}
diff --git a/include/asm-i386/mach-pc9800/io_ports.h b/include/asm-i386/mach-pc9800/io_ports.h
deleted file mode 100644 (file)
index 4e60742..0000000
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- *  arch/i386/mach-pc9800/io_ports.h
- *
- *  Machine specific IO port address definition for PC-9800.
- *  Written by Osamu Tomita <tomita@cinet.co.jp>
- */
-#ifndef _MACH_IO_PORTS_H
-#define _MACH_IO_PORTS_H
-
-/* i8253A PIT registers */
-#define PIT_MODE               0x77
-#define PIT_CH0                        0x71
-#define PIT_CH2                        0x75
-
-/* i8259A PIC registers */
-#define PIC_MASTER_CMD         0x00
-#define PIC_MASTER_IMR         0x02
-#define PIC_MASTER_ISR         PIC_MASTER_CMD
-#define PIC_MASTER_POLL                PIC_MASTER_ISR
-#define PIC_MASTER_OCW3                PIC_MASTER_ISR
-#define PIC_SLAVE_CMD          0x08
-#define PIC_SLAVE_IMR          0x0a
-
-/* i8259A PIC related values */
-#define PIC_CASCADE_IR         7
-#define MASTER_ICW4_DEFAULT    0x1d
-#define SLAVE_ICW4_DEFAULT     0x09
-#define PIC_ICW4_AEOI          0x02
-
-#endif /* !_MACH_IO_PORTS_H */
diff --git a/include/asm-i386/mach-pc9800/irq_vectors.h b/include/asm-i386/mach-pc9800/irq_vectors.h
deleted file mode 100644 (file)
index 8d9a0fa..0000000
+++ /dev/null
@@ -1,99 +0,0 @@
-/*
- * This file should contain #defines for all of the interrupt vector
- * numbers used by this architecture.
- *
- * In addition, there are some standard defines:
- *
- *     FIRST_EXTERNAL_VECTOR:
- *             The first free place for external interrupts
- *
- *     SYSCALL_VECTOR:
- *             The IRQ vector a syscall makes the user to kernel transition
- *             under.
- *
- *     TIMER_IRQ:
- *             The IRQ number the timer interrupt comes in at.
- *
- *     NR_IRQS:
- *             The total number of interrupt vectors (including all the
- *             architecture specific interrupts) needed.
- *
- *     NR_IRQ_VECTORS:
- *             The total number of IO APIC vector inputs
- *
- */                    
-#ifndef _ASM_IRQ_VECTORS_H
-#define _ASM_IRQ_VECTORS_H
-
-/*
- * IDT vectors usable for external interrupt sources start
- * at 0x20:
- */
-#define FIRST_EXTERNAL_VECTOR  0x20
-
-#define SYSCALL_VECTOR         0x80
-
-/*
- * Vectors 0x20-0x2f are used for ISA interrupts.
- */
-
-/*
- * Special IRQ vectors used by the SMP architecture, 0xf0-0xff
- *
- *  some of the following vectors are 'rare', they are merged
- *  into a single vector (CALL_FUNCTION_VECTOR) to save vector space.
- *  TLB, reschedule and local APIC vectors are performance-critical.
- *
- *  Vectors 0xf0-0xfa are free (reserved for future Linux use).
- */
-#define SPURIOUS_APIC_VECTOR   0xff
-#define ERROR_APIC_VECTOR      0xfe
-#define INVALIDATE_TLB_VECTOR  0xfd
-#define RESCHEDULE_VECTOR      0xfc
-#define CALL_FUNCTION_VECTOR   0xfb
-
-#define THERMAL_APIC_VECTOR    0xf0
-/*
- * Local APIC timer IRQ vector is on a different priority level,
- * to work around the 'lost local interrupt if more than 2 IRQ
- * sources per level' errata.
- */
-#define LOCAL_TIMER_VECTOR     0xef
-
-/*
- * First APIC vector available to drivers: (vectors 0x30-0xee)
- * we start at 0x31 to spread out vectors evenly between priority
- * levels. (0x80 is the syscall vector)
- */
-#define FIRST_DEVICE_VECTOR    0x31
-#define FIRST_SYSTEM_VECTOR    0xef
-
-#define TIMER_IRQ 0
-
-/*
- * 16 8259A IRQ's, 208 potential APIC interrupt sources.
- * Right now the APIC is mostly only used for SMP.
- * 256 vectors is an architectural limit. (we can have
- * more than 256 devices theoretically, but they will
- * have to use shared interrupts)
- * Since vectors 0x00-0x1f are used/reserved for the CPU,
- * the usable vector space is 0x20-0xff (224 vectors)
- */
-#ifdef CONFIG_X86_IO_APIC
-#define NR_IRQS 224
-#else
-#define NR_IRQS 16
-#endif
-
-#define NR_VECTORS 256
-#define NR_IRQ_VECTORS NR_IRQS
-
-#define FPU_IRQ                        8
-
-#define        FIRST_VM86_IRQ          2
-#define LAST_VM86_IRQ          15
-#define invalid_vm86_irq(irq)  ((irq) < 2 || (irq) == 7 || (irq) > 15)
-
-#endif /* _ASM_IRQ_VECTORS_H */
-
-
diff --git a/include/asm-i386/mach-pc9800/mach_reboot.h b/include/asm-i386/mach-pc9800/mach_reboot.h
deleted file mode 100644 (file)
index ab35646..0000000
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- *  arch/i386/mach-pc9800/mach_reboot.h
- *
- *  Machine specific reboot functions for PC-9800.
- *  Written by Osamu Tomita <tomita@cinet.co.jp>
- */
-#ifndef _MACH_REBOOT_H
-#define _MACH_REBOOT_H
-
-#ifdef CMOS_WRITE
-#undef CMOS_WRITE
-#define CMOS_WRITE(a,b)        do{}while(0)
-#endif
-
-static inline void mach_reboot(void)
-{
-       outb(0, 0xf0);          /* signal CPU reset */
-       mdelay(1);
-}
-
-#endif /* !_MACH_REBOOT_H */
diff --git a/include/asm-i386/mach-pc9800/mach_time.h b/include/asm-i386/mach-pc9800/mach_time.h
deleted file mode 100644 (file)
index 971a9db..0000000
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- *  include/asm-i386/mach-pc9800/mach_time.h
- *
- *  Machine specific set RTC function for PC-9800.
- *  Written by Osamu Tomita <tomita@cinet.co.jp>
- */
-#ifndef _MACH_TIME_H
-#define _MACH_TIME_H
-
-#include <linux/bcd.h>
-#include <linux/upd4990a.h>
-
-/* for check timing call set_rtc_mmss() */
-/* used in arch/i386/time.c::do_timer_interrupt() */
-/*
- * Because PC-9800's RTC (NEC uPD4990A) does not allow setting
- * time partially, we always have to read-modify-write the
- * entire time (including year) so that set_rtc_mmss() will
- * take quite much time to execute.  You may want to relax
- * RTC resetting interval (currently ~11 minuts)...
- */
-#define USEC_AFTER     1000000
-#define USEC_BEFORE    0
-
-static inline int mach_set_rtc_mmss(unsigned long nowtime)
-{
-       int retval = 0;
-       int real_seconds, real_minutes, cmos_minutes;
-       struct upd4990a_raw_data data;
-
-       upd4990a_get_time(&data, 1);
-       cmos_minutes = BCD2BIN(data.min);
-
-       /*
-        * since we're only adjusting minutes and seconds,
-        * don't interfere with hour overflow. This avoids
-        * messing with unknown time zones but requires your
-        * RTC not to be off by more than 15 minutes
-        */
-       real_seconds = nowtime % 60;
-       real_minutes = nowtime / 60;
-       if (((abs(real_minutes - cmos_minutes) + 15) / 30) & 1)
-               real_minutes += 30;     /* correct for half hour time zone */
-       real_minutes %= 60;
-
-       if (abs(real_minutes - cmos_minutes) < 30) {
-               u8 temp_seconds = (real_seconds / 10) * 16 + real_seconds % 10;
-               u8 temp_minutes = (real_minutes / 10) * 16 + real_minutes % 10;
-
-               if (data.sec != temp_seconds || data.min != temp_minutes) {
-                       data.sec = temp_seconds;
-                       data.min = temp_minutes;
-                       upd4990a_set_time(&data, 1);
-               }
-       } else {
-               printk(KERN_WARNING
-                      "set_rtc_mmss: can't update from %d to %d\n",
-                      cmos_minutes, real_minutes);
-               retval = -1;
-       }
-
-       /* uPD4990A users' manual says we should issue Register Hold
-        * command after reading time, or future Time Read command
-        * may not work.  When we have set the time, this also starts
-        * the clock.
-        */
-       upd4990a_serial_command(UPD4990A_REGISTER_HOLD);
-
-       return retval;
-}
-
-static inline unsigned long mach_get_cmos_time(void)
-{
-       int i;
-       u8 prev, cur;
-       unsigned int year;
-       struct upd4990a_raw_data data;
-
-       /* Connect uPD4990A's DATA OUT pin to its 1Hz reference clock. */
-       upd4990a_serial_command(UPD4990A_REGISTER_HOLD);
-
-       /* Catch rising edge of reference clock.  */
-       prev = ~UPD4990A_READ_DATA();
-       for (i = 0; i < 1800000; i++) { /* may take up to 1 second... */
-               __asm__ ("outb %%al,%0" : : "N" (0x5f)); /* 0.6usec delay */
-               cur = UPD4990A_READ_DATA();
-               if (!(prev & cur & 1))
-                       break;
-               prev = ~cur;
-       }
-
-       upd4990a_get_time(&data, 0);
-
-       if ((year = BCD2BIN(data.year) + 1900) < 1995)
-               year += 100;
-       return mktime(year, data.mon, BCD2BIN(data.mday), BCD2BIN(data.hour),
-                       BCD2BIN(data.min), BCD2BIN(data.sec));
-}
-
-#endif /* !_MACH_TIME_H */
diff --git a/include/asm-i386/mach-pc9800/mach_timer.h b/include/asm-i386/mach-pc9800/mach_timer.h
deleted file mode 100644 (file)
index dbe78eb..0000000
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- *  include/asm-i386/mach-pc9800/mach_timer.h
- *
- *  Machine specific calibrate_tsc() for PC-9800.
- *  Written by Osamu Tomita <tomita@cinet.co.jp>
- */
-/* ------ Calibrate the TSC ------- 
- * PC-9800:
- *  CTC cannot be used because some models (especially
- *  note-machines) may disable clock to speaker channel (#1)
- *  unless speaker is enabled.  We use ARTIC instead.
- */
-#ifndef _MACH_TIMER_H
-#define _MACH_TIMER_H
-
-#define CALIBRATE_LATCH        (5 * 307200/HZ) /* 0.050sec * 307200Hz = 15360 */
-
-static inline void mach_prepare_counter(void)
-{
-       /* ARTIC can't be stopped nor reset. So we wait roundup. */
-       while (inw(0x5c));
-}
-
-static inline void mach_countup(unsigned long *count)
-{
-       do {
-               *count = inw(0x5c);
-       } while (*count < CALIBRATE_LATCH);
-}
-
-#endif /* !_MACH_TIMER_H */
diff --git a/include/asm-i386/mach-pc9800/mach_traps.h b/include/asm-i386/mach-pc9800/mach_traps.h
deleted file mode 100644 (file)
index 621c8f9..0000000
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- *  include/asm-i386/mach-pc9800/mach_traps.h
- *
- *  Machine specific NMI handling for PC-9800.
- *  Written by Osamu Tomita <tomita@cinet.co.jp>
- */
-#ifndef _MACH_TRAPS_H
-#define _MACH_TRAPS_H
-
-static inline void clear_mem_error(unsigned char reason)
-{
-       outb(0x08, 0x37);
-       outb(0x09, 0x37);
-}
-
-static inline unsigned char get_nmi_reason(void)
-{
-       return (inb(0x33) & 6) ? 0x80 : 0;
-}
-
-static inline void reassert_nmi(void)
-{
-       outb(0x09, 0x50);       /* disable NMI once */
-       outb(0x09, 0x52);       /* re-enable it */
-}
-
-#endif /* !_MACH_TRAPS_H */
diff --git a/include/asm-i386/mach-pc9800/mach_wakecpu.h b/include/asm-i386/mach-pc9800/mach_wakecpu.h
deleted file mode 100644 (file)
index 536444f..0000000
+++ /dev/null
@@ -1,45 +0,0 @@
-#ifndef __ASM_MACH_WAKECPU_H
-#define __ASM_MACH_WAKECPU_H
-
-/* 
- * This file copes with machines that wakeup secondary CPUs by the
- * INIT, INIT, STARTUP sequence.
- */
-
-#define WAKE_SECONDARY_VIA_INIT
-
-/*
- * On PC-9800, continuation on warm reset is done by loading
- * %ss:%sp from 0x0000:0404 and executing 'lret', so:
- */
-#define TRAMPOLINE_LOW phys_to_virt(0x4fa)
-#define TRAMPOLINE_HIGH phys_to_virt(0x4fc)
-
-#define boot_cpu_apicid boot_cpu_physical_apicid
-
-static inline void wait_for_init_deassert(atomic_t *deassert)
-{
-       while (!atomic_read(deassert));
-       return;
-}
-
-/* Nothing to do for most platforms, since cleared by the INIT cycle */
-static inline void smp_callin_clear_local_apic(void)
-{
-}
-
-static inline void store_NMI_vector(unsigned short *high, unsigned short *low)
-{
-}
-
-static inline void restore_NMI_vector(unsigned short *high, unsigned short *low)
-{
-}
-
-#if APIC_DEBUG
- #define inquire_remote_apic(apicid) __inquire_remote_apic(apicid)
-#else
- #define inquire_remote_apic(apicid) {}
-#endif
-
-#endif /* __ASM_MACH_WAKECPU_H */
diff --git a/include/asm-i386/mach-pc9800/pci-functions.h b/include/asm-i386/mach-pc9800/pci-functions.h
deleted file mode 100644 (file)
index 9130cab..0000000
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- *     PCI BIOS function codes for the PC9800. Different to
- *     standard PC systems
- */
-
-/* Note: PC-9800 confirms PCI 2.1 on only few models */
-
-#define PCIBIOS_PCI_FUNCTION_ID        0xccXX
-#define PCIBIOS_PCI_BIOS_PRESENT       0xcc81
-#define PCIBIOS_FIND_PCI_DEVICE                0xcc82
-#define PCIBIOS_FIND_PCI_CLASS_CODE    0xcc83
-/*      PCIBIOS_GENERATE_SPECIAL_CYCLE 0xcc86  (not supported by bios) */
-#define PCIBIOS_READ_CONFIG_BYTE       0xcc88
-#define PCIBIOS_READ_CONFIG_WORD       0xcc89
-#define PCIBIOS_READ_CONFIG_DWORD      0xcc8a
-#define PCIBIOS_WRITE_CONFIG_BYTE      0xcc8b
-#define PCIBIOS_WRITE_CONFIG_WORD      0xcc8c
-#define PCIBIOS_WRITE_CONFIG_DWORD     0xcc8d
-#define PCIBIOS_GET_ROUTING_OPTIONS    0xcc8e  /* PCI 2.1 only */
-#define PCIBIOS_SET_PCI_HW_INT         0xcc8f  /* PCI 2.1 only */
diff --git a/include/asm-i386/mach-pc9800/setup_arch_post.h b/include/asm-i386/mach-pc9800/setup_arch_post.h
deleted file mode 100644 (file)
index f7303fe..0000000
+++ /dev/null
@@ -1,29 +0,0 @@
-/**
- * machine_specific_memory_setup - Hook for machine specific memory setup.
- *
- * Description:
- *     This is included late in kernel/setup.c so that it can make
- *     use of all of the static functions.
- **/
-
-static inline char * __init machine_specific_memory_setup(void)
-{
-       char *who;
-       unsigned long low_mem_size, lower_high, higher_high;
-
-
-       who = "BIOS (common area)";
-
-       low_mem_size = ((*(unsigned char *)__va(PC9800SCA_BIOS_FLAG) & 7) + 1) << 17;
-       add_memory_region(0, low_mem_size, 1);
-       lower_high = (__u32) *(__u8 *) bus_to_virt(PC9800SCA_EXPMMSZ) << 17;
-       higher_high = (__u32) *(__u16 *) bus_to_virt(PC9800SCA_MMSZ16M) << 20;
-       if (lower_high != 0x00f00000UL) {
-               add_memory_region(HIGH_MEMORY, lower_high, 1);
-               add_memory_region(0x01000000UL, higher_high, 1);
-       }
-       else
-               add_memory_region(HIGH_MEMORY, lower_high + higher_high, 1);
-
-       return who;
-}
diff --git a/include/asm-i386/mach-pc9800/setup_arch_pre.h b/include/asm-i386/mach-pc9800/setup_arch_pre.h
deleted file mode 100644 (file)
index bd53bdd..0000000
+++ /dev/null
@@ -1,36 +0,0 @@
-/* Hook to call BIOS initialisation function */
-
-/* no action for generic */
-
-#define ARCH_SETUP arch_setup_pc9800();
-
-#include <linux/timex.h>
-#include <asm/io.h>
-#include <asm/pc9800.h>
-#include <asm/pc9800_sca.h>
-
-int CLOCK_TICK_RATE;
-extern unsigned long tick_usec;        /* ACTHZ          period (usec) */
-extern unsigned long tick_nsec;        /* USER_HZ period (nsec) */
-unsigned char pc9800_misc_flags;
-/* (bit 0) 1:High Address Video ram exists 0:otherwise */
-
-#ifdef CONFIG_SMP
-#define MPC_TABLE_SIZE 512
-#define MPC_TABLE ((char *) (PARAM+0x400))
-char mpc_table[MPC_TABLE_SIZE];
-#endif
-
-static  inline void arch_setup_pc9800(void)
-{
-       CLOCK_TICK_RATE = PC9800_8MHz_P() ? 1996800 : 2457600;
-       printk(KERN_DEBUG "CLOCK_TICK_RATE = %d\n", CLOCK_TICK_RATE);
-       tick_usec = TICK_USEC;          /* USER_HZ period (usec) */
-       tick_nsec = TICK_NSEC;          /* ACTHZ period (nsec) */
-
-       pc9800_misc_flags = PC9800_MISC_FLAGS;
-#ifdef CONFIG_SMP
-       if ((*(u32 *)(MPC_TABLE)) == 0x504d4350)
-               memcpy(mpc_table, MPC_TABLE, *(u16 *)(MPC_TABLE + 4));
-#endif /* CONFIG_SMP */
-}
diff --git a/include/asm-i386/mach-pc9800/smpboot_hooks.h b/include/asm-i386/mach-pc9800/smpboot_hooks.h
deleted file mode 100644 (file)
index 6c8f1d3..0000000
+++ /dev/null
@@ -1,52 +0,0 @@
-/* two abstractions specific to kernel/smpboot.c, mainly to cater to visws
- * which needs to alter them. */
-
-static inline void smpboot_clear_io_apic_irqs(void)
-{
-       io_apic_irqs = 0;
-}
-
-static inline void smpboot_setup_warm_reset_vector(unsigned long start_eip)
-{
-       /* reset code is stored in 8255 on PC-9800. */
-       outb(0x0e, 0x37);       /* SHUT0 = 0 */
-       local_flush_tlb();
-       Dprintk("1.\n");
-       *((volatile unsigned short *) TRAMPOLINE_HIGH) = start_eip >> 4;
-       Dprintk("2.\n");
-       *((volatile unsigned short *) TRAMPOLINE_LOW) = start_eip & 0xf;
-       Dprintk("3.\n");
-       /*
-        * On PC-9800, continuation on warm reset is done by loading
-        * %ss:%sp from 0x0000:0404 and executing 'lret', so:
-        */
-       /* 0x3f0 is on unused interrupt vector and should be safe... */
-       *((volatile unsigned long *) phys_to_virt(0x404)) = 0x000003f0;
-       Dprintk("4.\n");
-}
-
-static inline void smpboot_restore_warm_reset_vector(void)
-{
-       /*
-        * Install writable page 0 entry to set BIOS data area.
-        */
-       local_flush_tlb();
-
-       /*
-        * Paranoid:  Set warm reset code and vector here back
-        * to default values.
-        */
-       outb(0x0f, 0x37);       /* SHUT0 = 1 */
-
-       *((volatile long *) phys_to_virt(0x404)) = 0;
-}
-
-static inline void smpboot_setup_io_apic(void)
-{
-       /*
-        * Here we can be sure that there is an IO-APIC in the system. Let's
-        * go and set it up:
-        */
-       if (!skip_ioapic_setup && nr_ioapics)
-               setup_IO_APIC();
-}
diff --git a/include/asm-i386/pc9800.h b/include/asm-i386/pc9800.h
deleted file mode 100644 (file)
index 1268f35..0000000
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- *  PC-9800 machine types.
- *
- *  Copyright (C) 1999 TAKAI Kosuke <tak@kmc.kyoto-u.ac.jp>
- *                     (Linux/98 Project)
- */
-
-#ifndef _ASM_PC9800_H_
-#define _ASM_PC9800_H_
-
-#include <asm/pc9800_sca.h>
-#include <asm/types.h>
-
-#define __PC9800SCA(type, pa)  (*(type *) phys_to_virt(pa))
-#define __PC9800SCA_TEST_BIT(pa, n)    \
-       ((__PC9800SCA(u8, pa) & (1U << (n))) != 0)
-
-#define PC9800_HIGHRESO_P()    __PC9800SCA_TEST_BIT(PC9800SCA_BIOS_FLAG, 3)
-#define PC9800_8MHz_P()                __PC9800SCA_TEST_BIT(PC9800SCA_BIOS_FLAG, 7)
-
-                               /* 0x2198 is 98 21 on memory... */
-#define PC9800_9821_P()                (__PC9800SCA(u16, PC9821SCA_ROM_ID) == 0x2198)
-
-/* Note PC9821_...() are valid only when PC9800_9821_P() was true. */
-#define PC9821_IDEIF_DOUBLE_P()        __PC9800SCA_TEST_BIT(PC9821SCA_ROM_FLAG4, 4)
-
-#endif
diff --git a/include/asm-i386/pc9800_sca.h b/include/asm-i386/pc9800_sca.h
deleted file mode 100644 (file)
index 14731ed..0000000
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- *  System-common area definitions for NEC PC-9800 series
- *
- *  Copyright (C) 1999 TAKAI Kousuke <tak@kmc.kyoto-u.ac.jp>,
- *                     Kyoto University Microcomputer Club.
- */
-
-#ifndef _ASM_I386_PC9800SCA_H_
-#define _ASM_I386_PC9800SCA_H_
-
-#define PC9800SCA_EXPMMSZ              (0x0401)        /* B */
-#define PC9800SCA_SCSI_PARAMS          (0x0460)        /* 8 * 4B */
-#define PC9800SCA_DISK_EQUIPS          (0x0482)        /* B */
-#define PC9800SCA_XROM_ID              (0x04C0)        /* 52B */
-#define PC9800SCA_BIOS_FLAG            (0x0501)        /* B */
-#define PC9800SCA_MMSZ16M              (0x0594)        /* W */
-
-/* PC-9821 have additional system common area in their BIOS-ROM segment. */
-
-#define PC9821SCA__BASE                        (0xF8E8 << 4)
-#define PC9821SCA_ROM_ID               (PC9821SCA__BASE + 0x00)
-#define PC9821SCA_ROM_FLAG4            (PC9821SCA__BASE + 0x05)
-#define PC9821SCA_RSFLAGS              (PC9821SCA__BASE + 0x11)        /* B */
-
-#endif /* !_ASM_I386_PC9800SCA_H_ */
diff --git a/include/asm-i386/std_resources.h b/include/asm-i386/std_resources.h
deleted file mode 100644 (file)
index 5373398..0000000
+++ /dev/null
@@ -1,14 +0,0 @@
-/*
- * include/asm-i386/std_resources.h
- */
-
-#ifndef __ASM_I386_STD_RESOURCES_H
-#define __ASM_I386_STD_RESOURCES_H
-
-#include <linux/init.h>
-
-void probe_roms(void) __init;
-void request_graphics_resource(void) __init;
-void request_standard_io_resources(void) __init;
-
-#endif
diff --git a/include/asm-i386/upd4990a.h b/include/asm-i386/upd4990a.h
deleted file mode 100644 (file)
index de4f4ed..0000000
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- *  Architecture dependent definitions
- *  for NEC uPD4990A serial I/O real-time clock.
- *
- *  Copyright 2001  TAKAI Kousuke <tak@kmc.kyoto-u.ac.jp>
- *                 Kyoto University Microcomputer Club (KMC).
- *
- *  References:
- *     uPD4990A serial I/O real-time clock users' manual (Japanese)
- *     No. S12828JJ4V0UM00 (4th revision), NEC Corporation, 1999.
- */
-
-#ifndef _ASM_I386_uPD4990A_H
-#define _ASM_I386_uPD4990A_H
-
-#include <asm/io.h>
-
-#define UPD4990A_IO            (0x0020)
-#define UPD4990A_IO_DATAOUT    (0x0033)
-
-#define UPD4990A_OUTPUT_DATA_CLK(data, clk)            \
-       outb((((data) & 1) << 5) | (((clk) & 1) << 4)   \
-             | UPD4990A_PAR_SERIAL_MODE, UPD4990A_IO)
-
-#define UPD4990A_OUTPUT_CLK(clk)       UPD4990A_OUTPUT_DATA_CLK(0, (clk))
-
-#define UPD4990A_OUTPUT_STROBE(stb) \
-       outb(((stb) << 3) | UPD4990A_PAR_SERIAL_MODE, UPD4990A_IO)
-
-/*
- * Note: udelay() is *not* usable for UPD4990A_DELAY because
- *      the Linux kernel reads uPD4990A to set up system clock
- *      before calibrating delay...
- */
-#define UPD4990A_DELAY(usec)                                           \
-       do {                                                            \
-               if (__builtin_constant_p((usec)) && (usec) < 5) \
-                       __asm__ (".rept %c1\n\toutb %%al,%0\n\t.endr"   \
-                                : : "N" (0x5F),                        \
-                                    "i" (((usec) * 10 + 5) / 6));      \
-               else {                                                  \
-                       int _count = ((usec) * 10 + 5) / 6;             \
-                       __asm__ volatile ("1: outb %%al,%1\n\tloop 1b"  \
-                                         : "=c" (_count)               \
-                                         : "N" (0x5F), "0" (_count));  \
-               }                                                       \
-       } while (0)
-
-/* Caller should ignore all bits except bit0 */
-#define UPD4990A_READ_DATA()   inb(UPD4990A_IO_DATAOUT)
-
-#endif
diff --git a/include/asm-ia64/cpumask.h b/include/asm-ia64/cpumask.h
deleted file mode 100644 (file)
index 7764aef..0000000
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef _ASM_IA64_CPUMASK_H
-#define _ASM_IA64_CPUMASK_H
-
-#include <asm-generic/cpumask.h>
-
-#endif /* _ASM_IA64_CPUMASK_H */
diff --git a/include/asm-m68k/cpumask.h b/include/asm-m68k/cpumask.h
deleted file mode 100644 (file)
index b124503..0000000
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef _ASM_M68K_CPUMASK_H
-#define _ASM_M68K_CPUMASK_H
-
-#include <asm-generic/cpumask.h>
-
-#endif /* _ASM_M68K_CPUMASK_H */
diff --git a/include/asm-m68k/init.h b/include/asm-m68k/init.h
deleted file mode 100644 (file)
index aa33519..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
-#ifndef _M68K_INIT_H
-#define _M68K_INIT_H
-
-#define __init __attribute__ ((__section__ (".text.init")))
-#define __initdata __attribute__ ((__section__ (".data.init")))
-/* For assembly routines */
-#define __INIT         .section        ".text.init",#alloc,#execinstr
-#define __FINIT                .previous
-#define __INITDATA     .section        ".data.init",#alloc,#write
-
-#endif
diff --git a/include/asm-m68knommu/cpumask.h b/include/asm-m68knommu/cpumask.h
deleted file mode 100644 (file)
index cd9cc78..0000000
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef _ASM_M68KNOMMU_CPUMASK_H
-#define _ASM_M68KNOMMU_CPUMASK_H
-
-#include <asm-generic/cpumask.h>
-
-#endif /* _ASM_M68KNOMMU_CPUMASK_H */
diff --git a/include/asm-m68knommu/init.h b/include/asm-m68knommu/init.h
deleted file mode 100644 (file)
index 596fd41..0000000
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-m68k/init.h>
diff --git a/include/asm-mips/cpumask.h b/include/asm-mips/cpumask.h
deleted file mode 100644 (file)
index cf562af..0000000
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef _ASM_MIPS_CPUMASK_H
-#define _ASM_MIPS_CPUMASK_H
-
-#include <asm-generic/cpumask.h>
-
-#endif /* _ASM_MIPS_CPUMASK_H */
diff --git a/include/asm-mips/init.h b/include/asm-mips/init.h
deleted file mode 100644 (file)
index 17d2155..0000000
+++ /dev/null
@@ -1 +0,0 @@
-#error "<asm/init.h> should never be used - use <linux/init.h> instead"
diff --git a/include/asm-mips/vr41xx/eagle.h b/include/asm-mips/vr41xx/eagle.h
deleted file mode 100644 (file)
index 9cbd61c..0000000
+++ /dev/null
@@ -1,265 +0,0 @@
-/*
- * FILE NAME
- *     include/asm-mips/vr41xx/eagle.h
- *
- * BRIEF MODULE DESCRIPTION
- *     Include file for NEC Eagle board.
- *
- * Author: MontaVista Software, Inc.
- *         yyuasa@mvista.com or source@mvista.com
- *
- * Copyright 2001-2003 MontaVista Software 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.
- *
- *  THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED
- *  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- *  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- *  IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- *  INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
- *  BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
- *  OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- *  ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
- *  TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
- *  USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- *  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.
- */
-#ifndef __NEC_EAGLE_H
-#define __NEC_EAGLE_H
-
-#include <asm/addrspace.h>
-#include <asm/vr41xx/vr41xx.h>
-
-/*
- * Board specific address mapping
- */
-#define VR41XX_PCI_MEM1_BASE           0x10000000
-#define VR41XX_PCI_MEM1_SIZE           0x04000000
-#define VR41XX_PCI_MEM1_MASK           0x7c000000
-
-#define VR41XX_PCI_MEM2_BASE           0x14000000
-#define VR41XX_PCI_MEM2_SIZE           0x02000000
-#define VR41XX_PCI_MEM2_MASK           0x7e000000
-
-#define VR41XX_PCI_IO_BASE             0x16000000
-#define VR41XX_PCI_IO_SIZE             0x02000000
-#define VR41XX_PCI_IO_MASK             0x7e000000
-
-#define VR41XX_PCI_IO_START            0x01000000
-#define VR41XX_PCI_IO_END              0x01ffffff
-
-#define VR41XX_PCI_MEM_START           0x12000000
-#define VR41XX_PCI_MEM_END             0x15ffffff
-
-#define IO_PORT_BASE                   KSEG1ADDR(VR41XX_PCI_IO_BASE)
-#define IO_PORT_RESOURCE_START         0
-#define IO_PORT_RESOURCE_END           VR41XX_PCI_IO_SIZE
-#define IO_MEM1_RESOURCE_START         VR41XX_PCI_MEM1_BASE
-#define IO_MEM1_RESOURCE_END           (VR41XX_PCI_MEM1_BASE + VR41XX_PCI_MEM1_SIZE)
-#define IO_MEM2_RESOURCE_START         VR41XX_PCI_MEM2_BASE
-#define IO_MEM2_RESOURCE_END           (VR41XX_PCI_MEM2_BASE + VR41XX_PCI_MEM2_SIZE)
-
-/*
- * General-Purpose I/O Pin Number
- */
-#define VRC4173_PIN                    1
-#define PCISLOT_PIN                    4
-#define FPGA_PIN                       5
-#define DCD_PIN                                15
-
-/*
- * Interrupt Number
- */
-#define VRC4173_CASCADE_IRQ            GIU_IRQ(VRC4173_PIN)
-#define PCISLOT_IRQ                    GIU_IRQ(PCISLOT_PIN)
-#define FPGA_CASCADE_IRQ               GIU_IRQ(FPGA_PIN)
-#define DCD_IRQ                                GIU_IRQ(DCD_PIN)
-
-#define SDBINT_IRQ_BASE                        88
-#define SDBINT_IRQ(x)                  (SDBINT_IRQ_BASE + (x))
-/* RFU */
-#define DEG_IRQ                                SDBINT_IRQ(1)
-#define ENUM_IRQ                       SDBINT_IRQ(2)
-#define SIO1INT_IRQ                    SDBINT_IRQ(3)
-#define SIO2INT_IRQ                    SDBINT_IRQ(4)
-#define PARINT_IRQ                     SDBINT_IRQ(5)
-#define SDBINT_IRQ_LAST                        PARINT_IRQ
-
-#define PCIINT_IRQ_BASE                        96
-#define PCIINT_IRQ(x)                  (PCIINT_IRQ_BASE + (x))
-#define CP_INTA_IRQ                    PCIINT_IRQ(0)
-#define CP_INTB_IRQ                    PCIINT_IRQ(1)
-#define CP_INTC_IRQ                    PCIINT_IRQ(2)
-#define CP_INTD_IRQ                    PCIINT_IRQ(3)
-#define LANINTA_IRQ                    PCIINT_IRQ(4)
-#define PCIINT_IRQ_LAST                        LANINTA_IRQ
-
-/*
- * On board Devices I/O Mapping
- */
-#define NEC_EAGLE_SIO1RB               KSEG1ADDR(0x0DFFFEC0)
-#define NEC_EAGLE_SIO1TH               KSEG1ADDR(0x0DFFFEC0)
-#define NEC_EAGLE_SIO1IE               KSEG1ADDR(0x0DFFFEC2)
-#define NEC_EAGLE_SIO1IID              KSEG1ADDR(0x0DFFFEC4)
-#define NEC_EAGLE_SIO1FC               KSEG1ADDR(0x0DFFFEC4)
-#define NEC_EAGLE_SIO1LC               KSEG1ADDR(0x0DFFFEC6)
-#define NEC_EAGLE_SIO1MC               KSEG1ADDR(0x0DFFFEC8)
-#define NEC_EAGLE_SIO1LS               KSEG1ADDR(0x0DFFFECA)
-#define NEC_EAGLE_SIO1MS               KSEG1ADDR(0x0DFFFECC)
-#define NEC_EAGLE_SIO1SC               KSEG1ADDR(0x0DFFFECE)
-
-#define NEC_EAGLE_SIO2TH               KSEG1ADDR(0x0DFFFED0)
-#define NEC_EAGLE_SIO2IE               KSEG1ADDR(0x0DFFFED2)
-#define NEC_EAGLE_SIO2IID              KSEG1ADDR(0x0DFFFED4)
-#define NEC_EAGLE_SIO2FC               KSEG1ADDR(0x0DFFFED4)
-#define NEC_EAGLE_SIO2LC               KSEG1ADDR(0x0DFFFED6)
-#define NEC_EAGLE_SIO2MC               KSEG1ADDR(0x0DFFFED8)
-#define NEC_EAGLE_SIO2LS               KSEG1ADDR(0x0DFFFEDA)
-#define NEC_EAGLE_SIO2MS               KSEG1ADDR(0x0DFFFEDC)
-#define NEC_EAGLE_SIO2SC               KSEG1ADDR(0x0DFFFEDE)
-
-#define NEC_EAGLE_PIOPP_DATA           KSEG1ADDR(0x0DFFFEE0)
-#define NEC_EAGLE_PIOPP_STATUS         KSEG1ADDR(0x0DFFFEE2)
-#define NEC_EAGLE_PIOPP_CNT            KSEG1ADDR(0x0DFFFEE4)
-#define NEC_EAGLE_PIOPP_EPPADDR                KSEG1ADDR(0x0DFFFEE6)
-#define NEC_EAGLE_PIOPP_EPPDATA0       KSEG1ADDR(0x0DFFFEE8)
-#define NEC_EAGLE_PIOPP_EPPDATA1       KSEG1ADDR(0x0DFFFEEA)
-#define NEC_EAGLE_PIOPP_EPPDATA2       KSEG1ADDR(0x0DFFFEEC)
-
-#define NEC_EAGLE_PIOECP_DATA          KSEG1ADDR(0x0DFFFEF0)
-#define NEC_EAGLE_PIOECP_CONFIG                KSEG1ADDR(0x0DFFFEF2)
-#define NEC_EAGLE_PIOECP_EXTCNT                KSEG1ADDR(0x0DFFFEF4)
-
-/*
- *  FLSHCNT Register
- */
-#define NEC_EAGLE_FLSHCNT              KSEG1ADDR(0x0DFFFFA0)
-#define NEC_EAGLE_FLSHCNT_FRDY         0x80
-#define NEC_EAGLE_FLSHCNT_VPPE         0x40
-#define NEC_EAGLE_FLSHCNT_WP2          0x01
-
-/*
- * FLSHBANK Register
- */
-#define NEC_EAGLE_FLSHBANK             KSEG1ADDR(0x0DFFFFA4)
-#define NEC_EAGLE_FLSHBANK_S_BANK2     0x40
-#define NEC_EAGLE_FLSHBANK_S_BANK1     0x20
-#define NEC_EAGLE_FLSHBANK_BNKQ4       0x10
-#define NEC_EAGLE_FLSHBANK_BNKQ3       0x08
-#define NEC_EAGLE_FLSHBANK_BNKQ2       0x04
-#define NEC_EAGLE_FLSHBANK_BNKQ1       0x02
-#define NEC_EAGLE_FLSHBANK_BNKQ0       0x01
-
-/*
- * SWITCH Setting Register
- */
-#define NEC_EAGLE_SWTCHSET             KSEG1ADDR(0x0DFFFFA8)
-#define NEC_EAGLE_SWTCHSET_DP2SW4      0x80
-#define NEC_EAGLE_SWTCHSET_DP2SW3      0x40
-#define NEC_EAGLE_SWTCHSET_DP2SW2      0x20
-#define NEC_EAGLE_SWTCHSET_DP2SW1      0x10
-#define NEC_EAGLE_SWTCHSET_DP1SW4      0x08
-#define NEC_EAGLE_SWTCHSET_DP1SW3      0x04
-#define NEC_EAGLE_SWTCHSET_DP1SW2      0x02
-#define NEC_EAGLE_SWTCHSET_DP1SW1      0x01
-
-/*
- * PPT Parallel Port Device Controller
- */
-#define NEC_EAGLE_PPT_WRITE_DATA       KSEG1ADDR(0x0DFFFFB0)
-#define NEC_EAGLE_PPT_READ_DATA                KSEG1ADDR(0x0DFFFFB2)
-#define NEC_EAGLE_PPT_CNT              KSEG1ADDR(0x0DFFFFB4)
-#define NEC_EAGLE_PPT_CNT2             KSEG1ADDR(0x0DFFFFB4)
-
-/* Control Register */
-#define NEC_EAGLE_PPT_INTMSK           0x20
-#define NEC_EAGLE_PPT_PARIINT          0x10
-#define NEC_EAGLE_PPT_SELECTIN         0x08
-#define NEC_EAGLE_PPT_INIT             0x04
-#define NEC_EAGLE_PPT_AUTOFD           0x02
-#define NEC_EAGLE_PPT_STROBE           0x01
-
-/* Control Rgister 2 */
-#define NEC_EAGLE_PPT_PAREN            0x80
-#define NEC_EAGLE_PPT_AUTOEN           0x20
-#define NEC_EAGLE_PPT_BUSY             0x10
-#define NEC_EAGLE_PPT_ACK              0x08
-#define NEC_EAGLE_PPT_PE               0x04
-#define NEC_EAGLE_PPT_SELECT           0x02
-#define NEC_EAGLE_PPT_FAULT            0x01
-
-/*
- * LEDWR Register
- */
-#define NEC_EAGLE_LEDWR1               KSEG1ADDR(0x0DFFFFC0)
-#define NEC_EAGLE_LEDWR2               KSEG1ADDR(0x0DFFFFC4)
-
-/*
- * SDBINT Register
- */
-#define NEC_EAGLE_SDBINT               KSEG1ADDR(0x0DFFFFD0)
-#define NEC_EAGLE_SDBINT_PARINT                0x20
-#define NEC_EAGLE_SDBINT_SIO2INT       0x10
-#define NEC_EAGLE_SDBINT_SIO1INT       0x08
-#define NEC_EAGLE_SDBINT_ENUM          0x04
-#define NEC_EAGLE_SDBINT_DEG           0x02
-
-/*
- * SDB INTMSK Register
- */
-#define NEC_EAGLE_SDBINTMSK            KSEG1ADDR(0x0DFFFFD4)
-#define NEC_EAGLE_SDBINTMSK_MSKPAR     0x20
-#define NEC_EAGLE_SDBINTMSK_MSKSIO2    0x10
-#define NEC_EAGLE_SDBINTMSK_MSKSIO1    0x08
-#define NEC_EAGLE_SDBINTMSK_MSKENUM    0x04
-#define NEC_EAGLE_SDBINTMSK_MSKDEG     0x02
-
-/*
- * RSTREG Register
- */
-#define NEC_EAGLE_RSTREG               KSEG1ADDR(0x0DFFFFD8)
-#define NEC_EAGLE_RST_RSTSW            0x02
-#define NEC_EAGLE_RST_LEDOFF           0x01
-
-/*
- * PCI INT Rgister
- */
-#define NEC_EAGLE_PCIINTREG            KSEG1ADDR(0x0DFFFFDC)
-#define NEC_EAGLE_PCIINT_LANINT                0x10
-#define NEC_EAGLE_PCIINT_CP_INTD       0x08
-#define NEC_EAGLE_PCIINT_CP_INTC       0x04
-#define NEC_EAGLE_PCIINT_CP_INTB       0x02
-#define NEC_EAGLE_PCIINT_CP_INTA       0x01
-
-/*
- * PCI INT Mask Register
- */
-#define NEC_EAGLE_PCIINTMSKREG         KSEG1ADDR(0x0DFFFFE0)
-#define NEC_EAGLE_PCIINTMSK_MSKLANINT  0x10
-#define NEC_EAGLE_PCIINTMSK_MSKCP_INTD 0x08
-#define NEC_EAGLE_PCIINTMSK_MSKCP_INTC 0x04
-#define NEC_EAGLE_PCIINTMSK_MSKCP_INTB 0x02
-#define NEC_EAGLE_PCIINTMSK_MSKCP_INTA 0x01
-
-/*
- * CLK Division Register
- */
-#define NEC_EAGLE_CLKDIV               KSEG1ADDR(0x0DFFFFE4)
-#define NEC_EAGLE_CLKDIV_PCIDIV1       0x10
-#define NEC_EAGLE_CLKDIV_PCIDIV0       0x08
-#define NEC_EAGLE_CLKDIV_VTDIV2                0x04
-#define NEC_EAGLE_CLKDIV_VTDIV1                0x02
-#define NEC_EAGLE_CLKDIV_VTDIV0                0x01
-
-/*
- * Source Revision Register
- */
-#define NEC_EAGLE_REVISION             KSEG1ADDR(0x0DFFFFE8)
-
-#endif /* __NEC_EAGLE_H */
diff --git a/include/asm-mips/vr41xx/tb0229.h b/include/asm-mips/vr41xx/tb0229.h
deleted file mode 100644 (file)
index bd8cbc8..0000000
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * FILE NAME
- *     include/asm-mips/vr41xx/tb0229.h
- *
- * BRIEF MODULE DESCRIPTION
- *     Include file for TANBAC TB0229 and TB0219.
- *
- * Copyright 2002,2003 Yoichi Yuasa
- *                yuasa@hh.iij4u.or.jp
- *
- * Modified for TANBAC TB0229:
- * Copyright 2003 Megasolution Inc.
- *                matsu@megasolution.jp
- *
- *  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 __TANBAC_TB0229_H
-#define __TANBAC_TB0229_H
-
-#include <asm/addrspace.h>
-#include <asm/vr41xx/vr41xx.h>
-
-/*
- * Board specific address mapping
- */
-#define VR41XX_PCI_MEM1_BASE           0x10000000
-#define VR41XX_PCI_MEM1_SIZE           0x04000000
-#define VR41XX_PCI_MEM1_MASK           0x7c000000
-
-#define VR41XX_PCI_MEM2_BASE           0x14000000
-#define VR41XX_PCI_MEM2_SIZE           0x02000000
-#define VR41XX_PCI_MEM2_MASK           0x7e000000
-
-#define VR41XX_PCI_IO_BASE             0x16000000
-#define VR41XX_PCI_IO_SIZE             0x02000000
-#define VR41XX_PCI_IO_MASK             0x7e000000
-
-#define VR41XX_PCI_IO_START            0x01000000
-#define VR41XX_PCI_IO_END              0x01ffffff
-
-#define VR41XX_PCI_MEM_START           0x12000000
-#define VR41XX_PCI_MEM_END             0x15ffffff
-
-#define IO_PORT_BASE                   KSEG1ADDR(VR41XX_PCI_IO_BASE)
-#define IO_PORT_RESOURCE_START         0
-#define IO_PORT_RESOURCE_END           VR41XX_PCI_IO_SIZE
-#define IO_MEM1_RESOURCE_START         VR41XX_PCI_MEM1_BASE
-#define IO_MEM1_RESOURCE_END           (VR41XX_PCI_MEM1_BASE + VR41XX_PCI_MEM1_SIZE)
-#define IO_MEM2_RESOURCE_START         VR41XX_PCI_MEM2_BASE
-#define IO_MEM2_RESOURCE_END           (VR41XX_PCI_MEM2_BASE + VR41XX_PCI_MEM2_SIZE)
-
-/*
- * General-Purpose I/O Pin Number
- */
-#define TB0219_PCI_SLOT1_PIN           2
-#define TB0219_PCI_SLOT2_PIN           3
-#define TB0219_PCI_SLOT3_PIN           4
-
-/*
- * Interrupt Number
- */
-#define TB0219_PCI_SLOT1_IRQ           GIU_IRQ(TB0219_PCI_SLOT1_PIN)
-#define TB0219_PCI_SLOT2_IRQ           GIU_IRQ(TB0219_PCI_SLOT2_PIN)
-#define TB0219_PCI_SLOT3_IRQ           GIU_IRQ(TB0219_PCI_SLOT3_PIN)
-
-#define TB0219_RESET_REGS              KSEG1ADDR(0x0a00000e)
-
-extern void tanbac_tb0229_restart(char *command);
-
-#endif /* __TANBAC_TB0229_H */
diff --git a/include/asm-parisc/cpumask.h b/include/asm-parisc/cpumask.h
deleted file mode 100644 (file)
index 27f4f17..0000000
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef _ASM_PARISC_CPUMASK_H
-#define _ASM_PARISC_CPUMASK_H
-
-#include <asm-generic/cpumask.h>
-
-#endif /* _ASM_PARISC_CPUMASK_H */
diff --git a/include/asm-parisc/numnodes.h b/include/asm-parisc/numnodes.h
deleted file mode 100644 (file)
index dcdd933..0000000
+++ /dev/null
@@ -1,9 +0,0 @@
-#ifndef _ASM_MAX_NUMNODES_H
-#define _ASM_MAX_NUMNODES_H
-
-#include <linux/config.h>
-
-/* Max 8 Nodes */
-#define NODES_SHIFT    3
-
-#endif /* _ASM_MAX_NUMNODES_H */
diff --git a/include/asm-ppc/cpm_8260.h b/include/asm-ppc/cpm_8260.h
deleted file mode 100644 (file)
index 0afe638..0000000
+++ /dev/null
@@ -1,702 +0,0 @@
-/*
- * MPC8260 Communication Processor Module.
- * Copyright (c) 1999 Dan Malek (dmalek@jlc.net)
- *
- * This file contains structures and information for the communication
- * processor channels found in the dual port RAM or parameter RAM.
- * All CPM control and status is available through the MPC8260 internal
- * memory map.  See immap.h for details.
- */
-#ifdef __KERNEL__
-#ifndef __CPM_82XX__
-#define __CPM_82XX__
-
-#include <asm/immap_8260.h>
-
-/* CPM Command register.
-*/
-#define CPM_CR_RST     ((uint)0x80000000)
-#define CPM_CR_PAGE    ((uint)0x7c000000)
-#define CPM_CR_SBLOCK  ((uint)0x03e00000)
-#define CPM_CR_FLG     ((uint)0x00010000)
-#define CPM_CR_MCN     ((uint)0x00003fc0)
-#define CPM_CR_OPCODE  ((uint)0x0000000f)
-
-/* Device sub-block and page codes.
-*/
-#define CPM_CR_SCC1_SBLOCK     (0x04)
-#define CPM_CR_SCC2_SBLOCK     (0x05)
-#define CPM_CR_SCC3_SBLOCK     (0x06)
-#define CPM_CR_SCC4_SBLOCK     (0x07)
-#define CPM_CR_SMC1_SBLOCK     (0x08)
-#define CPM_CR_SMC2_SBLOCK     (0x09)
-#define CPM_CR_SPI_SBLOCK      (0x0a)
-#define CPM_CR_I2C_SBLOCK      (0x0b)
-#define CPM_CR_TIMER_SBLOCK    (0x0f)
-#define CPM_CR_RAND_SBLOCK     (0x0e)
-#define CPM_CR_FCC1_SBLOCK     (0x10)
-#define CPM_CR_FCC2_SBLOCK     (0x11)
-#define CPM_CR_FCC3_SBLOCK     (0x12)
-#define CPM_CR_IDMA1_SBLOCK    (0x14)
-#define CPM_CR_IDMA2_SBLOCK    (0x15)
-#define CPM_CR_IDMA3_SBLOCK    (0x16)
-#define CPM_CR_IDMA4_SBLOCK    (0x17)
-#define CPM_CR_MCC1_SBLOCK     (0x1c)
-
-#define CPM_CR_SCC1_PAGE       (0x00)
-#define CPM_CR_SCC2_PAGE       (0x01)
-#define CPM_CR_SCC3_PAGE       (0x02)
-#define CPM_CR_SCC4_PAGE       (0x03)
-#define CPM_CR_SMC1_PAGE       (0x07)
-#define CPM_CR_SMC2_PAGE       (0x08)
-#define CPM_CR_SPI_PAGE                (0x09)
-#define CPM_CR_I2C_PAGE                (0x0a)
-#define CPM_CR_TIMER_PAGE      (0x0a)
-#define CPM_CR_RAND_PAGE       (0x0a)
-#define CPM_CR_FCC1_PAGE       (0x04)
-#define CPM_CR_FCC2_PAGE       (0x05)
-#define CPM_CR_FCC3_PAGE       (0x06)
-#define CPM_CR_IDMA1_PAGE      (0x07)
-#define CPM_CR_IDMA2_PAGE      (0x08)
-#define CPM_CR_IDMA3_PAGE      (0x09)
-#define CPM_CR_IDMA4_PAGE      (0x0a)
-#define CPM_CR_MCC1_PAGE       (0x07)
-#define CPM_CR_MCC2_PAGE       (0x08)
-
-/* Some opcodes (there are more...later)
-*/
-#define CPM_CR_INIT_TRX                ((ushort)0x0000)
-#define CPM_CR_INIT_RX         ((ushort)0x0001)
-#define CPM_CR_INIT_TX         ((ushort)0x0002)
-#define CPM_CR_HUNT_MODE       ((ushort)0x0003)
-#define CPM_CR_STOP_TX         ((ushort)0x0004)
-#define CPM_CR_RESTART_TX      ((ushort)0x0006)
-#define CPM_CR_SET_GADDR       ((ushort)0x0008)
-
-#define mk_cr_cmd(PG, SBC, MCN, OP) \
-       ((PG << 26) | (SBC << 21) | (MCN << 6) | OP)
-
-/* Dual Port RAM addresses.  The first 16K is available for almost
- * any CPM use, so we put the BDs there.  The first 128 bytes are
- * used for SMC1 and SMC2 parameter RAM, so we start allocating
- * BDs above that.  All of this must change when we start
- * downloading RAM microcode.
- */
-#define CPM_DATAONLY_BASE      ((uint)128)
-#define CPM_DATAONLY_SIZE      ((uint)(16 * 1024) - CPM_DATAONLY_BASE)
-#define CPM_DP_NOSPACE         ((uint)0x7fffffff)
-#define CPM_FCC_SPECIAL_BASE   ((uint)0x0000b000)
-
-/* The number of pages of host memory we allocate for CPM.  This is
- * done early in kernel initialization to get physically contiguous
- * pages.
- */
-#define NUM_CPM_HOST_PAGES     2
-
-
-/* Export the base address of the communication processor registers
- * and dual port ram.
- */
-extern cpm8260_t       *cpmp;          /* Pointer to comm processor */
-uint           m8260_cpm_dpalloc(uint size, uint align);
-uint           m8260_cpm_hostalloc(uint size, uint align);
-void           m8260_cpm_setbrg(uint brg, uint rate);
-void           m8260_cpm_fastbrg(uint brg, uint rate, int div16);
-
-/* Buffer descriptors used by many of the CPM protocols.
-*/
-typedef struct cpm_buf_desc {
-       ushort  cbd_sc;         /* Status and Control */
-       ushort  cbd_datlen;     /* Data length in buffer */
-       uint    cbd_bufaddr;    /* Buffer address in host memory */
-} cbd_t;
-
-#define BD_SC_EMPTY    ((ushort)0x8000)        /* Receive is empty */
-#define BD_SC_READY    ((ushort)0x8000)        /* Transmit is ready */
-#define BD_SC_WRAP     ((ushort)0x2000)        /* Last buffer descriptor */
-#define BD_SC_INTRPT   ((ushort)0x1000)        /* Interrupt on change */
-#define BD_SC_LAST     ((ushort)0x0800)        /* Last buffer in frame */
-#define BD_SC_CM       ((ushort)0x0200)        /* Continous mode */
-#define BD_SC_ID       ((ushort)0x0100)        /* Rec'd too many idles */
-#define BD_SC_P                ((ushort)0x0100)        /* xmt preamble */
-#define BD_SC_BR       ((ushort)0x0020)        /* Break received */
-#define BD_SC_FR       ((ushort)0x0010)        /* Framing error */
-#define BD_SC_PR       ((ushort)0x0008)        /* Parity error */
-#define BD_SC_OV       ((ushort)0x0002)        /* Overrun */
-#define BD_SC_CD       ((ushort)0x0001)        /* ?? */
-
-/* Function code bits, usually generic to devices.
-*/
-#define CPMFCR_GBL     ((u_char)0x20)  /* Set memory snooping */
-#define CPMFCR_EB      ((u_char)0x10)  /* Set big endian byte order */
-#define CPMFCR_TC2     ((u_char)0x04)  /* Transfer code 2 value */
-#define CPMFCR_DTB     ((u_char)0x02)  /* Use local bus for data when set */
-#define CPMFCR_BDB     ((u_char)0x01)  /* Use local bus for BD when set */
-
-/* Parameter RAM offsets from the base.
-*/
-#define PROFF_SCC1             ((uint)0x8000)
-#define PROFF_SCC2             ((uint)0x8100)
-#define PROFF_SCC3             ((uint)0x8200)
-#define PROFF_SCC4             ((uint)0x8300)
-#define PROFF_FCC1             ((uint)0x8400)
-#define PROFF_FCC2             ((uint)0x8500)
-#define PROFF_FCC3             ((uint)0x8600)
-#define PROFF_MCC1             ((uint)0x8700)
-#define PROFF_SMC1_BASE                ((uint)0x87fc)
-#define PROFF_IDMA1_BASE       ((uint)0x87fe)
-#define PROFF_MCC2             ((uint)0x8800)
-#define PROFF_SMC2_BASE                ((uint)0x88fc)
-#define PROFF_IDMA2_BASE       ((uint)0x88fe)
-#define PROFF_SPI_BASE         ((uint)0x89fc)
-#define PROFF_IDMA3_BASE       ((uint)0x89fe)
-#define PROFF_TIMERS           ((uint)0x8ae0)
-#define PROFF_REVNUM           ((uint)0x8af0)
-#define PROFF_RAND             ((uint)0x8af8)
-#define PROFF_I2C_BASE         ((uint)0x8afc)
-#define PROFF_IDMA4_BASE       ((uint)0x8afe)
-
-/* The SMCs are relocated to any of the first eight DPRAM pages.
- * We will fix these at the first locations of DPRAM, until we
- * get some microcode patches :-).
- * The parameter ram space for the SMCs is fifty-some bytes, and
- * they are required to start on a 64 byte boundary.
- */
-#define PROFF_SMC1     (0)
-#define PROFF_SMC2     (64)
-
-
-/* Define enough so I can at least use the serial port as a UART.
- */
-typedef struct smc_uart {
-       ushort  smc_rbase;      /* Rx Buffer descriptor base address */
-       ushort  smc_tbase;      /* Tx Buffer descriptor base address */
-       u_char  smc_rfcr;       /* Rx function code */
-       u_char  smc_tfcr;       /* Tx function code */
-       ushort  smc_mrblr;      /* Max receive buffer length */
-       uint    smc_rstate;     /* Internal */
-       uint    smc_idp;        /* Internal */
-       ushort  smc_rbptr;      /* Internal */
-       ushort  smc_ibc;        /* Internal */
-       uint    smc_rxtmp;      /* Internal */
-       uint    smc_tstate;     /* Internal */
-       uint    smc_tdp;        /* Internal */
-       ushort  smc_tbptr;      /* Internal */
-       ushort  smc_tbc;        /* Internal */
-       uint    smc_txtmp;      /* Internal */
-       ushort  smc_maxidl;     /* Maximum idle characters */
-       ushort  smc_tmpidl;     /* Temporary idle counter */
-       ushort  smc_brklen;     /* Last received break length */
-       ushort  smc_brkec;      /* rcv'd break condition counter */
-       ushort  smc_brkcr;      /* xmt break count register */
-       ushort  smc_rmask;      /* Temporary bit mask */
-       uint    smc_stmp;       /* SDMA Temp */
-} smc_uart_t;
-
-/* SMC uart mode register (Internal memory map).
-*/
-#define SMCMR_REN      ((ushort)0x0001)
-#define SMCMR_TEN      ((ushort)0x0002)
-#define SMCMR_DM       ((ushort)0x000c)
-#define SMCMR_SM_GCI   ((ushort)0x0000)
-#define SMCMR_SM_UART  ((ushort)0x0020)
-#define SMCMR_SM_TRANS ((ushort)0x0030)
-#define SMCMR_SM_MASK  ((ushort)0x0030)
-#define SMCMR_PM_EVEN  ((ushort)0x0100)        /* Even parity, else odd */
-#define SMCMR_REVD     SMCMR_PM_EVEN
-#define SMCMR_PEN      ((ushort)0x0200)        /* Parity enable */
-#define SMCMR_BS       SMCMR_PEN
-#define SMCMR_SL       ((ushort)0x0400)        /* Two stops, else one */
-#define SMCR_CLEN_MASK ((ushort)0x7800)        /* Character length */
-#define smcr_mk_clen(C)        (((C) << 11) & SMCR_CLEN_MASK)
-
-/* SMC Event and Mask register.
-*/
-#define SMCM_BRKE       ((unsigned char)0x40)   /* When in UART Mode */
-#define SMCM_BRK        ((unsigned char)0x10)   /* When in UART Mode */
-#define SMCM_TXE       ((unsigned char)0x10)
-#define SMCM_BSY       ((unsigned char)0x04)
-#define SMCM_TX                ((unsigned char)0x02)
-#define SMCM_RX                ((unsigned char)0x01)
-
-/* Baud rate generators.
-*/
-#define CPM_BRG_RST            ((uint)0x00020000)
-#define CPM_BRG_EN             ((uint)0x00010000)
-#define CPM_BRG_EXTC_INT       ((uint)0x00000000)
-#define CPM_BRG_EXTC_CLK3_9    ((uint)0x00004000)
-#define CPM_BRG_EXTC_CLK5_15   ((uint)0x00008000)
-#define CPM_BRG_ATB            ((uint)0x00002000)
-#define CPM_BRG_CD_MASK                ((uint)0x00001ffe)
-#define CPM_BRG_DIV16          ((uint)0x00000001)
-
-/* SCCs.
-*/
-#define SCC_GSMRH_IRP          ((uint)0x00040000)
-#define SCC_GSMRH_GDE          ((uint)0x00010000)
-#define SCC_GSMRH_TCRC_CCITT   ((uint)0x00008000)
-#define SCC_GSMRH_TCRC_BISYNC  ((uint)0x00004000)
-#define SCC_GSMRH_TCRC_HDLC    ((uint)0x00000000)
-#define SCC_GSMRH_REVD         ((uint)0x00002000)
-#define SCC_GSMRH_TRX          ((uint)0x00001000)
-#define SCC_GSMRH_TTX          ((uint)0x00000800)
-#define SCC_GSMRH_CDP          ((uint)0x00000400)
-#define SCC_GSMRH_CTSP         ((uint)0x00000200)
-#define SCC_GSMRH_CDS          ((uint)0x00000100)
-#define SCC_GSMRH_CTSS         ((uint)0x00000080)
-#define SCC_GSMRH_TFL          ((uint)0x00000040)
-#define SCC_GSMRH_RFW          ((uint)0x00000020)
-#define SCC_GSMRH_TXSY         ((uint)0x00000010)
-#define SCC_GSMRH_SYNL16       ((uint)0x0000000c)
-#define SCC_GSMRH_SYNL8                ((uint)0x00000008)
-#define SCC_GSMRH_SYNL4                ((uint)0x00000004)
-#define SCC_GSMRH_RTSM         ((uint)0x00000002)
-#define SCC_GSMRH_RSYN         ((uint)0x00000001)
-
-#define SCC_GSMRL_SIR          ((uint)0x80000000)      /* SCC2 only */
-#define SCC_GSMRL_EDGE_NONE    ((uint)0x60000000)
-#define SCC_GSMRL_EDGE_NEG     ((uint)0x40000000)
-#define SCC_GSMRL_EDGE_POS     ((uint)0x20000000)
-#define SCC_GSMRL_EDGE_BOTH    ((uint)0x00000000)
-#define SCC_GSMRL_TCI          ((uint)0x10000000)
-#define SCC_GSMRL_TSNC_3       ((uint)0x0c000000)
-#define SCC_GSMRL_TSNC_4       ((uint)0x08000000)
-#define SCC_GSMRL_TSNC_14      ((uint)0x04000000)
-#define SCC_GSMRL_TSNC_INF     ((uint)0x00000000)
-#define SCC_GSMRL_RINV         ((uint)0x02000000)
-#define SCC_GSMRL_TINV         ((uint)0x01000000)
-#define SCC_GSMRL_TPL_128      ((uint)0x00c00000)
-#define SCC_GSMRL_TPL_64       ((uint)0x00a00000)
-#define SCC_GSMRL_TPL_48       ((uint)0x00800000)
-#define SCC_GSMRL_TPL_32       ((uint)0x00600000)
-#define SCC_GSMRL_TPL_16       ((uint)0x00400000)
-#define SCC_GSMRL_TPL_8                ((uint)0x00200000)
-#define SCC_GSMRL_TPL_NONE     ((uint)0x00000000)
-#define SCC_GSMRL_TPP_ALL1     ((uint)0x00180000)
-#define SCC_GSMRL_TPP_01       ((uint)0x00100000)
-#define SCC_GSMRL_TPP_10       ((uint)0x00080000)
-#define SCC_GSMRL_TPP_ZEROS    ((uint)0x00000000)
-#define SCC_GSMRL_TEND         ((uint)0x00040000)
-#define SCC_GSMRL_TDCR_32      ((uint)0x00030000)
-#define SCC_GSMRL_TDCR_16      ((uint)0x00020000)
-#define SCC_GSMRL_TDCR_8       ((uint)0x00010000)
-#define SCC_GSMRL_TDCR_1       ((uint)0x00000000)
-#define SCC_GSMRL_RDCR_32      ((uint)0x0000c000)
-#define SCC_GSMRL_RDCR_16      ((uint)0x00008000)
-#define SCC_GSMRL_RDCR_8       ((uint)0x00004000)
-#define SCC_GSMRL_RDCR_1       ((uint)0x00000000)
-#define SCC_GSMRL_RENC_DFMAN   ((uint)0x00003000)
-#define SCC_GSMRL_RENC_MANCH   ((uint)0x00002000)
-#define SCC_GSMRL_RENC_FM0     ((uint)0x00001000)
-#define SCC_GSMRL_RENC_NRZI    ((uint)0x00000800)
-#define SCC_GSMRL_RENC_NRZ     ((uint)0x00000000)
-#define SCC_GSMRL_TENC_DFMAN   ((uint)0x00000600)
-#define SCC_GSMRL_TENC_MANCH   ((uint)0x00000400)
-#define SCC_GSMRL_TENC_FM0     ((uint)0x00000200)
-#define SCC_GSMRL_TENC_NRZI    ((uint)0x00000100)
-#define SCC_GSMRL_TENC_NRZ     ((uint)0x00000000)
-#define SCC_GSMRL_DIAG_LE      ((uint)0x000000c0)      /* Loop and echo */
-#define SCC_GSMRL_DIAG_ECHO    ((uint)0x00000080)
-#define SCC_GSMRL_DIAG_LOOP    ((uint)0x00000040)
-#define SCC_GSMRL_DIAG_NORM    ((uint)0x00000000)
-#define SCC_GSMRL_ENR          ((uint)0x00000020)
-#define SCC_GSMRL_ENT          ((uint)0x00000010)
-#define SCC_GSMRL_MODE_ENET    ((uint)0x0000000c)
-#define SCC_GSMRL_MODE_DDCMP   ((uint)0x00000009)
-#define SCC_GSMRL_MODE_BISYNC  ((uint)0x00000008)
-#define SCC_GSMRL_MODE_V14     ((uint)0x00000007)
-#define SCC_GSMRL_MODE_AHDLC   ((uint)0x00000006)
-#define SCC_GSMRL_MODE_PROFIBUS        ((uint)0x00000005)
-#define SCC_GSMRL_MODE_UART    ((uint)0x00000004)
-#define SCC_GSMRL_MODE_SS7     ((uint)0x00000003)
-#define SCC_GSMRL_MODE_ATALK   ((uint)0x00000002)
-#define SCC_GSMRL_MODE_HDLC    ((uint)0x00000000)
-
-#define SCC_TODR_TOD           ((ushort)0x8000)
-
-/* SCC Event and Mask register.
-*/
-#define SCCM_TXE       ((unsigned char)0x10)
-#define SCCM_BSY       ((unsigned char)0x04)
-#define SCCM_TX                ((unsigned char)0x02)
-#define SCCM_RX                ((unsigned char)0x01)
-
-typedef struct scc_param {
-       ushort  scc_rbase;      /* Rx Buffer descriptor base address */
-       ushort  scc_tbase;      /* Tx Buffer descriptor base address */
-       u_char  scc_rfcr;       /* Rx function code */
-       u_char  scc_tfcr;       /* Tx function code */
-       ushort  scc_mrblr;      /* Max receive buffer length */
-       uint    scc_rstate;     /* Internal */
-       uint    scc_idp;        /* Internal */
-       ushort  scc_rbptr;      /* Internal */
-       ushort  scc_ibc;        /* Internal */
-       uint    scc_rxtmp;      /* Internal */
-       uint    scc_tstate;     /* Internal */
-       uint    scc_tdp;        /* Internal */
-       ushort  scc_tbptr;      /* Internal */
-       ushort  scc_tbc;        /* Internal */
-       uint    scc_txtmp;      /* Internal */
-       uint    scc_rcrc;       /* Internal */
-       uint    scc_tcrc;       /* Internal */
-} sccp_t;
-
-/* CPM Ethernet through SCC1.
- */
-typedef struct scc_enet {
-       sccp_t  sen_genscc;
-       uint    sen_cpres;      /* Preset CRC */
-       uint    sen_cmask;      /* Constant mask for CRC */
-       uint    sen_crcec;      /* CRC Error counter */
-       uint    sen_alec;       /* alignment error counter */
-       uint    sen_disfc;      /* discard frame counter */
-       ushort  sen_pads;       /* Tx short frame pad character */
-       ushort  sen_retlim;     /* Retry limit threshold */
-       ushort  sen_retcnt;     /* Retry limit counter */
-       ushort  sen_maxflr;     /* maximum frame length register */
-       ushort  sen_minflr;     /* minimum frame length register */
-       ushort  sen_maxd1;      /* maximum DMA1 length */
-       ushort  sen_maxd2;      /* maximum DMA2 length */
-       ushort  sen_maxd;       /* Rx max DMA */
-       ushort  sen_dmacnt;     /* Rx DMA counter */
-       ushort  sen_maxb;       /* Max BD byte count */
-       ushort  sen_gaddr1;     /* Group address filter */
-       ushort  sen_gaddr2;
-       ushort  sen_gaddr3;
-       ushort  sen_gaddr4;
-       uint    sen_tbuf0data0; /* Save area 0 - current frame */
-       uint    sen_tbuf0data1; /* Save area 1 - current frame */
-       uint    sen_tbuf0rba;   /* Internal */
-       uint    sen_tbuf0crc;   /* Internal */
-       ushort  sen_tbuf0bcnt;  /* Internal */
-       ushort  sen_paddrh;     /* physical address (MSB) */
-       ushort  sen_paddrm;
-       ushort  sen_paddrl;     /* physical address (LSB) */
-       ushort  sen_pper;       /* persistence */
-       ushort  sen_rfbdptr;    /* Rx first BD pointer */
-       ushort  sen_tfbdptr;    /* Tx first BD pointer */
-       ushort  sen_tlbdptr;    /* Tx last BD pointer */
-       uint    sen_tbuf1data0; /* Save area 0 - current frame */
-       uint    sen_tbuf1data1; /* Save area 1 - current frame */
-       uint    sen_tbuf1rba;   /* Internal */
-       uint    sen_tbuf1crc;   /* Internal */
-       ushort  sen_tbuf1bcnt;  /* Internal */
-       ushort  sen_txlen;      /* Tx Frame length counter */
-       ushort  sen_iaddr1;     /* Individual address filter */
-       ushort  sen_iaddr2;
-       ushort  sen_iaddr3;
-       ushort  sen_iaddr4;
-       ushort  sen_boffcnt;    /* Backoff counter */
-
-       /* NOTE: Some versions of the manual have the following items
-        * incorrectly documented.  Below is the proper order.
-        */
-       ushort  sen_taddrh;     /* temp address (MSB) */
-       ushort  sen_taddrm;
-       ushort  sen_taddrl;     /* temp address (LSB) */
-} scc_enet_t;
-
-
-/* SCC Event register as used by Ethernet.
-*/
-#define SCCE_ENET_GRA  ((ushort)0x0080)        /* Graceful stop complete */
-#define SCCE_ENET_TXE  ((ushort)0x0010)        /* Transmit Error */
-#define SCCE_ENET_RXF  ((ushort)0x0008)        /* Full frame received */
-#define SCCE_ENET_BSY  ((ushort)0x0004)        /* All incoming buffers full */
-#define SCCE_ENET_TXB  ((ushort)0x0002)        /* A buffer was transmitted */
-#define SCCE_ENET_RXB  ((ushort)0x0001)        /* A buffer was received */
-
-/* SCC Mode Register (PSMR) as used by Ethernet.
-*/
-#define SCC_PSMR_HBC   ((ushort)0x8000)        /* Enable heartbeat */
-#define SCC_PSMR_FC    ((ushort)0x4000)        /* Force collision */
-#define SCC_PSMR_RSH   ((ushort)0x2000)        /* Receive short frames */
-#define SCC_PSMR_IAM   ((ushort)0x1000)        /* Check individual hash */
-#define SCC_PSMR_ENCRC ((ushort)0x0800)        /* Ethernet CRC mode */
-#define SCC_PSMR_PRO   ((ushort)0x0200)        /* Promiscuous mode */
-#define SCC_PSMR_BRO   ((ushort)0x0100)        /* Catch broadcast pkts */
-#define SCC_PSMR_SBT   ((ushort)0x0080)        /* Special backoff timer */
-#define SCC_PSMR_LPB   ((ushort)0x0040)        /* Set Loopback mode */
-#define SCC_PSMR_SIP   ((ushort)0x0020)        /* Sample Input Pins */
-#define SCC_PSMR_LCW   ((ushort)0x0010)        /* Late collision window */
-#define SCC_PSMR_NIB22 ((ushort)0x000a)        /* Start frame search */
-#define SCC_PSMR_FDE   ((ushort)0x0001)        /* Full duplex enable */
-
-/* Buffer descriptor control/status used by Ethernet receive.
- * Common to SCC and FCC.
- */
-#define BD_ENET_RX_EMPTY       ((ushort)0x8000)
-#define BD_ENET_RX_WRAP                ((ushort)0x2000)
-#define BD_ENET_RX_INTR                ((ushort)0x1000)
-#define BD_ENET_RX_LAST                ((ushort)0x0800)
-#define BD_ENET_RX_FIRST       ((ushort)0x0400)
-#define BD_ENET_RX_MISS                ((ushort)0x0100)
-#define BD_ENET_RX_BC          ((ushort)0x0080)        /* FCC Only */
-#define BD_ENET_RX_MC          ((ushort)0x0040)        /* FCC Only */
-#define BD_ENET_RX_LG          ((ushort)0x0020)
-#define BD_ENET_RX_NO          ((ushort)0x0010)
-#define BD_ENET_RX_SH          ((ushort)0x0008)
-#define BD_ENET_RX_CR          ((ushort)0x0004)
-#define BD_ENET_RX_OV          ((ushort)0x0002)
-#define BD_ENET_RX_CL          ((ushort)0x0001)
-#define BD_ENET_RX_STATS       ((ushort)0x01ff)        /* All status bits */
-
-/* Buffer descriptor control/status used by Ethernet transmit.
- * Common to SCC and FCC.
- */
-#define BD_ENET_TX_READY       ((ushort)0x8000)
-#define BD_ENET_TX_PAD         ((ushort)0x4000)
-#define BD_ENET_TX_WRAP                ((ushort)0x2000)
-#define BD_ENET_TX_INTR                ((ushort)0x1000)
-#define BD_ENET_TX_LAST                ((ushort)0x0800)
-#define BD_ENET_TX_TC          ((ushort)0x0400)
-#define BD_ENET_TX_DEF         ((ushort)0x0200)
-#define BD_ENET_TX_HB          ((ushort)0x0100)
-#define BD_ENET_TX_LC          ((ushort)0x0080)
-#define BD_ENET_TX_RL          ((ushort)0x0040)
-#define BD_ENET_TX_RCMASK      ((ushort)0x003c)
-#define BD_ENET_TX_UN          ((ushort)0x0002)
-#define BD_ENET_TX_CSL         ((ushort)0x0001)
-#define BD_ENET_TX_STATS       ((ushort)0x03ff)        /* All status bits */
-
-/* SCC as UART
-*/
-typedef struct scc_uart {
-       sccp_t  scc_genscc;
-       uint    scc_res1;       /* Reserved */
-       uint    scc_res2;       /* Reserved */
-       ushort  scc_maxidl;     /* Maximum idle chars */
-       ushort  scc_idlc;       /* temp idle counter */
-       ushort  scc_brkcr;      /* Break count register */
-       ushort  scc_parec;      /* receive parity error counter */
-       ushort  scc_frmec;      /* receive framing error counter */
-       ushort  scc_nosec;      /* receive noise counter */
-       ushort  scc_brkec;      /* receive break condition counter */
-       ushort  scc_brkln;      /* last received break length */
-       ushort  scc_uaddr1;     /* UART address character 1 */
-       ushort  scc_uaddr2;     /* UART address character 2 */
-       ushort  scc_rtemp;      /* Temp storage */
-       ushort  scc_toseq;      /* Transmit out of sequence char */
-       ushort  scc_char1;      /* control character 1 */
-       ushort  scc_char2;      /* control character 2 */
-       ushort  scc_char3;      /* control character 3 */
-       ushort  scc_char4;      /* control character 4 */
-       ushort  scc_char5;      /* control character 5 */
-       ushort  scc_char6;      /* control character 6 */
-       ushort  scc_char7;      /* control character 7 */
-       ushort  scc_char8;      /* control character 8 */
-       ushort  scc_rccm;       /* receive control character mask */
-       ushort  scc_rccr;       /* receive control character register */
-       ushort  scc_rlbc;       /* receive last break character */
-} scc_uart_t;
-
-/* SCC Event and Mask registers when it is used as a UART.
-*/
-#define UART_SCCM_GLR          ((ushort)0x1000)
-#define UART_SCCM_GLT          ((ushort)0x0800)
-#define UART_SCCM_AB           ((ushort)0x0200)
-#define UART_SCCM_IDL          ((ushort)0x0100)
-#define UART_SCCM_GRA          ((ushort)0x0080)
-#define UART_SCCM_BRKE         ((ushort)0x0040)
-#define UART_SCCM_BRKS         ((ushort)0x0020)
-#define UART_SCCM_CCR          ((ushort)0x0008)
-#define UART_SCCM_BSY          ((ushort)0x0004)
-#define UART_SCCM_TX           ((ushort)0x0002)
-#define UART_SCCM_RX           ((ushort)0x0001)
-
-/* The SCC PMSR when used as a UART.
-*/
-#define SCU_PMSR_FLC           ((ushort)0x8000)
-#define SCU_PMSR_SL            ((ushort)0x4000)
-#define SCU_PMSR_CL            ((ushort)0x3000)
-#define SCU_PMSR_UM            ((ushort)0x0c00)
-#define SCU_PMSR_FRZ           ((ushort)0x0200)
-#define SCU_PMSR_RZS           ((ushort)0x0100)
-#define SCU_PMSR_SYN           ((ushort)0x0080)
-#define SCU_PMSR_DRT           ((ushort)0x0040)
-#define SCU_PMSR_PEN           ((ushort)0x0010)
-#define SCU_PMSR_RPM           ((ushort)0x000c)
-#define SCU_PMSR_REVP          ((ushort)0x0008)
-#define SCU_PMSR_TPM           ((ushort)0x0003)
-#define SCU_PMSR_TEVP          ((ushort)0x0003)
-
-/* CPM Transparent mode SCC.
- */
-typedef struct scc_trans {
-       sccp_t  st_genscc;
-       uint    st_cpres;       /* Preset CRC */
-       uint    st_cmask;       /* Constant mask for CRC */
-} scc_trans_t;
-
-#define BD_SCC_TX_LAST         ((ushort)0x0800)
-
-/* How about some FCCs.....
-*/
-#define FCC_GFMR_DIAG_NORM     ((uint)0x00000000)
-#define FCC_GFMR_DIAG_LE       ((uint)0x40000000)
-#define FCC_GFMR_DIAG_AE       ((uint)0x80000000)
-#define FCC_GFMR_DIAG_ALE      ((uint)0xc0000000)
-#define FCC_GFMR_TCI           ((uint)0x20000000)
-#define FCC_GFMR_TRX           ((uint)0x10000000)
-#define FCC_GFMR_TTX           ((uint)0x08000000)
-#define FCC_GFMR_TTX           ((uint)0x08000000)
-#define FCC_GFMR_CDP           ((uint)0x04000000)
-#define FCC_GFMR_CTSP          ((uint)0x02000000)
-#define FCC_GFMR_CDS           ((uint)0x01000000)
-#define FCC_GFMR_CTSS          ((uint)0x00800000)
-#define FCC_GFMR_SYNL_NONE     ((uint)0x00000000)
-#define FCC_GFMR_SYNL_AUTO     ((uint)0x00004000)
-#define FCC_GFMR_SYNL_8                ((uint)0x00008000)
-#define FCC_GFMR_SYNL_16       ((uint)0x0000c000)
-#define FCC_GFMR_RTSM          ((uint)0x00002000)
-#define FCC_GFMR_RENC_NRZ      ((uint)0x00000000)
-#define FCC_GFMR_RENC_NRZI     ((uint)0x00000800)
-#define FCC_GFMR_REVD          ((uint)0x00000400)
-#define FCC_GFMR_TENC_NRZ      ((uint)0x00000000)
-#define FCC_GFMR_TENC_NRZI     ((uint)0x00000100)
-#define FCC_GFMR_TCRC_16       ((uint)0x00000000)
-#define FCC_GFMR_TCRC_32       ((uint)0x00000080)
-#define FCC_GFMR_ENR           ((uint)0x00000020)
-#define FCC_GFMR_ENT           ((uint)0x00000010)
-#define FCC_GFMR_MODE_ENET     ((uint)0x0000000c)
-#define FCC_GFMR_MODE_ATM      ((uint)0x0000000a)
-#define FCC_GFMR_MODE_HDLC     ((uint)0x00000000)
-
-/* Generic FCC parameter ram.
-*/
-typedef struct fcc_param {
-       ushort  fcc_riptr;      /* Rx Internal temp pointer */
-       ushort  fcc_tiptr;      /* Tx Internal temp pointer */
-       ushort  fcc_res1;
-       ushort  fcc_mrblr;      /* Max receive buffer length, mod 32 bytes */
-       uint    fcc_rstate;     /* Upper byte is Func code, must be set */
-       uint    fcc_rbase;      /* Receive BD base */
-       ushort  fcc_rbdstat;    /* RxBD status */
-       ushort  fcc_rbdlen;     /* RxBD down counter */
-       uint    fcc_rdptr;      /* RxBD internal data pointer */
-       uint    fcc_tstate;     /* Upper byte is Func code, must be set */
-       uint    fcc_tbase;      /* Transmit BD base */
-       ushort  fcc_tbdstat;    /* TxBD status */
-       ushort  fcc_tbdlen;     /* TxBD down counter */
-       uint    fcc_tdptr;      /* TxBD internal data pointer */
-       uint    fcc_rbptr;      /* Rx BD Internal buf pointer */
-       uint    fcc_tbptr;      /* Tx BD Internal buf pointer */
-       uint    fcc_rcrc;       /* Rx temp CRC */
-       uint    fcc_res2;
-       uint    fcc_tcrc;       /* Tx temp CRC */
-} fccp_t;
-
-
-/* Ethernet controller through FCC.
-*/
-typedef struct fcc_enet {
-       fccp_t  fen_genfcc;
-       uint    fen_statbuf;    /* Internal status buffer */
-       uint    fen_camptr;     /* CAM address */
-       uint    fen_cmask;      /* Constant mask for CRC */
-       uint    fen_cpres;      /* Preset CRC */
-       uint    fen_crcec;      /* CRC Error counter */
-       uint    fen_alec;       /* alignment error counter */
-       uint    fen_disfc;      /* discard frame counter */
-       ushort  fen_retlim;     /* Retry limit */
-       ushort  fen_retcnt;     /* Retry counter */
-       ushort  fen_pper;       /* Persistence */
-       ushort  fen_boffcnt;    /* backoff counter */
-       uint    fen_gaddrh;     /* Group address filter, high 32-bits */
-       uint    fen_gaddrl;     /* Group address filter, low 32-bits */
-       ushort  fen_tfcstat;    /* out of sequence TxBD */
-       ushort  fen_tfclen;
-       uint    fen_tfcptr;
-       ushort  fen_mflr;       /* Maximum frame length (1518) */
-       ushort  fen_paddrh;     /* MAC address */
-       ushort  fen_paddrm;
-       ushort  fen_paddrl;
-       ushort  fen_ibdcount;   /* Internal BD counter */
-       ushort  fen_idbstart;   /* Internal BD start pointer */
-       ushort  fen_ibdend;     /* Internal BD end pointer */
-       ushort  fen_txlen;      /* Internal Tx frame length counter */
-       uint    fen_ibdbase[8]; /* Internal use */
-       uint    fen_iaddrh;     /* Individual address filter */
-       uint    fen_iaddrl;
-       ushort  fen_minflr;     /* Minimum frame length (64) */
-       ushort  fen_taddrh;     /* Filter transfer MAC address */
-       ushort  fen_taddrm;
-       ushort  fen_taddrl;
-       ushort  fen_padptr;     /* Pointer to pad byte buffer */
-       ushort  fen_cftype;     /* control frame type */
-       ushort  fen_cfrange;    /* control frame range */
-       ushort  fen_maxb;       /* maximum BD count */
-       ushort  fen_maxd1;      /* Max DMA1 length (1520) */
-       ushort  fen_maxd2;      /* Max DMA2 length (1520) */
-       ushort  fen_maxd;       /* internal max DMA count */
-       ushort  fen_dmacnt;     /* internal DMA counter */
-       uint    fen_octc;       /* Total octect counter */
-       uint    fen_colc;       /* Total collision counter */
-       uint    fen_broc;       /* Total broadcast packet counter */
-       uint    fen_mulc;       /* Total multicast packet count */
-       uint    fen_uspc;       /* Total packets < 64 bytes */
-       uint    fen_frgc;       /* Total packets < 64 bytes with errors */
-       uint    fen_ospc;       /* Total packets > 1518 */
-       uint    fen_jbrc;       /* Total packets > 1518 with errors */
-       uint    fen_p64c;       /* Total packets == 64 bytes */
-       uint    fen_p65c;       /* Total packets 64 < bytes <= 127 */
-       uint    fen_p128c;      /* Total packets 127 < bytes <= 255 */
-       uint    fen_p256c;      /* Total packets 256 < bytes <= 511 */
-       uint    fen_p512c;      /* Total packets 512 < bytes <= 1023 */
-       uint    fen_p1024c;     /* Total packets 1024 < bytes <= 1518 */
-       uint    fen_cambuf;     /* Internal CAM buffer poiner */
-       ushort  fen_rfthr;      /* Received frames threshold */
-       ushort  fen_rfcnt;      /* Received frames count */
-} fcc_enet_t;
-
-/* FCC Event/Mask register as used by Ethernet.
-*/
-#define FCC_ENET_GRA   ((ushort)0x0080)        /* Graceful stop complete */
-#define FCC_ENET_RXC   ((ushort)0x0040)        /* Control Frame Received */
-#define FCC_ENET_TXC   ((ushort)0x0020)        /* Out of seq. Tx sent */
-#define FCC_ENET_TXE   ((ushort)0x0010)        /* Transmit Error */
-#define FCC_ENET_RXF   ((ushort)0x0008)        /* Full frame received */
-#define FCC_ENET_BSY   ((ushort)0x0004)        /* Busy.  Rx Frame dropped */
-#define FCC_ENET_TXB   ((ushort)0x0002)        /* A buffer was transmitted */
-#define FCC_ENET_RXB   ((ushort)0x0001)        /* A buffer was received */
-
-/* FCC Mode Register (FPSMR) as used by Ethernet.
-*/
-#define FCC_PSMR_HBC   ((uint)0x80000000)      /* Enable heartbeat */
-#define FCC_PSMR_FC    ((uint)0x40000000)      /* Force Collision */
-#define FCC_PSMR_SBT   ((uint)0x20000000)      /* Stop backoff timer */
-#define FCC_PSMR_LPB   ((uint)0x10000000)      /* Local protect. 1 = FDX */
-#define FCC_PSMR_LCW   ((uint)0x08000000)      /* Late collision select */
-#define FCC_PSMR_FDE   ((uint)0x04000000)      /* Full Duplex Enable */
-#define FCC_PSMR_MON   ((uint)0x02000000)      /* RMON Enable */
-#define FCC_PSMR_PRO   ((uint)0x00400000)      /* Promiscuous Enable */
-#define FCC_PSMR_FCE   ((uint)0x00200000)      /* Flow Control Enable */
-#define FCC_PSMR_RSH   ((uint)0x00100000)      /* Receive Short Frames */
-#define FCC_PSMR_CAM   ((uint)0x00000400)      /* CAM enable */
-#define FCC_PSMR_BRO   ((uint)0x00000200)      /* Broadcast pkt discard */
-#define FCC_PSMR_ENCRC ((uint)0x00000080)      /* Use 32-bit CRC */
-
-/* IIC parameter RAM.
-*/
-typedef struct iic {
-       ushort  iic_rbase;      /* Rx Buffer descriptor base address */
-       ushort  iic_tbase;      /* Tx Buffer descriptor base address */
-       u_char  iic_rfcr;       /* Rx function code */
-       u_char  iic_tfcr;       /* Tx function code */
-       ushort  iic_mrblr;      /* Max receive buffer length */
-       uint    iic_rstate;     /* Internal */
-       uint    iic_rdp;        /* Internal */
-       ushort  iic_rbptr;      /* Internal */
-       ushort  iic_rbc;        /* Internal */
-       uint    iic_rxtmp;      /* Internal */
-       uint    iic_tstate;     /* Internal */
-       uint    iic_tdp;        /* Internal */
-       ushort  iic_tbptr;      /* Internal */
-       ushort  iic_tbc;        /* Internal */
-       uint    iic_txtmp;      /* Internal */
-} iic_t;
-
-#define BD_IIC_START           ((ushort)0x0400)
-
-#endif /* __CPM_82XX__ */
-#endif /* __KERNEL__ */
diff --git a/include/asm-ppc/cpumask.h b/include/asm-ppc/cpumask.h
deleted file mode 100644 (file)
index 3090108..0000000
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef _ASM_PPC_CPUMASK_H
-#define _ASM_PPC_CPUMASK_H
-
-#include <asm-generic/cpumask.h>
-
-#endif /* _ASM_PPC_CPUMASK_H */
diff --git a/include/asm-ppc/immap_8260.h b/include/asm-ppc/immap_8260.h
deleted file mode 100644 (file)
index cee53ba..0000000
+++ /dev/null
@@ -1,433 +0,0 @@
-/*
- * MPC8260 Internal Memory Map
- * Copyright (c) 1999 Dan Malek (dmalek@jlc.net)
- *
- * The Internal Memory Map of the 8260.  I don't know how generic
- * this will be, as I don't have any knowledge of the subsequent
- * parts at this time.  I copied this from the 8xx_immap.h.
- */
-#ifdef __KERNEL__
-#ifndef __IMMAP_82XX__
-#define __IMMAP_82XX__
-
-/* System configuration registers.
-*/
-typedef        struct sys_conf {
-       uint    sc_siumcr;
-       uint    sc_sypcr;
-       char    res1[6];
-       ushort  sc_swsr;
-       char    res2[20];
-       uint    sc_bcr;
-       u_char  sc_ppc_acr;
-       char    res3[3];
-       uint    sc_ppc_alrh;
-       uint    sc_ppc_alrl;
-       u_char  sc_lcl_acr;
-       char    res4[3];
-       uint    sc_lcl_alrh;
-       uint    sc_lcl_alrl;
-       uint    sc_tescr1;
-       uint    sc_tescr2;
-       uint    sc_ltescr1;
-       uint    sc_ltescr2;
-       uint    sc_pdtea;
-       u_char  sc_pdtem;
-       char    res5[3];
-       uint    sc_ldtea;
-       u_char  sc_ldtem;
-       char    res6[163];
-} sysconf8260_t;
-
-
-/* Memory controller registers.
-*/
-typedef struct mem_ctlr {
-       uint    memc_br0;
-       uint    memc_or0;
-       uint    memc_br1;
-       uint    memc_or1;
-       uint    memc_br2;
-       uint    memc_or2;
-       uint    memc_br3;
-       uint    memc_or3;
-       uint    memc_br4;
-       uint    memc_or4;
-       uint    memc_br5;
-       uint    memc_or5;
-       uint    memc_br6;
-       uint    memc_or6;
-       uint    memc_br7;
-       uint    memc_or7;
-       uint    memc_br8;
-       uint    memc_or8;
-       uint    memc_br9;
-       uint    memc_or9;
-       uint    memc_br10;
-       uint    memc_or10;
-       uint    memc_br11;
-       uint    memc_or11;
-       char    res1[8];
-       uint    memc_mar;
-       char    res2[4];
-       uint    memc_mamr;
-       uint    memc_mbmr;
-       uint    memc_mcmr;
-       char    res3[8];
-       ushort  memc_mptpr;
-       char    res4[2];
-       uint    memc_mdr;
-       char    res5[4];
-       uint    memc_psdmr;
-       uint    memc_lsdmr;
-       u_char  memc_purt;
-       char    res6[3];
-       u_char  memc_psrt;
-       char    res7[3];
-       u_char  memc_lurt;
-       char    res8[3];
-       u_char  memc_lsrt;
-       char    res9[3];
-       uint    memc_immr;
-       char    res10[84];
-} memctl8260_t;
-
-/* System Integration Timers.
-*/
-typedef struct sys_int_timers {
-       char    res1[32];
-       ushort  sit_tmcntsc;
-       char    res2[2];
-       uint    sit_tmcnt;
-       char    res3[4];
-       uint    sit_tmcntal;
-       char    res4[16];
-       ushort  sit_piscr;
-       char    res5[2];
-       uint    sit_pitc;
-       uint    sit_pitr;
-       char    res6[94];
-       char    res7[2390];
-} sit8260_t;
-
-#define PISCR_PIRQ_MASK                ((ushort)0xff00)
-#define PISCR_PS               ((ushort)0x0080)
-#define PISCR_PIE              ((ushort)0x0004)
-#define PISCR_PTF              ((ushort)0x0002)
-#define PISCR_PTE              ((ushort)0x0001)
-
-/* Interrupt Controller.
-*/
-typedef struct interrupt_controller {
-       ushort  ic_sicr;
-       char    res1[2];
-       uint    ic_sivec;
-       uint    ic_sipnrh;
-       uint    ic_sipnrl;
-       uint    ic_siprr;
-       uint    ic_scprrh;
-       uint    ic_scprrl;
-       uint    ic_simrh;
-       uint    ic_simrl;
-       uint    ic_siexr;
-       char    res2[88];
-} intctl8260_t;
-
-/* Clocks and Reset.
-*/
-typedef struct clk_and_reset {
-       uint    car_sccr;
-       char    res1[4];
-       uint    car_scmr;
-       char    res2[4];
-       uint    car_rsr;
-       uint    car_rmr;
-       char    res[104];
-} car8260_t;
-
-/* Input/Output Port control/status registers.
- * Names consistent with processor manual, although they are different
- * from the original 8xx names.......
- */
-typedef struct io_port {
-       uint    iop_pdira;
-       uint    iop_ppara;
-       uint    iop_psora;
-       uint    iop_podra;
-       uint    iop_pdata;
-       char    res1[12];
-       uint    iop_pdirb;
-       uint    iop_pparb;
-       uint    iop_psorb;
-       uint    iop_podrb;
-       uint    iop_pdatb;
-       char    res2[12];
-       uint    iop_pdirc;
-       uint    iop_pparc;
-       uint    iop_psorc;
-       uint    iop_podrc;
-       uint    iop_pdatc;
-       char    res3[12];
-       uint    iop_pdird;
-       uint    iop_ppard;
-       uint    iop_psord;
-       uint    iop_podrd;
-       uint    iop_pdatd;
-       char    res4[12];
-} iop8260_t;
-
-/* Communication Processor Module Timers
-*/
-typedef struct cpm_timers {
-       u_char  cpmt_tgcr1;
-       char    res1[3];
-       u_char  cpmt_tgcr2;
-       char    res2[11];
-       ushort  cpmt_tmr1;
-       ushort  cpmt_tmr2;
-       ushort  cpmt_trr1;
-       ushort  cpmt_trr2;
-       ushort  cpmt_tcr1;
-       ushort  cpmt_tcr2;
-       ushort  cpmt_tcn1;
-       ushort  cpmt_tcn2;
-       ushort  cpmt_tmr3;
-       ushort  cpmt_tmr4;
-       ushort  cpmt_trr3;
-       ushort  cpmt_trr4;
-       ushort  cpmt_tcr3;
-       ushort  cpmt_tcr4;
-       ushort  cpmt_tcn3;
-       ushort  cpmt_tcn4;
-       ushort  cpmt_ter1;
-       ushort  cpmt_ter2;
-       ushort  cpmt_ter3;
-       ushort  cpmt_ter4;
-       char    res3[584];
-} cpmtimer8260_t;
-
-/* DMA control/status registers.
-*/
-typedef struct sdma_csr {
-       char    res0[24];
-       u_char  sdma_sdsr;
-       char    res1[3];
-       u_char  sdma_sdmr;
-       char    res2[3];
-       u_char  sdma_idsr1;
-       char    res3[3];
-       u_char  sdma_idmr1;
-       char    res4[3];
-       u_char  sdma_idsr2;
-       char    res5[3];
-       u_char  sdma_idmr2;
-       char    res6[3];
-       u_char  sdma_idsr3;
-       char    res7[3];
-       u_char  sdma_idmr3;
-       char    res8[3];
-       u_char  sdma_idsr4;
-       char    res9[3];
-       u_char  sdma_idmr4;
-       char    res10[707];
-} sdma8260_t;
-
-/* Fast controllers
-*/
-typedef struct fcc {
-       uint    fcc_gfmr;
-       uint    fcc_fpsmr;
-       ushort  fcc_ftodr;
-       char    res1[2];
-       ushort  fcc_fdsr;
-       char    res2[2];
-       ushort  fcc_fcce;
-       char    res3[2];
-       ushort  fcc_fccm;
-       char    res4[2];
-       u_char  fcc_fccs;
-       char    res5[3];
-       u_char  fcc_ftirr_phy[4];
-} fcc_t;
-
-/* I2C
-*/
-typedef struct i2c {
-       u_char  i2c_i2mod;
-       char    res1[3];
-       u_char  i2c_i2add;
-       char    res2[3];
-       u_char  i2c_i2brg;
-       char    res3[3];
-       u_char  i2c_i2com;
-       char    res4[3];
-       u_char  i2c_i2cer;
-       char    res5[3];
-       u_char  i2c_i2cmr;
-       char    res6[331];
-} i2c8260_t;
-
-typedef struct scc {           /* Serial communication channels */
-       uint    scc_gsmrl;
-       uint    scc_gsmrh;
-       ushort  scc_pmsr;
-       char    res1[2];
-       ushort  scc_todr;
-       ushort  scc_dsr;
-       ushort  scc_scce;
-       char    res2[2];
-       ushort  scc_sccm;
-       char    res3;
-       u_char  scc_sccs;
-       char    res4[8];
-} scc_t;
-
-typedef struct smc {           /* Serial management channels */
-       char    res1[2];
-       ushort  smc_smcmr;
-       char    res2[2];
-       u_char  smc_smce;
-       char    res3[3];
-       u_char  smc_smcm;
-       char    res4[5];
-} smc_t;
-
-/* Serial Peripheral Interface.
-*/
-typedef struct spi {
-       ushort  spi_spmode;
-       char    res1[4];
-       u_char  spi_spie;
-       char    res2[3];
-       u_char  spi_spim;
-       char    res3[2];
-       u_char  spi_spcom;
-       char    res4[82];
-} spi_t;
-
-/* CPM Mux.
-*/
-typedef struct cpmux {
-       u_char  cmx_si1cr;
-       char    res1;
-       u_char  cmx_si2cr;
-       char    res2;
-       uint    cmx_fcr;
-       uint    cmx_scr;
-       u_char  cmx_smr;
-       char    res3;
-       ushort  cmx_uar;
-       char    res4[16];
-} cpmux_t;
-
-/* SIRAM control
-*/
-typedef struct siram {
-       ushort  si_amr;
-       ushort  si_bmr;
-       ushort  si_cmr;
-       ushort  si_dmr;
-       u_char  si_gmr;
-       char    res1;
-       u_char  si_cmdr;
-       char    res2;
-       u_char  si_str;
-       char    res3;
-       ushort  si_rsr;
-} siramctl_t;
-
-typedef struct mcc {
-       ushort  mcc_mcce;
-       char    res1[2];
-       ushort  mcc_mccm;
-       char    res2[2];
-       u_char  mcc_mccf;
-       char    res3[7];
-} mcc_t;
-
-typedef struct comm_proc {
-       uint    cp_cpcr;
-       uint    cp_rccr;
-       char    res1[14];
-       ushort  cp_rter;
-       char    res2[2];
-       ushort  cp_rtmr;
-       ushort  cp_rtscr;
-       char    res3[2];
-       uint    cp_rtsr;
-       char    res4[12];
-} cpm8260_t;
-
-/* ...and the whole thing wrapped up....
-*/
-typedef struct immap {
-       /* Some references are into the unique and known dpram spaces,
-        * others are from the generic base.
-        */
-#define im_dprambase   im_dpram1
-       u_char          im_dpram1[16*1024];
-       char            res1[16*1024];
-       u_char          im_dpram2[4*1024];
-       char            res2[8*1024];
-       u_char          im_dpram3[4*1024];
-       char            res3[16*1024];
-
-       sysconf8260_t   im_siu_conf;    /* SIU Configuration */
-       memctl8260_t    im_memctl;      /* Memory Controller */
-       sit8260_t       im_sit;         /* System Integration Timers */
-       intctl8260_t    im_intctl;      /* Interrupt Controller */
-       car8260_t       im_clkrst;      /* Clocks and reset */
-       iop8260_t       im_ioport;      /* IO Port control/status */
-       cpmtimer8260_t  im_cpmtimer;    /* CPM timers */
-       sdma8260_t      im_sdma;        /* SDMA control/status */
-
-       fcc_t           im_fcc[3];      /* Three FCCs */
-
-       char            res4[159];
-
-       /* First set of baud rate generators.
-       */
-       char            res4a[496];
-       uint            im_brgc5;
-       uint            im_brgc6;
-       uint            im_brgc7;
-       uint            im_brgc8;
-
-       char            res5[608];
-
-       i2c8260_t       im_i2c;         /* I2C control/status */
-       cpm8260_t       im_cpm;         /* Communication processor */
-
-       /* Second set of baud rate generators.
-       */
-       uint            im_brgc1;
-       uint            im_brgc2;
-       uint            im_brgc3;
-       uint            im_brgc4;
-
-       scc_t           im_scc[4];      /* Four SCCs */
-       smc_t           im_smc[2];      /* Couple of SMCs */
-       spi_t           im_spi;         /* A SPI */
-       cpmux_t         im_cpmux;       /* CPM clock route mux */
-       siramctl_t      im_siramctl1;   /* First SI RAM Control */
-       mcc_t           im_mcc1;        /* First MCC */
-       siramctl_t      im_siramctl2;   /* Second SI RAM Control */
-       mcc_t           im_mcc2;        /* Second MCC */
-
-       char            res6[1184];
-
-       ushort          im_si1txram[256];
-       char            res7[512];
-       ushort          im_si1rxram[256];
-       char            res8[512];
-       ushort          im_si2txram[256];
-       char            res9[512];
-       ushort          im_si2rxram[256];
-       char            res10[512];
-       char            res11[4096];
-} immap_t;
-
-extern immap_t *immr;
-
-#endif /* __IMMAP_82XX__ */
-#endif /* __KERNEL__ */
diff --git a/include/asm-ppc/mpc52xx.h b/include/asm-ppc/mpc52xx.h
deleted file mode 100644 (file)
index 4fb6e57..0000000
+++ /dev/null
@@ -1,380 +0,0 @@
-/*
- * include/asm-ppc/mpc52xx.h
- * 
- * Prototypes, etc. for the Freescale MPC52xx embedded cpu chips
- * May need to be cleaned as the port goes on ...
- *
- *
- * Maintainer : Sylvain Munaut <tnt@246tNt.com>
- *
- * Originally written by Dale Farnsworth <dfarnsworth@mvista.com> 
- * for the 2.4 kernel.
- *
- * Copyright (C) 2004 Sylvain Munaut <tnt@246tNt.com>
- * Copyright (C) 2003 MontaVista, Software, Inc.
- *
- * This file is licensed under the terms of the GNU General Public License
- * version 2. This program is licensed "as is" without any warranty of any
- * kind, whether express or implied.
- */
-
-#ifndef __ASM_MPC52xx_H__
-#define __ASM_MPC52xx_H__
-
-#ifndef __ASSEMBLY__
-#include <asm/ppcboot.h>
-#include <asm/types.h>
-
-struct pt_regs;
-struct ocp_def;
-#endif /* __ASSEMBLY__ */
-
-
-/* ======================================================================== */
-/* Main registers/struct addresses                                          */
-/* ======================================================================== */
-/* Theses are PHYSICAL addresses !                                          */
-/* TODO : There should be no static mapping, but it's not yet the case, so  */
-/*        we require a 1:1 mapping                                          */
-
-#define MPC52xx_MBAR           0xf0000000      /* Phys address */
-#define MPC52xx_MBAR_SIZE      0x00010000
-#define MPC52xx_MBAR_VIRT      0xf0000000      /* Virt address */
-
-#define MPC52xx_MMAP_CTL       (MPC52xx_MBAR + 0x0000)
-#define MPC52xx_CDM            (MPC52xx_MBAR + 0x0200)
-#define MPC52xx_SFTRST         (MPC52xx_MBAR + 0x0220)
-#define MPC52xx_SFTRST_BIT     0x01000000
-#define MPC52xx_INTR           (MPC52xx_MBAR + 0x0500)
-#define MPC52xx_GPTx(x)                (MPC52xx_MBAR + 0x0600 + ((x)<<4))
-#define MPC52xx_RTC            (MPC52xx_MBAR + 0x0800)
-#define MPC52xx_MSCAN1         (MPC52xx_MBAR + 0x0900)
-#define MPC52xx_MSCAN2         (MPC52xx_MBAR + 0x0980)
-#define MPC52xx_GPIO           (MPC52xx_MBAR + 0x0b00)
-#define MPC52xx_PCI            (MPC52xx_MBAR + 0x0d00)
-#define MPC52xx_USB_OHCI       (MPC52xx_MBAR + 0x1000)
-#define MPC52xx_SDMA           (MPC52xx_MBAR + 0x1200)
-#define MPC52xx_XLB            (MPC52xx_MBAR + 0x1f00)
-#define MPC52xx_PSCx(x)                (MPC52xx_MBAR + 0x2000 + ((x)<<9))
-#define MPC52xx_PSC1           (MPC52xx_MBAR + 0x2000)
-#define MPC52xx_PSC2           (MPC52xx_MBAR + 0x2200)
-#define MPC52xx_PSC3           (MPC52xx_MBAR + 0x2400)
-#define MPC52xx_PSC4           (MPC52xx_MBAR + 0x2600)
-#define MPC52xx_PSC5           (MPC52xx_MBAR + 0x2800)
-#define MPC52xx_PSC6           (MPC52xx_MBAR + 0x2C00)
-#define MPC52xx_FEC            (MPC52xx_MBAR + 0x3000)
-#define MPC52xx_ATA            (MPC52xx_MBAR + 0x3a00)
-#define MPC52xx_I2C1           (MPC52xx_MBAR + 0x3d00)
-#define MPC52xx_I2C_MICR       (MPC52xx_MBAR + 0x3d20)
-#define MPC52xx_I2C2           (MPC52xx_MBAR + 0x3d40)
-
-/* SRAM used for SDMA */
-#define MPC52xx_SRAM           (MPC52xx_MBAR + 0x8000)
-#define MPC52xx_SRAM_SIZE      (16*1024)
-#define MPC52xx_SDMA_MAX_TASKS 16
-
-       /* Memory allocation block size */
-#define MPC52xx_SDRAM_UNIT     0x8000          /* 32K byte */
-
-
-/* ======================================================================== */
-/* IRQ mapping                                                              */
-/* ======================================================================== */
-/* Be sure to look at mpc52xx_pic.h if you wish for whatever reason to change
- * this
- */
-
-#define MPC52xx_CRIT_IRQ_NUM   4
-#define MPC52xx_MAIN_IRQ_NUM   17
-#define MPC52xx_SDMA_IRQ_NUM   17
-#define MPC52xx_PERP_IRQ_NUM   23
-
-#define MPC52xx_CRIT_IRQ_BASE  0
-#define MPC52xx_MAIN_IRQ_BASE  (MPC52xx_CRIT_IRQ_BASE + MPC52xx_CRIT_IRQ_NUM)
-#define MPC52xx_SDMA_IRQ_BASE  (MPC52xx_MAIN_IRQ_BASE + MPC52xx_MAIN_IRQ_NUM)
-#define MPC52xx_PERP_IRQ_BASE  (MPC52xx_SDMA_IRQ_BASE + MPC52xx_SDMA_IRQ_NUM)
-
-#define MPC52xx_IRQ0                   (MPC52xx_CRIT_IRQ_BASE + 0)
-#define MPC52xx_SLICE_TIMER_0_IRQ      (MPC52xx_CRIT_IRQ_BASE + 1)
-#define MPC52xx_HI_INT_IRQ             (MPC52xx_CRIT_IRQ_BASE + 2)
-#define MPC52xx_CCS_IRQ                        (MPC52xx_CRIT_IRQ_BASE + 3)
-
-#define MPC52xx_IRQ1                   (MPC52xx_MAIN_IRQ_BASE + 1)
-#define MPC52xx_IRQ2                   (MPC52xx_MAIN_IRQ_BASE + 2)
-#define MPC52xx_IRQ3                   (MPC52xx_MAIN_IRQ_BASE + 3)
-
-#define MPC52xx_SDMA_IRQ               (MPC52xx_PERP_IRQ_BASE + 0)
-#define MPC52xx_PSC1_IRQ               (MPC52xx_PERP_IRQ_BASE + 1)
-#define MPC52xx_PSC2_IRQ               (MPC52xx_PERP_IRQ_BASE + 2)
-#define MPC52xx_PSC3_IRQ               (MPC52xx_PERP_IRQ_BASE + 3)
-#define MPC52xx_PSC6_IRQ               (MPC52xx_PERP_IRQ_BASE + 4)
-#define MPC52xx_IRDA_IRQ               (MPC52xx_PERP_IRQ_BASE + 4)
-#define MPC52xx_FEC_IRQ                        (MPC52xx_PERP_IRQ_BASE + 5)
-#define MPC52xx_USB_IRQ                        (MPC52xx_PERP_IRQ_BASE + 6)
-#define MPC52xx_ATA_IRQ                        (MPC52xx_PERP_IRQ_BASE + 7)
-#define MPC52xx_PCI_CNTRL_IRQ          (MPC52xx_PERP_IRQ_BASE + 8)
-#define MPC52xx_PCI_SCIRX_IRQ          (MPC52xx_PERP_IRQ_BASE + 9)
-#define MPC52xx_PCI_SCITX_IRQ          (MPC52xx_PERP_IRQ_BASE + 10)
-#define MPC52xx_PSC4_IRQ               (MPC52xx_PERP_IRQ_BASE + 11)
-#define MPC52xx_PSC5_IRQ               (MPC52xx_PERP_IRQ_BASE + 12)
-#define MPC52xx_SPI_MODF_IRQ           (MPC52xx_PERP_IRQ_BASE + 13)
-#define MPC52xx_SPI_SPIF_IRQ           (MPC52xx_PERP_IRQ_BASE + 14)
-#define MPC52xx_I2C1_IRQ               (MPC52xx_PERP_IRQ_BASE + 15)
-#define MPC52xx_I2C2_IRQ               (MPC52xx_PERP_IRQ_BASE + 16)
-#define MPC52xx_CAN1_IRQ               (MPC52xx_PERP_IRQ_BASE + 17)
-#define MPC52xx_CAN2_IRQ               (MPC52xx_PERP_IRQ_BASE + 18)
-#define MPC52xx_IR_RX_IRQ              (MPC52xx_PERP_IRQ_BASE + 19)
-#define MPC52xx_IR_TX_IRQ              (MPC52xx_PERP_IRQ_BASE + 20)
-#define MPC52xx_XLB_ARB_IRQ            (MPC52xx_PERP_IRQ_BASE + 21)
-
-
-
-/* ======================================================================== */
-/* Structures mapping of some unit register set                             */
-/* ======================================================================== */
-
-#ifndef __ASSEMBLY__
-
-/* Memory Mapping Control */
-struct mpc52xx_mmap_ctl {
-       volatile u32    mbar;           /* MMAP_CTRL + 0x00 */
-
-       volatile u32    cs0_start;      /* MMAP_CTRL + 0x04 */
-       volatile u32    cs0_stop;       /* MMAP_CTRL + 0x08 */
-       volatile u32    cs1_start;      /* MMAP_CTRL + 0x0c */
-       volatile u32    cs1_stop;       /* MMAP_CTRL + 0x10 */
-       volatile u32    cs2_start;      /* MMAP_CTRL + 0x14 */
-       volatile u32    cs2_stop;       /* MMAP_CTRL + 0x18 */
-       volatile u32    cs3_start;      /* MMAP_CTRL + 0x1c */
-       volatile u32    cs3_stop;       /* MMAP_CTRL + 0x20 */
-       volatile u32    cs4_start;      /* MMAP_CTRL + 0x24 */
-       volatile u32    cs4_stop;       /* MMAP_CTRL + 0x28 */
-       volatile u32    cs5_start;      /* MMAP_CTRL + 0x2c */
-       volatile u32    cs5_stop;       /* MMAP_CTRL + 0x30 */
-
-       volatile u32    sdram0;         /* MMAP_CTRL + 0x34 */
-       volatile u32    sdram1;         /* MMAP_CTRL + 0X38 */
-
-       volatile u32    reserved[4];    /* MMAP_CTRL + 0x3c .. 0x48 */
-
-       volatile u32    boot_start;     /* MMAP_CTRL + 0x4c */
-       volatile u32    boot_stop;      /* MMAP_CTRL + 0x50 */
-       
-       volatile u32    ipbi_ws_ctrl;   /* MMAP_CTRL + 0x54 */
-       
-       volatile u32    cs6_start;      /* MMAP_CTRL + 0x58 */
-       volatile u32    cs6_stop;       /* MMAP_CTRL + 0x5c */
-       volatile u32    cs7_start;      /* MMAP_CTRL + 0x60 */
-       volatile u32    cs7_stop;       /* MMAP_CTRL + 0x60 */
-};
-
-/* Interrupt controller */
-struct mpc52xx_intr {
-       volatile u32    per_mask;       /* INTR + 0x00 */
-       volatile u32    per_pri1;       /* INTR + 0x04 */
-       volatile u32    per_pri2;       /* INTR + 0x08 */
-       volatile u32    per_pri3;       /* INTR + 0x0c */
-       volatile u32    ctrl;           /* INTR + 0x10 */
-       volatile u32    main_mask;      /* INTR + 0x14 */
-       volatile u32    main_pri1;      /* INTR + 0x18 */
-       volatile u32    main_pri2;      /* INTR + 0x1c */
-       volatile u32    reserved1;      /* INTR + 0x20 */
-       volatile u32    enc_status;     /* INTR + 0x24 */
-       volatile u32    crit_status;    /* INTR + 0x28 */
-       volatile u32    main_status;    /* INTR + 0x2c */
-       volatile u32    per_status;     /* INTR + 0x30 */
-       volatile u32    reserved2;      /* INTR + 0x34 */
-       volatile u32    per_error;      /* INTR + 0x38 */
-};
-
-/* SDMA */
-struct mpc52xx_sdma {
-       volatile u32    taskBar;        /* SDMA + 0x00 */
-       volatile u32    currentPointer; /* SDMA + 0x04 */
-       volatile u32    endPointer;     /* SDMA + 0x08 */
-       volatile u32    variablePointer;/* SDMA + 0x0c */
-
-       volatile u8     IntVect1;       /* SDMA + 0x10 */
-       volatile u8     IntVect2;       /* SDMA + 0x11 */
-       volatile u16    PtdCntrl;       /* SDMA + 0x12 */
-
-       volatile u32    IntPend;        /* SDMA + 0x14 */
-       volatile u32    IntMask;        /* SDMA + 0x18 */
-       
-       volatile u16    tcr[16];        /* SDMA + 0x1c .. 0x3a */
-
-       volatile u8     ipr[31];        /* SDMA + 0x3c .. 5b */
-
-       volatile u32    res1;           /* SDMA + 0x5c */
-       volatile u32    task_size0;     /* SDMA + 0x60 */
-       volatile u32    task_size1;     /* SDMA + 0x64 */
-       volatile u32    MDEDebug;       /* SDMA + 0x68 */
-       volatile u32    ADSDebug;       /* SDMA + 0x6c */
-       volatile u32    Value1;         /* SDMA + 0x70 */
-       volatile u32    Value2;         /* SDMA + 0x74 */
-       volatile u32    Control;        /* SDMA + 0x78 */
-       volatile u32    Status;         /* SDMA + 0x7c */
-};
-
-/* GPT */
-struct mpc52xx_gpt {
-       volatile u32    mode;           /* GPTx + 0x00 */
-       volatile u32    count;          /* GPTx + 0x04 */
-       volatile u32    pwm;            /* GPTx + 0x08 */
-       volatile u32    status;         /* GPTx + 0X0c */
-};
-
-/* RTC */
-struct mpc52xx_rtc {
-       volatile u32    time_set;       /* RTC + 0x00 */
-       volatile u32    date_set;       /* RTC + 0x04 */
-       volatile u32    stopwatch;      /* RTC + 0x08 */
-       volatile u32    int_enable;     /* RTC + 0x0c */
-       volatile u32    time;           /* RTC + 0x10 */
-       volatile u32    date;           /* RTC + 0x14 */
-       volatile u32    stopwatch_intr; /* RTC + 0x18 */
-       volatile u32    bus_error;      /* RTC + 0x1c */
-       volatile u32    dividers;       /* RTC + 0x20 */
-};
-
-/* GPIO */
-struct mpc52xx_gpio {
-       volatile u32    port_config;    /* GPIO + 0x00 */
-       volatile u32    simple_gpioe;   /* GPIO + 0x04 */
-       volatile u32    simple_ode;     /* GPIO + 0x08 */
-       volatile u32    simple_ddr;     /* GPIO + 0x0c */
-       volatile u32    simple_dvo;     /* GPIO + 0x10 */
-       volatile u32    simple_ival;    /* GPIO + 0x14 */
-       volatile u8     outo_gpioe;     /* GPIO + 0x18 */
-       volatile u8     reserved1[3];   /* GPIO + 0x19 */
-       volatile u8     outo_dvo;       /* GPIO + 0x1c */
-       volatile u8     reserved2[3];   /* GPIO + 0x1d */
-       volatile u8     sint_gpioe;     /* GPIO + 0x20 */
-       volatile u8     reserved3[3];   /* GPIO + 0x21 */
-       volatile u8     sint_ode;       /* GPIO + 0x24 */
-       volatile u8     reserved4[3];   /* GPIO + 0x25 */
-       volatile u8     sint_ddr;       /* GPIO + 0x28 */
-       volatile u8     reserved5[3];   /* GPIO + 0x29 */
-       volatile u8     sint_dvo;       /* GPIO + 0x2c */
-       volatile u8     reserved6[3];   /* GPIO + 0x2d */
-       volatile u8     sint_inten;     /* GPIO + 0x30 */
-       volatile u8     reserved7[3];   /* GPIO + 0x31 */
-       volatile u16    sint_itype;     /* GPIO + 0x34 */
-       volatile u16    reserved8;      /* GPIO + 0x36 */
-       volatile u8     gpio_control;   /* GPIO + 0x38 */
-       volatile u8     reserved9[3];   /* GPIO + 0x39 */
-       volatile u8     sint_istat;     /* GPIO + 0x3c */
-       volatile u8     sint_ival;      /* GPIO + 0x3d */
-       volatile u8     bus_errs;       /* GPIO + 0x3e */
-       volatile u8     reserved10;     /* GPIO + 0x3f */
-};
-
-#define MPC52xx_GPIO_PSC_CONFIG_UART_WITHOUT_CD        4
-#define MPC52xx_GPIO_PSC_CONFIG_UART_WITH_CD   5
-#define MPC52xx_GPIO_PCI_DIS                   (1<<15)
-
-/* XLB Bus control */
-struct mpc52xx_xlb {
-       volatile u8 reserved[0x40];
-       volatile u32 config;            /* XLB + 0x40 */
-       volatile u32 version;           /* XLB + 0x44 */
-       volatile u32 status;            /* XLB + 0x48 */
-       volatile u32 int_enable;        /* XLB + 0x4c */
-       volatile u32 addr_capture;      /* XLB + 0x50 */
-       volatile u32 bus_sig_capture;   /* XLB + 0x54 */
-       volatile u32 addr_timeout;      /* XLB + 0x58 */
-       volatile u32 data_timeout;      /* XLB + 0x5c */
-       volatile u32 bus_act_timeout;   /* XLB + 0x60 */
-       volatile u32 master_pri_enable; /* XLB + 0x64 */
-       volatile u32 master_priority;   /* XLB + 0x68 */
-       volatile u32 base_address;      /* XLB + 0x6c */
-       volatile u32 snoop_window;      /* XLB + 0x70 */
-};
-
-
-/* Clock Distribution control */
-struct mpc52xx_cdm {
-       volatile u32    jtag_id;        /* MBAR_CDM + 0x00  reg0 read only */
-       volatile u32    rstcfg;         /* MBAR_CDM + 0x04  reg1 read only */
-       volatile u32    breadcrumb;     /* MBAR_CDM + 0x08  reg2 */
-
-       volatile u8     mem_clk_sel;    /* MBAR_CDM + 0x0c  reg3 byte0 */
-       volatile u8     xlb_clk_sel;    /* MBAR_CDM + 0x0d  reg3 byte1 read only */
-       volatile u8     ipb_clk_sel;    /* MBAR_CDM + 0x0e  reg3 byte2 */
-       volatile u8     pci_clk_sel;    /* MBAR_CDM + 0x0f  reg3 byte3 */
-
-       volatile u8     ext_48mhz_en;   /* MBAR_CDM + 0x10  reg4 byte0 */
-       volatile u8     fd_enable;      /* MBAR_CDM + 0x11  reg4 byte1 */
-       volatile u16    fd_counters;    /* MBAR_CDM + 0x12  reg4 byte2,3 */
-
-       volatile u32    clk_enables;    /* MBAR_CDM + 0x14  reg5 */
-
-       volatile u8     osc_disable;    /* MBAR_CDM + 0x18  reg6 byte0 */
-       volatile u8     reserved0[3];   /* MBAR_CDM + 0x19  reg6 byte1,2,3 */
-
-       volatile u8     ccs_sleep_enable;/* MBAR_CDM + 0x1c  reg7 byte0 */
-       volatile u8     osc_sleep_enable;/* MBAR_CDM + 0x1d  reg7 byte1 */
-       volatile u8     reserved1;      /* MBAR_CDM + 0x1e  reg7 byte2 */
-       volatile u8     ccs_qreq_test;  /* MBAR_CDM + 0x1f  reg7 byte3 */
-
-       volatile u8     soft_reset;     /* MBAR_CDM + 0x20  u8 byte0 */
-       volatile u8     no_ckstp;       /* MBAR_CDM + 0x21  u8 byte0 */
-       volatile u8     reserved2[2];   /* MBAR_CDM + 0x22  u8 byte1,2,3 */
-
-       volatile u8     pll_lock;       /* MBAR_CDM + 0x24  reg9 byte0 */
-       volatile u8     pll_looselock;  /* MBAR_CDM + 0x25  reg9 byte1 */
-       volatile u8     pll_sm_lockwin; /* MBAR_CDM + 0x26  reg9 byte2 */
-       volatile u8     reserved3;      /* MBAR_CDM + 0x27  reg9 byte3 */
-
-       volatile u16    reserved4;      /* MBAR_CDM + 0x28  reg10 byte0,1 */
-       volatile u16    mclken_div_psc1;/* MBAR_CDM + 0x2a  reg10 byte2,3 */
-    
-       volatile u16    reserved5;      /* MBAR_CDM + 0x2c  reg11 byte0,1 */
-       volatile u16    mclken_div_psc2;/* MBAR_CDM + 0x2e  reg11 byte2,3 */
-               
-       volatile u16    reserved6;      /* MBAR_CDM + 0x30  reg12 byte0,1 */
-       volatile u16    mclken_div_psc3;/* MBAR_CDM + 0x32  reg12 byte2,3 */
-    
-       volatile u16    reserved7;      /* MBAR_CDM + 0x34  reg13 byte0,1 */
-       volatile u16    mclken_div_psc6;/* MBAR_CDM + 0x36  reg13 byte2,3 */
-};
-
-#endif /* __ASSEMBLY__ */
-
-
-/* ========================================================================= */
-/* Prototypes for MPC52xx syslib                                             */
-/* ========================================================================= */
-
-#ifndef __ASSEMBLY__
-
-extern void mpc52xx_init_irq(void);
-extern int mpc52xx_get_irq(struct pt_regs *regs);
-
-extern unsigned long mpc52xx_find_end_of_memory(void);
-extern void mpc52xx_set_bat(void);
-extern void mpc52xx_map_io(void);
-extern void mpc52xx_restart(char *cmd);
-extern void mpc52xx_halt(void);
-extern void mpc52xx_power_off(void);
-extern void mpc52xx_progress(char *s, unsigned short hex);
-extern void mpc52xx_calibrate_decr(void);
-extern void mpc52xx_add_board_devices(struct ocp_def board_ocp[]);
-
-#endif /* __ASSEMBLY__ */
-
-
-/* ========================================================================= */
-/* Platform configuration                                                    */
-/* ========================================================================= */
-
-/* The U-Boot platform information struct */
-extern bd_t __res;
-
-/* Platform options */
-#if defined(CONFIG_LITE5200)
-#include <platforms/lite5200.h>
-#endif
-
-
-#endif /* __ASM_MPC52xx_H__ */
diff --git a/include/asm-ppc/mpc52xx_psc.h b/include/asm-ppc/mpc52xx_psc.h
deleted file mode 100644 (file)
index 483102e..0000000
+++ /dev/null
@@ -1,191 +0,0 @@
-/*
- * include/asm-ppc/mpc52xx_psc.h
- * 
- * Definitions of consts/structs to drive the Freescale MPC52xx OnChip
- * PSCs. Theses are shared between multiple drivers since a PSC can be
- * UART, AC97, IR, I2S, ... So this header is in asm-ppc.
- *
- *
- * Maintainer : Sylvain Munaut <tnt@246tNt.com>
- *
- * Based/Extracted from some header of the 2.4 originally written by 
- * Dale Farnsworth <dfarnsworth@mvista.com> 
- *
- * Copyright (C) 2004 Sylvain Munaut <tnt@246tNt.com>
- * Copyright (C) 2003 MontaVista, Software, Inc.
- *
- * This file is licensed under the terms of the GNU General Public License
- * version 2. This program is licensed "as is" without any warranty of any
- * kind, whether express or implied.
- */
-
-#ifndef __MPC52xx_PSC_H__
-#define __MPC52xx_PSC_H__
-
-#include <asm/types.h>
-
-/* Max number of PSCs */
-#define MPC52xx_PSC_MAXNUM     6
-
-/* Programmable Serial Controller (PSC) status register bits */
-#define MPC52xx_PSC_SR_CDE     0x0080
-#define MPC52xx_PSC_SR_RXRDY   0x0100
-#define MPC52xx_PSC_SR_RXFULL  0x0200
-#define MPC52xx_PSC_SR_TXRDY   0x0400
-#define MPC52xx_PSC_SR_TXEMP   0x0800
-#define MPC52xx_PSC_SR_OE      0x1000
-#define MPC52xx_PSC_SR_PE      0x2000
-#define MPC52xx_PSC_SR_FE      0x4000
-#define MPC52xx_PSC_SR_RB      0x8000
-
-/* PSC Command values */
-#define MPC52xx_PSC_RX_ENABLE          0x0001
-#define MPC52xx_PSC_RX_DISABLE         0x0002
-#define MPC52xx_PSC_TX_ENABLE          0x0004
-#define MPC52xx_PSC_TX_DISABLE         0x0008
-#define MPC52xx_PSC_SEL_MODE_REG_1     0x0010
-#define MPC52xx_PSC_RST_RX             0x0020
-#define MPC52xx_PSC_RST_TX             0x0030
-#define MPC52xx_PSC_RST_ERR_STAT       0x0040
-#define MPC52xx_PSC_RST_BRK_CHG_INT    0x0050
-#define MPC52xx_PSC_START_BRK          0x0060
-#define MPC52xx_PSC_STOP_BRK           0x0070
-
-/* PSC TxRx FIFO status bits */
-#define MPC52xx_PSC_RXTX_FIFO_ERR      0x0040
-#define MPC52xx_PSC_RXTX_FIFO_UF       0x0020
-#define MPC52xx_PSC_RXTX_FIFO_OF       0x0010
-#define MPC52xx_PSC_RXTX_FIFO_FR       0x0008
-#define MPC52xx_PSC_RXTX_FIFO_FULL     0x0004
-#define MPC52xx_PSC_RXTX_FIFO_ALARM    0x0002
-#define MPC52xx_PSC_RXTX_FIFO_EMPTY    0x0001
-
-/* PSC interrupt mask bits */
-#define MPC52xx_PSC_IMR_TXRDY          0x0100
-#define MPC52xx_PSC_IMR_RXRDY          0x0200
-#define MPC52xx_PSC_IMR_DB             0x0400
-#define MPC52xx_PSC_IMR_IPC            0x8000
-
-/* PSC input port change bit */
-#define MPC52xx_PSC_CTS                        0x01
-#define MPC52xx_PSC_DCD                        0x02
-#define MPC52xx_PSC_D_CTS              0x10
-#define MPC52xx_PSC_D_DCD              0x20
-
-/* PSC mode fields */
-#define MPC52xx_PSC_MODE_5_BITS                        0x00
-#define MPC52xx_PSC_MODE_6_BITS                        0x01
-#define MPC52xx_PSC_MODE_7_BITS                        0x02
-#define MPC52xx_PSC_MODE_8_BITS                        0x03
-#define MPC52xx_PSC_MODE_BITS_MASK             0x03
-#define MPC52xx_PSC_MODE_PAREVEN               0x00
-#define MPC52xx_PSC_MODE_PARODD                        0x04
-#define MPC52xx_PSC_MODE_PARFORCE              0x08
-#define MPC52xx_PSC_MODE_PARNONE               0x10
-#define MPC52xx_PSC_MODE_ERR                   0x20
-#define MPC52xx_PSC_MODE_FFULL                 0x40
-#define MPC52xx_PSC_MODE_RXRTS                 0x80
-
-#define MPC52xx_PSC_MODE_ONE_STOP_5_BITS       0x00
-#define MPC52xx_PSC_MODE_ONE_STOP              0x07
-#define MPC52xx_PSC_MODE_TWO_STOP              0x0f
-
-#define MPC52xx_PSC_RFNUM_MASK 0x01ff
-
-
-/* Structure of the hardware registers */
-struct mpc52xx_psc {
-       volatile u8             mode;           /* PSC + 0x00 */
-       volatile u8             reserved0[3];
-       union {                                 /* PSC + 0x04 */
-               volatile u16    status;
-               volatile u16    clock_select;
-       } sr_csr;
-#define mpc52xx_psc_status     sr_csr.status
-#define mpc52xx_psc_clock_select       sr_csr.clock_select
-       volatile u16            reserved1;
-       volatile u8             command;        /* PSC + 0x08 */
-volatile u8            reserved2[3];
-       union {                                 /* PSC + 0x0c */
-               volatile u8     buffer_8;
-               volatile u16    buffer_16;
-               volatile u32    buffer_32;
-       } buffer;
-#define mpc52xx_psc_buffer_8   buffer.buffer_8
-#define mpc52xx_psc_buffer_16  buffer.buffer_16
-#define mpc52xx_psc_buffer_32  buffer.buffer_32
-       union {                                 /* PSC + 0x10 */
-               volatile u8     ipcr;
-               volatile u8     acr;
-       } ipcr_acr;
-#define mpc52xx_psc_ipcr       ipcr_acr.ipcr
-#define mpc52xx_psc_acr                ipcr_acr.acr
-       volatile u8             reserved3[3];
-       union {                                 /* PSC + 0x14 */
-               volatile u16    isr;
-               volatile u16    imr;
-       } isr_imr;
-#define mpc52xx_psc_isr                isr_imr.isr
-#define mpc52xx_psc_imr                isr_imr.imr
-       volatile u16            reserved4;
-       volatile u8             ctur;           /* PSC + 0x18 */
-       volatile u8             reserved5[3];
-       volatile u8             ctlr;           /* PSC + 0x1c */
-       volatile u8             reserved6[3];
-       volatile u16            ccr;            /* PSC + 0x20 */
-       volatile u8             reserved7[14];
-       volatile u8             ivr;            /* PSC + 0x30 */
-       volatile u8             reserved8[3];
-       volatile u8             ip;             /* PSC + 0x34 */
-       volatile u8             reserved9[3];
-       volatile u8             op1;            /* PSC + 0x38 */
-       volatile u8             reserved10[3];
-       volatile u8             op0;            /* PSC + 0x3c */
-       volatile u8             reserved11[3];
-       volatile u32            sicr;           /* PSC + 0x40 */
-       volatile u8             ircr1;          /* PSC + 0x44 */
-       volatile u8             reserved13[3];
-       volatile u8             ircr2;          /* PSC + 0x44 */
-       volatile u8             reserved14[3];
-       volatile u8             irsdr;          /* PSC + 0x4c */
-       volatile u8             reserved15[3];
-       volatile u8             irmdr;          /* PSC + 0x50 */
-       volatile u8             reserved16[3];
-       volatile u8             irfdr;          /* PSC + 0x54 */
-       volatile u8             reserved17[3];
-       volatile u16            rfnum;          /* PSC + 0x58 */
-       volatile u16            reserved18;
-       volatile u16            tfnum;          /* PSC + 0x5c */
-       volatile u16            reserved19;
-       volatile u32            rfdata;         /* PSC + 0x60 */
-       volatile u16            rfstat;         /* PSC + 0x64 */
-       volatile u16            reserved20;
-       volatile u8             rfcntl;         /* PSC + 0x68 */
-       volatile u8             reserved21[5];
-       volatile u16            rfalarm;        /* PSC + 0x6e */
-       volatile u16            reserved22;
-       volatile u16            rfrptr;         /* PSC + 0x72 */
-       volatile u16            reserved23;
-       volatile u16            rfwptr;         /* PSC + 0x76 */
-       volatile u16            reserved24;
-       volatile u16            rflrfptr;       /* PSC + 0x7a */
-       volatile u16            reserved25;
-       volatile u16            rflwfptr;       /* PSC + 0x7e */
-       volatile u32            tfdata;         /* PSC + 0x80 */
-       volatile u16            tfstat;         /* PSC + 0x84 */
-       volatile u16            reserved26;
-       volatile u8             tfcntl;         /* PSC + 0x88 */
-       volatile u8             reserved27[5];
-       volatile u16            tfalarm;        /* PSC + 0x8e */
-       volatile u16            reserved28;
-       volatile u16            tfrptr;         /* PSC + 0x92 */
-       volatile u16            reserved29;
-       volatile u16            tfwptr;         /* PSC + 0x96 */
-       volatile u16            reserved30;
-       volatile u16            tflrfptr;       /* PSC + 0x9a */
-       volatile u16            reserved31;
-       volatile u16            tflwfptr;       /* PSC + 0x9e */
-};
-
-
-#endif  /* __MPC52xx_PSC_H__ */
diff --git a/include/asm-ppc/mv64x60.h b/include/asm-ppc/mv64x60.h
deleted file mode 100644 (file)
index 0aa5482..0000000
+++ /dev/null
@@ -1,335 +0,0 @@
-/*
- * include/asm-ppc/mv64x60.h
- * 
- * Prototypes, etc. for the Marvell/Galileo MV64x60 host bridge routines.
- *
- * Author: Mark A. Greer <mgreer@mvista.com>
- *
- * 2001-2002 (c) MontaVista, Software, Inc.  This file is licensed under
- * the terms of the GNU General Public License version 2.  This program
- * is licensed "as is" without any warranty of any kind, whether express
- * or implied.
- */
-#ifndef __ASMPPC_MV64x60_H
-#define __ASMPPC_MV64x60_H
-
-#include <linux/kernel.h>
-#include <linux/init.h>
-#include <linux/pci.h>
-#include <linux/slab.h>
-#include <linux/config.h>
-
-#include <asm/byteorder.h>
-#include <asm/io.h>
-#include <asm/irq.h>
-#include <asm/uaccess.h>
-#include <asm/machdep.h>
-#include <asm/pci-bridge.h>
-#include <asm/mv64x60_defs.h>
-
-extern u8      mv64x60_pci_exclude_bridge;
-
-extern spinlock_t mv64x60_lock;
-extern spinlock_t mv64x60_rmw_lock;
-
-#ifndef        TRUE
-#define        TRUE    1
-#endif
-
-#ifndef        FALSE
-#define        FALSE   0
-#endif
-
-/* 32-bit Window table entry defines */
-#define        MV64x60_CPU2MEM_0_WIN                   0
-#define        MV64x60_CPU2MEM_1_WIN                   1
-#define        MV64x60_CPU2MEM_2_WIN                   2
-#define        MV64x60_CPU2MEM_3_WIN                   3
-#define        MV64x60_CPU2DEV_0_WIN                   4
-#define        MV64x60_CPU2DEV_1_WIN                   5
-#define        MV64x60_CPU2DEV_2_WIN                   6
-#define        MV64x60_CPU2DEV_3_WIN                   7
-#define        MV64x60_CPU2BOOT_WIN                    8
-#define        MV64x60_CPU2PCI0_IO_WIN                 9
-#define        MV64x60_CPU2PCI0_MEM_0_WIN              10
-#define        MV64x60_CPU2PCI0_MEM_1_WIN              11
-#define        MV64x60_CPU2PCI0_MEM_2_WIN              12
-#define        MV64x60_CPU2PCI0_MEM_3_WIN              13
-#define        MV64x60_CPU2PCI1_IO_WIN                 14
-#define        MV64x60_CPU2PCI1_MEM_0_WIN              15
-#define        MV64x60_CPU2PCI1_MEM_1_WIN              16
-#define        MV64x60_CPU2PCI1_MEM_2_WIN              17
-#define        MV64x60_CPU2PCI1_MEM_3_WIN              18
-#define        MV64x60_CPU2SRAM_WIN                    19
-#define        MV64x60_CPU2PCI0_IO_REMAP_WIN           20
-#define        MV64x60_CPU2PCI1_IO_REMAP_WIN           21
-#define        MV64x60_CPU_PROT_0_WIN                  22
-#define        MV64x60_CPU_PROT_1_WIN                  23
-#define        MV64x60_CPU_PROT_2_WIN                  24
-#define        MV64x60_CPU_PROT_3_WIN                  25
-#define        MV64x60_CPU_SNOOP_0_WIN                 26
-#define        MV64x60_CPU_SNOOP_1_WIN                 27
-#define        MV64x60_CPU_SNOOP_2_WIN                 28
-#define        MV64x60_CPU_SNOOP_3_WIN                 29
-#define        MV64x60_PCI02MEM_REMAP_0_WIN            30
-#define        MV64x60_PCI02MEM_REMAP_1_WIN            31
-#define        MV64x60_PCI02MEM_REMAP_2_WIN            32
-#define        MV64x60_PCI02MEM_REMAP_3_WIN            33
-#define        MV64x60_PCI12MEM_REMAP_0_WIN            34
-#define        MV64x60_PCI12MEM_REMAP_1_WIN            35
-#define        MV64x60_PCI12MEM_REMAP_2_WIN            36
-#define        MV64x60_PCI12MEM_REMAP_3_WIN            37
-
-#define        MV64x60_32BIT_WIN_COUNT                 38
-
-/* 64-bit Window table entry defines */
-#define        MV64x60_CPU2PCI0_MEM_0_REMAP_WIN        0
-#define        MV64x60_CPU2PCI0_MEM_1_REMAP_WIN        1
-#define        MV64x60_CPU2PCI0_MEM_2_REMAP_WIN        2
-#define        MV64x60_CPU2PCI0_MEM_3_REMAP_WIN        3
-#define        MV64x60_CPU2PCI1_MEM_0_REMAP_WIN        4
-#define        MV64x60_CPU2PCI1_MEM_1_REMAP_WIN        5
-#define        MV64x60_CPU2PCI1_MEM_2_REMAP_WIN        6
-#define        MV64x60_CPU2PCI1_MEM_3_REMAP_WIN        7
-#define        MV64x60_PCI02MEM_ACC_CNTL_0_WIN         8
-#define        MV64x60_PCI02MEM_ACC_CNTL_1_WIN         9
-#define        MV64x60_PCI02MEM_ACC_CNTL_2_WIN         10
-#define        MV64x60_PCI02MEM_ACC_CNTL_3_WIN         11
-#define        MV64x60_PCI12MEM_ACC_CNTL_0_WIN         12
-#define        MV64x60_PCI12MEM_ACC_CNTL_1_WIN         13
-#define        MV64x60_PCI12MEM_ACC_CNTL_2_WIN         14
-#define        MV64x60_PCI12MEM_ACC_CNTL_3_WIN         15
-#define        MV64x60_PCI02MEM_SNOOP_0_WIN            16
-#define        MV64x60_PCI02MEM_SNOOP_1_WIN            17
-#define        MV64x60_PCI02MEM_SNOOP_2_WIN            18
-#define        MV64x60_PCI02MEM_SNOOP_3_WIN            19
-#define        MV64x60_PCI12MEM_SNOOP_0_WIN            20
-#define        MV64x60_PCI12MEM_SNOOP_1_WIN            21
-#define        MV64x60_PCI12MEM_SNOOP_2_WIN            22
-#define        MV64x60_PCI12MEM_SNOOP_3_WIN            23
-
-#define        MV64x60_64BIT_WIN_COUNT                 24
-
-
-/*
- * Define a structure that's used to pass in config information to the
- * core routines.
- */
-typedef struct {
-       u32     cpu_base;
-       u32     pci_base_hi;
-       u32     pci_base_lo;
-       u32     size;
-       u32     swap;
-} mv64x60_pci_window_t;
-
-typedef        struct {
-       u8      enable_bus;     /* allow access to this PCI bus? */
-       u8      enumerate_bus;  /* enumerate devices on this bus? */
-
-       mv64x60_pci_window_t    pci_io;
-       mv64x60_pci_window_t    pci_mem[3];
-
-       u32     acc_cntl_options[MV64x60_CPU2MEM_WINDOWS];
-       u32     snoop_options[MV64x60_CPU2MEM_WINDOWS];
-       u16     pci_cmd_bits;
-       u16     latency_timer;
-} mv64x60_pci_info_t;
-
-typedef struct {
-       u32     phys_reg_base;
-
-       u32     window_preserve_mask_32;
-       u32     window_preserve_mask_64;
-
-       u32     base_irq;       /* Starting irq # for this intr ctlr */
-       int     ((*map_irq)(struct pci_dev *, unsigned char, unsigned char));
-
-       u32     cpu_prot_options[MV64x60_CPU2MEM_WINDOWS];
-       u32     cpu_snoop_options[MV64x60_CPU2MEM_WINDOWS];
-
-       mv64x60_pci_info_t      pci_0;
-       mv64x60_pci_info_t      pci_1;
-} mv64x60_setup_info_t;
-
-/*
- * Define the 'handle' struct that will be passed between the 64x60 core
- * code and the platform-specific code that will use it.  The handle
- * will contain pointers to chip-specific routines & information.
- */
-typedef struct {
-       u32     base_reg;
-       u32     size_reg;
-       u8      base_bits;
-       u8      size_bits;
-       u32     (*get_from_field)(u32 val, u32 num_bits);
-       u32     (*map_to_field)(u32 val, u32 num_bits);
-       u32     extra;
-} mv64x60_32bit_window_t;
-
-typedef struct {
-       u32     base_hi_reg;
-       u32     base_lo_reg;
-       u32     size_reg;
-       u8      base_lo_bits;
-       u8      size_bits;
-       u32     (*get_from_field)(u32 val, u32 num_bits);
-       u32     (*map_to_field)(u32 val, u32 num_bits);
-       u32     extra;
-} mv64x60_64bit_window_t;
-
-typedef        struct mv64x60_handle   mv64x60_handle_t;
-
-typedef struct {
-       u32     (*translate_size)(u32 base, u32 size, u32 num_bits);
-       u32     (*untranslate_size)(u32 base, u32 size, u32 num_bits);
-       void    (*set_pci2mem_window)(struct pci_controller *hose, u32 window,
-                       u32 base);
-       u32     (*is_enabled_32bit)(mv64x60_handle_t *bh, u32 window);
-       void    (*enable_window_32bit)(mv64x60_handle_t *bh, u32 window);
-       void    (*disable_window_32bit)(mv64x60_handle_t *bh, u32 window);
-       void    (*enable_window_64bit)(mv64x60_handle_t *bh, u32 window);
-       void    (*disable_window_64bit)(mv64x60_handle_t *bh, u32 window);
-       void    (*disable_all_windows)(mv64x60_handle_t *bh,
-                                      mv64x60_setup_info_t *si);
-       void    (*chip_specific_init)(mv64x60_handle_t *bh,
-                                     mv64x60_setup_info_t *si);
-
-       mv64x60_32bit_window_t  *window_tab_32bit;
-       mv64x60_64bit_window_t  *window_tab_64bit;
-} mv64x60_chip_info_t;
-
-struct mv64x60_handle {
-       u32     type;           /* type of bridge */
-       u32     v_base;         /* virtual base addr of bridge regs */
-       u32     p_base;         /* physical base addr of bridge regs */
-       u32     base_irq;       /* Base irq # for intrs on this intr cltr */
-
-       u32     io_base_a;      /* vaddr of pci 0's I/O space */
-       u32     io_base_b;      /* vaddr of pci 1's I/O space */
-
-       struct pci_controller   *hose_a;
-       struct pci_controller   *hose_b;
-
-       mv64x60_chip_info_t     *ci;    /* chip/bridge-specific info */
-};
-
-
-/* Define I/O routines for accessing registers on the 64x60 bridge. */
-extern inline void
-mv64x60_write(mv64x60_handle_t *bh, u32 offset, u32 val) {
-       out_le32((volatile u32 *)(bh->v_base + offset), val);
-}
-
-extern inline u32
-mv64x60_read(mv64x60_handle_t *bh, u32 offset) {
-       return in_le32((volatile u32 *)(bh->v_base + offset));
-}
-
-extern inline void
-mv64x60_modify(mv64x60_handle_t *bh, u32 offs, u32 data, u32 mask)
-{
-       uint32_t reg;
-       unsigned long flags;
-
-       spin_lock_irqsave(&mv64x60_rmw_lock, flags);
-       reg = mv64x60_read(bh, offs) & (~mask); /* zero any bits we care about*/
-       reg |= data & mask; /* set bits from the data */
-       mv64x60_write(bh, offs, reg);
-       spin_unlock_irqrestore(&mv64x60_rmw_lock, flags);
-}
-
-#define        mv64x60_set_bits(bh, offs, bits) mv64x60_modify(bh, offs, ~0, bits) 
-#define        mv64x60_clr_bits(bh, offs, bits) mv64x60_modify(bh, offs, 0, bits)
-
-
-/* Externally visible function prototypes */
-int mv64x60_init(mv64x60_handle_t *bh, mv64x60_setup_info_t *si);
-u32 mv64x60_get_mem_size(u32 bridge_base, u32 chip_type);
-void mv64x60_get_32bit_window(mv64x60_handle_t *bh, u32 window,
-                                       u32 *base, u32 *size);
-void mv64x60_set_32bit_window(mv64x60_handle_t *bh, u32 window, u32 base,
-                                       u32 size, u32 other_bits);
-void mv64x60_get_64bit_window(mv64x60_handle_t *bh, u32 window, u32 *base_hi,
-                                       u32 *base_lo, u32 *size);
-void mv64x60_set_64bit_window(mv64x60_handle_t *bh, u32 window, u32 base_hi,
-                                       u32 base_lo, u32 size, u32 other_bits);
-
-
-void gt64260_init_irq(void);
-int gt64260_get_irq(struct pt_regs *regs);
-
-/*
- * OCP Related Definitions
- */
-typedef struct {
-       u8      mirror_regs;
-       u8      cache_mgmt;
-       u8      max_idle;
-       int     default_baud;
-       int     default_bits;
-       int     default_parity;
-       int     default_flow;
-       u32     chr_1_val;
-       u32     chr_2_val;
-       u32     chr_10_val;
-       u32     mpcr_val;
-       u32     mrr_val;
-       u32     rcrr_val;
-       u32     tcrr_val;
-       u32     intr_mask_val;
-       u32     bcr_val;
-       u32     sdma_irq;
-       u8      brg_can_tune;
-       u8      brg_clk_src;
-       u32     brg_clk_freq;
-} mv64x60_ocp_mpsc_data_t;
-
-#define MV64x60_OCP_SYSFS_MPSC_DATA()                                  \
-OCP_SYSFS_ADDTL(mv64x60_ocp_mpsc_data_t, "%d\n", mpsc, mirror_regs)    \
-OCP_SYSFS_ADDTL(mv64x60_ocp_mpsc_data_t, "%d\n", mpsc, cache_mgmt)     \
-OCP_SYSFS_ADDTL(mv64x60_ocp_mpsc_data_t, "%d\n", mpsc, max_idle)       \
-OCP_SYSFS_ADDTL(mv64x60_ocp_mpsc_data_t, "%d\n", mpsc, default_baud)   \
-OCP_SYSFS_ADDTL(mv64x60_ocp_mpsc_data_t, "%d\n", mpsc, default_bits)   \
-OCP_SYSFS_ADDTL(mv64x60_ocp_mpsc_data_t, "%c\n", mpsc, default_parity) \
-OCP_SYSFS_ADDTL(mv64x60_ocp_mpsc_data_t, "%c\n", mpsc, default_flow)   \
-OCP_SYSFS_ADDTL(mv64x60_ocp_mpsc_data_t, "0x%x\n", mpsc, chr_1_val)    \
-OCP_SYSFS_ADDTL(mv64x60_ocp_mpsc_data_t, "0x%x\n", mpsc, chr_2_val)    \
-OCP_SYSFS_ADDTL(mv64x60_ocp_mpsc_data_t, "0x%x\n", mpsc, chr_10_val)   \
-OCP_SYSFS_ADDTL(mv64x60_ocp_mpsc_data_t, "0x%x\n", mpsc, mpcr_val)     \
-OCP_SYSFS_ADDTL(mv64x60_ocp_mpsc_data_t, "0x%x\n", mpsc, mrr_val)      \
-OCP_SYSFS_ADDTL(mv64x60_ocp_mpsc_data_t, "0x%x\n", mpsc, rcrr_val)     \
-OCP_SYSFS_ADDTL(mv64x60_ocp_mpsc_data_t, "0x%x\n", mpsc, tcrr_val)     \
-OCP_SYSFS_ADDTL(mv64x60_ocp_mpsc_data_t, "0x%x\n", mpsc, intr_mask_val)        \
-OCP_SYSFS_ADDTL(mv64x60_ocp_mpsc_data_t, "0x%x\n", mpsc, bcr_val)      \
-OCP_SYSFS_ADDTL(mv64x60_ocp_mpsc_data_t, "%d\n", mpsc, sdma_irq)       \
-OCP_SYSFS_ADDTL(mv64x60_ocp_mpsc_data_t, "%d\n", mpsc, brg_can_tune)   \
-OCP_SYSFS_ADDTL(mv64x60_ocp_mpsc_data_t, "%d\n", mpsc, brg_clk_src)    \
-OCP_SYSFS_ADDTL(mv64x60_ocp_mpsc_data_t, "%d\n", mpsc, brg_clk_freq)   \
-                                                                       \
-void                                                                   \
-mv64x60_ocp_show_mpsc(struct device *dev)                              \
-{                                                                      \
-       device_create_file(dev, &dev_attr_mpsc_mirror_regs);            \
-       device_create_file(dev, &dev_attr_mpsc_cache_mgmt);             \
-       device_create_file(dev, &dev_attr_mpsc_max_idle);               \
-       device_create_file(dev, &dev_attr_mpsc_default_baud);           \
-       device_create_file(dev, &dev_attr_mpsc_default_bits);           \
-       device_create_file(dev, &dev_attr_mpsc_default_parity);         \
-       device_create_file(dev, &dev_attr_mpsc_default_flow);           \
-       device_create_file(dev, &dev_attr_mpsc_chr_1_val);              \
-       device_create_file(dev, &dev_attr_mpsc_chr_2_val);              \
-       device_create_file(dev, &dev_attr_mpsc_chr_10_val);             \
-       device_create_file(dev, &dev_attr_mpsc_mpcr_val);               \
-       device_create_file(dev, &dev_attr_mpsc_mrr_val);                \
-       device_create_file(dev, &dev_attr_mpsc_rcrr_val);               \
-       device_create_file(dev, &dev_attr_mpsc_tcrr_val);               \
-       device_create_file(dev, &dev_attr_mpsc_intr_mask_val);          \
-       device_create_file(dev, &dev_attr_mpsc_bcr_val);                \
-       device_create_file(dev, &dev_attr_mpsc_sdma_irq);               \
-       device_create_file(dev, &dev_attr_mpsc_brg_can_tune);           \
-       device_create_file(dev, &dev_attr_mpsc_brg_clk_src);            \
-       device_create_file(dev, &dev_attr_mpsc_brg_clk_freq);           \
-}
-
-#endif /* __ASMPPC_MV64x60_H */
diff --git a/include/asm-ppc/mv64x60_defs.h b/include/asm-ppc/mv64x60_defs.h
deleted file mode 100644 (file)
index 6f7899d..0000000
+++ /dev/null
@@ -1,996 +0,0 @@
-/*
- * include/asm-ppc/gt64260_defs.h
- * 
- * Register definitions for the Marvell/Galileo GT64260, MV64360, etc.
- * host bridges.
- *
- * Author: Mark A. Greer <mgreer@mvista.com>
- *
- * 2001-2002 (c) MontaVista, Software, Inc.  This file is licensed under
- * the terms of the GNU General Public License version 2.  This program
- * is licensed "as is" without any warranty of any kind, whether express
- * or implied.
- */
-#ifndef __ASMPPC_MV64x60_DEFS_H
-#define __ASMPPC_MV64x60_DEFS_H
-
-/*
- * Define the Marvell bridges that are supported
- */
-#define        MV64x60_TYPE_INVALID            0
-#define        MV64x60_TYPE_GT64260A           1
-#define        MV64x60_TYPE_GT64260B           2
-#define        MV64x60_TYPE_MV64360            3
-#define        MV64x60_TYPE_MV64361            4
-#define        MV64x60_TYPE_MV64362            5
-#define        MV64x60_TYPE_MV64460            6
-
-
-/* Revisions of each supported chip */
-#define        GT64260_REV_A                   0x10
-#define        GT64260_REV_B                   0x20
-#define        MV64360                         0x01
-#define        MV64460                         0x01
-
-/* Minimum window size supported by 64260 is 1MB */
-#define GT64260_WINDOW_SIZE_MIN                0x00100000
-#define MV64360_WINDOW_SIZE_MIN                0x00010000
-
-/* IRQ's for embedded controllers */
-#define        MV64x60_IRQ_DEV                 1
-#define        MV64x60_IRQ_CPU_ERR             3
-#define        MV64x60_IRQ_TIMER_0_1           8
-#define        MV64x60_IRQ_TIMER_2_3           9
-#define        MV64x60_IRQ_TIMER_4_5           10
-#define        MV64x60_IRQ_TIMER_6_7           11
-#define        MV64x60_IRQ_ETH_0               32
-#define        MV64x60_IRQ_ETH_1               33
-#define        MV64x60_IRQ_ETH_2               34
-#define        MV64x60_IRQ_SDMA_0              36
-#define        MV64x60_IRQ_I2C                 37
-#define        MV64x60_IRQ_SDMA_1              38
-#define        MV64x60_IRQ_BRG                 39
-#define        MV64x60_IRQ_MPSC_0              40
-#define        MV64x60_IRQ_MPSC_1              42
-#define        MV64x60_IRQ_COMM                43
-
-#define        MV64360_IRQ_PCI0                12
-#define        MV64360_IRQ_SRAM_PAR_ERR        13
-#define        MV64360_IRQ_PCI1                16
-
-/* Offsets for register blocks */
-#define        MV64x60_MPSC_0_OFFSET           0x8000
-#define        MV64x60_MPSC_1_OFFSET           0x9000
-#define        MV64x60_MPSC_ROUTING_OFFSET     0xb400
-#define        MV64x60_SDMA_0_OFFSET           0x4000
-#define        MV64x60_SDMA_1_OFFSET           0x6000
-#define        MV64x60_SDMA_INTR_OFFSET        0xb800
-#define        MV64x60_BRG_0_OFFSET            0xb200
-#define        MV64x60_BRG_1_OFFSET            0xb208
-
-/*
- *****************************************************************************
- *
- *     CPU Interface Registers
- *
- *****************************************************************************
- */
-
-/* CPU physical address of 64260's registers */
-#define MV64x60_INTERNAL_SPACE_DECODE                  0x0068
-#define MV64x60_INTERNAL_SPACE_SIZE                    0x10000
-#define MV64x60_INTERNAL_SPACE_DEFAULT_ADDR            0x14000000
-
-#define        MV64360_CPU_BAR_ENABLE                          0x0278
-
-/* CPU Memory Controller Window Registers (4 windows) */
-#define        MV64x60_CPU2MEM_WINDOWS                         4
-
-#define        MV64x60_CPU2MEM_0_BASE                          0x0008
-#define        MV64x60_CPU2MEM_0_SIZE                          0x0010
-#define        MV64x60_CPU2MEM_1_BASE                          0x0208
-#define        MV64x60_CPU2MEM_1_SIZE                          0x0210
-#define        MV64x60_CPU2MEM_2_BASE                          0x0018
-#define        MV64x60_CPU2MEM_2_SIZE                          0x0020
-#define        MV64x60_CPU2MEM_3_BASE                          0x0218
-#define        MV64x60_CPU2MEM_3_SIZE                          0x0220
-
-/* CPU Device Controller Window Registers (4 windows) */
-#define        MV64x60_CPU2DEV_CS_WINDOWS                      4
-
-#define        MV64x60_CPU2DEV_0_BASE                          0x0028
-#define        MV64x60_CPU2DEV_0_SIZE                          0x0030
-#define        MV64x60_CPU2DEV_1_BASE                          0x0228
-#define        MV64x60_CPU2DEV_1_SIZE                          0x0230
-#define        MV64x60_CPU2DEV_2_BASE                          0x0248
-#define        MV64x60_CPU2DEV_2_SIZE                          0x0250
-#define        MV64x60_CPU2DEV_3_BASE                          0x0038
-#define        MV64x60_CPU2DEV_3_SIZE                          0x0040
-
-#define        MV64x60_CPU2BOOT_0_BASE                         0x0238
-#define        MV64x60_CPU2BOOT_0_SIZE                         0x0240
-
-/* CPU Windows to PCI space (2 PCI buses each w/ 1 I/O & 4 MEM windows) */
-#define        MV64x60_PCI_BUSES                               2
-#define        MV64x60_PCI_IO_WINDOWS_PER_BUS                  1
-#define        MV64x60_PCI_MEM_WINDOWS_PER_BUS                 4
-
-#define        MV64x60_CPU2PCI_SWAP_BYTE                       0x00000000
-#define        MV64x60_CPU2PCI_SWAP_NONE                       0x01000000
-#define        MV64x60_CPU2PCI_SWAP_BYTE_WORD                  0x02000000
-#define        MV64x60_CPU2PCI_SWAP_WORD                       0x03000000
-
-#define        MV64x60_CPU2PCI_MEM_REQ64                       (1<<27)
-
-#define        MV64x60_CPU2PCI0_IO_BASE                        0x0048
-#define        MV64x60_CPU2PCI0_IO_SIZE                        0x0050
-#define        MV64x60_CPU2PCI0_MEM_0_BASE                     0x0058
-#define        MV64x60_CPU2PCI0_MEM_0_SIZE                     0x0060
-#define        MV64x60_CPU2PCI0_MEM_1_BASE                     0x0080
-#define        MV64x60_CPU2PCI0_MEM_1_SIZE                     0x0088
-#define        MV64x60_CPU2PCI0_MEM_2_BASE                     0x0258
-#define        MV64x60_CPU2PCI0_MEM_2_SIZE                     0x0260
-#define        MV64x60_CPU2PCI0_MEM_3_BASE                     0x0280
-#define        MV64x60_CPU2PCI0_MEM_3_SIZE                     0x0288
-
-#define        MV64x60_CPU2PCI0_IO_REMAP                       0x00f0
-#define        MV64x60_CPU2PCI0_MEM_0_REMAP_LO                 0x00f8
-#define        MV64x60_CPU2PCI0_MEM_0_REMAP_HI                 0x0320
-#define        MV64x60_CPU2PCI0_MEM_1_REMAP_LO                 0x0100
-#define        MV64x60_CPU2PCI0_MEM_1_REMAP_HI                 0x0328
-#define        MV64x60_CPU2PCI0_MEM_2_REMAP_LO                 0x02f8
-#define        MV64x60_CPU2PCI0_MEM_2_REMAP_HI                 0x0330
-#define        MV64x60_CPU2PCI0_MEM_3_REMAP_LO                 0x0300
-#define        MV64x60_CPU2PCI0_MEM_3_REMAP_HI                 0x0338
-
-#define        MV64x60_CPU2PCI1_IO_BASE                        0x0090
-#define        MV64x60_CPU2PCI1_IO_SIZE                        0x0098
-#define        MV64x60_CPU2PCI1_MEM_0_BASE                     0x00a0
-#define        MV64x60_CPU2PCI1_MEM_0_SIZE                     0x00a8
-#define        MV64x60_CPU2PCI1_MEM_1_BASE                     0x00b0
-#define        MV64x60_CPU2PCI1_MEM_1_SIZE                     0x00b8
-#define        MV64x60_CPU2PCI1_MEM_2_BASE                     0x02a0
-#define        MV64x60_CPU2PCI1_MEM_2_SIZE                     0x02a8
-#define        MV64x60_CPU2PCI1_MEM_3_BASE                     0x02b0
-#define        MV64x60_CPU2PCI1_MEM_3_SIZE                     0x02b8
-
-#define        MV64360_CPU2SRAM_BASE                           0x0268
-
-#define        MV64x60_CPU2PCI1_IO_REMAP                       0x0108
-#define        MV64x60_CPU2PCI1_MEM_0_REMAP_LO                 0x0110
-#define        MV64x60_CPU2PCI1_MEM_0_REMAP_HI                 0x0340
-#define        MV64x60_CPU2PCI1_MEM_1_REMAP_LO                 0x0118
-#define        MV64x60_CPU2PCI1_MEM_1_REMAP_HI                 0x0348
-#define        MV64x60_CPU2PCI1_MEM_2_REMAP_LO                 0x0310
-#define        MV64x60_CPU2PCI1_MEM_2_REMAP_HI                 0x0350
-#define        MV64x60_CPU2PCI1_MEM_3_REMAP_LO                 0x0318
-#define        MV64x60_CPU2PCI1_MEM_3_REMAP_HI                 0x0358
-
-/* CPU Control Registers */
-#define MV64x60_CPU_CONFIG                             0x0000
-#define MV64x60_CPU_MODE                               0x0120
-#define MV64x60_CPU_MASTER_CNTL                                0x0160
-#define MV64x60_CPU_XBAR_CNTL_LO                       0x0150
-#define MV64x60_CPU_XBAR_CNTL_HI                       0x0158
-#define MV64x60_CPU_XBAR_TO                            0x0168
-
-#define GT64260_CPU_RR_XBAR_CNTL_LO                    0x0170
-#define GT64260_CPU_RR_XBAR_CNTL_HI                    0x0178
-
-#define MV64360_CPU_PADS_CALIBRATION                   0x03b4
-#define MV64360_CPU_RESET_SAMPLE_LO                    0x03c4
-#define MV64360_CPU_RESET_SAMPLE_HI                    0x03d4
-
-/* SMP Register Map */
-#define MV64360_WHO_AM_I                               0x0200
-#define MV64360_CPU0_DOORBELL                          0x0214
-#define MV64360_CPU0_DOORBELL_CLR                      0x021c
-#define MV64360_CPU0_DOORBELL_MASK                     0x0234
-#define MV64360_CPU1_DOORBELL                          0x0224
-#define MV64360_CPU1_DOORBELL_CLR                      0x022c
-#define MV64360_CPU1_DOORBELL_MASK                     0x023c
-#define MV64360_CPUx_DOORBELL(x)                       (0x0214 + ((x)*0x10))
-#define MV64360_CPUx_DOORBELL_CLR(x)                   (0x021c + ((x)*0x10))
-#define MV64360_CPUx_DOORBELL_MASK(x)                  (0x0234 + ((x)*0x08))
-#define MV64360_SEMAPHORE_0                            0x0244
-#define MV64360_SEMAPHORE_1                            0x024c
-#define MV64360_SEMAPHORE_2                            0x0254
-#define MV64360_SEMAPHORE_3                            0x025c
-#define MV64360_SEMAPHORE_4                            0x0264
-#define MV64360_SEMAPHORE_5                            0x026c
-#define MV64360_SEMAPHORE_6                            0x0274
-#define MV64360_SEMAPHORE_7                            0x027c
-
-/* CPU Sync Barrier Registers */
-#define GT64260_CPU_SYNC_BARRIER_PCI0                  0x00c0
-#define GT64260_CPU_SYNC_BARRIER_PCI1                  0x00c8
-
-#define MV64360_CPU0_SYNC_BARRIER_TRIG                 0x00c0
-#define MV64360_CPU0_SYNC_BARRIER_VIRT                 0x00c8
-#define MV64360_CPU1_SYNC_BARRIER_TRIG                 0x00d0
-#define MV64360_CPU1_SYNC_BARRIER_VIRT                 0x00d8
-
-/* CPU Deadlock and Ordering registers (Rev B part only) */
-#define GT64260_CPU_DEADLOCK_ORDERING                   0x02d0
-#define GT64260_CPU_WB_PRIORITY_BUFFER_DEPTH            0x02d8
-#define GT64260_CPU_COUNTERS_SYNC_BARRIER_ATTRIBUTE     0x02e0
-
-/* CPU Access Protection Registers (gt64260 realy has 8 but don't need) */
-#define        MV64x260_CPU_PROT_WINDOWS                       4
-
-#define        GT64260_CPU_PROT_ACCPROTECT                     (1<<16)
-#define        GT64260_CPU_PROT_WRPROTECT                      (1<<17)
-#define        GT64260_CPU_PROT_CACHEPROTECT                   (1<<18)
-
-#define        MV64360_CPU_PROT_ACCPROTECT                     (1<<20)
-#define        MV64360_CPU_PROT_WRPROTECT                      (1<<21)
-#define        MV64360_CPU_PROT_CACHEPROTECT                   (1<<22)
-#define        MV64360_CPU_PROT_WIN_ENABLE                     (1<<31)
-
-#define MV64x60_CPU_PROT_BASE_0                                0x0180
-#define MV64x60_CPU_PROT_SIZE_0                                0x0188
-#define MV64x60_CPU_PROT_BASE_1                                0x0190
-#define MV64x60_CPU_PROT_SIZE_1                                0x0198
-#define MV64x60_CPU_PROT_BASE_2                                0x01a0
-#define MV64x60_CPU_PROT_SIZE_2                                0x01a8
-#define MV64x60_CPU_PROT_BASE_3                                0x01b0
-#define MV64x60_CPU_PROT_SIZE_3                                0x01b8
-
-#define GT64260_CPU_PROT_BASE_4                                0x01c0
-#define GT64260_CPU_PROT_SIZE_4                                0x01c8
-#define GT64260_CPU_PROT_BASE_5                                0x01d0
-#define GT64260_CPU_PROT_SIZE_5                                0x01d8
-#define GT64260_CPU_PROT_BASE_6                                0x01e0
-#define GT64260_CPU_PROT_SIZE_6                                0x01e8
-#define GT64260_CPU_PROT_BASE_7                                0x01f0
-#define GT64260_CPU_PROT_SIZE_7                                0x01f8
-
-/* CPU Snoop Control Registers (64260 only) */
-#define        GT64260_CPU_SNOOP_WINDOWS                       4
-
-#define        GT64260_CPU_SNOOP_NONE                          0x00000000
-#define        GT64260_CPU_SNOOP_WT                            0x00010000
-#define        GT64260_CPU_SNOOP_WB                            0x00020000
-#define        GT64260_CPU_SNOOP_MASK                          0x00030000
-#define        GT64260_CPU_SNOOP_ALL_BITS                      GT64260_CPU_SNOOP_MASK
-
-#define GT64260_CPU_SNOOP_BASE_0                       0x0380
-#define GT64260_CPU_SNOOP_SIZE_0                       0x0388
-#define GT64260_CPU_SNOOP_BASE_1                       0x0390
-#define GT64260_CPU_SNOOP_SIZE_1                       0x0398
-#define GT64260_CPU_SNOOP_BASE_2                       0x03a0
-#define GT64260_CPU_SNOOP_SIZE_2                       0x03a8
-#define GT64260_CPU_SNOOP_BASE_3                       0x03b0
-#define GT64260_CPU_SNOOP_SIZE_3                       0x03b8
-
-/* CPU Error Report Registers */
-#define MV64x60_CPU_ERR_ADDR_LO                                0x0070
-#define MV64x60_CPU_ERR_ADDR_HI                                0x0078
-#define MV64x60_CPU_ERR_DATA_LO                                0x0128
-#define MV64x60_CPU_ERR_DATA_HI                                0x0130
-#define MV64x60_CPU_ERR_PARITY                         0x0138
-#define MV64x60_CPU_ERR_CAUSE                          0x0140
-#define MV64x60_CPU_ERR_MASK                           0x0148
-
-/*
- *****************************************************************************
- *
- *     SRAM Cotnroller Registers
- *
- *****************************************************************************
- */
-
-#define        MV64360_SRAM_CONFIG                             0x0380
-#define        MV64360_SRAM_TEST_MODE                          0x03f4
-#define        MV64360_SRAM_ERR_CAUSE                          0x0388
-#define        MV64360_SRAM_ERR_ADDR_LO                        0x0390
-#define        MV64360_SRAM_ERR_ADDR_HI                        0x03f8
-#define        MV64360_SRAM_ERR_DATA_LO                        0x0398
-#define        MV64360_SRAM_ERR_DATA_HI                        0x03a0
-#define        MV64360_SRAM_ERR_PARITY                         0x03a8
-
-
-/*
- *****************************************************************************
- *
- *     SDRAM Cotnroller Registers
- *
- *****************************************************************************
- */
-
-/* SDRAM Config Registers (64260) */
-#define        GT64260_SDRAM_CONFIG                            0x0448
-
-/* SDRAM Error Report Registers (64260) */
-#define        GT64260_SDRAM_ERR_DATA_LO                       0x0484
-#define        GT64260_SDRAM_ERR_DATA_HI                       0x0480
-#define        GT64260_SDRAM_ERR_ADDR                          0x0490
-#define        GT64260_SDRAM_ERR_ECC_RCVD                      0x0488
-#define        GT64260_SDRAM_ERR_ECC_CALC                      0x048c
-#define        GT64260_SDRAM_ERR_ECC_CNTL                      0x0494
-#define        GT64260_SDRAM_ERR_ECC_ERR_CNT                   0x0498
-
-/* SDRAM Config Registers (64360) */
-#define        MV64360_SDRAM_CONFIG                            0x1400
-
-/* SDRAM Error Report Registers (64360) */
-#define        MV64360_SDRAM_ERR_DATA_LO                       0x1444
-#define        MV64360_SDRAM_ERR_DATA_HI                       0x1440
-#define        MV64360_SDRAM_ERR_ADDR                          0x1450
-#define        MV64360_SDRAM_ERR_ECC_RCVD                      0x1448
-#define        MV64360_SDRAM_ERR_ECC_CALC                      0x144c
-#define        MV64360_SDRAM_ERR_ECC_CNTL                      0x1454
-#define        MV64360_SDRAM_ERR_ECC_ERR_CNT                   0x1458
-
-
-/*
- *****************************************************************************
- *
- *     Device/BOOT Cotnroller Registers
- *
- *****************************************************************************
- */
-
-/* Device Control Registers */
-#define        MV64x60_DEV_BANK_PARAMS_0                       0x045c
-#define        MV64x60_DEV_BANK_PARAMS_1                       0x0460
-#define        MV64x60_DEV_BANK_PARAMS_2                       0x0464
-#define        MV64x60_DEV_BANK_PARAMS_3                       0x0468
-#define        MV64x60_DEV_BOOT_PARAMS                         0x046c
-#define        MV64x60_DEV_IF_CNTL                             0x04c0
-#define        MV64x60_DEV_IF_XBAR_CNTL_LO                     0x04c8
-#define        MV64x60_DEV_IF_XBAR_CNTL_HI                     0x04cc
-#define        MV64x60_DEV_IF_XBAR_CNTL_TO                     0x04c4
-
-/* Device Interrupt Registers */
-#define        MV64x60_DEV_INTR_CAUSE                          0x04d0
-#define        MV64x60_DEV_INTR_MASK                           0x04d4
-#define        MV64x60_DEV_INTR_ERR_ADDR                       0x04d8
-
-#define        MV64360_DEV_INTR_ERR_DATA                       0x04dc
-#define        MV64360_DEV_INTR_ERR_PAR                        0x04e0
-
-
-/*
- *****************************************************************************
- *
- *     PCI Bridge Interface Registers
- *
- *****************************************************************************
- */
-
-/* PCI Configuration Access Registers */
-#define        MV64x60_PCI0_CONFIG_ADDR                        0x0cf8
-#define        MV64x60_PCI0_CONFIG_DATA                        0x0cfc
-#define        MV64x60_PCI0_IACK                               0x0c34
-
-#define        MV64x60_PCI1_CONFIG_ADDR                        0x0c78
-#define        MV64x60_PCI1_CONFIG_DATA                        0x0c7c
-#define        MV64x60_PCI1_IACK                               0x0cb4
-
-/* PCI Control Registers */
-#define        MV64x60_PCI0_CMD                                0x0c00
-#define        MV64x60_PCI0_MODE                               0x0d00
-#define        MV64x60_PCI0_TO_RETRY                           0x0c04
-#define        MV64x60_PCI0_RD_BUF_DISCARD_TIMER               0x0d04
-#define        MV64x60_PCI0_MSI_TRIGGER_TIMER                  0x0c38
-#define        MV64x60_PCI0_ARBITER_CNTL                       0x1d00
-#define        MV64x60_PCI0_XBAR_CNTL_LO                       0x1d08
-#define        MV64x60_PCI0_XBAR_CNTL_HI                       0x1d0c
-#define        MV64x60_PCI0_XBAR_CNTL_TO                       0x1d04
-#define        MV64x60_PCI0_RD_RESP_XBAR_CNTL_LO               0x1d18
-#define        MV64x60_PCI0_RD_RESP_XBAR_CNTL_HI               0x1d1c
-#define        MV64x60_PCI0_SYNC_BARRIER                       0x1d10
-#define        MV64x60_PCI0_P2P_CONFIG                         0x1d14
-#define        MV64x60_PCI0_INTR_MASK
-
-#define        GT64260_PCI0_P2P_SWAP_CNTL                      0x1d54
-
-#define        MV64x60_PCI1_CMD                                0x0c80
-#define        MV64x60_PCI1_MODE                               0x0d80
-#define        MV64x60_PCI1_TO_RETRY                           0x0c84
-#define        MV64x60_PCI1_RD_BUF_DISCARD_TIMER               0x0d84
-#define        MV64x60_PCI1_MSI_TRIGGER_TIMER                  0x0cb8
-#define        MV64x60_PCI1_ARBITER_CNTL                       0x1d80
-#define        MV64x60_PCI1_XBAR_CNTL_LO                       0x1d88
-#define        MV64x60_PCI1_XBAR_CNTL_HI                       0x1d8c
-#define        MV64x60_PCI1_XBAR_CNTL_TO                       0x1d84
-#define        MV64x60_PCI1_RD_RESP_XBAR_CNTL_LO               0x1d98
-#define        MV64x60_PCI1_RD_RESP_XBAR_CNTL_HI               0x1d9c
-#define        MV64x60_PCI1_SYNC_BARRIER                       0x1d90
-#define        MV64x60_PCI1_P2P_CONFIG                         0x1d94
-
-#define        GT64260_PCI1_P2P_SWAP_CNTL                      0x1dd4
-
-/* PCI Access Control Regions Registers */
-#define        GT64260_PCI_ACC_CNTL_PREFETCHEN                 (1<<12)
-#define        GT64260_PCI_ACC_CNTL_DREADEN                    (1<<13)
-#define        GT64260_PCI_ACC_CNTL_RDPREFETCH                 (1<<16)
-#define        GT64260_PCI_ACC_CNTL_RDLINEPREFETCH             (1<<17)
-#define        GT64260_PCI_ACC_CNTL_RDMULPREFETCH              (1<<18)
-#define        GT64260_PCI_ACC_CNTL_MBURST_32_BTYES            0x00000000
-#define        GT64260_PCI_ACC_CNTL_MBURST_64_BYTES            0x00100000
-#define        GT64260_PCI_ACC_CNTL_MBURST_128_BYTES           0x00200000
-#define        GT64260_PCI_ACC_CNTL_MBURST_MASK                0x00300000
-#define        GT64260_PCI_ACC_CNTL_SWAP_BYTE                  0x00000000
-#define        GT64260_PCI_ACC_CNTL_SWAP_NONE                  0x01000000
-#define        GT64260_PCI_ACC_CNTL_SWAP_BYTE_WORD             0x02000000
-#define        GT64260_PCI_ACC_CNTL_SWAP_WORD                  0x03000000
-#define        GT64260_PCI_ACC_CNTL_SWAP_MASK                  0x03000000
-#define        GT64260_PCI_ACC_CNTL_ACCPROT                    (1<<28)
-#define        GT64260_PCI_ACC_CNTL_WRPROT                     (1<<29)
-
-#define        GT64260_PCI_ACC_CNTL_ALL_BITS   (GT64260_PCI_ACC_CNTL_PREFETCHEN |    \
-                                        GT64260_PCI_ACC_CNTL_DREADEN |       \
-                                        GT64260_PCI_ACC_CNTL_RDPREFETCH |    \
-                                        GT64260_PCI_ACC_CNTL_RDLINEPREFETCH |\
-                                        GT64260_PCI_ACC_CNTL_RDMULPREFETCH | \
-                                        GT64260_PCI_ACC_CNTL_MBURST_MASK |   \
-                                        GT64260_PCI_ACC_CNTL_SWAP_MASK |     \
-                                        GT64260_PCI_ACC_CNTL_ACCPROT|        \
-                                        GT64260_PCI_ACC_CNTL_WRPROT)
-
-#define        MV64360_PCI_ACC_CNTL_ENABLE                     (1<<0)
-#define        MV64360_PCI_ACC_CNTL_REQ64                      (1<<1)
-#define        MV64360_PCI_ACC_CNTL_SNOOP_NONE                 0x00000000
-#define        MV64360_PCI_ACC_CNTL_SNOOP_WT                   0x00000004
-#define        MV64360_PCI_ACC_CNTL_SNOOP_WB                   0x00000008
-#define        MV64360_PCI_ACC_CNTL_SNOOP_MASK                 0x0000000c
-#define        MV64360_PCI_ACC_CNTL_ACCPROT                    (1<<4)
-#define        MV64360_PCI_ACC_CNTL_WRPROT                     (1<<5)
-#define        MV64360_PCI_ACC_CNTL_SWAP_BYTE                  0x00000000
-#define        MV64360_PCI_ACC_CNTL_SWAP_NONE                  0x00000040
-#define        MV64360_PCI_ACC_CNTL_SWAP_BYTE_WORD             0x00000080
-#define        MV64360_PCI_ACC_CNTL_SWAP_WORD                  0x000000c0
-#define        MV64360_PCI_ACC_CNTL_SWAP_MASK                  0x000000c0
-#define        MV64360_PCI_ACC_CNTL_MBURST_32_BYTES            0x00000000
-#define        MV64360_PCI_ACC_CNTL_MBURST_64_BYTES            0x00000100
-#define        MV64360_PCI_ACC_CNTL_MBURST_128_BYTES           0x00000200
-#define        MV64360_PCI_ACC_CNTL_MBURST_MASK                0x00000300
-#define        MV64360_PCI_ACC_CNTL_RDSIZE_32_BYTES            0x00000000
-#define        MV64360_PCI_ACC_CNTL_RDSIZE_64_BYTES            0x00000400
-#define        MV64360_PCI_ACC_CNTL_RDSIZE_128_BYTES           0x00000800
-#define        MV64360_PCI_ACC_CNTL_RDSIZE_256_BYTES           0x00000c00
-#define        MV64360_PCI_ACC_CNTL_RDSIZE_MASK                0x00000c00
-
-#define        MV64360_PCI_ACC_CNTL_ALL_BITS   (MV64360_PCI_ACC_CNTL_ENABLE |      \
-                                        MV64360_PCI_ACC_CNTL_REQ64 |       \
-                                        MV64360_PCI_ACC_CNTL_SNOOP_MASK |  \
-                                        MV64360_PCI_ACC_CNTL_ACCPROT |     \
-                                        MV64360_PCI_ACC_CNTL_WRPROT |      \
-                                        MV64360_PCI_ACC_CNTL_SWAP_MASK |   \
-                                        MV64360_PCI_ACC_CNTL_MBURST_MASK | \
-                                        MV64360_PCI_ACC_CNTL_RDSIZE_MASK)
-
-#define        MV64x60_PCI0_ACC_CNTL_0_BASE_LO                 0x1e00
-#define        MV64x60_PCI0_ACC_CNTL_0_BASE_HI                 0x1e04
-#define        MV64x60_PCI0_ACC_CNTL_0_SIZE                    0x1e08
-#define        MV64x60_PCI0_ACC_CNTL_1_BASE_LO                 0x1e10
-#define        MV64x60_PCI0_ACC_CNTL_1_BASE_HI                 0x1e14
-#define        MV64x60_PCI0_ACC_CNTL_1_SIZE                    0x1e18
-#define        MV64x60_PCI0_ACC_CNTL_2_BASE_LO                 0x1e20
-#define        MV64x60_PCI0_ACC_CNTL_2_BASE_HI                 0x1e24
-#define        MV64x60_PCI0_ACC_CNTL_2_SIZE                    0x1e28
-#define        MV64x60_PCI0_ACC_CNTL_3_BASE_LO                 0x1e30
-#define        MV64x60_PCI0_ACC_CNTL_3_BASE_HI                 0x1e34
-#define        MV64x60_PCI0_ACC_CNTL_3_SIZE                    0x1e38
-#define        MV64x60_PCI0_ACC_CNTL_4_BASE_LO                 0x1e40
-#define        MV64x60_PCI0_ACC_CNTL_4_BASE_HI                 0x1e44
-#define        MV64x60_PCI0_ACC_CNTL_4_SIZE                    0x1e48
-#define        MV64x60_PCI0_ACC_CNTL_5_BASE_LO                 0x1e50
-#define        MV64x60_PCI0_ACC_CNTL_5_BASE_HI                 0x1e54
-#define        MV64x60_PCI0_ACC_CNTL_5_SIZE                    0x1e58
-
-#define        GT64260_PCI0_ACC_CNTL_6_BASE_LO                 0x1e60
-#define        GT64260_PCI0_ACC_CNTL_6_BASE_HI                 0x1e64
-#define        GT64260_PCI0_ACC_CNTL_6_SIZE                    0x1e68
-#define        GT64260_PCI0_ACC_CNTL_7_BASE_LO                 0x1e70
-#define        GT64260_PCI0_ACC_CNTL_7_BASE_HI                 0x1e74
-#define        GT64260_PCI0_ACC_CNTL_7_SIZE                    0x1e78
-
-#define        MV64x60_PCI1_ACC_CNTL_0_BASE_LO                 0x1e80
-#define        MV64x60_PCI1_ACC_CNTL_0_BASE_HI                 0x1e84
-#define        MV64x60_PCI1_ACC_CNTL_0_SIZE                    0x1e88
-#define        MV64x60_PCI1_ACC_CNTL_1_BASE_LO                 0x1e90
-#define        MV64x60_PCI1_ACC_CNTL_1_BASE_HI                 0x1e94
-#define        MV64x60_PCI1_ACC_CNTL_1_SIZE                    0x1e98
-#define        MV64x60_PCI1_ACC_CNTL_2_BASE_LO                 0x1ea0
-#define        MV64x60_PCI1_ACC_CNTL_2_BASE_HI                 0x1ea4
-#define        MV64x60_PCI1_ACC_CNTL_2_SIZE                    0x1ea8
-#define        MV64x60_PCI1_ACC_CNTL_3_BASE_LO                 0x1eb0
-#define        MV64x60_PCI1_ACC_CNTL_3_BASE_HI                 0x1eb4
-#define        MV64x60_PCI1_ACC_CNTL_3_SIZE                    0x1eb8
-#define        MV64x60_PCI1_ACC_CNTL_4_BASE_LO                 0x1ec0
-#define        MV64x60_PCI1_ACC_CNTL_4_BASE_HI                 0x1ec4
-#define        MV64x60_PCI1_ACC_CNTL_4_SIZE                    0x1ec8
-#define        MV64x60_PCI1_ACC_CNTL_5_BASE_LO                 0x1ed0
-#define        MV64x60_PCI1_ACC_CNTL_5_BASE_HI                 0x1ed4
-#define        MV64x60_PCI1_ACC_CNTL_5_SIZE                    0x1ed8
-
-#define        GT64260_PCI1_ACC_CNTL_6_BASE_LO                 0x1ee0
-#define        GT64260_PCI1_ACC_CNTL_6_BASE_HI                 0x1ee4
-#define        GT64260_PCI1_ACC_CNTL_6_SIZE                    0x1ee8
-#define        GT64260_PCI1_ACC_CNTL_7_BASE_LO                 0x1ef0
-#define        GT64260_PCI1_ACC_CNTL_7_BASE_HI                 0x1ef4
-#define        GT64260_PCI1_ACC_CNTL_7_SIZE                    0x1ef8
-
-/* PCI Snoop Control Registers (64260 only) */
-#define        GT64260_PCI_SNOOP_NONE                          0x00000000
-#define        GT64260_PCI_SNOOP_WT                            0x00001000
-#define        GT64260_PCI_SNOOP_WB                            0x00002000
-
-#define        GT64260_PCI0_SNOOP_0_BASE_LO                    0x1f00
-#define        GT64260_PCI0_SNOOP_0_BASE_HI                    0x1f04
-#define        GT64260_PCI0_SNOOP_0_SIZE                       0x1f08
-#define        GT64260_PCI0_SNOOP_1_BASE_LO                    0x1f10
-#define        GT64260_PCI0_SNOOP_1_BASE_HI                    0x1f14
-#define        GT64260_PCI0_SNOOP_1_SIZE                       0x1f18
-#define        GT64260_PCI0_SNOOP_2_BASE_LO                    0x1f20
-#define        GT64260_PCI0_SNOOP_2_BASE_HI                    0x1f24
-#define        GT64260_PCI0_SNOOP_2_SIZE                       0x1f28
-#define        GT64260_PCI0_SNOOP_3_BASE_LO                    0x1f30
-#define        GT64260_PCI0_SNOOP_3_BASE_HI                    0x1f34
-#define        GT64260_PCI0_SNOOP_3_SIZE                       0x1f38
-
-#define        GT64260_PCI1_SNOOP_0_BASE_LO                    0x1f80
-#define        GT64260_PCI1_SNOOP_0_BASE_HI                    0x1f84
-#define        GT64260_PCI1_SNOOP_0_SIZE                       0x1f88
-#define        GT64260_PCI1_SNOOP_1_BASE_LO                    0x1f90
-#define        GT64260_PCI1_SNOOP_1_BASE_HI                    0x1f94
-#define        GT64260_PCI1_SNOOP_1_SIZE                       0x1f98
-#define        GT64260_PCI1_SNOOP_2_BASE_LO                    0x1fa0
-#define        GT64260_PCI1_SNOOP_2_BASE_HI                    0x1fa4
-#define        GT64260_PCI1_SNOOP_2_SIZE                       0x1fa8
-#define        GT64260_PCI1_SNOOP_3_BASE_LO                    0x1fb0
-#define        GT64260_PCI1_SNOOP_3_BASE_HI                    0x1fb4
-#define        GT64260_PCI1_SNOOP_3_SIZE                       0x1fb8
-
-/* PCI Error Report Registers */
-#define MV64x60_PCI0_ERR_SERR_MASK                     0x0c28
-#define MV64x60_PCI0_ERR_ADDR_LO                       0x1d40
-#define MV64x60_PCI0_ERR_ADDR_HI                       0x1d44
-#define MV64x60_PCI0_ERR_DATA_LO                       0x1d48
-#define MV64x60_PCI0_ERR_DATA_HI                       0x1d4c
-#define MV64x60_PCI0_ERR_CMD                           0x1d50
-#define MV64x60_PCI0_ERR_CAUSE                         0x1d58
-#define MV64x60_PCI0_ERR_MASK                          0x1d5c
-
-#define MV64x60_PCI1_ERR_SERR_MASK                     0x0ca8
-#define MV64x60_PCI1_ERR_ADDR_LO                       0x1dc0
-#define MV64x60_PCI1_ERR_ADDR_HI                       0x1dc4
-#define MV64x60_PCI1_ERR_DATA_LO                       0x1dc8
-#define MV64x60_PCI1_ERR_DATA_HI                       0x1dcc
-#define MV64x60_PCI1_ERR_CMD                           0x1dd0
-#define MV64x60_PCI1_ERR_CAUSE                         0x1dd8
-#define MV64x60_PCI1_ERR_MASK                          0x1ddc
-
-/* PCI Slave Address Decoding Registers */
-#define        MV64x60_PCI0_MEM_0_SIZE                         0x0c08
-#define        MV64x60_PCI0_MEM_1_SIZE                         0x0d08
-#define        MV64x60_PCI0_MEM_2_SIZE                         0x0c0c
-#define        MV64x60_PCI0_MEM_3_SIZE                         0x0d0c
-#define        MV64x60_PCI1_MEM_0_SIZE                         0x0c88
-#define        MV64x60_PCI1_MEM_1_SIZE                         0x0d88
-#define        MV64x60_PCI1_MEM_2_SIZE                         0x0c8c
-#define        MV64x60_PCI1_MEM_3_SIZE                         0x0d8c
-
-#define        MV64x60_PCI0_BAR_ENABLE                         0x0c3c
-#define        MV64x60_PCI1_BAR_ENABLE                         0x0cbc
-
-#define        MV64x60_PCI0_PCI_DECODE_CNTL                    0x0d3c
-
-
-
-
-
-#define        MV64x60_PCI0_SLAVE_BAR_REG_ENABLES              0x0c3c
-#define        MV64x60_PCI0_SLAVE_MEM_0_REMAP                  0x0c48
-#define        MV64x60_PCI0_SLAVE_MEM_1_REMAP                  0x0d48
-#define        MV64x60_PCI0_SLAVE_MEM_2_REMAP                  0x0c4c
-#define        MV64x60_PCI0_SLAVE_MEM_3_REMAP                  0x0d4c
-#define        MV64x60_PCI0_SLAVE_CS_0_REMAP                   0x0c50
-#define        MV64x60_PCI0_SLAVE_CS_1_REMAP                   0x0d50
-#define        MV64x60_PCI0_SLAVE_CS_2_REMAP                   0x0d58
-#define        MV64x60_PCI0_SLAVE_CS_3_REMAP                   0x0c54
-#define        MV64x60_PCI0_SLAVE_BOOT_REMAP                   0x0d54
-#define        MV64x60_PCI0_SLAVE_P2P_MEM_0_REMAP_LO           0x0d5c
-#define        MV64x60_PCI0_SLAVE_P2P_MEM_0_REMAP_HI           0x0d60
-#define        MV64x60_PCI0_SLAVE_P2P_MEM_1_REMAP_LO           0x0d64
-#define        MV64x60_PCI0_SLAVE_P2P_MEM_1_REMAP_HI           0x0d68
-#define        MV64x60_PCI0_SLAVE_P2P_IO_REMAP                 0x0d6c
-#define        MV64x60_PCI0_SLAVE_CPU_REMAP                    0x0d70
-
-#define        GT64260_PCI0_SLAVE_DAC_SCS_0_REMAP              0x0f00
-#define        GT64260_PCI0_SLAVE_DAC_SCS_1_REMAP              0x0f04
-#define        GT64260_PCI0_SLAVE_DAC_SCS_2_REMAP              0x0f08
-#define        GT64260_PCI0_SLAVE_DAC_SCS_3_REMAP              0x0f0c
-#define        GT64260_PCI0_SLAVE_DAC_CS_0_REMAP               0x0f10
-#define        GT64260_PCI0_SLAVE_DAC_CS_1_REMAP               0x0f14
-#define        GT64260_PCI0_SLAVE_DAC_CS_2_REMAP               0x0f18
-#define        GT64260_PCI0_SLAVE_DAC_CS_3_REMAP               0x0f1c
-#define        GT64260_PCI0_SLAVE_DAC_BOOT_REMAP               0x0f20
-#define        GT64260_PCI0_SLAVE_DAC_P2P_MEM_0_REMAP_LO       0x0f24
-#define        GT64260_PCI0_SLAVE_DAC_P2P_MEM_0_REMAP_HI       0x0f28
-#define        GT64260_PCI0_SLAVE_DAC_P2P_MEM_1_REMAP_LO       0x0f2c
-#define        GT64260_PCI0_SLAVE_DAC_P2P_MEM_1_REMAP_HI       0x0f30
-#define        GT64260_PCI0_SLAVE_DAC_CPU_REMAP                0x0f34
-
-#define        GT64260_PCI0_SLAVE_EXP_ROM_REMAP                0x0f38
-#define        GT64260_PCI0_SLAVE_PCI_DECODE_CNTL              0x0d3c
-
-
-
-
-
-/* XXXX BEGIN */
-#define        MV64x60_PCI1_PCI_DECODE_CNTL                    0x0dbc
-
-#define        MV64x60_PCI1_SLAVE_MEM_0_SIZE                   0x0c88
-#define        MV64x60_PCI1_SLAVE_MEM_1_SIZE                   0x0d88
-#define        MV64x60_PCI1_SLAVE_MEM_2_SIZE                   0x0c8c
-#define        MV64x60_PCI1_SLAVE_MEM_3_SIZE                   0x0d8c
-#define        MV64x60_PCI1_SLAVE_CS_0_SIZE                    0x0c90
-#define        MV64x60_PCI1_SLAVE_CS_1_SIZE                    0x0d90
-#define        MV64x60_PCI1_SLAVE_CS_2_SIZE                    0x0d98
-#define        MV64x60_PCI1_SLAVE_CS_3_SIZE                    0x0c94
-#define        MV64x60_PCI1_SLAVE_BOOT_SIZE                    0x0d94
-#define        MV64x60_PCI1_SLAVE_P2P_MEM_0_SIZE               0x0d9c
-#define        MV64x60_PCI1_SLAVE_P2P_MEM_1_SIZE               0x0da0
-#define        MV64x60_PCI1_SLAVE_P2P_IO_SIZE                  0x0da4
-#define        MV64x60_PCI1_SLAVE_CPU_SIZE                     0x0da8
-
-
-/* XXXXX END */
-
-
-#define        GT64260_PCI1_SLAVE_DAC_SCS_0_SIZE               0x0e80
-#define        GT64260_PCI1_SLAVE_DAC_SCS_1_SIZE               0x0e84
-#define        GT64260_PCI1_SLAVE_DAC_SCS_2_SIZE               0x0e88
-#define        GT64260_PCI1_SLAVE_DAC_SCS_3_SIZE               0x0e8c
-#define        GT64260_PCI1_SLAVE_DAC_CS_0_SIZE                0x0e90
-#define        GT64260_PCI1_SLAVE_DAC_CS_1_SIZE                0x0e94
-#define        GT64260_PCI1_SLAVE_DAC_CS_2_SIZE                0x0e98
-#define        GT64260_PCI1_SLAVE_DAC_CS_3_SIZE                0x0e9c
-#define        GT64260_PCI1_SLAVE_DAC_BOOT_SIZE                0x0ea0
-#define        GT64260_PCI1_SLAVE_DAC_P2P_MEM_0_SIZE           0x0ea4
-#define        GT64260_PCI1_SLAVE_DAC_P2P_MEM_1_SIZE           0x0ea8
-#define        GT64260_PCI1_SLAVE_DAC_CPU_SIZE                 0x0eac
-
-#define        GT64260_PCI1_SLAVE_EXP_ROM_SIZE                 0x0dac
-
-
-
-
-/* XXXX BEGIN */
-
-#define        MV64x60_PCI1_SLAVE_BAR_REG_ENABLES              0x0cbc
-#define        MV64x60_PCI1_SLAVE_MEM_0_REMAP                  0x0cc8
-#define        MV64x60_PCI1_SLAVE_MEM_1_REMAP                  0x0dc8
-#define        MV64x60_PCI1_SLAVE_MEM_2_REMAP                  0x0ccc
-#define        MV64x60_PCI1_SLAVE_MEM_3_REMAP                  0x0dcc
-#define        MV64x60_PCI1_SLAVE_CS_0_REMAP                   0x0cd0
-#define        MV64x60_PCI1_SLAVE_CS_1_REMAP                   0x0dd0
-#define        MV64x60_PCI1_SLAVE_CS_2_REMAP                   0x0dd8
-#define        MV64x60_PCI1_SLAVE_CS_3_REMAP                   0x0cd4
-#define        MV64x60_PCI1_SLAVE_BOOT_REMAP                   0x0dd4
-#define        MV64x60_PCI1_SLAVE_P2P_MEM_0_REMAP_LO           0x0ddc
-#define        MV64x60_PCI1_SLAVE_P2P_MEM_0_REMAP_HI           0x0de0
-#define        MV64x60_PCI1_SLAVE_P2P_MEM_1_REMAP_LO           0x0de4
-#define        MV64x60_PCI1_SLAVE_P2P_MEM_1_REMAP_HI           0x0de8
-#define        MV64x60_PCI1_SLAVE_P2P_IO_REMAP                 0x0dec
-#define        MV64x60_PCI1_SLAVE_CPU_REMAP                    0x0df0
-
-/* XXXXX END */
-
-
-
-#define        GT64260_PCI1_SLAVE_DAC_SCS_0_REMAP              0x0f80
-#define        GT64260_PCI1_SLAVE_DAC_SCS_1_REMAP              0x0f84
-#define        GT64260_PCI1_SLAVE_DAC_SCS_2_REMAP              0x0f88
-#define        GT64260_PCI1_SLAVE_DAC_SCS_3_REMAP              0x0f8c
-#define        GT64260_PCI1_SLAVE_DAC_CS_0_REMAP               0x0f90
-#define        GT64260_PCI1_SLAVE_DAC_CS_1_REMAP               0x0f94
-#define        GT64260_PCI1_SLAVE_DAC_CS_2_REMAP               0x0f98
-#define        GT64260_PCI1_SLAVE_DAC_CS_3_REMAP               0x0f9c
-#define        GT64260_PCI1_SLAVE_DAC_BOOT_REMAP               0x0fa0
-#define        GT64260_PCI1_SLAVE_DAC_P2P_MEM_0_REMAP_LO       0x0fa4
-#define        GT64260_PCI1_SLAVE_DAC_P2P_MEM_0_REMAP_HI       0x0fa8
-#define        GT64260_PCI1_SLAVE_DAC_P2P_MEM_1_REMAP_LO       0x0fac
-#define        GT64260_PCI1_SLAVE_DAC_P2P_MEM_1_REMAP_HI       0x0fb0
-#define        GT64260_PCI1_SLAVE_DAC_CPU_REMAP                0x0fb4
-
-#define        GT64260_PCI1_SLAVE_EXP_ROM_REMAP                0x0fb8
-#define        GT64260_PCI1_SLAVE_PCI_DECODE_CNTL              0x0dbc
-
-
-/*
- *****************************************************************************
- *
- *     Timer/Counter Interface Registers
- *
- *****************************************************************************
- */
-
-#define        MV64x60_TIMR_CNTR_0                             0x0850
-#define        MV64x60_TIMR_CNTR_1                             0x0854
-#define        MV64x60_TIMR_CNTR_2                             0x0858
-#define        MV64x60_TIMR_CNTR_3                             0x085c
-#define        MV64x60_TIMR_CNTR_0_3_CNTL                      0x0864
-#define        MV64x60_TIMR_CNTR_0_3_INTR_CAUSE                0x0868
-#define        MV64x60_TIMR_CNTR_0_3_INTR_MASK                 0x086c
-
-#define        GT64260_TIMR_CNTR_4                             0x0950
-#define        GT64260_TIMR_CNTR_5                             0x0954
-#define        GT64260_TIMR_CNTR_6                             0x0958
-#define        GT64260_TIMR_CNTR_7                             0x095c
-#define        GT64260_TIMR_CNTR_4_7_CNTL                      0x0964
-#define        GT64260_TIMR_CNTR_4_7_INTR_CAUSE                0x0968
-#define        GT64260_TIMR_CNTR_4_7_INTR_MASK                 0x096c
-
-
-/*
- *****************************************************************************
- *
- *     Communications Controller (Enet, Serial, etc.) Interface Registers
- *
- *****************************************************************************
- */
-
-#define        GT64260_COMM_ENET_0_OFFSET              0xf200
-#define        GT64260_COMM_ENET_1_OFFSET              0xf220
-#define        GT64260_COMM_ENET_2_OFFSET              0xf240
-
-#define        GT64260_ENET_CNTL_LO                    \
-       (0xf200 - GT64260_COMM_ENET_0_BASE)
-#define        GT64260_ENET_CNTL_HI                    \
-       (0xf204 - GT64260_COMM_ENET_0_BASE)
-#define        GT64260_ENET_RX_BUF_PCI_ADDR_HI         \
-       (0xf208 - GT64260_COMM_ENET_0_BASE)
-#define        GT64260_ENET_TX_BUF_PCI_ADDR_HI         \
-       (0xf20c - GT64260_COMM_ENET_0_BASE)
-#define        GT64260_ENET_RX_DESC_ADDR_HI            \
-       (0xf210 - GT64260_COMM_ENET_0_BASE)
-#define        GT64260_ENET_TX_DESC_ADDR_HI            \
-       (0xf214 - GT64260_COMM_ENET_0_BASE)
-#define        GT64260_ENET_HASH_TAB_PCI_ADDR_HI       \
-       (0xf218 - GT64260_COMM_ENET_0_BASE)
-
-#define        GT64260_COMM_MPSC_0_OFFSET              0xf280
-#define        GT64260_COMM_MPSC_1_OFFSET              0xf2c0
-
-#define        GT64260_MPSC_CNTL_LO                    \
-       (0xf280 - GT64260_COMM_MPSC_0_BASE)
-#define        GT64260_MPSC_CNTL_HI                    \
-       (0xf284 - GT64260_COMM_MPSC_0_BASE)
-#define        GT64260_MPSC_RX_BUF_PCI_ADDR_HI \
-       (0xf288 - GT64260_COMM_MPSC_0_BASE)
-#define        GT64260_MPSC_TX_BUF_PCI_ADDR_HI \
-       (0xf28c - GT64260_COMM_MPSC_0_BASE)
-#define        GT64260_MPSC_RX_DESC_ADDR_HI            \
-       (0xf290 - GT64260_COMM_MPSC_0_BASE)
-#define        GT64260_MPSC_TX_DESC_ADDR_HI            \
-       (0xf294 - GT64260_COMM_MPSC_0_BASE)
-
-#define        GT64260_SER_INIT_PCI_ADDR_HI            0xf320
-#define        GT64260_SER_INIT_LAST_DATA              0xf324
-#define        GT64260_SER_INIT_CONTROL                0xf328
-#define        GT64260_SER_INIT_STATUS                 0xf32c
-
-#define        GT64260_COMM_ARBITER_CNTL               0xf300
-#define        GT64260_COMM_CONFIG                     0xb40c
-#define        GT64260_COMM_XBAR_TO                    0xf304
-#define        GT64260_COMM_INTR_CAUSE                 0xf310
-#define        GT64260_COMM_INTR_MASK                  0xf314
-#define        GT64260_COMM_ERR_ADDR                   0xf318
-
-
-/*
- *****************************************************************************
- *
- *     Fast Ethernet Controller Interface Registers
- *
- *****************************************************************************
- */
-
-#define        GT64260_ENET_PHY_ADDR                   0x2000
-#define        GT64260_ENET_ESMIR                      0x2010
-
-#define GT64260_ENET_0_OFFSET                  0x2400
-#define GT64260_ENET_1_OFFSET                  0x2800
-#define GT64260_ENET_2_OFFSET                  0x2c00
-
-#define        GT64260_ENET_EPCR                       (0x2400 - GT64260_ENET_0_OFFSET)
-#define        GT64260_ENET_EPCXR                      (0x2408 - GT64260_ENET_0_OFFSET)
-#define        GT64260_ENET_EPCMR                      (0x2410 - GT64260_ENET_0_OFFSET)
-#define        GT64260_ENET_EPSR                       (0x2418 - GT64260_ENET_0_OFFSET)
-#define        GT64260_ENET_ESPR                       (0x2420 - GT64260_ENET_0_OFFSET)
-#define        GT64260_ENET_EHTPR                      (0x2428 - GT64260_ENET_0_OFFSET)
-#define        GT64260_ENET_EFCSAL                     (0x2430 - GT64260_ENET_0_OFFSET)
-#define        GT64260_ENET_EFCSAH                     (0x2438 - GT64260_ENET_0_OFFSET)
-#define        GT64260_ENET_ESDCR                      (0x2440 - GT64260_ENET_0_OFFSET)
-#define        GT64260_ENET_ESDCMR                     (0x2448 - GT64260_ENET_0_OFFSET)
-#define        GT64260_ENET_EICR                       (0x2450 - GT64260_ENET_0_OFFSET)
-#define        GT64260_ENET_EIMR                       (0x2458 - GT64260_ENET_0_OFFSET)
-#define        GT64260_ENET_EFRDP0                     (0x2480 - GT64260_ENET_0_OFFSET)
-#define        GT64260_ENET_EFRDP1                     (0x2484 - GT64260_ENET_0_OFFSET)
-#define        GT64260_ENET_EFRDP2                     (0x2488 - GT64260_ENET_0_OFFSET)
-#define        GT64260_ENET_EFRDP3                     (0x248c - GT64260_ENET_0_OFFSET)
-#define        GT64260_ENET_ECRDP0                     (0x24a0 - GT64260_ENET_0_OFFSET)
-#define        GT64260_ENET_ECRDP1                     (0x24a4 - GT64260_ENET_0_OFFSET)
-#define        GT64260_ENET_ECRDP2                     (0x24a8 - GT64260_ENET_0_OFFSET)
-#define        GT64260_ENET_ECRDP3                     (0x24ac - GT64260_ENET_0_OFFSET)
-#define        GT64260_ENET_ECTDP0                     (0x24e0 - GT64260_ENET_0_OFFSET)
-#define        GT64260_ENET_ECTDP1                     (0x24e4 - GT64260_ENET_0_OFFSET)
-#define        GT64260_ENET_DSCP2P0L                   (0x2460 - GT64260_ENET_0_OFFSET)
-#define        GT64260_ENET_DSCP2P0H                   (0x2464 - GT64260_ENET_0_OFFSET)
-#define        GT64260_ENET_DSCP2P1L                   (0x2468 - GT64260_ENET_0_OFFSET)
-#define        GT64260_ENET_DSCP2P1H                   (0x246c - GT64260_ENET_0_OFFSET)
-#define        GT64260_ENET_VPT2P                      (0x2470 - GT64260_ENET_0_OFFSET)
-#define        GT64260_ENET_MIB_CTRS                   (0x2500 - GT64260_ENET_0_OFFSET)
-
-/*
- *****************************************************************************
- *
- *     IDMA Controller Interface Registers
- *
- *****************************************************************************
- */
-
-#define        GT64260_IDMA_0_OFFSET                   0x0800
-#define        GT64260_IDMA_1_OFFSET                   0x0804
-#define        GT64260_IDMA_2_OFFSET                   0x0808
-#define        GT64260_IDMA_3_OFFSET                   0x080c
-#define        GT64260_IDMA_4_OFFSET                   0x0900
-#define        GT64260_IDMA_5_OFFSET                   0x0904
-#define        GT64260_IDMA_6_OFFSET                   0x0908
-#define        GT64260_IDMA_7_OFFSET                   0x090c
-
-#define        GT64260_IDMA_BYTE_COUNT                 (0x0800 - GT64260_IDMA_0_OFFSET)
-#define        GT64260_IDMA_SRC_ADDR                   (0x0810 - GT64260_IDMA_0_OFFSET)
-#define        GT64260_IDMA_DST_ADDR                   (0x0820 - GT64260_IDMA_0_OFFSET)
-#define        GT64260_IDMA_NEXT_DESC                  (0x0830 - GT64260_IDMA_0_OFFSET)
-#define        GT64260_IDMA_CUR_DESC                   (0x0870 - GT64260_IDMA_0_OFFSET)
-#define        GT64260_IDMA_SRC_PCI_ADDR_HI            (0x0890 - GT64260_IDMA_0_OFFSET)
-#define        GT64260_IDMA_DST_PCI_ADDR_HI            (0x08a0 - GT64260_IDMA_0_OFFSET)
-#define        GT64260_IDMA_NEXT_DESC_PCI_ADDR_HI      (0x08b0 - GT64260_IDMA_0_OFFSET)
-#define        GT64260_IDMA_CONTROL_LO                 (0x0840 - GT64260_IDMA_0_OFFSET)
-#define        GT64260_IDMA_CONTROL_HI                 (0x0880 - GT64260_IDMA_0_OFFSET)
-
-#define        GT64260_IDMA_0_3_ARBITER_CNTL           0x0860
-#define        GT64260_IDMA_4_7_ARBITER_CNTL           0x0960
-
-#define        GT64260_IDMA_0_3_XBAR_TO                0x08d0
-#define        GT64260_IDMA_4_7_XBAR_TO                0x09d0
-
-#define        GT64260_IDMA_0_3_INTR_CAUSE             0x08c0
-#define        GT64260_IDMA_0_3_INTR_MASK              0x08c4
-#define        GT64260_IDMA_0_3_ERROR_ADDR             0x08c8
-#define        GT64260_IDMA_0_3_ERROR_SELECT           0x08cc
-#define        GT64260_IDMA_4_7_INTR_CAUSE             0x09c0
-#define        GT64260_IDMA_4_7_INTR_MASK              0x09c4
-#define        GT64260_IDMA_4_7_ERROR_ADDR             0x09c8
-#define        GT64260_IDMA_4_7_ERROR_SELECT           0x09cc
-
-/*
- *****************************************************************************
- *
- *     Watchdog Timer Interface Registers
- *
- *****************************************************************************
- */
-
-#define        GT64260_WDT_WDC                                 0xb410
-#define        GT64260_WDT_WDV                                 0xb414
-
-
-/*
- *****************************************************************************
- *
- *      General Purpose Pins Controller Interface Registers
- *
- *****************************************************************************
- */
-
-#define        MV64x60_GPP_IO_CNTL                             0xf100
-#define        MV64x60_GPP_LEVEL_CNTL                          0xf110
-#define        MV64x60_GPP_VALUE                               0xf104
-#define        MV64x60_GPP_INTR_CAUSE                          0xf108
-#define        MV64x60_GPP_INTR_MASK                           0xf10c
-
-
-/*
- *****************************************************************************
- *
- *     Multi-Purpose Pins Controller Interface Registers
- *
- *****************************************************************************
- */
-
-#define        MV64x60_MPP_CNTL_0                              0xf000
-#define        MV64x60_MPP_CNTL_1                              0xf004
-#define        MV64x60_MPP_CNTL_2                              0xf008
-#define        MV64x60_MPP_CNTL_3                              0xf00c
-#define        GT64260_MPP_SERIAL_PORTS_MULTIPLEX              0xf010
-
-
-/*
- *****************************************************************************
- *
- *     I2C Controller Interface Registers
- *
- *****************************************************************************
- */
-
-#define GT64260_I2C_OFFSET                     0xc000
-
-#define GT64260_I2C_ADDR                       (0xc000 - GT64260_I2C_OFFSET)
-#define GT64260_I2C_EX_ADDR                    (0xc010 - GT64260_I2C_OFFSET)
-#define GT64260_I2C_DATA                       (0xc004 - GT64260_I2C_OFFSET)
-#define GT64260_I2C_CONTROL                    (0xc008 - GT64260_I2C_OFFSET)
-#define GT64260_I2C_STATUS                     (0xc00c - GT64260_I2C_OFFSET)
-#define GT64260_I2C_BAUD_RATE                  (0xc00c - GT64260_I2C_OFFSET)
-#define GT64260_I2C_RESET                      (0xc01c - GT64260_I2C_OFFSET)
-
-#define GT64260_I2C_ACK_BIT                    (1<<2)
-#define GT64260_I2C_IFLG_BIT                   (1<<3)
-#define GT64260_I2C_STOP_BIT                   (1<<4)
-#define GT64260_I2C_START_BIT                  (1<<5)
-#define GT64260_I2C_ENABLE_BIT                 (1<<6)
-#define GT64260_I2C_INT_ENABLE_BIT             (1<<7)
-
-#define GT64260_I2C_DATA_READ_BIT              0x01
-
-#define GT64260_I2C_STATUS_SENT_START          0x08
-#define GT64260_I2C_STATUS_RESENT_START                0x10
-#define GT64260_I2C_STATUS_WRITE_ADDR_ACK      0x18
-#define GT64260_I2C_STATUS_WRITE_ACK           0x28
-#define GT64260_I2C_STATUS_READ_ADDR_ACK       0x40
-#define GT64260_I2C_STATUS_READ_ACK            0x50
-#define GT64260_I2C_STATUS_READ_NO_ACK         0x58
-#define GT64260_I2C_STATUS_IDLE                        0xf8
-
-
-/*
- *****************************************************************************
- *
- *     Interrupt Controller Interface Registers
- *
- *****************************************************************************
- */
-
-#define        GT64260_IC_OFFSET                               0x0c18
-
-#define        GT64260_IC_MAIN_CAUSE_LO                (0x0c18 - GT64260_IC_OFFSET)
-#define        GT64260_IC_MAIN_CAUSE_HI                (0x0c68 - GT64260_IC_OFFSET)
-#define        GT64260_IC_CPU_INTR_MASK_LO             (0x0c1c - GT64260_IC_OFFSET)
-#define        GT64260_IC_CPU_INTR_MASK_HI             (0x0c6c - GT64260_IC_OFFSET)
-#define        GT64260_IC_CPU_SELECT_CAUSE             (0x0c70 - GT64260_IC_OFFSET)
-#define        GT64260_IC_PCI0_INTR_MASK_LO            (0x0c24 - GT64260_IC_OFFSET)
-#define        GT64260_IC_PCI0_INTR_MASK_HI            (0x0c64 - GT64260_IC_OFFSET)
-#define        GT64260_IC_PCI0_SELECT_CAUSE            (0x0c74 - GT64260_IC_OFFSET)
-#define        GT64260_IC_PCI1_INTR_MASK_LO            (0x0ca4 - GT64260_IC_OFFSET)
-#define        GT64260_IC_PCI1_INTR_MASK_HI            (0x0ce4 - GT64260_IC_OFFSET)
-#define        GT64260_IC_PCI1_SELECT_CAUSE            (0x0cf4 - GT64260_IC_OFFSET)
-#define        GT64260_IC_CPU_INT_0_MASK               (0x0e60 - GT64260_IC_OFFSET)
-#define        GT64260_IC_CPU_INT_1_MASK               (0x0e64 - GT64260_IC_OFFSET)
-#define        GT64260_IC_CPU_INT_2_MASK               (0x0e68 - GT64260_IC_OFFSET)
-#define        GT64260_IC_CPU_INT_3_MASK               (0x0e6c - GT64260_IC_OFFSET)
-
-#define        MV64360_IC_OFFSET                               0x0000
-
-#define        MV64360_IC_MAIN_CAUSE_LO                (0x0004 - MV64360_IC_OFFSET)
-#define        MV64360_IC_MAIN_CAUSE_HI                (0x000c - MV64360_IC_OFFSET)
-#define        MV64360_IC_CPU0_INTR_MASK_LO            (0x0014 - MV64360_IC_OFFSET)
-#define        MV64360_IC_CPU0_INTR_MASK_HI            (0x001c - MV64360_IC_OFFSET)
-#define        MV64360_IC_CPU0_SELECT_CAUSE            (0x0024 - MV64360_IC_OFFSET)
-#define        MV64360_IC_CPU1_INTR_MASK_LO            (0x0034 - MV64360_IC_OFFSET)
-#define        MV64360_IC_CPU1_INTR_MASK_HI            (0x003c - MV64360_IC_OFFSET)
-#define        MV64360_IC_CPU1_SELECT_CAUSE            (0x0044 - MV64360_IC_OFFSET)
-#define        MV64360_IC_INT0_MASK_LO                 (0x0054 - MV64360_IC_OFFSET)
-#define        MV64360_IC_INT0_MASK_HI                 (0x005c - MV64360_IC_OFFSET)
-#define        MV64360_IC_INT0_SELECT_CAUSE            (0x0064 - MV64360_IC_OFFSET)
-#define        MV64360_IC_INT1_MASK_LO                 (0x0074 - MV64360_IC_OFFSET)
-#define        MV64360_IC_INT1_MASK_HI                 (0x007c - MV64360_IC_OFFSET)
-#define        MV64360_IC_INT1_SELECT_CAUSE            (0x0084 - MV64360_IC_OFFSET)
-
-#endif /* __ASMPPC_MV64x60_DEFS_H */
diff --git a/include/asm-ppc/ppc4xx_dma.h b/include/asm-ppc/ppc4xx_dma.h
deleted file mode 100644 (file)
index 5b82faf..0000000
+++ /dev/null
@@ -1,570 +0,0 @@
-/*
- * include/asm-ppc/ppc4xx_dma.h
- *
- * IBM PPC4xx DMA engine library
- *
- * Copyright 2000-2004 MontaVista Software Inc.
- *
- * Cleaned up a bit more, Matt Porter <mporter@kernel.crashing.org>
- *
- * Original code by Armin Kuster <akuster@mvista.com>
- * and Pete Popov <ppopov@mvista.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 the
- * Free Software Foundation;  either version 2 of the  License, or (at your
- * option) any later version.
- *
- * 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.
- */
-
-#ifdef __KERNEL__
-#ifndef __ASMPPC_PPC4xx_DMA_H
-#define __ASMPPC_PPC4xx_DMA_H
-
-#include <linux/config.h>
-#include <linux/types.h>
-#include <asm/mmu.h>
-#include <asm/ibm4xx.h>
-
-#undef DEBUG_4xxDMA
-
-#define MAX_PPC4xx_DMA_CHANNELS                4
-
-/* in arch/ppc/kernel/setup.c -- Cort */
-extern unsigned long DMA_MODE_WRITE, DMA_MODE_READ;
-
-/*
- * Function return status codes
- * These values are used to indicate whether or not the function
- * call was successful, or a bad/invalid parameter was passed.
- */
-#define DMA_STATUS_GOOD                        0
-#define DMA_STATUS_BAD_CHANNEL         1
-#define DMA_STATUS_BAD_HANDLE          2
-#define DMA_STATUS_BAD_MODE            3
-#define DMA_STATUS_NULL_POINTER                4
-#define DMA_STATUS_OUT_OF_MEMORY       5
-#define DMA_STATUS_SGL_LIST_EMPTY      6
-#define DMA_STATUS_GENERAL_ERROR       7
-#define DMA_STATUS_CHANNEL_NOTFREE     8
-
-#define DMA_CHANNEL_BUSY               0x80000000
-
-/*
- * These indicate status as returned from the DMA Status Register.
- */
-#define DMA_STATUS_NO_ERROR    0
-#define DMA_STATUS_CS          1       /* Count Status        */
-#define DMA_STATUS_TS          2       /* Transfer Status     */
-#define DMA_STATUS_DMA_ERROR   3       /* DMA Error Occurred  */
-#define DMA_STATUS_DMA_BUSY    4       /* The channel is busy */
-
-
-/*
- * DMA Channel Control Registers
- */
-
-#ifdef CONFIG_44x
-#define        PPC4xx_DMA_64BIT
-#define DMA_CR_OFFSET 1
-#else
-#define DMA_CR_OFFSET 0
-#endif
-
-#define DMA_CE_ENABLE        (1<<31)   /* DMA Channel Enable */
-#define SET_DMA_CE_ENABLE(x) (((x)&0x1)<<31)
-#define GET_DMA_CE_ENABLE(x) (((x)&DMA_CE_ENABLE)>>31)
-
-#define DMA_CIE_ENABLE        (1<<30)  /* DMA Channel Interrupt Enable */
-#define SET_DMA_CIE_ENABLE(x) (((x)&0x1)<<30)
-#define GET_DMA_CIE_ENABLE(x) (((x)&DMA_CIE_ENABLE)>>30)
-
-#define DMA_TD                (1<<29)
-#define SET_DMA_TD(x)         (((x)&0x1)<<29)
-#define GET_DMA_TD(x)         (((x)&DMA_TD)>>29)
-
-#define DMA_PL                (1<<28)  /* Peripheral Location */
-#define SET_DMA_PL(x)         (((x)&0x1)<<28)
-#define GET_DMA_PL(x)         (((x)&DMA_PL)>>28)
-
-#define EXTERNAL_PERIPHERAL    0
-#define INTERNAL_PERIPHERAL    1
-
-#define SET_DMA_PW(x)     (((x)&0x3)<<(26-DMA_CR_OFFSET))      /* Peripheral Width */
-#define DMA_PW_MASK       SET_DMA_PW(3)
-#define   PW_8                 0
-#define   PW_16                1
-#define   PW_32                2
-#define   PW_64                3
-/* FIXME: Add PW_128 support for 440GP DMA block */
-#define GET_DMA_PW(x)     (((x)&DMA_PW_MASK)>>(26-DMA_CR_OFFSET))
-
-#define DMA_DAI           (1<<(25-DMA_CR_OFFSET))      /* Destination Address Increment */
-#define SET_DMA_DAI(x)    (((x)&0x1)<<(25-DMA_CR_OFFSET))
-
-#define DMA_SAI           (1<<(24-DMA_CR_OFFSET))      /* Source Address Increment */
-#define SET_DMA_SAI(x)    (((x)&0x1)<<(24-DMA_CR_OFFSET))
-
-#define DMA_BEN           (1<<(23-DMA_CR_OFFSET))      /* Buffer Enable */
-#define SET_DMA_BEN(x)    (((x)&0x1)<<(23-DMA_CR_OFFSET))
-
-#define SET_DMA_TM(x)     (((x)&0x3)<<(21-DMA_CR_OFFSET))      /* Transfer Mode */
-#define DMA_TM_MASK       SET_DMA_TM(3)
-#define   TM_PERIPHERAL        0       /* Peripheral */
-#define   TM_RESERVED          1       /* Reserved */
-#define   TM_S_MM              2       /* Memory to Memory */
-#define   TM_D_MM              3       /* Device Paced Memory to Memory */
-#define GET_DMA_TM(x)     (((x)&DMA_TM_MASK)>>(21-DMA_CR_OFFSET))
-
-#define SET_DMA_PSC(x)    (((x)&0x3)<<(19-DMA_CR_OFFSET))      /* Peripheral Setup Cycles */
-#define DMA_PSC_MASK      SET_DMA_PSC(3)
-#define GET_DMA_PSC(x)    (((x)&DMA_PSC_MASK)>>(19-DMA_CR_OFFSET))
-
-#define SET_DMA_PWC(x)    (((x)&0x3F)<<(13-DMA_CR_OFFSET))     /* Peripheral Wait Cycles */
-#define DMA_PWC_MASK      SET_DMA_PWC(0x3F)
-#define GET_DMA_PWC(x)    (((x)&DMA_PWC_MASK)>>(13-DMA_CR_OFFSET))
-
-#define SET_DMA_PHC(x)    (((x)&0x7)<<(10-DMA_CR_OFFSET))      /* Peripheral Hold Cycles */
-#define DMA_PHC_MASK      SET_DMA_PHC(0x7)
-#define GET_DMA_PHC(x)    (((x)&DMA_PHC_MASK)>>(10-DMA_CR_OFFSET))
-
-#define DMA_ETD_OUTPUT     (1<<(9-DMA_CR_OFFSET))      /* EOT pin is a TC output */
-#define SET_DMA_ETD(x)     (((x)&0x1)<<(9-DMA_CR_OFFSET))
-
-#define DMA_TCE_ENABLE     (1<<(8-DMA_CR_OFFSET))
-#define SET_DMA_TCE(x)     (((x)&0x1)<<(8-DMA_CR_OFFSET))
-
-#define DMA_DEC            (1<<(2)     /* Address Decrement */
-#define SET_DMA_DEC(x)     (((x)&0x1)<<2)
-#define GET_DMA_DEC(x)     (((x)&DMA_DEC)>>2)
-
-/*
- * Transfer Modes
- * These modes are defined in a way that makes it possible to
- * simply "or" in the value in the control register.
- */
-
-#define DMA_MODE_MM            (SET_DMA_TM(TM_S_MM))   /* memory to memory */
-
-                               /* Device-paced memory to memory, */
-                               /* device is at source address    */
-#define DMA_MODE_MM_DEVATSRC   (DMA_TD | SET_DMA_TM(TM_D_MM))
-
-                               /* Device-paced memory to memory,      */
-                               /* device is at destination address    */
-#define DMA_MODE_MM_DEVATDST   (SET_DMA_TM(TM_D_MM))
-
-/* 405gp/440gp */
-#define SET_DMA_PREFETCH(x)   (((x)&0x3)<<(4-DMA_CR_OFFSET))   /* Memory Read Prefetch */
-#define DMA_PREFETCH_MASK      SET_DMA_PREFETCH(3)
-#define   PREFETCH_1           0       /* Prefetch 1 Double Word */
-#define   PREFETCH_2           1
-#define   PREFETCH_4           2
-#define GET_DMA_PREFETCH(x) (((x)&DMA_PREFETCH_MASK)>>(4-DMA_CR_OFFSET))
-
-#define DMA_PCE            (1<<(3-DMA_CR_OFFSET))      /* Parity Check Enable */
-#define SET_DMA_PCE(x)     (((x)&0x1)<<(3-DMA_CR_OFFSET))
-#define GET_DMA_PCE(x)     (((x)&DMA_PCE)>>(3-DMA_CR_OFFSET))
-
-/* stb3x */
-
-#define DMA_ECE_ENABLE (1<<5)
-#define SET_DMA_ECE(x) (((x)&0x1)<<5)
-#define GET_DMA_ECE(x) (((x)&DMA_ECE_ENABLE)>>5)
-
-#define DMA_TCD_DISABLE        (1<<4)
-#define SET_DMA_TCD(x) (((x)&0x1)<<4)
-#define GET_DMA_TCD(x) (((x)&DMA_TCD_DISABLE)>>4)
-
-typedef uint32_t sgl_handle_t;
-
-#ifdef CONFIG_PPC4xx_EDMA
-
-#define SGL_LIST_SIZE 4096
-#define DMA_PPC4xx_SIZE SGL_LIST_SIZE
-
-#define SET_DMA_PRIORITY(x)   (((x)&0x3)<<(6-DMA_CR_OFFSET))   /* DMA Channel Priority */
-#define DMA_PRIORITY_MASK SET_DMA_PRIORITY(3)
-#define PRIORITY_LOW           0
-#define PRIORITY_MID_LOW       1
-#define PRIORITY_MID_HIGH      2
-#define PRIORITY_HIGH          3
-#define GET_DMA_PRIORITY(x) (((x)&DMA_PRIORITY_MASK)>>(6-DMA_CR_OFFSET))
-
-/*
- * DMA Polarity Configuration Register
- */
-#define DMAReq_ActiveLow(chan) (1<<(31-(chan*3)))
-#define DMAAck_ActiveLow(chan) (1<<(30-(chan*3)))
-#define EOT_ActiveLow(chan)    (1<<(29-(chan*3)))      /* End of Transfer */
-
-/*
- * DMA Sleep Mode Register
- */
-#define SLEEP_MODE_ENABLE (1<<21)
-
-/*
- * DMA Status Register
- */
-#define DMA_CS0           (1<<31)      /* Terminal Count has been reached */
-#define DMA_CS1           (1<<30)
-#define DMA_CS2           (1<<29)
-#define DMA_CS3           (1<<28)
-
-#define DMA_TS0           (1<<27)      /* End of Transfer has been requested */
-#define DMA_TS1           (1<<26)
-#define DMA_TS2           (1<<25)
-#define DMA_TS3           (1<<24)
-
-#define DMA_CH0_ERR       (1<<23)      /* DMA Chanel 0 Error */
-#define DMA_CH1_ERR       (1<<22)
-#define DMA_CH2_ERR       (1<<21)
-#define DMA_CH3_ERR       (1<<20)
-
-#define DMA_IN_DMA_REQ0   (1<<19)      /* Internal DMA Request is pending */
-#define DMA_IN_DMA_REQ1   (1<<18)
-#define DMA_IN_DMA_REQ2   (1<<17)
-#define DMA_IN_DMA_REQ3   (1<<16)
-
-#define DMA_EXT_DMA_REQ0  (1<<15)      /* External DMA Request is pending */
-#define DMA_EXT_DMA_REQ1  (1<<14)
-#define DMA_EXT_DMA_REQ2  (1<<13)
-#define DMA_EXT_DMA_REQ3  (1<<12)
-
-#define DMA_CH0_BUSY      (1<<11)      /* DMA Channel 0 Busy */
-#define DMA_CH1_BUSY      (1<<10)
-#define DMA_CH2_BUSY       (1<<9)
-#define DMA_CH3_BUSY       (1<<8)
-
-#define DMA_SG0            (1<<7)      /* DMA Channel 0 Scatter/Gather in progress */
-#define DMA_SG1            (1<<6)
-#define DMA_SG2            (1<<5)
-#define DMA_SG3            (1<<4)
-
-/*
- * DMA SG Command Register
- */
-#define SSG_ENABLE(chan)       (1<<(31-chan))  /* Start Scatter Gather */
-#define SSG_MASK_ENABLE(chan)  (1<<(15-chan))  /* Enable writing to SSG0 bit */
-
-/*
- * DMA Scatter/Gather Descriptor Bit fields
- */
-#define SG_LINK            (1<<31)     /* Link */
-#define SG_TCI_ENABLE      (1<<29)     /* Enable Terminal Count Interrupt */
-#define SG_ETI_ENABLE      (1<<28)     /* Enable End of Transfer Interrupt */
-#define SG_ERI_ENABLE      (1<<27)     /* Enable Error Interrupt */
-#define SG_COUNT_MASK       0xFFFF     /* Count Field */
-
-#define SET_DMA_CONTROL \
-               (SET_DMA_CIE_ENABLE(p_init->int_enable) | /* interrupt enable         */ \
-               SET_DMA_BEN(p_init->buffer_enable)     | /* buffer enable            */\
-               SET_DMA_ETD(p_init->etd_output)        | /* end of transfer pin      */ \
-               SET_DMA_TCE(p_init->tce_enable)        | /* terminal count enable    */ \
-                SET_DMA_PL(p_init->pl)                 | /* peripheral location      */ \
-                SET_DMA_DAI(p_init->dai)               | /* dest addr increment      */ \
-                SET_DMA_SAI(p_init->sai)               | /* src addr increment       */ \
-                SET_DMA_PRIORITY(p_init->cp)           |  /* channel priority        */ \
-                SET_DMA_PW(p_init->pwidth)             |  /* peripheral/bus width    */ \
-                SET_DMA_PSC(p_init->psc)               |  /* peripheral setup cycles */ \
-                SET_DMA_PWC(p_init->pwc)               |  /* peripheral wait cycles  */ \
-                SET_DMA_PHC(p_init->phc)               |  /* peripheral hold cycles  */ \
-                SET_DMA_PREFETCH(p_init->pf)              /* read prefetch           */)
-
-#define GET_DMA_POLARITY(chan) (DMAReq_ActiveLow(chan) | DMAAck_ActiveLow(chan) | EOT_ActiveLow(chan))
-
-#elif defined(CONFIG_STBXXX_DMA)               /* stb03xxx */
-
-#define DMA_PPC4xx_SIZE        4096
-
-/*
- * DMA Status Register
- */
-
-#define SET_DMA_PRIORITY(x)   (((x)&0x00800001))       /* DMA Channel Priority */
-#define DMA_PRIORITY_MASK      0x00800001
-#define   PRIORITY_LOW                 0x00000000
-#define   PRIORITY_MID_LOW             0x00000001
-#define   PRIORITY_MID_HIGH            0x00800000
-#define   PRIORITY_HIGH                0x00800001
-#define GET_DMA_PRIORITY(x) (((((x)&DMA_PRIORITY_MASK) &0x00800000) >> 22 ) | (((x)&DMA_PRIORITY_MASK) &0x00000001))
-
-#define DMA_CS0           (1<<31)      /* Terminal Count has been reached */
-#define DMA_CS1           (1<<30)
-#define DMA_CS2           (1<<29)
-#define DMA_CS3           (1<<28)
-
-#define DMA_TS0           (1<<27)      /* End of Transfer has been requested */
-#define DMA_TS1           (1<<26)
-#define DMA_TS2           (1<<25)
-#define DMA_TS3           (1<<24)
-
-#define DMA_CH0_ERR       (1<<23)      /* DMA Chanel 0 Error */
-#define DMA_CH1_ERR       (1<<22)
-#define DMA_CH2_ERR       (1<<21)
-#define DMA_CH3_ERR       (1<<20)
-
-#define DMA_CT0                  (1<<19)       /* Chained transfere */
-
-#define DMA_IN_DMA_REQ0   (1<<18)      /* Internal DMA Request is pending */
-#define DMA_IN_DMA_REQ1   (1<<17)
-#define DMA_IN_DMA_REQ2   (1<<16)
-#define DMA_IN_DMA_REQ3   (1<<15)
-
-#define DMA_EXT_DMA_REQ0  (1<<14)      /* External DMA Request is pending */
-#define DMA_EXT_DMA_REQ1  (1<<13)
-#define DMA_EXT_DMA_REQ2  (1<<12)
-#define DMA_EXT_DMA_REQ3  (1<<11)
-
-#define DMA_CH0_BUSY      (1<<10)      /* DMA Channel 0 Busy */
-#define DMA_CH1_BUSY      (1<<9)
-#define DMA_CH2_BUSY       (1<<8)
-#define DMA_CH3_BUSY       (1<<7)
-
-#define DMA_CT1            (1<<6)      /* Chained transfere */
-#define DMA_CT2            (1<<5)
-#define DMA_CT3            (1<<4)
-
-#define DMA_CH_ENABLE (1<<7)
-#define SET_DMA_CH(x) (((x)&0x1)<<7)
-#define GET_DMA_CH(x) (((x)&DMA_CH_ENABLE)>>7)
-
-/* STBx25xxx dma unique */
-/* enable device port on a dma channel
- * example ext 0 on dma 1
- */
-
-#define        SSP0_RECV       15
-#define        SSP0_XMIT       14
-#define EXT_DMA_0      12
-#define        SC1_XMIT        11
-#define SC1_RECV       10
-#define EXT_DMA_2      9
-#define        EXT_DMA_3       8
-#define SERIAL2_XMIT   7
-#define SERIAL2_RECV   6
-#define SC0_XMIT       5
-#define        SC0_RECV        4
-#define        SERIAL1_XMIT    3
-#define SERIAL1_RECV   2
-#define        SERIAL0_XMIT    1
-#define SERIAL0_RECV   0
-
-#define DMA_CHAN_0     1
-#define DMA_CHAN_1     2
-#define DMA_CHAN_2     3
-#define DMA_CHAN_3     4
-
-/* end STBx25xx */
-
-/*
- * Bit 30 must be one for Redwoods, otherwise transfers may receive errors.
- */
-#define DMA_CR_MB0 0x2
-
-#define SET_DMA_CONTROL \
-                       (SET_DMA_CIE_ENABLE(p_init->int_enable) |  /* interrupt enable         */ \
-               SET_DMA_ETD(p_init->etd_output)        |  /* end of transfer pin      */ \
-               SET_DMA_TCE(p_init->tce_enable)        |  /* terminal count enable    */ \
-               SET_DMA_PL(p_init->pl)                 |  /* peripheral location      */ \
-               SET_DMA_DAI(p_init->dai)               |  /* dest addr increment      */ \
-               SET_DMA_SAI(p_init->sai)               |  /* src addr increment       */ \
-               SET_DMA_PRIORITY(p_init->cp)           |  /* channel priority        */  \
-               SET_DMA_PW(p_init->pwidth)             |  /* peripheral/bus width    */ \
-               SET_DMA_PSC(p_init->psc)               |  /* peripheral setup cycles */ \
-               SET_DMA_PWC(p_init->pwc)               |  /* peripheral wait cycles  */ \
-               SET_DMA_PHC(p_init->phc)               |  /* peripheral hold cycles  */ \
-               SET_DMA_TCD(p_init->tcd_disable)          |  /* TC chain mode disable   */ \
-               SET_DMA_ECE(p_init->ece_enable)   |  /* ECE chanin mode enable  */ \
-               SET_DMA_CH(p_init->ch_enable)   |    /* Chain enable            */ \
-               DMA_CR_MB0                              /* must be one */)
-
-#define GET_DMA_POLARITY(chan) chan
-
-#endif
-
-typedef struct {
-       unsigned short in_use;  /* set when channel is being used, clr when
-                                * available.
-                                */
-       /*
-        * Valid polarity settings:
-        *   DMAReq_ActiveLow(n)
-        *   DMAAck_ActiveLow(n)
-        *   EOT_ActiveLow(n)
-        *
-        *   n is 0 to max dma chans
-        */
-       unsigned int polarity;
-
-       char buffer_enable;     /* Boolean: buffer enable            */
-       char tce_enable;        /* Boolean: terminal count enable    */
-       char etd_output;        /* Boolean: eot pin is a tc output   */
-       char pce;               /* Boolean: parity check enable      */
-
-       /*
-        * Peripheral location:
-        * INTERNAL_PERIPHERAL (UART0 on the 405GP)
-        * EXTERNAL_PERIPHERAL
-        */
-       char pl;                /* internal/external peripheral      */
-
-       /*
-        * Valid pwidth settings:
-        *   PW_8
-        *   PW_16
-        *   PW_32
-        *   PW_64
-        */
-       unsigned int pwidth;
-
-       char dai;               /* Boolean: dst address increment   */
-       char sai;               /* Boolean: src address increment   */
-
-       /*
-        * Valid psc settings: 0-3
-        */
-       unsigned int psc;       /* Peripheral Setup Cycles         */
-
-       /*
-        * Valid pwc settings:
-        * 0-63
-        */
-       unsigned int pwc;       /* Peripheral Wait Cycles          */
-
-       /*
-        * Valid phc settings:
-        * 0-7
-        */
-       unsigned int phc;       /* Peripheral Hold Cycles          */
-
-       /*
-        * Valid cp (channel priority) settings:
-        *   PRIORITY_LOW
-        *   PRIORITY_MID_LOW
-        *   PRIORITY_MID_HIGH
-        *   PRIORITY_HIGH
-        */
-       unsigned int cp;        /* channel priority                */
-
-       /*
-        * Valid pf (memory read prefetch) settings:
-        *
-        *   PREFETCH_1
-        *   PREFETCH_2
-        *   PREFETCH_4
-        */
-       unsigned int pf;        /* memory read prefetch            */
-
-       /*
-        * Boolean: channel interrupt enable
-        * NOTE: for sgl transfers, only the last descriptor will be setup to
-        * interrupt.
-        */
-       char int_enable;
-
-       char shift;             /* easy access to byte_count shift, based on */
-       /* the width of the channel                  */
-
-       uint32_t control;       /* channel control word                      */
-
-       /* These variabled are used ONLY in single dma transfers              */
-       unsigned int mode;      /* transfer mode                     */
-       phys_addr_t addr;
-       char ce;                /* channel enable */
-#ifdef CONFIG_STB03xxx
-       char ch_enable;
-       char tcd_disable;
-       char ece_enable;
-       char td;                /* transfer direction */
-#endif
-
-} ppc_dma_ch_t;
-
-/*
- * PPC44x DMA implementations have a slightly different
- * descriptor layout.  Probably moved about due to the
- * change to 64-bit addresses and link pointer. I don't
- * know why they didn't just leave control_count after
- * the dst_addr.
- */
-#ifdef PPC4xx_DMA_64BIT
-typedef struct {
-       uint32_t control;
-       uint32_t control_count;
-       phys_addr_t src_addr;
-       phys_addr_t dst_addr;
-       phys_addr_t next;
-} ppc_sgl_t;
-#else
-typedef struct {
-       uint32_t control;
-       phys_addr_t src_addr;
-       phys_addr_t dst_addr;
-       uint32_t control_count;
-       uint32_t next;
-} ppc_sgl_t;
-#endif
-
-typedef struct {
-       unsigned int dmanr;
-       uint32_t control;       /* channel ctrl word; loaded from each descrptr */
-       uint32_t sgl_control;   /* LK, TCI, ETI, and ERI bits in sgl descriptor */
-       dma_addr_t dma_addr;    /* dma (physical) address of this list          */
-       ppc_sgl_t *phead;
-       dma_addr_t phead_dma;
-       ppc_sgl_t *ptail;
-       dma_addr_t ptail_dma;
-} sgl_list_info_t;
-
-typedef struct {
-       phys_addr_t *src_addr;
-       phys_addr_t *dst_addr;
-       phys_addr_t dma_src_addr;
-       phys_addr_t dma_dst_addr;
-} pci_alloc_desc_t;
-
-extern ppc_dma_ch_t dma_channels[];
-
-/*
- * The DMA API are in ppc4xx_dma.c and ppc4xx_sgdma.c
- */
-extern int ppc4xx_init_dma_channel(unsigned int, ppc_dma_ch_t *);
-extern int ppc4xx_get_channel_config(unsigned int, ppc_dma_ch_t *);
-extern int ppc4xx_set_channel_priority(unsigned int, unsigned int);
-extern unsigned int ppc4xx_get_peripheral_width(unsigned int);
-extern void ppc4xx_set_sg_addr(int, phys_addr_t);
-extern int ppc4xx_add_dma_sgl(sgl_handle_t, phys_addr_t, phys_addr_t, unsigned int);
-extern void ppc4xx_enable_dma_sgl(sgl_handle_t);
-extern void ppc4xx_disable_dma_sgl(sgl_handle_t);
-extern int ppc4xx_get_dma_sgl_residue(sgl_handle_t, phys_addr_t *, phys_addr_t *);
-extern int ppc4xx_delete_dma_sgl_element(sgl_handle_t, phys_addr_t *, phys_addr_t *);
-extern int ppc4xx_alloc_dma_handle(sgl_handle_t *, unsigned int, unsigned int);
-extern void ppc4xx_free_dma_handle(sgl_handle_t);
-extern int ppc4xx_get_dma_status(void);
-extern void ppc4xx_set_src_addr(int dmanr, phys_addr_t src_addr);
-extern void ppc4xx_set_dst_addr(int dmanr, phys_addr_t dst_addr);
-extern void ppc4xx_enable_dma(unsigned int dmanr);
-extern void ppc4xx_disable_dma(unsigned int dmanr);
-extern void ppc4xx_set_dma_count(unsigned int dmanr, unsigned int count);
-extern int ppc4xx_get_dma_residue(unsigned int dmanr);
-extern void ppc4xx_set_dma_addr2(unsigned int dmanr, phys_addr_t src_dma_addr,
-                                phys_addr_t dst_dma_addr);
-extern int ppc4xx_enable_dma_interrupt(unsigned int dmanr);
-extern int ppc4xx_disable_dma_interrupt(unsigned int dmanr);
-extern int ppc4xx_clr_dma_status(unsigned int dmanr);
-extern int ppc4xx_map_dma_port(unsigned int dmanr, unsigned int ocp_dma,short dma_chan);
-extern int ppc4xx_disable_dma_port(unsigned int dmanr, unsigned int ocp_dma,short dma_chan);
-extern int ppc4xx_set_dma_mode(unsigned int dmanr, unsigned int mode);
-
-/* These are in kernel/dma.c: */
-
-/* reserve a DMA channel */
-extern int request_dma(unsigned int dmanr, const char *device_id);
-/* release it again */
-extern void free_dma(unsigned int dmanr);
-#endif
-#endif                         /* __KERNEL__ */
diff --git a/include/asm-ppc64/cpumask.h b/include/asm-ppc64/cpumask.h
deleted file mode 100644 (file)
index 0914511..0000000
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef _ASM_PPC64_CPUMASK_H
-#define _ASM_PPC64_CPUMASK_H
-
-#include <asm-generic/cpumask.h>
-
-#endif /* _ASM_PPC64_CPUMASK_H */
diff --git a/include/asm-ppc64/hvcserver.h b/include/asm-ppc64/hvcserver.h
deleted file mode 100644 (file)
index cee9a14..0000000
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * hvcserver.h
- * Copyright (C) 2004 Ryan S Arnold, IBM Corporation
- *
- * PPC64 virtual I/O console server support.
- *
- * 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
- */
-
-#ifndef _PPC64_HVCSERVER_H
-#define _PPC64_HVCSERVER_H
-
-#include <linux/list.h>
-
-/* Converged Location Code length */
-#define HVCS_CLC_LENGTH        79
-
-struct hvcs_partner_info {
-       struct list_head node;
-       unsigned int unit_address;
-       unsigned int partition_ID;
-       char location_code[HVCS_CLC_LENGTH + 1]; /* CLC + 1 null-term char */
-};
-
-extern int hvcs_free_partner_info(struct list_head *head);
-extern int hvcs_get_partner_info(unsigned int unit_address,
-               struct list_head *head, unsigned long *pi_buff);
-extern int hvcs_register_connection(unsigned int unit_address,
-               unsigned int p_partition_ID, unsigned int p_unit_address);
-extern int hvcs_free_connection(unsigned int unit_address);
-
-#endif /* _PPC64_HVCSERVER_H */
diff --git a/include/asm-ppc64/init.h b/include/asm-ppc64/init.h
deleted file mode 100644 (file)
index 17d2155..0000000
+++ /dev/null
@@ -1 +0,0 @@
-#error "<asm/init.h> should never be used - use <linux/init.h> instead"
diff --git a/include/asm-s390/cpumask.h b/include/asm-s390/cpumask.h
deleted file mode 100644 (file)
index 4deef16..0000000
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef _ASM_S390_CPUMASK_H
-#define _ASM_S390_CPUMASK_H
-
-#include <asm-generic/cpumask.h>
-
-#endif /* _ASM_S390_CPUMASK_H */
diff --git a/include/asm-s390/init.h b/include/asm-s390/init.h
deleted file mode 100644 (file)
index 16fcb9a..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-/*
- *  include/asm-s390/init.h
- *
- *  S390 version
- */
-
-#error "<asm/init.h> should never be used - use <linux/init.h> instead"
diff --git a/include/asm-sh/cpumask.h b/include/asm-sh/cpumask.h
deleted file mode 100644 (file)
index deaf3bb..0000000
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef _ASM_SH_CPUMASK_H
-#define _ASM_SH_CPUMASK_H
-
-#include <asm-generic/cpumask.h>
-
-#endif /* _ASM_SH_CPUMASK_H */
diff --git a/include/asm-sh/init.h b/include/asm-sh/init.h
deleted file mode 100644 (file)
index 17d2155..0000000
+++ /dev/null
@@ -1 +0,0 @@
-#error "<asm/init.h> should never be used - use <linux/init.h> instead"
diff --git a/include/asm-sparc/cpumask.h b/include/asm-sparc/cpumask.h
deleted file mode 100644 (file)
index 272f31d..0000000
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef _ASM_SPARC_CPUMASK_H
-#define _ASM_SPARC_CPUMASK_H
-
-#include <asm-generic/cpumask.h>
-
-#endif /* _ASM_SPARC_CPUMASK_H */
diff --git a/include/asm-sparc/init.h b/include/asm-sparc/init.h
deleted file mode 100644 (file)
index 17d2155..0000000
+++ /dev/null
@@ -1 +0,0 @@
-#error "<asm/init.h> should never be used - use <linux/init.h> instead"
diff --git a/include/asm-sparc64/cpumask.h b/include/asm-sparc64/cpumask.h
deleted file mode 100644 (file)
index ee60cae..0000000
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef _ASM_SPARC64_CPUMASK_H
-#define _ASM_SPARC64_CPUMASK_H
-
-#include <asm-generic/cpumask.h>
-
-#endif /* _ASM_SPARC64_CPUMASK_H */
diff --git a/include/asm-sparc64/init.h b/include/asm-sparc64/init.h
deleted file mode 100644 (file)
index 17d2155..0000000
+++ /dev/null
@@ -1 +0,0 @@
-#error "<asm/init.h> should never be used - use <linux/init.h> instead"
diff --git a/include/asm-um/cpufeature.h b/include/asm-um/cpufeature.h
deleted file mode 100644 (file)
index fb7bd42..0000000
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef __UM_CPUFEATURE_H
-#define __UM_CPUFEATURE_H
-
-#include "asm/arch/cpufeature.h"
-
-#endif
diff --git a/include/asm-um/cpumask.h b/include/asm-um/cpumask.h
deleted file mode 100644 (file)
index 90f0d00..0000000
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef _ASM_UM_CPUMASK_H
-#define _ASM_UM_CPUMASK_H
-
-#include <asm-generic/cpumask.h>
-
-#endif /* _ASM_UM_CPUMASK_H */
diff --git a/include/asm-um/init.h b/include/asm-um/init.h
deleted file mode 100644 (file)
index 1e271ca..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
-#ifndef _UM_INIT_H
-#define _UM_INIT_H
-
-#ifdef notdef
-#define __init
-#define __initdata
-#define __initfunc(__arginit) __arginit
-#define __cacheline_aligned 
-#endif
-
-#endif
diff --git a/include/asm-um/local.h b/include/asm-um/local.h
deleted file mode 100644 (file)
index 9a280c5..0000000
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef __UM_LOCAL_H
-#define __UM_LOCAL_H
-
-#include "asm/arch/local.h"
-
-#endif
diff --git a/include/asm-um/module-generic.h b/include/asm-um/module-generic.h
deleted file mode 100644 (file)
index 5a265f5..0000000
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef __UM_MODULE_GENERIC_H
-#define __UM_MODULE_GENERIC_H
-
-#include "asm/arch/module.h"
-
-#endif
diff --git a/include/asm-um/sections.h b/include/asm-um/sections.h
deleted file mode 100644 (file)
index 6b0231e..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-#ifndef _UM_SECTIONS_H
-#define _UM_SECTIONS_H
-
-/* nothing to see, move along */
-#include <asm-generic/sections.h>
-
-#endif
diff --git a/include/asm-v850/cpumask.h b/include/asm-v850/cpumask.h
deleted file mode 100644 (file)
index 09aebd0..0000000
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef _ASM_V850_CPUMASK_H
-#define _ASM_V850_CPUMASK_H
-
-#include <asm-generic/cpumask.h>
-
-#endif /* _ASM_V850_CPUMASK_H */
diff --git a/include/asm-x86_64/cpumask.h b/include/asm-x86_64/cpumask.h
deleted file mode 100644 (file)
index d9ea497..0000000
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef _ASM_X86_64_CPUMASK_H
-#define _ASM_X86_64_CPUMASK_H
-
-#include <asm-generic/cpumask.h>
-
-#endif /* _ASM_X86_64_CPUMASK_H */
diff --git a/include/asm-x86_64/init.h b/include/asm-x86_64/init.h
deleted file mode 100644 (file)
index 17d2155..0000000
+++ /dev/null
@@ -1 +0,0 @@
-#error "<asm/init.h> should never be used - use <linux/init.h> instead"
diff --git a/include/linux/802_11.h b/include/linux/802_11.h
deleted file mode 100644 (file)
index bd5196c..0000000
+++ /dev/null
@@ -1,191 +0,0 @@
-#ifndef IEEE_802_11
-#define IEEE_802_11  
-
-#include <linux/types.h>
-
-enum ieee_802_11_link_status_failure_reason {
-       reserved0, Unspecified=1, Previous_not_valid, 
-       Sender_Quits_ESS_or_IBSS,
-       Due_Inactivity, AP_Overload, 
-       Class_2_from_NonAuth,
-       Class_3_from_NonAuth,
-       Sender_Quits_BSS,
-       Association_requester_not_authenticated,
-       Reserved10 
-};
-       
-       
-#define IEEE_802_11_LINK_STATUS_FAILURE_REASON_STRINGS \
-{      \
-        {reserved0,            0xff," Reserved reason "},\
-        {Unspecified,          0xff," Unspecified Reason "},\
-        {Previous_not_valid,   0xff," Previous Authentication no longer valid "},\
-        {Sender_Quits_ESS_or_IBSS,0xff," Deauthenticated because sending station is leaving (has left) IBSS or ESS "},\
-        {Due_Inactivity,       0xff," Disassociated due to inactivity "},\
-        {AP_Overload,          0xff," Disassociated because AP is unable to handle all currently associated stations "},\
-        {Class_2_from_NonAuth, 0xff," Class 2 frame received from non-Authenticated station"},\
-        {Class_3_from_NonAuth, 0xff," Class 3 frame received from non­Associated station"},\
-        {Sender_Quits_BSS,     0xff," Disassociated because sending station is leaving (has left) BSS"},\
-        {Association_requester_not_authenticated,0xff," Station requesting (Re)Association is not Authenticated with responding station"},\
-        {Reserved10,           0xff," Reserved"},\
-       {0,0,NULL}\
-};
-
-
-
-struct ieee_802_11_header {
-       u16     frame_control;// needs to be subtyped
-       u16     duration;
-       u8      mac1[6];
-       u8      mac2[6];
-       u8      mac3[6];
-       u16     SeqCtl;
-       u8      mac4[6];
-       u16     gapLen;
-       u8      gap[8];
-};
-
-
-struct ieee_802_3_header {
-
-       u16     status;
-       u16     payload_length;
-       u8      dst_mac[6];
-       u8      src_mac[6];
-       
-};
-
-#define P80211_OUI_LEN 3
-
-struct ieee_802_11_snap_header { 
-
-       u8    dsap;   /* always 0xAA */
-       u8    ssap;   /* always 0xAA */
-       u8    ctrl;   /* always 0x03 */
-       u8    oui[P80211_OUI_LEN];    /* organizational universal id */
-
-} __attribute__ ((packed));
-
-#define P80211_LLC_OUI_LEN 3
-
-struct ieee_802_11_802_1H_header {
-
-       u8    dsap;   
-       u8    ssap;   /* always 0xAA */
-       u8    ctrl;   /* always 0x03 */
-       u8    oui[P80211_OUI_LEN];    /* organizational universal id */
-       u16    unknown1;      /* packet type ID fields */
-       u16    unknown2;                /* here is something like length in some cases */
-} __attribute__ ((packed));
-
-struct ieee_802_11_802_2_header {
-
-       u8    dsap;   
-       u8    ssap;   /* always 0xAA */
-       u8    ctrl;   /* always 0x03 */
-       u8    oui[P80211_OUI_LEN];    /* organizational universal id */
-       u8    type;      /* packet type ID field. i guess,  */
-
-} __attribute__ ((packed));
-
-
-
-// following is incoplete and may be incorrect and need reorganization
-
-#define ieee_802_11_frame_type_Management      0x00
-#define ieee_802_11_frame_type_Control         0x01
-#define ieee_802_11_frame_type_Data            0x10
-#define ieee_802_11_frame_type_Reserved                0x11
-
-#define ieee_802_11_frame_subtype_Association_Req      0x0 // Association Request
-#define ieee_802_11_frame_subtype_Association_Resp     0x1 // Association Response
-#define ieee_802_11_frame_subtype_Reassociation_Req    0x2 // Reassociation Request
-#define ieee_802_11_frame_subtype_Reassociation_Resp   0x3 // Reassociation Response
-#define ieee_802_11_frame_subtype_Probe_Req            0x4 // Probe Request
-#define ieee_802_11_frame_subtype_Probe_Resp           0x5 // Probe Response
-#define ieee_802_11_frame_subtype_Beacon               0x8 // Beacon
-#define ieee_802_11_frame_subtype_ATIM                         0x9 // ATIM
-#define ieee_802_11_frame_subtype_Disassociation       0xA // Disassociation
-#define ieee_802_11_frame_subtype_Authentication       0xB // Authentication
-#define ieee_802_11_frame_subtype_Deauthentication     0xC // Deauthentication
-#define ieee_802_11_frame_subtype_PS_Poll              0xA // PS-Poll
-#define ieee_802_11_frame_subtype_RTS                  0xB // RTS
-#define ieee_802_11_frame_subtype_CTS                  0xC // CTS
-#define ieee_802_11_frame_subtype_ACK                  0xD // ACK
-#define ieee_802_11_frame_subtype_CFEnd                0xE // CF-End
-#define ieee_802_11_frame_subtype_CFEnd_CFAck          0xF // CF-End + CF-Ack
-#define ieee_802_11_frame_subtype_Data                         0x0 // Data
-#define ieee_802_11_frame_subtype_Data_CFAck           0x1 // Data + CF-Ack
-#define ieee_802_11_frame_subtype_Data_CF_Poll                 0x2 // Data + CF-Poll
-#define ieee_802_11_frame_subtype_Data_CF_AckCF_Poll   0x3 // Data + CF-Ack + CF-Poll
-#define ieee_802_11_frame_subtype_NullFunction                 0x4 // Null Function (no data)
-#define ieee_802_11_frame_subtype_CF_Ack               0x5 // CF-Ack (no data)
-#define ieee_802_11_frame_subtype_CF_Poll              0x6 // CF-Poll (no data)
-#define ieee_802_11_frame_subtype_CF_AckCF_Poll        0x7 // CF-Ack + CF-Poll (no data)
-
-
-#define ieee_802_11_frame_subtype_strings {\
-       { ieee_802_11_frame_subtype_Association_Req,    0xF,"f  Association Request"},\
-       { ieee_802_11_frame_subtype_Association_Resp,   0xF,"1  Association Response"},\
-       { ieee_802_11_frame_subtype_Reassociation_Req,  0xF,"2  Reassociation Request"},\
-       { ieee_802_11_frame_subtype_Reassociation_Resp, 0xF,"3  Reassociation Response"},\
-       { ieee_802_11_frame_subtype_Probe_Req   ,       0xF,"4  Probe Request"},\
-       { ieee_802_11_frame_subtype_Probe_Resp  ,       0xF,"5  Probe Response"},\
-       { ieee_802_11_frame_subtype_Beacon      ,       0xF,"8  Beacon"},\
-       { ieee_802_11_frame_subtype_ATIM        ,       0xF,"9  ATIM"},\
-       { ieee_802_11_frame_subtype_Disassociation,     0xF,"A  Disassociation"},\
-       { ieee_802_11_frame_subtype_Authentication,     0xF,"B  Authentication"},\
-       { ieee_802_11_frame_subtype_Deauthentication,   0xF,"C  Deauthentication"},\
-       { ieee_802_11_frame_subtype_PS_Poll     ,       0xF,"A  PS-Poll"},\
-       { ieee_802_11_frame_subtype_RTS         ,       0xF,"B  RTS"},\
-       { ieee_802_11_frame_subtype_CTS         ,       0xF,"C  CTS"},\
-       { ieee_802_11_frame_subtype_ACK         ,       0xF,"D  ACK"},\
-       { ieee_802_11_frame_subtype_CFEnd       ,       0xF,"E  CF-End"},\
-       { ieee_802_11_frame_subtype_CFEnd_CFAck ,       0xF,"F  CF-End + CF-Ack"},\
-       { ieee_802_11_frame_subtype_Data        ,       0xF,"0  Data"},\
-       { ieee_802_11_frame_subtype_Data_CFAck  ,       0xF,"1  Data + CF-Ack"},\
-       { ieee_802_11_frame_subtype_Data_CFPoll ,       0xF,"2  Data + CF-Poll"},\
-       { ieee_802_11_frame_subtype_Data_CFAck_CFPoll,  0xF,"3  Data + CF-Ack + CF-Poll"},\
-       { ieee_802_11_frame_subtype_Null_Function ,     0xF,"4  Null Function (no data)"},\
-       { ieee_802_11_frame_subtype_CFAck ,             0xF,"5  CF-Ack (no data)"},\
-       { ieee_802_11_frame_subtype_CFPoll ,            0xF,"6  CF-Poll (no data)"},\
-       { ieee_802_11_frame_subtype_CFAck_CFPoll,       0xF,"y7  CF-Ack + CF-Poll (no data)"},\
-       { 0,0,NULL}\
-}
-struct ieee_802_11_frame_subtype_class {
-       u8      subtype;
-       u8      mask;
-       u8      class;
-       u8      type;
-};
-#define ieee_802_11_frame_subtype_classes {\
-       { ieee_802_11_frame_subtype_Association_Req,    0xF,2,ieee_802_11_frame_type_Management},\
-       { ieee_802_11_frame_subtype_Association_Resp,   0xF,2,ieee_802_11_frame_type_Management},\
-       { ieee_802_11_frame_subtype_Reassociation_Req,  0xF,2,ieee_802_11_frame_type_Management},\
-       { ieee_802_11_frame_subtype_Reassociation_Resp, 0xF,2,ieee_802_11_frame_type_Management},\
-       { ieee_802_11_frame_subtype_Probe_Req   ,       0xF,1,ieee_802_11_frame_type_Management},\
-       { ieee_802_11_frame_subtype_Probe_Resp  ,       0xF,1,ieee_802_11_frame_type_Management},\
-       { ieee_802_11_frame_subtype_Beacon      ,       0xF,1,ieee_802_11_frame_type_Management},\
-       { ieee_802_11_frame_subtype_ATIM        ,       0xF,1,ieee_802_11_frame_type_Management},\
-       { ieee_802_11_frame_subtype_Disassociation,     0xF,2,ieee_802_11_frame_type_Management},\
-       { ieee_802_11_frame_subtype_Authentication,     0xF,1,ieee_802_11_frame_type_Management},\
-       { ieee_802_11_frame_subtype_Deauthentication,   0xF,3,ieee_802_11_frame_type_Management},\
-       { ieee_802_11_frame_subtype_PS-Poll     ,       0xF,3,ieee_802_11_frame_type_Control},\
-       { ieee_802_11_frame_subtype_RTS         ,       0xF,1,ieee_802_11_frame_type_Control},\
-       { ieee_802_11_frame_subtype_CTS         ,       0xF,1,ieee_802_11_frame_type_Control},\
-       { ieee_802_11_frame_subtype_ACK         ,       0xF,1,ieee_802_11_frame_type_Control},\
-       { ieee_802_11_frame_subtype_CFEnd       ,       0xF,1,ieee_802_11_frame_type_Control},\
-       { ieee_802_11_frame_subtype_CFEnd_CFAck ,       0xF,1,ieee_802_11_frame_type_Control},\
-       { ieee_802_11_frame_subtype_Data        ,       0xF,3,ieee_802_11_frame_type_Data},\
-       { ieee_802_11_frame_subtype_Data_CFAck  ,       0xF,3,ieee_802_11_frame_type_Data},\
-       { ieee_802_11_frame_subtype_Data_CF_Poll        0xF,3,ieee_802_11_frame_type_Data},\
-       { ieee_802_11_frame_subtype_Data_CF_AckCF_Poll, 0xF,3,ieee_802_11_frame_type_Data},\
-       { ieee_802_11_frame_subtype_NullFunction        0xF,1,ieee_802_11_frame_type_Data},\
-       { ieee_802_11_frame_subtype_CF_Ack ,            0xF,1,ieee_802_11_frame_type_Data},\
-       { ieee_802_11_frame_subtype_CF_Poll ,           0xF,1,ieee_802_11_frame_type_Data},\
-       { ieee_802_11_frame_subtype_CF_AckCF_Poll,      0xF,1,ieee_802_11_frame_type_Data},\
-       { 0,0,NULL}\
-}
-
-
-#endif
diff --git a/include/linux/acpi_serial.h b/include/linux/acpi_serial.h
deleted file mode 100644 (file)
index e4b87c5..0000000
+++ /dev/null
@@ -1,107 +0,0 @@
-/*
- *  linux/include/linux/acpi_serial.h
- *
- *  Copyright (C) 2000  Hewlett-Packard Co.
- *  Copyright (C) 2000  Khalid Aziz <khalid_aziz@hp.com>
- *
- *  Definitions for ACPI defined serial ports (headless console and 
- *  debug ports)
- *
- */
-
-#include <linux/serial.h>
-
-extern void setup_serial_acpi(void *);
-
-#define ACPI_SIG_LEN           4
-
-/* ACPI table signatures */
-#define ACPI_SPCRT_SIGNATURE   "SPCR"
-#define ACPI_DBGPT_SIGNATURE   "DBGP"
-
-/* Interface type as defined in ACPI serial port tables */
-#define ACPI_SERIAL_INTFC_16550        0
-#define ACPI_SERIAL_INTFC_16450        1
-
-/* Interrupt types for ACPI serial port tables */
-#define ACPI_SERIAL_INT_PCAT   0x01
-#define ACPI_SERIAL_INT_APIC   0x02
-#define ACPI_SERIAL_INT_SAPIC  0x04
-
-/* Baud rates as defined in ACPI serial port tables */
-#define ACPI_SERIAL_BAUD_9600          3
-#define ACPI_SERIAL_BAUD_19200         4
-#define ACPI_SERIAL_BAUD_57600         6
-#define ACPI_SERIAL_BAUD_115200                7
-
-/* Parity as defined in ACPI serial port tables */
-#define ACPI_SERIAL_PARITY_NONE                0
-
-/* Flow control methods as defined in ACPI serial port tables */
-#define ACPI_SERIAL_FLOW_DCD   0x01
-#define ACPI_SERIAL_FLOW_RTS   0x02
-#define ACPI_SERIAL_FLOW_XON   0x04
-
-/* Terminal types as defined in ACPI serial port tables */
-#define ACPI_SERIAL_TERM_VT100         0
-#define ACPI_SERIAL_TERM_VT100X        1
-
-/* PCI Flags as defined by SPCR table */
-#define ACPI_SERIAL_PCIFLAG_PNP        0x00000001
-
-/* Space ID as defined in base address structure in ACPI serial port tables */
-#define ACPI_SERIAL_MEM_SPACE          0
-#define ACPI_SERIAL_IO_SPACE           1
-#define ACPI_SERIAL_PCICONF_SPACE      2
-
-/* 
- * Generic Register Address Structure - as defined by Microsoft 
- * in http://www.microsoft.com/hwdev/onnow/download/LFreeACPI.doc
- *
-*/
-typedef struct {
-       u8  space_id;
-       u8  bit_width;
-       u8  bit_offset;
-       u8  resv;
-       u32 addrl;
-       u32 addrh;
-} gen_regaddr;
-
-/* Space ID for generic register address structure */
-#define REGADDR_SPACE_SYSMEM   0
-#define REGADDR_SPACE_SYSIO    1
-#define REGADDR_SPACE_PCICONFIG        2
-
-/* Serial Port Console Redirection and Debug Port Table formats */
-typedef struct {
-       u8 signature[4];
-       u32 length;
-       u8  rev;
-       u8  chksum;
-       u8  oemid[6];
-       u8  oem_tabid[8];
-       u32 oem_rev;
-       u8  creator_id[4];
-       u32 creator_rev;
-       u8  intfc_type;
-       u8  resv1[3];
-       gen_regaddr base_addr;
-       u8  int_type;
-       u8  irq;
-       u8  global_int[4];
-       u8  baud;
-       u8  parity;
-       u8  stop_bits;
-       u8  flow_ctrl;
-       u8  termtype;
-       u8  language;
-       u16 pci_dev_id;
-       u16 pci_vendor_id;
-       u8  pci_bus;
-       u8  pci_dev;
-       u8  pci_func;
-       u8  pci_flags[4];
-       u8  pci_seg;
-       u32 resv2;
-} acpi_ser_t;
diff --git a/include/linux/adb_mouse.h b/include/linux/adb_mouse.h
deleted file mode 100644 (file)
index 8791780..0000000
+++ /dev/null
@@ -1,23 +0,0 @@
-#ifndef _LINUX_ADB_MOUSE_H
-#define _LINUX_ADB_MOUSE_H
-
-/*
- * linux/include/linux/mac_mouse.h
- * header file for Macintosh ADB mouse driver
- * 27-10-97 Michael Schmitz
- * copied from:
- * header file for Atari Mouse driver
- * by Robert de Vries (robert@and.nl) on 19Jul93
- */
-
-struct mouse_status {
-       char            buttons;
-       short           dx;
-       short           dy;
-       int             ready;
-       int             active;
-       struct wait_queue *wait;
-       struct fasync_struct *fasyncptr;
-};
-
-#endif
diff --git a/include/linux/atapi.h b/include/linux/atapi.h
deleted file mode 100644 (file)
index 806aa4e..0000000
+++ /dev/null
@@ -1,370 +0,0 @@
-/**** vi:set ts=8 sts=8 sw=8:************************************************
- *
- * Copyright (C) 2002 Marcin Dalecki <martin@dalecki.de>
- *
- * 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.
- *
- * 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.
- */
-
-#include <linux/types.h>
-#include <asm/byteorder.h>
-
-/*
- * With each packet command, we allocate a buffer.
- * This is used for several packet
- * commands (Not for READ/WRITE commands).
- */
-#define IDEFLOPPY_PC_BUFFER_SIZE       256
-#define IDETAPE_PC_BUFFER_SIZE         256
-
-/*
- * Packet flags bits.
- */
-
-#define        PC_ABORT                0       /* set when an error is considered normal - we won't retry */
-#define PC_WAIT_FOR_DSC                1       /* 1 when polling for DSC on a media access command */
-#define PC_DMA_RECOMMENDED     2       /* 1 when we prefer to use DMA if possible */
-#define        PC_DMA_IN_PROGRESS      3       /* 1 while DMA in progress */
-#define        PC_DMA_ERROR            4       /* 1 when encountered problem during DMA */
-#define        PC_WRITING              5       /* data direction */
-#define        PC_SUPPRESS_ERROR       6       /* suppress error reporting */
-#define PC_TRANSFORM           7       /* transform SCSI commands */
-
-/* This struct get's shared between different drivers.
- */
-struct atapi_packet_command {
-       u8 c[12];                       /* Actual packet bytes */
-       char *buffer;                   /* Data buffer */
-       int buffer_size;                /* Size of our data buffer */
-       char *current_position;         /* Pointer into the above buffer */
-       int request_transfer;           /* Bytes to transfer */
-       int actually_transferred;       /* Bytes actually transferred */
-
-       unsigned long flags;            /* Status/Action bit flags: long for set_bit */
-
-       /* FIXME: the following is ugly as hell, but the only way we can start
-        * actually to unify the code.
-        */
-       /* driver specific data. */
-       /* floppy/tape */
-       int retries;                            /* On each retry, we increment retries */
-       int error;                              /* Error code */
-       char *b_data;                           /* Pointer which runs on the buffers */
-       unsigned int b_count;                   /* Missing/Available data on the current buffer */
-       u8 pc_buffer[IDEFLOPPY_PC_BUFFER_SIZE]; /* Temporary buffer */
-       /* Called when this packet command is completed */
-       void (*callback) (struct ata_device *, struct request *);
-
-       /* only tape */
-       struct bio *bio;
-
-       /* only scsi */
-       struct {
-               unsigned int b_count;                   /* Bytes transferred from current entry */
-               struct scatterlist *sg;                 /* Scatter gather table */
-               struct scsi_cmnd *scsi_cmd;             /* SCSI command */
-               void (*done)(struct scsi_cmnd *);       /* Scsi completion routine */
-               unsigned long timeout;                  /* Command timeout */
-       } s;
-};
-
-/*
- *     ATAPI Status Register.
- */
-typedef union {
-       u8 all                  : 8;
-       struct {
-#if defined(__LITTLE_ENDIAN_BITFIELD)
-               u8 check        : 1;    /* Error occurred */
-               u8 idx          : 1;    /* Reserved */
-               u8 corr         : 1;    /* Correctable error occurred */
-               u8 drq          : 1;    /* Data is request by the device */
-               u8 dsc          : 1;    /* Media access command finished / Buffer availability */
-               u8 reserved5    : 1;    /* Reserved */
-               u8 drdy         : 1;    /* Ignored for ATAPI commands (ready to accept ATA command) */
-               u8 bsy          : 1;    /* The device has access to the command block */
-#elif defined(__BIG_ENDIAN_BITFIELD)
-               u8 bsy          : 1;
-               u8 drdy         : 1;
-               u8 reserved5    : 1;
-               u8 dsc          : 1;
-               u8 drq          : 1;
-               u8 corr         : 1;
-               u8 idx          : 1;
-               u8 check        : 1;
-#else
-#error "Please fix <asm/byteorder.h>"
-#endif
-       } b;
-} atapi_status_reg_t;
-
-/*
- *     ATAPI error register.
- */
-typedef union {
-       u8 all                  : 8;
-       struct {
-#if defined(__LITTLE_ENDIAN_BITFIELD)
-               u8 ili          : 1;    /* Illegal Length Indication */
-               u8 eom          : 1;    /* End Of Media Detected */
-               u8 abrt         : 1;    /* Aborted command - As defined by ATA */
-               u8 mcr          : 1;    /* Media Change Requested - As defined by ATA */
-               u8 sense_key    : 4;    /* Sense key of the last failed packet command */
-#elif defined(__BIG_ENDIAN_BITFIELD)
-               u8 sense_key    : 4;
-               u8 mcr          : 1;
-               u8 abrt         : 1;
-               u8 eom          : 1;
-               u8 ili          : 1;
-#else
-#error "Please fix <asm/byteorder.h>"
-#endif
-       } b;
-} atapi_error_reg_t;
-
-/* Currently unused, but please do not remove.  --bkz */
-/*
- *     ATAPI Feature Register.
- */
-typedef union {
-       u8 all                  : 8;
-       struct {
-#if defined(__LITTLE_ENDIAN_BITFIELD)
-               u8 dma          : 1;    /* Using DMA or PIO */
-               u8 reserved321  : 3;    /* Reserved */
-               u8 reserved654  : 3;    /* Reserved (Tag Type) */
-               u8 reserved7    : 1;    /* Reserved */
-#elif defined(__BIG_ENDIAN_BITFIELD)
-               u8 reserved7    : 1;
-               u8 reserved654  : 3;
-               u8 reserved321  : 3;
-               u8 dma          : 1;
-#else
-#error "Please fix <asm/byteorder.h>"
-#endif
-       } b;
-} atapi_feature_reg_t;
-
-/*
- *     ATAPI Byte Count Register.
- */
-typedef union {
-       u16 all                 : 16;
-       struct {
-#if defined(__LITTLE_ENDIAN_BITFIELD)
-               u8 low;                 /* LSB */
-               u8 high;                /* MSB */
-#elif defined(__BIG_ENDIAN_BITFIELD)
-               u8 high;
-               u8 low;
-#else
-#error "Please fix <asm/byteorder.h>"
-#endif
-       } b;
-} atapi_bcount_reg_t;
-
-/*
- *     ATAPI Interrupt Reason Register.
- */
-typedef union {
-       u8 all                  : 8;
-       struct {
-#if defined(__LITTLE_ENDIAN_BITFIELD)
-               u8 cod          : 1;    /* Information transferred is command (1) or data (0) */
-               u8 io           : 1;    /* The device requests us to read (1) or write (0) */
-               u8 reserved     : 6;    /* Reserved */
-#elif defined(__BIG_ENDIAN_BITFIELD)
-               u8 reserved     : 6;
-               u8 io           : 1;
-               u8 cod          : 1;
-#else
-#error "Please fix <asm/byteorder.h>"
-#endif
-       } b;
-} atapi_ireason_reg_t;
-
-/* Currently unused, but please do not remove.  --bkz */
-/*
- *     ATAPI Drive Select Register.
- */
-typedef union {
-       u8 all                  :8;
-       struct {
-#if defined(__LITTLE_ENDIAN_BITFIELD)
-               u8 sam_lun      :3;     /* Logical unit number */
-               u8 reserved3    :1;     /* Reserved */
-               u8 drv          :1;     /* The responding drive will be drive 0 (0) or drive 1 (1) */
-               u8 one5         :1;     /* Should be set to 1 */
-               u8 reserved6    :1;     /* Reserved */
-               u8 one7         :1;     /* Should be set to 1 */
-#elif defined(__BIG_ENDIAN_BITFIELD)
-               u8 one7         :1;
-               u8 reserved6    :1;
-               u8 one5         :1;
-               u8 drv          :1;
-               u8 reserved3    :1;
-               u8 sam_lun      :3;
-#else
-#error "Please fix <asm/byteorder.h>"
-#endif
-       } b;
-} atapi_drivesel_reg_t;
-
-/* Currently unused, but please do not remove.  --bkz */
-/*
- *     ATAPI Device Control Register.
- */
-typedef union {
-       u8 all                  : 8;
-       struct {
-#if defined(__LITTLE_ENDIAN_BITFIELD)
-               u8 zero0        : 1;    /* Should be set to zero */
-               u8 nien         : 1;    /* Device interrupt is disabled (1) or enabled (0) */
-               u8 srst         : 1;    /* ATA software reset. ATAPI devices should use the new ATAPI srst. */
-               u8 one3         : 1;    /* Should be set to 1 */
-               u8 reserved4567 : 4;    /* Reserved */
-#elif defined(__BIG_ENDIAN_BITFIELD)
-               u8 reserved4567 : 4;
-               u8 one3         : 1;
-               u8 srst         : 1;
-               u8 nien         : 1;
-               u8 zero0        : 1;
-#else
-#error "Please fix <asm/byteorder.h>"
-#endif
-       } b;
-} atapi_control_reg_t;
-
-/*
- *     The following is used to format the general configuration word
- *     of the ATAPI IDENTIFY DEVICE command.
- */
-struct atapi_id_gcw {
-#if defined(__LITTLE_ENDIAN_BITFIELD)
-       u8 packet_size          : 2;    /* Packet Size */
-       u8 reserved234          : 3;    /* Reserved */
-       u8 drq_type             : 2;    /* Command packet DRQ type */
-       u8 removable            : 1;    /* Removable media */
-       u8 device_type          : 5;    /* Device type */
-       u8 reserved13           : 1;    /* Reserved */
-       u8 protocol             : 2;    /* Protocol type */
-#elif defined(__BIG_ENDIAN_BITFIELD)
-       u8 protocol             : 2;
-       u8 reserved13           : 1;
-       u8 device_type          : 5;
-       u8 removable            : 1;
-       u8 drq_type             : 2;
-       u8 reserved234          : 3;
-       u8 packet_size          : 2;
-#else
-#error "Please fix <asm/byteorder.h>"
-#endif
-};
-
-/*
- *     INQUIRY packet command - Data Format.
- */
-typedef struct {
-#if defined(__LITTLE_ENDIAN_BITFIELD)
-       u8      device_type     : 5;    /* Peripheral Device Type */
-       u8      reserved0_765   : 3;    /* Peripheral Qualifier - Reserved */
-       u8      reserved1_6t0   : 7;    /* Reserved */
-       u8      rmb             : 1;    /* Removable Medium Bit */
-       u8      ansi_version    : 3;    /* ANSI Version */
-       u8      ecma_version    : 3;    /* ECMA Version */
-       u8      iso_version     : 2;    /* ISO Version */
-       u8      response_format : 4;    /* Response Data Format */
-       u8      reserved3_45    : 2;    /* Reserved */
-       u8      reserved3_6     : 1;    /* TrmIOP - Reserved */
-       u8      reserved3_7     : 1;    /* AENC - Reserved */
-#elif defined(__BIG_ENDIAN_BITFIELD)
-       u8      reserved0_765   : 3;
-       u8      device_type     : 5;
-       u8      rmb             : 1;
-       u8      reserved1_6t0   : 7;
-       u8      iso_version     : 2;
-       u8      ecma_version    : 3;
-       u8      ansi_version    : 3;
-       u8      reserved3_7     : 1;
-       u8      reserved3_6     : 1;
-       u8      reserved3_45    : 2;
-       u8      response_format : 4;
-#else
-#error "Please fix <asm/byteorder.h>"
-#endif
-       u8      additional_length;      /* Additional Length (total_length-4) */
-       u8      rsv5, rsv6, rsv7;       /* Reserved */
-       u8      vendor_id[8];           /* Vendor Identification */
-       u8      product_id[16];         /* Product Identification */
-       u8      revision_level[4];      /* Revision Level */
-       u8      vendor_specific[20];    /* Vendor Specific - Optional */
-       u8      reserved56t95[40];      /* Reserved - Optional */
-                                       /* Additional information may be returned */
-} atapi_inquiry_result_t;
-
-/*
- *     REQUEST SENSE packet command result - Data Format.
- */
-typedef struct atapi_request_sense {
-#if defined(__LITTLE_ENDIAN_BITFIELD)
-       u8      error_code      : 7;    /* Error Code (0x70 - current or 0x71 - deferred) */
-       u8      valid           : 1;    /* The information field conforms to standard */
-       u8      reserved1       : 8;    /* Reserved (Segment Number) */
-       u8      sense_key       : 4;    /* Sense Key */
-       u8      reserved2_4     : 1;    /* Reserved */
-       u8      ili             : 1;    /* Incorrect Length Indicator */
-       u8      eom             : 1;    /* End Of Medium */
-       u8      filemark        : 1;    /* Filemark */
-#elif defined(__BIG_ENDIAN_BITFIELD)
-       u8      valid           : 1;
-       u8      error_code      : 7;
-       u8      reserved1       : 8;
-       u8      filemark        : 1;
-       u8      eom             : 1;
-       u8      ili             : 1;
-       u8      reserved2_4     : 1;
-       u8      sense_key       : 4;
-#else
-#error "Please fix <asm/byteorder.h>"
-#endif
-       u32     information __attribute__ ((packed));
-       u8      asl;                    /* Additional sense length (n-7) */
-       u32     command_specific;       /* Additional command specific information */
-       u8      asc;                    /* Additional Sense Code */
-       u8      ascq;                   /* Additional Sense Code Qualifier */
-       u8      replaceable_unit_code;  /* Field Replaceable Unit Code */
-#if defined(__LITTLE_ENDIAN_BITFIELD)
-       u8      sk_specific1    : 7;    /* Sense Key Specific */
-       u8      sksv            : 1;    /* Sense Key Specific information is valid */
-#elif defined(__BIG_ENDIAN_BITFIELD)
-       u8      sksv            : 1;    /* Sense Key Specific information is valid */
-       u8      sk_specific1    : 7;    /* Sense Key Specific */
-#else
-#error "Please fix <asm/byteorder.h>"
-#endif
-       u8      sk_specific[2];         /* Sense Key Specific */
-       u8      pad[2];                 /* Padding to 20 bytes */
-} atapi_request_sense_result_t;
-
-
-extern void atapi_init_pc(struct atapi_packet_command *pc);
-
-extern void atapi_discard_data(struct ata_device *, unsigned int);
-extern void atapi_write_zeros(struct ata_device *, unsigned int);
-
-extern void atapi_read(struct ata_device *, u8 *, unsigned int);
-extern void atapi_write(struct ata_device *, u8 *, unsigned int);
-
-typedef enum {
-       ide_wait,       /* insert rq at end of list, and wait for it */
-       ide_preempt,    /* insert rq in front of current request */
-       ide_end         /* insert rq at end of list, but don't wait for it */
-} ide_action_t;
-
-extern int ide_do_drive_cmd(struct ata_device *, struct request *, ide_action_t);
diff --git a/include/linux/fsfilter.h b/include/linux/fsfilter.h
deleted file mode 100644 (file)
index 0cd4677..0000000
+++ /dev/null
@@ -1,134 +0,0 @@
-/* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*-
- * vim:expandtab:shiftwidth=8:tabstop=8:
- */
-
-#ifndef __FILTER_H_
-#define __FILTER_H_ 1
-
-#ifdef __KERNEL__
-
-/* cachetype.c */
-
-/* 
- * it is important that things like inode, super and file operations
- * for intermezzo are not defined statically.  If methods are NULL
- * the VFS takes special action based on that.  Given that different
- * cache types have NULL ops at different slots, we must install opeation 
- * talbes for InterMezzo with NULL's in the same spot
- */
-
-struct filter_ops { 
-        struct super_operations filter_sops;
-
-        struct inode_operations filter_dir_iops;
-        struct inode_operations filter_file_iops;
-        struct inode_operations filter_sym_iops;
-
-        struct file_operations filter_dir_fops;
-        struct file_operations filter_file_fops;
-        struct file_operations filter_sym_fops;
-
-        struct dentry_operations filter_dentry_ops;
-};
-
-struct cache_ops {
-        /* operations on the file store */
-        struct super_operations *cache_sops;
-
-        struct inode_operations *cache_dir_iops;
-        struct inode_operations *cache_file_iops;
-        struct inode_operations *cache_sym_iops;
-
-        struct file_operations *cache_dir_fops;
-        struct file_operations *cache_file_fops;
-        struct file_operations *cache_sym_fops;
-
-        struct dentry_operations *cache_dentry_ops;
-};
-
-
-#define FILTER_DID_SUPER_OPS 0x1
-#define FILTER_DID_INODE_OPS 0x2
-#define FILTER_DID_FILE_OPS 0x4
-#define FILTER_DID_DENTRY_OPS 0x8
-#define FILTER_DID_DEV_OPS 0x10
-#define FILTER_DID_SYMLINK_OPS 0x20
-#define FILTER_DID_DIR_OPS 0x40
-
-struct filter_fs {
-        int o_flags;
-        struct filter_ops o_fops;
-        struct cache_ops  o_caops;
-        struct journal_ops *o_trops;
-        struct snapshot_ops *o_snops;
-};
-
-#define FILTER_FS_TYPES 6
-#define FILTER_FS_EXT2 0
-#define FILTER_FS_EXT3 1
-#define FILTER_FS_REISERFS 2
-#define FILTER_FS_XFS 3
-#define FILTER_FS_OBDFS 4
-#define FILTER_FS_TMPFS 5
-extern struct filter_fs filter_oppar[FILTER_FS_TYPES];
-
-struct filter_fs *filter_get_filter_fs(const char *cache_type);
-void filter_setup_journal_ops(struct filter_fs *ops, char *cache_type);
-struct super_operations *filter_c2usops(struct filter_fs *cache);
-struct inode_operations *filter_c2ufiops(struct filter_fs *cache);
-struct inode_operations *filter_c2udiops(struct filter_fs *cache);
-struct inode_operations *filter_c2usiops(struct filter_fs *cache);
-struct file_operations *filter_c2uffops(struct filter_fs *cache);
-struct file_operations *filter_c2udfops(struct filter_fs *cache);
-struct file_operations *filter_c2usfops(struct filter_fs *cache);
-struct super_operations *filter_c2csops(struct filter_fs *cache);
-struct inode_operations *filter_c2cfiops(struct filter_fs *cache);
-struct inode_operations *filter_c2cdiops(struct filter_fs *cache);
-struct inode_operations *filter_c2csiops(struct filter_fs *cache);
-struct file_operations *filter_c2cffops(struct filter_fs *cache);
-struct file_operations *filter_c2cdfops(struct filter_fs *cache);
-struct file_operations *filter_c2csfops(struct filter_fs *cache);
-struct dentry_operations *filter_c2cdops(struct filter_fs *cache);
-struct dentry_operations *filter_c2udops(struct filter_fs *cache);
-
-void filter_setup_super_ops(struct filter_fs *cache, struct super_operations *cache_ops, struct super_operations *filter_sops);
-void filter_setup_dir_ops(struct filter_fs *cache, struct inode *cache_inode, struct inode_operations *filter_iops, struct file_operations *ffops);
-void filter_setup_file_ops(struct filter_fs *cache, struct inode *cache_inode, struct inode_operations *filter_iops, struct file_operations *filter_op);
-void filter_setup_symlink_ops(struct filter_fs *cache, struct inode *cache_inode, struct inode_operations *filter_iops, struct file_operations *filter_op);
-void filter_setup_dentry_ops(struct filter_fs *cache, struct dentry_operations *cache_dop,  struct dentry_operations *filter_dop);
-
-
-#define PRESTO_DEBUG
-#ifdef PRESTO_DEBUG
-/* debugging masks */
-#define D_SUPER     1  
-#define D_INODE     2   /* print entry and exit into procedure */
-#define D_FILE      4
-#define D_CACHE     8   /* cache debugging */
-#define D_MALLOC    16  /* print malloc, de-alloc information */
-#define D_JOURNAL   32
-#define D_UPCALL    64  /* up and downcall debugging */
-#define D_PSDEV    128
-#define D_PIOCTL   256
-#define D_SPECIAL  512
-#define D_TIMING  1024
-#define D_DOWNCALL 2048
-
-#define FDEBUG(mask, format, a...)                                      \
-        do {                                                            \
-                if (filter_debug & mask) {                              \
-                        printk("(%s,l. %d): ", __FUNCTION__, __LINE__); \
-                        printk(format, ##a); }                          \
-        } while (0)
-
-#define FENTRY                                                          \
-        if(filter_print_entry)                                          \
-                printk("Process %d entered %s\n", current->pid, __FUNCTION__)
-
-#define FEXIT                                                           \
-        if(filter_print_entry)                                          \
-                printk("Process %d leaving %s at %d\n", current->pid,   \
-                       __FUNCTION__,__LINE__)
-#endif
-#endif
-#endif
diff --git a/include/linux/in_systm.h b/include/linux/in_systm.h
deleted file mode 100644 (file)
index eac9a58..0000000
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * INET                An implementation of the TCP/IP protocol suite for the LINUX
- *             operating system.  INET is implemented using the  BSD Socket
- *             interface as the means of communication with the user level.
- *
- *             Miscellaneous internetwork definitions for kernel.
- *
- * Version:    @(#)in_systm.h  1.0.0   12/17/93
- *
- * Authors:    Original taken from Berkeley BSD UNIX 4.3-RENO.
- *             Fred N. van Kempen, <waltje@uwalt.nl.mugnet.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.
- */
-#ifndef _LINUX_IN_SYSTM_H
-#define _LINUX_IN_SYSTM_H
-
-/*
- * Network types.
- * The n_ types are network-order variants of their natural
- * equivalents.  The Linux kernel NET-2 code does not use
- * them (yet), but it might in the future.  This is mostly
- * there for compatibility with BSD user-level programs.
- */
-typedef u_short        n_short;        /* short as received from the net       */
-typedef u_long n_long;         /* long as received from the net        */
-typedef u_long n_time;         /* ms since 00:00 GMT, byte rev         */
-
-#endif /* _LINUX_IN_SYSTM_H */
diff --git a/include/linux/isdn_lzscomp.h b/include/linux/isdn_lzscomp.h
deleted file mode 100644 (file)
index ca16cb1..0000000
+++ /dev/null
@@ -1,28 +0,0 @@
-/* $Id: isdn_lzscomp.h,v 1.1.10.1 2001/09/23 22:25:05 kai Exp $
- *
- * Header for isdn_lzscomp.c
- * Concentrated here to not mess up half a dozen kernel headers with code
- * snippets
- *
- * This software may be used and distributed according to the terms
- * of the GNU General Public License, incorporated herein by reference.
- *
- */
-
-#define CI_LZS_COMPRESS                17
-#define CILEN_LZS_COMPRESS     5
-
-#define LZS_CMODE_NONE         0
-#define LZS_CMODE_LCB          1
-#define LZS_CMODE_CRC          2
-#define LZS_CMODE_SEQNO                3       /* MUST be implemented (default) */
-#define LZS_CMODE_EXT          4       /* Seems to be what Win0.95 uses */
-
-#define LZS_COMP_MAX_HISTS     1       /* Don't waste peers ressources */
-#define LZS_COMP_DEF_HISTS     1       /* Most likely to negotiate */
-#define LZS_DECOMP_MAX_HISTS   32      /* More is really nonsense */
-#define LZS_DECOMP_DEF_HISTS   8       /* If we get it, this may be optimal */
-
-#define LZS_HIST_BYTE1(word)           (word>>8)       /* Just for better reading */
-#define LZS_HIST_BYTE2(word)   (word&0xff)     /* of this big endian stuff */
-#define LZS_HIST_WORD(b1,b2)   ((b1<<8)|b2)    /* (network byte order rulez) */
diff --git a/include/linux/mpp.h b/include/linux/mpp.h
deleted file mode 100644 (file)
index 2dd02ff..0000000
+++ /dev/null
@@ -1,18 +0,0 @@
-#ifndef _LINUX_MPP_H
-#define _LINUX_MPP_H
-
-/*
- * Definitions related to Massively Parallel Processing support.
- */
-
-/* All mpp implementations must supply these functions */
-
-extern void mpp_init(void);
-extern void mpp_hw_init(void);
-extern void mpp_procfs_init(void);
-
-extern int mpp_num_cells(void);
-extern int mpp_cid(void);
-extern int get_mppinfo(char *buffer);
-
-#endif
diff --git a/include/linux/mtd/physmap.h b/include/linux/mtd/physmap.h
deleted file mode 100644 (file)
index d522d43..0000000
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * For boards with physically mapped flash and using 
- * drivers/mtd/maps/physmap.c mapping driver.
- *
- * $Id: physmap.h,v 1.2 2004/07/14 17:48:46 dwmw2 Exp $
- *
- * Copyright (C) 2003 MontaVista Software Inc.
- * Author: Jun Sun, jsun@mvista.com or jsun@junsun.net
- *
- * 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 __LINUX_MTD_PHYSMAP__
-
-#include <linux/config.h>
-
-#if defined(CONFIG_MTD_PHYSMAP) 
-
-#include <linux/mtd/mtd.h>
-#include <linux/mtd/map.h>
-#include <linux/mtd/partitions.h>
-
-/*
- * The map_info for physmap.  Board can override size, buswidth, phys,
- * (*set_vpp)(), etc in their initial setup routine.
- */
-extern struct map_info physmap_map;
-
-/*
- * Board needs to specify the exact mapping during their setup time.
- */
-static inline void physmap_configure(unsigned long addr, unsigned long size, int buswidth, void (*set_vpp)(struct map_info *, int) )
-{
-       physmap_map.phys = addr;
-       physmap_map.size = size;
-       physmap_map.buswidth = buswidth;
-       physmap_map.set_vpp = set_vpp;
-}
-
-#if defined(CONFIG_MTD_PARTITIONS)
-
-/*
- * Machines that wish to do flash partition may want to call this function in 
- * their setup routine.  
- *
- *     physmap_set_partitions(mypartitions, num_parts);
- *
- * Note that one can always override this hard-coded partition with 
- * command line partition (you need to enable CONFIG_MTD_CMDLINE_PARTS).
- */
-void physmap_set_partitions(struct mtd_partition *parts, int num_parts);
-
-#endif /* defined(CONFIG_MTD_PARTITIONS) */
-#endif /* defined(CONFIG_MTD) */
-
-#endif /* __LINUX_MTD_PHYSMAP__ */
-
diff --git a/include/linux/netbeui.h b/include/linux/netbeui.h
deleted file mode 100644 (file)
index 2fb2f71..0000000
+++ /dev/null
@@ -1,16 +0,0 @@
-#ifndef _LINUX_NETBEUI_H
-#define _LINUX_NETBEUI_H
-
-#include <linux/if.h>
-
-#define NB_NAME_LEN    20      /* Set this properly from the full docs when
-                                  I get them */
-                                  
-struct sockaddr_netbeui
-{
-       sa_family       snb_family;
-       char            snb_name[NB_NAME_LEN];
-       char            snb_devhint[IFNAMSIZ];
-};
-
-#endif
diff --git a/include/linux/netfilter_ddp.h b/include/linux/netfilter_ddp.h
deleted file mode 100644 (file)
index 7c63c94..0000000
+++ /dev/null
@@ -1,14 +0,0 @@
-#ifndef __LINUX_DDP_NETFILTER_H
-#define __LINUX_DDP_NETFILTER_H
-
-/* DDP-specific defines for netfilter.  Complete me sometime.
- * (C)1998 Rusty Russell -- This code is GPL.
- */
-
-#include <linux/netfilter.h>
-
-/* Appletalk hooks */
-#define NF_DDP_INPUT   0
-#define NF_DDP_FORWARD 1
-#define NF_DDP_OUTPUT  2
-#endif /*__LINUX_DDP_NETFILTER_H*/
diff --git a/include/linux/netfilter_ipx.h b/include/linux/netfilter_ipx.h
deleted file mode 100644 (file)
index ebd93bf..0000000
+++ /dev/null
@@ -1,14 +0,0 @@
-#ifndef __LINUX_IPX_NETFILTER_H
-#define __LINUX_IPX_NETFILTER_H
-
-/* IPX-specific defines for netfilter.  Complete me sometime.
- * (C)1998 Rusty Russell -- This code is GPL.
- */
-
-#include <linux/netfilter.h>
-
-/* IPX Hooks */
-#define NF_IPX_INPUT   0
-#define NF_IPX_FORWARD 1
-#define NF_IPX_OUTPUT  2
-#endif /*__LINUX_IPX_NETFILTER_H*/
diff --git a/include/linux/netfilter_x25.h b/include/linux/netfilter_x25.h
deleted file mode 100644 (file)
index 88e2354..0000000
+++ /dev/null
@@ -1,15 +0,0 @@
-#ifndef __LINUX_X25_NETFILTER_H
-#define __LINUX_X25_NETFILTER_H
-
-/* X25-specific defines for netfilter.  Complete me sometime.
- * (C)1998 Rusty Russell -- This code is GPL.
- */
-
-#include <linux/netfilter.h>
-
-/* Hooks */
-#define NF_X25_INPUT   0
-#define NF_X25_FORWARD 1
-#define NF_X25_OUTPUT  2
-
-#endif /*__LINUX_X25_NETFILTER_H*/
diff --git a/include/linux/snmp.h b/include/linux/snmp.h
deleted file mode 100644 (file)
index 4db25d5..0000000
+++ /dev/null
@@ -1,266 +0,0 @@
-/*
- * Definitions for MIBs
- *
- * Author: Hideaki YOSHIFUJI <yoshfuji@linux-ipv6.org>
- */
-
-#ifndef _LINUX_SNMP_H
-#define _LINUX_SNMP_H
-
-/* ipstats mib definitions */
-/*
- * RFC 1213:  MIB-II
- * RFC 2011 (updates 1213):  SNMPv2-MIB-IP
- * RFC 2863:  Interfaces Group MIB
- * RFC 2465:  IPv6 MIB: General Group
- * draft-ietf-ipv6-rfc2011-update-10.txt: MIB for IP: IP Statistics Tables
- */
-enum
-{
-       IPSTATS_MIB_NUM = 0,
-       IPSTATS_MIB_INRECEIVES,                 /* InReceives */
-       IPSTATS_MIB_INHDRERRORS,                /* InHdrErrors */
-       IPSTATS_MIB_INTOOBIGERRORS,             /* InTooBigErrors */
-       IPSTATS_MIB_INNOROUTES,                 /* InNoRoutes */
-       IPSTATS_MIB_INADDRERRORS,               /* InAddrErrors */
-       IPSTATS_MIB_INUNKNOWNPROTOS,            /* InUnknownProtos */
-       IPSTATS_MIB_INTRUNCATEDPKTS,            /* InTruncatedPkts */
-       IPSTATS_MIB_INDISCARDS,                 /* InDiscards */
-       IPSTATS_MIB_INDELIVERS,                 /* InDelivers */
-       IPSTATS_MIB_OUTFORWDATAGRAMS,           /* OutForwDatagrams */
-       IPSTATS_MIB_OUTREQUESTS,                /* OutRequests */
-       IPSTATS_MIB_OUTDISCARDS,                /* OutDiscards */
-       IPSTATS_MIB_OUTNOROUTES,                /* OutNoRoutes */
-       IPSTATS_MIB_REASMTIMEOUT,               /* ReasmTimeout */
-       IPSTATS_MIB_REASMREQDS,                 /* ReasmReqds */
-       IPSTATS_MIB_REASMOKS,                   /* ReasmOKs */
-       IPSTATS_MIB_REASMFAILS,                 /* ReasmFails */
-       IPSTATS_MIB_FRAGOKS,                    /* FragOKs */
-       IPSTATS_MIB_FRAGFAILS,                  /* FragFails */
-       IPSTATS_MIB_FRAGCREATES,                /* FragCreates */
-       IPSTATS_MIB_INMCASTPKTS,                /* InMcastPkts */
-       IPSTATS_MIB_OUTMCASTPKTS,               /* OutMcastPkts */
-       __IPSTATS_MIB_MAX
-};
-
-/* icmp mib definitions */
-/*
- * RFC 1213:  MIB-II ICMP Group
- * RFC 2011 (updates 1213):  SNMPv2 MIB for IP: ICMP group
- */
-enum
-{
-       ICMP_MIB_NUM = 0,
-       ICMP_MIB_INMSGS,                        /* InMsgs */
-       ICMP_MIB_INERRORS,                      /* InErrors */
-       ICMP_MIB_INDESTUNREACHS,                /* InDestUnreachs */
-       ICMP_MIB_INTIMEEXCDS,                   /* InTimeExcds */
-       ICMP_MIB_INPARMPROBS,                   /* InParmProbs */
-       ICMP_MIB_INSRCQUENCHS,                  /* InSrcQuenchs */
-       ICMP_MIB_INREDIRECTS,                   /* InRedirects */
-       ICMP_MIB_INECHOS,                       /* InEchos */
-       ICMP_MIB_INECHOREPS,                    /* InEchoReps */
-       ICMP_MIB_INTIMESTAMPS,                  /* InTimestamps */
-       ICMP_MIB_INTIMESTAMPREPS,               /* InTimestampReps */
-       ICMP_MIB_INADDRMASKS,                   /* InAddrMasks */
-       ICMP_MIB_INADDRMASKREPS,                /* InAddrMaskReps */
-       ICMP_MIB_OUTMSGS,                       /* OutMsgs */
-       ICMP_MIB_OUTERRORS,                     /* OutErrors */
-       ICMP_MIB_OUTDESTUNREACHS,               /* OutDestUnreachs */
-       ICMP_MIB_OUTTIMEEXCDS,                  /* OutTimeExcds */
-       ICMP_MIB_OUTPARMPROBS,                  /* OutParmProbs */
-       ICMP_MIB_OUTSRCQUENCHS,                 /* OutSrcQuenchs */
-       ICMP_MIB_OUTREDIRECTS,                  /* OutRedirects */
-       ICMP_MIB_OUTECHOS,                      /* OutEchos */
-       ICMP_MIB_OUTECHOREPS,                   /* OutEchoReps */
-       ICMP_MIB_OUTTIMESTAMPS,                 /* OutTimestamps */
-       ICMP_MIB_OUTTIMESTAMPREPS,              /* OutTimestampReps */
-       ICMP_MIB_OUTADDRMASKS,                  /* OutAddrMasks */
-       ICMP_MIB_OUTADDRMASKREPS,               /* OutAddrMaskReps */
-       __ICMP_MIB_MAX
-};
-
-/* icmp6 mib definitions */
-/*
- * RFC 2466:  ICMPv6-MIB
- */
-enum
-{
-       ICMP6_MIB_NUM = 0,
-       ICMP6_MIB_INMSGS,                       /* InMsgs */
-       ICMP6_MIB_INERRORS,                     /* InErrors */
-       ICMP6_MIB_INDESTUNREACHS,               /* InDestUnreachs */
-       ICMP6_MIB_INPKTTOOBIGS,                 /* InPktTooBigs */
-       ICMP6_MIB_INTIMEEXCDS,                  /* InTimeExcds */
-       ICMP6_MIB_INPARMPROBLEMS,               /* InParmProblems */
-       ICMP6_MIB_INECHOS,                      /* InEchos */
-       ICMP6_MIB_INECHOREPLIES,                /* InEchoReplies */
-       ICMP6_MIB_INGROUPMEMBQUERIES,           /* InGroupMembQueries */
-       ICMP6_MIB_INGROUPMEMBRESPONSES,         /* InGroupMembResponses */
-       ICMP6_MIB_INGROUPMEMBREDUCTIONS,        /* InGroupMembReductions */
-       ICMP6_MIB_INROUTERSOLICITS,             /* InRouterSolicits */
-       ICMP6_MIB_INROUTERADVERTISEMENTS,       /* InRouterAdvertisements */
-       ICMP6_MIB_INNEIGHBORSOLICITS,           /* InNeighborSolicits */
-       ICMP6_MIB_INNEIGHBORADVERTISEMENTS,     /* InNeighborAdvertisements */
-       ICMP6_MIB_INREDIRECTS,                  /* InRedirects */
-       ICMP6_MIB_OUTMSGS,                      /* OutMsgs */
-       ICMP6_MIB_OUTDESTUNREACHS,              /* OutDestUnreachs */
-       ICMP6_MIB_OUTPKTTOOBIGS,                /* OutPktTooBigs */
-       ICMP6_MIB_OUTTIMEEXCDS,                 /* OutTimeExcds */
-       ICMP6_MIB_OUTPARMPROBLEMS,              /* OutParmProblems */
-       ICMP6_MIB_OUTECHOREPLIES,               /* OutEchoReplies */
-       ICMP6_MIB_OUTROUTERSOLICITS,            /* OutRouterSolicits */
-       ICMP6_MIB_OUTNEIGHBORSOLICITS,          /* OutNeighborSolicits */
-       ICMP6_MIB_OUTNEIGHBORADVERTISEMENTS,    /* OutNeighborAdvertisements */
-       ICMP6_MIB_OUTREDIRECTS,                 /* OutRedirects */
-       ICMP6_MIB_OUTGROUPMEMBRESPONSES,        /* OutGroupMembResponses */
-       ICMP6_MIB_OUTGROUPMEMBREDUCTIONS,       /* OutGroupMembReductions */
-       __ICMP6_MIB_MAX
-};
-
-/* tcp mib definitions */
-/*
- * RFC 1213:  MIB-II TCP group
- * RFC 2012 (updates 1213):  SNMPv2-MIB-TCP
- */
-enum
-{
-       TCP_MIB_NUM = 0,
-       TCP_MIB_RTOALGORITHM,                   /* RtoAlgorithm */
-       TCP_MIB_RTOMIN,                         /* RtoMin */
-       TCP_MIB_RTOMAX,                         /* RtoMax */
-       TCP_MIB_MAXCONN,                        /* MaxConn */
-       TCP_MIB_ACTIVEOPENS,                    /* ActiveOpens */
-       TCP_MIB_PASSIVEOPENS,                   /* PassiveOpens */
-       TCP_MIB_ATTEMPTFAILS,                   /* AttemptFails */
-       TCP_MIB_ESTABRESETS,                    /* EstabResets */
-       TCP_MIB_CURRESTAB,                      /* CurrEstab */
-       TCP_MIB_INSEGS,                         /* InSegs */
-       TCP_MIB_OUTSEGS,                        /* OutSegs */
-       TCP_MIB_RETRANSSEGS,                    /* RetransSegs */
-       TCP_MIB_INERRS,                         /* InErrs */
-       TCP_MIB_OUTRSTS,                        /* OutRsts */
-       __TCP_MIB_MAX
-};
-
-/* udp mib definitions */
-/*
- * RFC 1213:  MIB-II UDP group
- * RFC 2013 (updates 1213):  SNMPv2-MIB-UDP
- */
-enum
-{
-       UDP_MIB_NUM = 0,
-       UDP_MIB_INDATAGRAMS,                    /* InDatagrams */
-       UDP_MIB_NOPORTS,                        /* NoPorts */
-       UDP_MIB_INERRORS,                       /* InErrors */
-       UDP_MIB_OUTDATAGRAMS,                   /* OutDatagrams */
-       __UDP_MIB_MAX
-};
-
-/* sctp mib definitions */
-/*
- * draft-ietf-sigtran-sctp-mib-07.txt
- */
-enum
-{
-       SCTP_MIB_NUM = 0,
-       SCTP_MIB_CURRESTAB,                     /* CurrEstab */
-       SCTP_MIB_ACTIVEESTABS,                  /* ActiveEstabs */
-       SCTP_MIB_PASSIVEESTABS,                 /* PassiveEstabs */
-       SCTP_MIB_ABORTEDS,                      /* Aborteds */
-       SCTP_MIB_SHUTDOWNS,                     /* Shutdowns */
-       SCTP_MIB_OUTOFBLUES,                    /* OutOfBlues */
-       SCTP_MIB_CHECKSUMERRORS,                /* ChecksumErrors */
-       SCTP_MIB_OUTCTRLCHUNKS,                 /* OutCtrlChunks */
-       SCTP_MIB_OUTORDERCHUNKS,                /* OutOrderChunks */
-       SCTP_MIB_OUTUNORDERCHUNKS,              /* OutUnorderChunks */
-       SCTP_MIB_INCTRLCHUNKS,                  /* InCtrlChunks */
-       SCTP_MIB_INORDERCHUNKS,                 /* InOrderChunks */
-       SCTP_MIB_INUNORDERCHUNKS,               /* InUnorderChunks */
-       SCTP_MIB_FRAGUSRMSGS,                   /* FragUsrMsgs */
-       SCTP_MIB_REASMUSRMSGS,                  /* ReasmUsrMsgs */
-       SCTP_MIB_OUTSCTPPACKS,                  /* OutSCTPPacks */
-       SCTP_MIB_INSCTPPACKS,                   /* InSCTPPacks */
-       SCTP_MIB_RTOALGORITHM,                  /* RtoAlgorithm */
-       SCTP_MIB_RTOMIN,                        /* RtoMin */
-       SCTP_MIB_RTOMAX,                        /* RtoMax */
-       SCTP_MIB_RTOINITIAL,                    /* RtoInitial */
-       SCTP_MIB_VALCOOKIELIFE,                 /* ValCookieLife */
-       SCTP_MIB_MAXINITRETR,                   /* MaxInitRetr */
-       __SCTP_MIB_MAX
-};
-
-/* linux mib definitions */
-enum
-{
-       LINUX_MIB_NUM = 0,
-       LINUX_MIB_SYNCOOKIESSENT,               /* SyncookiesSent */
-       LINUX_MIB_SYNCOOKIESRECV,               /* SyncookiesRecv */
-       LINUX_MIB_SYNCOOKIESFAILED,             /* SyncookiesFailed */
-       LINUX_MIB_EMBRYONICRSTS,                /* EmbryonicRsts */
-       LINUX_MIB_PRUNECALLED,                  /* PruneCalled */
-       LINUX_MIB_RCVPRUNED,                    /* RcvPruned */
-       LINUX_MIB_OFOPRUNED,                    /* OfoPruned */
-       LINUX_MIB_OUTOFWINDOWICMPS,             /* OutOfWindowIcmps */
-       LINUX_MIB_LOCKDROPPEDICMPS,             /* LockDroppedIcmps */
-       LINUX_MIB_ARPFILTER,                    /* ArpFilter */
-       LINUX_MIB_TIMEWAITED,                   /* TimeWaited */
-       LINUX_MIB_TIMEWAITRECYCLED,             /* TimeWaitRecycled */
-       LINUX_MIB_TIMEWAITKILLED,               /* TimeWaitKilled */
-       LINUX_MIB_PAWSPASSIVEREJECTED,          /* PAWSPassiveRejected */
-       LINUX_MIB_PAWSACTIVEREJECTED,           /* PAWSActiveRejected */
-       LINUX_MIB_PAWSESTABREJECTED,            /* PAWSEstabRejected */
-       LINUX_MIB_DELAYEDACKS,                  /* DelayedACKs */
-       LINUX_MIB_DELAYEDACKLOCKED,             /* DelayedACKLocked */
-       LINUX_MIB_DELAYEDACKLOST,               /* DelayedACKLost */
-       LINUX_MIB_LISTENOVERFLOWS,              /* ListenOverflows */
-       LINUX_MIB_LISTENDROPS,                  /* ListenDrops */
-       LINUX_MIB_TCPPREQUEUED,                 /* TCPPrequeued */
-       LINUX_MIB_TCPDIRECTCOPYFROMBACKLOG,     /* TCPDirectCopyFromBacklog */
-       LINUX_MIB_TCPDIRECTCOPYFROMPREQUEUE,    /* TCPDirectCopyFromPrequeue */
-       LINUX_MIB_TCPPREQUEUEDROPPED,           /* TCPPrequeueDropped */
-       LINUX_MIB_TCPHPHITS,                    /* TCPHPHits */
-       LINUX_MIB_TCPHPHITSTOUSER,              /* TCPHPHitsToUser */
-       LINUX_MIB_TCPPUREACKS,                  /* TCPPureAcks */
-       LINUX_MIB_TCPHPACKS,                    /* TCPHPAcks */
-       LINUX_MIB_TCPRENORECOVERY,              /* TCPRenoRecovery */
-       LINUX_MIB_TCPSACKRECOVERY,              /* TCPSackRecovery */
-       LINUX_MIB_TCPSACKRENEGING,              /* TCPSACKReneging */
-       LINUX_MIB_TCPFACKREORDER,               /* TCPFACKReorder */
-       LINUX_MIB_TCPSACKREORDER,               /* TCPSACKReorder */
-       LINUX_MIB_TCPRENOREORDER,               /* TCPRenoReorder */
-       LINUX_MIB_TCPTSREORDER,                 /* TCPTSReorder */
-       LINUX_MIB_TCPFULLUNDO,                  /* TCPFullUndo */
-       LINUX_MIB_TCPPARTIALUNDO,               /* TCPPartialUndo */
-       LINUX_MIB_TCPDSACKUNDO,                 /* TCPDSACKUndo */
-       LINUX_MIB_TCPLOSSUNDO,                  /* TCPLossUndo */
-       LINUX_MIB_TCPLOSS,                      /* TCPLoss */
-       LINUX_MIB_TCPLOSTRETRANSMIT,            /* TCPLostRetransmit */
-       LINUX_MIB_TCPRENOFAILURES,              /* TCPRenoFailures */
-       LINUX_MIB_TCPSACKFAILURES,              /* TCPSackFailures */
-       LINUX_MIB_TCPLOSSFAILURES,              /* TCPLossFailures */
-       LINUX_MIB_TCPFASTRETRANS,               /* TCPFastRetrans */
-       LINUX_MIB_TCPFORWARDRETRANS,            /* TCPForwardRetrans */
-       LINUX_MIB_TCPSLOWSTARTRETRANS,          /* TCPSlowStartRetrans */
-       LINUX_MIB_TCPTIMEOUTS,                  /* TCPTimeouts */
-       LINUX_MIB_TCPRENORECOVERYFAIL,          /* TCPRenoRecoveryFail */
-       LINUX_MIB_TCPSACKRECOVERYFAIL,          /* TCPSackRecoveryFail */
-       LINUX_MIB_TCPSCHEDULERFAILED,           /* TCPSchedulerFailed */
-       LINUX_MIB_TCPRCVCOLLAPSED,              /* TCPRcvCollapsed */
-       LINUX_MIB_TCPDSACKOLDSENT,              /* TCPDSACKOldSent */
-       LINUX_MIB_TCPDSACKOFOSENT,              /* TCPDSACKOfoSent */
-       LINUX_MIB_TCPDSACKRECV,                 /* TCPDSACKRecv */
-       LINUX_MIB_TCPDSACKOFORECV,              /* TCPDSACKOfoRecv */
-       LINUX_MIB_TCPABORTONSYN,                /* TCPAbortOnSyn */
-       LINUX_MIB_TCPABORTONDATA,               /* TCPAbortOnData */
-       LINUX_MIB_TCPABORTONCLOSE,              /* TCPAbortOnClose */
-       LINUX_MIB_TCPABORTONMEMORY,             /* TCPAbortOnMemory */
-       LINUX_MIB_TCPABORTONTIMEOUT,            /* TCPAbortOnTimeout */
-       LINUX_MIB_TCPABORTONLINGER,             /* TCPAbortOnLinger */
-       LINUX_MIB_TCPABORTFAILED,               /* TCPAbortFailed */
-       LINUX_MIB_TCPMEMORYPRESSURES,           /* TCPMemoryPressures */
-       __LINUX_MIB_MAX
-};
-
-#endif /* _LINUX_SNMP_H */
diff --git a/include/linux/upd4990a.h b/include/linux/upd4990a.h
deleted file mode 100644 (file)
index ad50634..0000000
+++ /dev/null
@@ -1,140 +0,0 @@
-/*
- *  Constant and architecture independent procedures
- *  for NEC uPD4990A serial I/O real-time clock.
- *
- *  Copyright 2001  TAKAI Kousuke <tak@kmc.kyoto-u.ac.jp>
- *                 Kyoto University Microcomputer Club (KMC).
- *
- *  References:
- *     uPD4990A serial I/O real-time clock users' manual (Japanese)
- *     No. S12828JJ4V0UM00 (4th revision), NEC Corporation, 1999.
- */
-
-#ifndef _LINUX_uPD4990A_H
-#define _LINUX_uPD4990A_H
-
-#include <asm/byteorder.h>
-
-#include <asm/upd4990a.h>
-
-/* Serial commands (4 bits) */
-#define UPD4990A_REGISTER_HOLD                 (0x0)
-#define UPD4990A_REGISTER_SHIFT                        (0x1)
-#define UPD4990A_TIME_SET_AND_COUNTER_HOLD     (0x2)
-#define UPD4990A_TIME_READ                     (0x3)
-#define UPD4990A_TP_64HZ                       (0x4)
-#define UPD4990A_TP_256HZ                      (0x5)
-#define UPD4990A_TP_2048HZ                     (0x6)
-#define UPD4990A_TP_4096HZ                     (0x7)
-#define UPD4990A_TP_1S                         (0x8)
-#define UPD4990A_TP_10S                                (0x9)
-#define UPD4990A_TP_30S                                (0xA)
-#define UPD4990A_TP_60S                                (0xB)
-#define UPD4990A_INTERRUPT_RESET               (0xC)
-#define UPD4990A_INTERRUPT_TIMER_START         (0xD)
-#define UPD4990A_INTERRUPT_TIMER_STOP          (0xE)
-#define UPD4990A_TEST_MODE_SET                 (0xF)
-
-/* Parallel commands (3 bits)
-   0-6 are same with serial commands.  */
-#define UPD4990A_PAR_SERIAL_MODE               7
-
-#ifndef UPD4990A_DELAY
-# include <linux/delay.h>
-# define UPD4990A_DELAY(usec)  udelay((usec))
-#endif
-#ifndef UPD4990A_OUTPUT_DATA
-# define UPD4990A_OUTPUT_DATA(bit)                     \
-       do {                                            \
-               UPD4990A_OUTPUT_DATA_CLK((bit), 0);     \
-               UPD4990A_DELAY(1); /* t-DSU */          \
-               UPD4990A_OUTPUT_DATA_CLK((bit), 1);     \
-               UPD4990A_DELAY(1); /* t-DHLD */ \
-       } while (0)
-#endif
-
-static __inline__ void upd4990a_serial_command(int command)
-{
-       UPD4990A_OUTPUT_DATA(command >> 0);
-       UPD4990A_OUTPUT_DATA(command >> 1);
-       UPD4990A_OUTPUT_DATA(command >> 2);
-       UPD4990A_OUTPUT_DATA(command >> 3);
-       UPD4990A_DELAY(1);      /* t-HLD */
-       UPD4990A_OUTPUT_STROBE(1);
-       UPD4990A_DELAY(1);      /* t-STB & t-d1 */
-       UPD4990A_OUTPUT_STROBE(0);
-       /* 19 microseconds extra delay is needed
-          iff previous mode is TIME READ command  */
-}
-
-struct upd4990a_raw_data {
-       u8      sec;            /* BCD */
-       u8      min;            /* BCD */
-       u8      hour;           /* BCD */
-       u8      mday;           /* BCD */
-#if   defined __LITTLE_ENDIAN_BITFIELD
-       unsigned wday :4;       /* 0-6 */
-       unsigned mon :4;        /* 1-based */
-#elif defined __BIG_ENDIAN_BITFIELD
-       unsigned mon :4;        /* 1-based */
-       unsigned wday :4;       /* 0-6 */
-#else
-# error Unknown bitfield endian!
-#endif
-       u8      year;           /* BCD */
-};
-
-static __inline__ void upd4990a_get_time(struct upd4990a_raw_data *buf,
-                                         int leave_register_hold)
-{
-       int byte;
-
-       upd4990a_serial_command(UPD4990A_TIME_READ);
-       upd4990a_serial_command(UPD4990A_REGISTER_SHIFT);
-       UPD4990A_DELAY(19);     /* t-d2 - t-d1 */
-
-       for (byte = 0; byte < 6; byte++) {
-               u8 tmp;
-               int bit;
-
-               for (tmp = 0, bit = 0; bit < 8; bit++) {
-                       tmp = (tmp | (UPD4990A_READ_DATA() << 8)) >> 1;
-                       UPD4990A_OUTPUT_CLK(1);
-                       UPD4990A_DELAY(1);
-                       UPD4990A_OUTPUT_CLK(0);
-                       UPD4990A_DELAY(1);
-               }
-               ((u8 *) buf)[byte] = tmp;
-       }
-
-       /* The uPD4990A users' manual says that we should issue `Register
-          Hold' command after each data retrieval, or next `Time Read'
-          command may not work correctly.  */
-       if (!leave_register_hold)
-               upd4990a_serial_command(UPD4990A_REGISTER_HOLD);
-}
-
-static __inline__ void upd4990a_set_time(const struct upd4990a_raw_data *data,
-                                         int time_set_only)
-{
-       int byte;
-
-       if (!time_set_only)
-               upd4990a_serial_command(UPD4990A_REGISTER_SHIFT);
-
-       for (byte = 0; byte < 6; byte++) {
-               int bit;
-               u8 tmp = ((const u8 *) data)[byte];
-
-               for (bit = 0; bit < 8; bit++, tmp >>= 1)
-                       UPD4990A_OUTPUT_DATA(tmp);
-       }
-
-       upd4990a_serial_command(UPD4990A_TIME_SET_AND_COUNTER_HOLD);
-
-       /* Release counter hold and start the clock.  */
-       if (!time_set_only)
-               upd4990a_serial_command(UPD4990A_REGISTER_HOLD);
-}
-
-#endif /* _LINUX_uPD4990A_H */
diff --git a/include/mtd/inftl-user.h b/include/mtd/inftl-user.h
deleted file mode 100644 (file)
index bda4f2c..0000000
+++ /dev/null
@@ -1,91 +0,0 @@
-/*
- * $Id: inftl-user.h,v 1.1 2004/05/05 15:17:00 dwmw2 Exp $
- *
- * Parts of INFTL headers shared with userspace 
- *
- */
-
-#ifndef __MTD_INFTL_USER_H__
-#define __MTD_INFTL_USER_H__
-
-#define        OSAK_VERSION    0x5120
-#define        PERCENTUSED     98
-
-#define        SECTORSIZE      512
-
-/* Block Control Information */
-
-struct inftl_bci {
-       uint8_t ECCsig[6];
-       uint8_t Status;
-       uint8_t Status1;
-} __attribute__((packed));
-
-struct inftl_unithead1 {
-       uint16_t virtualUnitNo;
-       uint16_t prevUnitNo;
-       uint8_t ANAC;
-       uint8_t NACs;
-       uint8_t parityPerField;
-       uint8_t discarded;
-} __attribute__((packed));
-
-struct inftl_unithead2 {
-       uint8_t parityPerField;
-       uint8_t ANAC;
-       uint16_t prevUnitNo;
-       uint16_t virtualUnitNo;
-       uint8_t NACs;
-       uint8_t discarded;
-} __attribute__((packed));
-
-struct inftl_unittail {
-       uint8_t Reserved[4];
-       uint16_t EraseMark;
-       uint16_t EraseMark1;
-} __attribute__((packed));
-
-union inftl_uci {
-       struct inftl_unithead1 a;
-       struct inftl_unithead2 b;
-       struct inftl_unittail c;
-};
-
-struct inftl_oob {
-       struct inftl_bci b;
-       union inftl_uci u;
-};
-
-
-/* INFTL Media Header */
-
-struct INFTLPartition {
-       __u32 virtualUnits;
-       __u32 firstUnit;
-       __u32 lastUnit;
-       __u32 flags;
-       __u32 spareUnits;
-       __u32 Reserved0;
-       __u32 Reserved1;
-} __attribute__((packed));
-
-struct INFTLMediaHeader {
-       char bootRecordID[8];
-       __u32 NoOfBootImageBlocks;
-       __u32 NoOfBinaryPartitions;
-       __u32 NoOfBDTLPartitions;
-       __u32 BlockMultiplierBits;
-       __u32 FormatFlags;
-       __u32 OsakVersion;
-       __u32 PercentUsed;
-       struct INFTLPartition Partitions[4];
-} __attribute__((packed));
-
-/* Partition flag types */
-#define        INFTL_BINARY    0x20000000
-#define        INFTL_BDTL      0x40000000
-#define        INFTL_LAST      0x80000000
-
-#endif /* __MTD_INFTL_USER_H__ */
-
-
diff --git a/include/mtd/jffs2-user.h b/include/mtd/jffs2-user.h
deleted file mode 100644 (file)
index d508ef0..0000000
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * $Id: jffs2-user.h,v 1.1 2004/05/05 11:57:54 dwmw2 Exp $
- *
- * JFFS2 definitions for use in user space only
- */
-
-#ifndef __JFFS2_USER_H__
-#define __JFFS2_USER_H__
-
-/* This file is blessed for inclusion by userspace */
-#include <linux/jffs2.h>
-#include <endian.h>
-#include <byteswap.h>
-
-#undef cpu_to_je16
-#undef cpu_to_je32
-#undef cpu_to_jemode
-#undef je16_to_cpu
-#undef je32_to_cpu
-#undef jemode_to_cpu
-
-extern int target_endian;
-
-#define t16(x) ({ uint16_t __b = (x); (target_endian==__BYTE_ORDER)?__b:bswap_16(__b); })
-#define t32(x) ({ uint32_t __b = (x); (target_endian==__BYTE_ORDER)?__b:bswap_32(__b); })
-
-#define cpu_to_je16(x) ((jint16_t){t16(x)})
-#define cpu_to_je32(x) ((jint32_t){t32(x)})
-#define cpu_to_jemode(x) ((jmode_t){t32(x)})
-
-#define je16_to_cpu(x) (t16((x).v16))
-#define je32_to_cpu(x) (t32((x).v32))
-#define jemode_to_cpu(x) (t32((x).m))
-
-#endif /* __JFFS2_USER_H__ */
diff --git a/include/mtd/mtd-abi.h b/include/mtd/mtd-abi.h
deleted file mode 100644 (file)
index db5fca2..0000000
+++ /dev/null
@@ -1,97 +0,0 @@
-/*
- * $Id: mtd-abi.h,v 1.5 2004/06/22 09:29:35 gleixner Exp $
- *
- * Portions of MTD ABI definition which are shared by kernel and user space 
- */
-
-#ifndef __MTD_ABI_H__
-#define __MTD_ABI_H__
-
-struct erase_info_user {
-       uint32_t start;
-       uint32_t length;
-};
-
-struct mtd_oob_buf {
-       uint32_t start;
-       uint32_t length;
-       unsigned char *ptr;
-};
-
-#define MTD_ABSENT             0
-#define MTD_RAM                        1
-#define MTD_ROM                        2
-#define MTD_NORFLASH           3
-#define MTD_NANDFLASH          4
-#define MTD_PEROM              5
-#define MTD_OTHER              14
-#define MTD_UNKNOWN            15
-
-#define MTD_CLEAR_BITS         1       // Bits can be cleared (flash)
-#define MTD_SET_BITS           2       // Bits can be set
-#define MTD_ERASEABLE          4       // Has an erase function
-#define MTD_WRITEB_WRITEABLE   8       // Direct IO is possible
-#define MTD_VOLATILE           16      // Set for RAMs
-#define MTD_XIP                        32      // eXecute-In-Place possible
-#define MTD_OOB                        64      // Out-of-band data (NAND flash)
-#define MTD_ECC                        128     // Device capable of automatic ECC
-
-// Some common devices / combinations of capabilities
-#define MTD_CAP_ROM            0
-#define MTD_CAP_RAM            (MTD_CLEAR_BITS|MTD_SET_BITS|MTD_WRITEB_WRITEABLE)
-#define MTD_CAP_NORFLASH        (MTD_CLEAR_BITS|MTD_ERASEABLE)
-#define MTD_CAP_NANDFLASH       (MTD_CLEAR_BITS|MTD_ERASEABLE|MTD_OOB)
-#define MTD_WRITEABLE          (MTD_CLEAR_BITS|MTD_SET_BITS)
-
-
-// Types of automatic ECC/Checksum available
-#define MTD_ECC_NONE           0       // No automatic ECC available
-#define MTD_ECC_RS_DiskOnChip  1       // Automatic ECC on DiskOnChip
-#define MTD_ECC_SW             2       // SW ECC for Toshiba & Samsung devices
-
-/* ECC byte placement */
-#define MTD_NANDECC_OFF                0       // Switch off ECC (Not recommended)
-#define MTD_NANDECC_PLACE      1       // Use the given placement in the structure (YAFFS1 legacy mode)
-#define MTD_NANDECC_AUTOPLACE  2       // Use the default placement scheme
-#define MTD_NANDECC_PLACEONLY  3       // Use the given placement in the structure (Do not store ecc result on read)
-
-struct mtd_info_user {
-       uint8_t type;
-       uint32_t flags;
-       uint32_t size;   // Total size of the MTD
-       uint32_t erasesize;
-       uint32_t oobblock;  // Size of OOB blocks (e.g. 512)
-       uint32_t oobsize;   // Amount of OOB data per block (e.g. 16)
-       uint32_t ecctype;
-       uint32_t eccsize;
-};
-
-struct region_info_user {
-       uint32_t offset;                /* At which this region starts, 
-                                        * from the beginning of the MTD */
-       uint32_t erasesize;             /* For this region */
-       uint32_t numblocks;             /* Number of blocks in this region */
-       uint32_t regionindex;
-};
-
-#define MEMGETINFO              _IOR('M', 1, struct mtd_info_user)
-#define MEMERASE                _IOW('M', 2, struct erase_info_user)
-#define MEMWRITEOOB             _IOWR('M', 3, struct mtd_oob_buf)
-#define MEMREADOOB              _IOWR('M', 4, struct mtd_oob_buf)
-#define MEMLOCK                 _IOW('M', 5, struct erase_info_user)
-#define MEMUNLOCK               _IOW('M', 6, struct erase_info_user)
-#define MEMGETREGIONCOUNT      _IOR('M', 7, int)
-#define MEMGETREGIONINFO       _IOWR('M', 8, struct region_info_user)
-#define MEMSETOOBSEL           _IOW('M', 9, struct nand_oobinfo)
-#define MEMGETOOBSEL           _IOR('M', 10, struct nand_oobinfo)
-#define MEMGETBADBLOCK         _IOW('M', 11, loff_t)
-#define MEMSETBADBLOCK         _IOW('M', 12, loff_t)
-
-struct nand_oobinfo {
-       uint32_t useecc;
-       uint32_t eccbytes;
-       uint32_t oobfree[8][2];
-       uint32_t eccpos[32];
-};
-
-#endif /* __MTD_ABI_H__ */
diff --git a/include/mtd/mtd-user.h b/include/mtd/mtd-user.h
deleted file mode 100644 (file)
index 1c13fc7..0000000
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * $Id: mtd-user.h,v 1.2 2004/05/05 14:44:57 dwmw2 Exp $
- *
- * MTD ABI header for use by user space only.
- */
-
-#ifndef __MTD_USER_H__
-#define __MTD_USER_H__
-
-#include <stdint.h>
-
-/* This file is blessed for inclusion by userspace */
-#include <mtd/mtd-abi.h>
-
-typedef struct mtd_info_user mtd_info_t;
-typedef struct erase_info_user erase_info_t;
-typedef struct region_info_user region_info_t;
-typedef struct nand_oobinfo nand_oobinfo_t;
-
-#endif /* __MTD_USER_H__ */
diff --git a/include/mtd/nftl-user.h b/include/mtd/nftl-user.h
deleted file mode 100644 (file)
index 924ec04..0000000
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- * $Id: nftl-user.h,v 1.1 2004/05/05 14:44:57 dwmw2 Exp $
- *
- * Parts of NFTL headers shared with userspace 
- *
- */
-
-#ifndef __MTD_NFTL_USER_H__
-#define __MTD_NFTL_USER_H__
-
-/* Block Control Information */
-
-struct nftl_bci {
-       unsigned char ECCSig[6];
-       uint8_t Status;
-       uint8_t Status1;
-}__attribute__((packed));
-
-/* Unit Control Information */
-
-struct nftl_uci0 {
-       uint16_t VirtUnitNum;
-       uint16_t ReplUnitNum;
-       uint16_t SpareVirtUnitNum;
-       uint16_t SpareReplUnitNum;
-} __attribute__((packed));
-
-struct nftl_uci1 {
-       uint32_t WearInfo;
-       uint16_t EraseMark;
-       uint16_t EraseMark1;
-} __attribute__((packed));
-
-struct nftl_uci2 {
-        uint16_t FoldMark;
-        uint16_t FoldMark1;
-       uint32_t unused;
-} __attribute__((packed));
-
-union nftl_uci {
-       struct nftl_uci0 a;
-       struct nftl_uci1 b;
-       struct nftl_uci2 c;
-};
-
-struct nftl_oob {
-       struct nftl_bci b;
-       union nftl_uci u;
-};
-
-/* NFTL Media Header */
-
-struct NFTLMediaHeader {
-       char DataOrgID[6];
-       uint16_t NumEraseUnits;
-       uint16_t FirstPhysicalEUN;
-       uint32_t FormattedSize;
-       unsigned char UnitSizeFactor;
-} __attribute__((packed));
-
-#define MAX_ERASE_ZONES (8192 - 512)
-
-#define ERASE_MARK 0x3c69
-#define SECTOR_FREE 0xff
-#define SECTOR_USED 0x55
-#define SECTOR_IGNORE 0x11
-#define SECTOR_DELETED 0x00
-
-#define FOLD_MARK_IN_PROGRESS 0x5555
-
-#define ZONE_GOOD 0xff
-#define ZONE_BAD_ORIGINAL 0
-#define ZONE_BAD_MARKED 7
-
-
-#endif /* __MTD_NFTL_USER_H__ */
diff --git a/include/net/tux.h b/include/net/tux.h
deleted file mode 100644 (file)
index 44a3882..0000000
+++ /dev/null
@@ -1,800 +0,0 @@
-#ifndef _NET_TUX_H
-#define _NET_TUX_H
-
-/*
- * TUX - Integrated Application Protocols Layer and Object Cache
- *
- * Copyright (C) 2000, 2001, Ingo Molnar <mingo@redhat.com>
- *
- * tux.h: main structure definitions and function prototypes
- */
-
-#define __KERNEL_SYSCALLS__
-
-#include <linux/mm.h>
-#include <linux/net.h>
-#include <linux/wait.h>
-#include <linux/namei.h>
-#include <linux/file.h>
-#include <linux/mman.h>
-#include <linux/swap.h>
-#include <linux/ctype.h>
-#include <linux/config.h>
-#include <linux/module.h>
-#include <linux/kernel.h>
-#include <linux/unistd.h>
-#include <linux/sysctl.h>
-#include <linux/proc_fs.h>
-#include <linux/pagemap.h>
-#include <linux/vmalloc.h>
-#include <linux/utsname.h>
-#include <linux/smp_lock.h>
-#include <linux/kernel_stat.h>
-#include <linux/kernel_stat.h>
-#include <linux/time.h>
-#include <asm/div64.h>
-#include <asm/unaligned.h>
-#include <linux/compiler.h>
-#include <linux/mount.h>
-#include <linux/zlib.h>
-
-#include <net/tcp.h>
-#include <net/tux_u.h>
-
-/* Maximum number of threads: */
-#define CONFIG_TUX_NUMTHREADS 8
-
-/* Number of cachemiss/IO threads: */
-#define NR_IO_THREADS 32
-
-/* Maximum number of listen sockets per thread: */
-#define CONFIG_TUX_NUMSOCKETS 16
-
-extern spinlock_t tux_module_lock;
-extern struct module *tux_module;
-extern asmlinkage long (*sys_tux_ptr) (unsigned int action, user_req_t *u_info);
-
-#undef Dprintk
-
-extern int tux_TDprintk;
-extern int tux_Dprintk;
-
-#define TUX_DEBUG CONFIG_TUX_DEBUG
-#if CONFIG_TUX_DEBUG
-# define TUX_BUG() BUG()
-
-# define TUX_DPRINTK 1
-# define TDprintk(x...) do { if (tux_TDprintk) { printk("<%ld:%s:%d>: ", jiffies, __FILE__, __LINE__); printk(x); } } while (0)
-# define Dprintk(x...) do { if (tux_Dprintk == 1) TDprintk(x); } while (0)
-#else
-# define TUX_DPRINTK 0
-# define Dprintk(x...) do { } while (0)
-# define TDprintk(x...) do { } while (0)
-//# define TUX_BUG() BUG()
-# define TUX_BUG() do { } while (0)
-#endif
-
-#if 1
-# define INC_STAT(x) do { } while (0)
-# define DEC_STAT(x) do { } while (0)
-# define ADD_STAT(x,y) do { } while (0)
-# define SUB_STAT(x,y) do { } while (0)
-#else
-# define INC_STAT(x) atomic_inc((atomic_t *)&kstat.x)
-# define DEC_STAT(x) atomic_dec((atomic_t *)&kstat.x)
-# define ADD_STAT(y,x) atomic_add(y,(atomic_t *)&kstat.x)
-# define SUB_STAT(y,x) atomic_sub(y,(atomic_t *)&kstat.x)
-#endif
-
-// lru needs this:
-
-# define DEBUG_DEL_LIST(x...) do { INIT_LIST_HEAD((x)); } while (0)
-
-
-#define LOG_LEN (8*1024*1024UL)
-
-struct tux_req_struct;
-typedef struct tux_req_struct tux_req_t;
-typedef struct tux_threadinfo threadinfo_t;
-
-extern struct address_space_operations url_aops;
-
-typedef struct tcapi_template_s {
-       char *vfs_name;
-       struct list_head modules;
-       int (*query) (tux_req_t *req);
-       struct module *mod;
-       unsigned int userspace_id;
-} tcapi_template_t;
-
-typedef struct mimetype_s {
-       struct list_head list;
-
-       char *ext;
-       unsigned int ext_len;
-       char *type;
-       unsigned int type_len;
-       char *expire_str;
-       unsigned int expire_str_len;
-
-       unsigned int special;
-} mimetype_t;
-
-typedef struct tux_attribute_s {
-       mimetype_t *mime;
-       tcapi_template_t *tcapi;
-} tux_attribute_t;
-
-#define MAX_TUX_ATOMS 8
-
-typedef void (atom_func_t)(tux_req_t *req, int cachemiss);
-
-typedef struct tux_proto_s
-{
-       unsigned int defer_accept;
-       unsigned int can_redirect;
-       void (*got_request) (tux_req_t *req);
-       int (*parse_message) (tux_req_t *req, const int total_len);
-       atom_func_t *illegal_request;
-       atom_func_t *request_timeout;
-       void (*pre_log) (tux_req_t *req);
-       int (*check_req_err) (tux_req_t *req, int cachemiss);
-       char * (*print_dir_line) (tux_req_t *req, char *tmp, char *d_name, int d_len, int d_type, struct dentry *dentry, struct inode *inode);
-       const char *name;
-       struct nameidata main_docroot;
-} tux_proto_t;
-
-typedef struct tux_socket_s {
-       tux_proto_t *proto;
-       unsigned int ip;
-       unsigned short port;
-       struct proc_dir_entry *entry;
-} tux_socket_t;
-
-extern tux_socket_t tux_listen [CONFIG_TUX_NUMTHREADS][CONFIG_TUX_NUMSOCKETS];
-
-
-typedef struct abuf_s {
-       struct page *page;
-       char *buf;
-       unsigned int size;
-       unsigned int max_len;
-       unsigned int offset;
-       unsigned int left;
-       unsigned long flags;
-} abuf_t;
-
-struct linux_dirent64 {
-       u64             d_ino;
-       s64             d_off;
-       unsigned short  d_reclen;
-       unsigned char   d_type;
-       char            d_name[0];
-};
-
-struct getdents_callback64 {
-       struct linux_dirent64 * current_dir;
-       struct linux_dirent64 * previous;
-       int count;
-       int error;
-};
-
-#define TUX_MAGIC 0x12457801
-
-#define MAX_TUX_ATOMS 8
-
-struct tux_req_struct
-{
-       tux_proto_t *proto;
-
-       int atom_idx;
-       atom_func_t *atoms [MAX_TUX_ATOMS];
-       struct list_head work;
-
-       struct list_head all;
-       struct list_head free;
-       struct list_head lru;
-
-       unsigned long idle_input;
-       unsigned long wait_output_space;
-
-       struct socket *sock;
-       struct dentry *dentry;
-       struct vfsmount *mnt;
-       struct dentry *docroot_dentry;
-       struct vfsmount *docroot_mnt;
-       struct dentry *cwd_dentry;
-       struct vfsmount *cwd_mnt;
-
-       struct file in_file;
-       int fd;
-       read_descriptor_t desc;
-       u32 client_addr;
-       u32 client_port;
-       unsigned int virtual;
-
-       loff_t total_file_len;
-       unsigned int lendigits;
-       loff_t offset_start;
-       loff_t offset_end;
-       loff_t output_len;
-
-       loff_t ftp_offset_start;
-
-       time_t mtime;
-       unsigned int etaglen;
-       char etag [40];
-
-       char usermode;
-       unsigned int usermodule_idx;
-       struct dentry *module_dentry;
-       struct vfsmount *module_mnt;
-       char *userbuf;
-       unsigned int userlen;
-
-       tux_attribute_t *attr;
-
-       threadinfo_t *ti;
-       wait_queue_t sleep;
-       wait_queue_t ftp_sleep;
-
-       abuf_t abuf;
-       /*
-        * Parsed request fields. In-line strings are zero-delimited.
-        */
-       const char *headers;
-       unsigned int headers_len;
-
-       unsigned int parsed_len;
-
-       // FTP part
-       ftp_command_t ftp_command;
-       u32 ftp_user_addr;
-       u16 ftp_user_port;
-
-       struct socket *data_sock;
-       unsigned int prev_pos;
-
-       // ls handing:
-       struct linux_dirent64 *dirp0;
-       unsigned int curroff, total;
-
-#define MAX_USERNAME_LEN 16
-       char username[MAX_USERNAME_LEN];
-       unsigned int username_len;
-
-       // HTTP part
-       http_method_t method;
-       const char *method_str;
-       unsigned int method_len;
-
-       http_version_t version;
-       const char *version_str;
-       unsigned int version_len;
-
-       /* requested URI: */
-
-       const char *uri_str;
-       unsigned int uri_len;
-
-       /* Objectname (filename/scriptname) this URI refers to: */
-
-#define MAX_OBJECTNAME_LEN 256
-       char objectname[MAX_OBJECTNAME_LEN + 4]; // space for .gz as well
-       unsigned int objectname_len;
-
-       /* Query string within the URI: */
-
-       const char *query_str;
-       unsigned int query_len;
-
-       /* Cookies: */
-
-       const char *cookies_str;
-       unsigned int cookies_len;
-       unsigned int parse_cookies;
-
-       /* Content-TYpe */
-       const char *content_type_str;
-       unsigned int content_type_len;
-
-       /* Content-Length: */
-
-       const char *contentlen_str;
-       unsigned int contentlen_len;
-       unsigned int content_len;
-
-       /* User-Agent: */
-
-       const char *user_agent_str;
-       unsigned int user_agent_len;
-
-       /* Accept: */
-
-       const char *accept_str;
-       unsigned int accept_len;
-
-       /* Accept-Charset: */
-
-       const char *accept_charset_str;
-       unsigned int accept_charset_len;
-
-       /* Accept-Language: */
-
-       const char *accept_language_str;
-       unsigned int accept_language_len;
-
-       /* Cache-Control: */
-
-       const char *cache_control_str;
-       unsigned int cache_control_len;
-
-       /* If-Modified-Since: */
-
-       const char *if_modified_since_str;
-       unsigned int if_modified_since_len;
-
-       /* If-None-Match: */
-       const char *if_none_match_str;
-       unsigned int if_none_match_len;
-
-       /* If-Range: */
-
-       const char *if_range_str;
-       unsigned int if_range_len;
-
-       /* Negotiate: */
-
-       const char *negotiate_str;
-       unsigned int negotiate_len;
-
-       /* Pragma: */
-
-       const char *pragma_str;
-       unsigned int pragma_len;
-
-       /* Referer: */
-
-       const char *referer_str;
-       unsigned int referer_len;
-
-       /* Accept-Encoding: */
-
-       const char *accept_encoding_str;
-       unsigned int accept_encoding_len;
-       unsigned int may_send_gzip;
-       unsigned int content_gzipped;
-
-       /* Host */
-
-#define MAX_HOST_LEN 128
-       char host[MAX_HOST_LEN];
-       unsigned int host_len;
-
-       /* POSTed data: */
-
-       const char *post_data_str;
-       unsigned int post_data_len;
-
-       unsigned int status;
-
-       /* the file being sent */
-
-       unsigned int bytes_sent;
-#if CONFIG_TUX_DEBUG
-       unsigned int bytes_expected;
-#endif
-       unsigned long first_timestamp;
-       unsigned int body_len;
-
-       unsigned int user_error;
-
-       char error;
-       char postponed;
-
-       char had_cachemiss;
-       char lookup_dir;
-       char lookup_404;
-
-       char keep_alive;
-       struct timer_list keepalive_timer;
-       unsigned int total_bytes;
-       struct timer_list output_timer;
-
-       unsigned int nr_keepalives;
-
-       unsigned int event;
-       u64 private;
-
-       unsigned int magic;
-       void (*real_data_ready)(struct sock *sk, int space);
-       void (*real_state_change)(struct sock *sk);
-       void (*real_write_space)(struct sock *sk);
-       void (*real_error_report)(struct sock *sk);
-       void (*real_destruct)(struct sock *sk);
-
-       void (*ftp_real_data_ready)(struct sock *sk, int space);
-       void (*ftp_real_state_change)(struct sock *sk);
-       void (*ftp_real_write_space)(struct sock *sk);
-       void (*ftp_real_error_report)(struct sock *sk);
-       void (*ftp_real_create_child)(struct sock *sk, struct sock *newsk);
-       void (*ftp_real_destruct)(struct sock *sk);
-
-#if CONFIG_TUX_EXTENDED_LOG
-       unsigned long accept_timestamp;
-       unsigned long parse_timestamp;
-       unsigned long output_timestamp;
-       unsigned long flush_timestamp;
-# define SET_TIMESTAMP(x) do { (x) = jiffies; } while (0)
-#else
-# define SET_TIMESTAMP(x) do { } while (0)
-#endif
-
-};
-
-extern void add_tux_atom (tux_req_t *req, atom_func_t *event_done);
-extern void del_tux_atom (tux_req_t *req);
-extern void tux_schedule_atom (tux_req_t *req, int cachemiss);
-extern void add_req_to_workqueue (tux_req_t *req);
-
-
-typedef struct iothread_s
-{
-       spinlock_t async_lock;
-       threadinfo_t *ti;
-       struct list_head async_queue;
-       wait_queue_head_t async_sleep;
-       unsigned int nr_async_pending;
-       unsigned int threads;
-       unsigned int shutdown;
-       wait_queue_head_t wait_shutdown;
-} iothread_t;
-
-typedef struct tux_listen_s
-{
-       tux_proto_t *proto;
-       struct socket *sock;
-       unsigned int cloned;
-} tux_listen_t;
-
-struct tux_threadinfo
-{
-       tux_req_t *userspace_req;
-       unsigned int started;
-       struct task_struct *thread;
-       iothread_t *iot;
-       wait_queue_t wait_event [CONFIG_TUX_NUMSOCKETS];
-       wait_queue_t stop;
-       unsigned int pid;
-
-       struct page *header_cache;
-       unsigned int header_offset;
-
-       unsigned int nr_requests;
-       struct list_head all_requests;
-
-       unsigned int nr_free_requests;
-       spinlock_t free_requests_lock;
-       struct list_head free_requests;
-
-       spinlock_t work_lock;
-       struct list_head work_pending;
-       struct list_head lru;
-       unsigned int nr_lru;
-
-       unsigned int listen_error;
-       tux_listen_t listen[CONFIG_TUX_NUMSOCKETS];
-
-       struct semaphore gzip_sem;
-       z_stream gzip_state;
-
-       unsigned int cpu;
-       unsigned int __padding[16];
-};
-
-typedef enum special_mimetypes {
-       NORMAL_MIME_TYPE,
-       MIME_TYPE_REDIRECT,
-       MIME_TYPE_CGI,
-       MIME_TYPE_MODULE,
-} special_mimetypes_t;
-
-#if CONFIG_TUX_DEBUG
-#if 0
-extern inline void url_hist_hit (int size)
-{
-       unsigned int idx = size/1024;
-
-       if (idx >= URL_HIST_SIZE)
-               idx = URL_HIST_SIZE-1;
-       kstat.url_hist_hits[idx]++;
-}
-extern inline void url_hist_miss (int size)
-{
-       unsigned int idx = size/1024;
-       if (idx >= URL_HIST_SIZE)
-               idx = URL_HIST_SIZE-1;
-       kstat.url_hist_misses[idx]++;
-}
-#endif
-extern void __check_req_list (tux_req_t *req, struct list_head *list);
-# define check_req_list __check_req_list
-#else
-# define check_req_list(req, list) do { } while (0)
-#endif
-
-#define url_hist_hit(size) do { } while (0)
-#define url_hist_miss(size) do { } while (0)
-
-extern char tux_common_docroot[200];
-extern char tux_http_subdocroot[200];
-extern char tux_ftp_subdocroot[200];
-extern char tux_logfile[200];
-extern char tux_cgiroot[200];
-extern char tux_404_page[200];
-extern char tux_default_vhost[200];
-extern char tux_extra_html_header[600];
-extern unsigned int tux_extra_html_header_size;
-extern int tux_cgi_uid;
-extern int tux_cgi_gid;
-extern unsigned int tux_clientport;
-extern unsigned int tux_logging;
-extern unsigned int tux_threads;
-extern unsigned int tux_keepalive_timeout;
-extern unsigned int tux_max_output_bandwidth;
-extern unsigned int tux_max_backlog;
-extern unsigned int tux_max_connect;
-extern unsigned int tux_mode_forbidden;
-extern unsigned int tux_mode_allowed;
-extern unsigned int tux_logentry_align_order;
-extern unsigned int tux_nonagle;
-extern unsigned int tux_ack_pingpong;
-extern unsigned int tux_push_all;
-extern unsigned int tux_zerocopy_parse;
-extern unsigned int tux_generate_etags;
-extern unsigned int tux_generate_last_mod;
-extern unsigned int tux_generate_cache_control;
-extern unsigned int tux_ip_logging;
-extern unsigned int tux_ftp_wait_close;
-extern unsigned int tux_ftp_log_retr_only;
-extern unsigned int tux_hide_unreadable;
-
-typedef enum virtual_server {
-       TUX_VHOST_NONE,
-       TUX_VHOST_HOST,
-       TUX_VHOST_IP,
-       TUX_VHOST_IP_HOST,
-} virtual_server_t;
-
-extern unsigned int tux_virtual_server;
-extern unsigned int mass_hosting_hash;
-extern unsigned int strip_host_tail;
-extern unsigned int tux_ftp_virtual_server;
-
-extern unsigned int tux_max_object_size;
-extern unsigned int tux_max_free_requests;
-extern unsigned int tux_defer_accept;
-
-extern struct socket * start_listening(tux_socket_t *listen, int nr);
-extern void stop_listening(struct socket **sock);
-extern void start_sysctl(void);
-extern void end_sysctl(void);
-extern void flush_request (tux_req_t *req, int cachemiss);
-extern void unlink_tux_socket (tux_req_t *req);
-extern void unlink_tux_data_socket (tux_req_t *req);
-extern void unlink_tux_listen_socket (tux_req_t *req);
-extern void link_tux_ftp_accept_socket (tux_req_t *req, struct socket *sock);
-extern void link_tux_data_socket (tux_req_t *req, struct socket *sock);
-extern void tux_push_req (tux_req_t *req);
-extern int send_sync_buf (tux_req_t *req, struct socket *sock, const char *buf, const size_t length, unsigned long flags);
-extern void __send_async_message (tux_req_t *req, const char *message, int status, unsigned int size, int push);
-#define send_async_message(req,str,status,push) \
-               __send_async_message(req,str,status,strlen(str),push)
-
-extern void send_success (tux_req_t *req, struct socket *sock);
-extern void send_async_err_not_found (tux_req_t *req);
-extern void send_async_timed_out (tux_req_t *req);
-
-extern void kfree_req (tux_req_t *req);
-extern int accept_requests (threadinfo_t *ti);
-extern int process_requests (threadinfo_t *ti, tux_req_t **user_req);
-extern int flush_freequeue (threadinfo_t * ti);
-extern int tux_flush_workqueue (threadinfo_t *ti);
-extern tux_req_t * pick_userspace_req (threadinfo_t *ti);
-extern atom_func_t redirect_request;
-extern atom_func_t parse_request;
-extern void queue_cachemiss (tux_req_t *req);
-extern int start_cachemiss_threads (threadinfo_t *ti);
-extern void stop_cachemiss_threads (threadinfo_t *ti);
-struct file * tux_open_file(char *filename, int mode);
-extern void start_log_thread (void);
-extern void stop_log_thread (void);
-extern void add_mimetype (char *new_ext, char *new_type, char *new_expire);
-extern void free_mimetypes (void);
-extern int lookup_object (tux_req_t *req, const unsigned int flag);
-extern int handle_gzip_req (tux_req_t *req, unsigned int flags);
-extern struct dentry * tux_lookup (tux_req_t *req, const char *filename, const unsigned int flag, struct vfsmount **mnt);
-extern tcapi_template_t * lookup_tuxmodule (const char *filename);
-extern int register_tuxmodule (tcapi_template_t *tcapi);
-extern tcapi_template_t * unregister_tuxmodule (char *vfs_name);
-extern tcapi_template_t * get_first_usermodule (void);
-extern int user_register_module (user_req_t *u_info);
-extern int user_unregister_module (user_req_t *u_info);
-extern void unregister_all_tuxmodules (void);
-
-typedef struct exec_param_s {
-       char *command;
-       char **argv;
-       char **envp;
-       unsigned int pipe_fds;
-} exec_param_t;
-
-extern pid_t tux_exec_process (char *command, char **argv, char **envp, int pipe_fds, exec_param_t *param, int wait);
-
-extern void start_external_cgi (tux_req_t *req);
-extern tcapi_template_t extcgi_tcapi;
-
-extern void queue_output_req (tux_req_t *req, threadinfo_t *ti);
-extern void queue_userspace_req (tux_req_t *req, threadinfo_t *ti);
-
-
-extern void __log_request (tux_req_t *req);
-extern inline void log_request (tux_req_t *req)
-{
-       if (tux_logging)
-               __log_request(req);
-}
-
-extern int __connection_too_fast (tux_req_t *req);
-
-#define connection_too_fast(req)                               \
-       ({                                                      \
-               int __ret = 1;                                  \
-               if (unlikely(tux_max_output_bandwidth))         \
-                       __ret = __connection_too_fast(req);     \
-               __ret;                                          \
-       })
-
-extern void trunc_headers (tux_req_t *req);
-extern int generic_send_file (tux_req_t *req, struct socket *sock, int cachemiss);
-extern int tux_fetch_file (tux_req_t *req, int nonblock);
-
-extern void postpone_request (tux_req_t *req);
-extern int continue_request (int fd);
-extern void tux_push_pending (struct sock *sk);
-extern void zap_request (tux_req_t *req, int cachemiss);
-extern int add_output_space_event (tux_req_t *req, struct socket *sock);
-
-extern void reap_kids (void);
-extern void unuse_frag (struct sk_buff *skb, skb_frag_t *frag);
-extern skb_frag_t * build_dynbuf_frag (tux_req_t *req, unsigned int size);
-extern int tux_permission (struct inode *inode);
-extern void flush_all_signals (void);
-
-#define D() Dprintk("{%s:%d}\n", __FILE__, __LINE__)
-
-extern int nr_async_io_pending (void);
-
-extern void __add_keepalive_timer (tux_req_t *req);
-#define add_keepalive_timer(req)                                       \
-do {                                                                   \
-       if (tux_keepalive_timeout) {                                    \
-               Dprintk("add_keepalive_timer(%p).\n", (req));           \
-               __add_keepalive_timer(req);                             \
-       }                                                               \
-} while (0)
-extern void __del_keepalive_timer (tux_req_t *req);
-#define del_keepalive_timer(req)                                       \
-do {                                                                   \
-       if (tux_keepalive_timeout) {                                    \
-               Dprintk("del_keepalive_timer(%p).\n", (req));           \
-               __del_keepalive_timer(req);                             \
-       }                                                               \
-} while (0)
-
-extern void del_output_timer (tux_req_t *req);
-extern void output_timeout (tux_req_t *req);
-
-extern void print_req (tux_req_t *req);
-
-extern char tux_date [DATE_LEN];
-
-
-extern int nr_async_io_pending (void);
-extern void tux_exit (void);
-extern char * get_abuf (tux_req_t *req, unsigned int max_size);
-extern void send_abuf (tux_req_t *req, unsigned int size, unsigned long flags);
-
-
-extern int idle_event (tux_req_t *req);
-extern int output_space_event (tux_req_t *req);
-extern unsigned int log_cpu_mask;
-extern unsigned int tux_compression;
-extern unsigned int tux_noid;
-extern unsigned int tux_cgi_inherit_cpu;
-extern unsigned int tux_zerocopy_header;
-extern unsigned int tux_zerocopy_sendfile;
-extern unsigned int tux_cgi_cpu_mask;
-extern tux_proto_t tux_proto_http;
-extern tux_proto_t tux_proto_ftp;
-extern unsigned int tux_all_userspace;
-extern unsigned int tux_ignore_query;
-extern unsigned int tux_redirect_logging;
-extern unsigned int tux_referer_logging;
-extern unsigned int tux_log_incomplete;
-extern unsigned int tux_max_header_len;
-extern unsigned int tux_cpu_offset;
-extern unsigned int tux_ftp_login_message;
-
-extern void drop_permissions (void);
-extern int query_extcgi (tux_req_t *req);
-extern int tux_chroot (char *dir);
-
-extern void install_req_dentry (tux_req_t *req, struct dentry *dentry, struct vfsmount *mnt);
-extern void release_req_dentry (tux_req_t *req);
-extern void unidle_req (tux_req_t *req);
-extern int nr_requests_used (void);
-
-#define req_err(req) do { (req)->error = 1; Dprintk("request %p error at %s:%d.\n", req, __FILE__, __LINE__); } while (0)
-
-#define enough_wspace(sk) (tcp_wspace(sk) >= tcp_min_write_space(sk))
-#define clear_keepalive(req) do { (req)->keep_alive = 0; Dprintk("keepalive cleared for req %p.\n", req); } while (0)
-
-extern int print_all_requests (threadinfo_t *ti);
-extern unsigned int tux_max_keepalives;
-extern int time_unix2ls (time_t zulu, char *buf);
-extern void last_mod_time(char * curr, const time_t t);
-extern int mdtm_time(char * curr, const time_t t);
-extern time_t parse_time(const char *str, const int str_len);
-
-extern unsigned int nr_tux_threads;
-extern threadinfo_t threadinfo[CONFIG_TUX_NUMTHREADS];
-
-#define switch_docroot(req) do { if (((req)->docroot_dentry != current->fs->root) || ((req)->docroot_mnt != current->fs->rootmnt)) __switch_docroot(req); } while (0)
-extern void __switch_docroot(tux_req_t *req);
-extern void list_directory (tux_req_t *req, int cachemiss);
-extern char * tux_print_path (tux_req_t *req, struct dentry *dentry, struct vfsmount *mnt, char *buf, unsigned int max_len);
-
-extern unsigned int tux_http_dir_indexing;
-
-int tux_gzip_compress (tux_req_t *req, unsigned char *data_in, unsigned char *data_out, __u32 *in_len, __u32 *out_len);
-
-struct dentry * __tux_lookup (tux_req_t *req, const char *filename,
-                         struct nameidata *base, struct vfsmount **mnt);
-
-/* error codes for req->error */
-#define TUX_ERROR_REDIRECT     1
-#define TUX_ERROR_UNUSED       2
-#define TUX_ERROR_CONN_CLOSE   3
-#define TUX_ERROR_CONN_TIMEOUT 4
-
-extern void __put_data_sock (tux_req_t *req);
-
-static inline void put_data_sock (tux_req_t *req)
-{
-       if (req->data_sock)
-               __put_data_sock(req);
-}
-
-#define socket_input(sock) \
-       (!skb_queue_empty(&(sock)->sk->sk_receive_queue) || \
-               !skb_queue_empty(&(sock)->sk->sk_error_queue))
-
-#define tux_kmalloc(size)                                              \
-({                                                                     \
-       void *__ptr;                                                    \
-                                                                       \
-       while (!(__ptr = kmalloc(size, GFP_KERNEL))) {                  \
-               if (net_ratelimit())                                    \
-                       printk(KERN_WARNING "tux: OOM at %s:%d (%d bytes).\n", \
-                               __FILE__, __LINE__, size);              \
-               current->state = TASK_UNINTERRUPTIBLE;                  \
-               schedule_timeout(1);                                    \
-       }                                                               \
-       __ptr;                                                          \
-})
-
-extern long tux_close(unsigned int fd);
-
-#endif
diff --git a/include/net/tux_u.h b/include/net/tux_u.h
deleted file mode 100644 (file)
index 24ba401..0000000
+++ /dev/null
@@ -1,163 +0,0 @@
-#ifndef _NET_TUX_U_H
-#define _NET_TUX_U_H
-
-/*
- * TUX - Integrated Application Protocols Layer and Object Cache
- *
- * Copyright (C) 2000, 2001, Ingo Molnar <mingo@redhat.com>
- *
- * tux_u.h: HTTP module API - HTTP interface to user-space
- */
-
-/*
- * Different major versions are not compatible.
- * Different minor versions are only downward compatible.
- * Different patchlevel versions are downward and upward compatible.
- */
-#define TUX_MAJOR_VERSION              3
-#define TUX_MINOR_VERSION              0
-#define TUX_PATCHLEVEL_VERSION         0
-
-#define __KERNEL_SYSCALLS__
-
-typedef enum http_versions {
-        HTTP_1_0,
-        HTTP_1_1
-} http_version_t;
-
-/*
- * Request methods known to HTTP:
- */
-typedef enum http_methods {
-        METHOD_NONE,
-        METHOD_GET,
-        METHOD_HEAD,
-        METHOD_POST,
-        METHOD_PUT,
-       NR_METHODS
-} http_method_t;
-
-enum user_req {
-       TUX_ACTION_STARTUP = 1,
-       TUX_ACTION_SHUTDOWN = 2,
-       TUX_ACTION_STARTTHREAD = 3,
-       TUX_ACTION_STOPTHREAD = 4,
-       TUX_ACTION_EVENTLOOP = 5,
-       TUX_ACTION_GET_OBJECT = 6,
-       TUX_ACTION_SEND_OBJECT = 7,
-       TUX_ACTION_READ_OBJECT = 8,
-       TUX_ACTION_FINISH_REQ = 9,
-       TUX_ACTION_FINISH_CLOSE_REQ = 10,
-       TUX_ACTION_REGISTER_MODULE = 11,
-       TUX_ACTION_UNREGISTER_MODULE = 12,
-       TUX_ACTION_CURRENT_DATE = 13,
-       TUX_ACTION_REGISTER_MIMETYPE = 14,
-       TUX_ACTION_READ_HEADERS = 15,
-       TUX_ACTION_POSTPONE_REQ = 16,
-       TUX_ACTION_CONTINUE_REQ = 17,
-       TUX_ACTION_REDIRECT_REQ = 18,
-       TUX_ACTION_READ_POST_DATA = 19,
-       TUX_ACTION_SEND_BUFFER = 20,
-       TUX_ACTION_WATCH_PROXY_SOCKET = 21,
-       TUX_ACTION_WAIT_PROXY_SOCKET = 22,
-       TUX_ACTION_QUERY_VERSION = 23,
-       MAX_TUX_ACTION
-};
-
-enum tux_ret {
-       TUX_ERROR = -1,
-       TUX_RETURN_USERSPACE_REQUEST = 0,
-       TUX_RETURN_EXIT = 1,
-       TUX_RETURN_SIGNAL = 2,
-       TUX_CONTINUE_EVENTLOOP = 3,
-};
-
-#define MAX_URI_LEN 256
-#define MAX_COOKIE_LEN 128
-#define MAX_FIELD_LEN 64
-#define DATE_LEN 30
-
-typedef struct user_req_s {
-       u32 version_major;
-       u32 version_minor;
-       u32 version_patch;
-       u32 http_version;
-       u32 http_method;
-       u32 http_status;
-
-       u32 sock;
-       u32 event;
-       u32 error;
-       u32 thread_nr;
-       u32 bytes_sent;
-       u32 client_host;
-       u32 objectlen;
-       u32 module_index;
-       u32 keep_alive;
-       u32 cookies_len;
-
-       u64 id;
-       u64 priv;
-       u64 object_addr;
-
-       u8 query[MAX_URI_LEN];
-       u8 objectname[MAX_URI_LEN];
-       u8 cookies[MAX_COOKIE_LEN];
-       u8 content_type[MAX_FIELD_LEN];
-       u8 user_agent[MAX_FIELD_LEN];
-       u8 accept[MAX_FIELD_LEN];
-       u8 accept_charset[MAX_FIELD_LEN];
-       u8 accept_encoding[MAX_FIELD_LEN];
-       u8 accept_language[MAX_FIELD_LEN];
-       u8 cache_control[MAX_FIELD_LEN];
-       u8 if_modified_since[MAX_FIELD_LEN];
-       u8 negotiate[MAX_FIELD_LEN];
-       u8 pragma[MAX_FIELD_LEN];
-       u8 referer[MAX_FIELD_LEN];
-       u8 new_date[DATE_LEN];
-       u8 pad[2];
-
-} user_req_t;
-
-typedef enum ftp_commands {
-        FTP_COMM_NONE,
-        FTP_COMM_USER,
-        FTP_COMM_PASS,
-        FTP_COMM_ACCT,
-        FTP_COMM_CWD,
-        FTP_COMM_CDUP,
-        FTP_COMM_SMNT,
-        FTP_COMM_QUIT,
-        FTP_COMM_REIN,
-        FTP_COMM_PORT,
-        FTP_COMM_PASV,
-        FTP_COMM_TYPE,
-        FTP_COMM_STRU,
-        FTP_COMM_MODE,
-        FTP_COMM_RETR,
-        FTP_COMM_SIZE,
-        FTP_COMM_MDTM,
-        FTP_COMM_STOR,
-        FTP_COMM_STOU,
-        FTP_COMM_APPE,
-        FTP_COMM_ALLO,
-        FTP_COMM_REST,
-        FTP_COMM_RNFR,
-        FTP_COMM_RNTO,
-        FTP_COMM_ABOR,
-        FTP_COMM_DELE,
-        FTP_COMM_RMD,
-        FTP_COMM_MKD,
-        FTP_COMM_PWD,
-        FTP_COMM_LIST,
-        FTP_COMM_NLST,
-        FTP_COMM_SITE,
-        FTP_COMM_SYST,
-        FTP_COMM_STAT,
-        FTP_COMM_HELP,
-        FTP_COMM_NOOP,
-        FTP_COMM_FEAT,
-        FTP_COMM_CLNT,
-} ftp_command_t;
-
-#endif
diff --git a/net/ipv4/datagram.c b/net/ipv4/datagram.c
deleted file mode 100644 (file)
index f84e104..0000000
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- *     common UDP/RAW code
- *     Linux INET implementation
- *
- * Authors:
- *     Hideaki YOSHIFUJI <yoshfuji@linux-ipv6.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.
- */
-
-#include <linux/config.h>
-#include <linux/types.h>
-#include <linux/module.h>
-#include <linux/ip.h>
-#include <linux/in.h>
-#include <net/sock.h>
-#include <net/tcp.h>
-#include <net/route.h>
-
-int ip4_datagram_connect(struct sock *sk, struct sockaddr *uaddr, int addr_len)
-{
-       struct inet_opt *inet = inet_sk(sk);
-       struct sockaddr_in *usin = (struct sockaddr_in *) uaddr;
-       struct rtable *rt;
-       u32 saddr;
-       int oif;
-       int err;
-
-       
-       if (addr_len < sizeof(*usin)) 
-               return -EINVAL;
-
-       if (usin->sin_family != AF_INET) 
-               return -EAFNOSUPPORT;
-
-       sk_dst_reset(sk);
-
-       oif = sk->sk_bound_dev_if;
-       saddr = inet->saddr;
-       if (MULTICAST(usin->sin_addr.s_addr)) {
-               if (!oif)
-                       oif = inet->mc_index;
-               if (!saddr)
-                       saddr = inet->mc_addr;
-       }
-       err = ip_route_connect(&rt, usin->sin_addr.s_addr, saddr,
-                              RT_CONN_FLAGS(sk), oif,
-                              sk->sk_protocol,
-                              inet->sport, usin->sin_port, sk);
-       if (err)
-               return err;
-       if ((rt->rt_flags & RTCF_BROADCAST) && !sock_flag(sk, SOCK_BROADCAST)) {
-               ip_rt_put(rt);
-               return -EACCES;
-       }
-       if (!inet->saddr)
-               inet->saddr = rt->rt_src;       /* Update source address */
-       if (!inet->rcv_saddr)
-               inet->rcv_saddr = rt->rt_src;
-       inet->daddr = rt->rt_dst;
-       inet->dport = usin->sin_port;
-       sk->sk_state = TCP_ESTABLISHED;
-       inet->id = jiffies;
-
-       sk_dst_set(sk, &rt->u.dst);
-       return(0);
-}
-
-EXPORT_SYMBOL(ip4_datagram_connect);
-
diff --git a/net/ipv6/xfrm6_output.c b/net/ipv6/xfrm6_output.c
deleted file mode 100644 (file)
index 712856f..0000000
+++ /dev/null
@@ -1,141 +0,0 @@
-/*
- * xfrm6_output.c - Common IPsec encapsulation code for IPv6.
- * Copyright (C) 2002 USAGI/WIDE Project
- * Copyright (c) 2004 Herbert Xu <herbert@gondor.apana.org.au>
- * 
- * 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/skbuff.h>
-#include <linux/spinlock.h>
-#include <linux/icmpv6.h>
-#include <net/inet_ecn.h>
-#include <net/ipv6.h>
-#include <net/xfrm.h>
-
-/* Add encapsulation header.
- *
- * In transport mode, the IP header and mutable extension headers will be moved
- * forward to make space for the encapsulation header.
- *
- * In tunnel mode, the top IP header will be constructed per RFC 2401.
- * The following fields in it shall be filled in by x->type->output:
- *     payload_len
- *
- * On exit, skb->h will be set to the start of the encapsulation header to be
- * filled in by x->type->output and skb->nh will be set to the nextheader field
- * of the extension header directly preceding the encapsulation header, or in
- * its absence, that of the top IP header.  The value of skb->data will always
- * point to the top IP header.
- */
-static void xfrm6_encap(struct sk_buff *skb)
-{
-       struct dst_entry *dst = skb->dst;
-       struct xfrm_state *x = dst->xfrm;
-       struct ipv6hdr *iph, *top_iph;
-
-       skb_push(skb, x->props.header_len);
-       iph = skb->nh.ipv6h;
-
-       if (!x->props.mode) {
-               u8 *prevhdr;
-               int hdr_len;
-
-               hdr_len = ip6_find_1stfragopt(skb, &prevhdr);
-               skb->nh.raw = prevhdr - x->props.header_len;
-               skb->h.raw = skb->data + hdr_len;
-               memmove(skb->data, iph, hdr_len);
-               return;
-       }
-
-       skb->nh.raw = skb->data;
-       top_iph = skb->nh.ipv6h;
-       skb->nh.raw = &top_iph->nexthdr;
-       skb->h.ipv6h = top_iph + 1;
-
-       top_iph->version = 6;
-       top_iph->priority = iph->priority;
-       if (x->props.flags & XFRM_STATE_NOECN)
-               IP6_ECN_clear(top_iph);
-       top_iph->flow_lbl[0] = iph->flow_lbl[0];
-       top_iph->flow_lbl[1] = iph->flow_lbl[1];
-       top_iph->flow_lbl[2] = iph->flow_lbl[2];
-       top_iph->nexthdr = IPPROTO_IPV6; 
-       top_iph->hop_limit = iph->hop_limit;
-       ipv6_addr_copy(&top_iph->saddr, (struct in6_addr *)&x->props.saddr);
-       ipv6_addr_copy(&top_iph->daddr, (struct in6_addr *)&x->id.daddr);
-}
-
-static int xfrm6_tunnel_check_size(struct sk_buff *skb)
-{
-       int mtu, ret = 0;
-       struct dst_entry *dst = skb->dst;
-
-       mtu = dst_pmtu(dst) - sizeof(struct ipv6hdr);
-       if (mtu < IPV6_MIN_MTU)
-               mtu = IPV6_MIN_MTU;
-
-       if (skb->len > mtu) {
-               icmpv6_send(skb, ICMPV6_PKT_TOOBIG, 0, mtu, skb->dev);
-               ret = -EMSGSIZE;
-       }
-
-       return ret;
-}
-
-int xfrm6_output(struct sk_buff **pskb)
-{
-       struct sk_buff *skb = *pskb;
-       struct dst_entry *dst = skb->dst;
-       struct xfrm_state *x = dst->xfrm;
-       int err;
-       
-       if (skb->ip_summed == CHECKSUM_HW) {
-               err = skb_checksum_help(pskb, 0);
-               skb = *pskb;
-               if (err)
-                       goto error_nolock;
-       }
-
-       spin_lock_bh(&x->lock);
-       err = xfrm_state_check(x, skb);
-       if (err)
-               goto error;
-
-       if (x->props.mode) {
-               err = xfrm6_tunnel_check_size(skb);
-               if (err)
-                       goto error;
-       }
-
-       xfrm6_encap(skb);
-
-       err = x->type->output(pskb);
-       skb = *pskb;
-       if (err)
-               goto error;
-
-       x->curlft.bytes += skb->len;
-       x->curlft.packets++;
-
-       spin_unlock_bh(&x->lock);
-
-       skb->nh.raw = skb->data;
-       
-       if (!(skb->dst = dst_pop(dst))) {
-               err = -EHOSTUNREACH;
-               goto error_nolock;
-       }
-       err = NET_XMIT_BYPASS;
-
-out_exit:
-       return err;
-error:
-       spin_unlock_bh(&x->lock);
-error_nolock:
-       kfree_skb(skb);
-       goto out_exit;
-}
diff --git a/net/irda/crc.c b/net/irda/crc.c
deleted file mode 100644 (file)
index b79b59a..0000000
+++ /dev/null
@@ -1,68 +0,0 @@
-/*********************************************************************
- *                
- * Filename:      crc.c
- * Version:       0.1
- * Description:   CRC calculation routines
- * Status:        Experimental.
- * Author:        Dag Brattli <dagb@cs.uit.no>
- * Created at:    Mon Aug  4 20:40:53 1997
- * Modified at:   Sun May  2 20:28:08 1999
- * Modified by:   Dag Brattli <dagb@cs.uit.no>
- * Sources:       ppp.c by Michael Callahan <callahan@maths.ox.ac.uk>
- *                Al Longyear <longyear@netcom.com>
- *
- ********************************************************************/
-
-#include <net/irda/crc.h>
-#include <linux/module.h>
-
-/*
- * This mysterious table is just the CRC of each possible byte.  It can be
- * computed using the standard bit-at-a-time methods.  The polynomial can
- * be seen in entry 128, 0x8408.  This corresponds to x^0 + x^5 + x^12.
- * Add the implicit x^16, and you have the standard CRC-CCITT.
- */
-__u16 const irda_crc16_table[256] =
-{
-       0x0000, 0x1189, 0x2312, 0x329b, 0x4624, 0x57ad, 0x6536, 0x74bf,
-       0x8c48, 0x9dc1, 0xaf5a, 0xbed3, 0xca6c, 0xdbe5, 0xe97e, 0xf8f7,
-       0x1081, 0x0108, 0x3393, 0x221a, 0x56a5, 0x472c, 0x75b7, 0x643e,
-       0x9cc9, 0x8d40, 0xbfdb, 0xae52, 0xdaed, 0xcb64, 0xf9ff, 0xe876,
-       0x2102, 0x308b, 0x0210, 0x1399, 0x6726, 0x76af, 0x4434, 0x55bd,
-       0xad4a, 0xbcc3, 0x8e58, 0x9fd1, 0xeb6e, 0xfae7, 0xc87c, 0xd9f5,
-       0x3183, 0x200a, 0x1291, 0x0318, 0x77a7, 0x662e, 0x54b5, 0x453c,
-       0xbdcb, 0xac42, 0x9ed9, 0x8f50, 0xfbef, 0xea66, 0xd8fd, 0xc974,
-       0x4204, 0x538d, 0x6116, 0x709f, 0x0420, 0x15a9, 0x2732, 0x36bb,
-       0xce4c, 0xdfc5, 0xed5e, 0xfcd7, 0x8868, 0x99e1, 0xab7a, 0xbaf3,
-       0x5285, 0x430c, 0x7197, 0x601e, 0x14a1, 0x0528, 0x37b3, 0x263a,
-       0xdecd, 0xcf44, 0xfddf, 0xec56, 0x98e9, 0x8960, 0xbbfb, 0xaa72,
-       0x6306, 0x728f, 0x4014, 0x519d, 0x2522, 0x34ab, 0x0630, 0x17b9,
-       0xef4e, 0xfec7, 0xcc5c, 0xddd5, 0xa96a, 0xb8e3, 0x8a78, 0x9bf1,
-       0x7387, 0x620e, 0x5095, 0x411c, 0x35a3, 0x242a, 0x16b1, 0x0738,
-       0xffcf, 0xee46, 0xdcdd, 0xcd54, 0xb9eb, 0xa862, 0x9af9, 0x8b70,
-       0x8408, 0x9581, 0xa71a, 0xb693, 0xc22c, 0xd3a5, 0xe13e, 0xf0b7,
-       0x0840, 0x19c9, 0x2b52, 0x3adb, 0x4e64, 0x5fed, 0x6d76, 0x7cff,
-       0x9489, 0x8500, 0xb79b, 0xa612, 0xd2ad, 0xc324, 0xf1bf, 0xe036,
-       0x18c1, 0x0948, 0x3bd3, 0x2a5a, 0x5ee5, 0x4f6c, 0x7df7, 0x6c7e,
-       0xa50a, 0xb483, 0x8618, 0x9791, 0xe32e, 0xf2a7, 0xc03c, 0xd1b5,
-       0x2942, 0x38cb, 0x0a50, 0x1bd9, 0x6f66, 0x7eef, 0x4c74, 0x5dfd,
-       0xb58b, 0xa402, 0x9699, 0x8710, 0xf3af, 0xe226, 0xd0bd, 0xc134,
-       0x39c3, 0x284a, 0x1ad1, 0x0b58, 0x7fe7, 0x6e6e, 0x5cf5, 0x4d7c,
-       0xc60c, 0xd785, 0xe51e, 0xf497, 0x8028, 0x91a1, 0xa33a, 0xb2b3,
-       0x4a44, 0x5bcd, 0x6956, 0x78df, 0x0c60, 0x1de9, 0x2f72, 0x3efb,
-       0xd68d, 0xc704, 0xf59f, 0xe416, 0x90a9, 0x8120, 0xb3bb, 0xa232,
-       0x5ac5, 0x4b4c, 0x79d7, 0x685e, 0x1ce1, 0x0d68, 0x3ff3, 0x2e7a,
-       0xe70e, 0xf687, 0xc41c, 0xd595, 0xa12a, 0xb0a3, 0x8238, 0x93b1,
-       0x6b46, 0x7acf, 0x4854, 0x59dd, 0x2d62, 0x3ceb, 0x0e70, 0x1ff9,
-       0xf78f, 0xe606, 0xd49d, 0xc514, 0xb1ab, 0xa022, 0x92b9, 0x8330,
-       0x7bc7, 0x6a4e, 0x58d5, 0x495c, 0x3de3, 0x2c6a, 0x1ef1, 0x0f78
-};
-EXPORT_SYMBOL(irda_crc16_table);
-
-__u16 irda_calc_crc16( __u16 fcs, __u8 const *buf, size_t len) 
-{
-       while (len--)
-                fcs = irda_fcs(fcs, *buf++);
-       return fcs;
-}
-EXPORT_SYMBOL(irda_calc_crc16);
diff --git a/net/sched/sch_csz.c b/net/sched/sch_csz.c
deleted file mode 100644 (file)
index 3d9a553..0000000
+++ /dev/null
@@ -1,1057 +0,0 @@
-/*
- * net/sched/sch_csz.c Clark-Shenker-Zhang scheduler.
- *
- *             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.
- *
- * Authors:    Alexey Kuznetsov, <kuznet@ms2.inr.ac.ru>
- *
- */
-
-#include <linux/config.h>
-#include <linux/module.h>
-#include <asm/uaccess.h>
-#include <asm/system.h>
-#include <asm/bitops.h>
-#include <linux/types.h>
-#include <linux/kernel.h>
-#include <linux/jiffies.h>
-#include <linux/string.h>
-#include <linux/mm.h>
-#include <linux/socket.h>
-#include <linux/sockios.h>
-#include <linux/in.h>
-#include <linux/errno.h>
-#include <linux/interrupt.h>
-#include <linux/if_ether.h>
-#include <linux/inet.h>
-#include <linux/netdevice.h>
-#include <linux/etherdevice.h>
-#include <linux/notifier.h>
-#include <net/ip.h>
-#include <net/route.h>
-#include <linux/skbuff.h>
-#include <net/sock.h>
-#include <net/pkt_sched.h>
-
-
-/*     Clark-Shenker-Zhang algorithm.
-       =======================================
-
-       SOURCE.
-
-       David D. Clark, Scott Shenker and Lixia Zhang
-       "Supporting Real-Time Applications in an Integrated Services Packet
-       Network: Architecture and Mechanism".
-
-       CBQ presents a flexible universal algorithm for packet scheduling,
-       but it has pretty poor delay characteristics.
-       Round-robin scheduling and link-sharing goals
-       apparently contradict minimization of network delay and jitter.
-       Moreover, correct handling of predictive flows seems to be
-       impossible in CBQ.
-
-       CSZ presents a more precise but less flexible and less efficient
-       approach. As I understand it, the main idea is to create
-       WFQ flows for each guaranteed service and to allocate
-       the rest of bandwidth to dummy flow-0. Flow-0 comprises
-       the predictive services and the best effort traffic;
-       it is handled by a priority scheduler with the highest
-       priority band allocated for predictive services, and the rest ---
-       to the best effort packets.
-
-       Note that in CSZ flows are NOT limited to their bandwidth.  It
-       is supposed that the flow passed admission control at the edge
-       of the QoS network and it doesn't need further shaping. Any
-       attempt to improve the flow or to shape it to a token bucket
-       at intermediate hops will introduce undesired delays and raise
-       jitter.
-
-       At the moment CSZ is the only scheduler that provides
-       true guaranteed service. Another schemes (including CBQ)
-       do not provide guaranteed delay and randomize jitter.
-       There is a proof (Sally Floyd), that delay
-       can be estimated by a IntServ compliant formula.
-       This result is true formally, but it is wrong in principle.
-       It takes into account only round-robin delays,
-       ignoring delays introduced by link sharing i.e. overlimiting.
-       Note that temporary overlimits are inevitable because
-       real links are not ideal, and the real algorithm must take this
-       into account.
-
-        ALGORITHM.
-
-       --- Notations.
-
-       $B$ is link bandwidth (bits/sec).
-
-       $I$ is set of all flows, including flow $0$.
-       Every flow $a \in I$ has associated bandwidth slice $r_a < 1$ and
-       $\sum_{a \in I} r_a = 1$.
-
-       --- Flow model.
-
-       Let $m_a$ is the number of backlogged bits in flow $a$.
-       The flow is {\em active}, if $m_a > 0$.
-       This number is a discontinuous function of time;
-       when a packet $i$ arrives:
-       \[
-       m_a(t_i+0) - m_a(t_i-0) = L^i,
-       \]
-       where $L^i$ is the length of the arrived packet.
-       The flow queue is drained continuously until $m_a == 0$:
-       \[
-       {d m_a \over dt} = - { B r_a \over \sum_{b \in A} r_b}.
-       \]
-       I.e. flow rates are their allocated rates proportionally
-       scaled to take all available link bandwidth. Apparently,
-       it is not the only possible policy. F.e. CBQ classes
-       without borrowing would be modelled by:
-       \[
-       {d m_a \over dt} = - B r_a .
-       \]
-       More complicated hierarchical bandwidth allocation
-       policies are possible, but unfortunately, the basic
-       flow equations have a simple solution only for proportional
-       scaling.
-
-       --- Departure times.
-
-       We calculate the time until the last bit of packet is sent:
-       \[
-       E_a^i(t) = { m_a(t_i) - \delta_a(t) \over r_a },
-       \]
-       where $\delta_a(t)$ is number of bits drained since $t_i$.
-       We have to evaluate $E_a^i$ for all queued packets,
-       then find the packet with minimal $E_a^i$ and send it.
-
-       This sounds good, but direct implementation of the algorithm
-       is absolutely infeasible. Luckily, if flow rates
-       are scaled proportionally, the equations have a simple solution.
-       
-       The differential equation for $E_a^i$ is
-       \[
-       {d E_a^i (t) \over dt } = - { d \delta_a(t) \over dt} { 1 \over r_a} =
-       { B \over \sum_{b \in A} r_b}
-       \]
-       with initial condition
-       \[
-       E_a^i (t_i) = { m_a(t_i) \over r_a } .
-       \]
-
-       Let's introduce an auxiliary function $R(t)$:
-
-       --- Round number.
-
-       Consider the following model: we rotate over active flows,
-       sending $r_a B$ bits from every flow, so that we send
-       $B \sum_{a \in A} r_a$ bits per round, that takes
-       $\sum_{a \in A} r_a$ seconds.
-       
-       Hence, $R(t)$ (round number) is a monotonically increasing
-       linear function of time when $A$ is not changed
-       \[
-       { d R(t) \over dt } = { 1 \over \sum_{a \in A} r_a }
-       \]
-       and it is continuous when $A$ changes.
-
-       The central observation is that the quantity
-       $F_a^i = R(t) + E_a^i(t)/B$ does not depend on time at all!
-       $R(t)$ does not depend on flow, so that $F_a^i$ can be
-       calculated only once on packet arrival, and we need not
-       recalculate $E$ numbers and resorting queues.
-       The number $F_a^i$ is called finish number of the packet.
-       It is just the value of $R(t)$ when the last bit of packet
-       is sent out.
-
-       Maximal finish number on flow is called finish number of flow
-       and minimal one is "start number of flow".
-       Apparently, flow is active if and only if $F_a \leq R$.
-
-       When a packet of length $L_i$ bit arrives to flow $a$ at time $t_i$,
-       we calculate $F_a^i$ as:
-
-       If flow was inactive ($F_a < R$):
-       $F_a^i = R(t) + {L_i \over B r_a}$
-       otherwise
-       $F_a^i = F_a + {L_i \over B r_a}$
-
-       These equations complete the algorithm specification.
-
-       It looks pretty hairy, but there is a simple
-       procedure for solving these equations.
-       See procedure csz_update(), that is a generalization of
-       the algorithm from S. Keshav's thesis Chapter 3
-       "Efficient Implementation of Fair Queuing".
-
-       NOTES.
-
-       * We implement only the simplest variant of CSZ,
-       when flow-0 is a explicit 4band priority fifo.
-       This is bad, but we need a "peek" operation in addition
-       to "dequeue" to implement complete CSZ.
-       I do not want to do that, unless it is absolutely
-       necessary.
-       
-       * A primitive support for token bucket filtering
-       presents itself too. It directly contradicts CSZ, but
-       even though the Internet is on the globe ... :-)
-       "the edges of the network" really exist.
-       
-       BUGS.
-
-       * Fixed point arithmetic is overcomplicated, suboptimal and even
-       wrong. Check it later.  */
-
-
-/* This number is arbitrary */
-
-#define CSZ_GUARANTEED         16
-#define CSZ_FLOWS              (CSZ_GUARANTEED+4)
-
-struct csz_head
-{
-       struct csz_head         *snext;
-       struct csz_head         *sprev;
-       struct csz_head         *fnext;
-       struct csz_head         *fprev;
-};
-
-struct csz_flow
-{
-       struct csz_head         *snext;
-       struct csz_head         *sprev;
-       struct csz_head         *fnext;
-       struct csz_head         *fprev;
-
-/* Parameters */
-       struct tc_ratespec      rate;
-       struct tc_ratespec      slice;
-       u32                     *L_tab; /* Lookup table for L/(B*r_a) values */
-       unsigned long           limit;  /* Maximal length of queue */
-#ifdef CSZ_PLUS_TBF
-       struct tc_ratespec      peakrate;
-       __u32                   buffer; /* Depth of token bucket, normalized
-                                          as L/(B*r_a) */
-       __u32                   mtu;
-#endif
-
-/* Variables */
-#ifdef CSZ_PLUS_TBF
-       unsigned long           tokens; /* Tokens number: usecs */
-       psched_time_t           t_tbf;
-       unsigned long           R_tbf;
-       int                     throttled;
-#endif
-       unsigned                peeked;
-       unsigned long           start;  /* Finish number of the first skb */
-       unsigned long           finish; /* Finish number of the flow */
-
-       struct sk_buff_head     q;      /* FIFO queue */
-};
-
-#define L2R(f,L) ((f)->L_tab[(L)>>(f)->slice.cell_log])
-
-struct csz_sched_data
-{
-/* Parameters */
-       unsigned char   rate_log;       /* fixed point position for rate;
-                                        * really we need not it */
-       unsigned char   R_log;          /* fixed point position for round number */
-       unsigned char   delta_log;      /* 1<<delta_log is maximal timeout in usecs;
-                                        * 21 <-> 2.1sec is MAXIMAL value */
-
-/* Variables */
-       struct tcf_proto *filter_list;
-       u8      prio2band[TC_PRIO_MAX+1];
-#ifdef CSZ_PLUS_TBF
-       struct timer_list wd_timer;
-       long            wd_expires;
-#endif
-       psched_time_t   t_c;            /* Time check-point */
-       unsigned long   R_c;            /* R-number check-point */
-       unsigned long   rate;           /* Current sum of rates of active flows */
-       struct csz_head s;              /* Flows sorted by "start" */
-       struct csz_head f;              /* Flows sorted by "finish"     */
-
-       struct sk_buff_head     other[4];/* Predicted (0) and the best efforts
-                                           classes (1,2,3) */
-       struct csz_flow flow[CSZ_GUARANTEED]; /* Array of flows */
-};
-
-/* These routines (csz_insert_finish and csz_insert_start) are
-   the most time consuming part of all the algorithm.
-
-   We insert to sorted list, so that time
-   is linear with respect to number of active flows in the worst case.
-   Note that we have not very large number of guaranteed flows,
-   so that logarithmic algorithms (heap etc.) are useless,
-   they are slower than linear one when length of list <= 32.
-
-   Heap would take sence if we used WFQ for best efforts
-   flows, but SFQ is better choice in this case.
- */
-
-
-/* Insert flow "this" to the list "b" before
-   flow with greater finish number.
- */
-
-#if 0
-/* Scan forward */
-static inline void csz_insert_finish(struct csz_head *b,
-                                    struct csz_flow *this)
-{
-       struct csz_head *f = b->fnext;
-       unsigned long finish = this->finish;
-
-       while (f != b) {
-               if (((struct csz_flow*)f)->finish - finish > 0)
-                       break;
-               f = f->fnext;
-       }
-       this->fnext = f;
-       this->fprev = f->fprev;
-       this->fnext->fprev = this->fprev->fnext = (struct csz_head*)this;
-}
-#else
-/* Scan backward */
-static inline void csz_insert_finish(struct csz_head *b,
-                                    struct csz_flow *this)
-{
-       struct csz_head *f = b->fprev;
-       unsigned long finish = this->finish;
-
-       while (f != b) {
-               if (((struct csz_flow*)f)->finish - finish <= 0)
-                       break;
-               f = f->fprev;
-       }
-       this->fnext = f->fnext;
-       this->fprev = f;
-       this->fnext->fprev = this->fprev->fnext = (struct csz_head*)this;
-}
-#endif
-
-/* Insert flow "this" to the list "b" before
-   flow with greater start number.
- */
-
-static inline void csz_insert_start(struct csz_head *b,
-                                   struct csz_flow *this)
-{
-       struct csz_head *f = b->snext;
-       unsigned long start = this->start;
-
-       while (f != b) {
-               if (((struct csz_flow*)f)->start - start > 0)
-                       break;
-               f = f->snext;
-       }
-       this->snext = f;
-       this->sprev = f->sprev;
-       this->snext->sprev = this->sprev->snext = (struct csz_head*)this;
-}
-
-
-/* Calculate and return current round number.
-   It is another time consuming part, but
-   it is impossible to avoid it.
-
-   It costs O(N) that make all the algorithm useful only
-   to play with closest to ideal fluid model.
-
-   There exist less academic, but more practical modifications,
-   which might have even better characteristics (WF2Q+, HPFQ, HFSC)
- */
-
-static unsigned long csz_update(struct Qdisc *sch)
-{
-       struct csz_sched_data   *q = (struct csz_sched_data*)sch->data;
-       struct csz_flow         *a;
-       unsigned long           F;
-       unsigned long           tmp;
-       psched_time_t           now;
-       unsigned long           delay;
-       unsigned long           R_c;
-
-       PSCHED_GET_TIME(now);
-       delay = PSCHED_TDIFF_SAFE(now, q->t_c, 0, goto do_reset);
-
-       if (delay>>q->delta_log) {
-do_reset:
-               /* Delta is too large.
-                  It is possible if MTU/BW > 1<<q->delta_log
-                  (i.e. configuration error) or because of hardware
-                  fault. We have no choice...
-                */
-               qdisc_reset(sch);
-               return 0;
-       }
-
-       q->t_c = now;
-
-       for (;;) {
-               a = (struct csz_flow*)q->f.fnext;
-
-               /* No more active flows. Reset R and exit. */
-               if (a == (struct csz_flow*)&q->f) {
-#ifdef CSZ_DEBUG
-                       if (q->rate) {
-                               printk("csz_update: rate!=0 on inactive csz\n");
-                               q->rate = 0;
-                       }
-#endif
-                       q->R_c = 0;
-                       return 0;
-               }
-
-               F = a->finish;
-
-#ifdef CSZ_DEBUG
-               if (q->rate == 0) {
-                       printk("csz_update: rate=0 on active csz\n");
-                       goto do_reset;
-               }
-#endif
-
-               /*
-                *           tmp = (t - q->t_c)/q->rate;
-                */
-
-               tmp = ((delay<<(31-q->delta_log))/q->rate)>>(31-q->delta_log+q->R_log);
-
-               tmp += q->R_c;
-
-               /* OK, this flow (and all flows with greater
-                  finish numbers) is still active */
-               if (F - tmp > 0)
-                       break;
-
-               /* It is more not active */
-
-               a->fprev->fnext = a->fnext;
-               a->fnext->fprev = a->fprev;
-
-               /*
-                * q->t_c += (F - q->R_c)*q->rate
-                */
-
-               tmp = ((F-q->R_c)*q->rate)<<q->R_log;
-               R_c = F;
-               q->rate -= a->slice.rate;
-
-               if ((long)(delay - tmp) >= 0) {
-                       delay -= tmp;
-                       continue;
-               }
-               delay = 0;
-       }
-
-       q->R_c = tmp;
-       return tmp;
-}
-
-unsigned csz_classify(struct sk_buff *skb, struct csz_sched_data *q)
-{
-       return CSZ_GUARANTEED;
-}
-
-static int
-csz_enqueue(struct sk_buff *skb, struct Qdisc* sch)
-{
-       struct csz_sched_data *q = (struct csz_sched_data *)sch->data;
-       unsigned flow_id = csz_classify(skb, q);
-       unsigned long R;
-       int prio = 0;
-       struct csz_flow *this;
-
-       if (flow_id >= CSZ_GUARANTEED) {
-               prio = flow_id - CSZ_GUARANTEED;
-               flow_id = 0;
-       }
-
-       this = &q->flow[flow_id];
-       if (this->q.qlen >= this->limit || this->L_tab == NULL) {
-               sch->stats.drops++;
-               kfree_skb(skb);
-               return NET_XMIT_DROP;
-       }
-
-       R = csz_update(sch);
-
-       if ((long)(this->finish - R) >= 0) {
-               /* It was active */
-               this->finish += L2R(this,skb->len);
-       } else {
-               /* It is inactive; activate it */
-               this->finish = R + L2R(this,skb->len);
-               q->rate += this->slice.rate;
-               csz_insert_finish(&q->f, this);
-       }
-
-       /* If this flow was empty, remember start number
-          and insert it into start queue */
-       if (this->q.qlen == 0) {
-               this->start = this->finish;
-               csz_insert_start(&q->s, this);
-       }
-       if (flow_id)
-               skb_queue_tail(&this->q, skb);
-       else
-               skb_queue_tail(&q->other[prio], skb);
-       sch->q.qlen++;
-       sch->stats.bytes += skb->len;
-       sch->stats.packets++;
-       return 0;
-}
-
-static __inline__ struct sk_buff *
-skb_dequeue_best(struct csz_sched_data * q)
-{
-       int i;
-       struct sk_buff *skb;
-
-       for (i=0; i<4; i++) {
-               skb = skb_dequeue(&q->other[i]);
-               if (skb) {
-                       q->flow[0].q.qlen--;
-                       return skb;
-               }
-       }
-       return NULL;
-}
-
-static __inline__ struct sk_buff *
-skb_peek_best(struct csz_sched_data * q)
-{
-       int i;
-       struct sk_buff *skb;
-
-       for (i=0; i<4; i++) {
-               skb = skb_peek(&q->other[i]);
-               if (skb)
-                       return skb;
-       }
-       return NULL;
-}
-
-#ifdef CSZ_PLUS_TBF
-
-static void csz_watchdog(unsigned long arg)
-{
-       struct Qdisc *sch = (struct Qdisc*)arg;
-
-       qdisc_wakeup(sch->dev);
-}
-
-static __inline__ void
-csz_move_queue(struct csz_flow *this, long delta)
-{
-       this->fprev->fnext = this->fnext;
-       this->fnext->fprev = this->fprev;
-
-       this->start += delta;
-       this->finish += delta;
-
-       csz_insert_finish(this);
-}
-
-static __inline__ int csz_enough_tokens(struct csz_sched_data *q,
-                                       struct csz_flow *this,
-                                       struct sk_buff *skb)
-{
-       long toks;
-       long shift;
-       psched_time_t now;
-
-       PSCHED_GET_TIME(now);
-
-       toks = PSCHED_TDIFF(now, t_tbf) + this->tokens - L2R(q,this,skb->len);
-
-       shift = 0;
-       if (this->throttled) {
-               /* Remember aposteriory delay */
-
-               unsigned long R = csz_update(q);
-               shift = R - this->R_tbf;
-               this->R_tbf = R;
-       }
-
-       if (toks >= 0) {
-               /* Now we have enough tokens to proceed */
-
-               this->tokens = toks <= this->depth ? toks : this->depth;
-               this->t_tbf = now;
-       
-               if (!this->throttled)
-                       return 1;
-
-               /* Flow was throttled. Update its start&finish numbers
-                  with delay calculated aposteriori.
-                */
-
-               this->throttled = 0;
-               if (shift > 0)
-                       csz_move_queue(this, shift);
-               return 1;
-       }
-
-       if (!this->throttled) {
-               /* Flow has just been throttled; remember
-                  current round number to calculate aposteriori delay
-                */
-               this->throttled = 1;
-               this->R_tbf = csz_update(q);
-       }
-
-       /* Move all the queue to the time when it will be allowed to send.
-          We should translate time to round number, but it is impossible,
-          so that we made the most conservative estimate i.e. we suppose
-          that only this flow is active and, hence, R = t.
-          Really toks <= R <= toks/r_a.
-
-          This apriory shift in R will be adjusted later to reflect
-          real delay. We cannot avoid it because of:
-          - throttled flow continues to be active from the viewpoint
-            of CSZ, so that it would acquire the highest priority,
-            if you not adjusted start numbers.
-          - Eventually, finish number would become less than round
-            number and flow were declared inactive.
-        */
-
-       toks = -toks;
-
-       /* Remember, that we should start watchdog */
-       if (toks < q->wd_expires)
-               q->wd_expires = toks;
-
-       toks >>= q->R_log;
-       shift += toks;
-       if (shift > 0) {
-               this->R_tbf += toks;
-               csz_move_queue(this, shift);
-       }
-       csz_insert_start(this);
-       return 0;
-}
-#endif
-
-
-static struct sk_buff *
-csz_dequeue(struct Qdisc* sch)
-{
-       struct csz_sched_data *q = (struct csz_sched_data *)sch->data;
-       struct sk_buff *skb;
-       struct csz_flow *this;
-
-#ifdef CSZ_PLUS_TBF
-       q->wd_expires = 0;
-#endif
-       this = (struct csz_flow*)q->s.snext;
-
-       while (this != (struct csz_flow*)&q->s) {
-
-               /* First of all: unlink from start list */
-               this->sprev->snext = this->snext;
-               this->snext->sprev = this->sprev;
-
-               if (this != &q->flow[0]) {      /* Guaranteed flow */
-                       skb = __skb_dequeue(&this->q);
-                       if (skb) {
-#ifdef CSZ_PLUS_TBF
-                               if (this->depth) {
-                                       if (!csz_enough_tokens(q, this, skb))
-                                               continue;
-                               }
-#endif
-                               if (this->q.qlen) {
-                                       struct sk_buff *nskb = skb_peek(&this->q);
-                                       this->start += L2R(this,nskb->len);
-                                       csz_insert_start(&q->s, this);
-                               }
-                               sch->q.qlen--;
-                               return skb;
-                       }
-               } else {        /* Predicted or best effort flow */
-                       skb = skb_dequeue_best(q);
-                       if (skb) {
-                               unsigned peeked = this->peeked;
-                               this->peeked = 0;
-
-                               if (--this->q.qlen) {
-                                       struct sk_buff *nskb;
-                                       unsigned dequeued = L2R(this,skb->len);
-
-                                       /* We got not the same thing that
-                                          peeked earlier; adjust start number
-                                          */
-                                       if (peeked != dequeued && peeked)
-                                               this->start += dequeued - peeked;
-
-                                       nskb = skb_peek_best(q);
-                                       peeked = L2R(this,nskb->len);
-                                       this->start += peeked;
-                                       this->peeked = peeked;
-                                       csz_insert_start(&q->s, this);
-                               }
-                               sch->q.qlen--;
-                               return skb;
-                       }
-               }
-       }
-#ifdef CSZ_PLUS_TBF
-       /* We are about to return no skb.
-          Schedule watchdog timer, if it occurred because of shaping.
-        */
-       if (q->wd_expires) {
-               unsigned long delay = PSCHED_US2JIFFIE(q->wd_expires);
-               if (delay == 0)
-                       delay = 1;
-               mod_timer(&q->wd_timer, jiffies + delay);
-               sch->stats.overlimits++;
-       }
-#endif
-       return NULL;
-}
-
-static void
-csz_reset(struct Qdisc* sch)
-{
-       struct csz_sched_data *q = (struct csz_sched_data *)sch->data;
-       int    i;
-
-       for (i=0; i<4; i++)
-               skb_queue_purge(&q->other[i]);
-
-       for (i=0; i<CSZ_GUARANTEED; i++) {
-               struct csz_flow *this = q->flow + i;
-               skb_queue_purge(&this->q);
-               this->snext = this->sprev =
-               this->fnext = this->fprev = (struct csz_head*)this;
-               this->start = this->finish = 0;
-       }
-       q->s.snext = q->s.sprev = &q->s;
-       q->f.fnext = q->f.fprev = &q->f;
-       q->R_c = 0;
-#ifdef CSZ_PLUS_TBF
-       PSCHED_GET_TIME(&q->t_tbf);
-       q->tokens = q->depth;
-       del_timer(&q->wd_timer);
-#endif
-       sch->q.qlen = 0;
-}
-
-static void
-csz_destroy(struct Qdisc* sch)
-{
-       struct csz_sched_data *q = (struct csz_sched_data *)sch->data;
-       struct tcf_proto *tp;
-
-       while ((tp = q->filter_list) != NULL) {
-               q->filter_list = tp->next;
-               tcf_destroy(tp);
-       }
-}
-
-static int csz_init(struct Qdisc *sch, struct rtattr *opt)
-{
-       struct csz_sched_data *q = (struct csz_sched_data *)sch->data;
-       struct rtattr *tb[TCA_CSZ_PTAB];
-       struct tc_csz_qopt *qopt;
-       int    i;
-
-       rtattr_parse(tb, TCA_CSZ_PTAB, RTA_DATA(opt), RTA_PAYLOAD(opt));
-       if (tb[TCA_CSZ_PARMS-1] == NULL ||
-           RTA_PAYLOAD(tb[TCA_CSZ_PARMS-1]) < sizeof(*qopt))
-               return -EINVAL;
-       qopt = RTA_DATA(tb[TCA_CSZ_PARMS-1]);
-
-       q->R_log = qopt->R_log;
-       q->delta_log = qopt->delta_log;
-       for (i=0; i<=TC_PRIO_MAX; i++) {
-               if (qopt->priomap[i] >= CSZ_FLOWS)
-                       return -EINVAL;
-               q->prio2band[i] = qopt->priomap[i];
-       }
-
-       for (i=0; i<4; i++)
-               skb_queue_head_init(&q->other[i]);
-
-       for (i=0; i<CSZ_GUARANTEED; i++) {
-               struct csz_flow *this = q->flow + i;
-               skb_queue_head_init(&this->q);
-               this->snext = this->sprev =
-               this->fnext = this->fprev = (struct csz_head*)this;
-               this->start = this->finish = 0;
-       }
-       q->s.snext = q->s.sprev = &q->s;
-       q->f.fnext = q->f.fprev = &q->f;
-       q->R_c = 0;
-#ifdef CSZ_PLUS_TBF
-       init_timer(&q->wd_timer);
-       q->wd_timer.data = (unsigned long)sch;
-       q->wd_timer.function = csz_watchdog;
-#endif
-       return 0;
-}
-
-static int csz_dump(struct Qdisc *sch, struct sk_buff *skb)
-{
-       struct csz_sched_data *q = (struct csz_sched_data *)sch->data;
-       unsigned char    *b = skb->tail;
-       struct rtattr *rta;
-       struct tc_csz_qopt opt;
-
-       rta = (struct rtattr*)b;
-       RTA_PUT(skb, TCA_OPTIONS, 0, NULL);
-
-       opt.flows = CSZ_FLOWS;
-       memcpy(&opt.priomap, q->prio2band, TC_PRIO_MAX+1);
-       RTA_PUT(skb, TCA_CSZ_PARMS, sizeof(opt), &opt);
-       rta->rta_len = skb->tail - b;
-
-       return skb->len;
-
-rtattr_failure:
-       skb_trim(skb, b - skb->data);
-       return -1;
-}
-
-static int csz_graft(struct Qdisc *sch, unsigned long cl, struct Qdisc *new,
-                    struct Qdisc **old)
-{
-       return -EINVAL;
-}
-
-static struct Qdisc * csz_leaf(struct Qdisc *sch, unsigned long cl)
-{
-       return NULL;
-}
-
-
-static unsigned long csz_get(struct Qdisc *sch, u32 classid)
-{
-       struct csz_sched_data *q = (struct csz_sched_data *)sch->data;
-       unsigned long band = TC_H_MIN(classid) - 1;
-
-       if (band >= CSZ_FLOWS)
-               return 0;
-
-       if (band < CSZ_GUARANTEED && q->flow[band].L_tab == NULL)
-               return 0;
-
-       return band+1;
-}
-
-static unsigned long csz_bind(struct Qdisc *sch, unsigned long parent, u32 classid)
-{
-       return csz_get(sch, classid);
-}
-
-
-static void csz_put(struct Qdisc *sch, unsigned long cl)
-{
-       return;
-}
-
-static int csz_change(struct Qdisc *sch, u32 handle, u32 parent, struct rtattr **tca, unsigned long *arg)
-{
-       unsigned long cl = *arg;
-       struct csz_sched_data *q = (struct csz_sched_data *)sch->data;
-       struct rtattr *opt = tca[TCA_OPTIONS-1];
-       struct rtattr *tb[TCA_CSZ_PTAB];
-       struct tc_csz_copt *copt;
-
-       rtattr_parse(tb, TCA_CSZ_PTAB, RTA_DATA(opt), RTA_PAYLOAD(opt));
-       if (tb[TCA_CSZ_PARMS-1] == NULL ||
-           RTA_PAYLOAD(tb[TCA_CSZ_PARMS-1]) < sizeof(*copt))
-               return -EINVAL;
-       copt = RTA_DATA(tb[TCA_CSZ_PARMS-1]);
-
-       if (tb[TCA_CSZ_RTAB-1] &&
-           RTA_PAYLOAD(tb[TCA_CSZ_RTAB-1]) < 1024)
-               return -EINVAL;
-
-       if (cl) {
-               struct csz_flow *a;
-               cl--;
-               if (cl >= CSZ_FLOWS)
-                       return -ENOENT;
-               if (cl >= CSZ_GUARANTEED || q->flow[cl].L_tab == NULL)
-                       return -EINVAL;
-
-               a = &q->flow[cl];
-
-               spin_lock_bh(&sch->dev->queue_lock);
-#if 0
-               a->rate_log = copt->rate_log;
-#endif
-#ifdef CSZ_PLUS_TBF
-               a->limit = copt->limit;
-               a->rate = copt->rate;
-               a->buffer = copt->buffer;
-               a->mtu = copt->mtu;
-#endif
-
-               if (tb[TCA_CSZ_RTAB-1])
-                       memcpy(a->L_tab, RTA_DATA(tb[TCA_CSZ_RTAB-1]), 1024);
-
-               spin_unlock_bh(&sch->dev->queue_lock);
-               return 0;
-       }
-       /* NI */
-       return 0;
-}
-
-static int csz_delete(struct Qdisc *sch, unsigned long cl)
-{
-       struct csz_sched_data *q = (struct csz_sched_data *)sch->data;
-       struct csz_flow *a;
-
-       cl--;
-
-       if (cl >= CSZ_FLOWS)
-               return -ENOENT;
-       if (cl >= CSZ_GUARANTEED || q->flow[cl].L_tab == NULL)
-               return -EINVAL;
-
-       a = &q->flow[cl];
-
-       spin_lock_bh(&sch->dev->queue_lock);
-       a->fprev->fnext = a->fnext;
-       a->fnext->fprev = a->fprev;
-       a->sprev->snext = a->snext;
-       a->snext->sprev = a->sprev;
-       a->start = a->finish = 0;
-       kfree(xchg(&q->flow[cl].L_tab, NULL));
-       spin_unlock_bh(&sch->dev->queue_lock);
-
-       return 0;
-}
-
-static int csz_dump_class(struct Qdisc *sch, unsigned long cl, struct sk_buff *skb, struct tcmsg *tcm)
-{
-       struct csz_sched_data *q = (struct csz_sched_data *)sch->data;
-       unsigned char    *b = skb->tail;
-       struct rtattr *rta;
-       struct tc_csz_copt opt;
-
-       tcm->tcm_handle = sch->handle|cl;
-
-       cl--;
-
-       if (cl > CSZ_FLOWS)
-               goto rtattr_failure;
-
-       if (cl < CSZ_GUARANTEED) {
-               struct csz_flow *f = &q->flow[cl];
-
-               if (f->L_tab == NULL)
-                       goto rtattr_failure;
-
-               rta = (struct rtattr*)b;
-               RTA_PUT(skb, TCA_OPTIONS, 0, NULL);
-
-               opt.limit = f->limit;
-               opt.rate = f->rate;
-               opt.slice = f->slice;
-               memset(&opt.peakrate, 0, sizeof(opt.peakrate));
-#ifdef CSZ_PLUS_TBF
-               opt.buffer = f->buffer;
-               opt.mtu = f->mtu;
-#else
-               opt.buffer = 0;
-               opt.mtu = 0;
-#endif
-
-               RTA_PUT(skb, TCA_CSZ_PARMS, sizeof(opt), &opt);
-               rta->rta_len = skb->tail - b;
-       }
-
-       return skb->len;
-
-rtattr_failure:
-       skb_trim(skb, b - skb->data);
-       return -1;
-}
-
-static void csz_walk(struct Qdisc *sch, struct qdisc_walker *arg)
-{
-       struct csz_sched_data *q = (struct csz_sched_data *)sch->data;
-       int prio = 0;
-
-       if (arg->stop)
-               return;
-
-       for (prio = 0; prio < CSZ_FLOWS; prio++) {
-               if (arg->count < arg->skip) {
-                       arg->count++;
-                       continue;
-               }
-               if (prio < CSZ_GUARANTEED && q->flow[prio].L_tab == NULL) {
-                       arg->count++;
-                       continue;
-               }
-               if (arg->fn(sch, prio+1, arg) < 0) {
-                       arg->stop = 1;
-                       break;
-               }
-               arg->count++;
-       }
-}
-
-static struct tcf_proto ** csz_find_tcf(struct Qdisc *sch, unsigned long cl)
-{
-       struct csz_sched_data *q = (struct csz_sched_data *)sch->data;
-
-       if (cl)
-               return NULL;
-
-       return &q->filter_list;
-}
-
-struct Qdisc_class_ops csz_class_ops = {
-       .graft          =       csz_graft,
-       .leaf           =       csz_leaf,
-       .get            =       csz_get,
-       .put            =       csz_put,
-       .change         =       csz_change,
-       .delete         =       csz_delete,
-       .walk           =       csz_walk,
-       .tcf_chain      =       csz_find_tcf,
-       .bind_tcf       =       csz_bind,
-       .unbind_tcf     =       csz_put,
-       .dump           =       csz_dump_class,
-};
-
-static struct Qdisc_ops csz_qdisc_ops = {
-       .next           =       NULL,
-       .cl_ops         =       &csz_class_ops,
-       .id             =       "csz",
-       .priv_size      =       sizeof(struct csz_sched_data),
-       .enqueue        =       csz_enqueue,
-       .dequeue        =       csz_dequeue,
-       .requeue        =       NULL,
-       .drop           =       NULL,
-       .init           =       csz_init,
-       .reset          =       csz_reset,
-       .destroy        =       csz_destroy,
-       .change         =       NULL,
-       .dump           =       csz_dump,
-       .owner          =       THIS_MODULE,
-};
-
-static int __init csz_module_init(void)
-{
-       return register_qdisc(&csz_qdisc_ops);
-}
-static void __exit csz_module_exit(void) 
-{
-       unregister_qdisc(&csz_qdisc_ops);
-}
-module_init(csz_module_init)
-module_exit(csz_module_exit)
-MODULE_LICENSE("GPL");
diff --git a/net/sched/sch_delay.c b/net/sched/sch_delay.c
deleted file mode 100644 (file)
index a97d7be..0000000
+++ /dev/null
@@ -1,281 +0,0 @@
-/*
- * net/sched/sch_delay.c       Simple constant delay
- *
- *             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.
- *
- * Authors:    Stephen Hemminger <shemminger@osdl.org>
- */
-
-#include <linux/config.h>
-#include <linux/module.h>
-#include <linux/types.h>
-#include <linux/kernel.h>
-
-#include <linux/string.h>
-#include <linux/mm.h>
-#include <linux/socket.h>
-#include <linux/sockios.h>
-#include <linux/in.h>
-#include <linux/errno.h>
-#include <linux/interrupt.h>
-#include <linux/if_ether.h>
-#include <linux/inet.h>
-#include <linux/netdevice.h>
-#include <linux/etherdevice.h>
-#include <linux/notifier.h>
-#include <net/ip.h>
-#include <net/route.h>
-#include <linux/skbuff.h>
-#include <net/sock.h>
-#include <net/pkt_sched.h>
-
-/*     Network delay simulator
-       This scheduler adds a fixed delay to all packets.
-       Similar to NISTnet and BSD Dummynet.
-
-       It uses byte fifo underneath similar to TBF */
-struct dly_sched_data {
-       u32     latency;
-       u32     limit;
-       u32     loss;
-       struct timer_list timer;
-       struct Qdisc *qdisc;
-};
-
-/* Time stamp put into socket buffer control block */
-struct dly_skb_cb {
-       psched_time_t   queuetime;
-};
-
-/* Enqueue packets with underlying discipline (fifo)
- * but mark them with current time first.
- */
-static int dly_enqueue(struct sk_buff *skb, struct Qdisc *sch)
-{
-       struct dly_sched_data *q = (struct dly_sched_data *)sch->data;
-       struct dly_skb_cb *cb = (struct dly_skb_cb *)skb->cb;
-       int ret;
-
-       /* Random packet drop 0 => none, ~0 => all */
-       if (q->loss >= net_random()) {
-               sch->stats.drops++;
-               return 0;       /* lie about loss so TCP doesn't know */
-       }
-
-       PSCHED_GET_TIME(cb->queuetime);
-
-       /* Queue to underlying scheduler */
-       ret = q->qdisc->enqueue(skb, q->qdisc);
-       if (ret)
-               sch->stats.drops++;
-       else {
-               sch->q.qlen++;
-               sch->stats.bytes += skb->len;
-               sch->stats.packets++;
-       }
-       return ret;
-}
-
-/* Requeue packets but don't change time stamp */
-static int dly_requeue(struct sk_buff *skb, struct Qdisc *sch)
-{
-       struct dly_sched_data *q = (struct dly_sched_data *)sch->data;
-       int ret;
-
-       ret = q->qdisc->ops->requeue(skb, q->qdisc);
-       if (ret == 0)
-               sch->q.qlen++;
-       return ret;
-}
-
-static unsigned int dly_drop(struct Qdisc *sch)
-{
-       struct dly_sched_data *q = (struct dly_sched_data *)sch->data;
-       unsigned int len;
-
-       len = q->qdisc->ops->drop(q->qdisc);
-       if (len) {
-               sch->q.qlen--;
-               sch->stats.drops++;
-       }
-       return len;
-}
-
-/* Dequeue packet.
- * If packet needs to be held up, then stop the
- * queue and set timer to wakeup later.
- */
-static struct sk_buff *dly_dequeue(struct Qdisc *sch)
-{
-       struct dly_sched_data *q = (struct dly_sched_data *)sch->data;
-       struct sk_buff *skb;
-
- retry:
-       skb = q->qdisc->dequeue(q->qdisc);
-       if (skb) {
-               struct dly_skb_cb *cb = (struct dly_skb_cb *)skb->cb;
-               psched_time_t now;
-               long diff, delay;
-
-               PSCHED_GET_TIME(now);
-               diff = q->latency - PSCHED_TDIFF(now, cb->queuetime);
-
-               if (diff <= 0) {
-                       sch->q.qlen--;
-                       sch->flags &= ~TCQ_F_THROTTLED;
-                       return skb;
-               }
-
-               if (q->qdisc->ops->requeue(skb, q->qdisc) != NET_XMIT_SUCCESS) {
-                       sch->q.qlen--;
-                       sch->stats.drops++;
-                       goto retry;
-               }
-
-               delay = PSCHED_US2JIFFIE(diff);
-               if (delay <= 0)
-                 delay = 1;
-               mod_timer(&q->timer, jiffies+delay);
-
-               sch->flags |= TCQ_F_THROTTLED;
-       }
-       return NULL;
-}
-
-static void dly_reset(struct Qdisc *sch)
-{
-       struct dly_sched_data *q = (struct dly_sched_data *)sch->data;
-
-       qdisc_reset(q->qdisc);
-       sch->q.qlen = 0;
-       sch->flags &= ~TCQ_F_THROTTLED;
-       del_timer(&q->timer);
-}
-
-static void dly_timer(unsigned long arg)
-{
-       struct Qdisc *sch = (struct Qdisc *)arg;
-
-       sch->flags &= ~TCQ_F_THROTTLED;
-       netif_schedule(sch->dev);
-}
-
-/* Tell Fifo the new limit. */
-static int change_limit(struct Qdisc *q, u32 limit)
-{
-       struct rtattr *rta;
-       int ret;
-
-       rta = kmalloc(RTA_LENGTH(sizeof(struct tc_fifo_qopt)), GFP_KERNEL);
-       if (!rta)
-               return -ENOMEM;
-
-       rta->rta_type = RTM_NEWQDISC;
-       rta->rta_len = RTA_LENGTH(sizeof(struct tc_fifo_qopt));
-       ((struct tc_fifo_qopt *)RTA_DATA(rta))->limit = limit;
-       ret = q->ops->change(q, rta);
-       kfree(rta);
-
-       return ret;
-}
-
-/* Setup underlying FIFO discipline */
-static int dly_change(struct Qdisc *sch, struct rtattr *opt)
-{
-       struct dly_sched_data *q = (struct dly_sched_data *)sch->data;
-       struct tc_dly_qopt *qopt = RTA_DATA(opt);
-       int err;
-
-       if (q->qdisc == &noop_qdisc) {
-               struct Qdisc *child
-                       = qdisc_create_dflt(sch->dev, &bfifo_qdisc_ops);
-               if (!child)
-                       return -EINVAL;
-               q->qdisc = child;
-       }
-
-       err = change_limit(q->qdisc, qopt->limit);
-       if (err) {
-               qdisc_destroy(q->qdisc);
-               q->qdisc = &noop_qdisc;
-       } else {
-               q->latency = qopt->latency;
-               q->limit = qopt->limit;
-               q->loss = qopt->loss;
-       }
-       return err;
-}
-
-static int dly_init(struct Qdisc *sch, struct rtattr *opt)
-{
-       struct dly_sched_data *q = (struct dly_sched_data *)sch->data;
-
-       if (!opt)
-               return -EINVAL;
-
-       init_timer(&q->timer);
-       q->timer.function = dly_timer;
-       q->timer.data = (unsigned long) sch;
-       q->qdisc = &noop_qdisc;
-
-       return dly_change(sch, opt);
-}
-
-static void dly_destroy(struct Qdisc *sch)
-{
-       struct dly_sched_data *q = (struct dly_sched_data *)sch->data;
-
-       del_timer(&q->timer);
-       qdisc_destroy(q->qdisc);
-       q->qdisc = &noop_qdisc;
-}
-
-static int dly_dump(struct Qdisc *sch, struct sk_buff *skb)
-{
-       struct dly_sched_data *q = (struct dly_sched_data *)sch->data;
-       unsigned char    *b = skb->tail;
-       struct tc_dly_qopt qopt;
-
-       qopt.latency = q->latency;
-       qopt.limit = q->limit;
-       qopt.loss = q->loss;
-
-       RTA_PUT(skb, TCA_OPTIONS, sizeof(qopt), &qopt);
-
-       return skb->len;
-
-rtattr_failure:
-       skb_trim(skb, b - skb->data);
-       return -1;
-}
-
-static struct Qdisc_ops dly_qdisc_ops = {
-       .id             =       "delay",
-       .priv_size      =       sizeof(struct dly_sched_data),
-       .enqueue        =       dly_enqueue,
-       .dequeue        =       dly_dequeue,
-       .requeue        =       dly_requeue,
-       .drop           =       dly_drop,
-       .init           =       dly_init,
-       .reset          =       dly_reset,
-       .destroy        =       dly_destroy,
-       .change         =       dly_change,
-       .dump           =       dly_dump,
-       .owner          =       THIS_MODULE,
-};
-
-
-static int __init dly_module_init(void)
-{
-       return register_qdisc(&dly_qdisc_ops);
-}
-static void __exit dly_module_exit(void)
-{
-       unregister_qdisc(&dly_qdisc_ops);
-}
-module_init(dly_module_init)
-module_exit(dly_module_exit)
-MODULE_LICENSE("GPL");
diff --git a/net/tux/Kconfig b/net/tux/Kconfig
deleted file mode 100644 (file)
index 8b6d624..0000000
+++ /dev/null
@@ -1,25 +0,0 @@
-
-config TUX
-       tristate "TUX: Threaded linUX application protocol accelerator layer"
-       default y if INET=y
-       select ZLIB_DEFLATE
-       help
-         This is the TUX content-accelerator/server
-
-menu "TUX options"
-       depends on TUX
-
-config TUX_EXTCGI
-       bool "External CGI module"
-       default y
-
-config TUX_EXTENDED_LOG
-       bool "extended TUX logging format"
-       default n
-
-config TUX_DEBUG
-       bool "debug TUX"
-       default n
-
-endmenu
-
diff --git a/net/tux/Makefile b/net/tux/Makefile
deleted file mode 100644 (file)
index fc0bbd0..0000000
+++ /dev/null
@@ -1,12 +0,0 @@
-#
-# Makefile for TUX
-#
-
-obj-$(CONFIG_TUX) += tux.o
-
-tux-y := accept.o input.o userspace.o cachemiss.o output.o \
-       redirect.o postpone.o logger.o proto_http.o proto_ftp.o \
-       proc.o main.o mod.o abuf.o times.o directory.o gzip.o
-
-tux-$(subst m,y,$(CONFIG_TUX_EXTCGI)) += cgi.o extcgi.o
-
diff --git a/net/tux/abuf.c b/net/tux/abuf.c
deleted file mode 100644 (file)
index 7447e69..0000000
+++ /dev/null
@@ -1,186 +0,0 @@
-/*
- * TUX - Integrated Application Protocols Layer and Object Cache
- *
- * Copyright (C) 2000, 2001, Ingo Molnar <mingo@redhat.com>
- *
- * abuf.c: async buffer-sending
- */
-
-#include <net/tux.h>
-
-/****************************************************************
- *      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, 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.
- *
- ****************************************************************/
-
-char * get_abuf (tux_req_t *req, unsigned int max_size)
-{
-       threadinfo_t *ti = req->ti;
-       struct page *page;
-       char *buf;
-       unsigned int offset;
-       unsigned int left;
-
-       if (req->abuf.page || req->abuf.buf || req->abuf.size)
-               TUX_BUG();
-
-       if (max_size > PAGE_SIZE)
-               BUG();
-       offset = ti->header_offset;
-       if (offset > PAGE_SIZE)
-               TUX_BUG();
-       left = PAGE_SIZE - offset;
-       if (!max_size)
-               BUG();
-       page = ti->header_cache;
-       if ((left < max_size) || !page) {
-               while (!(page = alloc_pages(GFP_KERNEL, 0))) {
-                       if (net_ratelimit())
-                               printk(KERN_WARNING "tux: OOM in get_abuf()!\n");
-                       current->state = TASK_UNINTERRUPTIBLE;
-                       schedule_timeout(1);
-               }
-
-               if (ti->header_cache)
-                       __free_page(ti->header_cache);
-               ti->header_cache = page;
-               ti->header_offset = 0;
-               offset = 0;
-       }
-       buf = page_address(page) + offset;
-
-       if (!page)
-               BUG();
-       req->abuf.page = page;
-       req->abuf.buf = buf;
-       req->abuf.size = 0;
-       req->abuf.offset = offset;
-       req->abuf.flags = 0;
-       get_page(req->abuf.page);
-
-       return buf;
-}
-
-static void do_send_abuf (tux_req_t *req, int cachemiss);
-
-void send_abuf (tux_req_t *req, unsigned int size, unsigned long flags)
-{
-       threadinfo_t *ti = req->ti;
-
-       Dprintk("send_abuf(req: %p, sock: %p): %p(%p), size:%d, off:%d, flags:%08lx\n", req, req->sock, req->abuf.page, req->abuf.buf, size, req->abuf.offset, flags);
-
-       ti->header_offset += size;
-       if (ti->header_offset > PAGE_SIZE)
-               TUX_BUG();
-       if (req->abuf.offset + req->abuf.size > PAGE_SIZE)
-               TUX_BUG();
-
-       req->abuf.flags = flags | MSG_NOSIGNAL;
-       req->abuf.size = size;
-
-       add_tux_atom(req, do_send_abuf);
-}
-
-static void do_send_abuf (tux_req_t *req, int cachemiss)
-{
-       int ret;
-
-       if (req->magic != TUX_MAGIC)
-               TUX_BUG();
-       if (!req->sock)
-               TUX_BUG();
-       tcp_sk(req->sock->sk)->nonagle = 2;
-
-repeat:
-       Dprintk("do_send_abuf(%p,%d): %p(%p), size:%d, off:%d, flags:%08lx\n",
-                       req, cachemiss,
-                       req->abuf.page, req->abuf.buf, req->abuf.size,
-                       req->abuf.offset, req->abuf.flags);
-
-       if (tux_zerocopy_header)
-               ret = tcp_sendpage(req->sock, req->abuf.page,
-                       req->abuf.offset, req->abuf.size, req->abuf.flags);
-       else {
-               mm_segment_t oldmm;
-               oldmm = get_fs(); set_fs(KERNEL_DS);
-               ret = send_sync_buf(req, req->sock, req->abuf.buf,
-                       req->abuf.size, req->abuf.flags);
-               set_fs(oldmm);
-       }
-
-
-       Dprintk("do_send_abuf: ret: %d\n", ret);
-       if (!ret)
-               TUX_BUG();
-
-       if (ret < 0) {
-               if (ret != -EAGAIN) {
-                       TDprintk("ret: %d, req->error = TUX_ERROR_CONN_CLOSE.\n", ret);
-                       req->error = TUX_ERROR_CONN_CLOSE;
-                       req->atom_idx = 0;
-                       req->in_file.f_pos = 0;
-                       __free_page(req->abuf.page);
-                       memset(&req->abuf, 0, sizeof(req->abuf));
-                       zap_request(req, cachemiss);
-                       return;
-               }
-               add_tux_atom(req, do_send_abuf);
-               if (add_output_space_event(req, req->sock)) {
-                       del_tux_atom(req);
-                       goto repeat;
-               }
-               return;
-       }
-
-       req->abuf.buf += ret;
-       req->abuf.offset += ret;
-       req->abuf.size -= ret;
-
-       if ((int)req->abuf.size < 0)
-               TUX_BUG();
-       if (req->abuf.size > 0)
-               goto repeat;
-
-       Dprintk("DONE do_send_abuf: %p(%p), size:%d, off:%d, flags:%08lx\n",
-                       req->abuf.page, req->abuf.buf, req->abuf.size,
-                       req->abuf.offset, req->abuf.flags);
-
-       __free_page(req->abuf.page);
-
-       memset(&req->abuf, 0, sizeof(req->abuf));
-
-       add_req_to_workqueue(req);
-}
-
-void __send_async_message (tux_req_t *req, const char *message,
-                               int status, unsigned int size, int push)
-{
-       unsigned int flags;
-       char *buf;
-
-       Dprintk("TUX: sending %d reply (%d bytes)!\n", status, size);
-       Dprintk("request %p, reply: %s\n", req, message);
-       if (!size)
-               TUX_BUG();
-       buf = get_abuf(req, size);
-       memcpy(buf, message, size);
-
-       req->status = status;
-       flags = MSG_DONTWAIT;
-       if (!push)
-               flags |= MSG_MORE;
-       send_abuf(req, size, flags);
-       add_req_to_workqueue(req);
-}
diff --git a/net/tux/accept.c b/net/tux/accept.c
deleted file mode 100644 (file)
index 16f611c..0000000
+++ /dev/null
@@ -1,859 +0,0 @@
-/*
- * TUX - Integrated Application Protocols Layer and Object Cache
- *
- * Copyright (C) 2000, 2001, Ingo Molnar <mingo@redhat.com>
- *
- * accept.c: accept new connections, allocate requests
- */
-
-#include <net/tux.h>
-
-/****************************************************************
- *      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, 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.
- *
- ****************************************************************/
-
-unsigned int tux_ack_pingpong = 1;
-unsigned int tux_push_all = 0;
-unsigned int tux_zerocopy_parse = 1;
-
-static int __idle_event (tux_req_t *req);
-static int __output_space_event (tux_req_t *req);
-
-struct socket * start_listening(tux_socket_t *listen, int nr)
-{
-       struct sockaddr_in sin;
-       struct socket *sock = NULL;
-       struct sock *sk;
-       struct tcp_opt *tp;
-       int err;
-       u16 port = listen->port;
-       u32 addr = listen->ip;
-       tux_proto_t *proto = listen->proto;
-
-       /* Create a listening socket: */
-
-       err = sock_create(PF_INET, SOCK_STREAM, IPPROTO_TCP, &sock);
-       if (err) {
-               printk(KERN_ERR "TUX: error %d creating socket.\n", err);
-               goto error;
-       }
-
-       /* Bind the socket: */
-
-       sin.sin_family = AF_INET;
-       sin.sin_addr.s_addr = htonl(addr);
-       sin.sin_port = htons(port);
-
-       sk = sock->sk;
-       sk->sk_reuse = 1;
-       sock_set_flag(sk, SOCK_URGINLINE);
-
-       err = sock->ops->bind(sock, (struct sockaddr*)&sin, sizeof(sin));
-       if (err) {
-               printk(KERN_ERR "TUX: error %d binding socket. This means that probably some other process is (or was a short time ago) using addr %s://%d.%d.%d.%d:%d.\n", 
-                       err, proto->name, HIPQUAD(addr), port);
-               goto error;
-       }
-
-       tp = tcp_sk(sk);
-       Dprintk("listen sk accept_queue: %p/%p.\n",
-               tp->accept_queue, tp->accept_queue_tail);
-       tp->ack.pingpong = tux_ack_pingpong;
-
-       sock_reset_flag(sk, SOCK_LINGER);
-       sk->sk_lingertime = 0;
-       tp->linger2 = tux_keepalive_timeout * HZ;
-
-       if (proto->defer_accept && !tux_keepalive_timeout && tux_defer_accept)
-               tp->defer_accept = 1;
-
-       /* Now, start listening on the socket */
-
-       err = sock->ops->listen(sock, tux_max_backlog);
-       if (err) {
-               printk(KERN_ERR "TUX: error %d listening on socket.\n", err);
-               goto error;
-       }
-
-       printk(KERN_NOTICE "TUX: thread %d listens on %s://%d.%d.%d.%d:%d.\n",
-               nr, proto->name, HIPQUAD(addr), port);
-       return sock;
-
-error:
-       if (sock)
-               sock_release(sock);
-       return NULL;
-}
-
-static inline void __kfree_req (tux_req_t *req, threadinfo_t * ti)
-{
-       list_del(&req->all);
-       DEBUG_DEL_LIST(&req->all);
-       ti->nr_requests--;
-       kfree(req);
-}
-
-int flush_freequeue (threadinfo_t * ti)
-{
-       struct list_head *tmp;
-       unsigned long flags;
-       tux_req_t *req;
-       int count = 0;
-
-       spin_lock_irqsave(&ti->free_requests_lock,flags);
-       while (ti->nr_free_requests) {
-               ti->nr_free_requests--;
-               tmp = ti->free_requests.next;
-               req = list_entry(tmp, tux_req_t, free);
-               list_del(tmp);
-               DEBUG_DEL_LIST(tmp);
-               DEC_STAT(nr_free_pending);
-               __kfree_req(req, ti);
-               count++;
-       }
-       spin_unlock_irqrestore(&ti->free_requests_lock,flags);
-
-       return count;
-}
-
-static tux_req_t * kmalloc_req (threadinfo_t * ti)
-{
-       struct list_head *tmp;
-       unsigned long flags;
-       tux_req_t *req;
-
-       spin_lock_irqsave(&ti->free_requests_lock, flags);
-       if (ti->nr_free_requests) {
-               ti->nr_free_requests--;
-               tmp = ti->free_requests.next;
-               req = list_entry(tmp, tux_req_t, free);
-               list_del(tmp);
-               DEBUG_DEL_LIST(tmp);
-               DEC_STAT(nr_free_pending);
-               req->magic = TUX_MAGIC;
-               spin_unlock_irqrestore(&ti->free_requests_lock, flags);
-       } else {
-               spin_unlock_irqrestore(&ti->free_requests_lock, flags);
-               req = tux_kmalloc(sizeof(*req));
-               ti->nr_requests++;
-               memset (req, 0, sizeof(*req));
-               list_add(&req->all, &ti->all_requests);
-       }
-       req->magic = TUX_MAGIC;
-       INC_STAT(nr_allocated);
-       init_waitqueue_entry(&req->sleep, current);
-       init_waitqueue_entry(&req->ftp_sleep, current);
-       INIT_LIST_HEAD(&req->work);
-       INIT_LIST_HEAD(&req->free);
-       INIT_LIST_HEAD(&req->lru);
-       req->ti = ti;
-       req->total_bytes = 0;
-       SET_TIMESTAMP(req->accept_timestamp);
-       req->first_timestamp = jiffies;
-       req->fd = -1;
-       init_timer(&req->keepalive_timer);
-       init_timer(&req->output_timer);
-
-       Dprintk("allocated NEW req %p.\n", req);
-       return req;
-}
-
-void kfree_req (tux_req_t *req)
-{
-       threadinfo_t * ti = req->ti;
-       unsigned long flags;
-
-       Dprintk("freeing req %p.\n", req);
-
-       if (req->magic != TUX_MAGIC)
-               TUX_BUG();
-       spin_lock_irqsave(&ti->free_requests_lock,flags);
-       req->magic = 0;
-       DEC_STAT(nr_allocated);
-       if (req->sock || req->dentry || req->private)
-               TUX_BUG();
-       if (ti->nr_free_requests > tux_max_free_requests)
-               __kfree_req(req, ti);
-       else {
-               req->error = 0;
-               ti->nr_free_requests++;
-
-               // the free requests queue is LIFO
-               list_add(&req->free, &ti->free_requests);
-               INC_STAT(nr_free_pending);
-       }
-       spin_unlock_irqrestore(&ti->free_requests_lock,flags);
-}
-
-static void __add_req_to_workqueue (tux_req_t *req)
-{
-       threadinfo_t *ti = req->ti;
-
-       if (!list_empty(&req->work))
-               TUX_BUG();
-       Dprintk("work-queueing request %p at %p/%p.\n", req, __builtin_return_address(0), __builtin_return_address(1));
-       if (connection_too_fast(req))
-               list_add_tail(&req->work, &ti->work_pending);
-       else
-               list_add(&req->work, &ti->work_pending);
-       INC_STAT(nr_work_pending);
-       wake_up_process(ti->thread);
-       return;
-}
-
-void add_req_to_workqueue (tux_req_t *req)
-{
-       unsigned long flags;
-       threadinfo_t *ti = req->ti;
-
-       spin_lock_irqsave(&ti->work_lock, flags);
-       __add_req_to_workqueue(req);
-       spin_unlock_irqrestore(&ti->work_lock, flags);
-}
-
-void del_output_timer (tux_req_t *req)
-{
-#if CONFIG_SMP
-       if (!spin_is_locked(&req->ti->work_lock))
-               TUX_BUG();
-#endif
-       if (!list_empty(&req->lru)) {
-               list_del(&req->lru);
-               DEBUG_DEL_LIST(&req->lru);
-               req->ti->nr_lru--;
-       }
-       Dprintk("del output timeout for req %p.\n", req);
-       del_timer(&req->output_timer);
-}
-
-static void output_timeout_fn (unsigned long data);
-
-#define OUTPUT_TIMEOUT HZ
-
-static void add_output_timer (tux_req_t *req)
-{
-       struct timer_list *timer = &req->output_timer;
-
-       timer->data = (unsigned long) req;
-       timer->function = &output_timeout_fn;
-       mod_timer(timer, jiffies + OUTPUT_TIMEOUT);
-}
-
-static void output_timeout_fn (unsigned long data)
-{
-       tux_req_t *req = (tux_req_t *)data;
-
-       if (connection_too_fast(req)) {
-               add_output_timer(req);
-//             mod_timer(&req->output_timer, jiffies + OUTPUT_TIMEOUT);
-               return;
-       }
-       output_space_event(req);
-}
-
-void output_timeout (tux_req_t *req)
-{
-       Dprintk("output timeout for req %p.\n", req);
-       if (test_and_set_bit(0, &req->wait_output_space))
-               TUX_BUG();
-       INC_STAT(nr_output_space_pending);
-       add_output_timer(req);
-}
-
-void __del_keepalive_timer (tux_req_t *req)
-{
-#if CONFIG_SMP
-       if (!spin_is_locked(&req->ti->work_lock))
-               TUX_BUG();
-#endif
-       if (!list_empty(&req->lru)) {
-               list_del(&req->lru);
-               DEBUG_DEL_LIST(&req->lru);
-               req->ti->nr_lru--;
-       }
-       Dprintk("del keepalive timeout for req %p.\n", req);
-       del_timer(&req->keepalive_timer);
-}
-
-static void keepalive_timeout_fn (unsigned long data)
-{
-       tux_req_t *req = (tux_req_t *)data;
-
-#if CONFIG_TUX_DEBUG
-       Dprintk("req %p timed out after %d sec!\n", req, tux_keepalive_timeout);
-       if (tux_Dprintk)
-               print_req(req);
-#endif
-       Dprintk("req->error = TUX_ERROR_CONN_TIMEOUT!\n");
-       req->error = TUX_ERROR_CONN_TIMEOUT;
-       if (!idle_event(req))
-               output_space_event(req);
-}
-
-void __add_keepalive_timer (tux_req_t *req)
-{
-       struct timer_list *timer = &req->keepalive_timer;
-
-       if (!tux_keepalive_timeout)
-               TUX_BUG();
-#if CONFIG_SMP
-       if (!spin_is_locked(&req->ti->work_lock))
-               TUX_BUG();
-#endif
-
-       if (!list_empty(&req->lru))
-               TUX_BUG();
-       if (req->ti->nr_lru > tux_max_keepalives) {
-               struct list_head *head, *last;
-               tux_req_t *last_req;
-
-               head = &req->ti->lru;
-               last = head->prev;
-               if (last == head)
-                       TUX_BUG();
-               last_req = list_entry(last, tux_req_t, lru);
-               list_del(last);
-               DEBUG_DEL_LIST(last);
-               req->ti->nr_lru--;
-
-               Dprintk("LRU-aging req %p!\n", last_req);
-               last_req->error = TUX_ERROR_CONN_TIMEOUT;
-               if (!__idle_event(last_req))
-                       __output_space_event(last_req);
-       }
-       list_add(&req->lru, &req->ti->lru);
-       req->ti->nr_lru++;
-
-       timer->expires = jiffies + tux_keepalive_timeout * HZ;
-       timer->data = (unsigned long) req;
-       timer->function = &keepalive_timeout_fn;
-       add_timer(timer);
-}
-
-static int __output_space_event (tux_req_t *req)
-{
-       if (!req || (req->magic != TUX_MAGIC))
-               TUX_BUG();
-
-       if (!test_and_clear_bit(0, &req->wait_output_space)) {
-               Dprintk("output space ready event at <%p>, on non-idle %p.\n", __builtin_return_address(0), req);
-               return 0;
-       }
-
-       Dprintk("output space ready event at <%p>, %p was waiting!\n", __builtin_return_address(0), req);
-       DEC_STAT(nr_output_space_pending);
-
-       del_keepalive_timer(req);
-       del_output_timer(req);
-
-       __add_req_to_workqueue(req);
-       return 1;
-}
-
-int output_space_event (tux_req_t *req)
-{
-       int ret;
-       unsigned long flags;
-
-       spin_lock_irqsave(&req->ti->work_lock, flags);
-       ret = __output_space_event(req);
-       spin_unlock_irqrestore(&req->ti->work_lock, flags);
-
-       return ret;
-}
-
-static int __idle_event (tux_req_t *req)
-{
-       struct tcp_opt *tp;
-       threadinfo_t *ti;
-
-       if (!req || (req->magic != TUX_MAGIC))
-               TUX_BUG();
-       ti = req->ti;
-
-       if (!test_and_clear_bit(0, &req->idle_input)) {
-               Dprintk("data ready event at <%p>, on non-idle %p.\n", __builtin_return_address(0), req);
-               return 0;
-       }
-
-       Dprintk("data ready event at <%p>, %p was idle!\n", __builtin_return_address(0), req);
-       del_keepalive_timer(req);
-       del_output_timer(req);
-       DEC_STAT(nr_idle_input_pending);
-
-       tp = tcp_sk(req->sock->sk);
-
-       tp->ack.pingpong = tux_ack_pingpong;
-       SET_TIMESTAMP(req->accept_timestamp);
-
-       __add_req_to_workqueue(req);
-
-       return 1;
-}
-
-int idle_event (tux_req_t *req)
-{
-       int ret;
-       unsigned long flags;
-
-       spin_lock_irqsave(&req->ti->work_lock, flags);
-       ret = __idle_event(req);
-       spin_unlock_irqrestore(&req->ti->work_lock, flags);
-
-       return ret;
-}
-
-#define HANDLE_CALLBACK_1(callback, tux_name, real_name, param...)     \
-       tux_req_t *req;                                 \
-                                                       \
-       read_lock(&sk->sk_callback_lock);               \
-       req = sk->sk_user_data;                         \
-                                                       \
-       Dprintk("callback "#callback"(%p) req %p.\n",   \
-               sk->sk_##callback, req);                \
-                                                       \
-       if (!req) {                                     \
-               if (sk->sk_##callback == tux_name) {    \
-                       printk("BUG: "#callback" "#tux_name" "#real_name" no req!"); \
-                       TUX_BUG();                      \
-               }                                       \
-               read_unlock(&sk->sk_callback_lock);     \
-               if (sk->sk_##callback)                  \
-                       sk->sk_##callback(param);       \
-               return;                                 \
-       }                                               \
-
-#define HANDLE_CALLBACK_2(callback, tux_name, real_name, param...)     \
-       Dprintk(#tux_name"() on %p.\n", req);           \
-       if (req->magic != TUX_MAGIC)                    \
-               TUX_BUG();                              \
-       if (req->real_name)                             \
-               req->real_name(param);
-
-#define HANDLE_CALLBACK(callback, tux_name, real_name, param...)       \
-       HANDLE_CALLBACK_1(callback,tux_name,real_name,param)    \
-       HANDLE_CALLBACK_2(callback,tux_name,real_name,param)
-
-static void tux_data_ready (struct sock *sk, int len)
-{
-       HANDLE_CALLBACK_1(data_ready, tux_data_ready, real_data_ready, sk, len);
-
-       if (!idle_event(req))
-               output_space_event(req);
-       read_unlock(&sk->sk_callback_lock);
-}
-
-static void tux_write_space (struct sock *sk)
-{
-       HANDLE_CALLBACK(write_space, tux_write_space, real_write_space, sk);
-
-       Dprintk("sk->sk_wmem_queued: %d, sk->sk_sndbuf: %d.\n",
-               sk->sk_wmem_queued, sk->sk_sndbuf);
-
-       if (tcp_wspace(sk) >= tcp_min_write_space(sk)) {
-               clear_bit(SOCK_NOSPACE, &sk->sk_socket->flags);
-               if (!idle_event(req))
-                       output_space_event(req);
-       }
-       read_unlock(&sk->sk_callback_lock);
-}
-
-static void tux_error_report (struct sock *sk)
-{
-       HANDLE_CALLBACK(error_report, tux_error_report, real_error_report, sk);
-
-       req->error = TUX_ERROR_CONN_CLOSE;
-       if (!idle_event(req))
-               output_space_event(req);
-       read_unlock(&sk->sk_callback_lock);
-}
-
-static void tux_state_change (struct sock *sk)
-{
-       HANDLE_CALLBACK(state_change, tux_state_change, real_state_change, sk);
-
-       if (req->sock && req->sock->sk &&
-                               (req->sock->sk->sk_state > TCP_ESTABLISHED)) {
-               Dprintk("req %p changed to TCP non-established!\n", req);
-               Dprintk("req->sock: %p\n", req->sock);
-               if (req->sock)
-                       Dprintk("req->sock->sk: %p\n", req->sock->sk);
-               if (req->sock && req->sock->sk)
-                       Dprintk("TCP state: %d\n", req->sock->sk->sk_state);
-               Dprintk("req->error = TUX_ERROR_CONN_CLOSE!\n");
-               req->error = TUX_ERROR_CONN_CLOSE;
-       }
-       if (!idle_event(req))
-               output_space_event(req);
-       read_unlock(&sk->sk_callback_lock);
-}
-
-static void tux_destruct (struct sock *sk)
-{
-       BUG();
-}
-
-static void tux_ftp_data_ready (struct sock *sk, int len)
-{
-       HANDLE_CALLBACK_1(data_ready, tux_ftp_data_ready,
-                               ftp_real_data_ready, sk, len);
-       if (!idle_event(req))
-               output_space_event(req);
-       read_unlock(&sk->sk_callback_lock);
-}
-
-static void tux_ftp_write_space (struct sock *sk)
-{
-       HANDLE_CALLBACK_1(write_space, tux_ftp_write_space,
-                               ftp_real_write_space, sk);
-
-       Dprintk("sk->sk_wmem_queued: %d, sk->sk_sndbuf: %d.\n",
-               sk->sk_wmem_queued, sk->sk_sndbuf);
-
-       if (tcp_wspace(sk) >= sk->sk_sndbuf/10*8) {
-               clear_bit(SOCK_NOSPACE, &sk->sk_socket->flags);
-               if (!idle_event(req))
-                       output_space_event(req);
-       }
-       read_unlock(&sk->sk_callback_lock);
-}
-
-static void tux_ftp_error_report (struct sock *sk)
-{
-       HANDLE_CALLBACK(error_report, tux_ftp_error_report,
-               ftp_real_error_report, sk);
-
-       TDprintk("req %p sock %p got TCP errors on FTP data connection!\n", req, sk);
-       TDprintk("req->error = TUX_ERROR_CONN_CLOSE!\n");
-       req->error = TUX_ERROR_CONN_CLOSE;
-       if (!idle_event(req))
-               output_space_event(req);
-       read_unlock(&sk->sk_callback_lock);
-}
-
-static void tux_ftp_state_change (struct sock *sk)
-{
-       HANDLE_CALLBACK(state_change, tux_ftp_state_change,
-                       ftp_real_state_change, sk);
-
-       if (req->sock && req->sock->sk &&
-                       (req->sock->sk->sk_state > TCP_ESTABLISHED)) {
-               Dprintk("req %p FTP control sock changed to TCP non-established!\n", req);
-               Dprintk("req->sock: %p\n", req->sock);
-               TDprintk("req->error = TUX_ERROR_CONN_CLOSE!\n");
-
-               req->error = TUX_ERROR_CONN_CLOSE;
-       }
-       if (!idle_event(req))
-               output_space_event(req);
-       read_unlock(&sk->sk_callback_lock);
-}
-
-static void tux_ftp_create_child (struct sock *sk, struct sock *newsk)
-{
-       HANDLE_CALLBACK(create_child, tux_ftp_create_child,
-                       ftp_real_create_child, sk, newsk);
-
-       newsk->sk_user_data = NULL;
-       newsk->sk_data_ready = req->ftp_real_data_ready;
-       newsk->sk_state_change = req->ftp_real_state_change;
-       newsk->sk_write_space = req->ftp_real_write_space;
-       newsk->sk_error_report = req->ftp_real_error_report;
-       newsk->sk_create_child = req->ftp_real_create_child;
-       newsk->sk_destruct = req->ftp_real_destruct;
-
-       if (!idle_event(req))
-               output_space_event(req);
-       read_unlock(&sk->sk_callback_lock);
-}
-
-static void tux_ftp_destruct (struct sock *sk)
-{
-       BUG();
-}
-
-static void link_tux_socket (tux_req_t *req, struct socket *sock)
-{
-       struct sock *sk = sock->sk;
-
-       if (req->sock)
-               TUX_BUG();
-       if (sk->sk_destruct == tux_destruct)
-               TUX_BUG();
-       /*
-        * (No need to lock the socket, we just want to
-        * make sure that events from now on go through
-        * tux_data_ready())
-        */
-       write_lock_irq(&sk->sk_callback_lock);
-
-       req->sock = sock;
-       sk->sk_user_data = req;
-
-       req->real_data_ready = sk->sk_data_ready;
-       req->real_state_change = sk->sk_state_change;
-       req->real_write_space = sk->sk_write_space;
-       req->real_error_report = sk->sk_error_report;
-       req->real_destruct = sk->sk_destruct;
-
-       sk->sk_data_ready = tux_data_ready;
-       sk->sk_state_change = tux_state_change;
-       sk->sk_write_space = tux_write_space;
-       sk->sk_error_report = tux_error_report;
-       sk->sk_destruct = tux_destruct;
-
-       write_unlock_irq(&sk->sk_callback_lock);
-
-       if (req->real_destruct == tux_destruct)
-               TUX_BUG();
-       req->client_addr = inet_sk(sk)->daddr;
-       req->client_port = inet_sk(sk)->dport;
-
-       add_wait_queue(sk->sk_sleep, &req->sleep);
-}
-
-void __link_data_socket (tux_req_t *req, struct socket *sock,
-                                               struct sock *sk)
-{
-       /*
-        * (No need to lock the socket, we just want to
-        * make sure that events from now on go through
-        * tux_data_ready())
-        */
-       write_lock_irq(&sk->sk_callback_lock);
-
-       req->data_sock = sock;
-       sk->sk_user_data = req;
-
-       req->ftp_real_data_ready = sk->sk_data_ready;
-       req->ftp_real_state_change = sk->sk_state_change;
-       req->ftp_real_write_space = sk->sk_write_space;
-       req->ftp_real_error_report = sk->sk_error_report;
-       req->ftp_real_create_child = sk->sk_create_child;
-       req->ftp_real_destruct = sk->sk_destruct;
-
-       sk->sk_data_ready = tux_ftp_data_ready;
-       sk->sk_state_change = tux_ftp_state_change;
-       sk->sk_write_space = tux_ftp_write_space;
-       sk->sk_error_report = tux_ftp_error_report;
-       sk->sk_create_child = tux_ftp_create_child;
-       sk->sk_destruct = tux_ftp_destruct;
-
-       if (req->ftp_real_destruct == tux_ftp_destruct)
-               TUX_BUG();
-
-       write_unlock_irq(&sk->sk_callback_lock);
-
-       add_wait_queue(sk->sk_sleep, &req->ftp_sleep);
-}
-
-void link_tux_data_socket (tux_req_t *req, struct socket *sock)
-{
-       struct sock *sk = sock->sk;
-
-       if (req->data_sock)
-               TUX_BUG();
-       if (sk->sk_destruct == tux_ftp_destruct)
-               TUX_BUG();
-       __link_data_socket(req, sock, sk);
-}
-
-void unlink_tux_socket (tux_req_t *req)
-{
-       struct sock *sk;
-       
-       if (!req->sock || !req->sock->sk)
-               return;
-       sk = req->sock->sk;
-
-       write_lock_irq(&sk->sk_callback_lock);
-       if (!sk->sk_user_data)
-               TUX_BUG();
-       if (req->real_destruct == tux_destruct)
-               TUX_BUG();
-
-       sk->sk_user_data = NULL;
-
-       sk->sk_data_ready = req->real_data_ready;
-       sk->sk_state_change = req->real_state_change;
-       sk->sk_write_space = req->real_write_space;
-       sk->sk_error_report = req->real_error_report;
-       sk->sk_destruct = req->real_destruct;
-
-       if (sk->sk_destruct == tux_destruct)
-               TUX_BUG();
-
-       req->real_data_ready = NULL;
-       req->real_state_change = NULL;
-       req->real_write_space = NULL;
-       req->real_error_report = NULL;
-       req->real_destruct = NULL;
-
-       write_unlock_irq(&sk->sk_callback_lock);
-
-       remove_wait_queue(sk->sk_sleep, &req->sleep);
-}
-
-void unlink_tux_data_socket (tux_req_t *req)
-{
-       struct sock *sk;
-       
-       if (!req->data_sock || !req->data_sock->sk)
-               return;
-       sk = req->data_sock->sk;
-
-       write_lock_irq(&sk->sk_callback_lock);
-
-       if (req->real_destruct == tux_ftp_destruct)
-               TUX_BUG();
-
-       sk->sk_user_data = NULL;
-       sk->sk_data_ready = req->ftp_real_data_ready;
-       sk->sk_state_change = req->ftp_real_state_change;
-       sk->sk_write_space = req->ftp_real_write_space;
-       sk->sk_error_report = req->ftp_real_error_report;
-       sk->sk_create_child = req->ftp_real_create_child;
-       sk->sk_destruct = req->ftp_real_destruct;
-
-       req->ftp_real_data_ready = NULL;
-       req->ftp_real_state_change = NULL;
-       req->ftp_real_write_space = NULL;
-       req->ftp_real_error_report = NULL;
-       req->ftp_real_create_child = NULL;
-       req->ftp_real_destruct = NULL;
-
-       write_unlock_irq(&sk->sk_callback_lock);
-
-       if (sk->sk_destruct == tux_ftp_destruct)
-               TUX_BUG();
-
-       remove_wait_queue(sk->sk_sleep, &req->ftp_sleep);
-}
-
-void add_tux_atom (tux_req_t *req, atom_func_t *atom)
-{
-       Dprintk("adding TUX atom %p to req %p, atom_idx: %d, at %p/%p.\n",
-               atom, req, req->atom_idx, __builtin_return_address(0), __builtin_return_address(1));
-       if (req->atom_idx == MAX_TUX_ATOMS)
-               TUX_BUG();
-       req->atoms[req->atom_idx] = atom;
-       req->atom_idx++;
-}
-
-void del_tux_atom (tux_req_t *req)
-{
-       if (!req->atom_idx)
-               TUX_BUG();
-       req->atom_idx--;
-       Dprintk("removing TUX atom %p to req %p, atom_idx: %d, at %p.\n",
-               req->atoms[req->atom_idx], req, req->atom_idx, __builtin_return_address(0));
-}
-
-void tux_schedule_atom (tux_req_t *req, int cachemiss)
-{
-       if (!list_empty(&req->work))
-               TUX_BUG();
-       if (!req->atom_idx)
-               TUX_BUG();
-       req->atom_idx--;
-       Dprintk("DOING TUX atom %p, req %p, atom_idx: %d, at %p.\n",
-               req->atoms[req->atom_idx], req, req->atom_idx, __builtin_return_address(0));
-       might_sleep();
-       req->atoms[req->atom_idx](req, cachemiss);
-       might_sleep();
-       Dprintk("DONE TUX atom %p, req %p, atom_idx: %d, at %p.\n",
-               req->atoms[req->atom_idx], req, req->atom_idx, __builtin_return_address(0));
-}
-
-/*
- * Puts newly accepted connections into the inputqueue. This is the
- * first step in the life of a TUX request.
- */
-int accept_requests (threadinfo_t *ti)
-{
-       int count = 0, last_count = 0, error, socknr = 0;
-       struct socket *sock, *new_sock;
-       struct tcp_opt *tp1, *tp2;
-       tux_req_t *req;
-
-       if (ti->nr_requests > tux_max_connect)
-               goto out;
-
-repeat:
-       for (socknr = 0; socknr < CONFIG_TUX_NUMSOCKETS; socknr++) {
-               tux_listen_t *tux_listen;
-
-               tux_listen = ti->listen + socknr;
-               sock = tux_listen->sock;
-               if (!sock)
-                       break;
-               if (unlikely(test_thread_flag(TIF_NEED_RESCHED)))
-                       break;
-
-       tp1 = tcp_sk(sock->sk);
-       /*
-        * Quick test to see if there are connections on the queue.
-        * This is cheaper than accept() itself because this saves us
-        * the allocation of a new socket. (Which doesn't seem to be
-        * used anyway)
-        */
-       if (tp1->accept_queue) {
-               tux_proto_t *proto;
-
-               if (!count++)
-                       __set_task_state(current, TASK_RUNNING);
-
-               new_sock = sock_alloc();
-               if (!new_sock)
-                       goto out;
-
-               new_sock->type = sock->type;
-               new_sock->ops = sock->ops;
-
-               error = sock->ops->accept(sock, new_sock, O_NONBLOCK);
-               if (error < 0)
-                       goto err;
-               if (new_sock->sk->sk_state != TCP_ESTABLISHED)
-                       goto err;
-
-               tp2 = tcp_sk(new_sock->sk);
-               tp2->nonagle = 2;
-               tp2->ack.pingpong = tux_ack_pingpong;
-               new_sock->sk->sk_reuse = 1;
-               sock_set_flag(new_sock->sk, SOCK_URGINLINE);
-
-               /* Allocate a request-entry for the connection */
-               req = kmalloc_req(ti);
-               if (!req)
-                       BUG();
-               link_tux_socket(req, new_sock);
-
-               proto = req->proto = tux_listen->proto;
-
-               proto->got_request(req);
-       }
-       }
-       if (count != last_count) {
-               last_count = count;
-               goto repeat;
-       }
-out:
-       return count;
-err:
-       sock_release(new_sock);
-       goto out;
-}
-
diff --git a/net/tux/cachemiss.c b/net/tux/cachemiss.c
deleted file mode 100644 (file)
index f840583..0000000
+++ /dev/null
@@ -1,264 +0,0 @@
-/*
- * TUX - Integrated Application Protocols Layer and Object Cache
- *
- * Copyright (C) 2000, 2001, Ingo Molnar <mingo@redhat.com>
- *
- * cachemiss.c: handle the 'slow IO path' by queueing not-yet-cached
- * requests to the IO-thread pool. Dynamic load balancing is done
- * between IO threads, based on the number of requests they have pending.
- */
-
-#include <net/tux.h>
-#include <linux/delay.h>
-
-/****************************************************************
- *      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, 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.
- *
- ****************************************************************/
-
-void queue_cachemiss (tux_req_t *req)
-{
-       iothread_t *iot = req->ti->iot;
-
-       Dprintk("queueing_cachemiss(req:%p) (req->cwd_dentry: %p) at %p:%p.\n",
-               req, req->cwd_dentry, __builtin_return_address(0), __builtin_return_address(1));
-       if (req->idle_input || req->wait_output_space)
-               TUX_BUG();
-       req->had_cachemiss = 1;
-       if (!list_empty(&req->work))
-               TUX_BUG();
-       spin_lock(&iot->async_lock);
-       if (connection_too_fast(req))
-               list_add_tail(&req->work, &iot->async_queue);
-       else
-               list_add(&req->work, &iot->async_queue);
-       iot->nr_async_pending++;
-       INC_STAT(nr_cachemiss_pending);
-       spin_unlock(&iot->async_lock);
-
-       wake_up(&iot->async_sleep);
-}
-
-static tux_req_t * get_cachemiss (iothread_t *iot)
-{
-       struct list_head *tmp;
-       tux_req_t *req = NULL;
-
-       spin_lock(&iot->async_lock);
-       if (!list_empty(&iot->async_queue)) {
-
-               tmp = iot->async_queue.next;
-               req = list_entry(tmp, tux_req_t, work);
-
-               Dprintk("get_cachemiss(%p): got req %p.\n", iot, req);
-               list_del(tmp);
-               DEBUG_DEL_LIST(tmp);
-               iot->nr_async_pending--;
-               DEC_STAT(nr_cachemiss_pending);
-
-               if (req->ti->iot != iot)
-                       TUX_BUG();
-       }
-       spin_unlock(&iot->async_lock);
-       return req;
-}
-
-struct file * tux_open_file (char *filename, int mode)
-{
-       struct file *filp;
-
-       if (!filename)
-               TUX_BUG();
-
-       /* Rule no. 3 -- Does the file exist ? */
-
-       filp = filp_open(filename, mode, 0600);
-
-       if (IS_ERR(filp) || !filp || !filp->f_dentry)
-               goto err;
-
-out:
-       return filp;
-err:
-       Dprintk("filp_open() error: %d.\n", (int)filp);
-       filp = NULL;
-       goto out;
-}
-
-static int cachemiss_thread (void *data)
-{
-       tux_req_t *req;
-       struct k_sigaction *ka;
-       DECLARE_WAITQUEUE(wait, current);
-       iothread_t *iot = data;
-       int nr = iot->ti->cpu, wake_up;
-
-       Dprintk("iot %p/%p got started.\n", iot, current);
-       drop_permissions();
-
-       spin_lock(&iot->async_lock);
-       iot->threads++;
-       sprintf(current->comm, "async IO %d/%d", nr, iot->threads);
-
-
-       spin_lock_irq(&current->sighand->siglock);
-       ka = current->sighand->action + SIGCHLD-1;
-       ka->sa.sa_handler = SIG_IGN;
-       siginitsetinv(&current->blocked, sigmask(SIGCHLD));
-       recalc_sigpending();
-       spin_unlock_irq(&current->sighand->siglock);
-
-       spin_unlock(&iot->async_lock);
-#if CONFIG_SMP
-       {
-               cpumask_t mask;
-
-               if (cpu_isset(nr, cpu_online_map)) {
-                       cpus_clear(mask);
-                       cpu_set(nr, mask);
-                       set_cpus_allowed(current, mask);
-               }
-
-       }
-#endif
-
-       add_wait_queue_exclusive(&iot->async_sleep, &wait);
-
-       for (;;) {
-               while (!list_empty(&iot->async_queue) &&
-                               (req = get_cachemiss(iot))) {
-
-                       if (!req->atom_idx) {
-                               add_tux_atom(req, flush_request);
-                               add_req_to_workqueue(req);
-                               continue;
-                       }
-                       tux_schedule_atom(req, 1);
-                       if (signal_pending(current))
-                               flush_all_signals();
-               }
-               if (signal_pending(current))
-                       flush_all_signals();
-               if (!list_empty(&iot->async_queue))
-                       continue;
-               if (iot->shutdown) {
-                       Dprintk("iot %p/%p got shutdown!\n", iot, current);
-                       break;
-               }
-               __set_current_state(TASK_INTERRUPTIBLE);
-               if (list_empty(&iot->async_queue)) {
-                       Dprintk("iot %p/%p going to sleep.\n", iot, current);
-                       schedule();
-                       Dprintk("iot %p/%p got woken up.\n", iot, current);
-               }
-               __set_current_state(TASK_RUNNING);
-       }
-
-       remove_wait_queue(&iot->async_sleep, &wait);
-
-       wake_up = 0;
-       spin_lock(&iot->async_lock);
-       if (!--iot->threads)
-               wake_up = 1;
-       spin_unlock(&iot->async_lock);
-       Dprintk("iot %p/%p has finished shutdown!\n", iot, current);
-       if (wake_up) {
-               Dprintk("iot %p/%p waking up master.\n", iot, current);
-               wake_up(&iot->wait_shutdown);
-       }
-
-       return 0;
-}
-
-static void __stop_cachemiss_threads (iothread_t *iot)
-{
-       DECLARE_WAITQUEUE(wait, current);
-
-       Dprintk("stopping async IO threads %p.\n", iot);
-       add_wait_queue(&iot->wait_shutdown, &wait);
-
-       spin_lock(&iot->async_lock);
-       if (iot->shutdown)
-               TUX_BUG();
-       if (!iot->threads)
-               TUX_BUG();
-       iot->shutdown = 1;
-       wake_up_all(&iot->async_sleep);
-       spin_unlock(&iot->async_lock);
-               
-       __set_current_state(TASK_UNINTERRUPTIBLE);
-       Dprintk("waiting for async IO threads %p to exit.\n", iot);
-       schedule();
-       remove_wait_queue(&iot->wait_shutdown, &wait);
-
-       if (iot->threads)
-               TUX_BUG();
-       if (iot->nr_async_pending)
-               TUX_BUG();
-       Dprintk("stopped async IO threads %p.\n", iot);
-}
-
-void stop_cachemiss_threads (threadinfo_t *ti)
-{
-       iothread_t *iot = ti->iot;
-
-       if (!iot)
-               TUX_BUG();
-       if (iot->nr_async_pending)
-               TUX_BUG();
-       __stop_cachemiss_threads(iot);
-       ti->iot = NULL;
-       kfree(iot);
-}
-
-int start_cachemiss_threads (threadinfo_t *ti)
-{
-       int i, pid;
-
-       iothread_t *iot;
-
-       iot = kmalloc(sizeof(*iot), GFP_KERNEL);
-       if (!iot)
-               return -ENOMEM;
-       memset(iot, 0, sizeof(*iot));
-
-       iot->ti = ti;
-       iot->async_lock = SPIN_LOCK_UNLOCKED;
-       iot->nr_async_pending = 0;
-       INIT_LIST_HEAD(&iot->async_queue);
-       init_waitqueue_head(&iot->async_sleep);
-       init_waitqueue_head(&iot->wait_shutdown);
-               
-       for (i = 0; i < NR_IO_THREADS; i++) {
-               pid = kernel_thread(cachemiss_thread, (void *)iot, 0);
-               if (pid < 0) {
-                       printk(KERN_ERR "TUX: error %d creating IO thread!\n",
-                                       pid);
-                       __stop_cachemiss_threads(iot);
-                       kfree(iot);
-                       return pid;
-               }
-       }
-       ti->iot = iot;
-       /*
-        * Wait for all cachemiss threads to start up:
-        */
-       while (iot->threads != NR_IO_THREADS) {
-               __set_current_state(TASK_INTERRUPTIBLE);
-               schedule_timeout(HZ/10);
-       }
-       return 0;
-}
-
diff --git a/net/tux/cgi.c b/net/tux/cgi.c
deleted file mode 100644 (file)
index fda4d38..0000000
+++ /dev/null
@@ -1,173 +0,0 @@
-/*
- * TUX - Integrated Application Protocols Layer and Object Cache
- *
- * Copyright (C) 2000, 2001, Ingo Molnar <mingo@redhat.com>
- *
- * cgi.c: user-space CGI (and other) code execution.
- */
-
-#define __KERNEL_SYSCALLS__
-#define __KERNEL_SYSCALLS_NO_ERRNO__
-
-#include <net/tux.h>
-
-/****************************************************************
- *      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, 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.
- *
- ****************************************************************/
-
-static int exec_usermode(char *program_path, char *argv[], char *envp[])
-{
-       int i, err;
-
-       err = tux_chroot(tux_cgiroot);
-       if (err) {
-               printk(KERN_ERR "TUX: CGI chroot returned %d, /proc/sys/net/tux/cgiroot is probably set up incorrectly! Aborting CGI execution.\n", err);
-               return err;
-       }
-
-       /* Allow execve args to be in kernel space. */
-       set_fs(KERNEL_DS);
-
-       flush_signals(current);
-       spin_lock_irq(&current->sighand->siglock);
-       flush_signal_handlers(current, 1);
-       spin_unlock_irq(&current->sighand->siglock);
-
-       for (i = 3; i < current->files->max_fds; i++ )
-               if (current->files->fd[i])
-                       tux_close(i);
-
-       err = execve(program_path, argv, envp);
-       if (err < 0)
-               return err;
-       return 0;
-}
-
-static inline long tux_dup(unsigned int fildes)
-{
-       int ret = -EBADF;
-       struct file * file = fget(fildes);
-
-       if (file)
-               ret = dupfd(file, 0);
-       return ret;
-}
-
-static int exec_helper (void * data)
-{
-       exec_param_t *param = data;
-       char **tmp;
-       int ret;
-
-       sprintf(current->comm,"doexec - %d", current->pid);
-#if CONFIG_SMP
-       if (!tux_cgi_inherit_cpu) {
-               
-               cpumask_t cgi_mask, map;
-               
-               mask_to_cpumask(tux_cgi_cpu_mask, &cgi_mask);
-               cpus_and(map, cpu_online_map, cgi_mask);
-       
-               if (!(cpus_empty(map)))
-                       set_cpus_allowed(current, cgi_mask);
-               else
-                       set_cpus_allowed(current, cpu_online_map);
-       }
-#endif
-
-       if (!param)
-               TUX_BUG();
-       Dprintk("doing exec(%s).\n", param->command);
-
-       Dprintk("argv: ");
-       tmp = param->argv;
-       while (*tmp) {
-               Dprintk("{%s} ", *tmp);
-               tmp++;
-       }
-       Dprintk("\n");
-       Dprintk("envp: ");
-       tmp = param->envp;
-       while (*tmp) {
-               Dprintk("{%s} ", *tmp);
-               tmp++;
-       }
-       Dprintk("\n");
-       /*
-        * Set up stdin, stdout and stderr of the external
-        * CGI application.
-        */
-       if (param->pipe_fds) {
-               tux_close(1);
-               tux_close(2);
-               tux_close(4);
-               if (tux_dup(3) != 1)
-                       TUX_BUG();
-               if (tux_dup(5) != 2)
-                       TUX_BUG();
-               tux_close(3);
-               tux_close(5);
-               // do not close on exec.
-#if 0
-               sys_fcntl(0, F_SETFD, 0);
-               sys_fcntl(1, F_SETFD, 0);
-               sys_fcntl(2, F_SETFD, 0);
-#else
-               spin_lock(&current->files->file_lock);
-               FD_CLR(0, current->files->close_on_exec);
-               FD_CLR(1, current->files->close_on_exec);
-               FD_CLR(2, current->files->close_on_exec);
-               spin_unlock(&current->files->file_lock);
-#endif
-       }
-       ret = exec_usermode(param->command, param->argv, param->envp);
-       if (ret < 0)
-               Dprintk("bug: exec() returned %d.\n", ret);
-       else
-               Dprintk("exec()-ed successfully!\n");
-       return 0;
-}
-
-pid_t tux_exec_process (char *command, char **argv,
-                       char **envp, int pipe_fds,
-                               exec_param_t *param, int wait)
-{
-       exec_param_t param_local;
-       pid_t pid;
-       struct k_sigaction *ka;
-
-       ka = current->sighand->action + SIGCHLD-1;
-       ka->sa.sa_handler = SIG_IGN;
-
-       if (!param && wait)
-               param = &param_local;
-
-       param->command = command;
-       param->argv = argv;
-       param->envp = envp;
-       param->pipe_fds = pipe_fds;
-
-repeat_fork:
-       pid = kernel_thread(exec_helper, (void*) param, CLONE_SIGHAND|SIGCHLD);
-       Dprintk("kernel thread created PID %d.\n", pid);
-       if (pid < 0) {
-               printk(KERN_ERR "TUX: could not create new CGI kernel thread due to %d... retrying.\n", pid);
-               current->state = TASK_UNINTERRUPTIBLE;
-               schedule_timeout(HZ);
-               goto repeat_fork;
-       }
-       return pid;
-}
diff --git a/net/tux/directory.c b/net/tux/directory.c
deleted file mode 100644 (file)
index 714800e..0000000
+++ /dev/null
@@ -1,297 +0,0 @@
-/*
- * TUX - Integrated Application Protocols Layer and Object Cache
- *
- * Copyright (C) 2000, 2001, Ingo Molnar <mingo@redhat.com>
- *
- * directory.c: directory listing support
- */
-
-#define __KERNEL_SYSCALLS__
-#include <net/tux.h>
-
-/****************************************************************
- *      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, 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.
- *
- ****************************************************************/
-
-char * tux_print_path (tux_req_t *req, struct dentry *dentry, struct vfsmount *mnt, char *buf, unsigned int max_len)
-{
-       char *res;
-       struct dentry *cwd, *root;
-       struct vfsmount *cwd_mnt, *rootmnt;
-
-       cwd = dget(dentry);
-       cwd_mnt = mntget(mnt);
-       root = dget(req->docroot_dentry);
-       rootmnt = mntget(req->docroot_mnt);
-
-       spin_lock(&dcache_lock);
-       res = __d_path(cwd, cwd_mnt, root, rootmnt, buf, max_len);
-       spin_unlock(&dcache_lock);
-
-       dput(cwd);
-       mntput(cwd_mnt);
-       dput(root);
-       mntput(rootmnt);
-
-       return res;
-}
-
-/*
- * There are filesystems that do not fill in ->d_type correctly.
- * Determine file-type.
- */
-static int get_d_type (struct dentry *dentry)
-{
-       unsigned int mode = dentry->d_inode->i_mode;
-
-       if (S_ISREG(mode))
-               return DT_REG;
-       if (S_ISDIR(mode))
-               return DT_DIR;
-       if (S_ISLNK(mode))
-               return DT_LNK;
-       if (S_ISFIFO(mode))
-               return DT_FIFO;
-       if (S_ISSOCK(mode))
-               return DT_SOCK;
-       if (S_ISCHR(mode))
-               return DT_CHR;
-       if (S_ISBLK(mode))
-               return DT_BLK;
-       return 0;
-}
-
-static void do_dir_line (tux_req_t *req, int cachemiss)
-{
-       struct linux_dirent64 *dirp, *dirp0;
-       char string0[MAX_OBJECTNAME_LEN+200], *tmp;
-       int len, curroff, total, str_len = 0;
-       int err, flag = cachemiss ? 0 : LOOKUP_ATOMIC;
-       struct nameidata base;
-       struct dentry *dentry = NULL;
-       struct inode *inode = NULL;
-       struct vfsmount *mnt = NULL;
-
-       if (req->proto->check_req_err(req, cachemiss))
-               return;
-
-       tmp = NULL;
-       dirp0 = req->dirp0;
-       curroff = req->curroff;
-       total = req->total;
-
-       dirp = (struct linux_dirent64 *)((char *)dirp0 + curroff);
-       if (!dirp->d_name || !dirp->d_name[0])
-               goto next_dir;
-       /*
-        * Hide .xxxxx files:
-        */
-       if (dirp->d_name[0] == '.')
-               goto next_dir;
-       Dprintk("<%s T:%d (off:%Ld) (len:%d)>\n", dirp->d_name, dirp->d_type, dirp->d_off, dirp->d_reclen);
-       if (tux_hide_unreadable) {
-               switch (dirp->d_type) {
-                       default:
-                               goto next_dir;
-                       case DT_UNKNOWN:
-                       case DT_REG:
-                       case DT_DIR:
-                       case DT_LNK:
-                       /* valid entries - fall through. */
-                               ;
-               }
-       }
-       len = strlen(dirp->d_name);
-       if (len >= MAX_OBJECTNAME_LEN) {
-               dirp->d_name[MAX_OBJECTNAME_LEN] = 0;
-               len = MAX_OBJECTNAME_LEN-1;
-       }
-
-       if (!req->dentry)
-               TUX_BUG();
-
-       base.flags = flag;
-       base.last_type = LAST_ROOT;
-       base.dentry = dget(req->dentry);
-       base.mnt = mntget(req->cwd_mnt);
-
-       switch_docroot(req);
-       err = path_walk(dirp->d_name, &base);
-
-       Dprintk("path_walk() returned %d.\n", err);
-
-       if (err) {
-               if (err == -EWOULDBLOCKIO) {
-                       add_tux_atom(req, do_dir_line);
-                       queue_cachemiss(req);
-                       return;
-               }
-               goto next_dir;
-       }
-
-       dentry = base.dentry;
-       mnt = base.mnt;
-       if (!dentry)
-               TUX_BUG();
-       if (IS_ERR(dentry))
-               TUX_BUG();
-       inode = dentry->d_inode;
-       if (!inode)
-               TUX_BUG();
-       if (!dirp->d_type)
-               dirp->d_type = get_d_type(dentry);
-       if (tux_hide_unreadable) {
-               umode_t mode;
-
-               mode = inode->i_mode;
-               if (mode & tux_mode_forbidden)
-                       goto out_dput;
-               if (!(mode & tux_mode_allowed))
-                       goto out_dput;
-
-               err = permission(inode, MAY_READ, NULL);
-               if (err)
-                       goto out_dput;
-               if (dirp->d_type == DT_DIR) {
-                       err = permission(inode, MAY_EXEC, NULL);
-                       if (err)
-                               goto out_dput;
-               }
-       }
-
-       tmp = req->proto->print_dir_line(req, string0, dirp->d_name, len, dirp->d_type, dentry, inode);
-       if (tmp)
-               str_len = tmp-string0;
-out_dput:
-       dput(dentry);
-       mntput(mnt);
-next_dir:
-       curroff += dirp->d_reclen;
-
-       if (tmp && (tmp != string0))
-               Dprintk("writing line (len: %d): <%s>\n", strlen(string0), string0);
-
-       if (curroff < total) {
-               req->dirp0 = dirp0;
-               req->curroff = curroff;
-               add_tux_atom(req, do_dir_line);
-       } else {
-               kfree(dirp0);
-               req->dirp0 = NULL;
-               req->curroff = 0;
-               // falls back to the list_directory atom
-       }
-       if (tmp && (tmp != string0))
-               __send_async_message(req, string0, 200, str_len, 0);
-       else
-               add_req_to_workqueue(req);
-}
-
-#define NAME_OFFSET(de) ((int) ((de)->d_name - (char *) (de)))
-#define ROUND_UP(x) (((x)+sizeof(long)-1) & ~(sizeof(long)-1))
-#define ROUND_UP64(x) (((x)+sizeof(u64)-1) & ~(sizeof(u64)-1))
-
-static int filldir64(void * __buf, const char * name, int namlen, loff_t offset,
-                    ino_t ino, unsigned int d_type)
-{
-       struct linux_dirent64 * dirent, d;
-       struct getdents_callback64 * buf = (struct getdents_callback64 *) __buf;
-       int reclen = ROUND_UP64(NAME_OFFSET(dirent) + namlen + 1);
-
-       buf->error = -EINVAL;   /* only used if we fail.. */
-       if (reclen > buf->count)
-               return -EINVAL;
-       dirent = buf->previous;
-       if (dirent) {
-               d.d_off = offset;
-               copy_to_user(&dirent->d_off, &d.d_off, sizeof(d.d_off));
-       }
-       dirent = buf->current_dir;
-       buf->previous = dirent;
-       memset(&d, 0, NAME_OFFSET(&d));
-       d.d_ino = ino;
-       d.d_reclen = reclen;
-       d.d_type = d_type;
-       copy_to_user(dirent, &d, NAME_OFFSET(&d));
-       copy_to_user(dirent->d_name, name, namlen);
-       put_user(0, dirent->d_name + namlen);
-       dirent = (void *)dirent + reclen;
-       buf->current_dir = dirent;
-       buf->count -= reclen;
-       return 0;
-}
-#define DIRENT_SIZE 3000
-
-void list_directory (tux_req_t *req, int cachemiss)
-{
-       struct getdents_callback64 buf;
-       struct linux_dirent64 *dirp0;
-       mm_segment_t oldmm;
-       int total;
-
-       Dprintk("list_directory(%p, %d), dentry: %p.\n", req, cachemiss, req->dentry);
-       if (!req->cwd_dentry)
-               TUX_BUG();
-
-       if (!cachemiss) {
-               add_tux_atom(req, list_directory);
-               queue_cachemiss(req);
-               return;
-       }
-
-       dirp0 = tux_kmalloc(DIRENT_SIZE);
-
-       buf.current_dir = dirp0;
-       buf.previous = NULL;
-       buf.count = DIRENT_SIZE;
-       buf.error = 0;
-
-       oldmm = get_fs(); set_fs(KERNEL_DS);
-       set_fs(KERNEL_DS);
-       total = vfs_readdir(&req->in_file, filldir64, &buf);
-       set_fs(oldmm);
-
-       if (buf.previous)
-               total = DIRENT_SIZE - buf.count;
-
-       Dprintk("total: %d (buf.error: %d, buf.previous %p)\n",
-               total, buf.error, buf.previous);
-
-       if (total < 0) {
-               kfree(dirp0);
-               req_err(req);
-               add_req_to_workqueue(req);
-               return;
-       }
-       if (!total) {
-               kfree(dirp0);
-               req->in_file.f_pos = 0;
-               add_req_to_workqueue(req);
-               return;
-       }
-
-       if (!req->cwd_dentry)
-               TUX_BUG();
-       add_tux_atom(req, list_directory);
-
-       req->dirp0 = dirp0;
-       req->curroff = 0;
-       req->total = total;
-       add_tux_atom(req, do_dir_line);
-
-       add_req_to_workqueue(req);
-}
-
diff --git a/net/tux/extcgi.c b/net/tux/extcgi.c
deleted file mode 100644 (file)
index 1d1d1d5..0000000
+++ /dev/null
@@ -1,329 +0,0 @@
-/*
- * TUX - Integrated Application Protocols Layer and Object Cache
- *
- * Copyright (C) 2000, 2001, Ingo Molnar <mingo@redhat.com>
- *
- * extcgi.c: dynamic TUX module which forks and starts an external CGI
- */
-
-#define __KERNEL_SYSCALLS__
-#define __KERNEL_SYSCALLS_NO_ERRNO__
-
-#include <net/tux.h>
-#include "parser.h"
-
-/****************************************************************
- *      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, 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.
- *
- ****************************************************************/
-
-#define MAX_ENVLEN 1000
-#define MAX_CGI_METAVARIABLES 32
-#define CGI_CHUNK_SIZE 1024 
-#define MAX_CGI_COMMAND_LEN 256
-
-#if CONFIG_TUX_DEBUG
-#define PRINT_MESSAGE_LEFT \
-       Dprintk("CGI message left at %s:%d:\n--->{%s}<---\n", \
-               __FILE__, __LINE__, curr)
-#else
-#define PRINT_MESSAGE_LEFT do {} while(0)
-#endif
-
-#define GOTO_INCOMPLETE do { Dprintk("invalid CGI reply at %s:%d.\n", __FILE__, __LINE__); goto invalid; } while (0)
-
-/*
- * Please acknowledge our hard work by not changing this define, or
- * at least please acknowledge us by leaving "TUX/2.0 (Linux)" in
- * the ID string. Thanks! :-)
- */
-#define CGI_SUCCESS2 "HTTP/1.1 200 OK\r\nConnection: close\r\nServer: TUX/2.0 (Linux)\r\n"
-
-static int handle_cgi_reply (tux_req_t *req)
-{
-       int first = 1;
-       int len, left, total;
-       char *buf, *tmp;
-       mm_segment_t oldmm;
-
-       buf = tux_kmalloc(CGI_CHUNK_SIZE+1);
-       tux_close(3);
-       tux_close(4);
-       tux_close(5);
-       oldmm = get_fs(); set_fs(KERNEL_DS);
-       send_sync_buf(NULL, req->sock, CGI_SUCCESS2, sizeof(CGI_SUCCESS2)-1, MSG_MORE);
-       set_fs(oldmm);
-
-       req->bytes_sent = 0;
-       /*
-        * The new process is the new owner of the socket, it will
-        * close it.
-        */
-repeat:
-       left = CGI_CHUNK_SIZE;
-       len = 0;
-       total = 0;
-       tmp = buf;
-       do {
-               mm_segment_t oldmm;
-
-               tmp += len;
-               total += len;
-               left -= len;
-               if (!left)
-                       break;
-repeat_read:
-               Dprintk("reading %d bytes via read().\n", left);
-               oldmm = get_fs(); set_fs(KERNEL_DS);
-               len = read(2, tmp, left);
-               set_fs(oldmm);
-               Dprintk("got %d bytes from read() (total: %d).\n", len, total);
-               if (len > 0)
-                       tmp[len] = 0;
-               Dprintk("CGI reply: (%d bytes, total %d).\n", len, total);
-               if (len == -ERESTARTSYS) {
-                       flush_all_signals();
-                       goto repeat_read;
-               }
-       } while (len > 0);
-       if (total > CGI_CHUNK_SIZE) {
-               printk(KERN_ERR "TUX: CGI weirdness. total: %d, len: %d, left: %d.\n", total, len, left);
-               TUX_BUG();
-       }
-       Dprintk("CGI done reply chunk: (%d bytes last, total %d).\n", len, total);
-       if (total) {
-               mm_segment_t oldmm;
-
-               oldmm = get_fs(); set_fs(KERNEL_DS);
-               if (!len)
-                       send_sync_buf(NULL, req->sock, buf, total, 0);
-               else
-                       send_sync_buf(NULL, req->sock, buf, total, MSG_MORE);
-               set_fs(oldmm);
-               req->bytes_sent += total;
-       }
-
-       Dprintk("bytes_sent: %d\n", req->bytes_sent);
-       if ((total > 0) && first) {
-               first = 0;
-
-               if (buf[total])
-                       TUX_BUG();
-               tmp = strstr(buf, "\n\n");
-               if (tmp) {
-                       req->bytes_sent -= (tmp-buf) + 2;
-                       Dprintk("new bytes_sent: %d\n", req->bytes_sent);
-               } else {
-                       req->bytes_sent = 0;
-                       req_err(req);
-               }
-       }
-       if (len < 0)
-               Dprintk("sys_read returned with %d.\n", len);
-       else {
-               if (total > 0)
-                       goto repeat;
-       }
-       tux_close(2);
-
-       req->status = 200;
-       add_req_to_workqueue(req);
-       kfree(buf);
-
-       return -1;
-}
-
-static int exec_external_cgi (void *data)
-{
-       exec_param_t param;
-       tux_req_t *req = data;
-       char *envp[MAX_CGI_METAVARIABLES+1], **envp_p;
-       char *argv[] = { "extcgi", NULL};
-       char *envstr, *tmp;
-       unsigned int host;
-       struct k_sigaction *ka;
-       int in_pipe_fds[2], out_pipe_fds[2], err_pipe_fds[2], len, err;
-       char *command;
-       pid_t pid;
-
-       len = strlen(tux_common_docroot);
-       if (req->objectname_len + len + 12 > MAX_CGI_COMMAND_LEN)
-               return -ENOMEM;
-       sprintf(current->comm,"cgimain - %d", current->pid);
-       host = inet_sk(req->sock->sk)->daddr;
-
-       envstr = tux_kmalloc(MAX_ENVLEN);
-       command = tux_kmalloc(MAX_CGI_COMMAND_LEN);
-
-       tmp = envstr;
-       envp_p = envp;
-
-#define WRITE_ENV(str...) \
-       if (envp_p >= envp + MAX_CGI_METAVARIABLES) \
-               TUX_BUG(); \
-       len = sprintf(tmp, str); \
-       *envp_p++ = tmp; \
-       tmp += len + 1; \
-       if (tmp >= envstr + MAX_ENVLEN) \
-               TUX_BUG();
-
-       #define WRITE_ENV_STR(str,field,len)                    \
-       do {                                                    \
-               int offset;                                     \
-                                                               \
-               offset = sizeof(str)-1;                         \
-               err = -EFAULT;                                  \
-               if (tmp - envstr + offset + len >= MAX_ENVLEN)  \
-                       goto out;                               \
-               if (envp_p >= envp + MAX_CGI_METAVARIABLES)     \
-                       TUX_BUG();                              \
-               memcpy(tmp, str, offset);                       \
-               memcpy(tmp + offset, field, len);               \
-               offset += len;                                  \
-               tmp[offset] = 0;                                \
-               *envp_p++ = tmp;                                \
-               tmp += offset + 1;                              \
-       } while (0)
-
-       WRITE_ENV("GATEWAY_INTERFACE=CGI/1.1");
-       WRITE_ENV("CONTENT_LENGTH=%d", req->post_data_len);
-       WRITE_ENV("REMOTE_ADDR=%d.%d.%d.%d", NIPQUAD(host));
-       WRITE_ENV("SERVER_PORT=%d", 80);
-       WRITE_ENV("SERVER_SOFTWARE=TUX/2.0 (Linux)");
-
-#if 1
-       WRITE_ENV("DOCUMENT_ROOT=/");
-       WRITE_ENV("PATH_INFO=/");
-#else
-       WRITE_ENV_STR("DOCUMENT_ROOT=", tux_common_docroot, len);
-       WRITE_ENV_STR("PATH_INFO=", tux_common_docroot, len);
-#endif
-       WRITE_ENV_STR("QUERY_STRING=", req->query_str, req->query_len);
-       WRITE_ENV_STR("REQUEST_METHOD=", req->method_str, req->method_len);
-       WRITE_ENV_STR("SCRIPT_NAME=", req->objectname, req->objectname_len);
-       WRITE_ENV_STR("SERVER_PROTOCOL=", req->version_str, req->version_len);
-
-       if (req->content_type_len)
-               WRITE_ENV_STR("CONTENT_TYPE=",
-                       req->content_type_str, req->content_type_len);
-       if (req->cookies_len)
-               WRITE_ENV_STR("HTTP_COOKIE=",
-                       req->cookies_str, req->cookies_len);
-
-       if (req->host_len)
-               WRITE_ENV_STR("SERVER_NAME=", req->host, req->host_len);
-       else {
-               const char *host = "localhost";
-               WRITE_ENV_STR("SERVER_NAME=", host, strlen(host));
-       }
-
-       *envp_p = NULL;
-
-       spin_lock_irq(&current->sighand->siglock);
-       ka = current->sighand->action + SIGPIPE-1;
-       ka->sa.sa_handler = SIG_IGN;
-       siginitsetinv(&current->blocked, sigmask(SIGCHLD));
-       recalc_sigpending();
-       spin_unlock_irq(&current->sighand->siglock);
-
-       tux_close(0); tux_close(1);
-       tux_close(2); tux_close(3);
-       tux_close(4); tux_close(5);
-
-       in_pipe_fds[0] = in_pipe_fds[1] = -1;
-       out_pipe_fds[0] = out_pipe_fds[1] = -1;
-       err_pipe_fds[0] = err_pipe_fds[1] = -1;
-
-       err = -ENFILE;
-       if (do_pipe(in_pipe_fds))
-               goto out;
-       if (do_pipe(out_pipe_fds))
-               goto out;
-       if (do_pipe(err_pipe_fds))
-               goto out;
-
-       if (in_pipe_fds[0] != 0) TUX_BUG();
-       if (in_pipe_fds[1] != 1) TUX_BUG();
-       if (out_pipe_fds[0] != 2) TUX_BUG();
-       if (out_pipe_fds[1] != 3) TUX_BUG();
-       if (err_pipe_fds[0] != 4) TUX_BUG();
-       if (err_pipe_fds[1] != 5) TUX_BUG();
-
-       if (req->virtual && req->host_len)
-               sprintf(command, "/%s/cgi-bin/%s", req->host, req->objectname);
-       else
-               sprintf(command, "/cgi-bin/%s", req->objectname);
-       Dprintk("before CGI exec.\n");
-       pid = tux_exec_process(command, argv, envp, 1, &param, 0);
-       Dprintk("after CGI exec.\n");
-
-       if (req->post_data_len) {
-               mm_segment_t oldmm;
-               int ret;
-
-               Dprintk("POST data to CGI:\n");
-               oldmm = get_fs(); set_fs(KERNEL_DS);
-               ret = write(1, req->post_data_str, req->post_data_len);
-               set_fs(oldmm);
-               Dprintk("write() returned: %d.\n", ret);
-               if (ret != req->post_data_len)
-                       Dprintk("write() returned: %d.\n", ret);
-       }
-
-       tux_close(0);
-       tux_close(1);
-
-       handle_cgi_reply(req);
-       err = 0;
-
-out:
-       kfree(envstr);
-       kfree(command);
-
-       return err;
-}
-
-void start_external_cgi (tux_req_t *req)
-{
-       int pid;
-
-repeat:
-       pid = kernel_thread(exec_external_cgi, (void*) req, SIGCHLD);
-       if (pid == -1)
-               return;
-       if (pid < 0) {
-               printk(KERN_INFO "TUX: Could not fork external CGI process due to %d, retrying!\n", pid);
-               current->state = TASK_UNINTERRUPTIBLE;
-               schedule_timeout(HZ);
-               goto repeat;
-       }
-}
-
-int query_extcgi (tux_req_t *req)
-{
-       clear_keepalive(req);
-       start_external_cgi(req);
-       return -1;
-}
-
-#define EXTCGI_INVALID_HEADER \
-       "HTTP/1.1 503 Service Unavailable\r\n" \
-       "Content-Length: 23\r\n\r\n"
-
-#define EXTCGI_INVALID_BODY \
-       "TUX: invalid CGI reply."
-
-#define EXTCGI_INVALID EXTCGI_INVALID_HEADER EXTCGI_INVALID_BODY
-
diff --git a/net/tux/gzip.c b/net/tux/gzip.c
deleted file mode 100644 (file)
index 5476dff..0000000
+++ /dev/null
@@ -1,40 +0,0 @@
-/*     $Id: zlib.h,v 1.2 1997/12/23 10:47:44 paulus Exp $      */
-
-#include <linux/kernel.h>
-#include <linux/slab.h>
-#include <linux/zlib.h>
-#include <net/tux.h>
-
-#define STREAM_END_SPACE 12
-
-int tux_gzip_compress (tux_req_t *req, unsigned char *data_in, unsigned char *data_out, __u32 *in_len, __u32 *out_len)
-{
-       z_stream *s = &req->ti->gzip_state;
-       int ret, left;
-
-       down(&req->ti->gzip_sem);
-       if (zlib_deflateReset(s) != Z_OK)
-               BUG();
-
-       s->next_in = data_in;
-       s->next_out = data_out;
-       s->avail_in = *in_len;
-       s->avail_out = *out_len;
-
-       Dprintk("calling zlib_deflate with avail_in %d, avail_out %d\n", s->avail_in, s->avail_out);
-       ret = zlib_deflate(s, Z_FINISH);
-       Dprintk("deflate returned with avail_in %d, avail_out %d, total_in %ld, total_out %ld\n", s->avail_in, s->avail_out, s->total_in, s->total_out);
-
-       if (ret != Z_STREAM_END) {
-               printk("bad: deflate returned with %d! avail_in %d, avail_out %d, total_in %ld, total_out %ld\n", ret, s->avail_in, s->avail_out, s->total_in, s->total_out);
-               BUG();
-       }
-       *in_len = s->avail_in;
-       *out_len = s->avail_out;
-       left = s->avail_in;
-
-       up(&req->ti->gzip_sem);
-
-       return left;
-}
-
diff --git a/net/tux/input.c b/net/tux/input.c
deleted file mode 100644 (file)
index 054c3ed..0000000
+++ /dev/null
@@ -1,641 +0,0 @@
-/*
- * TUX - Integrated Application Protocols Layer and Object Cache
- *
- * Copyright (C) 2000, 2001, Ingo Molnar <mingo@redhat.com>
- *
- * input.c: handle requests arriving on accepted connections
- */
-
-#include <net/tux.h>
-#include <linux/kmod.h>
-
-/****************************************************************
- *      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, 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.
- *
- ****************************************************************/
-
-void zap_request (tux_req_t *req, int cachemiss)
-{
-       if (!req->error)
-               TUX_BUG();
-       if (req->error == TUX_ERROR_CONN_TIMEOUT) {
-               if (req->proto->request_timeout) {
-                       clear_keepalive(req);
-                       req->proto->request_timeout(req, cachemiss);
-               } else {
-                       clear_keepalive(req);
-                       if (!cachemiss)
-                               flush_request(req, 0);
-                       else {
-                               add_tux_atom(req, flush_request);
-                               add_req_to_workqueue(req);
-                       }
-               }
-               return;
-       }
-
-       if (!cachemiss && (req->error == TUX_ERROR_CONN_CLOSE)) {
-               /*
-                * Zap connection as fast as possible, there is
-                * no valid client connection anymore:
-                */
-               clear_keepalive(req);
-               flush_request(req, 0);
-       } else {
-               if (req->error == TUX_ERROR_CONN_CLOSE) {
-                       clear_keepalive(req);
-                       add_tux_atom(req, flush_request);
-               } else
-                       /*
-                        * Potentially redirect to the secondary server:
-                        */
-                       add_tux_atom(req, redirect_request);
-               add_req_to_workqueue(req);
-       }
-}
-
-void __switch_docroot(tux_req_t *req)
-{
-       if (!req->docroot_dentry || !req->docroot_mnt)
-               TUX_BUG();
-       set_fs_root(current->fs, req->docroot_mnt, req->docroot_dentry);
-}
-
-struct dentry * __tux_lookup (tux_req_t *req, const char *filename,
-                        struct nameidata *base, struct vfsmount **mnt)
-{
-       int err;
-
-       err = path_walk(filename, base);
-       if (err) {
-               Dprintk("path_walk() returned with %d!\n", err);
-               return ERR_PTR(err);
-       }
-       if (*mnt)
-               TUX_BUG();
-       *mnt = base->mnt;
-
-       return base->dentry;
-}
-
-int tux_permission (struct inode *inode)
-{
-       umode_t mode;
-       int err;
-
-       mode = inode->i_mode;
-       Dprintk("URL inode mode: %08x.\n", mode);
-
-       if (mode & tux_mode_forbidden)
-               return -2;
-       /*
-        * at least one bit in the 'allowed' set has to
-        * be present to allow access.
-        */
-       if (!(mode & tux_mode_allowed))
-               return -3;
-       err = permission(inode,MAY_READ,NULL);
-       return err;
-}
-
-struct dentry * tux_lookup (tux_req_t *req, const char *filename,
-                       const unsigned int flag, struct vfsmount **mnt)
-{
-       struct dentry *dentry;
-       struct nameidata base;
-
-       Dprintk("tux_lookup(%p, %s, %d, virtual: %d, host: %s (%d).)\n", req, filename, flag, req->virtual, req->host, req->host_len);
-
-       base.flags = LOOKUP_FOLLOW|flag;
-       base.last_type = LAST_ROOT;
-       if (req->objectname[0] == '/') {
-               base.dentry = dget(req->docroot_dentry);
-               base.mnt = mntget(req->docroot_mnt);
-       } else {
-               if (!req->cwd_dentry) {
-                       req->cwd_dentry = dget(req->docroot_dentry);
-                       req->cwd_mnt = mntget(req->docroot_mnt);
-               }
-               base.dentry = req->cwd_dentry;
-               dget(base.dentry);
-               base.mnt = mntget(req->cwd_mnt);
-       }
-
-       switch_docroot(req);
-       dentry = __tux_lookup (req, filename, &base, mnt);
-
-       Dprintk("looked up {%s} == dentry %p.\n", filename, dentry);
-
-       if (dentry && !IS_ERR(dentry) && !dentry->d_inode)
-               TUX_BUG();
-       return dentry;
-}
-
-int lookup_object (tux_req_t *req, const unsigned int flag)
-{
-       struct vfsmount *mnt = NULL;
-       struct dentry *dentry = NULL;
-       int perm;
-
-       dentry = tux_lookup(req, req->objectname, flag, &mnt);
-       if (!dentry || IS_ERR(dentry)) {
-               if (PTR_ERR(dentry) == -EWOULDBLOCKIO)
-                       goto cachemiss;
-               goto abort;
-       }
-       perm = tux_permission(dentry->d_inode);
-       /*
-        * Only regular files allowed.
-        */
-       if ((perm < 0) || !S_ISREG(dentry->d_inode->i_mode)) {
-               req->status = 403;
-               goto abort;
-       }
-       req->total_file_len = dentry->d_inode->i_size;
-out:
-       install_req_dentry(req, dentry, mnt);
-       return 0;
-cachemiss:
-       return 1;
-abort:
-       if (dentry) {
-               if (!IS_ERR(dentry))
-                       dput(dentry);
-               dentry = NULL;
-       }
-       if (mnt) {
-               if (!IS_ERR(mnt))
-                       mntput(mnt);
-               mnt = NULL;
-       }
-       req_err(req);
-       goto out;
-}
-
-void install_req_dentry (tux_req_t *req, struct dentry *dentry, struct vfsmount *mnt)
-{
-       if (req->dentry)
-               TUX_BUG();
-       req->dentry = dentry;
-       if (req->mnt)
-               TUX_BUG();
-       req->mnt = mnt;
-       if (req->in_file.f_dentry)
-               TUX_BUG();
-       if (dentry)
-               open_private_file(&req->in_file, dentry, FMODE_READ);
-}
-
-void release_req_dentry (tux_req_t *req)
-{
-       if (!req->dentry) {
-               if (req->in_file.f_dentry)
-                       TUX_BUG();
-               return;
-       }
-       if (req->in_file.f_op && req->in_file.f_op->release)
-               req->in_file.f_op->release(req->dentry->d_inode, &req->in_file);
-       memset(&req->in_file, 0, sizeof(req->in_file));
-
-       dput(req->dentry);
-       req->dentry = NULL;
-       mntput(req->mnt);
-       req->mnt = NULL;
-}
-
-int __connection_too_fast (tux_req_t *req)
-{
-       unsigned long curr_bw, delta, bytes;
-
-       bytes = req->total_bytes + req->bytes_sent;
-       if (!bytes)
-               return 1;
-
-       delta = jiffies - req->first_timestamp;
-       if (!delta)
-               delta++;
-       curr_bw = bytes * HZ / delta;
-
-       if (curr_bw > tux_max_output_bandwidth)
-               return 2;
-       return 0;
-}
-
-void unidle_req (tux_req_t *req)
-{
-       threadinfo_t *ti = req->ti;
-
-       Dprintk("UNIDLE req %p <%p> (sock %p, sk %p) (keepalive: %d, status: %d)\n", req, __builtin_return_address(0), req->sock, req->sock->sk, req->keep_alive, req->status);
-       spin_lock_irq(&ti->work_lock);
-       if (req->magic != TUX_MAGIC)
-               TUX_BUG();
-       if (!test_and_clear_bit(0, &req->idle_input)) {
-               Dprintk("unidling %p, wasnt idle!\n", req);
-               if (list_empty(&req->work))
-                       TUX_BUG();
-               list_del(&req->work);
-               DEBUG_DEL_LIST(&req->work);
-               DEC_STAT(nr_work_pending);
-       } else {
-               del_keepalive_timer(req);
-               DEC_STAT(nr_idle_input_pending);
-               Dprintk("unidled %p.\n", req);
-       }
-       if (req->idle_input)
-               TUX_BUG();
-       spin_unlock_irq(&ti->work_lock);
-}
-
-#define GOTO_INCOMPLETE do { Dprintk("incomplete at %s:%d.\n", __FILE__, __LINE__); goto incomplete; } while (0)
-#define GOTO_REDIRECT do { TDprintk("redirect at %s:%d.\n", __FILE__, __LINE__); goto redirect; } while (0)
-#define GOTO_REDIRECT_NONIDLE do { TDprintk("redirect at %s:%d.\n", __FILE__, __LINE__); goto redirect_nonidle; } while (0)
-
-static int read_request (struct socket *sock, char *buf, int max_size)
-{
-       mm_segment_t oldmm;
-       struct kiocb iocb;
-       struct msghdr msg;
-       struct iovec iov;
-
-       int len;
-
-       msg.msg_name     = 0;
-       msg.msg_namelen  = 0;
-       msg.msg_iov      = &iov;
-       msg.msg_iovlen   = 1;
-       msg.msg_control  = NULL;
-       msg.msg_controllen = 0;
-       msg.msg_flags    = 0;
-       
-       msg.msg_iov->iov_base = buf;
-       msg.msg_iov->iov_len  = max_size;
-       
-       oldmm = get_fs(); set_fs(KERNEL_DS);
-
-read_again:
-       init_sync_kiocb(&iocb, NULL);
-       len = sock->sk->sk_prot->recvmsg(&iocb, sock->sk, &msg, max_size,
-                                               MSG_DONTWAIT, MSG_PEEK, NULL);
-       if (-EIOCBQUEUED == len)
-               len = wait_on_sync_kiocb(&iocb);
-
-       /*
-        * We must not get a signal inbetween
-        */
-       if ((len == -EAGAIN) || (len == -ERESTARTSYS)) {
-               if (!signal_pending(current)) {
-                       len = 0;
-                       goto out;
-               }
-               flush_all_signals();
-               goto read_again;
-       }
-out:
-       set_fs(oldmm);
-       return len;
-}
-
-/*
- * We inline URG data so it's at the head of the normal receive queue.
- */
-static int zap_urg_data (struct socket *sock)
-{
-       mm_segment_t oldmm;
-       struct msghdr msg;
-       struct iovec iov;
-       struct kiocb iocb;
-       int len;
-       char buf[10];
-
-       oldmm = get_fs(); set_fs(KERNEL_DS);
-
-       msg.msg_name            = 0;
-       msg.msg_namelen         = 0;
-       msg.msg_iov             = &iov;
-       msg.msg_iovlen          = 1;
-       msg.msg_control         = NULL;
-       msg.msg_controllen      = 0;
-       msg.msg_flags           = 0;
-       
-       msg.msg_iov->iov_base = buf;
-       msg.msg_iov->iov_len  = 2;
-
-read_again:
-       init_sync_kiocb(&iocb, NULL);
-       len = sock->sk->sk_prot->recvmsg(&iocb, sock->sk, &msg, 2,
-                                               MSG_DONTWAIT, 0, NULL);
-       if (-EIOCBQUEUED == len)
-               len = wait_on_sync_kiocb(&iocb);
-       Dprintk("recvmsg(MSG_OOB) returned %d.\n", len);
-
-       /*
-        * We must not get a signal inbetween
-        */
-       if ((len == -EAGAIN) || (len == -ERESTARTSYS)) {
-               if (!signal_pending(current)) {
-                       len = 0;
-                       goto out;
-               }
-               flush_all_signals();
-               goto read_again;
-       }
-out:
-       set_fs(oldmm);
-
-       Dprintk("in out:.. and will return %d.!\n", len);
-
-       return len;
-}
-
-void trunc_headers (tux_req_t *req)
-{
-       struct sock *sk = req->sock->sk;
-       int len, addr_len = 0;
-       struct kiocb iocb;
-
-       if (!req->parsed_len)
-               TUX_BUG();
-repeat_trunc:
-       init_sync_kiocb(&iocb, NULL);
-       len = sk->sk_prot->recvmsg(&iocb, sk, NULL, req->parsed_len, 1, MSG_TRUNC, &addr_len);
-       if (-EIOCBQUEUED == len)
-               len = wait_on_sync_kiocb(&iocb);
-       if ((len == -ERESTARTSYS) || (len == -EAGAIN)) {
-               flush_all_signals();
-               goto repeat_trunc;
-       }
-       Dprintk("truncated (TRUNC) %d bytes at %p. (wanted: %d.)\n", len, __builtin_return_address(0), req->parsed_len);
-
-
-
-       req->parsed_len = 0;
-}
-
-void print_req (tux_req_t *req)
-{
-       struct sock *sk;
-
-       printk("PRINT req %p <%p>, sock %p\n",
-                       req, __builtin_return_address(0), req->sock);
-       printk("... idx: %d\n", req->atom_idx);
-       if (req->sock) {
-               sk = req->sock->sk;
-               printk("... sock %p, sk %p, sk->state: %d, sk->err: %d\n", req->sock, sk, sk->sk_state, sk->sk_err);
-               printk("... write_queue: %d, receive_queue: %d, error_queue: %d, keepalive: %d, status: %d\n", !skb_queue_empty(&sk->sk_write_queue), !skb_queue_empty(&sk->sk_receive_queue), !skb_queue_empty(&sk->sk_error_queue), req->keep_alive, req->status);
-               printk("...tp->send_head: %p\n", tcp_sk(sk)->send_head);
-               printk("...tp->snd_una: %08x\n", tcp_sk(sk)->snd_una);
-               printk("...tp->snd_nxt: %08x\n", tcp_sk(sk)->snd_nxt);
-               printk("...tp->packets_out: %08x\n", tcp_sk(sk)->packets_out);
-       }
-       printk("... meth:{%s}, uri:{%s}, query:{%s}, ver:{%s}\n", req->method_str ? req->method_str : "<null>", req->uri_str ? req->uri_str : "<null>", req->query_str ? req->query_str : "<null>", req->version_str ? req->version_str : "<null>");
-       printk("... post_data:{%s}(%d).\n", req->post_data_str, req->post_data_len);
-       printk("... headers: {%s}\n", req->headers);
-}
-/* 
- * parse_request() reads all available TCP/IP data and prepares
- * the request if the TUX request is complete. (we can get TUX
- * requests in several packets.) Invalid requests are redirected
- * to the secondary server.
- */
-
-void parse_request (tux_req_t *req, int cachemiss)
-{
-       int len, parsed_len;
-       struct sock *sk = req->sock->sk;
-       struct tcp_opt *tp = tcp_sk(sk);
-       int was_keepalive = req->keep_alive;
-
-       if (req->magic != TUX_MAGIC)
-               TUX_BUG();
-
-       SET_TIMESTAMP(req->parse_timestamp);
-
-       spin_lock_irq(&req->ti->work_lock);
-       add_keepalive_timer(req);
-       if (test_and_set_bit(0, &req->idle_input))
-               TUX_BUG();
-       INC_STAT(nr_idle_input_pending);
-       spin_unlock_irq(&req->ti->work_lock);
-
-       Dprintk("idled request %p.\n", req);
-
-restart:
-
-       if (tp->urg_data && !(tp->urg_data & TCP_URG_READ)) {
-               len = zap_urg_data(req->sock);
-               if (tp->urg_data && !(tp->urg_data & TCP_URG_READ)) {
-                       req->error = TUX_ERROR_CONN_CLOSE;
-                       goto redirect_error;
-               }
-       }
-
-       INC_STAT(input_slowpath);
-
-       if (!req->headers)
-               req->headers = tux_kmalloc(tux_max_header_len);
-
-       /* First, read the data */
-       len = read_request(req->sock, (char *)req->headers, tux_max_header_len-1);
-       if (len < 0) {
-               req->error = TUX_ERROR_CONN_CLOSE;
-               goto redirect_error;
-       }
-       if (!len)
-               GOTO_INCOMPLETE;
-
-       /*
-        * Make it a zero-delimited string to automatically get
-        * protection against various buffer overflow situations.
-        * Then pass it to the TUX application protocol stack.
-        */
-       ((char *)req->headers)[len] = 0;
-       req->headers_len = len;
-
-       parsed_len = req->proto->parse_message(req, len);
-
-       /*
-        * Is the request fully read? (or is there any error)
-        */
-       if (parsed_len < 0)
-               GOTO_REDIRECT;
-       if (!parsed_len) {
-               /*
-                * Push pending ACK which was delayed due to the
-                * pingpong optimization:
-                */
-               if (was_keepalive) {
-                       lock_sock(sk);
-                       tp->ack.pingpong = 0;
-                       tp->ack.pending |= TCP_ACK_PUSHED;
-                       cleanup_rbuf(sk, 1);
-                       release_sock(sk);
-               }
-               if (len >= tux_max_header_len-1)
-                       GOTO_REDIRECT;
-               GOTO_INCOMPLETE;
-       }
-       unidle_req(req);
-
-       tp->nonagle = 2;
-
-       add_req_to_workqueue(req);
-       return;
-
-redirect:
-       TDprintk("req %p will be redirected!\n", req);
-       req_err(req);
-
-redirect_error:
-       unidle_req(req);
-
-       if (len < 0)
-               req->parsed_len = 0;
-       else
-               req->parsed_len = len;
-
-       INC_STAT(parse_static_redirect);
-       if (req->headers)
-               kfree(req->headers);
-       req->headers = NULL;
-       if (req->error)
-               zap_request(req, cachemiss);
-       return;
-
-incomplete:
-       if (req->error)
-               goto redirect_error;
-       if (tp->urg_data && !(tp->urg_data & TCP_URG_READ))
-               goto restart;
-
-       add_tux_atom(req, parse_request);
-       INC_STAT(parse_static_incomplete);
-       tux_push_req(req);
-}
-
-int process_requests (threadinfo_t *ti, tux_req_t **user_req)
-{
-       struct list_head *head, *curr;
-       int count = 0;
-       tux_req_t *req;
-
-       *user_req = NULL;
-
-restart_loop:
-       spin_lock_irq(&ti->work_lock);
-       head = &ti->work_pending;
-       curr = head->next;
-       
-       if (curr != head) {
-               int i;
-
-               req = list_entry(curr, tux_req_t, work);
-               Dprintk("PROCESS req %p <%p>.\n",
-                       req, __builtin_return_address(0));
-               for (i = 0; i < req->atom_idx; i++)
-                       Dprintk("... atom %d: %p\n", i, req->atoms[i]);
-
-               if (req->ti != ti)
-                       TUX_BUG();
-               if (req->magic != TUX_MAGIC)
-                       TUX_BUG();
-
-               if (list_empty(&req->work))
-                       TUX_BUG();
-               list_del(curr);
-               DEBUG_DEL_LIST(&req->work);
-               spin_unlock_irq(&ti->work_lock);
-
-               if (!req->atom_idx) {
-                       if (req->usermode) {
-                               *user_req = req;
-                               return count;
-                       }
-                       /*
-                        * idx == 0 requests are flushed automatically.
-                        */
-                       flush_request(req, 0);
-               } else
-                       tux_schedule_atom(req, 0);
-               count++;
-               goto restart_loop;
-       }
-       spin_unlock_irq(&ti->work_lock);
-
-       return count;
-}
-
-int tux_flush_workqueue (threadinfo_t *ti)
-{
-       struct list_head *head, *curr, *next;
-       tux_req_t *req;
-       int count = 0;
-
-restart:
-       spin_lock_irq(&ti->work_lock);
-       head = &ti->work_pending;
-       curr = head->next;
-
-       if (curr != head) {
-               req = list_entry(curr, tux_req_t, work);
-               next = curr->next;
-               clear_bit(0, &req->idle_input);
-               clear_bit(0, &req->wait_output_space);
-               if (list_empty(&req->work))
-                       TUX_BUG();
-               list_del(curr);
-               DEBUG_DEL_LIST(curr);
-               DEC_STAT(nr_input_pending);
-               spin_unlock_irq(&ti->work_lock);
-#if CONFIG_TUX_DEBUG
-               req->bytes_expected = 0;
-#endif
-               req->in_file.f_pos = 0;
-               req->atom_idx = 0;
-               clear_keepalive(req);
-               req->status = -1;
-               if (req->usermode) {
-                       req->usermode = 0;
-                       req->private = 0;
-               }
-               flush_request(req, 0);
-               count++;
-               goto restart;
-       }
-       spin_unlock_irq(&ti->work_lock);
-
-       return count;
-}
-
-int print_all_requests (threadinfo_t *ti)
-{
-       struct list_head *head, *curr;
-       tux_req_t *req;
-       int count = 0;
-
-       spin_lock_irq(&ti->work_lock);
-       head = &ti->all_requests;
-       curr = head->next;
-
-       while (curr != head) {
-               req = list_entry(curr, tux_req_t, all);
-               curr = curr->next;
-               print_req(req);
-               count++;
-       }
-       spin_unlock_irq(&ti->work_lock);
-
-       return count;
-}
-
diff --git a/net/tux/logger.c b/net/tux/logger.c
deleted file mode 100644 (file)
index 5ce80c1..0000000
+++ /dev/null
@@ -1,855 +0,0 @@
-/*
- * TUX - Integrated Application Protocols Layer and Object Cache
- *
- * Copyright (C) 2000, 2001, Ingo Molnar <mingo@redhat.com>
- *
- * Cleaned up logger output for Alpha.
- * -- Phil Ezolt (Phillip.Ezolt@compaq.com) & Bill Carr (wcarr92@yahoo.com)
- *
- * logger.c: log requests finished by TUX.
- */
-
-#define __KERNEL_SYSCALLS__
-#include <net/tux.h>
-
-/****************************************************************
- *      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, 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.
- *
- ****************************************************************/
-
-static spinlock_t log_lock = SPIN_LOCK_UNLOCKED;
-static unsigned int log_head, log_tail;
-static char * log_buffer = NULL;
-static DECLARE_WAIT_QUEUE_HEAD(log_wait);
-static DECLARE_WAIT_QUEUE_HEAD(log_full);
-static int logger_pid = 0;
-
-/*
- * High-speed TUX logging architecture:
- *
- * All fast threads share a common log-ringbuffer. (default size 1MB)
- * Log entries are binary and are padded to be cacheline aligned, this
- * ensures that there is no cache-pingpong between fast threads.
- *
- * The logger thread writes out pending log entries within 1 second
- * (buffer-cache writes data out within 5 seconds). The logger thread
- * gets activated once we have more than 25% of the log ringbuffer
- * filled - or the 1 second log timeout expires. Fast threads block
- * if if more than 95% of the ringbuffer is filled and unblock only
- * if used logbuffer space drops below 90%.
- *
- * This architecture guarantees that 1) logging is reliable (no
- * log entry is ever lost), 2) timely (touches disk within 6 seconds),
- * 3) in the log-contention case the saturation behavior is still
- * write-clustered, but 4) if the logger thread can keep up then
- * the coupling is completely asynchron and parallel.
- *
- * The binary log format gives us about 50% saved IO/memory bandwith
- * and 50% less on-disk used log space than the traditional W3C ASCII
- * format.
- *
- * (We might switch to raw IO though to write the logfile.)
- */
-
-#define SOFT_LIMIT             (LOG_LEN*25/100)
-#define HARD_LIMIT             (LOG_LEN*95/100)
-#define HARD_RELAX_LIMIT       (LOG_LEN*90/100)
-
-unsigned int tux_logentry_align_order = 5;
-
-#if SMP_CACHE_BYTES == 8
-# define TUX_LOGENTRY_ALIGN 3
-#else
-#if SMP_CACHE_BYTES == 16
-# define TUX_LOGENTRY_ALIGN 4
-#else
-#if SMP_CACHE_BYTES == 32
-# define TUX_LOGENTRY_ALIGN 5
-#else
-#if SMP_CACHE_BYTES == 64
-# define TUX_LOGENTRY_ALIGN 6
-#else
-#if SMP_CACHE_BYTES == 128
-# define TUX_LOGENTRY_ALIGN 7
-#else
-#if SMP_CACHE_BYTES == 256
-# define TUX_LOGENTRY_ALIGN 8
-#else
-#error Add entry!
-#endif
-#endif
-#endif
-#endif
-#endif
-#endif
-
-#define ROUND_UP(x) (((((x)-1) >> TUX_LOGENTRY_ALIGN) + 1) \
-                                       << TUX_LOGENTRY_ALIGN)
-
-static void __throttle_logging (void)
-{
-       DECLARE_WAITQUEUE(wait, current);
-       int pending;
-
-       add_wait_queue(&log_full, &wait);
-       for (;;) {
-               static unsigned long last_warning = 0;
-
-               if (jiffies - last_warning > 10*HZ) {
-                       last_warning = jiffies;
-                       printk(KERN_NOTICE "TUX: log buffer overflow, have to throttle TUX thread!\n");
-               }
-
-               current->state = TASK_INTERRUPTIBLE;
-
-               spin_lock(&log_lock);
-               pending = log_head-log_tail;
-               spin_unlock(&log_lock);
-
-               if ((pending % LOG_LEN) < HARD_LIMIT)
-                       break;
-
-               schedule();
-       }
-       current->state = TASK_RUNNING;
-       remove_wait_queue(&log_full, &wait);
-}
-
-#if CONFIG_TUX_DEBUG
-#define CHECK_LOGPTR(ptr) \
-do { \
-       if ((ptr < log_buffer) || (ptr > log_buffer + LOG_LEN)) { \
-               printk(KERN_ERR "TUX: ouch: log ptr %p > %p + %ld!\n", \
-                       ptr, log_buffer, LOG_LEN); \
-               TUX_BUG(); \
-       } \
-} while (0)
-#else
-#define CHECK_LOGPTR(ptr) do { } while (0)
-#endif
-
-void __log_request (tux_req_t *req)
-{
-       char *str, *next;
-       const char *uri_str;
-       unsigned int inc, len, uri_len, pending, next_head, def_vhost_len = 0;
-       unsigned long flags;
-
-       if (req->proto->pre_log)
-               req->proto->pre_log(req);
-       /*
-        * Log the reply status (success, or type of failure)
-        */
-       if (!tux_log_incomplete && (!req->status || (req->bytes_sent == -1))) {
-               
-               Dprintk("not logging req %p: {%s} [%d/%d]\n", req, req->uri_str, req->status, req->bytes_sent);
-               return;
-       }
-       Dprintk("uri: {%s} [%d]\n", req->uri_str, req->uri_len);
-
-#define NO_URI "<none>"
-       if (req->uri_len) {
-               uri_len = req->uri_len;
-               uri_str = req->uri_str;
-       } else {
-               uri_str = NO_URI;
-               uri_len = sizeof(NO_URI)-1;
-       }
-       len = uri_len + 1;
-
-       if (req->virtual) {
-               if (req->host_len)
-                       len += req->host_len;
-               else {
-                       def_vhost_len = strlen(tux_default_vhost);
-                       len += def_vhost_len;
-               }
-       }
-
-       Dprintk("method_str: {%s} [%d]\n", req->method_str, req->method_len);
-       len += req->method_len + 1;
-
-       Dprintk("version_str: {%s} [%d]\n", req->version_str, req->version_len);
-       len += req->version_len + 1;
-
-#if CONFIG_TUX_EXTENDED_LOG
-       Dprintk("user_agent_str: {%s} [%d]\n", req->user_agent_str, req->user_agent_len);
-       len += req->user_agent_len + 1;
-#endif
-       if (tux_referer_logging) {
-               Dprintk("referer_str: {%s} [%d]\n", req->referer_str, req->referer_len);
-               len += req->referer_len;
-       }
-       len++;
-
-       inc = 5*sizeof(u32) + len;
-#if CONFIG_TUX_EXTENDED_LOG
-       inc += 7*sizeof(u32);
-#endif
-
-       spin_lock_irqsave(&log_lock, flags);
-
-       next_head = ROUND_UP(log_head + inc);
-
-       if (next_head < LOG_LEN) {
-               str = log_buffer + log_head;
-               if (str > log_buffer + LOG_LEN)
-                       TUX_BUG();
-               log_head = next_head;
-       } else {
-               if (log_head < LOG_LEN)
-                       memset(log_buffer+log_head, 0, LOG_LEN-log_head);
-               str = log_buffer;
-               log_head = ROUND_UP(inc);
-       }
-
-       if (str < log_buffer || str+inc >= log_buffer+LOG_LEN)
-               TUX_BUG();
-
-       /*
-        * Log record signature - this makes finding the next entry
-        * easier (since record length is variable), and makes the
-        * binary logfile more robust against potential data corruption
-        * and other damage. The signature also servers as a log format
-        * version identifier.
-        */
-#if CONFIG_TUX_EXTENDED_LOG
-       *(u32 *)str = 0x2223beef;
-#else
-       *(u32 *)str = 0x1112beef;
-#endif
-       str += sizeof(u32);
-       CHECK_LOGPTR(str);
-
-       *(u32 *)str = 0;
-       /*
-        * Log the client IP address:
-        */
-       if (tux_ip_logging)
-               *(u32 *)str = req->client_addr;
-       str += sizeof(u32);
-       CHECK_LOGPTR(str);
-
-#if CONFIG_TUX_EXTENDED_LOG
-       /*
-        * Log the client port number:
-        */
-       *(u32 *)str = 0;
-       if (tux_ip_logging)
-               *(u32 *)str = req->client_port;
-       str += sizeof(u32);
-       CHECK_LOGPTR(str);
-#endif
-
-       /*
-        * Log the request timestamp, in units of 'seconds since 1970'.
-        */
-       *(u32 *)str = CURRENT_TIME.tv_sec;
-       str += sizeof(u32);
-       CHECK_LOGPTR(str);
-
-#if CONFIG_TUX_EXTENDED_LOG
-       *(u32 *)str = req->accept_timestamp; str += sizeof(u32);
-       *(u32 *)str = req->parse_timestamp; str += sizeof(u32);
-       *(u32 *)str = req->output_timestamp; str += sizeof(u32);
-       *(u32 *)str = req->flush_timestamp; str += sizeof(u32);
-       *(u32 *)str = req->had_cachemiss; str += sizeof(u32);
-       *(u32 *)str = req->keep_alive; str += sizeof(u32);
-#endif
-       /*
-        * Log the requested file size (in fact, log actual bytes sent.)
-        */
-       *(u32 *)str = req->bytes_sent;
-       str += sizeof(u32);
-       CHECK_LOGPTR(str);
-
-       *(u32 *)str = req->status;
-       str += sizeof(u32);
-       CHECK_LOGPTR(str);
-
-       /*
-        * Zero-terminated method, (base) URI, query and version string.
-        */
-       if (req->method_len) {
-               memcpy(str, req->method_str, req->method_len);
-               str += req->method_len;
-               CHECK_LOGPTR(str);
-       }
-       *str++ = 0;
-
-       if (req->virtual) {
-               if (req->host_len) {
-                       memcpy(str, req->host, req->host_len);
-                       str += req->host_len;
-               } else {
-                       memcpy(str, tux_default_vhost, def_vhost_len);
-                       str += def_vhost_len;
-               }
-               CHECK_LOGPTR(str);
-       }
-
-       memcpy(str, uri_str, uri_len);
-       str += uri_len;
-       *str++ = 0;
-
-       CHECK_LOGPTR(str);
-
-       if (req->version_len) {
-               memcpy(str, req->version_str, req->version_len);
-               str += req->version_len;
-               CHECK_LOGPTR(str);
-       }
-       *str++ = 0;
-#if CONFIG_TUX_EXTENDED_LOG
-       if (req->user_agent_len) {
-               memcpy(str, req->user_agent_str, req->user_agent_len);
-               str += req->user_agent_len;
-               CHECK_LOGPTR(str);
-       }
-       *str++ = 0;
-#endif
-       CHECK_LOGPTR(str);
-
-       if (tux_referer_logging && req->referer_len) {
-               memcpy(str, req->referer_str, req->referer_len);
-               str += req->referer_len;
-               CHECK_LOGPTR(str);
-       }
-       *str++ = 0;
-       CHECK_LOGPTR(str);
-       /*
-        * pad with spaces to next cacheline, with an ending newline.
-        * (not needed for the user-space log utility, but results in
-        * a more readable binary log file, and reduces the amount
-        * of cache pingpong.)
-        */
-       next = (char *)ROUND_UP((unsigned long)str);
-
-       CHECK_LOGPTR(next);
-       len = next-str;
-       memset(str, ' ', len);
-
-       pending = (log_head-log_tail) % LOG_LEN;
-       spin_unlock_irqrestore(&log_lock, flags);
-
-       if (pending >= SOFT_LIMIT)
-               wake_up(&log_wait);
-
-       if (pending >= HARD_LIMIT)
-               __throttle_logging();
-}
-
-void tux_push_pending (struct sock *sk)
-{
-       struct tcp_opt *tp = tcp_sk(sk);
-
-       Dprintk("pushing pending frames on sock %p.\n", sk);
-       lock_sock(sk);
-       if ((sk->sk_state == TCP_ESTABLISHED) && !sk->sk_err) {
-               tp->ack.pingpong = tux_ack_pingpong;
-               tp->nonagle = 1;
-               __tcp_push_pending_frames(sk, tp, tcp_current_mss(sk, 0), TCP_NAGLE_OFF);
-       }
-       release_sock(sk);
-}
-
-inline void tux_push_req (tux_req_t *req)
-{
-       if (req->sock)
-               tux_push_pending(req->sock->sk);
-       if (req->data_sock)
-               tux_push_pending(req->data_sock->sk);
-}
-
-void __put_data_sock (tux_req_t *req)
-{
-       unlink_tux_data_socket(req);
-       if (req->data_sock->file)
-               fput(req->data_sock->file);
-       else
-               sock_release(req->data_sock);
-       req->data_sock = NULL;
-}
-
-/* open-coded sys_close */
-
-long tux_close(unsigned int fd)
-{
-       struct file * filp;
-       struct files_struct *files = current->files;
-
-       spin_lock(&files->file_lock);
-       if (fd >= files->max_fds)
-               goto out_unlock;
-       filp = files->fd[fd];
-       if (!filp)
-               goto out_unlock;
-       files->fd[fd] = NULL;
-       FD_CLR(fd, files->close_on_exec);
-       /* __put_unused_fd(files, fd); */
-       __FD_CLR(fd, files->open_fds);
-       if (fd < files->next_fd)
-               files->next_fd = fd;
-       spin_unlock(&files->file_lock);
-       return filp_close(filp, files);
-
-out_unlock:
-       spin_unlock(&files->file_lock);
-       return -EBADF;
-}
-
-void flush_request (tux_req_t *req, int cachemiss)
-{
-       struct socket *sock;
-       struct sock *sk;
-       int keep_alive;
-
-       if (cachemiss)
-               TUX_BUG();
-       __set_task_state(current, TASK_RUNNING);
-
-       if (req->magic != TUX_MAGIC)
-               TUX_BUG();
-       if (req->ti->thread != current)
-               TUX_BUG();
-#if CONFIG_TUX_DEBUG
-       if (req->bytes_expected && (req->bytes_sent != req->bytes_expected)) {
-               printk("hm, bytes_expected: %d != bytes_sent: %d!\n",
-                       req->bytes_expected, req->bytes_sent);
-               TUX_BUG();
-       }
-#endif
-       SET_TIMESTAMP(req->flush_timestamp);
-
-       log_request(req);
-       sock = req->sock;
-       sk = NULL;
-       if (sock)
-               sk = sock->sk;
-       Dprintk("FLUSHING req %p <%p> (sock %p, sk %p) (keepalive: %d, status: %d)\n", req, __builtin_return_address(0), sock, sk, req->keep_alive, req->status);
-       if (req->in_file.f_pos)
-               /*TUX_BUG()*/;
-       release_req_dentry(req);
-       req->private = 0;
-
-       if (req->docroot_dentry) {
-               dput(req->docroot_dentry);
-               req->docroot_dentry = NULL;
-               if (!req->docroot_mnt)
-                       TUX_BUG();
-       }
-       if (req->docroot_mnt) {
-               mntput(req->docroot_mnt);
-               req->docroot_mnt = NULL;
-       }
-
-       req->offset_start = 0;
-       req->offset_end = 0;
-       req->output_len = 0;
-       req->total_file_len = 0;
-       req->lendigits = 0;
-       req->mtime = 0;
-       req->etaglen = 0;
-       req->etag[0] = 0;
-       req->ftp_command = 0;
-
-       if (req->postponed)
-               TUX_BUG();
-       if (test_bit(0, &req->idle_input))
-               TUX_BUG();
-       if (test_bit(0, &req->wait_output_space))
-               TUX_BUG();
-       if (req->parsed_len)
-               trunc_headers(req);
-       if (req->parsed_len)
-               TUX_BUG();
-       req->attr = NULL;
-       req->usermode = 0;
-       req->usermodule_idx = 0;
-       req->atom_idx = 0;
-       if (req->module_dentry) {
-               dput(req->module_dentry);
-               req->module_dentry = NULL;
-       }
-       if (req->headers)
-               kfree(req->headers);
-       req->headers = NULL;
-       req->headers_len = 0;
-
-       req->method = METHOD_NONE;
-       req->method_len = 0;
-       req->method_str = NULL;
-       req->version = 0;
-       req->version_str = NULL;
-       req->version_len = 0;
-
-       req->uri_str = NULL;
-       req->uri_len = 0;
-
-       req->objectname[0] = 0;
-       req->objectname_len = 0;
-
-       req->query_str = NULL;
-       req->query_len = 0;
-
-       req->cookies_str = NULL;
-       req->cookies_len = 0;
-       req->parse_cookies = 0;
-
-       req->contentlen_str = NULL;
-       req->contentlen_len = 0;
-       req->content_len = 0;
-
-       req->user_agent_str = NULL;
-       req->user_agent_len = 0;
-
-       req->may_send_gzip = 0;
-       req->content_gzipped = 0;
-
-       req->content_type_str = NULL;
-       req->content_type_len = 0;
-
-       req->accept_str = NULL;
-       req->accept_len = 0;
-
-       req->accept_charset_str = NULL;
-       req->accept_charset_len = 0;
-
-       req->accept_encoding_str = NULL;
-       req->accept_encoding_len = 0;
-
-       req->accept_language_str = NULL;
-       req->accept_language_len = 0;
-
-       req->cache_control_str = NULL;
-       req->cache_control_len = 0;
-
-       req->if_modified_since_str = NULL;
-       req->if_modified_since_len = 0;
-
-       req->if_none_match_str = NULL;
-       req->if_none_match_len = 0;
-
-       req->if_range_str = NULL;
-       req->if_range_len = 0;
-
-       req->negotiate_str = NULL;
-       req->negotiate_len = 0;
-
-       req->pragma_str = NULL;
-       req->pragma_len = 0;
-
-       req->referer_str = NULL;
-       req->referer_len = 0;
-
-       req->post_data_str = NULL;
-       req->post_data_len = 0;
-
-       SET_TIMESTAMP(req->accept_timestamp);
-#if CONFIG_TUX_EXTENDED_LOG
-       req->parse_timestamp = 0;
-       req->output_timestamp = 0;
-       req->flush_timestamp = 0;
-#endif
-       req->status = 0;
-
-       req->total_bytes += req->bytes_sent;
-       req->bytes_sent = 0;
-#if CONFIG_TUX_DEBUG
-       req->bytes_expected = 0;
-#endif
-       req->body_len = 0;
-       keep_alive = req->keep_alive;
-       clear_keepalive(req);
-       req->had_cachemiss = 0;
-       // first_timestamp and total_bytes is kept!
-       req->event = 0;
-       req->lookup_dir = 0;
-       req->lookup_404 = 0;
-
-       req->error = 0;
-       req->user_error = 0;
-
-       if (req->abuf.page)
-               __free_page(req->abuf.page);
-       memset(&req->abuf, 0, sizeof(req->abuf));
-
-       if (sk && keep_alive) {
-               add_tux_atom(req, parse_request);
-               if (skb_queue_empty(&sk->sk_receive_queue)) {
-                       spin_lock_irq(&req->ti->work_lock);
-                       add_keepalive_timer(req);
-                       if (test_and_set_bit(0, &req->idle_input))
-                               TUX_BUG();
-                       /*
-                        * Avoid the race with the event callback:
-                        */
-                       if (skb_queue_empty(&sk->sk_receive_queue) ||
-                                  !test_and_clear_bit(0, &req->idle_input)) {
-                               INC_STAT(nr_idle_input_pending);
-                               spin_unlock_irq(&req->ti->work_lock);
-                               tux_push_req(req);
-                               goto out;
-                       }
-                       del_keepalive_timer(req);
-                       spin_unlock_irq(&req->ti->work_lock);
-               }
-               Dprintk("KEEPALIVE PENDING req %p <%p> (sock %p, sk %p) (keepalive: %d, status: %d)\n", req, __builtin_return_address(0), req->sock, req->sock->sk, req->keep_alive, req->status);
-               add_req_to_workqueue(req);
-               INC_STAT(nr_keepalive_optimized);
-               goto out;
-       }
-
-       del_timer_sync(&req->keepalive_timer);
-       del_timer_sync(&req->output_timer);
-
-       if (timer_pending(&req->keepalive_timer))
-               TUX_BUG();
-       if (timer_pending(&req->output_timer))
-               TUX_BUG();
-       if (!list_empty(&req->lru))
-               TUX_BUG();
-       req->nr_keepalives = 0;
-       req->client_addr = 0;
-       req->client_port = 0;
-       req->virtual = 0;
-       req->ftp_offset_start = 0;
-
-       req->host[0] = 0;
-       req->host_len = 0;
-
-       if (req->cwd_dentry) {
-               dput(req->cwd_dentry);
-               req->cwd_dentry = NULL;
-               if (!req->cwd_mnt)
-                       TUX_BUG();
-       }
-       if (req->cwd_mnt) {
-               mntput(req->cwd_mnt);
-               req->cwd_mnt = NULL;
-       }
-       put_data_sock(req);
-       req->prev_pos = 0;
-       req->curroff = 0;
-       req->total = 0;
-       if (req->dirp0) {
-               kfree(req->dirp0);
-               req->dirp0 = NULL;
-       }
-
-       if (sk)
-               unlink_tux_socket(req);
-       req->sock = NULL;
-       /*
-        * Close potential user-space file descriptors.
-        */
-       {
-               int fd = req->fd, ret;
-
-               if (fd != -1) {
-                       req->fd = -1;
-                       ret = tux_close(fd);
-                       if (ret)
-                               TUX_BUG();
-               } else
-                       if (sock)
-                               sock_release(sock);
-       }
-       kfree_req(req);
-out:
-       ;
-}
-
-static int warn_once = 1;
-
-static unsigned int writeout_log (void)
-{
-       unsigned int len, pending, next_log_tail;
-       mm_segment_t oldmm = get_fs();
-       struct file *log_filp;
-       char * str;
-       unsigned int ret;
-
-       if (tux_logging)
-               Dprintk("TUX logger: opening log file {%s}.\n", tux_logfile);
-       log_filp = tux_open_file(tux_logfile, O_CREAT|O_APPEND|O_WRONLY|O_LARGEFILE);
-       if (!log_filp) {
-               if (warn_once) {
-                       printk(KERN_ERR "TUX: could not open log file {%s}!\n",
-                               tux_logfile);
-                       warn_once = 0;
-               }
-               __set_current_state(TASK_INTERRUPTIBLE);
-               schedule_timeout(HZ);
-               return 0;
-       }
-       spin_lock(&log_lock);
-       str = log_buffer + log_tail;
-       if (log_head < log_tail) {
-               len = LOG_LEN-log_tail;
-               next_log_tail = 0;
-       } else {
-               len = log_head-log_tail;
-               next_log_tail = log_head;
-       }
-       if (!len)
-               goto out;
-       spin_unlock(&log_lock);
-
-       set_fs(KERNEL_DS);
-       ret = log_filp->f_op->write(log_filp, str, len, &log_filp->f_pos);
-       set_fs(oldmm);
-
-       if (len != ret) {
-               if (ret == -ENOSPC) {
-                       printk(KERN_ERR "TUX: trying to write TUX logfile %s, but filesystem is full! Lost %d bytes of log data.\n", tux_logfile, len);
-               } else {
-                       printk(KERN_ERR "TUX: log write %d != %d.\n", ret, len);
-                       printk(KERN_ERR "TUX: log_filp: %p, str: %p, len: %d str[len-1]: %d.\n", log_filp, str, len, str[len-1]);
-               }
-               goto out_lock;
-       }
-
-       /*
-        * Sync log data to disk:
-        */
-       if (log_filp->f_op && log_filp->f_op->fsync) {
-               down(&log_filp->f_dentry->d_inode->i_sem);
-               log_filp->f_op->fsync(log_filp, log_filp->f_dentry, 1);
-               up(&log_filp->f_dentry->d_inode->i_sem);
-       }
-
-       /*
-        * Reduce the cache footprint of the logger file - it's
-        * typically write-once.
-        */
-       invalidate_inode_pages(log_filp->f_dentry->d_inode->i_mapping);
-
-out_lock:
-       spin_lock(&log_lock);
-out:
-       log_tail = next_log_tail;
-       pending = (log_head-log_tail) % LOG_LEN;
-       spin_unlock(&log_lock);
-
-       if (pending < HARD_LIMIT)
-               wake_up(&log_full);
-
-       fput(log_filp);
-       return pending;
-}
-
-static DECLARE_WAIT_QUEUE_HEAD(stop_logger_wait);
-static int stop_logger = 0;
-
-static int logger_thread (void *data)
-{
-       DECLARE_WAITQUEUE(wait, current);
-       mm_segment_t oldmm;
-
-       daemonize("TUX logger");
-
-       oldmm = get_fs();
-       set_fs(KERNEL_DS);
-       printk(KERN_NOTICE "TUX: logger thread started.\n");
-#if CONFIG_SMP
-       {
-               cpumask_t log_mask, map;
-
-               mask_to_cpumask(log_cpu_mask, &log_mask);
-               cpus_and(map, cpu_online_map, log_mask);
-               if(!(cpus_empty(map)))
-                       set_cpus_allowed(current, map);
-
-       }
-#endif
-
-
-       spin_lock_irq(&current->sighand->siglock);
-       siginitsetinv(&current->blocked, 0);
-       recalc_sigpending();
-       spin_unlock_irq(&current->sighand->siglock);
-
-       if (log_buffer)
-               TUX_BUG();
-       log_buffer = vmalloc(LOG_LEN);
-       memset(log_buffer, 0, LOG_LEN);
-       log_head = log_tail = 0;
-
-       current->rlim[RLIMIT_FSIZE].rlim_cur = RLIM_INFINITY;
-
-       add_wait_queue(&log_wait, &wait);
-       for (;;) {
-               if (tux_logging)
-                       Dprintk("logger does writeout - stop:%d.\n", stop_logger);
-
-               while (writeout_log() >= SOFT_LIMIT) {
-                       if (stop_logger)
-                               break;
-               }
-               if (stop_logger)
-                       break;
-                       /* nothing */;
-
-               if (tux_logging)
-                       Dprintk("logger does sleep - stop:%d.\n", stop_logger);
-               __set_current_state(TASK_INTERRUPTIBLE);
-               if (log_head != log_tail) {
-                       __set_current_state(TASK_RUNNING);
-                       continue;
-               }
-               schedule_timeout(HZ);
-               if (tux_logging)
-                       Dprintk("logger back from sleep - stop:%d.\n", stop_logger);
-               if (signal_pending(current))
-                       flush_all_signals();
-       }
-       remove_wait_queue(&log_wait, &wait);
-
-       vfree(log_buffer);
-       log_buffer = NULL;
-       stop_logger = 0;
-       wake_up(&stop_logger_wait);
-
-       set_fs(oldmm);
-
-       return 0;
-}
-
-void start_log_thread (void)
-{
-       warn_once = 1;
-
-       logger_pid = kernel_thread(logger_thread, NULL, 0);
-       if (logger_pid < 0)
-               TUX_BUG();
-}
-
-void stop_log_thread (void)
-{
-       DECLARE_WAITQUEUE(wait, current);
-
-       Dprintk("stopping logger thread %d ...\n", logger_pid);
-
-       __set_current_state(TASK_UNINTERRUPTIBLE);
-       add_wait_queue(&stop_logger_wait, &wait);
-       stop_logger = 1;
-       wake_up(&log_wait);
-       schedule();
-       __set_current_state(TASK_RUNNING);
-       remove_wait_queue(&stop_logger_wait, &wait);
-
-       Dprintk("logger thread stopped!\n");
-}
diff --git a/net/tux/main.c b/net/tux/main.c
deleted file mode 100644 (file)
index e33241f..0000000
+++ /dev/null
@@ -1,1413 +0,0 @@
-/*
- * TUX - Integrated Application Protocols Layer and Object Cache
- *
- * Copyright (C) 2000, 2001, Ingo Molnar <mingo@redhat.com>
- *
- * main.c: main management and initialization routines
- */
-
-#define __KERNEL_SYSCALLS__
-#define __KERNEL_SYSCALLS_NO_ERRNO__
-
-#include <net/tux.h>
-
-/****************************************************************
- *      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, 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.
- *
- ****************************************************************/
-
-/*
- * Threads information.
- */
-unsigned int nr_tux_threads;
-static atomic_t nr_tux_threads_running = ATOMIC_INIT(0);
-static int stop_threads = 0;
-
-threadinfo_t threadinfo[CONFIG_TUX_NUMTHREADS];
-
-static void flush_all_requests (threadinfo_t *ti);
-
-void flush_all_signals (void)
-{
-       spin_lock_irq(&current->sighand->siglock);
-       flush_signals(current);
-       recalc_sigpending();
-       spin_unlock_irq(&current->sighand->siglock);
-}
-
-int nr_requests_used (void)
-{
-       unsigned int i, nr = 0;
-
-       for (i = 0; i < nr_tux_threads; i++) {
-               threadinfo_t *ti = threadinfo + i;
-               nr += ti->nr_requests - ti->nr_free_requests;
-       }
-
-       return nr;
-}
-
-static inline int accept_pending (threadinfo_t *ti)
-{
-       int j;
-
-       for (j = 0; j < CONFIG_TUX_NUMSOCKETS; j++) {
-               if (!ti->listen[j].proto)
-                       break;
-               if (!ti->listen[j].sock)
-                       break;
-               if (tcp_sk(ti->listen[j].sock->sk)->accept_queue)
-                       return 1;
-       }
-       return 0;
-}
-
-static inline int requests_pending (threadinfo_t *ti)
-{
-       if (!list_empty(&ti->work_pending))
-               return 1;
-       return 0;
-}
-
-static int event_loop (threadinfo_t *ti)
-{
-       tux_req_t *req;
-       int work_done;
-
-repeat_accept:
-       if (ti->thread != current)
-               TUX_BUG();
-
-       /*
-        * Any (relevant) event on the socket will change this
-        * thread to TASK_RUNNING because we add it to both
-        * the main listening and the connection request socket
-        * waitqueues. Thus we can do 'lazy checking' of work
-        * to be done and schedule away only if the thread is
-        * still TASK_INTERRUPTIBLE. This makes TUX fully
-        * event driven.
-        */
-       set_task_state(current, TASK_INTERRUPTIBLE);
-       current->flags |= PF_MEMALLOC;
-       work_done = 0;
-       if (accept_pending(ti))
-               work_done = accept_requests(ti);
-
-       if (requests_pending(ti)) {
-               work_done = process_requests(ti, &req);
-               if (req)
-                       goto handle_userspace_req;
-       }
-
-       /*
-        * Be nice to other processes:
-        */
-       if (unlikely(test_thread_flag(TIF_NEED_RESCHED))) {
-               __set_task_state(current, TASK_RUNNING);
-               schedule();
-               goto repeat_accept;
-       }
-
-       if (ti->userspace_req)
-               TUX_BUG();
-       if (unlikely(stop_threads))
-               goto handle_stop;
-
-       /* Any signals? */
-       if (unlikely(signal_pending(current)))
-               goto handle_signal;
-
-       if (work_done)
-               goto repeat_accept;
-       /*
-        * Any socket event either on the listen socket
-        * or on the request sockets will wake us up:
-        */
-       if ((current->state != TASK_RUNNING) &&
-                       !requests_pending(ti) && !accept_pending(ti)) {
-               Dprintk("fast thread: no work to be done, sleeping.\n");
-               schedule();
-               Dprintk("fast thread: back from sleep!\n");
-               goto repeat_accept;
-       }
-       goto repeat_accept;
-
-handle_userspace_req:
-       if (req->attr)
-               TUX_BUG();
-       switch_docroot(req);
-       ti->userspace_req = req;
-       __set_task_state(current, TASK_RUNNING);
-       return TUX_RETURN_USERSPACE_REQUEST;
-
-handle_signal:
-       __set_task_state(current, TASK_RUNNING);
-       return TUX_RETURN_SIGNAL;
-
-handle_stop:
-       __set_task_state(current, TASK_RUNNING);
-       return TUX_RETURN_EXIT;
-}
-
-static int init_queues (int nr_tux_threads)
-{
-       int i;
-
-       for (i = 0; i < nr_tux_threads; i++) {
-               threadinfo_t *ti = threadinfo + i;
-
-               INIT_LIST_HEAD(&ti->all_requests);
-
-               ti->free_requests_lock = SPIN_LOCK_UNLOCKED;
-               INIT_LIST_HEAD(&ti->free_requests);
-
-               ti->work_lock = SPIN_LOCK_UNLOCKED;
-               INIT_LIST_HEAD(&ti->work_pending);
-               INIT_LIST_HEAD(&ti->lru);
-
-       }
-       return 0;
-}
-
-int tux_chroot (char *dir)
-{
-       kernel_cap_t saved_cap = current->cap_effective;
-       mm_segment_t oldmm;
-       int err;
-
-       /* Allow chroot dir to be in kernel space. */
-       oldmm = get_fs(); set_fs(KERNEL_DS);
-       set_fs(KERNEL_DS);
-       cap_raise (current->cap_effective, CAP_SYS_CHROOT);
-
-       err = chroot(dir);
-       if (!err)
-               chdir("/");
-
-       current->cap_effective = saved_cap;
-       set_fs(oldmm);
-
-       return err;
-}
-
-/*
- * Right now this is not fully SMP-safe against multiple TUX
- * managers. It's just a rudimentary protection against typical
- * mistakes.
- */
-static int initialized = 0;
-
-#define MAX_DOCROOTLEN 500
-
-static int lookup_docroot(struct nameidata *docroot, const char *name)
-{
-       int err;
-
-       docroot->mnt = mntget(current->fs->rootmnt);
-       docroot->dentry = dget(current->fs->root);
-       docroot->last.len = 0;
-       docroot->flags = LOOKUP_FOLLOW;
-
-       err = path_walk(name, docroot);
-       if (err) {
-               mntput(docroot->mnt);
-               docroot->mnt = NULL;
-               return err;
-       }
-       return 0;
-}
-
-static int user_req_startup (void)
-{
-       char name[MAX_DOCROOTLEN];
-       struct nameidata *docroot;
-       unsigned int i;
-       int err;
-
-       if (initialized)
-               return -EINVAL;
-       initialized = 1;
-
-       /*
-        * Look up the HTTP and FTP document root.
-        * (typically they are shared, but can be 
-        * different directories.)
-        */
-       docroot = &tux_proto_http.main_docroot;
-       if (docroot->mnt)
-               TUX_BUG();
-       strcpy(name, tux_common_docroot);
-       strcat(name, tux_http_subdocroot);
-
-       err = lookup_docroot(docroot, name);
-       if (err) {
-               initialized = 0;
-               printk(KERN_ERR "TUX: could not look up HTTP documentroot: \"%s\"\n", name);
-               return err;
-       }
-
-       docroot = &tux_proto_ftp.main_docroot;
-       if (docroot->mnt)
-               TUX_BUG();
-       strcpy(name, tux_common_docroot);
-       strcat(name, tux_ftp_subdocroot);
-
-       err = lookup_docroot(docroot, name);
-       if (err) {
-abort:
-               docroot = &tux_proto_http.main_docroot;
-               path_release(docroot);
-               memset(docroot, 0, sizeof(*docroot));
-               initialized = 0;
-               printk(KERN_ERR "TUX: could not look up FTP documentroot: \"%s\"\n", name);
-               return err;
-       }
-
-       /*
-        * Start up the logger thread. (which opens the logfile)
-        */
-       start_log_thread();
-
-       nr_tux_threads = tux_threads;
-       if (nr_tux_threads < 1) 
-               nr_tux_threads = 1;
-       if (nr_tux_threads > CONFIG_TUX_NUMTHREADS) 
-               nr_tux_threads = CONFIG_TUX_NUMTHREADS;
-       tux_threads = nr_tux_threads;
-
-       /*
-        * Set up per-thread work-queues:
-        */
-       memset(threadinfo, 0, CONFIG_TUX_NUMTHREADS*sizeof(threadinfo_t));
-       init_queues(nr_tux_threads);
-
-       /*
-        * Prepare the worker thread structures.
-        */
-       for (i = 0; i < nr_tux_threads; i++) {
-               threadinfo_t *ti = threadinfo + i;
-               ti->cpu = i;
-               ti->gzip_state.workspace =
-                       vmalloc(zlib_deflate_workspacesize());
-               if (!ti->gzip_state.workspace ||
-                           (zlib_deflateInit(&ti->gzip_state, 6) != Z_OK)) {
-                       stop_log_thread();
-                       goto abort;
-               }
-               init_MUTEX(&ti->gzip_sem);
-       }
-
-       __module_get(tux_module);
-
-       return 0;
-}
-
-static DECLARE_WAIT_QUEUE_HEAD(wait_stop);
-static DECLARE_WAIT_QUEUE_HEAD(thread_stopped);
-
-static int user_req_shutdown (void)
-{
-       DECLARE_WAITQUEUE(wait, current);
-       struct nameidata *docroot;
-       int i, err = -EINVAL;
-
-       lock_kernel();
-       if (!initialized) {
-               Dprintk("TUX is not up - cannot shut down.\n");
-               goto err;
-       }
-       initialized = 0;
-       stop_threads = 1;
-       add_wait_queue(&thread_stopped, &wait);
-
-wait_more:
-       /*
-        * Wake up all the worker threads so they notice
-        * that we are being stopped.
-        */
-       set_task_state(current, TASK_UNINTERRUPTIBLE);
-       if (atomic_read(&nr_tux_threads_running)) {
-               Dprintk("TUX: shutdown, %d threads still running.\n",
-                       atomic_read(&nr_tux_threads_running));
-               wake_up(&wait_stop);
-               schedule();
-               goto wait_more;
-       }
-       set_task_state(current, TASK_RUNNING);
-       stop_threads = 0;
-       remove_wait_queue(&thread_stopped, &wait);
-
-       if (nr_async_io_pending())
-               TUX_BUG();
-
-       stop_log_thread();
-
-       docroot = &tux_proto_http.main_docroot;
-       path_release(docroot);
-       memset(docroot, 0, sizeof(*docroot));
-       docroot = &tux_proto_ftp.main_docroot;
-       path_release(docroot);
-       memset(docroot, 0, sizeof(*docroot));
-       err = 0;
-
-       flush_dentry_attributes();
-       free_mimetypes();
-       unregister_all_tuxmodules();
-
-       for (i = 0; i < nr_tux_threads; i++) {
-               threadinfo_t *ti = threadinfo + i;
-               vfree(ti->gzip_state.workspace);
-       }
-
-       module_put(tux_module);
-
-err:
-       unlock_kernel();
-       return err;
-}
-
-void drop_permissions (void)
-{
-       /*
-        * Userspace drops privileges already, and group
-        * membership is important to keep.
-        */
-       /* Give the new process no privileges.. */
-       current->uid = current->euid =
-               current->suid = current->fsuid = tux_cgi_uid;
-       current->gid = current->egid =
-               current->sgid = current->fsgid = tux_cgi_gid;
-       cap_clear(current->cap_permitted);
-       cap_clear(current->cap_inheritable);
-       cap_clear(current->cap_effective);
-}
-
-static int wait_for_others (void)
-{
-       threadinfo_t *ti;
-       unsigned int cpu;
-
-repeat:
-       if (signal_pending(current))
-               return -1;
-       set_current_state(TASK_INTERRUPTIBLE);
-       schedule_timeout(HZ/10);
-
-       for (cpu = 0; cpu < nr_tux_threads; cpu++) {
-               ti = threadinfo + cpu;
-               if (ti->listen_error)
-                       return -1;
-               if (!ti->started)
-                       goto repeat;
-       }
-       /* ok, all threads have started up. */
-       return 0;
-}
-
-static void zap_listen_sockets (threadinfo_t *ti)
-{
-       struct socket *sock;
-       int i;
-
-       for (i = 0; i < CONFIG_TUX_NUMSOCKETS; i++) {
-               if (!ti->listen[i].proto)
-                       break;
-               sock = ti->listen[i].sock;
-               if (!ti->listen[i].cloned && sock) {
-                       while (waitqueue_active(sock->sk->sk_sleep))
-                               yield();
-                       sock_release(sock);
-               }
-               ti->listen[i].sock = NULL;
-               ti->listen[i].proto = NULL;
-               ti->listen[i].cloned = 0;
-       }
-}
-
-static DECLARE_MUTEX(serialize_startup);
-
-static int user_req_start_thread (threadinfo_t *ti)
-{
-       unsigned int err, cpu, i, j, k;
-       struct k_sigaction *ka;
-
-       cpu = ti->cpu;
-#if CONFIG_SMP
-       {
-               unsigned int mask;
-               cpumask_t cpu_mask, map;
-
-               mask = 1 << ((cpu + tux_cpu_offset) % num_online_cpus());
-
-               mask_to_cpumask(mask, &cpu_mask);
-               cpus_and(map, cpu_mask, cpu_online_map);
-               if(!(cpus_empty(map)))
-                       set_cpus_allowed(current, map);         
-       }
-#endif
-       ti->thread = current;
-       atomic_inc(&nr_tux_threads_running);
-
-       err = start_cachemiss_threads(ti);
-       if (err)
-               goto out;
-
-       init_waitqueue_entry(&ti->stop, current);
-       for (j = 0; j < CONFIG_TUX_NUMSOCKETS; j++)
-               init_waitqueue_entry(ti->wait_event + j, current);
-
-       ka = current->sighand->action + SIGCHLD-1;
-       ka->sa.sa_handler = SIG_IGN;
-
-       /* Block all signals except SIGKILL, SIGSTOP, SIGHUP and SIGCHLD */
-       spin_lock_irq(&current->sighand->siglock);
-       siginitsetinv(&current->blocked, sigmask(SIGKILL) |
-                       sigmask(SIGSTOP)| sigmask(SIGHUP) | sigmask(SIGCHLD));
-       recalc_sigpending();
-       spin_unlock_irq(&current->sighand->siglock);
-
-       if (!tux_listen[cpu][0].proto) {
-               printk(KERN_ERR "no listen socket specified for TUX thread %d, in /proc/net/tux/%d/listen/, aborting.\n", cpu, cpu);
-               goto error;
-       }
-
-       /*
-        * Serialize startup so that listen sockets can be
-        * created race-free.
-        */
-       down(&serialize_startup);
-
-       Dprintk("thread %d initializing sockets.\n", cpu);
-
-       for (k = 0; k < CONFIG_TUX_NUMSOCKETS; k++) {
-               tux_socket_t *e1, *e2;
-
-               e1 = tux_listen[cpu] + k;
-               if (!e1->proto)
-                       break;
-               for (i = 0; i < CONFIG_TUX_NUMTHREADS; i++) {
-                       if (i == cpu)
-                               continue;
-                       for (j = 0; j < CONFIG_TUX_NUMSOCKETS; j++) {
-                               e2 = tux_listen[i] + j;
-                               if (!e2->proto)
-                                       continue;
-                               if ((e1->ip == e2->ip) && (e1->port == e2->port) && (e1->proto == e2->proto) && threadinfo[i].listen[j].proto) {
-                                       ti->listen[k] = threadinfo[i].listen[j];
-                                       ti->listen[k].cloned = 1;
-                                       Dprintk("cloned socket %d from thread %d's socket %d.\n", k, i, j);
-                                       goto next_socket;
-                               }
-                       }
-               }
-
-               ti->listen[k].sock = start_listening(tux_listen[cpu] + k, cpu);
-               if (!ti->listen[k].sock)
-                       goto error_unlock;
-               ti->listen[k].cloned = 0;
-               ti->listen[k].proto = tux_listen[cpu][k].proto;
-               Dprintk("thread %d got sock %p (%d), proto %s.\n", cpu, ti->listen[k].sock, k, ti->listen[k].proto->name);
-next_socket:
-               ;
-       }
-       Dprintk("thread %d done initializing sockets.\n", cpu);
-       up(&serialize_startup);
-
-       if (wait_for_others())
-               goto error_nomsg;
-
-       if (!ti->listen[0].proto) {
-               printk("hm, socket 0 has no protocol.\n");
-               goto error;
-       }
-
-       add_wait_queue(&wait_stop, &ti->stop);
-       for (j = 0; j < CONFIG_TUX_NUMSOCKETS; j++)
-               if (ti->listen[j].proto)
-                       add_wait_queue_exclusive(ti->listen[j].sock->sk->sk_sleep,
-                               ti->wait_event + j);
-       drop_permissions();
-
-       __module_get(tux_module);
-       return 0;
-
-error_unlock:
-       up(&serialize_startup);
-error:
-       printk(KERN_NOTICE "TUX: could not start worker thread %d.\n", ti->cpu);
-
-error_nomsg:
-       ti->listen_error = 1;
-       ti->started = 0;
-
-       zap_listen_sockets(ti);
-       flush_all_requests(ti);
-       stop_cachemiss_threads(ti);
-
-       err = -EINVAL;
-
-out:
-       /*
-        * Last thread close the door:
-        */
-       if (atomic_dec_and_test(&nr_tux_threads_running))
-               user_req_shutdown();
-
-       return -err;
-}
-
-static int flush_idleinput (threadinfo_t * ti)
-{
-       struct list_head *head, *tmp;
-       tux_req_t *req;
-       int count = 0;
-
-       head = &ti->all_requests;
-       tmp = head->next;
-
-       while (tmp != head) {
-               req = list_entry(tmp, tux_req_t, all);
-               tmp = tmp->next;
-               if (test_bit(0, &req->idle_input)) {
-                       idle_event(req);
-                       count++;
-               }
-       }
-       return count;
-}
-
-static int flush_waitoutput (threadinfo_t * ti)
-{
-       struct list_head *head, *tmp;
-       tux_req_t *req;
-       int count = 0;
-
-       head = &ti->all_requests;
-       tmp = head->next;
-
-       while (tmp != head) {
-               req = list_entry(tmp, tux_req_t, all);
-               tmp = tmp->next;
-               if (test_bit(0, &req->wait_output_space)) {
-                       output_space_event(req);
-                       count++;
-               }
-       }
-       return count;
-}
-
-static void flush_all_requests (threadinfo_t *ti)
-{
-       for (;;) {
-               int count;
-
-               count = flush_idleinput(ti);
-               count += flush_waitoutput(ti);
-               count += tux_flush_workqueue(ti);
-               count += flush_freequeue(ti);
-               if (!ti->nr_requests)
-                       break;
-               /*
-                * Go through again if we advanced:
-                */
-               if (count)
-                       continue;
-               Dprintk("flush_all_requests: %d requests still waiting.\n", ti->nr_requests);
-#if TUX_DEBUG
-               count = print_all_requests(ti);
-               Dprintk("flush_all_requests: printed %d requests.\n", count);
-#endif
-               current->state = TASK_UNINTERRUPTIBLE;
-               schedule_timeout(HZ/10);
-       }
-}
-
-int nr_async_io_pending (void)
-{
-       unsigned int i, sum = 0;
-
-       for (i = 0; i < nr_tux_threads; i++) {
-               threadinfo_t *ti = threadinfo + i;
-               if (ti->iot)
-                       sum += ti->iot->nr_async_pending;
-       }
-       return sum;
-}
-
-static int user_req_stop_thread (threadinfo_t *ti)
-{
-       int j;
-
-       printk(KERN_NOTICE "TUX: thread %d stopping ...\n",
-               (int)(ti-threadinfo));
-
-       if (!ti->started)
-               TUX_BUG();
-       for (j = 0; j < CONFIG_TUX_NUMSOCKETS; j++)
-               if (ti->listen[j].proto)
-                       remove_wait_queue(ti->listen[j].sock->sk->sk_sleep,
-                               ti->wait_event + j);
-       remove_wait_queue(&wait_stop, &ti->stop);
-
-       Dprintk(KERN_NOTICE "TUX: thread %d waiting for sockets to go inactive ...\n", (int)(ti-threadinfo));
-       zap_listen_sockets(ti);
-
-       Dprintk(KERN_NOTICE "TUX: thread %d has all sockets inactive.\n", (int)(ti-threadinfo));
-
-       flush_all_requests(ti);
-       stop_cachemiss_threads(ti);
-
-       if (ti->nr_requests)
-               TUX_BUG();
-       ti->started = 0;
-
-       printk(KERN_INFO "TUX: thread %d stopped.\n", ti->cpu);
-
-       ti->thread = NULL;
-       current->tux_info = NULL;
-       current->tux_exit = NULL;
-       atomic_dec(&nr_tux_threads_running);
-       wake_up(&thread_stopped);
-
-       module_put(tux_module);
-
-       return 0;
-}
-
-#define COPY_INT(u_field, k_field)                                     \
-do {                                                                   \
-       if (__copy_to_user(&u_info->u_field, &req->k_field,             \
-                                       sizeof(req->k_field)))          \
-               return_EFAULT;                                          \
-} while (0)
-
-#define GETLEN(k_field, maxlen)                                                \
-               ((req->k_field##_len < maxlen) ?                        \
-               req->k_field##_len : maxlen-1)
-
-#define COPY_STR(u_field, k_field, maxlen)                             \
-do {                                                                   \
-       if (__copy_to_user(u_info->u_field, req->k_field##_str,         \
-               GETLEN(k_field, maxlen)))                               \
-                       return_EFAULT;                                  \
-} while (0)
-
-#define COPY_COND_STR(u_field,k_field,maxlen)                          \
-do {                                                                   \
-       if (req->k_field##_len)                                         \
-               COPY_STR(u_field, k_field, maxlen);                     \
-       if (__put_user((char)0, u_info->u_field +                       \
-                       GETLEN(k_field, maxlen)))                       \
-               return_EFAULT;                                          \
-} while (0)
-
-static void finish_userspace_req (tux_req_t *req)
-{
-       threadinfo_t *ti = req->ti;
-
-       ti->userspace_req = NULL;
-       req->usermode = 0;
-       req->private = 0;
-       req->error = 0;
-       DEC_STAT(nr_userspace_pending);
-       flush_request(req, 0);
-}
-
-static void zap_userspace_req (tux_req_t *req)
-{
-       clear_keepalive(req);
-       finish_userspace_req(req);
-}
-
-/*
- * Fills in the user-space request structure:
- */
-static int prepare_userspace_req (threadinfo_t *ti, user_req_t *u_info)
-{
-       u64 u_req;
-       tux_req_t *req = ti->userspace_req;
-       unsigned int tmp;
-       int filelen;
-       int fd;
-
-       Dprintk("prepare_userspace_req(%p).\n", req);
-       if (!req)
-               TUX_BUG();
-       if (req->error) {
-               TDprintk("userspace request has error %d.\n", req->error);
-               return -1;
-       }
-       fd = req->fd;
-       if (fd == -1) {
-               fd = sock_map_fd(req->sock);
-               Dprintk("sock_map_fd(%p) :%d.\n", req, fd);
-               if (fd < 0) {
-                       Dprintk("sock_map_fd() returned %d.\n", fd);
-                       return -EMFILE;
-               }
-               req->fd = fd;
-       }
-
-#define return_EFAULT do { Dprintk("-EFAULT at %d:%s.\n", __LINE__, __FILE__); return -EFAULT; } while (0)
-
-       if (!access_ok(VERIFY_WRITE, u_info, sizeof(*u_info)))
-               return_EFAULT;
-       if (__copy_to_user(&u_info->sock, &fd, sizeof(fd)))
-               return_EFAULT;
-       if (req->attr)
-               TUX_BUG();
-
-       COPY_INT(module_index, usermodule_idx);
-
-       COPY_COND_STR(query, query, MAX_URI_LEN);
-
-       COPY_INT(event, event);
-       Dprintk("prepare userspace, user error: %d, event %d.\n", req->user_error, req->event);
-       COPY_INT(error, user_error);
-       req->user_error = 0;
-
-       filelen = req->total_file_len;
-       if (filelen < 0)
-               filelen = 0;
-       if (__copy_to_user(&u_info->objectlen, &filelen, sizeof(filelen)))
-               return_EFAULT;
-       if ((req->method == METHOD_POST) && !filelen)
-               if (__copy_to_user(&u_info->objectlen,
-                       &req->content_len, sizeof(filelen)))
-               return_EFAULT;
-       if (req->objectname_len) {
-               if (req->objectname[req->objectname_len])
-                       TUX_BUG();
-               if (__copy_to_user(u_info->objectname, req->objectname,
-                               req->objectname_len + 1))
-                       return_EFAULT;
-       } else
-               if (__put_user((char)0, u_info->objectname))
-                       return_EFAULT;
-
-       COPY_INT(http_version, version);
-       COPY_INT(http_method, method);
-       COPY_INT(keep_alive, keep_alive);
-
-       COPY_INT(cookies_len, cookies_len);
-       if (req->cookies_len)
-               COPY_STR(cookies, cookies, MAX_COOKIE_LEN);
-       if (__put_user((char)0, u_info->cookies + req->cookies_len))
-               return_EFAULT;
-
-       u_req = (u64)(unsigned long)req;
-       if (__copy_to_user(&u_info->id, &u_req, sizeof(u_req)))
-               return_EFAULT;
-       COPY_INT(priv, private);
-       COPY_INT(bytes_sent, bytes_sent);
-
-       tmp = inet_sk(req->sock->sk)->daddr;
-       if (__copy_to_user(&u_info->client_host, &tmp, sizeof(tmp)))
-               return_EFAULT;
-
-       COPY_COND_STR(content_type, content_type, MAX_FIELD_LEN);
-       COPY_COND_STR(user_agent, user_agent, MAX_FIELD_LEN);
-       COPY_COND_STR(accept, accept, MAX_FIELD_LEN);
-       COPY_COND_STR(accept_charset, accept_charset, MAX_FIELD_LEN);
-       COPY_COND_STR(accept_encoding, accept_encoding, MAX_FIELD_LEN);
-       COPY_COND_STR(accept_language, accept_language, MAX_FIELD_LEN);
-       COPY_COND_STR(cache_control, cache_control, MAX_FIELD_LEN);
-       COPY_COND_STR(if_modified_since, if_modified_since, MAX_FIELD_LEN);
-       COPY_COND_STR(negotiate, negotiate, MAX_FIELD_LEN);
-       COPY_COND_STR(pragma, pragma, MAX_FIELD_LEN);
-       COPY_COND_STR(referer, referer, MAX_FIELD_LEN);
-
-       return TUX_RETURN_USERSPACE_REQUEST;
-}
-
-#define GOTO_ERR_no_unlock do { Dprintk("sys_tux() ERR at %s:%d.\n", __FILE__, __LINE__); goto err_no_unlock; } while (0)
-#define GOTO_ERR_unlock do { Dprintk("sys_tux() ERR at %s:%d.\n", __FILE__, __LINE__); goto err_unlock; } while (0)
-
-static int register_mimetype(user_req_t *u_info)
-{
-       char extension[MAX_URI_LEN], mimetype[MAX_URI_LEN], expires[MAX_URI_LEN];
-       u64 u_addr;
-       char *addr;
-       int ret;
-
-       ret = strncpy_from_user(extension, u_info->objectname, MAX_URI_LEN);
-       if (ret <= 0)
-               GOTO_ERR_no_unlock;
-       extension[ret] = 0;
-       Dprintk("got MIME extension: %s.\n", extension);
-       ret = copy_from_user(&u_addr, &u_info->object_addr, sizeof(u_addr));
-       if (ret)
-               GOTO_ERR_no_unlock;
-       addr = (char *)(unsigned long)u_addr;
-       ret = strncpy_from_user(mimetype, addr, MAX_URI_LEN);
-       if (ret <= 0)
-               GOTO_ERR_no_unlock;
-       mimetype[ret] = 0;
-       Dprintk("got MIME type: %s.\n", mimetype);
-        ret = strncpy_from_user(expires, u_info->cache_control, MAX_URI_LEN);
-        if (ret >= 0)
-               expires[ret] = 0;
-       else
-               expires[0] = 0;
-        Dprintk("got expires header: %s.\n", expires);
-
-       add_mimetype(extension, mimetype, expires);
-       ret = 0;
-err_no_unlock:
-       return ret;
-}
-
-void user_send_buffer (tux_req_t *req, int cachemiss)
-{
-       int ret;
-
-
-       SET_TIMESTAMP(req->output_timestamp);
-
-repeat:
-       ret = send_sync_buf(req, req->sock, req->userbuf, req->userlen, MSG_DONTWAIT | MSG_MORE);
-       switch (ret) {
-               case -EAGAIN:
-                       add_tux_atom(req, user_send_buffer);
-                       if (add_output_space_event(req, req->sock)) {
-                               del_tux_atom(req);
-                               goto repeat;
-                       }
-                       INC_STAT(user_sendbuf_write_misses);
-                       break;
-               default:
-                       if (ret <= 0) {
-                               req_err(req);
-                               req->usermode = 0;
-                               req->private = 0;
-                               add_req_to_workqueue(req);
-                               break;
-                       }
-                       req->userbuf += ret;
-                       req->userlen -= ret;
-                       if ((int)req->userlen < 0)
-                               TUX_BUG();
-                       if (req->userlen)
-                               goto repeat;
-                       add_req_to_workqueue(req);
-                       break;
-       }
-}
-
-void user_send_object (tux_req_t *req, int cachemiss)
-{
-       int ret;
-
-
-       SET_TIMESTAMP(req->output_timestamp);
-
-repeat:
-       ret = generic_send_file(req, req->sock, cachemiss);
-       switch (ret) {
-               case -5:
-                       add_tux_atom(req, user_send_object);
-                       output_timeout(req);
-                       break;
-               case -4:
-                       add_tux_atom(req, user_send_object);
-                       if (add_output_space_event(req, req->sock)) {
-                               del_tux_atom(req);
-                               goto repeat;
-                       }
-                       INC_STAT(user_sendobject_write_misses);
-                       break;
-               case -3:
-                       INC_STAT(user_sendobject_cachemisses);
-                       add_tux_atom(req, user_send_object);
-                       queue_cachemiss(req);
-                       break;
-               case -1:
-                       break;
-               default:
-                       req->in_file.f_pos = 0;
-                       add_req_to_workqueue(req);
-                       break;
-       }
-}
-
-void user_get_object (tux_req_t *req, int cachemiss)
-{
-       int missed;
-
-       if (!req->dentry) {
-               req->usermode = 0;
-               missed = lookup_object(req, cachemiss ? 0 : LOOKUP_ATOMIC);
-               if (req->usermode)
-                       TUX_BUG();
-               req->usermode = 1;
-               if (!missed && !req->dentry) {
-                       req->error = 0;
-                       req->user_error = -ENOENT;
-                       add_req_to_workqueue(req);
-                       return;
-               }
-               if (missed) {
-                       if (cachemiss)
-                               TUX_BUG();
-                       INC_STAT(user_lookup_cachemisses);
-fetch_missed:
-                       req->ti->userspace_req = NULL;
-                       DEC_STAT(nr_userspace_pending);
-                       add_tux_atom(req, user_get_object);
-                       queue_cachemiss(req);
-                       return;
-               }
-       }
-       req->total_file_len = req->dentry->d_inode->i_size;
-       if (!req->output_len)
-               req->output_len = req->total_file_len;
-       if (tux_fetch_file(req, !cachemiss)) {
-               INC_STAT(user_fetch_cachemisses);
-               goto fetch_missed;
-       }
-       req->in_file.f_pos = 0;
-       add_req_to_workqueue(req);
-}
-
-asmlinkage long __sys_tux (unsigned int action, user_req_t *u_info)
-{
-       int ret = -1;
-       threadinfo_t *ti;
-       tux_req_t *req;
-
-       if (action != TUX_ACTION_CURRENT_DATE)
-               Dprintk("got sys_tux(%d, %p).\n", action, u_info);
-
-       if (action >= MAX_TUX_ACTION)
-               GOTO_ERR_no_unlock;
-
-       ti = (threadinfo_t *) current->tux_info;
-       if (ti)
-               if (ti->thread != current)
-                       TUX_BUG();
-
-       if (!capable(CAP_SYS_ADMIN)
-                       && (action != TUX_ACTION_CONTINUE_REQ) &&
-                               (action != TUX_ACTION_STOPTHREAD))
-               goto userspace_actions;
-
-       switch (action) {
-               case TUX_ACTION_CONTINUE_REQ:
-                       ret = continue_request((int)(long)u_info);
-                       goto out;
-
-               case TUX_ACTION_STARTUP:
-                       lock_kernel();
-                       ret = user_req_startup();
-                       unlock_kernel();
-                       goto out;
-
-               case TUX_ACTION_SHUTDOWN:
-                       lock_kernel();
-                       ret = user_req_shutdown();
-                       unlock_kernel();
-                       goto out;
-
-               case TUX_ACTION_REGISTER_MODULE:
-                       ret = user_register_module(u_info);
-                       goto out;
-
-               case TUX_ACTION_UNREGISTER_MODULE:
-                       ret = user_unregister_module(u_info);
-                       goto out;
-
-               case TUX_ACTION_STARTTHREAD:
-               {
-                       unsigned int nr;
-
-                       ret = copy_from_user(&nr, &u_info->thread_nr,
-                                               sizeof(int));
-                       if (ret)
-                               GOTO_ERR_no_unlock;
-                       if (nr >= nr_tux_threads)
-                               GOTO_ERR_no_unlock;
-                       ti = threadinfo + nr;
-                       if (ti->started)
-                               GOTO_ERR_unlock;
-                       ti->started = 1;
-                       current->tux_info = ti;
-                       current->tux_exit = tux_exit;
-                       if (ti->thread)
-                               TUX_BUG();
-                       Dprintk("TUX: current open files limit for TUX%d: %ld.\n", nr, current->rlim[RLIMIT_NOFILE].rlim_cur);
-                       lock_kernel();
-                       ret = user_req_start_thread(ti);
-                       unlock_kernel();
-                       if (ret) {
-                               current->tux_info = NULL;
-                               current->tux_exit = NULL;
-                       } else {
-                               if (ti->thread != current)
-                                       TUX_BUG();
-                       }
-                       goto out_userreq;
-               }
-
-               case TUX_ACTION_STOPTHREAD:
-                       if (!ti)
-                               GOTO_ERR_no_unlock;
-                       if (!ti->started)
-                               GOTO_ERR_unlock;
-                       req = ti->userspace_req;
-                       if (req)
-                               zap_userspace_req(req);
-                       
-                       lock_kernel();
-                       ret = user_req_stop_thread(ti);
-                       unlock_kernel();
-                       goto out_userreq;
-
-               case TUX_ACTION_CURRENT_DATE:
-                       ret = strncpy_from_user(tux_date, u_info->new_date,
-                               DATE_LEN);
-                       if (ret <= 0)
-                               GOTO_ERR_no_unlock;
-                       goto out;
-
-               case TUX_ACTION_REGISTER_MIMETYPE:
-                       ret = register_mimetype(u_info);
-                       if (ret)
-                               GOTO_ERR_no_unlock;
-                       goto out;
-
-               case TUX_ACTION_QUERY_VERSION:
-                       ret = (TUX_MAJOR_VERSION << 24) | (TUX_MINOR_VERSION << 16) | TUX_PATCHLEVEL_VERSION;
-                       goto out;
-               default:
-                       ;
-       }
-
-userspace_actions:
-
-       if (!ti)
-               GOTO_ERR_no_unlock;
-
-       if (!ti->started)
-               GOTO_ERR_unlock;
-
-       req = ti->userspace_req;
-       if (!req) {
-               if (action == TUX_ACTION_EVENTLOOP)
-                       goto eventloop;
-               GOTO_ERR_unlock;
-       }
-       if (!req->usermode)
-               TUX_BUG();
-
-       ret = copy_from_user(&req->event, &u_info->event, sizeof(int));
-       if (ret)
-               GOTO_ERR_unlock;
-       ret = copy_from_user(&req->status, &u_info->http_status, sizeof(int));
-       if (ret)
-               GOTO_ERR_unlock;
-       ret = copy_from_user(&req->bytes_sent, &u_info->bytes_sent, sizeof(int));
-       if (ret)
-               GOTO_ERR_unlock;
-       ret = copy_from_user(&req->private, &u_info->priv, sizeof(req->private));
-       if (ret)
-               GOTO_ERR_unlock;
-
-       switch (action) {
-
-               case TUX_ACTION_EVENTLOOP:
-eventloop:
-                       req = ti->userspace_req;
-                       if (req)
-                               zap_userspace_req(req);
-                       ret = event_loop(ti);
-                       goto out_userreq;
-
-               /*
-                * Module forces keepalive off, server will close
-                * the connection.
-                */
-               case TUX_ACTION_FINISH_CLOSE_REQ:
-                       clear_keepalive(req);
-
-               case TUX_ACTION_FINISH_REQ:
-                       finish_userspace_req(req);
-                       goto eventloop;
-
-               case TUX_ACTION_REDIRECT_REQ:
-
-                       ti->userspace_req = NULL;
-                       req->usermode = 0;
-                       req->private = 0;
-                       req->error = TUX_ERROR_REDIRECT;
-                       DEC_STAT(nr_userspace_pending);
-                       add_tux_atom(req, redirect_request);
-                       add_req_to_workqueue(req);
-
-                       goto eventloop;
-
-               case TUX_ACTION_POSTPONE_REQ:
-
-                       postpone_request(req);
-                       ti->userspace_req = NULL;
-                       ret = TUX_RETURN_USERSPACE_REQUEST;
-                       break;
-
-               case TUX_ACTION_GET_OBJECT:
-                       release_req_dentry(req);
-                       ret = strncpy_from_user(req->objectname,
-                               u_info->objectname, MAX_URI_LEN-1);
-                       if (ret <= 0) {
-                               req->objectname[0] = 0;
-                               req->objectname_len = 0;
-                               GOTO_ERR_unlock;
-                       }
-                       req->objectname[ret] = 0; // string delimit
-                       req->objectname_len = ret;
-
-                       Dprintk("got objectname {%s} (%d) from user-space req %p (req: %p).\n", req->objectname, req->objectname_len, u_info, req);
-                       req->ti->userspace_req = NULL;
-                       DEC_STAT(nr_userspace_pending);
-                       user_get_object(req, 0);
-                       goto eventloop;
-
-               case TUX_ACTION_READ_OBJECT:
-               {
-                       u64 u_addr;
-                       char *addr;
-                       loff_t ppos = 0;
-                       struct file *filp;
-
-                       if (!req->dentry)
-                               GOTO_ERR_unlock;
-                       
-                       ret = copy_from_user(&u_addr, &u_info->object_addr,
-                                       sizeof(u_addr));
-                       if (ret)
-                               GOTO_ERR_unlock;
-                       addr = (char *)(unsigned long)u_addr;
-                       filp = dentry_open(req->dentry, O_RDONLY, 0);
-                       dget(req->dentry);
-                       generic_file_read(filp, addr, req->total_file_len, &ppos);
-                       fput(filp);
-                       ret = TUX_RETURN_USERSPACE_REQUEST;
-                       break;
-               }
-
-               case TUX_ACTION_SEND_OBJECT:
-                       if (!req->dentry)
-                               GOTO_ERR_unlock;
-                       req->ti->userspace_req = NULL;
-                       DEC_STAT(nr_userspace_pending);
-                       user_send_object(req, 0);
-                       goto eventloop;
-
-               case TUX_ACTION_SEND_BUFFER:
-               {
-                       u64 u_addr;
-                       char *addr;
-                       unsigned int len;
-
-                       ret = copy_from_user(&u_addr,
-                                       &u_info->object_addr, sizeof(u_addr));
-                       if (ret)
-                               GOTO_ERR_unlock;
-                       addr = (char *)(unsigned long)u_addr;
-                       ret = copy_from_user(&len,
-                                       &u_info->objectlen, sizeof(addr));
-                       if (ret)
-                               GOTO_ERR_unlock;
-                       if ((int)len <= 0)
-                               GOTO_ERR_unlock;
-
-                       ret = -EFAULT;
-                       if (!access_ok(VERIFY_READ, addr, len))
-                               GOTO_ERR_unlock;
-                       req->userbuf = addr;
-                       req->userlen = len;
-
-                       req->ti->userspace_req = NULL;
-                       DEC_STAT(nr_userspace_pending);
-                       user_send_buffer(req, 0);
-                       ret = 0;
-                       goto eventloop;
-               }
-
-               case TUX_ACTION_READ_HEADERS:
-               {
-                       char *addr;
-                       u64 u_addr;
-
-                       ret = copy_from_user(&u_addr, &u_info->object_addr,
-                                       sizeof(u_addr));
-                       if (ret)
-                               GOTO_ERR_unlock;
-                       addr = (char *)(unsigned long)u_addr;
-                       ret = copy_to_user(&u_info->objectlen,
-                                &req->headers_len, sizeof(req->headers_len));
-                       if (ret)
-                               GOTO_ERR_unlock;
-                       ret = copy_to_user(addr,req->headers, req->headers_len);
-                       if (ret)
-                               GOTO_ERR_unlock;
-                       break;
-               }
-
-               case TUX_ACTION_READ_POST_DATA:
-               {
-                       char *addr;
-                       unsigned int size;
-                       u64 u_addr;
-
-                       ret = copy_from_user(&u_addr, &u_info->object_addr,
-                                       sizeof(u_addr));
-                       if (ret)
-                               GOTO_ERR_unlock;
-                       addr = (char *)(unsigned long)u_addr;
-
-                       ret = copy_from_user(&size, &u_info->objectlen,
-                                       sizeof(size));
-                       if (ret)
-                               GOTO_ERR_unlock;
-                       Dprintk("READ_POST_DATA: got %p(%d).\n", addr, size);
-                       if (req->post_data_len < size)
-                               size = req->post_data_len;
-                       Dprintk("READ_POST_DATA: writing %d.\n", size);
-                       ret = copy_to_user(&u_info->objectlen,
-                                               &size, sizeof(size));
-                       if (ret)
-                               GOTO_ERR_unlock;
-                       ret = copy_to_user(addr, req->post_data_str, size);
-                       if (ret)
-                               GOTO_ERR_unlock;
-                       goto out;
-               }
-
-               case TUX_ACTION_WATCH_PROXY_SOCKET:
-               {
-                       struct socket *sock;
-                       int err;
-                       long fd;
-                       u64 u_addr;
-
-                       ret = copy_from_user(&u_addr, &u_info->object_addr,
-                                       sizeof(u_addr));
-                       if (ret)
-                               GOTO_ERR_unlock;
-                       fd = (int)(unsigned long)u_addr;
-
-                       sock = sockfd_lookup(fd, &err);
-                       if (!sock)
-                               GOTO_ERR_unlock;
-                       put_data_sock(req);
-                       link_tux_data_socket(req, sock);
-
-                       ret = 0;
-                       goto out;
-               }
-
-               case TUX_ACTION_WAIT_PROXY_SOCKET:
-               {
-                       if (!req->data_sock)
-                               GOTO_ERR_unlock;
-                       if (socket_input(req->data_sock)) {
-                               ret = TUX_RETURN_USERSPACE_REQUEST;
-                               goto out_userreq;
-                       }
-                       spin_lock_irq(&req->ti->work_lock);
-                       add_keepalive_timer(req);
-                       if (test_and_set_bit(0, &req->idle_input))
-                               TUX_BUG();
-                       spin_unlock_irq(&req->ti->work_lock);
-                       if (socket_input(req->data_sock)) {
-                               unidle_req(req);
-                               ret = TUX_RETURN_USERSPACE_REQUEST;
-                               goto out_userreq;
-                       }
-                       req->ti->userspace_req = NULL;
-                       goto eventloop;
-               }
-
-               default:
-                       GOTO_ERR_unlock;
-       }
-
-out_userreq:
-       req = ti->userspace_req;
-       if (req) {
-               ret = prepare_userspace_req(ti, u_info);
-               if (ret < 0) {
-                       TDprintk("hm, user req %p returned %d, zapping.\n",
-                               req, ret);
-                       zap_userspace_req(req);
-                       goto eventloop;
-               }
-       }
-out:
-       if (action != TUX_ACTION_CURRENT_DATE)
-               Dprintk("sys_tux(%d, %p) returning %d.\n", action, u_info, ret);
-       while (unlikely(test_thread_flag(TIF_NEED_RESCHED))) {
-               __set_task_state(current, TASK_RUNNING);
-               schedule();
-       }
-       return ret;
-err_unlock:
-err_no_unlock:
-       Dprintk("sys_tux(%d, %p) returning -EINVAL (ret:%d)!\n", action, u_info, ret);
-       while (unlikely(test_thread_flag(TIF_NEED_RESCHED))) {
-               __set_task_state(current, TASK_RUNNING);
-               schedule();
-       }
-       return -EINVAL;
-}
-
-/*
- * This gets called if a TUX thread does an exit().
- */
-void tux_exit (void)
-{
-       __sys_tux(TUX_ACTION_STOPTHREAD, NULL);
-}
-
-int tux_init(void)
-{
-       start_sysctl();
-
-#if CONFIG_TUX_MODULE
-       spin_lock(&tux_module_lock);
-       sys_tux_ptr = __sys_tux;
-       tux_module = THIS_MODULE;
-       spin_unlock(&tux_module_lock);
-#endif
-
-       return 0;
-}
-
-void tux_cleanup (void)
-{
-#if CONFIG_TUX_MODULE
-       spin_lock(&tux_module_lock);
-       tux_module = NULL;
-       sys_tux_ptr = NULL;
-       spin_unlock(&tux_module_lock);
-#endif
-
-       end_sysctl();
-}
-
-module_init(tux_init)
-module_exit(tux_cleanup)
-
-MODULE_LICENSE("GPL");
-
diff --git a/net/tux/mod.c b/net/tux/mod.c
deleted file mode 100644 (file)
index 1489114..0000000
+++ /dev/null
@@ -1,262 +0,0 @@
-/*
- * TUX - Integrated Application Protocols Layer and Object Cache
- *
- * Copyright (C) 2000, 2001, Ingo Molnar <mingo@redhat.com>
- *
- * mod.c: loading/registering of dynamic TUX modules
- */
-
-#include <net/tux.h>
-#include <linux/kmod.h>
-
-/****************************************************************
- *      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, 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.
- *
- ****************************************************************/
-
-spinlock_t tuxmodules_lock = SPIN_LOCK_UNLOCKED;
-static LIST_HEAD(tuxmodules_list);
-
-tcapi_template_t * get_first_usermodule (void)
-{
-       tcapi_template_t *tcapi;
-       struct list_head *head, *curr, *next;
-
-       spin_lock(&tuxmodules_lock);
-       head = &tuxmodules_list;
-       next = head->next;
-
-       while ((curr = next) != head) {
-               tcapi = list_entry(curr, tcapi_template_t, modules);
-               next = curr->next;
-               if (tcapi->userspace_id) {
-                       spin_unlock(&tuxmodules_lock);
-                       return tcapi;
-               }
-       }
-       spin_unlock(&tuxmodules_lock);
-       return NULL;
-}
-
-static tcapi_template_t * lookup_module (const char *vfs_name)
-{
-       tcapi_template_t *tcapi;
-       struct list_head *head, *curr, *next;
-
-       while (*vfs_name == '/')
-               vfs_name++;
-       Dprintk("looking up TUX module {%s}.\n", vfs_name);
-       head = &tuxmodules_list;
-       next = head->next;
-
-       while ((curr = next) != head) {
-               tcapi = list_entry(curr, tcapi_template_t, modules);
-               next = curr->next;
-               Dprintk("checking module {%s} == {%s}?\n", vfs_name, tcapi->vfs_name);
-               if (!strcmp(tcapi->vfs_name, vfs_name))
-                       return tcapi;
-       }
-       return NULL;
-}
-
-/*
- * Attempt to load a TUX application module.
- * This is the slow path, we cache ('link') the module's
- * API vector to the inode.
- * The module loading path is serialized, and we handshake
- * with the loaded module and fetch its API vector.
- */
-tcapi_template_t * lookup_tuxmodule (const char *filename)
-{
-       tcapi_template_t *tcapi;
-
-       spin_lock(&tuxmodules_lock);
-       tcapi = lookup_module(filename);
-       if (!tcapi)
-               Dprintk("did not find module vfs:{%s}\n", filename);
-       spin_unlock(&tuxmodules_lock);
-       return tcapi;
-}
-
-
-int register_tuxmodule (tcapi_template_t *tcapi)
-{
-       int ret = -EEXIST;
-
-       spin_lock(&tuxmodules_lock);
-
-       if (lookup_module(tcapi->vfs_name)) {
-               Dprintk("module with VFS binding '%s' already registered!\n",
-                                                tcapi->vfs_name);
-               goto out;
-       } 
-
-       list_add(&tcapi->modules, &tuxmodules_list);
-       ret = 0;
-       Dprintk("TUX module %s registered.\n", tcapi->vfs_name);
-out:
-       spin_unlock(&tuxmodules_lock);
-
-       return ret;
-}
-
-void unregister_all_tuxmodules (void)
-{
-       tcapi_template_t *tcapi;
-       struct list_head *curr;
-
-       spin_lock(&tuxmodules_lock);
-       while (((curr = tuxmodules_list.next)) != &tuxmodules_list) {
-               tcapi = list_entry(curr, tcapi_template_t, modules);
-               list_del(curr);
-               kfree(tcapi->vfs_name);
-               kfree(tcapi);
-       }
-       spin_unlock(&tuxmodules_lock);
-}
-
-tcapi_template_t * unregister_tuxmodule (char *vfs_name)
-{
-       tcapi_template_t *tcapi;
-       int err = 0;
-
-       spin_lock(&tuxmodules_lock);
-       tcapi = lookup_module(vfs_name);
-       if (!tcapi) {
-               Dprintk("huh, module %s not registered??\n", vfs_name);
-               err = -1;
-       } else {
-               list_del(&tcapi->modules);
-               Dprintk("TUX module %s unregistered.\n", vfs_name);
-       }
-       spin_unlock(&tuxmodules_lock);
-
-       return tcapi;
-}
-
-static int check_module_version (user_req_t *u_info)
-{
-       int major, minor, patch, ret;
-
-       ret = copy_from_user(&major, &u_info->version_major, sizeof(int));
-       ret += copy_from_user(&minor, &u_info->version_minor, sizeof(int));
-       ret += copy_from_user(&patch, &u_info->version_patch, sizeof(int));
-       if (ret)
-               return -EFAULT;
-
-       if ((major != TUX_MAJOR_VERSION) || (minor > TUX_MINOR_VERSION)) {
-
-               printk(KERN_ERR "TUX: module version %d:%d incompatible with kernel version %d:%d!\n", major, minor, TUX_MAJOR_VERSION, TUX_MINOR_VERSION);
-               return -EINVAL;
-       }
-       return 0;
-}
-
-int user_register_module (user_req_t *u_info)
-{
-       int idx, len, ret;
-       tcapi_template_t *tcapi;
-       char modulename [MAX_URI_LEN+1];
-
-       ret = check_module_version(u_info);
-       if (ret)
-               return ret;
-
-       /*
-        * Check module name length.
-        */
-       ret = strnlen_user(u_info->objectname, MAX_URI_LEN+2);
-       if (ret < 0)
-               goto out;
-       ret = -EINVAL;
-       if (ret >= MAX_URI_LEN)
-               goto out;
-
-       Dprintk("register user-module, %p.\n", u_info);
-       ret = strncpy_from_user(modulename, u_info->objectname, MAX_URI_LEN);
-       if (ret < 0)
-               goto out;
-       modulename[ret] = 0;
-       Dprintk("... user-module is: {%s}.\n", modulename);
-       len = strlen(modulename);
-       if (!len)
-               printk(KERN_ERR "no module name provided: please upgrade your TUX user-space utilities!\n");
-       if (!len || (len > MAX_URI_LEN))
-               return -EINVAL;
-       Dprintk("... user-module len is: %d.\n", len);
-
-       ret = copy_from_user(&idx, &u_info->module_index, sizeof(int));
-       if (ret || !idx)
-               goto out;
-       Dprintk("... user-module index is: %d.\n", idx);
-
-       ret = -ENOMEM;
-       tcapi = (tcapi_template_t *) kmalloc(sizeof(*tcapi), GFP_KERNEL);
-       if (!tcapi)
-               goto out;
-       memset(tcapi, 0, sizeof(*tcapi));
-
-       tcapi->vfs_name = (char *) kmalloc(len+1, GFP_KERNEL);
-       if (!tcapi->vfs_name) {
-               kfree(tcapi);
-               goto out;
-       }
-       strcpy(tcapi->vfs_name, modulename);
-       tcapi->userspace_id = idx;
-
-       Dprintk("... registering module {%s}.\n", tcapi->vfs_name);
-       ret = register_tuxmodule(tcapi);
-out:
-       return ret;
-}
-
-int user_unregister_module (user_req_t *u_info)
-{
-       int len, ret;
-       tcapi_template_t *tcapi;
-       char modulename [MAX_URI_LEN+1];
-
-       /*
-        * Check module name length.
-        */
-       ret = strnlen_user(u_info->objectname, MAX_URI_LEN+2);
-       if (ret < 0)
-               goto out;
-       ret = -EINVAL;
-       if (ret >= MAX_URI_LEN)
-               goto out;
-       Dprintk("unregister user-module, %p.\n", u_info);
-       ret = strncpy_from_user(modulename, u_info->objectname, MAX_URI_LEN);
-       if (ret <= 0)
-               goto out;
-       modulename[ret] = 0;
-       Dprintk("... user-module is: {%s}.\n", modulename);
-       len = strlen(modulename);
-       if (!len || (len > MAX_URI_LEN))
-               return -EINVAL;
-       Dprintk("... user-module len is: %d.\n", len);
-
-       Dprintk("... unregistering module {%s}.\n", modulename);
-       tcapi = unregister_tuxmodule(modulename);
-       ret = -EINVAL;
-       if (tcapi) {
-               ret = 0;
-               kfree(tcapi->vfs_name);
-               kfree(tcapi);
-       }
-out:
-       return ret;
-}
-
diff --git a/net/tux/output.c b/net/tux/output.c
deleted file mode 100644 (file)
index 2d0f073..0000000
+++ /dev/null
@@ -1,352 +0,0 @@
-/*
- * TUX - Integrated Application Protocols Layer and Object Cache
- *
- * Copyright (C) 2000, 2001, Ingo Molnar <mingo@redhat.com>
- *
- * output.c: Send data to clients
- */
-
-#include <net/tux.h>
-
-/****************************************************************
- *      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, 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.
- *
- ****************************************************************/
-
-int send_sync_buf (tux_req_t *req, struct socket *sock, const char *buf, const size_t length, unsigned long flags)
-{
-       struct msghdr msg;
-       struct iovec iov;
-       int len, written = 0, left = length;
-       struct tcp_opt *tp = tcp_sk(sock->sk);
-
-       tp->nonagle = 2;
-
-       msg.msg_name     = 0;
-       msg.msg_namelen  = 0;
-       msg.msg_iov      = &iov;
-       msg.msg_iovlen   = 1;
-       msg.msg_control  = NULL;
-       msg.msg_controllen = 0;
-       msg.msg_flags    = flags | MSG_NOSIGNAL;
-repeat_send:
-       msg.msg_iov->iov_len = left;
-       msg.msg_iov->iov_base = (char *) buf + written;
-
-       len = sock_sendmsg(sock, &msg, left);
-
-       Dprintk("sendmsg ret: %d, written: %d, left: %d.\n", len,written,left);
-       if ((len == -ERESTARTSYS) || (!(flags & MSG_DONTWAIT) &&
-                        (len == -EAGAIN))) {
-               flush_all_signals();
-               goto repeat_send;
-       }
-       if (len > 0) {
-               written += len;
-               left -= len;
-               if (left)
-                       goto repeat_send;
-       }
-       if (len >= 0) {
-               if (written != length)
-                       TUX_BUG();
-               if (left)
-                       TUX_BUG();
-       }
-       if (req && (written > 0))
-               req->bytes_sent += written;
-       Dprintk("sendmsg FINAL ret: %d, written: %d, left: %d.\n", len,written,left);
-       return written ? written : len;
-}
-
-unsigned int tux_zerocopy_sendfile = 1;
-
-typedef struct sock_send_desc
-{
-       struct socket *sock;
-       tux_req_t *req;
-} sock_send_desc_t;
-
-static int sock_send_actor (read_descriptor_t * desc, struct page *page,
-                               unsigned long offset, unsigned long orig_size)
-{
-       sock_send_desc_t *sock_desc = (sock_send_desc_t *)desc->buf;
-       struct socket *sock = sock_desc->sock;
-       tux_req_t *req = sock_desc->req;
-       unsigned int flags;
-       ssize_t written;
-       char *buf = NULL;
-       unsigned int size;
-
-       flags = MSG_DONTWAIT | MSG_NOSIGNAL;
-       if (desc->count < orig_size)
-               orig_size = desc->count;
-       if (desc->count > orig_size)
-               flags |= MSG_MORE;
-       Dprintk("sock_send_actor(), page: %p, offset: %ld, orig_size: %ld, sock: %p, desc->count: %d, desc->written: %d, MSG_MORE: %d.\n", page, offset, orig_size, sock, desc->count, desc->written, flags & MSG_MORE);
-
-       if (req->content_gzipped >= 2) {
-               unsigned int gzip_left;
-               struct msghdr msg;
-               struct iovec iov;
-               mm_segment_t oldmm;
-               char *kaddr = kmap(page);
-               __u32 in_len, out_len;
-               out_len = orig_size*101/100 + 12;
-               buf = tux_kmalloc(out_len);
-               in_len = orig_size;
-               size = out_len;
-               gzip_left = 0;
-// 8b1f 0808 fdc4 3bd8 0300 79
-buf[1] = 0x8b; buf[0] = 0x1f; buf[3] = 0x08; buf[2] = 0x08;
-buf[5] = 0xfd; buf[4] = 0xc4; buf[7] = 0x3b; buf[6] = 0xd8;
-buf[9] = 0x03; buf[8] = 0x00; buf[10] = 0x79;
-               size += 11;
-               Dprintk("pre-compress: in_len: %d, out_len: %d, gzip_left: %d, uncompressed size: %d.\n", in_len, out_len, gzip_left, size);
-               gzip_left = tux_gzip_compress(req, kaddr, buf+11, &in_len, &out_len);
-               size -= out_len;
- buf[11] = 0x79; buf[12] = 0x00;
-
-               Dprintk("post-compress: in_len: %d, out_len: %d, gzip_left: %d, compressed size: %d.\n", in_len, out_len, gzip_left, size);
-               kunmap(page);
-               msg.msg_name = NULL;
-               msg.msg_namelen = 0;
-               msg.msg_iov = &iov;
-               msg.msg_iovlen = 1;
-               msg.msg_control = NULL;
-               msg.msg_controllen = 0;
-               flags &= ~MSG_DONTWAIT;
-               msg.msg_flags = flags;
-               iov.iov_base = buf;
-               iov.iov_len = size;
-
-               oldmm = get_fs(); set_fs(KERNEL_DS);
-               written = sock_sendmsg(sock, &msg, size);
-               set_fs(oldmm);
-
-               Dprintk("buf: %p, offset: %ld, size: %d, written: %d.\n", buf, offset, size, written);
-               if (written == size)
-                       written = orig_size;
-               else
-                       written = size;
-                       
-       } else {
-               size = orig_size;
-               if (tux_zerocopy_sendfile && sock->ops->sendpage &&
-                   (sock->sk->sk_route_caps&NETIF_F_SG)) {
-                       written = sock->ops->sendpage(sock, page, offset, size, flags);
-               } else {
-                       struct msghdr msg;
-                       struct iovec iov;
-                       char *kaddr;
-                       mm_segment_t oldmm;
-       
-                       if (offset+size > PAGE_SIZE)
-                               return -EFAULT;
-
-                       kaddr = kmap(page);
-       
-                       msg.msg_name = NULL;
-                       msg.msg_namelen = 0;
-                       msg.msg_iov = &iov;
-                       msg.msg_iovlen = 1;
-                       msg.msg_control = NULL;
-                       msg.msg_controllen = 0;
-                       msg.msg_flags = flags;
-                       iov.iov_base = kaddr + offset;
-                       iov.iov_len = size;
-
-                       oldmm = get_fs(); set_fs(KERNEL_DS);
-                       written = sock_sendmsg(sock, &msg, size);
-                       set_fs(oldmm);
-
-                       Dprintk("kaddr: %p, offset: %ld, size: %d, written: %d.\n", kaddr, offset, size, written);
-                       kunmap(page);
-               }
-       }
-       if (written < 0) {
-               desc->error = written;
-               written = 0;
-       }
-       Dprintk("desc->count: %d, desc->written: %d, written: %d.\n", desc->count, desc->written, written);
-       desc->count -= written;
-       if ((int)desc->count < 0)
-               TUX_BUG();
-       desc->written += written;
-
-       if (buf)
-               kfree(buf);
-
-       return written;
-}
-
-/*
- * Return 1 if the output space condition went away
- * before adding the handler.
- */
-int add_output_space_event (tux_req_t *req, struct socket *sock)
-{
-       struct sock *sk = sock->sk;
-       /*
-        * blocked due to socket IO?
-        */
-       spin_lock_irq(&req->ti->work_lock);
-       add_keepalive_timer(req);
-       if (test_and_set_bit(0,&req->wait_output_space))
-               TUX_BUG();
-       INC_STAT(nr_output_space_pending);
-
-       if ((sk->sk_state == TCP_ESTABLISHED) && enough_wspace(sk)) {
-               if (test_and_clear_bit(0, &req->wait_output_space)) {
-                       DEC_STAT(nr_output_space_pending);
-                       del_keepalive_timer(req);
-                       spin_unlock_irq(&req->ti->work_lock);
-                       return 1;
-               }
-       }
-       spin_unlock_irq(&req->ti->work_lock);
-
-       return 0;
-}
-
-#define SEND_BLOCKSIZE (164*1024)
-
-int generic_send_file (tux_req_t *req, struct socket *sock, int cachemiss)
-{
-       sock_send_desc_t sock_desc;
-       int len, want, nonblock = !cachemiss;
-       struct tcp_opt *tp = tcp_sk(sock->sk);
-
-       tp->nonagle = 2;
-
-       sock_desc.sock = sock;
-       sock_desc.req = req;
-
-repeat:
-       Dprintk("generic_send_file(%p,%d,%p) called, f_pos: %Ld, output_len: %Ld.\n", req, nonblock, sock, req->in_file.f_pos, req->output_len);
-
-       if (req->proto->check_req_err(req, cachemiss))
-               return -1;
-       if (connection_too_fast(req) == 2) {
-               len = -5;
-               goto out;
-       }
-       if (req->total_file_len < req->in_file.f_pos)
-               TUX_BUG();
-
-       req->desc.written = 0;
-       /*
-        * Careful, output_len can be 64-bit, while 'want' can be 32-bit.
-        */
-       if (req->output_len > SEND_BLOCKSIZE)
-               want = SEND_BLOCKSIZE;
-       else
-               want = req->output_len;
-       req->desc.count = want;
-       req->desc.buf = (char *) &sock_desc;
-       req->desc.error = 0;
-       Dprintk("sendfile(), desc.count: %d.\n", req->desc.count);
-       do_generic_file_read(&req->in_file, &req->in_file.f_pos, &req->desc, sock_send_actor, nonblock);
-       if (req->desc.written > 0) {
-               req->bytes_sent += req->desc.written;
-               req->output_len -= req->desc.written;
-       }
-       if (!nonblock && (req->desc.error == -EWOULDBLOCKIO))
-               TUX_BUG();
-       Dprintk("sendfile() wrote: %d bytes.\n", req->desc.written);
-       if (req->output_len && !req->desc.written && !req->desc.error) {
-#if CONFIG_TUX_DEBUG
-               req->bytes_expected = 0;
-#endif
-               req->in_file.f_pos = 0;
-               req->error = TUX_ERROR_CONN_CLOSE;
-               zap_request(req, cachemiss);
-               return -1;
-       }
-
-       switch (req->desc.error) {
-
-       case -EWOULDBLOCKIO:
-               len = -3;
-               break;
-       case -EAGAIN:
-no_write_space:
-               Dprintk("sk->wmem_queued: %d, sk->sndbuf: %d.\n",
-                       sock->sk->sk_wmem_queued, sock->sk->sk_sndbuf);
-               len = -4;
-               break;
-       default:
-               len = req->desc.written;
-#if CONFIG_TUX_DEBUG
-               if (req->desc.error)
-                       TDprintk("TUX: sendfile() returned error %d (signals pending: %08lx)!\n", req->desc.error, current->pending.signal.sig[0]);
-#endif
-               if (!req->desc.error) {
-                       if (req->output_len < 0)
-                               BUG();
-                       if (req->output_len) {
-                               if (test_bit(SOCK_NOSPACE, &sock->flags))
-                                       goto no_write_space;
-                               goto repeat;
-                       }
-               }
-#if CONFIG_TUX_DEBUG
-               if (req->desc.written != want)
-                       TDprintk("TUX: sendfile() wrote %d bytes, wanted %d! (pos %Ld) (signals pending: %08lx).\n", req->desc.written, want, req->in_file.f_pos, current->pending.signal.sig[0]);
-               else
-                       Dprintk("TUX: sendfile() FINISHED for req %p, wrote %d bytes.\n", req, req->desc.written);
-               req->bytes_expected = 0;
-#endif
-               break;
-       }
-
-out:
-       Dprintk("sendfile() wrote %d bytes.\n", len);
-
-       return len;
-}
-
-static int file_fetch_actor (read_descriptor_t * desc, struct page *page,
-                               unsigned long offset, unsigned long size)
-{
-       if (desc->count < size)
-               size = desc->count;
-
-       desc->count -= size;
-       desc->written += size;
-
-       return size;
-}
-
-int tux_fetch_file (tux_req_t *req, int nonblock)
-{
-       int len;
-
-       req->desc.written = 0;
-       req->desc.count = req->output_len;
-       req->desc.buf = NULL;
-       req->desc.error = 0;
-
-       do_generic_file_read(&req->in_file, &req->in_file.f_pos, &req->desc,
-                                       file_fetch_actor, nonblock);
-       if (nonblock && (req->desc.error == -EWOULDBLOCKIO))
-               return 1;
-       len = req->desc.written;
-       if (req->desc.error)
-               Dprintk("fetchfile() returned %d error!\n", req->desc.error);
-       Dprintk("fetchfile() fetched %d bytes.\n", len);
-       return 0;
-}
-
diff --git a/net/tux/parser.h b/net/tux/parser.h
deleted file mode 100644 (file)
index f355c1e..0000000
+++ /dev/null
@@ -1,102 +0,0 @@
-/*
- * TUX - Integrated Application Protocols Layer and Object Cache
- *
- * Copyright (C) 2000, Ingo Molnar <mingo@redhat.com>
- *
- * parser.h: generic parsing routines
- */
-
-#define get_c(ptr,left)                                                \
-({                                                             \
-       char __ret;                                     \
-                                                               \
-       if (!left)                                              \
-               GOTO_INCOMPLETE;                                \
-       left--;                                                 \
-       __ret = *((ptr)++);                                     \
-       if (!__ret)                                             \
-               GOTO_REDIR;                                     \
-       __ret;                                                  \
-})
-
-#define PARSE_TOKEN(ptr,str,left)                              \
-       ({                                                      \
-               int __ret;                                      \
-                                                               \
-               if (!left)                                      \
-                       GOTO_INCOMPLETE;                        \
-               if (sizeof(str)-1 > left) {                     \
-                       if (memcmp(ptr, str, left))             \
-                               GOTO_REDIR;                     \
-                       GOTO_INCOMPLETE;                        \
-               }                                               \
-                                                               \
-               if (memcmp(ptr, str, sizeof(str)-1))            \
-                       __ret = 0;                              \
-               else {                                          \
-                       ptr += sizeof(str)-1;                   \
-                       left -= sizeof(str)-1;                  \
-                       __ret = 1;                              \
-               }                                               \
-               __ret;                                          \
-       })
-
-#define PARSE_METHOD(req,ptr,name,left)                                \
-       ({                                                      \
-               int __ret;                                      \
-                                                               \
-               if (PARSE_TOKEN(ptr,#name" ",left)) {           \
-                       req->method = METHOD_##name;            \
-                       __ret = 1;                              \
-               } else                                          \
-                       __ret = 0;                              \
-               __ret;                                          \
-       })
-
-#define COPY_LINE(ptr,target,left)                             \
-       do {                                                    \
-               char prev_c = 0, c;                             \
-               while (((c = get_c(ptr,left))) != '\n') \
-                       *target++ = prev_c = c;                 \
-               if (prev_c != '\r')                             \
-                       GOTO_REDIR;                             \
-       } while (0)
-
-#define COPY_LINE_TOLOWER(ptr,target,left,limit)               \
-       do {                                                    \
-               char prev_c = 0, c;                             \
-               while (((c = get_c(ptr,left))) != '\n') {       \
-                       if ((c >= 'A') && (c <= 'Z'))           \
-                               c -= 'A'-'a';                   \
-                       *target++ = prev_c = c;                 \
-                       if (target == (limit))                  \
-                               GOTO_REDIR;                     \
-               }                                               \
-               if (prev_c != '\r')                             \
-                       GOTO_REDIR;                             \
-       } while (0)
-
-#define COPY_FIELD(ptr,target,left)                            \
-       do {                                                    \
-               char c;                                         \
-               while ((c = get_c(ptr,left)) != ' ')            \
-                       *target++ = c;                          \
-       } while (0)
-
-#define SKIP_LINE(ptr,left)                                    \
-       do {                                                    \
-               char prev_c = 0, c;                             \
-               while (((c = get_c(ptr,left))) != '\n')         \
-                       prev_c = c;                             \
-               if (prev_c != '\r')                             \
-                       GOTO_REDIR;                             \
-       } while (0)
-
-#define SKIP_WHITESPACE(curr,left)             \
-do {                                           \
-       while ((left) && (*(curr) == ' '))      \
-               (curr)++, (left)--;             \
-       if (!(left))                            \
-               GOTO_REDIR;                     \
-} while (0)
-
diff --git a/net/tux/postpone.c b/net/tux/postpone.c
deleted file mode 100644 (file)
index d4a693b..0000000
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
- * TUX - Integrated Application Protocols Layer and Object Cache
- *
- * Copyright (C) 2000, 2001, Ingo Molnar <mingo@redhat.com>
- *
- * postpone.c: postpone/continue userspace requests
- */
-
-#include <net/tux.h>
-
-/****************************************************************
- *      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, 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.
- *
- ****************************************************************/
-
-void postpone_request (tux_req_t *req)
-{
-       if (!req->usermode)
-               TUX_BUG();
-       INC_STAT(nr_postpone_pending);
-       req->postponed = 1;
-}
-
-/*
- * Continue a postponed request. The request will show up in the
- * userspace queue and will be handled by the fast thread.
- * A request can only be postponed in a TUX process, but can be
- * continued from any process that has access to the socket file
- * descriptor.
- */
-int continue_request (int fd)
-{
-       threadinfo_t *ti;
-       struct socket *sock;
-       tux_req_t *req;
-       int err;
-
-       sock = sockfd_lookup(fd, &err);
-       if (!sock || !sock->sk)
-               goto out;
-       req = sock->sk->sk_user_data;
-
-       err = -EINVAL;
-       if (!req)
-               goto out_put;
-       ti = req->ti;
-       if (!req->postponed)
-               goto out_unlock_put;
-       if (!req->usermode)
-               TUX_BUG();
-
-       req->postponed = 0;
-       DEC_STAT(nr_postpone_pending);
-
-       Dprintk("continuing postponed req %p.\n", req);
-       add_req_to_workqueue(req);
-
-out_unlock_put:
-       err = 0;
-out_put:
-       fput(sock->file);
-out:
-       return err;
-}
-
diff --git a/net/tux/proc.c b/net/tux/proc.c
deleted file mode 100644 (file)
index 2973a48..0000000
+++ /dev/null
@@ -1,1190 +0,0 @@
-/*
- * TUX - Integrated Application Protocols Layer and Object Cache
- *
- * Copyright (C) 2000, 2001, Ingo Molnar <mingo@redhat.com>
- *
- * proc.c: /proc/sys/tux handling
- */
-
-#include <net/tux.h>
-
-/****************************************************************
- *      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, 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.
- *
- ****************************************************************/
-
-char tux_common_docroot[200] = "/var/www/tux/";
-char tux_http_subdocroot[200] = "";
-char tux_ftp_subdocroot[200] = "";
-char tux_logfile[200] = "/var/log/tux";
-char tux_cgiroot[200] = "/var/www/tux/cgiroot/";
-char tux_404_page[200] = "404.html";
-char tux_default_vhost[200] = "default";
-char tux_extra_html_header[600];
-unsigned int tux_extra_html_header_size = 0;
-
-int tux_cgi_uid = -1;
-int tux_cgi_gid = -1;
-unsigned int tux_clientport = 8080;
-unsigned int tux_logging = 0;
-unsigned int tux_threads = 2;
-unsigned int tux_max_connect = 10000;
-unsigned int tux_max_keepalives = 10000;
-unsigned int tux_max_backlog = 2048;
-unsigned int tux_keepalive_timeout = 0;
-unsigned int tux_max_output_bandwidth = 0;
-unsigned int tux_defer_accept = 1;
-unsigned int tux_mode_forbidden = 0 /*S_IXUGO*/; /* do not allow executable (CGI) files */
-unsigned int tux_mode_allowed = S_IROTH; /* allow access if read-other is set */
-unsigned int tux_virtual_server = 0;
-unsigned int tux_ftp_virtual_server = 0;
-unsigned int mass_hosting_hash = 0;
-unsigned int strip_host_tail = 0;
-unsigned int tux_max_object_size = 0;
-unsigned int log_cpu_mask = ~0;
-unsigned int tux_compression = 0;
-unsigned int tux_noid = 0;
-unsigned int tux_cgi_inherit_cpu = 0;
-unsigned int tux_cgi_cpu_mask = ~0;
-unsigned int tux_zerocopy_header = 1;
-unsigned int tux_max_free_requests = 1000;
-unsigned int tux_ignore_query = 0;
-unsigned int tux_all_userspace = 0;
-unsigned int tux_redirect_logging = 1;
-unsigned int tux_max_header_len = 3000;
-unsigned int tux_referer_logging = 0;
-unsigned int tux_generate_etags = 1;
-unsigned int tux_generate_last_mod = 1;
-unsigned int tux_generate_cache_control = 1;
-unsigned int tux_ip_logging = 1;
-unsigned int tux_ftp_wait_close = 1;
-unsigned int tux_ftp_log_retr_only = 0;
-unsigned int tux_hide_unreadable = 1;
-unsigned int tux_http_dir_indexing = 0;
-unsigned int tux_log_incomplete = 0;
-unsigned int tux_cpu_offset = 0;
-unsigned int tux_ftp_login_message = 0;
-
-static struct ctl_table_header *tux_table_header;
-
-static ctl_table tux_table[] = {
-       {       NET_TUX_DOCROOT,
-               "documentroot",
-               &tux_common_docroot,
-               sizeof(tux_common_docroot),
-               0644,
-               NULL,
-               proc_dostring,
-               &sysctl_string,
-               NULL,
-               NULL,
-               NULL
-       },
-       {       NET_TUX_DOCROOT,
-               "http_subdocroot",
-               &tux_http_subdocroot,
-               sizeof(tux_http_subdocroot),
-               0644,
-               NULL,
-               proc_dostring,
-               &sysctl_string,
-               NULL,
-               NULL,
-               NULL
-       },
-       {       NET_TUX_DOCROOT,
-               "ftp_subdocroot",
-               &tux_ftp_subdocroot,
-               sizeof(tux_ftp_subdocroot),
-               0644,
-               NULL,
-               proc_dostring,
-               &sysctl_string,
-               NULL,
-               NULL,
-               NULL
-       },
-       {       NET_TUX_LOGFILE,
-               "logfile",
-               &tux_logfile,
-               sizeof(tux_logfile),
-               0644,
-               NULL,
-               proc_dostring,
-               &sysctl_string,
-               NULL,
-               NULL,
-               NULL
-       },
-       {       NET_TUX_THREADS,
-               "threads",
-               &tux_threads,
-               sizeof(int),
-               0644,
-               NULL,
-               proc_dointvec,
-               &sysctl_intvec,
-               NULL,
-               NULL,
-               NULL
-       },
-       {       NET_TUX_KEEPALIVE_TIMEOUT,
-               "keepalive_timeout",
-               &tux_keepalive_timeout,
-               sizeof(int),
-               0644,
-               NULL,
-               proc_dointvec,
-               &sysctl_intvec,
-               NULL,
-               NULL,
-               NULL
-       },
-       {       NET_TUX_MAX_KEEPALIVE_BW,
-               "max_output_bandwidth",
-               &tux_max_output_bandwidth,
-               sizeof(int),
-               0644,
-               NULL,
-               proc_dointvec,
-               &sysctl_intvec,
-               NULL,
-               NULL,
-               NULL
-       },
-       {       NET_TUX_DEFER_ACCEPT,
-               "defer_accept",
-               &tux_defer_accept,
-               sizeof(int),
-               0644,
-               NULL,
-               proc_dointvec,
-               &sysctl_intvec,
-               NULL,
-               NULL,
-               NULL
-       },
-       {       NET_TUX_MAX_BACKLOG,
-               "max_backlog",
-               &tux_max_backlog,
-               sizeof(int),
-               0644,
-               NULL,
-               proc_dointvec,
-               &sysctl_intvec,
-               NULL,
-               NULL,
-               NULL
-       },
-       {       NET_TUX_MAX_CONNECT,
-               "max_connect",
-               &tux_max_connect,
-               sizeof(int),
-               0644,
-               NULL,
-               proc_dointvec,
-               &sysctl_intvec,
-               NULL,
-               NULL,
-               NULL
-       },
-       {       NET_TUX_MAX_KEEPALIVES,
-               "max_keepalives",
-               &tux_max_keepalives,
-               sizeof(int),
-               0644,
-               NULL,
-               proc_dointvec,
-               &sysctl_intvec,
-               NULL,
-               NULL,
-               NULL
-       },
-       {       NET_TUX_MODE_FORBIDDEN,
-               "mode_forbidden",
-               &tux_mode_forbidden,
-               sizeof(int),
-               0644,
-               NULL,
-               proc_dointvec,
-               &sysctl_intvec,
-               NULL,
-               NULL,
-               NULL
-       },
-       {       NET_TUX_MODE_ALLOWED,
-               "mode_allowed",
-               &tux_mode_allowed,
-               sizeof(int),
-               0644,
-               NULL,
-               proc_dointvec,
-               &sysctl_intvec,
-               NULL,
-               NULL,
-               NULL
-       },
-       {       NET_TUX_CGI_UID,
-               "cgi_uid",
-               &tux_cgi_uid,
-               sizeof(int),
-               0644,
-               NULL,
-               proc_dointvec,
-               &sysctl_intvec,
-               NULL,
-               NULL,
-               NULL
-       },
-       {       NET_TUX_CGI_GID,
-               "cgi_gid",
-               &tux_cgi_gid,
-               sizeof(int),
-               0644,
-               NULL,
-               proc_dointvec,
-               &sysctl_intvec,
-               NULL,
-               NULL,
-               NULL
-       },
-       {       NET_TUX_CGIROOT,
-               "cgiroot",
-               &tux_cgiroot,
-               sizeof(tux_cgiroot),
-               0644,
-               NULL,
-               proc_dostring,
-               &sysctl_string,
-               NULL,
-               NULL,
-               NULL
-       },
-       {       NET_TUX_404_PAGE,
-               "404_page",
-               &tux_404_page,
-               sizeof(tux_404_page),
-               0644,
-               NULL,
-               proc_dostring,
-               &sysctl_string,
-               NULL,
-               NULL,
-               NULL
-       },
-       {       NET_TUX_404_PAGE,
-               "default_vhost",
-               &tux_default_vhost,
-               sizeof(tux_default_vhost),
-               0644,
-               NULL,
-               proc_dostring,
-               &sysctl_string,
-               NULL,
-               NULL,
-               NULL
-       },
-       {       NET_TUX_404_PAGE,
-               "extra_html_header",
-               &tux_extra_html_header,
-               sizeof(tux_extra_html_header),
-               0644,
-               NULL,
-               proc_dostring,
-               &sysctl_string,
-               NULL,
-               NULL,
-               NULL
-       },
-       {       NET_TUX_CLIENTPORT,
-               "extra_html_header_size",
-               &tux_extra_html_header_size,
-               sizeof(int),
-               0644,
-               NULL,
-               proc_dointvec,
-               &sysctl_intvec,
-               NULL,
-               NULL,
-               NULL
-       },
-       {       NET_TUX_CLIENTPORT,
-               "clientport",
-               &tux_clientport,
-               sizeof(int),
-               0644,
-               NULL,
-               proc_dointvec,
-               &sysctl_intvec,
-               NULL,
-               NULL,
-               NULL
-       },
-       {       NET_TUX_CLIENTPORT,
-               "generate_etags",
-               &tux_generate_etags,
-               sizeof(int),
-               0644,
-               NULL,
-               proc_dointvec,
-               &sysctl_intvec,
-               NULL,
-               NULL,
-               NULL
-       },
-        {       NET_TUX_CLIENTPORT,
-                "generate_last_mod",
-                &tux_generate_last_mod,
-                sizeof(int),
-                0644,
-                NULL,
-                proc_dointvec,
-                &sysctl_intvec,
-                NULL,
-                NULL,
-                NULL
-        },
-        {       NET_TUX_CLIENTPORT,
-                "generate_cache_control",
-                &tux_generate_cache_control,
-                sizeof(int),
-                0644,
-                NULL,
-                proc_dointvec,
-                &sysctl_intvec,
-                NULL,
-                NULL,
-                NULL
-        },
-       {       NET_TUX_CLIENTPORT,
-               "ip_logging",
-               &tux_ip_logging,
-               sizeof(int),
-               0644,
-               NULL,
-               proc_dointvec,
-               &sysctl_intvec,
-               NULL,
-               NULL,
-               NULL
-       },
-       {       NET_TUX_CLIENTPORT,
-               "ftp_wait_close",
-               &tux_ftp_wait_close,
-               sizeof(int),
-               0644,
-               NULL,
-               proc_dointvec,
-               &sysctl_intvec,
-               NULL,
-               NULL,
-               NULL
-       },
-       {       NET_TUX_CLIENTPORT,
-               "ftp_log_retr_only",
-               &tux_ftp_log_retr_only,
-               sizeof(int),
-               0644,
-               NULL,
-               proc_dointvec,
-               &sysctl_intvec,
-               NULL,
-               NULL,
-               NULL
-       },
-       {       NET_TUX_CLIENTPORT,
-               "http_dir_indexing",
-               &tux_http_dir_indexing,
-               sizeof(int),
-               0644,
-               NULL,
-               proc_dointvec,
-               &sysctl_intvec,
-               NULL,
-               NULL,
-               NULL
-       },
-       {       NET_TUX_CLIENTPORT,
-               "hide_unreadable",
-               &tux_hide_unreadable,
-               sizeof(int),
-               0644,
-               NULL,
-               proc_dointvec,
-               &sysctl_intvec,
-               NULL,
-               NULL,
-               NULL
-       },
-       {       NET_TUX_CLIENTPORT,
-               "log_incomplete",
-               &tux_log_incomplete,
-               sizeof(int),
-               0644,
-               NULL,
-               proc_dointvec,
-               &sysctl_intvec,
-               NULL,
-               NULL,
-               NULL
-       },
-       {       NET_TUX_LOGGING,
-               "TDprintk",
-               &tux_TDprintk,
-               sizeof(int),
-               0644,
-               NULL,
-               proc_dointvec,
-               &sysctl_intvec,
-               NULL,
-               NULL,
-               NULL
-       },
-       {       NET_TUX_LOGGING,
-               "Dprintk",
-               &tux_Dprintk,
-               sizeof(int),
-               0644,
-               NULL,
-               proc_dointvec,
-               &sysctl_intvec,
-               NULL,
-               NULL,
-               NULL
-       },
-#if TUX_DPRINTK
-#endif
-       {       NET_TUX_LOGGING,
-               "logging",
-               &tux_logging,
-               sizeof(int),
-               0644,
-               NULL,
-               proc_dointvec,
-               &sysctl_intvec,
-               NULL,
-               NULL,
-               NULL
-       },
-       {       NET_TUX_LOGENTRY_ALIGN_ORDER,
-               "logentry_align_order",
-               &tux_logentry_align_order,
-               sizeof(int),
-               0644,
-               NULL,
-               proc_dointvec,
-               &sysctl_intvec,
-               NULL,
-               NULL,
-               NULL
-       },
-       {       NET_TUX_ACK_PINGPONG,
-               "ack_pingpong",
-               &tux_ack_pingpong,
-               sizeof(int),
-               0644,
-               NULL,
-               proc_dointvec,
-               &sysctl_intvec,
-               NULL,
-               NULL,
-               NULL
-       },
-       {       NET_TUX_PUSH_ALL,
-               "push_all",
-               &tux_push_all,
-               sizeof(int),
-               0644,
-               NULL,
-               proc_dointvec,
-               &sysctl_intvec,
-               NULL,
-               NULL,
-               NULL
-       },
-       {       NET_TUX_ZEROCOPY_PARSE,
-               "zerocopy_parse",
-               &tux_zerocopy_parse,
-               sizeof(int),
-               0644,
-               NULL,
-               proc_dointvec,
-               &sysctl_intvec,
-               NULL,
-               NULL,
-               NULL
-       },
-       {       NET_TUX_VIRTUAL_SERVER,
-               "virtual_server",
-               &tux_virtual_server,
-               sizeof(int),
-               0644,
-               NULL,
-               proc_dointvec,
-               &sysctl_intvec,
-               NULL,
-               NULL,
-               NULL
-       },
-       {       NET_TUX_VIRTUAL_SERVER,
-               "mass_hosting_hash",
-               &mass_hosting_hash,
-               sizeof(int),
-               0644,
-               NULL,
-               proc_dointvec,
-               &sysctl_intvec,
-               NULL,
-               NULL,
-               NULL
-       },
-       {       NET_TUX_VIRTUAL_SERVER,
-               "strip_host_tail",
-               &strip_host_tail,
-               sizeof(int),
-               0644,
-               NULL,
-               proc_dointvec,
-               &sysctl_intvec,
-               NULL,
-               NULL,
-               NULL
-       },
-       {       NET_TUX_VIRTUAL_SERVER,
-               "ftp_virtual_server",
-               &tux_ftp_virtual_server,
-               sizeof(int),
-               0644,
-               NULL,
-               proc_dointvec,
-               &sysctl_intvec,
-               NULL,
-               NULL,
-               NULL
-       },
-       {       NET_TUX_MAX_OBJECT_SIZE,
-               "max_object_size",
-               &tux_max_object_size,
-               sizeof(int),
-               0644,
-               NULL,
-               proc_dointvec,
-               &sysctl_intvec,
-               NULL,
-               NULL,
-               NULL
-       },
-       {       NET_TUX_COMPRESSION,
-               "compression",
-               &tux_compression,
-               sizeof(int),
-               0644,
-               NULL,
-               proc_dointvec,
-               &sysctl_intvec,
-               NULL,
-               NULL,
-               NULL
-       },
-       {       NET_TUX_NOID,
-               "noid",
-               &tux_noid,
-               sizeof(int),
-               0644,
-               NULL,
-               proc_dointvec,
-               &sysctl_intvec,
-               NULL,
-               NULL,
-               NULL
-       },
-       {       NET_TUX_CGI_INHERIT_CPU,
-               "cgi_inherit_cpu",
-               &tux_cgi_inherit_cpu,
-               sizeof(int),
-               0644,
-               NULL,
-               proc_dointvec,
-               &sysctl_intvec,
-               NULL,
-               NULL,
-               NULL
-       },
-       {       NET_TUX_CGI_CPU_MASK,
-               "cgi_cpu_mask",
-               &tux_cgi_cpu_mask,
-               sizeof(int),
-               0644,
-               NULL,
-               proc_dointvec,
-               &sysctl_intvec,
-               NULL,
-               NULL,
-               NULL
-       },
-       {       NET_TUX_ZEROCOPY_HEADER,
-               "zerocopy_header",
-               &tux_zerocopy_header,
-               sizeof(int),
-               0644,
-               NULL,
-               proc_dointvec,
-               &sysctl_intvec,
-               NULL,
-               NULL,
-               NULL
-       },
-       {       NET_TUX_ZEROCOPY_SENDFILE,
-               "zerocopy_sendfile",
-               &tux_zerocopy_sendfile,
-               sizeof(int),
-               0644,
-               NULL,
-               proc_dointvec,
-               &sysctl_intvec,
-               NULL,
-               NULL,
-               NULL
-       },
-       {       NET_TUX_MAX_FREE_REQUESTS,
-               "max_free_requests",
-               &tux_max_free_requests,
-               sizeof(int),
-               0644,
-               NULL,
-               proc_dointvec,
-               &sysctl_intvec,
-               NULL,
-               NULL,
-               NULL
-       },
-       {       NET_TUX_ALL_USERSPACE,
-               "all_userspace",
-               &tux_all_userspace,
-               sizeof(int),
-               0644,
-               NULL,
-               proc_dointvec,
-               &sysctl_intvec,
-               NULL,
-               NULL,
-               NULL
-       },
-       {       NET_TUX_REDIRECT_LOGGING,
-               "redirect_logging",
-               &tux_redirect_logging,
-               sizeof(int),
-               0644,
-               NULL,
-               proc_dointvec,
-               &sysctl_intvec,
-               NULL,
-               NULL,
-               NULL
-       },
-       {       NET_TUX_IGNORE_QUERY,
-               "ignore_query",
-               &tux_ignore_query,
-               sizeof(int),
-               0644,
-               NULL,
-               proc_dointvec,
-               &sysctl_intvec,
-               NULL,
-               NULL,
-               NULL
-       },
-       {       NET_TUX_REFERER_LOGGING,
-               "referer_logging",
-               &tux_referer_logging,
-               sizeof(int),
-               0644,
-               NULL,
-               proc_dointvec,
-               &sysctl_intvec,
-               NULL,
-               NULL,
-               NULL
-       },
-       {       NET_TUX_REFERER_LOGGING,
-               "cpu_offset",
-               &tux_cpu_offset,
-               sizeof(int),
-               0644,
-               NULL,
-               proc_dointvec,
-               &sysctl_intvec,
-               NULL,
-               NULL,
-               NULL
-       },
-       {       NET_TUX_REFERER_LOGGING,
-               "ftp_login_message",
-               &tux_ftp_login_message,
-               sizeof(int),
-               0644,
-               NULL,
-               proc_dointvec,
-               &sysctl_intvec,
-               NULL,
-               NULL,
-               NULL
-       },
-       {       NET_TUX_MAX_HEADER_LEN,
-               "max_header_len",
-               &tux_max_header_len,
-               sizeof(int),
-               0644,
-               NULL,
-               proc_dointvec,
-               &sysctl_intvec,
-               NULL,
-               NULL,
-               NULL
-       },
-       {0,0,0,0,0,0,0,0,0,0,0} };
-       
-       
-static ctl_table tux_dir_table[] = {
-       {NET_TUX, "tux", NULL, 0, 0555, tux_table,0,0,0,0,0},
-       {0,0,0,0,0,0,0,0,0,0,0}
-};
-
-static ctl_table tux_root_table[] = {
-       {CTL_NET, "net", NULL, 0, 0555, tux_dir_table,0,0,0,0,0},
-       {0,0,0,0,0,0,0,0,0,0,0}
-};
-
-
-static struct proc_dir_entry * root_tux_dir;
-static struct proc_dir_entry * log_cpu_mask_entry;
-static struct proc_dir_entry * stat_entry;
-static struct proc_dir_entry * tux_dir [CONFIG_TUX_NUMTHREADS];
-static struct proc_dir_entry * listen_dir [CONFIG_TUX_NUMTHREADS];
-
-tux_socket_t tux_listen [CONFIG_TUX_NUMTHREADS][CONFIG_TUX_NUMSOCKETS] =
- { [0 ... CONFIG_TUX_NUMTHREADS-1] = { {&tux_proto_http, 0, 80, NULL}, } };
-
-#define HEX_DIGITS 8
-
-static int hex_read_proc (char *page, char **start, off_t off,
-                       int count, int *eof, void *data)
-{
-       if (count < HEX_DIGITS+1)
-               return -EINVAL;
-       return sprintf (page, "%08x\n", *(unsigned int *)data);
-}
-
-static int hex_write_proc (struct file *file, const char *buffer,
-                                       unsigned long count, void *data)
-{
-       char hexnum [HEX_DIGITS];
-       unsigned int new_value;
-       unsigned int i, full_count = count;
-
-       if (!count)
-               return -EINVAL;
-       if (count > HEX_DIGITS)
-               count = HEX_DIGITS;
-       if (copy_from_user(hexnum, buffer, count))
-               return -EFAULT;
-
-       /*
-        * Parse the first 8 characters as a hex string, any non-hex char
-        * is end-of-string. '00e1', 'e1', '00E1', 'E1' are the same.
-        */
-       new_value = 0;
-
-       for (i = 0; i < count; i++) {
-               unsigned int c = hexnum[i];
-
-               switch (c) {
-                       case '0' ... '9': c -= '0'; break;
-                       case 'a' ... 'f': c -= 'a'-10; break;
-                       case 'A' ... 'F': c -= 'A'-10; break;
-               default:
-                       goto out;
-               }
-               new_value = (new_value << 4) | c;
-       }
-out:
-       *(int *)data = new_value;
-
-       return full_count;
-}
-
-#define LINE_SIZE 1024
-#define LINE_MASK (LINE_SIZE-1)
-
-static int print_request_stats (threadinfo_t *ti, char *page, unsigned int skip_count, unsigned int max_count)
-{
-       struct list_head *head, *curr;
-       tux_req_t *req;
-       unsigned int count = 0, size, line_off, len;
-       char stat_line [LINE_SIZE];
-
-       if (!max_count)
-               BUG();
-
-       head = &ti->all_requests;
-       curr = head->next;
-
-       while (curr != head) {
-               req = list_entry(curr, tux_req_t, all);
-               curr = curr->next;
-               count++;
-               if (count <= skip_count)
-                       continue;
-               line_off = 0;
-#define SP(x...) \
-       line_off += sprintf(stat_line + line_off, x)
-
-               if (req->proto == &tux_proto_http)
-                       SP("0 ");
-               else
-                       SP("1 ");
-       
-               SP("%p ", req);
-               SP("%d ", req->atom_idx);
-               if (req->atom_idx >= 1)
-                       SP("%p ", req->atoms[0]);
-               else
-                       SP("........ ");
-               if (req->atom_idx >= 2)
-                       SP("%p ", req->atoms[1]);
-               else
-                       SP("........ ");
-               if (!list_empty(&req->work))    SP("W");        else SP(".");
-               if (!list_empty(&req->free))    SP("F");        else SP(".");
-               if (!list_empty(&req->lru))     SP("L");        else SP(".");
-               if (req->keep_alive)            SP("K");        else SP(".");
-               if (req->idle_input)            SP("I");        else SP(".");
-               if (timer_pending(&req->keepalive_timer))
-                                               SP("T(%lu/%lu)",jiffies,req->keepalive_timer.expires);  else SP(".");
-               if (req->wait_output_space)     SP("O");        else SP(".");
-               if (timer_pending(&req->output_timer))
-                                               SP("T");        else SP(".");
-               SP(" %d ", req->error);
-               SP(" %d ", req->status);
-
-#define SP_HOST(ip,port) \
-               SP("%d.%d.%d.%d:%d ",NIPQUAD(ip),port)
-
-               if (req->sock) {
-                       if (req->sock->sk)
-                               SP("%d:", req->sock->sk->sk_state);
-                       else
-                               SP("-2:");
-               } else
-                       SP("-1:");
-               SP_HOST(req->client_addr, req->client_port);
-
-               SP("%Ld ", req->total_file_len);
-               SP("%Ld ", req->in_file.f_pos);
-               if (req->proto == &tux_proto_http) {
-                       SP("%d ", req->method);
-                       SP("%d ", req->version);
-               }
-               if (req->proto == &tux_proto_ftp) {
-                       SP("%d ", req->ftp_command);
-                       if (req->data_sock) {
-                               if (req->data_sock->sk)
-                                       SP("%d:",req->data_sock->sk->sk_state);
-                               else
-                                       SP("-2:");
-                               if (req->data_sock->sk)
-                                       SP_HOST(inet_sk(req->data_sock->sk)->daddr,
-                                               inet_sk(req->data_sock->sk)->dport);
-                               else
-                                       SP("-1:-1 ");
-                       } else
-                               SP("-1 ");
-               }
-               SP("%p/%p %p/%p ", req->sock, req->sock ? req->sock->sk : (void *)-1, req->data_sock, req->data_sock ? req->data_sock->sk : (void *)-1);
-
-               SP("%d\n", req->parsed_len);
-               len = req->headers_len;
-               if (len > 500)
-                       len = 500;
-               SP("\n%d\n", len);
-               memcpy(stat_line + line_off, req->headers, len);
-               line_off += len;
-               len = req->objectname_len;
-               if (len > 100)
-                       len = 100;
-               SP("\n%d\n", len);
-               memcpy(stat_line + line_off, req->objectname, len);
-               line_off += len;
-               SP("\n\n<END>");
-               if (line_off >= LINE_SIZE)
-                       BUG();
-               Dprintk("printing req %p, count %d, page %p: {%s}.\n", req, count, page, stat_line);
-               size = sprintf(page, "%-*s\n", LINE_SIZE-1, stat_line);
-               if (size != LINE_SIZE)
-                       BUG();
-               page += LINE_SIZE;
-               if (count-skip_count >= max_count)
-                       break;
-       }
-
-       Dprintk("count: %d.\n", count-skip_count);
-       return count - skip_count;
-}
-
-static int stat_read_proc (char *page, char **start, off_t off,
-                       int max_size, int *eof, void *data)
-{
-       unsigned int i, nr_total = 0, nr, nr_off, nr_skip, size = 0, nr_wanted;
-
-       Dprintk("START, page: %p, max_size: %d, off: %ld.\n", page, max_size, off);
-       *eof = 1;
-       if (max_size & LINE_MASK)
-               return 0;
-       if (off & LINE_MASK)
-               return 0;
-       if (!max_size)
-               return 0;
-
-       nr_off = off/LINE_SIZE;
-
-       for (i = 0; i < nr_tux_threads; i++) {
-               threadinfo_t *ti = threadinfo + i;
-               spin_lock_irq(&ti->work_lock);
-               nr = ti->nr_requests;
-               Dprintk("ti: %p, nr: %d, nr_total: %d, nr_off: %d.\n", ti, nr, nr_total, nr_off);
-               nr_total += nr;
-               if (nr_off >= nr_total) {
-                       spin_unlock_irq(&ti->work_lock);
-                       continue;
-               }
-               nr_skip = nr_off - (nr_total - nr);
-               nr_wanted = (max_size-size) / LINE_SIZE;
-               Dprintk("nr_skip: %d, nr_wanted: %d.\n", nr_skip, nr_wanted);
-               nr = print_request_stats(ti, page + size, nr_skip, nr_wanted);
-               spin_unlock_irq(&ti->work_lock);
-               nr_off += nr;
-               size += nr * LINE_SIZE;
-               Dprintk("ret: %d requests, size: %d.\n", nr, size);
-               if (size > max_size)
-                       BUG();
-               if (size == max_size)
-                       break;
-       }
-       Dprintk("DONE: size: %d.\n", size);
-
-       *start = page;
-
-       if (size)
-               *eof = 0;
-       return size;
-}
-
-static int stat_write_proc (struct file *file, const char *buffer,
-                                       unsigned long count, void *data)
-{
-       return -EINVAL;
-}
-
-#define MAX_STRING "http://255.255.255.255:65535"
-#define MAX_STRINGLEN (sizeof(MAX_STRING))
-
-#define INACTIVE_1 "[inactive]\n"
-#define INACTIVE_2 "0\n"
-
-static int listen_read_proc (char *page, char **start, off_t off,
-                       int count, int *eof, void *data)
-{
-       tux_socket_t *listen = data;
-
-       if (count < MAX_STRINGLEN)
-               return -EINVAL;
-
-       if (!listen->proto)
-               return sprintf(page, INACTIVE_1);
-
-       return sprintf (page, "%s://%u.%u.%u.%u:%hu\n", listen->proto->name,
-                       HIPQUAD(listen->ip), listen->port);
-}
-
-static int listen_write_proc (struct file *file, const char *buffer,
-                                       unsigned long count, void *data)
-{
-       char string [MAX_STRINGLEN];
-       unsigned int d1, d2, d3, d4;
-       unsigned short port;
-       tux_socket_t *listen = data;
-
-       if (!count)
-               return -EINVAL;
-       if (count > MAX_STRINGLEN)
-               count = MAX_STRINGLEN;
-       if (copy_from_user(string, buffer, count))
-               return -EFAULT;
-       string[count] = 0;
-
-       if (!strcmp(string, INACTIVE_1) || !strcmp(string, INACTIVE_2)) {
-               listen->proto = NULL;
-               listen->ip = 0;
-               listen->port = 0;
-               return count;
-       }
-
-#define MK_IP(a,b,c,d) ((a << 24) | (b << 16) | (c << 8) | d)
-
-        if (sscanf(string, "http://%u.%u.%u.%u:%hu\n",
-                                       &d1, &d2, &d3, &d4, &port) == 5) {
-               listen->ip = MK_IP(d1,d2,d3,d4);
-               listen->port = port;
-               listen->proto = &tux_proto_http;
-               return count;
-       }
-               
-        if (sscanf(string, "ftp://%u.%u.%u.%u:%hu\n",
-                                       &d1, &d2, &d3, &d4, &port) == 5) {
-               listen->ip = MK_IP(d1,d2,d3,d4);
-               listen->port = port;
-               listen->proto = &tux_proto_ftp;
-               return count;
-       }
-       printk(KERN_ERR "tux: invalid listen-socket parameters: %s\n", string);
-       return -EINVAL;
-}
-
-#define MAX_NAMELEN 10
-
-static void register_tux_proc (unsigned int nr)
-{
-       struct proc_dir_entry *entry;
-       char name [MAX_NAMELEN];
-       int i;
-
-       if (!root_tux_dir)
-               TUX_BUG();
-
-       sprintf(name, "%d", nr);
-
-       /* create /proc/net/tux/1234/ */
-       tux_dir[nr] = proc_mkdir(name, root_tux_dir);
-
-       /* create /proc/net/tux/1234/listen/ */
-       listen_dir[nr] = proc_mkdir("listen", tux_dir[nr]);
-
-       /* create /proc/net/tux/1234/listen/ */
-       for (i = 0; i < CONFIG_TUX_NUMSOCKETS; i++) {
-               sprintf(name, "%d", i);
-               entry = create_proc_entry(name, 0700, listen_dir[nr]);
-
-               entry->nlink = 1;
-               entry->data = (void *)(tux_listen[nr] + i);
-               entry->read_proc = listen_read_proc;
-               entry->write_proc = listen_write_proc;
-               tux_listen[nr][i].entry = entry;
-       }
-}
-
-static void unregister_tux_proc (unsigned int nr)
-{
-       int i;
-
-       for (i = 0; i < CONFIG_TUX_NUMSOCKETS; i++) {
-               remove_proc_entry(tux_listen[nr][i].entry->name,listen_dir[nr]);
-               tux_listen[nr][i].entry = NULL;
-       }
-
-       remove_proc_entry(listen_dir[nr]->name, tux_dir[nr]);
-
-       remove_proc_entry(tux_dir[nr]->name, root_tux_dir);
-}
-
-static void cleanup_tux_proc (void)
-{
-       int i;
-
-       Dprintk("cleaning up /proc/net/tux/\n");
-
-       for (i = 0; i < CONFIG_TUX_NUMTHREADS; i++)
-               unregister_tux_proc(i);
-       remove_proc_entry(stat_entry->name, root_tux_dir);
-       remove_proc_entry(log_cpu_mask_entry->name, root_tux_dir);
-       remove_proc_entry(root_tux_dir->name, proc_net);
-}
-
-static void init_tux_proc (void)
-{
-       struct proc_dir_entry *entry;
-       int i;
-
-       if (root_tux_dir)
-               return;
-
-       /* create /proc/net/tux */
-       root_tux_dir = proc_mkdir("tux", proc_net);
-
-       entry = create_proc_entry("log_cpu_mask", 0700, root_tux_dir);
-
-       entry->nlink = 1;
-       entry->data = (void *)&log_cpu_mask;
-       entry->read_proc = hex_read_proc;
-       entry->write_proc = hex_write_proc;
-
-       log_cpu_mask_entry = entry;
-
-       entry = create_proc_entry("stat", 0700, root_tux_dir);
-
-       entry->nlink = 1;
-       entry->data = NULL;
-       entry->read_proc = stat_read_proc;
-       entry->write_proc = stat_write_proc;
-
-       stat_entry = entry;
-
-       /*
-        * Create entries for all existing threads.
-        */
-       for (i = 0; i < CONFIG_TUX_NUMTHREADS; i++)
-               register_tux_proc(i);
-}
-
-void start_sysctl(void)
-{
-       init_tux_proc();
-       tux_table_header = register_sysctl_table(tux_root_table,1);
-}
-
-void end_sysctl(void)
-{
-       cleanup_tux_proc();
-       unregister_sysctl_table(tux_table_header);
-}
-
-#if CONFIG_SMP
-void mask_to_cpumask(unsigned int mask, cpumask_t *cpu_mask)
-{
-
-       unsigned int bit_mask, i;
-
-       bit_mask = 1 << 31;
-
-       for (i=NR_CPUS-1; i--; i >= 0) {
-               if(mask & bit_mask)
-                       cpu_set(i, *cpu_mask);
-               else
-                       cpu_clear(i, *cpu_mask);
-               mask <<= 1;
-       }
-
-}
-#endif
-
diff --git a/net/tux/proto_ftp.c b/net/tux/proto_ftp.c
deleted file mode 100644 (file)
index fbb9d8e..0000000
+++ /dev/null
@@ -1,1549 +0,0 @@
-/*
- * TUX - Integrated Application Protocols Layer and Object Cache
- *
- * Copyright (C) 2000, 2001, Ingo Molnar <mingo@redhat.com>
- *
- * ftp_proto.c: FTP application protocol support
- */
-
-#define __KERNEL_SYSCALLS__
-#include <net/tux.h>
-
-/****************************************************************
- *      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, 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.
- *
- ****************************************************************/
-
-#define HELLO          "220 Linux/TUX 3.0 FTP server welcomes you!\r\n"
-#define WRITE_DONE     "226 Transfer complete.\r\n"
-#define BAD_FILENAME   "550 No such file or directory.\r\n"
-#define GOOD_DIR       "250 CWD command successful.\r\n"
-#define LIST_ERR       "503 LIST without PORT! Closing connection.\r\n"
-#define LIST_ERR_MEM   "503 LIST could not allocate memory! Closing connection.\r\n"
-#define WRITE_FILE     "150 Opening BINARY mode data connection.\r\n"
-#define WRITE_LIST     "150 Opening ASCII mode data connection.\r\n"
-#define RETR_ERR       "503 RETR without PORT! Closing connection.\r\n"
-#define PORT_OK                "200 PORT command successful.\r\n"
-#define LOGIN_OK       "230-There are currently %d users logged in, out of %d maximum.\r\n230-Bandwidth served by TUX currently: %d KB/sec\r\n230 TUX Guest login ok.\r\n"
-#define LOGIN_OK_ONE   "230-There is currently 1 user logged in, out of %d maximum.\r\n230-Bandwidth served by TUX currently: %d KB/sec\r\n230 TUX Guest login ok.\r\n"
-#define LOGIN_OK_PASS  "230 TUX Guest login ok.\r\n"
-#define LOGIN_FORBIDDEN        "530 Sorry, Login Denied!\r\n"
-#define TYPE_OK                "200 Type set to I.\r\n"
-#define BYE            "221 Thank You for using TUX!\r\n"
-#define NOT_IMPLEMENTED        "502 Command not implemented.\r\n"
-#define CLOSE_2                "221 Cannot handle request, closing connection!\r\n"
-#define CLOSE          "500 Unknown command.\r\n"
-#define CLOSE_TIMEOUT  "421 Timeout, closing connection!\r\n"
-#define LINUX_SYST     "215 UNIX Type: L8, Linux/TUX/3.0\r\n"
-#define COMMAND_OK     "200 Command OK.\r\n"
-#define REST_OK                "350 Restart offset OK.\r\n"
-#define WRITE_ABORTED  "426 Transfer aborted, data connection closed.\r\n"
-#define SITE           "214 No SITE commands are recognized.\r\n"
-
-#define INTERVAL 10
-
-unsigned long last_measurement;
-unsigned int ftp_bytes_sent;
-unsigned int ftp_bandwidth;
-
-static void __update_bandwidth (tux_req_t *req, unsigned int bytes)
-{
-       /*
-        * Bandwidth measurement. Not completely accurate,
-        * but it's good enough and lightweight enough.
-        */
-       if (jiffies >= last_measurement + INTERVAL*HZ) {
-               ftp_bandwidth = (ftp_bytes_sent + 1023)/INTERVAL/1024;
-               ftp_bytes_sent = 0;
-               last_measurement = jiffies;
-       }
-       if (bytes)
-               atomic_add(bytes, (atomic_t *)&ftp_bytes_sent);
-       Dprintk("update_bandwidth(%p,%d), bytes_sent: %d, bandwidth: %d.\n",
-               req, bytes, ftp_bytes_sent, ftp_bandwidth);
-}
-
-#define update_bandwidth(req,bytes)                            \
-       do {                                                    \
-               if (unlikely(tux_ftp_login_message))            \
-                       __update_bandwidth(req, bytes);         \
-       } while (0)
-
-static inline void __ftp_send_async_message (tux_req_t *req,
-                const char *message, int status, unsigned int size)
-{
-       update_bandwidth(req, size);
-       __send_async_message(req, message, status, size, 1);
-}
-
-#define ftp_send_async_message(req,str,status) \
-               __ftp_send_async_message(req,str,status,sizeof(str)-1)
-
-
-static void ftp_flush_req (tux_req_t *req, int cachemiss)
-{
-       tux_push_pending(req->sock->sk);
-       add_req_to_workqueue(req);
-}
-
-static void ftp_execute_command (tux_req_t *req, int cachemiss);
-
-static void ftp_lookup_vhost (tux_req_t *req, int cachemiss)
-{
-       struct dentry *dentry;
-       struct nameidata base;
-       struct vfsmount *mnt = NULL;
-       unsigned int flag = cachemiss ? 0 : LOOKUP_ATOMIC;
-       char ip[3+1+3+1+3+1+3 + 2];
-
-       sprintf(ip, "%d.%d.%d.%d", NIPQUAD(inet_sk(req->sock->sk)->rcv_saddr));
-       Dprintk("ftp_lookup_vhost(%p, %d, virtual: %d, host: %s.)\n", 
-               req, flag, req->virtual, ip);
-
-       base.flags = LOOKUP_FOLLOW|flag;
-       base.last_type = LAST_ROOT;
-       base.dentry = dget(req->proto->main_docroot.dentry);
-       base.mnt = mntget(req->proto->main_docroot.mnt);
-
-       dentry = __tux_lookup(req, ip, &base, &mnt);
-
-       Dprintk("looked up dentry %p.\n", dentry);
-       if (dentry && !IS_ERR(dentry) && !dentry->d_inode)
-               TUX_BUG();
-
-       if (!dentry || IS_ERR(dentry)) {
-               if (PTR_ERR(dentry) == -EWOULDBLOCKIO) {
-                       add_tux_atom(req, ftp_lookup_vhost);
-                       queue_cachemiss(req);
-                       return;
-               }
-               goto abort;
-       }
-
-       req->docroot_dentry = dentry;
-       req->docroot_mnt = mnt;
-
-       add_tux_atom(req, ftp_execute_command);
-       add_req_to_workqueue(req);
-       return;
-abort:
-       if (dentry) {
-               if (!IS_ERR(dentry))
-                       dput(dentry);
-               dentry = NULL;
-       }
-       if (mnt) {
-               if (!IS_ERR(mnt))
-                       mntput(mnt);
-               mnt = NULL;
-       }
-       req_err(req);
-       add_req_to_workqueue(req);
-}
-
-static void ftp_got_request (tux_req_t *req)
-{
-       add_tux_atom(req, parse_request);
-       add_tux_atom(req, ftp_flush_req);
-       ftp_send_async_message(req, HELLO, 220);
-}
-
-#define GOTO_ERR { TDprintk("FTP protocol error at: %s:%d\n", \
-                       __FILE__, __LINE__); goto error; }
-
-static void zap_data_socket (tux_req_t *req)
-{
-       if (!req->data_sock)
-               return;
-       Dprintk("zapping req %p's data socket %p.\n", req, req->data_sock);
-
-       unlink_tux_data_socket(req);
-       sock_release(req->data_sock);
-       req->data_sock = NULL;
-}
-
-static int parse_ftp_message (tux_req_t *req, const int total_len)
-{
-       int comm, comm1 = 0, comm2 = 0, comm3 = 0, comm4 = 0;
-       int newline_pos, i;
-       const char *mess, *curr;
-
-       curr = mess = req->headers;
-
-       Dprintk("FTP parser got %d bytes: --->{%s}<---\n", total_len, curr);
-
-       newline_pos = -1;
-       for (i = 0; i < total_len; i++, curr++) {
-               if (!*curr)
-                       GOTO_ERR;
-               if (!(*curr == '\r') || !(*(curr+1) == '\n'))
-                       continue;
-               newline_pos = i;
-               break;
-       }
-       Dprintk("Newline pos: %d\n", newline_pos);
-       if (newline_pos == -1) {
-               Dprintk("incomplete mess on req %p!\n", req);
-               return 0;
-       }
-       if (newline_pos < 3)
-               GOTO_ERR;
-
-#define toup(c) ((((c) >= 'a') && ((c) <= 'z')) ? ((c) + 'A' - 'a') : (c))
-
-#define STRING_VAL(c1,c2,c3,c4) \
-       (toup(c1) + (toup(c2) << 8) + (toup(c3) << 16) + (toup(c4) << 24))
-
-#define STRING_VAL_STR(str) \
-               STRING_VAL(str[0], str[1], str[2], str[3])
-
-       Dprintk("string val (%c%c%c%c): %08x\n",
-               mess[0], mess[1], mess[2], mess[3],
-               STRING_VAL_STR(mess));
-
-#define PARSE_FTP_COMM(c1,c2,c3,c4,name,num)                   \
-       if (STRING_VAL_STR(mess) == STRING_VAL(c1,c2,c3,c4))    \
-       {                                                       \
-               Dprintk("parsed "#name".\n");                   \
-               comm##num = FTP_COMM_##name;                    \
-       }
-
-       PARSE_FTP_COMM('A','C','C','T', ACCT,2);
-       PARSE_FTP_COMM('C','D','U','P', CDUP,3);
-       PARSE_FTP_COMM('S','M','N','T', SMNT,4);
-       PARSE_FTP_COMM('Q','U','I','T', QUIT,1);
-       PARSE_FTP_COMM('R','E','I','N', REIN,2);
-       PARSE_FTP_COMM('P','A','S','V', PASV,3);
-       PARSE_FTP_COMM('S','T','R','U', STRU,4); 
-       PARSE_FTP_COMM('S','T','O','R', STOR,2); 
-       PARSE_FTP_COMM('S','T','O','U', STOU,3); 
-       PARSE_FTP_COMM('A','P','P','E', APPE,4); 
-       PARSE_FTP_COMM('A','L','L','O', ALLO,1); 
-       PARSE_FTP_COMM('R','N','F','R', RNFR,2); 
-       PARSE_FTP_COMM('R','N','T','O', RNTO,3); 
-       PARSE_FTP_COMM('A','B','O','R', ABOR,4); 
-       PARSE_FTP_COMM('D','E','L','E', DELE,1); 
-       PARSE_FTP_COMM('R','M','D',' ', RMD, 2); 
-       PARSE_FTP_COMM('M','K','D',' ', MKD, 3); 
-       PARSE_FTP_COMM('P','W','D',' ', PWD, 4); 
-       PARSE_FTP_COMM('S','Y','S','T', SYST,2); 
-       PARSE_FTP_COMM('N','O','O','P', NOOP,3); 
-       PARSE_FTP_COMM('F','E','A','T', FEAT,4); 
-
-       comm = comm1 | comm2 | comm3 | comm4;
-
-       if (comm) {
-               if (newline_pos != 4)
-                       GOTO_ERR;
-               req->ftp_command = comm;
-               goto out;
-       }
-       
-       switch (STRING_VAL(mess[0], mess[1], mess[2], mess[3])) {
-
-#define PARSE_FTP_COMM_3CHAR(c1,c2,c3,name)                            \
-               case STRING_VAL(c1,c2,c3,'\r'):                         \
-               {                                                       \
-                       Dprintk("parsed "#name".\n");                   \
-                       req->ftp_command = FTP_COMM_##name;             \
-                       if (newline_pos != 3)                           \
-                               GOTO_ERR;                               \
-               }
-
-#define PARSE_FTP_3CHAR_COMM_IGNORE(c1,c2,c3,name)                     \
-               case STRING_VAL(c1,c2,c3,' '):                          \
-               {                                                       \
-                       Dprintk("parsed "#name".\n");                   \
-                       req->ftp_command = FTP_COMM_##name;             \
-               }
-
-#define PARSE_FTP_COMM_IGNORE(c1,c2,c3,c4,name)                                \
-               case STRING_VAL(c1,c2,c3,c4):                           \
-               {                                                       \
-                       Dprintk("parsed "#name".\n");                   \
-                       req->ftp_command = FTP_COMM_##name;             \
-               }
-
-#define PARSE_FTP_3CHAR_COMM_1_FIELD(c1,c2,c3,name,field,field_len,max)        \
-               case STRING_VAL(c1,c2,c3,' '):                          \
-               {                                                       \
-                       Dprintk("parsed "#name".\n");                   \
-                       req->ftp_command = FTP_COMM_##name;             \
-                       if (newline_pos == 4)                           \
-                               GOTO_ERR;                               \
-                       if (newline_pos >= 5) {                         \
-                               curr = mess + 3;                        \
-                               if (*curr++ != ' ')                     \
-                                       GOTO_ERR;                       \
-                               *(field_len) = newline_pos-4;           \
-                               if (*(field_len) >= max)                \
-                                       GOTO_ERR;                       \
-                               memcpy(field, curr, *(field_len));      \
-                               (field)[*(field_len)] = 0;              \
-                       }                                               \
-               }
-
-#define PARSE_FTP_COMM_1_FIELD(c1,c2,c3,c4,name,field,field_len,max)   \
-               case STRING_VAL(c1,c2,c3,c4):                           \
-               {                                                       \
-                       Dprintk("parsed "#name".\n");                   \
-                       req->ftp_command = FTP_COMM_##name;             \
-                       if (newline_pos < 4)                            \
-                               GOTO_ERR;                               \
-                       if (newline_pos == 4)                           \
-                               *(field_len) = 0;                       \
-                       else {                                          \
-                               curr = mess + 4;                        \
-                               if (*curr++ != ' ')                     \
-                                       GOTO_ERR;                       \
-                               *(field_len) = newline_pos-5;           \
-                               if (*(field_len) >= max)                \
-                                       GOTO_ERR;                       \
-                               memcpy(field, curr, *(field_len));      \
-                               (field)[*(field_len)] = 0;              \
-                       }                                               \
-               }
-
-               PARSE_FTP_COMM_1_FIELD('U','S','E','R', USER,
-                       req->username, &req->username_len,
-                       MAX_USERNAME_LEN-1);
-               if (!req->username_len)
-                       GOTO_ERR;
-               break;
-
-               {
-                       #define MAX_PASS_LEN 100
-                       char pass[MAX_PASS_LEN];
-                       unsigned int pass_len;
-                       PARSE_FTP_COMM_1_FIELD('P','A','S','S', PASS,
-                               pass, &pass_len,
-                               MAX_PASS_LEN-1);
-                       if (!pass_len)
-                               GOTO_ERR;
-                       break;
-               }
-
-               PARSE_FTP_3CHAR_COMM_1_FIELD('C','W','D', CWD,
-                       req->objectname, &req->objectname_len,
-                       MAX_OBJECTNAME_LEN-1);
-               if (!req->objectname_len)
-                       GOTO_ERR;
-               req->uri_str = req->objectname;
-               req->uri_len = req->objectname_len;
-               break;
-
-               PARSE_FTP_COMM_3CHAR('P','W','D', PWD); break;
-
-               {
-                       char type[3];
-                       unsigned int type_len;
-
-                       PARSE_FTP_COMM_1_FIELD('T','Y','P','E', TYPE,
-                               type, &type_len, 2);
-                       if (!type_len)
-                               GOTO_ERR;
-                       if ((type[0] != 'I') && (type[0] != 'A'))
-                               GOTO_ERR;
-               }
-               break;
-
-               PARSE_FTP_COMM_1_FIELD('R','E','T','R', RETR,
-                       req->objectname, &req->objectname_len,
-                       MAX_OBJECTNAME_LEN-1);
-               if (!req->objectname_len) {
-                       zap_data_socket(req);
-                       req->ftp_command = FTP_COMM_NONE;
-               }
-               req->uri_str = req->objectname;
-               req->uri_len = req->objectname_len;
-               break;
-
-               PARSE_FTP_COMM_1_FIELD('S','I','Z','E', SIZE,
-                       req->objectname, &req->objectname_len,
-                       MAX_OBJECTNAME_LEN-1);
-               if (!req->objectname_len)
-                       req->ftp_command = FTP_COMM_NONE;
-               req->uri_str = req->objectname;
-               req->uri_len = req->objectname_len;
-               break;
-
-               PARSE_FTP_COMM_1_FIELD('M','D','T','M', MDTM,
-                       req->objectname, &req->objectname_len,
-                       MAX_OBJECTNAME_LEN-1);
-               if (!req->objectname_len)
-                       req->ftp_command = FTP_COMM_NONE;
-               req->uri_str = req->objectname;
-               req->uri_len = req->objectname_len;
-               break;
-
-               PARSE_FTP_COMM_IGNORE('M','O','D','E', MODE);
-               break;
-
-               PARSE_FTP_COMM_IGNORE('S','T','A','T', STAT);
-               break;
-
-               PARSE_FTP_COMM_IGNORE('S','I','T','E', SITE);
-               break;
-
-               PARSE_FTP_COMM_1_FIELD('L','I','S','T', LIST,
-                       req->objectname, &req->objectname_len,
-                       MAX_OBJECTNAME_LEN-1);
-               if (req->objectname[0] == '-') {
-                       req->objectname_len = 0;
-                       req->objectname[0] = 0;
-               }
-               if (req->objectname_len) {
-                       req->uri_str = req->objectname;
-                       req->uri_len = req->objectname_len;
-               }
-               break;
-
-               PARSE_FTP_COMM_1_FIELD('N','L','S','T', NLST,
-                       req->objectname, &req->objectname_len,
-                       MAX_OBJECTNAME_LEN-1);
-               if (req->objectname[0] == '-') {
-                       req->objectname_len = 0;
-                       req->objectname[0] = 0;
-               }
-               if (req->objectname_len) {
-                       req->uri_str = req->objectname;
-                       req->uri_len = req->objectname_len;
-               }
-               break;
-
-               PARSE_FTP_COMM_IGNORE('H','E','L','P', HELP);
-               break;
-
-               PARSE_FTP_COMM_IGNORE('C','L','N','T', CLNT);
-               break;
-
-#define IS_NUM(n) (((n) >= '0') && ((n) <= '9'))
-
-#define GET_DIGIT(curr,n)                              \
-       n += (*curr) - '0';                             \
-       curr++;                                         \
-       if (IS_NUM(*curr)) {                            \
-               n *= 10;
-
-#define PARSE_PORTNUM(curr,n)                          \
-do {                                                   \
-       Dprintk("PORT NUM parser:--->{%s}<---\n", curr);\
-       if (!IS_NUM(*curr))                             \
-               GOTO_ERR;                               \
-       n = 0;                                          \
-       GET_DIGIT(curr,n);                              \
-       GET_DIGIT(curr,n);                              \
-       GET_DIGIT(curr,n);                              \
-       }}}                                             \
-       if (n > 255)                                    \
-               GOTO_ERR;                               \
-       Dprintk("PORT NUM parser:--->{%s}<---\n", curr);\
-       Dprintk("PORT NUM parser parsed %d.\n", n);     \
-} while (0)
-
-#define PARSE_NUM(curr,n)                              \
-do {                                                   \
-       Dprintk("NUM parser:--->{%s}<---\n", curr);     \
-       if (!IS_NUM(*curr))                             \
-               GOTO_ERR;                               \
-       n = 0;                                          \
-       GET_DIGIT(curr,n);                              \
-       GET_DIGIT(curr,n);                              \
-       GET_DIGIT(curr,n);                              \
-       GET_DIGIT(curr,n);                              \
-       GET_DIGIT(curr,n);                              \
-       GET_DIGIT(curr,n);                              \
-       GET_DIGIT(curr,n);                              \
-       GET_DIGIT(curr,n);                              \
-       GET_DIGIT(curr,n);                              \
-       GET_DIGIT(curr,n);                              \
-       }}}}}}}}}}                                      \
-       Dprintk("NUM parser:--->{%s}<---\n", curr);     \
-       Dprintk("NUM parser parsed %d.\n", n);          \
-} while (0)
-
-               case STRING_VAL('P','O','R','T'):
-               {
-                       unsigned int h1, h2, h3, h4, p1, p2;
-                       if (req->data_sock)
-                               zap_data_socket(req);
-                       /*
-                        * Minimum size: "PORT 0,0,0,0,0,0", 16 bytes.
-                        */
-                       if (newline_pos < 16)
-                               GOTO_ERR;
-                       Dprintk("parsed PORT.\n");
-                       if (req->data_sock)
-                               GOTO_ERR;
-                       curr = mess + 4;
-                       if (*curr++ != ' ')
-                               GOTO_ERR;
-                       PARSE_PORTNUM(curr,h1);
-                       if (*curr++ != ',')
-                               GOTO_ERR;
-                       PARSE_PORTNUM(curr,h2);
-                       if (*curr++ != ',')
-                               GOTO_ERR;
-                       PARSE_PORTNUM(curr,h3);
-                       if (*curr++ != ',')
-                               GOTO_ERR;
-                       PARSE_PORTNUM(curr,h4);
-                       if (*curr++ != ',')
-                               GOTO_ERR;
-                       PARSE_PORTNUM(curr,p1);
-                       if (*curr++ != ',')
-                               GOTO_ERR;
-                       PARSE_PORTNUM(curr,p2);
-                       if (curr-mess != newline_pos)
-                               GOTO_ERR;
-                       req->ftp_command = FTP_COMM_PORT;
-                       req->ftp_user_addr = (h1<<24) + (h2<<16) + (h3<<8) + h4;
-                       req->ftp_user_port = (p1<<8) + p2;
-                       Dprintk("FTP PORT got: %d.%d.%d.%d:%d.\n",
-                               h1, h2, h3, h4, req->ftp_user_port);
-                       Dprintk("FTP user-addr: %08x (htonl: %08x), socket: %08x.\n",
-                               req->ftp_user_addr, htonl(req->ftp_user_addr),
-                               inet_sk(req->sock->sk)->daddr);
-                       /*
-                        * Do not allow redirection of connections, and do
-                        * not allow reserved ports to be accessed.
-                        */
-                       if (inet_sk(req->sock->sk)->daddr != htonl(req->ftp_user_addr))
-                               GOTO_ERR;
-                       if (req->ftp_user_port < 1024)
-                               GOTO_ERR;
-                       break;
-               }
-               case STRING_VAL('R','E','S','T'):
-               {
-                       unsigned int offset;
-
-                       /*
-                        * Minimum size: "REST 0", 6 bytes.
-                        */
-                       if (newline_pos < 6)
-                               GOTO_ERR;
-                       Dprintk("parsed REST.\n");
-                       curr = mess + 4;
-                       if (*curr++ != ' ')
-                               GOTO_ERR;
-                       PARSE_NUM(curr,offset);
-                       if (curr-mess != newline_pos)
-                               GOTO_ERR;
-                       req->ftp_command = FTP_COMM_REST;
-                       req->ftp_offset_start = offset;
-                       Dprintk("FTP REST got: %d bytes offset.\n", offset);
-
-                       break;
-               }
-               default:
-                       req->ftp_command = FTP_COMM_NONE;
-                       break;
-       }
-
-out:
-       req->parsed_len = newline_pos + 2;
-
-       req->virtual = tux_ftp_virtual_server;
-       if (req->virtual)
-               add_tux_atom(req, ftp_lookup_vhost);
-       else {
-               req->docroot_dentry = dget(req->proto->main_docroot.dentry);
-               req->docroot_mnt = mntget(req->proto->main_docroot.mnt);
-               add_tux_atom(req, ftp_execute_command);
-       }
-
-       return req->parsed_len;
-error:
-       clear_keepalive(req);
-       TDprintk("rejecting FTP session!\n");
-       TDprintk("mess     :--->{%s}<---\n", mess);
-       TDprintk("mess left:--->{%s}<---\n", curr);
-       req_err(req);
-       return -1;
-}
-
-static void ftp_wait_close (tux_req_t *req, int cachemiss);
-static void ftp_wait_syn (tux_req_t *req, int cachemiss);
-
-static int ftp_check_req_err (tux_req_t *req, int cachemiss)
-{
-       int state = req->sock->sk->sk_state;
-       int err = req->sock->sk->sk_err | req->error;
-       int urg = tcp_sk(req->sock->sk)->urg_data;
-
-       if (req->data_sock) {
-               urg |= tcp_sk(req->data_sock->sk)->urg_data;
-               state |= req->data_sock->sk->sk_state;
-               err |= req->data_sock->sk->sk_err;
-       }
-
-       if ((state <= TCP_SYN_RECV) && !err) {
-               if (!urg)
-                       return 0;
-               req->in_file.f_pos = 0;
-               add_tux_atom(req, flush_request);
-               zap_data_socket(req);
-               ftp_send_async_message(req, WRITE_ABORTED, 426);
-               return 1;
-       }
-#if CONFIG_TUX_DEBUG
-       req->bytes_expected = 0;
-       if (tux_TDprintk)
-               dump_stack();
-#endif
-       req->in_file.f_pos = 0;
-       TDprintk("zapping, data sock state: %d (err: %d, urg: %d)\n",
-               state, err, urg);
-       /*
-        * We are in the middle of a file transfer,
-        * zap it immediately:
-        */
-       req->error = TUX_ERROR_CONN_CLOSE;
-       zap_request(req, cachemiss);
-       return 1;
-}
-
-void ftp_send_file (tux_req_t *req, int cachemiss)
-{
-       int ret;
-
-       SET_TIMESTAMP(req->output_timestamp);
-repeat:
-       ret = generic_send_file(req, req->data_sock, cachemiss);
-       update_bandwidth(req, req->in_file.f_pos - req->prev_pos);
-       req->prev_pos = req->in_file.f_pos;
-
-       switch (ret) {
-               case -5:
-                       add_tux_atom(req, ftp_send_file);
-                       output_timeout(req);
-                       break;
-               case -4:
-                       add_tux_atom(req, ftp_send_file);
-                       if (add_output_space_event(req, req->data_sock)) {
-                               del_tux_atom(req);
-                               goto repeat;
-                       }
-                       break;
-               case -3:
-                       add_tux_atom(req, ftp_send_file);
-                       queue_cachemiss(req);
-                       break;
-               case -1:
-                       break;
-               default:
-                       req->in_file.f_pos = 0;
-
-                       if (tux_ftp_wait_close) {
-                               req->data_sock->ops->shutdown(req->data_sock, SEND_SHUTDOWN);
-                               add_tux_atom(req, ftp_wait_close);
-                               add_req_to_workqueue(req);
-                               return;
-                       }
-                       Dprintk("FTP send file req %p finished!\n", req);
-                       zap_data_socket(req);
-                       add_tux_atom(req, ftp_flush_req);
-                       if (req->error)
-                               ftp_send_async_message(req, BAD_FILENAME, 200);
-                       else
-                               ftp_send_async_message(req, WRITE_DONE, 200);
-                       break;
-       }
-}
-
-#define sk_syn(sk) \
-       (!(sk)->sk_err && ((1 << (sk)->sk_state) & (TCPF_SYN_SENT | TCPF_SYN_RECV)))
-#define req_syn(req) \
-       (!(req)->error && sk_syn((req)->data_sock->sk))
-
-static void ftp_wait_syn (tux_req_t *req, int cachemiss)
-{
-       Dprintk("ftp_wait_syn in: data socket state %d.\n", req->data_sock->state);
-       if (req_syn(req)) {
-               spin_lock_irq(&req->ti->work_lock);
-               add_keepalive_timer(req);
-               if (test_and_set_bit(0, &req->idle_input))
-                       TUX_BUG();
-               spin_unlock_irq(&req->ti->work_lock);
-               if (req_syn(req)) {
-                       add_tux_atom(req, ftp_wait_syn);
-                       return;
-               }
-               unidle_req(req);
-       }
-       Dprintk("ftp_wait_syn out: data socket state %d.\n", req->data_sock->state);
-       add_req_to_workqueue(req);
-}
-
-static void ftp_wait_close (tux_req_t *req, int cachemiss)
-{
-       struct sock *sk = req->data_sock->sk;
-
-       Dprintk("ftp_wait_close: data socket state %d.\n", sk->sk_state);
-
-       if (!req->error && (sk->sk_state <= TCP_FIN_WAIT1) && !sk->sk_err) {
-               spin_lock_irq(&req->ti->work_lock);
-               add_keepalive_timer(req);
-               if (test_and_set_bit(0, &req->idle_input))
-                       TUX_BUG();
-               spin_unlock_irq(&req->ti->work_lock);
-               if (!req->error && (sk->sk_state <= TCP_FIN_WAIT1) && !sk->sk_err) {
-                       add_tux_atom(req, ftp_wait_close);
-                       return;
-               }
-               unidle_req(req);
-       }
-       zap_data_socket(req);
-       add_tux_atom(req, ftp_flush_req);
-       if (req->error)
-               ftp_send_async_message(req, BAD_FILENAME, 200);
-       else
-               ftp_send_async_message(req, WRITE_DONE, 200);
-}
-
-void ftp_get_size (tux_req_t *req, int cachemiss)
-{
-       char file_size[200];
-       int missed, len;
-
-       if (!req->dentry) {
-               missed = lookup_object(req, cachemiss ? 0 : LOOKUP_ATOMIC);
-               if (!missed && !req->dentry) {
-                       ftp_send_async_message(req, BAD_FILENAME, 200);
-                       return;
-               }
-               if (missed) {
-                       if (cachemiss)
-                               TUX_BUG();
-                       add_tux_atom(req, ftp_get_size);
-                       queue_cachemiss(req);
-                       return;
-               }
-       }
-       req->in_file.f_pos = 0;
-       len = sprintf(file_size, "213 %Li\r\n", req->dentry->d_inode->i_size);
-       __ftp_send_async_message(req, file_size, 200, len);
-}
-
-void ftp_get_mdtm (tux_req_t *req, int cachemiss)
-{
-       unsigned int flag = cachemiss ? 0 : LOOKUP_ATOMIC;
-       struct dentry *dentry;
-       struct vfsmount *mnt = NULL;
-       char file_mdtm[200];
-       unsigned int len;
-       int err;
-
-       dentry = tux_lookup(req, req->objectname, flag, &mnt);
-       if (!dentry || IS_ERR(dentry)) {
-               if (PTR_ERR(dentry) == -EWOULDBLOCKIO) {
-                       if (cachemiss)
-                               TUX_BUG();
-                       add_tux_atom(req, ftp_get_mdtm);
-                       queue_cachemiss(req);
-                       return;
-               }
-               goto out_err;
-       }
-       err = permission(dentry->d_inode, MAY_READ, NULL);
-       if (err)
-               goto out_err_put;
-
-       req->in_file.f_pos = 0;
-       len = mdtm_time (file_mdtm, dentry->d_inode->i_mtime.tv_sec);
-       dput(dentry);
-       mntput(mnt);
-       __ftp_send_async_message(req, file_mdtm, 200, len);
-       return;
-
-out_err_put:
-       dput(dentry);
-       mntput(mnt);
-out_err:
-       ftp_send_async_message(req, BAD_FILENAME, 550);
-}
-
-static void ftp_get_file (tux_req_t *req, int cachemiss)
-{
-       int missed;
-
-       if (!req->dentry) {
-               missed = lookup_object(req, cachemiss ? 0 : LOOKUP_ATOMIC);
-               if (!missed && !req->dentry) {
-                       ftp_send_async_message(req, BAD_FILENAME, 200);
-                       return;
-               }
-               if (missed) {
-                       if (cachemiss)
-                               TUX_BUG();
-                       add_tux_atom(req, ftp_get_file);
-                       queue_cachemiss(req);
-                       return;
-               }
-       }
-       Dprintk("ftp_send_file %p, ftp_offset: %Ld, total_len: %Ld.\n", req, req->ftp_offset_start, req->total_file_len);
-       req->in_file.f_pos = 0;
-       if (req->ftp_offset_start) {
-               if (req->ftp_offset_start <= req->total_file_len) {
-                       req->offset_start = req->ftp_offset_start;
-                       req->in_file.f_pos = req->offset_start;
-               }
-               req->ftp_offset_start = 0;
-       }
-       req->output_len = req->total_file_len - req->offset_start;
-       req->prev_pos = req->in_file.f_pos;
-       Dprintk("ftp_send_file %p, f_pos: %Ld (out_len: %Ld).\n", req, req->in_file.f_pos, req->output_len);
-       add_tux_atom(req, ftp_send_file);
-       add_tux_atom(req, ftp_wait_syn);
-       add_tux_atom(req, ftp_flush_req);
-       ftp_send_async_message(req, WRITE_FILE, 200);
-}
-
-static void __exchange_sockets (tux_req_t *req)
-{
-       struct socket *tmp;
-
-       tmp = req->data_sock;
-       req->data_sock = req->sock;
-       req->sock = tmp;
-
-       req->in_file.f_pos = 0;
-}
-
-static void ftp_do_ls_start (tux_req_t *req, int cachemiss)
-{
-       Dprintk("ftp_do_ls_start(%p, %d).\n", req, cachemiss);
-       if (!req->cwd_dentry)
-               TUX_BUG();
-       __exchange_sockets(req);
-       queue_cachemiss(req);
-}
-
-static void ftp_do_ls_end (tux_req_t *req, int cachemiss)
-{
-       Dprintk("ftp_do_ls_end(%p, %d).\n", req, cachemiss);
-       __exchange_sockets(req);
-       if (tux_ftp_wait_close) {
-               req->data_sock->ops->shutdown(req->data_sock, SEND_SHUTDOWN);
-               add_tux_atom(req, ftp_wait_close);
-               add_req_to_workqueue(req);
-               return;
-       }
-       zap_data_socket(req);
-       add_tux_atom(req, ftp_flush_req);
-       if (req->error)
-               ftp_send_async_message(req, BAD_FILENAME, 200);
-       else
-               ftp_send_async_message(req, WRITE_DONE, 200);
-}
-
-static void ftp_chdir (tux_req_t *req, int cachemiss)
-{
-       unsigned int flag = cachemiss ? 0 : LOOKUP_ATOMIC;
-       struct dentry *dentry;
-       struct vfsmount *mnt = NULL;
-       int err;
-
-       Dprintk("ftp_chdir(%p, %d, {%s})\n", req, cachemiss, req->objectname);
-       dentry = tux_lookup(req, req->objectname, flag, &mnt);
-       if (!dentry || IS_ERR(dentry)) {
-               if (PTR_ERR(dentry) == -EWOULDBLOCKIO) {
-                       if (cachemiss)
-                               TUX_BUG();
-                       add_tux_atom(req, ftp_chdir);
-                       queue_cachemiss(req);
-                       return;
-               }
-               goto out_err;
-       }
-       err = permission(dentry->d_inode, MAY_EXEC, NULL);
-       if (err)
-               goto out_err_put;
-       req->cwd_dentry = dentry;
-       req->cwd_mnt = mnt;
-       ftp_send_async_message(req, GOOD_DIR, 200);
-       return;
-
-out_err_put:
-       dput(dentry);
-       mntput(mnt);
-out_err:
-       ftp_send_async_message(req, BAD_FILENAME, 550);
-}
-
-void ftp_accept_pasv (tux_req_t *req, int cachemiss)
-{
-       struct socket *sock, *new_sock = NULL;
-       struct tcp_opt *tp1, *tp2;
-       int err;
-
-       tp1 = tcp_sk(req->data_sock->sk);
-
-       Dprintk("PASV accept on req %p, accept_queue: %p.\n",
-                       req, tp1->accept_queue);
-       if (req->error || (req->data_sock->sk->sk_state != TCP_LISTEN))
-               goto error;
-new_socket:
-       if (!tp1->accept_queue) {
-               spin_lock_irq(&req->ti->work_lock);
-               add_keepalive_timer(req);
-               if (test_and_set_bit(0, &req->idle_input))
-                       TUX_BUG();
-               spin_unlock_irq(&req->ti->work_lock);
-               if (!tp1->accept_queue) {
-                       add_tux_atom(req, ftp_accept_pasv);
-                       return;
-               }
-               unidle_req(req);
-       }
-       new_sock = sock_alloc();
-       if (!new_sock)
-               goto error;
-       sock = req->data_sock;
-       new_sock->type = sock->type;
-       new_sock->ops = sock->ops;
-
-       err = sock->ops->accept(sock, new_sock, O_NONBLOCK);
-       Dprintk("PASV accept() returned %d (state %d).\n", err, new_sock->sk->sk_state);
-       if (err < 0)
-               goto error;
-       if (new_sock->sk->sk_state != TCP_ESTABLISHED)
-               goto error;
-       /*
-        * Do not allow other clients to steal the FTP connection!
-        */
-       if (inet_sk(new_sock->sk)->daddr != inet_sk(req->sock->sk)->daddr) {
-               Dprintk("PASV: ugh, unauthorized connect?\n");
-               sock_release(new_sock);
-               new_sock = NULL;
-               goto new_socket;
-       }
-       /*
-        * Zap the listen socket:
-        */
-       zap_data_socket(req);
-
-       tp2 = tcp_sk(new_sock->sk);
-       tp2->nonagle = 2;
-       tp2->ack.pingpong = tux_ack_pingpong;
-       new_sock->sk->sk_reuse = 1;
-       sock_set_flag(new_sock->sk, SOCK_URGINLINE);
-       sock_reset_flag(new_sock->sk, SOCK_LINGER);
-
-       link_tux_data_socket(req, new_sock);
-       add_req_to_workqueue(req);
-       return;
-
-error:
-       if (new_sock)
-               sock_release(new_sock);
-       req_err(req);
-       zap_data_socket(req);
-       ftp_send_async_message(req, CLOSE, 500);
-}
-
-static char * ftp_print_dir_line (tux_req_t *req, char *tmp, char *d_name, int d_len, int d_type, struct dentry *dentry, struct inode *inode)
-{
-       char *string0 = tmp;
-       unsigned int size;
-
-       if (req->ftp_command == FTP_COMM_NLST) {
-               memcpy(tmp, d_name, d_len);
-               tmp += d_len;
-               *tmp++ = '\r';
-               *tmp++ = '\n';
-               *tmp = 0;
-               return tmp;
-       }
-       switch (d_type) {
-               default:
-               case DT_UNKNOWN:
-               case DT_WHT:
-                       if (tux_hide_unreadable)
-                               goto out_dput;
-                       *tmp++ = '?';
-                       break;
-
-               case DT_FIFO:
-                       if (tux_hide_unreadable)
-                               goto out_dput;
-                       *tmp++ = 'p';
-                       break;
-
-               case DT_CHR:
-                       if (tux_hide_unreadable)
-                               goto out_dput;
-                       *tmp++ = 'c';
-                       break;
-
-               case DT_DIR:
-                       *tmp++ = 'd';
-                       break;
-
-               case DT_BLK:
-                       if (tux_hide_unreadable)
-                               goto out_dput;
-                       *tmp++ = 'b';
-                       break;
-
-               case DT_REG:
-                       *tmp++ = '-';
-                       break;
-
-               case DT_LNK:
-                       *tmp++ = 'l';
-                       break;
-
-               case DT_SOCK:
-                       if (tux_hide_unreadable)
-                               goto out_dput;
-                       *tmp++ = 's';
-                       break;
-       }
-
-       if (inode->i_mode & S_IRUSR) *tmp++ = 'r'; else *tmp++ = '-';
-       if (inode->i_mode & S_IWUSR) *tmp++ = 'w'; else *tmp++ = '-';
-       if (inode->i_mode & S_IXUSR) *tmp++ = 'x'; else *tmp++ = '-';
-       if (inode->i_mode & S_IRGRP) *tmp++ = 'r'; else *tmp++ = '-';
-       if (inode->i_mode & S_IWGRP) *tmp++ = 'w'; else *tmp++ = '-';
-       if (inode->i_mode & S_IXGRP) *tmp++ = 'x'; else *tmp++ = '-';
-       if (inode->i_mode & S_IROTH) *tmp++ = 'r'; else *tmp++ = '-';
-       if (inode->i_mode & S_IWOTH) *tmp++ = 'w'; else *tmp++ = '-';
-       if (inode->i_mode & S_IXOTH) *tmp++ = 'x'; else *tmp++ = '-';
-
-       *tmp++ = ' ';
-
-       size = sprintf(tmp, "%4i %d", inode->i_nlink, inode->i_uid);
-       tmp += size;
-
-       size = 14 - size;
-       if (size <= 0)
-               size = 1;
-       memset(tmp, ' ', size);
-       tmp += size;
-
-       size = sprintf(tmp, "%d", inode->i_gid);
-       tmp += size;
-
-       size = 9 - size;
-       if (size <= 0)
-               size = 1;
-       memset(tmp, ' ', size);
-       tmp += size;
-
-       tmp += sprintf(tmp, "%8Li", inode->i_size);
-       *tmp++ = ' ';
-
-       tmp += time_unix2ls(inode->i_mtime.tv_sec, tmp);
-       *tmp++ = ' ';
-
-       memcpy(tmp, d_name, d_len);
-       tmp += d_len;
-
-       if (d_type == DT_LNK) {
-               int len = 0, max_len;
-               #define ARROW " -> "
-
-               memcpy(tmp, ARROW, sizeof(ARROW)-1);
-               tmp += sizeof(ARROW)-1;
-               max_len = MAX_OBJECTNAME_LEN-(tmp-string0);
-               if (inode->i_op && inode->i_op->readlink) {
-                       mm_segment_t oldmm;
-
-                       oldmm = get_fs(); set_fs(KERNEL_DS);
-                       set_fs(KERNEL_DS);
-                       len = inode->i_op->readlink(dentry, tmp, max_len);
-                       set_fs(oldmm);
-               }
-               if (len > 0)
-                       tmp += len;
-               else
-                       Dprintk("hm, readlink() returned %d.\n", len);
-       }
-       *tmp++ = '\r';
-       *tmp++ = '\n';
-       *tmp = 0;
-
-       return tmp;
-out_dput:
-       return NULL;
-}
-
-static void ftp_do_ls_onefile (tux_req_t *req, int cachemiss)
-{
-       char string0[MAX_OBJECTNAME_LEN+200], *tmp;
-
-       tmp = ftp_print_dir_line(req, string0, req->objectname, req->objectname_len,
-DT_REG, req->dentry, req->dentry->d_inode);
-       if (!tmp) {
-               req_err(req);
-               add_req_to_workqueue(req);
-               return;
-       }
-       if (tmp - string0 >= MAX_OBJECTNAME_LEN+200)
-               BUG();
-       __ftp_send_async_message(req, string0, 200, tmp - string0);
-}
-
-static void ftp_lookup_listfile (tux_req_t *req, int cachemiss)
-{
-       unsigned int flag = cachemiss ? 0 : LOOKUP_ATOMIC;
-       struct dentry *dentry;
-       struct vfsmount *mnt = NULL;
-       int err;
-
-       Dprintk("ftp_lookup_listfile(%p, %d, {%s})\n", req, cachemiss, req->objectname);
-       dentry = tux_lookup(req, req->objectname, flag, &mnt);
-       if (!dentry || IS_ERR(dentry)) {
-               if (PTR_ERR(dentry) == -EWOULDBLOCKIO) {
-                       if (cachemiss)
-                               TUX_BUG();
-                       add_tux_atom(req, ftp_lookup_listfile);
-                       queue_cachemiss(req);
-                       return;
-               }
-               goto out_err;
-       }
-
-       if (S_ISDIR(dentry->d_inode->i_mode)) {
-               err = permission(dentry->d_inode, MAY_EXEC, NULL);
-               if (err) {
-                       Dprintk("Directory permission error: %d.\n", err);
-                       goto out_err_put;
-               }
-               install_req_dentry(req, dentry, mnt);
-
-               add_tux_atom(req, ftp_do_ls_end);
-               if (!req->cwd_dentry)
-                       TUX_BUG();
-               add_tux_atom(req, list_directory);
-       } else {
-               install_req_dentry(req, dentry, mnt);
-
-               add_tux_atom(req, ftp_do_ls_end);
-               add_tux_atom(req, ftp_do_ls_onefile);
-       }
-
-       add_tux_atom(req, ftp_do_ls_start);
-       add_tux_atom(req, ftp_wait_syn);
-       add_tux_atom(req, ftp_flush_req);
-       ftp_send_async_message(req, WRITE_LIST, 200);
-       return;
-
-out_err_put:
-       dput(dentry);
-       mntput(mnt);
-out_err:
-       ftp_send_async_message(req, BAD_FILENAME, 550);
-}
-
-static void ftp_execute_command (tux_req_t *req, int cachemiss)
-{
-       if (!req->parsed_len)
-               TUX_BUG();
-       trunc_headers(req);
-       req->keep_alive = 1;
-
-       switch (req->ftp_command) {
-
-#define ABORTED \
-       "226 Abort successful.\r\n"
-
-       case FTP_COMM_ABOR:
-       {
-               zap_data_socket(req);
-               ftp_send_async_message(req, ABORTED, 226);
-               break;
-       }
-
-       case FTP_COMM_PWD:
-       {
-               unsigned int str_len;
-               char *buf, *path;
-
-               buf = (char *)__get_free_page(GFP_KERNEL);
-               if (!buf) {
-                       req_err(req);
-                       ftp_send_async_message(req, LIST_ERR_MEM, 200);
-                       GOTO_ERR;
-               }
-
-               if (!req->cwd_dentry) {
-                       req->cwd_dentry = dget(req->docroot_dentry);
-                       req->cwd_mnt = mntget(req->docroot_mnt);
-               }
-
-// "257 "/" is current directory.\r\n"
-
-#define PART_1 "257 \""
-#define PART_1_LEN (sizeof(PART_1)-1)
-
-#define PART_3 "\" is current directory.\r\n"
-#define PART_3_LEN sizeof(PART_3)
-
-               path = tux_print_path(req, req->cwd_dentry, req->cwd_mnt,
-                       buf+PART_1_LEN, PAGE_SIZE - PART_3_LEN - PART_1_LEN);
-
-               if (path < buf + PART_1_LEN)
-                       BUG();
-
-               memcpy(path - PART_1_LEN, PART_1, PART_1_LEN);
-               memcpy(buf + PAGE_SIZE-PART_3_LEN-1, PART_3, PART_3_LEN);
-               str_len = buf + PAGE_SIZE-1 - (path - PART_1_LEN) - 1;
-
-               __ftp_send_async_message(req, path - PART_1_LEN, 226, str_len);
-               free_page((unsigned long)buf);
-               break;
-       }
-
-       case FTP_COMM_CDUP:
-       {
-               memcpy(req->objectname, "..", 3);
-               req->objectname_len = 2;
-               req->uri_str = req->objectname;
-               req->uri_len = req->objectname_len;
-
-               // fall through to CWD:
-       }
-       case FTP_COMM_CWD:
-       {
-               ftp_chdir(req, cachemiss);
-               break;
-       }
-
-       case FTP_COMM_NLST:
-       case FTP_COMM_LIST:
-       {
-               if (!req->data_sock) {
-                       req_err(req);
-                       ftp_send_async_message(req, LIST_ERR, 200);
-                       GOTO_ERR;
-               }
-               if (req->dentry)
-                       TUX_BUG();
-               if (!req->cwd_dentry) {
-                       req->cwd_dentry = dget(req->docroot_dentry);
-                       req->cwd_mnt = mntget(req->docroot_mnt);
-               }
-               if (req->objectname_len)
-                       ftp_lookup_listfile(req, cachemiss);
-               else {
-                       dget(req->cwd_dentry);
-                       mntget(req->cwd_mnt);
-                       install_req_dentry(req, req->cwd_dentry, req->cwd_mnt);
-                       if (!req->dentry)
-                               TUX_BUG();
-                       add_tux_atom(req, ftp_do_ls_end);
-                       if (!req->cwd_dentry)
-                               TUX_BUG();
-                       add_tux_atom(req, list_directory);
-                       add_tux_atom(req, ftp_do_ls_start);
-                       add_tux_atom(req, ftp_wait_syn);
-                       add_tux_atom(req, ftp_flush_req);
-                       ftp_send_async_message(req, WRITE_LIST, 200);
-               }
-               break;
-       }
-
-       case FTP_COMM_RETR:
-       {
-               if (!req->data_sock) {
-                       req_err(req);
-                       ftp_send_async_message(req, RETR_ERR, 200);
-                       GOTO_ERR;
-               }
-               ftp_get_file(req, cachemiss);
-               break;
-       }
-
-       case FTP_COMM_SIZE:
-       {
-               ftp_get_size(req, cachemiss);
-               break;
-       }
-
-       case FTP_COMM_MDTM:
-       {
-               ftp_get_mdtm(req, cachemiss);
-               break;
-       }
-
-       case FTP_COMM_PASV:
-       {
-               char buf [36 + 4*3 + 5 + 10];
-               struct socket *data_sock;
-               struct sockaddr_in addr;
-               unsigned int str_len;
-               struct tcp_opt *tp;
-               u32 local_addr;
-               int err;
-
-               if (req->data_sock)
-                       zap_data_socket(req);
-               /*
-                * Create FTP data connection to client:
-                */
-               err = sock_create(AF_INET, SOCK_STREAM, IPPROTO_IP, &data_sock);
-               if (err < 0) {
-                       Dprintk("sock create err: %d\n", err);
-                       req_err(req);
-                       ftp_send_async_message(req, CLOSE, 500);
-                       GOTO_ERR;
-               }
-                       
-               local_addr = inet_sk(req->sock->sk)->rcv_saddr;
-               addr.sin_family = AF_INET;
-               addr.sin_port = 0;
-               addr.sin_addr.s_addr = local_addr;
-               Dprintk("client address: (%d,%d,%d,%d).\n", 
-                       NIPQUAD(inet_sk(req->sock->sk)->daddr));
-
-               data_sock->sk->sk_reuse = 1;
-               sock_set_flag(data_sock->sk, SOCK_URGINLINE);
-               sock_reset_flag(data_sock->sk, SOCK_LINGER);
-
-               err = data_sock->ops->bind(data_sock,
-                               (struct sockaddr*)&addr, sizeof(addr));
-               tp = tcp_sk(data_sock->sk);
-               tp->nonagle = 2;
-               Dprintk("PASV bind() ret: %d.\n", err);
-               if (err < 0) {
-                       req_err(req);
-                       sock_release(data_sock);
-                       ftp_send_async_message(req, CLOSE, 500);
-                       GOTO_ERR;
-               }
-
-               tp->ack.pingpong = tux_ack_pingpong;
-
-               if (!tux_keepalive_timeout)
-                       tp->linger2 = 0;
-               else
-                       tp->linger2 = tux_keepalive_timeout * HZ;
-
-               err = data_sock->ops->listen(data_sock, 1);
-               Dprintk("PASV listen() ret: %d\n", err);
-               if (err) {
-                       req_err(req);
-                       sock_release(data_sock);
-                       ftp_send_async_message(req, CLOSE, 500);
-                       GOTO_ERR;
-               }
-               link_tux_data_socket(req, data_sock);
-
-               Dprintk("FTP PASV listen sock state: %d, sk state: %d\n",
-                       data_sock->state, data_sock->sk->sk_state);
-
-               str_len = sprintf(buf,
-                       "227 Entering Passive Mode (%d,%d,%d,%d,%d,%d)\r\n",
-                               NIPQUAD(local_addr),
-                               ntohs(inet_sk(data_sock->sk)->sport) / 256,
-                               ntohs(inet_sk(data_sock->sk)->sport) & 255 );
-               Dprintk("PASV mess: {%s}\n", buf);
-
-               add_tux_atom(req, ftp_accept_pasv);
-               add_tux_atom(req, ftp_flush_req);
-               __ftp_send_async_message(req, buf, 227, str_len);
-               break;
-       }
-
-       case FTP_COMM_PORT:
-       {
-               struct socket *data_sock;
-               struct sockaddr_in addr;
-               kernel_cap_t saved_cap;
-               u32 local_addr;
-               int err;
-
-               /*
-                * Create FTP data connection to client:
-                */
-               err = sock_create(AF_INET, SOCK_STREAM, IPPROTO_IP, &data_sock);
-               if (err < 0) {
-                       Dprintk("sock create err: %d\n", err);
-                       req_err(req);
-                       ftp_send_async_message(req, CLOSE, 500);
-                       GOTO_ERR;
-               }
-
-               local_addr = inet_sk(req->sock->sk)->rcv_saddr;
-               addr.sin_family = AF_INET;
-               addr.sin_port = htons(20);
-               addr.sin_addr.s_addr = local_addr;
-
-               Dprintk("data socket address: (%d,%d,%d,%d).\n",
-                       NIPQUAD(local_addr));
-
-               data_sock->sk->sk_reuse = 1;
-               sock_set_flag(data_sock->sk, SOCK_URGINLINE);
-               sock_reset_flag(data_sock->sk, SOCK_LINGER);
-
-               saved_cap = current->cap_effective;
-               cap_raise (current->cap_effective, CAP_NET_BIND_SERVICE);
-               err = data_sock->ops->bind(data_sock,
-                               (struct sockaddr*)&addr, sizeof(addr));
-               current->cap_effective = saved_cap;
-
-               Dprintk("ACTIVE bind() ret: %d.\n", err);
-               if (err) {
-                       sock_release(data_sock);
-                       req_err(req);
-                       ftp_send_async_message(req, CLOSE, 500);
-                       GOTO_ERR;
-               }
-               tcp_sk(data_sock->sk)->nonagle = 2;
-
-               link_tux_data_socket(req, data_sock);
-
-               addr.sin_family = AF_INET;
-               addr.sin_port = htons(req->ftp_user_port);
-               addr.sin_addr.s_addr = htonl(req->ftp_user_addr);
-
-               err = data_sock->ops->connect(data_sock, (struct sockaddr *) &addr, sizeof(addr), O_RDWR|O_NONBLOCK);
-               if (err && (err != -EINPROGRESS)) {
-                       Dprintk("connect error: %d\n", err);
-                       zap_data_socket(req);
-                       req_err(req);
-                       ftp_send_async_message(req, CLOSE, 500);
-                       GOTO_ERR;
-               }
-               Dprintk("FTP data sock state: %d, sk state: %d\n", data_sock->state, data_sock->sk->sk_state);
-               ftp_send_async_message(req, PORT_OK, 200);
-               break;
-       }
-
-       case FTP_COMM_USER:
-       {
-               if (!strcmp(req->username, "ftp")
-                        || !strcmp(req->username, "FTP")
-                        || !strcmp(req->username, "anonymous")
-                        || !strcmp(req->username, "ANONYMOUS")) {
-                       unsigned int str_len;
-                       char login_ok [200];
-
-                       if (!tux_ftp_login_message) {
-                               ftp_send_async_message(req, LOGIN_OK_PASS, 230);
-                               break;
-                       }
-                       update_bandwidth(req, 0); /* get current bandwidth */
-                       if (nr_requests_used() == 1)
-                               str_len = sprintf(login_ok, LOGIN_OK_ONE,
-                                       tux_max_connect, ftp_bandwidth);
-                       else
-                               str_len = sprintf(login_ok, LOGIN_OK,
-                                       nr_requests_used(), tux_max_connect, ftp_bandwidth);
-                       __ftp_send_async_message(req, login_ok, 200, str_len);
-               } else {
-                       clear_keepalive(req);
-                       ftp_send_async_message(req, LOGIN_FORBIDDEN, 530);
-               }
-               break;
-       }
-       case FTP_COMM_PASS:
-       {
-               ftp_send_async_message(req, LOGIN_OK_PASS, 230);
-               break;
-       }
-       case FTP_COMM_SITE:
-       {
-               ftp_send_async_message(req, SITE, 214);
-               break;
-       }
-       case FTP_COMM_SYST:
-       {
-               ftp_send_async_message(req, LINUX_SYST, 200);
-               break;
-       }
-       case FTP_COMM_TYPE:
-       {
-               ftp_send_async_message(req, TYPE_OK, 200);
-               break;
-       }
-#define EXTRA_FEATURES "211-Extensions supported:\r\n SIZE\r\n MDTM\r\n211 End\r\n"
-
-       case FTP_COMM_FEAT:
-       {
-               ftp_send_async_message(req, EXTRA_FEATURES, 211);
-               break;
-       }
-       case FTP_COMM_HELP:
-       case FTP_COMM_CLNT:
-       case FTP_COMM_NOOP:
-       {
-               ftp_send_async_message(req, COMMAND_OK, 200);
-               break;
-       }
-       case FTP_COMM_REST:
-       {
-               ftp_send_async_message(req, REST_OK, 200);
-               break;
-       }
-       case FTP_COMM_QUIT:
-       {
-               clear_keepalive(req);
-               ftp_send_async_message(req, BYE, 200);
-               break;
-       }
-
-       default:
-       {
-               req->keep_alive = 1;
-               ftp_send_async_message(req, CLOSE, 500);
-               break;
-       }
-       }
-       return;
-error:
-       Dprintk("rejecting FTP session!\n");
-       return;
-}
-
-
-static void ftp_timeout (tux_req_t *req, int cachemiss)
-{
-       Dprintk("called ftp_timeout(%p)\n", req);
-       if (req->error != TUX_ERROR_CONN_TIMEOUT)
-               TUX_BUG();
-       ftp_send_async_message(req, CLOSE_TIMEOUT, 421);
-}
-
-static void ftp_close (tux_req_t *req, int cachemiss)
-{
-       Dprintk("called ftp_close(%p)\n", req);
-       ftp_send_async_message(req, CLOSE, 500);
-}
-
-static void ftp_pre_log (tux_req_t *req)
-{
-       if (tux_ftp_log_retr_only && (req->ftp_command != FTP_COMM_RETR))
-               req->status = 0;
-       else
-               req->status = req->ftp_command;
-}
-
-tux_proto_t tux_proto_ftp = {
-       defer_accept: 0,
-       can_redirect: 0,
-       got_request: ftp_got_request,
-       parse_message: parse_ftp_message,
-       illegal_request: ftp_close,
-       request_timeout: ftp_timeout,
-       pre_log: ftp_pre_log,
-       check_req_err: ftp_check_req_err,
-       print_dir_line: ftp_print_dir_line,
-       name: "ftp",
-};
-
diff --git a/net/tux/proto_http.c b/net/tux/proto_http.c
deleted file mode 100644 (file)
index 192dd4f..0000000
+++ /dev/null
@@ -1,2199 +0,0 @@
-/*
- * TUX - Integrated Application Protocols Layer and Object Cache
- *
- * Copyright (C) 2000, 2001, Ingo Molnar <mingo@redhat.com>
- *
- * proto_http.c: HTTP application protocol support
- *
- * Right now we detect simple GET headers, anything more
- * subtle gets redirected to secondary server port.
- */
-
-#include <net/tux.h>
-#include "parser.h"
-
-/****************************************************************
- *      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, 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.
- *
- ****************************************************************/
-
-/* 
- * Parse the HTTP message and put results into the request structure.
- * CISAPI extensions do not see the actual message buffer.
- *
- * Any perceived irregularity is honored with a redirect to the
- * secondary server - which in most cases should be Apache. So
- * if TUX gets confused by some strange request we fall back
- * to Apache to be RFC-correct.
- *
- * The parser is 'optimistic', ie. it's optimized for the case where
- * the whole message is available and correct. The parser is also
- * supposed to be 'robust', ie. it can be called multiple times with
- * an incomplete message, as new packets arrive.
- */
-
-static inline int TOHEX (char c)
-{
-       switch (c) {
-               case '0' ... '9': c -= '0'; break;
-               case 'a' ... 'f': c -= 'a'-10; break;
-               case 'A' ... 'F': c -= 'A'-10; break;
-       default:
-               c = -1;
-       }
-       return c;
-}
-
-/*
- * This function determines whether the client supports
- * gzip-type content-encoding.
- */
-static int may_gzip (const char *str, int len)
-{
-       const char *tmp, *curr;
-       int i;
-
-       if (len <= 4)
-               return 0;
-       tmp = str;
-       for (i = 0; i <= len-6; i++) {
-               Dprintk("gzip-checking: {%s}\n", tmp);
-               if (memcmp(tmp, " gzip", 5)) {
-                       tmp++;
-                       continue;
-               }
-               curr = tmp + 5;
-
-               if (*curr == ',' || *curr == '\r')
-                       return 1;
-               if (memcmp(curr, ";q=", 3))
-                       return 0;
-               curr += 3;
-               /*
-                * Every qvalue except explicitly zero is accepted.
-                * Zero values are "q=0.0", "q=0.00", "q=0.000".
-                * Parsing is optimized.
-                */
-               if (*curr == '0') {
-                       curr += 2;
-                       if (*curr == '0') {
-                               curr++;
-                               if (*curr == ' ' || *curr == '\r')
-                                       return 0;
-                               if (*curr == '0') {
-                                       curr++;
-                                       if (*curr == ' ' || *curr == '\r')
-                                               return 0;
-                                       if (*curr == '0') {
-                                               curr++;
-                                               if (*curr == ' ' ||
-                                                               *curr == '\r')
-                                                       return 0;
-                                       }
-                               }
-                       }
-               }
-               return 1;
-       }
-       return 0;
-}
-
-/*
- * This function strips off 'strip_host_tail' number of hostname
- * components from the tail of the hostname.
- *
- * Eg. with a value of '1', the "somesite.hosting.com" hostname gets
- * transformed into the "somesite" string.
- */
-static void strip_hostname(tux_req_t *req)
-{
-       int strip = strip_host_tail;
-       int left = req->host_len;
-       int component = 0;
-
-       if (!strip || !left)
-               return;
-
-       while (--left) {
-               if (req->host[left] != '.')
-                       continue;
-               if (++component == strip)
-                       break;
-       }
-       if (!left)
-               return;
-       req->host[left] = 0;
-       req->host_len = left;
-}
-
-static void http_lookup_vhost (tux_req_t *req, int cachemiss);
-static void http_process_message (tux_req_t *req, int cachemiss);
-
-int parse_http_message (tux_req_t *req, const int total_len)
-{
-       int hexhex = 0, hex_val_0 = 0, hex_val_1 = 0;
-       const char *curr, *uri, *message;
-       unsigned int objectname_len, left;
-       unsigned int have_r = 0;
-       char c;
-
-       left = total_len;
-       message = req->headers;
-       Dprintk("parsing request:\n---\n%s\n---\n", message);
-/*
- * RFC 2616, 5.1:
- *
- *      Request-Line   = Method SP Request-URI SP HTTP-Version CRLF
- */
-
-       if (!total_len)
-               TUX_BUG();
-
-       curr = message;
-
-#define GOTO_INCOMPLETE do { Dprintk("incomplete at %s:%d.\n", __FILE__, __LINE__); goto incomplete_message; } while (0)
-#define GOTO_REDIR do { TDprintk("redirect secondary at %s:%d.\n", __FILE__, __LINE__); goto error; } while (0)
-
-#define PRINT_MESSAGE_LEFT \
-    Dprintk("message left (%d) at %s:%d:\n--->{%s}<---\n", left, __FILE__, __LINE__, curr)
-
-       switch (*curr) {
-               case 'G':
-                       if (PARSE_METHOD(req,curr,GET,left))
-                               break;
-                       GOTO_REDIR;
-
-               case 'H':
-                       if (PARSE_METHOD(req,curr,HEAD,left))
-                               break;
-                       GOTO_REDIR;
-
-               case 'P':
-                       if (PARSE_METHOD(req,curr,POST,left))
-                               break;
-                       if (PARSE_METHOD(req,curr,PUT,left))
-                               break;
-                       GOTO_REDIR;
-
-               default:
-                       GOTO_REDIR;
-       }
-
-       req->method_str = message;
-       req->method_len = curr-message-1;
-
-       Dprintk("got method %d\n", req->method);
-
-       PRINT_MESSAGE_LEFT;
-
-       /*
-        * Ok, we got one of the methods we can handle, parse
-        * the URI:
-        */
-
-       {
-               // Do not allow leading "../" and intermediate "/../"
-               int dotdot = 1;
-               char *tmp = req->objectname;
-               int slashcheck = 1;
-
-               req->uri_str = uri = curr;
-
-               for (;;) {
-                       c = get_c(curr,left);
-                       if (slashcheck) {
-                               if (c == '/')
-                                       continue;
-                               slashcheck = 0;
-                       }
-
-                       PRINT_MESSAGE_LEFT;
-                       if (c == ' ' || ((c == '?') && (tux_ignore_query != 1)) || c == '\r' || c == '\n')
-                               break;
-                       if (c == '#')
-                               GOTO_REDIR;
-
-                       Dprintk("hexhex: %d.\n", hexhex);
-                       /*
-                        * First handle HEX HEX encoding
-                        */
-                       switch (hexhex) {
-                               case 0:
-                                       if (c == '%') {
-                                               hexhex = 1;
-                                               goto continue_parsing;
-                                       }
-                                       break;
-                               case 1:
-                                       hex_val_0 = TOHEX(c);
-                                       if (hex_val_0 < 0)
-                                               GOTO_REDIR;
-                                       hexhex = 2;
-                                       goto continue_parsing;
-                               case 2:
-                                       hex_val_1 = TOHEX(c);
-                                       if (hex_val_1 < 0)
-                                               GOTO_REDIR;
-                                       c = (hex_val_0 << 4) | hex_val_1;
-                                       if (!c)
-                                               GOTO_REDIR;
-                                       hexhex = 0;
-                                       break;
-                               default:
-                                       TUX_BUG();
-                       }
-                       if (hexhex)
-                               TUX_BUG();
-
-                       switch (dotdot) {
-                               case 0:
-                                       break;
-                               case 1:
-                                       if (c == '.')
-                                               dotdot = 2;
-                                       else
-                                               dotdot = 0;
-                                       break;
-                               case 2:
-                                       if (c == '.')
-                                               dotdot = 3;
-                                       else
-                                               dotdot = 0;
-                                       break;
-                               case 3:
-                                       if (c == '/')
-                                               GOTO_REDIR;
-                                       else
-                                               dotdot = 0;
-                                       break;
-                               default:
-                                       TUX_BUG();
-                       }
-                       if (!dotdot && (c == '/'))
-                               dotdot = 1;
-
-                       *(tmp++) = c;
-continue_parsing:
-                       if (curr - uri >= MAX_OBJECTNAME_LEN)
-                               GOTO_REDIR;
-               }
-               PRINT_MESSAGE_LEFT;
-               *tmp = 0;
-
-               // handle trailing "/.."
-               if (dotdot == 3)
-                       GOTO_REDIR;
-
-               objectname_len = tmp - req->objectname;
-               req->objectname_len = objectname_len;
-       }
-       Dprintk("got filename %s (%d)\n", req->objectname, req->objectname_len);
-
-       PRINT_MESSAGE_LEFT;
-
-       /*
-        * Parse optional query string. Copy until end-of-string or space.
-        */
-       if (c == '?') {
-               int query_len;
-               const char *query;
-
-               req->query_str = query = curr;
-
-               for (;;) {
-                       c = get_c(curr,left);
-                       if (c == ' ')
-                               break;
-                       if (c == '#')
-                               GOTO_REDIR;
-               }
-               if (unlikely(tux_ignore_query == 2))
-                       req->query_str = NULL;
-               else {
-                       query_len = curr-query-1;
-                       req->query_len = query_len;
-               }
-       }
-       if (req->query_len)
-               Dprintk("got query string %s (%d)\n", req->query_str, req->query_len);
-       req->uri_len = curr-uri-1;
-       if (!req->uri_len)
-               GOTO_REDIR;
-       Dprintk("got URI %s (%d)\n", req->uri_str, req->uri_len);
-
-       PRINT_MESSAGE_LEFT;
-       /*
-        * Parse the HTTP version field:
-        */
-       req->version_str = curr;
-       if (!PARSE_TOKEN(curr,"HTTP/1.",left))
-               GOTO_REDIR;
-
-       switch (get_c(curr,left)) {
-               case '0':
-                       req->version = HTTP_1_0;
-                       break;
-               case '1':
-                       req->version = HTTP_1_1;
-                       break;
-               default:
-                       GOTO_REDIR;
-       }
-       /*
-        * We default to keepalive in the HTTP/1.1 case and default
-        * to non-keepalive in the HTTP/1.0 case. If max_keepalives
-        * is 0 then we do no keepalives.
-        */
-       clear_keepalive(req);
-       if (tux_max_keepalives && (req->version == HTTP_1_1))
-               req->keep_alive = 1;
-       req->version_len = curr - req->version_str;
-
-       if (get_c(curr,left) != '\r')
-               GOTO_REDIR;
-       if (get_c(curr,left) != '\n')
-               GOTO_REDIR;
-
-       Dprintk("got version %d [%d]\n", req->version, req->version_len);
-       PRINT_MESSAGE_LEFT;
-
-       /*
-        * Now parse (optional) request header fields:
-        */
-       for (;;) {
-               char c;
-
-               c = get_c(curr,left);
-               switch (c) {
-               case '\r':
-                       if (have_r)
-                               GOTO_REDIR;
-                       have_r = 1;
-                       continue;
-               case '\n':
-                       if (!have_r)
-                               GOTO_REDIR;
-                       goto out;
-               default:
-                       if (have_r)
-                               GOTO_REDIR;
-               }
-
-#define PARSE_STR_FIELD(char,field,str,len)                            \
-       if (PARSE_TOKEN(curr,field,left)) {                             \
-               req->str = curr;                                        \
-               SKIP_LINE(curr,left);                                   \
-               req->len = curr - req->str - 2;                         \
-               Dprintk(char field "field: %s.\n", req->str);           \
-               break;                                                  \
-       }
-
-#define ALLOW_UNKNOWN_FIELDS 1
-#ifdef ALLOW_UNKNOWN_FIELDS
-# define UNKNOWN_FIELD { SKIP_LINE(curr,left); break; }
-#else
-# define UNKNOWN_FIELD GOTO_REDIR
-#endif
-
-               switch (c) {
-               case 'A':
-                       PARSE_STR_FIELD("A","ccept: ",
-                               accept_str,accept_len);
-                       if (PARSE_TOKEN(curr,"ccept-Encoding: ",left)) {
-                               const char *str = curr-1;
-
-                               req->accept_encoding_str = curr;
-                               SKIP_LINE(curr,left);
-                               req->accept_encoding_len = curr - req->accept_encoding_str - 2;
-                               Dprintk("Accept-Encoding field: {%s}.\n", str);
-
-                               if (tux_compression && may_gzip(str,curr-str)) {
-                                       Dprintk("client accepts gzip!.\n");
-                                       req->may_send_gzip = 1;
-                               }
-                               break;
-                       }
-                       PARSE_STR_FIELD("A","ccept-Charset: ",
-                               accept_charset_str,accept_charset_len);
-                       PARSE_STR_FIELD("A","ccept-Language: ",
-                               accept_language_str,accept_language_len);
-                       UNKNOWN_FIELD;
-
-               case 'C':
-                       if (PARSE_TOKEN(curr,"onnection: ",left)) {
-next_token:
-                       switch (get_c(curr,left)) {
-                       case 'K':
-                               if (!PARSE_TOKEN(curr,"eep-Alive",left))
-                                       GOTO_REDIR;
-                               if (tux_max_keepalives)
-                                       req->keep_alive = 1;
-                               break;
-
-                       case 'C':
-                       case 'c':
-                               if (!PARSE_TOKEN(curr,"lose",left))
-                                       GOTO_REDIR;
-                               clear_keepalive(req);
-                               break;
-
-                       case 'k':
-                               if (!PARSE_TOKEN(curr,"eep-alive",left))
-                                       GOTO_REDIR;
-                               if (tux_max_keepalives)
-                                       req->keep_alive = 1;
-                               break;
-                       case 'T':
-                               if (PARSE_TOKEN(curr,"E",left))
-                                       break;
-                               if (PARSE_TOKEN(curr,"railers",left))
-                                       break;
-                               if (PARSE_TOKEN(curr,"ransfer-Encoding",left))
-                                       break;
-                               GOTO_REDIR;
-                       case 'P':
-                               if (PARSE_TOKEN(curr,"roxy-Authenticate",left))
-                                       break;
-                               if (PARSE_TOKEN(curr,"roxy-Authorization",left))
-                                       break;
-                               GOTO_REDIR;
-                       case 'U':
-                               if (!PARSE_TOKEN(curr,"pgrade",left))
-                                       GOTO_REDIR;
-                               break;
-                       case ' ':
-                               PRINT_MESSAGE_LEFT;
-                               goto next_token;
-                       case ',':
-                               PRINT_MESSAGE_LEFT;
-                               goto next_token;
-                       default:
-                               GOTO_REDIR;
-                       }
-                       PRINT_MESSAGE_LEFT;
-                       if (*curr != '\r')
-                               goto next_token;
-                       // allow other tokens.
-                       SKIP_LINE(curr,left);
-                       break;
-                       }
-
-                       PARSE_STR_FIELD("C","ookie: ",
-                               cookies_str,cookies_len);
-                       PARSE_STR_FIELD("C","ontent-Type: ",
-                               content_type_str,content_type_len);
-
-                       if (PARSE_TOKEN(curr,"ontent-Length: ",left) ||
-                           PARSE_TOKEN(curr,"ontent-length: ",left)) {
-                               const char *tmp;
-                               req->contentlen_str = curr;
-                               SKIP_LINE(curr,left);
-                               req->contentlen_len = curr - req->contentlen_str - 2;
-                               if (req->contentlen_len) {
-                                       tmp = req->contentlen_str;
-                                       req->content_len = simple_strtoul(tmp, NULL, 10);
-                               }
-                               Dprintk("Content-Length field: %s [%d].\n", req->contentlen_str, req->contentlen_len);
-                               Dprintk("Content-Length value: %d.\n", req->content_len);
-                               break;
-                       }
-                       PARSE_STR_FIELD("C","ache-Control: ",
-                               cache_control_str,cache_control_len);
-                       UNKNOWN_FIELD;
-
-               case 'H':
-                       if (PARSE_TOKEN(curr,"ost: ",left)) {
-                               const char *tmp = curr;
-                               char *tmp2 = req->host;
-
-                               /*
-                                * canonize the hostname:
-                                *
-                                * 1) strip off preceding 'www.' variants,
-                                * 2) transform it to lowercase.
-                                * 3) strip trailing dots
-                                * 4) potentially strip off tail
-                                */
-                               
-#define is_w(n) ((curr[n] == 'w') || (curr[n] == 'W'))
-
-                               if ((left > 4) && is_w(0) && is_w(1) &&
-                                               is_w(2) && curr[3] == '.') {
-                                       curr += 4;
-                                       left -= 4;
-                                       tmp = curr;
-                               }
-                        
-                               COPY_LINE_TOLOWER(curr, tmp2, left, req->host+MAX_HOST_LEN-2);
-                               req->host_len = curr - tmp - 2;
-                               while (req->host[req->host_len] == '.') {
-                                       if (!req->host_len)
-                                               break;
-                                       req->host_len--;
-                               }
-                               req->host[req->host_len] = 0;
-                               if (strip_host_tail)
-                                       strip_hostname(req);
-                               Dprintk("Host field: %s [%d].\n", req->host, req->host_len);
-                               break;
-                       }
-                       UNKNOWN_FIELD;
-
-               case 'I':
-                       PARSE_STR_FIELD("I","f-None-Match: ",
-                               if_none_match_str,if_none_match_len);
-                       PARSE_STR_FIELD("I","f-Modified-Since: ",
-                               if_modified_since_str,if_modified_since_len);
-                       PARSE_STR_FIELD("I","f-Range: ",
-                               if_range_str,if_range_len);
-                       UNKNOWN_FIELD;
-
-               case 'N':
-                       PARSE_STR_FIELD("N","egotiate: ",
-                               negotiate_str,negotiate_len);
-                       UNKNOWN_FIELD;
-
-               case 'P':
-                       PARSE_STR_FIELD("P","ragma: ",
-                               pragma_str,pragma_len);
-                       UNKNOWN_FIELD;
-
-               case 'R':
-
-                       PARSE_STR_FIELD("R","eferer: ",
-                               referer_str,referer_len);
-                       if (!PARSE_TOKEN(curr,"ange: bytes=",left))
-                               UNKNOWN_FIELD;
-               {
-                       const char *tmp = curr;
-                       char *tmp2 = (char *)curr;
-                       unsigned int offset_start = 0, offset_end = 0;
-
-                       if (*tmp2 != '-')
-                               offset_start = simple_strtoul(tmp2, &tmp2, 10);
-                       if (*tmp2 == '-') {
-                               tmp2++;
-                               if (*tmp2 != '\r')
-                                       offset_end = simple_strtoul(tmp2, &tmp2, 10) +1;
-                       }
-                       curr = tmp2;
-                       left -= tmp2-tmp;
-
-                       req->offset_start = offset_start;
-                       req->offset_end = offset_end;
-
-                       SKIP_LINE(curr,left);
-                       Dprintk("Range field: %s [%d] (%d-%d).\n", tmp, curr-tmp, offset_start, offset_end);
-                       break;
-               }
-
-               case 'U':
-                       PARSE_STR_FIELD("U","ser-Agent: ",
-                               user_agent_str,user_agent_len);
-                       UNKNOWN_FIELD;
-
-               default:
-                       UNKNOWN_FIELD;
-               }
-               PRINT_MESSAGE_LEFT;
-       }
-out:
-       /*
-        * POST data.
-        */
-       if ((req->method == METHOD_POST) && req->content_len) {
-               PRINT_MESSAGE_LEFT;
-               if (curr + req->content_len > message + total_len)
-                       GOTO_INCOMPLETE;
-               req->post_data_str = curr;
-               req->post_data_len = req->content_len;
-               curr += req->content_len;
-               left -= req->content_len;
-               Dprintk("POST-ed data: {%s}\n", req->post_data_str);
-       }
-
-       switch (req->method) {
-               default:
-                       GOTO_REDIR;
-               case METHOD_GET:
-               case METHOD_HEAD:
-               case METHOD_POST:
-               case METHOD_PUT:
-                       ;
-       }
-
-#define TUX_SCHEME "http://"
-#define TUX_SCHEME_LEN (sizeof(TUX_SCHEME)-1)
-
-       if (!memcmp(req->objectname, TUX_SCHEME, TUX_SCHEME_LEN)) {
-
-               /* http://user:password@host:port/object */
-
-               const char *head, *tail, *end, *host, *port;
-               int host_len, objectname_len;
-
-               head = req->objectname + TUX_SCHEME_LEN;
-               end = req->objectname + req->objectname_len;
-
-               tail = memchr(head, '/', end - head);
-               if (!tail)
-                       GOTO_REDIR;
-               host = memchr(head, '@', tail - head);
-               if (!host)
-                       host = head;
-               else
-                       host++;
-               if (!*host)
-                       GOTO_REDIR;
-               port = memchr(host, ':', tail - host);
-               if (port)
-                       host_len = port - host;
-               else
-                       host_len = tail - host;
-               if (host_len >= MAX_HOST_LEN)
-                       GOTO_REDIR;
-               memcpy(req->host, host, host_len);
-               req->host_len = host_len;
-               req->host[host_len] = 0;
-
-               if (*tail != '/')
-                       TUX_BUG();
-
-               req->uri_str = tail;
-               req->uri_len = end - tail;
-
-               tail++;
-               while (*tail == '/')
-                       tail++;
-
-               objectname_len = end - tail;
-               memcpy(req->objectname, tail, objectname_len);
-               req->objectname_len = objectname_len;
-               req->objectname[objectname_len] = 0;
-       } else
-               if (req->uri_str[0] != '/')
-                       GOTO_REDIR;
-
-       if ((req->version == HTTP_1_1) && !req->host_len)
-               GOTO_REDIR;
-       if (req->objectname[0] == '/')
-               GOTO_REDIR;
-       /*
-        * Lets make sure nobody plays games with the host
-        * header in a virtual hosting environment:
-        */
-       if (req->virtual && req->host_len) {
-               if (memchr(req->host, '/', req->host_len))
-                       GOTO_REDIR;
-               if (req->host[0] == '.') {
-                       if (req->host_len == 1)
-                               GOTO_REDIR;
-                       if ((req->host_len == 2) && (req->host[0] == '.'))
-                               GOTO_REDIR;
-               }
-       }
-       /*
-        * From this point on the request is for the main TUX engine:
-        */
-       Dprintk("ok, request accepted.\n");
-
-       if (req->keep_alive) {
-               req->nr_keepalives++;
-               if (req->nr_keepalives == -1)
-                       req->nr_keepalives--;
-               INC_STAT(nr_keepalive_reqs);
-       } else
-               INC_STAT(nr_nonkeepalive_reqs);
-       INC_STAT(keepalive_hist[req->nr_keepalives]);
-
-       PRINT_MESSAGE_LEFT;
-       req->parsed_len = curr-message;
-       if (req->dentry)
-               TUX_BUG();
-       req->virtual = tux_virtual_server;
-       if (req->virtual)
-               add_tux_atom(req, http_lookup_vhost);
-       else {
-               req->docroot_dentry = dget(req->proto->main_docroot.dentry);
-               req->docroot_mnt = mntget(req->proto->main_docroot.mnt);
-               add_tux_atom(req, http_process_message);
-       }
-
-       return req->parsed_len;
-
-incomplete_message:
-       Dprintk("incomplete message!\n");
-       PRINT_MESSAGE_LEFT;
-
-       return 0;
-
-error:
-       if (total_len > 0)
-               req->parsed_len = total_len;
-       else
-               req->parsed_len = 0;
-       PRINT_MESSAGE_LEFT;
-       if (tux_TDprintk) {
-               TDprintk("redirecting message to secondary server.\n");
-               print_req(req);
-       }
-       return -1;
-}
-
-static int lookup_url (tux_req_t *req, const unsigned int flag)
-{
-       /*
-        * -1 : no previous checks made
-        *  0 : previous check failed, do not check farther, 
-        *  1 : previous check successed, check farther
-        */
-       int not_modified = -1;
-       int perm = 0, i;
-       struct dentry *dentry = NULL;
-       struct vfsmount *mnt = NULL;
-       struct inode *inode;
-       const char *filename;
-
-       /*
-        * Do not do any etag or last_modified header checking
-        * if both unset.
-        */
-       if (!tux_generate_etags && !tux_generate_last_mod)
-               not_modified = 0;
-
-repeat_lookup:
-       if (req->dentry)
-               TUX_BUG();
-
-       filename = req->objectname;
-       Dprintk("will look up {%s} (%d)\n", filename, req->objectname_len);
-       Dprintk("current->fsuid: %d, current->fsgid: %d, ngroups: %d\n",
-               current->fsuid, current->fsgid, current->group_info->ngroups);
-       for (i = 0; i < current->group_info->ngroups; i++)
-               Dprintk(".. group #%d: %d.\n", i, current->groups[i]);
-
-       dentry = tux_lookup(req, filename, flag, &mnt);
-
-#define INDEX "/index.html"
-
-       if (!dentry || IS_ERR(dentry)) {
-               if (PTR_ERR(dentry) == -EWOULDBLOCKIO)
-                       goto cachemiss;
-
-               if (tux_http_dir_indexing && (req->lookup_dir == 1)) {
-                       // undo the index.html appending:
-                       req->objectname_len -= sizeof(INDEX)-1;
-                       req->objectname[req->objectname_len] = 0;
-                       req->lookup_dir = 2;
-                       goto repeat_lookup;
-               }
-               if (!req->lookup_404) {
-                       int len = strlen(tux_404_page);
-                       memcpy(req->objectname, tux_404_page, len);
-                       req->objectname[len] = 0;
-                       req->objectname_len = len;
-                       req->lookup_404 = 1;
-                       req->status = 404;
-                       goto repeat_lookup;
-               }
-               TDprintk("abort - lookup error.\n");
-               goto abort;
-       }
-
-       Dprintk("SUCCESS, looked up {%s} == dentry %p (inode %p, count %d.)\n", filename, dentry, dentry->d_inode, atomic_read(&dentry->d_count));
-       inode = dentry->d_inode;
-
-       /*
-        * At this point we have a real, non-negative dentry.
-        */
-       perm = tux_permission(inode);
-
-       if ((perm < 0) || (!S_ISDIR(dentry->d_inode->i_mode)
-                               && !S_ISREG(dentry->d_inode->i_mode))) {
-               Dprintk("FAILED trusted dentry %p permission %d.\n", dentry, perm);
-               req->status = 403;
-               goto abort;
-       }
-       if ((req->lookup_dir != 2) && S_ISDIR(dentry->d_inode->i_mode)) {
-               if (req->lookup_dir || (req->objectname_len +
-                                sizeof(INDEX) >= MAX_OBJECTNAME_LEN)) {
-                       req->status = 403;
-                       goto abort;
-               }
-               if (req->objectname_len && (req->objectname[req->objectname_len-1] != '/')) {
-                       dput(dentry);
-                       mntput(mnt);
-                       req->lookup_dir = 0;
-                       return 2;
-               }
-               memcpy(req->objectname + req->objectname_len,
-                                               INDEX, sizeof(INDEX));
-               req->objectname_len += sizeof(INDEX)-1;
-               req->lookup_dir = 1;
-               dput(dentry);
-               mntput(mnt);
-               mnt = NULL;
-               dentry = NULL;
-               goto repeat_lookup;
-       }
-       if (tux_max_object_size && (inode->i_size > tux_max_object_size)) {
-               TDprintk("too big object, %Ld bytes.\n", inode->i_size);
-               req->status = 403;
-               goto abort;
-       }
-       req->total_file_len = inode->i_size;
-       req->mtime = inode->i_mtime.tv_sec;
-
-       {
-               loff_t num = req->total_file_len;
-               int nr_digits = 0;
-               unsigned long modulo;
-               char * etag_p = req->etag;
-               char digits [30];
-
-               do {
-                       modulo = do_div(num, 10);
-                       digits[nr_digits++] = '0' + modulo;
-               } while (num);
-
-               req->lendigits = nr_digits;
-               req->etaglen = nr_digits;
-
-               while (nr_digits)
-                       *etag_p++ = digits[--nr_digits];
-
-               *etag_p++ = '-';
-               num = req->mtime;
-               nr_digits = 0;
-
-               do {
-                       digits[nr_digits++] = 'a' + num % 16;
-                               num /= 16;
-               } while (num);
-               req->etaglen += nr_digits+1;
-               while (nr_digits)
-                       *etag_p++ = digits[--nr_digits];
-               *etag_p = 0;
-       }
-
-       if ((req->if_none_match_len >= req->etaglen) && (abs(not_modified) == 1)) {
-
-               char * etag_p = req->etag;
-               const char * match_p = req->if_none_match_str;
-               int pos = req->etaglen - 1;
-               int matchpos = req->etaglen - 1;
-
-               do {
-                       while (etag_p[matchpos--] == match_p[pos--])
-                               if (matchpos < 0)
-                                       break;
-                       if (matchpos < 0)
-                               pos = req->if_none_match_len;
-                       else {
-                               if (match_p[pos+1] == ',')
-                                       pos += req->etaglen + 2;
-                               else
-                                       pos += req->etaglen-matchpos;
-                               matchpos = req->etaglen - 1;
-                       }
-               } while (pos < req->if_none_match_len);
-
-               if (matchpos < 0) {
-                       not_modified = 1;
-                       TDprintk("Etag matched.\n");
-               } else
-                       not_modified = 0; 
-       }
-
-        if ((req->if_modified_since_len >= 24) && (abs(not_modified) == 1)) {
-                if (parse_time(req->if_modified_since_str, req->if_modified_since_len) >= req->mtime ) {
-                       not_modified = 1;
-                        Dprintk("Last-Modified matched.\n");
-                } else
-                       not_modified = 0;
-        }
-
-       if (not_modified == 1) {
-               req->status = 304;
-               goto abort;
-       }
-
-       Dprintk("looked up cached dentry %p, (count %d.)\n", dentry, dentry ? atomic_read(&dentry->d_count) : -1 );
-
-       url_hist_hit(req->total_file_len);
-out:
-       install_req_dentry(req, dentry, mnt);
-       req->lookup_dir = 0;
-       return 0;
-
-cachemiss:
-       return 1;
-
-abort:
-       if (dentry) {
-               if (!IS_ERR(dentry))
-                       dput(dentry);
-               dentry = NULL;
-       }
-       if (mnt) {
-               if (!IS_ERR(mnt))
-                       mntput(mnt);
-               mnt = NULL;
-       }
-#if CONFIG_TUX_DEBUG
-       if (!not_modified) {
-               TDprintk("req %p has lookup errors!\n", req);
-               if (tux_TDprintk)
-                       print_req(req);
-       }
-#endif
-       req_err(req);
-       goto out;
-}
-
-int handle_gzip_req (tux_req_t *req, unsigned int flags)
-{
-       char *curr = req->objectname + req->objectname_len;
-       struct dentry *dentry;
-       struct vfsmount *mnt = NULL;
-       struct inode *inode, *orig_inode;
-       loff_t size, orig_size;
-
-       *curr++ = '.';
-       *curr++ = 'g';
-       *curr++ = 'z';
-       *curr++ = 0;
-       req->objectname_len += 3;
-
-       dentry = tux_lookup(req, req->objectname, flags, &mnt);
-
-       req->objectname_len -= 3;
-       req->objectname[req->objectname_len] = 0;
-
-       if (!dentry)
-               return 0;
-       if (IS_ERR(dentry)) {
-               if (PTR_ERR(dentry) == -EWOULDBLOCKIO) {
-                       release_req_dentry(req);
-                       return 1;
-               }
-               return 0;
-       }
-
-       inode = dentry->d_inode;
-       size = inode->i_size;
-       orig_inode = req->dentry->d_inode;
-       orig_size = orig_inode->i_size;
-
-       if (!tux_permission(inode)
-                       && (size < orig_size)
-                       && (inode->i_mtime.tv_sec >= orig_inode->i_mtime.tv_sec)) {
-
-               release_req_dentry(req);
-               install_req_dentry(req, dentry, mnt);
-               req->total_file_len = req->output_len = size;
-               Dprintk("content WILL be gzipped!\n");
-               req->content_gzipped = 1;
-       } else {
-               dput(dentry);
-               mntput(mnt);
-       }
-
-       return 0;
-}
-
-static spinlock_t mimetypes_lock = SPIN_LOCK_UNLOCKED;
-
-static LIST_HEAD(mimetypes_head);
-
-static mimetype_t default_mimetype = { type: "text/plain", type_len: 10, expire_str: "", expire_str_len: 0 };
-
-#define MAX_MIMETYPE_LEN 128
-#define MAX_CACHE_CONTROL_AGE_LEN 30
-
-void add_mimetype (char *new_ext, char *new_type, char *new_expire)
-{
-       int type_len = strlen(new_type);
-       int ext_len = strlen(new_ext);
-       int expire_len = strlen(new_expire);
-       mimetype_t *mime;
-       char *ext, *type, *expire;
-
-        if (type_len > MAX_MIMETYPE_LEN)
-                type_len = MAX_MIMETYPE_LEN;
-        if (ext_len > MAX_URI_LEN)
-                ext_len = MAX_URI_LEN;
-        if (expire_len > MAX_CACHE_CONTROL_AGE_LEN)
-                expire_len = MAX_CACHE_CONTROL_AGE_LEN;
-
-       mime = tux_kmalloc(sizeof(*mime));
-       memset(mime, 0, sizeof(*mime));
-       ext = tux_kmalloc(ext_len + 1);
-       type = tux_kmalloc(type_len + 1);
-       expire = tux_kmalloc(expire_len + 1);
-
-       strncpy(ext, new_ext, ext_len);
-       strncpy(type, new_type, type_len);
-       strncpy(expire, new_expire, expire_len);
-       
-       // in case one of the above parameters was too long :
-
-       ext[ext_len] = '\0';
-       type[type_len] = '\0';
-       expire[expire_len] = '\0';
-
-       mime->ext = ext;
-       mime->ext_len = ext_len;
-
-       mime->type = type;
-       mime->type_len = type_len;
-
-       mime->expire_str = expire;
-       mime->expire_str_len = expire_len;
-
-       mime->special = NORMAL_MIME_TYPE;
-       if (!strcmp(type, "TUX/redirect"))
-               mime->special = MIME_TYPE_REDIRECT;
-       if (!strcmp(type, "TUX/CGI"))
-               mime->special = MIME_TYPE_CGI;
-       if (!strcmp(type, "TUX/module"))
-               mime->special = MIME_TYPE_MODULE;
-
-       spin_lock(&mimetypes_lock);
-       list_add(&mime->list, &mimetypes_head);
-       spin_unlock(&mimetypes_lock);
-}
-
-static inline int ext_matches (char *file, int len, char *ext, int extlen)
-{
-       int i;
-       char *tmp = file + len-1;
-       char *tmp2 = ext + extlen-1;
-
-       if (len < extlen)
-               return 0;
-
-       for (i = 0; i < extlen; i++) {
-               if (*tmp != *tmp2)
-                       return 0;
-               tmp--;
-               tmp2--;
-       }
-       return 1;
-}
-
-/*
- * Overhead is not a problem, we cache the MIME type
- * in the dentry.
- */
-static mimetype_t * lookup_mimetype (tux_req_t *req)
-{
-       char *objectname = req->objectname;
-       int len = req->objectname_len;
-       mimetype_t *mime = NULL;
-       struct list_head *head, *tmp, *tmp1, *tmp2, *tmp3;
-
-       if (!memchr(objectname, '.', len))
-               goto out;
-
-       spin_lock(&mimetypes_lock);
-       head = &mimetypes_head;
-       tmp = head->next;
-
-       while (tmp != head) {
-               mime = list_entry(tmp, mimetype_t, list);
-               if (ext_matches(objectname, len, mime->ext, mime->ext_len)) {
-                       /*
-                        * Percolate often-used mimetypes up:
-                        */
-                       if (tmp->prev != &mimetypes_head) {
-                               tmp1 = tmp;
-                               tmp2 = tmp->prev;
-                               tmp3 = tmp->prev->prev;
-                               list_del(tmp1);
-                               list_del(tmp2);
-                               list_add(tmp, tmp3);
-                               list_add(tmp2, tmp);
-                       }
-                       break;
-               } else
-                       mime = NULL;
-               tmp = tmp->next;
-       }
-       spin_unlock(&mimetypes_lock);
-
-out:
-       if (!mime)
-               mime = &default_mimetype;
-       return mime;
-}
-
-void free_mimetypes (void)
-{
-       struct list_head *head, *tmp, *next;
-       mimetype_t *mime;
-
-       spin_lock(&mimetypes_lock);
-       head = &mimetypes_head;
-       tmp = head->next;
-
-       while (tmp != head) {
-               next = tmp->next;
-               mime = list_entry(tmp, mimetype_t, list);
-               list_del(tmp);
-
-               kfree(mime->ext);
-               mime->ext = NULL;
-               kfree(mime->type);
-               mime->type = NULL;
-               kfree(mime);
-
-               tmp = next;
-       }
-       spin_unlock(&mimetypes_lock);
-}
-
-/*
- * Various constant HTTP responses:
- */
-
-static const char forbidden[] =
-       "HTTP/1.1 403 Forbidden\r\n"
-       "Connection: Keep-Alive\r\n" \
-       "Content-Length: 24\r\n\r\n"
-       "<HTML> Forbidden </HTML>";
-
-static const char not_found[] =
-       "HTTP/1.1 404 Not Found\r\n"
-       "Connection: Keep-Alive\r\n" \
-       "Content-Length: 29\r\n\r\n"
-       "<HTML> Page Not Found </HTML>";
-
-#define NOTMODIFIED_1 \
-       "HTTP/1.1 304 Not Modified\r\n" \
-       "Connection: Keep-Alive\r\n" \
-       "Date: "
-
-#define NOTMODIFIED_1_LEN (sizeof(NOTMODIFIED_1) - 1)
-
-#define NOTMODIFIED_2 \
-       "\r\nETag: \""
-
-#define NOTMODIFIED_2_LEN (sizeof(NOTMODIFIED_2) - 1)
-
-#define NOTMODIFIED_3 \
-       "\"\r\n\r\n"
-
-#define NOTMODIFIED_3_LEN (sizeof(NOTMODIFIED_3) - 1)
-
-#define REDIRECT_1 \
-       "HTTP/1.1 301 Moved Permanently\r\n" \
-       "Location: http://"
-
-#define REDIRECT_1_LEN (sizeof(REDIRECT_1) - 1)
-
-#define REDIRECT_2 \
-       "/\r\nContent-Length: 36\r\n" \
-       "Connection: Keep-Alive\r\n" \
-       "Content-Type: text/html\r\n\r\n" \
-       "<HTML> 301 Moved Permanently </HTML>"
-
-#define REDIRECT_2_LEN (sizeof(REDIRECT_2) - 1)
-
-void send_async_err_forbidden (tux_req_t *req)
-{
-       send_async_message(req, forbidden, 403, 1);
-}
-
-void send_async_err_not_found (tux_req_t *req)
-{
-       send_async_message(req, not_found, 404, 1);
-}
-
-static void send_ret_notmodified (tux_req_t *req)
-{
-       char *buf;
-       int size;
-
-       size = NOTMODIFIED_1_LEN + DATE_LEN - 1 + NOTMODIFIED_2_LEN + req->etaglen + NOTMODIFIED_3_LEN;
-       buf = get_abuf(req, size); 
-       memcpy(buf, NOTMODIFIED_1, NOTMODIFIED_1_LEN);
-       buf += NOTMODIFIED_1_LEN;
-       memcpy(buf, tux_date, DATE_LEN-1);
-       buf += DATE_LEN-1; 
-       memcpy(buf, NOTMODIFIED_2, NOTMODIFIED_2_LEN);
-       buf += NOTMODIFIED_2_LEN;
-       memcpy(buf, &req->etag, req->etaglen);
-       buf += req->etaglen;
-       memcpy(buf, NOTMODIFIED_3, NOTMODIFIED_3_LEN);
-       buf += NOTMODIFIED_3_LEN;
-
-       req->status = 304;
-       send_abuf(req, size, MSG_DONTWAIT);
-       add_req_to_workqueue(req);
-}
-
-static void send_ret_redirect (tux_req_t *req, int cachemiss)
-{
-       char *buf;
-       unsigned int size;
-       unsigned int uts_len = 0;
-
-       size = REDIRECT_1_LEN;
-       if (req->host_len)
-               size += req->host_len;
-       else {
-               down_read(&uts_sem);
-               uts_len = strlen(system_utsname.nodename);
-               size += uts_len;
-       }
-       if (req->objectname[0] != '/')
-               size++;
-       size += req->objectname_len;
-       size += REDIRECT_2_LEN;
-
-       if (size > PAGE_SIZE) {
-               req->error = TUX_ERROR_CONN_CLOSE;
-               zap_request(req, cachemiss);
-               return;
-       }
-
-       buf = get_abuf(req, size);
-
-       memcpy(buf, REDIRECT_1, REDIRECT_1_LEN);
-       buf += REDIRECT_1_LEN;
-
-       Dprintk("req %p, host: %s, host_len: %d.\n", req, req->host, req->host_len);
-       if (req->host_len) {
-               memcpy(buf, req->host, req->host_len);
-               buf += req->host_len;
-       } else {
-               memcpy(buf, system_utsname.nodename, uts_len);
-               up_read(&uts_sem);
-               buf += uts_len;
-       }
-       if (req->objectname[0] != '/') {
-               buf[0] = '/';
-               buf++;
-       }
-
-       memcpy(buf, req->objectname, req->objectname_len);
-       buf += req->objectname_len;
-
-       memcpy(buf, REDIRECT_2, REDIRECT_2_LEN);
-       buf += REDIRECT_2_LEN;
-
-       req->status = 301;
-       send_abuf(req, size, MSG_DONTWAIT);
-       add_req_to_workqueue(req);
-}
-
-static void http_got_request (tux_req_t *req)
-{
-       req->host[0] = 0;
-       req->host_len = 0;
-       add_tux_atom(req, parse_request);
-       add_req_to_workqueue(req);
-}
-
-
-tux_attribute_t * lookup_tux_attribute (tux_req_t *req)
-{
-       tux_attribute_t *attr;
-       struct inode *inode;
-       mimetype_t *mime;
-
-       attr = tux_kmalloc(sizeof(*attr));
-       memset(attr, 0, sizeof(*attr));
-
-       mime = lookup_mimetype(req);
-
-       inode = req->dentry->d_inode;
-       if (!inode->i_uid && !inode->i_gid) {
-               if (mime->special == MIME_TYPE_MODULE) {
-                       attr->tcapi = lookup_tuxmodule(req->objectname);
-                       if (!attr->tcapi) {
-                               req_err(req);
-                               mime = &default_mimetype;
-                       }
-               }
-       } else {
-               if (mime->special && (mime->special != MIME_TYPE_REDIRECT))
-                       mime = &default_mimetype;
-       }
-       attr->mime = mime;
-
-       return attr;
-}
-
-static void handle_range(tux_req_t *req)
-{
-       if (req->if_range_len) {
-               time_t range_time;
-
-               range_time = parse_time(req->if_range_str, req->if_range_len);
-
-               /*
-                * If the file is newer then we send the whole file.
-                */
-               if (range_time < req->mtime )
-                       goto out_no_range;
-       }
-       /* if no offset_end was specified then default to 'end of file': */
-       if (!req->offset_end)
-               req->offset_end = req->total_file_len;
-       /*
-        * Sanity checks:
-        *
-        *  - is the range between 0...file_len-1 ?
-        *  - is offset_end after offset_start?
-        *
-        * (note that offset_end is higher by 1)
-        */
-       if ((req->offset_end > req->total_file_len) ||
-                       (req->offset_start >= req->total_file_len) ||
-                       (req->offset_end <= req->offset_start))
-               goto out_no_range;
-       /*
-        * If the range is 0...file_len-1 then send the whole file:
-        */
-       if (!req->offset_start && (req->offset_end == req->total_file_len))
-               goto out_no_range;
-
-       /* ok, the range is valid, use it: */
-
-       req->output_len = req->offset_end - req->offset_start;
-       req->in_file.f_pos = req->offset_start;
-       return;
-
-out_no_range:
-       req->offset_start = 0;
-       req->offset_end = 0;
-}
-
-static void http_pre_header (tux_req_t *req, int push);
-static void http_post_header (tux_req_t *req, int cachemiss);
-static void http_send_body (tux_req_t *req, int cachemiss);
-
-#define DIRLIST_HEAD_1 "\
-<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 3.2 Final//EN\">\
-<HTML><HEAD><TITLE>Index of %s</TITLE></HEAD><BODY>\
-<H1>Index of %s </H1><PRE><HR>\n%s"
-
-#define DIRLIST_HEAD_2 "\
-<IMG SRC=\"/icons/back.gif\"ALT=\"[DIR]\"> <A HREF=\"../\">Parent Directory</A>\n"
-
-#define DIRLIST_HEAD_SIZE (sizeof(DIRLIST_HEAD_1) + sizeof(DIRLIST_HEAD_2))
-
-static void http_dirlist_head (tux_req_t *req, int cachemiss)
-{
-       char *buf1, *buf2, *path;
-       int len;
-
-       buf1 = (char *)__get_free_page(GFP_KERNEL);
-       buf2 = (char *)__get_free_page(GFP_KERNEL);
-       if (!buf1 || !buf2)
-               goto out;
-       path = tux_print_path(req, req->dentry, req->mnt, buf1, PAGE_SIZE);
-       if (path[0] == '/' && path[1] == '/' && !path[3])
-               path = "/";
-       if (2*strlen(path) + DIRLIST_HEAD_SIZE >= PAGE_SIZE)
-               goto out;
-       len = sprintf(buf2, DIRLIST_HEAD_1, path, path, req->dentry == req->docroot_dentry ? "" : DIRLIST_HEAD_2);
-       __send_async_message(req, buf2, 200, len, 0);
-
-out:
-       if (buf1)
-               free_page((unsigned long)buf1);
-       if (buf2)
-               free_page((unsigned long)buf2);
-}
-
-#define DIRLIST_TAIL "\
-</PRE><HR><ADDRESS><IMG SRC=\"/icons/tuxlogo.gif\"ALIGN=\"MIDDLE\"ALT=\"[TUX]\">Powered by Linux/TUX 3.0</ADDRESS>\n</BODY></HTML>"
-
-static void http_dirlist_tail (tux_req_t *req, int cachemiss)
-{
-       __send_async_message(req, DIRLIST_TAIL, 200, sizeof(DIRLIST_TAIL)-1, 1);
-}
-
-static void http_dirlist (tux_req_t *req, int cachemiss)
-{
-       int head = (req->method == METHOD_HEAD);
-
-       req->lookup_dir = 3;
-       clear_keepalive(req);
-       if (!head) {
-               add_tux_atom(req, http_dirlist_tail);
-               add_tux_atom(req, list_directory);
-               add_tux_atom(req, http_dirlist_head);
-       }
-       http_pre_header(req, head);
-       add_req_to_workqueue(req);
-}
-
-static char *host_path_hash(tux_req_t *req, char *tmp)
-{
-       if (req->host_len < 2)
-               return NULL;
-
-       switch (mass_hosting_hash) {
-               default:
-               case 0:
-                       return req->host;
-               case 1:
-
-                       // www.ABCDEFG.com => A/ABCDEFG.com
-
-                       tmp[0] = req->host[0];
-                       tmp[1] = '/';
-                       memcpy(tmp + 2, req->host, req->host_len);
-                       tmp[req->host_len + 2] = 0;
-
-                       return tmp;
-               case 2:
-                       // www.ABCDEFG.com => A/AB/ABCDEFG.com
-
-                       tmp[0] = req->host[0];
-                       tmp[1] = '/';
-                       tmp[2] = req->host[0];
-                       tmp[3] = req->host[1];
-                       tmp[4] = '/';
-                       memcpy(tmp + 5, req->host, req->host_len);
-                       tmp[req->host_len + 5] = 0;
-
-                       return tmp;
-               case 3:
-                       // www.ABCDEFG.com => A/AB/ABC/ABCDEFG.com
-
-                       tmp[0] = req->host[0];
-                       tmp[1] = '/';
-                       tmp[2] = req->host[0];
-                       tmp[3] = req->host[1];
-                       tmp[4] = '/';
-                       tmp[5] = req->host[0];
-                       tmp[6] = req->host[1];
-                       tmp[7] = req->host[2];
-                       tmp[8] = '/';
-                       memcpy(tmp + 9, req->host, req->host_len);
-                       tmp[req->host_len + 9] = 0;
-
-                       return tmp;
-       }
-}
-
-static struct dentry * vhost_lookup (tux_req_t *req, struct nameidata* base, struct vfsmount **mnt)
-{
-       struct dentry *dentry = NULL;
-       // 255.255.255.255
-       char ip [3+1+3+1+3+1+3 + 2];
-
-       if (req->virtual >= TUX_VHOST_IP) {
-               sprintf(ip, "%d.%d.%d.%d",
-                               NIPQUAD(inet_sk(req->sock->sk)->rcv_saddr));
-               dentry = __tux_lookup (req, ip, base, mnt);
-               if (!dentry || IS_ERR(dentry)) {
-                       if (PTR_ERR(dentry) == -EWOULDBLOCKIO)
-                               return dentry;
-                       base->dentry = dget(req->proto->main_docroot.dentry);
-                       base->mnt = mntget(req->proto->main_docroot.mnt);
-                       goto lookup_default;
-               }
-               if (req->virtual == TUX_VHOST_IP)
-                       goto done;
-
-               // fall through in mixed mode:
-       }
-
-       if (!req->host_len) {
-lookup_default:
-               *mnt = NULL;
-               dentry = __tux_lookup (req, tux_default_vhost, base, mnt);
-       } else {
-               char tmp [MAX_HOST_LEN*2];
-               char *host_path;
-
-               host_path = host_path_hash(req, tmp);
-               Dprintk("host path hash returned: {%s}\n", host_path);
-
-               dentry = NULL;
-               if (host_path) {
-                       *mnt = NULL;
-                       dentry = __tux_lookup (req, host_path, base, mnt);
-               }
-               if (!dentry || IS_ERR(dentry)) {
-                       if (PTR_ERR(dentry) == -EWOULDBLOCKIO)
-                               return dentry;
-                       base->dentry = dget(req->proto->main_docroot.dentry);
-                       base->mnt = mntget(req->proto->main_docroot.mnt);
-                       if (req->virtual >= TUX_VHOST_IP) {
-                               *mnt = NULL;
-                               dentry = __tux_lookup (req, ip, base, mnt);
-                               if (!dentry || IS_ERR(dentry)) {
-                                       if (PTR_ERR(dentry) == -EWOULDBLOCKIO)
-                                               return dentry;
-                                       base->dentry = dget(req->proto->main_docroot.dentry);
-                                       base->mnt = mntget(req->proto->main_docroot.mnt);
-                               }
-                       }
-                       goto lookup_default;
-               }
-       }
-done:
-       return dentry;
-}
-
-static void http_lookup_vhost (tux_req_t *req, int cachemiss)
-{
-       struct dentry *dentry;
-       struct nameidata base;
-       struct vfsmount *mnt = NULL;
-       unsigned int flag = cachemiss ? 0 : LOOKUP_ATOMIC;
-       
-       Dprintk("http_lookup_vhost(%p, %d, virtual: %d, host: %s (%d).)\n", req, flag, req->virtual, req->host, req->host_len);
-
-       base.flags = LOOKUP_FOLLOW|flag;
-       base.last_type = LAST_ROOT;
-       base.dentry = dget(req->proto->main_docroot.dentry);
-       base.mnt = mntget(req->proto->main_docroot.mnt);
-
-       dentry = vhost_lookup(req, &base, &mnt);
-
-       Dprintk("looked up dentry %p.\n", dentry);
-
-       if (dentry && !IS_ERR(dentry) && !dentry->d_inode)
-               TUX_BUG();
-
-       if (!dentry || IS_ERR(dentry)) {
-               if (PTR_ERR(dentry) == -EWOULDBLOCKIO) {
-                       add_tux_atom(req, http_lookup_vhost);
-                       queue_cachemiss(req);
-                       return;
-               }
-               goto abort;
-       }
-
-       req->docroot_dentry = dentry;
-       req->docroot_mnt = mnt;
-
-       add_tux_atom(req, http_process_message);
-       add_req_to_workqueue(req);
-       return;
-abort:
-       if (dentry) {
-               if (!IS_ERR(dentry))
-                       dput(dentry);
-               dentry = NULL;
-       }
-       if (mnt) {
-               if (!IS_ERR(mnt))
-                       mntput(mnt);
-               mnt = NULL;
-       }
-       req_err(req);
-       add_req_to_workqueue(req);
-}
-
-static void http_process_message (tux_req_t *req, int cachemiss)
-{
-       tux_attribute_t *attr;
-       int missed;
-       unsigned int lookup_flag = cachemiss ? 0 : LOOKUP_ATOMIC;
-
-       Dprintk("handling req %p, cachemiss: %d.\n", req, cachemiss);
-
-       /*
-        * URL redirection support - redirect all valid requests
-        * to the first userspace module.
-        */
-       if (tux_all_userspace) {
-               tcapi_template_t *tcapi = get_first_usermodule();
-               if (tcapi) {
-                       req->usermode = 1;
-                       req->usermodule_idx = tcapi->userspace_id;
-                       goto usermode;
-               }
-       }
-       missed = lookup_url(req, lookup_flag);
-       if (missed == 2) {
-               if (req->query_str) {
-                       req->error = TUX_ERROR_REDIRECT;
-                       goto error;
-               }
-               send_ret_redirect(req, cachemiss);
-               return;
-       }
-       if (req->error)
-               goto error;
-       if (missed) {
-cachemiss:
-               if (cachemiss)
-                       TUX_BUG();
-               Dprintk("uncached request.\n");
-               INC_STAT(static_lookup_cachemisses);
-               if (req->dentry)
-                       TUX_BUG();
-               add_tux_atom(req, http_process_message);
-               queue_cachemiss(req);
-               return;
-       }
-       /*
-        * HTML directory indexing.
-        */
-       if (S_ISDIR(req->dentry->d_inode->i_mode))
-               return http_dirlist(req, cachemiss);
-       if (!S_ISREG(req->dentry->d_inode->i_mode))
-               TUX_BUG();
-
-
-       attr = req->dentry->d_extra_attributes;
-       if (!attr) {
-               attr = lookup_tux_attribute(req);
-               if (!attr)
-                       TUX_BUG();
-               req->dentry->d_extra_attributes = attr;
-       }
-       if (attr->mime)
-               Dprintk("using MIME type %s:%s, %d.\n", attr->mime->type, attr->mime->ext, attr->mime->special);
-       if (attr->tcapi) {
-               req->usermode = 1;
-               req->usermodule_idx = attr->tcapi->userspace_id;
-               if (req->module_dentry)
-                       TUX_BUG();
-               req->module_dentry = dget(req->dentry);
-               release_req_dentry(req);
-               goto usermode;
-       }
-
-       switch (attr->mime->special) {
-               case MIME_TYPE_MODULE:
-                       req->usermode = 1;
-                       goto usermode;
-
-               case MIME_TYPE_REDIRECT:
-                       req->error = TUX_ERROR_REDIRECT;
-                       goto error;
-
-               case MIME_TYPE_CGI:
-#if CONFIG_TUX_EXTCGI
-                       Dprintk("CGI request %p.\n", req);
-                       query_extcgi(req);
-                       return;
-#endif
-
-               default:
-                       if (req->query_str) {
-                               req->error = TUX_ERROR_REDIRECT;
-                               goto error;
-                       }
-       }
-       req->attr = attr;
-       switch (req->method) {
-               case METHOD_GET:
-               case METHOD_HEAD:
-                       break;
-               default:
-                       req->error = TUX_ERROR_REDIRECT;
-                       goto error;
-       }
-       if (req->usermode)
-               TUX_BUG();
-
-       req->output_len = req->total_file_len;
-       /*
-        * Do range calculations.
-        */
-       if (req->offset_end || req->offset_start)
-               handle_range(req);
-
-       if (req->may_send_gzip && !req->offset_start && !req->offset_end) {
-               if (handle_gzip_req(req, lookup_flag))
-                       goto cachemiss;
-               if ((tux_compression >= 2) && !req->content_gzipped)
-                       req->content_gzipped = 2;
-       }
-       if (req->parsed_len)
-               trunc_headers(req);
-
-       if (req->error)
-               goto error;
-
-       add_tux_atom(req, http_send_body);
-       add_tux_atom(req, http_post_header);
-
-       http_pre_header(req, req->method == METHOD_HEAD);
-
-       add_req_to_workqueue(req);
-       return;
-
-error:
-       if (req->error)
-               zap_request(req, cachemiss);
-       return;
-
-usermode:
-       add_req_to_workqueue(req);
-}
-
-static void http_post_header (tux_req_t *req, int cachemiss)
-{
-#if CONFIG_TUX_DEBUG
-       req->bytes_expected = req->output_len;
-#endif
-       req->bytes_sent = 0; // data comes now.
-
-       add_req_to_workqueue(req);
-}
-
-static void http_send_body (tux_req_t *req, int cachemiss)
-{
-       int ret;
-
-       Dprintk("SEND req %p <%p> (sock %p, sk %p) (keepalive: %d, status: %d)\n", req, __builtin_return_address(0), req->sock, req->sock->sk, req->keep_alive, req->status);
-
-       SET_TIMESTAMP(req->output_timestamp);
-
-       if (req->error) {
-#if CONFIG_TUX_DEBUG
-               req->bytes_expected = 0;
-#endif
-               req->in_file.f_pos = 0;
-               /*
-                * We are in the middle of a file transfer,
-                * zap it immediately:
-                */
-               TDprintk("req->error = TUX_ERROR_CONN_CLOSE.\n");
-               req->error = TUX_ERROR_CONN_CLOSE;
-               zap_request(req, cachemiss);
-               return;
-       }
-
-repeat:
-       ret = 0;
-       if (!req->status)
-               req->status = 200;
-       if (req->method != METHOD_HEAD) {
-               ret = generic_send_file(req, req->sock, cachemiss);
-               Dprintk("body send-file returned: %d.\n", ret);
-       } else {
-#if CONFIG_TUX_DEBUG
-               req->bytes_expected = 0;
-#endif
-       }
-
-       switch (ret) {
-               case -5:
-                       add_tux_atom(req, http_send_body);
-                       output_timeout(req);
-                       break;
-               case -4:
-                       add_tux_atom(req, http_send_body);
-                       if (add_output_space_event(req, req->sock)) {
-                               del_tux_atom(req);
-                               goto repeat;
-                       }
-                       break;
-               case -3:
-                       INC_STAT(static_sendfile_cachemisses);
-                       add_tux_atom(req, http_send_body);
-                       queue_cachemiss(req);
-                       break;
-               case -1:
-                       break;
-               default:
-                       req->in_file.f_pos = 0;
-                       add_req_to_workqueue(req);
-                       break;
-       }
-}
-
-#define DEFAULT_DATE "Wed, 01 Jan 1970 00:00:01 GMT"
-
-char tux_date [DATE_LEN] = DEFAULT_DATE;
-
-/*
- * HTTP header
- */
-
-#define HEADER_PART1A \
-               "HTTP/1.1 200 OK\r\n" \
-               "Content-Type: "
-
-#define HEADER_PART1B \
-               "HTTP/1.1 200 OK" 
-
-#define HEADER_PART1AP \
-               "HTTP/1.1 206 Partial Content\r\n" \
-               "Content-Type: "
-
-#define HEADER_PART1BP \
-               "HTTP/1.1 206 Partial Content" 
-
-#define HEADER_PART1C \
-               "HTTP/1.1 404 Page Not Found\r\n" \
-               "Content-Type: "
-
-#define HEADER_PART1D \
-               "HTTP/1.1 200 OK\r\n" \
-               "Content-Type: text/html\r\n" \
-               "Connection: close\r\n"
-
-#define HEADER_PART2_keepalive "\r\nConnection: Keep-Alive\r\nDate: "
-
-#define HEADER_PART2_close "\r\nConnection: close\r\nDate: "
-
-#define HEADER_PART2_none "\r\nDate: "
-
-// date "%s"
-
-#define HEADER_PART3A "\r\nContent-Encoding: gzip"
-#define HEADER_PART3BX "\r\nContent-Length: "
-
-/*
- * Please acknowledge our hard work by not changing this define, or
- * at least please acknowledge us by leaving "TUX/2.0 (Linux)" in
- * the ID string. Thanks! :-)
- */
-#define HEADER_PART3BY "\r\nServer: TUX/2.0 (Linux)\r\nContent-Length: "
-#define HEADER_PART3C "\r\nETag: \""
-#define HEADER_PART3ACC "\r\nAccept-Ranges: bytes"
-#define HEADER_PART3L "\r\nLast-Modified: "
-#define HEADER_PART3P "\r\nContent-Range: bytes "
-#define HEADER_PART3CA "\r\nCache-Control: max-age="
-#define HEADER_PART4 "\r\n\r\n"
-
-#define MAX_OUT_HEADER_LEN (sizeof(HEADER_PART1AP) + MAX_MIMETYPE_LEN + \
-               sizeof(HEADER_PART2_keepalive) + DATE_LEN + \
-               sizeof(HEADER_PART3A) + sizeof(HEADER_PART3BY) + \
-               12 + sizeof(HEADER_PART3C) + 21 + sizeof(HEADER_PART3L) + \
-               sizeof(HEADER_PART3P) + 32 + \
-               DATE_LEN + sizeof(HEADER_PART4) + sizeof(tux_extra_html_header) \
-               + sizeof(HEADER_PART3CA) + MAX_CACHE_CONTROL_AGE_LEN)
-
-static void http_pre_header (tux_req_t *req, int head)
-{
-       int partial = req->offset_start | req->offset_end;
-       unsigned long flags;
-       char *buf, *curr;
-       mimetype_t *mime = NULL;
-       int size;
-
-
-       if (MAX_OUT_HEADER_LEN > PAGE_SIZE)
-               TUX_BUG();
-       if ((req->attr && req->attr->tcapi) || req->usermode)
-               TUX_BUG();
-
-#define COPY_STATIC_PART(nr,curr)                                      \
-       do {    \
-               memcpy(curr, HEADER_PART##nr, sizeof(HEADER_PART##nr)-1); \
-               curr += sizeof(HEADER_PART##nr)-1;                      \
-       } while (0)
-
-       buf = curr = get_abuf(req, MAX_OUT_HEADER_LEN);
-
-       if (req->lookup_dir) {
-               COPY_STATIC_PART(1D, curr);
-               goto dir_next;
-       }
-       mime = req->attr->mime;
-       if (!mime)
-               TUX_BUG();
-
-       if (req->status == 404) {
-               COPY_STATIC_PART(1C, curr);
-               memcpy(curr, mime->type, mime->type_len);
-               curr += mime->type_len;
-       } else {
-               if (tux_noid && (mime == &default_mimetype)) {
-                       if (partial)
-                               COPY_STATIC_PART(1BP, curr);
-                       else
-                               COPY_STATIC_PART(1B, curr);
-               } else {
-                       if (partial)
-                               COPY_STATIC_PART(1AP, curr);
-                       else
-                               COPY_STATIC_PART(1A, curr);
-                       memcpy(curr, mime->type, mime->type_len);
-                       curr += mime->type_len;
-               }
-       }
-
-       if (tux_generate_cache_control && mime->expire_str_len) {
-               COPY_STATIC_PART(3CA, curr);
-               memcpy(curr, mime->expire_str, mime->expire_str_len);
-               curr += mime->expire_str_len;
-       }
-
-       if (req->keep_alive /* && (req->version == HTTP_1_0) */)
-               COPY_STATIC_PART(2_keepalive, curr);
-       else if (!req->keep_alive && (req->version == HTTP_1_1))
-               COPY_STATIC_PART(2_close, curr);
-       else
-               // HTTP/1.0 default means close
-               COPY_STATIC_PART(2_none, curr);
-
-dir_next:
-       memcpy(curr, tux_date, DATE_LEN-1);
-       curr += DATE_LEN-1;
-
-       if (req->content_gzipped)
-               COPY_STATIC_PART(3A, curr);
-
-       /*
-        * Content-Length:
-        */
-       if (!req->lookup_dir) {
-               if (tux_noid)
-                       COPY_STATIC_PART(3BX, curr);
-               else
-                       COPY_STATIC_PART(3BY, curr);
-
-               if (partial)
-                       curr += sprintf(curr, "%Ld", req->output_len);
-               else {
-                       if (req->content_gzipped)
-                               curr += sprintf(curr, "%Ld",
-                                                       req->total_file_len);
-                       else {
-                               memcpy(curr, &req->etag, req->lendigits);
-                               curr += req->lendigits;
-                       }
-               }
-               if (tux_generate_etags && (req->status != 404)) {
-                       COPY_STATIC_PART(3C, curr);
-                       memcpy(curr, &req->etag, req->etaglen);
-                       curr += req->etaglen;
-                       curr[0] = '"';
-                       curr++;
-               }
-               if (tux_generate_last_mod || tux_generate_etags)
-                       COPY_STATIC_PART(3ACC, curr);
-       }
-        if (tux_generate_last_mod && (req->status != 404)) {
-                COPY_STATIC_PART(3L, curr);
-               last_mod_time(curr, req->mtime);
-               curr += DATE_LEN-1;
-        }
-       if (partial) {
-               COPY_STATIC_PART(3P, curr);
-               curr += sprintf(curr, "%Ld-%Ld/%Ld", req->offset_start,
-                               req->offset_end-1, req->total_file_len);
-       }
-       COPY_STATIC_PART(4, curr);
-       /*
-        * Possibly add an extra HTML header:
-        */
-       if (tux_extra_html_header_size && mime && !strcmp(mime->type, "text/html")) {
-               unsigned int len = tux_extra_html_header_size;
-
-               memcpy(curr, tux_extra_html_header, len);
-               curr += len;
-       }
-
-       size = curr-buf;
-
-#if CONFIG_TUX_DEBUG
-       *curr = 0;
-       Dprintk("{%s} [%d/%d]\n", buf, size, strlen(buf));
-#endif
-
-       flags = MSG_DONTWAIT;
-       if (!head)
-               flags |= MSG_MORE;
-       send_abuf(req, size, flags);
-}
-
-void http_illegal_request (tux_req_t *req, int cachemiss)
-{
-       if (req->status == 304)
-               send_ret_notmodified(req);
-       else {
-               if (req->status == 403)
-                       send_async_err_forbidden(req);
-               else
-                       send_async_err_not_found(req);
-       }
-}
-
-static int http_check_req_err (tux_req_t *req, int cachemiss)
-{
-       if ((req->sock->sk->sk_state <= TCP_SYN_RECV) &&
-               !tcp_sk(req->sock->sk)->urg_data)
-                       return 0;
-       Dprintk("http_check_req_err(%p,%d): 1 (state: %d, urg: %d)\n",
-               req, cachemiss, req->sock->sk->sk_state,
-               tcp_sk(req->sock->sk)->urg_data);
-#if CONFIG_TUX_DEBUG
-       req->bytes_expected = 0;
-#endif
-       req->in_file.f_pos = 0;
-       req->error = TUX_ERROR_CONN_CLOSE;
-       zap_request(req, cachemiss);
-
-       return 1;
-}
-
-#define COPY_STR(str) \
-       do { memcpy(tmp, str, sizeof(str)-1); \
-       tmp += sizeof(str)-1; } while (0)
-
-static char * http_print_dir_line (tux_req_t *req, char *tmp, char *d_name, int d_len, int d_type, struct dentry *dentry, struct inode *inode)
-{
-       int len, spaces;
-       loff_t size;
-
-       switch (d_type) {
-       case DT_DIR:
-               COPY_STR("<IMG SRC=\"/icons/dir.gif\" ALT=\"[DIR]\">");
-               break;
-       case DT_REG:
-               if ((d_len >= 3) &&
-                       (d_name[d_len-3] == '.') &&
-                       (d_name[d_len-2] == 'g') &&
-                       (d_name[d_len-1] == 'z'))
-                       COPY_STR("<IMG SRC=\"/icons/compressed.gif\" ALT=\"[   ]\">");
-               else
-               if ((d_len >= 4) &&
-                       (d_name[d_len-4] == '.') &&
-                       (d_name[d_len-3] == 't') &&
-                       (d_name[d_len-2] == 'g') &&
-                       (d_name[d_len-1] == 'z'))
-                       COPY_STR("<IMG SRC=\"/icons/compressed.gif\" ALT=\"[   ]\">");
-               else
-               if ((d_len >= 4) &&
-                       (d_name[d_len-4] == '.') &&
-                       (d_name[d_len-3] == 't') &&
-                       (d_name[d_len-2] == 'x') &&
-                       (d_name[d_len-1] == 't'))
-                       COPY_STR("<IMG SRC=\"/icons/text.gif\" ALT=\"[   ]\">");
-               else
-               if ((d_len >= 4) &&
-                       (d_name[d_len-4] == '.') &&
-                       (d_name[d_len-3] == 'b') &&
-                       (d_name[d_len-2] == 'z') &&
-                       (d_name[d_len-1] == '2'))
-                       COPY_STR("<IMG SRC=\"/icons/compressed.gif\" ALT=\"[   ]\">");
-               else
-               if ((d_len >= 4) &&
-                       (d_name[d_len-4] == '.') &&
-                       (d_name[d_len-3] == 'z') &&
-                       (d_name[d_len-2] == 'i') &&
-                       (d_name[d_len-1] == 'p'))
-                       COPY_STR("<IMG SRC=\"/icons/compressed.gif\" ALT=\"[   ]\">");
-               else
-                       COPY_STR("<IMG SRC=\"/icons/file.gif\" ALT=\"[   ]\">");
-               break;
-       case DT_LNK:
-               COPY_STR("<IMG SRC=\"/icons/link.gif\" ALT=\"[LNK]\">");
-               break;
-       default:
-               if (tux_hide_unreadable)
-                       goto out_dput;
-               COPY_STR("<IMG SRC=\"/icons/unknown.gif\" ALT=\"[   ]\">");
-               break;
-       }
-
-#define LIST_1 " <A HREF=\""
-#define LIST_2 "\">"
-#define LIST_2_DIR "/\">"
-#define LIST_3 "</A> "
-
-       COPY_STR(LIST_1);
-       memcpy(tmp, d_name, d_len);
-       tmp += d_len;
-       if (d_type == DT_DIR)
-               COPY_STR(LIST_2_DIR);
-       else
-               COPY_STR(LIST_2);
-       spaces = 0;
-       len = d_len;
-
-       if (len > 25)
-               len = 25;
-       memcpy(tmp, d_name, len);
-       tmp += len;
-       if (len != d_len) {
-               *tmp++ = '.';
-               *tmp++ = '.';
-       } else {
-               if (d_type == DT_DIR)
-                       *tmp++ = '/';
-               else
-                       spaces++;
-               spaces++;
-       }
-       COPY_STR(LIST_3);
-       while (spaces) {
-               *tmp++ = ' ';
-               spaces--;
-       }
-#define FILL 25
-       if (d_len < FILL) {
-               memset(tmp, ' ', FILL-d_len);
-               tmp += FILL-d_len;
-       }
-
-       tmp += time_unix2ls(inode->i_mtime.tv_sec, tmp);
-       *tmp++ = ' ';
-
-       if (d_type != DT_REG) {
-               COPY_STR("        - ");
-               goto out_size;
-       }
-       size = inode->i_size >> 10;
-       if (size < 1024) {
-               tmp += sprintf(tmp, "%8Lik ", size);
-               goto out_size;
-       }
-       size >>= 10;
-       if (size < 1024) {
-               tmp += sprintf(tmp, "%8LiM ", size);
-               goto out_size;
-       }
-       size >>= 10;
-       if (size < 1024) {
-               tmp += sprintf(tmp, "%8LiG ", size);
-               goto out_size;
-       }
-       size >>= 10;
-       if (size < 1024) {
-               tmp += sprintf(tmp, "%8LiT ", size);
-               goto out_size;
-       }
-       size >>= 10;
-       tmp += sprintf(tmp, "%8LiT ", size);
-
-out_size:
-       *tmp++ = '\n';
-       *tmp = 0;
-
-       return tmp;
-out_dput:
-       return NULL;
-}
-
-tux_proto_t tux_proto_http = {
-       defer_accept: 1,
-       can_redirect: 1,
-       got_request: http_got_request,
-       parse_message: parse_http_message,
-       illegal_request: http_illegal_request,
-       check_req_err: http_check_req_err,
-       print_dir_line: http_print_dir_line,
-       name: "http",
-};
-
diff --git a/net/tux/redirect.c b/net/tux/redirect.c
deleted file mode 100644 (file)
index 86b5300..0000000
+++ /dev/null
@@ -1,154 +0,0 @@
-/*
- * TUX - Integrated Application Protocols Layer and Object Cache
- *
- * Copyright (C) 2000, 2001, Ingo Molnar <mingo@redhat.com>
- *
- * redirect.c: redirect requests to other server sockets (such as Apache).
- */
-
-#include <net/tux.h>
-
-/****************************************************************
- *      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, 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.
- *
- ****************************************************************/
-
-static void dummy_destructor(struct open_request *req)
-{
-}
-
-static struct or_calltable dummy = 
-{
-       0,
-       NULL,
-       NULL,
-       &dummy_destructor,
-       NULL
-};
-
-static int redirect_sock (tux_req_t *req, const int port)
-{
-       struct socket *sock = req->sock;
-       struct open_request *tcpreq;
-       struct sock *sk, *oldsk;
-       int err = -1;
-
-       /*
-        * Look up (optional) listening user-space socket.
-        */
-       local_bh_disable();
-       sk = tcp_v4_lookup_listener(INADDR_ANY, port, 0);
-       /*
-        * Look up localhost listeners as well.
-        */
-       if (!sk) {
-               u32 daddr;
-               ((unsigned char *)&daddr)[0] = 127;
-               ((unsigned char *)&daddr)[1] = 0;
-               ((unsigned char *)&daddr)[2] = 0;
-               ((unsigned char *)&daddr)[3] = 1;
-               sk = tcp_v4_lookup_listener(daddr, port, 0);
-       }
-       local_bh_enable();
-
-       /* No secondary server found */
-       if (!sk)
-               goto out;
-
-       /*
-        * Requeue the 'old' socket as an accept-socket of
-        * the listening socket. This way we can shuffle
-        * a socket around. Since we've read the input data
-        * via the non-destructive MSG_PEEK, the secondary
-        * server can be used transparently.
-        */
-       oldsk = sock->sk;
-       lock_sock(sk);
-
-       if (sk->sk_state != TCP_LISTEN)
-               goto out_unlock;
-
-       tcpreq = tcp_openreq_alloc();
-       if (!tcpreq)
-               goto out_unlock;
-
-       unlink_tux_socket(req);
-
-       sock->sk = NULL;
-       sock->state = SS_UNCONNECTED;
-
-       tcpreq->class = &dummy;
-       write_lock_irq(&oldsk->sk_callback_lock);
-       oldsk->sk_socket = NULL;
-        oldsk->sk_sleep = NULL;
-       write_unlock_irq(&oldsk->sk_callback_lock);
-
-       tcp_sk(oldsk)->nonagle = 0;
-
-       tcp_acceptq_queue(sk, tcpreq, oldsk);
-
-       sk->sk_data_ready(sk, 0);
-
-       /*
-        * It's now completely up to the secondary
-        * server to handle this request.
-        */
-       sock_release(req->sock);
-       req->sock = NULL;
-       req->parsed_len = 0;
-       err = 0;
-       Dprintk("req %p redirected to secondary server!\n", req);
-
-out_unlock:
-       release_sock(sk);
-       sock_put(sk);
-out:
-       if (err)
-               Dprintk("NO secondary server for req %p!\n", req);
-       return err;
-}
-
-void redirect_request (tux_req_t *req, int cachemiss)
-{
-       if (tux_TDprintk && (req->status != 304)) {
-               TDprintk("trying to redirect req %p, req->error: %d, req->status: %d.\n", req, req->error, req->status);
-               print_req(req);
-       }
-
-       if (cachemiss)
-               TUX_BUG();
-       if (req->error == TUX_ERROR_CONN_CLOSE)
-               goto out_flush;
-       if (!req->sock)
-               TUX_BUG();
-
-       if (!req->status)
-               req->status = -1;
-       if (!req->proto->can_redirect || (req->status == 304) || redirect_sock(req, tux_clientport)) {
-               if (req->parsed_len)
-                       trunc_headers(req);
-               req->proto->illegal_request(req, cachemiss);
-               return;
-       } else {
-               if (req->data_sock)
-                       BUG();
-       }
-out_flush:
-       clear_keepalive(req);
-       if (!tux_redirect_logging)
-               req->status = 0;
-       flush_request(req, cachemiss);
-}
-
diff --git a/net/tux/times.c b/net/tux/times.c
deleted file mode 100644 (file)
index 3388f63..0000000
+++ /dev/null
@@ -1,392 +0,0 @@
-/*
- * TUX - Integrated Application Protocols Layer and Object Cache
- *
- * Copyright (C) 2000, 2001, Ingo Molnar <mingo@redhat.com>
- *
- * times.c: time conversion routines.
- *
- * Original time convserion code Copyright (C) 1999 by Arjan van de Ven
- */
-
-/****************************************************************
- *     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, 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.
- *
- ****************************************************************/
-
-#include <linux/time.h>
-#include <linux/kernel.h>
-#include <linux/slab.h>
-#include <linux/ctype.h>
-
-
-#include "times.h"
-
-char *dayName[7] = {
-       "Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"
-};
-
-static char *monthName[12] = {
-       "Jan", "Feb", "Mar", "Apr", "May", "Jun",
-       "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"
-};
-
-char itoa_h[60]={'0','0','0','0','0','0','0','0','0','0',
-                '1','1','1','1','1','1','1','1','1','1',
-                '2','2','2','2','2','2','2','2','2','2',
-                '3','3','3','3','3','3','3','3','3','3',
-                '4','4','4','4','4','4','4','4','4','4',
-                '5','5','5','5','5','5','5','5','5','5'};
-               
-char itoa_l[60]={'0','1','2','3','4','5','6','7','8','9',
-                '0','1','2','3','4','5','6','7','8','9',
-                '0','1','2','3','4','5','6','7','8','9',
-                '0','1','2','3','4','5','6','7','8','9',
-                '0','1','2','3','4','5','6','7','8','9',
-                '0','1','2','3','4','5','6','7','8','9'};
-
-int time_unix2ls(time_t zulu, char *buf)
-{
-       int Y=0,M=0,D=0;
-       int H=0,Min=0,S=0,WD=0;
-       int I,I2;
-       time_t rest, delta;
-
-       if (zulu > xtime.tv_sec)
-               zulu = xtime.tv_sec;
-
-       I=0;
-       while (I<TUX_NUMYEARS) {
-               if (TimeDays[I][0]>zulu) 
-                  break;
-               I++;
-       }
-       
-       Y=--I;
-       if (I<0) {
-               Y=0;
-               goto BuildYear;
-       }
-       I2=0;
-       while (I2<=12) {
-               if (TimeDays[I][I2]>zulu) 
-                  break;
-               I2++;
-       }                          
-       
-       M=I2-1;
-       
-       rest=zulu - TimeDays[Y][M];
-       WD=WeekDays[Y][M];
-       D=rest/86400;
-       rest=rest%86400;
-       WD+=D;
-       WD=WD%7;
-       H=rest/3600;
-       rest=rest%3600;
-       Min=rest/60;
-       rest=rest%60;
-       S=rest;
-       
-BuildYear:
-       Y+=TUX_YEAROFFSET;
-       
-       
-       /* Format:  Day, 01 Mon 1999 01:01:01 GMT */
-
-       delta = xtime.tv_sec - zulu;
-       if (delta > 6*30*24*60)
-               //               "May 23   2000"
-               return sprintf( buf, "%s %02i  %04i", monthName[M], D+1, Y);
-       else
-               //                "May 23 10:14"
-               return sprintf( buf, "%s %02i %02i:%02i",
-                       monthName[M], D+1, H, Min);
-}
-
-static int MonthHash[32] =
-       {0,0,7,0,0,0,0,0,0,0,0,3,0,0,0,2,6,0,5,0,9,8,4,0,0,11,1,10,0,0,0,0};
-
-#define is_digit(c)    ((c) >= '0' && (c) <= '9')
-
-static inline int skip_atoi(char **s)
-{
-       int i=0;
-
-       while (is_digit(**s))
-               i = i*10 + *((*s)++) - '0';
-       return i;
-}
-
-time_t mimetime_to_unixtime(char *Q)
-{
-       int Y,M,D,H,Min,S;
-       unsigned int Hash;
-       time_t Temp;
-       char *s,**s2;
-       
-       s=Q;
-       s2=&s;
-       
-       if (strlen(s)<30) return 0;
-       if (s[3]!=',') return 0;
-       if (s[19]!=':') return 0;
-       
-       s+=5; /* Skip day of week */
-       D = skip_atoi(s2);  /*  Day of month */
-       s++;
-       Hash = (char)s[0]+(char)s[2];
-       Hash = (Hash<<1) + (char)s[1];
-       Hash = (Hash&63)>>1;
-       M = MonthHash[Hash];
-       s+=4;
-       Y = skip_atoi(s2); /* Year */
-       s++;
-       H = skip_atoi(s2); /* Hour */
-       s++;
-       Min = skip_atoi(s2); /* Minutes */
-       s++;
-       S = skip_atoi(s2); /* Seconds */
-       s++;
-       if ((s[0]!='G')||(s[1]!='M')||(s[2]!='T')) 
-       {       
-               return 0; /* No GMT */
-       }
-
-       if (Y<TUX_YEAROFFSET) Y = TUX_YEAROFFSET;
-       if (Y>TUX_YEAROFFSET+9) Y = TUX_YEAROFFSET+9;
-       
-       Temp =  TimeDays[Y-TUX_YEAROFFSET][M];
-       Temp += D*86400+H*3600+Min*60+S;
-       
-       return Temp;  
-}
-
-// writes the full http date, corresponding to time_t received
-
-void last_mod_time(char * curr, const time_t t)
-{
-       int day, tod, year, wday, mon, hour, min, sec;
-       tod = t % 86400;
-       day = t / 86400;
-       if (tod < 0) {
-               tod += 86400;
-               --day;
-       }
-       hour = tod / 3600;
-       tod %= 3600;
-       min = tod / 60;
-       sec = tod % 60;
-       wday = (day + 4) % 7;
-       if (wday < 0)
-               wday += 7;
-       day -= 11017;
-       /* day 0 is march 1, 2000 */
-       year = 5 + day / 146097;
-       day = day % 146097;
-       if (day < 0) {
-               day += 146097;
-               --year;
-       }
-       /* from now on, day is nonnegative */
-       year *= 4;
-       if (day == 146096) {
-               year += 3;
-               day = 36524;
-       } else {
-               year += day / 36524;
-               day %= 36524;
-       }
-       year *= 25;
-       year += day / 1461;
-       day %= 1461;
-       year *= 4;
-       if (day == 1460) {
-               year += 3;
-               day = 365;
-       } else {
-               year += day / 365;
-               day %= 365;
-       }
-       day *= 10;
-       mon = (day + 5) / 306;
-       day = day + 5 - 306 * mon;
-       day /= 10;
-       if (mon >= 10) {
-               ++year;
-               mon -= 10;
-       } else
-               mon += 2;
-       sprintf(curr, "%s, %.2d %s %d %.2d:%.2d:%.2d GMT", dayName[wday],
-               day+1, monthName[mon], year, hour, min, sec);
-}
-
-// writes the full date in ISO8601 format,
-// corresponding to time_t received
-// example: 20011126224910
-
-int mdtm_time(char * curr, const time_t t)
-{
-       int day, tod, year, wday, mon, hour, min, sec;
-       tod = t % 86400;
-       day = t / 86400;
-       if (tod < 0) {
-               tod += 86400;
-               --day;
-       }
-       hour = tod / 3600;
-       tod %= 3600;
-       min = tod / 60;
-       sec = tod % 60;
-       wday = (day + 4) % 7;
-       if (wday < 0)
-               wday += 7;
-       day -= 11017;
-       /* day 0 is march 1, 2000 */
-       year = 5 + day / 146097;
-       day = day % 146097;
-       if (day < 0) {
-               day += 146097;
-               --year;
-       }
-       /* from now on, day is nonnegative */
-       year *= 4;
-       if (day == 146096) {
-               year += 3;
-               day = 36524;
-       } else {
-               year += day / 36524;
-               day %= 36524;
-       }
-       year *= 25;
-       year += day / 1461;
-       day %= 1461;
-       year *= 4;
-       if (day == 1460) {
-               year += 3;
-               day = 365;
-       } else {
-               year += day / 365;
-               day %= 365;
-       }
-       day *= 10;
-       mon = (day + 5) / 306;
-       day = day + 5 - 306 * mon;
-       day /= 10;
-       if (mon >= 10) {
-               ++year;
-               mon -= 10;
-       } else
-               mon += 2;
-       return sprintf(curr, "213 %.4d%.2d%.2d%.2d%.2d%.2d\r\n",
-               year, mon+1, day+1, hour, min, sec);
-}
-
-static inline int make_num(const char *s)
-{
-       if (*s >= '0' && *s <= '9')
-               return 10 * (*s - '0') + *(s + 1) - '0';
-       else
-               return *(s + 1) - '0';
-}
-
-static inline int make_month(const char *s)
-{
-       int i;
-
-       for (i = 0; i < 12; i++)
-               if (!strncmp(monthName[i], s, 3))
-                       return i+1;
-       return 0;
-}
-
-time_t parse_time(const char *str, const int str_len)
-{
-       int hour;
-       int min;
-       int sec;
-       int mday;
-       int mon;
-       int year;
-
-       if (str[3] == ',') {
-               /* Thu, 09 Jan 1993 01:29:59 GMT */
-
-               if (str_len < 29) 
-                       return -1;
-
-               mday = make_num(str+5);
-               mon = make_month(str + 8);
-               year = 100 * make_num(str + 12) + make_num(str + 14);
-               hour = make_num(str + 17);
-               min = make_num(str + 20);
-               sec = make_num(str + 23);
-       }
-       else {
-               const char *s;
-               s = strchr(str, ',');
-               if (!s || (str_len - (s - str) < 24)) {
-                       /* Wed Jun  9 01:29:59 1993 */
-
-                       if (str_len < 24)
-                               return -1;
-
-                       mon = make_month(str+4);
-                       mday = make_num(str+8);
-                       hour = make_num(str+11);
-                       min = make_num(str+14);
-                       sec = make_num(str+17);
-                       year = make_num(str+20)*100 + make_num(str+22);
-               }
-               else {
-                       /* Thursday, 10-Jun-93 01:29:59 GMT */
-
-                       mday = make_num(s + 2);
-                       mon = make_month(s + 5);
-                       year = make_num(s + 9) + 1900;
-                       if (year < 1970)
-                               year += 100;
-                       hour = make_num(s + 12);
-                       min = make_num(s + 15);
-                       sec = make_num(s + 18);
-               }
-       }
-
-       if (sec < 0 || sec > 59)
-               return -1;
-       if (min < 0 || min > 59)
-               return -1;
-       if (hour < 0 || hour > 23)
-               return -1;
-       if (mday < 1 || mday > 31)
-               return -1;
-       if (mon < 1 || mon > 12)
-               return -1;
-       if (year < 1970 || year > 2020)
-               return -1;
-
-       return mktime(year, mon, mday, hour, min, sec);
-}
diff --git a/net/tux/times.h b/net/tux/times.h
deleted file mode 100644 (file)
index 09c389f..0000000
+++ /dev/null
@@ -1,26 +0,0 @@
-static time_t TimeDays[10][13] = { 
- { 852073200,  854751600,      857170800,      859849200,      862441200,      865119600,      867711600,      870390000,      873068400,      875660400,      878338800,      880930800,      883609200 } ,
- { 883609200,  886287600,      888706800,      891385200,      893977200,      896655600,      899247600,      901926000,      904604400,      907196400,      909874800,      912466800,      915145200 } ,
- { 915145200,  917823600,      920242800,      922921200,      925513200,      928191600,      930783600,      933462000,      936140400,      938732400,      941410800,      944002800,      946681200 } ,
- { 946681200,  949359600,      951865200,      954543600,      957135600,      959814000,      962406000,      965084400,      967762800,      970354800,      973033200,      975625200,      978303600 } ,
- { 978303600,  980982000,      983401200,      986079600,      988671600,      991350000,      993942000,      996620400,      999298800,      1001890800,     1004569200,     1007161200,     1009839600 } ,
- { 1009839600, 1012518000,     1014937200,     1017615600,     1020207600,     1022886000,     1025478000,     1028156400,     1030834800,     1033426800,     1036105200,     1038697200,     1041375600 } ,
- { 1041375600, 1044054000,     1046473200,     1049151600,     1051743600,     1054422000,     1057014000,     1059692400,     1062370800,     1064962800,     1067641200,     1070233200,     1072911600 } ,
- { 1072911600, 1075590000,     1078095600,     1080774000,     1083366000,     1086044400,     1088636400,     1091314800,     1093993200,     1096585200,     1099263600,     1101855600,     1104534000 } ,
- { 1104534000, 1107212400,     1109631600,     1112310000,     1114902000,     1117580400,     1120172400,     1122850800,     1125529200,     1128121200,     1130799600,     1133391600,     1136070000 } ,
- { 1136070000, 1138748400,     1141167600,     1143846000,     1146438000,     1149116400,     1151708400,     1154386800,     1157065200,     1159657200,     1162335600,     1164927600,     1167606000 } 
-};
-static int WeekDays[10][13] = { 
- { 3,  6,      6,      2,      4,      0,      2,      5,      1,      3,      6,      1,      4 } ,
- { 4,  0,      0,      3,      5,      1,      3,      6,      2,      4,      0,      2,      5 } ,
- { 5,  1,      1,      4,      6,      2,      4,      0,      3,      5,      1,      3,      6 } ,
- { 6,  2,      3,      6,      1,      4,      6,      2,      5,      0,      3,      5,      1 } ,
- { 1,  4,      4,      0,      2,      5,      0,      3,      6,      1,      4,      6,      2 } ,
- { 2,  5,      5,      1,      3,      6,      1,      4,      0,      2,      5,      0,      3 } ,
- { 3,  6,      6,      2,      4,      0,      2,      5,      1,      3,      6,      1,      4 } ,
- { 4,  0,      1,      4,      6,      2,      4,      0,      3,      5,      1,      3,      6 } ,
- { 6,  2,      2,      5,      0,      3,      5,      1,      4,      6,      2,      4,      0 } ,
- { 0,  3,      3,      6,      1,      4,      6,      2,      5,      0,      3,      5,      1 } 
-};
-#define TUX_YEAROFFSET   1997
-#define TUX_NUMYEARS     10
diff --git a/net/tux/userspace.c b/net/tux/userspace.c
deleted file mode 100644 (file)
index effd45d..0000000
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * TUX - Integrated Application Protocols Layer and Object Cache
- *
- * Copyright (C) 2000, 2001, Ingo Molnar <mingo@redhat.com>
- *
- * userspace.c: handle userspace-module requests
- */
-
-#include <net/tux.h>
-
-/****************************************************************
- *      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, 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.
- *
- ****************************************************************/
-
diff --git a/net/xfrm/xfrm_output.c b/net/xfrm/xfrm_output.c
deleted file mode 100644 (file)
index ae72dfd..0000000
+++ /dev/null
@@ -1,46 +0,0 @@
-/* 
- * generic xfrm output routines
- *
- * Copyright (c) 2003 James Morris <jmorris@intercode.com.au>
- *
- * 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/kernel.h>
-#include <linux/skbuff.h>
-#include <net/xfrm.h>
-
-int xfrm_check_output(struct xfrm_state *x,
-                      struct sk_buff *skb, unsigned short family)
-{
-       int err;
-       
-       err = xfrm_state_check_expire(x);
-       if (err)
-               goto out;
-               
-       if (x->props.mode) {
-               switch (family) {
-               case AF_INET:
-                       err = xfrm4_tunnel_check_size(skb);
-                       break;
-                       
-               case AF_INET6:
-                       err = xfrm6_tunnel_check_size(skb);
-                       break;
-                       
-               default:
-                       err = -EINVAL;
-               }
-               
-               if (err)
-                       goto out;
-       }
-
-       err = xfrm_state_check_space(x, skb);
-out:
-       return err;
-}
diff --git a/scripts/mkmakefile b/scripts/mkmakefile
deleted file mode 100644 (file)
index c4d621b..0000000
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/bin/sh
-# Generates a small Makefile used in the root of the output
-# directory, to allow make to be started from there.
-# The Makefile also allow for more convinient build of external modules
-
-# Usage
-# $1 - Kernel src directory
-# $2 - Output directory
-# $3 - version
-# $4 - patchlevel
-
-
-cat << EOF
-# Automatically generated by $0: don't edit
-
-VERSION = $3
-PATCHLEVEL = $4
-
-KERNELSRC    := $1
-KERNELOUTPUT := $2
-
-MAKEFLAGS += --no-print-directory
-
-all:
-       \$(MAKE) -C \$(KERNELSRC) O=\$(KERNELOUTPUT)
-
-%::
-       \$(MAKE) -C \$(KERNELSRC) O=\$(KERNELOUTPUT) \$@
-
-EOF
-
diff --git a/scripts/mkspec b/scripts/mkspec
deleted file mode 100755 (executable)
index e644296..0000000
+++ /dev/null
@@ -1,72 +0,0 @@
-#!/bin/sh
-#
-#      Output a simple RPM spec file that uses no fancy features requring
-#      RPM v4. This is intended to work with any RPM distro.
-#
-#      The only gothic bit here is redefining install_post to avoid 
-#      stripping the symbols from files in the kernel which we want
-#
-#      Patched for non-x86 by Opencon (L) 2002 <opencon@rio.skydome.net>
-#
-# That's the voodoo to see if it's a x86.
-ISX86=`echo ${ARCH:=\`arch\`} | grep -ie i.86`
-if [ ! -z $ISX86 ]; then
-       PC=1
-else
-       PC=0
-fi
-# starting to output the spec
-if [ "`grep CONFIG_DRM=y .config | cut -f2 -d\=`" = "y" ]; then
-       PROVIDES=kernel-drm
-fi
-
-PROVIDES="$PROVIDES kernel-$VERSION.$PATCHLEVEL.$SUBLEVEL$EXTRAVERSION"
-
-echo "Name: kernel"
-echo "Summary: The Linux Kernel"
-echo "Version: "$VERSION.$PATCHLEVEL.$SUBLEVEL$EXTRAVERSION | sed -e "s/-//g"
-# we need to determine the NEXT version number so that uname and
-# rpm -q will agree
-echo "Release: `. $srctree/scripts/mkversion`"
-echo "License: GPL"
-echo "Group: System Environment/Kernel"
-echo "Vendor: The Linux Community"
-echo "URL: http://www.kernel.org"
-echo -n "Source: kernel-$VERSION.$PATCHLEVEL.$SUBLEVEL"
-echo "$EXTRAVERSION.tar.gz" | sed -e "s/-//g"
-echo "BuildRoot: /var/tmp/%{name}-%{PACKAGE_VERSION}-root"
-echo "Provides: $PROVIDES"
-echo "%define __spec_install_post /usr/lib/rpm/brp-compress || :"
-echo "%define debug_package %{nil}"
-echo ""
-echo "%description"
-echo "The Linux Kernel, the operating system core itself"
-echo ""
-echo "%prep"
-echo "%setup -q"
-echo ""
-echo "%build"
-echo "make clean all"
-echo ""
-echo "%install"
-echo 'mkdir -p $RPM_BUILD_ROOT/boot $RPM_BUILD_ROOT/lib $RPM_BUILD_ROOT/lib/modules'
-echo 'INSTALL_MOD_PATH=$RPM_BUILD_ROOT make modules_install'
-# This is the first disagreement between i386 and most others
-if [ $PC = 1 ]; then
-       echo 'cp arch/i386/boot/bzImage $RPM_BUILD_ROOT'"/boot/vmlinuz-$VERSION.$PATCHLEVEL.$SUBLEVEL$EXTRAVERSION"
-else
-       echo 'cp vmlinux $RPM_BUILD_ROOT'"/boot/vmlinux-$VERSION.$PATCHLEVEL.$SUBLEVEL$EXTRAVERSION"
-fi
-# Back on track
-echo 'cp System.map $RPM_BUILD_ROOT'"/boot/System.map-$VERSION.$PATCHLEVEL.$SUBLEVEL$EXTRAVERSION"
-echo 'cp .config $RPM_BUILD_ROOT'"/boot/config-$VERSION.$PATCHLEVEL.$SUBLEVEL$EXTRAVERSION"
-echo ""
-echo "%clean"
-echo '#echo -rf $RPM_BUILD_ROOT'
-echo ""
-echo "%files"
-echo '%defattr (-, root, root)'
-echo "%dir /lib/modules"
-echo "/lib/modules/$VERSION.$PATCHLEVEL.$SUBLEVEL$EXTRAVERSION"
-echo "/boot/*"
-echo ""
diff --git a/scripts/mod/Makefile b/scripts/mod/Makefile
deleted file mode 100644 (file)
index f66bf52..0000000
+++ /dev/null
@@ -1,16 +0,0 @@
-host-progs     := modpost mk_elfconfig
-always         := $(host-progs) empty.o
-
-modpost-objs   := modpost.o file2alias.o sumversion.o
-
-# dependencies on generated files need to be listed explicitly
-
-$(obj)/modpost.o $(obj)/file2alias.o $(obj)/sumversion.o: $(obj)/elfconfig.h
-
-quiet_cmd_elfconfig = MKELF   $@
-      cmd_elfconfig = $(obj)/mk_elfconfig $(ARCH) < $< > $@
-
-$(obj)/elfconfig.h: $(obj)/empty.o $(obj)/mk_elfconfig FORCE
-       $(call if_changed,elfconfig)
-
-targets += elfconfig.h
diff --git a/scripts/mod/empty.c b/scripts/mod/empty.c
deleted file mode 100644 (file)
index 49839cc..0000000
+++ /dev/null
@@ -1 +0,0 @@
-/* empty file to figure out endianness / word size */
diff --git a/scripts/mod/file2alias.c b/scripts/mod/file2alias.c
deleted file mode 100644 (file)
index f38c6d7..0000000
+++ /dev/null
@@ -1,282 +0,0 @@
-/* Simple code to turn various tables in an ELF file into alias definitions.
- * This deals with kernel datastructures where they should be
- * dealt with: in the kernel source.
- *
- * Copyright 2002-2003  Rusty Russell, IBM Corporation
- *           2003       Kai Germaschewski
- *           
- *
- * This software may be used and distributed according to the terms
- * of the GNU General Public License, incorporated herein by reference.
- */
-
-#include "modpost.h"
-
-/* We use the ELF typedefs, since we can't rely on stdint.h being present. */
-
-#if KERNEL_ELFCLASS == ELFCLASS32
-typedef Elf32_Addr     kernel_ulong_t;
-#else
-typedef Elf64_Addr     kernel_ulong_t;
-#endif
-
-typedef Elf32_Word     __u32;
-typedef Elf32_Half     __u16;
-typedef unsigned char  __u8;
-
-/* Big exception to the "don't include kernel headers into userspace, which
- * even potentially has different endianness and word sizes, since 
- * we handle those differences explicitly below */
-#include "../../include/linux/mod_devicetable.h"
-
-#define ADD(str, sep, cond, field)                              \
-do {                                                            \
-        strcat(str, sep);                                       \
-        if (cond)                                               \
-                sprintf(str + strlen(str),                      \
-                        sizeof(field) == 1 ? "%02X" :           \
-                        sizeof(field) == 2 ? "%04X" :           \
-                        sizeof(field) == 4 ? "%08X" : "",       \
-                        field);                                 \
-        else                                                    \
-                sprintf(str + strlen(str), "*");                \
-} while(0)
-
-/* Looks like "usb:vNpNdlNdhNdcNdscNdpNicNiscNipN" */
-static int do_usb_entry(const char *filename,
-                       struct usb_device_id *id, char *alias)
-{
-       id->match_flags = TO_NATIVE(id->match_flags);
-       id->idVendor = TO_NATIVE(id->idVendor);
-       id->idProduct = TO_NATIVE(id->idProduct);
-       id->bcdDevice_lo = TO_NATIVE(id->bcdDevice_lo);
-       id->bcdDevice_hi = TO_NATIVE(id->bcdDevice_hi);
-
-       /*
-        * Some modules (visor) have empty slots as placeholder for
-        * run-time specification that results in catch-all alias
-        */
-       if (!(id->idVendor | id->bDeviceClass | id->bInterfaceClass))
-               return 1;
-
-       strcpy(alias, "usb:");
-       ADD(alias, "v", id->match_flags&USB_DEVICE_ID_MATCH_VENDOR,
-           id->idVendor);
-       ADD(alias, "p", id->match_flags&USB_DEVICE_ID_MATCH_PRODUCT,
-           id->idProduct);
-       ADD(alias, "dl", id->match_flags&USB_DEVICE_ID_MATCH_DEV_LO,
-           id->bcdDevice_lo);
-       ADD(alias, "dh", id->match_flags&USB_DEVICE_ID_MATCH_DEV_HI,
-           id->bcdDevice_hi);
-       ADD(alias, "dc", id->match_flags&USB_DEVICE_ID_MATCH_DEV_CLASS,
-           id->bDeviceClass);
-       ADD(alias, "dsc",
-           id->match_flags&USB_DEVICE_ID_MATCH_DEV_SUBCLASS,
-           id->bDeviceSubClass);
-       ADD(alias, "dp",
-           id->match_flags&USB_DEVICE_ID_MATCH_DEV_PROTOCOL,
-           id->bDeviceProtocol);
-       ADD(alias, "ic",
-           id->match_flags&USB_DEVICE_ID_MATCH_INT_CLASS,
-           id->bInterfaceClass);
-       ADD(alias, "isc",
-           id->match_flags&USB_DEVICE_ID_MATCH_INT_SUBCLASS,
-           id->bInterfaceSubClass);
-       ADD(alias, "ip",
-           id->match_flags&USB_DEVICE_ID_MATCH_INT_PROTOCOL,
-           id->bInterfaceProtocol);
-       return 1;
-}
-
-/* Looks like: ieee1394:venNmoNspNverN */
-static int do_ieee1394_entry(const char *filename,
-                            struct ieee1394_device_id *id, char *alias)
-{
-       id->match_flags = TO_NATIVE(id->match_flags);
-       id->vendor_id = TO_NATIVE(id->vendor_id);
-       id->model_id = TO_NATIVE(id->model_id);
-       id->specifier_id = TO_NATIVE(id->specifier_id);
-       id->version = TO_NATIVE(id->version);
-
-       strcpy(alias, "ieee1394:");
-       ADD(alias, "ven", id->match_flags & IEEE1394_MATCH_VENDOR_ID,
-           id->vendor_id);
-       ADD(alias, "mo", id->match_flags & IEEE1394_MATCH_MODEL_ID,
-           id->model_id);
-       ADD(alias, "sp", id->match_flags & IEEE1394_MATCH_SPECIFIER_ID,
-           id->specifier_id);
-       ADD(alias, "ver", id->match_flags & IEEE1394_MATCH_VERSION,
-           id->version);
-
-       return 1;
-}
-
-/* Looks like: pci:vNdNsvNsdNbcNscNiN. */
-static int do_pci_entry(const char *filename,
-                       struct pci_device_id *id, char *alias)
-{
-       /* Class field can be divided into these three. */
-       unsigned char baseclass, subclass, interface,
-               baseclass_mask, subclass_mask, interface_mask;
-
-       id->vendor = TO_NATIVE(id->vendor);
-       id->device = TO_NATIVE(id->device);
-       id->subvendor = TO_NATIVE(id->subvendor);
-       id->subdevice = TO_NATIVE(id->subdevice);
-       id->class = TO_NATIVE(id->class);
-       id->class_mask = TO_NATIVE(id->class_mask);
-
-       strcpy(alias, "pci:");
-       ADD(alias, "v", id->vendor != PCI_ANY_ID, id->vendor);
-       ADD(alias, "d", id->device != PCI_ANY_ID, id->device);
-       ADD(alias, "sv", id->subvendor != PCI_ANY_ID, id->subvendor);
-       ADD(alias, "sd", id->subdevice != PCI_ANY_ID, id->subdevice);
-
-       baseclass = (id->class) >> 16;
-       baseclass_mask = (id->class_mask) >> 16;
-       subclass = (id->class) >> 8;
-       subclass_mask = (id->class_mask) >> 8;
-       interface = id->class;
-       interface_mask = id->class_mask;
-
-       if ((baseclass_mask != 0 && baseclass_mask != 0xFF)
-           || (subclass_mask != 0 && subclass_mask != 0xFF)
-           || (interface_mask != 0 && interface_mask != 0xFF)) {
-               fprintf(stderr,
-                       "*** Warning: Can't handle masks in %s:%04X\n",
-                       filename, id->class_mask);
-               return 0;
-       }
-
-       ADD(alias, "bc", baseclass_mask == 0xFF, baseclass);
-       ADD(alias, "sc", subclass_mask == 0xFF, subclass);
-       ADD(alias, "i", interface_mask == 0xFF, interface);
-       return 1;
-}
-
-/* looks like: "ccw:tNmNdtNdmN" */ 
-static int do_ccw_entry(const char *filename,
-                       struct ccw_device_id *id, char *alias)
-{
-       id->match_flags = TO_NATIVE(id->match_flags);
-       id->cu_type = TO_NATIVE(id->cu_type);
-       id->cu_model = TO_NATIVE(id->cu_model);
-       id->dev_type = TO_NATIVE(id->dev_type);
-       id->dev_model = TO_NATIVE(id->dev_model);
-
-       strcpy(alias, "ccw:");
-       ADD(alias, "t", id->match_flags&CCW_DEVICE_ID_MATCH_CU_TYPE,
-           id->cu_type);
-       ADD(alias, "m", id->match_flags&CCW_DEVICE_ID_MATCH_CU_MODEL,
-           id->cu_model);
-       ADD(alias, "dt", id->match_flags&CCW_DEVICE_ID_MATCH_DEVICE_TYPE,
-           id->dev_type);
-       ADD(alias, "dm", id->match_flags&CCW_DEVICE_ID_MATCH_DEVICE_TYPE,
-           id->dev_model);
-       return 1;
-}
-
-/* looks like: "pnp:dD" */
-static int do_pnp_entry(const char *filename,
-                       struct pnp_device_id *id, char *alias)
-{
-       sprintf(alias, "pnp:d%s", id->id);
-       return 1;
-}
-
-/* looks like: "pnp:cCdD..." */
-static int do_pnp_card_entry(const char *filename,
-                       struct pnp_card_device_id *id, char *alias)
-{
-       int i;
-
-       sprintf(alias, "pnp:c%s", id->id);
-       for (i = 0; i < PNP_MAX_DEVICES; i++) {
-               if (! *id->devs[i].id)
-                       break;
-               sprintf(alias + strlen(alias), "d%s", id->devs[i].id);
-       }
-       return 1;
-}
-
-/* Ignore any prefix, eg. v850 prepends _ */
-static inline int sym_is(const char *symbol, const char *name)
-{
-       const char *match;
-
-       match = strstr(symbol, name);
-       if (!match)
-               return 0;
-       return match[strlen(symbol)] == '\0';
-}
-
-static void do_table(void *symval, unsigned long size,
-                    unsigned long id_size,
-                    void *function,
-                    struct module *mod)
-{
-       unsigned int i;
-       char alias[500];
-       int (*do_entry)(const char *, void *entry, char *alias) = function;
-
-       if (size % id_size || size < id_size) {
-               fprintf(stderr, "*** Warning: %s ids %lu bad size "
-                       "(each on %lu)\n", mod->name, size, id_size);
-       }
-       /* Leave last one: it's the terminator. */
-       size -= id_size;
-
-       for (i = 0; i < size; i += id_size) {
-               if (do_entry(mod->name, symval+i, alias)) {
-                       /* Always end in a wildcard, for future extension */
-                       if (alias[strlen(alias)-1] != '*')
-                               strcat(alias, "*");
-                       buf_printf(&mod->dev_table_buf,
-                                  "MODULE_ALIAS(\"%s\");\n", alias);
-               }
-       }
-}
-
-/* Create MODULE_ALIAS() statements.
- * At this time, we cannot write the actual output C source yet,
- * so we write into the mod->dev_table_buf buffer. */
-void handle_moddevtable(struct module *mod, struct elf_info *info,
-                       Elf_Sym *sym, const char *symname)
-{
-       void *symval;
-
-       /* We're looking for a section relative symbol */
-       if (!sym->st_shndx || sym->st_shndx >= info->hdr->e_shnum)
-               return;
-
-       symval = (void *)info->hdr
-               + info->sechdrs[sym->st_shndx].sh_offset
-               + sym->st_value;
-
-       if (sym_is(symname, "__mod_pci_device_table"))
-               do_table(symval, sym->st_size, sizeof(struct pci_device_id),
-                        do_pci_entry, mod);
-       else if (sym_is(symname, "__mod_usb_device_table"))
-               do_table(symval, sym->st_size, sizeof(struct usb_device_id),
-                        do_usb_entry, mod);
-       else if (sym_is(symname, "__mod_ieee1394_device_table"))
-               do_table(symval, sym->st_size, sizeof(struct ieee1394_device_id),
-                        do_ieee1394_entry, mod);
-       else if (sym_is(symname, "__mod_ccw_device_table"))
-               do_table(symval, sym->st_size, sizeof(struct ccw_device_id),
-                        do_ccw_entry, mod);
-       else if (sym_is(symname, "__mod_pnp_device_table"))
-               do_table(symval, sym->st_size, sizeof(struct pnp_device_id),
-                        do_pnp_entry, mod);
-       else if (sym_is(symname, "__mod_pnp_card_device_table"))
-               do_table(symval, sym->st_size, sizeof(struct pnp_card_device_id),
-                        do_pnp_card_entry, mod);
-}
-
-/* Now add out buffered information to the generated C source */
-void add_moddevtable(struct buffer *buf, struct module *mod)
-{
-       buf_printf(buf, "\n");
-       buf_write(buf, mod->dev_table_buf.p, mod->dev_table_buf.pos);
-       free(mod->dev_table_buf.p);
-}
diff --git a/scripts/mod/mk_elfconfig.c b/scripts/mod/mk_elfconfig.c
deleted file mode 100644 (file)
index de2aabf..0000000
+++ /dev/null
@@ -1,65 +0,0 @@
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <elf.h>
-
-int
-main(int argc, char **argv)
-{
-       unsigned char ei[EI_NIDENT];    
-       union { short s; char c[2]; } endian_test;
-
-       if (argc != 2) {
-               fprintf(stderr, "Error: no arch\n");
-       }
-       if (fread(ei, 1, EI_NIDENT, stdin) != EI_NIDENT) {
-               fprintf(stderr, "Error: input truncated\n");
-               return 1;
-       }
-       if (memcmp(ei, ELFMAG, SELFMAG) != 0) {
-               fprintf(stderr, "Error: not ELF\n");
-               return 1;
-       }
-       switch (ei[EI_CLASS]) {
-       case ELFCLASS32:
-               printf("#define KERNEL_ELFCLASS ELFCLASS32\n");
-               break;
-       case ELFCLASS64:
-               printf("#define KERNEL_ELFCLASS ELFCLASS64\n");
-               break;
-       default:
-               abort();
-       }
-       switch (ei[EI_DATA]) {
-       case ELFDATA2LSB:
-               printf("#define KERNEL_ELFDATA ELFDATA2LSB\n");
-               break;
-       case ELFDATA2MSB:
-               printf("#define KERNEL_ELFDATA ELFDATA2MSB\n");
-               break;
-       default:
-               abort();
-       }
-
-       if (sizeof(unsigned long) == 4) {
-               printf("#define HOST_ELFCLASS ELFCLASS32\n");
-       } else if (sizeof(unsigned long) == 8) {
-               printf("#define HOST_ELFCLASS ELFCLASS64\n");
-       }
-
-       endian_test.s = 0x0102;
-       if (memcmp(endian_test.c, "\x01\x02", 2) == 0)
-               printf("#define HOST_ELFDATA ELFDATA2MSB\n");
-       else if (memcmp(endian_test.c, "\x02\x01", 2) == 0)
-               printf("#define HOST_ELFDATA ELFDATA2LSB\n");
-       else
-               abort();
-
-       if ((strcmp(argv[1], "v850") == 0) || (strcmp(argv[1], "h8300") == 0))
-               printf("#define MODULE_SYMBOL_PREFIX \"_\"\n");
-       else 
-               printf("#define MODULE_SYMBOL_PREFIX \"\"\n");
-
-       return 0;
-}
-
diff --git a/scripts/mod/modpost.c b/scripts/mod/modpost.c
deleted file mode 100644 (file)
index 662e75b..0000000
+++ /dev/null
@@ -1,739 +0,0 @@
-/* Postprocess module symbol versions
- *
- * Copyright 2003       Kai Germaschewski
- *           2002-2003  Rusty Russell, IBM Corporation
- *
- * Based in part on module-init-tools/depmod.c,file2alias
- *
- * This software may be used and distributed according to the terms
- * of the GNU General Public License, incorporated herein by reference.
- *
- * Usage: modpost vmlinux module1.o module2.o ...
- */
-
-#include <ctype.h>
-#include "modpost.h"
-
-/* Are we using CONFIG_MODVERSIONS? */
-int modversions = 0;
-/* Warn about undefined symbols? (do so if we have vmlinux) */
-int have_vmlinux = 0;
-
-void
-fatal(const char *fmt, ...)
-{
-       va_list arglist;
-
-       fprintf(stderr, "FATAL: ");
-
-       va_start(arglist, fmt);
-       vfprintf(stderr, fmt, arglist);
-       va_end(arglist);
-
-       exit(1);
-}
-
-void
-warn(const char *fmt, ...)
-{
-       va_list arglist;
-
-       fprintf(stderr, "WARNING: ");
-
-       va_start(arglist, fmt);
-       vfprintf(stderr, fmt, arglist);
-       va_end(arglist);
-}
-
-void *do_nofail(void *ptr, const char *file, int line, const char *expr)
-{
-       if (!ptr) {
-               fatal("Memory allocation failure %s line %d: %s.\n",
-                     file, line, expr);
-       }
-       return ptr;
-}
-
-/* A list of all modules we processed */
-
-static struct module *modules;
-
-struct module *
-find_module(char *modname)
-{
-       struct module *mod;
-
-       for (mod = modules; mod; mod = mod->next)
-               if (strcmp(mod->name, modname) == 0)
-                       break;
-       return mod;
-}
-
-struct module *
-new_module(char *modname)
-{
-       struct module *mod;
-       char *p, *s;
-       
-       mod = NOFAIL(malloc(sizeof(*mod)));
-       memset(mod, 0, sizeof(*mod));
-       p = NOFAIL(strdup(modname));
-
-       /* strip trailing .o */
-       if ((s = strrchr(p, '.')) != NULL)
-               if (strcmp(s, ".o") == 0)
-                       *s = '\0';
-
-       /* add to list */
-       mod->name = p;
-       mod->next = modules;
-       modules = mod;
-
-       return mod;
-}
-
-/* A hash of all exported symbols,
- * struct symbol is also used for lists of unresolved symbols */
-
-#define SYMBOL_HASH_SIZE 1024
-
-struct symbol {
-       struct symbol *next;
-       struct module *module;
-       unsigned int crc;
-       int crc_valid;
-       char name[0];
-};
-
-static struct symbol *symbolhash[SYMBOL_HASH_SIZE];
-
-/* This is based on the hash agorithm from gdbm, via tdb */
-static inline unsigned int tdb_hash(const char *name)
-{
-       unsigned value; /* Used to compute the hash value.  */
-       unsigned   i;   /* Used to cycle through random values. */
-
-       /* Set the initial value from the key size. */
-       for (value = 0x238F13AF * strlen(name), i=0; name[i]; i++)
-               value = (value + (((unsigned char *)name)[i] << (i*5 % 24)));
-
-       return (1103515243 * value + 12345);
-}
-
-/* Allocate a new symbols for use in the hash of exported symbols or
- * the list of unresolved symbols per module */
-
-struct symbol *
-alloc_symbol(const char *name, struct symbol *next)
-{
-       struct symbol *s = NOFAIL(malloc(sizeof(*s) + strlen(name) + 1));
-
-       memset(s, 0, sizeof(*s));
-       strcpy(s->name, name);
-       s->next = next;
-       return s;
-}
-
-/* For the hash of exported symbols */
-
-void
-new_symbol(const char *name, struct module *module, unsigned int *crc)
-{
-       unsigned int hash;
-       struct symbol *new;
-
-       hash = tdb_hash(name) % SYMBOL_HASH_SIZE;
-       new = symbolhash[hash] = alloc_symbol(name, symbolhash[hash]);
-       new->module = module;
-       if (crc) {
-               new->crc = *crc;
-               new->crc_valid = 1;
-       }
-}
-
-struct symbol *
-find_symbol(const char *name)
-{
-       struct symbol *s;
-
-       /* For our purposes, .foo matches foo.  PPC64 needs this. */
-       if (name[0] == '.')
-               name++;
-
-       for (s = symbolhash[tdb_hash(name) % SYMBOL_HASH_SIZE]; s; s=s->next) {
-               if (strcmp(s->name, name) == 0)
-                       return s;
-       }
-       return NULL;
-}
-
-/* Add an exported symbol - it may have already been added without a
- * CRC, in this case just update the CRC */
-void
-add_exported_symbol(const char *name, struct module *module, unsigned int *crc)
-{
-       struct symbol *s = find_symbol(name);
-
-       if (!s) {
-               new_symbol(name, module, crc);
-               return;
-       }
-       if (crc) {
-               s->crc = *crc;
-               s->crc_valid = 1;
-       }
-}
-
-void *
-grab_file(const char *filename, unsigned long *size)
-{
-       struct stat st;
-       void *map;
-       int fd;
-
-       fd = open(filename, O_RDONLY);
-       if (fd < 0 || fstat(fd, &st) != 0)
-               return NULL;
-
-       *size = st.st_size;
-       map = mmap(NULL, *size, PROT_READ|PROT_WRITE, MAP_PRIVATE, fd, 0);
-       close(fd);
-
-       if (map == MAP_FAILED)
-               return NULL;
-       return map;
-}
-
-/*
-   Return a copy of the next line in a mmap'ed file.
-   spaces in the beginning of the line is trimmed away.
-   Return a pointer to a static buffer.
-*/
-char*
-get_next_line(unsigned long *pos, void *file, unsigned long size)
-{
-       static char line[4096];
-       int skip = 1;
-       size_t len = 0;
-       char *p = (char *)file + *pos;
-       char *s = line;
-
-       for (; *pos < size ; (*pos)++)
-       {
-               if (skip && isspace(*p)) {
-                       p++;
-                       continue;
-               }
-               skip = 0;
-               if (*p != '\n' && (*pos < size)) {
-                       len++;
-                       *s++ = *p++;
-                       if (len > 4095)
-                               break; /* Too long, stop */
-               } else {
-                       /* End of string */
-                       *s = '\0';
-                       return line;
-               }
-       }
-       /* End of buffer */
-       return NULL;
-}
-
-void
-release_file(void *file, unsigned long size)
-{
-       munmap(file, size);
-}
-
-void
-parse_elf(struct elf_info *info, const char *filename)
-{
-       unsigned int i;
-       Elf_Ehdr *hdr = info->hdr;
-       Elf_Shdr *sechdrs;
-       Elf_Sym  *sym;
-
-       hdr = grab_file(filename, &info->size);
-       if (!hdr) {
-               perror(filename);
-               abort();
-       }
-       info->hdr = hdr;
-       if (info->size < sizeof(*hdr))
-               goto truncated;
-
-       /* Fix endianness in ELF header */
-       hdr->e_shoff    = TO_NATIVE(hdr->e_shoff);
-       hdr->e_shstrndx = TO_NATIVE(hdr->e_shstrndx);
-       hdr->e_shnum    = TO_NATIVE(hdr->e_shnum);
-       hdr->e_machine  = TO_NATIVE(hdr->e_machine);
-       sechdrs = (void *)hdr + hdr->e_shoff;
-       info->sechdrs = sechdrs;
-
-       /* Fix endianness in section headers */
-       for (i = 0; i < hdr->e_shnum; i++) {
-               sechdrs[i].sh_type   = TO_NATIVE(sechdrs[i].sh_type);
-               sechdrs[i].sh_offset = TO_NATIVE(sechdrs[i].sh_offset);
-               sechdrs[i].sh_size   = TO_NATIVE(sechdrs[i].sh_size);
-               sechdrs[i].sh_link   = TO_NATIVE(sechdrs[i].sh_link);
-               sechdrs[i].sh_name   = TO_NATIVE(sechdrs[i].sh_name);
-       }
-       /* Find symbol table. */
-       for (i = 1; i < hdr->e_shnum; i++) {
-               const char *secstrings
-                       = (void *)hdr + sechdrs[hdr->e_shstrndx].sh_offset;
-
-               if (sechdrs[i].sh_offset > info->size)
-                       goto truncated;
-               if (strcmp(secstrings+sechdrs[i].sh_name, ".modinfo") == 0) {
-                       info->modinfo = (void *)hdr + sechdrs[i].sh_offset;
-                       info->modinfo_len = sechdrs[i].sh_size;
-               }
-               if (sechdrs[i].sh_type != SHT_SYMTAB)
-                       continue;
-
-               info->symtab_start = (void *)hdr + sechdrs[i].sh_offset;
-               info->symtab_stop  = (void *)hdr + sechdrs[i].sh_offset 
-                                                + sechdrs[i].sh_size;
-               info->strtab       = (void *)hdr + 
-                                    sechdrs[sechdrs[i].sh_link].sh_offset;
-       }
-       if (!info->symtab_start) {
-               fprintf(stderr, "modpost: %s no symtab?\n", filename);
-               abort();
-       }
-       /* Fix endianness in symbols */
-       for (sym = info->symtab_start; sym < info->symtab_stop; sym++) {
-               sym->st_shndx = TO_NATIVE(sym->st_shndx);
-               sym->st_name  = TO_NATIVE(sym->st_name);
-               sym->st_value = TO_NATIVE(sym->st_value);
-               sym->st_size  = TO_NATIVE(sym->st_size);
-       }
-       return;
-
- truncated:
-       fprintf(stderr, "modpost: %s is truncated.\n", filename);
-       abort();
-}
-
-void
-parse_elf_finish(struct elf_info *info)
-{
-       release_file(info->hdr, info->size);
-}
-
-#define CRC_PFX     MODULE_SYMBOL_PREFIX "__crc_"
-#define KSYMTAB_PFX MODULE_SYMBOL_PREFIX "__ksymtab_"
-
-void
-handle_modversions(struct module *mod, struct elf_info *info,
-                  Elf_Sym *sym, const char *symname)
-{
-       unsigned int crc;
-
-       switch (sym->st_shndx) {
-       case SHN_COMMON:
-               fprintf(stderr, "*** Warning: \"%s\" [%s] is COMMON symbol\n",
-                       symname, mod->name);
-               break;
-       case SHN_ABS:
-               /* CRC'd symbol */
-               if (memcmp(symname, CRC_PFX, strlen(CRC_PFX)) == 0) {
-                       crc = (unsigned int) sym->st_value;
-                       add_exported_symbol(symname + strlen(CRC_PFX),
-                                           mod, &crc);
-                       modversions = 1;
-               }
-               break;
-       case SHN_UNDEF:
-               /* undefined symbol */
-               if (ELF_ST_BIND(sym->st_info) != STB_GLOBAL)
-                       break;
-               /* ignore global offset table */
-               if (strcmp(symname, "_GLOBAL_OFFSET_TABLE_") == 0)
-                       break;
-               /* ignore __this_module, it will be resolved shortly */
-               if (strcmp(symname, MODULE_SYMBOL_PREFIX "__this_module") == 0)
-                       break;
-#ifdef STT_REGISTER
-               if (info->hdr->e_machine == EM_SPARC ||
-                   info->hdr->e_machine == EM_SPARCV9) {
-                       /* Ignore register directives. */
-                       if (ELF_ST_TYPE(sym->st_info) == STT_REGISTER)
-                               break;
-               }
-#endif
-               
-               if (memcmp(symname, MODULE_SYMBOL_PREFIX,
-                          strlen(MODULE_SYMBOL_PREFIX)) == 0)
-                       mod->unres = alloc_symbol(symname +
-                                                 strlen(MODULE_SYMBOL_PREFIX),
-                                                 mod->unres);
-               break;
-       default:
-               /* All exported symbols */
-               if (memcmp(symname, KSYMTAB_PFX, strlen(KSYMTAB_PFX)) == 0) {
-                       add_exported_symbol(symname + strlen(KSYMTAB_PFX),
-                                           mod, NULL);
-               }
-               break;
-       }
-}
-
-int
-is_vmlinux(const char *modname)
-{
-       const char *myname;
-
-       if ((myname = strrchr(modname, '/')))
-               myname++;
-       else
-               myname = modname;
-
-       return strcmp(myname, "vmlinux") == 0;
-}
-
-void
-read_symbols(char *modname)
-{
-       const char *symname;
-       struct module *mod;
-       struct elf_info info = { };
-       Elf_Sym *sym;
-
-       parse_elf(&info, modname);
-
-       mod = new_module(modname);
-
-       /* When there's no vmlinux, don't print warnings about
-        * unresolved symbols (since there'll be too many ;) */
-       if (is_vmlinux(modname)) {
-               unsigned int fake_crc = 0;
-               have_vmlinux = 1;
-               /* May not have this if !CONFIG_MODULE_UNLOAD: fake it.
-                  If it appears, we'll get the real CRC. */
-               add_exported_symbol("cleanup_module", mod, &fake_crc);
-               add_exported_symbol("struct_module", mod, &fake_crc);
-               mod->skip = 1;
-       }
-
-       for (sym = info.symtab_start; sym < info.symtab_stop; sym++) {
-               symname = info.strtab + sym->st_name;
-
-               handle_modversions(mod, &info, sym, symname);
-               handle_moddevtable(mod, &info, sym, symname);
-       }
-       maybe_frob_version(modname, info.modinfo, info.modinfo_len,
-                          (void *)info.modinfo - (void *)info.hdr);
-       parse_elf_finish(&info);
-
-       /* Our trick to get versioning for struct_module - it's
-        * never passed as an argument to an exported function, so
-        * the automatic versioning doesn't pick it up, but it's really
-        * important anyhow */
-       if (modversions) {
-               mod->unres = alloc_symbol("struct_module", mod->unres);
-
-               /* Always version init_module and cleanup_module, in
-                * case module doesn't have its own. */
-               mod->unres = alloc_symbol("init_module", mod->unres);
-               mod->unres = alloc_symbol("cleanup_module", mod->unres);
-       }
-}
-
-#define SZ 500
-
-/* We first write the generated file into memory using the
- * following helper, then compare to the file on disk and
- * only update the later if anything changed */
-
-void __attribute__((format(printf, 2, 3)))
-buf_printf(struct buffer *buf, const char *fmt, ...)
-{
-       char tmp[SZ];
-       int len;
-       va_list ap;
-       
-       va_start(ap, fmt);
-       len = vsnprintf(tmp, SZ, fmt, ap);
-       if (buf->size - buf->pos < len + 1) {
-               buf->size += 128;
-               buf->p = realloc(buf->p, buf->size);
-       }
-       strncpy(buf->p + buf->pos, tmp, len + 1);
-       buf->pos += len;
-       va_end(ap);
-}
-
-void
-buf_write(struct buffer *buf, const char *s, int len)
-{
-       if (buf->size - buf->pos < len) {
-               buf->size += len;
-               buf->p = realloc(buf->p, buf->size);
-       }
-       strncpy(buf->p + buf->pos, s, len);
-       buf->pos += len;
-}
-
-/* Header for the generated file */
-
-void
-add_header(struct buffer *b)
-{
-       buf_printf(b, "#include <linux/module.h>\n");
-       buf_printf(b, "#include <linux/vermagic.h>\n");
-       buf_printf(b, "#include <linux/compiler.h>\n");
-       buf_printf(b, "\n");
-       buf_printf(b, "MODULE_INFO(vermagic, VERMAGIC_STRING);\n");
-       buf_printf(b, "\n");
-       buf_printf(b, "#undef unix\n"); /* We have a module called "unix" */
-       buf_printf(b, "struct module __this_module\n");
-       buf_printf(b, "__attribute__((section(\".gnu.linkonce.this_module\"))) = {\n");
-       buf_printf(b, " .name = __stringify(KBUILD_MODNAME),\n");
-       buf_printf(b, " .init = init_module,\n");
-       buf_printf(b, "#ifdef CONFIG_MODULE_UNLOAD\n");
-       buf_printf(b, " .exit = cleanup_module,\n");
-       buf_printf(b, "#endif\n");
-       buf_printf(b, "};\n");
-}
-
-/* Record CRCs for unresolved symbols */
-
-void
-add_versions(struct buffer *b, struct module *mod)
-{
-       struct symbol *s, *exp;
-
-       for (s = mod->unres; s; s = s->next) {
-               exp = find_symbol(s->name);
-               if (!exp || exp->module == mod) {
-                       if (have_vmlinux)
-                               fprintf(stderr, "*** Warning: \"%s\" [%s.ko] "
-                               "undefined!\n", s->name, mod->name);
-                       continue;
-               }
-               s->module = exp->module;
-               s->crc_valid = exp->crc_valid;
-               s->crc = exp->crc;
-       }
-
-       if (!modversions)
-               return;
-
-       buf_printf(b, "\n");
-       buf_printf(b, "static const struct modversion_info ____versions[]\n");
-       buf_printf(b, "__attribute_used__\n");
-       buf_printf(b, "__attribute__((section(\"__versions\"))) = {\n");
-
-       for (s = mod->unres; s; s = s->next) {
-               if (!s->module) {
-                       continue;
-               }
-               if (!s->crc_valid) {
-                       fprintf(stderr, "*** Warning: \"%s\" [%s.ko] "
-                               "has no CRC!\n",
-                               s->name, mod->name);
-                       continue;
-               }
-               buf_printf(b, "\t{ %#8x, \"%s\" },\n", s->crc, s->name);
-       }
-
-       buf_printf(b, "};\n");
-}
-
-void
-add_depends(struct buffer *b, struct module *mod, struct module *modules)
-{
-       struct symbol *s;
-       struct module *m;
-       int first = 1;
-
-       for (m = modules; m; m = m->next) {
-               m->seen = is_vmlinux(m->name);
-       }
-
-       buf_printf(b, "\n");
-       buf_printf(b, "static const char __module_depends[]\n");
-       buf_printf(b, "__attribute_used__\n");
-       buf_printf(b, "__attribute__((section(\".modinfo\"))) =\n");
-       buf_printf(b, "\"depends=");
-       for (s = mod->unres; s; s = s->next) {
-               if (!s->module)
-                       continue;
-
-               if (s->module->seen)
-                       continue;
-
-               s->module->seen = 1;
-               buf_printf(b, "%s%s", first ? "" : ",",
-                          strrchr(s->module->name, '/') + 1);
-               first = 0;
-       }
-       buf_printf(b, "\";\n");
-}
-
-void
-write_if_changed(struct buffer *b, const char *fname)
-{
-       char *tmp;
-       FILE *file;
-       struct stat st;
-
-       file = fopen(fname, "r");
-       if (!file)
-               goto write;
-
-       if (fstat(fileno(file), &st) < 0)
-               goto close_write;
-
-       if (st.st_size != b->pos)
-               goto close_write;
-
-       tmp = NOFAIL(malloc(b->pos));
-       if (fread(tmp, 1, b->pos, file) != b->pos)
-               goto free_write;
-
-       if (memcmp(tmp, b->p, b->pos) != 0)
-               goto free_write;
-
-       free(tmp);
-       fclose(file);
-       return;
-
- free_write:
-       free(tmp);
- close_write:
-       fclose(file);
- write:
-       file = fopen(fname, "w");
-       if (!file) {
-               perror(fname);
-               exit(1);
-       }
-       if (fwrite(b->p, 1, b->pos, file) != b->pos) {
-               perror(fname);
-               exit(1);
-       }
-       fclose(file);
-}
-
-void
-read_dump(const char *fname)
-{
-       unsigned long size, pos = 0;
-       void *file = grab_file(fname, &size);
-       char *line;
-
-        if (!file)
-               /* No symbol versions, silently ignore */
-               return;
-
-       while ((line = get_next_line(&pos, file, size))) {
-               char *symname, *modname, *d;
-               unsigned int crc;
-               struct module *mod;
-
-               if (!(symname = strchr(line, '\t')))
-                       goto fail;
-               *symname++ = '\0';
-               if (!(modname = strchr(symname, '\t')))
-                       goto fail;
-               *modname++ = '\0';
-               if (strchr(modname, '\t'))
-                       goto fail;
-               crc = strtoul(line, &d, 16);
-               if (*symname == '\0' || *modname == '\0' || *d != '\0')
-                       goto fail;
-
-               if (!(mod = find_module(modname))) {
-                       if (is_vmlinux(modname)) {
-                               modversions = 1;
-                               have_vmlinux = 1;
-                       }
-                       mod = new_module(NOFAIL(strdup(modname)));
-                       mod->skip = 1;
-               }
-               add_exported_symbol(symname, mod, &crc);
-       }
-       return;
-fail:
-       fatal("parse error in symbol dump file\n");
-}
-
-void
-write_dump(const char *fname)
-{
-       struct buffer buf = { };
-       struct symbol *symbol;
-       int n;
-
-       for (n = 0; n < SYMBOL_HASH_SIZE ; n++) {
-               symbol = symbolhash[n];
-               while (symbol) {
-                       symbol = symbol->next;
-               }
-       }
-
-       for (n = 0; n < SYMBOL_HASH_SIZE ; n++) {
-               symbol = symbolhash[n];
-               while (symbol) {
-                       buf_printf(&buf, "0x%08x\t%s\t%s\n", symbol->crc,
-                               symbol->name, symbol->module->name);
-                       symbol = symbol->next;
-               }
-       }
-       write_if_changed(&buf, fname);
-}
-
-int
-main(int argc, char **argv)
-{
-       struct module *mod;
-       struct buffer buf = { };
-       char fname[SZ];
-       char *dump_read = NULL, *dump_write = NULL;
-       int opt;
-
-       while ((opt = getopt(argc, argv, "i:o:")) != -1) {
-               switch(opt) {
-                       case 'i':
-                               dump_read = optarg;
-                               break;
-                       case 'o':
-                               dump_write = optarg;
-                               break;
-                       default:
-                               exit(1);
-               }
-       }
-
-       if (dump_read)
-               read_dump(dump_read);
-
-       while (optind < argc) {
-               read_symbols(argv[optind++]);
-       }
-
-       for (mod = modules; mod; mod = mod->next) {
-               if (mod->skip)
-                       continue;
-
-               buf.pos = 0;
-
-               add_header(&buf);
-               add_versions(&buf, mod);
-               add_depends(&buf, mod, modules);
-               add_moddevtable(&buf, mod);
-
-               sprintf(fname, "%s.mod.c", mod->name);
-               write_if_changed(&buf, fname);
-       }
-
-       if (dump_write)
-               write_dump(dump_write);
-
-       return 0;
-}
-
diff --git a/scripts/mod/modpost.h b/scripts/mod/modpost.h
deleted file mode 100644 (file)
index ddb013d..0000000
+++ /dev/null
@@ -1,103 +0,0 @@
-#include <stdio.h>
-#include <stdlib.h>
-#include <stdarg.h>
-#include <string.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <sys/mman.h>
-#include <fcntl.h>
-#include <unistd.h>
-#include <elf.h>
-
-#include "elfconfig.h"
-
-#if KERNEL_ELFCLASS == ELFCLASS32
-
-#define Elf_Ehdr    Elf32_Ehdr 
-#define Elf_Shdr    Elf32_Shdr 
-#define Elf_Sym     Elf32_Sym
-#define ELF_ST_BIND ELF32_ST_BIND
-#define ELF_ST_TYPE ELF32_ST_TYPE
-
-#else
-
-#define Elf_Ehdr    Elf64_Ehdr 
-#define Elf_Shdr    Elf64_Shdr 
-#define Elf_Sym     Elf64_Sym
-#define ELF_ST_BIND ELF64_ST_BIND
-#define ELF_ST_TYPE ELF64_ST_TYPE
-
-#endif
-
-#if KERNEL_ELFDATA != HOST_ELFDATA
-
-static inline void __endian(const void *src, void *dest, unsigned int size)
-{
-       unsigned int i;
-       for (i = 0; i < size; i++)
-               ((unsigned char*)dest)[i] = ((unsigned char*)src)[size - i-1];
-}
-
-
-
-#define TO_NATIVE(x)                                           \
-({                                                             \
-       typeof(x) __x;                                          \
-       __endian(&(x), &(__x), sizeof(__x));                    \
-       __x;                                                    \
-})
-
-#else /* endianness matches */
-
-#define TO_NATIVE(x) (x)
-
-#endif
-
-#define NOFAIL(ptr)   do_nofail((ptr), __FILE__, __LINE__, #ptr)
-void *do_nofail(void *ptr, const char *file, int line, const char *expr);
-
-struct buffer {
-       char *p;
-       int pos;
-       int size;
-};
-
-void __attribute__((format(printf, 2, 3)))
-buf_printf(struct buffer *buf, const char *fmt, ...);
-
-void
-buf_write(struct buffer *buf, const char *s, int len);
-
-struct module {
-       struct module *next;
-       const char *name;
-       struct symbol *unres;
-       int seen;
-       int skip;
-       struct buffer dev_table_buf;
-};
-
-struct elf_info {
-       unsigned long size;
-       Elf_Ehdr     *hdr;
-       Elf_Shdr     *sechdrs;
-       Elf_Sym      *symtab_start;
-       Elf_Sym      *symtab_stop;
-       const char   *strtab;
-       char         *modinfo;
-       unsigned int modinfo_len;
-};
-
-void handle_moddevtable(struct module *mod, struct elf_info *info,
-                       Elf_Sym *sym, const char *symname);
-
-void add_moddevtable(struct buffer *buf, struct module *mod);
-
-void maybe_frob_version(const char *modfilename,
-                       void *modinfo,
-                       unsigned long modinfo_len,
-                       unsigned long modinfo_offset);
-
-void *grab_file(const char *filename, unsigned long *size);
-char* get_next_line(unsigned long *pos, void *file, unsigned long size);
-void release_file(void *file, unsigned long size);
diff --git a/scripts/mod/sumversion.c b/scripts/mod/sumversion.c
deleted file mode 100644 (file)
index b41b718..0000000
+++ /dev/null
@@ -1,544 +0,0 @@
-#include <netinet/in.h>
-#include <stdint.h>
-#include <ctype.h>
-#include <errno.h>
-#include <string.h>
-#include "modpost.h"
-
-/* Parse tag=value strings from .modinfo section */
-static char *next_string(char *string, unsigned long *secsize)
-{
-       /* Skip non-zero chars */
-       while (string[0]) {
-               string++;
-               if ((*secsize)-- <= 1)
-                       return NULL;
-       }
-
-       /* Skip any zero padding. */
-       while (!string[0]) {
-               string++;
-               if ((*secsize)-- <= 1)
-                       return NULL;
-       }
-       return string;
-}
-
-static char *get_modinfo(void *modinfo, unsigned long modinfo_len,
-                        const char *tag)
-{
-       char *p;
-       unsigned int taglen = strlen(tag);
-       unsigned long size = modinfo_len;
-
-       for (p = modinfo; p; p = next_string(p, &size)) {
-               if (strncmp(p, tag, taglen) == 0 && p[taglen] == '=')
-                       return p + taglen + 1;
-       }
-       return NULL;
-}
-
-/*
- * Stolen form Cryptographic API.
- *
- * MD4 Message Digest Algorithm (RFC1320).
- *
- * Implementation derived from Andrew Tridgell and Steve French's
- * CIFS MD4 implementation, and the cryptoapi implementation
- * originally based on the public domain implementation written
- * by Colin Plumb in 1993.
- *
- * Copyright (c) Andrew Tridgell 1997-1998.
- * Modified by Steve French (sfrench@us.ibm.com) 2002
- * Copyright (c) Cryptoapi developers.
- * Copyright (c) 2002 David S. Miller (davem@redhat.com)
- * Copyright (c) 2002 James Morris <jmorris@intercode.com.au>
- *
- * 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.
- *
- */
-#define MD4_DIGEST_SIZE                16
-#define MD4_HMAC_BLOCK_SIZE    64
-#define MD4_BLOCK_WORDS                16
-#define MD4_HASH_WORDS         4
-
-struct md4_ctx {
-       uint32_t hash[MD4_HASH_WORDS];
-       uint32_t block[MD4_BLOCK_WORDS];
-       uint64_t byte_count;
-};
-
-static inline uint32_t lshift(uint32_t x, unsigned int s)
-{
-       x &= 0xFFFFFFFF;
-       return ((x << s) & 0xFFFFFFFF) | (x >> (32 - s));
-}
-
-static inline uint32_t F(uint32_t x, uint32_t y, uint32_t z)
-{
-       return (x & y) | ((~x) & z);
-}
-
-static inline uint32_t G(uint32_t x, uint32_t y, uint32_t z)
-{
-       return (x & y) | (x & z) | (y & z);
-}
-
-static inline uint32_t H(uint32_t x, uint32_t y, uint32_t z)
-{
-       return x ^ y ^ z;
-}
-
-#define ROUND1(a,b,c,d,k,s) (a = lshift(a + F(b,c,d) + k, s))
-#define ROUND2(a,b,c,d,k,s) (a = lshift(a + G(b,c,d) + k + (uint32_t)0x5A827999,s))
-#define ROUND3(a,b,c,d,k,s) (a = lshift(a + H(b,c,d) + k + (uint32_t)0x6ED9EBA1,s))
-
-/* XXX: this stuff can be optimized */
-static inline void le32_to_cpu_array(uint32_t *buf, unsigned int words)
-{
-       while (words--) {
-               *buf = ntohl(*buf);
-               buf++;
-       }
-}
-
-static inline void cpu_to_le32_array(uint32_t *buf, unsigned int words)
-{
-       while (words--) {
-               *buf = htonl(*buf);
-               buf++;
-       }
-}
-
-static void md4_transform(uint32_t *hash, uint32_t const *in)
-{
-       uint32_t a, b, c, d;
-
-       a = hash[0];
-       b = hash[1];
-       c = hash[2];
-       d = hash[3];
-
-       ROUND1(a, b, c, d, in[0], 3);
-       ROUND1(d, a, b, c, in[1], 7);
-       ROUND1(c, d, a, b, in[2], 11);
-       ROUND1(b, c, d, a, in[3], 19);
-       ROUND1(a, b, c, d, in[4], 3);
-       ROUND1(d, a, b, c, in[5], 7);
-       ROUND1(c, d, a, b, in[6], 11);
-       ROUND1(b, c, d, a, in[7], 19);
-       ROUND1(a, b, c, d, in[8], 3);
-       ROUND1(d, a, b, c, in[9], 7);
-       ROUND1(c, d, a, b, in[10], 11);
-       ROUND1(b, c, d, a, in[11], 19);
-       ROUND1(a, b, c, d, in[12], 3);
-       ROUND1(d, a, b, c, in[13], 7);
-       ROUND1(c, d, a, b, in[14], 11);
-       ROUND1(b, c, d, a, in[15], 19);
-
-       ROUND2(a, b, c, d,in[ 0], 3);
-       ROUND2(d, a, b, c, in[4], 5);
-       ROUND2(c, d, a, b, in[8], 9);
-       ROUND2(b, c, d, a, in[12], 13);
-       ROUND2(a, b, c, d, in[1], 3);
-       ROUND2(d, a, b, c, in[5], 5);
-       ROUND2(c, d, a, b, in[9], 9);
-       ROUND2(b, c, d, a, in[13], 13);
-       ROUND2(a, b, c, d, in[2], 3);
-       ROUND2(d, a, b, c, in[6], 5);
-       ROUND2(c, d, a, b, in[10], 9);
-       ROUND2(b, c, d, a, in[14], 13);
-       ROUND2(a, b, c, d, in[3], 3);
-       ROUND2(d, a, b, c, in[7], 5);
-       ROUND2(c, d, a, b, in[11], 9);
-       ROUND2(b, c, d, a, in[15], 13);
-
-       ROUND3(a, b, c, d,in[ 0], 3);
-       ROUND3(d, a, b, c, in[8], 9);
-       ROUND3(c, d, a, b, in[4], 11);
-       ROUND3(b, c, d, a, in[12], 15);
-       ROUND3(a, b, c, d, in[2], 3);
-       ROUND3(d, a, b, c, in[10], 9);
-       ROUND3(c, d, a, b, in[6], 11);
-       ROUND3(b, c, d, a, in[14], 15);
-       ROUND3(a, b, c, d, in[1], 3);
-       ROUND3(d, a, b, c, in[9], 9);
-       ROUND3(c, d, a, b, in[5], 11);
-       ROUND3(b, c, d, a, in[13], 15);
-       ROUND3(a, b, c, d, in[3], 3);
-       ROUND3(d, a, b, c, in[11], 9);
-       ROUND3(c, d, a, b, in[7], 11);
-       ROUND3(b, c, d, a, in[15], 15);
-
-       hash[0] += a;
-       hash[1] += b;
-       hash[2] += c;
-       hash[3] += d;
-}
-
-static inline void md4_transform_helper(struct md4_ctx *ctx)
-{
-       le32_to_cpu_array(ctx->block, sizeof(ctx->block) / sizeof(uint32_t));
-       md4_transform(ctx->hash, ctx->block);
-}
-
-static void md4_init(struct md4_ctx *mctx)
-{
-       mctx->hash[0] = 0x67452301;
-       mctx->hash[1] = 0xefcdab89;
-       mctx->hash[2] = 0x98badcfe;
-       mctx->hash[3] = 0x10325476;
-       mctx->byte_count = 0;
-}
-
-static void md4_update(struct md4_ctx *mctx,
-                      const unsigned char *data, unsigned int len)
-{
-       const uint32_t avail = sizeof(mctx->block) - (mctx->byte_count & 0x3f);
-
-       mctx->byte_count += len;
-
-       if (avail > len) {
-               memcpy((char *)mctx->block + (sizeof(mctx->block) - avail),
-                      data, len);
-               return;
-       }
-
-       memcpy((char *)mctx->block + (sizeof(mctx->block) - avail),
-              data, avail);
-
-       md4_transform_helper(mctx);
-       data += avail;
-       len -= avail;
-
-       while (len >= sizeof(mctx->block)) {
-               memcpy(mctx->block, data, sizeof(mctx->block));
-               md4_transform_helper(mctx);
-               data += sizeof(mctx->block);
-               len -= sizeof(mctx->block);
-       }
-
-       memcpy(mctx->block, data, len);
-}
-
-static void md4_final_ascii(struct md4_ctx *mctx, char *out, unsigned int len)
-{
-       const unsigned int offset = mctx->byte_count & 0x3f;
-       char *p = (char *)mctx->block + offset;
-       int padding = 56 - (offset + 1);
-
-       *p++ = 0x80;
-       if (padding < 0) {
-               memset(p, 0x00, padding + sizeof (uint64_t));
-               md4_transform_helper(mctx);
-               p = (char *)mctx->block;
-               padding = 56;
-       }
-
-       memset(p, 0, padding);
-       mctx->block[14] = mctx->byte_count << 3;
-       mctx->block[15] = mctx->byte_count >> 29;
-       le32_to_cpu_array(mctx->block, (sizeof(mctx->block) -
-                         sizeof(uint64_t)) / sizeof(uint32_t));
-       md4_transform(mctx->hash, mctx->block);
-       cpu_to_le32_array(mctx->hash, sizeof(mctx->hash) / sizeof(uint32_t));
-
-       snprintf(out, len, "%08X%08X%08X%08X",
-                mctx->hash[0], mctx->hash[1], mctx->hash[2], mctx->hash[3]);
-}
-
-static inline void add_char(unsigned char c, struct md4_ctx *md)
-{
-       md4_update(md, &c, 1);
-}
-
-static int parse_string(const char *file, unsigned long len,
-                       struct md4_ctx *md)
-{
-       unsigned long i;
-
-       add_char(file[0], md);
-       for (i = 1; i < len; i++) {
-               add_char(file[i], md);
-               if (file[i] == '"' && file[i-1] != '\\')
-                       break;
-       }
-       return i;
-}
-
-static int parse_comment(const char *file, unsigned long len)
-{
-       unsigned long i;
-
-       for (i = 2; i < len; i++) {
-               if (file[i-1] == '*' && file[i] == '/')
-                       break;
-       }
-       return i;
-}
-
-/* FIXME: Handle .s files differently (eg. # starts comments) --RR */
-static int parse_file(const char *fname, struct md4_ctx *md)
-{
-       char *file;
-       unsigned long i, len;
-
-       file = grab_file(fname, &len);
-       if (!file)
-               return 0;
-
-       for (i = 0; i < len; i++) {
-               /* Collapse and ignore \ and CR. */
-               if (file[i] == '\\' && (i+1 < len) && file[i+1] == '\n') {
-                       i++;
-                       continue;
-               }
-
-               /* Ignore whitespace */
-               if (isspace(file[i]))
-                       continue;
-
-               /* Handle strings as whole units */
-               if (file[i] == '"') {
-                       i += parse_string(file+i, len - i, md);
-                       continue;
-               }
-
-               /* Comments: ignore */
-               if (file[i] == '/' && file[i+1] == '*') {
-                       i += parse_comment(file+i, len - i);
-                       continue;
-               }
-
-               add_char(file[i], md);
-       }
-       release_file(file, len);
-       return 1;
-}
-
-/* We have dir/file.o.  Open dir/.file.o.cmd, look for deps_ line to
- * figure out source file. */
-static int parse_source_files(const char *objfile, struct md4_ctx *md)
-{
-       char *cmd, *file, *line, *dir;
-       const char *base;
-       unsigned long flen, pos = 0;
-       int dirlen, ret = 0, check_files = 0;
-
-       cmd = NOFAIL(malloc(strlen(objfile) + sizeof("..cmd")));
-
-       base = strrchr(objfile, '/');
-       if (base) {
-               base++;
-               dirlen = base - objfile;
-               sprintf(cmd, "%.*s.%s.cmd", dirlen, objfile, base);
-       } else {
-               dirlen = 0;
-               sprintf(cmd, ".%s.cmd", objfile);
-       }
-       dir = NOFAIL(malloc(dirlen + 1));
-       strncpy(dir, objfile, dirlen);
-       dir[dirlen] = '\0';
-
-       file = grab_file(cmd, &flen);
-       if (!file) {
-               fprintf(stderr, "Warning: could not find %s for %s\n",
-                       cmd, objfile);
-               goto out;
-       }
-
-       /* There will be a line like so:
-               deps_drivers/net/dummy.o := \
-                 drivers/net/dummy.c \
-                   $(wildcard include/config/net/fastroute.h) \
-                 include/linux/config.h \
-                   $(wildcard include/config/h.h) \
-                 include/linux/module.h \
-
-          Sum all files in the same dir or subdirs.
-       */
-       while ((line = get_next_line(&pos, file, flen)) != NULL) {
-               char* p = line;
-               if (strncmp(line, "deps_", sizeof("deps_")-1) == 0) {
-                       check_files = 1;
-                       continue;
-               }
-               if (!check_files)
-                       continue;
-
-               /* Continue until line does not end with '\' */
-               if ( *(p + strlen(p)-1) != '\\')
-                       break;
-               /* Terminate line at first space, to get rid of final ' \' */
-               while (*p) {
-                       if (isspace(*p)) {
-                               *p = '\0';
-                               break;
-                       }
-                       p++;
-               }
-
-               /* Check if this file is in same dir as objfile */
-               if ((strstr(line, dir)+strlen(dir)-1) == strrchr(line, '/')) {
-                       if (!parse_file(line, md)) {
-                               fprintf(stderr,
-                                       "Warning: could not open %s: %s\n",
-                                       line, strerror(errno));
-                               goto out_file;
-                       }
-
-               }
-
-       }
-
-       /* Everyone parsed OK */
-       ret = 1;
-out_file:
-       release_file(file, flen);
-out:
-       free(dir);
-       free(cmd);
-       return ret;
-}
-
-static int get_version(const char *modname, char sum[])
-{
-       void *file;
-       unsigned long len;
-       int ret = 0;
-       struct md4_ctx md;
-       char *sources, *end, *fname;
-       const char *basename;
-       char filelist[sizeof(".tmp_versions/%s.mod") + strlen(modname)];
-
-       /* Source files for module are in .tmp_versions/modname.mod,
-          after the first line. */
-       if (strrchr(modname, '/'))
-               basename = strrchr(modname, '/') + 1;
-       else
-               basename = modname;
-       sprintf(filelist, ".tmp_versions/%s", basename);
-       /* Truncate .o, add .mod */
-       strcpy(filelist + strlen(filelist)-2, ".mod");
-
-       file = grab_file(filelist, &len);
-       if (!file) {
-               fprintf(stderr, "Warning: could not find versions for %s\n",
-                       filelist);
-               return 0;
-       }
-
-       sources = strchr(file, '\n');
-       if (!sources) {
-               fprintf(stderr, "Warning: malformed versions file for %s\n",
-                       modname);
-               goto release;
-       }
-
-       sources++;
-       end = strchr(sources, '\n');
-       if (!end) {
-               fprintf(stderr, "Warning: bad ending versions file for %s\n",
-                       modname);
-               goto release;
-       }
-       *end = '\0';
-
-       md4_init(&md);
-       for (fname = strtok(sources, " "); fname; fname = strtok(NULL, " ")) {
-               if (!parse_source_files(fname, &md))
-                       goto release;
-       }
-
-       /* sum is of form \0<padding>. */
-       md4_final_ascii(&md, sum, 1 + strlen(sum+1));
-       ret = 1;
-release:
-       release_file(file, len);
-       return ret;
-}
-
-static void write_version(const char *filename, const char *sum,
-                         unsigned long offset)
-{
-       int fd;
-
-       fd = open(filename, O_RDWR);
-       if (fd < 0) {
-               fprintf(stderr, "Warning: changing sum in %s failed: %s\n",
-                       filename, strerror(errno));
-               return;
-       }
-
-       if (lseek(fd, offset, SEEK_SET) == (off_t)-1) {
-               fprintf(stderr, "Warning: changing sum in %s:%lu failed: %s\n",
-                       filename, offset, strerror(errno));
-               goto out;
-       }
-
-       if (write(fd, sum, strlen(sum)+1) != strlen(sum)+1) {
-               fprintf(stderr, "Warning: writing sum in %s failed: %s\n",
-                       filename, strerror(errno));
-               goto out;
-       }
-out:
-       close(fd);
-}
-
-void strip_rcs_crap(char *version)
-{
-       unsigned int len, full_len;
-
-       if (strncmp(version, "$Revision", strlen("$Revision")) != 0)
-               return;
-
-       /* Space for version string follows. */
-       full_len = strlen(version) + strlen(version + strlen(version) + 1) + 2;
-
-       /* Move string to start with version number: prefix will be
-        * $Revision$ or $Revision: */
-       len = strlen("$Revision");
-       if (version[len] == ':' || version[len] == '$')
-               len++;
-       while (isspace(version[len]))
-               len++;
-       memmove(version, version+len, full_len-len);
-       full_len -= len;
-
-       /* Preserve up to next whitespace. */
-       len = 0;
-       while (version[len] && !isspace(version[len]))
-               len++;
-       memmove(version + len, version + strlen(version),
-               full_len - strlen(version));
-}
-
-/* If the modinfo contains a "version" value, then set this. */
-void maybe_frob_version(const char *modfilename,
-                       void *modinfo,
-                       unsigned long modinfo_len,
-                       unsigned long modinfo_offset)
-{
-       char *version, *csum;
-
-       version = get_modinfo(modinfo, modinfo_len, "version");
-       if (!version)
-               return;
-
-       /* RCS $Revision gets stripped out. */
-       strip_rcs_crap(version);
-
-       /* Check against double sumversion */
-       if (strchr(version, ' '))
-               return;
-
-       /* Version contains embedded NUL: second half has space for checksum */
-       csum = version + strlen(version);
-       *(csum++) = ' ';
-       if (get_version(modfilename, csum))
-               write_version(modfilename, version,
-                             modinfo_offset + (version - (char *)modinfo));
-}
diff --git a/sound/isa/cs423x/pc98.c b/sound/isa/cs423x/pc98.c
deleted file mode 100644 (file)
index ec0b4cc..0000000
+++ /dev/null
@@ -1,438 +0,0 @@
-/*
- *  Driver for CS4232 on NEC PC9800 series
- *  Copyright (c) by Jaroslav Kysela <perex@suse.cz>
- *                   Osamu Tomita <tomita@cinet.co.jp>
- *                   Takashi Iwai <tiwai@suse.de>
- *                   Hideaki Okubo <okubo@msh.biglobe.ne.jp>
- *
- *
- *   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
- *
- */
-
-#include <sound/driver.h>
-#include <linux/init.h>
-#include <linux/slab.h>
-#include <linux/moduleparam.h>
-#include <sound/core.h>
-#include <sound/cs4231.h>
-#include <sound/mpu401.h>
-#include <sound/opl3.h>
-#include <sound/initval.h>
-#include "sound_pc9800.h"
-
-#define chip_t cs4231_t
-
-MODULE_AUTHOR("Osamu Tomita <tomita@cinet.co.jp>");
-MODULE_LICENSE("GPL");
-MODULE_CLASSES("{sound}");
-MODULE_DESCRIPTION("NEC PC9800 CS4232");
-MODULE_DEVICES("{{NEC,PC9800}}");
-
-#define IDENT "PC98-CS4232"
-
-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] = SNDRV_DEFAULT_ENABLE_ISAPNP; /* Enable this card */
-static long port[SNDRV_CARDS] = SNDRV_DEFAULT_PORT;    /* PnP setup */
-#if 0 /* NOT USED */
-static long cport[SNDRV_CARDS] = SNDRV_DEFAULT_PORT;   /* PnP setup */
-#endif
-static long mpu_port[SNDRV_CARDS] = SNDRV_DEFAULT_PORT;/* PnP setup */
-static long fm_port[SNDRV_CARDS] = SNDRV_DEFAULT_PORT; /* PnP setup */
-static int irq[SNDRV_CARDS] = SNDRV_DEFAULT_IRQ;       /* 5,7,9,11,12,15 */
-static int mpu_irq[SNDRV_CARDS] = SNDRV_DEFAULT_IRQ;   /* 9,11,12,15 */
-static int dma1[SNDRV_CARDS] = SNDRV_DEFAULT_DMA;      /* 0,1,3,5,6,7 */
-static int dma2[SNDRV_CARDS] = SNDRV_DEFAULT_DMA;      /* 0,1,3,5,6,7 */
-static int pc98ii[SNDRV_CARDS];                                /* PC98II */
-static int boot_devs;
-
-module_param_array(index, int, boot_devs, 0444);
-MODULE_PARM_DESC(index, "Index value for " IDENT " soundcard.");
-MODULE_PARM_SYNTAX(index, SNDRV_INDEX_DESC);
-module_param_array(id, charp, boot_devs, 0444);
-MODULE_PARM_DESC(id, "ID string for " IDENT " soundcard.");
-MODULE_PARM_SYNTAX(id, SNDRV_ID_DESC);
-module_param_array(enable, bool, boot_devs, 0444);
-MODULE_PARM_DESC(enable, "Enable " IDENT " soundcard.");
-MODULE_PARM_SYNTAX(enable, SNDRV_ENABLE_DESC);
-module_param_array(port, long, boot_devs, 0444);
-MODULE_PARM_DESC(port, "Port # for " IDENT " driver.");
-MODULE_PARM_SYNTAX(port, SNDRV_PORT12_DESC);
-#if 0 /* NOT USED */
-module_param_array(cport, long, boot_devs, 0444);
-MODULE_PARM_DESC(cport, "Control port # for " IDENT " driver.");
-MODULE_PARM_SYNTAX(cport, SNDRV_PORT12_DESC);
-#endif
-module_param_array(mpu_port, long, boot_devs, 0444);
-MODULE_PARM_DESC(mpu_port, "MPU-401 port # for " IDENT " driver.");
-MODULE_PARM_SYNTAX(mpu_port, SNDRV_PORT12_DESC);
-module_param_array(fm_port, long, boot_devs, 0444);
-MODULE_PARM_DESC(fm_port, "FM port # for " IDENT " driver.");
-MODULE_PARM_SYNTAX(fm_port, SNDRV_PORT12_DESC);
-module_param_array(irq, int, boot_devs, 0444);
-MODULE_PARM_DESC(irq, "IRQ # for " IDENT " driver.");
-MODULE_PARM_SYNTAX(irq, SNDRV_IRQ_DESC);
-module_param_array(mpu_irq, int, boot_devs, 0444);
-MODULE_PARM_DESC(mpu_irq, "MPU-401 IRQ # for " IDENT " driver.");
-MODULE_PARM_SYNTAX(mpu_irq, SNDRV_IRQ_DESC);
-module_param_array(dma1, int, boot_devs, 0444);
-MODULE_PARM_DESC(dma1, "DMA1 # for " IDENT " driver.");
-MODULE_PARM_SYNTAX(dma1, SNDRV_DMA_DESC);
-module_param_array(dma2, int, boot_devs, 0444);
-MODULE_PARM_DESC(dma2, "DMA2 # for " IDENT " driver.");
-MODULE_PARM_SYNTAX(dma2, SNDRV_DMA_DESC);
-module_param_array(pc98ii, bool, boot_devs, 0444);
-MODULE_PARM_DESC(pc98ii, "Roland MPU-PC98II support.");
-MODULE_PARM_SYNTAX(pc98ii, SNDRV_BOOLEAN_FALSE_DESC);
-
-
-static snd_card_t *snd_pc98_cards[SNDRV_CARDS] = SNDRV_DEFAULT_PTR;
-
-/*
- * initialize MPU401-UART
- */
-
-static int __init pc98_mpu401_init(int irq)
-{
-#include "pc9801_118_magic.h"
-#define outp118(reg,data) outb((reg),0x148e);outb((data),0x148f)
-#define WAIT118 outb(0x00,0x5f)
-       int     mpu_intr, count;
-#ifdef OOKUBO_ORIGINAL
-       int     err = 0;
-#endif /* OOKUBO_ORIGINAL */
-
-       switch (irq) {
-       case 3:
-               mpu_intr = 3;
-               break;
-       case 5:
-               mpu_intr = 2;
-               break;
-       case 6:
-               mpu_intr = 1;
-               break;
-       case 10:
-               mpu_intr = 0;
-               break;
-       default:
-               snd_printk(KERN_ERR IDENT ": Bad IRQ %d\n", irq);
-               return -EINVAL;
-       }
-
-       outp118(0x21, mpu_intr);
-       WAIT118;
-       outb(0x00, 0x148e);
-       if (inb(0x148f) & 0x08) {
-               snd_printk(KERN_INFO IDENT ": No MIDI daughter board found\n");
-               return 0;
-       }
-
-       outp118(0x20, 0x00);
-       outp118(0x05, 0x04);
-       for (count = 0; count < 35000; count ++)
-               WAIT118;
-       outb(0x05, 0x148e);
-       for (count = 0; count < 65000; count ++)
-               if (inb(0x148f) == 0x04)
-                       goto set_mode_118;
-       snd_printk(KERN_ERR IDENT ": MIDI daughter board initialize failed at stage1\n\n");
-       return -EINVAL;
-
- set_mode_118:
-       outp118(0x05, 0x0c);
-       outb(0xaa, 0x485);
-       outb(0x99, 0x485);
-       outb(0x2a, 0x485);
-       for (count = 0; count < sizeof(Data0485_99); count ++) {
-               outb(Data0485_99[count], 0x485);
-               WAIT118;
-       }
-
-       outb(0x00, 0x486);
-       outb(0xaa, 0x485);
-       outb(0x9e, 0x485);
-       outb(0x2a, 0x485);
-       for (count = 0; count < sizeof(Data0485_9E); count ++)
-               if (inb(0x485) != Data0485_9E[count]) {
-#ifdef OOKUBO_ORIGINAL
-                       err = 1;
-#endif /* OOKUBO_ORIGINAL */
-                       break;
-               }
-       outb(0x00, 0x486);
-       for (count = 0; count < 2000; count ++)
-               WAIT118;
-#ifdef OOKUBO_ORIGINAL
-       if (!err) {
-               outb(0xaa, 0x485);
-               outb(0x36, 0x485);
-               outb(0x28, 0x485);
-               for (count = 0; count < sizeof(Data0485_36); count ++)
-                       outb(Data0485_36[count], 0x485);
-               outb(0x00, 0x486);
-               for (count = 0; count < 1500; count ++)
-                       WAIT118;
-               outp118(0x05, inb(0x148f) | 0x08);
-               outb(0xff, 0x148c);
-               outp118(0x05, inb(0x148f) & 0xf7);
-               for (count = 0; count < 1500; count ++)
-                       WAIT118;
-       }
-#endif /* OOKUBO_ORIGINAL */
-
-       outb(0xaa, 0x485);
-       outb(0xa9, 0x485);
-       outb(0x21, 0x485);
-       for (count = 0; count < sizeof(Data0485_A9); count ++) {
-               outb(Data0485_A9[count], 0x485);
-               WAIT118;
-       }
-
-       outb(0x00, 0x486);
-       outb(0xaa, 0x485);
-       outb(0x0c, 0x485);
-       outb(0x20, 0x485);
-       for (count = 0; count < sizeof(Data0485_0C); count ++) {
-               outb(Data0485_0C[count], 0x485);
-               WAIT118;
-       }
-
-       outb(0x00, 0x486);
-       outb(0xaa, 0x485);
-       outb(0x66, 0x485);
-       outb(0x20, 0x485);
-       for (count = 0; count < sizeof(Data0485_66); count ++) {
-               outb(Data0485_66[count], 0x485);
-               WAIT118;
-       }
-
-       outb(0x00, 0x486);
-       outb(0xaa, 0x485);
-       outb(0x60, 0x485);
-       outb(0x20, 0x485);
-       for (count = 0; count < sizeof(Data0485_60); count ++) {
-               outb(Data0485_60[count], 0x485);
-               WAIT118;
-       }
-
-       outb(0x00, 0x486);
-       outp118(0x05, 0x04);
-       outp118(0x05, 0x00);
-       for (count = 0; count < 35000; count ++)
-               WAIT118;
-       outb(0x05, 0x148e);
-       for (count = 0; count < 65000; count ++)
-               if (inb(0x148f) == 0x00)
-                       goto end_mode_118;
-       snd_printk(KERN_ERR IDENT ": MIDI daughter board initialize failed at stage2\n");
-       return -EINVAL;
-
- end_mode_118:
-       outb(0x3f, 0x148d);
-       snd_printk(KERN_INFO IDENT ": MIDI daughter board initialized\n");
-       return 0;
-}
-
-static int __init pc98_cs4231_chip_init(int dev)
-{
-       int intr_bits, intr_bits2, dma_bits;
-
-       switch (irq[dev]) {
-       case 3:
-               intr_bits = 0x08;
-               intr_bits2 = 0x03;
-               break;
-       case 5:
-               intr_bits = 0x10;
-               intr_bits2 = 0x08;
-               break;
-       case 10:
-               intr_bits = 0x18;
-               intr_bits2 = 0x02;
-               break;
-       case 12:
-               intr_bits = 0x20;
-               intr_bits2 = 0x00;
-               break;
-       default:
-               snd_printk(KERN_ERR IDENT ": Bad IRQ %d\n", irq[dev]);
-               return -EINVAL;
-       }
-
-       switch (dma1[dev]) {
-       case 0:
-               dma_bits = 0x01;
-               break;
-       case 1:
-               dma_bits = 0x02;
-               break;
-       case 3:
-               dma_bits = 0x03;
-               break;
-       default:
-               snd_printk(KERN_ERR IDENT ": Bad DMA %d\n", dma1[dev]);
-               return -EINVAL;
-       }
-
-       if (dma2[dev] >= 2) {
-               snd_printk(KERN_ERR IDENT ": Bad DMA %d\n", dma2[dev]);
-               return -EINVAL;
-       }
-
-       outb(dma1[dev], 0x29);          /* dma1 boundary 64KB */
-       if (dma1[dev] != dma2[dev] && dma2[dev] >= 0) {
-               outb(0, 0x5f);          /* wait */
-               outb(dma2[dev], 0x29);  /* dma2 boundary 64KB */
-               intr_bits |= 0x04;
-       }
-
-       if (PC9800_SOUND_ID() == PC9800_SOUND_ID_118) {
-               /* Set up CanBe control registers. */
-               snd_printd(KERN_INFO "Setting up CanBe Sound System\n");
-               outb(inb(PC9800_SOUND_IO_ID) | 0x03, PC9800_SOUND_IO_ID);
-               outb(0x01, 0x0f4a);
-               outb(intr_bits2, 0x0f4b);
-       }
-
-       outb(intr_bits | dma_bits, 0xf40);
-       return 0;
-}
-
-
-static int __init snd_card_pc98_probe(int dev)
-{
-       snd_card_t *card;
-       snd_pcm_t *pcm = NULL;
-       cs4231_t *chip;
-       opl3_t *opl3;
-       int err;
-
-       if (port[dev] == SNDRV_AUTO_PORT) {
-               snd_printk(KERN_ERR IDENT ": specify port\n");
-               return -EINVAL;
-       }
-       card = snd_card_new(index[dev], id[dev], THIS_MODULE, 0);
-       if (card == NULL)
-               return -ENOMEM;
-
-       if ((err = pc98_cs4231_chip_init(dev)) < 0) {
-               snd_card_free(card);
-               return err;
-       }
-
-       if ((err = snd_cs4231_create(card,
-                                    port[dev],
-                                    -1,
-                                    irq[dev],
-                                    dma1[dev],
-                                    dma2[dev],
-                                    CS4231_HW_DETECT,
-                                    0,
-                                    &chip)) < 0) {
-               snd_card_free(card);
-               return err;
-       }
-       if ((err = snd_cs4231_pcm(chip, 0, &pcm)) < 0) {
-               snd_card_free(card);
-               return err;
-       }
-       if ((err = snd_cs4231_mixer(chip)) < 0) {
-               snd_card_free(card);
-               return err;
-       }
-
-       if ((err = snd_cs4231_timer(chip, 0, NULL)) < 0) {
-               snd_card_free(card);
-               return err;
-       }
-
-       if (fm_port[dev] > 0 && fm_port[dev] != SNDRV_AUTO_PORT) {
-               /* ??? */
-               outb(0x00, fm_port[dev] + 6);
-               inb(fm_port[dev] + 7);
-               /* Enable OPL-3 Function */
-               outb(inb(PC9800_SOUND_IO_ID) | 0x03, PC9800_SOUND_IO_ID);
-               if (snd_opl3_create(card,
-                                   fm_port[dev], fm_port[dev] + 2,
-                                   OPL3_HW_OPL3_PC98, 0, &opl3) < 0) {
-                       printk(KERN_ERR IDENT ": OPL3 not detected\n");
-               } else {
-                       if ((err = snd_opl3_hwdep_new(opl3, 0, 1, NULL)) < 0) {
-                               snd_card_free(card);
-                               return err;
-                       }
-               }
-       }
-
-       if (mpu_port[dev] > 0 && mpu_port[dev] != SNDRV_AUTO_PORT) {
-               err = pc98_mpu401_init(mpu_irq[dev]);
-               if (! err) {
-                       err = snd_mpu401_uart_new(card, 0,
-                                                 pc98ii[dev] ? MPU401_HW_PC98II : MPU401_HW_MPU401,
-                                                 mpu_port[dev], 0,
-                                                 mpu_irq[dev], SA_INTERRUPT, NULL);
-                       if (err < 0)
-                               snd_printk(KERN_INFO IDENT ": MPU401 not detected\n");
-               }
-       }
-
-       strcpy(card->driver, pcm->name);
-       strcpy(card->shortname, pcm->name);
-       sprintf(card->longname, "%s at 0x%lx, irq %i, dma %i",
-               pcm->name,
-               chip->port,
-               irq[dev],
-               dma1[dev]);
-       if (dma2[dev] >= 0)
-               sprintf(card->longname + strlen(card->longname), "&%d", dma2[dev]);
-       if ((err = snd_card_register(card)) < 0) {
-               snd_card_free(card);
-               return err;
-       }
-       snd_pc98_cards[dev] = card;
-       return 0;
-}
-
-static int __init alsa_card_pc98_init(void)
-{
-       int dev, cards = 0;
-
-       for (dev = 0; dev < SNDRV_CARDS; dev++) {
-               if (!enable[dev])
-                       continue;
-               if (snd_card_pc98_probe(dev) >= 0)
-                       cards++;
-       }
-       if (!cards) {
-#ifdef MODULE
-               printk(KERN_ERR IDENT " soundcard not found or device busy\n");
-#endif
-               return -ENODEV;
-       }
-       return 0;
-}
-
-static void __exit alsa_card_pc98_exit(void)
-{
-       int idx;
-
-       for (idx = 0; idx < SNDRV_CARDS; idx++)
-               snd_card_free(snd_pc98_cards[idx]);
-}
-
-module_init(alsa_card_pc98_init)
-module_exit(alsa_card_pc98_exit)
diff --git a/sound/isa/cs423x/pc9801_118_magic.h b/sound/isa/cs423x/pc9801_118_magic.h
deleted file mode 100644 (file)
index 2452127..0000000
+++ /dev/null
@@ -1,411 +0,0 @@
-               static unsigned char    Data0485_A9[] = {
-               0x12, 0x03, 0x90, 0xc2, 0x2a, 0x75, 0x1e, 0x20,
-               0xe4, 0x12, 0x2b, 0x9b, 0x22, 0xa9, 0x16, 0x77,
-               0x33, 0xe9, 0x04, 0x54, 0x03, 0x44, 0xa8, 0xf5,
-               0x16, 0xc2, 0x2f, 0x22, 0xa9, 0x16, 0x77, 0x42,
-               0xe9, 0x04, 0x54, 0x03, 0x44, 0xa8, 0xf9, 0x77,
-               0xf8, 0x04, 0x54, 0x03, 0x44, 0xa8, 0xf5, 0x16,
-               0xc2, 0x2f, 0x22, 0x90, 0x25, 0x9f, 0x30, 0x04,
-               0x05, 0xc2, 0x04, 0x12, 0x1f, 0x62, 0x30, 0x00,
-               0x05, 0xc2, 0x00, 0x12, 0x15, 0xe6, 0x30, 0x01,
-               0x05, 0xc2, 0x01, 0x12, 0x29, 0xaf, 0x30, 0x02,
-               0x05, 0xc2, 0x02, 0x12, 0x29, 0xaf, 0x30, 0x05,
-               0x05, 0xc2, 0x05, 0x12, 0x16, 0x65, 0x30, 0x06,
-               0x08, 0xc2, 0x06, 0x12, 0x16, 0xb1, 0x12, 0x29,
-               0xaf, 0x30, 0x07, 0x08, 0xc2, 0x07, 0x12, 0x16,
-               0xe9, 0x12, 0x29, 0xaf, 0x22, 0x20, 0x97, 0x09,
-               0x53, 0xa8, 0xfb, 0x12, 0x04, 0x2c, 0x43, 0xa8,
-               0x04, 0x22, 0x71, 0xb8, 0x71, 0xb8, 0x71, 0xb8,
-               0x22, 0x20, 0x4b, 0x04, 0x75, 0x4e, 0x02, 0x22,
-               0xe5, 0x35, 0x24, 0xff, 0xf5, 0x35, 0xe5, 0x36,
-               0x34, 0xff, 0xf5, 0x36, 0x75, 0x4e, 0x02, 0x22,
-               0x10, 0x19, 0x02, 0x80, 0x08, 0x78, 0x00, 0xe2,
-               0x78, 0x07, 0xf2, 0x61, 0x9b, 0x78, 0x11, 0xe2,
-               0xc0, 0x01, 0xc0, 0xf0, 0xc0, 0xd0, 0xc0, 0x02,
-               0x71, 0x14, 0xe5, 0x30, 0xb4, 0x01, 0x02, 0x61,
-               0x93, 0x43, 0x08, 0x40, 0x12, 0x2a, 0x53, 0x61,
-               0x93, 0x79, 0x03, 0xe3, 0xa2, 0xe2, 0x92, 0x26,
-               0xa2, 0xe3, 0x92, 0x27, 0x22, 0xad, 0x2b, 0xbd,
-               0x04, 0x07, 0xf5, 0x72, 0x78, 0x27, 0x02, 0x11,
-               0x76, 0x02, 0x11, 0x30, 0x00, 0x00, 0x00, 0x12,
-               0x28, 0xba, 0x79, 0x01, 0xe3, 0x75, 0x21, 0x3f,
-               0x75, 0x49, 0x11, 0x75, 0x4c, 0x11, 0x31, 0xdc,
-               0x75, 0x1a, 0x80, 0x51, 0x72, 0x75, 0x81, 0xe3,
-               0x12, 0x25, 0xc9, 0x43, 0xa8, 0x01, 0x00, 0x53,
-               0xa8, 0xfe, 0x10, 0x50, 0x02, 0x80, 0x03, 0x12,
-               0x1a, 0x8d, 0xd1, 0x28, 0x12, 0x03, 0xd9, 0xd1,
-               0xf2, 0x12, 0x2d, 0xf0, 0xb0, 0x11, 0x92, 0xe0,
-               0xa2, 0x2a, 0xa0, 0xb5, 0x82, 0xe0, 0x50, 0x03,
-               0x79, 0x0f, 0xe3, 0x71, 0xca, 0x51, 0x1e, 0x91,
-               0xe4, 0x53, 0xa8, 0xfb, 0x10, 0x10, 0x02, 0x80,
-               0x26, 0xc2, 0x8e, 0xd2, 0xab, 0xa2, 0x1c, 0x40,
-               0x13, 0xa2, 0x1d, 0x50, 0x0a, 0x43, 0x08, 0x40,
-               0x12, 0x1a, 0x01, 0xd1, 0xd7, 0x80, 0x0b, 0x12,
-               0x26, 0x04, 0x61, 0x08, 0x43, 0x08, 0x40, 0x12,
-               0x1a, 0x01, 0xd2, 0x1f, 0x12, 0x17, 0x7f, 0x43,
-               0xa8, 0x04, 0x51, 0x1e, 0x91, 0xe4, 0x12, 0x13,
-               0x34, 0x80, 0x98, 0xa2, 0x17, 0x72, 0x16, 0x72,
-               0x15, 0x72, 0x2d, 0x50, 0x06, 0xfa, 0x12, 0x13,
-               0x66, 0x80, 0x25, 0xc2, 0x13, 0x30, 0x28, 0x05,
-               0x12, 0x02, 0xbe, 0x80, 0x1b, 0xb4, 0x10, 0x12,
-               0x78, 0x00, 0xf2, 0xe5, 0x30, 0xb4, 0x01, 0x06,
-               0x12, 0x03, 0x90, 0xd2, 0x19, 0x22, 0x12, 0x00,
-               0xdd, 0x22, 0x75, 0x30, 0x00, 0x12, 0x00, 0xa1,
-               0x22, 0x00, 0x00, 0x75, 0x1e, 0x00, 0x74, 0x0c,
-               0x12, 0x2b, 0x9b, 0x74, 0x40, 0x79, 0x05, 0xf3,
-               0x74, 0x49, 0x12, 0x2b, 0x9b, 0x74, 0x04, 0x79,
-               0x05, 0xf3, 0x75, 0x15, 0x04, 0x74, 0x10, 0x12,
-               0x2b, 0x9b, 0x74, 0x00, 0x79, 0x05, 0xf3, 0x74,
-               0x17, 0x12, 0x2b, 0x9b, 0x74, 0x00, 0x79, 0x05,
-               0xf3, 0x74, 0x1a, 0x12, 0x2b, 0x9b, 0x74, 0x00,
-               0x79, 0x05, 0xf3, 0x74, 0x0a, 0x12, 0x2b, 0x9b,
-               0x74, 0x20, 0x79, 0x05, 0xf3, 0x79, 0xe0, 0x77,
-               0x20, 0x22, 0xd0, 0x02, 0xd0, 0xd0, 0xd0, 0xf0,
-               0xd0, 0x01, 0xe5, 0x5f, 0xd0, 0xa8, 0x22, 0x00,
-               0x00, 0x90, 0x25, 0x9f, 0x75, 0x26, 0xff, 0x75,
-               0x27, 0xff, 0x75, 0x28, 0x03, 0x75, 0x13, 0xff,
-               0x75, 0x1f, 0x00, 0x75, 0x14, 0xff, 0x22, 0x79,
-               0x06, 0xe5, 0x29, 0x60, 0x0b, 0xe3, 0x30, 0xe1,
-               0xf8, 0xe5, 0x4f, 0x64, 0x80, 0x79, 0x07, 0xf3,
-               0x22, 0x10, 0x4c, 0x01, 0x22, 0x30, 0x4b, 0x0a,
-               0xc2, 0x4b, 0xe5, 0x4d, 0x64, 0x80, 0xf5, 0x4f,
-               0x80, 0x1d, 0xe5, 0x15, 0xa2, 0xe0, 0x82, 0xe6,
-               0x40, 0x02, 0x80, 0x35, 0x30, 0x4a, 0x04, 0xb1,
-               0xe6, 0x80, 0x0c, 0x30, 0x49, 0x04, 0x51, 0x2b,
-               0x80, 0x05, 0x30, 0x48, 0x24, 0x91, 0x7e, 0x79,
-               0x06, 0xe3, 0x30, 0xe0, 0x1a, 0x79, 0x06, 0xf3,
-               0xe5, 0x4e, 0x24, 0xff, 0x50, 0x04, 0xf5, 0x4e,
-               0x80, 0x0d, 0x79, 0x0f, 0xf3, 0x20, 0x2a, 0x07,
-               0x12, 0x2b, 0x32, 0x75, 0x29, 0x00, 0x22, 0x91,
-               0x1b, 0x22, 0x79, 0x0f, 0xe3, 0xc0, 0xa8, 0x75,
-               0xa8, 0x00, 0x30, 0x2b, 0x03, 0xd0, 0xa8, 0x22,
-               0x79, 0x0e, 0xf3, 0xd0, 0xa8, 0x22, 0x8a, 0xf0,
-               0xe5, 0x50, 0x10, 0xf3, 0x10, 0x23, 0x23, 0x23,
-               0x25, 0xf0, 0x12, 0x2c, 0xb8, 0xa2, 0xe7, 0x92,
-               0xe4, 0xc2, 0xe7, 0x80, 0x08, 0x23, 0x23, 0x23,
-               0x25, 0xf0, 0x12, 0x2c, 0x19, 0x25, 0x4f, 0x20,
-               0xd2, 0x04, 0xf5, 0x4f, 0x80, 0x0a, 0x40, 0x05,
-               0x75, 0x4f, 0x7f, 0x80, 0x03, 0x75, 0x4f, 0xff,
-               0xea, 0x12, 0x2c, 0x3c, 0x25, 0x50, 0x20, 0xe7,
-               0x05, 0xb4, 0x03, 0x07, 0x80, 0x0c, 0x75, 0x50,
-               0x00, 0x80, 0x09, 0x40, 0x05, 0x75, 0x50, 0x03,
-               0x80, 0x02, 0xf5, 0x50, 0x22, 0xe5, 0x4d, 0xc4,
-               0x54, 0x0c, 0x03, 0x03, 0xfa, 0x91, 0xa9, 0x71,
-               0xb8, 0xe5, 0x4d, 0xc4, 0x54, 0x03, 0xfa, 0x91,
-               0xa9, 0x71, 0xb8, 0xe5, 0x4d, 0x54, 0x0c, 0x03,
-               0x03, 0xfa, 0x91, 0xa9, 0x71, 0xb8, 0xe5, 0x4d,
-               0x54, 0x03, 0xfa, 0x91, 0xa9, 0x71, 0xb8, 0x22,
-               0x8a, 0xf0, 0xe5, 0x50, 0x23, 0x23, 0x25, 0xf0,
-               0x12, 0x2b, 0xf6, 0x25, 0x4f, 0x20, 0xd2, 0x04,
-               0xf5, 0x4f, 0x80, 0x0a, 0x40, 0x05, 0x75, 0x4f,
-               0x7f, 0x80, 0x03, 0x75, 0x4f, 0xff, 0xea, 0x12,
-               0x2c, 0x40, 0x25, 0x50, 0x20, 0xe7, 0x05, 0xb4,
-               0x05, 0x07, 0x80, 0x0c, 0x75, 0x50, 0x00, 0x80,
-               0x09, 0x40, 0x05, 0x75, 0x50, 0x05, 0x80, 0x02,
-               0xf5, 0x50, 0x22, 0x30, 0x26, 0x03, 0x12, 0x1e,
-               0xf5, 0x30, 0x27, 0x03, 0x12, 0x1f, 0x37, 0x30,
-               0x25, 0x09, 0x12, 0x1f, 0x4e, 0x30, 0x23, 0x03,
-               0x12, 0x1f, 0x1e, 0x10, 0x22, 0x02, 0x80, 0x0a,
-               0xe5, 0x3b, 0xb4, 0xff, 0x02, 0xc2, 0x20, 0x12,
-               0x1e, 0x79, 0x22, 0x78, 0x11, 0xe2, 0x20, 0xe0,
-               0x07, 0xc0, 0x01, 0x12, 0x28, 0xba, 0xd0, 0x01,
-               0x78, 0x00, 0xf2, 0x61, 0x9b, 0x12, 0x2b, 0x32,
-               0x12, 0x17, 0x7f, 0x78, 0x00, 0xf2, 0xaa, 0x35,
-               0xab, 0x36, 0xea, 0x24, 0xff, 0xfa, 0xeb, 0x34,
-               0xff, 0xfb, 0x50, 0x03, 0xd2, 0x10, 0x22, 0x75,
-               0x37, 0x01, 0x75, 0x38, 0x00, 0x75, 0x39, 0x00,
-               0x12, 0x04, 0x04, 0xd2, 0x8e, 0x22, 0xa8, 0x2b,
-               0xb8, 0x00, 0x02, 0x80, 0x03, 0x02, 0x11, 0xbd,
-               0xf5, 0x74, 0x78, 0x2a, 0x12, 0x11, 0xec, 0xe5,
-               0x74, 0x78, 0x29, 0x12, 0x11, 0xec, 0x22, 0xfa,
-               0xe5, 0x2b, 0x60, 0x01, 0x22, 0xea, 0x78, 0x2b,
-               0xf5, 0x75, 0x12, 0x11, 0xec, 0x22, 0x74, 0x10,
-               0x12, 0x2b, 0x9b, 0x74, 0x20, 0x78, 0x05, 0xf2,
-               0x74, 0x09, 0x12, 0x17, 0x75, 0xe5, 0x15, 0x44,
-               0x80, 0x79, 0x05, 0xf3, 0xf5, 0x15, 0x12, 0x17,
-               0x7f, 0x22, 0x12, 0x03, 0x84, 0x79, 0x0f, 0xe3,
-               0x78, 0x00, 0xf2, 0x12, 0x2b, 0x28, 0xe5, 0x81,
-               0x24, 0xfc, 0xf5, 0x81, 0x61, 0x93, 0xd2, 0x07,
-               0x78, 0x11, 0xe2, 0x44, 0x11, 0xf5, 0x4c, 0xc2,
-               0x0f, 0x12, 0x29, 0xa3, 0x61, 0x93, 0x02, 0x1b,
-               0x77, 0x00, 0xe1, 0x81, 0xe1, 0x9a, 0xd2, 0x2c,
-               0xa1, 0x0c, 0x20, 0x20, 0x02, 0xd2, 0x26, 0x02,
-               0x1e, 0x35, 0x02, 0x1e, 0x61, 0x02, 0x1d, 0x8f,
-               0xc2, 0x8e, 0x75, 0xa8, 0x9e, 0x22, 0x41, 0x49,
-               0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-               0x02, 0x29, 0x91, 0x00, 0x00, 0x00, 0xa1, 0xbb,
-               0xa1, 0xc3, 0x02, 0x1e, 0x6b, 0xe5, 0x4d, 0xc4,
-               0x54, 0x0f, 0xfa, 0x91, 0x2f, 0x71, 0xb8, 0xe5,
-               0x4d, 0x54, 0x0f, 0xfa, 0x91, 0x2f, 0x71, 0xb8,
-               0x22, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa1, 0xc6,
-               0x02, 0x1d, 0x8f, 0xc2, 0x8e, 0xd2, 0xab, 0xc2,
-               0x10, 0x79, 0x0f, 0xf3, 0x22, 0x00, 0x02, 0x2a,
-               0x84, 0x00, 0xe1, 0xbc, 0xe1, 0xc8, 0x02, 0x1e,
-               0x27, 0x00, 0x78, 0x00, 0xf2, 0x78, 0x0b, 0xe2,
-               0xf4, 0xf5, 0x4d, 0xd2, 0x4c, 0x61, 0x9b, 0x30,
-               0xb5, 0x02, 0xc2, 0x11, 0x22, 0x00, 0x00, 0x00,
-               0x00, 0x00, 0x00, 0x79, 0xbd, 0xf1, 0x3d, 0x83,
-               0x22, 0xdd, 0xbd, 0xbd, 0xbd, 0x61, 0xbd, 0x8d,
-               0x7a, 0xbd, 0xbd, 0xbd, 0xbd, 0x30, 0xbd, 0xbd,
-               0xbd, 0x55, 0xbd, 0xbd, 0xbd, 0x52, 0xbd, 0xb6,
-               0xb6, 0xbd, 0xbd, 0xbd, 0xbd, 0x00, 0xbd, 0xbd,
-               0xbd, 0xe8, 0xda, 0xbd, 0xbd, 0xcf, 0xb9, 0xbd,
-               0xc4, 0xf1, 0xbd, 0xbd, 0xbd, 0xbd, 0xbd, 0xbd,
-               0xbd, 0x7b, 0xbd, 0xbd, 0xbd, 0xbd, 0xbd, 0xbd,
-               0xbd, 0x70, 0x6a, 0x57, 0x47, 0x34, 0xbd, 0xbd,
-               0xbd, 0xbd, 0xbd, 0xbd, 0xbd, 0xbd, 0x29, 0xbd,
-               0xbd, 0xbd, 0xb6, 0xb6, 0xbd, 0xbd, 0xbd, 0xbd,
-               0xbd, 0xbd, 0xbd, 0xbd, 0xbd, 0xbd, 0x2e, 0x25,
-               0xbd, 0xbd, 0xbd, 0xbd, 0xbd, 0xbd, 0xfe, 0xf5,
-               0xbd, 0xbd, 0xbd, 0xbd, 0xbd, 0xbd, 0x19, 0xbd,
-               0xbd, 0xbd, 0xbd, 0xbd, 0xbd, 0xbd, 0x21, 0x8f,
-               0x09, 0xbd, 0xf9, 0x86, 0xbd, 0xbd, 0xbd, 0xd7,
-               0xbd, 0xa9, 0xbd, 0xbd, 0xbd, 0xbd, 0xbd, 0x9b,
-               0xd1, 0x9d, 0xbd, 0xae, 0xbd, 0xbd, 0xbd, 0xcb,
-               0xbd, 0xbd, 0xbd, 0xbd, 0xbd, 0xbd, 0xbd, 0xbd,
-               0xb6, 0xa5, 0xbd, 0xc5, 0xbd, 0xbd, 0xbd, 0xc3,
-               0xbd, 0xbd, 0xbd, 0xbd, 0xbd, 0xbd, 0x74, 0x10,
-               0x12, 0x2b, 0x9b, 0xe4, 0x78, 0x05, 0xf2, 0x74,
-               0x09, 0x12, 0x17, 0x75, 0xe5, 0x15, 0x54, 0x7f,
-               0x79, 0x05, 0xf3, 0xf5, 0x15, 0x12, 0x17, 0x7f,
-               0x22, 0x30, 0x51, 0x01, 0x22, 0x53, 0xa8, 0xfb,
-               0x12, 0x2d, 0xf0, 0x50, 0x22, 0x79, 0x03, 0xe3,
-               0x20, 0xe4, 0x1c, 0xaa, 0x35, 0xab, 0x36, 0xea,
-               0x24, 0xf0, 0xfa, 0xeb, 0x34, 0xff, 0xfb, 0x50,
-               0x0e, 0x10, 0x1f, 0x02, 0x80, 0x09, 0x20, 0x2a,
-               0x03, 0x12, 0x2b, 0x32, 0x12, 0x2d, 0xd6, 0x43,
-               0xa8, 0x04, 0x22, 0xa2, 0x1c, 0x72, 0x1d, 0x40,
-               0x07, 0x53, 0x08, 0xbf, 0x78, 0x00, 0xf2, 0x22,
-               0xb1, 0x1e, 0x22, 0x00, 0x79, 0x02, 0x12, 0x27,
-               0x3d, 0x02, 0x2d, 0x37, 0x14, 0x54, 0xf0, 0x60,
-               0x21, 0xe5, 0xf0, 0x24, 0xb6, 0xe5, 0xf0, 0x50,
-               0x16, 0x24, 0x8b, 0x50, 0x15, 0xe5, 0xf0, 0x24,
-               0x56, 0xe5, 0xf0, 0x50, 0x08, 0x24, 0x2f, 0x50,
-               0x09, 0xe5, 0xf0, 0x24, 0xd9, 0x24, 0xd5, 0x24,
-               0xf0, 0x22, 0x15, 0x81, 0x15, 0x81, 0xe9, 0x22,
-               0x78, 0x13, 0x74, 0x00, 0xf2, 0x75, 0x2e, 0x01,
-               0xd2, 0x6a, 0xc2, 0x69, 0xc2, 0x68, 0xc2, 0x6c,
-               0x90, 0x25, 0x9f, 0x75, 0xb8, 0x07, 0x41, 0xa4,
-               0xc0, 0x01, 0xc0, 0xf0, 0xc0, 0xd0, 0xc0, 0x02,
-               0xe5, 0x3d, 0x54, 0x7d, 0x03, 0x10, 0xe5, 0x05,
-               0x90, 0x28, 0x4b, 0x80, 0x03, 0x90, 0x2b, 0x7c,
-               0x73, 0xe5, 0x3d, 0x30, 0xe5, 0x07, 0x74, 0xfd,
-               0x78, 0x00, 0xf2, 0x61, 0x9b, 0x90, 0x1a, 0x97,
-               0x74, 0xb6, 0xc0, 0xe0, 0x74, 0x27, 0xc0, 0xe0,
-               0xc0, 0xa8, 0x02, 0x1b, 0xab, 0x90, 0x25, 0x9f,
-               0xd0, 0xa8, 0x22, 0x90, 0x27, 0xb6, 0xc0, 0x82,
-               0xc0, 0x83, 0xc0, 0xa8, 0x02, 0x1d, 0xa6, 0x90,
-               0x27, 0xb6, 0xc0, 0x82, 0xc0, 0x83, 0xc0, 0xa8,
-               0x02, 0x1e, 0x0a, 0xea, 0x24, 0xf0, 0xfa, 0xeb,
-               0x34, 0xff, 0xfb, 0x50, 0x2e, 0x20, 0x0b, 0x05,
-               0x85, 0x44, 0xe0, 0x80, 0x03, 0x75, 0xe0, 0x00,
-               0x30, 0xe1, 0x20, 0xe5, 0x35, 0x24, 0xff, 0xf5,
-               0x35, 0xe5, 0x36, 0x34, 0xff, 0xf5, 0x36, 0xc3,
-               0xe5, 0x36, 0x13, 0xf5, 0x36, 0xe5, 0x35, 0x13,
-               0xf5, 0x35, 0x75, 0x3a, 0x10, 0x12, 0x1a, 0x77,
-               0x02, 0x18, 0x77, 0x75, 0x3a, 0x00, 0x12, 0x1a,
-               0x77, 0x02, 0x18, 0x1b, 0x20, 0x4b, 0x04, 0x75,
-               0x4e, 0x03, 0x22, 0xe5, 0x35, 0x24, 0xff, 0xf5,
-               0x35, 0xe5, 0x36, 0x34, 0xff, 0xf5, 0x36, 0x75,
-               0x4e, 0x03, 0x22, 0x00, 0x00, 0x00, 0x00, 0x00,
-               0x00, 0x00, 0x00, 0x00, 0x00, 0x22, 0x02, 0x2c,
-               0x70, 0xd2, 0x00, 0x78, 0x11, 0xe2, 0x44, 0x11,
-               0xf5, 0x3f, 0xc2, 0x08, 0x12, 0x29, 0xa3, 0x02,
-               0x23, 0x93, 0x21, 0x62, 0x61, 0x40, 0x01, 0x3a,
-               0x01, 0x73, 0x21, 0x76, 0x61, 0xa8, 0x21, 0x39,
-               0x21, 0x4a, 0x02, 0x2a, 0x7b, 0x79, 0x06, 0xf3,
-               0xc0, 0xd0, 0x12, 0x03, 0xd9, 0x78, 0x00, 0xf2,
-               0xd0, 0xd0, 0x22, 0x00, 0x00, 0x00, 0x00, 0x02,
-               0x2c, 0xb4, 0x78, 0x11, 0xe2, 0x44, 0x11, 0x54,
-               0x0f, 0xf8, 0xc4, 0x48, 0xd2, 0x05, 0xf5, 0x48,
-               0xc2, 0x0d, 0x31, 0xa3, 0x02, 0x23, 0x93, 0x20,
-               0x4b, 0x04, 0x75, 0x4e, 0x01, 0x22, 0xe5, 0x35,
-               0x24, 0xff, 0xf5, 0x35, 0xe5, 0x36, 0x34, 0xff,
-               0xf5, 0x36, 0x75, 0x4e, 0x01, 0x22, 0x00, 0x00,
-               0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-               0x79, 0xd0, 0x77, 0x1b, 0x79, 0xd1, 0x77, 0x18,
-               0x79, 0xd2, 0x77, 0x77, 0x79, 0xd3, 0x77, 0x18,
-               0x22, 0x75, 0x29, 0x00, 0x75, 0x25, 0x00, 0x75,
-               0x34, 0x03, 0x75, 0x22, 0x00, 0x75, 0x23, 0x05,
-               0x75, 0x4f, 0x00, 0x75, 0x50, 0x00, 0x75, 0x30,
-               0x00, 0x79, 0xdc, 0x77, 0x03, 0xc2, 0x8e, 0x75,
-               0x17, 0xa8, 0x75, 0x16, 0xa8, 0x74, 0xaa, 0x79,
-               0x01, 0xf3, 0x79, 0xd7, 0x77, 0x74, 0x79, 0xd8,
-               0x77, 0xff, 0x79, 0xd9, 0x77, 0x07, 0x79, 0xda,
-               0x77, 0x00, 0x12, 0x25, 0x6f, 0x43, 0x08, 0x40,
-               0x71, 0x32, 0x79, 0x0e, 0xe3, 0x10, 0x51, 0x1c,
-               0x74, 0x06, 0x71, 0x9b, 0xe5, 0x11, 0x44, 0x80,
-               0x79, 0x05, 0xf3, 0xf5, 0x11, 0x74, 0x07, 0x71,
-               0x9b, 0xe5, 0x12, 0x44, 0x80, 0x79, 0x05, 0xf3,
-               0xf5, 0x12, 0x80, 0x18, 0x53, 0x27, 0xa0, 0x53,
-               0x28, 0x01, 0x75, 0x20, 0xf7, 0x12, 0x23, 0x4c,
-               0x75, 0x11, 0x80, 0x75, 0x12, 0x80, 0x12, 0x1f,
-               0xc0, 0x12, 0x21, 0xdc, 0x79, 0x06, 0xf3, 0x22,
-               0xd2, 0x02, 0x78, 0x11, 0xe2, 0x44, 0x11, 0xf5,
-               0x43, 0xc2, 0x0a, 0x12, 0x29, 0xa3, 0x02, 0x23,
-               0x93, 0x78, 0x11, 0xe2, 0x44, 0x11, 0xf5, 0x44,
-               0xc2, 0x0b, 0x12, 0x29, 0xa3, 0x02, 0x23, 0x93,
-               0x78, 0x00, 0xe2, 0x90, 0x25, 0x9f, 0x02, 0x23,
-               0x93, 0x78, 0x11, 0xe2, 0x75, 0x20, 0xf7, 0x75,
-               0x21, 0x3f, 0x75, 0x49, 0x11, 0x75, 0x4c, 0x11,
-               0x31, 0xa3, 0x02, 0x23, 0x93, 0x78, 0x11, 0xe2,
-               0x44, 0x11, 0x54, 0x0f, 0xf8, 0xc4, 0x48, 0xf8,
-               0xe5, 0x49, 0x45, 0x3f, 0x58, 0xf5, 0x49, 0xd2,
-               0x06, 0xc2, 0x0e, 0x31, 0xa3, 0x02, 0x23, 0x93,
-               0xc0, 0x01, 0x20, 0x2a, 0x04, 0x71, 0x32, 0xc2,
-               0x11, 0x11, 0x5e, 0xc2, 0x1f, 0xd0, 0x01, 0x02,
-               0x23, 0x9b, 0x12, 0x21, 0xdc, 0x78, 0x00, 0xf2,
-               0x22, 0x00, 0x00, 0x00, 0x00, 0x00, 0x79, 0xda,
-               0xe7, 0x70, 0x2b, 0x20, 0x0a, 0x05, 0x85, 0x43,
-               0xe0, 0x80, 0x03, 0x75, 0xe0, 0x00, 0x30, 0xe1,
-               0x1d, 0x20, 0xe2, 0x1f, 0x74, 0xe0, 0xca, 0x74,
-               0x00, 0x71, 0x9b, 0xca, 0x79, 0x05, 0xf3, 0xf5,
-               0x09, 0xca, 0x74, 0x01, 0x71, 0x9b, 0xca, 0x79,
-               0x05, 0xf3, 0xf5, 0x0a, 0x80, 0x43, 0x12, 0x15,
-               0x3e, 0x80, 0x3e, 0xe5, 0x0b, 0xb4, 0x17, 0x02,
-               0x80, 0x0b, 0x50, 0x09, 0x74, 0x17, 0xc3, 0x95,
-               0x0b, 0x44, 0x60, 0x80, 0x02, 0x74, 0x60, 0xca,
-               0x74, 0x00, 0x71, 0x9b, 0xca, 0x79, 0x05, 0xf3,
-               0xf5, 0x09, 0xe5, 0x0c, 0xb4, 0x17, 0x02, 0x80,
-               0x0b, 0x50, 0x09, 0x74, 0x17, 0xc3, 0x95, 0x0c,
-               0x44, 0x60, 0x80, 0x02, 0x74, 0x60, 0xca, 0x74,
-               0x01, 0x71, 0x9b, 0xca, 0x79, 0x05, 0xf3, 0xf5,
-               0x0a, 0x22, 0xd2, 0x04, 0x78, 0x11, 0xe2, 0x44,
-               0x11, 0xf5, 0x46, 0xc2, 0x0c, 0x31, 0xa3, 0x02,
-               0x23, 0x93, 0xd2, 0x05, 0x78, 0x11, 0xe2, 0x44,
-               0x11, 0xf5, 0x48, 0xc2, 0x0d, 0x31, 0xa3, 0x02,
-               0x23, 0x93, 0xd2, 0x06, 0x78, 0x11, 0xe2, 0x44,
-               0x11, 0xf5, 0x49, 0xc2, 0x0e, 0x31, 0xa3, 0x02,
-               0x23, 0x93, 0x30, 0x1c, 0x21, 0x20, 0x4d, 0x1e,
-               0xe5, 0x29, 0x60, 0x1a, 0xc2, 0x1c, 0x12, 0x19,
-               0xec, 0x12, 0x13, 0xcf, 0xd2, 0x4d, 0x12, 0x17,
-               0x7f, 0x78, 0x00, 0xf2, 0x79, 0x06, 0xf3, 0x43,
-               0xa8, 0x04, 0x12, 0x24, 0x1b, 0x22, 0x12, 0x27,
-               0x24, 0x22, 0x78, 0x00, 0xe2, 0x90, 0x25, 0x9f,
-               0x02, 0x23, 0x93, 0x78, 0x00, 0xe2, 0xa2, 0xe7,
-               0x72, 0xe3, 0x92, 0xe7, 0x02, 0x1d, 0x85, 0x00,
-               0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-               0x79, 0x04, 0xe3, 0x54, 0x80, 0x70, 0xf9, 0x22,
-               0xe5, 0x29, 0x79, 0xde, 0xf7, 0x75, 0x29, 0x00,
-               0x70, 0x12, 0xe5, 0x15, 0x79, 0xdd, 0xf7, 0x12,
-               0x2d, 0xf0, 0x40, 0x08, 0x20, 0x1c, 0x07, 0x20,
-               0x1d, 0x04, 0x80, 0x02, 0x71, 0x32, 0x30, 0xb5,
-               0x0c, 0x79, 0x06, 0xf3, 0x20, 0x2a, 0x06, 0x79,
-               0xdd, 0xe7, 0x54, 0xfc, 0xf7, 0xd2, 0x2b, 0x12,
-               0x25, 0x6f, 0x22, 0x00, 0x00, 0x00, 0x00, 0xe5,
-               0x15, 0xa2, 0xe0, 0xb0, 0xe6, 0x40, 0x31, 0xa2,
-               0xe1, 0xb0, 0xe7, 0x40, 0x38, 0x10, 0x2b, 0x02,
-               0x80, 0x26, 0x79, 0xde, 0xe7, 0x70, 0x0b, 0x79,
-               0xdd, 0xe7, 0x20, 0xe0, 0x12, 0x20, 0xe1, 0x28,
-               0x80, 0x16, 0xf5, 0x29, 0x30, 0x4d, 0x11, 0x20,
-               0x4c, 0x0e, 0x12, 0x24, 0x1b, 0x80, 0x09, 0x43,
-               0x08, 0x40, 0x12, 0x13, 0xcf, 0x12, 0x17, 0x7f,
-               0xe5, 0x13, 0x20, 0xe4, 0x05, 0x12, 0x18, 0x1b,
-               0x80, 0x03, 0x12, 0x18, 0x77, 0xc2, 0x2b, 0x22,
-               0x12, 0x26, 0xd7, 0x12, 0x13, 0xb7, 0x22, 0x78,
-               0x04, 0x79, 0x00, 0xd9, 0xfe, 0xd8, 0xfa, 0x22,
-               0x00, 0x74, 0x09, 0x71, 0x9b, 0xe5, 0x15, 0x54,
-               0xfc, 0x79, 0x05, 0xf3, 0xf5, 0x15, 0x22, 0x78,
-               0x11, 0xe2, 0x44, 0x11, 0x54, 0x0f, 0xf8, 0xc4,
-               0x48, 0xf5, 0x46, 0xc2, 0x0c, 0xd2, 0x04, 0x31,
-               0xa3, 0x02, 0x23, 0x93, 0x12, 0x26, 0xd7, 0x12,
-               0x00, 0xb7, 0x22, 0x00, 0x79, 0x06, 0xf3, 0x74,
-               0x0a, 0x71, 0x9b, 0x79, 0xe0, 0xe7, 0x44, 0x02,
-               0xf7, 0x79, 0x05, 0xf3, 0x22, 0x74, 0x0a, 0x71,
-               0x9b, 0x79, 0xe0, 0xe7, 0x54, 0xfd, 0xf7, 0x79,
-               0x05, 0xf3, 0x22, 0x21, 0x59, 0x41, 0x23, 0x21,
-               0x59, 0x41, 0x33, 0x41, 0x43, 0x21, 0x59, 0x21,
-               0x59, 0x02, 0x25, 0x9f, 0x00, 0x74, 0x0d, 0x71,
-               0x9b, 0x74, 0x4d, 0x79, 0x05, 0xf3, 0xd2, 0x52,
-               0x22, 0x00, 0x53, 0x08, 0x40, 0x45, 0x08, 0x45,
-               0x1e, 0x79, 0x04, 0xf3, 0xf5, 0x08, 0x22, 0xd2,
-               0x01, 0x78, 0x11, 0xe2, 0x44, 0x11, 0xf5, 0x42,
-               0xc2, 0x09, 0x31, 0xa3, 0x02, 0x23, 0x93, 0x00,
-               0x00, 0x00, 0x00, 0x71, 0x6e, 0x74, 0x09, 0x12,
-               0x17, 0x75, 0xe5, 0x15, 0x44, 0x40, 0x79, 0x05,
-               0xf3, 0xf5, 0x15, 0x75, 0x3a, 0x00, 0x12, 0x1a,
-               0x77, 0x02, 0x18, 0x1b, 0xf5, 0x38, 0xe5, 0x37,
-               0x24, 0x01, 0xf5, 0x37, 0xe5, 0x38, 0x34, 0x00,
-               0xf5, 0x38, 0x40, 0x05, 0x75, 0x39, 0x00, 0x80,
-               0x03, 0x75, 0x39, 0x01, 0x12, 0x04, 0x04, 0xd2,
-               0x8e, 0x02, 0x03, 0x8d, 0x00, 0xb4, 0x0d, 0x03,
-               0x74, 0x14, 0x22, 0x04, 0x83, 0x22, 0x00, 0x02,
-               0xff, 0x01, 0x00, 0x05, 0xfe, 0xff, 0x00, 0x0a,
-               0xfc, 0xfe, 0x00, 0xc0, 0xf8, 0xfc, 0x00, 0x28,
-               0xf0, 0xf8, 0x00, 0x30, 0xe0, 0xd0, 0x01, 0x88,
-               0x04, 0x83, 0x22, 0x00, 0xff, 0xfe, 0xfd, 0xfc,
-               0xfc, 0xfb, 0xfa, 0xfe, 0xfd, 0xfb, 0xf9, 0xf7,
-               0xf7, 0xf5, 0xf3, 0xfc, 0xfa, 0xf6, 0xf2, 0xee,
-               0xee, 0xea, 0xe6, 0xf8, 0xf4, 0xec, 0xe4, 0xdc,
-               0xd4, 0xcc, 0xc4, 0x24, 0x21, 0x83, 0x22, 0x04,
-               0x83, 0x22, 0xff, 0x01, 0xff, 0x01, 0x00, 0x00,
-               0x00, 0x02, 0x22, 0x32, 0x00, 0x00, 0x00, 0x00,
-               0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-               0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff,
-               0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0xff,
-               0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x83,
-               0x22, 0x8a, 0x01, 0x20, 0x01, 0x0b, 0xea, 0xf3,
-               0xf9, 0x8b, 0x7e, 0x6b, 0xd5, 0x01, 0x00, 0x01,
-               0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01,
-               0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-               0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-               0x00, 0x01, 0x3a, 0x01, 0x38, 0x01, 0x4b, 0x01,
-               0x49, 0x01, 0x5c, 0x01, 0x5a, 0x01, 0x08, 0x08,
-               0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-               0x00, 0x01, 0x15, 0x24, 0x48, 0x83, 0x22, 0x04,
-               0x83, 0x22, 0x00, 0x01, 0x02, 0x03, 0x04, 0x06,
-               0x07, 0x08, 0x00, 0x03, 0x05, 0x07, 0x09, 0x0d,
-               0x0f, 0x81, 0x00, 0x06, 0x0a, 0x0e, 0x82, 0x8a,
-               0x8e, 0x22, 0x00, 0x0c, 0x84, 0x8c, 0x24, 0x2c,
-               0xa4, 0xac, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-               0x00, 0x00, 0x00, 0x00, 0xaa, 0x35, 0xab, 0x36,
-               0x02, 0x27, 0xd4, 0x00, 0x00, 0x00, 0x00, 0x00,
-               0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-               0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03,
-               0x03, 0x03, 0x03, 0x03, 0x02, 0x02, 0x02, 0x25,
-               0x03, 0x03, 0x2b, 0x03, 0x00, 0x03, 0x00, 0x03,
-               0x00, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00, 0x00,
-               0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-               0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03,
-               0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03,
-               0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x83, 0x22,
-               0x00, 0x02, 0x02, 0x02, 0x01, 0x02, 0x02, 0x02,
-               0x02, 0x02, 0x02, 0x02, 0x01, 0x02, 0x02, 0x02,
-               0x2b, 0x02, 0x02, 0x02, 0x01, 0x02, 0x02, 0x02,
-               0x02, 0x02, 0x02, 0x02, 0x01, 0x02, 0x02, 0x02,
-               0x01, 0x01, 0x02, 0x02, 0x01, 0x01, 0x02, 0x01,
-               0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02,
-               0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02,
-               0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02,
-               0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02,
-               0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02,
-               0x02, 0x02, 0x02, 0x02, 0x02, 0x01, 0x01, 0x02,
-               0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x00, 0x02,
-               0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02,
-               0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x01, 0x02,
-               0x02, 0x01, 0x01, 0x02, 0x02, 0x02, 0x00, 0x02,
-               0x21, 0x02, 0x02, 0x02, 0x02, 0x02, 0x01, 0x00,
-               0x02, 0x02, 0x01, 0x02, 0x02, 0x02, 0x00, 0x02,
-               0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x21,
-               0x01, 0x02, 0x21, 0x02, 0x02, 0x02, 0x00, 0x02,
-               0x02, 0x02, 0x02, 0x02, 0x02, 0x20, 0xb5, 0x05,
-               0x79, 0x0f, 0xf3, 0xc2, 0x11, 0x22, 0x00, 0x00,
-               0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-               0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe5,
-               0x15, 0xa2, 0xe0, 0xb0, 0xe6, 0x50, 0x01, 0x22,
-               0xa2, 0xe1, 0xb0, 0xe7, 0x22, 0x02, 0x00};
-               static unsigned char    Data0485_0C[] = {
-               0x02, 0x27, 0x69};
-               static unsigned char    Data0485_66[] = {
-               0x02, 0x25, 0x47, 0x02, 0x25, 0x60};
-               static unsigned char    Data0485_60[] = {
-               0x02, 0x22, 0x7e};
-               static unsigned char    Data0485_99[] = {
-               0xc2, 0x53, 0x02, 0x12, 0x86};
-               static unsigned char    Data0485_9E[] = {
-               0x70, 0xf9, 0x22};
-#ifdef OOKUBO_ORIGINAL
-               static unsigned char    Data0485_36[] = {
-               0x78, 0x00, 0xf2, 0xc2, 0x53, 0x74, 0x86, 0xc0,
-               0xe0, 0x74, 0x12, 0xc0, 0xe0, 0x32};
-#endif /* OOKUBO_ORIGINAL */
diff --git a/sound/isa/cs423x/sound_pc9800.h b/sound/isa/cs423x/sound_pc9800.h
deleted file mode 100644 (file)
index 7ae310a..0000000
+++ /dev/null
@@ -1,23 +0,0 @@
-#ifndef _SOUND_PC9800_H_
-#define _SOUND_PC9800_H_
-
-#include <asm/io.h>
-
-#define PC9800_SOUND_IO_ID     0xa460
-
-/* Sound Functions ID. */
-#define PC9800_SOUND_ID()      ((inb(PC9800_SOUND_IO_ID) >> 4) & 0x0f)
-
-#define PC9800_SOUND_ID_DO     0x0     /* PC-98DO+ Internal */
-#define PC9800_SOUND_ID_GS     0x1     /* PC-98GS Internal */
-#define PC9800_SOUND_ID_73     0x2     /* PC-9801-73 (base 0x18x) */
-#define PC9800_SOUND_ID_73A    0x3     /* PC-9801-73/76 (base 0x28x) */
-#define PC9800_SOUND_ID_86     0x4     /* PC-9801-86 and compatible (base 0x18x) */
-#define PC9800_SOUND_ID_86A    0x5     /* PC-9801-86 (base 0x28x) */
-#define PC9800_SOUND_ID_NF     0x6     /* PC-9821Nf/Np Internal */
-#define PC9800_SOUND_ID_XMATE  0x7     /* X-Mate Internal and compatible */
-#define PC9800_SOUND_ID_118    0x8     /* PC-9801-118 and compatible(CanBe Internal, etc.) */
-
-#define PC9800_SOUND_ID_UNKNOWN        0xf     /* Unknown (No Sound System or PC-9801-26) */
-
-#endif