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

663 files changed:
Documentation/block/as-iosched.txt [deleted file]
Documentation/block/deadline-iosched.txt [deleted file]
Documentation/filesystems/automount-support.txt [deleted file]
Documentation/filesystems/relayfs.txt [deleted file]
Documentation/i2c/i2c-parport [deleted file]
Documentation/powerpc/hvcs.txt [deleted file]
Documentation/powerpc/mpc52xx.txt [deleted file]
Documentation/usb/sn9c102.txt [deleted file]
arch/arm/boot/bootp/initrd.S [deleted file]
arch/arm/boot/bootp/kernel.S [deleted file]
arch/arm/boot/compressed/piggy.S [deleted file]
arch/arm/common/locomo.c [deleted file]
arch/arm/common/time-acorn.c [deleted file]
arch/arm/mach-footbridge/time.c [deleted file]
arch/arm/mach-lh7a40x/time.c [deleted file]
arch/arm/mach-omap/time.c [deleted file]
arch/arm/mach-pxa/time.c [deleted file]
arch/arm/mach-s3c2410/gpio.c [deleted file]
arch/arm/mach-s3c2410/time.c [deleted file]
arch/arm/mach-sa1100/collie.c [deleted file]
arch/arm/mach-sa1100/time.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/ocelot_g_defconfig [deleted file]
arch/mips/kernel/module.c [deleted file]
arch/mips/mm/tlb-r8k.c [deleted file]
arch/mips/mm/tlb64-glue-r4k.S [deleted file]
arch/mips/mm/tlb64-glue-sb1.S [deleted file]
arch/mips/mm/tlbex32-r3k.S [deleted file]
arch/mips/mm/tlbex32-r4k.S [deleted file]
arch/mips/mm/tlbex64-r4k.S [deleted file]
arch/mips/pci/fixup-jaguar.c [deleted file]
arch/mips/pci/fixup-mpc30x.c [deleted file]
arch/mips/pci/fixup-ocelot-c.c [deleted file]
arch/mips/pci/fixup-ocelot-g.c [deleted file]
arch/mips/pci/fixup-tb0219.c [deleted file]
arch/mips/pci/ops-marvell.c [deleted file]
arch/mips/pci/ops-titan-ht.c [deleted file]
arch/mips/pci/ops-vr41xx.c [deleted file]
arch/mips/pci/pci-yosemite.c [deleted file]
arch/mips/pmc-sierra/yosemite/dbg_io.c [deleted file]
arch/mips/pmc-sierra/yosemite/i2c-yosemite.c [deleted file]
arch/mips/pmc-sierra/yosemite/py-console.c [deleted file]
arch/mips/vr41xx/tanbac-tb0229/tb0219.c [deleted file]
arch/parisc/configs/n4000_defconfig [deleted file]
arch/parisc/lib/debuglocks.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/ads8272_defconfig [deleted file]
arch/ppc/configs/lite5200_defconfig [deleted file]
arch/ppc/configs/rpx8260_defconfig [deleted file]
arch/ppc/lib/rheap.c [deleted file]
arch/ppc/oprofile/Kconfig [deleted file]
arch/ppc/oprofile/Makefile [deleted file]
arch/ppc/oprofile/init.c [deleted file]
arch/ppc/platforms/85xx/mpc8555.c [deleted file]
arch/ppc/platforms/85xx/mpc8555_cds.h [deleted file]
arch/ppc/platforms/85xx/mpc8560.c [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/85xx/sbc8560.c [deleted file]
arch/ppc/platforms/85xx/sbc8560.h [deleted file]
arch/ppc/platforms/85xx/sbc85xx.c [deleted file]
arch/ppc/platforms/85xx/sbc85xx.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/pq2ads.h [deleted file]
arch/ppc/platforms/pq2ads_setup.c [deleted file]
arch/ppc/platforms/rpx8260.c [deleted file]
arch/ppc/platforms/rpx8260.h [deleted file]
arch/ppc/syslib/cpm2_common.c [deleted file]
arch/ppc/syslib/cpm2_pic.c [deleted file]
arch/ppc/syslib/cpm2_pic.h [deleted file]
arch/ppc/syslib/m8260_pci.c [deleted file]
arch/ppc/syslib/m8260_pci.h [deleted file]
arch/ppc/syslib/m8260_pci_erratum9.c [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/ppc64/kernel/hvcserver.c [deleted file]
arch/ppc64/kernel/vecemu.c [deleted file]
arch/ppc64/kernel/vector.S [deleted file]
arch/ppc64/lib/e2a.c [deleted file]
arch/ppc64/lib/usercopy.c [deleted file]
arch/ppc64/mm/slb.c [deleted file]
arch/ppc64/mm/slb_low.S [deleted file]
arch/s390/kernel/vtime.c [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/renesas/hs7751rvoip/Makefile [deleted file]
arch/sh/boards/renesas/hs7751rvoip/io.c [deleted file]
arch/sh/boards/renesas/hs7751rvoip/irq.c [deleted file]
arch/sh/boards/renesas/hs7751rvoip/led.c [deleted file]
arch/sh/boards/renesas/hs7751rvoip/mach.c [deleted file]
arch/sh/boards/renesas/hs7751rvoip/pci.c [deleted file]
arch/sh/boards/renesas/hs7751rvoip/setup.c [deleted file]
arch/sh/boards/renesas/rts7751r2d/Makefile [deleted file]
arch/sh/boards/renesas/rts7751r2d/io.c [deleted file]
arch/sh/boards/renesas/rts7751r2d/irq.c [deleted file]
arch/sh/boards/renesas/rts7751r2d/led.c [deleted file]
arch/sh/boards/renesas/rts7751r2d/mach.c [deleted file]
arch/sh/boards/renesas/rts7751r2d/setup.c [deleted file]
arch/sh/boards/renesas/systemh/Makefile [deleted file]
arch/sh/boards/renesas/systemh/io.c [deleted file]
arch/sh/boards/renesas/systemh/irq.c [deleted file]
arch/sh/boards/renesas/systemh/setup.c [deleted file]
arch/sh/boards/se/7300/Makefile [deleted file]
arch/sh/boards/se/7300/io.c [deleted file]
arch/sh/boards/se/7300/irq.c [deleted file]
arch/sh/boards/se/7300/led.c [deleted file]
arch/sh/boards/se/7300/setup.c [deleted file]
arch/sh/cchips/voyagergx/Makefile [deleted file]
arch/sh/cchips/voyagergx/consistent.c [deleted file]
arch/sh/cchips/voyagergx/irq.c [deleted file]
arch/sh/cchips/voyagergx/setup.c [deleted file]
arch/sh/configs/rts7751r2d_defconfig [deleted file]
arch/sh/configs/se7300_defconfig [deleted file]
arch/sh/drivers/dma/dma-sysfs.c [deleted file]
arch/sh/drivers/pci/fixups-rts7751r2d.c [deleted file]
arch/sh/drivers/pci/ops-rts7751r2d.c [deleted file]
arch/sh/kernel/cpu/adc.c [deleted file]
arch/sh/kernel/cpu/bus.c [deleted file]
arch/sh/kernel/early_printk.c [deleted file]
arch/sh/ramdisk/Makefile [deleted file]
arch/sh/ramdisk/ld.script [deleted file]
arch/sh64/Kconfig [deleted file]
arch/sh64/Makefile [deleted file]
arch/sh64/boot/Makefile [deleted file]
arch/sh64/boot/compressed/Makefile [deleted file]
arch/sh64/boot/compressed/cache.c [deleted file]
arch/sh64/boot/compressed/head.S [deleted file]
arch/sh64/boot/compressed/install.sh [deleted file]
arch/sh64/boot/compressed/misc.c [deleted file]
arch/sh64/boot/compressed/vmlinux.lds.S [deleted file]
arch/sh64/configs/cayman_defconfig [deleted file]
arch/sh64/defconfig [deleted file]
arch/sh64/kernel/Makefile [deleted file]
arch/sh64/kernel/alphanum.c [deleted file]
arch/sh64/kernel/asm-offsets.c [deleted file]
arch/sh64/kernel/dma.c [deleted file]
arch/sh64/kernel/early_printk.c [deleted file]
arch/sh64/kernel/entry.S [deleted file]
arch/sh64/kernel/fpu.c [deleted file]
arch/sh64/kernel/head.S [deleted file]
arch/sh64/kernel/init_task.c [deleted file]
arch/sh64/kernel/irq.c [deleted file]
arch/sh64/kernel/irq_intc.c [deleted file]
arch/sh64/kernel/led.c [deleted file]
arch/sh64/kernel/pci-dma.c [deleted file]
arch/sh64/kernel/pci_sh5.c [deleted file]
arch/sh64/kernel/pci_sh5.h [deleted file]
arch/sh64/kernel/pcibios.c [deleted file]
arch/sh64/kernel/process.c [deleted file]
arch/sh64/kernel/ptrace.c [deleted file]
arch/sh64/kernel/semaphore.c [deleted file]
arch/sh64/kernel/setup.c [deleted file]
arch/sh64/kernel/sh_ksyms.c [deleted file]
arch/sh64/kernel/signal.c [deleted file]
arch/sh64/kernel/switchto.S [deleted file]
arch/sh64/kernel/sys_sh64.c [deleted file]
arch/sh64/kernel/syscalls.S [deleted file]
arch/sh64/kernel/time.c [deleted file]
arch/sh64/kernel/traps.c [deleted file]
arch/sh64/kernel/unwind.c [deleted file]
arch/sh64/kernel/vmlinux.lds.S [deleted file]
arch/sh64/lib/Makefile [deleted file]
arch/sh64/lib/c-checksum.c [deleted file]
arch/sh64/lib/copy_user_memcpy.S [deleted file]
arch/sh64/lib/dbg.c [deleted file]
arch/sh64/lib/io.c [deleted file]
arch/sh64/lib/memcpy.c [deleted file]
arch/sh64/lib/old-checksum.c [deleted file]
arch/sh64/lib/page_clear.S [deleted file]
arch/sh64/lib/page_copy.S [deleted file]
arch/sh64/lib/panic.c [deleted file]
arch/sh64/lib/udelay.c [deleted file]
arch/sh64/mach-cayman/Makefile [deleted file]
arch/sh64/mach-cayman/irq.c [deleted file]
arch/sh64/mach-cayman/led.c [deleted file]
arch/sh64/mach-cayman/setup.c [deleted file]
arch/sh64/mach-harp/Makefile [deleted file]
arch/sh64/mach-harp/setup.c [deleted file]
arch/sh64/mach-romram/Makefile [deleted file]
arch/sh64/mach-romram/setup.c [deleted file]
arch/sh64/mach-sim/Makefile [deleted file]
arch/sh64/mach-sim/setup.c [deleted file]
arch/sh64/mm/Makefile [deleted file]
arch/sh64/mm/cache.c [deleted file]
arch/sh64/mm/extable.c [deleted file]
arch/sh64/mm/fault.c [deleted file]
arch/sh64/mm/hugetlbpage.c [deleted file]
arch/sh64/mm/init.c [deleted file]
arch/sh64/mm/ioremap.c [deleted file]
arch/sh64/mm/tlb.c [deleted file]
arch/sh64/mm/tlbmiss.c [deleted file]
arch/sh64/oprofile/Kconfig [deleted file]
arch/sh64/oprofile/Makefile [deleted file]
arch/sh64/oprofile/op_model_null.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]
crypto/mpi/Makefile [deleted file]
crypto/mpi/generic_mpi-asm-defs.h [deleted file]
crypto/mpi/generic_mpih-add1.c [deleted file]
crypto/mpi/generic_mpih-lshift.c [deleted file]
crypto/mpi/generic_mpih-mul1.c [deleted file]
crypto/mpi/generic_mpih-mul2.c [deleted file]
crypto/mpi/generic_mpih-mul3.c [deleted file]
crypto/mpi/generic_mpih-rshift.c [deleted file]
crypto/mpi/generic_mpih-sub1.c [deleted file]
crypto/mpi/generic_udiv-w-sdiv.c [deleted file]
crypto/mpi/longlong.h [deleted file]
crypto/mpi/mpi-add.c [deleted file]
crypto/mpi/mpi-bit.c [deleted file]
crypto/mpi/mpi-cmp.c [deleted file]
crypto/mpi/mpi-div.c [deleted file]
crypto/mpi/mpi-gcd.c [deleted file]
crypto/mpi/mpi-inline.c [deleted file]
crypto/mpi/mpi-inline.h [deleted file]
crypto/mpi/mpi-internal.h [deleted file]
crypto/mpi/mpi-inv.c [deleted file]
crypto/mpi/mpi-mpow.c [deleted file]
crypto/mpi/mpi-mul.c [deleted file]
crypto/mpi/mpi-pow.c [deleted file]
crypto/mpi/mpi-scan.c [deleted file]
crypto/mpi/mpicoder.c [deleted file]
crypto/mpi/mpih-cmp.c [deleted file]
crypto/mpi/mpih-div.c [deleted file]
crypto/mpi/mpih-mul.c [deleted file]
crypto/mpi/mpiutil.c [deleted file]
crypto/signature/Makefile [deleted file]
crypto/signature/dsa.c [deleted file]
crypto/signature/key.h [deleted file]
crypto/signature/ksign-keyring.c [deleted file]
crypto/signature/ksign-parse.c [deleted file]
crypto/signature/ksign-publickey.c [deleted file]
crypto/signature/ksign.c [deleted file]
crypto/signature/local.h [deleted file]
crypto/tea.c [deleted file]
drivers/block/floppy98.c [deleted file]
drivers/block/sx8.c [deleted file]
drivers/char/ds1286.c [deleted file]
drivers/char/hvcs.c [deleted file]
drivers/char/ip27-rtc.c [deleted file]
drivers/char/lcd.h [deleted file]
drivers/char/lp_old98.c [deleted file]
drivers/char/upd4990a.c [deleted file]
drivers/char/watchdog/ixp2000_wdt.c [deleted file]
drivers/firmware/pcdp.c [deleted file]
drivers/firmware/pcdp.h [deleted file]
drivers/i2c/chips/adm1025.c [deleted file]
drivers/i2c/chips/adm1031.c [deleted file]
drivers/i2c/chips/lm77.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/media/video/ovcamchip/Makefile [deleted file]
drivers/media/video/ovcamchip/ov6x20.c [deleted file]
drivers/media/video/ovcamchip/ov6x30.c [deleted file]
drivers/media/video/ovcamchip/ov76be.c [deleted file]
drivers/media/video/ovcamchip/ov7x10.c [deleted file]
drivers/media/video/ovcamchip/ov7x20.c [deleted file]
drivers/media/video/ovcamchip/ovcamchip_core.c [deleted file]
drivers/media/video/ovcamchip/ovcamchip_priv.h [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/fec_8xx/Kconfig [deleted file]
drivers/net/fec_8xx/Makefile [deleted file]
drivers/net/fec_8xx/fec_8xx-netta.c [deleted file]
drivers/net/fec_8xx/fec_8xx.h [deleted file]
drivers/net/fec_8xx/fec_main.c [deleted file]
drivers/net/fec_8xx/fec_mii.c [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/netdump.c [deleted file]
drivers/net/netdump.h [deleted file]
drivers/net/smc91x.c [deleted file]
drivers/net/smc91x.h [deleted file]
drivers/net/wan/wanxlfw.inc [deleted file]
drivers/pcmcia/pd6729.c [deleted file]
drivers/pcmcia/pd6729.h [deleted file]
drivers/pcmcia/socket_sysfs.c [deleted file]
drivers/s390/net/ctcdbug.c [deleted file]
drivers/s390/net/ctcdbug.h [deleted file]
drivers/scsi/fdomain.h [deleted file]
drivers/scsi/pc980155.c [deleted file]
drivers/scsi/pc980155.h [deleted file]
drivers/scsi/sata_nv.c [deleted file]
drivers/scsi/scsi_pc98.c [deleted file]
drivers/serial/cpm_uart/Makefile [deleted file]
drivers/serial/cpm_uart/cpm_uart.h [deleted file]
drivers/serial/cpm_uart/cpm_uart_core.c [deleted file]
drivers/serial/cpm_uart/cpm_uart_cpm1.c [deleted file]
drivers/serial/cpm_uart/cpm_uart_cpm1.h [deleted file]
drivers/serial/cpm_uart/cpm_uart_cpm2.c [deleted file]
drivers/serial/cpm_uart/cpm_uart_cpm2.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/serial_lh7a40x.c [deleted file]
drivers/serial/sn_console.c [deleted file]
drivers/usb/media/sn9c102.h [deleted file]
drivers/usb/media/sn9c102_core.c [deleted file]
drivers/usb/media/sn9c102_pas106b.c [deleted file]
drivers/usb/media/sn9c102_sensor.h [deleted file]
drivers/usb/media/sn9c102_tas5110c1b.c [deleted file]
drivers/usb/media/sn9c102_tas5130d1b.c [deleted file]
drivers/usb/media/w9968cf_vpp.h [deleted file]
drivers/w1/Kconfig [deleted file]
drivers/w1/Makefile [deleted file]
drivers/w1/matrox_w1.c [deleted file]
drivers/w1/w1.c [deleted file]
drivers/w1/w1.h [deleted file]
drivers/w1/w1_family.c [deleted file]
drivers/w1/w1_family.h [deleted file]
drivers/w1/w1_int.c [deleted file]
drivers/w1/w1_int.h [deleted file]
drivers/w1/w1_io.c [deleted file]
drivers/w1/w1_io.h [deleted file]
drivers/w1/w1_log.h [deleted file]
drivers/w1/w1_netlink.c [deleted file]
drivers/w1/w1_netlink.h [deleted file]
drivers/w1/w1_therm.c [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/nls/nls_ascii.c [deleted file]
fs/ntfs/collate.c [deleted file]
fs/ntfs/collate.h [deleted file]
fs/ntfs/index.c [deleted file]
fs/ntfs/index.h [deleted file]
fs/ntfs/quota.c [deleted file]
fs/ntfs/quota.h [deleted file]
fs/partitions/nec98.c [deleted file]
fs/partitions/nec98.h [deleted file]
fs/xfs/linux-2.6/kmem.c [deleted file]
include/asm-alpha/setup.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-sa1100/collie.h [deleted file]
include/asm-arm/hardware/locomo.h [deleted file]
include/asm-arm/mach/time.h [deleted file]
include/asm-generic/netdump.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/netdump.h [deleted file]
include/asm-i386/pc9800.h [deleted file]
include/asm-i386/pc9800_sca.h [deleted file]
include/asm-i386/pgtable-2level-defs.h [deleted file]
include/asm-i386/pgtable-3level-defs.h [deleted file]
include/asm-i386/std_resources.h [deleted file]
include/asm-ia64/netdump.h [deleted file]
include/asm-ia64/setup.h [deleted file]
include/asm-mips/gt64240.h [deleted file]
include/asm-mips/mach-yosemite/cpu-feature-overrides.h [deleted file]
include/asm-mips/marvell.h [deleted file]
include/asm-mips/setup.h [deleted file]
include/asm-mips/vr41xx/tb0219.h [deleted file]
include/asm-parisc/numnodes.h [deleted file]
include/asm-ppc/cpm2.h [deleted file]
include/asm-ppc/immap_cpm2.h [deleted file]
include/asm-ppc/m8260_pci.h [deleted file]
include/asm-ppc/mpc52xx.h [deleted file]
include/asm-ppc/mpc52xx_psc.h [deleted file]
include/asm-ppc/mpc8260_pci9.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-ppc/rheap.h [deleted file]
include/asm-ppc64/hvcserver.h [deleted file]
include/asm-ppc64/netdump.h [deleted file]
include/asm-s390/netdump.h [deleted file]
include/asm-sh/adc.h [deleted file]
include/asm-sh/bus-sh.h [deleted file]
include/asm-sh/cpu-sh3/adc.h [deleted file]
include/asm-sh/fixmap.h [deleted file]
include/asm-sh/hp6xx/ide.h [deleted file]
include/asm-sh/hs7751rvoip/hs7751rvoip.h [deleted file]
include/asm-sh/hs7751rvoip/ide.h [deleted file]
include/asm-sh/hs7751rvoip/io.h [deleted file]
include/asm-sh/rts7751r2d/ide.h [deleted file]
include/asm-sh/rts7751r2d/io.h [deleted file]
include/asm-sh/rts7751r2d/rts7751r2d.h [deleted file]
include/asm-sh/rts7751r2d/voyagergx_reg.h [deleted file]
include/asm-sh/se7300/io.h [deleted file]
include/asm-sh/se7300/se7300.h [deleted file]
include/asm-sh/setup.h [deleted file]
include/asm-sh64/a.out.h [deleted file]
include/asm-sh64/atomic.h [deleted file]
include/asm-sh64/bitops.h [deleted file]
include/asm-sh64/bug.h [deleted file]
include/asm-sh64/bugs.h [deleted file]
include/asm-sh64/byteorder.h [deleted file]
include/asm-sh64/cache.h [deleted file]
include/asm-sh64/cacheflush.h [deleted file]
include/asm-sh64/cayman.h [deleted file]
include/asm-sh64/checksum.h [deleted file]
include/asm-sh64/cpumask.h [deleted file]
include/asm-sh64/current.h [deleted file]
include/asm-sh64/delay.h [deleted file]
include/asm-sh64/div64.h [deleted file]
include/asm-sh64/dma-mapping.h [deleted file]
include/asm-sh64/dma.h [deleted file]
include/asm-sh64/elf.h [deleted file]
include/asm-sh64/errno.h [deleted file]
include/asm-sh64/fcntl.h [deleted file]
include/asm-sh64/hardirq.h [deleted file]
include/asm-sh64/hardware.h [deleted file]
include/asm-sh64/hdreg.h [deleted file]
include/asm-sh64/hw_irq.h [deleted file]
include/asm-sh64/ide.h [deleted file]
include/asm-sh64/io.h [deleted file]
include/asm-sh64/ioctl.h [deleted file]
include/asm-sh64/ioctls.h [deleted file]
include/asm-sh64/ipc.h [deleted file]
include/asm-sh64/ipcbuf.h [deleted file]
include/asm-sh64/irq.h [deleted file]
include/asm-sh64/keyboard.h [deleted file]
include/asm-sh64/kmap_types.h [deleted file]
include/asm-sh64/linkage.h [deleted file]
include/asm-sh64/local.h [deleted file]
include/asm-sh64/mc146818rtc.h [deleted file]
include/asm-sh64/mman.h [deleted file]
include/asm-sh64/mmu.h [deleted file]
include/asm-sh64/mmu_context.h [deleted file]
include/asm-sh64/module.h [deleted file]
include/asm-sh64/msgbuf.h [deleted file]
include/asm-sh64/namei.h [deleted file]
include/asm-sh64/page.h [deleted file]
include/asm-sh64/param.h [deleted file]
include/asm-sh64/pci.h [deleted file]
include/asm-sh64/percpu.h [deleted file]
include/asm-sh64/pgalloc.h [deleted file]
include/asm-sh64/pgtable.h [deleted file]
include/asm-sh64/platform.h [deleted file]
include/asm-sh64/poll.h [deleted file]
include/asm-sh64/posix_types.h [deleted file]
include/asm-sh64/processor.h [deleted file]
include/asm-sh64/ptrace.h [deleted file]
include/asm-sh64/registers.h [deleted file]
include/asm-sh64/resource.h [deleted file]
include/asm-sh64/scatterlist.h [deleted file]
include/asm-sh64/sections.h [deleted file]
include/asm-sh64/segment.h [deleted file]
include/asm-sh64/semaphore-helper.h [deleted file]
include/asm-sh64/semaphore.h [deleted file]
include/asm-sh64/sembuf.h [deleted file]
include/asm-sh64/serial.h [deleted file]
include/asm-sh64/setup.h [deleted file]
include/asm-sh64/shmbuf.h [deleted file]
include/asm-sh64/shmparam.h [deleted file]
include/asm-sh64/sigcontext.h [deleted file]
include/asm-sh64/siginfo.h [deleted file]
include/asm-sh64/signal.h [deleted file]
include/asm-sh64/smp.h [deleted file]
include/asm-sh64/smplock.h [deleted file]
include/asm-sh64/socket.h [deleted file]
include/asm-sh64/sockios.h [deleted file]
include/asm-sh64/softirq.h [deleted file]
include/asm-sh64/spinlock.h [deleted file]
include/asm-sh64/stat.h [deleted file]
include/asm-sh64/statfs.h [deleted file]
include/asm-sh64/string.h [deleted file]
include/asm-sh64/system.h [deleted file]
include/asm-sh64/termbits.h [deleted file]
include/asm-sh64/termios.h [deleted file]
include/asm-sh64/thread_info.h [deleted file]
include/asm-sh64/timex.h [deleted file]
include/asm-sh64/tlb.h [deleted file]
include/asm-sh64/tlbflush.h [deleted file]
include/asm-sh64/topology.h [deleted file]
include/asm-sh64/types.h [deleted file]
include/asm-sh64/uaccess.h [deleted file]
include/asm-sh64/ucontext.h [deleted file]
include/asm-sh64/unaligned.h [deleted file]
include/asm-sh64/unistd.h [deleted file]
include/asm-sh64/user.h [deleted file]
include/asm-sparc64/cmt.h [deleted file]
include/asm-um/cpufeature.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-um/setup.h [deleted file]
include/asm-v850/setup.h [deleted file]
include/asm-x86_64/netdump.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/crc-ccitt.h [deleted file]
include/linux/crypto/ksign.h [deleted file]
include/linux/crypto/mpi.h [deleted file]
include/linux/dmi.h [deleted file]
include/linux/ds1286.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_ipv4/ipt_addrtype.h [deleted file]
include/linux/netfilter_ipv4/ipt_realm.h [deleted file]
include/linux/netfilter_ipx.h [deleted file]
include/linux/netfilter_x25.h [deleted file]
include/linux/snmp.h [deleted file]
include/media/ovcamchip.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/ip6_checksum.h [deleted file]
include/net/pkt_act.h [deleted file]
kernel/module-verify.c [deleted file]
kernel/module-verify.h [deleted file]
kernel/power/smp.c [deleted file]
lib/crc-ccitt.c [deleted file]
net/bluetooth/hidp/Kconfig [deleted file]
net/bluetooth/hidp/Makefile [deleted file]
net/bluetooth/hidp/core.c [deleted file]
net/bluetooth/hidp/hidp.h [deleted file]
net/bluetooth/hidp/sock.c [deleted file]
net/ipv4/datagram.c [deleted file]
net/ipv4/netfilter/ipt_addrtype.c [deleted file]
net/ipv4/netfilter/ipt_realm.c [deleted file]
net/ipv4/xfrm4_output.c [deleted file]
net/ipv6/xfrm6_output.c [deleted file]
net/ipv6/xfrm6_tunnel.c [deleted file]
net/sched/act_api.c [deleted file]
net/sched/sch_netem.c [deleted file]
scripts/mkmakefile [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]
scripts/modsign/Makefile [deleted file]
scripts/modsign/mod-extract.c [deleted file]
scripts/modsign/mod-extract.sh [deleted file]
scripts/modsign/modsign.sh [deleted file]
scripts/package/Makefile [deleted file]
scripts/package/builddeb [deleted file]
scripts/package/mkspec [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/block/as-iosched.txt b/Documentation/block/as-iosched.txt
deleted file mode 100644 (file)
index fd763cc..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/block/deadline-iosched.txt b/Documentation/block/deadline-iosched.txt
deleted file mode 100644 (file)
index 2b13186..0000000
+++ /dev/null
@@ -1,78 +0,0 @@
-Deadline IO scheduler tunables
-==============================
-
-This little file attempts to document how the deadline io scheduler works.
-In particular, it will clarify the meaning of the exposed tunables that may be
-of interest to power users.
-
-Each io queue has a set of io scheduler tunables associated with it. These
-tunables control how the io scheduler works. You can find these entries
-in:
-
-/sys/block/<device>/iosched
-
-assuming that you have sysfs mounted on /sys. If you don't have sysfs mounted,
-you can do so by typing:
-
-# mount none /sys -t sysfs
-
-
-********************************************************************************
-
-
-read_expire    (in ms)
------------
-
-The goal of the deadline io scheduler is to attempt to guarentee a start
-service time for a request. As we focus mainly on read latencies, this is
-tunable. When a read request first enters the io scheduler, it is assigned
-a deadline that is the current time + the read_expire value in units of
-miliseconds.
-
-
-write_expire   (in ms)
------------
-
-Similar to read_expire mentioned above, but for writes.
-
-
-fifo_batch
-----------
-
-When a read request expires its deadline, we must move some requests from
-the sorted io scheduler list to the block device dispatch queue. fifo_batch
-controls how many requests we move, based on the cost of each request. A
-request is either qualified as a seek or a stream. The io scheduler knows
-the last request that was serviced by the drive (or will be serviced right
-before this one). See seek_cost and stream_unit.
-
-
-write_starved  (number of dispatches)
--------------
-
-When we have to move requests from the io scheduler queue to the block
-device dispatch queue, we always give a preference to reads. However, we
-don't want to starve writes indefinitely either. So writes_starved controls
-how many times we give preference to reads over writes. When that has been
-done writes_starved number of times, we dispatch some writes based on the
-same criteria as reads.
-
-
-front_merges   (bool)
-------------
-
-Sometimes it happens that a request enters the io scheduler that is contigious
-with a request that is already on the queue. Either it fits in the back of that
-request, or it fits at the front. That is called either a back merge candidate
-or a front merge candidate. Due to the way files are typically laid out,
-back merges are much more common than front merges. For some work loads, you
-may even know that it is a waste of time to spend any time attempting to
-front merge requests. Setting front_merges to 0 disables this functionality.
-Front merges may still occur due to the cached last_merge hint, but since
-that comes at basically 0 cost we leave that on. We simply disable the
-rbtree front sector lookup when the io scheduler merge function is called.
-
-
-Nov 11 2002, Jens Axboe <axboe@suse.de>
-
-
diff --git a/Documentation/filesystems/automount-support.txt b/Documentation/filesystems/automount-support.txt
deleted file mode 100644 (file)
index 58c65a1..0000000
+++ /dev/null
@@ -1,118 +0,0 @@
-Support is available for filesystems that wish to do automounting support (such
-as kAFS which can be found in fs/afs/). This facility includes allowing
-in-kernel mounts to be performed and mountpoint degradation to be
-requested. The latter can also be requested by userspace.
-
-
-======================
-IN-KERNEL AUTOMOUNTING
-======================
-
-A filesystem can now mount another filesystem on one of its directories by the
-following procedure:
-
- (1) Give the directory a follow_link() operation.
-
-     When the directory is accessed, the follow_link op will be called, and
-     it will be provided with the location of the mountpoint in the nameidata
-     structure (vfsmount and dentry).
-
- (2) Have the follow_link() op do the following steps:
-
-     (a) Call do_kern_mount() to call the appropriate filesystem to set up a
-         superblock and gain a vfsmount structure representing it.
-
-     (b) Copy the nameidata provided as an argument and substitute the dentry
-        argument into it the copy.
-
-     (c) Call do_add_mount() to install the new vfsmount into the namespace's
-        mountpoint tree, thus making it accessible to userspace. Use the
-        nameidata set up in (b) as the destination.
-
-        If the mountpoint will be automatically expired, then do_add_mount()
-        should also be given the location of an expiration list (see further
-        down).
-
-     (d) Release the path in the nameidata argument and substitute in the new
-        vfsmount and its root dentry. The ref counts on these will need
-        incrementing.
-
-Then from userspace, you can just do something like:
-
-       [root@andromeda root]# mount -t afs \#root.afs. /afs
-       [root@andromeda root]# ls /afs
-       asd  cambridge  cambridge.redhat.com  grand.central.org
-       [root@andromeda root]# ls /afs/cambridge
-       afsdoc
-       [root@andromeda root]# ls /afs/cambridge/afsdoc/
-       ChangeLog  html  LICENSE  pdf  RELNOTES-1.2.2
-
-And then if you look in the mountpoint catalogue, you'll see something like:
-
-       [root@andromeda root]# cat /proc/mounts
-       ...
-       #root.afs. /afs afs rw 0 0
-       #root.cell. /afs/cambridge.redhat.com afs rw 0 0
-       #afsdoc. /afs/cambridge.redhat.com/afsdoc afs rw 0 0
-
-
-===========================
-AUTOMATIC MOUNTPOINT EXPIRY
-===========================
-
-Automatic expiration of mountpoints is easy, provided you've mounted the
-mountpoint to be expired in the automounting procedure outlined above.
-
-To do expiration, you need to follow these steps:
-
- (3) Create at least one list off which the vfsmounts to be expired can be
-     hung. Access to this list will be governed by the vfsmount_lock.
-
- (4) In step (2c) above, the call to do_add_mount() should be provided with a
-     pointer to this list. It will hang the vfsmount off of it if it succeeds.
-
- (5) When you want mountpoints to be expired, call mark_mounts_for_expiry()
-     with a pointer to this list. This will process the list, marking every
-     vfsmount thereon for potential expiry on the next call.
-
-     If a vfsmount was already flagged for expiry, and if its usage count is 1
-     (it's only referenced by its parent vfsmount), then it will be deleted
-     from the namespace and thrown away (effectively unmounted).
-
-     It may prove simplest to simply call this at regular intervals, using
-     some sort of timed event to drive it.
-
-The expiration flag is cleared by calls to mntput. This means that expiration
-will only happen on the second expiration request after the last time the
-mountpoint was accessed.
-
-If a mountpoint is moved, it gets removed from the expiration list. If a bind
-mount is made on an expirable mount, the new vfsmount will not be on the
-expiration list and will not expire.
-
-If a namespace is copied, all mountpoints contained therein will be copied,
-and the copies of those that are on an expiration list will be added to the
-same expiration list.
-
-
-=======================
-USERSPACE DRIVEN EXPIRY
-=======================
-
-As an alternative, it is possible for userspace to request expiry of any
-mountpoint (though some will be rejected - the current process's idea of the
-rootfs for example). It does this by passing the MNT_EXPIRE flag to
-umount(). This flag is considered incompatible with MNT_FORCE and MNT_DETACH.
-
-If the mountpoint in question is in referenced by something other than
-umount() or its parent mountpoint, an EBUSY error will be returned and the
-mountpoint will not be marked for expiration or unmounted.
-
-If the mountpoint was not already marked for expiry at that time, an EAGAIN
-error will be given and it won't be unmounted.
-
-Otherwise if it was already marked and it wasn't referenced, unmounting will
-take place as usual.
-
-Again, the expiration flag is cleared every time anything other than umount()
-looks at a mountpoint.
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-parport b/Documentation/i2c/i2c-parport
deleted file mode 100644 (file)
index d359461..0000000
+++ /dev/null
@@ -1,156 +0,0 @@
-==================
-i2c-parport driver
-==================
-
-2004-07-06, Jean Delvare
-
-This is a unified driver for several i2c-over-parallel-port adapters,
-such as the ones made by Philips, Velleman or ELV. This driver is
-meant as a replacement for the older, individual drivers:
- * i2c-philips-par
- * i2c-elv
- * i2c-velleman
- * video/i2c-parport (NOT the same as this one, dedicated to home brew
-                      teletext adapters)
-
-It currently supports the following devices:
- * Philips adapter
- * home brew teletext adapter
- * Velleman K8000 adapter
- * ELV adapter
- * Analog Devices evaluation boards (ADM1025, ADM1030, ADM1031, ADM1032)
-
-These devices use different pinout configurations, so you have to tell
-the driver what you have, using the type module parameter. There is no
-way to autodetect the devices. Support for different pinout configurations
-can be easily added when needed.
-
-
-Building your own adapter
--------------------------
-
-If you want to build you own i2c-over-parallel-port adapter, here is
-a sample electronics schema (credits go to Sylvain Munaut):
-
-Device                                                      PC
-Side          ___________________Vdd (+)                    Side
-               |    |         |
-              ---  ---       ---
-              | |  | |       | |
-              |R|  |R|       |R|
-              | |  | |       | |
-              ---  ---       ---
-               |    |         |
-               |    |    /|   |
-SCL  ----------x--------o |-----------x-------------------  pin 2
-                    |    \|   |       |
-                    |         |       |
-                    |   |\    |       |
-SDA  ----------x----x---| o---x---------------------------  pin 13
-               |        |/            |
-               |                      |
-               |         /|           |
-               ---------o |----------------x--------------  pin 3
-                         \|           |    |
-                                      |    |
-                                     ---  ---
-                                     | |  | |
-                                     |R|  |R|
-                                     | |  | |
-                                     ---  ---
-                                      |    | 
-                                     ###  ###
-                                     GND  GND
-        
-Remarks:
- - This is the exact pinout and electronics used on the Analog Devices
-   evaluation boards.
-                   /|
- - All inverters -o |- must be 74HC05, they must be open collector output.
-                   \|
- - All resitors are 10k.
- - Pins 18-25 of the parallel port connected to GND.
- - Pins 4-9 (D2-D7) could be used as VDD is the driver drives them high.
-   The ADM1032 evaluation board uses D4-D7. Beware that the amount of
-   current you can draw from the parallel port is limited. Also note that
-   all connected lines MUST BE driven at the same state, else you'll short
-   circuit the output buffers! So plugging the I2C adapter after loading
-   the i2c-parport module might be a good safety since data line state
-   prior to init may be unknown. 
- - This is 5V!
- - Obviously you cannot read SCL (so it's not really standard-compliant).
-   Pretty easy to add, just copy the SDA part and use another input pin.
-   That would give (ELV compatible pinout):
-
-
-Device                                                      PC
-Side          ______________________________Vdd (+)         Side
-               |    |            |    |
-              ---  ---          ---  ---
-              | |  | |          | |  | |
-              |R|  |R|          |R|  |R|
-              | |  | |          | |  | |
-              ---  ---          ---  ---
-               |    |            |    |
-               |    |      |\    |    |
-SCL  ----------x--------x--| o---x------------------------  pin 15
-                    |   |  |/         | 
-                    |   |             |
-                    |   |   /|        |
-                    |   ---o |-------------x--------------  pin 2
-                    |       \|        |    |
-                    |                 |    |
-                    |                 |    |
-                    |      |\         |    |
-SDA  ---------------x---x--| o--------x-------------------  pin 10
-                        |  |/              |
-                        |                  |
-                        |   /|             |
-                        ---o |------------------x---------  pin 3
-                            \|             |    |
-                                           |    |
-                                          ---  ---
-                                          | |  | |
-                                          |R|  |R|
-                                          | |  | |
-                                          ---  ---
-                                           |    | 
-                                          ###  ###
-                                          GND  GND
-
-
-If possible, you should use the same pinout configuration as existing
-adapters do, so you won't even have to change the code.
-
-
-Similar (but different) drivers
--------------------------------
-
-This driver is NOT the same as the i2c-pport driver found in the i2c package.
-The i2c-pport driver makes use of modern parallel port features so that
-you don't need additional electronics. It has other restrictions however, and
-was not ported to Linux 2.6 (yet).
-
-This driver is also NOT the same as the i2c-pcf-epp driver found in the
-lm_sensors package. The i2c-pcf-epp driver doesn't use the parallel port
-as an I2C bus directly. Instead, it uses it to control an external I2C bus
-master. That driver was not ported to Linux 2.6 (yet) either.
-
-
-Legacy documentation for Velleman adapter
------------------------------------------
-
-Useful links:
-Velleman                http://www.velleman.be/
-Velleman K8000 Howto    http://howto.htlw16.ac.at/k8000-howto.html
-
-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.
-  http://home.wanadoo.nl/hihihi/libk8000.htm
-  http://home.wanadoo.nl/hihihi/libk8005.htm
-  http://struyve.mine.nu:8080/index.php?block=k8000
-  http://sourceforge.net/projects/libk8005/
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/Documentation/usb/sn9c102.txt b/Documentation/usb/sn9c102.txt
deleted file mode 100644 (file)
index 65018c8..0000000
+++ /dev/null
@@ -1,276 +0,0 @@
-
-                        SN9C10[12] PC Camera Controllers
-                                Driver for Linux
-                        ================================
-
-                               - Documentation -
-
-
-Index
-=====
-1.  Copyright
-2.  License
-3.  Overview
-4.  Module dependencies
-5.  Module loading
-6.  Module parameters
-7.  Device control through "sysfs"
-8.  Supported devices
-9.  How to add support for new image sensors
-10. Note for V4L2 developers
-11. Contact information
-12. Credits
-
-
-1. Copyright
-============
-Copyright (C) 2004 by Luca Risolia <luca.risolia@studio.unibo.it>
-
-SONiX is a trademark of SONiX Technology Company Limited, inc.
-This driver is not sponsored or developed by SONiX.
-
-
-2. License
-==========
-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.
-
-
-3. Overview
-===========
-This driver attempts to support the video streaming capabilities of the devices
-mounting the SONiX SN9C101 or SONiX SN9C102 PC Camera Controllers.
-
-- It's worth to note that SONiX has never collaborated with me during the
-development of this project, despite of several requests for enough detailed
-specifications of the register tables, compression engine and video data format
-of the above chips -
-
-Up to 64 cameras can be handled at the same time. They can be connected and
-disconnected from the host many times without turning off the computer, if
-your system supports the hotplug facility.
-
-The driver relies on the Video4Linux2 and USB core modules. It has been
-designed to run properly on SMP systems as well.
-
-The latest version of the SN9C10[12] driver can be found at the following URL:
-http://go.lamarinapunto.com/
-
-
-4. Module dependencies
-======================
-For it to work properly, the driver needs kernel support for Video4Linux and
-USB.
-
-The following options of the kernel configuration file must be enabled and
-corresponding modules must be compiled:
-
-       # Multimedia devices
-       #
-       CONFIG_VIDEO_DEV=m
-
-       # USB support
-       #
-       CONFIG_USB=m
-
-In addition, depending on the hardware being used, the modules below are
-necessary:
-
-       # USB Host Controller Drivers
-       #
-       CONFIG_USB_EHCI_HCD=m
-       CONFIG_USB_UHCI_HCD=m
-       CONFIG_USB_OHCI_HCD=m
-
-And finally:
-
-       # USB Multimedia devices
-       #
-       CONFIG_USB_SN9C102=m
-
-
-5. Module loading
-=================
-To use the driver, it is necessary to load the "sn9c102" module into memory
-after every other module required: "videodev", "usbcore" and, depending on
-the USB host controller you have, "ehci-hcd", "uhci-hcd" or "ohci-hcd".
-
-Loading can be done as shown below:
-
-       [root@localhost home]# modprobe usbcore
-       [root@localhost home]# modprobe sn9c102
-
-At this point the devices should be recognized. You can invoke "dmesg" to
-analyze kernel messages and verify that the loading process has gone well:
-
-       [user@localhost home]$ dmesg
-
-
-6. Module parameters
-====================
-Module parameters are listed below:
--------------------------------------------------------------------------------
-Name:           video_nr
-Type:           int array (min = 0, max = 32)
-Syntax:         <-1|n[,...]> 
-Description:    Specify V4L2 minor mode number:
-                -1 = use next available
-                 n = use minor number n
-                You can specify up to 32 cameras this way.
-                For example:
-                video_nr=-1,2,-1 would assign minor number 2 to the second
-                recognized camera and use auto for the first one and for every
-                other camera.
-Default:        -1
--------------------------------------------------------------------------------
-Name:           debug
-Type:           int
-Syntax:         <n> 
-Description:    Debugging information level, from 0 to 3:
-                0 = none (use carefully)
-                1 = critical errors
-                2 = significant informations
-                3 = more verbose messages
-                Level 3 is useful for testing only, when just one device
-                is used.
-Default:        2
--------------------------------------------------------------------------------
-
-
-7. Device control through "sysfs"
-=================================
-It is possible to read and write both the SN9C10[12] and the image sensor
-registers by using the "sysfs" filesystem interface.
-
-Every time a supported device is recognized, read-only files named "redblue"
-and "green" are created in the /sys/class/video4linux/videoX directory. You can
-set the red, blue and green channel's gain by writing the desired value to
-them. The value may range from 0 to 15 for each channel; this means that
-"redblue" accepts 8-bit values, where the low 4 bits are reserved for red and
-the others for blue.
-
-There are other four entries in the directory above for each registered camera:
-"reg", "val", "i2c_reg" and "i2c_val". The first two files control the
-SN9C10[12] bridge, while the other two control the sensor chip. "reg" and
-"i2c_reg" hold the values of the current register index where the following
-reading/writing operations are addressed at through "val" and "i2c_val". Their
-use is not intended for end-users, unless you know what you are doing. Note
-that "i2c_reg" and "i2c_val" won't be created if the sensor does not actually
-support the standard I2C protocol. Also, remember that you must be logged in as
-root before writing to them.
-
-As an example, suppose we were to want to read the value contained in the
-register number 1 of the sensor register table - which usually is the product
-identifier - of the camera registered as "/dev/video0":
-
-       [root@localhost #] cd /sys/class/video4linux/video0
-       [root@localhost #] echo 1 > i2c_reg
-       [root@localhost #] cat i2c_val
-
-Now let's set the green gain's register of the SN9C10[12] chip to 2:
-
-       [root@localhost #] echo 0x11 > reg
-       [root@localhost #] echo 2 > val
-
-Note that the SN9C10[12] always returns 0 when some of its registers are read.
-To avoid race conditions, all the I/O accesses to the files are serialized.
-
-
-8. Supported devices
-====================
-- I won't mention any of the names of the companies as well as their products
-here. They have never collaborated with me, so no advertising -
-
-From the point of view of a driver, what unambiguously identify a device are
-its vendor and product USB identifiers. Below is a list of known identifiers of
-devices mounting the SN9C10[12] PC camera controllers:
-
-Vendor ID  Product ID
----------  ----------
-0xc45      0x6001
-0xc45      0x6005
-0xc45      0x6009
-0xc45      0x600d
-0xc45      0x6024
-0xc45      0x6025
-0xc45      0x6028
-0xc45      0x6029
-0xc45      0x602a
-0xc45      0x602c
-0xc45      0x8001
-
-The list above does NOT imply that all those devices work with this driver: up
-until now only the ones that mount the following image sensors are supported.
-Kernel messages will always tell you whether this is the case:
-
-Model       Manufacturer
------       ------------
-PAS106B     PixArt Imaging Inc.
-TAS5110C1B  Taiwan Advanced Sensor Corporation
-TAS5130D1B  Taiwan Advanced Sensor Corporation
-
-If you think your camera is based on the above hardware and is not actually
-listed in the above table, you may try to add the specific USB VendorID and
-ProductID identifiers to the sn9c102_id_table[] in the file "sn9c102_sensor.h";
-then compile, load the module again and look at the kernel output.
-If this works, please send an email to me reporting the kernel messages, so
-that I will add a new entry in the list of supported devices.
-
-Donations of new models for further testing and support would be much
-appreciated. I won't add official support for hardware that I don't actually
-have.
-
-
-9. How to add support for new image sensors
-===========================================
-It should be easy to write code for new sensors by using the small API that I
-have created for this purpose, which is present in "sn9c102_sensor.h"
-(documentation is included there). As an example, have a look at the code in
-"sn9c102_pas106b.c", which uses the mentioned interface.
-
-At the moment, not yet supported image sensors are: PAS202B (VGA),
-HV7131[D|E1] (VGA), MI03 (VGA), OV7620 (VGA).
-
-
-10. Note for V4L2 developers
-============================
-This driver follows the V4L2 API specifications. In particular, it enforces two
-rules:
-
-1) Exactly one I/O method, either "mmap" or "read", is associated with each
-file descriptor. Once it is selected, the application must close and reopen the
-device to switch to the other I/O method.
-
-2) Previously mapped buffer memory must always be unmapped before calling any
-of the "VIDIOC_S_CROP", "VIDIOC_TRY_FMT" and "VIDIOC_S_FMT" ioctl's. In case,
-the same number of buffers as before will be allocated again to match the size
-of the new video frames, so you have to map them again before any I/O attempts.
-
-
-11. Contact information
-=======================
-I may be contacted by e-mail at <luca.risolia@studio.unibo.it>.
-
-I can accept GPG/PGP encrypted e-mail. My GPG key ID is 'FCE635A4'.
-My public 1024-bit key should be available at any keyserver; the fingerprint
-is: '88E8 F32F 7244 68BA 3958  5D40 99DA 5D2A FCE6 35A4'.
-
-
-12. Credits
-===========
-I would thank the following persons:
-
-- Stefano Mozzi, who donated 45 EU;
-- Luca Capello for the donation of a webcam;
-- Mizuno Takafumi for the donation of a webcam.
diff --git a/arch/arm/boot/bootp/initrd.S b/arch/arm/boot/bootp/initrd.S
deleted file mode 100644 (file)
index d81ea18..0000000
+++ /dev/null
@@ -1,6 +0,0 @@
-       .type   initrd_start,#object
-       .globl  initrd_start
-initrd_start:
-       .incbin INITRD
-       .globl  initrd_end
-initrd_end:
diff --git a/arch/arm/boot/bootp/kernel.S b/arch/arm/boot/bootp/kernel.S
deleted file mode 100644 (file)
index b87a25c..0000000
+++ /dev/null
@@ -1,6 +0,0 @@
-       .globl  kernel_start
-kernel_start:
-       .incbin "arch/arm/boot/zImage"
-       .globl  kernel_end
-kernel_end:
-       .align  2
diff --git a/arch/arm/boot/compressed/piggy.S b/arch/arm/boot/compressed/piggy.S
deleted file mode 100644 (file)
index 54c9518..0000000
+++ /dev/null
@@ -1,6 +0,0 @@
-       .section .piggydata,#alloc
-       .globl  input_data
-input_data:
-       .incbin "arch/arm/boot/compressed/piggy.gz"
-       .globl  input_data_end
-input_data_end:
diff --git a/arch/arm/common/locomo.c b/arch/arm/common/locomo.c
deleted file mode 100644 (file)
index 46550dd..0000000
+++ /dev/null
@@ -1,762 +0,0 @@
-/*
- * linux/arch/arm/common/locomo.c
- *
- * Sharp LoCoMo support
- *
- * 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 file contains all generic LoCoMo support.
- *
- * All initialization functions provided here are intended to be called
- * from machine specific code with proper arguments when required.
- *
- * Based on sa1111.c
- */
-
-#include <linux/config.h>
-#include <linux/module.h>
-#include <linux/init.h>
-#include <linux/kernel.h>
-#include <linux/delay.h>
-#include <linux/errno.h>
-#include <linux/ioport.h>
-#include <linux/device.h>
-#include <linux/slab.h>
-#include <linux/spinlock.h>
-
-#include <asm/hardware.h>
-#include <asm/mach-types.h>
-#include <asm/io.h>
-#include <asm/irq.h>
-#include <asm/mach/irq.h>
-
-#include <asm/hardware/locomo.h>
-
-/* the following is the overall data for the locomo chip */
-struct locomo {
-       struct device *dev;
-       unsigned long phys;
-       unsigned int irq;
-       void *base;
-};
-
-struct locomo_dev_info {
-       unsigned long   offset;
-       unsigned long   length;
-       unsigned int    devid;
-       unsigned int    irq[1];
-       const char *    name;
-};
-
-static struct locomo_dev_info locomo_devices[] = {
-};
-
-
-/** LoCoMo interrupt handling stuff.
- * NOTE: LoCoMo has a 1 to many mapping on all of its IRQs.
- * that is, there is only one real hardware interrupt
- * we determine which interrupt it is by reading some IO memory.
- * We have two levels of expansion, first in the handler for the
- * hardware interrupt we generate an interrupt
- * IRQ_LOCOMO_*_BASE and those handlers generate more interrupts
- *
- * hardware irq reads LOCOMO_ICR & 0x0f00
- *   IRQ_LOCOMO_KEY_BASE
- *   IRQ_LOCOMO_GPIO_BASE
- *   IRQ_LOCOMO_LT_BASE
- *   IRQ_LOCOMO_SPI_BASE
- * IRQ_LOCOMO_KEY_BASE reads LOCOMO_KIC & 0x0001
- *   IRQ_LOCOMO_KEY
- * IRQ_LOCOMO_GPIO_BASE reads LOCOMO_GIR & LOCOMO_GPD & 0xffff
- *   IRQ_LOCOMO_GPIO[0-15]
- * IRQ_LOCOMO_LT_BASE reads LOCOMO_LTINT & 0x0001
- *   IRQ_LOCOMO_LT
- * IRQ_LOCOMO_SPI_BASE reads LOCOMO_SPIIR & 0x000F
- *   IRQ_LOCOMO_SPI_RFR
- *   IRQ_LOCOMO_SPI_RFW
- *   IRQ_LOCOMO_SPI_OVRN
- *   IRQ_LOCOMO_SPI_TEND
- */
-
-#define LOCOMO_IRQ_START       (IRQ_LOCOMO_KEY_BASE)
-#define LOCOMO_IRQ_KEY_START   (IRQ_LOCOMO_KEY)
-#define        LOCOMO_IRQ_GPIO_START   (IRQ_LOCOMO_GPIO0)
-#define        LOCOMO_IRQ_LT_START     (IRQ_LOCOMO_LT)
-#define        LOCOMO_IRQ_SPI_START    (IRQ_LOCOMO_SPI_RFR)
-
-static void locomo_handler(unsigned int irq, struct irqdesc *desc,
-                       struct pt_regs *regs)
-{
-       int req, i;
-       struct irqdesc *d;
-       void *mapbase = get_irq_chipdata(irq);
-
-       /* Acknowledge the parent IRQ */
-       desc->chip->ack(irq);
-
-       /* check why this interrupt was generated */
-       req = locomo_readl(mapbase + LOCOMO_ICR) & 0x0f00;
-
-       if (req) {
-               /* generate the next interrupt(s) */
-               irq = LOCOMO_IRQ_START;
-               d = irq_desc + irq;
-               for (i = 0; i <= 3; i++, d++, irq++) {
-                       if (req & (0x0100 << i)) {
-                               d->handle(irq, d, regs);
-                       }
-
-               }
-       }
-}
-
-static void locomo_ack_irq(unsigned int irq)
-{
-}
-
-static void locomo_mask_irq(unsigned int irq)
-{
-       void *mapbase = get_irq_chipdata(irq);
-       unsigned int r;
-       r = locomo_readl(mapbase + LOCOMO_ICR);
-       r &= ~(0x0010 << (irq - LOCOMO_IRQ_START));
-       locomo_writel(r, mapbase + LOCOMO_ICR);
-}
-
-static void locomo_unmask_irq(unsigned int irq)
-{
-       void *mapbase = get_irq_chipdata(irq);
-       unsigned int r;
-       r = locomo_readl(mapbase + LOCOMO_ICR);
-       r |= (0x0010 << (irq - LOCOMO_IRQ_START));
-       locomo_writel(r, mapbase + LOCOMO_ICR);
-}
-
-static struct irqchip locomo_chip = {
-       .ack    = locomo_ack_irq,
-       .mask   = locomo_mask_irq,
-       .unmask = locomo_unmask_irq,
-};
-
-static void locomo_key_handler(unsigned int irq, struct irqdesc *desc,
-                           struct pt_regs *regs)
-{
-       struct irqdesc *d;
-       void *mapbase = get_irq_chipdata(irq);
-
-       if (locomo_readl(mapbase + LOCOMO_KIC) & 0x0001) {
-               d = irq_desc + LOCOMO_IRQ_KEY_START;
-               d->handle(LOCOMO_IRQ_KEY_START, d, regs);
-       }
-}
-
-static void locomo_key_ack_irq(unsigned int irq)
-{
-       void *mapbase = get_irq_chipdata(irq);
-       unsigned int r;
-       r = locomo_readl(mapbase + LOCOMO_KIC);
-       r &= ~(0x0100 << (irq - LOCOMO_IRQ_KEY_START));
-       locomo_writel(r, mapbase + LOCOMO_KIC);
-}
-
-static void locomo_key_mask_irq(unsigned int irq)
-{
-       void *mapbase = get_irq_chipdata(irq);
-       unsigned int r;
-       r = locomo_readl(mapbase + LOCOMO_KIC);
-       r &= ~(0x0010 << (irq - LOCOMO_IRQ_KEY_START));
-       locomo_writel(r, mapbase + LOCOMO_KIC);
-}
-
-static void locomo_key_unmask_irq(unsigned int irq)
-{
-       void *mapbase = get_irq_chipdata(irq);
-       unsigned int r;
-       r = locomo_readl(mapbase + LOCOMO_KIC);
-       r |= (0x0010 << (irq - LOCOMO_IRQ_KEY_START));
-       locomo_writel(r, mapbase + LOCOMO_KIC);
-}
-
-static struct irqchip locomo_key_chip = {
-       .ack    = locomo_key_ack_irq,
-       .mask   = locomo_key_mask_irq,
-       .unmask = locomo_key_unmask_irq,
-};
-
-static void locomo_gpio_handler(unsigned int irq, struct irqdesc *desc,
-                            struct pt_regs *regs)
-{
-       int req, i;
-       struct irqdesc *d;
-       void *mapbase = get_irq_chipdata(irq);
-
-       req =   locomo_readl(mapbase + LOCOMO_GIR) &
-               locomo_readl(mapbase + LOCOMO_GPD) &
-               0xffff;
-
-       if (req) {
-               irq = LOCOMO_IRQ_GPIO_START;
-               d = irq_desc + LOCOMO_IRQ_GPIO_START;
-               for (i = 0; i <= 15; i++, irq++, d++) {
-                       if (req & (0x0001 << i)) {
-                               d->handle(irq, d, regs);
-                       }
-               }
-       }
-}
-
-static void locomo_gpio_ack_irq(unsigned int irq)
-{
-       void *mapbase = get_irq_chipdata(irq);
-       unsigned int r;
-       r = locomo_readl(mapbase + LOCOMO_GWE);
-       r |= (0x0001 << (irq - LOCOMO_IRQ_GPIO_START));
-       locomo_writel(r, mapbase + LOCOMO_GWE);
-
-       r = locomo_readl(mapbase + LOCOMO_GIS);
-       r &= ~(0x0001 << (irq - LOCOMO_IRQ_GPIO_START));
-       locomo_writel(r, mapbase + LOCOMO_GIS);
-
-       r = locomo_readl(mapbase + LOCOMO_GWE);
-       r &= ~(0x0001 << (irq - LOCOMO_IRQ_GPIO_START));
-       locomo_writel(r, mapbase + LOCOMO_GWE);
-}
-
-static void locomo_gpio_mask_irq(unsigned int irq)
-{
-       void *mapbase = get_irq_chipdata(irq);
-       unsigned int r;
-       r = locomo_readl(mapbase + LOCOMO_GIE);
-       r &= ~(0x0001 << (irq - LOCOMO_IRQ_GPIO_START));
-       locomo_writel(r, mapbase + LOCOMO_GIE);
-}
-
-static void locomo_gpio_unmask_irq(unsigned int irq)
-{
-       void *mapbase = get_irq_chipdata(irq);
-       unsigned int r;
-       r = locomo_readl(mapbase + LOCOMO_GIE);
-       r |= (0x0001 << (irq - LOCOMO_IRQ_GPIO_START));
-       locomo_writel(r, mapbase + LOCOMO_GIE);
-}
-
-static struct irqchip locomo_gpio_chip = {
-       .ack    = locomo_gpio_ack_irq,
-       .mask   = locomo_gpio_mask_irq,
-       .unmask = locomo_gpio_unmask_irq,
-};
-
-static void locomo_lt_handler(unsigned int irq, struct irqdesc *desc,
-                          struct pt_regs *regs)
-{
-       struct irqdesc *d;
-       void *mapbase = get_irq_chipdata(irq);
-
-       if (locomo_readl(mapbase + LOCOMO_LTINT) & 0x0001) {
-               d = irq_desc + LOCOMO_IRQ_LT_START;
-               d->handle(LOCOMO_IRQ_LT_START, d, regs);
-       }
-}
-
-static void locomo_lt_ack_irq(unsigned int irq)
-{
-       void *mapbase = get_irq_chipdata(irq);
-       unsigned int r;
-       r = locomo_readl(mapbase + LOCOMO_LTINT);
-       r &= ~(0x0100 << (irq - LOCOMO_IRQ_LT_START));
-       locomo_writel(r, mapbase + LOCOMO_LTINT);
-}
-
-static void locomo_lt_mask_irq(unsigned int irq)
-{
-       void *mapbase = get_irq_chipdata(irq);
-       unsigned int r;
-       r = locomo_readl(mapbase + LOCOMO_LTINT);
-       r &= ~(0x0010 << (irq - LOCOMO_IRQ_LT_START));
-       locomo_writel(r, mapbase + LOCOMO_LTINT);
-}
-
-static void locomo_lt_unmask_irq(unsigned int irq)
-{
-       void *mapbase = get_irq_chipdata(irq);
-       unsigned int r;
-       r = locomo_readl(mapbase + LOCOMO_LTINT);
-       r |= (0x0010 << (irq - LOCOMO_IRQ_LT_START));
-       locomo_writel(r, mapbase + LOCOMO_LTINT);
-}
-
-static struct irqchip locomo_lt_chip = {
-       .ack    = locomo_lt_ack_irq,
-       .mask   = locomo_lt_mask_irq,
-       .unmask = locomo_lt_unmask_irq,
-};
-
-static void locomo_spi_handler(unsigned int irq, struct irqdesc *desc,
-                           struct pt_regs *regs)
-{
-       int req, i;
-       struct irqdesc *d;
-       void *mapbase = get_irq_chipdata(irq);
-
-       req = locomo_readl(mapbase + LOCOMO_SPIIR) & 0x000F;
-       if (req) {
-               irq = LOCOMO_IRQ_SPI_START;
-               d = irq_desc + irq;
-
-               for (i = 0; i <= 3; i++, irq++, d++) {
-                       if (req & (0x0001 << i)) {
-                               d->handle(irq, d, regs);
-                       }
-               }
-       }
-}
-
-static void locomo_spi_ack_irq(unsigned int irq)
-{
-       void *mapbase = get_irq_chipdata(irq);
-       unsigned int r;
-       r = locomo_readl(mapbase + LOCOMO_SPIWE);
-       r |= (0x0001 << (irq - LOCOMO_IRQ_SPI_START));
-       locomo_writel(r, mapbase + LOCOMO_SPIWE);
-
-       r = locomo_readl(mapbase + LOCOMO_SPIIS);
-       r &= ~(0x0001 << (irq - LOCOMO_IRQ_SPI_START));
-       locomo_writel(r, mapbase + LOCOMO_SPIIS);
-
-       r = locomo_readl(mapbase + LOCOMO_SPIWE);
-       r &= ~(0x0001 << (irq - LOCOMO_IRQ_SPI_START));
-       locomo_writel(r, mapbase + LOCOMO_SPIWE);
-}
-
-static void locomo_spi_mask_irq(unsigned int irq)
-{
-       void *mapbase = get_irq_chipdata(irq);
-       unsigned int r;
-       r = locomo_readl(mapbase + LOCOMO_SPIIE);
-       r &= ~(0x0001 << (irq - LOCOMO_IRQ_SPI_START));
-       locomo_writel(r, mapbase + LOCOMO_SPIIE);
-}
-
-static void locomo_spi_unmask_irq(unsigned int irq)
-{
-       void *mapbase = get_irq_chipdata(irq);
-       unsigned int r;
-       r = locomo_readl(mapbase + LOCOMO_SPIIE);
-       r |= (0x0001 << (irq - LOCOMO_IRQ_SPI_START));
-       locomo_writel(r, mapbase + LOCOMO_SPIIE);
-}
-
-static struct irqchip locomo_spi_chip = {
-       .ack    = locomo_spi_ack_irq,
-       .mask   = locomo_spi_mask_irq,
-       .unmask = locomo_spi_unmask_irq,
-};
-
-static void locomo_setup_irq(struct locomo *lchip)
-{
-       int irq;
-       void *irqbase = lchip->base;
-
-       /*
-        * Install handler for IRQ_LOCOMO_HW.
-        */
-       set_irq_type(lchip->irq, IRQT_FALLING);
-       set_irq_chipdata(lchip->irq, irqbase);
-       set_irq_chained_handler(lchip->irq, locomo_handler);
-
-       /* Install handlers for IRQ_LOCOMO_*_BASE */
-       set_irq_chip(IRQ_LOCOMO_KEY_BASE, &locomo_chip);
-       set_irq_chipdata(IRQ_LOCOMO_KEY_BASE, irqbase);
-       set_irq_chained_handler(IRQ_LOCOMO_KEY_BASE, locomo_key_handler);
-       set_irq_flags(IRQ_LOCOMO_KEY_BASE, IRQF_VALID | IRQF_PROBE);
-
-       set_irq_chip(IRQ_LOCOMO_GPIO_BASE, &locomo_chip);
-       set_irq_chipdata(IRQ_LOCOMO_GPIO_BASE, irqbase);
-       set_irq_chained_handler(IRQ_LOCOMO_GPIO_BASE, locomo_gpio_handler);
-       set_irq_flags(IRQ_LOCOMO_GPIO_BASE, IRQF_VALID | IRQF_PROBE);
-
-       set_irq_chip(IRQ_LOCOMO_LT_BASE, &locomo_chip);
-       set_irq_chipdata(IRQ_LOCOMO_LT_BASE, irqbase);
-       set_irq_chained_handler(IRQ_LOCOMO_LT_BASE, locomo_lt_handler);
-       set_irq_flags(IRQ_LOCOMO_LT_BASE, IRQF_VALID | IRQF_PROBE);
-
-       set_irq_chip(IRQ_LOCOMO_SPI_BASE, &locomo_chip);
-       set_irq_chipdata(IRQ_LOCOMO_SPI_BASE, irqbase);
-       set_irq_chained_handler(IRQ_LOCOMO_SPI_BASE, locomo_spi_handler);
-       set_irq_flags(IRQ_LOCOMO_SPI_BASE, IRQF_VALID | IRQF_PROBE);
-
-       /* install handlers for IRQ_LOCOMO_KEY_BASE generated interrupts */
-       set_irq_chip(LOCOMO_IRQ_KEY_START, &locomo_key_chip);
-       set_irq_chipdata(LOCOMO_IRQ_KEY_START, irqbase);
-       set_irq_handler(LOCOMO_IRQ_KEY_START, do_edge_IRQ);
-       set_irq_flags(LOCOMO_IRQ_KEY_START, IRQF_VALID | IRQF_PROBE);
-
-       /* install handlers for IRQ_LOCOMO_GPIO_BASE generated interrupts */
-       for (irq = LOCOMO_IRQ_GPIO_START; irq < LOCOMO_IRQ_GPIO_START + 16; irq++) {
-               set_irq_chip(irq, &locomo_gpio_chip);
-               set_irq_chipdata(irq, irqbase);
-               set_irq_handler(irq, do_edge_IRQ);
-               set_irq_flags(irq, IRQF_VALID | IRQF_PROBE);
-       }
-
-       /* install handlers for IRQ_LOCOMO_LT_BASE generated interrupts */
-       set_irq_chip(LOCOMO_IRQ_LT_START, &locomo_lt_chip);
-       set_irq_chipdata(LOCOMO_IRQ_LT_START, irqbase);
-       set_irq_handler(LOCOMO_IRQ_LT_START, do_edge_IRQ);
-       set_irq_flags(LOCOMO_IRQ_LT_START, IRQF_VALID | IRQF_PROBE);
-
-       /* install handlers for IRQ_LOCOMO_SPI_BASE generated interrupts */
-       for (irq = LOCOMO_IRQ_SPI_START; irq < LOCOMO_IRQ_SPI_START + 3; irq++) {
-               set_irq_chip(irq, &locomo_spi_chip);
-               set_irq_chipdata(irq, irqbase);
-               set_irq_handler(irq, do_edge_IRQ);
-               set_irq_flags(irq, IRQF_VALID | IRQF_PROBE);
-       }
-}
-
-
-static void locomo_dev_release(struct device *_dev)
-{
-       struct locomo_dev *dev = LOCOMO_DEV(_dev);
-
-       release_resource(&dev->res);
-       kfree(dev);
-}
-
-static int
-locomo_init_one_child(struct locomo *lchip, struct resource *parent,
-                     struct locomo_dev_info *info)
-{
-       struct locomo_dev *dev;
-       int ret;
-
-       dev = kmalloc(sizeof(struct locomo_dev), GFP_KERNEL);
-       if (!dev) {
-               ret = -ENOMEM;
-               goto out;
-       }
-       memset(dev, 0, sizeof(struct locomo_dev));
-
-       strncpy(dev->dev.bus_id,info->name,sizeof(dev->dev.bus_id));
-       /*
-        * If the parent device has a DMA mask associated with it,
-        * propagate it down to the children.
-        */
-       if (lchip->dev->dma_mask) {
-               dev->dma_mask = *lchip->dev->dma_mask;
-               dev->dev.dma_mask = &dev->dma_mask;
-       }
-
-       dev->devid       = info->devid;
-       dev->dev.parent  = lchip->dev;
-       dev->dev.bus     = &locomo_bus_type;
-       dev->dev.release = locomo_dev_release;
-       dev->dev.coherent_dma_mask = lchip->dev->coherent_dma_mask;
-       dev->res.start   = lchip->phys + info->offset;
-       dev->res.end     = dev->res.start + info->length;
-       dev->res.name    = dev->dev.bus_id;
-       dev->res.flags   = IORESOURCE_MEM;
-       dev->mapbase     = lchip->base + info->offset;
-       memmove(dev->irq, info->irq, sizeof(dev->irq));
-
-       if (info->length) {
-               ret = request_resource(parent, &dev->res);
-               if (ret) {
-                       printk("LoCoMo: failed to allocate resource for %s\n",
-                               dev->res.name);
-                       goto out;
-               }
-       }
-
-       ret = device_register(&dev->dev);
-       if (ret) {
-               release_resource(&dev->res);
- out:
-               kfree(dev);
-       }
-       return ret;
-}
-
-/**
- *     locomo_probe - probe for a single LoCoMo chip.
- *     @phys_addr: physical address of device.
- *
- *     Probe for a LoCoMo chip.  This must be called
- *     before any other locomo-specific code.
- *
- *     Returns:
- *     %-ENODEV        device not found.
- *     %-EBUSY         physical address already marked in-use.
- *     %0              successful.
- */
-static int
-__locomo_probe(struct device *me, struct resource *mem, int irq)
-{
-       struct locomo *lchip;
-       unsigned long r;
-       int i, ret = -ENODEV;
-
-       lchip = kmalloc(sizeof(struct locomo), GFP_KERNEL);
-       if (!lchip)
-               return -ENOMEM;
-
-       memset(lchip, 0, sizeof(struct locomo));
-
-       lchip->dev = me;
-       dev_set_drvdata(lchip->dev, lchip);
-
-       lchip->phys = mem->start;
-       lchip->irq = irq;
-
-       /*
-        * Map the whole region.  This also maps the
-        * registers for our children.
-        */
-       lchip->base = ioremap(mem->start, PAGE_SIZE);
-       if (!lchip->base) {
-               ret = -ENOMEM;
-               goto out;
-       }
-
-       /* locomo initialize */
-       locomo_writel(0, lchip->base + LOCOMO_ICR);
-       /* KEYBOARD */
-       locomo_writel(0, lchip->base + LOCOMO_KIC);
-
-       /* GPIO */
-       locomo_writel(0, lchip->base + LOCOMO_GPO);
-       locomo_writel( (LOCOMO_GPIO(2) | LOCOMO_GPIO(3) | LOCOMO_GPIO(13) | LOCOMO_GPIO(14))
-                       , lchip->base + LOCOMO_GPE);
-       locomo_writel( (LOCOMO_GPIO(2) | LOCOMO_GPIO(3) | LOCOMO_GPIO(13) | LOCOMO_GPIO(14))
-                       , lchip->base + LOCOMO_GPD);
-       locomo_writel(0, lchip->base + LOCOMO_GIE);
-
-       /* FrontLight */
-       locomo_writel(0, lchip->base + LOCOMO_ALS);
-       locomo_writel(0, lchip->base + LOCOMO_ALD);
-       /* Longtime timer */
-       locomo_writel(0, lchip->base + LOCOMO_LTINT);
-       /* SPI */
-       locomo_writel(0, lchip->base + LOCOMO_SPIIE);
-
-       locomo_writel(6 + 8 + 320 + 30 - 10, lchip->base + LOCOMO_ASD);
-       r = locomo_readl(lchip->base + LOCOMO_ASD);
-       r |= 0x8000;
-       locomo_writel(r, lchip->base + LOCOMO_ASD);
-
-       locomo_writel(6 + 8 + 320 + 30 - 10 - 128 + 4, lchip->base + LOCOMO_HSD);
-       r = locomo_readl(lchip->base + LOCOMO_HSD);
-       r |= 0x8000;
-       locomo_writel(r, lchip->base + LOCOMO_HSD);
-
-       locomo_writel(128 / 8, lchip->base + LOCOMO_HSC);
-
-       /* XON */
-       locomo_writel(0x80, lchip->base + LOCOMO_TADC);
-       udelay(1000);
-       /* CLK9MEN */
-       r = locomo_readl(lchip->base + LOCOMO_TADC);
-       r |= 0x10;
-       locomo_writel(r, lchip->base + LOCOMO_TADC);
-       udelay(100);
-
-       /* init DAC */
-       r = locomo_readl(lchip->base + LOCOMO_DAC);
-       r |= LOCOMO_DAC_SCLOEB | LOCOMO_DAC_SDAOEB;
-       locomo_writel(r, lchip->base + LOCOMO_DAC);
-
-       r = locomo_readl(lchip->base + LOCOMO_VER);
-       printk(KERN_INFO "LoCoMo Chip: %lu%lu\n", (r >> 8), (r & 0xff));
-
-       /*
-        * The interrupt controller must be initialised before any
-        * other device to ensure that the interrupts are available.
-        */
-       if (lchip->irq != NO_IRQ)
-               locomo_setup_irq(lchip);
-
-       for (i = 0; i < ARRAY_SIZE(locomo_devices); i++)
-               locomo_init_one_child(lchip, mem, &locomo_devices[i]);
-
-       return 0;
-
- out:
-       kfree(lchip);
-       return ret;
-}
-
-static void __locomo_remove(struct locomo *lchip)
-{
-       struct list_head *l, *n;
-
-       list_for_each_safe(l, n, &lchip->dev->children) {
-               struct device *d = list_to_dev(l);
-
-               device_unregister(d);
-       }
-
-       if (lchip->irq != NO_IRQ) {
-               set_irq_chained_handler(lchip->irq, NULL);
-               set_irq_data(lchip->irq, NULL);
-       }
-
-       iounmap(lchip->base);
-       kfree(lchip);
-}
-
-static int locomo_probe(struct device *dev)
-{
-       struct platform_device *pdev = to_platform_device(dev);
-       struct resource *mem = NULL, *irq = NULL;
-       int i;
-
-       for (i = 0; i < pdev->num_resources; i++) {
-               if (pdev->resource[i].flags & IORESOURCE_MEM)
-                       mem = &pdev->resource[i];
-               if (pdev->resource[i].flags & IORESOURCE_IRQ)
-                       irq = &pdev->resource[i];
-       }
-
-       return __locomo_probe(dev, mem, irq ? irq->start : NO_IRQ);
-}
-
-static int locomo_remove(struct device *dev)
-{
-       struct locomo *lchip = dev_get_drvdata(dev);
-
-       if (lchip) {
-               __locomo_remove(lchip);
-               dev_set_drvdata(dev, NULL);
-
-               kfree(dev->saved_state);
-               dev->saved_state = NULL;
-       }
-
-       return 0;
-}
-
-/*
- *     Not sure if this should be on the system bus or not yet.
- *     We really want some way to register a system device at
- *     the per-machine level, and then have this driver pick
- *     up the registered devices.
- */
-static struct device_driver locomo_device_driver = {
-       .name           = "locomo",
-       .bus            = &platform_bus_type,
-       .probe          = locomo_probe,
-       .remove         = locomo_remove,
-};
-
-/*
- *     Get the parent device driver (us) structure
- *     from a child function device
- */
-static inline struct locomo *locomo_chip_driver(struct locomo_dev *ldev)
-{
-       return (struct locomo *)dev_get_drvdata(ldev->dev.parent);
-}
-
-/*
- *     LoCoMo "Register Access Bus."
- *
- *     We model this as a regular bus type, and hang devices directly
- *     off this.
- */
-static int locomo_match(struct device *_dev, struct device_driver *_drv)
-{
-       struct locomo_dev *dev = LOCOMO_DEV(_dev);
-       struct locomo_driver *drv = LOCOMO_DRV(_drv);
-
-       return dev->devid == drv->devid;
-}
-
-static int locomo_bus_suspend(struct device *dev, u32 state)
-{
-       struct locomo_dev *ldev = LOCOMO_DEV(dev);
-       struct locomo_driver *drv = LOCOMO_DRV(dev->driver);
-       int ret = 0;
-
-       if (drv && drv->suspend)
-               ret = drv->suspend(ldev, state);
-       return ret;
-}
-
-static int locomo_bus_resume(struct device *dev)
-{
-       struct locomo_dev *ldev = LOCOMO_DEV(dev);
-       struct locomo_driver *drv = LOCOMO_DRV(dev->driver);
-       int ret = 0;
-
-       if (drv && drv->resume)
-               ret = drv->resume(ldev);
-       return ret;
-}
-
-static int locomo_bus_probe(struct device *dev)
-{
-       struct locomo_dev *ldev = LOCOMO_DEV(dev);
-       struct locomo_driver *drv = LOCOMO_DRV(dev->driver);
-       int ret = -ENODEV;
-
-       if (drv->probe)
-               ret = drv->probe(ldev);
-       return ret;
-}
-
-static int locomo_bus_remove(struct device *dev)
-{
-       struct locomo_dev *ldev = LOCOMO_DEV(dev);
-       struct locomo_driver *drv = LOCOMO_DRV(dev->driver);
-       int ret = 0;
-
-       if (drv->remove)
-               ret = drv->remove(ldev);
-       return ret;
-}
-
-struct bus_type locomo_bus_type = {
-       .name           = "locomo-bus",
-       .match          = locomo_match,
-       .suspend        = locomo_bus_suspend,
-       .resume         = locomo_bus_resume,
-};
-
-int locomo_driver_register(struct locomo_driver *driver)
-{
-       driver->drv.probe = locomo_bus_probe;
-       driver->drv.remove = locomo_bus_remove;
-       driver->drv.bus = &locomo_bus_type;
-       return driver_register(&driver->drv);
-}
-
-void locomo_driver_unregister(struct locomo_driver *driver)
-{
-       driver_unregister(&driver->drv);
-}
-
-static int __init locomo_init(void)
-{
-       int ret = bus_register(&locomo_bus_type);
-       if (ret == 0)
-               driver_register(&locomo_device_driver);
-       return ret;
-}
-
-static void __exit locomo_exit(void)
-{
-       driver_unregister(&locomo_device_driver);
-       bus_unregister(&locomo_bus_type);
-}
-
-module_init(locomo_init);
-module_exit(locomo_exit);
-
-MODULE_DESCRIPTION("Sharp LoCoMo core driver");
-MODULE_LICENSE("GPL");
-MODULE_AUTHOR("John Lenz <jelenz@students.wisc.edu>");
-
-EXPORT_SYMBOL(locomo_driver_register);
-EXPORT_SYMBOL(locomo_driver_unregister);
diff --git a/arch/arm/common/time-acorn.c b/arch/arm/common/time-acorn.c
deleted file mode 100644 (file)
index eb06282..0000000
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- *  linux/arch/arm/common/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
- *   13=Jun-2004       DS      Moved to arch/arm/common b/c shared w/CLPS7500
- */
-#include <linux/timex.h>
-#include <linux/init.h>
-
-#include <asm/hardware.h>
-#include <asm/io.h>
-#include <asm/hardware/ioc.h>
-
-#include <asm/mach/time.h>
-
-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-footbridge/time.c b/arch/arm/mach-footbridge/time.c
deleted file mode 100644 (file)
index e9f5708..0000000
+++ /dev/null
@@ -1,296 +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/timex.h>
-#include <linux/init.h>
-#include <linux/interrupt.h>
-#include <linux/sched.h>
-#include <linux/mc146818rtc.h>
-#include <linux/bcd.h>
-
-#include <asm/hardware/dec21285.h>
-
-#include <asm/hardware.h>
-#include <asm/irq.h>
-#include <asm/leds.h>
-#include <asm/mach-types.h>
-#include <asm/io.h>
-#include <asm/hardware/clps7111.h>
-
-#include <asm/mach/time.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)
-{
-       timer_tick(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;
-
-       timer_tick(regs);
-
-       return IRQ_HANDLED;
-}
-
-static struct irqaction footbridge_timer_irq = {
-       .flags  = SA_INTERRUPT
-};
-
-/*
- * Set up timer interrupt.
- */
-void __init footbridge_init_time(void)
-{
-       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;
-
-               footbridge_timer_irq.name = "Timer1 Timer Tick";
-               footbridge_timer_irq.handler = timer1_interrupt;
-               
-               setup_irq(IRQ_TIMER1, &footbridge_timer_irq);
-
-       } 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;
-
-               footbridge_timer_irq.name = "ISA Timer Tick";
-               footbridge_timer_irq.handler = isa_timer_interrupt;
-               
-               setup_irq(IRQ_ISA_TIMER, &footbridge_timer_irq);
-       }
-}
diff --git a/arch/arm/mach-lh7a40x/time.c b/arch/arm/mach-lh7a40x/time.c
deleted file mode 100644 (file)
index 61ada24..0000000
+++ /dev/null
@@ -1,67 +0,0 @@
-/* 
- *  arch/arm/mach-lh7a40x/time.c
- *
- *  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.
- *
- */
-#include <linux/config.h>
-#include <linux/module.h>
-#include <linux/kernel.h>
-#include <linux/interrupt.h>
-#include <linux/time.h>
-
-#include <asm/hardware.h>
-#include <asm/io.h>
-#include <asm/irq.h>
-#include <asm/leds.h>
-
-#include <asm/mach/time.h>
-
-#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;
-       timer_tick(regs);
-
-       return IRQ_HANDLED;
-}
-
-static struct irqaction lh7a40x_timer_irq = {
-       .name           = "LHA740x Timer Tick",
-       .flags          = SA_INTERRUPT,
-       .handler        = lh7a40x_timer_interrupt
-};
-
-void __init lh7a40x_init_time(void)
-{
-                               /* Stop/disable all timers */
-       TIMER_CONTROL1 = 0;
-       TIMER_CONTROL2 = 0;
-       TIMER_CONTROL3 = 0;
-
-       setup_irq (TIMER_IRQ, &lh7a40x_timer_irq);
-
-       TIMER_LOAD = TIMER_CONSTANT;
-       TIMER_CONTROL = TIMER_MODE;
-}
-
diff --git a/arch/arm/mach-omap/time.c b/arch/arm/mach-omap/time.c
deleted file mode 100644 (file)
index cb3c5d6..0000000
+++ /dev/null
@@ -1,217 +0,0 @@
-/*
- * arch/arm/mach-omap/time.c
- *
- * OMAP Timer Tick 
- *
- * 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.
- */
-
-#include <linux/config.h>
-#include <linux/kernel.h>
-#include <linux/init.h>
-#include <linux/delay.h>
-#include <linux/interrupt.h>
-#include <linux/sched.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/mach/time.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 omap_gettimeoffset(void)
-{
-       /* Return elapsed usecs since last system timer ISR */
-       return machinecycles_to_usecs(do_getmachinecycles() - systimer_mark);
-}
-
-static irqreturn_t
-omap_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;
-
-       timer_tick(regs);
-
-       return IRQ_HANDLED;
-}
-
-static struct irqaction omap_timer_irq = {
-       .name           = "OMAP Timer Tick",
-       .flags          = SA_INTERRUPT,
-       .handler        = omap_timer_interrupt
-};
-
-void __init omap_init_time(void)
-{
-       /* Since we don't call request_irq, we must init the structure */
-       gettimeoffset = omap_gettimeoffset;
-
-#ifdef OMAP1510_USE_32KHZ_TIMER
-       timer32k_write(TIMER32k_CR, 0x0);
-       timer32k_write(TIMER32k_TVR,TIMER32k_PERIOD);
-       setup_irq(INT_OS_32kHz_TIMER, &omap_timer_irq);
-       start_timer32k();
-#else
-       setup_irq(INT_TIMER2, &omap_timer_irq);
-       start_mputimer2(MPUTICKS_PER_SEC / 100 - 1);
-#endif
-}
-
diff --git a/arch/arm/mach-pxa/time.c b/arch/arm/mach-pxa/time.c
deleted file mode 100644 (file)
index 7e89235..0000000
+++ /dev/null
@@ -1,124 +0,0 @@
-/*
- * arch/arm/mach-pxa/time.c
- *
- * 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.
- */
-
-#include <linux/config.h>
-#include <linux/kernel.h>
-#include <linux/init.h>
-#include <linux/delay.h>
-#include <linux/interrupt.h>
-#include <linux/time.h>
-#include <linux/signal.h>
-#include <linux/errno.h>
-#include <linux/sched.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/mach/time.h>
-
-
-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;
-
-       /* 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 {
-               timer_tick(regs);
-               OSSR = OSSR_M0;  /* Clear match on timer 0 */
-               next_match = (OSMR0 += LATCH);
-       } while( (signed long)(next_match - OSCR) <= 8 );
-
-       return IRQ_HANDLED;
-}
-
-static struct irqaction pxa_timer_irq = {
-       .name           = "PXA Timer Tick",
-       .flags          = SA_INTERRUPT,
-       .handler        = pxa_timer_interrupt
-};
-
-void __init pxa_init_time(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);
-
-       OSMR0 = 0;              /* set initial match at 0 */
-       OSSR = 0xf;             /* clear status on all timers */
-       setup_irq(IRQ_OST0, &pxa_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/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-s3c2410/time.c b/arch/arm/mach-s3c2410/time.c
deleted file mode 100644 (file)
index 62d89d9..0000000
+++ /dev/null
@@ -1,176 +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 <linux/config.h>
-#include <linux/kernel.h>
-#include <linux/sched.h>
-#include <linux/init.h>
-#include <linux/interrupt.h>
-#include <asm/system.h>
-#include <asm/leds.h>
-#include <asm/mach-types.h>
-
-#include <asm/io.h>
-#include <asm/irq.h>
-#include <asm/arch/map.h>
-#include <asm/arch/regs-timer.h>
-#include <asm/mach/time.h>
-
-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)
-{
-       timer_tick(regs);
-
-       return IRQ_HANDLED;
-}
-
-static struct irqaction s3c2410_timer_irq = {
-       .name           = "S32410 Timer Tick",
-       .flags          = SA_INTERRUPT,
-       .handler        = s3c2410_timer_interrupt
-};
-
-/*
- * 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 s3c2410_init_time (void)
-{
-       unsigned long tcon;
-       unsigned long tcnt;
-       unsigned long tcfg1;
-       unsigned long tcfg0;
-
-       gettimeoffset = s3c2410_gettimeoffset;
-
-       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, &s3c2410_timer_irq);
-
-       /* start the timer running */
-       tcon |= S3C2410_TCON_T4START;
-       tcon &= ~S3C2410_TCON_T4MANUALUPD;
-       __raw_writel(tcon, S3C2410_TCON);
-}
-
-
-
diff --git a/arch/arm/mach-sa1100/collie.c b/arch/arm/mach-sa1100/collie.c
deleted file mode 100644 (file)
index dcbb3c7..0000000
+++ /dev/null
@@ -1,144 +0,0 @@
-/*
- * linux/arch/arm/mach-sa1100/collie.c
- *
- * May be copied or modified under the terms of the GNU General Public
- * License.  See linux/COPYING for more information.
- *
- * This file contains all Collie-specific tweaks.
- *
- * 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:
- *  03-06-2004 John Lenz <jelenz@wisc.edu>
- *  06-04-2002 Chris Larson <kergoth@digitalnemesis.net>
- *  04-16-2001 Lineo Japan,Inc. ...
- */
-
-#include <linux/config.h>
-#include <linux/init.h>
-#include <linux/kernel.h>
-#include <linux/tty.h>
-#include <linux/delay.h>
-#include <linux/device.h>
-#include <linux/timer.h>
-
-#include <asm/hardware.h>
-#include <asm/mach-types.h>
-#include <asm/irq.h>
-#include <asm/setup.h>
-#include <asm/arch/collie.h>
-
-#include <asm/mach/arch.h>
-#include <asm/mach/map.h>
-#include <asm/mach/serial_sa1100.h>
-
-#include <asm/hardware/locomo.h>
-
-#include "generic.h"
-
-static void __init scoop_init(void)
-{
-
-#define        COLLIE_SCP_INIT_DATA(adr,dat)   (((adr)<<16)|(dat))
-#define        COLLIE_SCP_INIT_DATA_END        ((unsigned long)-1)
-       static const unsigned long scp_init[] = {
-               COLLIE_SCP_INIT_DATA(COLLIE_SCP_MCR, 0x0140),   // 00
-               COLLIE_SCP_INIT_DATA(COLLIE_SCP_MCR, 0x0100),
-               COLLIE_SCP_INIT_DATA(COLLIE_SCP_CDR, 0x0000),   // 04
-               COLLIE_SCP_INIT_DATA(COLLIE_SCP_CPR, 0x0000),   // 0C
-               COLLIE_SCP_INIT_DATA(COLLIE_SCP_CCR, 0x0000),   // 10
-               COLLIE_SCP_INIT_DATA(COLLIE_SCP_IMR, 0x0000),   // 18
-               COLLIE_SCP_INIT_DATA(COLLIE_SCP_IRM, 0x00FF),   // 14
-               COLLIE_SCP_INIT_DATA(COLLIE_SCP_ISR, 0x0000),   // 1C
-               COLLIE_SCP_INIT_DATA(COLLIE_SCP_IRM, 0x0000),
-               COLLIE_SCP_INIT_DATA(COLLIE_SCP_GPCR, COLLIE_SCP_IO_DIR),       // 20
-               COLLIE_SCP_INIT_DATA(COLLIE_SCP_GPWR, COLLIE_SCP_IO_OUT),       // 24
-               COLLIE_SCP_INIT_DATA_END
-       };
-       int i;
-       for (i = 0; scp_init[i] != COLLIE_SCP_INIT_DATA_END; i++) {
-               int adr = scp_init[i] >> 16;
-               COLLIE_SCP_REG(adr) = scp_init[i] & 0xFFFF;
-       }
-
-}
-
-static struct resource locomo_resources[] = {
-       [0] = {
-               .start          = 0x40000000,
-               .end            = 0x40001fff,
-               .flags          = IORESOURCE_MEM,
-       },
-       [1] = {
-               .start          = IRQ_GPIO25,
-               .end            = IRQ_GPIO25,
-               .flags          = IORESOURCE_IRQ,
-       },
-};
-
-static struct platform_device locomo_device = {
-       .name           = "locomo",
-       .id             = 0,
-       .num_resources  = ARRAY_SIZE(locomo_resources),
-       .resource       = locomo_resources,
-};
-
-static struct platform_device *devices[] __initdata = {
-       &locomo_device,
-};
-
-static void __init collie_init(void)
-{
-       int ret = 0;
-
-       /* cpu initialize */
-       GAFR = ( GPIO_SSP_TXD | \
-                GPIO_SSP_SCLK | GPIO_SSP_SFRM | GPIO_SSP_CLK | GPIO_TIC_ACK | \
-                GPIO_32_768kHz );
-
-       GPDR = ( GPIO_LDD8 | GPIO_LDD9 | GPIO_LDD10 | GPIO_LDD11 | GPIO_LDD12 | \
-                GPIO_LDD13 | GPIO_LDD14 | GPIO_LDD15 | GPIO_SSP_TXD | \
-                GPIO_SSP_SCLK | GPIO_SSP_SFRM | GPIO_SDLC_SCLK | \
-                GPIO_SDLC_AAF | GPIO_UART_SCLK1 | GPIO_32_768kHz );
-       GPLR = GPIO_GPIO18;
-
-       // PPC pin setting
-       PPDR = ( PPC_LDD0 | PPC_LDD1 | PPC_LDD2 | PPC_LDD3 | PPC_LDD4 | PPC_LDD5 | \
-                PPC_LDD6 | PPC_LDD7 | PPC_L_PCLK | PPC_L_LCLK | PPC_L_FCLK | PPC_L_BIAS | \
-                PPC_TXD1 | PPC_TXD2 | PPC_RXD2 | PPC_TXD3 | PPC_TXD4 | PPC_SCLK | PPC_SFRM );
-
-       PSDR = ( PPC_RXD1 | PPC_RXD2 | PPC_RXD3 | PPC_RXD4 );
-
-       GAFR |= GPIO_32_768kHz;
-       GPDR |= GPIO_32_768kHz;
-       TUCR  = TUCR_32_768kHz;
-
-       scoop_init();
-
-       ret = platform_add_devices(devices, ARRAY_SIZE(devices));
-       if (ret) {
-               printk(KERN_WARNING "collie: Unable to register LoCoMo device\n");
-       }
-}
-
-static struct map_desc collie_io_desc[] __initdata = {
-       /* virtual     physical    length      type */
-       {0xe8000000, 0x00000000, 0x02000000, MT_DEVICE},        /* 32M main flash (cs0) */
-       {0xea000000, 0x08000000, 0x02000000, MT_DEVICE},        /* 32M boot flash (cs1) */
-       {0xf0000000, 0x40000000, 0x01000000, MT_DEVICE},        /* 16M LOCOMO  & SCOOP (cs4) */
-};
-
-static void __init collie_map_io(void)
-{
-       sa1100_map_io();
-       iotable_init(collie_io_desc, ARRAY_SIZE(collie_io_desc));
-}
-
-MACHINE_START(COLLIE, "Sharp-Collie")
-       BOOT_MEM(0xc0000000, 0x80000000, 0xf8000000)
-       MAPIO(collie_map_io)
-       INITIRQ(sa1100_init_irq)
-       INIT_MACHINE(collie_init)
-MACHINE_END
diff --git a/arch/arm/mach-sa1100/time.c b/arch/arm/mach-sa1100/time.c
deleted file mode 100644 (file)
index 1c3d082..0000000
+++ /dev/null
@@ -1,119 +0,0 @@
-/*
- * linux/arch/arm/mach-sa1100/time.c
- *
- * 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.
- *
- */
-#include <linux/init.h>
-#include <linux/errno.h>
-#include <linux/interrupt.h>
-#include <linux/timex.h>
-#include <linux/signal.h>
-
-#include <asm/mach/time.h>
-#include <asm/hardware.h>
-
-#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 {
-               timer_tick(regs);
-               OSSR = OSSR_M0;  /* Clear match on timer 0 */
-               next_match = (OSMR0 += LATCH);
-       } while ((signed long)(next_match - OSCR) <= 0);
-
-       return IRQ_HANDLED;
-}
-
-static struct irqaction sa1100_timer_irq = {
-       .name           = "SA11xx Timer Tick",
-       .flags          = SA_INTERRUPT,
-       .handler        = sa1100_timer_interrupt
-};
-
-void __init sa1100_init_time(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);
-
-       OSMR0 = 0;              /* set initial match at 0 */
-       OSSR = 0xf;             /* clear status on all timers */
-       setup_irq(IRQ_OST0, &sa1100_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/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/ocelot_g_defconfig b/arch/mips/configs/ocelot_g_defconfig
deleted file mode 100644 (file)
index fa25841..0000000
+++ /dev/null
@@ -1,592 +0,0 @@
-#
-# Automatically generated make config: don't edit
-#
-CONFIG_MIPS=y
-CONFIG_MIPS64=y
-CONFIG_64BIT=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 is not set
-# CONFIG_IKCONFIG is not set
-CONFIG_EMBEDDED=y
-CONFIG_KALLSYMS=y
-# 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 is not set
-
-#
-# Machine selection
-#
-# CONFIG_MACH_JAZZ is not set
-# CONFIG_MACH_VR41XX 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=y
-# 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_IP27 is not set
-# CONFIG_SGI_IP32 is not set
-# CONFIG_SIBYTE_SB1xxx_SOC is not set
-# CONFIG_SNI_RM200_PCI is not set
-CONFIG_RWSEM_GENERIC_SPINLOCK=y
-CONFIG_HAVE_DEC_LOCK=y
-CONFIG_DMA_NONCOHERENT=y
-# CONFIG_CPU_LITTLE_ENDIAN is not set
-CONFIG_IRQ_CPU=y
-CONFIG_IRQ_CPU_RM7K=y
-CONFIG_PCI_MARVELL=y
-CONFIG_SWAP_IO_SPACE=y
-# CONFIG_SYSCLK_75 is not set
-# CONFIG_SYSCLK_83 is not set
-CONFIG_SYSCLK_100=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 is not set
-# 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=y
-# CONFIG_CPU_RM9000 is not set
-# CONFIG_CPU_SB1 is not set
-CONFIG_PAGE_SIZE_4KB=y
-# CONFIG_PAGE_SIZE_8KB is not set
-# CONFIG_PAGE_SIZE_16KB is not set
-# CONFIG_PAGE_SIZE_64KB is not set
-CONFIG_BOARD_SCACHE=y
-CONFIG_RM7000_CPU_SCACHE=y
-CONFIG_CPU_HAS_PREFETCH=y
-CONFIG_CPU_HAS_LLSC=y
-CONFIG_CPU_HAS_LLDSCD=y
-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_HW_HAS_PCI=y
-CONFIG_PCI=y
-CONFIG_PCI_LEGACY_PROC=y
-CONFIG_PCI_NAMES=y
-CONFIG_MMU=y
-
-#
-# Executable file formats
-#
-CONFIG_BINFMT_ELF=y
-# CONFIG_BINFMT_MISC is not set
-CONFIG_MIPS32_COMPAT=y
-CONFIG_COMPAT=y
-CONFIG_MIPS32_O32=y
-CONFIG_MIPS32_N32=y
-CONFIG_BINFMT_ELF32=y
-
-#
-# 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_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_SX8 is not set
-# CONFIG_BLK_DEV_RAM 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
-
-#
-# Networking support
-#
-CONFIG_NET=y
-
-#
-# Networking options
-#
-# CONFIG_PACKET is not set
-CONFIG_NETLINK_DEV=y
-CONFIG_UNIX=y
-CONFIG_NET_KEY=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=y
-# CONFIG_IP_PNP_BOOTP is not set
-# 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_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
-# 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
-# CONFIG_ETHERTAP is not set
-
-#
-# ARCnet devices
-#
-# CONFIG_ARCNET is not set
-
-#
-# Ethernet (10 or 100Mbit)
-#
-CONFIG_NET_ETHERNET=y
-CONFIG_MII=y
-CONFIG_GALILEO_64240_ETH=y
-# 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
-
-#
-# 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_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 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=y
-CONFIG_SERIAL_8250_CONSOLE=y
-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 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
-# 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 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=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_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_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 is not set
-
-#
-# Library routines
-#
-CONFIG_CRC16=y
-# CONFIG_CRC32 is not set
-# CONFIG_LIBCRC32C is not set
diff --git a/arch/mips/kernel/module.c b/arch/mips/kernel/module.c
deleted file mode 100644 (file)
index 5816870..0000000
+++ /dev/null
@@ -1,53 +0,0 @@
-#include <linux/module.h>
-#include <linux/spinlock.h>
-
-static LIST_HEAD(dbe_list);
-static spinlock_t dbe_lock = SPIN_LOCK_UNLOCKED;
-
-/* Given an address, look for it in the module exception tables. */
-const struct exception_table_entry *search_module_dbetables(unsigned long addr)
-{
-       unsigned long flags;
-       const struct exception_table_entry *e = NULL;
-       struct mod_arch_specific *dbe;
-
-       spin_lock_irqsave(&dbe_lock, flags);
-       list_for_each_entry(dbe, &dbe_list, dbe_list) {
-               e = search_extable(dbe->dbe_start, dbe->dbe_end - 1, addr);
-               if (e)
-                       break;
-       }
-       spin_unlock_irqrestore(&dbe_lock, flags);
-
-       /* Now, if we found one, we are running inside it now, hence
-           we cannot unload the module, hence no refcnt needed. */
-       return e;
-}
-
-/* Put in dbe list if neccessary. */
-int module_finalize(const Elf_Ehdr *hdr,
-                   const Elf_Shdr *sechdrs,
-                   struct module *me)
-{
-       const Elf_Shdr *s;
-       char *secstrings = (void *)hdr + sechdrs[hdr->e_shstrndx].sh_offset;
-
-       INIT_LIST_HEAD(&me->arch.dbe_list);
-       for (s = sechdrs; s < sechdrs + hdr->e_shnum; s++) {
-               if (strcmp("__dbe_table", secstrings + s->sh_name) != 0)
-                       continue;
-               me->arch.dbe_start = (void *)s->sh_addr;
-               me->arch.dbe_end = (void *)s->sh_addr + s->sh_size;
-               spin_lock_irq(&dbe_lock);
-               list_add(&me->arch.dbe_list, &dbe_list);
-               spin_unlock_irq(&dbe_lock);
-       }
-       return 0;
-}
-
-void module_arch_cleanup(struct module *mod)
-{
-       spin_lock_irq(&dbe_lock);
-       list_del(&mod->arch.dbe_list);
-       spin_unlock_irq(&dbe_lock);
-}
diff --git a/arch/mips/mm/tlb-r8k.c b/arch/mips/mm/tlb-r8k.c
deleted file mode 100644 (file)
index daac80e..0000000
+++ /dev/null
@@ -1,253 +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) 1996 David S. Miller (dm@engr.sgi.com)
- * Copyright (C) 1997, 1998, 1999, 2000 Ralf Baechle ralf@gnu.org
- * Carsten Langgaard, carstenl@mips.com
- * Copyright (C) 2002 MIPS Technologies, Inc.  All rights reserved.
- */
-#include <linux/config.h>
-#include <linux/init.h>
-#include <linux/sched.h>
-#include <linux/mm.h>
-
-#include <asm/cpu.h>
-#include <asm/bootinfo.h>
-#include <asm/mmu_context.h>
-#include <asm/pgtable.h>
-#include <asm/system.h>
-
-extern void except_vec0_generic(void);
-extern void except_vec1_r8k(void);
-
-#define TFP_TLB_SIZE           384
-#define TFP_TLB_SET_SHIFT      7
-
-/* CP0 hazard avoidance. */
-#define BARRIER __asm__ __volatile__(".set noreorder\n\t" \
-                                    "nop; nop; nop; nop; nop; nop;\n\t" \
-                                    ".set reorder\n\t")
-
-void local_flush_tlb_all(void)
-{
-       unsigned long flags;
-       unsigned long old_ctx;
-       int entry;
-
-       local_irq_save(flags);
-       /* Save old context and create impossible VPN2 value */
-       old_ctx = read_c0_entryhi();
-       write_c0_entrylo(0);
-
-       for (entry = 0; entry < TFP_TLB_SIZE; entry++) {
-               write_c0_tlbset(entry >> TFP_TLB_SET_SHIFT);
-               write_c0_vaddr(entry << PAGE_SHIFT);
-               write_c0_entryhi(CKSEG0 + (entry << (PAGE_SHIFT + 1)));
-               mtc0_tlbw_hazard();
-               tlb_write();
-       }
-       tlbw_use_hazard();
-       write_c0_entryhi(old_ctx);
-       local_irq_restore(flags);
-}
-
-void local_flush_tlb_mm(struct mm_struct *mm)
-{
-       int cpu = smp_processor_id();
-
-       if (cpu_context(cpu, mm) != 0)
-               drop_mmu_context(mm,cpu);
-}
-
-void local_flush_tlb_range(struct vm_area_struct *vma, unsigned long start,
-       unsigned long end)
-{
-       struct mm_struct *mm = vma->vm_mm;
-       int cpu = smp_processor_id();
-       unsigned long flags;
-       int oldpid, newpid, size;
-
-       if (!cpu_context(cpu, mm))
-               return;
-
-       size = (end - start + (PAGE_SIZE - 1)) >> PAGE_SHIFT;
-       size = (size + 1) >> 1;
-
-       local_irq_save(flags);
-
-       if (size > TFP_TLB_SIZE / 2) {
-               drop_mmu_context(mm, cpu);
-               goto out_restore;
-       }
-
-       oldpid = read_c0_entryhi();
-       newpid = cpu_asid(cpu, mm);
-
-       write_c0_entrylo(0);
-
-       start &= PAGE_MASK;
-       end += (PAGE_SIZE - 1);
-       end &= PAGE_MASK;
-       while (start < end) {
-               signed long idx;
-
-               write_c0_vaddr(start);
-               write_c0_entryhi(start);
-               start += PAGE_SIZE;
-               tlb_probe();
-               idx = read_c0_tlbset();
-               if (idx < 0)
-                       continue;
-
-               write_c0_entryhi(CKSEG0 + (idx << (PAGE_SHIFT + 1)));
-               tlb_write();
-       }
-       write_c0_entryhi(oldpid);
-
-out_restore:
-       local_irq_restore(flags);
-}
-
-/* Usable for KV1 addresses only! */
-void local_flush_tlb_kernel_range(unsigned long start, unsigned long end)
-{
-       unsigned long flags;
-       int size;
-
-       size = (end - start + (PAGE_SIZE - 1)) >> PAGE_SHIFT;
-       size = (size + 1) >> 1;
-
-       if (size > TFP_TLB_SIZE / 2) {
-               local_flush_tlb_all();
-               return;
-       }
-
-       local_irq_save(flags);
-
-       write_c0_entrylo(0);
-
-       start &= PAGE_MASK;
-       end += (PAGE_SIZE - 1);
-       end &= PAGE_MASK;
-       while (start < end) {
-               signed long idx;
-
-               write_c0_vaddr(start);
-               write_c0_entryhi(start);
-               start += PAGE_SIZE;
-               tlb_probe();
-               idx = read_c0_tlbset();
-               if (idx < 0)
-                       continue;
-
-               write_c0_entryhi(CKSEG0 + (idx << (PAGE_SHIFT + 1)));
-               tlb_write();
-       }
-
-       local_irq_restore(flags);
-}
-
-void local_flush_tlb_page(struct vm_area_struct *vma, unsigned long page)
-{
-       int cpu = smp_processor_id();
-       unsigned long flags;
-       int oldpid, newpid;
-       signed long idx;
-
-       if (!cpu_context(cpu, vma->vm_mm))
-               return;
-
-       newpid = cpu_asid(cpu, vma->vm_mm);
-       page &= PAGE_MASK;
-       local_irq_save(flags);
-       oldpid = read_c0_entryhi();
-       write_c0_vaddr(page);
-       write_c0_entryhi(newpid);
-       tlb_probe();
-       idx = read_c0_tlbset();
-       if (idx < 0)
-               goto finish;
-
-       write_c0_entrylo(0);
-       write_c0_entryhi(CKSEG0 + (idx << (PAGE_SHIFT + 1)));
-       tlb_write();
-
-finish:
-       write_c0_entryhi(oldpid);
-       local_irq_restore(flags);
-}
-
-/*
- * We will need multiple versions of update_mmu_cache(), one that just
- * updates the TLB with the new pte(s), and another which also checks
- * for the R4k "end of page" hardware bug and does the needy.
- */
-void __update_tlb(struct vm_area_struct * vma, unsigned long address, pte_t pte)
-{
-       unsigned long flags;
-       pgd_t *pgdp;
-       pmd_t *pmdp;
-       pte_t *ptep;
-       int pid;
-
-       /*
-        * Handle debugger faulting in for debugee.
-        */
-       if (current->active_mm != vma->vm_mm)
-               return;
-
-       pid = read_c0_entryhi() & ASID_MASK;
-
-       local_irq_save(flags);
-       address &= PAGE_MASK;
-       write_c0_vaddr(address);
-       write_c0_entryhi(pid);
-       pgdp = pgd_offset(vma->vm_mm, address);
-       pmdp = pmd_offset(pgdp, address);
-       ptep = pte_offset_map(pmdp, address);
-       tlb_probe();
-
-       write_c0_entrylo(pte_val(*ptep++) >> 6);
-       tlb_write();
-
-       write_c0_entryhi(pid);
-       local_irq_restore(flags);
-}
-
-static void __init probe_tlb(unsigned long config)
-{
-       struct cpuinfo_mips *c = &current_cpu_data;
-
-       c->tlbsize = 3 * 128;           /* 3 sets each 128 entries */
-}
-
-void __init tlb_init(void)
-{
-       unsigned int config = read_c0_config();
-       unsigned long status;
-
-       probe_tlb(config);
-
-       status = read_c0_status();
-       status &= ~(ST0_UPS | ST0_KPS);
-#ifdef CONFIG_PAGE_SIZE_4KB
-       status |= (TFP_PAGESIZE_4K << 32) | (TFP_PAGESIZE_4K << 36);
-#elif defined(CONFIG_PAGE_SIZE_8KB)
-       status |= (TFP_PAGESIZE_8K << 32) | (TFP_PAGESIZE_8K << 36);
-#elif defined(CONFIG_PAGE_SIZE_16KB)
-       status |= (TFP_PAGESIZE_16K << 32) | (TFP_PAGESIZE_16K << 36);
-#elif defined(CONFIG_PAGE_SIZE_64KB)
-       status |= (TFP_PAGESIZE_64K << 32) | (TFP_PAGESIZE_64K << 36);
-#endif
-       write_c0_status(status);
-
-       write_c0_wired(0);
-
-       local_flush_tlb_all();
-
-       memcpy((void *)(CKSEG0 + 0x00), &except_vec0_generic, 0x80);
-       memcpy((void *)(CKSEG0 + 0x80), except_vec1_r8k, 0x80);
-       flush_icache_range(CKSEG0 + 0x80, CKSEG0 + 0x100);
-}
diff --git a/arch/mips/mm/tlb64-glue-r4k.S b/arch/mips/mm/tlb64-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/tlb64-glue-sb1.S b/arch/mips/mm/tlb64-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/tlbex32-r3k.S b/arch/mips/mm/tlbex32-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/mm/tlbex32-r4k.S b/arch/mips/mm/tlbex32-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/tlbex64-r4k.S b/arch/mips/mm/tlbex64-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/pci/fixup-jaguar.c b/arch/mips/pci/fixup-jaguar.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-mpc30x.c b/arch/mips/pci/fixup-mpc30x.c
deleted file mode 100644 (file)
index 1320c42..0000000
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- *  fixup-mpc30x.c, The Victor MP-C303/304 specific PCI fixups.
- *
- *  Copyright (C) 2002,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
- */
-#include <linux/init.h>
-#include <linux/pci.h>
-
-#include <asm/vr41xx/mpc30x.h>
-#include <asm/vr41xx/vrc4173.h>
-
-static const int internal_func_irqs[] __initdata = {
-       VRC4173_CASCADE_IRQ,
-       VRC4173_AC97_IRQ,
-       VRC4173_USB_IRQ,
-};
-
-static char irq_tab_mpc30x[] __initdata = {
- [12] = VRC4173_PCMCIA1_IRQ,
- [13] = VRC4173_PCMCIA2_IRQ,
- [29] = MQ200_IRQ,
-};
-
-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];
-}
-
-struct pci_fixup pcibios_fixups[] __initdata = {
-       {       .pass = 0,      },
-};
diff --git a/arch/mips/pci/fixup-ocelot-c.c b/arch/mips/pci/fixup-ocelot-c.c
deleted file mode 100644 (file)
index 0cc86ec..0000000
+++ /dev/null
@@ -1,39 +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>
-
-int __init pcibios_map_irq(struct pci_dev *dev, u8 slot, u8 pin)
-{
-       int bus = dev->bus->number;
-
-       if (bus == 0 && slot == 1)
-               return 2;       /* PCI-X A */
-       if (bus == 1 && slot == 1)
-               return 12;      /* PCI-X B */
-       if (bus == 1 && slot == 2)
-               return 4;       /* PCI B */
-
-return 0;
-       panic("Whooops in pcibios_map_irq");
-}
-
-struct pci_fixup pcibios_fixups[] = {
-       {0}
-};
diff --git a/arch/mips/pci/fixup-ocelot-g.c b/arch/mips/pci/fixup-ocelot-g.c
deleted file mode 100644 (file)
index 9a2cc85..0000000
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * 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.
- *
- * Copyright (C) 2004 Ralf Baechle (ralf@linux-mips.org)
- */
-#include <linux/types.h>
-#include <linux/pci.h>
-#include <linux/kernel.h>
-#include <linux/init.h>
-
-int __init pcibios_map_irq(struct pci_dev *dev, u8 slot, u8 pin)
-{
-       int bus = dev->bus->number;
-
-       if (bus == 0 && slot == 1)      /* Intel 82543 Gigabit MAC */
-               return 2;               /* irq_nr is 2 for INT0 */
-
-       if (bus == 0 && slot == 2)      /* Intel 82543 Gigabit MAC */
-               return 3;               /* irq_nr is 3 for INT1 */
-
-       if (bus == 1 && slot == 3)      /* Intel 21555 bridge */
-               return 5;               /* irq_nr is 8 for INT6 */
-
-       if (bus == 1 && slot == 4)      /* PMC Slot */
-               return 9;               /* irq_nr is 9 for INT7 */
-
-       return -1;
-}
-
-struct pci_fixup pcibios_fixups[] = {
-       {0}
-};
diff --git a/arch/mips/pci/fixup-tb0219.c b/arch/mips/pci/fixup-tb0219.c
deleted file mode 100644 (file)
index ca4d99f..0000000
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- *  fixup-tb0219.c, The TANBAC TB0219 specific PCI fixups.
- *
- *  Copyright (C) 2003  Megasolution Inc. <matsu@megasolution.jp>
- *  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
- */
-#include <linux/init.h>
-#include <linux/pci.h>
-
-#include <asm/vr41xx/tb0219.h>
-
-int __init pcibios_map_irq(struct pci_dev *dev, u8 slot, u8 pin)
-{
-       int irq = -1;
-
-       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);
-               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);
-               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);
-               irq = TB0219_PCI_SLOT3_IRQ;
-               break;
-       default:
-               break;
-       }
-
-       return irq;
-}
-
-struct pci_fixup pcibios_fixups[] __initdata = {
-       {       .pass = 0,      },
-};
diff --git a/arch/mips/pci/ops-marvell.c b/arch/mips/pci/ops-marvell.c
deleted file mode 100644 (file)
index 1ac5c59..0000000
+++ /dev/null
@@ -1,93 +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) 2003, 2004 Ralf Baechle (ralf@linux-mips.org)
- */
-#include <linux/kernel.h>
-#include <linux/types.h>
-#include <linux/pci.h>
-
-#include <asm/marvell.h>
-
-static int mv_read_config(struct pci_bus *bus, unsigned int devfn,
-       int where, int size, u32 * val)
-{
-       struct mv_pci_controller *mvbc = bus->sysdata;
-       unsigned long address_reg, data_reg;
-       u32 address;
-
-       address_reg = mvbc->config_addr;
-       data_reg = mvbc->config_vreg;
-
-       /* Accessing device 31 crashes those Marvells.  Since years.
-          Will they ever make sane controllers ... */
-       if (PCI_SLOT(devfn) == 31)
-               return PCIBIOS_DEVICE_NOT_FOUND;
-
-       address = (bus->number << 16) | (devfn << 8) |
-                 (where & 0xfc) | 0x80000000;
-
-       /* start the configuration cycle */
-       MV_WRITE(address_reg, address);
-
-       switch (size) {
-       case 1:
-               *val = MV_READ_8(data_reg + (where & 0x3));
-               break;
-
-       case 2:
-               *val = MV_READ_16(data_reg + (where & 0x3));
-               break;
-
-       case 4:
-               *val = MV_READ(data_reg);
-               break;
-       }
-
-       return PCIBIOS_SUCCESSFUL;
-}
-
-static int mv_write_config(struct pci_bus *bus, unsigned int devfn,
-       int where, int size, u32 val)
-{
-       struct mv_pci_controller *mvbc = bus->sysdata;
-       unsigned long address_reg, data_reg;
-       u32 address;
-
-       address_reg = mvbc->config_addr;
-       data_reg = mvbc->config_vreg;
-
-       /* Accessing device 31 crashes those Marvells.  Since years.
-          Will they ever make sane controllers ... */
-       if (PCI_SLOT(devfn) == 31)
-               return PCIBIOS_DEVICE_NOT_FOUND;
-
-       address = (bus->number << 16) | (devfn << 8) |
-                 (where & 0xfc) | 0x80000000;
-
-       /* start the configuration cycle */
-       MV_WRITE(address_reg, address);
-
-       switch (size) {
-       case 1:
-               MV_WRITE_8(data_reg + (where & 0x3), val);
-               break;
-
-       case 2:
-               MV_WRITE_16(data_reg + (where & 0x3), val);
-               break;
-
-       case 4:
-               MV_WRITE(data_reg, val);
-               break;
-       }
-
-       return PCIBIOS_SUCCESSFUL;
-}
-
-struct pci_ops mv_pci_ops = {
-       .read   = mv_read_config,
-       .write  = mv_write_config
-};
diff --git a/arch/mips/pci/ops-titan-ht.c b/arch/mips/pci/ops-titan-ht.c
deleted file mode 100644 (file)
index 46c636c..0000000
+++ /dev/null
@@ -1,125 +0,0 @@
-/*
- * Copyright 2003 PMC-Sierra
- * Author: Manish Lachwani (lachwani@pmc-sierra.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.
- */
-
-#include <linux/types.h>
-#include <linux/pci.h>
-#include <linux/kernel.h>
-#include <linux/slab.h>
-#include <linux/delay.h>
-#include <asm/io.h>
-
-#include <asm/titan_dep.h>
-
-static int titan_ht_config_read_dword(struct pci_bus *bus, unsigned int devfn,
-       int offset, u32 * val)
-{
-       volatile uint32_t address;
-       int busno;
-
-       busno = bus->number;
-
-       address = (busno << 16) | (devfn << 8) | (offset & 0xfc) | 0x80000000;
-       if (busno != 0)
-               address |= 1;
-
-       /*
-        * RM9000 HT Errata: Issue back to back HT config
-        * transcations. Issue a BIU sync before and
-        * after the HT cycle
-        */
-
-       *(volatile int32_t *) 0xfb0000f0 |= 0x2;
-
-       udelay(30);
-
-       *(volatile int32_t *) 0xfb0006f8 = address;
-       *(val) = *(volatile int32_t *) 0xfb0006fc;
-
-       udelay(30);
-
-       * (volatile int32_t *) 0xfb0000f0 |= 0x2;
-
-       return PCIBIOS_SUCCESSFUL;
-}
-
-static int titan_ht_config_read(struct pci_bus *bus, unsigned int devfn,
-       int offset, int size, u32 * val)
-{
-       uint32_t dword;
-
-       titan_ht_config_read_dword(bus, devfn, offset, &dword);
-
-       dword >>= ((offset & 3) << 3);
-       dword &= (0xffffffffU >> ((4 - size) << 8));
-
-       return PCIBIOS_SUCCESSFUL;
-}
-
-static inline int titan_ht_config_write_dword(struct pci_bus *bus,
-       unsigned int devfn, int offset, u32 val)
-{
-       volatile uint32_t address;
-       int busno;
-
-       busno = bus->number;
-
-       address = (busno << 16) | (devfn << 8) | (offset & 0xfc) | 0x80000000;
-       if (busno != 0)
-               address |= 1;
-
-       *(volatile int32_t *) 0xfb0000f0 |= 0x2;
-
-       udelay(30);
-
-       *(volatile int32_t *) 0xfb0006f8 = address;
-       *(volatile int32_t *) 0xfb0006fc = val;
-
-       udelay(30);
-
-       *(volatile int32_t *) 0xfb0000f0 |= 0x2;
-
-       return PCIBIOS_SUCCESSFUL;
-}
-
-static int titan_ht_config_write(struct pci_bus *bus, unsigned int devfn,
-       int offset, int size, u32 val)
-{
-       uint32_t val1, val2, mask;
-
-       titan_ht_config_read_dword(bus, devfn, offset, &val2);
-
-       val1 = val << ((offset & 3) << 3);
-       mask = ~(0xffffffffU >> ((4 - size) << 8));
-       val2 &= ~(mask << ((offset & 3) << 8));
-
-       titan_ht_config_write_dword(bus, devfn, offset, val1 | val2);
-
-       return PCIBIOS_SUCCESSFUL;
-}
-
-struct pci_ops titan_ht_pci_ops = {
-       .read   = titan_ht_config_read,
-       .write  = titan_ht_config_write,
-};
diff --git a/arch/mips/pci/ops-vr41xx.c b/arch/mips/pci/ops-vr41xx.c
deleted file mode 100644 (file)
index 4465460..0000000
+++ /dev/null
@@ -1,126 +0,0 @@
-/*
- *  ops-vr41xx.c, PCI configuration routines for the PCIU of NEC VR4100 series.
- *
- *  Copyright (C) 2001-2003 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 VR4122 and VR4131 are supported.
- */
-#include <linux/pci.h>
-#include <linux/types.h>
-
-#include <asm/io.h>
-
-#define PCICONFDREG    KSEG1ADDR(0x0f000c14)
-#define PCICONFAREG    KSEG1ADDR(0x0f000c18)
-
-static inline int set_pci_configuration_address(unsigned char number,
-                                                unsigned int devfn, int where)
-{
-       if (number == 0) {
-               /*
-                * Type 0 configuration
-                */
-               if (PCI_SLOT(devfn) < 11 || where > 0xff)
-                       return -EINVAL;
-
-               writel((1U << PCI_SLOT(devfn)) | (PCI_FUNC(devfn) << 8) |
-                      (where & 0xfc), PCICONFAREG);
-       } else {
-               /*
-                * Type 1 configuration
-                */
-               if (where > 0xff)
-                       return -EINVAL;
-
-               writel(((uint32_t)number << 16) | ((devfn & 0xff) << 8) |
-                      (where & 0xfc) | 1U, PCICONFAREG);
-       }
-
-       return 0;
-}
-
-static int pci_config_read(struct pci_bus *bus, unsigned int devfn, int where,
-                           int size, uint32_t *val)
-{
-       uint32_t data;
-
-       *val = 0xffffffffU;
-       if (set_pci_configuration_address(bus->number, devfn, where) < 0)
-               return PCIBIOS_DEVICE_NOT_FOUND;
-
-       data = readl(PCICONFDREG);
-
-       switch (size) {
-       case 1:
-               *val = (data >> ((where & 3) << 3)) & 0xffU;
-               break;
-       case 2:
-               *val = (data >> ((where & 2) << 3)) & 0xffffU;
-               break;
-       case 4:
-               *val = data;
-               break;
-       default:
-               return PCIBIOS_FUNC_NOT_SUPPORTED;
-       }
-
-       return PCIBIOS_SUCCESSFUL;
-}
-
-static int pci_config_write(struct pci_bus *bus, unsigned int devfn, int where,
-                            int size, uint32_t val)
-{
-       uint32_t data;
-       int shift;
-
-       if (set_pci_configuration_address(bus->number, devfn, where) < 0)
-               return PCIBIOS_DEVICE_NOT_FOUND;
-
-       data = readl(PCICONFDREG);
-
-       switch (size) {
-       case 1:
-               shift = (where & 3) << 3;
-               data &= ~(0xffU << shift);
-               data |= ((val & 0xffU) << shift);
-               break;
-       case 2:
-               shift = (where & 2) << 3;
-               data &= ~(0xffffU << shift);
-               data |= ((val & 0xffffU) << shift);
-               break;
-       case 4:
-               data = val;
-               break;
-       default:
-               return PCIBIOS_FUNC_NOT_SUPPORTED;
-       }
-
-       writel(data, PCICONFDREG);
-
-       return PCIBIOS_SUCCESSFUL;
-}
-
-struct pci_ops vr41xx_pci_ops = {
-       .read   = pci_config_read,
-       .write  = pci_config_write,
-};
diff --git a/arch/mips/pci/pci-yosemite.c b/arch/mips/pci/pci-yosemite.c
deleted file mode 100644 (file)
index c1151f4..0000000
+++ /dev/null
@@ -1,37 +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) 2004 by Ralf Baechle
- *
- */
-#include <linux/init.h>
-#include <linux/kernel.h>
-#include <linux/types.h>
-#include <linux/pci.h>
-#include <asm/gt64240.h>
-#include <asm/pci_channel.h>
-
-extern struct pci_ops titan_pci_ops;
-
-static struct resource py_mem_resource = {
-       "Titan PCI MEM", 0xe0000000UL, 0xe3ffffffUL, IORESOURCE_MEM
-};
-
-static struct resource py_io_resource = {
-       "Titan IO MEM", 0x00000000UL, 0x00ffffffUL, IORESOURCE_IO,
-};
-
-static struct pci_controller py_controller = {
-       .pci_ops        = &titan_pci_ops,
-       .mem_resource   = &py_mem_resource,
-       .mem_offset     = 0x10000000UL,
-       .io_resource    = &py_io_resource,
-       .io_offset      = 0x00000000UL
-};
-
-static int __init pmc_yosemite_setup(void)
-{
-       register_pci_controller(&py_controller);
-}
diff --git a/arch/mips/pmc-sierra/yosemite/dbg_io.c b/arch/mips/pmc-sierra/yosemite/dbg_io.c
deleted file mode 100644 (file)
index 1ff8d95..0000000
+++ /dev/null
@@ -1,184 +0,0 @@
-/*
- * Copyright 2003 PMC-Sierra
- * Author: Manish Lachwani (lachwani@pmc-sierra.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.
- */
-
-/*
- * Support for KGDB for the Yosemite board. We make use of single serial
- * port to be used for KGDB as well as console. The second serial port
- * seems to be having a problem. Single IRQ is allocated for both the
- * ports. Hence, the interrupt routing code needs to figure out whether
- * the interrupt came from channel A or B.
- */
-
-#include <linux/config.h>
-
-#if defined(CONFIG_KGDB)
-#include <asm/serial.h>
-
-/*
- * Baud rate, Parity, Data and Stop bit settings for the
- * serial port on the Yosemite. Note that the Early printk
- * patch has been added. So, we should be all set to go
- */
-#define        YOSEMITE_BAUD_2400      2400
-#define        YOSEMITE_BAUD_4800      4800
-#define        YOSEMITE_BAUD_9600      9600
-#define        YOSEMITE_BAUD_19200     19200
-#define        YOSEMITE_BAUD_38400     38400
-#define        YOSEMITE_BAUD_57600     57600
-#define        YOSEMITE_BAUD_115200    115200
-
-#define        YOSEMITE_PARITY_NONE    0
-#define        YOSEMITE_PARITY_ODD     0x08
-#define        YOSEMITE_PARITY_EVEN    0x18
-#define        YOSEMITE_PARITY_MARK    0x28
-#define        YOSEMITE_PARITY_SPACE   0x38
-
-#define        YOSEMITE_DATA_5BIT      0x0
-#define        YOSEMITE_DATA_6BIT      0x1
-#define        YOSEMITE_DATA_7BIT      0x2
-#define        YOSEMITE_DATA_8BIT      0x3
-
-#define        YOSEMITE_STOP_1BIT      0x0
-#define        YOSEMITE_STOP_2BIT      0x4
-
-/* This is crucial */
-#define        SERIAL_REG_OFS          0x1
-
-#define        SERIAL_RCV_BUFFER       0x0
-#define        SERIAL_TRANS_HOLD       0x0
-#define        SERIAL_SEND_BUFFER      0x0
-#define        SERIAL_INTR_ENABLE      (1 * SERIAL_REG_OFS)
-#define        SERIAL_INTR_ID          (2 * SERIAL_REG_OFS)
-#define        SERIAL_DATA_FORMAT      (3 * SERIAL_REG_OFS)
-#define        SERIAL_LINE_CONTROL     (3 * SERIAL_REG_OFS)
-#define        SERIAL_MODEM_CONTROL    (4 * SERIAL_REG_OFS)
-#define        SERIAL_RS232_OUTPUT     (4 * SERIAL_REG_OFS)
-#define        SERIAL_LINE_STATUS      (5 * SERIAL_REG_OFS)
-#define        SERIAL_MODEM_STATUS     (6 * SERIAL_REG_OFS)
-#define        SERIAL_RS232_INPUT      (6 * SERIAL_REG_OFS)
-#define        SERIAL_SCRATCH_PAD      (7 * SERIAL_REG_OFS)
-
-#define        SERIAL_DIVISOR_LSB      (0 * SERIAL_REG_OFS)
-#define        SERIAL_DIVISOR_MSB      (1 * SERIAL_REG_OFS)
-
-/*
- * Functions to READ and WRITE to serial port 0
- */
-#define        SERIAL_READ(ofs)                (*((volatile unsigned char*)    \
-                                       (TITAN_SERIAL_BASE + ofs)))
-
-#define        SERIAL_WRITE(ofs, val)          ((*((volatile unsigned char*)   \
-                                       (TITAN_SERIAL_BASE + ofs))) = val)
-
-/*
- * Functions to READ and WRITE to serial port 1
- */
-#define        SERIAL_READ_1(ofs)              (*((volatile unsigned char*)    \
-                                       (TITAN_SERIAL_BASE_1 + ofs)
-
-#define        SERIAL_WRITE_1(ofs, val)        ((*((volatile unsigned char*)   \
-                                       (TITAN_SERIAL_BASE_1 + ofs))) = val)
-
-/*
- * Second serial port initialization
- */
-void init_second_port(void)
-{
-       /* Disable Interrupts */
-       SERIAL_WRITE_1(SERIAL_LINE_CONTROL, 0x0);
-       SERIAL_WRITE_1(SERIAL_INTR_ENABLE, 0x0);
-
-       {
-               unsigned int divisor;
-
-               SERIAL_WRITE_1(SERIAL_LINE_CONTROL, 0x80);
-               divisor = TITAN_SERIAL_BASE_BAUD / YOSEMITE_BAUD_115200;
-               SERIAL_WRITE_1(SERIAL_DIVISOR_LSB, divisor & 0xff);
-
-               SERIAL_WRITE_1(SERIAL_DIVISOR_MSB,
-                              (divisor & 0xff00) >> 8);
-               SERIAL_WRITE_1(SERIAL_LINE_CONTROL, 0x0);
-       }
-
-       SERIAL_WRITE_1(SERIAL_DATA_FORMAT, YOSEMITE_DATA_8BIT |
-                      YOSEMITE_PARITY_NONE | YOSEMITE_STOP_1BIT);
-
-       /* Enable Interrupts */
-       SERIAL_WRITE_1(SERIAL_INTR_ENABLE, 0xf);
-}
-
-/* Initialize the serial port for KGDB debugging */
-void debugInit(unsigned int baud, unsigned char data, unsigned char parity,
-              unsigned char stop)
-{
-       /* Disable Interrupts */
-       SERIAL_WRITE(SERIAL_LINE_CONTROL, 0x0);
-       SERIAL_WRITE(SERIAL_INTR_ENABLE, 0x0);
-
-       {
-               unsigned int divisor;
-
-               SERIAL_WRITE(SERIAL_LINE_CONTROL, 0x80);
-
-               divisor = TITAN_SERIAL_BASE_BAUD / baud;
-               SERIAL_WRITE(SERIAL_DIVISOR_LSB, divisor & 0xff);
-
-               SERIAL_WRITE(SERIAL_DIVISOR_MSB, (divisor & 0xff00) >> 8);
-               SERIAL_WRITE(SERIAL_LINE_CONTROL, 0x0);
-       }
-
-       SERIAL_WRITE(SERIAL_DATA_FORMAT, data | parity | stop);
-}
-
-static int remoteDebugInitialized = 0;
-
-unsigned char getDebugChar(void)
-{
-       if (!remoteDebugInitialized) {
-               remoteDebugInitialized = 1;
-               debugInit(YOSEMITE_BAUD_115200,
-                         YOSEMITE_DATA_8BIT,
-                         YOSEMITE_PARITY_NONE, YOSEMITE_STOP_1BIT);
-       }
-
-       while ((SERIAL_READ(SERIAL_LINE_STATUS) & 0x1) == 0);
-       return SERIAL_READ(SERIAL_RCV_BUFFER);
-}
-
-int putDebugChar(unsigned char byte)
-{
-       if (!remoteDebugInitialized) {
-               remoteDebugInitialized = 1;
-               debugInit(YOSEMITE_BAUD_115200,
-                         YOSEMITE_DATA_8BIT,
-                         YOSEMITE_PARITY_NONE, YOSEMITE_STOP_1BIT);
-       }
-
-       while ((SERIAL_READ(SERIAL_LINE_STATUS) & 0x20) == 0);
-       SERIAL_WRITE(SERIAL_SEND_BUFFER, byte);
-
-       return 1;
-}
-#endif
diff --git a/arch/mips/pmc-sierra/yosemite/i2c-yosemite.c b/arch/mips/pmc-sierra/yosemite/i2c-yosemite.c
deleted file mode 100644 (file)
index 416da22..0000000
+++ /dev/null
@@ -1,188 +0,0 @@
-/*
- *  Copyright (C) 2003 PMC-Sierra Inc.
- *  Author: Manish Lachwani (lachwani@pmc-sierra.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.
- */
-
-/*
- * Detailed Description:
- *
- * This block implements the I2C interface to the slave devices like the
- * Atmel 24C32 EEPROM and the MAX 1619 Sensors device. The I2C Master interface
- * can be controlled by the SCMB block. And the SCMB block kicks in only when
- * using the Ethernet Mode of operation and __not__ the SysAD mode
- *
- * The SCMB controls the two modes: MDIO and the I2C. The MDIO mode is used to
- * communicate with the Quad-PHY from Marvel. The I2C is used to communicate
- * with the I2C slave devices.  It seems that the driver does not explicitly
- * deal with the control of SDA and SCL serial lines. So, the driver will set
- * the slave address, drive the command and then the data.  The SCMB will then
- * control the two serial lines as required.
- *
- * It seems the documents are very unclear abt this. Hence, I took some time
- * out to write the desciption to have an idea of how the I2C can actually
- * work. Currently, this Linux driver wont be integrated into the generic Linux
- * I2C framework. And finally, the I2C interface is also known as the 2BI
- * interface. 2BI means 2-bit interface referring to SDA and SCL serial lines
- * respectively.
- *
- * - Manish Lachwani (12/09/2003)
- */
-
-#include "i2c-yosemite.h"
-
-/*
- * Poll the I2C interface for the BUSY bit.
- */
-static int titan_i2c_poll(void)
-{
-       int i = 0;
-       unsigned long val = 0;
-
-       for (i = 0; i < TITAN_I2C_MAX_POLL; i++) {
-               val = TITAN_I2C_READ(TITAN_I2C_COMMAND);
-
-               if (!(val & 0x8000))
-                       return 0;
-       }
-
-       return TITAN_I2C_ERR_TIMEOUT;
-}
-
-/*
- * Execute the I2C command
- */
-int titan_i2c_xfer(unsigned int slave_addr, titan_i2c_command * cmd,
-                  int size, unsigned int *addr)
-{
-       int loop = 0, bytes, i;
-       unsigned int *write_data, data, *read_data;
-       unsigned long reg_val, val;
-
-       write_data = cmd->data;
-       read_data = addr;
-
-       TITAN_I2C_WRITE(TITAN_I2C_SLAVE_ADDRESS, slave_addr);
-
-       if (cmd->type == TITAN_I2C_CMD_WRITE)
-               loop = cmd->write_size;
-       else
-               loop = size;
-
-       while (loop > 0) {
-               if ((cmd->type == TITAN_I2C_CMD_WRITE) ||
-                   (cmd->type == TITAN_I2C_CMD_READ_WRITE)) {
-
-                       reg_val = TITAN_I2C_DATA;
-                       for (i = 0; i < TITAN_I2C_MAX_WORDS_PER_RW;
-                            ++i, write_data += 2, reg_val += 4) {
-                               if (bytes < cmd->write_size) {
-                                       data = write_data[0];
-                                       ++data;
-                               }
-
-                               if (bytes < cmd->write_size) {
-                                       data = write_data[1];
-                                       ++data;
-                               }
-
-                               TITAN_I2C_WRITE(reg_val, data);
-                       }
-               }
-
-               TITAN_I2C_WRITE(TITAN_I2C_COMMAND,
-                               (unsigned int) (cmd->type << 13));
-               if (titan_i2c_poll() != TITAN_I2C_ERR_OK)
-                       return TITAN_I2C_ERR_TIMEOUT;
-
-               if ((cmd->type == TITAN_I2C_CMD_READ) ||
-                   (cmd->type == TITAN_I2C_CMD_READ_WRITE)) {
-
-                       reg_val = TITAN_I2C_DATA;
-                       for (i = 0; i < TITAN_I2C_MAX_WORDS_PER_RW;
-                            ++i, read_data += 2, reg_val += 4) {
-                               data = TITAN_I2C_READ(reg_val);
-
-                               if (bytes < size) {
-                                       read_data[0] = data & 0xff;
-                                       ++bytes;
-                               }
-
-                               if (bytes < size) {
-                                       read_data[1] =
-                                           ((data >> 8) & 0xff);
-                                       ++bytes;
-                               }
-                       }
-               }
-
-               loop -= (TITAN_I2C_MAX_WORDS_PER_RW * 2);
-       }
-
-       /*
-        * Read the Interrupt status and then return the appropriate error code
-        */
-
-       val = TITAN_I2C_READ(TITAN_I2C_INTERRUPTS);
-       if (val & 0x0020)
-               return TITAN_I2C_ERR_ARB_LOST;
-
-       if (val & 0x0040)
-               return TITAN_I2C_ERR_NO_RESP;
-
-       if (val & 0x0080)
-               return TITAN_I2C_ERR_DATA_COLLISION;
-
-       return TITAN_I2C_ERR_OK;
-}
-
-/*
- * Init the I2C subsystem of the PMC-Sierra Yosemite board
- */
-int titan_i2c_init(titan_i2c_config * config)
-{
-       unsigned int val;
-
-       /*
-        * Reset the SCMB and program into the I2C mode
-        */
-       TITAN_I2C_WRITE(TITAN_I2C_SCMB_CONTROL, 0xA000);
-       TITAN_I2C_WRITE(TITAN_I2C_SCMB_CONTROL, 0x2000);
-
-       /*
-        * Configure the filtera and clka values
-        */
-       val = TITAN_I2C_READ(TITAN_I2C_SCMB_CLOCK_A);
-       val |= ((val & ~(0xF000)) | ((config->filtera << 12) & 0xF000));
-       val |= ((val & ~(0x03FF)) | (config->clka & 0x03FF));
-       TITAN_I2C_WRITE(TITAN_I2C_SCMB_CLOCK_A, val);
-
-       /*
-        * Configure the filterb and clkb values
-        */
-       val = TITAN_I2C_READ(TITAN_I2C_SCMB_CLOCK_B);
-       val |= ((val & ~(0xF000)) | ((config->filterb << 12) & 0xF000));
-       val |= ((val & ~(0x03FF)) | (config->clkb & 0x03FF));
-       TITAN_I2C_WRITE(TITAN_I2C_SCMB_CLOCK_B, val);
-
-       return TITAN_I2C_ERR_OK;
-}
diff --git a/arch/mips/pmc-sierra/yosemite/py-console.c b/arch/mips/pmc-sierra/yosemite/py-console.c
deleted file mode 100644 (file)
index 22c336f..0000000
+++ /dev/null
@@ -1,130 +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) 2001, 2002, 2004 Ralf Baechle
- */
-#include <linux/init.h>
-#include <linux/console.h>
-#include <linux/kdev_t.h>
-#include <linux/major.h>
-#include <linux/termios.h>
-#include <linux/sched.h>
-#include <linux/tty.h>
-
-#include <linux/serial.h>
-#include <linux/serial_core.h>
-#include <asm/serial.h>
-#include <asm/io.h>
-
-/* SUPERIO uart register map */
-struct yo_uartregs {
-       union {
-               volatile u8     rbr;    /* read only, DLAB == 0 */
-               volatile u8     thr;    /* write only, DLAB == 0 */
-               volatile u8     dll;    /* DLAB == 1 */
-       } u1;
-       union {
-               volatile u8     ier;    /* DLAB == 0 */
-               volatile u8     dlm;    /* DLAB == 1 */
-       } u2;
-       union {
-               volatile u8     iir;    /* read only */
-               volatile u8     fcr;    /* write only */
-       } u3;
-       volatile u8     iu_lcr;
-       volatile u8     iu_mcr;
-       volatile u8     iu_lsr;
-       volatile u8     iu_msr;
-       volatile u8     iu_scr;
-} yo_uregs_t;
-
-#define iu_rbr u1.rbr
-#define iu_thr u1.thr
-#define iu_dll u1.dll
-#define iu_ier u2.ier
-#define iu_dlm u2.dlm
-#define iu_iir u3.iir
-#define iu_fcr u3.fcr
-
-extern unsigned long uart_base;
-
-#define IO_BASE_64     0x9000000000000000ULL
-
-static unsigned char readb_outer_space(unsigned long phys)
-{
-       unsigned long long vaddr = IO_BASE_64 | phys;
-       unsigned char res;
-       unsigned int sr;
-
-       sr = read_c0_status();
-       write_c0_status((sr | ST0_KX) & ~ ST0_IE);
-       __asm__("sll    $0, $0, 2\n");
-       __asm__("sll    $0, $0, 2\n");
-       __asm__("sll    $0, $0, 2\n");
-       __asm__("sll    $0, $0, 2\n");
-
-       __asm__ __volatile__ (
-       "       .set    mips3           \n"
-       "       ld      %0, (%0)        \n"
-       "       lbu     %0, (%0)        \n"
-       "       .set    mips0           \n"
-       : "=r" (res)
-       : "0" (&vaddr));
-
-       write_c0_status(sr);
-       __asm__("sll    $0, $0, 2\n");
-       __asm__("sll    $0, $0, 2\n");
-       __asm__("sll    $0, $0, 2\n");
-       __asm__("sll    $0, $0, 2\n");
-
-       return res;
-}
-
-static void writeb_outer_space(unsigned long phys, unsigned char c)
-{
-       unsigned long long vaddr = IO_BASE_64 | phys;
-       unsigned long tmp;
-       unsigned int sr;
-
-       sr = read_c0_status();
-       write_c0_status((sr | ST0_KX) & ~ ST0_IE);
-       __asm__("sll    $0, $0, 2\n");
-       __asm__("sll    $0, $0, 2\n");
-       __asm__("sll    $0, $0, 2\n");
-       __asm__("sll    $0, $0, 2\n");
-
-       __asm__ __volatile__ (
-       "       .set    mips3           \n"
-       "       ld      %0, (%1)        \n"
-       "       sb      %2, (%0)        \n"
-       "       .set    mips0           \n"
-       : "=r" (tmp)
-       : "r" (&vaddr), "r" (c));
-
-       write_c0_status(sr);
-       __asm__("sll    $0, $0, 2\n");
-       __asm__("sll    $0, $0, 2\n");
-       __asm__("sll    $0, $0, 2\n");
-       __asm__("sll    $0, $0, 2\n");
-}
-
-static inline struct yo_uartregs *console_uart(void)
-{
-       return (struct yo_uartregs *) (uart_base + 8);
-}
-
-void prom_putchar(char c)
-{
-       unsigned long lsr = 0xfd000008UL + offsetof(struct yo_uartregs, iu_lsr);
-       unsigned long thr = 0xfd000008UL + offsetof(struct yo_uartregs, iu_thr);
-
-       while ((readb_outer_space(lsr) & 0x20) == 0);
-       writeb_outer_space(thr, c);
-}
-
-char __init prom_getchar(void)
-{
-       return 0;
-}
diff --git a/arch/mips/vr41xx/tanbac-tb0229/tb0219.c b/arch/mips/vr41xx/tanbac-tb0229/tb0219.c
deleted file mode 100644 (file)
index a07d9fa..0000000
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- *  tb0219.c, Setup for the TANBAC TB0219
- *
- *  Copyright (C) 2003  Megasolution Inc. <matsu@megasolution.jp>
- *  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
- */
-#include <linux/init.h>
-
-#include <asm/io.h>
-#include <asm/reboot.h>
-
-#define TB0219_RESET_REGS      KSEG1ADDR(0x0a00000e)
-
-#define tb0219_hard_reset()    writew(0, TB0219_RESET_REGS)
-
-static void tanbac_tb0219_restart(char *command)
-{
-       local_irq_disable();
-       tb0219_hard_reset();
-       while (1);
-}
-
-static int __init tanbac_tb0219_setup(void)
-{
-       _machine_restart = tanbac_tb0219_restart;
-
-       return 0;
-}
-
-early_initcall(tanbac_tb0219_setup);
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/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/ads8272_defconfig b/arch/ppc/configs/ads8272_defconfig
deleted file mode 100644 (file)
index 709a180..0000000
+++ /dev/null
@@ -1,583 +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_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_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_RPX6 is not set
-# CONFIG_TQM8260 is not set
-CONFIG_ADS8272=y
-CONFIG_PQ2ADS=y
-CONFIG_8260=y
-CONFIG_8272=y
-CONFIG_CPM2=y
-# CONFIG_PC_KEYBOARD is not set
-CONFIG_SERIAL_CONSOLE=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 is not set
-
-#
-# Bus options
-#
-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 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
-#
-
-#
-# 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=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=32768
-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=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=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=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
-
-#
-# 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
-
-#
-# ARCnet devices
-#
-# CONFIG_ARCNET is not set
-
-#
-# Ethernet (10 or 100Mbit)
-#
-CONFIG_NET_ETHERNET=y
-# CONFIG_MII is not set
-# CONFIG_OAKNET 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
-
-#
-# 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_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
-# CONFIG_SERIO_I8042 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 is not set
-# CONFIG_SERIAL_NONSTANDARD is not set
-
-#
-# Serial drivers
-#
-# CONFIG_SERIAL_8250 is not set
-
-#
-# Non-8250 serial port support
-#
-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=y
-# CONFIG_GEN_RTC_X 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
-#
-# CONFIG_DVB is not set
-
-#
-# Graphics support
-#
-# CONFIG_FB is not set
-
-#
-# 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=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_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
-
-#
-# 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 is not set
-CONFIG_ROOT_NFS=y
-CONFIG_LOCKD=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_NEC98_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_SCC_CONSOLE=y
-CONFIG_FCC1_ENET=y
-# CONFIG_FCC2_ENET is not set
-# CONFIG_FCC3_ENET is not set
-
-#
-# Library routines
-#
-# CONFIG_CRC32 is not set
-# CONFIG_LIBCRC32C 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/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/lib/rheap.c b/arch/ppc/lib/rheap.c
deleted file mode 100644 (file)
index 4d938a0..0000000
+++ /dev/null
@@ -1,692 +0,0 @@
-/*
- * arch/ppc/syslib/rheap.c
- *
- * A Remote Heap.  Remote means that we don't touch the memory that the
- * heap points to. Normal heap implementations use the memory they manage
- * to place their list. We cannot do that because the memory we manage may
- * have special properties, for example it is uncachable or of different
- * endianess.
- *
- * Author: Pantelis Antoniou <panto@intracom.gr>
- *
- * 2004 (c) INTRACOM S.A. Greece. 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/types.h>
-#include <linux/errno.h>
-#include <linux/mm.h>
-#include <linux/slab.h>
-
-#include <asm/rheap.h>
-
-/*
- * Fixup a list_head, needed when copying lists.  If the pointers fall
- * between s and e, apply the delta.  This assumes that
- * sizeof(struct list_head *) == sizeof(unsigned long *).
- */
-static inline void fixup(unsigned long s, unsigned long e, int d,
-                        struct list_head *l)
-{
-       unsigned long *pp;
-
-       pp = (unsigned long *)&l->next;
-       if (*pp >= s && *pp < e)
-               *pp += d;
-
-       pp = (unsigned long *)&l->prev;
-       if (*pp >= s && *pp < e)
-               *pp += d;
-}
-
-/* Grow the allocated blocks */
-static int grow(rh_info_t * info, int max_blocks)
-{
-       rh_block_t *block, *blk;
-       int i, new_blocks;
-       int delta;
-       unsigned long blks, blke;
-
-       if (max_blocks <= info->max_blocks)
-               return -EINVAL;
-
-       new_blocks = max_blocks - info->max_blocks;
-
-       block = kmalloc(sizeof(rh_block_t) * max_blocks, GFP_KERNEL);
-       if (block == NULL)
-               return -ENOMEM;
-
-       if (info->max_blocks > 0) {
-
-               /* copy old block area */
-               memcpy(block, info->block,
-                      sizeof(rh_block_t) * info->max_blocks);
-
-               delta = (char *)block - (char *)info->block;
-
-               /* and fixup list pointers */
-               blks = (unsigned long)info->block;
-               blke = (unsigned long)(info->block + info->max_blocks);
-
-               for (i = 0, blk = block; i < info->max_blocks; i++, blk++)
-                       fixup(blks, blke, delta, &blk->list);
-
-               fixup(blks, blke, delta, &info->empty_list);
-               fixup(blks, blke, delta, &info->free_list);
-               fixup(blks, blke, delta, &info->taken_list);
-
-               /* free the old allocated memory */
-               if ((info->flags & RHIF_STATIC_BLOCK) == 0)
-                       kfree(info->block);
-       }
-
-       info->block = block;
-       info->empty_slots += new_blocks;
-       info->max_blocks = max_blocks;
-       info->flags &= ~RHIF_STATIC_BLOCK;
-
-       /* add all new blocks to the free list */
-       for (i = 0, blk = block + info->max_blocks; i < new_blocks; i++, blk++)
-               list_add(&blk->list, &info->empty_list);
-
-       return 0;
-}
-
-/*
- * Assure at least the required amount of empty slots.  If this function
- * causes a grow in the block area then all pointers kept to the block
- * area are invalid!
- */
-static int assure_empty(rh_info_t * info, int slots)
-{
-       int max_blocks;
-
-       /* This function is not meant to be used to grow uncontrollably */
-       if (slots >= 4)
-               return -EINVAL;
-
-       /* Enough space */
-       if (info->empty_slots >= slots)
-               return 0;
-
-       /* Next 16 sized block */
-       max_blocks = ((info->max_blocks + slots) + 15) & ~15;
-
-       return grow(info, max_blocks);
-}
-
-static rh_block_t *get_slot(rh_info_t * info)
-{
-       rh_block_t *blk;
-
-       /* If no more free slots, and failure to extend. */
-       /* XXX: You should have called assure_empty before */
-       if (info->empty_slots == 0) {
-               printk(KERN_ERR "rh: out of slots; crash is imminent.\n");
-               return NULL;
-       }
-
-       /* Get empty slot to use */
-       blk = list_entry(info->empty_list.next, rh_block_t, list);
-       list_del_init(&blk->list);
-       info->empty_slots--;
-
-       /* Initialize */
-       blk->start = NULL;
-       blk->size = 0;
-       blk->owner = NULL;
-
-       return blk;
-}
-
-static inline void release_slot(rh_info_t * info, rh_block_t * blk)
-{
-       list_add(&blk->list, &info->empty_list);
-       info->empty_slots++;
-}
-
-static void attach_free_block(rh_info_t * info, rh_block_t * blkn)
-{
-       rh_block_t *blk;
-       rh_block_t *before;
-       rh_block_t *after;
-       rh_block_t *next;
-       int size;
-       unsigned long s, e, bs, be;
-       struct list_head *l;
-
-       /* We assume that they are aligned properly */
-       size = blkn->size;
-       s = (unsigned long)blkn->start;
-       e = s + size;
-
-       /* Find the blocks immediately before and after the given one
-        * (if any) */
-       before = NULL;
-       after = NULL;
-       next = NULL;
-
-       list_for_each(l, &info->free_list) {
-               blk = list_entry(l, rh_block_t, list);
-
-               bs = (unsigned long)blk->start;
-               be = bs + blk->size;
-
-               if (next == NULL && s >= bs)
-                       next = blk;
-
-               if (be == s)
-                       before = blk;
-
-               if (e == bs)
-                       after = blk;
-
-               /* If both are not null, break now */
-               if (before != NULL && after != NULL)
-                       break;
-       }
-
-       /* Now check if they are really adjacent */
-       if (before != NULL && s != (unsigned long)before->start + before->size)
-               before = NULL;
-
-       if (after != NULL && e != (unsigned long)after->start)
-               after = NULL;
-
-       /* No coalescing; list insert and return */
-       if (before == NULL && after == NULL) {
-
-               if (next != NULL)
-                       list_add(&blkn->list, &next->list);
-               else
-                       list_add(&blkn->list, &info->free_list);
-
-               return;
-       }
-
-       /* We don't need it anymore */
-       release_slot(info, blkn);
-
-       /* Grow the before block */
-       if (before != NULL && after == NULL) {
-               before->size += size;
-               return;
-       }
-
-       /* Grow the after block backwards */
-       if (before == NULL && after != NULL) {
-               (int8_t *) after->start -= size;
-               after->size += size;
-               return;
-       }
-
-       /* Grow the before block, and release the after block */
-       before->size += size + after->size;
-       list_del(&after->list);
-       release_slot(info, after);
-}
-
-static void attach_taken_block(rh_info_t * info, rh_block_t * blkn)
-{
-       rh_block_t *blk;
-       struct list_head *l;
-
-       /* Find the block immediately before the given one (if any) */
-       list_for_each(l, &info->taken_list) {
-               blk = list_entry(l, rh_block_t, list);
-               if (blk->start > blkn->start) {
-                       list_add_tail(&blkn->list, &blk->list);
-                       return;
-               }
-       }
-
-       list_add_tail(&blkn->list, &info->taken_list);
-}
-
-/*
- * Create a remote heap dynamically.  Note that no memory for the blocks
- * are allocated.  It will upon the first allocation
- */
-rh_info_t *rh_create(unsigned int alignment)
-{
-       rh_info_t *info;
-
-       /* Alignment must be a power of two */
-       if ((alignment & (alignment - 1)) != 0)
-               return NULL;
-
-       info = kmalloc(sizeof(*info), GFP_KERNEL);
-       if (info == NULL)
-               return NULL;
-
-       info->alignment = alignment;
-
-       /* Initially everything as empty */
-       info->block = NULL;
-       info->max_blocks = 0;
-       info->empty_slots = 0;
-       info->flags = 0;
-
-       INIT_LIST_HEAD(&info->empty_list);
-       INIT_LIST_HEAD(&info->free_list);
-       INIT_LIST_HEAD(&info->taken_list);
-
-       return info;
-}
-
-/*
- * Destroy a dynamically created remote heap.  Deallocate only if the areas
- * are not static
- */
-void rh_destroy(rh_info_t * info)
-{
-       if ((info->flags & RHIF_STATIC_BLOCK) == 0 && info->block != NULL)
-               kfree(info->block);
-
-       if ((info->flags & RHIF_STATIC_INFO) == 0)
-               kfree(info);
-}
-
-/*
- * Initialize in place a remote heap info block.  This is needed to support
- * operation very early in the startup of the kernel, when it is not yet safe
- * to call kmalloc.
- */
-void rh_init(rh_info_t * info, unsigned int alignment, int max_blocks,
-            rh_block_t * block)
-{
-       int i;
-       rh_block_t *blk;
-
-       /* Alignment must be a power of two */
-       if ((alignment & (alignment - 1)) != 0)
-               return;
-
-       info->alignment = alignment;
-
-       /* Initially everything as empty */
-       info->block = block;
-       info->max_blocks = max_blocks;
-       info->empty_slots = max_blocks;
-       info->flags = RHIF_STATIC_INFO | RHIF_STATIC_BLOCK;
-
-       INIT_LIST_HEAD(&info->empty_list);
-       INIT_LIST_HEAD(&info->free_list);
-       INIT_LIST_HEAD(&info->taken_list);
-
-       /* Add all new blocks to the free list */
-       for (i = 0, blk = block; i < max_blocks; i++, blk++)
-               list_add(&blk->list, &info->empty_list);
-}
-
-/* Attach a free memory region, coalesces regions if adjuscent */
-int rh_attach_region(rh_info_t * info, void *start, int size)
-{
-       rh_block_t *blk;
-       unsigned long s, e, m;
-       int r;
-
-       /* The region must be aligned */
-       s = (unsigned long)start;
-       e = s + size;
-       m = info->alignment - 1;
-
-       /* Round start up */
-       s = (s + m) & ~m;
-
-       /* Round end down */
-       e = e & ~m;
-
-       /* Take final values */
-       start = (void *)s;
-       size = (int)(e - s);
-
-       /* Grow the blocks, if needed */
-       r = assure_empty(info, 1);
-       if (r < 0)
-               return r;
-
-       blk = get_slot(info);
-       blk->start = start;
-       blk->size = size;
-       blk->owner = NULL;
-
-       attach_free_block(info, blk);
-
-       return 0;
-}
-
-/* Detatch given address range, splits free block if needed. */
-void *rh_detach_region(rh_info_t * info, void *start, int size)
-{
-       struct list_head *l;
-       rh_block_t *blk, *newblk;
-       unsigned long s, e, m, bs, be;
-
-       /* Validate size */
-       if (size <= 0)
-               return NULL;
-
-       /* The region must be aligned */
-       s = (unsigned long)start;
-       e = s + size;
-       m = info->alignment - 1;
-
-       /* Round start up */
-       s = (s + m) & ~m;
-
-       /* Round end down */
-       e = e & ~m;
-
-       if (assure_empty(info, 1) < 0)
-               return NULL;
-
-       blk = NULL;
-       list_for_each(l, &info->free_list) {
-               blk = list_entry(l, rh_block_t, list);
-               /* The range must lie entirely inside one free block */
-               bs = (unsigned long)blk->start;
-               be = (unsigned long)blk->start + blk->size;
-               if (s >= bs && e <= be)
-                       break;
-               blk = NULL;
-       }
-
-       if (blk == NULL)
-               return NULL;
-
-       /* Perfect fit */
-       if (bs == s && be == e) {
-               /* Delete from free list, release slot */
-               list_del(&blk->list);
-               release_slot(info, blk);
-               return (void *)s;
-       }
-
-       /* blk still in free list, with updated start and/or size */
-       if (bs == s || be == e) {
-               if (bs == s)
-                       (int8_t *) blk->start += size;
-               blk->size -= size;
-
-       } else {
-               /* The front free fragment */
-               blk->size = s - bs;
-
-               /* the back free fragment */
-               newblk = get_slot(info);
-               newblk->start = (void *)e;
-               newblk->size = be - e;
-
-               list_add(&newblk->list, &blk->list);
-       }
-
-       return (void *)s;
-}
-
-void *rh_alloc(rh_info_t * info, int size, const char *owner)
-{
-       struct list_head *l;
-       rh_block_t *blk;
-       rh_block_t *newblk;
-       void *start;
-
-       /* Validate size */
-       if (size <= 0)
-               return NULL;
-
-       /* Align to configured alignment */
-       size = (size + (info->alignment - 1)) & ~(info->alignment - 1);
-
-       if (assure_empty(info, 1) < 0)
-               return NULL;
-
-       blk = NULL;
-       list_for_each(l, &info->free_list) {
-               blk = list_entry(l, rh_block_t, list);
-               if (size <= blk->size)
-                       break;
-               blk = NULL;
-       }
-
-       if (blk == NULL)
-               return NULL;
-
-       /* Just fits */
-       if (blk->size == size) {
-               /* Move from free list to taken list */
-               list_del(&blk->list);
-               blk->owner = owner;
-               start = blk->start;
-
-               attach_taken_block(info, blk);
-
-               return start;
-       }
-
-       newblk = get_slot(info);
-       newblk->start = blk->start;
-       newblk->size = size;
-       newblk->owner = owner;
-
-       /* blk still in free list, with updated start, size */
-       (int8_t *) blk->start += size;
-       blk->size -= size;
-
-       start = newblk->start;
-
-       attach_taken_block(info, newblk);
-
-       return start;
-}
-
-/* allocate at precisely the given address */
-void *rh_alloc_fixed(rh_info_t * info, void *start, int size, const char *owner)
-{
-       struct list_head *l;
-       rh_block_t *blk, *newblk1, *newblk2;
-       unsigned long s, e, m, bs, be;
-
-       /* Validate size */
-       if (size <= 0)
-               return NULL;
-
-       /* The region must be aligned */
-       s = (unsigned long)start;
-       e = s + size;
-       m = info->alignment - 1;
-
-       /* Round start up */
-       s = (s + m) & ~m;
-
-       /* Round end down */
-       e = e & ~m;
-
-       if (assure_empty(info, 2) < 0)
-               return NULL;
-
-       blk = NULL;
-       list_for_each(l, &info->free_list) {
-               blk = list_entry(l, rh_block_t, list);
-               /* The range must lie entirely inside one free block */
-               bs = (unsigned long)blk->start;
-               be = (unsigned long)blk->start + blk->size;
-               if (s >= bs && e <= be)
-                       break;
-       }
-
-       if (blk == NULL)
-               return NULL;
-
-       /* Perfect fit */
-       if (bs == s && be == e) {
-               /* Move from free list to taken list */
-               list_del(&blk->list);
-               blk->owner = owner;
-
-               start = blk->start;
-               attach_taken_block(info, blk);
-
-               return start;
-
-       }
-
-       /* blk still in free list, with updated start and/or size */
-       if (bs == s || be == e) {
-               if (bs == s)
-                       (int8_t *) blk->start += size;
-               blk->size -= size;
-
-       } else {
-               /* The front free fragment */
-               blk->size = s - bs;
-
-               /* The back free fragment */
-               newblk2 = get_slot(info);
-               newblk2->start = (void *)e;
-               newblk2->size = be - e;
-
-               list_add(&newblk2->list, &blk->list);
-       }
-
-       newblk1 = get_slot(info);
-       newblk1->start = (void *)s;
-       newblk1->size = e - s;
-       newblk1->owner = owner;
-
-       start = newblk1->start;
-       attach_taken_block(info, newblk1);
-
-       return start;
-}
-
-int rh_free(rh_info_t * info, void *start)
-{
-       rh_block_t *blk, *blk2;
-       struct list_head *l;
-       int size;
-
-       /* Linear search for block */
-       blk = NULL;
-       list_for_each(l, &info->taken_list) {
-               blk2 = list_entry(l, rh_block_t, list);
-               if (start < blk2->start)
-                       break;
-               blk = blk2;
-       }
-
-       if (blk == NULL || start > (blk->start + blk->size))
-               return -EINVAL;
-
-       /* Remove from taken list */
-       list_del(&blk->list);
-
-       /* Get size of freed block */
-       size = blk->size;
-       attach_free_block(info, blk);
-
-       return size;
-}
-
-int rh_get_stats(rh_info_t * info, int what, int max_stats, rh_stats_t * stats)
-{
-       rh_block_t *blk;
-       struct list_head *l;
-       struct list_head *h;
-       int nr;
-
-       switch (what) {
-
-       case RHGS_FREE:
-               h = &info->free_list;
-               break;
-
-       case RHGS_TAKEN:
-               h = &info->taken_list;
-               break;
-
-       default:
-               return -EINVAL;
-       }
-
-       /* Linear search for block */
-       nr = 0;
-       list_for_each(l, h) {
-               blk = list_entry(l, rh_block_t, list);
-               if (stats != NULL && nr < max_stats) {
-                       stats->start = blk->start;
-                       stats->size = blk->size;
-                       stats->owner = blk->owner;
-                       stats++;
-               }
-               nr++;
-       }
-
-       return nr;
-}
-
-int rh_set_owner(rh_info_t * info, void *start, const char *owner)
-{
-       rh_block_t *blk, *blk2;
-       struct list_head *l;
-       int size;
-
-       /* Linear search for block */
-       blk = NULL;
-       list_for_each(l, &info->taken_list) {
-               blk2 = list_entry(l, rh_block_t, list);
-               if (start < blk2->start)
-                       break;
-               blk = blk2;
-       }
-
-       if (blk == NULL || start > (blk->start + blk->size))
-               return -EINVAL;
-
-       blk->owner = owner;
-
-       return size;
-}
-
-void rh_dump(rh_info_t * info)
-{
-       static rh_stats_t st[32];       /* XXX maximum 32 blocks */
-       int maxnr;
-       int i, nr;
-
-       maxnr = sizeof(st) / sizeof(st[0]);
-
-       printk(KERN_INFO
-              "info @0x%p (%d slots empty / %d max)\n",
-              info, info->empty_slots, info->max_blocks);
-
-       printk(KERN_INFO "  Free:\n");
-       nr = rh_get_stats(info, RHGS_FREE, maxnr, st);
-       if (nr > maxnr)
-               nr = maxnr;
-       for (i = 0; i < nr; i++)
-               printk(KERN_INFO
-                      "    0x%p-0x%p (%u)\n",
-                      st[i].start, (int8_t *) st[i].start + st[i].size,
-                      st[i].size);
-       printk(KERN_INFO "\n");
-
-       printk(KERN_INFO "  Taken:\n");
-       nr = rh_get_stats(info, RHGS_TAKEN, maxnr, st);
-       if (nr > maxnr)
-               nr = maxnr;
-       for (i = 0; i < nr; i++)
-               printk(KERN_INFO
-                      "    0x%p-0x%p (%u) %s\n",
-                      st[i].start, (int8_t *) st[i].start + st[i].size,
-                      st[i].size, st[i].owner != NULL ? st[i].owner : "");
-       printk(KERN_INFO "\n");
-}
-
-void rh_dump_blk(rh_info_t * info, rh_block_t * blk)
-{
-       printk(KERN_INFO
-              "blk @0x%p: 0x%p-0x%p (%u)\n",
-              blk, blk->start, (int8_t *) blk->start + blk->size, blk->size);
-}
diff --git a/arch/ppc/oprofile/Kconfig b/arch/ppc/oprofile/Kconfig
deleted file mode 100644 (file)
index 19d3773..0000000
+++ /dev/null
@@ -1,23 +0,0 @@
-
-menu "Profiling support"
-       depends on EXPERIMENTAL
-
-config PROFILING
-       bool "Profiling support (EXPERIMENTAL)"
-       help
-         Say Y here to enable the extended profiling support mechanisms used
-         by profilers such as OProfile.
-
-
-config OPROFILE
-       tristate "OProfile system profiling (EXPERIMENTAL)"
-       depends on PROFILING
-       help
-         OProfile is a profiling system capable of profiling the
-         whole system, include the kernel, kernel modules, libraries,
-         and applications.
-
-         If unsure, say N.
-
-endmenu
-
diff --git a/arch/ppc/oprofile/Makefile b/arch/ppc/oprofile/Makefile
deleted file mode 100644 (file)
index 06e7c81..0000000
+++ /dev/null
@@ -1,9 +0,0 @@
-obj-$(CONFIG_OPROFILE) += oprofile.o
-
-DRIVER_OBJS := $(addprefix ../../../drivers/oprofile/, \
-               oprof.o cpu_buffer.o buffer_sync.o \
-               event_buffer.o oprofile_files.o \
-               oprofilefs.o oprofile_stats.o \
-               timer_int.o )
-
-oprofile-y := $(DRIVER_OBJS) init.o
diff --git a/arch/ppc/oprofile/init.c b/arch/ppc/oprofile/init.c
deleted file mode 100644 (file)
index e4217d6..0000000
+++ /dev/null
@@ -1,23 +0,0 @@
-/**
- * @file init.c
- *
- * @remark Copyright 2002 OProfile authors
- * @remark Read the file COPYING
- *
- * @author John Levon <levon@movementarian.org>
- */
-
-#include <linux/kernel.h>
-#include <linux/oprofile.h>
-#include <linux/init.h>
-#include <linux/errno.h>
-
-int __init oprofile_arch_init(struct oprofile_operations ** ops)
-{
-       return -ENODEV;
-}
-
-
-void oprofile_arch_exit(void)
-{
-}
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.c b/arch/ppc/platforms/85xx/mpc8560.c
deleted file mode 100644 (file)
index c254299..0000000
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- * arch/ppc/platforms/85xx/mpc8560.c
- * 
- * MPC8560 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_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/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/85xx/sbc8560.c b/arch/ppc/platforms/85xx/sbc8560.c
deleted file mode 100644 (file)
index c32d662..0000000
+++ /dev/null
@@ -1,249 +0,0 @@
-/*
- * arch/ppc/platforms/85xx/sbc8560.c
- * 
- * Wind River SBC8560 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/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 <mm/mmu_decl.h>
-
-#include <syslib/ppc85xx_common.h>
-#include <syslib/ppc85xx_setup.h>
-
-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_EXT6,
-       .flags = (GFAR_HAS_GIGABIT | GFAR_HAS_MULTI_INTR | GFAR_HAS_PHY_INTR),
-       .phyid = 25,
-       .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_EXT7,
-       .flags = (GFAR_HAS_GIGABIT | GFAR_HAS_MULTI_INTR | GFAR_HAS_PHY_INTR),
-       .phyid = 26,
-       .phyregidx = 0,
-};
-
-struct ocp_fs_i2c_data mpc85xx_i2c1_def = {
-       .flags = FS_I2C_SEPARATE_DFSRR,
-};
-
-
-#ifdef CONFIG_SERIAL_8250
-static void __init
-sbc8560_early_serial_map(void)
-{
-        struct uart_port uart_req;
-        /* Setup serial port access */
-        memset(&uart_req, 0, sizeof (uart_req));
-       uart_req.irq = MPC85xx_IRQ_EXT9;
-       uart_req.flags = STD_COM_FLAGS;
-       uart_req.uartclk = BASE_BAUD * 16;
-        uart_req.iotype = SERIAL_IO_MEM;
-        uart_req.mapbase = UARTA_ADDR;
-        uart_req.membase = ioremap(uart_req.mapbase, MPC85xx_UART0_SIZE);
-
-#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 = UARTB_ADDR;
-        uart_req.membase = ioremap(uart_req.mapbase, MPC85xx_UART1_SIZE);
-       uart_req.irq = MPC85xx_IRQ_EXT10;
-#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
-
-/* ************************************************************************
- *
- * Setup the architecture
- *
- */
-static void __init
-sbc8560_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;
-
-       if (ppc_md.progress)
-               ppc_md.progress("sbc8560_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
-#ifdef CONFIG_DUMMY_CONSOLE
-       conswitchp = &dummy_con;
-#endif
-#ifdef CONFIG_SERIAL_8250
-       sbc8560_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
-
-       /* Set up MAC addresses for the Ethernet devices */
-       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
-       /* Use the last TLB entry to map CCSRBAR to allow access to DUART regs */
-       settlbcam(NUM_TLBCAMS - 1, UARTA_ADDR,
-                 UARTA_ADDR, 0x1000, _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 = sbc8560_setup_arch;
-       ppc_md.show_cpuinfo = sbc8560_show_cpuinfo;
-
-       ppc_md.init_IRQ = sbc8560_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("sbc8560_init(): exit", 0);
-}
diff --git a/arch/ppc/platforms/85xx/sbc8560.h b/arch/ppc/platforms/85xx/sbc8560.h
deleted file mode 100644 (file)
index 5c86187..0000000
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * arch/ppc/platforms/85xx/sbc8560.h
- *
- * Wind River SBC8560 board definitions
- *
- * Copyright 2003 Motorola 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_SBC8560_H__
-#define __MACH_SBC8560_H__
-#include <linux/config.h>
-#include <linux/serial.h>
-#include <platforms/85xx/sbc85xx.h>
-#ifdef CONFIG_SERIAL_MANY_PORTS
-#define RS_TABLE_SIZE  64
-#else
-#define RS_TABLE_SIZE  2
-#endif
-/* Rate for the 1.8432 Mhz clock for the onboard serial chip */
-#define BASE_BAUD ( 1843200 / 16 )
-#ifdef CONFIG_SERIAL_DETECT_IRQ
-#define STD_COM_FLAGS (ASYNC_BOOT_AUTOCONF|ASYNC_SKIP_TEST|ASYNC_AUTO_IRQ)
-#else
-#define STD_COM_FLAGS (ASYNC_BOOT_AUTOCONF|ASYNC_SKIP_TEST)
-#endif
-#define STD_SERIAL_PORT_DFNS \
-        { 0, BASE_BAUD, UARTA_ADDR, MPC85xx_IRQ_EXT9, STD_COM_FLAGS, /* ttyS0 */ \
-                iomem_base: (u8 *)UARTA_ADDR,                       \
-                io_type: SERIAL_IO_MEM },                                 \
-        { 0, BASE_BAUD, UARTB_ADDR, MPC85xx_IRQ_EXT10, STD_COM_FLAGS, /* ttyS1 */ \
-                iomem_base: (u8 *)UARTB_ADDR,                       \
-                io_type: SERIAL_IO_MEM },
-#define SERIAL_PORT_DFNS \
-        STD_SERIAL_PORT_DFNS
-#endif /* __MACH_SBC8560_H__ */
diff --git a/arch/ppc/platforms/85xx/sbc85xx.c b/arch/ppc/platforms/85xx/sbc85xx.c
deleted file mode 100644 (file)
index a7a33fd..0000000
+++ /dev/null
@@ -1,215 +0,0 @@
-/*
- * arch/ppc/platform/85xx/sbc85xx.c
- * 
- * WindRiver PowerQUICC III SBC85xx board common routines
- *
- * Copyright 2002, 2003 Motorola Inc.
- * Copyright 2004 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 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 <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/ocp.h>
-
-#include <mm/mmu_decl.h>
-
-#include <platforms/85xx/sbc85xx.h>
-
-unsigned char __res[sizeof (bd_t)];
-
-#ifndef CONFIG_PCI
-unsigned long isa_io_base = 0;
-unsigned long isa_mem_base = 0;
-unsigned long pci_dram_offset = 0;
-#endif
-
-extern unsigned long total_memory;     /* in mm/init */
-
-/* Internal interrupts are all Level Sensitive, and Positive Polarity */
-
-static u_char sbc8560_openpic_initsenses[] __initdata = {
-       (IRQ_POLARITY_POSITIVE),        /* Internal  0: L2 Cache */
-       (IRQ_POLARITY_POSITIVE),        /* Internal  1: ECM */
-       (IRQ_POLARITY_POSITIVE),        /* Internal  2: DDR DRAM */
-       (IRQ_POLARITY_POSITIVE),        /* Internal  3: LBIU */
-       (IRQ_POLARITY_POSITIVE),        /* Internal  4: DMA 0 */
-       (IRQ_POLARITY_POSITIVE),        /* Internal  5: DMA 1 */
-       (IRQ_POLARITY_POSITIVE),        /* Internal  6: DMA 2 */
-       (IRQ_POLARITY_POSITIVE),        /* Internal  7: DMA 3 */
-       (IRQ_POLARITY_POSITIVE),        /* Internal  8: PCI/PCI-X */
-       (IRQ_POLARITY_POSITIVE),        /* Internal  9: RIO Inbound Port Write Error */
-       (IRQ_POLARITY_POSITIVE),        /* Internal 10: RIO Doorbell Inbound */
-       (IRQ_POLARITY_POSITIVE),        /* Internal 11: RIO Outbound Message */
-       (IRQ_POLARITY_POSITIVE),        /* Internal 12: RIO Inbound Message */
-       (IRQ_POLARITY_POSITIVE),        /* Internal 13: TSEC 0 Transmit */
-       (IRQ_POLARITY_POSITIVE),        /* Internal 14: TSEC 0 Receive */
-       (IRQ_POLARITY_POSITIVE),        /* Internal 15: Unused */
-       (IRQ_POLARITY_POSITIVE),        /* Internal 16: Unused */
-       (IRQ_POLARITY_POSITIVE),        /* Internal 17: Unused */
-       (IRQ_POLARITY_POSITIVE),        /* Internal 18: TSEC 0 Receive/Transmit Error */
-       (IRQ_POLARITY_POSITIVE),        /* Internal 19: TSEC 1 Transmit */
-       (IRQ_POLARITY_POSITIVE),        /* Internal 20: TSEC 1 Receive */
-       (IRQ_POLARITY_POSITIVE),        /* Internal 21: Unused */
-       (IRQ_POLARITY_POSITIVE),        /* Internal 22: Unused */
-       (IRQ_POLARITY_POSITIVE),        /* Internal 23: Unused */
-       (IRQ_POLARITY_POSITIVE),        /* Internal 24: TSEC 1 Receive/Transmit Error */
-       (IRQ_POLARITY_POSITIVE),        /* Internal 25: Fast Ethernet */
-       (IRQ_POLARITY_POSITIVE),        /* Internal 26: DUART */
-       (IRQ_POLARITY_POSITIVE),        /* Internal 27: I2C */
-       (IRQ_POLARITY_POSITIVE),        /* Internal 28: Performance Monitor */
-       (IRQ_POLARITY_POSITIVE),        /* Internal 29: Unused */
-       (IRQ_POLARITY_POSITIVE),        /* Internal 30: CPM */
-       (IRQ_POLARITY_POSITIVE),        /* Internal 31: Unused */
-       0x0,                            /* External  0: */
-       0x0,                            /* External  1: */
-#if defined(CONFIG_PCI)
-       (IRQ_SENSE_LEVEL | IRQ_POLARITY_NEGATIVE),      /* External 2: PCI slot 0 */
-       (IRQ_SENSE_LEVEL | IRQ_POLARITY_NEGATIVE),      /* External 3: PCI slot 1 */
-       (IRQ_SENSE_LEVEL | IRQ_POLARITY_NEGATIVE),      /* External 4: PCI slot 2 */
-       (IRQ_SENSE_LEVEL | IRQ_POLARITY_NEGATIVE),      /* External 5: PCI slot 3 */
-#else
-       0x0,                            /* External  2: */
-       0x0,                            /* External  3: */
-       0x0,                            /* External  4: */
-       0x0,                            /* External  5: */
-#endif
-       (IRQ_SENSE_LEVEL | IRQ_POLARITY_NEGATIVE),      /* External 6: PHY */
-       (IRQ_SENSE_LEVEL | IRQ_POLARITY_NEGATIVE),      /* External 7: PHY */
-       0x0,                            /* External  8: */
-       (IRQ_SENSE_LEVEL | IRQ_POLARITY_POSITIVE),      /* External 9: PHY */
-       (IRQ_SENSE_LEVEL | IRQ_POLARITY_POSITIVE),      /* External 10: PHY */
-       0x0,                            /* External 11: */
-};
-
-/* ************************************************************************ */
-int
-sbc8560_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: Wind River\n");
-
-       switch (svid & 0xffff0000) {
-       case SVR_8540:
-               seq_printf(m, "Machine\t\t: hhmmm, this board isn't made yet!\n");
-               break;
-       case SVR_8560:
-               seq_printf(m, "Machine\t\t: SBC8560\n");
-               break;
-       default:
-               seq_printf(m, "Machine\t\t: unknown\n");
-               break;
-       }
-       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;
-}
-
-void __init
-sbc8560_init_IRQ(void)
-{
-       bd_t *binfo = (bd_t *) __res;
-       /* 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 = sbc8560_openpic_initsenses;
-       OpenPIC_NumInitSenses = sizeof (sbc8560_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);
-
-       return;
-}
-
-/*
- * interrupt routing
- */
-
-#ifdef CONFIG_PCI
-int mpc85xx_map_irq(struct pci_dev *dev, unsigned char idsel,
-                   unsigned char pin)
-{
-       static char pci_irq_table[][4] =
-           /*
-            *      PCI IDSEL/INTPIN->INTLINE
-            *        A      B      C      D
-            */
-       {
-               {PIRQA, PIRQB, PIRQC, PIRQD},
-               {PIRQD, PIRQA, PIRQB, PIRQC},
-               {PIRQC, PIRQD, PIRQA, PIRQB},
-               {PIRQB, PIRQC, PIRQD, PIRQA},
-       };
-
-       const long min_idsel = 12, max_idsel = 15, irqs_per_slot = 4;
-       return PCI_IRQ_TABLE_LOOKUP;
-}
-
-int mpc85xx_exclude_device(u_char bus, u_char devfn)
-{
-       if (bus == 0 && PCI_SLOT(devfn) == 0)
-               return PCIBIOS_DEVICE_NOT_FOUND;
-       else
-               return PCIBIOS_SUCCESSFUL;
-}
-#endif /* CONFIG_PCI */
diff --git a/arch/ppc/platforms/85xx/sbc85xx.h b/arch/ppc/platforms/85xx/sbc85xx.h
deleted file mode 100644 (file)
index 7af93c6..0000000
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * arch/ppc/platforms/85xx/sbc85xx.h
- *
- * WindRiver PowerQUICC III SBC85xx common board definitions
- *
- * Copyright 2003 Motorola Inc.
- * Copyright 2004 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 of the  License, or (at your
- * option) any later version.
- *
- */
-
-#ifndef __PLATFORMS_85XX_SBC85XX_H__
-#define __PLATFORMS_85XX_SBC85XX_H__
-
-#include <linux/config.h>
-#include <linux/init.h>
-#include <linux/seq_file.h>
-#include <asm/ppcboot.h>
-
-#define BOARD_CCSRBAR          ((uint)0xff700000)
-#define CCSRBAR_SIZE           ((uint)1024*1024)
-
-#define BCSR_ADDR              ((uint)0xfc000000)
-#define BCSR_SIZE              ((uint)(16 * 1024 * 1024))
-
-#define UARTA_ADDR             (BCSR_ADDR + 0x00700000)
-#define UARTB_ADDR             (BCSR_ADDR + 0x00800000)
-#define RTC_DEVICE_ADDR                (BCSR_ADDR + 0x00900000)
-#define EEPROM_ADDR            (BCSR_ADDR + 0x00b00000)
-
-extern int  sbc8560_show_cpuinfo(struct seq_file *m);
-extern void sbc8560_init_IRQ(void) __init; 
-
-/* PCI interrupt controller */
-#define PIRQA          MPC85xx_IRQ_EXT1
-#define PIRQB          MPC85xx_IRQ_EXT2
-#define PIRQC          MPC85xx_IRQ_EXT3
-#define PIRQD          MPC85xx_IRQ_EXT4
-
-#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
-
-#endif /* __PLATFORMS_85XX_SBC85XX_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/pq2ads.h b/arch/ppc/platforms/pq2ads.h
deleted file mode 100644 (file)
index 1bee6ca..0000000
+++ /dev/null
@@ -1,90 +0,0 @@
-/*
- * A collection of structures, addresses, and values associated with
- * the Motorola MPC8260ADS/MPC8266ADS-PCI boards.
- * Copied from the RPX-Classic and SBS8260 stuff.
- *
- * Copyright (c) 2001 Dan Malek (dan@mvista.com)
- */
-#ifdef __KERNEL__
-#ifndef __MACH_ADS8260_DEFS
-#define __MACH_ADS8260_DEFS
-
-#include <linux/config.h>
-
-#include <asm/ppcboot.h>
-
-/* 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 BCSR_ADDR              ((uint)0xf4500000)
-#define BCSR_SIZE              ((uint)(32 * 1024))
-
-#define BOOTROM_RESTART_ADDR   ((uint)0xff000104)
-
-/* The ADS8260 has 16, 32-bit wide control/status registers, accessed
- * only on word boundaries.
- * Not all are used (yet), or are interesting to us (yet).
- */
-
-/* Things of interest in the CSR.
-*/
-#define BCSR0_LED0             ((uint)0x02000000)      /* 0 == on */
-#define BCSR0_LED1             ((uint)0x01000000)      /* 0 == on */
-#define BCSR1_FETHIEN          ((uint)0x08000000)      /* 0 == enable */
-#define BCSR1_FETH_RST         ((uint)0x04000000)      /* 0 == reset */
-#define BCSR1_RS232_EN1                ((uint)0x02000000)      /* 0 == enable */
-#define BCSR1_RS232_EN2                ((uint)0x01000000)      /* 0 == enable */
-
-#define PHY_INTERRUPT  SIU_INT_IRQ7
-
-#ifdef CONFIG_PCI
-/* PCI interrupt controller */
-#define PCI_INT_STAT_REG       0xF8200000
-#define PCI_INT_MASK_REG       0xF8200004
-#define PIRQA                  (NR_SIU_INTS + 0)
-#define PIRQB                  (NR_SIU_INTS + 1)
-#define PIRQC                  (NR_SIU_INTS + 2)
-#define PIRQD                  (NR_SIU_INTS + 3)
-
-/*
- * PCI memory map definitions for MPC8266ADS-PCI.
- *
- * processor view
- *     local address           PCI address             target
- *     0x80000000-0x9FFFFFFF   0x80000000-0x9FFFFFFF   PCI mem with prefetch
- *     0xA0000000-0xBFFFFFFF   0xA0000000-0xBFFFFFFF   PCI mem w/o prefetch
- *     0xF4000000-0xF7FFFFFF   0x00000000-0x03FFFFFF   PCI IO
- *
- * PCI master view
- *     local address           PCI address             target
- *     0x00000000-0x1FFFFFFF   0x00000000-0x1FFFFFFF   MPC8266 local memory
- */
-
-/* window for a PCI master to access MPC8266 memory */
-#define PCI_SLV_MEM_LOCAL      0x00000000      /* Local base */
-#define PCI_SLV_MEM_BUS                0x00000000      /* PCI base */
-
-/* window for the processor to access PCI memory with prefetching */
-#define PCI_MSTR_MEM_LOCAL     0x80000000      /* Local base */
-#define PCI_MSTR_MEM_BUS       0x80000000      /* PCI base   */
-#define PCI_MSTR_MEM_SIZE      0x20000000      /* 512MB */
-
-/* window for the processor to access PCI memory without prefetching */
-#define PCI_MSTR_MEMIO_LOCAL   0xA0000000      /* Local base */
-#define PCI_MSTR_MEMIO_BUS     0xA0000000      /* PCI base   */
-#define PCI_MSTR_MEMIO_SIZE    0x20000000      /* 512MB */
-
-/* window for the processor to access PCI I/O */
-#define PCI_MSTR_IO_LOCAL      0xF4000000      /* Local base */
-#define PCI_MSTR_IO_BUS         0x00000000     /* PCI base   */
-#define PCI_MSTR_IO_SIZE        0x04000000     /* 64MB */
-
-#define _IO_BASE               PCI_MSTR_IO_LOCAL
-#define _ISA_MEM_BASE          PCI_MSTR_MEMIO_LOCAL
-#define PCI_DRAM_OFFSET                PCI_SLV_MEM_BUS
-#endif /* CONFIG_PCI */
-
-#endif /* __MACH_ADS8260_DEFS */
-#endif /* __KERNEL__ */
diff --git a/arch/ppc/platforms/pq2ads_setup.c b/arch/ppc/platforms/pq2ads_setup.c
deleted file mode 100644 (file)
index eaeb2d9..0000000
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * arch/ppc/platforms/pq2ads_setup.c
- *
- * PQ2ADS platform support
- *
- * Author: Kumar Gala <kumar.gala@freescale.com>
- * Derived from: est8260_setup.c by Allen Curtis
- *
- * 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/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
-pq2ads_show_cpuinfo(struct seq_file *m)
-{
-       bd_t    *binfo = (bd_t *)__res;
-
-       seq_printf(m, "vendor\t\t: Motorola\n"
-                     "machine\t\t: PQ2 ADS PowerPC\n"
-                     "\n"
-                     "mem size\t\t: 0x%08lx\n"
-                     "console baud\t\t: %ld\n"
-                     "\n",
-                     binfo->bi_memsize,
-                     binfo->bi_baudrate);
-       return 0;
-}
-
-static void __init
-pq2ads_setup_arch(void)
-{
-       printk("PQ2 ADS Port\n");
-       callback_setup_arch();
-        *(volatile uint *)(BCSR_ADDR + 4) &= ~BCSR1_RS232_EN2;
-}
-
-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     = pq2ads_show_cpuinfo;
-
-       callback_setup_arch     = ppc_md.setup_arch;
-       ppc_md.setup_arch       = pq2ads_setup_arch;
-}
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/cpm2_common.c b/arch/ppc/syslib/cpm2_common.c
deleted file mode 100644 (file)
index 5ca6d4c..0000000
+++ /dev/null
@@ -1,205 +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 <linux/module.h>
-#include <asm/irq.h>
-#include <asm/mpc8260.h>
-#include <asm/page.h>
-#include <asm/pgtable.h>
-#include <asm/immap_cpm2.h>
-#include <asm/cpm2.h>
-#include <asm/rheap.h>
-
-static void cpm2_dpinit(void);
-cpm_cpm2_t     *cpmp;          /* Pointer to comm processor space */
-
-/* We allocate this here because it is used almost exclusively for
- * the communication processor devices.
- */
-cpm2_map_t *cpm2_immr;
-
-void
-cpm2_reset(void)
-{
-       cpm2_immr = (cpm2_map_t *)CPM_MAP_ADDR;
-
-       /* Reclaim the DP memory for our use.
-        */
-       cpm2_dpinit();
-
-       /* Tell everyone where the comm processor resides.
-        */
-       cpmp = &cpm2_immr->im_cpm;
-}
-
-/* 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
-cpm2_setbrg(uint brg, uint rate)
-{
-       volatile uint   *bp;
-
-       /* This is good enough to get SMCs running.....
-       */
-       if (brg < 4) {
-               bp = (uint *)&cpm2_immr->im_brgc1;
-       }
-       else {
-               bp = (uint *)&cpm2_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
-cpm2_fastbrg(uint brg, uint rate, int div16)
-{
-       volatile uint   *bp;
-
-       if (brg < 4) {
-               bp = (uint *)&cpm2_immr->im_brgc1;
-       }
-       else {
-               bp = (uint *)&cpm2_immr->im_brgc5;
-               brg -= 4;
-       }
-       bp += brg;
-       *bp = ((BRG_INT_CLK / rate) << 1) | CPM_BRG_EN;
-       if (div16)
-               *bp |= CPM_BRG_DIV16;
-}
-
-/*
- * dpalloc / dpfree bits.
- */
-static spinlock_t cpm_dpmem_lock;
-/* 16 blocks should be enough to satisfy all requests
- * until the memory subsystem goes up... */
-static rh_block_t cpm_boot_dpmem_rh_block[16];
-static rh_info_t cpm_dpmem_info;
-
-static void cpm2_dpinit(void)
-{
-       void *dprambase = &((cpm2_map_t *)CPM_MAP_ADDR)->im_dprambase;
-
-       spin_lock_init(&cpm_dpmem_lock);
-
-       /* initialize the info header */
-       rh_init(&cpm_dpmem_info, 1,
-                       sizeof(cpm_boot_dpmem_rh_block) /
-                       sizeof(cpm_boot_dpmem_rh_block[0]),
-                       cpm_boot_dpmem_rh_block);
-
-       /* Attach the usable dpmem area */
-       /* XXX: This is actually crap. CPM_DATAONLY_BASE and
-        * CPM_DATAONLY_SIZE is only a subset of the available dpram. It
-        * varies with the processor and the microcode patches activated.
-        * But the following should be at least safe.
-        */
-       rh_attach_region(&cpm_dpmem_info, dprambase + CPM_DATAONLY_BASE,
-                       CPM_DATAONLY_SIZE);
-}
-
-/* This function used to return an index into the DPRAM area.
- * Now it returns the actuall physical address of that area.
- * use cpm2_dpram_offset() to get the index
- */
-void *cpm2_dpalloc(uint size, uint align)
-{
-       void *start;
-       unsigned long flags;
-
-       spin_lock_irqsave(&cpm_dpmem_lock, flags);
-       cpm_dpmem_info.alignment = align;
-       start = rh_alloc(&cpm_dpmem_info, size, "commproc");
-       spin_unlock_irqrestore(&cpm_dpmem_lock, flags);
-
-       return start;
-}
-EXPORT_SYMBOL(cpm2_dpalloc);
-
-int cpm2_dpfree(void *addr)
-{
-       int ret;
-       unsigned long flags;
-
-       spin_lock_irqsave(&cpm_dpmem_lock, flags);
-       ret = rh_free(&cpm_dpmem_info, addr);
-       spin_unlock_irqrestore(&cpm_dpmem_lock, flags);
-
-       return ret;
-}
-EXPORT_SYMBOL(cpm2_dpfree);
-
-/* not sure if this is ever needed */
-void *cpm2_dpalloc_fixed(void *addr, uint size, uint align)
-{
-       void *start;
-       unsigned long flags;
-
-       spin_lock_irqsave(&cpm_dpmem_lock, flags);
-       cpm_dpmem_info.alignment = align;
-       start = rh_alloc_fixed(&cpm_dpmem_info, addr, size, "commproc");
-       spin_unlock_irqrestore(&cpm_dpmem_lock, flags);
-
-       return start;
-}
-EXPORT_SYMBOL(cpm2_dpalloc_fixed);
-
-void cpm2_dpdump(void)
-{
-       rh_dump(&cpm_dpmem_info);
-}
-EXPORT_SYMBOL(cpm2_dpdump);
-
-uint cpm2_dpram_offset(void *addr)
-{
-       return (uint)((u_char *)addr -
-                       ((uint)((cpm2_map_t *)CPM_MAP_ADDR)->im_dprambase));
-}
-EXPORT_SYMBOL(cpm2_dpram_offset);
-
-void *cpm2_dpram_addr(int offset)
-{
-       return (void *)&((cpm2_map_t *)CPM_MAP_ADDR)->im_dprambase[offset];
-}
-EXPORT_SYMBOL(cpm2_dpram_addr);
diff --git a/arch/ppc/syslib/cpm2_pic.c b/arch/ppc/syslib/cpm2_pic.c
deleted file mode 100644 (file)
index 43eac41..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_cpm2.h>
-#include <asm/mpc8260.h>
-#include "cpm2_pic.h"
-
-/* The CPM2 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 cpm2_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 = &(cpm2_immr->im_intctl.ic_simrh);
-       ppc_cached_irq_mask[word] &= ~(1 << (31 - bit));
-       simr[word] = ppc_cached_irq_mask[word];
-}
-
-static void cpm2_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 = &(cpm2_immr->im_intctl.ic_simrh);
-       ppc_cached_irq_mask[word] |= (1 << (31 - bit));
-       simr[word] = ppc_cached_irq_mask[word];
-}
-
-static void cpm2_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 = &(cpm2_immr->im_intctl.ic_simrh);
-       sipnr = &(cpm2_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 cpm2_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 = &(cpm2_immr->im_intctl.ic_simrh);
-               ppc_cached_irq_mask[word] |= (1 << (31 - bit));
-               simr[word] = ppc_cached_irq_mask[word];
-       }
-}
-
-struct hw_interrupt_type cpm2_pic = {
-       " CPM2 SIU  ",
-       NULL,
-       NULL,
-       cpm2_unmask_irq,
-       cpm2_mask_irq,
-       cpm2_mask_and_ack,
-       cpm2_end_irq,
-       0
-};
-
-
-int
-cpm2_get_irq(struct pt_regs *regs)
-{
-       int irq;
-        unsigned long bits;
-
-        /* For CPM2, read the SIVEC register and shift the bits down
-         * to get the irq number.         */
-        bits = cpm2_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/cpm2_pic.h b/arch/ppc/syslib/cpm2_pic.h
deleted file mode 100644 (file)
index a9da441..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-#ifndef _PPC_KERNEL_CPM2_H
-#define _PPC_KERNEL_CPM2_H
-
-#include <linux/irq.h>
-
-extern struct hw_interrupt_type cpm2_pic;
-
-void cpm2_pic_init(void);
-void cpm2_do_IRQ(struct pt_regs *regs,
-                 int            cpu);
-int cpm2_get_irq(struct pt_regs *regs);
-
-#endif /* _PPC_KERNEL_CPM2_H */
diff --git a/arch/ppc/syslib/m8260_pci.c b/arch/ppc/syslib/m8260_pci.c
deleted file mode 100644 (file)
index bd564fb..0000000
+++ /dev/null
@@ -1,194 +0,0 @@
-/*
- * (C) Copyright 2003
- * Wolfgang Denk, DENX Software Engineering, wd@denx.de.
- *
- * (C) Copyright 2004 Red Hat, Inc.
- *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
- * 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/init.h>
-#include <linux/pci.h>
-#include <linux/slab.h>
-#include <linux/delay.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/immap_cpm2.h>
-#include <asm/mpc8260.h>
-
-#include "m8260_pci.h"
-
-
-/* PCI bus configuration registers.
- */
-
-static void __init m8260_setup_pci(struct pci_controller *hose)
-{
-       volatile cpm2_map_t *immap = cpm2_immr;
-       unsigned long pocmr;
-       u16 tempShort;
-
-#ifndef CONFIG_ATC     /* already done in U-Boot */
-       /* 
-        * Setting required to enable IRQ1-IRQ7 (SIUMCR [DPPC]), 
-        * and local bus for PCI (SIUMCR [LBPC]).
-        */
-       immap->im_siu_conf.siu_82xx.sc_siumcr = 0x00640000;
-#endif
-
-       /* Make PCI lowest priority */
-       /* Each 4 bits is a device bus request  and the MS 4bits 
-          is highest priority */
-       /* Bus               4bit value 
-          ---               ----------
-          CPM high          0b0000
-          CPM middle        0b0001
-          CPM low           0b0010
-          PCI reguest       0b0011
-          Reserved          0b0100
-          Reserved          0b0101
-          Internal Core     0b0110
-          External Master 1 0b0111
-          External Master 2 0b1000
-          External Master 3 0b1001
-          The rest are reserved */
-       immap->im_siu_conf.siu_82xx.sc_ppc_alrh = 0x61207893;
-
-       /* Park bus on core while modifying PCI Bus accesses */
-       immap->im_siu_conf.siu_82xx.sc_ppc_acr = 0x6;
-
-       /* 
-        * Set up master window that allows the CPU to access PCI space. This 
-        * window is set up using the first SIU PCIBR registers.
-        */
-       immap->im_memctl.memc_pcimsk0 = MPC826x_PCI_MASK;
-       immap->im_memctl.memc_pcibr0 =  MPC826x_PCI_BASE | PCIBR_ENABLE;
-
-       /* Disable machine check on no response or target abort */
-       immap->im_pci.pci_emr = cpu_to_le32(0x1fe7);
-       /* Release PCI RST (by default the PCI RST signal is held low)  */
-       immap->im_pci.pci_gcr = cpu_to_le32(PCIGCR_PCI_BUS_EN);
-
-       /* give it some time */
-       mdelay(1);
-
-       /* 
-        * Set up master window that allows the CPU to access PCI Memory (prefetch) 
-        * space. This window is set up using the first set of Outbound ATU registers.
-        */
-       immap->im_pci.pci_potar0 = cpu_to_le32(MPC826x_PCI_LOWER_MEM >> 12);
-       immap->im_pci.pci_pobar0 = cpu_to_le32((MPC826x_PCI_LOWER_MEM - MPC826x_PCI_MEM_OFFSET) >> 12);
-       pocmr = ((MPC826x_PCI_UPPER_MEM - MPC826x_PCI_LOWER_MEM) >> 12) ^ 0xfffff;
-       immap->im_pci.pci_pocmr0 = cpu_to_le32(pocmr | POCMR_ENABLE | POCMR_PREFETCH_EN);
-
-       /* 
-        * Set up master window that allows the CPU to access PCI Memory (non-prefetch) 
-        * space. This window is set up using the second set of Outbound ATU registers.
-        */
-       immap->im_pci.pci_potar1 = cpu_to_le32(MPC826x_PCI_LOWER_MMIO >> 12);
-       immap->im_pci.pci_pobar1 = cpu_to_le32((MPC826x_PCI_LOWER_MMIO - MPC826x_PCI_MMIO_OFFSET) >> 12);
-       pocmr = ((MPC826x_PCI_UPPER_MMIO - MPC826x_PCI_LOWER_MMIO) >> 12) ^ 0xfffff;
-       immap->im_pci.pci_pocmr1 = cpu_to_le32(pocmr | POCMR_ENABLE);
-
-       /* 
-        * Set up master window that allows the CPU to access PCI IO space. This window
-        * is set up using the third set of Outbound ATU registers.
-        */
-       immap->im_pci.pci_potar2 = cpu_to_le32(MPC826x_PCI_IO_BASE >> 12);
-       immap->im_pci.pci_pobar2 = cpu_to_le32(MPC826x_PCI_LOWER_IO >> 12);
-       pocmr = ((MPC826x_PCI_UPPER_IO - MPC826x_PCI_LOWER_IO) >> 12) ^ 0xfffff;
-       immap->im_pci.pci_pocmr2 = cpu_to_le32(pocmr | POCMR_ENABLE | POCMR_PCI_IO);
-
-       /* 
-        * Set up slave window that allows PCI masters to access MPC826x local memory. 
-        * This window is set up using the first set of Inbound ATU registers
-        */
-
-       immap->im_pci.pci_pitar0 = cpu_to_le32(MPC826x_PCI_SLAVE_MEM_LOCAL >> 12);
-       immap->im_pci.pci_pibar0 = cpu_to_le32(MPC826x_PCI_SLAVE_MEM_BUS >> 12);
-       pocmr = ((MPC826x_PCI_SLAVE_MEM_SIZE-1) >> 12) ^ 0xfffff;
-       immap->im_pci.pci_picmr0 = cpu_to_le32(pocmr | PICMR_ENABLE | PICMR_PREFETCH_EN);
-
-       /* See above for description - puts PCI request as highest priority */
-       immap->im_siu_conf.siu_82xx.sc_ppc_alrh = 0x03124567;
-
-       /* Park the bus on the PCI */
-       immap->im_siu_conf.siu_82xx.sc_ppc_acr = PPC_ACR_BUS_PARK_PCI;
-
-       /* Host mode - specify the bridge as a host-PCI bridge */
-       early_write_config_word(hose, 0, 0, PCI_CLASS_DEVICE, PCI_CLASS_BRIDGE_HOST);
-
-       /* Enable the host bridge to be a master on the PCI bus, and to act as a PCI memory target */
-       early_read_config_word(hose, 0, 0, PCI_COMMAND, &tempShort);
-       early_write_config_word(hose, 0, 0, PCI_COMMAND,
-                               tempShort | PCI_COMMAND_MASTER | PCI_COMMAND_MEMORY);
-}
-
-void __init m8260_find_bridges(void)
-{
-       extern int pci_assign_all_busses;
-       struct pci_controller * hose;
-
-       pci_assign_all_busses = 1;
-
-       hose = pcibios_alloc_controller();
-
-       if (!hose)
-               return;
-
-       ppc_md.pci_swizzle = common_swizzle;
-
-       hose->first_busno = 0;
-       hose->bus_offset = 0;
-       hose->last_busno = 0xff;
-
-       setup_m8260_indirect_pci(hose, 
-                                (unsigned long)&cpm2_immr->im_pci.pci_cfg_addr,
-                                (unsigned long)&cpm2_immr->im_pci.pci_cfg_data);
-
-       m8260_setup_pci(hose);
-        hose->pci_mem_offset = MPC826x_PCI_MEM_OFFSET;
-
-        isa_io_base =
-                (unsigned long) ioremap(MPC826x_PCI_IO_BASE,
-                                        MPC826x_PCI_IO_SIZE);
-        hose->io_base_virt = (void *) isa_io_base;
-        /* setup resources */
-        pci_init_resource(&hose->mem_resources[0],
-                         MPC826x_PCI_LOWER_MEM,
-                         MPC826x_PCI_UPPER_MEM,
-                         IORESOURCE_MEM|IORESOURCE_PREFETCH, "PCI prefetchable memory");
-
-        pci_init_resource(&hose->mem_resources[1],
-                         MPC826x_PCI_LOWER_MMIO,
-                         MPC826x_PCI_UPPER_MMIO,
-                         IORESOURCE_MEM, "PCI memory");
-
-        pci_init_resource(&hose->io_resource,
-                         MPC826x_PCI_LOWER_IO,
-                         MPC826x_PCI_UPPER_IO,
-                         IORESOURCE_IO, "PCI I/O");
-}
diff --git a/arch/ppc/syslib/m8260_pci.h b/arch/ppc/syslib/m8260_pci.h
deleted file mode 100644 (file)
index 4e2ce7f..0000000
+++ /dev/null
@@ -1,75 +0,0 @@
-
-#ifndef _PPC_KERNEL_M8260_PCI_H
-#define _PPC_KERNEL_M8260_PCI_H
-
-#include <asm/m8260_pci.h>
-
-/*
- *   Local->PCI map (from CPU)                             controlled by
- *   MPC826x master window
- *
- *   0x80000000 - 0xBFFFFFFF    Total CPU2PCI space        PCIBR0
- *                       
- *   0x80000000 - 0x9FFFFFFF    PCI Mem with prefetch      (Outbound ATU #1)
- *   0xA0000000 - 0xAFFFFFFF    PCI Mem w/o  prefetch      (Outbound ATU #2)
- *   0xB0000000 - 0xB0FFFFFF    32-bit PCI IO              (Outbound ATU #3)
- *                      
- *   PCI->Local map (from PCI)
- *   MPC826x slave window                                  controlled by
- *
- *   0x00000000 - 0x07FFFFFF    MPC826x local memory       (Inbound ATU #1)
- */
-
-/* 
- * Slave window that allows PCI masters to access MPC826x local memory. 
- * This window is set up using the first set of Inbound ATU registers
- */
-
-#ifndef MPC826x_PCI_SLAVE_MEM_LOCAL
-#define MPC826x_PCI_SLAVE_MEM_LOCAL    (((struct bd_info *)__res)->bi_memstart)
-#define MPC826x_PCI_SLAVE_MEM_BUS      (((struct bd_info *)__res)->bi_memstart)
-#define MPC826x_PCI_SLAVE_MEM_SIZE     (((struct bd_info *)__res)->bi_memsize)
-#endif
-
-/* 
- * This is the window that allows the CPU to access PCI address space.
- * It will be setup with the SIU PCIBR0 register. All three PCI master
- * windows, which allow the CPU to access PCI prefetch, non prefetch,
- * and IO space (see below), must all fit within this window. 
- */
-#ifndef MPC826x_PCI_BASE
-#define MPC826x_PCI_BASE       0x80000000
-#define MPC826x_PCI_MASK       0xc0000000
-#endif
-
-#ifndef MPC826x_PCI_LOWER_MEM
-#define MPC826x_PCI_LOWER_MEM  0x80000000
-#define MPC826x_PCI_UPPER_MEM  0x9fffffff
-#define MPC826x_PCI_MEM_OFFSET 0x00000000
-#endif
-
-#ifndef MPC826x_PCI_LOWER_MMIO
-#define MPC826x_PCI_LOWER_MMIO  0xa0000000
-#define MPC826x_PCI_UPPER_MMIO  0xafffffff
-#define MPC826x_PCI_MMIO_OFFSET 0x00000000
-#endif
-
-#ifndef MPC826x_PCI_LOWER_IO
-#define MPC826x_PCI_LOWER_IO   0x00000000
-#define MPC826x_PCI_UPPER_IO   0x00ffffff
-#define MPC826x_PCI_IO_BASE    0xb0000000
-#define MPC826x_PCI_IO_SIZE    0x01000000
-#endif
-
-#ifndef _IO_BASE
-#define _IO_BASE isa_io_base
-#endif
-
-#ifdef CONFIG_8260_PCI9
-extern void setup_m8260_indirect_pci(struct pci_controller* hose,
-                                    u32 cfg_addr, u32 cfg_data);
-#else
-#define setup_m8260_indirect_pci setup_indirect_pci
-#endif
-
-#endif /* _PPC_KERNEL_M8260_PCI_H */
diff --git a/arch/ppc/syslib/m8260_pci_erratum9.c b/arch/ppc/syslib/m8260_pci_erratum9.c
deleted file mode 100644 (file)
index ae76a1b..0000000
+++ /dev/null
@@ -1,474 +0,0 @@
-/*
- * arch/ppc/platforms/mpc8260_pci9.c
- *
- * Workaround for device erratum PCI 9.
- * See Motorola's "XPC826xA Family Device Errata Reference."
- * The erratum applies to all 8260 family Hip4 processors.  It is scheduled 
- * to be fixed in HiP4 Rev C.  Erratum PCI 9 states that a simultaneous PCI 
- * inbound write transaction and PCI outbound read transaction can result in a 
- * bus deadlock.  The suggested workaround is to use the IDMA controller to 
- * perform all reads from PCI configuration, memory, and I/O space.
- *
- * Author:  andy_lowe@mvista.com
- *
- * 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/kernel.h>
-#include <linux/config.h>
-#include <linux/module.h>
-#include <linux/pci.h>
-#include <linux/types.h>
-#include <linux/string.h>
-
-#include <asm/io.h>
-#include <asm/pci-bridge.h>
-#include <asm/machdep.h>
-#include <asm/byteorder.h>
-#include <asm/mpc8260.h>
-#include <asm/immap_cpm2.h>
-#include <asm/cpm2.h>
-
-#include "m8260_pci.h"
-
-#ifdef CONFIG_8260_PCI9
-/*#include <asm/mpc8260_pci9.h>*/ /* included in asm/io.h */
-
-#define IDMA_XFER_BUF_SIZE 64  /* size of the IDMA transfer buffer */
-
-/* define a structure for the IDMA dpram usage */
-typedef struct idma_dpram_s {
-       idma_t pram;                            /* IDMA parameter RAM */
-       u_char xfer_buf[IDMA_XFER_BUF_SIZE];    /* IDMA transfer buffer */
-       idma_bd_t bd;                           /* buffer descriptor */
-} idma_dpram_t;
-
-/* define offsets relative to start of IDMA dpram */
-#define IDMA_XFER_BUF_OFFSET (sizeof(idma_t))
-#define IDMA_BD_OFFSET (sizeof(idma_t) + IDMA_XFER_BUF_SIZE)
-
-/* define globals */
-static volatile idma_dpram_t *idma_dpram;
-
-/* Exactly one of CONFIG_8260_PCI9_IDMAn must be defined, 
- * where n is 1, 2, 3, or 4.  This selects the IDMA channel used for 
- * the PCI9 workaround.
- */
-#ifdef CONFIG_8260_PCI9_IDMA1
-#define IDMA_CHAN 0
-#define PROFF_IDMA PROFF_IDMA1_BASE
-#define IDMA_PAGE CPM_CR_IDMA1_PAGE
-#define IDMA_SBLOCK CPM_CR_IDMA1_SBLOCK
-#endif
-#ifdef CONFIG_8260_PCI9_IDMA2
-#define IDMA_CHAN 1
-#define PROFF_IDMA PROFF_IDMA2_BASE
-#define IDMA_PAGE CPM_CR_IDMA2_PAGE
-#define IDMA_SBLOCK CPM_CR_IDMA2_SBLOCK
-#endif
-#ifdef CONFIG_8260_PCI9_IDMA3
-#define IDMA_CHAN 2
-#define PROFF_IDMA PROFF_IDMA3_BASE
-#define IDMA_PAGE CPM_CR_IDMA3_PAGE
-#define IDMA_SBLOCK CPM_CR_IDMA3_SBLOCK
-#endif
-#ifdef CONFIG_8260_PCI9_IDMA4
-#define IDMA_CHAN 3
-#define PROFF_IDMA PROFF_IDMA4_BASE
-#define IDMA_PAGE CPM_CR_IDMA4_PAGE
-#define IDMA_SBLOCK CPM_CR_IDMA4_SBLOCK
-#endif
-
-void idma_pci9_init(void)
-{
-       uint dpram_offset;
-       volatile idma_t *pram;
-       volatile im_idma_t *idma_reg;
-       volatile cpm2_map_t *immap = cpm2_immr;
-
-       /* allocate IDMA dpram */
-       dpram_offset = cpm2_dpalloc(sizeof(idma_dpram_t), 64);
-       idma_dpram = 
-               (volatile idma_dpram_t *)&immap->im_dprambase[dpram_offset];
-
-       /* initialize the IDMA parameter RAM */
-       memset((void *)idma_dpram, 0, sizeof(idma_dpram_t));
-       pram = &idma_dpram->pram;
-       pram->ibase = dpram_offset + IDMA_BD_OFFSET;
-       pram->dpr_buf = dpram_offset + IDMA_XFER_BUF_OFFSET;
-       pram->ss_max = 32;
-       pram->dts = 32;
-
-       /* initialize the IDMA_BASE pointer to the IDMA parameter RAM */
-       *((ushort *) &immap->im_dprambase[PROFF_IDMA]) = dpram_offset;
-
-       /* initialize the IDMA registers */
-       idma_reg = (volatile im_idma_t *) &immap->im_sdma.sdma_idsr1;
-       idma_reg[IDMA_CHAN].idmr = 0;           /* mask all IDMA interrupts */
-       idma_reg[IDMA_CHAN].idsr = 0xff;        /* clear all event flags */
-
-       printk("<4>Using IDMA%d for MPC8260 device erratum PCI 9 workaround\n",
-               IDMA_CHAN + 1);
-
-       return;
-}
-
-/* Use the IDMA controller to transfer data from I/O memory to local RAM.
- * The src address must be a physical address suitable for use by the DMA 
- * controller with no translation.  The dst address must be a kernel virtual 
- * address.  The dst address is translated to a physical address via 
- * virt_to_phys().
- * The sinc argument specifies whether or not the source address is incremented
- * by the DMA controller.  The source address is incremented if and only if sinc
- * is non-zero.  The destination address is always incremented since the 
- * destination is always host RAM.
- */
-static void 
-idma_pci9_read(u8 *dst, u8 *src, int bytes, int unit_size, int sinc)
-{
-       unsigned long flags;
-       volatile idma_t *pram = &idma_dpram->pram;
-       volatile idma_bd_t *bd = &idma_dpram->bd;
-       volatile cpm2_map_t *immap = cpm2_immr;
-
-       local_irq_save(flags);
-
-       /* initialize IDMA parameter RAM for this transfer */
-       if (sinc)
-               pram->dcm = IDMA_DCM_DMA_WRAP_64 | IDMA_DCM_SINC
-                         | IDMA_DCM_DINC | IDMA_DCM_SD_MEM2MEM;
-       else
-               pram->dcm = IDMA_DCM_DMA_WRAP_64 | IDMA_DCM_DINC 
-                         | IDMA_DCM_SD_MEM2MEM;
-       pram->ibdptr = pram->ibase;
-       pram->sts = unit_size;
-       pram->istate = 0;
-
-       /* initialize the buffer descriptor */
-       bd->dst = virt_to_phys(dst);
-       bd->src = (uint) src;
-       bd->len = bytes;
-       bd->flags = IDMA_BD_V | IDMA_BD_W | IDMA_BD_I | IDMA_BD_L | IDMA_BD_DGBL
-                 | IDMA_BD_DBO_BE | IDMA_BD_SBO_BE | IDMA_BD_SDTB;
-
-       /* issue the START_IDMA command to the CP */
-       while (immap->im_cpm.cp_cpcr & CPM_CR_FLG);
-       immap->im_cpm.cp_cpcr = mk_cr_cmd(IDMA_PAGE, IDMA_SBLOCK, 0,
-                                        CPM_CR_START_IDMA) | CPM_CR_FLG;
-       while (immap->im_cpm.cp_cpcr & CPM_CR_FLG);
-
-       /* wait for transfer to complete */
-       while(bd->flags & IDMA_BD_V);
-
-       local_irq_restore(flags);
-
-       return;
-}
-
-/* Use the IDMA controller to transfer data from I/O memory to local RAM.
- * The dst address must be a physical address suitable for use by the DMA 
- * controller with no translation.  The src address must be a kernel virtual 
- * address.  The src address is translated to a physical address via 
- * virt_to_phys().
- * The dinc argument specifies whether or not the dest address is incremented
- * by the DMA controller.  The source address is incremented if and only if sinc
- * is non-zero.  The source address is always incremented since the 
- * source is always host RAM.
- */
-static void 
-idma_pci9_write(u8 *dst, u8 *src, int bytes, int unit_size, int dinc)
-{
-       unsigned long flags;
-       volatile idma_t *pram = &idma_dpram->pram;
-       volatile idma_bd_t *bd = &idma_dpram->bd;
-       volatile cpm2_map_t *immap = cpm2_immr;
-
-       local_irq_save(flags);
-
-       /* initialize IDMA parameter RAM for this transfer */
-       if (dinc)
-               pram->dcm = IDMA_DCM_DMA_WRAP_64 | IDMA_DCM_SINC
-                         | IDMA_DCM_DINC | IDMA_DCM_SD_MEM2MEM;
-       else
-               pram->dcm = IDMA_DCM_DMA_WRAP_64 | IDMA_DCM_SINC 
-                         | IDMA_DCM_SD_MEM2MEM;
-       pram->ibdptr = pram->ibase;
-       pram->sts = unit_size;
-       pram->istate = 0;
-
-       /* initialize the buffer descriptor */
-       bd->dst = (uint) dst;
-       bd->src = virt_to_phys(src);
-       bd->len = bytes;
-       bd->flags = IDMA_BD_V | IDMA_BD_W | IDMA_BD_I | IDMA_BD_L | IDMA_BD_DGBL
-                 | IDMA_BD_DBO_BE | IDMA_BD_SBO_BE | IDMA_BD_SDTB;
-
-       /* issue the START_IDMA command to the CP */
-       while (immap->im_cpm.cp_cpcr & CPM_CR_FLG);
-       immap->im_cpm.cp_cpcr = mk_cr_cmd(IDMA_PAGE, IDMA_SBLOCK, 0,
-                                        CPM_CR_START_IDMA) | CPM_CR_FLG;
-       while (immap->im_cpm.cp_cpcr & CPM_CR_FLG);
-
-       /* wait for transfer to complete */
-       while(bd->flags & IDMA_BD_V);
-
-       local_irq_restore(flags);
-
-       return;
-}
-
-/* Same as idma_pci9_read, but 16-bit little-endian byte swapping is performed
- * if the unit_size is 2, and 32-bit little-endian byte swapping is performed if
- * the unit_size is 4.
- */
-static void 
-idma_pci9_read_le(u8 *dst, u8 *src, int bytes, int unit_size, int sinc)
-{
-       int i;
-       u8 *p;
-
-       idma_pci9_read(dst, src, bytes, unit_size, sinc);
-       switch(unit_size) {
-               case 2:
-                       for (i = 0, p = dst; i < bytes; i += 2, p += 2)
-                               swab16s((u16 *) p);
-                       break;
-               case 4:
-                       for (i = 0, p = dst; i < bytes; i += 4, p += 4)
-                               swab32s((u32 *) p);
-                       break;
-               default:
-                       break;
-       }
-}
-EXPORT_SYMBOL(idma_pci9_init);
-EXPORT_SYMBOL(idma_pci9_read);
-EXPORT_SYMBOL(idma_pci9_read_le);
-
-static inline int is_pci_mem(unsigned long addr)
-{
-       if (addr >= MPC826x_PCI_LOWER_MMIO &&
-           addr <= MPC826x_PCI_UPPER_MMIO)
-               return 1;
-       if (addr >= MPC826x_PCI_LOWER_MEM &&
-           addr <= MPC826x_PCI_UPPER_MEM)
-               return 1;
-       return 0;
-}
-
-#define is_pci_mem(pa) ( (pa > 0x80000000) && (pa < 0xc0000000))
-int readb(volatile unsigned char *addr)
-{
-       u8 val;
-       unsigned long pa = iopa((unsigned long) addr);
-
-       if (!is_pci_mem(pa))
-               return in_8(addr);
-
-       idma_pci9_read((u8 *)&val, (u8 *)pa, sizeof(val), sizeof(val), 0);
-       return val;
-}
-
-int readw(volatile unsigned short *addr)
-{
-       u16 val;
-       unsigned long pa = iopa((unsigned long) addr);
-
-       if (!is_pci_mem(pa))
-               return in_le16(addr);
-
-       idma_pci9_read((u8 *)&val, (u8 *)pa, sizeof(val), sizeof(val), 0);
-       return swab16(val);
-}
-
-unsigned readl(volatile unsigned *addr)
-{
-       u32 val;
-       unsigned long pa = iopa((unsigned long) addr);
-
-       if (!is_pci_mem(pa))
-               return in_le32(addr);
-
-       idma_pci9_read((u8 *)&val, (u8 *)pa, sizeof(val), sizeof(val), 0);
-       return swab32(val);
-}
-
-int inb(unsigned port)
-{
-       u8 val;
-       u8 *addr = (u8 *)(port + _IO_BASE);
-
-       idma_pci9_read((u8 *)&val, (u8 *)addr, sizeof(val), sizeof(val), 0);
-       return val;
-}
-
-int inw(unsigned port)
-{
-       u16 val;
-       u8 *addr = (u8 *)(port + _IO_BASE);
-
-       idma_pci9_read((u8 *)&val, (u8 *)addr, sizeof(val), sizeof(val), 0);
-       return swab16(val);
-}
-
-unsigned inl(unsigned port)
-{
-       u32 val;
-       u8 *addr = (u8 *)(port + _IO_BASE);
-
-       idma_pci9_read((u8 *)&val, (u8 *)addr, sizeof(val), sizeof(val), 0);
-       return swab32(val);
-}
-
-void insb(unsigned port, void *buf, int ns)
-{
-       u8 *addr = (u8 *)(port + _IO_BASE);
-
-       idma_pci9_read((u8 *)buf, (u8 *)addr, ns*sizeof(u8), sizeof(u8), 0);
-}
-
-void insw(unsigned port, void *buf, int ns)
-{
-       u8 *addr = (u8 *)(port + _IO_BASE);
-
-       idma_pci9_read((u8 *)buf, (u8 *)addr, ns*sizeof(u16), sizeof(u16), 0);
-}
-
-void insl(unsigned port, void *buf, int nl)
-{
-       u8 *addr = (u8 *)(port + _IO_BASE);
-
-       idma_pci9_read((u8 *)buf, (u8 *)addr, nl*sizeof(u32), sizeof(u32), 0);
-}
-
-void insw_ns(unsigned port, void *buf, int ns)
-{
-       u8 *addr = (u8 *)(port + _IO_BASE);
-
-       idma_pci9_read((u8 *)buf, (u8 *)addr, ns*sizeof(u16), sizeof(u16), 0);
-}
-
-void insl_ns(unsigned port, void *buf, int nl)
-{
-       u8 *addr = (u8 *)(port + _IO_BASE);
-
-       idma_pci9_read((u8 *)buf, (u8 *)addr, nl*sizeof(u32), sizeof(u32), 0);
-}
-
-void *memcpy_fromio(void *dest, unsigned long src, size_t count)
-{
-       unsigned long pa = iopa((unsigned long) src);
-
-       if (is_pci_mem(pa))
-               idma_pci9_read((u8 *)dest, (u8 *)pa, count, 32, 1);
-       else
-               memcpy(dest, (void *)src, count);
-       return dest;
-}
-
-EXPORT_SYMBOL(readb);
-EXPORT_SYMBOL(readw);
-EXPORT_SYMBOL(readl);
-EXPORT_SYMBOL(inb);
-EXPORT_SYMBOL(inw);
-EXPORT_SYMBOL(inl);
-EXPORT_SYMBOL(insb);
-EXPORT_SYMBOL(insw);
-EXPORT_SYMBOL(insl);
-EXPORT_SYMBOL(insw_ns);
-EXPORT_SYMBOL(insl_ns);
-EXPORT_SYMBOL(memcpy_fromio);
-
-#endif /* ifdef CONFIG_8260_PCI9 */
-
-/* Indirect PCI routines adapted from arch/ppc/kernel/indirect_pci.c.
- * Copyright (C) 1998 Gabriel Paubert.
- */
-#ifndef CONFIG_8260_PCI9
-#define cfg_read(val, addr, type, op)  *val = op((type)(addr))
-#else
-#define cfg_read(val, addr, type, op) \
-       idma_pci9_read_le((u8*)(val),(u8*)(addr),sizeof(*(val)),sizeof(*(val)),0)
-#endif
-
-#define cfg_write(val, addr, type, op) op((type *)(addr), (val))
-
-static int indirect_write_config(struct pci_bus *pbus, unsigned int devfn, int where,
-                        int size, u32 value)
-{
-       struct pci_controller *hose = pbus->sysdata;
-       u8 cfg_type = 0;
-       if (ppc_md.pci_exclude_device)
-               if (ppc_md.pci_exclude_device(pbus->number, devfn))
-                       return PCIBIOS_DEVICE_NOT_FOUND;
-
-       if (hose->set_cfg_type)
-               if (pbus->number != hose->first_busno)
-                       cfg_type = 1;
-
-       out_be32(hose->cfg_addr,
-                (((where & 0xfc) | cfg_type) << 24) | (devfn << 16)
-                | ((pbus->number - hose->bus_offset) << 8) | 0x80);
-
-       switch (size)
-       {
-               case 1:
-                       cfg_write(value, hose->cfg_data + (where & 3), u8, out_8);
-                       break;
-               case 2:
-                       cfg_write(value, hose->cfg_data + (where & 2), u16, out_le16);
-                       break;
-               case 4:
-                       cfg_write(value, hose->cfg_data + (where & 0), u32, out_le32);
-                       break;
-       }               
-       return PCIBIOS_SUCCESSFUL;
-}
-
-static int indirect_read_config(struct pci_bus *pbus, unsigned int devfn, int where,
-                        int size, u32 *value)
-{
-       struct pci_controller *hose = pbus->sysdata;
-       u8 cfg_type = 0;
-       if (ppc_md.pci_exclude_device)
-               if (ppc_md.pci_exclude_device(pbus->number, devfn))
-                       return PCIBIOS_DEVICE_NOT_FOUND;
-
-       if (hose->set_cfg_type)
-               if (pbus->number != hose->first_busno)
-                       cfg_type = 1;
-
-       out_be32(hose->cfg_addr,
-                (((where & 0xfc) | cfg_type) << 24) | (devfn << 16)
-                | ((pbus->number - hose->bus_offset) << 8) | 0x80);
-
-       switch (size)
-       {
-               case 1:
-                       cfg_read(value, hose->cfg_data + (where & 3), u8 *, in_8);
-                       break;
-               case 2:
-                       cfg_read(value, hose->cfg_data + (where & 2), u16 *, in_le16);
-                       break;
-               case 4:
-                       cfg_read(value, hose->cfg_data + (where & 0), u32 *, in_le32);
-                       break;
-       }               
-       return PCIBIOS_SUCCESSFUL;
-}
-
-static struct pci_ops indirect_pci_ops =
-{
-       .read = indirect_read_config,
-       .write = indirect_write_config,
-};
-
-void
-setup_m8260_indirect_pci(struct pci_controller* hose, u32 cfg_addr, u32 cfg_data)
-{
-       hose->ops = &indirect_pci_ops;
-       hose->cfg_addr = (unsigned int *) ioremap(cfg_addr, 4);
-       hose->cfg_data = (unsigned char *) ioremap(cfg_data, 4);
-}
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/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/kernel/vecemu.c b/arch/ppc64/kernel/vecemu.c
deleted file mode 100644 (file)
index 1430ef5..0000000
+++ /dev/null
@@ -1,346 +0,0 @@
-/*
- * Routines to emulate some Altivec/VMX instructions, specifically
- * those that can trap when given denormalized operands in Java mode.
- */
-#include <linux/kernel.h>
-#include <linux/errno.h>
-#include <linux/sched.h>
-#include <asm/ptrace.h>
-#include <asm/processor.h>
-#include <asm/uaccess.h>
-
-/* Functions in vector.S */
-extern void vaddfp(vector128 *dst, vector128 *a, vector128 *b);
-extern void vsubfp(vector128 *dst, vector128 *a, vector128 *b);
-extern void vmaddfp(vector128 *dst, vector128 *a, vector128 *b, vector128 *c);
-extern void vnmsubfp(vector128 *dst, vector128 *a, vector128 *b, vector128 *c);
-extern void vrefp(vector128 *dst, vector128 *src);
-extern void vrsqrtefp(vector128 *dst, vector128 *src);
-extern void vexptep(vector128 *dst, vector128 *src);
-
-static unsigned int exp2s[8] = {
-       0x800000,
-       0x8b95c2,
-       0x9837f0,
-       0xa5fed7,
-       0xb504f3,
-       0xc5672a,
-       0xd744fd,
-       0xeac0c7
-};
-
-/*
- * Computes an estimate of 2^x.  The `s' argument is the 32-bit
- * single-precision floating-point representation of x.
- */
-static unsigned int eexp2(unsigned int s)
-{
-       int exp, pwr;
-       unsigned int mant, frac;
-
-       /* extract exponent field from input */
-       exp = ((s >> 23) & 0xff) - 127;
-       if (exp > 7) {
-               /* check for NaN input */
-               if (exp == 128 && (s & 0x7fffff) != 0)
-                       return s | 0x400000;    /* return QNaN */
-               /* 2^-big = 0, 2^+big = +Inf */
-               return (s & 0x80000000)? 0: 0x7f800000; /* 0 or +Inf */
-       }
-       if (exp < -23)
-               return 0x3f800000;      /* 1.0 */
-
-       /* convert to fixed point integer in 9.23 representation */
-       pwr = (s & 0x7fffff) | 0x800000;
-       if (exp > 0)
-               pwr <<= exp;
-       else
-               pwr >>= -exp;
-       if (s & 0x80000000)
-               pwr = -pwr;
-
-       /* extract integer part, which becomes exponent part of result */
-       exp = (pwr >> 23) + 126;
-       if (exp >= 254)
-               return 0x7f800000;
-       if (exp < -23)
-               return 0;
-
-       /* table lookup on top 3 bits of fraction to get mantissa */
-       mant = exp2s[(pwr >> 20) & 7];
-
-       /* linear interpolation using remaining 20 bits of fraction */
-       asm("mulhwu %0,%1,%2" : "=r" (frac)
-           : "r" (pwr << 12), "r" (0x172b83ff));
-       asm("mulhwu %0,%1,%2" : "=r" (frac) : "r" (frac), "r" (mant));
-       mant += frac;
-
-       if (exp >= 0)
-               return mant + (exp << 23);
-
-       /* denormalized result */
-       exp = -exp;
-       mant += 1 << (exp - 1);
-       return mant >> exp;
-}
-
-/*
- * Computes an estimate of log_2(x).  The `s' argument is the 32-bit
- * single-precision floating-point representation of x.
- */
-static unsigned int elog2(unsigned int s)
-{
-       int exp, mant, lz, frac;
-
-       exp = s & 0x7f800000;
-       mant = s & 0x7fffff;
-       if (exp == 0x7f800000) {        /* Inf or NaN */
-               if (mant != 0)
-                       s |= 0x400000;  /* turn NaN into QNaN */
-               return s;
-       }
-       if ((exp | mant) == 0)          /* +0 or -0 */
-               return 0xff800000;      /* return -Inf */
-
-       if (exp == 0) {
-               /* denormalized */
-               asm("cntlzw %0,%1" : "=r" (lz) : "r" (mant));
-               mant <<= lz - 8;
-               exp = (-118 - lz) << 23;
-       } else {
-               mant |= 0x800000;
-               exp -= 127 << 23;
-       }
-
-       if (mant >= 0xb504f3) {                         /* 2^0.5 * 2^23 */
-               exp |= 0x400000;                        /* 0.5 * 2^23 */
-               asm("mulhwu %0,%1,%2" : "=r" (mant)
-                   : "r" (mant), "r" (0xb504f334));    /* 2^-0.5 * 2^32 */
-       }
-       if (mant >= 0x9837f0) {                         /* 2^0.25 * 2^23 */
-               exp |= 0x200000;                        /* 0.25 * 2^23 */
-               asm("mulhwu %0,%1,%2" : "=r" (mant)
-                   : "r" (mant), "r" (0xd744fccb));    /* 2^-0.25 * 2^32 */
-       }
-       if (mant >= 0x8b95c2) {                         /* 2^0.125 * 2^23 */
-               exp |= 0x100000;                        /* 0.125 * 2^23 */
-               asm("mulhwu %0,%1,%2" : "=r" (mant)
-                   : "r" (mant), "r" (0xeac0c6e8));    /* 2^-0.125 * 2^32 */
-       }
-       if (mant > 0x800000) {                          /* 1.0 * 2^23 */
-               /* calculate (mant - 1) * 1.381097463 */
-               /* 1.381097463 == 0.125 / (2^0.125 - 1) */
-               asm("mulhwu %0,%1,%2" : "=r" (frac)
-                   : "r" ((mant - 0x800000) << 1), "r" (0xb0c7cd3a));
-               exp += frac;
-       }
-       s = exp & 0x80000000;
-       if (exp != 0) {
-               if (s)
-                       exp = -exp;
-               asm("cntlzw %0,%1" : "=r" (lz) : "r" (exp));
-               lz = 8 - lz;
-               if (lz > 0)
-                       exp >>= lz;
-               else if (lz < 0)
-                       exp <<= -lz;
-               s += ((lz + 126) << 23) + exp;
-       }
-       return s;
-}
-
-#define VSCR_SAT       1
-
-static int ctsxs(unsigned int x, int scale, unsigned int *vscrp)
-{
-       int exp, mant;
-
-       exp = (x >> 23) & 0xff;
-       mant = x & 0x7fffff;
-       if (exp == 255 && mant != 0)
-               return 0;               /* NaN -> 0 */
-       exp = exp - 127 + scale;
-       if (exp < 0)
-               return 0;               /* round towards zero */
-       if (exp >= 31) {
-               /* saturate, unless the result would be -2^31 */
-               if (x + (scale << 23) != 0xcf000000)
-                       *vscrp |= VSCR_SAT;
-               return (x & 0x80000000)? 0x80000000: 0x7fffffff;
-       }
-       mant |= 0x800000;
-       mant = (mant << 7) >> (30 - exp);
-       return (x & 0x80000000)? -mant: mant;
-}
-
-static unsigned int ctuxs(unsigned int x, int scale, unsigned int *vscrp)
-{
-       int exp;
-       unsigned int mant;
-
-       exp = (x >> 23) & 0xff;
-       mant = x & 0x7fffff;
-       if (exp == 255 && mant != 0)
-               return 0;               /* NaN -> 0 */
-       exp = exp - 127 + scale;
-       if (exp < 0)
-               return 0;               /* round towards zero */
-       if (x & 0x80000000) {
-               /* negative => saturate to 0 */
-               *vscrp |= VSCR_SAT;
-               return 0;
-       }
-       if (exp >= 32) {
-               /* saturate */
-               *vscrp |= VSCR_SAT;
-               return 0xffffffff;
-       }
-       mant |= 0x800000;
-       mant = (mant << 8) >> (31 - exp);
-       return mant;
-}
-
-/* Round to floating integer, towards 0 */
-static unsigned int rfiz(unsigned int x)
-{
-       int exp;
-
-       exp = ((x >> 23) & 0xff) - 127;
-       if (exp == 128 && (x & 0x7fffff) != 0)
-               return x | 0x400000;    /* NaN -> make it a QNaN */
-       if (exp >= 23)
-               return x;               /* it's an integer already (or Inf) */
-       if (exp < 0)
-               return x & 0x80000000;  /* |x| < 1.0 rounds to 0 */
-       return x & ~(0x7fffff >> exp);
-}
-
-/* Round to floating integer, towards +/- Inf */
-static unsigned int rfii(unsigned int x)
-{
-       int exp, mask;
-
-       exp = ((x >> 23) & 0xff) - 127;
-       if (exp == 128 && (x & 0x7fffff) != 0)
-               return x | 0x400000;    /* NaN -> make it a QNaN */
-       if (exp >= 23)
-               return x;               /* it's an integer already (or Inf) */
-       if ((x & 0x7fffffff) == 0)
-               return x;               /* +/-0 -> +/-0 */
-       if (exp < 0)
-               /* 0 < |x| < 1.0 rounds to +/- 1.0 */
-               return (x & 0x80000000) | 0x3f800000;
-       mask = 0x7fffff >> exp;
-       /* mantissa overflows into exponent - that's OK,
-          it can't overflow into the sign bit */
-       return (x + mask) & ~mask;
-}
-
-/* Round to floating integer, to nearest */
-static unsigned int rfin(unsigned int x)
-{
-       int exp, half;
-
-       exp = ((x >> 23) & 0xff) - 127;
-       if (exp == 128 && (x & 0x7fffff) != 0)
-               return x | 0x400000;    /* NaN -> make it a QNaN */
-       if (exp >= 23)
-               return x;               /* it's an integer already (or Inf) */
-       if (exp < -1)
-               return x & 0x80000000;  /* |x| < 0.5 -> +/-0 */
-       if (exp == -1)
-               /* 0.5 <= |x| < 1.0 rounds to +/- 1.0 */
-               return (x & 0x80000000) | 0x3f800000;
-       half = 0x400000 >> exp;
-       /* add 0.5 to the magnitude and chop off the fraction bits */
-       return (x + half) & ~(0x7fffff >> exp);
-}
-
-int
-emulate_altivec(struct pt_regs *regs)
-{
-       unsigned int instr, i;
-       unsigned int va, vb, vc, vd;
-       vector128 *vrs;
-
-       if (get_user(instr, (unsigned int *) regs->nip))
-               return -EFAULT;
-       if ((instr >> 26) != 4)
-               return -EINVAL;         /* not an altivec instruction */
-       vd = (instr >> 21) & 0x1f;
-       va = (instr >> 16) & 0x1f;
-       vb = (instr >> 11) & 0x1f;
-       vc = (instr >> 6) & 0x1f;
-
-       vrs = current->thread.vr;
-       switch (instr & 0x3f) {
-       case 10:
-               switch (vc) {
-               case 0: /* vaddfp */
-                       vaddfp(&vrs[vd], &vrs[va], &vrs[vb]);
-                       break;
-               case 1: /* vsubfp */
-                       vsubfp(&vrs[vd], &vrs[va], &vrs[vb]);
-                       break;
-               case 4: /* vrefp */
-                       vrefp(&vrs[vd], &vrs[vb]);
-                       break;
-               case 5: /* vrsqrtefp */
-                       vrsqrtefp(&vrs[vd], &vrs[vb]);
-                       break;
-               case 6: /* vexptefp */
-                       for (i = 0; i < 4; ++i)
-                               vrs[vd].u[i] = eexp2(vrs[vb].u[i]);
-                       break;
-               case 7: /* vlogefp */
-                       for (i = 0; i < 4; ++i)
-                               vrs[vd].u[i] = elog2(vrs[vb].u[i]);
-                       break;
-               case 8:         /* vrfin */
-                       for (i = 0; i < 4; ++i)
-                               vrs[vd].u[i] = rfin(vrs[vb].u[i]);
-                       break;
-               case 9:         /* vrfiz */
-                       for (i = 0; i < 4; ++i)
-                               vrs[vd].u[i] = rfiz(vrs[vb].u[i]);
-                       break;
-               case 10:        /* vrfip */
-                       for (i = 0; i < 4; ++i) {
-                               u32 x = vrs[vb].u[i];
-                               x = (x & 0x80000000)? rfiz(x): rfii(x);
-                               vrs[vd].u[i] = x;
-                       }
-                       break;
-               case 11:        /* vrfim */
-                       for (i = 0; i < 4; ++i) {
-                               u32 x = vrs[vb].u[i];
-                               x = (x & 0x80000000)? rfii(x): rfiz(x);
-                               vrs[vd].u[i] = x;
-                       }
-                       break;
-               case 14:        /* vctuxs */
-                       for (i = 0; i < 4; ++i)
-                               vrs[vd].u[i] = ctuxs(vrs[vb].u[i], va,
-                                               &current->thread.vscr.u[3]);
-                       break;
-               case 15:        /* vctsxs */
-                       for (i = 0; i < 4; ++i)
-                               vrs[vd].u[i] = ctsxs(vrs[vb].u[i], va,
-                                               &current->thread.vscr.u[3]);
-                       break;
-               default:
-                       return -EINVAL;
-               }
-               break;
-       case 46:        /* vmaddfp */
-               vmaddfp(&vrs[vd], &vrs[va], &vrs[vb], &vrs[vc]);
-               break;
-       case 47:        /* vnmsubfp */
-               vnmsubfp(&vrs[vd], &vrs[va], &vrs[vb], &vrs[vc]);
-               break;
-       default:
-               return -EINVAL;
-       }
-
-       return 0;
-}
diff --git a/arch/ppc64/kernel/vector.S b/arch/ppc64/kernel/vector.S
deleted file mode 100644 (file)
index 940cd72..0000000
+++ /dev/null
@@ -1,172 +0,0 @@
-#include <asm/ppc_asm.h>
-#include <asm/processor.h>
-
-/*
- * The routines below are in assembler so we can closely control the
- * usage of floating-point registers.  These routines must be called
- * with preempt disabled.
- */
-       .section ".toc","aw"
-fpzero:
-       .tc     FD_0_0[TC],0
-fpone:
-       .tc     FD_3ff00000_0[TC],0x3ff0000000000000    /* 1.0 */
-fphalf:
-       .tc     FD_3fe00000_0[TC],0x3fe0000000000000    /* 0.5 */
-
-       .text
-/*
- * Internal routine to enable floating point and set FPSCR to 0.
- * Don't call it from C; it doesn't use the normal calling convention.
- */
-fpenable:
-       mfmsr   r10
-       ori     r11,r10,MSR_FP
-       mtmsr   r11
-       isync
-       stfd    fr31,-8(r1)
-       stfd    fr0,-16(r1)
-       stfd    fr1,-24(r1)
-       mffs    fr31
-       lfd     fr1,fpzero@toc(r2)
-       mtfsf   0xff,fr1
-       blr
-
-fpdisable:
-       mtlr    r12
-       mtfsf   0xff,fr31
-       lfd     fr1,-24(r1)
-       lfd     fr0,-16(r1)
-       lfd     fr31,-8(r1)
-       mtmsr   r10
-       isync
-       blr
-
-/*
- * Vector add, floating point.
- */
-_GLOBAL(vaddfp)
-       mflr    r12
-       bl      fpenable
-       li      r0,4
-       mtctr   r0
-       li      r6,0
-1:     lfsx    fr0,r4,r6
-       lfsx    fr1,r5,r6
-       fadds   fr0,fr0,fr1
-       stfsx   fr0,r3,r6
-       addi    r6,r6,4
-       bdnz    1b
-       b       fpdisable
-
-/*
- * Vector subtract, floating point.
- */
-_GLOBAL(vsubfp)
-       mflr    r12
-       bl      fpenable
-       li      r0,4
-       mtctr   r0
-       li      r6,0
-1:     lfsx    fr0,r4,r6
-       lfsx    fr1,r5,r6
-       fsubs   fr0,fr0,fr1
-       stfsx   fr0,r3,r6
-       addi    r6,r6,4
-       bdnz    1b
-       b       fpdisable
-
-/*
- * Vector multiply and add, floating point.
- */
-_GLOBAL(vmaddfp)
-       mflr    r12
-       bl      fpenable
-       stfd    fr2,-32(r1)
-       li      r0,4
-       mtctr   r0
-       li      r7,0
-1:     lfsx    fr0,r4,r7
-       lfsx    fr1,r5,r7
-       lfsx    fr2,r6,r7
-       fmadds  fr0,fr0,fr1,fr2
-       stfsx   fr0,r3,r7
-       addi    r7,r7,4
-       bdnz    1b
-       lfd     fr2,-32(r1)
-       b       fpdisable
-
-/*
- * Vector negative multiply and subtract, floating point.
- */
-_GLOBAL(vnmsubfp)
-       mflr    r12
-       bl      fpenable
-       stfd    fr2,-32(r1)
-       li      r0,4
-       mtctr   r0
-       li      r7,0
-1:     lfsx    fr0,r4,r7
-       lfsx    fr1,r5,r7
-       lfsx    fr2,r6,r7
-       fnmsubs fr0,fr0,fr1,fr2
-       stfsx   fr0,r3,r7
-       addi    r7,r7,4
-       bdnz    1b
-       lfd     fr2,-32(r1)
-       b       fpdisable
-
-/*
- * Vector reciprocal estimate.  We just compute 1.0/x.
- * r3 -> destination, r4 -> source.
- */
-_GLOBAL(vrefp)
-       mflr    r12
-       bl      fpenable
-       li      r0,4
-       lfd     fr1,fpone@toc(r2)
-       mtctr   r0
-       li      r6,0
-1:     lfsx    fr0,r4,r6
-       fdivs   fr0,fr1,fr0
-       stfsx   fr0,r3,r6
-       addi    r6,r6,4
-       bdnz    1b
-       b       fpdisable
-
-/*
- * Vector reciprocal square-root estimate, floating point.
- * We use the frsqrte instruction for the initial estimate followed
- * by 2 iterations of Newton-Raphson to get sufficient accuracy.
- * r3 -> destination, r4 -> source.
- */
-_GLOBAL(vrsqrtefp)
-       mflr    r12
-       bl      fpenable
-       stfd    fr2,-32(r1)
-       stfd    fr3,-40(r1)
-       stfd    fr4,-48(r1)
-       stfd    fr5,-56(r1)
-       li      r0,4
-       lfd     fr4,fpone@toc(r2)
-       lfd     fr5,fphalf@toc(r2)
-       mtctr   r0
-       li      r6,0
-1:     lfsx    fr0,r4,r6
-       frsqrte fr1,fr0         /* r = frsqrte(s) */
-       fmuls   fr3,fr1,fr0     /* r * s */
-       fmuls   fr2,fr1,fr5     /* r * 0.5 */
-       fnmsubs fr3,fr1,fr3,fr4 /* 1 - s * r * r */
-       fmadds  fr1,fr2,fr3,fr1 /* r = r + 0.5 * r * (1 - s * r * r) */
-       fmuls   fr3,fr1,fr0     /* r * s */
-       fmuls   fr2,fr1,fr5     /* r * 0.5 */
-       fnmsubs fr3,fr1,fr3,fr4 /* 1 - s * r * r */
-       fmadds  fr1,fr2,fr3,fr1 /* r = r + 0.5 * r * (1 - s * r * r) */
-       stfsx   fr1,r3,r6
-       addi    r6,r6,4
-       bdnz    1b
-       lfd     fr5,-56(r1)
-       lfd     fr4,-48(r1)
-       lfd     fr3,-40(r1)
-       lfd     fr2,-32(r1)
-       b       fpdisable
diff --git a/arch/ppc64/lib/e2a.c b/arch/ppc64/lib/e2a.c
deleted file mode 100644 (file)
index d2b8348..0000000
+++ /dev/null
@@ -1,108 +0,0 @@
-/*
- *  arch/ppc64/lib/e2a.c
- *
- *  EBCDIC to ASCII conversion
- *
- * This function moved here from arch/ppc64/kernel/viopath.c
- *
- * (C) Copyright 2000-2004 IBM 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) anyu 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/module.h>
-
-unsigned char e2a(unsigned char x)
-{
-       switch (x) {
-       case 0xF0:
-               return '0';
-       case 0xF1:
-               return '1';
-       case 0xF2:
-               return '2';
-       case 0xF3:
-               return '3';
-       case 0xF4:
-               return '4';
-       case 0xF5:
-               return '5';
-       case 0xF6:
-               return '6';
-       case 0xF7:
-               return '7';
-       case 0xF8:
-               return '8';
-       case 0xF9:
-               return '9';
-       case 0xC1:
-               return 'A';
-       case 0xC2:
-               return 'B';
-       case 0xC3:
-               return 'C';
-       case 0xC4:
-               return 'D';
-       case 0xC5:
-               return 'E';
-       case 0xC6:
-               return 'F';
-       case 0xC7:
-               return 'G';
-       case 0xC8:
-               return 'H';
-       case 0xC9:
-               return 'I';
-       case 0xD1:
-               return 'J';
-       case 0xD2:
-               return 'K';
-       case 0xD3:
-               return 'L';
-       case 0xD4:
-               return 'M';
-       case 0xD5:
-               return 'N';
-       case 0xD6:
-               return 'O';
-       case 0xD7:
-               return 'P';
-       case 0xD8:
-               return 'Q';
-       case 0xD9:
-               return 'R';
-       case 0xE2:
-               return 'S';
-       case 0xE3:
-               return 'T';
-       case 0xE4:
-               return 'U';
-       case 0xE5:
-               return 'V';
-       case 0xE6:
-               return 'W';
-       case 0xE7:
-               return 'X';
-       case 0xE8:
-               return 'Y';
-       case 0xE9:
-               return 'Z';
-       }
-       return ' ';
-}
-EXPORT_SYMBOL(e2a);
-
-
diff --git a/arch/ppc64/lib/usercopy.c b/arch/ppc64/lib/usercopy.c
deleted file mode 100644 (file)
index 5eea6f3..0000000
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Functions which are too large to be inlined.
- *
- * 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/module.h>
-#include <asm/uaccess.h>
-
-unsigned long copy_from_user(void *to, const void __user *from, unsigned long n)
-{
-       if (likely(access_ok(VERIFY_READ, from, n)))
-               n = __copy_from_user(to, from, n);
-       else
-               memset(to, 0, n);
-       return n;
-}
-
-unsigned long copy_to_user(void __user *to, const void *from, unsigned long n)
-{
-       if (likely(access_ok(VERIFY_WRITE, to, n)))
-               n = __copy_to_user(to, from, n);
-       return n;
-}
-
-unsigned long copy_in_user(void __user *to, const void __user *from,
-                          unsigned long n)
-{
-       might_sleep();
-       if (likely(access_ok(VERIFY_READ, from, n) &&
-           access_ok(VERIFY_WRITE, to, n)))
-               n =__copy_tofrom_user(to, from, n);
-       return n;
-}
-
-EXPORT_SYMBOL(copy_from_user);
-EXPORT_SYMBOL(copy_to_user);
-EXPORT_SYMBOL(copy_in_user);
-
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/kernel/vtime.c b/arch/s390/kernel/vtime.c
deleted file mode 100644 (file)
index d9ccdbd..0000000
+++ /dev/null
@@ -1,480 +0,0 @@
-/*
- *  arch/s390/kernel/vtime.c
- *    Virtual cpu timer based timer functions.
- *
- *  S390 version
- *    Copyright (C) 2004 IBM Deutschland Entwicklung GmbH, IBM Corporation
- *    Author(s): Jan Glauber <jan.glauber@de.ibm.com>
- */
-
-#include <linux/config.h>
-#include <linux/module.h>
-#include <linux/kernel.h>
-#include <linux/time.h>
-#include <linux/delay.h>
-#include <linux/init.h>
-#include <linux/smp.h>
-#include <linux/types.h>
-#include <linux/timex.h>
-#include <linux/notifier.h>
-
-#include <asm/s390_ext.h>
-#include <asm/timer.h>
-
-#define VTIMER_MAGIC (0x4b87ad6e + 1)
-static ext_int_info_t ext_int_info_timer;
-DEFINE_PER_CPU(struct vtimer_queue, virt_cpu_timer);
-
-void start_cpu_timer(void)
-{
-       struct vtimer_queue *vt_list;
-
-       vt_list = &per_cpu(virt_cpu_timer, smp_processor_id());
-       set_vtimer(vt_list->idle);
-}
-
-void stop_cpu_timer(void)
-{
-       __u64 done;
-       struct vtimer_queue *vt_list;
-
-       vt_list = &per_cpu(virt_cpu_timer, smp_processor_id());
-
-       /* nothing to do */
-       if (list_empty(&vt_list->list)) {
-               vt_list->idle = VTIMER_MAX_SLICE;
-               goto fire;
-       }
-
-       /* store progress */
-       asm volatile ("STPT %0" : "=m" (done));
-
-       /*
-        * If done is negative we do not stop the CPU timer
-        * because we will get instantly an interrupt that
-        * will start the CPU timer again.
-        */
-       if (done & 1LL<<63)
-               return;
-       else
-               vt_list->offset += vt_list->to_expire - done;
-
-       /* save the actual expire value */
-       vt_list->idle = done;
-
-       /*
-        * We cannot halt the CPU timer, we just write a value that
-        * nearly never expires (only after 71 years) and re-write
-        * the stored expire value if we continue the timer
-        */
- fire:
-       set_vtimer(VTIMER_MAX_SLICE);
-}
-
-void set_vtimer(__u64 expires)
-{
-       asm volatile ("SPT %0" : : "m" (expires));
-
-       /* store expire time for this CPU timer */
-       per_cpu(virt_cpu_timer, smp_processor_id()).to_expire = expires;
-}
-
-/*
- * Sorted add to a list. List is linear searched until first bigger
- * element is found.
- */
-void list_add_sorted(struct vtimer_list *timer, struct list_head *head)
-{
-       struct vtimer_list *event;
-
-       list_for_each_entry(event, head, entry) {
-               if (event->expires > timer->expires) {
-                       list_add_tail(&timer->entry, &event->entry);
-                       return;
-               }
-       }
-       list_add_tail(&timer->entry, head);
-}
-
-/*
- * Do the callback functions of expired vtimer events.
- * Called from within the interrupt handler.
- */
-static void do_callbacks(struct list_head *cb_list, struct pt_regs *regs)
-{
-       struct vtimer_queue *vt_list;
-       struct vtimer_list *event, *tmp;
-       void (*fn)(unsigned long, struct pt_regs*);
-       unsigned long data;
-
-       if (list_empty(cb_list))
-               return;
-
-       vt_list = &per_cpu(virt_cpu_timer, smp_processor_id());
-
-       list_for_each_entry_safe(event, tmp, cb_list, entry) {
-               fn = event->function;
-               data = event->data;
-               fn(data, regs);
-
-               if (!event->interval)
-                       /* delete one shot timer */
-                       list_del_init(&event->entry);
-               else {
-                       /* move interval timer back to list */
-                       spin_lock(&vt_list->lock);
-                       list_del_init(&event->entry);
-                       list_add_sorted(event, &vt_list->list);
-                       spin_unlock(&vt_list->lock);
-               }
-       }
-}
-
-/*
- * Handler for the virtual CPU timer.
- */
-static void do_cpu_timer_interrupt(struct pt_regs *regs, __u16 error_code)
-{
-       int cpu;
-       __u64 next, delta;
-       struct vtimer_queue *vt_list;
-       struct vtimer_list *event, *tmp;
-       struct list_head *ptr;
-       /* the callback queue */
-       struct list_head cb_list;
-
-       INIT_LIST_HEAD(&cb_list);
-       cpu = smp_processor_id();
-       vt_list = &per_cpu(virt_cpu_timer, cpu);
-
-       /* walk timer list, fire all expired events */
-       spin_lock(&vt_list->lock);
-
-       if (vt_list->to_expire < VTIMER_MAX_SLICE)
-               vt_list->offset += vt_list->to_expire;
-
-       list_for_each_entry_safe(event, tmp, &vt_list->list, entry) {
-               if (event->expires > vt_list->offset)
-                       /* found first unexpired event, leave */
-                       break;
-
-               /* re-charge interval timer, we have to add the offset */
-               if (event->interval)
-                       event->expires = event->interval + vt_list->offset;
-
-               /* move expired timer to the callback queue */
-               list_move_tail(&event->entry, &cb_list);
-       }
-       spin_unlock(&vt_list->lock);
-       do_callbacks(&cb_list, regs);
-
-       /* next event is first in list */
-       spin_lock(&vt_list->lock);
-       if (!list_empty(&vt_list->list)) {
-               ptr = vt_list->list.next;
-               event = list_entry(ptr, struct vtimer_list, entry);
-               next = event->expires - vt_list->offset;
-
-               /* add the expired time from this interrupt handler
-                * and the callback functions
-                */
-               asm volatile ("STPT %0" : "=m" (delta));
-               delta = 0xffffffffffffffffLL - delta + 1;
-               vt_list->offset += delta;
-               next -= delta;
-       } else {
-               vt_list->offset = 0;
-               next = VTIMER_MAX_SLICE;
-       }
-       spin_unlock(&vt_list->lock);
-       set_vtimer(next);
-}
-
-void init_virt_timer(struct vtimer_list *timer)
-{
-       timer->magic = VTIMER_MAGIC;
-       timer->function = NULL;
-       INIT_LIST_HEAD(&timer->entry);
-       spin_lock_init(&timer->lock);
-}
-EXPORT_SYMBOL(init_virt_timer);
-
-static inline int check_vtimer(struct vtimer_list *timer)
-{
-       if (timer->magic != VTIMER_MAGIC)
-               return -EINVAL;
-       return 0;
-}
-
-static inline int vtimer_pending(struct vtimer_list *timer)
-{
-       return (!list_empty(&timer->entry));
-}
-
-/*
- * this function should only run on the specified CPU
- */
-static void internal_add_vtimer(struct vtimer_list *timer)
-{
-       unsigned long flags;
-       __u64 done;
-       struct vtimer_list *event;
-       struct vtimer_queue *vt_list;
-
-       vt_list = &per_cpu(virt_cpu_timer, timer->cpu);
-       spin_lock_irqsave(&vt_list->lock, flags);
-
-       if (timer->cpu != smp_processor_id())
-               printk("internal_add_vtimer: BUG, running on wrong CPU");
-
-       /* if list is empty we only have to set the timer */
-       if (list_empty(&vt_list->list)) {
-               /* reset the offset, this may happen if the last timer was
-                * just deleted by mod_virt_timer and the interrupt
-                * didn't happen until here
-                */
-               vt_list->offset = 0;
-               goto fire;
-       }
-
-       /* save progress */
-       asm volatile ("STPT %0" : "=m" (done));
-
-       /* calculate completed work */
-       done = vt_list->to_expire - done + vt_list->offset;
-       vt_list->offset = 0;
-
-       list_for_each_entry(event, &vt_list->list, entry)
-               event->expires -= done;
-
- fire:
-       list_add_sorted(timer, &vt_list->list);
-
-       /* get first element, which is the next vtimer slice */
-       event = list_entry(vt_list->list.next, struct vtimer_list, entry);
-
-       set_vtimer(event->expires);
-       spin_unlock_irqrestore(&vt_list->lock, flags);
-       /* release CPU aquired in prepare_vtimer or mod_virt_timer() */
-       put_cpu();
-}
-
-static inline int prepare_vtimer(struct vtimer_list *timer)
-{
-       if (check_vtimer(timer) || !timer->function) {
-               printk("add_virt_timer: uninitialized timer\n");
-               return -EINVAL;
-       }
-
-       if (!timer->expires || timer->expires > VTIMER_MAX_SLICE) {
-               printk("add_virt_timer: invalid timer expire value!\n");
-               return -EINVAL;
-       }
-
-       if (vtimer_pending(timer)) {
-               printk("add_virt_timer: timer pending\n");
-               return -EBUSY;
-       }
-
-       timer->cpu = get_cpu();
-       return 0;
-}
-
-/*
- * add_virt_timer - add an oneshot virtual CPU timer
- */
-void add_virt_timer(void *new)
-{
-       struct vtimer_list *timer;
-
-       timer = (struct vtimer_list *)new;
-
-       if (prepare_vtimer(timer) < 0)
-               return;
-
-       timer->interval = 0;
-       internal_add_vtimer(timer);
-}
-EXPORT_SYMBOL(add_virt_timer);
-
-/*
- * add_virt_timer_int - add an interval virtual CPU timer
- */
-void add_virt_timer_periodic(void *new)
-{
-       struct vtimer_list *timer;
-
-       timer = (struct vtimer_list *)new;
-
-       if (prepare_vtimer(timer) < 0)
-               return;
-
-       timer->interval = timer->expires;
-       internal_add_vtimer(timer);
-}
-EXPORT_SYMBOL(add_virt_timer_periodic);
-
-/*
- * If we change a pending timer the function must be called on the CPU
- * where the timer is running on, e.g. by smp_call_function_on()
- *
- * The original mod_timer adds the timer if it is not pending. For compatibility
- * we do the same. The timer will be added on the current CPU as a oneshot timer.
- *
- * returns whether it has modified a pending timer (1) or not (0)
- */
-int mod_virt_timer(struct vtimer_list *timer, __u64 expires)
-{
-       struct vtimer_queue *vt_list;
-       unsigned long flags;
-       int cpu;
-
-       if (check_vtimer(timer) || !timer->function) {
-               printk("mod_virt_timer: uninitialized timer\n");
-               return  -EINVAL;
-       }
-
-       if (!expires || expires > VTIMER_MAX_SLICE) {
-               printk("mod_virt_timer: invalid expire range\n");
-               return -EINVAL;
-       }
-
-       /*
-        * This is a common optimization triggered by the
-        * networking code - if the timer is re-modified
-        * to be the same thing then just return:
-        */
-       if (timer->expires == expires && vtimer_pending(timer))
-               return 1;
-
-       cpu = get_cpu();
-       vt_list = &per_cpu(virt_cpu_timer, cpu);
-
-       /* disable interrupts before test if timer is pending */
-       spin_lock_irqsave(&vt_list->lock, flags);
-
-       /* if timer isn't pending add it on the current CPU */
-       if (!vtimer_pending(timer)) {
-               spin_unlock_irqrestore(&vt_list->lock, flags);
-               /* we do not activate an interval timer with mod_virt_timer */
-               timer->interval = 0;
-               timer->expires = expires;
-               timer->cpu = cpu;
-               internal_add_vtimer(timer);
-               return 0;
-       }
-
-       /* check if we run on the right CPU */
-       if (timer->cpu != cpu) {
-               printk("mod_virt_timer: running on wrong CPU, check your code\n");
-               spin_unlock_irqrestore(&vt_list->lock, flags);
-               put_cpu();
-               return -EINVAL;
-       }
-
-       list_del_init(&timer->entry);
-       timer->expires = expires;
-
-       /* also change the interval if we have an interval timer */
-       if (timer->interval)
-               timer->interval = expires;
-
-       /* the timer can't expire anymore so we can release the lock */
-       spin_unlock_irqrestore(&vt_list->lock, flags);
-       internal_add_vtimer(timer);
-       return 1;
-}
-EXPORT_SYMBOL(mod_virt_timer);
-
-/*
- * delete a virtual timer
- *
- * returns whether the deleted timer was pending (1) or not (0)
- */
-int del_virt_timer(struct vtimer_list *timer)
-{
-       unsigned long flags;
-       struct vtimer_queue *vt_list;
-
-       if (check_vtimer(timer)) {
-               printk("del_virt_timer: timer not initialized\n");
-               return -EINVAL;
-       }
-
-       /* check if timer is pending */
-       if (!vtimer_pending(timer))
-               return 0;
-
-       vt_list = &per_cpu(virt_cpu_timer, timer->cpu);
-       spin_lock_irqsave(&vt_list->lock, flags);
-
-       /* we don't interrupt a running timer, just let it expire! */
-       list_del_init(&timer->entry);
-
-       /* last timer removed */
-       if (list_empty(&vt_list->list)) {
-               vt_list->to_expire = 0;
-               vt_list->offset = 0;
-       }
-
-       spin_unlock_irqrestore(&vt_list->lock, flags);
-       return 1;
-}
-EXPORT_SYMBOL(del_virt_timer);
-
-/*
- * Start the virtual CPU timer on the current CPU.
- */
-void init_cpu_vtimer(void)
-{
-       struct vtimer_queue *vt_list;
-       unsigned long cr0;
-       __u64 timer;
-
-       /* kick the virtual timer */
-       timer = VTIMER_MAX_SLICE;
-       asm volatile ("SPT %0" : : "m" (timer));
-       __ctl_store(cr0, 0, 0);
-       cr0 |= 0x400;
-       __ctl_load(cr0, 0, 0);
-
-       vt_list = &per_cpu(virt_cpu_timer, smp_processor_id());
-       INIT_LIST_HEAD(&vt_list->list);
-       spin_lock_init(&vt_list->lock);
-       vt_list->to_expire = 0;
-       vt_list->offset = 0;
-       vt_list->idle = 0;
-
-}
-
-static int vtimer_idle_notify(struct notifier_block *self,
-                             unsigned long action, void *hcpu)
-{
-       switch (action) {
-       case CPU_IDLE:
-               stop_cpu_timer();
-               break;
-       case CPU_NOT_IDLE:
-               start_cpu_timer();
-               break;
-       }
-       return NOTIFY_OK;
-}
-
-static struct notifier_block vtimer_idle_nb = {
-       .notifier_call = vtimer_idle_notify,
-};
-
-void __init vtime_init(void)
-{
-       /* request the cpu timer external interrupt */
-       if (register_early_external_interrupt(0x1005, do_cpu_timer_interrupt,
-                                             &ext_int_info_timer) != 0)
-               panic("Couldn't request external interrupt 0x1005");
-
-       if (register_idle_notifier(&vtimer_idle_nb))
-               panic("Couldn't register idle notifier");
-
-       init_cpu_vtimer();
-}
-
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/renesas/hs7751rvoip/Makefile b/arch/sh/boards/renesas/hs7751rvoip/Makefile
deleted file mode 100644 (file)
index e8b4109..0000000
+++ /dev/null
@@ -1,12 +0,0 @@
-#
-# Makefile for the HS7751RVoIP specific parts of the kernel
-#
-# Note! Dependencies are done automagically by 'make dep', which also
-# removes any old dependencies. DON'T put your own dependencies here
-# unless it's something special (ie not a .c file).
-#
-
-obj-y   := mach.o setup.o io.o irq.o led.o
-
-obj-$(CONFIG_PCI) += pci.o
-
diff --git a/arch/sh/boards/renesas/hs7751rvoip/io.c b/arch/sh/boards/renesas/hs7751rvoip/io.c
deleted file mode 100644 (file)
index a2ecd2d..0000000
+++ /dev/null
@@ -1,310 +0,0 @@
-/*
- * linux/arch/sh/kernel/io_hs7751rvoip.c
- *
- * Copyright (C) 2001  Ian da Silva, Jeremy Siegel
- * Based largely on io_se.c.
- *
- * I/O routine for Renesas Technology sales HS7751RVoIP
- *
- * Initial version only to support LAN access; some
- * placeholder code from io_hs7751rvoip.c left in with the
- * expectation of later SuperIO and PCMCIA access.
- */
-
-#include <linux/config.h>
-#include <linux/kernel.h>
-#include <linux/types.h>
-#include <asm/io.h>
-#include <asm/hs7751rvoip/hs7751rvoip.h>
-#include <asm/addrspace.h>
-
-#include <linux/module.h>
-#include <linux/pci.h>
-#include "../../../drivers/pci/pci-sh7751.h"
-
-extern void *area5_io8_base;   /* Area 5 8bit I/O Base address */
-extern void *area6_io8_base;   /* Area 6 8bit I/O Base address */
-extern void *area5_io16_base;  /* Area 5 16bit I/O Base address */
-extern void *area6_io16_base;  /* Area 6 16bit I/O Base address */
-
-/*
- * The 7751R HS7751RVoIP uses the built-in PCI controller (PCIC)
- * of the 7751R processor, and has a SuperIO accessible via the PCI.
- * The board also includes a PCMCIA controller on its memory bus,
- * like the other Solution Engine boards.
- */
-
-#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))
-
-#if defined(CONFIG_HS7751RVOIP_CODEC)
-#define CODEC_IO_BASE  0x1000
-#endif
-
-#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 unsigned long port2adr(unsigned int port)
-{
-       if ((0x1f0 <= port && port < 0x1f8) || port == 0x3f6)
-               if (port == 0x3f6)
-                       return ((unsigned long)area5_io16_base + 0x0c);
-               else
-                       return ((unsigned long)area5_io16_base + 0x800 + ((port-0x1f0) << 1));
-       else
-               maybebadio(port2adr, (unsigned long)port);
-       return port;
-}
-
-/* The 7751R HS7751RVoIP seems to have everything hooked */
-/* up pretty normally (nothing on high-bytes only...) so this */
-/* shouldn't be needed */
-static inline int shifted_port(unsigned long port)
-{
-       /* For IDE registers, value is not shifted */
-       if ((0x1f0 <= port && port < 0x1f8) || port == 0x3f6)
-               return 0;
-       else
-               return 1;
-}
-
-#if defined(CONFIG_HS7751RVOIP_CODEC)
-static inline int
-codec_port(unsigned long port)
-{
-       if (CODEC_IO_BASE <= port && port < (CODEC_IO_BASE+0x20))
-               return 1;
-       else
-               return 0;
-}
-#endif
-
-/* 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 hs7751rvoip_inb(unsigned long port)
-{
-       if (PXSEG(port))
-               return *(volatile unsigned char *)port;
-#if defined(CONFIG_HS7751RVOIP_CODEC)
-       else if (codec_port(port))
-               return *(volatile unsigned char *)((unsigned long)area6_io8_base+(port-CODEC_IO_BASE));
-#endif
-       else if (CHECK_SH7751_PCIIO(port) || shifted_port(port))
-               return *(volatile unsigned char *)PCI_IOMAP(port);
-       else
-               return (*(volatile unsigned short *)port2adr(port) & 0xff);
-}
-
-unsigned char hs7751rvoip_inb_p(unsigned long port)
-{
-       unsigned char v;
-
-        if (PXSEG(port))
-                v = *(volatile unsigned char *)port;
-#if defined(CONFIG_HS7751RVOIP_CODEC)
-       else if (codec_port(port))
-               v = *(volatile unsigned char *)((unsigned long)area6_io8_base+(port-CODEC_IO_BASE));
-#endif
-       else if (CHECK_SH7751_PCIIO(port) || shifted_port(port))
-                v = *(volatile unsigned char *)PCI_IOMAP(port);
-       else
-               v = (*(volatile unsigned short *)port2adr(port) & 0xff);
-       delay();
-       return v;
-}
-
-unsigned short hs7751rvoip_inw(unsigned long port)
-{
-        if (PXSEG(port))
-                return *(volatile unsigned short *)port;
-       else if (CHECK_SH7751_PCIIO(port) || shifted_port(port))
-                return *(volatile unsigned short *)PCI_IOMAP(port);
-       else
-               maybebadio(inw, port);
-       return 0;
-}
-
-unsigned int hs7751rvoip_inl(unsigned long port)
-{
-        if (PXSEG(port))
-                return *(volatile unsigned long *)port;
-       else if (CHECK_SH7751_PCIIO(port) || shifted_port(port))
-                return *(volatile unsigned long *)PCI_IOMAP(port);
-       else
-               maybebadio(inl, port);
-       return 0;
-}
-
-void hs7751rvoip_outb(unsigned char value, unsigned long port)
-{
-
-        if (PXSEG(port))
-                *(volatile unsigned char *)port = value;
-#if defined(CONFIG_HS7751RVOIP_CIDEC)
-       else if (codec_port(port))
-               *(volatile unsigned cjar *)((unsigned long)area6_io8_base+(port-CODEC_IO_BASE)) = value;
-#endif
-       else if (CHECK_SH7751_PCIIO(port) || shifted_port(port))
-               *(unsigned char *)PCI_IOMAP(port) = value;
-       else
-               *(volatile unsigned short *)port2adr(port) = value;
-}
-
-void hs7751rvoip_outb_p(unsigned char value, unsigned long port)
-{
-        if (PXSEG(port))
-                *(volatile unsigned char *)port = value;
-#if defined(CONFIG_HS7751RVOIP_CIDEC)
-       else if (codec_port(port))
-               *(volatile unsigned cjar *)((unsigned long)area6_io8_base+(port-CODEC_IO_BASE)) = value;
-#endif
-       else if (CHECK_SH7751_PCIIO(port) || shifted_port(port))
-               *(unsigned char *)PCI_IOMAP(port) = value;
-       else
-               *(volatile unsigned short *)port2adr(port) = value;
-       delay();
-}
-
-void hs7751rvoip_outw(unsigned short value, unsigned long port)
-{
-        if (PXSEG(port))
-                *(volatile unsigned short *)port = value;
-       else if (CHECK_SH7751_PCIIO(port) || shifted_port(port))
-               *(unsigned short *)PCI_IOMAP(port) = value;
-       else
-               maybebadio(outw, port);
-}
-
-void hs7751rvoip_outl(unsigned int value, unsigned long port)
-{
-        if (PXSEG(port))
-                *(volatile unsigned long *)port = value;
-       else if (CHECK_SH7751_PCIIO(port) || shifted_port(port))
-               *((unsigned long *)PCI_IOMAP(port)) = value;
-       else
-               maybebadio(outl, port);
-}
-
-void hs7751rvoip_insb(unsigned long port, void *addr, unsigned long count)
-{
-       if (PXSEG(port))
-               while (count--) *((unsigned char *) addr)++ = *(volatile unsigned char *)port;
-#if defined(CONFIG_HS7751RVOIP_CODEC)
-       else if (codec_port(port))
-               while (count--) *((unsigned char *) addr)++ = *(volatile unsigned char *)((unsigned long)area6_io8_base+(port-CODEC_IO_BASE));
-#endif
-       else if (CHECK_SH7751_PCIIO(port) || shifted_port(port)) {
-               volatile __u8 *bp = (__u8 *)PCI_IOMAP(port);
-
-               while (count--) *((volatile unsigned char *) addr)++ = *bp;
-       } else {
-               volatile __u16 *p = (volatile unsigned short *)port2adr(port);
-
-               while (count--) *((unsigned char *) addr)++ = *p & 0xff;
-       }
-}
-
-void hs7751rvoip_insw(unsigned long port, void *addr, unsigned long count)
-{
-       volatile __u16 *p;
-
-       if (PXSEG(port))
-               p = (volatile unsigned short *)port;
-       else if (CHECK_SH7751_PCIIO(port) || shifted_port(port))
-               p = (volatile unsigned short *)PCI_IOMAP(port);
-       else
-               p = (volatile unsigned short *)port2adr(port);
-       while (count--) *((__u16 *) addr)++ = *p;
-}
-
-void hs7751rvoip_insl(unsigned long port, void *addr, unsigned long count)
-{
-       if (CHECK_SH7751_PCIIO(port) || shifted_port(port)) {
-               volatile __u32 *p = (__u32 *)PCI_IOMAP(port);
-
-               while (count--) *((__u32 *) addr)++ = *p;
-       } else
-               maybebadio(insl, port);
-}
-
-void hs7751rvoip_outsb(unsigned long port, const void *addr, unsigned long count)
-{
-       if (PXSEG(port))
-               while (count--) *(volatile unsigned char *)port = *((unsigned char *) addr)++;
-#if defined(CONFIG_HS7751RVOIP_CODEC)
-       else if (codec_port(port))
-               while (count--) *(volatile unsigned char *)((unsigned long)area6_io8_base+(port-CODEC_IO_BASE)) = *((unsigned char *) addr)++;
-#endif
-       else if (CHECK_SH7751_PCIIO(port) || shifted_port(port)) {
-               volatile __u8 *bp = (__u8 *)PCI_IOMAP(port);
-
-               while (count--) *bp = *((volatile unsigned char *) addr)++;
-       } else {
-               volatile __u16 *p = (volatile unsigned short *)port2adr(port);
-
-               while (count--) *p = *((unsigned char *) addr)++;
-       }
-}
-
-void hs7751rvoip_outsw(unsigned long port, const void *addr, unsigned long count)
-{
-       volatile __u16 *p;
-
-       if (PXSEG(port))
-               p = (volatile unsigned short *)port;
-       else if (CHECK_SH7751_PCIIO(port) || shifted_port(port))
-               p = (volatile unsigned short *)PCI_IOMAP(port);
-       else
-               p = (volatile unsigned short *)port2adr(port);
-       while (count--) *p = *((__u16 *) addr)++;
-}
-
-void hs7751rvoip_outsl(unsigned long port, const void *addr, unsigned long count)
-{
-       if (CHECK_SH7751_PCIIO(port) || shifted_port(port)) {
-               volatile __u32 *p = (__u32 *)PCI_IOMAP(port);
-
-               while (count--) *p = *((__u32 *) addr)++;
-       } else
-               maybebadio(outsl, port);
-}
-
-void *hs7751rvoip_ioremap(unsigned long offset, unsigned long size)
-{
-       if (offset >= 0xfd000000)
-               return (void *)offset;
-       else
-               return (void *)P2SEGADDR(offset);
-}
-EXPORT_SYMBOL(hs7751rvoip_ioremap);
-
-unsigned long hs7751rvoip_isa_port2addr(unsigned long offset)
-{
-       return port2adr(offset);
-}
diff --git a/arch/sh/boards/renesas/hs7751rvoip/irq.c b/arch/sh/boards/renesas/hs7751rvoip/irq.c
deleted file mode 100644 (file)
index a7921f6..0000000
+++ /dev/null
@@ -1,122 +0,0 @@
-/*
- * linux/arch/sh/boards/renesas/hs7751rvoip/irq.c
- *
- * Copyright (C) 2000  Kazumoto Kojima
- *
- * Renesas Technology Sales HS7751RVoIP Support.
- *
- * Modified for HS7751RVoIP by
- * Atom Create Engineering Co., Ltd. 2002.
- * Lineo uSolutions, Inc. 2003.
- */
-
-#include <linux/config.h>
-#include <linux/init.h>
-#include <linux/irq.h>
-#include <asm/io.h>
-#include <asm/irq.h>
-#include <asm/hs7751rvoip/hs7751rvoip.h>
-
-static int mask_pos[] = {8, 9, 10, 11, 12, 13, 0, 1, 2, 3, 4, 5, 6, 7};
-
-static void enable_hs7751rvoip_irq(unsigned int irq);
-static void disable_hs7751rvoip_irq(unsigned int irq);
-
-/* shutdown is same as "disable" */
-#define shutdown_hs7751rvoip_irq disable_hs7751rvoip_irq
-
-static void ack_hs7751rvoip_irq(unsigned int irq);
-static void end_hs7751rvoip_irq(unsigned int irq);
-
-static unsigned int startup_hs7751rvoip_irq(unsigned int irq)
-{
-       enable_hs7751rvoip_irq(irq);
-       return 0; /* never anything pending */
-}
-
-static void disable_hs7751rvoip_irq(unsigned int irq)
-{
-       unsigned long flags;
-       unsigned short val;
-       unsigned short mask = 0xffff ^ (0x0001 << mask_pos[irq]);
-
-       /* Set the priority in IPR to 0 */
-       local_irq_save(flags);
-       val = ctrl_inw(IRLCNTR3);
-       val &= mask;
-       ctrl_outw(val, IRLCNTR3);
-       local_irq_restore(flags);
-}
-
-static void enable_hs7751rvoip_irq(unsigned int irq)
-{
-       unsigned long flags;
-       unsigned short val;
-       unsigned short value = (0x0001 << mask_pos[irq]);
-
-       /* Set priority in IPR back to original value */
-       local_irq_save(flags);
-       val = ctrl_inw(IRLCNTR3);
-       val |= value;
-       ctrl_outw(val, IRLCNTR3);
-       local_irq_restore(flags);
-}
-
-static void ack_hs7751rvoip_irq(unsigned int irq)
-{
-       disable_hs7751rvoip_irq(irq);
-}
-
-static void end_hs7751rvoip_irq(unsigned int irq)
-{
-       if (!(irq_desc[irq].status & (IRQ_DISABLED|IRQ_INPROGRESS)))
-               enable_hs7751rvoip_irq(irq);
-}
-
-static struct hw_interrupt_type hs7751rvoip_irq_type = {
-       "HS7751RVoIP IRQ",
-       startup_hs7751rvoip_irq,
-       shutdown_hs7751rvoip_irq,
-       enable_hs7751rvoip_irq,
-       disable_hs7751rvoip_irq,
-       ack_hs7751rvoip_irq,
-       end_hs7751rvoip_irq,
-};
-
-static void make_hs7751rvoip_irq(unsigned int irq)
-{
-       disable_irq_nosync(irq);
-       irq_desc[irq].handler = &hs7751rvoip_irq_type;
-       disable_hs7751rvoip_irq(irq);
-}
-
-/*
- * Initialize IRQ setting
- */
-void __init init_hs7751rvoip_IRQ(void)
-{
-       int i;
-
-       /* IRL0=ON HOOK1
-        * IRL1=OFF HOOK1
-        * IRL2=ON HOOK2
-        * IRL3=OFF HOOK2
-        * IRL4=Ringing Detection
-        * IRL5=CODEC
-        * IRL6=Ethernet
-        * IRL7=Ethernet Hub
-        * IRL8=USB Communication
-        * IRL9=USB Connection
-        * IRL10=USB DMA
-        * IRL11=CF Card
-        * IRL12=PCMCIA
-        * IRL13=PCI Slot
-        */
-       ctrl_outw(0x9876, IRLCNTR1);
-       ctrl_outw(0xdcba, IRLCNTR2);
-       ctrl_outw(0x0050, IRLCNTR4);
-       ctrl_outw(0x4321, IRLCNTR5);
-
-       for (i=0; i<14; i++)
-               make_hs7751rvoip_irq(i);
-}
diff --git a/arch/sh/boards/renesas/hs7751rvoip/led.c b/arch/sh/boards/renesas/hs7751rvoip/led.c
deleted file mode 100644 (file)
index 18a13c8..0000000
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * linux/arch/sh/kernel/setup_hs7751rvoip.c
- *
- * Copyright (C) 2000  Kazumoto Kojima
- *
- * Renesas Technology Sales HS7751RVoIP Support.
- *
- * Modified for HS7751RVoIP by
- * Atom Create Engineering Co., Ltd. 2002.
- * Lineo uSolutions, Inc. 2003.
- */
-
-#include <linux/config.h>
-#include <asm/io.h>
-#include <asm/hs7751rvoip/hs7751rvoip.h>
-
-extern unsigned int debug_counter;
-
-void debug_led_disp(void)
-{
-       unsigned short value;
-
-       value = (unsigned char)debug_counter++;
-       ctrl_outb((0xf0|value), PA_OUTPORTR);
-       if (value == 0x0f)
-               debug_counter = 0;
-}
diff --git a/arch/sh/boards/renesas/hs7751rvoip/mach.c b/arch/sh/boards/renesas/hs7751rvoip/mach.c
deleted file mode 100644 (file)
index 8bbed60..0000000
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * linux/arch/sh/kernel/mach_hs7751rvoip.c
- *
- * Minor tweak of mach_se.c file to reference hs7751rvoip-specific items.
- *
- * May be copied or modified under the terms of the GNU General Public
- * License.  See linux/COPYING for more information.
- *
- * Machine vector for the Renesas Technology sales HS7751RVoIP
- */
-
-#include <linux/config.h>
-#include <linux/init.h>
-
-#include <asm/machvec.h>
-#include <asm/rtc.h>
-#include <asm/irq.h>
-#include <asm/hs7751rvoip/io.h>
-
-extern void init_hs7751rvoip_IRQ(void);
-extern void *hs7751rvoip_ioremap(unsigned long, unsigned long);
-
-/*
- * The Machine Vector
- */
-
-struct sh_machine_vector mv_hs7751rvoip __initmv = {
-       .mv_nr_irqs             = 72,
-
-       .mv_inb                 = hs7751rvoip_inb,
-       .mv_inw                 = hs7751rvoip_inw,
-       .mv_inl                 = hs7751rvoip_inl,
-       .mv_outb                = hs7751rvoip_outb,
-       .mv_outw                = hs7751rvoip_outw,
-       .mv_outl                = hs7751rvoip_outl,
-
-       .mv_inb_p               = hs7751rvoip_inb_p,
-       .mv_inw_p               = hs7751rvoip_inw,
-       .mv_inl_p               = hs7751rvoip_inl,
-       .mv_outb_p              = hs7751rvoip_outb_p,
-       .mv_outw_p              = hs7751rvoip_outw,
-       .mv_outl_p              = hs7751rvoip_outl,
-
-       .mv_insb                = hs7751rvoip_insb,
-       .mv_insw                = hs7751rvoip_insw,
-       .mv_insl                = hs7751rvoip_insl,
-       .mv_outsb               = hs7751rvoip_outsb,
-       .mv_outsw               = hs7751rvoip_outsw,
-       .mv_outsl               = hs7751rvoip_outsl,
-
-       .mv_ioremap             = hs7751rvoip_ioremap,
-       .mv_isa_port2addr       = hs7751rvoip_isa_port2addr,
-       .mv_init_irq            = init_hs7751rvoip_IRQ,
-};
-ALIAS_MV(hs7751rvoip)
diff --git a/arch/sh/boards/renesas/hs7751rvoip/pci.c b/arch/sh/boards/renesas/hs7751rvoip/pci.c
deleted file mode 100644 (file)
index 7a442d1..0000000
+++ /dev/null
@@ -1,150 +0,0 @@
-/*
- * linux/arch/sh/kernel/pci-hs7751rvoip.c
- *
- * Author:  Ian DaSilva (idasilva@mvista.com)
- *
- * Highly leveraged from pci-bigsur.c, written by Dustin McIntire.
- *
- * May be copied or modified under the terms of the GNU General Public
- * License.  See linux/COPYING for more information.
- *
- * PCI initialization for the Renesas SH7751R HS7751RVoIP board
- */
-
-#include <linux/config.h>
-#include <linux/kernel.h>
-#include <linux/types.h>
-#include <linux/init.h>
-#include <linux/delay.h>
-#include <linux/pci.h>
-#include <linux/module.h>
-
-#include <asm/io.h>
-#include "../../../drivers/pci/pci-sh7751.h"
-#include <asm/hs7751rvoip/hs7751rvoip.h>
-
-#define PCIMCR_MRSET_OFF       0xBFFFFFFF
-#define PCIMCR_RFSH_OFF                0xFFFFFFFB
-
-/*
- * Only long word accesses of the PCIC's internal local registers and the
- * configuration registers from the CPU is supported.
- */
-#define PCIC_WRITE(x,v) writel((v), PCI_REG(x))
-#define PCIC_READ(x) readl(PCI_REG(x))
-
-/*
- * Description:  This function sets up and initializes the pcic, sets
- * up the BARS, maps the DRAM into the address space etc, etc.
- */
-int __init pcibios_init_platform(void)
-{
-       unsigned long bcr1, wcr1, wcr2, wcr3, mcr;
-       unsigned short bcr2, bcr3;
-
-       /*
-        * Initialize the slave bus controller on the pcic.  The values used
-        * here should not be hardcoded, but they should be taken from the bsc
-        * on the processor, to make this function as generic as possible.
-        * (i.e. Another sbc may usr different SDRAM timing settings -- in order
-        * for the pcic to work, its settings need to be exactly the same.)
-        */
-       bcr1 = (*(volatile unsigned long *)(SH7751_BCR1));
-       bcr2 = (*(volatile unsigned short *)(SH7751_BCR2));
-       bcr3 = (*(volatile unsigned short *)(SH7751_BCR3));
-       wcr1 = (*(volatile unsigned long *)(SH7751_WCR1));
-       wcr2 = (*(volatile unsigned long *)(SH7751_WCR2));
-       wcr3 = (*(volatile unsigned long *)(SH7751_WCR3));
-       mcr = (*(volatile unsigned long *)(SH7751_MCR));
-
-       bcr1 = bcr1 | 0x00080000;  /* Enable Bit 19, BREQEN */
-       (*(volatile unsigned long *)(SH7751_BCR1)) = bcr1;
-
-       bcr1 = bcr1 | 0x40080000;  /* Enable Bit 19 BREQEN, set PCIC to slave */
-       PCIC_WRITE(SH7751_PCIBCR1, bcr1);       /* PCIC BCR1 */
-       PCIC_WRITE(SH7751_PCIBCR2, bcr2);       /* PCIC BCR2 */
-       PCIC_WRITE(SH7751_PCIBCR3, bcr3);       /* PCIC BCR3 */
-       PCIC_WRITE(SH7751_PCIWCR1, wcr1);       /* PCIC WCR1 */
-       PCIC_WRITE(SH7751_PCIWCR2, wcr2);       /* PCIC WCR2 */
-       PCIC_WRITE(SH7751_PCIWCR3, wcr3);       /* PCIC WCR3 */
-       mcr = (mcr & PCIMCR_MRSET_OFF) & PCIMCR_RFSH_OFF;
-       PCIC_WRITE(SH7751_PCIMCR, mcr);         /* PCIC MCR */
-
-       /* Enable all interrupts, so we know what to fix */
-       PCIC_WRITE(SH7751_PCIINTM, 0x0000c3ff);
-       PCIC_WRITE(SH7751_PCIAINTM, 0x0000380f);
-
-       /* Set up standard PCI config registers */
-       PCIC_WRITE(SH7751_PCICONF1, 0xFB900047); /* Bus Master, Mem & I/O access */
-       PCIC_WRITE(SH7751_PCICONF2, 0x00000000); /* PCI Class code & Revision ID */
-       PCIC_WRITE(SH7751_PCICONF4, 0xab000001); /* PCI I/O address (local regs) */
-       PCIC_WRITE(SH7751_PCICONF5, 0x0c000000); /* PCI MEM address (local RAM)  */
-       PCIC_WRITE(SH7751_PCICONF6, 0xd0000000); /* PCI MEM address (unused) */
-       PCIC_WRITE(SH7751_PCICONF11, 0x35051054); /* PCI Subsystem ID & Vendor ID */
-       PCIC_WRITE(SH7751_PCILSR0, 0x03f00000); /* MEM (full 64M exposed) */
-       PCIC_WRITE(SH7751_PCILSR1, 0x00000000); /* MEM (unused) */
-       PCIC_WRITE(SH7751_PCILAR0, 0x0c000000); /* MEM (direct map from PCI) */
-       PCIC_WRITE(SH7751_PCILAR1, 0x00000000); /* MEM (unused) */
-
-       /* Now turn it on... */
-       PCIC_WRITE(SH7751_PCICR, 0xa5000001);
-
-       /*
-        * Set PCIMBR and PCIIOBR here, assuming a single window
-        * (16M MEM, 256K IO) is enough.  If a larger space is
-        * needed, the readx/writex and inx/outx functions will
-        * have to do more (e.g. setting registers for each call).
-        */
-
-       /*
-        * Set the MBR so PCI address is one-to-one with window,
-        * meaning all calls go straight through... use ifdef to
-        * catch erroneous assumption.
-        */
-       BUG_ON(PCIBIOS_MIN_MEM != SH7751_PCI_MEMORY_BASE);
-
-       PCIC_WRITE(SH7751_PCIMBR, PCIBIOS_MIN_MEM);
-
-       /* Set IOBR for window containing area specified in pci.h */
-       PCIC_WRITE(SH7751_PCIIOBR, (PCIBIOS_MIN_IO & SH7751_PCIIOBR_MASK));
-
-       /* All done, may as well say so... */
-       printk("SH7751R PCI: Finished initialization of the PCI controller\n");
-
-       return 1;
-}
-
-int __init pcibios_map_platform_irq(u8 slot, u8 pin)
-{
-        switch (slot) {
-       case 0: return IRQ_PCISLOT;     /* PCI Extend slot */
-       case 1: return IRQ_PCMCIA;      /* PCI Cardbus Bridge */
-       case 2: return IRQ_PCIETH;      /* Realtek Ethernet controller */
-       case 3: return IRQ_PCIHUB;      /* Realtek Ethernet Hub controller */
-       default:
-               printk("PCI: Bad IRQ mapping request for slot %d\n", slot);
-               return -1;
-       }
-}
-
-static struct resource sh7751_io_resource = {
-       .name   = "SH7751_IO",
-       .start  = 0x4000,
-       .end    = 0x4000 + SH7751_PCI_IO_SIZE - 1,
-       .flags  = IORESOURCE_IO
-};
-
-static struct resource sh7751_mem_resource = {
-       .name   = "SH7751_mem",
-       .start  = SH7751_PCI_MEMORY_BASE,
-       .end    = SH7751_PCI_MEMORY_BASE + SH7751_PCI_MEM_SIZE - 1,
-       .flags  = IORESOURCE_MEM
-};
-
-extern struct pci_ops sh7751_pci_ops;
-
-struct pci_channel board_pci_channels[] = {
-       { &sh7751_pci_ops, &sh7751_io_resource, &sh7751_mem_resource, 0, 0xff },
-       { NULL, NULL, NULL, 0, 0 },
-};
-EXPORT_SYMBOL(board_pci_channels);
diff --git a/arch/sh/boards/renesas/hs7751rvoip/setup.c b/arch/sh/boards/renesas/hs7751rvoip/setup.c
deleted file mode 100644 (file)
index f1a78b6..0000000
+++ /dev/null
@@ -1,89 +0,0 @@
-/*
- * linux/arch/sh/kernel/setup_hs7751rvoip.c
- *
- * Copyright (C) 2000  Kazumoto Kojima
- *
- * Renesas Technology Sales HS7751RVoIP Support.
- *
- * Modified for HS7751RVoIP by
- * Atom Create Engineering Co., Ltd. 2002.
- * Lineo uSolutions, Inc. 2003.
- */
-
-#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/hs7751rvoip/hs7751rvoip.h>
-
-#include <linux/mm.h>
-#include <linux/vmalloc.h>
-
-/* defined in mm/ioremap.c */
-extern void * p3_ioremap(unsigned long phys_addr, unsigned long size, unsigned long flags);
-
-unsigned int debug_counter;
-
-const char *get_system_type(void)
-{
-       return "HS7751RVoIP";
-}
-
-/*
- * Initialize the board
- */
-void __init platform_setup(void)
-{
-       printk(KERN_INFO "Renesas Technology Sales HS7751RVoIP-2 support.\n");
-       ctrl_outb(0xf0, PA_OUTPORTR);
-       debug_counter = 0;
-}
-
-void *area5_io8_base;
-void *area6_io8_base;
-void *area5_io16_base;
-void *area6_io16_base;
-
-int __init cf_init(void)
-{
-       pgprot_t prot;
-       unsigned long paddrbase, psize;
-
-       /* open I/O area window */
-       paddrbase = virt_to_phys((void *)(PA_AREA5_IO+0x00000800));
-       psize = PAGE_SIZE;
-       prot = PAGE_KERNEL_PCC(1, _PAGE_PCC_COM16);
-       area5_io16_base = p3_ioremap(paddrbase, psize, prot.pgprot);
-       if (!area5_io16_base) {
-               printk("allocate_cf_area : can't open CF I/O window!\n");
-               return -ENOMEM;
-       }
-
-       /* XXX : do we need attribute and common-memory area also? */
-
-       paddrbase = virt_to_phys((void *)PA_AREA6_IO);
-       psize = PAGE_SIZE;
-#if defined(CONFIG_HS7751RVOIP_CODEC)
-       prot = PAGE_KERNEL_PCC(0, _PAGE_PCC_COM8);
-#else
-       prot = PAGE_KERNEL_PCC(0, _PAGE_PCC_IO8);
-#endif
-       area6_io8_base = p3_ioremap(paddrbase, psize, prot.pgprot);
-       if (!area6_io8_base) {
-               printk("allocate_cf_area : can't open CODEC I/O 8bit window!\n");
-               return -ENOMEM;
-       }
-       prot = PAGE_KERNEL_PCC(0, _PAGE_PCC_IO16);
-       area6_io16_base = p3_ioremap(paddrbase, psize, prot.pgprot);
-       if (!area6_io16_base) {
-               printk("allocate_cf_area : can't open CODEC I/O 16bit window!\n");
-               return -ENOMEM;
-       }
-
-       return 0;
-}
-
-__initcall (cf_init);
diff --git a/arch/sh/boards/renesas/rts7751r2d/Makefile b/arch/sh/boards/renesas/rts7751r2d/Makefile
deleted file mode 100644 (file)
index daa5333..0000000
+++ /dev/null
@@ -1,10 +0,0 @@
-#
-# Makefile for the RTS7751R2D specific parts of the kernel
-#
-# Note! Dependencies are done automagically by 'make dep', which also
-# removes any old dependencies. DON'T put your own dependencies here
-# unless it's something special (ie not a .c file).
-#
-
-obj-y   := mach.o setup.o io.o irq.o led.o
-
diff --git a/arch/sh/boards/renesas/rts7751r2d/io.c b/arch/sh/boards/renesas/rts7751r2d/io.c
deleted file mode 100644 (file)
index c46f915..0000000
+++ /dev/null
@@ -1,319 +0,0 @@
-/*
- * linux/arch/sh/kernel/io_rts7751r2d.c
- *
- * Copyright (C) 2001  Ian da Silva, Jeremy Siegel
- * Based largely on io_se.c.
- *
- * I/O routine for Renesas Technology sales RTS7751R2D.
- *
- * Initial version only to support LAN access; some
- * placeholder code from io_rts7751r2d.c left in with the
- * expectation of later SuperIO and PCMCIA access.
- */
-
-#include <linux/kernel.h>
-#include <linux/types.h>
-#include <asm/io.h>
-#include <asm/rts7751r2d/rts7751r2d.h>
-#include <asm/addrspace.h>
-
-#include <linux/module.h>
-#include <linux/pci.h>
-#include "../../../drivers/pci/pci-sh7751.h"
-
-/*
- * The 7751R RTS7751R2D uses the built-in PCI controller (PCIC)
- * of the 7751R processor, and has a SuperIO accessible via the PCI.
- * The board also includes a PCMCIA controller on its memory bus,
- * like the other Solution Engine boards.
- */
-
-#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 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 unsigned long port2adr(unsigned int port)
-{
-       if ((0x1f0 <= port && port < 0x1f8) || port == 0x3f6)
-               if (port == 0x3f6)
-                       return (PA_AREA5_IO + 0x80c);
-               else
-                       return (PA_AREA5_IO + 0x1000 + ((port-0x1f0) << 1));
-       else
-               maybebadio(port2adr, (unsigned long)port);
-
-       return port;
-}
-
-static inline unsigned long port88796l(unsigned int port, int flag)
-{
-       unsigned long addr;
-
-       if (flag)
-               addr = PA_AX88796L + ((port - AX88796L_IO_BASE) << 1);
-       else
-               addr = PA_AX88796L + ((port - AX88796L_IO_BASE) << 1) + 0x1000;
-
-       return addr;
-}
-
-/* The 7751R RTS7751R2D seems to have everything hooked */
-/* up pretty normally (nothing on high-bytes only...) so this */
-/* shouldn't be needed */
-static inline int shifted_port(unsigned long port)
-{
-       /* For IDE registers, value is not shifted */
-       if ((0x1f0 <= port && port < 0x1f8) || port == 0x3f6)
-               return 0;
-       else
-               return 1;
-}
-
-/* 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
-
-#if defined(CONFIG_NE2000) || defined(CONFIG_NE2000_MODULE)
-#define CHECK_AX88796L_PORT(port) \
-  ((port >= AX88796L_IO_BASE) && (port < (AX88796L_IO_BASE+0x20)))
-#else
-#define CHECK_AX88796L_PORT(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 rts7751r2d_inb(unsigned long port)
-{
-       if (CHECK_AX88796L_PORT(port))
-               return (*(volatile unsigned short *)port88796l(port, 0)) & 0xff;
-       else if (PXSEG(port))
-               return *(volatile unsigned char *)port;
-       else if (CHECK_SH7751_PCIIO(port) || shifted_port(port))
-               return *(volatile unsigned char *)PCI_IOMAP(port);
-       else
-               return (*(volatile unsigned short *)port2adr(port) & 0xff);
-}
-
-unsigned char rts7751r2d_inb_p(unsigned long port)
-{
-       unsigned char v;
-
-       if (CHECK_AX88796L_PORT(port))
-               v = (*(volatile unsigned short *)port88796l(port, 0)) & 0xff;
-        else if (PXSEG(port))
-               v = *(volatile unsigned char *)port;
-       else if (CHECK_SH7751_PCIIO(port) || shifted_port(port))
-               v = *(volatile unsigned char *)PCI_IOMAP(port);
-       else
-               v = (*(volatile unsigned short *)port2adr(port) & 0xff);
-       delay();
-
-       return v;
-}
-
-unsigned short rts7751r2d_inw(unsigned long port)
-{
-       if (CHECK_AX88796L_PORT(port))
-               maybebadio(inw, port);
-        else if (PXSEG(port))
-               return *(volatile unsigned short *)port;
-       else if (CHECK_SH7751_PCIIO(port) || shifted_port(port))
-               return *(volatile unsigned short *)PCI_IOMAP(port);
-       else
-               maybebadio(inw, port);
-
-       return 0;
-}
-
-unsigned int rts7751r2d_inl(unsigned long port)
-{
-       if (CHECK_AX88796L_PORT(port))
-               maybebadio(inl, port);
-        else if (PXSEG(port))
-               return *(volatile unsigned long *)port;
-       else if (CHECK_SH7751_PCIIO(port) || shifted_port(port))
-               return *(volatile unsigned long *)PCI_IOMAP(port);
-       else
-               maybebadio(inl, port);
-
-       return 0;
-}
-
-void rts7751r2d_outb(unsigned char value, unsigned long port)
-{
-       if (CHECK_AX88796L_PORT(port))
-               *((volatile unsigned short *)port88796l(port, 0)) = value;
-        else if (PXSEG(port))
-               *(volatile unsigned char *)port = value;
-       else if (CHECK_SH7751_PCIIO(port) || shifted_port(port))
-               *(volatile unsigned char *)PCI_IOMAP(port) = value;
-       else
-               *(volatile unsigned short *)port2adr(port) = value;
-}
-
-void rts7751r2d_outb_p(unsigned char value, unsigned long port)
-{
-       if (CHECK_AX88796L_PORT(port))
-               *((volatile unsigned short *)port88796l(port, 0)) = value;
-        else if (PXSEG(port))
-               *(volatile unsigned char *)port = value;
-       else if (CHECK_SH7751_PCIIO(port) || shifted_port(port))
-               *(volatile unsigned char *)PCI_IOMAP(port) = value;
-       else
-               *(volatile unsigned short *)port2adr(port) = value;
-       delay();
-}
-
-void rts7751r2d_outw(unsigned short value, unsigned long port)
-{
-       if (CHECK_AX88796L_PORT(port))
-               maybebadio(outw, port);
-        else if (PXSEG(port))
-               *(volatile unsigned short *)port = value;
-       else if (CHECK_SH7751_PCIIO(port) || shifted_port(port))
-               *(volatile unsigned short *)PCI_IOMAP(port) = value;
-       else
-               maybebadio(outw, port);
-}
-
-void rts7751r2d_outl(unsigned int value, unsigned long port)
-{
-       if (CHECK_AX88796L_PORT(port))
-               maybebadio(outl, port);
-        else if (PXSEG(port))
-               *(volatile unsigned long *)port = value;
-       else if (CHECK_SH7751_PCIIO(port) || shifted_port(port))
-               *(volatile unsigned long *)PCI_IOMAP(port) = value;
-       else
-               maybebadio(outl, port);
-}
-
-void rts7751r2d_insb(unsigned long port, void *addr, unsigned long count)
-{
-       volatile __u8 *bp;
-       volatile __u16 *p;
-
-       if (CHECK_AX88796L_PORT(port)) {
-               p = (volatile unsigned short *)port88796l(port, 0);
-               while (count--) *((unsigned char *) addr)++ = *p & 0xff;
-       } else if (PXSEG(port))
-               while (count--) *((unsigned char *) addr)++ = *(volatile unsigned char *)port;
-       else if (CHECK_SH7751_PCIIO(port) || shifted_port(port)) {
-               bp = (__u8 *)PCI_IOMAP(port);
-               while (count--) *((volatile unsigned char *) addr)++ = *bp;
-       } else {
-               p = (volatile unsigned short *)port2adr(port);
-               while (count--) *((unsigned char *) addr)++ = *p & 0xff;
-       }
-}
-
-void rts7751r2d_insw(unsigned long port, void *addr, unsigned long count)
-{
-       volatile __u16 *p;
-
-       if (CHECK_AX88796L_PORT(port))
-               p = (volatile unsigned short *)port88796l(port, 1);
-       else if (PXSEG(port))
-               p = (volatile unsigned short *)port;
-       else if (CHECK_SH7751_PCIIO(port) || shifted_port(port))
-               p = (volatile unsigned short *)PCI_IOMAP(port);
-       else
-               p = (volatile unsigned short *)port2adr(port);
-       while (count--) *((__u16 *) addr)++ = *p;
-}
-
-void rts7751r2d_insl(unsigned long port, void *addr, unsigned long count)
-{
-       if (CHECK_AX88796L_PORT(port))
-               maybebadio(insl, port);
-       else if (CHECK_SH7751_PCIIO(port) || shifted_port(port)) {
-               volatile __u32 *p = (__u32 *)PCI_IOMAP(port);
-
-               while (count--) *((__u32 *) addr)++ = *p;
-       } else
-               maybebadio(insl, port);
-}
-
-void rts7751r2d_outsb(unsigned long port, const void *addr, unsigned long count)
-{
-       volatile __u8 *bp;
-       volatile __u16 *p;
-
-       if (CHECK_AX88796L_PORT(port)) {
-               p = (volatile unsigned short *)port88796l(port, 0);
-               while (count--) *p = *((unsigned char *) addr)++;
-       } else if (PXSEG(port))
-               while (count--) *(volatile unsigned char *)port = *((unsigned char *) addr)++;
-       else if (CHECK_SH7751_PCIIO(port) || shifted_port(port)) {
-               bp = (__u8 *)PCI_IOMAP(port);
-               while (count--) *bp = *((volatile unsigned char *) addr)++;
-       } else {
-               p = (volatile unsigned short *)port2adr(port);
-               while (count--) *p = *((unsigned char *) addr)++;
-       }
-}
-
-void rts7751r2d_outsw(unsigned long port, const void *addr, unsigned long count)
-{
-       volatile __u16 *p;
-
-       if (CHECK_AX88796L_PORT(port))
-               p = (volatile unsigned short *)port88796l(port, 1);
-       else if (PXSEG(port))
-               p = (volatile unsigned short *)port;
-       else if (CHECK_SH7751_PCIIO(port) || shifted_port(port))
-               p = (volatile unsigned short *)PCI_IOMAP(port);
-       else
-               p = (volatile unsigned short *)port2adr(port);
-       while (count--) *p = *((__u16 *) addr)++;
-}
-
-void rts7751r2d_outsl(unsigned long port, const void *addr, unsigned long count)
-{
-       if (CHECK_AX88796L_PORT(port))
-               maybebadio(outsl, port);
-       else if (CHECK_SH7751_PCIIO(port) || shifted_port(port)) {
-               volatile __u32 *p = (__u32 *)PCI_IOMAP(port);
-
-               while (count--) *p = *((__u32 *) addr)++;
-       } else
-               maybebadio(outsl, port);
-}
-
-void *rts7751r2d_ioremap(unsigned long offset, unsigned long size)
-{
-       if (offset >= 0xfd000000)
-               return (void *)offset;
-       else
-               return (void *)P2SEGADDR(offset);
-}
-EXPORT_SYMBOL(rts7751r2d_ioremap);
-
-unsigned long rts7751r2d_isa_port2addr(unsigned long offset)
-{
-       return port2adr(offset);
-}
diff --git a/arch/sh/boards/renesas/rts7751r2d/irq.c b/arch/sh/boards/renesas/rts7751r2d/irq.c
deleted file mode 100644 (file)
index 95717f4..0000000
+++ /dev/null
@@ -1,135 +0,0 @@
-/*
- * linux/arch/sh/boards/renesas/rts7751r2d/irq.c
- *
- * Copyright (C) 2000  Kazumoto Kojima
- *
- * Renesas Technology Sales RTS7751R2D Support.
- *
- * Modified for RTS7751R2D by
- * Atom Create Engineering Co., Ltd. 2002.
- */
-
-#include <linux/config.h>
-#include <linux/init.h>
-#include <linux/irq.h>
-#include <asm/io.h>
-#include <asm/irq.h>
-#include <asm/rts7751r2d/rts7751r2d.h>
-
-#if defined(CONFIG_RTS7751R2D_REV11)
-static int mask_pos[] = {11, 9, 8, 12, 10, 6, 5, 4, 7, 14, 13, 0, 0, 0, 0};
-#else
-static int mask_pos[] = {6, 11, 9, 8, 12, 10, 5, 4, 7, 14, 13, 0, 0, 0, 0};
-#endif
-
-extern int voyagergx_irq_demux(int irq);
-extern void setup_voyagergx_irq(void);
-
-static void enable_rts7751r2d_irq(unsigned int irq);
-static void disable_rts7751r2d_irq(unsigned int irq);
-
-/* shutdown is same as "disable" */
-#define shutdown_rts7751r2d_irq disable_rts7751r2d_irq
-
-static void ack_rts7751r2d_irq(unsigned int irq);
-static void end_rts7751r2d_irq(unsigned int irq);
-
-static unsigned int startup_rts7751r2d_irq(unsigned int irq)
-{
-       enable_rts7751r2d_irq(irq);
-       return 0; /* never anything pending */
-}
-
-static void disable_rts7751r2d_irq(unsigned int irq)
-{
-       unsigned long flags;
-       unsigned short val;
-       unsigned short mask = 0xffff ^ (0x0001 << mask_pos[irq]);
-
-       /* Set the priority in IPR to 0 */
-       local_irq_save(flags);
-       val = ctrl_inw(IRLCNTR1);
-       val &= mask;
-       ctrl_outw(val, IRLCNTR1);
-       local_irq_restore(flags);
-}
-
-static void enable_rts7751r2d_irq(unsigned int irq)
-{
-       unsigned long flags;
-       unsigned short val;
-       unsigned short value = (0x0001 << mask_pos[irq]);
-
-       /* Set priority in IPR back to original value */
-       local_irq_save(flags);
-       val = ctrl_inw(IRLCNTR1);
-       val |= value;
-       ctrl_outw(val, IRLCNTR1);
-       local_irq_restore(flags);
-}
-
-int rts7751r2d_irq_demux(int irq)
-{
-       int demux_irq;
-
-       demux_irq = voyagergx_irq_demux(irq);
-       return demux_irq;
-}
-
-static void ack_rts7751r2d_irq(unsigned int irq)
-{
-       disable_rts7751r2d_irq(irq);
-}
-
-static void end_rts7751r2d_irq(unsigned int irq)
-{
-       if (!(irq_desc[irq].status & (IRQ_DISABLED|IRQ_INPROGRESS)))
-               enable_rts7751r2d_irq(irq);
-}
-
-static struct hw_interrupt_type rts7751r2d_irq_type = {
-       "RTS7751R2D IRQ",
-       startup_rts7751r2d_irq,
-       shutdown_rts7751r2d_irq,
-       enable_rts7751r2d_irq,
-       disable_rts7751r2d_irq,
-       ack_rts7751r2d_irq,
-       end_rts7751r2d_irq,
-};
-
-static void make_rts7751r2d_irq(unsigned int irq)
-{
-       disable_irq_nosync(irq);
-       irq_desc[irq].handler = &rts7751r2d_irq_type;
-       disable_rts7751r2d_irq(irq);
-}
-
-/*
- * Initialize IRQ setting
- */
-void __init init_rts7751r2d_IRQ(void)
-{
-       int i;
-
-       /* IRL0=KEY Input
-        * IRL1=Ethernet
-        * IRL2=CF Card
-        * IRL3=CF Card Insert
-        * IRL4=PCMCIA
-        * IRL5=VOYAGER
-        * IRL6=RTC Alarm
-        * IRL7=RTC Timer
-        * IRL8=SD Card
-        * IRL9=PCI Slot #1
-        * IRL10=PCI Slot #2
-        * IRL11=Extention #0
-        * IRL12=Extention #1
-        * IRL13=Extention #2
-        * IRL14=Extention #3
-        */
-
-       for (i=0; i<15; i++)
-               make_rts7751r2d_irq(i);
-
-       setup_voyagergx_irq();
-}
diff --git a/arch/sh/boards/renesas/rts7751r2d/led.c b/arch/sh/boards/renesas/rts7751r2d/led.c
deleted file mode 100644 (file)
index 9993259..0000000
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * linux/arch/sh/kernel/led_rts7751r2d.c
- *
- * Copyright (C) Atom Create Engineering Co., Ltd.
- *
- * May be copied or modified under the terms of GNU General Public
- * License.  See linux/COPYING for more information.
- *
- * This file contains Renesas Technology Sales RTS7751R2D specific LED code.
- */
-
-#include <linux/config.h>
-#include <asm/io.h>
-#include <asm/rts7751r2d/rts7751r2d.h>
-
-extern unsigned int debug_counter;
-
-#ifdef CONFIG_HEARTBEAT
-
-#include <linux/sched.h>
-
-/* Cycle the LED's in the clasic Knightriger/Sun pattern */
-void heartbeat_rts7751r2d(void)
-{
-       static unsigned int cnt = 0, period = 0;
-       volatile unsigned short *p = (volatile unsigned short *)PA_OUTPORT;
-       static unsigned bit = 0, up = 1;
-
-       cnt += 1;
-       if (cnt < period)
-               return;
-
-       cnt = 0;
-
-       /* Go through the points (roughly!):
-        * f(0)=10, f(1)=16, f(2)=20, f(5)=35, f(int)->110
-        */
-       period = 110 - ((300 << FSHIFT)/((avenrun[0]/5) + (3<<FSHIFT)));
-
-       *p = 1 << bit;
-       if (up)
-               if (bit == 7) {
-                       bit--;
-                       up = 0;
-               } else
-                       bit++;
-       else if (bit == 0)
-               up = 1;
-       else
-               bit--;
-}
-#endif /* CONFIG_HEARTBEAT */
-
-void rts7751r2d_led(unsigned short value)
-{
-       ctrl_outw(value, PA_OUTPORT);
-}
-
-void debug_led_disp(void)
-{
-       unsigned short value;
-
-       value = (unsigned short)debug_counter++;
-       rts7751r2d_led(value);
-       if (value == 0xff)
-               debug_counter = 0;
-}
diff --git a/arch/sh/boards/renesas/rts7751r2d/mach.c b/arch/sh/boards/renesas/rts7751r2d/mach.c
deleted file mode 100644 (file)
index c1ff454..0000000
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * linux/arch/sh/kernel/mach_rts7751r2d.c
- *
- * Minor tweak of mach_se.c file to reference rts7751r2d-specific items.
- *
- * May be copied or modified under the terms of the GNU General Public
- * License.  See linux/COPYING for more information.
- *
- * Machine vector for the Renesas Technology sales RTS7751R2D
- */
-
-#include <linux/config.h>
-#include <linux/init.h>
-#include <linux/types.h>
-
-#include <asm/machvec.h>
-#include <asm/rtc.h>
-#include <asm/irq.h>
-#include <asm/rts7751r2d/io.h>
-
-extern void heartbeat_rts7751r2d(void);
-extern void init_rts7751r2d_IRQ(void);
-extern void *rts7751r2d_ioremap(unsigned long, unsigned long);
-extern int rts7751r2d_irq_demux(int irq);
-
-extern void *voyagergx_consistent_alloc(struct device *, size_t, dma_addr_t *, int);
-extern void voyagergx_consistent_free(struct device *, size_t, void *, dma_addr_t);
-
-/*
- * The Machine Vector
- */
-
-struct sh_machine_vector mv_rts7751r2d __initmv = {
-       .mv_nr_irqs             = 72,
-
-       .mv_inb                 = rts7751r2d_inb,
-       .mv_inw                 = rts7751r2d_inw,
-       .mv_inl                 = rts7751r2d_inl,
-       .mv_outb                = rts7751r2d_outb,
-       .mv_outw                = rts7751r2d_outw,
-       .mv_outl                = rts7751r2d_outl,
-
-       .mv_inb_p               = rts7751r2d_inb_p,
-       .mv_inw_p               = rts7751r2d_inw,
-       .mv_inl_p               = rts7751r2d_inl,
-       .mv_outb_p              = rts7751r2d_outb_p,
-       .mv_outw_p              = rts7751r2d_outw,
-       .mv_outl_p              = rts7751r2d_outl,
-
-       .mv_insb                = rts7751r2d_insb,
-       .mv_insw                = rts7751r2d_insw,
-       .mv_insl                = rts7751r2d_insl,
-       .mv_outsb               = rts7751r2d_outsb,
-       .mv_outsw               = rts7751r2d_outsw,
-       .mv_outsl               = rts7751r2d_outsl,
-
-       .mv_ioremap             = rts7751r2d_ioremap,
-       .mv_isa_port2addr       = rts7751r2d_isa_port2addr,
-       .mv_init_irq            = init_rts7751r2d_IRQ,
-#ifdef CONFIG_HEARTBEAT
-       .mv_heartbeat           = heartbeat_rts7751r2d,
-#endif
-       .mv_irq_demux           = rts7751r2d_irq_demux,
-
-       .mv_consistent_alloc    = voyagergx_consistent_alloc,
-       .mv_consistent_free     = voyagergx_consistent_free,
-};
-ALIAS_MV(rts7751r2d)
diff --git a/arch/sh/boards/renesas/rts7751r2d/setup.c b/arch/sh/boards/renesas/rts7751r2d/setup.c
deleted file mode 100644 (file)
index 2587fd1..0000000
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * linux/arch/sh/kernel/setup_rts7751r2d.c
- *
- * Copyright (C) 2000  Kazumoto Kojima
- *
- * Renesas Technology Sales RTS7751R2D Support.
- *
- * Modified for RTS7751R2D by
- * Atom Create Engineering Co., Ltd. 2002.
- */
-
-#include <linux/init.h>
-#include <asm/io.h>
-#include <asm/rts7751r2d/rts7751r2d.h>
-
-unsigned int debug_counter;
-
-const char *get_system_type(void)
-{
-       return "RTS7751R2D";
-}
-
-/*
- * Initialize the board
- */
-void __init platform_setup(void)
-{
-       printk(KERN_INFO "Renesas Technology Sales RTS7751R2D support.\n");
-       ctrl_outw(0x0000, PA_OUTPORT);
-       debug_counter = 0;
-}
diff --git a/arch/sh/boards/renesas/systemh/Makefile b/arch/sh/boards/renesas/systemh/Makefile
deleted file mode 100644 (file)
index 2cc6a23..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/renesas/systemh/io.c b/arch/sh/boards/renesas/systemh/io.c
deleted file mode 100644 (file)
index cf97901..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/renesas/systemh/irq.c b/arch/sh/boards/renesas/systemh/irq.c
deleted file mode 100644 (file)
index 5675a41..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/renesas/systemh/setup.c b/arch/sh/boards/renesas/systemh/setup.c
deleted file mode 100644 (file)
index 826fa3d..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/sh/boards/se/7300/Makefile b/arch/sh/boards/se/7300/Makefile
deleted file mode 100644 (file)
index 0fbd4f4..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-#
-# Makefile for the 7300 SolutionEngine specific parts of the kernel
-#
-
-obj-y   := setup.o io.o irq.o
-
-obj-$(CONFIG_HEARTBEAT) += led.o
diff --git a/arch/sh/boards/se/7300/io.c b/arch/sh/boards/se/7300/io.c
deleted file mode 100644 (file)
index 4e89391..0000000
+++ /dev/null
@@ -1,261 +0,0 @@
-/*
- * linux/arch/sh/boards/se/7300/io.c
- *
- * Copyright (C) 2003 YOSHII Takashi <yoshii-takashi@hitachi-ul.co.jp>
- */
-
-#include <linux/config.h>
-#include <linux/kernel.h>
-#include <asm/se7300/se7300.h>
-#include <asm/io.h>
-
-#define badio(fn, a) panic("bad i/o operation %s for %08lx.", #fn, a)
-
-struct iop {
-       unsigned long start, end;
-       unsigned long base;
-       struct iop *(*check) (struct iop * p, unsigned long port);
-       unsigned char (*inb) (struct iop * p, unsigned long port);
-       unsigned short (*inw) (struct iop * p, unsigned long port);
-       void (*outb) (struct iop * p, unsigned char value, unsigned long port);
-       void (*outw) (struct iop * p, unsigned short value, unsigned long port);
-};
-
-struct iop *
-simple_check(struct iop *p, unsigned long port)
-{
-       if ((p->start <= port) && (port <= p->end))
-               return p;
-       else
-               badio(check, port);
-}
-
-struct iop *
-ide_check(struct iop *p, unsigned long port)
-{
-       if (((0x1f0 <= port) && (port <= 0x1f7)) || (port == 0x3f7))
-               return p;
-       return NULL;
-}
-
-unsigned char
-simple_inb(struct iop *p, unsigned long port)
-{
-       return *(unsigned char *) (p->base + port);
-}
-
-unsigned short
-simple_inw(struct iop *p, unsigned long port)
-{
-       return *(unsigned short *) (p->base + port);
-}
-
-void
-simple_outb(struct iop *p, unsigned char value, unsigned long port)
-{
-       *(unsigned char *) (p->base + port) = value;
-}
-
-void
-simple_outw(struct iop *p, unsigned short value, unsigned long port)
-{
-       *(unsigned short *) (p->base + port) = value;
-}
-
-unsigned char
-pcc_inb(struct iop *p, unsigned long port)
-{
-       unsigned long addr = p->base + port + 0x40000;
-       unsigned long v;
-
-       if (port & 1)
-               addr += 0x00400000;
-       v = *(volatile unsigned char *) addr;
-       return v;
-}
-
-void
-pcc_outb(struct iop *p, unsigned char value, unsigned long port)
-{
-       unsigned long addr = p->base + port + 0x40000;
-
-       if (port & 1)
-               addr += 0x00400000;
-       *(volatile unsigned char *) addr = value;
-}
-
-unsigned char
-bad_inb(struct iop *p, unsigned long port)
-{
-       badio(inb, port);
-}
-
-void
-bad_outb(struct iop *p, unsigned char value, unsigned long port)
-{
-       badio(inw, port);
-}
-
-/* MSTLANEX01 LAN at 0xb400:0000 */
-static struct iop laniop = {
-       .start = 0x300,
-       .end = 0x30f,
-       .base = 0xb4000000,
-       .check = simple_check,
-       .inb = simple_inb,
-       .inw = simple_inw,
-       .outb = simple_outb,
-       .outw = simple_outw,
-};
-
-/* NE2000 pc card NIC */
-static struct iop neiop = {
-       .start = 0x280,
-       .end = 0x29f,
-       .base = 0xb0600000 + 0x80,      /* soft 0x280 -> hard 0x300 */
-       .check = simple_check,
-       .inb = pcc_inb,
-       .inw = simple_inw,
-       .outb = pcc_outb,
-       .outw = simple_outw,
-};
-
-/* CF in CF slot */
-static struct iop cfiop = {
-       .base = 0xb0600000,
-       .check = ide_check,
-       .inb = pcc_inb,
-       .inw = simple_inw,
-       .outb = pcc_outb,
-       .outw = simple_outw,
-};
-
-static __inline__ struct iop *
-port2iop(unsigned long port)
-{
-       if (0) ;
-#if defined(CONFIG_SMC91111)
-       else if (laniop.check(&laniop, port))
-               return &laniop;
-#endif
-#if defined(CONFIG_NE2000)
-       else if (neiop.check(&neiop, port))
-               return &neiop;
-#endif
-#if defined(CONFIG_IDE)
-       else if (cfiop.check(&cfiop, port))
-               return &cfiop;
-#endif
-       else
-               return &neiop;  /* fallback */
-}
-
-static inline void
-delay(void)
-{
-       ctrl_inw(0xac000000);
-       ctrl_inw(0xac000000);
-}
-
-unsigned char
-sh7300se_inb(unsigned long port)
-{
-       struct iop *p = port2iop(port);
-       return (p->inb) (p, port);
-}
-
-unsigned char
-sh7300se_inb_p(unsigned long port)
-{
-       unsigned char v = sh7300se_inb(port);
-       delay();
-       return v;
-}
-
-unsigned short
-sh7300se_inw(unsigned long port)
-{
-       struct iop *p = port2iop(port);
-       return (p->inw) (p, port);
-}
-
-unsigned int
-sh7300se_inl(unsigned long port)
-{
-       badio(inl, port);
-}
-
-void
-sh7300se_outb(unsigned char value, unsigned long port)
-{
-       struct iop *p = port2iop(port);
-       (p->outb) (p, value, port);
-}
-
-void
-sh7300se_outb_p(unsigned char value, unsigned long port)
-{
-       sh7300se_outb(value, port);
-       delay();
-}
-
-void
-sh7300se_outw(unsigned short value, unsigned long port)
-{
-       struct iop *p = port2iop(port);
-       (p->outw) (p, value, port);
-}
-
-void
-sh7300se_outl(unsigned int value, unsigned long port)
-{
-       badio(outl, port);
-}
-
-void
-sh7300se_insb(unsigned long port, void *addr, unsigned long count)
-{
-       unsigned char *a = addr;
-       struct iop *p = port2iop(port);
-       while (count--)
-               *a++ = (p->inb) (p, port);
-}
-
-void
-sh7300se_insw(unsigned long port, void *addr, unsigned long count)
-{
-       unsigned short *a = addr;
-       struct iop *p = port2iop(port);
-       while (count--)
-               *a++ = (p->inw) (p, port);
-}
-
-void
-sh7300se_insl(unsigned long port, void *addr, unsigned long count)
-{
-       badio(insl, port);
-}
-
-void
-sh7300se_outsb(unsigned long port, const void *addr, unsigned long count)
-{
-       unsigned char *a = (unsigned char *) addr;
-       struct iop *p = port2iop(port);
-       while (count--)
-               (p->outb) (p, *a++, port);
-}
-
-void
-sh7300se_outsw(unsigned long port, const void *addr, unsigned long count)
-{
-       unsigned short *a = (unsigned short *) addr;
-       struct iop *p = port2iop(port);
-       while (count--)
-               (p->outw) (p, *a++, port);
-}
-
-void
-sh7300se_outsl(unsigned long port, const void *addr, unsigned long count)
-{
-       badio(outsw, port);
-}
diff --git a/arch/sh/boards/se/7300/irq.c b/arch/sh/boards/se/7300/irq.c
deleted file mode 100644 (file)
index 96c8c23..0000000
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * linux/arch/sh/boards/se/7300/irq.c
- *
- * Copyright (C) 2003 Takashi Kusuda <kusuda-takashi@hitachi-ul.co.jp>
- *
- * SH-Mobile SolutionEngine 7300 Support.
- *
- */
-
-#include <linux/config.h>
-#include <linux/init.h>
-#include <linux/irq.h>
-#include <asm/irq.h>
-#include <asm/io.h>
-#include <asm/mach/se7300.h>
-
-/*
- * Initialize IRQ setting
- */
-void __init
-init_7300se_IRQ(void)
-{
-       ctrl_outw(0x0028, PA_EPLD_MODESET);     /* mode set IRQ0,1 active low. */
-       ctrl_outw(0xa000, INTC_ICR1);           /* IRQ mode; IRQ0,1 enable.    */
-       ctrl_outw(0x0000, PORT_PFCR);           /* use F for IRQ[3:0] and SIU. */
-
-       /* PC_IRQ[0-3] -> IRQ0 (32) */
-       make_ipr_irq(IRQ0_IRQ, IRQ0_IPR_ADDR, IRQ0_IPR_POS, 0x0f - IRQ0_IRQ);
-       /* A_IRQ[0-3] -> IRQ1 (33) */
-       make_ipr_irq(IRQ1_IRQ, IRQ1_IPR_ADDR, IRQ1_IPR_POS, 0x0f - IRQ1_IRQ);
-       make_ipr_irq(SIOF0_IRQ, SIOF0_IPR_ADDR, SIOF0_IPR_POS, SIOF0_PRIORITY);
-       make_ipr_irq(DMTE2_IRQ, DMA1_IPR_ADDR, DMA1_IPR_POS, DMA1_PRIORITY);
-       make_ipr_irq(DMTE3_IRQ, DMA1_IPR_ADDR, DMA1_IPR_POS, DMA1_PRIORITY);
-       make_ipr_irq(VIO_IRQ, VIO_IPR_ADDR, VIO_IPR_POS, VIO_PRIORITY);
-
-       ctrl_outw(0x2000, PA_MRSHPC + 0x0c);    /* mrshpc irq enable */
-}
diff --git a/arch/sh/boards/se/7300/led.c b/arch/sh/boards/se/7300/led.c
deleted file mode 100644 (file)
index 02c7f84..0000000
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * linux/arch/sh/boards/se/7300/led.c
- *
- * Derived from linux/arch/sh/boards/se/770x/led.c
- *
- * Copyright (C) 2000 Stuart Menefy <stuart.menefy@st.com>
- *
- * May be copied or modified under the terms of the GNU General Public
- * License.  See linux/COPYING for more information.
- *
- * This file contains Solution Engine specific LED code.
- */
-
-#include <linux/config.h>
-#include <linux/sched.h>
-#include <asm/mach/se7300.h>
-
-static void
-mach_led(int position, int value)
-{
-       volatile unsigned short *p = (volatile unsigned short *) PA_LED;
-
-       if (value) {
-               *p |= (1 << 8);
-       } else {
-               *p &= ~(1 << 8);
-       }
-}
-
-
-/* Cycle the LED's in the clasic Knightrider/Sun pattern */
-void
-heartbeat_7300se(void)
-{
-       static unsigned int cnt = 0, period = 0;
-       volatile unsigned short *p = (volatile unsigned short *) PA_LED;
-       static unsigned bit = 0, up = 1;
-
-       cnt += 1;
-       if (cnt < period) {
-               return;
-       }
-
-       cnt = 0;
-
-       /* Go through the points (roughly!):
-        * f(0)=10, f(1)=16, f(2)=20, f(5)=35,f(inf)->110
-        */
-       period = 110 - ((300 << FSHIFT) / ((avenrun[0] / 5) + (3 << FSHIFT)));
-
-       if (up) {
-               if (bit == 7) {
-                       bit--;
-                       up = 0;
-               } else {
-                       bit++;
-               }
-       } else {
-               if (bit == 0) {
-                       bit++;
-                       up = 1;
-               } else {
-                       bit--;
-               }
-       }
-       *p = 1 << (bit + 8);
-
-}
-
diff --git a/arch/sh/boards/se/7300/setup.c b/arch/sh/boards/se/7300/setup.c
deleted file mode 100644 (file)
index 08536bc..0000000
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * linux/arch/sh/boards/se/7300/setup.c
- *
- * Copyright (C) 2003 Takashi Kusuda <kusuda-takashi@hitachi-ul.co.jp>
- *
- * SH-Mobile SolutionEngine 7300 Support.
- *
- */
-
-#include <linux/config.h>
-#include <linux/init.h>
-#include <asm/machvec.h>
-#include <asm/machvec_init.h>
-#include <asm/mach/io.h>
-
-void heartbeat_7300se(void);
-void init_7300se_IRQ(void);
-
-const char *
-get_system_type(void)
-{
-       return "SolutionEngine 7300";
-}
-
-/*
- * The Machine Vector
- */
-
-struct sh_machine_vector mv_7300se __initmv = {
-       .mv_nr_irqs = 109,
-       .mv_inb = sh7300se_inb,
-       .mv_inw = sh7300se_inw,
-       .mv_inl = sh7300se_inl,
-       .mv_outb = sh7300se_outb,
-       .mv_outw = sh7300se_outw,
-       .mv_outl = sh7300se_outl,
-
-       .mv_inb_p = sh7300se_inb_p,
-       .mv_inw_p = sh7300se_inw,
-       .mv_inl_p = sh7300se_inl,
-       .mv_outb_p = sh7300se_outb_p,
-       .mv_outw_p = sh7300se_outw,
-       .mv_outl_p = sh7300se_outl,
-
-       .mv_insb = sh7300se_insb,
-       .mv_insw = sh7300se_insw,
-       .mv_insl = sh7300se_insl,
-       .mv_outsb = sh7300se_outsb,
-       .mv_outsw = sh7300se_outsw,
-       .mv_outsl = sh7300se_outsl,
-
-       .mv_init_irq = init_7300se_IRQ,
-#ifdef CONFIG_HEARTBEAT
-       .mv_heartbeat = heartbeat_7300se,
-#endif
-};
-
-ALIAS_MV(7300se)
-/*
- * Initialize the board
- */
-void __init
-platform_setup(void)
-{
-
-}
diff --git a/arch/sh/cchips/voyagergx/Makefile b/arch/sh/cchips/voyagergx/Makefile
deleted file mode 100644 (file)
index 085de72..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-# Makefile for VoyagerGX
-#
-
-obj-y  := irq.o setup.o
-
-obj-$(CONFIG_USB_OHCI_HCD)     += consistent.o
-
diff --git a/arch/sh/cchips/voyagergx/consistent.c b/arch/sh/cchips/voyagergx/consistent.c
deleted file mode 100644 (file)
index 95a309d..0000000
+++ /dev/null
@@ -1,126 +0,0 @@
-/*
- * arch/sh/cchips/voyagergx/consistent.c
- *
- * Copyright (C) 2004  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/mm.h>
-#include <linux/dma-mapping.h>
-#include <linux/slab.h>
-#include <linux/list.h>
-#include <linux/types.h>
-#include <linux/module.h>
-#include <linux/device.h>
-#include <asm/io.h>
-#include <asm/bus-sh.h>
-
-struct voya_alloc_entry {
-       struct list_head list;
-       unsigned long ofs;
-       unsigned long len;
-};
-
-static spinlock_t voya_list_lock = SPIN_LOCK_UNLOCKED;
-static LIST_HEAD(voya_alloc_list);
-
-#define OHCI_SRAM_START        0xb0000000
-#define OHCI_HCCA_SIZE 0x100
-#define OHCI_SRAM_SIZE 0x10000
-
-void *voyagergx_consistent_alloc(struct device *dev, size_t size,
-                                dma_addr_t *handle, int flag)
-{
-       struct list_head *list = &voya_alloc_list;
-       struct voya_alloc_entry *entry;
-       struct sh_dev *shdev = to_sh_dev(dev);
-       unsigned long start, end;
-       unsigned long flags;
-
-       /*
-        * The SM501 contains an integrated 8051 with its own SRAM.
-        * Devices within the cchip can all hook into the 8051 SRAM.
-        * We presently use this for the OHCI.
-        *
-        * Everything else goes through consistent_alloc().
-        */
-       if (!dev || dev->bus != &sh_bus_types[SH_BUS_VIRT] ||
-                  (dev->bus == &sh_bus_types[SH_BUS_VIRT] &&
-                   shdev->dev_id != SH_DEV_ID_USB_OHCI))
-               return consistent_alloc(flag, size, handle);
-
-       start = OHCI_SRAM_START + OHCI_HCCA_SIZE;
-
-       entry = kmalloc(sizeof(struct voya_alloc_entry), GFP_ATOMIC);
-       if (!entry)
-               return NULL;
-
-       entry->len = (size + 15) & ~15;
-
-       /*
-        * The basis for this allocator is dwmw2's malloc.. the
-        * Matrox allocator :-)
-        */
-       spin_lock_irqsave(&voya_list_lock, flags);
-       list_for_each(list, &voya_alloc_list) {
-               struct voya_alloc_entry *p;
-
-               p = list_entry(list, struct voya_alloc_entry, list);
-
-               if (p->ofs - start >= size)
-                       goto out;
-
-               start = p->ofs + p->len;
-       }
-
-       end  = start + (OHCI_SRAM_SIZE  - OHCI_HCCA_SIZE);
-       list = &voya_alloc_list;
-
-       if (end - start >= size) {
-out:
-               entry->ofs = start;
-               list_add_tail(&entry->list, list);
-               spin_unlock_irqrestore(&voya_list_lock, flags);
-
-               *handle = start;
-               return (void *)start;
-       }
-
-       kfree(entry);
-       spin_unlock_irqrestore(&voya_list_lock, flags);
-
-       return NULL;
-}
-
-void voyagergx_consistent_free(struct device *dev, size_t size,
-                              void *vaddr, dma_addr_t handle)
-{
-       struct voya_alloc_entry *entry;
-       struct sh_dev *shdev = to_sh_dev(dev);
-       unsigned long flags;
-
-       if (!dev || dev->bus != &sh_bus_types[SH_BUS_VIRT] ||
-                  (dev->bus == &sh_bus_types[SH_BUS_VIRT] &&
-                   shdev->dev_id != SH_DEV_ID_USB_OHCI)) {
-               consistent_free(vaddr, size);
-               return;
-       }
-
-       spin_lock_irqsave(&voya_list_lock, flags);
-       list_for_each_entry(entry, &voya_alloc_list, list) {
-               if (entry->ofs != handle)
-                       continue;
-
-               list_del(&entry->list);
-               kfree(entry);
-
-               break;
-       }
-       spin_unlock_irqrestore(&voya_list_lock, flags);
-}
-
-EXPORT_SYMBOL(voyagergx_consistent_alloc);
-EXPORT_SYMBOL(voyagergx_consistent_free);
-
diff --git a/arch/sh/cchips/voyagergx/irq.c b/arch/sh/cchips/voyagergx/irq.c
deleted file mode 100644 (file)
index 3079234..0000000
+++ /dev/null
@@ -1,194 +0,0 @@
-/* -------------------------------------------------------------------- */
-/* setup_voyagergx.c:                                                     */
-/* -------------------------------------------------------------------- */
-/*  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.
-
-    Copyright 2003 (c) Lineo uSolutions,Inc.
-*/
-/* -------------------------------------------------------------------- */
-
-#undef DEBUG
-
-#include <linux/config.h>
-#include <linux/sched.h>
-#include <linux/module.h>
-#include <linux/kernel.h>
-#include <linux/param.h>
-#include <linux/ioport.h>
-#include <linux/interrupt.h>
-#include <linux/init.h>
-#include <linux/irq.h>
-
-#include <asm/io.h>
-#include <asm/irq.h>
-#include <asm/rts7751r2d/rts7751r2d.h>
-#include <asm/rts7751r2d/voyagergx_reg.h>
-
-static void disable_voyagergx_irq(unsigned int irq)
-{
-       unsigned long flags, val;
-       unsigned long  mask = 1 << (irq - VOYAGER_IRQ_BASE);
-
-       pr_debug("disable_voyagergx_irq(%d): mask=%x\n", irq, mask);
-       local_irq_save(flags);
-        val = inl(VOYAGER_INT_MASK);
-        val &= ~mask;
-        outl(val, VOYAGER_INT_MASK);
-       local_irq_restore(flags);
-}
-
-
-static void enable_voyagergx_irq(unsigned int irq)
-{
-        unsigned long flags, val;
-        unsigned long  mask = 1 << (irq - VOYAGER_IRQ_BASE);
-
-        pr_debug("disable_voyagergx_irq(%d): mask=%x\n", irq, mask);
-        local_irq_save(flags);
-        val = inl(VOYAGER_INT_MASK);
-        val |= mask;
-        outl(val, VOYAGER_INT_MASK);
-        local_irq_restore(flags);
-}
-
-
-static void mask_and_ack_voyagergx(unsigned int irq)
-{
-       disable_voyagergx_irq(irq);
-}
-
-static void end_voyagergx_irq(unsigned int irq)
-{
-       if (!(irq_desc[irq].status & (IRQ_DISABLED|IRQ_INPROGRESS)))
-               enable_voyagergx_irq(irq);
-}
-
-static unsigned int startup_voyagergx_irq(unsigned int irq)
-{
-       enable_voyagergx_irq(irq);
-       return 0;
-}
-
-static void shutdown_voyagergx_irq(unsigned int irq)
-{
-       disable_voyagergx_irq(irq);
-}
-
-static struct hw_interrupt_type voyagergx_irq_type = {
-       "VOYAGERGX-IRQ",
-       startup_voyagergx_irq,
-       shutdown_voyagergx_irq,
-       enable_voyagergx_irq,
-       disable_voyagergx_irq,
-       mask_and_ack_voyagergx,
-       end_voyagergx_irq,
-};
-
-static irqreturn_t voyagergx_interrupt(int irq, void *dev_id, struct pt_regs *regs)
-{
-       printk(KERN_INFO
-              "VoyagerGX: spurious interrupt, status: 0x%x\n",
-                       inl(INT_STATUS));
-       return IRQ_HANDLED;
-}
-
-
-/*====================================================*/
-
-static struct {
-       int (*func)(int, void *);
-       void *dev;
-} voyagergx_demux[VOYAGER_IRQ_NUM];
-
-void voyagergx_register_irq_demux(int irq,
-               int (*demux)(int irq, void *dev), void *dev)
-{
-       voyagergx_demux[irq - VOYAGER_IRQ_BASE].func = demux;
-       voyagergx_demux[irq - VOYAGER_IRQ_BASE].dev = dev;
-}
-
-void voyagergx_unregister_irq_demux(int irq)
-{
-       voyagergx_demux[irq - VOYAGER_IRQ_BASE].func = 0;
-}
-
-int voyagergx_irq_demux(int irq)
-{
-
-       if (irq == IRQ_VOYAGER ) {
-               unsigned long i = 0, bit __attribute__ ((unused));
-               unsigned long val  = inl(INT_STATUS);
-#if 1
-               if ( val & ( 1 << 1 )){
-                       i = 1;
-               } else if ( val & ( 1 << 2 )){
-                       i = 2;
-               } else if ( val & ( 1 << 6 )){
-                       i = 6;
-               } else if( val & ( 1 << 10 )){
-                       i = 10;
-               } else if( val & ( 1 << 11 )){
-                       i = 11;
-               } else if( val & ( 1 << 12 )){
-                       i = 12;
-               } else if( val & ( 1 << 17 )){
-                       i = 17;
-               } else {
-                       printk("Unexpected IRQ irq = %d status = 0x%08lx\n", irq, val);
-               }
-               pr_debug("voyagergx_irq_demux %d \n", i);
-#else
-               for (bit = 1, i = 0 ; i < VOYAGER_IRQ_NUM ; bit <<= 1, i++)
-                       if (val & bit)
-                               break;
-#endif
-               if (i < VOYAGER_IRQ_NUM) {
-                       irq = VOYAGER_IRQ_BASE + i;
-                       if (voyagergx_demux[i].func != 0)
-                               irq = voyagergx_demux[i].func(irq, voyagergx_demux[i].dev);
-               }
-       }
-       return irq;
-}
-
-static struct irqaction irq0  = { voyagergx_interrupt, SA_INTERRUPT, 0, "VOYAGERGX", NULL, NULL};
-
-void __init setup_voyagergx_irq(void)
-{
-       int i, flag;
-
-       printk(KERN_INFO "VoyagerGX configured at 0x%x on irq %d(mapped into %d to %d)\n",
-              VOYAGER_BASE,
-              IRQ_VOYAGER,
-              VOYAGER_IRQ_BASE,
-              VOYAGER_IRQ_BASE + VOYAGER_IRQ_NUM - 1);
-
-       for (i=0; i<VOYAGER_IRQ_NUM; i++) {
-               flag = 0;
-               switch (VOYAGER_IRQ_BASE + i) {
-               case VOYAGER_USBH_IRQ:
-               case VOYAGER_8051_IRQ:
-               case VOYAGER_UART0_IRQ:
-               case VOYAGER_UART1_IRQ:
-               case VOYAGER_AC97_IRQ:
-                       flag = 1;
-               }
-               if (flag == 1)
-                       irq_desc[VOYAGER_IRQ_BASE + i].handler = &voyagergx_irq_type;
-       }
-
-       setup_irq(IRQ_VOYAGER, &irq0);
-}
-
diff --git a/arch/sh/cchips/voyagergx/setup.c b/arch/sh/cchips/voyagergx/setup.c
deleted file mode 100644 (file)
index 139ca88..0000000
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * arch/sh/cchips/voyagergx/setup.c
- *
- * Setup routines for VoyagerGX cchip.
- *
- * Copyright (C) 2003 Lineo uSolutions, 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/io.h>
-#include <asm/rts7751r2d/voyagergx_reg.h>
-
-static int __init setup_voyagergx(void)
-{
-       unsigned long val;
-
-       val = inl(DRAM_CTRL);
-       val |= (DRAM_CTRL_CPU_COLUMN_SIZE_256   |
-               DRAM_CTRL_CPU_ACTIVE_PRECHARGE  |
-               DRAM_CTRL_CPU_RESET             |
-               DRAM_CTRL_REFRESH_COMMAND       |
-               DRAM_CTRL_BLOCK_WRITE_TIME      |
-               DRAM_CTRL_BLOCK_WRITE_PRECHARGE |
-               DRAM_CTRL_ACTIVE_PRECHARGE      |
-               DRAM_CTRL_RESET                 |
-               DRAM_CTRL_REMAIN_ACTIVE);
-       outl(val, DRAM_CTRL);
-
-       return 0;
-}
-
-module_init(setup_voyagergx);
diff --git a/arch/sh/configs/rts7751r2d_defconfig b/arch/sh/configs/rts7751r2d_defconfig
deleted file mode 100644 (file)
index f9e1f7c..0000000
+++ /dev/null
@@ -1,809 +0,0 @@
-#
-# Automatically generated make config: don't edit
-#
-CONFIG_SUPERH=y
-CONFIG_UID16=y
-CONFIG_RWSEM_GENERIC_SPINLOCK=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_LOG_BUF_SHIFT=14
-# 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
-
-#
-# Loadable module support
-#
-CONFIG_MODULES=y
-# CONFIG_MODULE_UNLOAD is not set
-CONFIG_OBSOLETE_MODPARM=y
-# CONFIG_MODVERSIONS is not set
-# CONFIG_KMOD is not set
-
-#
-# System type
-#
-# CONFIG_SH_SOLUTION_ENGINE is not set
-# CONFIG_SH_7751_SOLUTION_ENGINE is not set
-# CONFIG_SH_7751_SYSTEMH is not set
-# CONFIG_SH_STB1_HARP is not set
-# CONFIG_SH_STB1_OVERDRIVE is not set
-# CONFIG_SH_HP620 is not set
-# CONFIG_SH_HP680 is not set
-# CONFIG_SH_HP690 is not set
-# CONFIG_SH_CQREEK is not set
-# CONFIG_SH_DMIDA is not set
-# CONFIG_SH_EC3104 is not set
-# CONFIG_SH_SATURN is not set
-# CONFIG_SH_DREAMCAST is not set
-# CONFIG_SH_CAT68701 is not set
-# CONFIG_SH_BIGSUR is not set
-# CONFIG_SH_SH2000 is not set
-# CONFIG_SH_ADX is not set
-# CONFIG_SH_MPC1211 is not set
-# CONFIG_SH_SECUREEDGE5410 is not set
-CONFIG_SH_RTS7751R2D=y
-# CONFIG_SH_UNKNOWN is not set
-# CONFIG_CPU_SH2 is not set
-# CONFIG_CPU_SH3 is not set
-CONFIG_CPU_SH4=y
-# CONFIG_CPU_SUBTYPE_SH7604 is not set
-# CONFIG_CPU_SUBTYPE_SH7300 is not set
-# CONFIG_CPU_SUBTYPE_SH7707 is not set
-# CONFIG_CPU_SUBTYPE_SH7708 is not set
-# CONFIG_CPU_SUBTYPE_SH7709 is not set
-# CONFIG_CPU_SUBTYPE_SH7750 is not set
-CONFIG_CPU_SUBTYPE_SH7751=y
-# CONFIG_CPU_SUBTYPE_SH7760 is not set
-# CONFIG_CPU_SUBTYPE_ST40STB1 is not set
-CONFIG_MMU=y
-CONFIG_CMDLINE_BOOL=y
-CONFIG_CMDLINE="mem=64M console=ttySC0,115200 root=/dev/hda1"
-CONFIG_MEMORY_START=0x0c000000
-CONFIG_MEMORY_SIZE=0x04000000
-CONFIG_MEMORY_SET=y
-# CONFIG_MEMORY_OVERRIDE is not set
-CONFIG_SH_RTC=y
-CONFIG_ZERO_PAGE_OFFSET=0x00010000
-CONFIG_BOOT_LINK_OFFSET=0x00800000
-CONFIG_CPU_LITTLE_ENDIAN=y
-# CONFIG_PREEMPT is not set
-# CONFIG_UBC_WAKEUP is not set
-# CONFIG_SH_WRITETHROUGH is not set
-# CONFIG_SH_OCRAM is not set
-# CONFIG_SH_STORE_QUEUES is not set
-# CONFIG_SMP is not set
-CONFIG_VOYAGERGX=y
-CONFIG_RTS7751R2D_REV11=y
-CONFIG_SH_PCLK_FREQ=60000000
-# CONFIG_CPU_FREQ is not set
-CONFIG_SH_DMA=y
-CONFIG_NR_ONCHIP_DMA_CHANNELS=8
-# CONFIG_NR_DMA_CHANNELS_BOOL is not set
-# CONFIG_DMA_PAGE_OPS is not set
-
-#
-# Bus options (PCI, PCMCIA, EISA, MCA, ISA)
-#
-CONFIG_ISA=y
-CONFIG_PCI=y
-CONFIG_SH_PCIDMA_NONCOHERENT=y
-CONFIG_PCI_AUTO=y
-CONFIG_PCI_AUTO_UPDATE_RESOURCES=y
-CONFIG_PCI_DMA=y
-# CONFIG_PCI_LEGACY_PROC is not set
-CONFIG_PCI_NAMES=y
-CONFIG_HOTPLUG=y
-
-#
-# PCMCIA/CardBus support
-#
-CONFIG_PCMCIA=m
-CONFIG_YENTA=m
-CONFIG_CARDBUS=y
-# CONFIG_I82092 is not set
-# CONFIG_I82365 is not set
-# CONFIG_TCIC is not set
-CONFIG_PCMCIA_PROBE=y
-
-#
-# PCI Hotplug Support
-#
-CONFIG_HOTPLUG_PCI=y
-# CONFIG_HOTPLUG_PCI_FAKE is not set
-# CONFIG_HOTPLUG_PCI_CPCI is not set
-
-#
-# Executable file formats
-#
-CONFIG_BINFMT_ELF=y
-# CONFIG_BINFMT_FLAT is not set
-# CONFIG_BINFMT_MISC is not set
-
-#
-# Generic Driver Options
-#
-# CONFIG_FW_LOADER is not set
-
-#
-# Memory Technology Devices (MTD)
-#
-# CONFIG_MTD is not set
-
-#
-# Parallel port support
-#
-# CONFIG_PARPORT is not set
-
-#
-# Block devices
-#
-# CONFIG_BLK_DEV_FD is not set
-# CONFIG_BLK_DEV_XD 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_RAM=y
-CONFIG_BLK_DEV_RAM_SIZE=4096
-# CONFIG_BLK_DEV_INITRD 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 is not set
-# CONFIG_IDEDISK_STROKE is not set
-CONFIG_BLK_DEV_IDECS=m
-# 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 is not set
-
-#
-# IDE chipset support/bugfixes
-#
-# CONFIG_BLK_DEV_IDEPCI is not set
-# CONFIG_IDE_CHIPSETS is not set
-# CONFIG_BLK_DEV_IDEDMA is not set
-# CONFIG_IDEDMA_AUTO is not set
-# CONFIG_DMA_NONPCI is not set
-# CONFIG_BLK_DEV_HD is not set
-
-#
-# SCSI device support
-#
-# CONFIG_SCSI is not set
-
-#
-# Old CD-ROM drivers (not SCSI, not IDE)
-#
-# CONFIG_CD_NO_IDESCSI is not set
-
-#
-# Multi-device support (RAID and LVM)
-#
-# CONFIG_MD is not set
-
-#
-# IEEE 1394 (FireWire) support (EXPERIMENTAL)
-#
-# CONFIG_IEEE1394 is not set
-
-#
-# 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 is not set
-# CONFIG_IP_ADVANCED_ROUTER is not set
-# CONFIG_IP_PNP 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_INET_AH is not set
-# CONFIG_INET_ESP is not set
-# CONFIG_INET_IPCOMP is not set
-# CONFIG_IPV6 is not set
-# CONFIG_DECNET is not set
-# CONFIG_BRIDGE is not set
-# CONFIG_NETFILTER is not set
-
-#
-# SCTP Configuration (EXPERIMENTAL)
-#
-CONFIG_IPV6_SCTP__=y
-# CONFIG_IP_SCTP is not set
-# CONFIG_ATM is not set
-# CONFIG_VLAN_8021Q 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_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
-
-#
-# Ethernet (10 or 100Mbit)
-#
-CONFIG_NET_ETHERNET=y
-CONFIG_MII=y
-# CONFIG_STNIC is not set
-# CONFIG_HAPPYMEAL 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
-
-#
-# Tulip family network device support
-#
-# CONFIG_NET_TULIP is not set
-# CONFIG_AT1700 is not set
-# CONFIG_DEPCA is not set
-# CONFIG_HP100 is not set
-CONFIG_NET_ISA=y
-# CONFIG_E2100 is not set
-# CONFIG_EWRK3 is not set
-# CONFIG_EEXPRESS is not set
-# CONFIG_EEXPRESS_PRO is not set
-# CONFIG_HPLAN_PLUS is not set
-# CONFIG_HPLAN is not set
-# CONFIG_LP486E is not set
-# CONFIG_ETH16I is not set
-CONFIG_NE2000=m
-# CONFIG_ZNET is not set
-# CONFIG_SEEQ8005 is not set
-CONFIG_NET_PCI=y
-# CONFIG_PCNET32 is not set
-# CONFIG_AMD8111_ETH is not set
-# CONFIG_ADAPTEC_STARFIRE is not set
-# CONFIG_AC3200 is not set
-# CONFIG_APRICOT is not set
-# CONFIG_B44 is not set
-# CONFIG_CS89x0 is not set
-# CONFIG_DGRS is not set
-# CONFIG_EEPRO100 is not set
-# CONFIG_E100 is not set
-# CONFIG_FEALNX is not set
-# CONFIG_NATSEMI is not set
-# CONFIG_NE2K_PCI is not set
-# CONFIG_8139CP is not set
-CONFIG_8139TOO=y
-# 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 is not set
-# CONFIG_SUNDANCE is not set
-# CONFIG_TLAN is not set
-# CONFIG_VIA_RHINE is not set
-# CONFIG_NET_POCKET 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_SIS190 is not set
-# CONFIG_SK98LIN is not set
-# CONFIG_TIGON3 is not set
-
-#
-# Ethernet (10000 Mbit)
-#
-# CONFIG_IXGB is not set
-# CONFIG_FDDI is not set
-# CONFIG_HIPPI is not set
-# CONFIG_PPP is not set
-# CONFIG_SLIP 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 is not set
-# CONFIG_PCMCIA_WAVELAN is not set
-# CONFIG_PCMCIA_NETWAVE is not set
-
-#
-# 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 is not set
-# CONFIG_TMD_HERMES is not set
-# CONFIG_PCI_HERMES is not set
-
-#
-# Wireless 802.11b Pcmcia/Cardbus cards support
-#
-CONFIG_PCMCIA_HERMES=m
-# CONFIG_AIRO_CS is not set
-# CONFIG_PCMCIA_ATMEL is not set
-# CONFIG_PCMCIA_WL3501 is not set
-CONFIG_NET_WIRELESS=y
-
-#
-# Token Ring devices
-#
-# CONFIG_TR is not set
-# CONFIG_RCPCI is not set
-# CONFIG_SHAPER is not set
-
-#
-# Wan interfaces
-#
-# CONFIG_WAN is not set
-
-#
-# PCMCIA network device support
-#
-# CONFIG_NET_PCMCIA is not set
-
-#
-# Amateur Radio support
-#
-# CONFIG_HAMRADIO is not set
-
-#
-# IrDA (infrared) support
-#
-# CONFIG_IRDA is not set
-
-#
-# Bluetooth support
-#
-# CONFIG_BT is not set
-
-#
-# ISDN subsystem
-#
-# CONFIG_ISDN_BOOL 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 is not set
-CONFIG_SH_SCI=y
-CONFIG_SERIAL_CONSOLE=y
-CONFIG_RTC_9701JE=y
-
-#
-# Unix 98 PTY support
-#
-# CONFIG_UNIX98_PTYS is not set
-CONFIG_HEARTBEAT=y
-# CONFIG_PSMOUSE is not set
-
-#
-# Watchdog Cards
-#
-# CONFIG_WATCHDOG is not set
-# CONFIG_RTC is not set
-
-#
-# PCMCIA character devices
-#
-# CONFIG_SYNCLINK_CS is not set
-
-#
-# Serial drivers
-#
-# CONFIG_SERIAL_8250 is not set
-
-#
-# Non-8250 serial port support
-#
-# CONFIG_SERIAL_SH_SCI is not set
-
-#
-# I2C support
-#
-# CONFIG_I2C is not set
-
-#
-# I2C Algorithms
-#
-
-#
-# I2C Hardware Bus support
-#
-
-#
-# I2C Hardware Sensors Chip support
-#
-# CONFIG_I2C_SENSOR 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=y
-# 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=y
-CONFIG_MSDOS_FS=y
-CONFIG_VFAT_FS=y
-# CONFIG_NTFS_FS is not set
-
-#
-# Pseudo filesystems
-#
-CONFIG_PROC_FS=y
-CONFIG_PROC_KCORE=y
-# CONFIG_DEVFS_FS is not set
-# 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_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
-
-#
-# Network File Systems
-#
-# CONFIG_NFS_FS is not set
-# CONFIG_NFSD is not set
-# CONFIG_EXPORTFS 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
-CONFIG_NLS=y
-
-#
-# Native Language Support
-#
-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=y
-# 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 is not set
-# 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
-
-#
-# 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=y
-
-#
-# Advanced Linux Sound Architecture
-#
-CONFIG_SND=m
-# CONFIG_SND_SEQUENCER is not set
-# CONFIG_SND_OSSEMUL is not set
-# CONFIG_SND_VERBOSE_PRINTK is not set
-# CONFIG_SND_DEBUG is not set
-
-#
-# Generic devices
-#
-# CONFIG_SND_DUMMY is not set
-# CONFIG_SND_MTPAV is not set
-# CONFIG_SND_SERIAL_U16550 is not set
-# CONFIG_SND_MPU401 is not set
-
-#
-# ISA devices
-#
-# CONFIG_SND_AD1848 is not set
-# CONFIG_SND_CS4231 is not set
-# CONFIG_SND_CS4232 is not set
-# CONFIG_SND_CS4236 is not set
-# CONFIG_SND_ES1688 is not set
-# CONFIG_SND_ES18XX is not set
-# CONFIG_SND_GUSCLASSIC is not set
-# CONFIG_SND_GUSEXTREME is not set
-# CONFIG_SND_GUSMAX is not set
-# CONFIG_SND_INTERWAVE is not set
-# CONFIG_SND_INTERWAVE_STB is not set
-# CONFIG_SND_OPTI92X_AD1848 is not set
-# CONFIG_SND_OPTI92X_CS4231 is not set
-# CONFIG_SND_OPTI93X is not set
-# CONFIG_SND_SB8 is not set
-# CONFIG_SND_SB16 is not set
-# CONFIG_SND_SBAWE is not set
-# CONFIG_SND_WAVEFRONT is not set
-# CONFIG_SND_CMI8330 is not set
-# CONFIG_SND_OPL3SA2 is not set
-# CONFIG_SND_SGALAXY is not set
-# CONFIG_SND_SSCAPE is not set
-
-#
-# PCI devices
-#
-# CONFIG_SND_ALI5451 is not set
-# CONFIG_SND_AZT3328 is not set
-# CONFIG_SND_CS46XX is not set
-# CONFIG_SND_CS4281 is not set
-# CONFIG_SND_EMU10K1 is not set
-# CONFIG_SND_KORG1212 is not set
-# CONFIG_SND_NM256 is not set
-# CONFIG_SND_RME32 is not set
-# CONFIG_SND_RME96 is not set
-# CONFIG_SND_RME9652 is not set
-# CONFIG_SND_HDSP is not set
-# CONFIG_SND_TRIDENT is not set
-CONFIG_SND_YMFPCI=m
-# CONFIG_SND_ALS4000 is not set
-# CONFIG_SND_CMIPCI is not set
-# CONFIG_SND_ENS1370 is not set
-# CONFIG_SND_ENS1371 is not set
-# CONFIG_SND_ES1938 is not set
-# CONFIG_SND_ES1968 is not set
-# CONFIG_SND_MAESTRO3 is not set
-# CONFIG_SND_FM801 is not set
-# CONFIG_SND_ICE1712 is not set
-# CONFIG_SND_ICE1724 is not set
-# CONFIG_SND_INTEL8X0 is not set
-# CONFIG_SND_SONICVIBES is not set
-# CONFIG_SND_VIA82XX is not set
-# CONFIG_SND_VX222 is not set
-
-#
-# PCMCIA devices
-#
-# CONFIG_SND_VXPOCKET is not set
-# CONFIG_SND_VXP440 is not set
-
-#
-# Open Sound System
-#
-CONFIG_SOUND_PRIME=m
-# CONFIG_SOUND_BT878 is not set
-CONFIG_SOUND_CMPCI=m
-# CONFIG_SOUND_CMPCI_FM is not set
-# CONFIG_SOUND_CMPCI_MIDI is not set
-# CONFIG_SOUND_CMPCI_JOYSTICK is not set
-# CONFIG_SOUND_CMPCI_CM8738 is not set
-# CONFIG_SOUND_EMU10K1 is not set
-# CONFIG_SOUND_FUSION is not set
-# CONFIG_SOUND_CS4281 is not set
-# CONFIG_SOUND_ES1370 is not set
-# CONFIG_SOUND_ES1371 is not set
-# CONFIG_SOUND_ESSSOLO1 is not set
-# CONFIG_SOUND_MAESTRO is not set
-# CONFIG_SOUND_MAESTRO3 is not set
-# CONFIG_SOUND_ICH is not set
-# CONFIG_SOUND_SONICVIBES is not set
-# CONFIG_SOUND_TRIDENT is not set
-# CONFIG_SOUND_MSNDCLAS is not set
-# CONFIG_SOUND_MSNDPIN is not set
-# CONFIG_SOUND_VIA82CXXX is not set
-# CONFIG_SOUND_OSS is not set
-# CONFIG_SOUND_ALI5455 is not set
-# CONFIG_SOUND_FORTE is not set
-# CONFIG_SOUND_RME96XX is not set
-# CONFIG_SOUND_AD1980 is not set
-CONFIG_SOUND_VOYAGERGX=m
-
-#
-# USB support
-#
-# CONFIG_USB is not set
-# CONFIG_USB_GADGET is not set
-
-#
-# Profiling support
-#
-# CONFIG_PROFILING is not set
-
-#
-# Kernel hacking
-#
-# CONFIG_MAGIC_SYSRQ is not set
-# CONFIG_DEBUG_SPINLOCK is not set
-# CONFIG_SH_STANDARD_BIOS is not set
-# CONFIG_KGDB is not set
-# CONFIG_FRAME_POINTER is not set
-
-#
-# Security options
-#
-# CONFIG_SECURITY is not set
-
-#
-# Cryptographic options
-#
-# CONFIG_CRYPTO is not set
-
-#
-# Library routines
-#
-CONFIG_CRC32=y
diff --git a/arch/sh/configs/se7300_defconfig b/arch/sh/configs/se7300_defconfig
deleted file mode 100644 (file)
index 842ca47..0000000
+++ /dev/null
@@ -1,461 +0,0 @@
-#
-# Automatically generated make config: don't edit
-#
-CONFIG_SUPERH=y
-CONFIG_UID16=y
-CONFIG_RWSEM_GENERIC_SPINLOCK=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 is not set
-# 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 is not set
-# CONFIG_EPOLL is not set
-CONFIG_IOSCHED_NOOP=y
-# CONFIG_IOSCHED_AS is not set
-# CONFIG_IOSCHED_DEADLINE is not set
-# CONFIG_IOSCHED_CFQ is not set
-# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
-
-#
-# Loadable module support
-#
-# CONFIG_MODULES is not set
-
-#
-# System type
-#
-# CONFIG_SH_SOLUTION_ENGINE is not set
-# CONFIG_SH_7751_SOLUTION_ENGINE is not set
-CONFIG_SH_7300_SOLUTION_ENGINE=y
-# CONFIG_SH_7751_SYSTEMH is not set
-# CONFIG_SH_STB1_HARP is not set
-# CONFIG_SH_STB1_OVERDRIVE is not set
-# CONFIG_SH_HP620 is not set
-# CONFIG_SH_HP680 is not set
-# CONFIG_SH_HP690 is not set
-# CONFIG_SH_CQREEK is not set
-# CONFIG_SH_DMIDA is not set
-# CONFIG_SH_EC3104 is not set
-# CONFIG_SH_SATURN is not set
-# CONFIG_SH_DREAMCAST is not set
-# CONFIG_SH_CAT68701 is not set
-# CONFIG_SH_BIGSUR is not set
-# CONFIG_SH_SH2000 is not set
-# CONFIG_SH_ADX is not set
-# CONFIG_SH_MPC1211 is not set
-# CONFIG_SH_SECUREEDGE5410 is not set
-# CONFIG_SH_HS7751RVOIP is not set
-# CONFIG_SH_RTS7751R2D is not set
-# CONFIG_SH_UNKNOWN is not set
-# CONFIG_CPU_SH2 is not set
-CONFIG_CPU_SH3=y
-# CONFIG_CPU_SH4 is not set
-# CONFIG_CPU_SUBTYPE_SH7604 is not set
-CONFIG_CPU_SUBTYPE_SH7300=y
-# CONFIG_CPU_SUBTYPE_SH7707 is not set
-# CONFIG_CPU_SUBTYPE_SH7708 is not set
-# CONFIG_CPU_SUBTYPE_SH7709 is not set
-# CONFIG_CPU_SUBTYPE_SH7750 is not set
-# CONFIG_CPU_SUBTYPE_SH7751 is not set
-# CONFIG_CPU_SUBTYPE_SH7760 is not set
-# CONFIG_CPU_SUBTYPE_ST40STB1 is not set
-# CONFIG_CPU_SUBTYPE_ST40GX1 is not set
-CONFIG_MMU=y
-CONFIG_CMDLINE_BOOL=y
-CONFIG_CMDLINE="console=ttySC0,38400 root=/dev/ram0"
-CONFIG_MEMORY_START=0x0c000000
-CONFIG_MEMORY_SIZE=0x04000000
-# CONFIG_MEMORY_OVERRIDE is not set
-CONFIG_SH_DSP=y
-# CONFIG_SH_ADC is not set
-CONFIG_ZERO_PAGE_OFFSET=0x00001000
-CONFIG_BOOT_LINK_OFFSET=0x00210000
-CONFIG_CPU_LITTLE_ENDIAN=y
-# CONFIG_PREEMPT is not set
-# CONFIG_UBC_WAKEUP is not set
-# CONFIG_SH_WRITETHROUGH is not set
-# CONFIG_SH_OCRAM is not set
-# CONFIG_SMP is not set
-# CONFIG_SH_PCLK_CALC is not set
-CONFIG_SH_PCLK_FREQ=33333333
-
-#
-# CPU Frequency scaling
-#
-# CONFIG_CPU_FREQ is not set
-
-#
-# DMA support
-#
-# CONFIG_SH_DMA is not set
-
-#
-# Companion Chips
-#
-# CONFIG_HD6446X_SERIES is not set
-CONFIG_HEARTBEAT=y
-
-#
-# Bus options (PCI, PCMCIA, EISA, MCA, ISA)
-#
-# CONFIG_PCI is not set
-
-#
-# Executable file formats
-#
-CONFIG_BINFMT_ELF=y
-# CONFIG_BINFMT_FLAT is not set
-# CONFIG_BINFMT_MISC is not set
-
-#
-# SH initrd options
-#
-CONFIG_EMBEDDED_RAMDISK=y
-CONFIG_EMBEDDED_RAMDISK_IMAGE="ramdisk.gz"
-
-#
-# Device Drivers
-#
-
-#
-# Generic Driver Options
-#
-
-#
-# 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 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
-#
-
-#
-# 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 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 is not set
-# CONFIG_SERIO_SERPORT is not set
-# CONFIG_SERIO_CT82C710 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 is not set
-# CONFIG_SERIAL_NONSTANDARD is not set
-
-#
-# Serial drivers
-#
-# CONFIG_SERIAL_8250 is not set
-
-#
-# Non-8250 serial port support
-#
-CONFIG_SERIAL_SH_SCI=y
-CONFIG_SERIAL_SH_SCI_CONSOLE=y
-CONFIG_SERIAL_CORE=y
-CONFIG_SERIAL_CORE_CONSOLE=y
-# CONFIG_UNIX98_PTYS is not set
-# CONFIG_LEGACY_PTYS is not set
-# CONFIG_QIC02_TAPE is not set
-
-#
-# IPMI
-#
-CONFIG_IPMI_HANDLER=y
-# CONFIG_IPMI_PANIC_EVENT is not set
-CONFIG_IPMI_DEVICE_INTERFACE=y
-# CONFIG_IPMI_SI is not set
-CONFIG_IPMI_WATCHDOG=y
-
-#
-# Watchdog Cards
-#
-CONFIG_WATCHDOG=y
-# CONFIG_WATCHDOG_NOWAYOUT is not set
-
-#
-# Watchdog Device Drivers
-#
-CONFIG_SOFT_WATCHDOG=y
-# CONFIG_SH_WDT 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
-# 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
-
-#
-# 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 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=y
-CONFIG_DEVFS_MOUNT=y
-# CONFIG_DEVFS_DEBUG is not set
-# CONFIG_TMPFS is not set
-# 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 is not set
-
-#
-# Partition Types
-#
-# CONFIG_PARTITION_ADVANCED is not set
-CONFIG_MSDOS_PARTITION=y
-
-#
-# Native Language Support
-#
-# CONFIG_NLS is not set
-
-#
-# Profiling support
-#
-# CONFIG_PROFILING is not set
-
-#
-# Kernel hacking
-#
-# CONFIG_MAGIC_SYSRQ is not set
-# CONFIG_DEBUG_SPINLOCK is not set
-# CONFIG_DEBUG_INFO is not set
-CONFIG_SH_STANDARD_BIOS=y
-CONFIG_EARLY_PRINTK=y
-CONFIG_KGDB=y
-
-#
-# KGDB configuration options
-#
-# CONFIG_MORE_COMPILE_OPTIONS is not set
-# CONFIG_KGDB_NMI is not set
-# CONFIG_KGDB_THREAD is not set
-# CONFIG_SH_KGDB_CONSOLE is not set
-# CONFIG_KGDB_SYSRQ is not set
-# CONFIG_KGDB_KERNEL_ASSERTS is not set
-
-#
-# Serial port setup
-#
-CONFIG_KGDB_DEFPORT=1
-CONFIG_KGDB_DEFBAUD=115200
-CONFIG_KGDB_DEFPARITY_N=y
-# CONFIG_KGDB_DEFPARITY_E is not set
-# CONFIG_KGDB_DEFPARITY_O is not set
-CONFIG_KGDB_DEFBITS_8=y
-# CONFIG_KGDB_DEFBITS_7 is not set
-# CONFIG_FRAME_POINTER is not set
-
-#
-# Security options
-#
-# CONFIG_SECURITY is not set
-
-#
-# Cryptographic options
-#
-# CONFIG_CRYPTO is not set
-
-#
-# Library routines
-#
-CONFIG_CRC32=y
-# CONFIG_LIBCRC32C is not set
diff --git a/arch/sh/drivers/dma/dma-sysfs.c b/arch/sh/drivers/dma/dma-sysfs.c
deleted file mode 100644 (file)
index 71a6d4e..0000000
+++ /dev/null
@@ -1,133 +0,0 @@
-/*
- * arch/sh/drivers/dma/dma-sysfs.c
- *
- * sysfs interface for SH DMA API
- *
- * Copyright (C) 2004  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/kernel.h>
-#include <linux/init.h>
-#include <linux/sysdev.h>
-#include <linux/module.h>
-#include <asm/dma.h>
-
-static struct sysdev_class dma_sysclass = {
-       set_kset_name("dma"),
-};
-
-EXPORT_SYMBOL(dma_sysclass);
-
-static ssize_t dma_show_devices(struct sys_device *dev, char *buf)
-{
-       ssize_t len = 0;
-       int i;
-
-       for (i = 0; i < MAX_DMA_CHANNELS; i++) {
-               struct dma_info *info = get_dma_info(i);
-               struct dma_channel *channel = &info->channels[i];
-
-               len += sprintf(buf + len, "%2d: %14s    %s\n",
-                              channel->chan, info->name,
-                              channel->dev_id);
-       }
-
-       return len;
-}
-
-static SYSDEV_ATTR(devices, S_IRUGO, dma_show_devices, NULL);
-
-static int __init dma_sysclass_init(void)
-{
-       int ret;
-
-       ret = sysdev_class_register(&dma_sysclass);
-       if (ret == 0)
-               sysfs_create_file(&dma_sysclass.kset.kobj, &attr_devices.attr);
-
-       return ret;
-}
-
-postcore_initcall(dma_sysclass_init);
-
-static ssize_t dma_show_dev_id(struct sys_device *dev, char *buf)
-{
-       struct dma_channel *channel = to_dma_channel(dev);
-       return sprintf(buf, "%s\n", channel->dev_id);
-}
-
-static ssize_t dma_store_dev_id(struct sys_device *dev,
-                               const char *buf, size_t count)
-{
-       struct dma_channel *channel = to_dma_channel(dev);
-       strcpy(channel->dev_id, buf);
-       return count;
-}
-
-static SYSDEV_ATTR(dev_id, S_IRUGO | S_IWUSR, dma_show_dev_id, dma_store_dev_id);
-
-static ssize_t dma_store_config(struct sys_device *dev,
-                               const char *buf, size_t count)
-{
-       struct dma_channel *channel = to_dma_channel(dev);
-       unsigned long config;
-
-       config = simple_strtoul(buf, NULL, 0);
-       dma_configure_channel(channel->chan, config);
-
-       return count;
-}
-
-static SYSDEV_ATTR(config, S_IWUSR, NULL, dma_store_config);
-
-static ssize_t dma_show_mode(struct sys_device *dev, char *buf)
-{
-       struct dma_channel *channel = to_dma_channel(dev);
-       return sprintf(buf, "0x%08x\n", channel->mode);
-}
-
-static ssize_t dma_store_mode(struct sys_device *dev,
-                             const char *buf, size_t count)
-{
-       struct dma_channel *channel = to_dma_channel(dev);
-       channel->mode = simple_strtoul(buf, NULL, 0);
-       return count;
-}
-
-static SYSDEV_ATTR(mode, S_IRUGO | S_IWUSR, dma_show_mode, dma_store_mode);
-
-#define dma_ro_attr(field, fmt)                                                \
-static ssize_t dma_show_##field(struct sys_device *dev, char *buf)     \
-{                                                                      \
-       struct dma_channel *channel = to_dma_channel(dev);              \
-       return sprintf(buf, fmt, channel->field);                       \
-}                                                                      \
-static SYSDEV_ATTR(field, S_IRUGO, dma_show_##field, NULL);
-
-dma_ro_attr(count, "0x%08x\n");
-dma_ro_attr(flags, "0x%08lx\n");
-
-int __init dma_create_sysfs_files(struct dma_channel *chan)
-{
-       struct sys_device *dev = &chan->dev;
-       int ret;
-
-       dev->id  = chan->chan;
-       dev->cls = &dma_sysclass;
-
-       ret = sysdev_register(dev);
-       if (ret)
-               return ret;
-
-       sysdev_create_file(dev, &attr_dev_id);
-       sysdev_create_file(dev, &attr_count);
-       sysdev_create_file(dev, &attr_mode);
-       sysdev_create_file(dev, &attr_flags);
-       sysdev_create_file(dev, &attr_config);
-
-       return 0;
-}
-
diff --git a/arch/sh/drivers/pci/fixups-rts7751r2d.c b/arch/sh/drivers/pci/fixups-rts7751r2d.c
deleted file mode 100644 (file)
index 7b5dbe1..0000000
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * arch/sh/drivers/pci/fixups-rts7751r2d.c
- *
- * RTS7751R2D PCI fixups
- *
- * Copyright (C) 2003  Lineo uSolutions, Inc.
- * Copyright (C) 2004  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 "pci-sh7751.h"
-#include <asm/io.h>
-
-#define PCIMCR_MRSET_OFF       0xBFFFFFFF
-#define PCIMCR_RFSH_OFF                0xFFFFFFFB
-
-int pci_fixup_pcic(void)
-{
-       unsigned long mcr;
-
-       outl(0xfb900047, SH7751_PCICONF1);
-       outl(0xab000001, SH7751_PCICONF4);
-
-       mcr = inl(SH7751_MCR);
-       mcr = (mcr & PCIMCR_MRSET_OFF) & PCIMCR_RFSH_OFF;
-       outl(mcr, SH7751_PCIMCR);
-
-       return 0;
-}
-
diff --git a/arch/sh/drivers/pci/ops-rts7751r2d.c b/arch/sh/drivers/pci/ops-rts7751r2d.c
deleted file mode 100644 (file)
index 2bceb43..0000000
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- * linux/arch/sh/kernel/pci-rts7751r2d.c
- *
- * Author:  Ian DaSilva (idasilva@mvista.com)
- *
- * Highly leveraged from pci-bigsur.c, written by Dustin McIntire.
- *
- * May be copied or modified under the terms of the GNU General Public
- * License.  See linux/COPYING for more information.
- *
- * PCI initialization for the Renesas SH7751R RTS7751R2D board
- */
-
-#include <linux/config.h>
-#include <linux/kernel.h>
-#include <linux/types.h>
-#include <linux/init.h>
-#include <linux/delay.h>
-#include <linux/pci.h>
-#include <linux/module.h>
-
-#include <asm/io.h>
-#include "pci-sh7751.h"
-#include <asm/rts7751r2d/rts7751r2d.h>
-
-int __init pcibios_map_platform_irq(u8 slot, u8 pin)
-{
-        switch (slot) {
-       case 0: return IRQ_PCISLOT1;    /* PCI Extend slot #1 */
-       case 1: return IRQ_PCISLOT2;    /* PCI Extend slot #2 */
-       case 2: return IRQ_PCMCIA;      /* PCI Cardbus Bridge */
-       case 3: return IRQ_PCIETH;      /* Realtek Ethernet controller */
-       default:
-               printk("PCI: Bad IRQ mapping request for slot %d\n", slot);
-               return -1;
-       }
-}
-
-static struct resource sh7751_io_resource = {
-       .name   = "SH7751_IO",
-       .start  = 0x4000,
-       .end    = 0x4000 + SH7751_PCI_IO_SIZE - 1,
-       .flags  = IORESOURCE_IO
-};
-
-static struct resource sh7751_mem_resource = {
-       .name   = "SH7751_mem",
-       .start  = SH7751_PCI_MEMORY_BASE,
-       .end    = SH7751_PCI_MEMORY_BASE + SH7751_PCI_MEM_SIZE - 1,
-       .flags  = IORESOURCE_MEM
-};
-
-extern struct pci_ops sh7751_pci_ops;
-
-struct pci_channel board_pci_channels[] = {
-       { &sh7751_pci_ops, &sh7751_io_resource, &sh7751_mem_resource, 0, 0xff },
-       { NULL, NULL, NULL, 0, 0 },
-};
-EXPORT_SYMBOL(board_pci_channels);
-
-static struct sh7751_pci_address_map sh7751_pci_map = {
-       .window0        = {
-               .base   = SH7751_CS3_BASE_ADDR,
-               .size   = 0x03f00000,
-       },
-
-       .flags  = SH7751_PCIC_NO_RESET,
-};
-
-int __init pcibios_init_platform(void)
-{
-       return sh7751_pcic_init(&sh7751_pci_map);
-}
-
diff --git a/arch/sh/kernel/cpu/adc.c b/arch/sh/kernel/cpu/adc.c
deleted file mode 100644 (file)
index da3d687..0000000
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * linux/arch/sh/kernel/adc.c -- SH3 on-chip ADC support
- *
- *  Copyright (C) 2004  Andriy Skulysh <askulysh@image.kiev.ua>
- */
-
-#include <linux/module.h>
-#include <asm/adc.h>
-#include <asm/io.h>
-
-
-int adc_single(unsigned int channel)
-{
-       int off;
-       unsigned char csr;
-
-       if (channel >= 8) return -1;
-
-       off = (channel & 0x03) << 2;
-
-       csr = ctrl_inb(ADCSR);
-       csr = channel | ADCSR_ADST | ADCSR_CKS;
-       ctrl_outb(csr, ADCSR);
-
-       do {
-               csr = ctrl_inb(ADCSR);
-       } while ((csr & ADCSR_ADF) == 0);
-
-       csr &= ~(ADCSR_ADF | ADCSR_ADST);
-       ctrl_outb(csr, ADCSR);
-
-       return (((ctrl_inb(ADDRAH + off) << 8) |
-               ctrl_inb(ADDRAL + off)) >> 6);
-}
-
-EXPORT_SYMBOL(adc_single);
diff --git a/arch/sh/kernel/cpu/bus.c b/arch/sh/kernel/cpu/bus.c
deleted file mode 100644 (file)
index ace82f4..0000000
+++ /dev/null
@@ -1,195 +0,0 @@
-/*
- * arch/sh/kernel/cpu/bus.c
- *
- * Virtual bus for SuperH.
- *
- * Copyright (C) 2004 Paul Mundt
- *
- * Shamelessly cloned from arch/arm/mach-omap/bus.c, which was written
- * by:
- *
- *     Copyright (C) 2003 - 2004 Nokia Corporation
- *     Written by Tony Lindgren <tony@atomide.com>
- *     Portions of code based on sa1111.c.
- *
- * 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/device.h>
-#include <linux/init.h>
-#include <linux/module.h>
-#include <asm/bus-sh.h>
-
-static int sh_bus_match(struct device *dev, struct device_driver *drv)
-{
-       struct sh_driver *shdrv = to_sh_driver(drv);
-       struct sh_dev *shdev = to_sh_dev(dev);
-
-       return shdev->dev_id == shdrv->dev_id;
-}
-
-static int sh_bus_suspend(struct device *dev, u32 state)
-{
-       struct sh_dev *shdev = to_sh_dev(dev);
-       struct sh_driver *shdrv = to_sh_driver(dev->driver);
-
-       if (shdrv && shdrv->suspend)
-               return shdrv->suspend(shdev, state);
-
-       return 0;
-}
-
-static int sh_bus_resume(struct device *dev)
-{
-       struct sh_dev *shdev = to_sh_dev(dev);
-       struct sh_driver *shdrv = to_sh_driver(dev->driver);
-
-       if (shdrv && shdrv->resume)
-               return shdrv->resume(shdev);
-
-       return 0;
-}
-
-static struct device sh_bus_devices[SH_NR_BUSES] = {
-       {
-               .bus_id         = SH_BUS_NAME_VIRT,
-       },
-};
-
-struct bus_type sh_bus_types[SH_NR_BUSES] = {
-       {
-               .name           = SH_BUS_NAME_VIRT,
-               .match          = sh_bus_match,
-               .suspend        = sh_bus_suspend,
-               .resume         = sh_bus_resume,
-       },
-};
-
-static int sh_device_probe(struct device *dev)
-{
-       struct sh_dev *shdev = to_sh_dev(dev);
-       struct sh_driver *shdrv = to_sh_driver(dev->driver);
-
-       if (shdrv && shdrv->probe)
-               return shdrv->probe(shdev);
-
-       return -ENODEV;
-}
-
-static int sh_device_remove(struct device *dev)
-{
-       struct sh_dev *shdev = to_sh_dev(dev);
-       struct sh_driver *shdrv = to_sh_driver(dev->driver);
-
-       if (shdrv && shdrv->remove)
-               return shdrv->remove(shdev);
-
-       return 0;
-}
-
-int sh_device_register(struct sh_dev *dev)
-{
-       if (!dev)
-               return -EINVAL;
-
-       if (dev->bus_id < 0 || dev->bus_id >= SH_NR_BUSES) {
-               printk(KERN_ERR "%s: bus_id invalid: %s bus: %d\n",
-                      __FUNCTION__, dev->name, dev->bus_id);
-               return -EINVAL;
-       }
-
-       dev->dev.parent = &sh_bus_devices[dev->bus_id];
-       dev->dev.bus    = &sh_bus_types[dev->bus_id];
-
-       /* This is needed for USB OHCI to work */
-       if (dev->dma_mask)
-               dev->dev.dma_mask = dev->dma_mask;
-
-       snprintf(dev->dev.bus_id, BUS_ID_SIZE, "%s%u",
-                dev->name, dev->dev_id);
-
-       printk(KERN_INFO "Registering SH device '%s'. Parent at %s\n",
-              dev->dev.bus_id, dev->dev.parent->bus_id);
-
-       return device_register(&dev->dev);
-}
-
-void sh_device_unregister(struct sh_dev *dev)
-{
-       device_unregister(&dev->dev);
-}
-
-int sh_driver_register(struct sh_driver *drv)
-{
-       if (!drv)
-               return -EINVAL;
-
-       if (drv->bus_id < 0 || drv->bus_id >= SH_NR_BUSES) {
-               printk(KERN_ERR "%s: bus_id invalid: bus: %d device %d\n",
-                      __FUNCTION__, drv->bus_id, drv->dev_id);
-               return -EINVAL;
-       }
-
-       drv->drv.probe  = sh_device_probe;
-       drv->drv.remove = sh_device_remove;
-       drv->drv.bus    = &sh_bus_types[drv->bus_id];
-
-       return driver_register(&drv->drv);
-}
-
-void sh_driver_unregister(struct sh_driver *drv)
-{
-       driver_unregister(&drv->drv);
-}
-
-static int __init sh_bus_init(void)
-{
-       int i, ret = 0;
-
-       for (i = 0; i < SH_NR_BUSES; i++) {
-               ret = device_register(&sh_bus_devices[i]);
-               if (ret != 0) {
-                       printk(KERN_ERR "Unable to register bus device %s\n",
-                              sh_bus_devices[i].bus_id);
-                       continue;
-               }
-
-               ret = bus_register(&sh_bus_types[i]);
-               if (ret != 0) {
-                       printk(KERN_ERR "Unable to register bus %s\n",
-                              sh_bus_types[i].name);
-                       device_unregister(&sh_bus_devices[i]);
-               }
-       }
-
-       printk(KERN_INFO "SH Virtual Bus initialized\n");
-
-       return ret;
-}
-
-static void __exit sh_bus_exit(void)
-{
-       int i;
-
-       for (i = 0; i < SH_NR_BUSES; i++) {
-               bus_unregister(&sh_bus_types[i]);
-               device_unregister(&sh_bus_devices[i]);
-       }
-}
-
-module_init(sh_bus_init);
-module_exit(sh_bus_exit);
-
-MODULE_AUTHOR("Paul Mundt <lethal@linux-sh.org>");
-MODULE_DESCRIPTION("SH Virtual Bus");
-MODULE_LICENSE("GPL");
-
-EXPORT_SYMBOL(sh_bus_types);
-EXPORT_SYMBOL(sh_device_register);
-EXPORT_SYMBOL(sh_device_unregister);
-EXPORT_SYMBOL(sh_driver_register);
-EXPORT_SYMBOL(sh_driver_unregister);
-
diff --git a/arch/sh/kernel/early_printk.c b/arch/sh/kernel/early_printk.c
deleted file mode 100644 (file)
index 8c2769c..0000000
+++ /dev/null
@@ -1,135 +0,0 @@
-/*
- * arch/sh/kernel/early_printk.c
- *
- *  Copyright (C) 1999, 2000  Niibe Yutaka
- *  Copyright (C) 2002  M. R. Brown
- *
- * 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/console.h>
-#include <linux/tty.h>
-#include <linux/init.h>
-#include <asm/io.h>
-
-#ifdef CONFIG_SH_STANDARD_BIOS
-#include <asm/sh_bios.h>
-
-/*
- *     Print a string through the BIOS
- */
-static void sh_console_write(struct console *co, const char *s,
-                                unsigned count)
-{
-       sh_bios_console_write(s, count);
-}
-
-/*
- *     Setup initial baud/bits/parity. We do two things here:
- *     - construct a cflag setting for the first rs_open()
- *     - initialize the serial port
- *     Return non-zero if we didn't find a serial port.
- */
-static int __init sh_console_setup(struct console *co, char *options)
-{
-       int     cflag = CREAD | HUPCL | CLOCAL;
-
-       /*
-        *      Now construct a cflag setting.
-        *      TODO: this is a totally bogus cflag, as we have
-        *      no idea what serial settings the BIOS is using, or
-        *      even if its using the serial port at all.
-        */
-       cflag |= B115200 | CS8 | /*no parity*/0;
-
-       co->cflag = cflag;
-
-       return 0;
-}
-
-static struct console early_console = {
-       .name           = "bios",
-       .write          = sh_console_write,
-       .setup          = sh_console_setup,
-       .flags          = CON_PRINTBUFFER,
-       .index          = -1,
-};
-#endif
-
-#ifdef CONFIG_EARLY_SCIF_CONSOLE
-#define SCIF_REG       0xffe80000
-
-static void scif_sercon_putc(int c)
-{
-       while (!(ctrl_inw(SCIF_REG + 0x10) & 0x20)) ;
-
-       ctrl_outb(c, SCIF_REG + 12);
-       ctrl_outw((ctrl_inw(SCIF_REG + 0x10) & 0x9f), SCIF_REG + 0x10);
-
-       if (c == '\n')
-               scif_sercon_putc('\r');
-}
-
-static void scif_sercon_flush(void)
-{
-       ctrl_outw((ctrl_inw(SCIF_REG + 0x10) & 0xbf), SCIF_REG + 0x10);
-
-       while (!(ctrl_inw(SCIF_REG + 0x10) & 0x40)) ;
-
-       ctrl_outw((ctrl_inw(SCIF_REG + 0x10) & 0xbf), SCIF_REG + 0x10);
-}
-
-static void scif_sercon_write(struct console *con, const char *s, unsigned count)
-{
-       while (count-- > 0)
-               scif_sercon_putc(*s++);
-
-       scif_sercon_flush();
-}
-
-static int __init scif_sercon_setup(struct console *con, char *options)
-{
-       con->cflag = CREAD | HUPCL | CLOCAL | B115200 | CS8;
-
-       return 0;
-}
-
-static struct console early_console = {
-       .name           = "sercon",
-       .write          = scif_sercon_write,
-       .setup          = scif_sercon_setup,
-       .flags          = CON_PRINTBUFFER,
-       .index          = -1,
-};
-
-void scif_sercon_init(int baud)
-{
-       ctrl_outw(0, SCIF_REG + 8);
-       ctrl_outw(0, SCIF_REG);
-
-       /* Set baud rate */
-       ctrl_outb((50000000 / (32 * baud)) - 1, SCIF_REG + 4);
-
-       ctrl_outw(12, SCIF_REG + 24);
-       ctrl_outw(8, SCIF_REG + 24);
-       ctrl_outw(0, SCIF_REG + 32);
-       ctrl_outw(0x60, SCIF_REG + 16);
-       ctrl_outw(0, SCIF_REG + 36);
-       ctrl_outw(0x30, SCIF_REG + 8);
-}
-#endif
-
-void __init enable_early_printk(void)
-{
-#ifdef CONFIG_EARLY_SCIF_CONSOLE
-       scif_sercon_init(115200);
-#endif
-       register_console(&early_console);
-}
-
-void disable_early_printk(void)
-{
-       unregister_console(&early_console);
-}
-
diff --git a/arch/sh/ramdisk/Makefile b/arch/sh/ramdisk/Makefile
deleted file mode 100644 (file)
index a22d86b..0000000
+++ /dev/null
@@ -1,19 +0,0 @@
-#
-# Makefile for a ramdisk image
-#
-
-obj-y += ramdisk.o
-
-
-O_FORMAT = $(shell $(OBJDUMP) -i | head -n 2 | grep elf32)
-img := $(subst ",,$(CONFIG_EMBEDDED_RAMDISK_IMAGE))
-# add $(src) when $(img) is relative
-img := $(subst $(src)//,/,$(src)/$(img))
-
-quiet_cmd_ramdisk = LD      $@
-define cmd_ramdisk
-       $(LD) -T $(src)/ld.script -b binary --oformat $(O_FORMAT) -o $@ $(img)
-endef
-
-$(obj)/ramdisk.o: $(img) $(src)/ld.script
-       $(call cmd,ramdisk)
diff --git a/arch/sh/ramdisk/ld.script b/arch/sh/ramdisk/ld.script
deleted file mode 100644 (file)
index 94beee2..0000000
+++ /dev/null
@@ -1,9 +0,0 @@
-OUTPUT_ARCH(sh)
-SECTIONS
-{
-  .initrd :
-  {
-       *(.data)
-  }
-}
-
diff --git a/arch/sh64/Kconfig b/arch/sh64/Kconfig
deleted file mode 100644 (file)
index 0ac5d41..0000000
+++ /dev/null
@@ -1,320 +0,0 @@
-#
-# For a description of the syntax of this configuration file,
-# see Documentation/kbuild/config-language.txt.
-#
-
-mainmenu "Linux/SH64 Kernel Configuration"
-
-config SUPERH
-       bool
-       default y
-
-config SUPERH64
-       bool
-       default y
-
-config MMU
-       bool
-       default y
-
-config UID16
-       bool
-       default y
-
-config RWSEM_GENERIC_SPINLOCK
-       bool
-       default y
-
-config LOG_BUF_SHIFT
-       int
-       default 14
-
-config RWSEM_XCHGADD_ALGORITHM
-       bool
-
-config GENERIC_ISA_DMA
-       bool
-
-source init/Kconfig
-
-menu "System type"
-
-choice
-       prompt "SuperH system type"
-       default SH_SIMULATOR
-
-config SH_GENERIC
-       bool "Generic"
-
-config SH_SIMULATOR
-       bool "Simulator"
-
-config SH_CAYMAN
-       bool "Cayman"
-
-config SH_ROMRAM
-       bool "ROM/RAM"
-
-config SH_HARP
-       bool "ST50-Harp"
-
-endchoice
-
-choice
-       prompt "Processor family"
-       default CPU_SH5
-
-config CPU_SH5
-       bool "SH-5"
-
-endchoice
-
-choice
-       prompt "Processor type"
-
-config CPU_SUBTYPE_SH5_101
-       bool "SH5-101"
-       depends on CPU_SH5
-
-config CPU_SUBTYPE_SH5_103
-       bool "SH5-103"
-       depends on CPU_SH5
-
-endchoice
-
-choice
-       prompt "Endianness"
-       default LITTLE_ENDIAN
-
-config LITTLE_ENDIAN
-       bool "Little-Endian"
-
-config BIG_ENDIAN
-       bool "Big-Endian"
-
-endchoice
-
-config SH64_FPU_DENORM_FLUSH
-       bool "Flush floating point denorms to zero"
-
-choice
-       prompt "Page table levels"
-       default SH64_PGTABLE_2_LEVEL
-
-config SH64_PGTABLE_2_LEVEL
-       bool "2"
-
-config SH64_PGTABLE_3_LEVEL
-       bool "3"
-
-endchoice
-
-choice
-       prompt "HugeTLB page size"
-       depends on HUGETLB_PAGE && MMU
-       default HUGETLB_PAGE_SIZE_64K
-
-config HUGETLB_PAGE_SIZE_64K
-       bool "64K"
-
-config HUGETLB_PAGE_SIZE_1MB
-       bool "1MB"
-
-config HUGETLB_PAGE_SIZE_512MB
-       bool "512MB"
-
-endchoice
-
-config SH64_USER_MISALIGNED_FIXUP
-       bool "Fixup misaligned loads/stores occurring in user mode"
-
-comment "Memory options"
-
-config CACHED_MEMORY_OFFSET
-       hex "Cached Area Offset"
-       depends on SH_HARP || SH_CAYMAN || SH_SIMULATOR
-       default "20000000"
-
-config MEMORY_START
-       hex "Physical memory start address"
-       depends on SH_HARP || SH_CAYMAN || SH_SIMULATOR
-       default "80000000"
-
-config MEMORY_SIZE_IN_MB
-       int "Memory size (in MB)" if SH_HARP || SH_CAYMAN || SH_SIMULATOR
-       default "64" if SH_HARP || SH_CAYMAN
-       default "8" if SH_SIMULATOR
-
-comment "Cache options"
-
-config DCACHE_DISABLED
-       bool "DCache Disabling"
-       depends on SH_HARP || SH_CAYMAN || SH_SIMULATOR
-
-choice
-       prompt "DCache mode"
-       depends on !DCACHE_DISABLED && !SH_SIMULATOR
-       default DCACHE_WRITE_BACK
-
-config DCACHE_WRITE_BACK
-       bool "Write-back"
-
-config DCACHE_WRITE_THROUGH
-       bool "Write-through"
-
-endchoice
-
-config ICACHE_DISABLED
-       bool "ICache Disabling"
-       depends on SH_HARP || SH_CAYMAN || SH_SIMULATOR
-
-config PCIDEVICE_MEMORY_START
-       hex
-       depends on SH_HARP || SH_CAYMAN || SH_SIMULATOR
-       default "C0000000"
-
-config DEVICE_MEMORY_START
-       hex
-       depends on SH_HARP || SH_CAYMAN || SH_SIMULATOR
-       default "E0000000"
-
-config FLASH_MEMORY_START
-       hex "Flash memory/on-chip devices start address"
-       depends on SH_HARP || SH_CAYMAN || SH_SIMULATOR
-       default "00000000"
-
-config PCI_BLOCK_START
-       hex "PCI block start address"
-       depends on SH_HARP || SH_CAYMAN || SH_SIMULATOR
-       default "40000000"
-
-comment "CPU Subtype specific options"
-
-config SH64_ID2815_WORKAROUND
-       bool "Include workaround for SH5-101 cut2 silicon defect ID2815"
-
-comment "Misc options"
-config HEARTBEAT
-       bool "Heartbeat LED"
-
-config HDSP253_LED
-       bool "Support for HDSP-253 LED"
-       depends on SH_CAYMAN
-
-config SH_DMA
-       tristate "DMA controller (DMAC) support"
-
-config PREEMPT
-       bool "Preemptible Kernel (EXPERIMENTAL)"
-       depends on EXPERIMENTAL
-
-endmenu
-
-menu "Bus options (PCI, PCMCIA, EISA, MCA, ISA)"
-
-config ISA
-       bool
-
-config SBUS
-       bool
-
-config PCI
-       bool "PCI support"
-       help
-         Find out whether you have a PCI motherboard. PCI is the name of a
-         bus system, i.e. the way the CPU talks to the other stuff inside
-         your box. Other bus systems are ISA, EISA, MicroChannel (MCA) or
-         VESA. If you have PCI, say Y, otherwise N.
-
-         The PCI-HOWTO, available from
-         <http://www.tldp.org/docs.html#howto>, contains valuable
-         information about which PCI hardware does work under Linux and which
-         doesn't.
-
-config SH_PCIDMA_NONCOHERENT
-       bool "Cache and PCI noncoherent"
-       depends on PCI
-       default y
-       help
-         Enable this option if your platform does not have a CPU cache which
-         remains coherent with PCI DMA. It is safest to say 'Y', although you
-         will see better performance if you can say 'N', because the PCI DMA
-         code will not have to flush the CPU's caches. If you have a PCI host
-         bridge integrated with your SH CPU, refer carefully to the chip specs
-         to see if you can say 'N' here. Otherwise, leave it as 'Y'.
-
-source "drivers/pci/Kconfig"
-
-source "drivers/pcmcia/Kconfig"
-
-source "drivers/pci/hotplug/Kconfig"
-
-endmenu
-
-menu "Executable file formats"
-
-source "fs/Kconfig.binfmt"
-
-endmenu
-
-source "drivers/Kconfig"
-
-source "fs/Kconfig"
-
-source "arch/sh64/oprofile/Kconfig"
-
-menu "Kernel hacking"
-
-config MAGIC_SYSRQ
-       bool "Magic SysRq key"
-       help
-         If you say Y here, you will have some control over the system even
-         if the system crashes for example during kernel debugging (e.g., you
-         will be able to flush the buffer cache to disk, reboot the system
-         immediately or dump some status information). This is accomplished
-         by pressing various keys while holding SysRq (Alt+PrintScreen). It
-         also works on a serial console (on PC hardware at least), if you
-         send a BREAK and then within 5 seconds a command keypress. The
-         keys are documented in Documentation/sysrq.txt. Don't say Y unless
-         you really know what this hack does.
-
-config EARLY_PRINTK
-       bool "Early SCIF console support"
-
-config DEBUG_KERNEL_WITH_GDB_STUB
-       bool "GDB Stub kernel debug"
-
-config SH64_PROC_TLB
-       bool "Debug: report TLB fill/purge activity through /proc/tlb"
-       depends on PROC_FS
-
-config SH64_PROC_ASIDS
-       bool "Debug: report ASIDs through /proc/asids"
-       depends on PROC_FS
-
-config SH64_SR_WATCH
-       bool "Debug: set SR.WATCH to enable hardware watchpoints and trace"
-
-config SH_ALPHANUMERIC
-       bool "Enable debug outputs to on-board alphanumeric display"
-
-config SH_NO_BSS_INIT
-       bool "Avoid zeroing BSS (to speed-up startup on suitable platforms)"
-
-config FRAME_POINTER
-       bool "Compile the kernel with frame pointers"
-       default y if KGDB
-       help
-         If you say Y here the resulting kernel image will be slightly larger
-         and slower, but it will give very useful debugging information.
-         If you don't debug the kernel, you can say N, but we may not be able
-         to solve problems without frame pointers.
-
-endmenu
-
-source "security/Kconfig"
-
-source "crypto/Kconfig"
-
-source "lib/Kconfig"
-
diff --git a/arch/sh64/Makefile b/arch/sh64/Makefile
deleted file mode 100644 (file)
index 62586a0..0000000
+++ /dev/null
@@ -1,112 +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, 2001  Paolo Alberelli
-# Copyright (C) 2003, 2004  Paul Mundt
-#
-# This file is included by the global makefile so that you can add your own
-# architecture-specific flags and dependencies. Remember to do have actions
-# for "archclean" and "archdep" for cleaning up and making dependencies for
-# this architecture
-#
-# Note that top level Makefile automagically builds dependencies for SUBDIRS
-# but does not automagically clean SUBDIRS. Therefore "archclean" should clean
-# up all, "archdep" does nothing on added SUBDIRS.
-#
-ifndef include_config
--include .config
-endif
-
-cpu-y                          := -mb
-cpu-$(CONFIG_LITTLE_ENDIAN)    := -ml
-
-cpu-$(CONFIG_CPU_SH5)          += -m5-32media-nofpu
-
-ifdef CONFIG_LITTLE_ENDIAN
-LDFLAGS_vmlinux                += --defsym 'jiffies=jiffies_64'
-LDFLAGS                        += -EL  -mshlelf32_linux
-else
-LDFLAGS_vmlinux                += --defsym 'jiffies=jiffies_64+4'
-LDFLAGS                        += -EB  -mshelf32_linux
-endif
-
-# No requirements for endianess support from AFLAGS, 'as' always run through gcc
-AFLAGS         += -m5 -isa=sh64 -traditional
-CFLAGS         += $(cpu-y)
-
-LDFLAGS_vmlinux        += --defsym phys_stext=_stext-$(CONFIG_CACHED_MEMORY_OFFSET) \
-                  -e phys_stext
-
-OBJCOPYFLAGS   := -O binary -R .note -R .comment -R .stab -R .stabstr -S
-
-ifdef LOADADDR
-LINKFLAGS     += -Ttext $(word 1,$(LOADADDR))
-endif
-
-machine-$(CONFIG_SH_CAYMAN)    := cayman
-machine-$(CONFIG_SH_SIMULATOR) := sim
-machine-$(CONFIG_SH_HARP)      := harp
-machine-$(CONFIG_SH_ROMRAM)    := romram
-
-head-y := arch/$(ARCH)/kernel/head.o arch/$(ARCH)/kernel/init_task.o
-
-core-y += $(addprefix arch/$(ARCH)/, kernel/ mm/ mach-$(machine-y)/)
-
-LIBGCC := $(shell $(CC) $(CFLAGS) -print-libgcc-file-name)
-libs-y += arch/$(ARCH)/lib/ $(LIBGCC)
-
-drivers-$(CONFIG_OPROFILE)     += arch/sh64/oprofile/
-
-boot := arch/$(ARCH)/boot
-
-zImage: vmlinux
-       $(Q)$(MAKE) $(build)=$(boot) $(boot)/$@
-
-compressed: zImage
-
-archclean:
-       $(Q)$(MAKE) $(clean)=$(boot)
-
-prepare: include/asm-$(ARCH)/asm-offsets.h arch/$(ARCH)/lib/syscalltab.h
-
-include/asm-$(ARCH)/asm-offsets.h: arch/$(ARCH)/kernel/asm-offsets.s \
-                                  include/asm include/linux/version.h
-       $(call filechk,gen-asm-offsets)
-
-define filechk_gen-syscalltab
-       (set -e; \
-       echo "/*"; \
-       echo " * DO NOT MODIFY."; \
-       echo " *"; \
-       echo " * This file was generated by arch/$(ARCH)/Makefile"; \
-       echo " * Any changes will be reverted at build time."; \
-       echo " */"; \
-       echo ""; \
-       echo "#ifndef __SYSCALLTAB_H"; \
-       echo "#define __SYSCALLTAB_H"; \
-       echo ""; \
-       echo "#include <linux/kernel.h>"; \
-       echo ""; \
-       echo "struct syscall_info {"; \
-       echo "  const char *name;"; \
-       echo "} syscall_info_table[] = {"; \
-       sed -e '/^.*\.long /!d;s//\t{ "/;s/\(\([^/]*\)\/\)\{1\}.*/\2/; \
-               s/[ \t]*$$//g;s/$$/" },/;s/\("\)sys_/\1/g'; \
-       echo "};"; \
-       echo ""; \
-       echo "#define NUM_SYSCALL_INFO_ENTRIES  ARRAY_SIZE(syscall_info_table)"; \
-       echo ""; \
-       echo "#endif /* __SYSCALLTAB_H */" )
-endef
-
-arch/$(ARCH)/lib/syscalltab.h: arch/sh64/kernel/syscalls.S
-       $(call filechk,gen-syscalltab)
-
-CLEAN_FILES += include/asm-$(ARCH)/asm-offsets.h arch/$(ARCH)/lib/syscalltab.h
-
-define archhelp
-       @echo '  zImage                    - Compressed kernel image (arch/sh64/boot/zImage)'
-endef
-
diff --git a/arch/sh64/boot/Makefile b/arch/sh64/boot/Makefile
deleted file mode 100644 (file)
index fb71087..0000000
+++ /dev/null
@@ -1,20 +0,0 @@
-#
-# arch/sh64/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) 2002 Stuart Menefy
-#
-
-targets := zImage
-subdir- := compressed
-
-$(obj)/zImage: $(obj)/compressed/vmlinux FORCE
-       $(call if_changed,objcopy)
-       @echo 'Kernel: $@ is ready'
-
-$(obj)/compressed/vmlinux: FORCE
-       $(Q)$(MAKE) $(build)=$(obj)/compressed $@
-
diff --git a/arch/sh64/boot/compressed/Makefile b/arch/sh64/boot/compressed/Makefile
deleted file mode 100644 (file)
index 3f6cbf0..0000000
+++ /dev/null
@@ -1,46 +0,0 @@
-#
-# linux/arch/sh64/boot/compressed/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) 2002 Stuart Menefy
-# Copyright (C) 2004 Paul Mundt
-#
-# create a compressed vmlinux image from the original vmlinux
-#
-
-targets                := vmlinux vmlinux.bin vmlinux.bin.gz \
-                  head.o misc.o cache.o piggy.o vmlinux.lds.o
-
-EXTRA_AFLAGS   := -traditional
-
-OBJECTS                := $(obj)/head.o $(obj)/misc.o $(obj)/cache.o
-
-#
-# ZIMAGE_OFFSET is the load offset of the compression loader
-# (4M for the kernel plus 64K for this loader)
-#
-ZIMAGE_OFFSET = $(shell printf "0x%8x" $$[$(CONFIG_MEMORY_START)+0x400000+0x10000])
-
-LDFLAGS_vmlinux := -Ttext $(ZIMAGE_OFFSET) -e startup \
-                   -T $(obj)/../../kernel/vmlinux.lds.s \
-                   --no-warn-mismatch
-
-$(obj)/vmlinux: $(OBJECTS) $(obj)/piggy.o FORCE
-       $(call if_changed,ld)
-       @:
-
-$(obj)/vmlinux.bin: vmlinux FORCE
-       $(call if_changed,objcopy)
-
-$(obj)/vmlinux.bin.gz: $(obj)/vmlinux.bin FORCE
-       $(call if_changed,gzip)
-
-LDFLAGS_piggy.o := -r --format binary --oformat elf32-sh64-linux -T
-OBJCOPYFLAGS += -R .empty_zero_page
-
-$(obj)/piggy.o: $(obj)/vmlinux.lds.s $(obj)/vmlinux.bin.gz FORCE
-       $(call if_changed,ld)
-
diff --git a/arch/sh64/boot/compressed/cache.c b/arch/sh64/boot/compressed/cache.c
deleted file mode 100644 (file)
index 7087073..0000000
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * arch/shmedia/boot/compressed/cache.c -- simple cache management functions
- *
- * Code extracted from sh-ipl+g, sh-stub.c, which has the copyright:
- *
- *   This is originally based on an m68k software stub written by Glenn
- *   Engel at HP, but has changed quite a bit.
- *
- *   Modifications for the SH by Ben Lee and Steve Chamberlain
- *
-****************************************************************************
-
-               THIS SOFTWARE IS NOT COPYRIGHTED
-
-   HP offers the following for use in the public domain.  HP makes no
-   warranty with regard to the software or it's performance and the
-   user accepts the software "AS IS" with all faults.
-
-   HP DISCLAIMS ANY WARRANTIES, EXPRESS OR IMPLIED, WITH REGARD
-   TO THIS SOFTWARE INCLUDING BUT NOT LIMITED TO THE WARRANTIES
-   OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-
-****************************************************************************/
-
-#define CACHE_ENABLE      0
-#define CACHE_DISABLE     1
-
-int cache_control(unsigned int command)
-{
-       volatile unsigned int *p = (volatile unsigned int *) 0x80000000;
-       int i;
-
-       for (i = 0; i < (32 * 1024); i += 32) {
-               (void *) *p;
-               p += (32 / sizeof (int));
-       }
-
-       return 0;
-}
diff --git a/arch/sh64/boot/compressed/head.S b/arch/sh64/boot/compressed/head.S
deleted file mode 100644 (file)
index 82040b1..0000000
+++ /dev/null
@@ -1,164 +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.
- *
- * arch/shmedia/boot/compressed/head.S
- *
- * Copied from
- *   arch/shmedia/kernel/head.S
- * which carried the copyright:
- *   Copyright (C) 2000, 2001  Paolo Alberelli
- *
- * Modification for compressed loader:
- *   Copyright (C) 2002 Stuart Menefy (stuart.menefy@st.com)
- */
-
-#include <linux/linkage.h>
-#include <asm/registers.h>
-#include <asm/cache.h>
-#include <asm/mmu_context.h>
-
-/*
- * Fixed TLB entries to identity map the beginning of RAM
- */
-#define MMUIR_TEXT_H   0x0000000000000003 | CONFIG_MEMORY_START
-                       /* Enabled, Shared, ASID 0, Eff. Add. 0xA0000000 */
-#define MMUIR_TEXT_L   0x000000000000009a | CONFIG_MEMORY_START
-                       /* 512 Mb, Cacheable (Write-back), execute, Not User, Ph. Add. */
-
-#define MMUDR_CACHED_H 0x0000000000000003 | CONFIG_MEMORY_START
-                       /* Enabled, Shared, ASID 0, Eff. Add. 0xA0000000 */
-#define MMUDR_CACHED_L 0x000000000000015a | CONFIG_MEMORY_START
-                       /* 512 Mb, Cacheable (Write-back), read/write, Not User, Ph. Add. */
-
-#define        ICCR0_INIT_VAL  ICCR0_ON | ICCR0_ICI            /* ICE + ICI */
-#define        ICCR1_INIT_VAL  ICCR1_NOLOCK                    /* No locking */
-
-#if 1
-#define        OCCR0_INIT_VAL  OCCR0_ON | OCCR0_OCI | OCCR0_WB /* OCE + OCI + WB */
-#else
-#define        OCCR0_INIT_VAL  OCCR0_OFF
-#endif
-#define        OCCR1_INIT_VAL  OCCR1_NOLOCK                    /* No locking */
-
-       .text
-
-       .global startup
-startup:
-       /*
-        * Prevent speculative fetch on device memory due to
-        * uninitialized target registers.
-        * This must be executed before the first branch.
-        */
-       ptabs/u ZERO, tr0
-       ptabs/u ZERO, tr1
-       ptabs/u ZERO, tr2
-       ptabs/u ZERO, tr3
-       ptabs/u ZERO, tr4
-       ptabs/u ZERO, tr5
-       ptabs/u ZERO, tr6
-       ptabs/u ZERO, tr7
-       synci
-
-       /*
-        * Set initial TLB entries for cached and uncached regions.
-        * Note: PTA/BLINK is PIC code, PTABS/BLINK isn't !
-        */
-       /* Clear ITLBs */
-       pta     1f, tr1
-       movi    ITLB_FIXED, r21
-       movi    ITLB_LAST_VAR_UNRESTRICTED+TLB_STEP, r22
-1:     putcfg  r21, 0, ZERO            /* Clear MMUIR[n].PTEH.V */
-       addi    r21, TLB_STEP, r21
-        bne    r21, r22, tr1
-
-       /* Clear DTLBs */
-       pta     1f, tr1
-       movi    DTLB_FIXED, r21
-       movi    DTLB_LAST_VAR_UNRESTRICTED+TLB_STEP, r22
-1:     putcfg  r21, 0, ZERO            /* Clear MMUDR[n].PTEH.V */
-       addi    r21, TLB_STEP, r21
-        bne    r21, r22, tr1
-
-       /* Map one big (512Mb) page for ITLB */
-       movi    ITLB_FIXED, r21
-       movi    MMUIR_TEXT_L, r22       /* PTEL first */
-       putcfg  r21, 1, r22             /* Set MMUIR[0].PTEL */
-       movi    MMUIR_TEXT_H, r22       /* PTEH last */
-       putcfg  r21, 0, r22             /* Set MMUIR[0].PTEH */
-
-       /* Map one big CACHED (512Mb) page for DTLB */
-       movi    DTLB_FIXED, r21
-       movi    MMUDR_CACHED_L, r22     /* PTEL first */
-       putcfg  r21, 1, r22             /* Set MMUDR[0].PTEL */
-       movi    MMUDR_CACHED_H, r22     /* PTEH last */
-       putcfg  r21, 0, r22             /* Set MMUDR[0].PTEH */
-
-       /* ICache */
-       movi    ICCR_BASE, r21
-       movi    ICCR0_INIT_VAL, r22
-       movi    ICCR1_INIT_VAL, r23
-       putcfg  r21, ICCR_REG0, r22
-       putcfg  r21, ICCR_REG1, r23
-       synci
-
-       /* OCache */
-       movi    OCCR_BASE, r21
-       movi    OCCR0_INIT_VAL, r22
-       movi    OCCR1_INIT_VAL, r23
-       putcfg  r21, OCCR_REG0, r22
-       putcfg  r21, OCCR_REG1, r23
-       synco
-
-       /*
-        * Enable the MMU.
-        * From here-on code can be non-PIC.
-        */
-       movi    SR_HARMLESS | SR_ENABLE_MMU, r22
-       putcon  r22, SSR
-       movi    1f, r22
-       putcon  r22, SPC
-       synco
-       rte                             /* And now go into the hyperspace ... */
-1:                                     /* ... that's the next instruction ! */
-
-       /* Set initial stack pointer */
-       movi    datalabel stack_start, r0
-       ld.l    r0, 0, r15
-
-       /*
-        * Clear bss
-        */
-       pt      1f, tr1
-       movi    datalabel __bss_start, r22
-       movi    datalabel _end, r23
-1:     st.l    r22, 0, ZERO
-       addi    r22, 4, r22
-       bne     r22, r23, tr1
-
-       /*
-        * Decompress the kernel.
-        */
-       pt      decompress_kernel, tr0
-       blink   tr0, r18
-
-       /*
-        * Disable the MMU.
-        */
-       movi    SR_HARMLESS, r22
-       putcon  r22, SSR
-       movi    1f, r22
-       putcon  r22, SPC
-       synco
-       rte                             /* And now go into the hyperspace ... */
-1:                                     /* ... that's the next instruction ! */
-
-       /* Jump into the decompressed kernel */
-       movi    datalabel (CONFIG_MEMORY_START + 0x2000)+1, r19
-       ptabs   r19, tr0
-       blink   tr0, r18
-
-       /* Shouldn't return here, but just in case, loop forever */
-       pt      1f, tr0
-1:     blink   tr0, ZERO
diff --git a/arch/sh64/boot/compressed/install.sh b/arch/sh64/boot/compressed/install.sh
deleted file mode 100644 (file)
index 90589f0..0000000
+++ /dev/null
@@ -1,56 +0,0 @@
-#!/bin/sh
-#
-# arch/sh/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
-# Adapted from code in arch/i386/boot/install.sh by Russell King
-# Adapted from code in arch/arm/boot/install.sh by Stuart Menefy
-#
-# "make install" script for sh 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 /sbin/installkernel ]; then
-  exec /sbin/installkernel "$@"
-fi
-
-if [ "$2" = "zImage" ]; then
-# Compressed install
-  echo "Installing compressed kernel"
-  if [ -f $4/vmlinuz-$1 ]; then
-    mv $4/vmlinuz-$1 $4/vmlinuz.old
-  fi
-
-  if [ -f $4/System.map-$1 ]; then
-    mv $4/System.map-$1 $4/System.old
-  fi
-
-  cat $2 > $4/vmlinuz-$1
-  cp $3 $4/System.map-$1
-else
-# Normal install
-  echo "Installing normal kernel"
-  if [ -f $4/vmlinux-$1 ]; then
-    mv $4/vmlinux-$1 $4/vmlinux.old
-  fi
-
-  if [ -f $4/System.map ]; then
-    mv $4/System.map $4/System.old
-  fi
-
-  cat $2 > $4/vmlinux-$1
-  cp $3 $4/System.map
-fi
diff --git a/arch/sh64/boot/compressed/misc.c b/arch/sh64/boot/compressed/misc.c
deleted file mode 100644 (file)
index 89dbf45..0000000
+++ /dev/null
@@ -1,251 +0,0 @@
-/*
- * arch/shmedia/boot/compressed/misc.c
- *
- * This is a collection of several routines from gzip-1.0.3
- * adapted for Linux.
- *
- * malloc by Hannu Savolainen 1993 and Matthias Urlichs 1994
- *
- * Adapted for SHmedia from sh by Stuart Menefy, May 2002
- */
-
-#include <linux/config.h>
-#include <asm/uaccess.h>
-
-/* cache.c */
-#define CACHE_ENABLE      0
-#define CACHE_DISABLE     1
-int cache_control(unsigned int command);
-
-/*
- * gzip declarations
- */
-
-#define OF(args)  args
-#define STATIC static
-
-#undef memset
-#undef memcpy
-#define memzero(s, n)     memset ((s), 0, (n))
-
-typedef unsigned char uch;
-typedef unsigned short ush;
-typedef unsigned long ulg;
-
-#define WSIZE 0x8000           /* Window size must be at least 32k, */
-                               /* and a power of two */
-
-static uch *inbuf;             /* input buffer */
-static uch window[WSIZE];      /* Sliding window buffer */
-
-static unsigned insize = 0;    /* valid bytes in inbuf */
-static unsigned inptr = 0;     /* index of next byte to be processed in inbuf */
-static unsigned outcnt = 0;    /* bytes in output buffer */
-
-/* gzip flag byte */
-#define ASCII_FLAG   0x01      /* bit 0 set: file probably ASCII text */
-#define CONTINUATION 0x02      /* bit 1 set: continuation of multi-part gzip file */
-#define EXTRA_FIELD  0x04      /* bit 2 set: extra field present */
-#define ORIG_NAME    0x08      /* bit 3 set: original file name present */
-#define COMMENT      0x10      /* bit 4 set: file comment present */
-#define ENCRYPTED    0x20      /* bit 5 set: file is encrypted */
-#define RESERVED     0xC0      /* bit 6,7:   reserved */
-
-#define get_byte()  (inptr < insize ? inbuf[inptr++] : fill_inbuf())
-
-/* Diagnostic functions */
-#ifdef DEBUG
-#  define Assert(cond,msg) {if(!(cond)) error(msg);}
-#  define Trace(x) fprintf x
-#  define Tracev(x) {if (verbose) fprintf x ;}
-#  define Tracevv(x) {if (verbose>1) fprintf x ;}
-#  define Tracec(c,x) {if (verbose && (c)) fprintf x ;}
-#  define Tracecv(c,x) {if (verbose>1 && (c)) fprintf x ;}
-#else
-#  define Assert(cond,msg)
-#  define Trace(x)
-#  define Tracev(x)
-#  define Tracevv(x)
-#  define Tracec(c,x)
-#  define Tracecv(c,x)
-#endif
-
-static int fill_inbuf(void);
-static void flush_window(void);
-static void error(char *m);
-static void gzip_mark(void **);
-static void gzip_release(void **);
-
-extern char input_data[];
-extern int input_len;
-
-static long bytes_out = 0;
-static uch *output_data;
-static unsigned long output_ptr = 0;
-
-static void *malloc(int size);
-static void free(void *where);
-static void error(char *m);
-static void gzip_mark(void **);
-static void gzip_release(void **);
-
-static void puts(const char *);
-
-extern int _text;              /* Defined in vmlinux.lds.S */
-extern int _end;
-static unsigned long free_mem_ptr;
-static unsigned long free_mem_end_ptr;
-
-#define HEAP_SIZE             0x10000
-
-#include "../../../../lib/inflate.c"
-
-static void *malloc(int size)
-{
-       void *p;
-
-       if (size < 0)
-               error("Malloc error\n");
-       if (free_mem_ptr == 0)
-               error("Memory error\n");
-
-       free_mem_ptr = (free_mem_ptr + 3) & ~3; /* Align */
-
-       p = (void *) free_mem_ptr;
-       free_mem_ptr += size;
-
-       if (free_mem_ptr >= free_mem_end_ptr)
-               error("\nOut of memory\n");
-
-       return p;
-}
-
-static void free(void *where)
-{                              /* Don't care */
-}
-
-static void gzip_mark(void **ptr)
-{
-       *ptr = (void *) free_mem_ptr;
-}
-
-static void gzip_release(void **ptr)
-{
-       free_mem_ptr = (long) *ptr;
-}
-
-void puts(const char *s)
-{
-}
-
-void *memset(void *s, int c, size_t n)
-{
-       int i;
-       char *ss = (char *) s;
-
-       for (i = 0; i < n; i++)
-               ss[i] = c;
-       return s;
-}
-
-void *memcpy(void *__dest, __const void *__src, size_t __n)
-{
-       int i;
-       char *d = (char *) __dest, *s = (char *) __src;
-
-       for (i = 0; i < __n; i++)
-               d[i] = s[i];
-       return __dest;
-}
-
-/* ===========================================================================
- * Fill the input buffer. This is called only when the buffer is empty
- * and at least one byte is really needed.
- */
-static int fill_inbuf(void)
-{
-       if (insize != 0) {
-               error("ran out of input data\n");
-       }
-
-       inbuf = input_data;
-       insize = input_len;
-       inptr = 1;
-       return inbuf[0];
-}
-
-/* ===========================================================================
- * Write the output window window[0..outcnt-1] and update crc and bytes_out.
- * (Used for the decompressed data only.)
- */
-static void flush_window(void)
-{
-       ulg c = crc;            /* temporary variable */
-       unsigned n;
-       uch *in, *out, ch;
-
-       in = window;
-       out = &output_data[output_ptr];
-       for (n = 0; n < outcnt; n++) {
-               ch = *out++ = *in++;
-               c = crc_32_tab[((int) c ^ ch) & 0xff] ^ (c >> 8);
-       }
-       crc = c;
-       bytes_out += (ulg) outcnt;
-       output_ptr += (ulg) outcnt;
-       outcnt = 0;
-       puts(".");
-}
-
-static void error(char *x)
-{
-       puts("\n\n");
-       puts(x);
-       puts("\n\n -- System halted");
-
-       while (1) ;             /* Halt */
-}
-
-#define STACK_SIZE (4096)
-long __attribute__ ((aligned(8))) user_stack[STACK_SIZE];
-long *stack_start = &user_stack[STACK_SIZE];
-
-void decompress_kernel(void)
-{
-       output_data = (uch *) (CONFIG_MEMORY_START + 0x2000);
-       free_mem_ptr = (unsigned long) &_end;
-       free_mem_end_ptr = free_mem_ptr + HEAP_SIZE;
-
-       makecrc();
-       puts("Uncompressing Linux... ");
-       cache_control(CACHE_ENABLE);
-       gunzip();
-       puts("\n");
-
-#if 0
-       /* When booting from ROM may want to do something like this if the
-        * boot loader doesn't.
-        */
-
-       /* Set up the parameters and command line */
-       {
-               volatile unsigned int *parambase =
-                   (int *) (CONFIG_MEMORY_START + 0x1000);
-
-               parambase[0] = 0x1;     /* MOUNT_ROOT_RDONLY */
-               parambase[1] = 0x0;     /* RAMDISK_FLAGS */
-               parambase[2] = 0x0200;  /* ORIG_ROOT_DEV */
-               parambase[3] = 0x0;     /* LOADER_TYPE */
-               parambase[4] = 0x0;     /* INITRD_START */
-               parambase[5] = 0x0;     /* INITRD_SIZE */
-               parambase[6] = 0;
-
-               strcpy((char *) ((int) parambase + 0x100),
-                      "console=ttySC0,38400");
-       }
-#endif
-
-       puts("Ok, booting the kernel.\n");
-
-       cache_control(CACHE_DISABLE);
-}
diff --git a/arch/sh64/boot/compressed/vmlinux.lds.S b/arch/sh64/boot/compressed/vmlinux.lds.S
deleted file mode 100644 (file)
index 15a737d..0000000
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * ld script to make compressed SuperH/shmedia Linux kernel+decompression
- *             bootstrap
- * Modified by Stuart Menefy from arch/sh/vmlinux.lds.S written by Niibe Yutaka
- */
-
-#include <linux/config.h>
-
-#ifdef CONFIG_LITTLE_ENDIAN
-/* OUTPUT_FORMAT("elf32-sh64l-linux", "elf32-sh64l-linux", "elf32-sh64l-linux") */
-#define NOP 0x6ff0fff0
-#else
-/* OUTPUT_FORMAT("elf32-sh64", "elf32-sh64", "elf32-sh64") */
-#define NOP 0xf0fff06f
-#endif
-
-OUTPUT_FORMAT("elf32-sh64-linux")
-OUTPUT_ARCH(sh)
-ENTRY(_start)
-
-#define ALIGNED_GAP(section, align) (((ADDR(section)+SIZEOF(section)+(align)-1) & ~((align)-1))-ADDR(section))
-#define FOLLOWING(section, align) AT (LOADADDR(section) + ALIGNED_GAP(section,align))
-
-SECTIONS
-{
-  _text = .;                   /* Text and read-only data */
-
-  .text : {
-       *(.text)
-       *(.text64)
-       *(.text..SHmedia32)
-       *(.fixup)
-       *(.gnu.warning)
-       } = NOP
-  . = ALIGN(4);
-  .rodata : { *(.rodata) }
-
-  /* There is no 'real' reason for eight byte alignment, four would work
-   * as well, but gdb downloads much (*4) faster with this.
-   */
-  . = ALIGN(8);
-  .image : { *(.image) }
-  . = ALIGN(4);
-  _etext = .;                  /* End of text section */
-
-  .data :                      /* Data */
-       FOLLOWING(.image, 4)
-       {
-       _data = .;
-       *(.data)
-       }
-  _data_image = LOADADDR(.data);/* Address of data section in ROM */
-
-  _edata = .;                  /* End of data section */
-
-  .stack : { stack = .;  _stack = .; }
-
-  . = ALIGN(4);
-  __bss_start = .;             /* BSS */
-  .bss : {
-       *(.bss)
-       }
-  . = ALIGN(4);
-  _end = . ;
-}
diff --git a/arch/sh64/configs/cayman_defconfig b/arch/sh64/configs/cayman_defconfig
deleted file mode 100644 (file)
index 6dd7cea..0000000
+++ /dev/null
@@ -1,660 +0,0 @@
-#
-# Automatically generated make config: don't edit
-#
-CONFIG_SUPERH=y
-CONFIG_SUPERH64=y
-CONFIG_MMU=y
-CONFIG_UID16=y
-CONFIG_RWSEM_GENERIC_SPINLOCK=y
-CONFIG_LOG_BUF_SHIFT=14
-
-#
-# 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 is not set
-CONFIG_POSIX_MQUEUE=y
-# CONFIG_BSD_PROCESS_ACCT is not set
-CONFIG_SYSCTL=y
-# CONFIG_AUDIT is not set
-# CONFIG_HOTPLUG is not set
-# CONFIG_IKCONFIG is not set
-# CONFIG_EMBEDDED is not set
-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 is not set
-
-#
-# System type
-#
-# CONFIG_SH_GENERIC is not set
-# CONFIG_SH_SIMULATOR is not set
-CONFIG_SH_CAYMAN=y
-# CONFIG_SH_ROMRAM is not set
-# CONFIG_SH_HARP is not set
-
-#
-# Processor type and features
-#
-CONFIG_CPU_SH5=y
-CONFIG_CPU_SUBTYPE_SH5_101=y
-# CONFIG_CPU_SUBTYPE_SH5_103 is not set
-CONFIG_LITTLE_ENDIAN=y
-# CONFIG_BIG_ENDIAN is not set
-# CONFIG_SH64_FPU_DENORM_FLUSH is not set
-CONFIG_SH64_PGTABLE_2_LEVEL=y
-# CONFIG_SH64_PGTABLE_3_LEVEL is not set
-CONFIG_HUGETLB_PAGE_SIZE_64K=y
-# CONFIG_HUGETLB_PAGE_SIZE_1MB is not set
-# CONFIG_HUGETLB_PAGE_SIZE_512MB is not set
-CONFIG_SH64_USER_MISALIGNED_FIXUP=y
-
-#
-# Memory options
-#
-CONFIG_CACHED_MEMORY_OFFSET=0x20000000
-CONFIG_MEMORY_START=0x80000000
-CONFIG_MEMORY_SIZE_IN_MB=128
-
-#
-# Cache options
-#
-# CONFIG_DCACHE_DISABLED is not set
-CONFIG_DCACHE_WRITE_BACK=y
-# CONFIG_DCACHE_WRITE_THROUGH is not set
-# CONFIG_ICACHE_DISABLED is not set
-CONFIG_PCIDEVICE_MEMORY_START=C0000000
-CONFIG_DEVICE_MEMORY_START=E0000000
-CONFIG_FLASH_MEMORY_START=0x00000000
-CONFIG_PCI_BLOCK_START=0x40000000
-
-#
-# CPU Subtype specific options
-#
-CONFIG_SH64_ID2815_WORKAROUND=y
-
-#
-# Misc options
-#
-CONFIG_HEARTBEAT=y
-CONFIG_HDSP253_LED=y
-CONFIG_SH_DMA=y
-CONFIG_PREEMPT=y
-
-#
-# Bus options (PCI, PCMCIA, EISA, MCA, ISA)
-#
-CONFIG_PCI=y
-CONFIG_SH_PCIDMA_NONCOHERENT=y
-CONFIG_PCI_LEGACY_PROC=y
-CONFIG_PCI_NAMES=y
-
-#
-# Executable file formats
-#
-CONFIG_BINFMT_ELF=y
-# CONFIG_BINFMT_FLAT is not set
-# CONFIG_BINFMT_MISC is not set
-
-#
-# Device Drivers
-#
-
-#
-# Generic Driver Options
-#
-
-#
-# 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=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=4096
-# CONFIG_BLK_DEV_INITRD is not set
-# 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
-
-#
-# 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 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 is not set
-# 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_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
-
-#
-# 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
-
-#
-# ARCnet devices
-#
-# CONFIG_ARCNET is not set
-
-#
-# Ethernet (10 or 100Mbit)
-#
-CONFIG_NET_ETHERNET=y
-# CONFIG_MII is not set
-# CONFIG_STNIC 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=y
-# CONFIG_DE2104X is not set
-CONFIG_TULIP=y
-# CONFIG_TULIP_MWI is not set
-# CONFIG_TULIP_MMIO is not set
-# CONFIG_TULIP_NAPI is not set
-# CONFIG_DE4X5 is not set
-# CONFIG_WINBOND_840 is not set
-# CONFIG_DM9102 is not set
-# CONFIG_HP100 is not set
-CONFIG_NET_PCI=y
-# CONFIG_PCNET32 is not set
-# 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 is not set
-# CONFIG_E100 is not set
-# CONFIG_FEALNX is not set
-# CONFIG_NATSEMI is not set
-# CONFIG_NE2K_PCI is not set
-# CONFIG_8139CP is not set
-# CONFIG_8139TOO is not set
-# CONFIG_SIS900 is not set
-# CONFIG_EPIC100 is not set
-# CONFIG_SUNDANCE is not set
-# CONFIG_TLAN is not set
-# CONFIG_VIA_RHINE 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
-
-#
-# 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_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=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 is not set
-# CONFIG_MOUSE_VSXXXAA 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_SH_SCI=y
-CONFIG_SERIAL_SH_SCI_CONSOLE=y
-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
-# CONFIG_SH_WDT 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
-# 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
-#
-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_E1355 is not set
-# CONFIG_FB_RIVA is not set
-# CONFIG_FB_MATROX is not set
-# CONFIG_FB_RADEON_OLD is not set
-# CONFIG_FB_RADEON is not set
-# CONFIG_FB_ATY128 is not set
-# CONFIG_FB_ATY is not set
-# CONFIG_FB_SIS is not set
-# CONFIG_FB_NEOMAGIC is not set
-CONFIG_FB_KYRO=y
-# CONFIG_FB_3DFX is not set
-# CONFIG_FB_VOODOO1 is not set
-# CONFIG_FB_TRIDENT is not set
-# CONFIG_FB_VIRTUAL is not set
-
-#
-# Console display driver support
-#
-# CONFIG_VGA_CONSOLE is not set
-# CONFIG_MDA_CONSOLE is not set
-CONFIG_DUMMY_CONSOLE=y
-CONFIG_FRAMEBUFFER_CONSOLE=y
-CONFIG_PCI_CONSOLE=y
-CONFIG_FONTS=y
-# CONFIG_FONT_8x8 is not set
-CONFIG_FONT_8x16=y
-# CONFIG_FONT_6x11 is not set
-# CONFIG_FONT_PEARL_8x8 is not set
-# CONFIG_FONT_ACORN_8x8 is not set
-# CONFIG_FONT_MINI_4x6 is not set
-# CONFIG_FONT_SUN8x16 is not set
-# CONFIG_FONT_SUN12x22 is not set
-
-#
-# Logo configuration
-#
-CONFIG_LOGO=y
-# CONFIG_LOGO_LINUX_MONO is not set
-# CONFIG_LOGO_LINUX_VGA16 is not set
-# CONFIG_LOGO_LINUX_CLUT224 is not set
-# CONFIG_LOGO_SUPERH_MONO is not set
-# CONFIG_LOGO_SUPERH_VGA16 is not set
-CONFIG_LOGO_SUPERH_CLUT224=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=y
-CONFIG_ROMFS_FS=y
-# 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_HUGETLBFS=y
-CONFIG_HUGETLB_PAGE=y
-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
-
-#
-# 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 is not set
-CONFIG_MSDOS_PARTITION=y
-
-#
-# Native Language Support
-#
-# CONFIG_NLS is not set
-
-#
-# Kernel hacking
-#
-CONFIG_MAGIC_SYSRQ=y
-# CONFIG_EARLY_PRINTK is not set
-# CONFIG_DEBUG_KERNEL_WITH_GDB_STUB is not set
-# CONFIG_SH64_PROC_TLB is not set
-# CONFIG_SH64_PROC_ASIDS is not set
-CONFIG_SH64_SR_WATCH=y
-# CONFIG_SH_ALPHANUMERIC is not set
-# CONFIG_SH_NO_BSS_INIT is not set
-CONFIG_FRAME_POINTER=y
-
-#
-# Security options
-#
-# CONFIG_SECURITY is not set
-
-#
-# Cryptographic options
-#
-# CONFIG_CRYPTO is not set
-
-#
-# Library routines
-#
-CONFIG_CRC32=y
-# CONFIG_LIBCRC32C is not set
diff --git a/arch/sh64/defconfig b/arch/sh64/defconfig
deleted file mode 100644 (file)
index e6233e8..0000000
+++ /dev/null
@@ -1,668 +0,0 @@
-#
-# Automatically generated make config: don't edit
-#
-CONFIG_SUPERH=y
-CONFIG_SUPERH64=y
-CONFIG_MMU=y
-CONFIG_UID16=y
-CONFIG_RWSEM_GENERIC_SPINLOCK=y
-CONFIG_LOG_BUF_SHIFT=14
-
-#
-# 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 is not set
-CONFIG_POSIX_MQUEUE=y
-# CONFIG_BSD_PROCESS_ACCT is not set
-CONFIG_SYSCTL=y
-# CONFIG_AUDIT is not set
-# CONFIG_HOTPLUG is not set
-# CONFIG_IKCONFIG is not set
-# CONFIG_EMBEDDED is not set
-CONFIG_KALLSYMS=y
-# 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 is not set
-
-#
-# System type
-#
-# CONFIG_SH_GENERIC is not set
-# CONFIG_SH_SIMULATOR is not set
-CONFIG_SH_CAYMAN=y
-# CONFIG_SH_ROMRAM is not set
-# CONFIG_SH_HARP is not set
-CONFIG_CPU_SH5=y
-CONFIG_CPU_SUBTYPE_SH5_101=y
-# CONFIG_CPU_SUBTYPE_SH5_103 is not set
-CONFIG_LITTLE_ENDIAN=y
-# CONFIG_BIG_ENDIAN is not set
-# CONFIG_SH64_FPU_DENORM_FLUSH is not set
-CONFIG_SH64_PGTABLE_2_LEVEL=y
-# CONFIG_SH64_PGTABLE_3_LEVEL is not set
-CONFIG_HUGETLB_PAGE_SIZE_64K=y
-# CONFIG_HUGETLB_PAGE_SIZE_1MB is not set
-# CONFIG_HUGETLB_PAGE_SIZE_512MB is not set
-CONFIG_SH64_USER_MISALIGNED_FIXUP=y
-
-#
-# Memory options
-#
-CONFIG_CACHED_MEMORY_OFFSET=0x20000000
-CONFIG_MEMORY_START=0x80000000
-CONFIG_MEMORY_SIZE_IN_MB=128
-
-#
-# Cache options
-#
-# CONFIG_DCACHE_DISABLED is not set
-CONFIG_DCACHE_WRITE_BACK=y
-# CONFIG_DCACHE_WRITE_THROUGH is not set
-# CONFIG_ICACHE_DISABLED is not set
-CONFIG_PCIDEVICE_MEMORY_START=C0000000
-CONFIG_DEVICE_MEMORY_START=E0000000
-CONFIG_FLASH_MEMORY_START=0x00000000
-CONFIG_PCI_BLOCK_START=0x40000000
-
-#
-# CPU Subtype specific options
-#
-CONFIG_SH64_ID2815_WORKAROUND=y
-
-#
-# Misc options
-#
-CONFIG_HEARTBEAT=y
-CONFIG_HDSP253_LED=y
-CONFIG_SH_DMA=y
-CONFIG_PREEMPT=y
-
-#
-# Bus options (PCI, PCMCIA, EISA, MCA, ISA)
-#
-CONFIG_PCI=y
-CONFIG_SH_PCIDMA_NONCOHERENT=y
-CONFIG_PCI_LEGACY_PROC=y
-CONFIG_PCI_NAMES=y
-
-#
-# Executable file formats
-#
-CONFIG_BINFMT_ELF=y
-# CONFIG_BINFMT_FLAT is not set
-# CONFIG_BINFMT_MISC is not set
-
-#
-# 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_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=y
-# CONFIG_BLK_DEV_CRYPTOLOOP is not set
-# CONFIG_BLK_DEV_NBD 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 is not set
-# 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
-
-#
-# 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 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 is not set
-# 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_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
-
-#
-# 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
-
-#
-# ARCnet devices
-#
-# CONFIG_ARCNET is not set
-
-#
-# Ethernet (10 or 100Mbit)
-#
-CONFIG_NET_ETHERNET=y
-# CONFIG_MII is not set
-# CONFIG_STNIC 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=y
-# CONFIG_DE2104X is not set
-CONFIG_TULIP=y
-# CONFIG_TULIP_MWI is not set
-# CONFIG_TULIP_MMIO is not set
-# CONFIG_TULIP_NAPI is not set
-# CONFIG_DE4X5 is not set
-# CONFIG_WINBOND_840 is not set
-# CONFIG_DM9102 is not set
-# CONFIG_HP100 is not set
-CONFIG_NET_PCI=y
-# CONFIG_PCNET32 is not set
-# 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 is not set
-# CONFIG_E100 is not set
-# CONFIG_FEALNX is not set
-# CONFIG_NATSEMI is not set
-# CONFIG_NE2K_PCI is not set
-# CONFIG_8139CP is not set
-# CONFIG_8139TOO is not set
-# CONFIG_SIS900 is not set
-# CONFIG_EPIC100 is not set
-# CONFIG_SUNDANCE is not set
-# CONFIG_TLAN is not set
-# CONFIG_VIA_RHINE is not set
-# CONFIG_VIA_VELOCITY 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
-
-#
-# 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_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=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 is not set
-# CONFIG_MOUSE_VSXXXAA 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_SH_SCI=y
-CONFIG_SERIAL_SH_SCI_CONSOLE=y
-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
-# CONFIG_SH_WDT 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
-# 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
-#
-CONFIG_FB=y
-# CONFIG_FB_CIRRUS is not set
-# 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_E1355 is not set
-# CONFIG_FB_RIVA is not set
-# CONFIG_FB_MATROX is not set
-# CONFIG_FB_RADEON_OLD is not set
-# CONFIG_FB_RADEON is not set
-# CONFIG_FB_ATY128 is not set
-# CONFIG_FB_ATY is not set
-# CONFIG_FB_SIS is not set
-# CONFIG_FB_NEOMAGIC is not set
-CONFIG_FB_KYRO=y
-# CONFIG_FB_3DFX is not set
-# CONFIG_FB_VOODOO1 is not set
-# CONFIG_FB_TRIDENT is not set
-# CONFIG_FB_VIRTUAL is not set
-
-#
-# Console display driver support
-#
-# CONFIG_VGA_CONSOLE is not set
-# CONFIG_MDA_CONSOLE is not set
-CONFIG_DUMMY_CONSOLE=y
-CONFIG_FRAMEBUFFER_CONSOLE=y
-CONFIG_PCI_CONSOLE=y
-CONFIG_FONTS=y
-# CONFIG_FONT_8x8 is not set
-CONFIG_FONT_8x16=y
-# CONFIG_FONT_6x11 is not set
-# CONFIG_FONT_PEARL_8x8 is not set
-# CONFIG_FONT_ACORN_8x8 is not set
-# CONFIG_FONT_MINI_4x6 is not set
-# CONFIG_FONT_SUN8x16 is not set
-# CONFIG_FONT_SUN12x22 is not set
-
-#
-# Logo configuration
-#
-CONFIG_LOGO=y
-# CONFIG_LOGO_LINUX_MONO is not set
-# CONFIG_LOGO_LINUX_VGA16 is not set
-# CONFIG_LOGO_LINUX_CLUT224 is not set
-# CONFIG_LOGO_SUPERH_MONO is not set
-# CONFIG_LOGO_SUPERH_VGA16 is not set
-CONFIG_LOGO_SUPERH_CLUT224=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=y
-CONFIG_ROMFS_FS=y
-# 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_HUGETLBFS=y
-CONFIG_HUGETLB_PAGE=y
-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
-
-#
-# 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 is not set
-CONFIG_MSDOS_PARTITION=y
-
-#
-# Native Language Support
-#
-# CONFIG_NLS is not set
-
-#
-# Profiling support
-#
-CONFIG_PROFILING=y
-# CONFIG_OPROFILE is not set
-
-#
-# Kernel hacking
-#
-CONFIG_MAGIC_SYSRQ=y
-# CONFIG_EARLY_PRINTK is not set
-# CONFIG_DEBUG_KERNEL_WITH_GDB_STUB is not set
-# CONFIG_SH64_PROC_TLB is not set
-# CONFIG_SH64_PROC_ASIDS is not set
-CONFIG_SH64_SR_WATCH=y
-# CONFIG_SH_ALPHANUMERIC is not set
-# CONFIG_SH_NO_BSS_INIT is not set
-CONFIG_FRAME_POINTER=y
-
-#
-# Security options
-#
-# CONFIG_SECURITY is not set
-
-#
-# Cryptographic options
-#
-# CONFIG_CRYPTO is not set
-
-#
-# Library routines
-#
-# CONFIG_CRC16 is not set
-CONFIG_CRC32=y
-# CONFIG_LIBCRC32C is not set
diff --git a/arch/sh64/kernel/Makefile b/arch/sh64/kernel/Makefile
deleted file mode 100644 (file)
index 2f8d077..0000000
+++ /dev/null
@@ -1,38 +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, 2001  Paolo Alberelli
-# Copyright (C) 2003  Paul Mundt
-#
-# Makefile for the Linux sh64 kernel.
-#
-# Note! Dependencies are done automagically by 'make dep', which also
-# removes any old dependencies. DON'T put your own dependencies here
-# unless it's something special (ie not a .c file).
-#
-
-extra-y        := head.o init_task.o vmlinux.lds.s
-
-obj-y  := process.o signal.o entry.o traps.o irq.o irq_intc.o \
-          ptrace.o setup.o time.o sys_sh64.o semaphore.o sh_ksyms.o \
-          switchto.o syscalls.o
-
-obj-$(CONFIG_HEARTBEAT)                += led.o
-obj-$(CONFIG_SH_ALPHANUMERIC)  += alphanum.o
-obj-$(CONFIG_SH_DMA)           += dma.o
-obj-$(CONFIG_EARLY_PRINTK)     += early_printk.o
-obj-$(CONFIG_KALLSYMS)         += unwind.o
-obj-$(CONFIG_PCI)              += pci-dma.o pcibios.o
-
-ifeq ($(CONFIG_PCI),y)
-obj-$(CONFIG_CPU_SH5)          += pci_sh5.o
-endif
-
-ifndef CONFIG_NOFPU_SUPPORT
-obj-y                          += fpu.o
-endif
-
-USE_STANDARD_AS_RULE := true
-
diff --git a/arch/sh64/kernel/alphanum.c b/arch/sh64/kernel/alphanum.c
deleted file mode 100644 (file)
index 56d6f9f..0000000
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * arch/sh64/kernel/alpanum.c
- *
- * Copyright (C) 2002 Stuart Menefy <stuart.menefy@st.com>
- *
- * May be copied or modified under the terms of the GNU General Public
- * License.  See linux/COPYING for more information.
- *
- * Machine-independent functions for handling 8-digit alphanumeric display
- * (e.g. Agilent HDSP-253x)
- */
-#include <linux/config.h>
-#include <linux/stddef.h>
-#include <linux/sched.h>
-
-void mach_alphanum(int pos, unsigned char val);
-void mach_led(int pos, int val);
-
-void print_seg(char *file, int line)
-{
-       int i;
-       unsigned int nibble;
-
-       for (i = 0; i < 5; i++) {
-               mach_alphanum(i, file[i]);
-       }
-
-       for (i = 0; i < 3; i++) {
-               nibble = ((line >> (i * 4)) & 0xf);
-               mach_alphanum(7 - i, nibble + ((nibble > 9) ? 55 : 48));
-       }
-}
-
-void print_seg_num(unsigned num)
-{
-       int i;
-       unsigned int nibble;
-
-       for (i = 0; i < 8; i++) {
-               nibble = ((num >> (i * 4)) & 0xf);
-
-               mach_alphanum(7 - i, nibble + ((nibble > 9) ? 55 : 48));
-       }
-}
-
diff --git a/arch/sh64/kernel/asm-offsets.c b/arch/sh64/kernel/asm-offsets.c
deleted file mode 100644 (file)
index ca76537..0000000
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * This program is used to generate definitions needed by
- * assembly language modules.
- *
- * We use the technique used in the OSF Mach kernel code:
- * generate asm statements containing #defines,
- * compile this file to assembler, and then extract the
- * #defines from the assembly-language output.
- */
-
-#include <linux/stddef.h>
-#include <linux/types.h>
-#include <linux/mm.h>
-#include <asm/thread_info.h>
-
-#define DEFINE(sym, val) \
-        asm volatile("\n->" #sym " %0 " #val : : "i" (val))
-
-#define BLANK() asm volatile("\n->" : : )
-
-int main(void)
-{
-       /* offsets into the thread_info struct */
-       DEFINE(TI_TASK,         offsetof(struct thread_info, task));
-       DEFINE(TI_EXEC_DOMAIN,  offsetof(struct thread_info, exec_domain));
-       DEFINE(TI_FLAGS,        offsetof(struct thread_info, flags));
-       DEFINE(TI_PRE_COUNT,    offsetof(struct thread_info, preempt_count));
-       DEFINE(TI_CPU,          offsetof(struct thread_info, cpu));
-       DEFINE(TI_ADDR_LIMIT,   offsetof(struct thread_info, addr_limit));
-       DEFINE(TI_RESTART_BLOCK,offsetof(struct thread_info, restart_block));
-
-       return 0;
-}
diff --git a/arch/sh64/kernel/dma.c b/arch/sh64/kernel/dma.c
deleted file mode 100644 (file)
index f5183b2..0000000
+++ /dev/null
@@ -1,297 +0,0 @@
-/*
- * arch/sh64/kernel/dma.c
- *
- * DMA routines for the SH-5 DMAC.
- *
- * Copyright (C) 2003  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 <linux/module.h>
-#include <linux/interrupt.h>
-#include <linux/types.h>
-#include <linux/irq.h>
-#include <linux/spinlock.h>
-#include <linux/mm.h>
-#include <asm/hardware.h>
-#include <asm/dma.h>
-#include <asm/signal.h>
-#include <asm/errno.h>
-#include <asm/io.h>
-
-typedef struct {
-       unsigned long dev_addr;
-       unsigned long mem_addr;
-
-       unsigned int mode;
-       unsigned int count;
-} dma_info_t;
-
-static dma_info_t dma_info[MAX_DMA_CHANNELS];
-extern spinlock_t dma_spin_lock;
-
-/* arch/sh64/kernel/irq_intc.c */
-extern void make_intc_irq(unsigned int irq);
-
-/* DMAC Interrupts */
-#define DMA_IRQ_DMTE0  18
-#define DMA_IRQ_DERR   22
-
-#define DMAC_COMMON_BASE       (dmac_base + 0x08)
-#define DMAC_SAR_BASE          (dmac_base + 0x10)
-#define DMAC_DAR_BASE          (dmac_base + 0x18)
-#define DMAC_COUNT_BASE                (dmac_base + 0x20)
-#define DMAC_CTRL_BASE         (dmac_base + 0x28)
-#define DMAC_STATUS_BASE       (dmac_base + 0x30)
-
-#define DMAC_SAR(n)    (DMAC_SAR_BASE    + ((n) * 0x28))
-#define DMAC_DAR(n)    (DMAC_DAR_BASE    + ((n) * 0x28))
-#define DMAC_COUNT(n)  (DMAC_COUNT_BASE  + ((n) * 0x28))
-#define DMAC_CTRL(n)   (DMAC_CTRL_BASE   + ((n) * 0x28))
-#define DMAC_STATUS(n) (DMAC_STATUS_BASE + ((n) * 0x28))
-
-/* DMAC.COMMON Bit Definitions */
-#define DMAC_COMMON_PR 0x00000001      /* Priority */
-                                       /* Bits 1-2 Reserved */
-#define DMAC_COMMON_ME 0x00000008      /* Master Enable */
-#define DMAC_COMMON_NMI        0x00000010      /* NMI Flag */
-                                       /* Bits 5-6 Reserved */
-#define DMAC_COMMON_ER 0x00000780      /* Error Response */
-#define DMAC_COMMON_AAE        0x00007800      /* Address Alignment Error */
-                                       /* Bits 15-63 Reserved */
-
-/* DMAC.SAR Bit Definitions */
-#define DMAC_SAR_ADDR  0xffffffff      /* Source Address */
-
-/* DMAC.DAR Bit Definitions */
-#define DMAC_DAR_ADDR  0xffffffff      /* Destination Address */
-
-/* DMAC.COUNT Bit Definitions */
-#define DMAC_COUNT_CNT 0xffffffff      /* Transfer Count */
-
-/* DMAC.CTRL Bit Definitions */
-#define DMAC_CTRL_TS   0x00000007      /* Transfer Size */
-#define DMAC_CTRL_SI   0x00000018      /* Source Increment */
-#define DMAC_CTRL_DI   0x00000060      /* Destination Increment */
-#define DMAC_CTRL_RS   0x00000780      /* Resource Select */
-#define DMAC_CTRL_IE   0x00000800      /* Interrupt Enable */
-#define DMAC_CTRL_TE   0x00001000      /* Transfer Enable */
-                                       /* Bits 15-63 Reserved */
-
-/* DMAC.STATUS Bit Definitions */
-#define DMAC_STATUS_TE 0x00000001      /* Transfer End */
-#define DMAC_STATUS_AAE        0x00000002      /* Address Alignment Error */
-                                       /* Bits 2-63 Reserved */
-
-static unsigned long dmac_base;
-
-void set_dma_count(unsigned int chan, unsigned int count);
-void set_dma_addr(unsigned int chan, unsigned int addr);
-
-static irqreturn_t dma_mte(int irq, void *dev_id, struct pt_regs *regs)
-{
-       unsigned int chan = irq - DMA_IRQ_DMTE0;
-       dma_info_t *info = dma_info + chan;
-       u64 status;
-
-       if (info->mode & DMA_MODE_WRITE) {
-               sh64_out64(info->mem_addr & DMAC_SAR_ADDR, DMAC_SAR(chan));
-       } else {
-               sh64_out64(info->mem_addr & DMAC_DAR_ADDR, DMAC_DAR(chan));
-       }
-
-       set_dma_count(chan, info->count);
-
-       /* Clear the TE bit */
-       status = sh64_in64(DMAC_STATUS(chan));
-       status &= ~DMAC_STATUS_TE;
-       sh64_out64(status, DMAC_STATUS(chan));
-
-       return IRQ_HANDLED;
-}
-
-static struct irqaction irq_dmte = {
-       .handler        = dma_mte,
-       .flags          = SA_INTERRUPT,
-       .name           = "DMA MTE",
-};
-
-static irqreturn_t dma_err(int irq, void *dev_id, struct pt_regs *regs)
-{
-       u64 tmp;
-       u8 chan;
-
-       printk(KERN_NOTICE "DMAC: Got a DMA Error!\n");
-
-       tmp = sh64_in64(DMAC_COMMON_BASE);
-
-       /* Check for the type of error */
-       if ((chan = tmp & DMAC_COMMON_AAE)) {
-               /* It's an address alignment error.. */
-               printk(KERN_NOTICE "DMAC: Alignment error on channel %d, ", chan);
-
-               printk(KERN_NOTICE "SAR: 0x%08llx, DAR: 0x%08llx, COUNT: %lld\n",
-                      (sh64_in64(DMAC_SAR(chan)) & DMAC_SAR_ADDR),
-                      (sh64_in64(DMAC_DAR(chan)) & DMAC_DAR_ADDR),
-                      (sh64_in64(DMAC_COUNT(chan)) & DMAC_COUNT_CNT));
-
-       } else if ((chan = tmp & DMAC_COMMON_ER)) {
-               /* Something else went wrong.. */
-               printk(KERN_NOTICE "DMAC: Error on channel %d\n", chan);
-       }
-
-       /* Reset the ME bit to clear the interrupt */
-       tmp |= DMAC_COMMON_ME;
-       sh64_out64(tmp, DMAC_COMMON_BASE);
-
-       return IRQ_HANDLED;
-}
-
-static struct irqaction irq_derr = {
-       .handler        = dma_err,
-       .flags          = SA_INTERRUPT,
-       .name           = "DMA Error",
-};
-
-static inline unsigned long calc_xmit_shift(unsigned int chan)
-{
-       return sh64_in64(DMAC_CTRL(chan)) & 0x03;
-}
-
-void setup_dma(unsigned int chan, dma_info_t *info)
-{
-       unsigned int irq = DMA_IRQ_DMTE0 + chan;
-       dma_info_t *dma = dma_info + chan;
-
-       make_intc_irq(irq);
-       setup_irq(irq, &irq_dmte);
-       dma = info;
-}
-
-void enable_dma(unsigned int chan)
-{
-       u64 ctrl;
-
-       ctrl = sh64_in64(DMAC_CTRL(chan));
-       ctrl |= DMAC_CTRL_TE;
-       sh64_out64(ctrl, DMAC_CTRL(chan));
-}
-
-void disable_dma(unsigned int chan)
-{
-       u64 ctrl;
-
-       ctrl = sh64_in64(DMAC_CTRL(chan));
-       ctrl &= ~DMAC_CTRL_TE;
-       sh64_out64(ctrl, DMAC_CTRL(chan));
-}
-
-void set_dma_mode(unsigned int chan, char mode)
-{
-       dma_info_t *info = dma_info + chan;
-
-       info->mode = mode;
-
-       set_dma_addr(chan, info->mem_addr);
-       set_dma_count(chan, info->count);
-}
-
-void set_dma_addr(unsigned int chan, unsigned int addr)
-{
-       dma_info_t *info = dma_info + chan;
-       unsigned long sar, dar;
-
-       info->mem_addr = addr;
-       sar = (info->mode & DMA_MODE_WRITE) ? info->mem_addr : info->dev_addr;
-       dar = (info->mode & DMA_MODE_WRITE) ? info->dev_addr : info->mem_addr;
-
-       sh64_out64(sar & DMAC_SAR_ADDR, DMAC_SAR(chan));
-       sh64_out64(dar & DMAC_SAR_ADDR, DMAC_DAR(chan));
-}
-
-void set_dma_count(unsigned int chan, unsigned int count)
-{
-       dma_info_t *info = dma_info + chan;
-       u64 tmp;
-
-       info->count = count;
-
-       tmp = (info->count >> calc_xmit_shift(chan)) & DMAC_COUNT_CNT;
-
-       sh64_out64(tmp, DMAC_COUNT(chan));
-}
-
-unsigned long claim_dma_lock(void)
-{
-       unsigned long flags;
-
-       spin_lock_irqsave(&dma_spin_lock, flags);
-
-       return flags;
-}
-
-void release_dma_lock(unsigned long flags)
-{
-       spin_unlock_irqrestore(&dma_spin_lock, flags);
-}
-
-int get_dma_residue(unsigned int chan)
-{
-       return sh64_in64(DMAC_COUNT(chan) << calc_xmit_shift(chan));
-}
-
-int __init init_dma(void)
-{
-       struct vcr_info vcr;
-       u64 tmp;
-
-       /* Remap the DMAC */
-       dmac_base = onchip_remap(PHYS_DMAC_BLOCK, 1024, "DMAC");
-       if (!dmac_base) {
-               printk(KERN_ERR "Unable to remap DMAC\n");
-               return -ENOMEM;
-       }
-
-       /* Report DMAC.VCR Info */
-       vcr = sh64_get_vcr_info(dmac_base);
-       printk("DMAC: Module ID: 0x%04x, Module version: 0x%04x\n",
-              vcr.mod_id, vcr.mod_vers);
-
-       /* Set the ME bit */
-       tmp = sh64_in64(DMAC_COMMON_BASE);
-       tmp |= DMAC_COMMON_ME;
-       sh64_out64(tmp, DMAC_COMMON_BASE);
-
-       /* Enable the DMAC Error Interrupt */
-       make_intc_irq(DMA_IRQ_DERR);
-       setup_irq(DMA_IRQ_DERR, &irq_derr);
-
-       return 0;
-}
-
-static void __exit exit_dma(void)
-{
-       onchip_unmap(dmac_base);
-       free_irq(DMA_IRQ_DERR, 0);
-}
-
-module_init(init_dma);
-module_exit(exit_dma);
-
-MODULE_AUTHOR("Paul Mundt");
-MODULE_DESCRIPTION("DMA API for SH-5 DMAC");
-MODULE_LICENSE("GPL");
-
-EXPORT_SYMBOL(setup_dma);
-EXPORT_SYMBOL(claim_dma_lock);
-EXPORT_SYMBOL(release_dma_lock);
-EXPORT_SYMBOL(enable_dma);
-EXPORT_SYMBOL(disable_dma);
-EXPORT_SYMBOL(set_dma_mode);
-EXPORT_SYMBOL(set_dma_addr);
-EXPORT_SYMBOL(set_dma_count);
-EXPORT_SYMBOL(get_dma_residue);
-
diff --git a/arch/sh64/kernel/early_printk.c b/arch/sh64/kernel/early_printk.c
deleted file mode 100644 (file)
index 3d03ca7..0000000
+++ /dev/null
@@ -1,107 +0,0 @@
-/*
- * arch/sh64/kernel/early_printk.c
- *
- * SH-5 Early SCIF console (cloned and hacked from sh implementation)
- *
- * Copyright (C) 2003, 2004  Paul Mundt <lethal@linux-sh.org>
- * Copyright (C) 2002  M. R. Brown <mrbrown@0xd6.org>
- *
- * 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/console.h>
-#include <linux/tty.h>
-#include <linux/init.h>
-#include <asm/io.h>
-#include <asm/hardware.h>
-
-extern void cpu_relax(void);
-
-#define SCIF_BASE_ADDR 0x01030000
-#define SCIF_ADDR_SH5  PHYS_PERIPHERAL_BLOCK+SCIF_BASE_ADDR
-
-/*
- * Fixed virtual address where SCIF is mapped (should already be done
- * in arch/sh64/kernel/head.S!).
- */
-#define SCIF_REG       0xfa030000
-
-enum {
-       SCIF_SCSMR2     = SCIF_REG + 0x00,
-       SCIF_SCBRR2     = SCIF_REG + 0x04,
-       SCIF_SCSCR2     = SCIF_REG + 0x08,
-       SCIF_SCFTDR2    = SCIF_REG + 0x0c,
-       SCIF_SCFSR2     = SCIF_REG + 0x10,
-       SCIF_SCFRDR2    = SCIF_REG + 0x14,
-       SCIF_SCFCR2     = SCIF_REG + 0x18,
-       SCIF_SCFDR2     = SCIF_REG + 0x1c,
-       SCIF_SCSPTR2    = SCIF_REG + 0x20,
-       SCIF_SCLSR2     = SCIF_REG + 0x24,
-};
-
-static void sh_console_putc(int c)
-{
-       while (!(ctrl_inw(SCIF_SCFSR2) & 0x20))
-               cpu_relax();
-
-       ctrl_outb(c, SCIF_SCFTDR2);
-       ctrl_outw((ctrl_inw(SCIF_SCFSR2) & 0x9f), SCIF_SCFSR2);
-
-       if (c == '\n')
-               sh_console_putc('\r');
-}
-
-static void sh_console_flush(void)
-{
-       ctrl_outw((ctrl_inw(SCIF_SCFSR2) & 0xbf), SCIF_SCFSR2);
-
-       while (!(ctrl_inw(SCIF_SCFSR2) & 0x40))
-               cpu_relax();
-
-       ctrl_outw((ctrl_inw(SCIF_SCFSR2) & 0xbf), SCIF_SCFSR2);
-}
-
-static void sh_console_write(struct console *con, const char *s, unsigned count)
-{
-       while (count-- > 0)
-               sh_console_putc(*s++);
-
-       sh_console_flush();
-}
-
-static int __init sh_console_setup(struct console *con, char *options)
-{
-       con->cflag = CREAD | HUPCL | CLOCAL | B19200 | CS8;
-
-       return 0;
-}
-
-static struct console sh_console = {
-       .name           = "scifcon",
-       .write          = sh_console_write,
-       .setup          = sh_console_setup,
-       .flags          = CON_PRINTBUFFER,
-       .index          = -1,
-};
-
-void __init enable_early_printk(void)
-{
-       ctrl_outb(0x2a, SCIF_SCBRR2);   /* 19200bps */
-
-       ctrl_outw(0x04, SCIF_SCFCR2);   /* Reset TFRST */
-       ctrl_outw(0x10, SCIF_SCFCR2);   /* TTRG0=1 */
-
-       ctrl_outw(0, SCIF_SCSPTR2);
-       ctrl_outw(0x60, SCIF_SCFSR2);
-       ctrl_outw(0, SCIF_SCLSR2);
-       ctrl_outw(0x30, SCIF_SCSCR2);
-
-       register_console(&sh_console);
-}
-
-void disable_early_printk(void)
-{
-       unregister_console(&sh_console);
-}
-
diff --git a/arch/sh64/kernel/entry.S b/arch/sh64/kernel/entry.S
deleted file mode 100644 (file)
index 52dda38..0000000
+++ /dev/null
@@ -1,2101 +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.
- *
- * arch/sh64/kernel/entry.S
- *
- * Copyright (C) 2000, 2001  Paolo Alberelli
- * Copyright (C) 2004  Paul Mundt
- * Copyright (C) 2003, 2004 Richard Curnow
- *
- */
-
-#include <linux/config.h>
-#include <linux/errno.h>
-#include <linux/sys.h>
-
-#include <asm/processor.h>
-#include <asm/registers.h>
-#include <asm/unistd.h>
-#include <asm/thread_info.h>
-#include <asm/asm-offsets.h>
-
-/*
- * SR fields.
- */
-#define SR_ASID_MASK   0x00ff0000
-#define SR_FD_MASK     0x00008000
-#define SR_SS          0x08000000
-#define SR_BL          0x10000000
-#define SR_MD          0x40000000
-
-/*
- * Event code.
- */
-#define        EVENT_INTERRUPT         0
-#define        EVENT_FAULT_TLB         1
-#define        EVENT_FAULT_NOT_TLB     2
-#define        EVENT_DEBUG             3
-
-/* EXPEVT values */
-#define        RESET_CAUSE             0x20
-#define DEBUGSS_CAUSE          0x980
-
-/*
- * Frame layout. Quad index.
- */
-#define        FRAME_T(x)      FRAME_TBASE+(x*8)
-#define        FRAME_R(x)      FRAME_RBASE+(x*8)
-#define        FRAME_S(x)      FRAME_SBASE+(x*8)
-#define FSPC           0
-#define FSSR           1
-#define FSYSCALL_ID    2
-
-/* Arrange the save frame to be a multiple of 32 bytes long */
-#define FRAME_SBASE    0
-#define FRAME_RBASE    (FRAME_SBASE+(3*8))     /* SYSCALL_ID - SSR - SPC */
-#define FRAME_TBASE    (FRAME_RBASE+(63*8))    /* r0 - r62 */
-#define FRAME_PBASE    (FRAME_TBASE+(8*8))     /* tr0 -tr7 */
-#define        FRAME_SIZE      (FRAME_PBASE+(2*8))     /* pad0-pad1 */
-
-#define FP_FRAME_SIZE  FP_FRAME_BASE+(33*8)    /* dr0 - dr31 + fpscr */
-#define FP_FRAME_BASE  0
-
-#define        SAVED_R2        0*8
-#define        SAVED_R3        1*8
-#define        SAVED_R4        2*8
-#define        SAVED_R5        3*8
-#define        SAVED_R18       4*8
-#define        SAVED_R6        5*8
-#define        SAVED_TR0       6*8
-
-/* These are the registers saved in the TLB path that aren't saved in the first
-   level of the normal one. */
-#define        TLB_SAVED_R25   7*8
-#define        TLB_SAVED_TR1   8*8
-#define        TLB_SAVED_TR2   9*8
-#define        TLB_SAVED_TR3   10*8
-#define        TLB_SAVED_TR4   11*8
-/* Save R0/R1 : PT-migrating compiler currently dishounours -ffixed-r0 and -ffixed-r1 causing
-   breakage otherwise. */
-#define        TLB_SAVED_R0    12*8
-#define        TLB_SAVED_R1    13*8
-
-#define CLI()                          \
-       getcon  SR, r6;                 \
-       ori     r6, 0xf0, r6;           \
-       putcon  r6, SR;
-
-#define STI()                          \
-       getcon  SR, r6;                 \
-       andi    r6, ~0xf0, r6;          \
-       putcon  r6, SR;
-
-#ifdef CONFIG_PREEMPT
-#  define preempt_stop()       CLI()
-#else
-#  define preempt_stop()
-#  define resume_kernel                restore_all
-#endif
-
-       .section        .data, "aw"
-
-#define FAST_TLBMISS_STACK_CACHELINES 4
-#define FAST_TLBMISS_STACK_QUADWORDS (4*FAST_TLBMISS_STACK_CACHELINES)
-
-/* Register back-up area for all exceptions */
-       .balign 32
-       /* Allow for 16 quadwords to be pushed by fast tlbmiss handling
-        * register saves etc. */
-       .fill FAST_TLBMISS_STACK_QUADWORDS, 8, 0x0
-/* This is 32 byte aligned by construction */
-/* Register back-up area for all exceptions */
-reg_save_area:
-       .quad   0
-       .quad   0
-       .quad   0
-       .quad   0
-
-       .quad   0
-       .quad   0
-       .quad   0
-       .quad   0
-
-       .quad   0
-       .quad   0
-       .quad   0
-       .quad   0
-
-       .quad   0
-       .quad   0
-
-/* Save area for RESVEC exceptions. We cannot use reg_save_area because of
- * reentrancy. Note this area may be accessed via physical address.
- * Align so this fits a whole single cache line, for ease of purging.
- */
-       .balign 32,0,32
-resvec_save_area:
-       .quad   0
-       .quad   0
-       .quad   0
-       .quad   0
-       .quad   0
-       .balign 32,0,32
-
-/* Jump table of 3rd level handlers  */
-trap_jtable:
-       .long   do_exception_error              /* 0x000 */
-       .long   do_exception_error              /* 0x020 */
-       .long   tlb_miss_load                           /* 0x040 */
-       .long   tlb_miss_store                          /* 0x060 */
-       ! ARTIFICIAL pseudo-EXPEVT setting
-       .long   do_debug_interrupt              /* 0x080 */
-       .long   tlb_miss_load                           /* 0x0A0 */
-       .long   tlb_miss_store                          /* 0x0C0 */
-       .long   do_address_error_load   /* 0x0E0 */
-       .long   do_address_error_store  /* 0x100 */
-#ifndef CONFIG_NOFPU_SUPPORT
-       .long   do_fpu_error            /* 0x120 */
-#else
-       .long   do_exception_error              /* 0x120 */
-#endif
-       .long   do_exception_error              /* 0x140 */
-       .long   system_call                             /* 0x160 */
-       .long   do_reserved_inst                /* 0x180 */
-       .long   do_illegal_slot_inst    /* 0x1A0 */
-       .long   do_NMI                  /* 0x1C0 */
-       .long   do_exception_error              /* 0x1E0 */
-       .rept 15
-               .long do_IRQ            /* 0x200 - 0x3C0 */
-       .endr
-       .long   do_exception_error              /* 0x3E0 */
-       .rept 32
-               .long do_IRQ            /* 0x400 - 0x7E0 */
-       .endr
-       .long   fpu_error_or_IRQA                       /* 0x800 */
-       .long   fpu_error_or_IRQB                       /* 0x820 */
-       .long   do_IRQ                  /* 0x840 */
-       .long   do_IRQ                  /* 0x860 */
-       .rept 6
-               .long do_exception_error        /* 0x880 - 0x920 */
-       .endr
-       .long   do_software_break_point /* 0x940 */
-       .long   do_exception_error              /* 0x960 */
-       .long   do_single_step          /* 0x980 */
-
-       .rept 3
-               .long do_exception_error        /* 0x9A0 - 0x9E0 */
-       .endr
-       .long   do_IRQ                  /* 0xA00 */
-       .long   do_IRQ                  /* 0xA20 */
-       .long   itlb_miss_or_IRQ                        /* 0xA40 */
-       .long   do_IRQ                  /* 0xA60 */
-       .long   do_IRQ                  /* 0xA80 */
-       .long   itlb_miss_or_IRQ                        /* 0xAA0 */
-       .long   do_exception_error              /* 0xAC0 */
-       .long   do_address_error_exec   /* 0xAE0 */
-       .rept 8
-               .long do_exception_error        /* 0xB00 - 0xBE0 */
-       .endr
-       .rept 18
-               .long do_IRQ            /* 0xC00 - 0xE20 */
-       .endr
-
-       .section        .text64, "ax"
-
-/*
- * --- Exception/Interrupt/Event Handling Section
- */
-
-/*
- * VBR and RESVEC blocks.
- *
- * First level handler for VBR-based exceptions.
- *
- * To avoid waste of space, align to the maximum text block size.
- * This is assumed to be at most 128 bytes or 32 instructions.
- * DO NOT EXCEED 32 instructions on the first level handlers !
- *
- * Also note that RESVEC is contained within the VBR block
- * where the room left (1KB - TEXT_SIZE) allows placing
- * the RESVEC block (at most 512B + TEXT_SIZE).
- *
- * So first (and only) level handler for RESVEC-based exceptions.
- *
- * Where the fault/interrupt is handled (not_a_tlb_miss, tlb_miss
- * and interrupt) we are a lot tight with register space until
- * saving onto the stack frame, which is done in handle_exception().
- *
- */
-
-#define        TEXT_SIZE       128
-#define        BLOCK_SIZE      1664            /* Dynamic check, 13*128 */
-
-       .balign TEXT_SIZE
-LVBR_block:
-       .space  256, 0                  /* Power-on class handler, */
-                                       /* not required here       */
-not_a_tlb_miss:
-       /* Save original stack pointer into KCR1 */
-       putcon  SP, KCR1
-
-       /* Save other original registers into reg_save_area */
-        movi  reg_save_area, SP
-       st.q    SP, SAVED_R2, r2
-       st.q    SP, SAVED_R3, r3
-       st.q    SP, SAVED_R4, r4
-       st.q    SP, SAVED_R5, r5
-       st.q    SP, SAVED_R6, r6
-       st.q    SP, SAVED_R18, r18
-       gettr   tr0, r3
-       st.q    SP, SAVED_TR0, r3
-
-       /* Set args for Non-debug, Not a TLB miss class handler */
-       getcon  EXPEVT, r2
-       movi    ret_from_exception, r3
-       ori     r3, 1, r3
-       movi    EVENT_FAULT_NOT_TLB, r4
-       or      SP, ZERO, r5
-       getcon  KCR1, SP
-       pta     handle_exception, tr0
-       blink   tr0, ZERO
-
-       .balign 256
-       ! VBR+0x200
-       nop
-       .balign 256
-       ! VBR+0x300
-       nop
-       .balign 256
-       /*
-        * Instead of the natural .balign 1024 place RESVEC here
-        * respecting the final 1KB alignment.
-        */
-       .balign TEXT_SIZE
-       /*
-        * Instead of '.space 1024-TEXT_SIZE' place the RESVEC
-        * block making sure the final alignment is correct.
-        */
-tlb_miss:
-       putcon  SP, KCR1
-       movi    reg_save_area, SP
-       /* SP is guaranteed 32-byte aligned. */
-       st.q    SP, TLB_SAVED_R0 , r0
-       st.q    SP, TLB_SAVED_R1 , r1
-       st.q    SP, SAVED_R2 , r2
-       st.q    SP, SAVED_R3 , r3
-       st.q    SP, SAVED_R4 , r4
-       st.q    SP, SAVED_R5 , r5
-       st.q    SP, SAVED_R6 , r6
-       st.q    SP, SAVED_R18, r18
-
-       /* Save R25 for safety; as/ld may want to use it to achieve the call to
-        * the code in mm/tlbmiss.c */
-       st.q    SP, TLB_SAVED_R25, r25
-       gettr   tr0, r2
-       gettr   tr1, r3
-       gettr   tr2, r4
-       gettr   tr3, r5
-       gettr   tr4, r18
-       st.q    SP, SAVED_TR0 , r2
-       st.q    SP, TLB_SAVED_TR1 , r3
-       st.q    SP, TLB_SAVED_TR2 , r4
-       st.q    SP, TLB_SAVED_TR3 , r5
-       st.q    SP, TLB_SAVED_TR4 , r18
-
-       pt      do_fast_page_fault, tr0
-       getcon  SSR, r2
-       getcon  EXPEVT, r3
-       getcon  TEA, r4
-       shlri   r2, 30, r2
-       andi    r2, 1, r2       /* r2 = SSR.MD */
-       blink   tr0, LINK
-
-       pt      fixup_to_invoke_general_handler, tr1
-
-       /* If the fast path handler fixed the fault, just drop through quickly
-          to the restore code right away to return to the excepting context.
-          */
-       beqi/u  r2, 0, tr1
-
-fast_tlb_miss_restore:
-       ld.q    SP, SAVED_TR0, r2
-       ld.q    SP, TLB_SAVED_TR1, r3
-       ld.q    SP, TLB_SAVED_TR2, r4
-
-       ld.q    SP, TLB_SAVED_TR3, r5
-       ld.q    SP, TLB_SAVED_TR4, r18
-
-       ptabs   r2, tr0
-       ptabs   r3, tr1
-       ptabs   r4, tr2
-       ptabs   r5, tr3
-       ptabs   r18, tr4
-
-       ld.q    SP, TLB_SAVED_R0, r0
-       ld.q    SP, TLB_SAVED_R1, r1
-       ld.q    SP, SAVED_R2, r2
-       ld.q    SP, SAVED_R3, r3
-       ld.q    SP, SAVED_R4, r4
-       ld.q    SP, SAVED_R5, r5
-       ld.q    SP, SAVED_R6, r6
-       ld.q    SP, SAVED_R18, r18
-       ld.q    SP, TLB_SAVED_R25, r25
-
-       getcon  KCR1, SP
-       rte
-       nop /* for safety, in case the code is run on sh5-101 cut1.x */
-
-fixup_to_invoke_general_handler:
-
-       /* OK, new method.  Restore stuff that's not expected to get saved into
-          the 'first-level' reg save area, then just fall through to setting
-          up the registers and calling the second-level handler. */
-
-       /* 2nd level expects r2,3,4,5,6,18,tr0 to be saved.  So we must restore
-          r25,tr1-4 and save r6 to get into the right state.  */
-
-       ld.q    SP, TLB_SAVED_TR1, r3
-       ld.q    SP, TLB_SAVED_TR2, r4
-       ld.q    SP, TLB_SAVED_TR3, r5
-       ld.q    SP, TLB_SAVED_TR4, r18
-       ld.q    SP, TLB_SAVED_R25, r25
-
-       ld.q    SP, TLB_SAVED_R0, r0
-       ld.q    SP, TLB_SAVED_R1, r1
-
-       ptabs/u r3, tr1
-       ptabs/u r4, tr2
-       ptabs/u r5, tr3
-       ptabs/u r18, tr4
-
-       /* Set args for Non-debug, TLB miss class handler */
-       getcon  EXPEVT, r2
-       movi    ret_from_exception, r3
-       ori     r3, 1, r3
-       movi    EVENT_FAULT_TLB, r4
-       or      SP, ZERO, r5
-       getcon  KCR1, SP
-       pta     handle_exception, tr0
-       blink   tr0, ZERO
-
-/* NB TAKE GREAT CARE HERE TO ENSURE THAT THE INTERRUPT CODE
-   DOES END UP AT VBR+0x600 */
-       nop
-       nop
-       nop
-       nop
-       nop
-       nop
-
-       .balign 256
-       /* VBR + 0x600 */
-
-interrupt:
-       /* Save original stack pointer into KCR1 */
-       putcon  SP, KCR1
-
-       /* Save other original registers into reg_save_area */
-        movi  reg_save_area, SP
-       st.q    SP, SAVED_R2, r2
-       st.q    SP, SAVED_R3, r3
-       st.q    SP, SAVED_R4, r4
-       st.q    SP, SAVED_R5, r5
-       st.q    SP, SAVED_R6, r6
-       st.q    SP, SAVED_R18, r18
-       gettr   tr0, r3
-       st.q    SP, SAVED_TR0, r3
-
-       /* Set args for interrupt class handler */
-       getcon  INTEVT, r2
-       movi    ret_from_irq, r3
-       ori     r3, 1, r3
-       movi    EVENT_INTERRUPT, r4
-       or      SP, ZERO, r5
-       getcon  KCR1, SP
-       pta     handle_exception, tr0
-       blink   tr0, ZERO
-       .balign TEXT_SIZE               /* let's waste the bare minimum */
-
-LVBR_block_end:                                /* Marker. Used for total checking */
-
-       .balign 256
-LRESVEC_block:
-       /* Panic handler. Called with MMU off. Possible causes/actions:
-        * - Reset:             Jump to program start.
-        * - Single Step:       Turn off Single Step & return.
-        * - Others:            Call panic handler, passing PC as arg.
-        *                      (this may need to be extended...)
-        */
-reset_or_panic:
-       putcon  SP, DCR
-       /* First save r0-1 and tr0, as we need to use these */
-       movi    resvec_save_area-CONFIG_CACHED_MEMORY_OFFSET, SP
-       st.q    SP, 0, r0
-       st.q    SP, 8, r1
-       gettr   tr0, r0
-       st.q    SP, 32, r0
-
-       /* Check cause */
-       getcon  EXPEVT, r0
-       movi    RESET_CAUSE, r1
-       sub     r1, r0, r1              /* r1=0 if reset */
-       movi    _stext-CONFIG_CACHED_MEMORY_OFFSET, r0
-       ori     r0, 1, r0
-       ptabs   r0, tr0
-       beqi    r1, 0, tr0              /* Jump to start address if reset */
-
-       getcon  EXPEVT, r0
-       movi    DEBUGSS_CAUSE, r1
-       sub     r1, r0, r1              /* r1=0 if single step */
-       pta     single_step_panic, tr0
-       beqi    r1, 0, tr0              /* jump if single step */
-
-       /* Now jump to where we save the registers. */
-       movi    panic_stash_regs-CONFIG_CACHED_MEMORY_OFFSET, r1
-       ptabs   r1, tr0
-       blink   tr0, r63
-
-single_step_panic:
-       /* We are in a handler with Single Step set. We need to resume the
-        * handler, by turning on MMU & turning off Single Step. */
-       getcon  SSR, r0
-       movi    SR_MMU, r1
-       or      r0, r1, r0
-       movi    ~SR_SS, r1
-       and     r0, r1, r0
-       putcon  r0, SSR
-       /* Restore EXPEVT, as the rte won't do this */
-       getcon  PEXPEVT, r0
-       putcon  r0, EXPEVT
-       /* Restore regs */
-       ld.q    SP, 32, r0
-       ptabs   r0, tr0
-       ld.q    SP, 0, r0
-       ld.q    SP, 8, r1
-       getcon  DCR, SP
-       synco
-       rte
-
-
-       .balign 256
-debug_exception:
-       /*
-        * Single step/software_break_point first level handler.
-        * Called with MMU off, so the first thing we do is enable it
-        * by doing an rte with appropriate SSR.
-        */
-       putcon  SP, DCR
-       /* Save SSR & SPC, together with R0 & R1, as we need to use 2 regs. */
-       movi    resvec_save_area-CONFIG_CACHED_MEMORY_OFFSET, SP
-
-       /* With the MMU off, we are bypassing the cache, so purge any
-         * data that will be made stale by the following stores.
-         */
-       ocbp    SP, 0
-       synco
-
-       st.q    SP, 0, r0
-       st.q    SP, 8, r1
-       getcon  SPC, r0
-       st.q    SP, 16, r0
-       getcon  SSR, r0
-       st.q    SP, 24, r0
-
-       /* Enable MMU, block exceptions, set priv mode, disable single step */
-       movi    SR_MMU | SR_BL | SR_MD, r1
-       or      r0, r1, r0
-       movi    ~SR_SS, r1
-       and     r0, r1, r0
-       putcon  r0, SSR
-       /* Force control to debug_exception_2 when rte is executed */
-       movi    debug_exeception_2, r0
-       ori     r0, 1, r0      /* force SHmedia, just in case */
-       putcon  r0, SPC
-       getcon  DCR, SP
-       synco
-       rte
-debug_exeception_2:
-       /* Restore saved regs */
-       putcon  SP, KCR1
-       movi    resvec_save_area, SP
-       ld.q    SP, 24, r0
-       putcon  r0, SSR
-       ld.q    SP, 16, r0
-       putcon  r0, SPC
-       ld.q    SP, 0, r0
-       ld.q    SP, 8, r1
-
-       /* Save other original registers into reg_save_area */
-        movi  reg_save_area, SP
-       st.q    SP, SAVED_R2, r2
-       st.q    SP, SAVED_R3, r3
-       st.q    SP, SAVED_R4, r4
-       st.q    SP, SAVED_R5, r5
-       st.q    SP, SAVED_R6, r6
-       st.q    SP, SAVED_R18, r18
-       gettr   tr0, r3
-       st.q    SP, SAVED_TR0, r3
-
-       /* Set args for debug class handler */
-       getcon  EXPEVT, r2
-       movi    ret_from_exception, r3
-       ori     r3, 1, r3
-       movi    EVENT_DEBUG, r4
-       or      SP, ZERO, r5
-       getcon  KCR1, SP
-       pta     handle_exception, tr0
-       blink   tr0, ZERO
-
-       .balign 256
-debug_interrupt:
-       /* !!! WE COME HERE IN REAL MODE !!! */
-       /* Hook-up debug interrupt to allow various debugging options to be
-        * hooked into its handler. */
-       /* Save original stack pointer into KCR1 */
-       synco
-       putcon  SP, KCR1
-       movi    resvec_save_area-CONFIG_CACHED_MEMORY_OFFSET, SP
-       ocbp    SP, 0
-       ocbp    SP, 32
-       synco
-
-       /* Save other original registers into reg_save_area thru real addresses */
-       st.q    SP, SAVED_R2, r2
-       st.q    SP, SAVED_R3, r3
-       st.q    SP, SAVED_R4, r4
-       st.q    SP, SAVED_R5, r5
-       st.q    SP, SAVED_R6, r6
-       st.q    SP, SAVED_R18, r18
-       gettr   tr0, r3
-       st.q    SP, SAVED_TR0, r3
-
-       /* move (spc,ssr)->(pspc,pssr).  The rte will shift
-          them back again, so that they look like the originals
-          as far as the real handler code is concerned. */
-       getcon  spc, r6
-       putcon  r6, pspc
-       getcon  ssr, r6
-       putcon  r6, pssr
-
-       ! construct useful SR for handle_exception
-       movi    3, r6
-       shlli   r6, 30, r6
-       getcon  sr, r18
-       or      r18, r6, r6
-       putcon  r6, ssr
-
-       ! SSR is now the current SR with the MD and MMU bits set
-       ! i.e. the rte will switch back to priv mode and put
-       ! the mmu back on
-
-       ! construct spc
-       movi    handle_exception, r18
-       ori     r18, 1, r18             ! for safety (do we need this?)
-       putcon  r18, spc
-
-       /* Set args for Non-debug, Not a TLB miss class handler */
-
-       ! EXPEVT==0x80 is unused, so 'steal' this value to put the
-       ! debug interrupt handler in the vectoring table
-       movi    0x80, r2
-       movi    ret_from_exception, r3
-       ori     r3, 1, r3
-       movi    EVENT_FAULT_NOT_TLB, r4
-
-       or      SP, ZERO, r5
-       movi    CONFIG_CACHED_MEMORY_OFFSET, r6
-       add     r6, r5, r5
-       getcon  KCR1, SP
-
-       synco   ! for safety
-       rte     ! -> handle_exception, switch back to priv mode again
-
-LRESVEC_block_end:                     /* Marker. Unused. */
-
-       .balign TEXT_SIZE
-
-/*
- * Second level handler for VBR-based exceptions. Pre-handler.
- * In common to all stack-frame sensitive handlers.
- *
- * Inputs:
- * (KCR0) Current [current task union]
- * (KCR1) Original SP
- * (r2)   INTEVT/EXPEVT
- * (r3)   appropriate return address
- * (r4)   Event (0 = interrupt, 1 = TLB miss fault, 2 = Not TLB miss fault, 3=debug)
- * (r5)   Pointer to reg_save_area
- * (SP)   Original SP
- *
- * Available registers:
- * (r6)
- * (r18)
- * (tr0)
- *
- */
-handle_exception:
-       /* Common 2nd level handler. */
-
-       /* First thing we need an appropriate stack pointer */
-       getcon  SSR, r6
-       shlri   r6, 30, r6
-       andi    r6, 1, r6
-       pta     stack_ok, tr0
-       bne     r6, ZERO, tr0           /* Original stack pointer is fine */
-
-       /* Set stack pointer for user fault */
-       getcon  KCR0, SP
-       movi    THREAD_SIZE, r6         /* Point to the end */
-       add     SP, r6, SP
-
-stack_ok:
-
-/* DEBUG : check for underflow/overflow of the kernel stack */
-       pta     no_underflow, tr0
-       getcon  KCR0, r6
-       movi    1024, r18
-       add     r6, r18, r6
-       bge     SP, r6, tr0     ! ? below 1k from bottom of stack : danger zone
-
-/* Just panic to cause a crash. */
-bad_sp:
-       ld.b    r63, 0, r6
-       nop
-
-no_underflow:
-       pta     bad_sp, tr0
-       getcon  kcr0, r6
-       movi    THREAD_SIZE, r18
-       add     r18, r6, r6
-       bgt     SP, r6, tr0     ! sp above the stack
-
-       /* Make some room for the BASIC frame. */
-       movi    -(FRAME_SIZE), r6
-       add     SP, r6, SP
-
-/* Could do this with no stalling if we had another spare register, but the
-   code below will be OK. */
-       ld.q    r5, SAVED_R2, r6
-       ld.q    r5, SAVED_R3, r18
-       st.q    SP, FRAME_R(2), r6
-       ld.q    r5, SAVED_R4, r6
-       st.q    SP, FRAME_R(3), r18
-       ld.q    r5, SAVED_R5, r18
-       st.q    SP, FRAME_R(4), r6
-       ld.q    r5, SAVED_R6, r6
-       st.q    SP, FRAME_R(5), r18
-       ld.q    r5, SAVED_R18, r18
-       st.q    SP, FRAME_R(6), r6
-       ld.q    r5, SAVED_TR0, r6
-       st.q    SP, FRAME_R(18), r18
-       st.q    SP, FRAME_T(0), r6
-
-       /* Keep old SP around */
-       getcon  KCR1, r6
-
-       /* Save the rest of the general purpose registers */
-       st.q    SP, FRAME_R(0), r0
-       st.q    SP, FRAME_R(1), r1
-       st.q    SP, FRAME_R(7), r7
-       st.q    SP, FRAME_R(8), r8
-       st.q    SP, FRAME_R(9), r9
-       st.q    SP, FRAME_R(10), r10
-       st.q    SP, FRAME_R(11), r11
-       st.q    SP, FRAME_R(12), r12
-       st.q    SP, FRAME_R(13), r13
-       st.q    SP, FRAME_R(14), r14
-
-       /* SP is somewhere else */
-       st.q    SP, FRAME_R(15), r6
-
-       st.q    SP, FRAME_R(16), r16
-       st.q    SP, FRAME_R(17), r17
-       /* r18 is saved earlier. */
-       st.q    SP, FRAME_R(19), r19
-       st.q    SP, FRAME_R(20), r20
-       st.q    SP, FRAME_R(21), r21
-       st.q    SP, FRAME_R(22), r22
-       st.q    SP, FRAME_R(23), r23
-       st.q    SP, FRAME_R(24), r24
-       st.q    SP, FRAME_R(25), r25
-       st.q    SP, FRAME_R(26), r26
-       st.q    SP, FRAME_R(27), r27
-       st.q    SP, FRAME_R(28), r28
-       st.q    SP, FRAME_R(29), r29
-       st.q    SP, FRAME_R(30), r30
-       st.q    SP, FRAME_R(31), r31
-       st.q    SP, FRAME_R(32), r32
-       st.q    SP, FRAME_R(33), r33
-       st.q    SP, FRAME_R(34), r34
-       st.q    SP, FRAME_R(35), r35
-       st.q    SP, FRAME_R(36), r36
-       st.q    SP, FRAME_R(37), r37
-       st.q    SP, FRAME_R(38), r38
-       st.q    SP, FRAME_R(39), r39
-       st.q    SP, FRAME_R(40), r40
-       st.q    SP, FRAME_R(41), r41
-       st.q    SP, FRAME_R(42), r42
-       st.q    SP, FRAME_R(43), r43
-       st.q    SP, FRAME_R(44), r44
-       st.q    SP, FRAME_R(45), r45
-       st.q    SP, FRAME_R(46), r46
-       st.q    SP, FRAME_R(47), r47
-       st.q    SP, FRAME_R(48), r48
-       st.q    SP, FRAME_R(49), r49
-       st.q    SP, FRAME_R(50), r50
-       st.q    SP, FRAME_R(51), r51
-       st.q    SP, FRAME_R(52), r52
-       st.q    SP, FRAME_R(53), r53
-       st.q    SP, FRAME_R(54), r54
-       st.q    SP, FRAME_R(55), r55
-       st.q    SP, FRAME_R(56), r56
-       st.q    SP, FRAME_R(57), r57
-       st.q    SP, FRAME_R(58), r58
-       st.q    SP, FRAME_R(59), r59
-       st.q    SP, FRAME_R(60), r60
-       st.q    SP, FRAME_R(61), r61
-       st.q    SP, FRAME_R(62), r62
-
-       /*
-        * Save the S* registers.
-        */
-       getcon  SSR, r61
-       st.q    SP, FRAME_S(FSSR), r61
-       getcon  SPC, r62
-       st.q    SP, FRAME_S(FSPC), r62
-       movi    -1, r62                 /* Reset syscall_nr */
-       st.q    SP, FRAME_S(FSYSCALL_ID), r62
-
-       /* Save the rest of the target registers */
-       gettr   tr1, r6
-       st.q    SP, FRAME_T(1), r6
-       gettr   tr2, r6
-       st.q    SP, FRAME_T(2), r6
-       gettr   tr3, r6
-       st.q    SP, FRAME_T(3), r6
-       gettr   tr4, r6
-       st.q    SP, FRAME_T(4), r6
-       gettr   tr5, r6
-       st.q    SP, FRAME_T(5), r6
-       gettr   tr6, r6
-       st.q    SP, FRAME_T(6), r6
-       gettr   tr7, r6
-       st.q    SP, FRAME_T(7), r6
-
-       ! setup FP so that unwinder can wind back through nested kernel mode
-       ! exceptions
-       add     SP, ZERO, r14
-
-#define POOR_MANS_STRACE 0
-
-#if POOR_MANS_STRACE
-       /* We've pushed all the registers now, so only r2-r4 hold anything
-        * useful. Move them into callee save registers */
-       or      r2, ZERO, r28
-       or      r3, ZERO, r29
-       or      r4, ZERO, r30
-
-       /* Preserve r2 as the event code */
-       movi    evt_debug, r3
-       ori     r3, 1, r3
-       ptabs   r3, tr0
-
-       or      SP, ZERO, r6
-       getcon  TRA, r5
-       blink   tr0, LINK
-
-       or      r28, ZERO, r2
-       or      r29, ZERO, r3
-       or      r30, ZERO, r4
-#endif
-
-
-       /* For syscall and debug race condition, get TRA now */
-       getcon  TRA, r5
-
-       /* We are in a safe position to turn SR.BL off, but set IMASK=0xf
-        * Also set FD, to catch FPU usage in the kernel.
-        *
-        * benedict.gaster@superh.com 29/07/2002
-        *
-        * On all SH5-101 revisions it is unsafe to raise the IMASK and at the
-        * same time change BL from 1->0, as any pending interrupt of a level
-        * higher than he previous value of IMASK will leak through and be
-        * taken unexpectedly.
-        *
-        * To avoid this we raise the IMASK and then issue another PUTCON to
-        * enable interrupts.
-         */
-       getcon  SR, r6
-       movi    SR_IMASK | SR_FD, r7
-       or      r6, r7, r6
-       putcon  r6, SR
-       movi    SR_UNBLOCK_EXC, r7
-       and     r6, r7, r6
-       putcon  r6, SR
-
-
-       /* Now call the appropriate 3rd level handler */
-       or      r3, ZERO, LINK
-       movi    trap_jtable, r3
-       shlri   r2, 3, r2
-       ldx.l   r2, r3, r3
-       shlri   r2, 2, r2
-       ptabs   r3, tr0
-       or      SP, ZERO, r3
-       blink   tr0, ZERO
-
-/*
- * Second level handler for VBR-based exceptions. Post-handlers.
- *
- * Post-handlers for interrupts (ret_from_irq), exceptions
- * (ret_from_exception) and common reentrance doors (restore_all
- * to get back to the original context, ret_from_syscall loop to
- * check kernel exiting).
- *
- * ret_with_reschedule and work_notifysig are an inner lables of
- * the ret_from_syscall loop.
- *
- * In common to all stack-frame sensitive handlers.
- *
- * Inputs:
- * (SP)   struct pt_regs *, original register's frame pointer (basic)
- *
- */
-       .global ret_from_irq
-ret_from_irq:
-#if POOR_MANS_STRACE
-       pta     evt_debug_ret_from_irq, tr0
-       ori     SP, 0, r2
-       blink   tr0, LINK
-#endif
-       ld.q    SP, FRAME_S(FSSR), r6
-       shlri   r6, 30, r6
-       andi    r6, 1, r6
-       pta     resume_kernel, tr0
-       bne     r6, ZERO, tr0           /* no further checks */
-       STI()
-       pta     ret_with_reschedule, tr0
-       blink   tr0, ZERO               /* Do not check softirqs */
-
-       .global ret_from_exception
-ret_from_exception:
-       preempt_stop()
-
-#if POOR_MANS_STRACE
-       pta     evt_debug_ret_from_exc, tr0
-       ori     SP, 0, r2
-       blink   tr0, LINK
-#endif
-
-       ld.q    SP, FRAME_S(FSSR), r6
-       shlri   r6, 30, r6
-       andi    r6, 1, r6
-       pta     resume_kernel, tr0
-       bne     r6, ZERO, tr0           /* no further checks */
-
-       /* Check softirqs */
-
-#ifdef CONFIG_PREEMPT
-       pta   ret_from_syscall, tr0
-       blink   tr0, ZERO
-
-resume_kernel:
-       pta     restore_all, tr0
-
-       getcon  KCR0, r6
-       ld.l    r6, TI_PRE_COUNT, r7
-       beq/u   r7, ZERO, tr0
-
-need_resched:
-       ld.l    r6, TI_FLAGS, r7
-       movi    (1 << TIF_NEED_RESCHED), r8
-       and     r8, r7, r8
-       bne     r8, ZERO, tr0
-
-       getcon  SR, r7
-       andi    r7, 0xf0, r7
-       bne     r7, ZERO, tr0
-
-       movi    ((PREEMPT_ACTIVE >> 16) & 65535), r8
-       shori   (PREEMPT_ACTIVE & 65535), r8
-       st.l    r6, TI_PRE_COUNT, r8
-
-       STI()
-       movi    schedule, r7
-       ori     r7, 1, r7
-       ptabs   r7, tr1
-       blink   tr1, LINK
-
-       st.l    r6, TI_PRE_COUNT, ZERO
-       CLI()
-
-       pta     need_resched, tr1
-       blink   tr1, ZERO
-#endif
-
-       .global ret_from_syscall
-ret_from_syscall:
-
-ret_with_reschedule:
-       getcon  KCR0, r6                ! r6 contains current_thread_info
-       ld.l    r6, TI_FLAGS, r7        ! r7 contains current_thread_info->flags
-
-       ! FIXME:!!!
-       ! no handling of TIF_SYSCALL_TRACE yet!!
-
-       movi    (1 << TIF_NEED_RESCHED), r8
-       and     r8, r7, r8
-       pta     work_resched, tr0
-       bne     r8, ZERO, tr0
-
-       pta     restore_all, tr1
-
-       movi    (1 << TIF_SIGPENDING), r8
-       and     r8, r7, r8
-       pta     work_notifysig, tr0
-       bne     r8, ZERO, tr0
-
-       blink   tr1, ZERO
-
-work_resched:
-       pta     ret_from_syscall, tr0
-       gettr   tr0, LINK
-       movi    schedule, r6
-       ptabs   r6, tr0
-       blink   tr0, ZERO               /* Call schedule(), return on top */
-
-work_notifysig:
-       gettr   tr1, LINK
-
-       movi    do_signal, r6
-       ptabs   r6, tr0
-       or      SP, ZERO, r2
-       or      ZERO, ZERO, r3
-       blink   tr0, LINK           /* Call do_signal(regs, 0), return here */
-
-restore_all:
-       /* Do prefetches */
-
-       ld.q    SP, FRAME_T(0), r6
-       ld.q    SP, FRAME_T(1), r7
-       ld.q    SP, FRAME_T(2), r8
-       ld.q    SP, FRAME_T(3), r9
-       ptabs   r6, tr0
-       ptabs   r7, tr1
-       ptabs   r8, tr2
-       ptabs   r9, tr3
-       ld.q    SP, FRAME_T(4), r6
-       ld.q    SP, FRAME_T(5), r7
-       ld.q    SP, FRAME_T(6), r8
-       ld.q    SP, FRAME_T(7), r9
-       ptabs   r6, tr4
-       ptabs   r7, tr5
-       ptabs   r8, tr6
-       ptabs   r9, tr7
-
-       ld.q    SP, FRAME_R(0), r0
-       ld.q    SP, FRAME_R(1), r1
-       ld.q    SP, FRAME_R(2), r2
-       ld.q    SP, FRAME_R(3), r3
-       ld.q    SP, FRAME_R(4), r4
-       ld.q    SP, FRAME_R(5), r5
-       ld.q    SP, FRAME_R(6), r6
-       ld.q    SP, FRAME_R(7), r7
-       ld.q    SP, FRAME_R(8), r8
-       ld.q    SP, FRAME_R(9), r9
-       ld.q    SP, FRAME_R(10), r10
-       ld.q    SP, FRAME_R(11), r11
-       ld.q    SP, FRAME_R(12), r12
-       ld.q    SP, FRAME_R(13), r13
-       ld.q    SP, FRAME_R(14), r14
-
-       ld.q    SP, FRAME_R(16), r16
-       ld.q    SP, FRAME_R(17), r17
-       ld.q    SP, FRAME_R(18), r18
-       ld.q    SP, FRAME_R(19), r19
-       ld.q    SP, FRAME_R(20), r20
-       ld.q    SP, FRAME_R(21), r21
-       ld.q    SP, FRAME_R(22), r22
-       ld.q    SP, FRAME_R(23), r23
-       ld.q    SP, FRAME_R(24), r24
-       ld.q    SP, FRAME_R(25), r25
-       ld.q    SP, FRAME_R(26), r26
-       ld.q    SP, FRAME_R(27), r27
-       ld.q    SP, FRAME_R(28), r28
-       ld.q    SP, FRAME_R(29), r29
-       ld.q    SP, FRAME_R(30), r30
-       ld.q    SP, FRAME_R(31), r31
-       ld.q    SP, FRAME_R(32), r32
-       ld.q    SP, FRAME_R(33), r33
-       ld.q    SP, FRAME_R(34), r34
-       ld.q    SP, FRAME_R(35), r35
-       ld.q    SP, FRAME_R(36), r36
-       ld.q    SP, FRAME_R(37), r37
-       ld.q    SP, FRAME_R(38), r38
-       ld.q    SP, FRAME_R(39), r39
-       ld.q    SP, FRAME_R(40), r40
-       ld.q    SP, FRAME_R(41), r41
-       ld.q    SP, FRAME_R(42), r42
-       ld.q    SP, FRAME_R(43), r43
-       ld.q    SP, FRAME_R(44), r44
-       ld.q    SP, FRAME_R(45), r45
-       ld.q    SP, FRAME_R(46), r46
-       ld.q    SP, FRAME_R(47), r47
-       ld.q    SP, FRAME_R(48), r48
-       ld.q    SP, FRAME_R(49), r49
-       ld.q    SP, FRAME_R(50), r50
-       ld.q    SP, FRAME_R(51), r51
-       ld.q    SP, FRAME_R(52), r52
-       ld.q    SP, FRAME_R(53), r53
-       ld.q    SP, FRAME_R(54), r54
-       ld.q    SP, FRAME_R(55), r55
-       ld.q    SP, FRAME_R(56), r56
-       ld.q    SP, FRAME_R(57), r57
-       ld.q    SP, FRAME_R(58), r58
-
-       getcon  SR, r59
-       movi    SR_BLOCK_EXC, r60
-       or      r59, r60, r59
-       putcon  r59, SR                 /* SR.BL = 1, keep nesting out */
-       ld.q    SP, FRAME_S(FSSR), r61
-       ld.q    SP, FRAME_S(FSPC), r62
-       movi    SR_ASID_MASK, r60
-       and     r59, r60, r59
-       andc    r61, r60, r61           /* Clear out older ASID */
-       or      r59, r61, r61           /* Retain current ASID */
-       putcon  r61, SSR
-       putcon  r62, SPC
-
-       /* Ignore FSYSCALL_ID */
-
-       ld.q    SP, FRAME_R(59), r59
-       ld.q    SP, FRAME_R(60), r60
-       ld.q    SP, FRAME_R(61), r61
-       ld.q    SP, FRAME_R(62), r62
-
-       /* Last touch */
-       ld.q    SP, FRAME_R(15), SP
-       rte
-       nop
-
-/*
- * Third level handlers for VBR-based exceptions. Adapting args to
- * and/or deflecting to fourth level handlers.
- *
- * Fourth level handlers interface.
- * Most are C-coded handlers directly pointed by the trap_jtable.
- * (Third = Fourth level)
- * Inputs:
- * (r2)   fault/interrupt code, entry number (e.g. NMI = 14,
- *       IRL0-3 (0000) = 16, RTLBMISS = 2, SYSCALL = 11, etc ...)
- * (r3)   struct pt_regs *, original register's frame pointer
- * (r4)   Event (0 = interrupt, 1 = TLB miss fault, 2 = Not TLB miss fault)
- * (r5)   TRA control register (for syscall/debug benefit only)
- * (LINK) return address
- * (SP)   = r3
- *
- * Kernel TLB fault handlers will get a slightly different interface.
- * (r2)   struct pt_regs *, original register's frame pointer
- * (r3)   writeaccess, whether it's a store fault as opposed to load fault
- * (r4)   execaccess, whether it's a ITLB fault as opposed to DTLB fault
- * (r5)   Effective Address of fault
- * (LINK) return address
- * (SP)   = r2
- *
- * fpu_error_or_IRQ? is a helper to deflect to the right cause.
- *
- */
-tlb_miss_load:
-       or      SP, ZERO, r2
-       or      ZERO, ZERO, r3          /* Read */
-       or      ZERO, ZERO, r4          /* Data */
-       getcon  TEA, r5
-       pta     call_do_page_fault, tr0
-       beq     ZERO, ZERO, tr0
-
-tlb_miss_store:
-       or      SP, ZERO, r2
-       movi    1, r3                   /* Write */
-       or      ZERO, ZERO, r4          /* Data */
-       getcon  TEA, r5
-       pta     call_do_page_fault, tr0
-       beq     ZERO, ZERO, tr0
-
-itlb_miss_or_IRQ:
-       pta     its_IRQ, tr0
-       beqi/u  r4, EVENT_INTERRUPT, tr0
-       or      SP, ZERO, r2
-       or      ZERO, ZERO, r3          /* Read */
-       movi    1, r4                   /* Text */
-       getcon  TEA, r5
-       /* Fall through */
-
-call_do_page_fault:
-       movi    do_page_fault, r6
-        ptabs  r6, tr0
-        blink  tr0, ZERO
-
-fpu_error_or_IRQA:
-       pta     its_IRQ, tr0
-       beqi/l  r4, EVENT_INTERRUPT, tr0
-#ifndef CONFIG_NOFPU_SUPPORT
-       movi    do_fpu_state_restore, r6
-#else
-       movi    do_exception_error, r6
-#endif
-       ptabs   r6, tr0
-       blink   tr0, ZERO
-
-fpu_error_or_IRQB:
-       pta     its_IRQ, tr0
-       beqi/l  r4, EVENT_INTERRUPT, tr0
-#ifndef CONFIG_NOFPU_SUPPORT
-       movi    do_fpu_state_restore, r6
-#else
-       movi    do_exception_error, r6
-#endif
-       ptabs   r6, tr0
-       blink   tr0, ZERO
-
-its_IRQ:
-       movi    do_IRQ, r6
-       ptabs   r6, tr0
-       blink   tr0, ZERO
-
-/*
- * system_call/unknown_trap third level handler:
- *
- * Inputs:
- * (r2)   fault/interrupt code, entry number (TRAP = 11)
- * (r3)   struct pt_regs *, original register's frame pointer
- * (r4)   Not used. Event (0=interrupt, 1=TLB miss fault, 2=Not TLB miss fault)
- * (r5)   TRA Control Reg (0x00xyzzzz: x=1 SYSCALL, y = #args, z=nr)
- * (SP)   = r3
- * (LINK) return address: ret_from_exception
- * (*r3)  Syscall parms: SC#, arg0, arg1, ..., arg5 in order (Saved r2/r7)
- *
- * Outputs:
- * (*r3)  Syscall reply (Saved r2)
- * (LINK) In case of syscall only it can be scrapped.
- *        Common second level post handler will be ret_from_syscall.
- *        Common (non-trace) exit point to that is syscall_ret (saving
- *        result to r2). Common bad exit point is syscall_bad (returning
- *        ENOSYS then saved to r2).
- *
- */
-
-unknown_trap:
-       /* Unknown Trap or User Trace */
-       movi    do_unknown_trapa, r6
-       ptabs   r6, tr0
-        ld.q    r3, FRAME_R(9), r2     /* r2 = #arg << 16 | syscall # */
-        andi    r2, 0x1ff, r2          /* r2 = syscall # */
-       blink   tr0, LINK
-
-       pta     syscall_ret, tr0
-       blink   tr0, ZERO
-
-        /* New syscall implementation*/
-system_call:
-       pta     unknown_trap, tr0
-        or      r5, ZERO, r4            /* TRA (=r5) -> r4 */
-        shlri   r4, 20, r4
-       bnei    r4, 1, tr0              /* unknown_trap if not 0x1yzzzz */
-
-        /* It's a system call */
-       st.q    r3, FRAME_S(FSYSCALL_ID), r5    /* ID (0x1yzzzz) -> stack */
-       andi    r5, 0x1ff, r5                   /* syscall # -> r5        */
-
-       STI()
-
-       pta     syscall_allowed, tr0
-       movi    NR_syscalls - 1, r4     /* Last valid */
-       bgeu/l  r4, r5, tr0
-
-syscall_bad:
-       /* Return ENOSYS ! */
-       movi    -(ENOSYS), r2           /* Fall-through */
-
-       .global syscall_ret
-syscall_ret:
-       st.q    SP, FRAME_R(9), r2      /* Expecting SP back to BASIC frame */
-
-#if POOR_MANS_STRACE
-       /* nothing useful in registers at this point */
-
-       movi    evt_debug2, r5
-       ori     r5, 1, r5
-       ptabs   r5, tr0
-       ld.q    SP, FRAME_R(9), r2
-       or      SP, ZERO, r3
-       blink   tr0, LINK
-#endif
-
-       ld.q    SP, FRAME_S(FSPC), r2
-       addi    r2, 4, r2               /* Move PC, being pre-execution event */
-       st.q    SP, FRAME_S(FSPC), r2
-       pta     ret_from_syscall, tr0
-       blink   tr0, ZERO
-
-
-/*  A different return path for ret_from_fork, because we now need
- *  to call schedule_tail with the later kernels. Because prev is
- *  loaded into r2 by switch_to() means we can just call it straight  away
- */
-
-.global        ret_from_fork
-ret_from_fork:
-
-       movi    schedule_tail,r5
-       ori     r5, 1, r5
-       ptabs   r5, tr0
-       blink   tr0, LINK
-
-#if POOR_MANS_STRACE
-       /* nothing useful in registers at this point */
-
-       movi    evt_debug2, r5
-       ori     r5, 1, r5
-       ptabs   r5, tr0
-       ld.q    SP, FRAME_R(9), r2
-       or      SP, ZERO, r3
-       blink   tr0, LINK
-#endif
-
-       ld.q    SP, FRAME_S(FSPC), r2
-       addi    r2, 4, r2               /* Move PC, being pre-execution event */
-       st.q    SP, FRAME_S(FSPC), r2
-       pta     ret_from_syscall, tr0
-       blink   tr0, ZERO
-
-
-
-syscall_allowed:
-       /* Use LINK to deflect the exit point, default is syscall_ret */
-       pta     syscall_ret, tr0
-       gettr   tr0, LINK
-       pta     syscall_notrace, tr0
-
-       getcon  KCR0, r2
-       ld.l    r2, TI_FLAGS, r4
-       movi    (1 << TIF_SYSCALL_TRACE), r6
-       and     r6, r4, r6
-       beq/l   r6, ZERO, tr0
-
-       /* Trace it by calling syscall_trace before and after */
-       movi    syscall_trace, r4
-       ptabs   r4, tr0
-       blink   tr0, LINK
-       /* Reload syscall number as r5 is trashed by syscall_trace */
-       ld.q    SP, FRAME_S(FSYSCALL_ID), r5
-       andi    r5, 0x1ff, r5
-
-       pta     syscall_ret_trace, tr0
-       gettr   tr0, LINK
-
-syscall_notrace:
-       /* Now point to the appropriate 4th level syscall handler */
-       movi    sys_call_table, r4
-       shlli   r5, 2, r5
-       ldx.l   r4, r5, r5
-       ptabs   r5, tr0
-
-       /* Prepare original args */
-       ld.q    SP, FRAME_R(2), r2
-       ld.q    SP, FRAME_R(3), r3
-       ld.q    SP, FRAME_R(4), r4
-       ld.q    SP, FRAME_R(5), r5
-       ld.q    SP, FRAME_R(6), r6
-       ld.q    SP, FRAME_R(7), r7
-
-       /* And now the trick for those syscalls requiring regs * ! */
-       or      SP, ZERO, r8
-
-       /* Call it */
-       blink   tr0, ZERO       /* LINK is already properly set */
-
-syscall_ret_trace:
-       /* We get back here only if under trace */
-       st.q    SP, FRAME_R(9), r2      /* Save return value */
-
-       movi    syscall_trace, LINK
-       ptabs   LINK, tr0
-       blink   tr0, LINK
-
-       /* This needs to be done after any syscall tracing */
-       ld.q    SP, FRAME_S(FSPC), r2
-       addi    r2, 4, r2       /* Move PC, being pre-execution event */
-       st.q    SP, FRAME_S(FSPC), r2
-
-       pta     ret_from_syscall, tr0
-       blink   tr0, ZERO               /* Resume normal return sequence */
-
-/*
- * --- Switch to running under a particular ASID and return the previous ASID value
- * --- The caller is assumed to have done a cli before calling this.
- *
- * Input r2 : new ASID
- * Output r2 : old ASID
- */
-
-       .global switch_and_save_asid
-switch_and_save_asid:
-       getcon  sr, r0
-       movi    255, r4
-       shlli   r4, 16, r4      /* r4 = mask to select ASID */
-       and     r0, r4, r3      /* r3 = shifted old ASID */
-       andi    r2, 255, r2     /* mask down new ASID */
-       shlli   r2, 16, r2      /* align new ASID against SR.ASID */
-       andc    r0, r4, r0      /* efface old ASID from SR */
-       or      r0, r2, r0      /* insert the new ASID */
-       putcon  r0, ssr
-       movi    1f, r0
-       putcon  r0, spc
-       rte
-       nop
-1:
-       ptabs   LINK, tr0
-       shlri   r3, 16, r2      /* r2 = old ASID */
-       blink tr0, r63
-
-       .global route_to_panic_handler
-route_to_panic_handler:
-       /* Switch to real mode, goto panic_handler, don't return.  Useful for
-          last-chance debugging, e.g. if no output wants to go to the console.
-          */
-
-       movi    panic_handler - CONFIG_CACHED_MEMORY_OFFSET, r1
-       ptabs   r1, tr0
-       pta     1f, tr1
-       gettr   tr1, r0
-       putcon  r0, spc
-       getcon  sr, r0
-       movi    1, r1
-       shlli   r1, 31, r1
-       andc    r0, r1, r0
-       putcon  r0, ssr
-       rte
-       nop
-1:     /* Now in real mode */
-       blink tr0, r63
-       nop
-
-       .global peek_real_address_q
-peek_real_address_q:
-       /* Two args:
-          r2 : real mode address to peek
-          r2(out) : result quadword
-
-          This is provided as a cheapskate way of manipulating device
-          registers for debugging (to avoid the need to onchip_remap the debug
-          module, and to avoid the need to onchip_remap the watchpoint
-          controller in a way that identity maps sufficient bits to avoid the
-          SH5-101 cut2 silicon defect).
-
-          This code is not performance critical
-       */
-
-       add.l   r2, r63, r2     /* sign extend address */
-       getcon  sr, r0          /* r0 = saved original SR */
-       movi    1, r1
-       shlli   r1, 28, r1
-       or      r0, r1, r1      /* r0 with block bit set */
-       putcon  r1, sr          /* now in critical section */
-       movi    1, r36
-       shlli   r36, 31, r36
-       andc    r1, r36, r1     /* turn sr.mmu off in real mode section */
-
-       putcon  r1, ssr
-       movi    .peek0 - CONFIG_CACHED_MEMORY_OFFSET, r36 /* real mode target address */
-       movi    1f, r37         /* virtual mode return addr */
-       putcon  r36, spc
-
-       synco
-       rte
-       nop
-
-.peek0:        /* come here in real mode, don't touch caches!!
-           still in critical section (sr.bl==1) */
-       putcon  r0, ssr
-       putcon  r37, spc
-       /* Here's the actual peek.  If the address is bad, all bets are now off
-        * what will happen (handlers invoked in real-mode = bad news) */
-       ld.q    r2, 0, r2
-       synco
-       rte     /* Back to virtual mode */
-       nop
-
-1:
-       ptabs   LINK, tr0
-       blink   tr0, r63
-
-       .global poke_real_address_q
-poke_real_address_q:
-       /* Two args:
-          r2 : real mode address to poke
-          r3 : quadword value to write.
-
-          This is provided as a cheapskate way of manipulating device
-          registers for debugging (to avoid the need to onchip_remap the debug
-          module, and to avoid the need to onchip_remap the watchpoint
-          controller in a way that identity maps sufficient bits to avoid the
-          SH5-101 cut2 silicon defect).
-
-          This code is not performance critical
-       */
-
-       add.l   r2, r63, r2     /* sign extend address */
-       getcon  sr, r0          /* r0 = saved original SR */
-       movi    1, r1
-       shlli   r1, 28, r1
-       or      r0, r1, r1      /* r0 with block bit set */
-       putcon  r1, sr          /* now in critical section */
-       movi    1, r36
-       shlli   r36, 31, r36
-       andc    r1, r36, r1     /* turn sr.mmu off in real mode section */
-
-       putcon  r1, ssr
-       movi    .poke0-CONFIG_CACHED_MEMORY_OFFSET, r36 /* real mode target address */
-       movi    1f, r37         /* virtual mode return addr */
-       putcon  r36, spc
-
-       synco
-       rte
-       nop
-
-.poke0:        /* come here in real mode, don't touch caches!!
-           still in critical section (sr.bl==1) */
-       putcon  r0, ssr
-       putcon  r37, spc
-       /* Here's the actual poke.  If the address is bad, all bets are now off
-        * what will happen (handlers invoked in real-mode = bad news) */
-       st.q    r2, 0, r3
-       synco
-       rte     /* Back to virtual mode */
-       nop
-
-1:
-       ptabs   LINK, tr0
-       blink   tr0, r63
-
-/*
- * --- User Access Handling Section
- */
-
-/*
- * User Access support. It all moved to non inlined Assembler
- * functions in here.
- *
- * __kernel_size_t __copy_user(void *__to, const void *__from,
- *                            __kernel_size_t __n)
- *
- * Inputs:
- * (r2)  target address
- * (r3)  source address
- * (r4)  size in bytes
- *
- * Ouputs:
- * (*r2) target data
- * (r2)  non-copied bytes
- *
- * If a fault occurs on the user pointer, bail out early and return the
- * number of bytes not copied in r2.
- * Strategy : for large blocks, call a real memcpy function which can
- * move >1 byte at a time using unaligned ld/st instructions, and can
- * manipulate the cache using prefetch + alloco to improve the speed
- * further.  If a fault occurs in that function, just revert to the
- * byte-by-byte approach used for small blocks; this is rare so the
- * performance hit for that case does not matter.
- *
- * For small blocks it's not worth the overhead of setting up and calling
- * the memcpy routine; do the copy a byte at a time.
- *
- */
-       .global __copy_user
-__copy_user:
-       pta     __copy_user_byte_by_byte, tr1
-       movi    16, r0 ! this value is a best guess, should tune it by benchmarking
-       bge/u   r0, r4, tr1
-       pta copy_user_memcpy, tr0
-       addi    SP, -32, SP
-       /* Save arguments in case we have to fix-up unhandled page fault */
-       st.q    SP, 0, r2
-       st.q    SP, 8, r3
-       st.q    SP, 16, r4
-       st.q    SP, 24, r35 ! r35 is callee-save
-       /* Save LINK in a register to reduce RTS time later (otherwise
-          ld SP,*,LINK;ptabs LINK;trn;blink trn,r63 becomes a critical path) */
-       ori     LINK, 0, r35
-       blink   tr0, LINK
-
-       /* Copy completed normally if we get back here */
-       ptabs   r35, tr0
-       ld.q    SP, 24, r35
-       /* don't restore r2-r4, pointless */
-       /* set result=r2 to zero as the copy must have succeeded. */
-       or      r63, r63, r2
-       addi    SP, 32, SP
-       blink   tr0, r63 ! RTS
-
-       .global __copy_user_fixup
-__copy_user_fixup:
-       /* Restore stack frame */
-       ori     r35, 0, LINK
-       ld.q    SP, 24, r35
-       ld.q    SP, 16, r4
-       ld.q    SP,  8, r3
-       ld.q    SP,  0, r2
-       addi    SP, 32, SP
-       /* Fall through to original code, in the 'same' state we entered with */
-
-/* The slow byte-by-byte method is used if the fast copy traps due to a bad
-   user address.  In that rare case, the speed drop can be tolerated. */
-__copy_user_byte_by_byte:
-       pta     ___copy_user_exit, tr1
-       pta     ___copy_user1, tr0
-       beq/u   r4, r63, tr1    /* early exit for zero length copy */
-       sub     r2, r3, r0
-       addi    r0, -1, r0
-
-___copy_user1:
-       ld.b    r3, 0, r5               /* Fault address 1 */
-
-       /* Could rewrite this to use just 1 add, but the second comes 'free'
-          due to load latency */
-       addi    r3, 1, r3
-       addi    r4, -1, r4              /* No real fixup required */
-___copy_user2:
-       stx.b   r3, r0, r5              /* Fault address 2 */
-       bne     r4, ZERO, tr0
-
-___copy_user_exit:
-       or      r4, ZERO, r2
-       ptabs   LINK, tr0
-       blink   tr0, ZERO
-
-/*
- * __kernel_size_t __clear_user(void *addr, __kernel_size_t size)
- *
- * Inputs:
- * (r2)  target address
- * (r3)  size in bytes
- *
- * Ouputs:
- * (*r2) zero-ed target data
- * (r2)  non-zero-ed bytes
- */
-       .global __clear_user
-__clear_user:
-       pta     ___clear_user_exit, tr1
-       pta     ___clear_user1, tr0
-       beq/u   r3, r63, tr1
-
-___clear_user1:
-       st.b    r2, 0, ZERO             /* Fault address */
-       addi    r2, 1, r2
-       addi    r3, -1, r3              /* No real fixup required */
-       bne     r3, ZERO, tr0
-
-___clear_user_exit:
-       or      r3, ZERO, r2
-       ptabs   LINK, tr0
-       blink   tr0, ZERO
-
-
-/*
- * int __strncpy_from_user(unsigned long __dest, unsigned long __src,
- *                        int __count)
- *
- * Inputs:
- * (r2)  target address
- * (r3)  source address
- * (r4)  maximum size in bytes
- *
- * Ouputs:
- * (*r2) copied data
- * (r2)  -EFAULT (in case of faulting)
- *       copied data (otherwise)
- */
-       .global __strncpy_from_user
-__strncpy_from_user:
-       pta     ___strncpy_from_user1, tr0
-       pta     ___strncpy_from_user_done, tr1
-       or      r4, ZERO, r5            /* r5 = original count */
-       beq/u   r4, r63, tr1            /* early exit if r4==0 */
-       movi    -(EFAULT), r6           /* r6 = reply, no real fixup */
-       or      ZERO, ZERO, r7          /* r7 = data, clear top byte of data */
-
-___strncpy_from_user1:
-       ld.b    r3, 0, r7               /* Fault address: only in reading */
-       st.b    r2, 0, r7
-       addi    r2, 1, r2
-       addi    r3, 1, r3
-       beq/u   ZERO, r7, tr1
-       addi    r4, -1, r4              /* return real number of copied bytes */
-       bne/l   ZERO, r4, tr0
-
-___strncpy_from_user_done:
-       sub     r5, r4, r6              /* If done, return copied */
-
-___strncpy_from_user_exit:
-       or      r6, ZERO, r2
-       ptabs   LINK, tr0
-       blink   tr0, ZERO
-
-/*
- * extern long __strnlen_user(const char *__s, long __n)
- *
- * Inputs:
- * (r2)  source address
- * (r3)  source size in bytes
- *
- * Ouputs:
- * (r2)  -EFAULT (in case of faulting)
- *       string length (otherwise)
- */
-       .global __strnlen_user
-__strnlen_user:
-       pta     ___strnlen_user_set_reply, tr0
-       pta     ___strnlen_user1, tr1
-       or      ZERO, ZERO, r5          /* r5 = counter */
-       movi    -(EFAULT), r6           /* r6 = reply, no real fixup */
-       or      ZERO, ZERO, r7          /* r7 = data, clear top byte of data */
-       beq     r3, ZERO, tr0
-
-___strnlen_user1:
-       ldx.b   r2, r5, r7              /* Fault address: only in reading */
-       addi    r3, -1, r3              /* No real fixup */
-       addi    r5, 1, r5
-       beq     r3, ZERO, tr0
-       bne     r7, ZERO, tr1
-! The line below used to be active.  This meant led to a junk byte lying between each pair
-! of entries in the argv & envp structures in memory.  Whilst the program saw the right data
-! via the argv and envp arguments to main, it meant the 'flat' representation visible through
-! /proc/$pid/cmdline was corrupt, causing trouble with ps, for example.
-!      addi    r5, 1, r5               /* Include '\0' */
-
-___strnlen_user_set_reply:
-       or      r5, ZERO, r6            /* If done, return counter */
-
-___strnlen_user_exit:
-       or      r6, ZERO, r2
-       ptabs   LINK, tr0
-       blink   tr0, ZERO
-
-/*
- * extern long __get_user_asm_?(void *val, long addr)
- *
- * Inputs:
- * (r2)  dest address
- * (r3)  source address (in User Space)
- *
- * Ouputs:
- * (r2)  -EFAULT (faulting)
- *       0      (not faulting)
- */
-       .global __get_user_asm_b
-__get_user_asm_b:
-       or      r2, ZERO, r4
-       movi    -(EFAULT), r2           /* r2 = reply, no real fixup */
-
-___get_user_asm_b1:
-       ld.b    r3, 0, r5               /* r5 = data */
-       st.b    r4, 0, r5
-       or      ZERO, ZERO, r2
-
-___get_user_asm_b_exit:
-       ptabs   LINK, tr0
-       blink   tr0, ZERO
-
-
-       .global __get_user_asm_w
-__get_user_asm_w:
-       or      r2, ZERO, r4
-       movi    -(EFAULT), r2           /* r2 = reply, no real fixup */
-
-___get_user_asm_w1:
-       ld.w    r3, 0, r5               /* r5 = data */
-       st.w    r4, 0, r5
-       or      ZERO, ZERO, r2
-
-___get_user_asm_w_exit:
-       ptabs   LINK, tr0
-       blink   tr0, ZERO
-
-
-       .global __get_user_asm_l
-__get_user_asm_l:
-       or      r2, ZERO, r4
-       movi    -(EFAULT), r2           /* r2 = reply, no real fixup */
-
-___get_user_asm_l1:
-       ld.l    r3, 0, r5               /* r5 = data */
-       st.l    r4, 0, r5
-       or      ZERO, ZERO, r2
-
-___get_user_asm_l_exit:
-       ptabs   LINK, tr0
-       blink   tr0, ZERO
-
-
-       .global __get_user_asm_q
-__get_user_asm_q:
-       or      r2, ZERO, r4
-       movi    -(EFAULT), r2           /* r2 = reply, no real fixup */
-
-___get_user_asm_q1:
-       ld.q    r3, 0, r5               /* r5 = data */
-       st.q    r4, 0, r5
-       or      ZERO, ZERO, r2
-
-___get_user_asm_q_exit:
-       ptabs   LINK, tr0
-       blink   tr0, ZERO
-
-/*
- * extern long __put_user_asm_?(void *pval, long addr)
- *
- * Inputs:
- * (r2)  kernel pointer to value
- * (r3)  dest address (in User Space)
- *
- * Ouputs:
- * (r2)  -EFAULT (faulting)
- *       0      (not faulting)
- */
-       .global __put_user_asm_b
-__put_user_asm_b:
-       ld.b    r2, 0, r4               /* r4 = data */
-       movi    -(EFAULT), r2           /* r2 = reply, no real fixup */
-
-___put_user_asm_b1:
-       st.b    r3, 0, r4
-       or      ZERO, ZERO, r2
-
-___put_user_asm_b_exit:
-       ptabs   LINK, tr0
-       blink   tr0, ZERO
-
-
-       .global __put_user_asm_w
-__put_user_asm_w:
-       ld.w    r2, 0, r4               /* r4 = data */
-       movi    -(EFAULT), r2           /* r2 = reply, no real fixup */
-
-___put_user_asm_w1:
-       st.w    r3, 0, r4
-       or      ZERO, ZERO, r2
-
-___put_user_asm_w_exit:
-       ptabs   LINK, tr0
-       blink   tr0, ZERO
-
-
-       .global __put_user_asm_l
-__put_user_asm_l:
-       ld.l    r2, 0, r4               /* r4 = data */
-       movi    -(EFAULT), r2           /* r2 = reply, no real fixup */
-
-___put_user_asm_l1:
-       st.l    r3, 0, r4
-       or      ZERO, ZERO, r2
-
-___put_user_asm_l_exit:
-       ptabs   LINK, tr0
-       blink   tr0, ZERO
-
-
-       .global __put_user_asm_q
-__put_user_asm_q:
-       ld.q    r2, 0, r4               /* r4 = data */
-       movi    -(EFAULT), r2           /* r2 = reply, no real fixup */
-
-___put_user_asm_q1:
-       st.q    r3, 0, r4
-       or      ZERO, ZERO, r2
-
-___put_user_asm_q_exit:
-       ptabs   LINK, tr0
-       blink   tr0, ZERO
-
-panic_stash_regs:
-       /* The idea is : when we get an unhandled panic, we dump the registers
-          to a known memory location, the just sit in a tight loop.
-          This allows the human to look at the memory region through the GDB
-          session (assuming the debug module's SHwy initiator isn't locked up
-          or anything), to hopefully analyze the cause of the panic. */
-
-       /* On entry, former r15 (SP) is in DCR
-          former r0  is at resvec_saved_area + 0
-          former r1  is at resvec_saved_area + 8
-          former tr0 is at resvec_saved_area + 32
-          DCR is the only register whose value is lost altogether.
-       */
-
-       movi    0xffffffff80000000, r0 ! phy of dump area
-       ld.q    SP, 0x000, r1   ! former r0
-       st.q    r0,  0x000, r1
-       ld.q    SP, 0x008, r1   ! former r1
-       st.q    r0,  0x008, r1
-       st.q    r0,  0x010, r2
-       st.q    r0,  0x018, r3
-       st.q    r0,  0x020, r4
-       st.q    r0,  0x028, r5
-       st.q    r0,  0x030, r6
-       st.q    r0,  0x038, r7
-       st.q    r0,  0x040, r8
-       st.q    r0,  0x048, r9
-       st.q    r0,  0x050, r10
-       st.q    r0,  0x058, r11
-       st.q    r0,  0x060, r12
-       st.q    r0,  0x068, r13
-       st.q    r0,  0x070, r14
-       getcon  dcr, r14
-       st.q    r0,  0x078, r14
-       st.q    r0,  0x080, r16
-       st.q    r0,  0x088, r17
-       st.q    r0,  0x090, r18
-       st.q    r0,  0x098, r19
-       st.q    r0,  0x0a0, r20
-       st.q    r0,  0x0a8, r21
-       st.q    r0,  0x0b0, r22
-       st.q    r0,  0x0b8, r23
-       st.q    r0,  0x0c0, r24
-       st.q    r0,  0x0c8, r25
-       st.q    r0,  0x0d0, r26
-       st.q    r0,  0x0d8, r27
-       st.q    r0,  0x0e0, r28
-       st.q    r0,  0x0e8, r29
-       st.q    r0,  0x0f0, r30
-       st.q    r0,  0x0f8, r31
-       st.q    r0,  0x100, r32
-       st.q    r0,  0x108, r33
-       st.q    r0,  0x110, r34
-       st.q    r0,  0x118, r35
-       st.q    r0,  0x120, r36
-       st.q    r0,  0x128, r37
-       st.q    r0,  0x130, r38
-       st.q    r0,  0x138, r39
-       st.q    r0,  0x140, r40
-       st.q    r0,  0x148, r41
-       st.q    r0,  0x150, r42
-       st.q    r0,  0x158, r43
-       st.q    r0,  0x160, r44
-       st.q    r0,  0x168, r45
-       st.q    r0,  0x170, r46
-       st.q    r0,  0x178, r47
-       st.q    r0,  0x180, r48
-       st.q    r0,  0x188, r49
-       st.q    r0,  0x190, r50
-       st.q    r0,  0x198, r51
-       st.q    r0,  0x1a0, r52
-       st.q    r0,  0x1a8, r53
-       st.q    r0,  0x1b0, r54
-       st.q    r0,  0x1b8, r55
-       st.q    r0,  0x1c0, r56
-       st.q    r0,  0x1c8, r57
-       st.q    r0,  0x1d0, r58
-       st.q    r0,  0x1d8, r59
-       st.q    r0,  0x1e0, r60
-       st.q    r0,  0x1e8, r61
-       st.q    r0,  0x1f0, r62
-       st.q    r0,  0x1f8, r63 ! bogus, but for consistency's sake...
-
-       ld.q    SP, 0x020, r1  ! former tr0
-       st.q    r0,  0x200, r1
-       gettr   tr1, r1
-       st.q    r0,  0x208, r1
-       gettr   tr2, r1
-       st.q    r0,  0x210, r1
-       gettr   tr3, r1
-       st.q    r0,  0x218, r1
-       gettr   tr4, r1
-       st.q    r0,  0x220, r1
-       gettr   tr5, r1
-       st.q    r0,  0x228, r1
-       gettr   tr6, r1
-       st.q    r0,  0x230, r1
-       gettr   tr7, r1
-       st.q    r0,  0x238, r1
-
-       getcon  sr,  r1
-       getcon  ssr,  r2
-       getcon  pssr,  r3
-       getcon  spc,  r4
-       getcon  pspc,  r5
-       getcon  intevt,  r6
-       getcon  expevt,  r7
-       getcon  pexpevt,  r8
-       getcon  tra,  r9
-       getcon  tea,  r10
-       getcon  kcr0, r11
-       getcon  kcr1, r12
-       getcon  vbr,  r13
-       getcon  resvec,  r14
-
-       st.q    r0,  0x240, r1
-       st.q    r0,  0x248, r2
-       st.q    r0,  0x250, r3
-       st.q    r0,  0x258, r4
-       st.q    r0,  0x260, r5
-       st.q    r0,  0x268, r6
-       st.q    r0,  0x270, r7
-       st.q    r0,  0x278, r8
-       st.q    r0,  0x280, r9
-       st.q    r0,  0x288, r10
-       st.q    r0,  0x290, r11
-       st.q    r0,  0x298, r12
-       st.q    r0,  0x2a0, r13
-       st.q    r0,  0x2a8, r14
-
-       getcon  SPC,r2
-       getcon  SSR,r3
-       getcon  EXPEVT,r4
-       /* Prepare to jump to C - physical address */
-       movi    panic_handler-CONFIG_CACHED_MEMORY_OFFSET, r1
-       ori     r1, 1, r1
-       ptabs   r1, tr0
-       getcon  DCR, SP
-       blink   tr0, ZERO
-       nop
-       nop
-       nop
-       nop
-
-
-
-
-/*
- * --- Signal Handling Section
- */
-
-/*
- * extern long long _sa_default_rt_restorer
- * extern long long _sa_default_restorer
- *
- *              or, better,
- *
- * extern void _sa_default_rt_restorer(void)
- * extern void _sa_default_restorer(void)
- *
- * Code prototypes to do a sys_rt_sigreturn() or sys_sysreturn()
- * from user space. Copied into user space by signal management.
- * Both must be quad aligned and 2 quad long (4 instructions).
- *
- */
-       .balign 8
-       .global sa_default_rt_restorer
-sa_default_rt_restorer:
-       movi    0x10, r9
-       shori   __NR_rt_sigreturn, r9
-       trapa   r9
-       nop
-
-       .balign 8
-       .global sa_default_restorer
-sa_default_restorer:
-       movi    0x10, r9
-       shori   __NR_sigreturn, r9
-       trapa   r9
-       nop
-
-/*
- * --- __ex_table Section
- */
-
-/*
- * User Access Exception Table.
- */
-       .section        __ex_table,  "a"
-
-       .global asm_uaccess_start       /* Just a marker */
-asm_uaccess_start:
-
-       .long   ___copy_user1, ___copy_user_exit
-       .long   ___copy_user2, ___copy_user_exit
-       .long   ___clear_user1, ___clear_user_exit
-       .long   ___strncpy_from_user1, ___strncpy_from_user_exit
-       .long   ___strnlen_user1, ___strnlen_user_exit
-       .long   ___get_user_asm_b1, ___get_user_asm_b_exit
-       .long   ___get_user_asm_w1, ___get_user_asm_w_exit
-       .long   ___get_user_asm_l1, ___get_user_asm_l_exit
-       .long   ___get_user_asm_q1, ___get_user_asm_q_exit
-       .long   ___put_user_asm_b1, ___put_user_asm_b_exit
-       .long   ___put_user_asm_w1, ___put_user_asm_w_exit
-       .long   ___put_user_asm_l1, ___put_user_asm_l_exit
-       .long   ___put_user_asm_q1, ___put_user_asm_q_exit
-
-       .global asm_uaccess_end         /* Just a marker */
-asm_uaccess_end:
-
-
-
-
-/*
- * --- .text.init Section
- */
-
-       .section        .text.init, "ax"
-
-/*
- * void trap_init (void)
- *
- */
-       .global trap_init
-trap_init:
-       addi    SP, -24, SP                     /* Room to save r28/r29/r30 */
-       st.q    SP, 0, r28
-       st.q    SP, 8, r29
-       st.q    SP, 16, r30
-
-       /* Set VBR and RESVEC */
-       movi    LVBR_block, r19
-       andi    r19, -4, r19                    /* reset MMUOFF + reserved */
-       /* For RESVEC exceptions we force the MMU off, which means we need the
-          physical address. */
-       movi    LRESVEC_block-CONFIG_CACHED_MEMORY_OFFSET, r20
-       andi    r20, -4, r20                    /* reset reserved */
-       ori     r20, 1, r20                     /* set MMUOFF */
-       putcon  r19, VBR
-       putcon  r20, RESVEC
-
-       /* Sanity check */
-       movi    LVBR_block_end, r21
-       andi    r21, -4, r21
-       movi    BLOCK_SIZE, r29                 /* r29 = expected size */
-       or      r19, ZERO, r30
-       add     r19, r29, r19
-
-       /*
-        * Ugly, but better loop forever now than crash afterwards.
-        * We should print a message, but if we touch LVBR or
-        * LRESVEC blocks we should not be surprised if we get stuck
-        * in trap_init().
-        */
-       pta     trap_init_loop, tr1
-       gettr   tr1, r28                        /* r28 = trap_init_loop */
-       sub     r21, r30, r30                   /* r30 = actual size */
-
-       /*
-        * VBR/RESVEC handlers overlap by being bigger than
-        * allowed. Very bad. Just loop forever.
-        * (r28) panic/loop address
-        * (r29) expected size
-        * (r30) actual size
-        */
-trap_init_loop:
-       bne     r19, r21, tr1
-
-       /* Now that exception vectors are set up reset SR.BL */
-       getcon  SR, r22
-       movi    SR_UNBLOCK_EXC, r23
-       and     r22, r23, r22
-       putcon  r22, SR
-
-       addi    SP, 24, SP
-       ptabs   LINK, tr0
-       blink   tr0, ZERO
-
diff --git a/arch/sh64/kernel/fpu.c b/arch/sh64/kernel/fpu.c
deleted file mode 100644 (file)
index 175c88a..0000000
+++ /dev/null
@@ -1,170 +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.
- *
- * arch/sh64/kernel/fpu.c
- *
- * Copyright (C) 2001  Manuela Cirronis, Paolo Alberelli
- * Copyright (C) 2002  STMicroelectronics Limited
- *   Author : Stuart Menefy
- *
- * Started from SH4 version:
- *   Copyright (C) 1999, 2000  Kaz Kojima & Niibe Yutaka
- *
- */
-
-#include <linux/sched.h>
-#include <linux/signal.h>
-#include <asm/processor.h>
-#include <asm/user.h>
-#include <asm/io.h>
-
-/*
- * Initially load the FPU with signalling NANS.  This bit pattern
- * has the property that no matter whether considered as single or as
- * double precision, it still represents a signalling NAN.
- */
-#define sNAN64         0xFFFFFFFFFFFFFFFFULL
-#define sNAN32         0xFFFFFFFFUL
-
-static union sh_fpu_union init_fpuregs = {
-       .hard = {
-         .fp_regs = { [0 ... 63] = sNAN32 },
-         .fpscr = FPSCR_INIT
-       }
-};
-
-inline void fpsave(struct sh_fpu_hard_struct *fpregs)
-{
-       asm volatile("fst.p     %0, (0*8), fp0\n\t"
-                    "fst.p     %0, (1*8), fp2\n\t"
-                    "fst.p     %0, (2*8), fp4\n\t"
-                    "fst.p     %0, (3*8), fp6\n\t"
-                    "fst.p     %0, (4*8), fp8\n\t"
-                    "fst.p     %0, (5*8), fp10\n\t"
-                    "fst.p     %0, (6*8), fp12\n\t"
-                    "fst.p     %0, (7*8), fp14\n\t"
-                    "fst.p     %0, (8*8), fp16\n\t"
-                    "fst.p     %0, (9*8), fp18\n\t"
-                    "fst.p     %0, (10*8), fp20\n\t"
-                    "fst.p     %0, (11*8), fp22\n\t"
-                    "fst.p     %0, (12*8), fp24\n\t"
-                    "fst.p     %0, (13*8), fp26\n\t"
-                    "fst.p     %0, (14*8), fp28\n\t"
-                    "fst.p     %0, (15*8), fp30\n\t"
-                    "fst.p     %0, (16*8), fp32\n\t"
-                    "fst.p     %0, (17*8), fp34\n\t"
-                    "fst.p     %0, (18*8), fp36\n\t"
-                    "fst.p     %0, (19*8), fp38\n\t"
-                    "fst.p     %0, (20*8), fp40\n\t"
-                    "fst.p     %0, (21*8), fp42\n\t"
-                    "fst.p     %0, (22*8), fp44\n\t"
-                    "fst.p     %0, (23*8), fp46\n\t"
-                    "fst.p     %0, (24*8), fp48\n\t"
-                    "fst.p     %0, (25*8), fp50\n\t"
-                    "fst.p     %0, (26*8), fp52\n\t"
-                    "fst.p     %0, (27*8), fp54\n\t"
-                    "fst.p     %0, (28*8), fp56\n\t"
-                    "fst.p     %0, (29*8), fp58\n\t"
-                    "fst.p     %0, (30*8), fp60\n\t"
-                    "fst.p     %0, (31*8), fp62\n\t"
-
-                    "fgetscr   fr63\n\t"
-                    "fst.s     %0, (32*8), fr63\n\t"
-               : /* no output */
-               : "r" (fpregs)
-               : "memory");
-}
-
-
-static inline void
-fpload(struct sh_fpu_hard_struct *fpregs)
-{
-       asm volatile("fld.p     %0, (0*8), fp0\n\t"
-                    "fld.p     %0, (1*8), fp2\n\t"
-                    "fld.p     %0, (2*8), fp4\n\t"
-                    "fld.p     %0, (3*8), fp6\n\t"
-                    "fld.p     %0, (4*8), fp8\n\t"
-                    "fld.p     %0, (5*8), fp10\n\t"
-                    "fld.p     %0, (6*8), fp12\n\t"
-                    "fld.p     %0, (7*8), fp14\n\t"
-                    "fld.p     %0, (8*8), fp16\n\t"
-                    "fld.p     %0, (9*8), fp18\n\t"
-                    "fld.p     %0, (10*8), fp20\n\t"
-                    "fld.p     %0, (11*8), fp22\n\t"
-                    "fld.p     %0, (12*8), fp24\n\t"
-                    "fld.p     %0, (13*8), fp26\n\t"
-                    "fld.p     %0, (14*8), fp28\n\t"
-                    "fld.p     %0, (15*8), fp30\n\t"
-                    "fld.p     %0, (16*8), fp32\n\t"
-                    "fld.p     %0, (17*8), fp34\n\t"
-                    "fld.p     %0, (18*8), fp36\n\t"
-                    "fld.p     %0, (19*8), fp38\n\t"
-                    "fld.p     %0, (20*8), fp40\n\t"
-                    "fld.p     %0, (21*8), fp42\n\t"
-                    "fld.p     %0, (22*8), fp44\n\t"
-                    "fld.p     %0, (23*8), fp46\n\t"
-                    "fld.p     %0, (24*8), fp48\n\t"
-                    "fld.p     %0, (25*8), fp50\n\t"
-                    "fld.p     %0, (26*8), fp52\n\t"
-                    "fld.p     %0, (27*8), fp54\n\t"
-                    "fld.p     %0, (28*8), fp56\n\t"
-                    "fld.p     %0, (29*8), fp58\n\t"
-                    "fld.p     %0, (30*8), fp60\n\t"
-
-                    "fld.s     %0, (32*8), fr63\n\t"
-                    "fputscr   fr63\n\t"
-
-                    "fld.p     %0, (31*8), fp62\n\t"
-               : /* no output */
-               : "r" (fpregs) );
-}
-
-void fpinit(struct sh_fpu_hard_struct *fpregs)
-{
-       *fpregs = init_fpuregs.hard;
-}
-
-asmlinkage void
-do_fpu_error(unsigned long ex, struct pt_regs *regs)
-{
-       struct task_struct *tsk = current;
-
-       regs->pc += 4;
-
-       tsk->thread.trap_no = 11;
-       tsk->thread.error_code = 0;
-       force_sig(SIGFPE, tsk);
-}
-
-
-asmlinkage void
-do_fpu_state_restore(unsigned long ex, struct pt_regs *regs)
-{
-       void die(const char *str, struct pt_regs *regs, long err);
-
-       if (! user_mode(regs))
-               die("FPU used in kernel", regs, ex);
-
-       regs->sr &= ~SR_FD;
-
-       if (last_task_used_math == current)
-               return;
-
-       grab_fpu();
-       if (last_task_used_math != NULL) {
-               /* Other processes fpu state, save away */
-               fpsave(&last_task_used_math->thread.fpu.hard);
-        }
-        last_task_used_math = current;
-        if (current->used_math) {
-                fpload(&current->thread.fpu.hard);
-        } else {
-               /* First time FPU user.  */
-               fpload(&init_fpuregs.hard);
-                current->used_math = 1;
-        }
-       release_fpu();
-}
-
diff --git a/arch/sh64/kernel/head.S b/arch/sh64/kernel/head.S
deleted file mode 100644 (file)
index 667aef4..0000000
+++ /dev/null
@@ -1,373 +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.
- *
- * arch/sh64/kernel/head.S
- *
- * Copyright (C) 2000, 2001  Paolo Alberelli
- * Copyright (C) 2003, 2004  Paul Mundt
- *
- *
- * benedict.gaster@superh.com:  2nd May 2002
- *    Moved definition of empty_zero_page to its own section allowing
- *    it to be placed at an absolute address known at load time.
- *
- * lethal@linux-sh.org:          9th May 2003
- *    Kill off GLOBAL_NAME() usage.
- *
- * lethal@linux-sh.org:          8th May 2004
- *    Add early SCIF console DTLB mapping.
- */
-
-#include <linux/config.h>
-
-#include <asm/page.h>
-#include <asm/mmu_context.h>
-#include <asm/cache.h>
-#include <asm/tlb.h>
-#include <asm/processor.h>
-#include <asm/registers.h>
-#include <asm/thread_info.h>
-
-/*
- * MMU defines: TLB boundaries.
- */
-
-#define MMUIR_FIRST    ITLB_FIXED
-#define MMUIR_END      ITLB_LAST_VAR_UNRESTRICTED+TLB_STEP
-#define MMUIR_STEP     TLB_STEP
-
-#define MMUDR_FIRST    DTLB_FIXED
-#define MMUDR_END      DTLB_LAST_VAR_UNRESTRICTED+TLB_STEP
-#define MMUDR_STEP     TLB_STEP
-
-/* Safety check : CONFIG_CACHED_MEMORY_OFFSET has to be a multiple of 512Mb */
-#if (CONFIG_CACHED_MEMORY_OFFSET & ((1UL<<29)-1))
-#error "CONFIG_CACHED_MEMORY_OFFSET must be a multiple of 512Mb"
-#endif
-
-/*
- * MMU defines: Fixed TLBs.
- */
-/* Deal safely with the case where the base of RAM is not 512Mb aligned */
-
-#define ALIGN_512M_MASK (0xffffffffe0000000)
-#define ALIGNED_EFFECTIVE ((CONFIG_CACHED_MEMORY_OFFSET + CONFIG_MEMORY_START) & ALIGN_512M_MASK)
-#define ALIGNED_PHYSICAL (CONFIG_MEMORY_START & ALIGN_512M_MASK)
-
-#define MMUIR_TEXT_H   (0x0000000000000003 | ALIGNED_EFFECTIVE)
-                       /* Enabled, Shared, ASID 0, Eff. Add. 0xA0000000 */
-
-#define MMUIR_TEXT_L   (0x000000000000009a | ALIGNED_PHYSICAL)
-                       /* 512 Mb, Cacheable, Write-back, execute, Not User, Ph. Add. */
-
-#define MMUDR_CACHED_H 0x0000000000000003 | ALIGNED_EFFECTIVE
-                       /* Enabled, Shared, ASID 0, Eff. Add. 0xA0000000 */
-#define MMUDR_CACHED_L 0x000000000000015a | ALIGNED_PHYSICAL
-                       /* 512 Mb, Cacheable, Write-back, read/write, Not User, Ph. Add. */
-
-#ifdef CONFIG_ICACHE_DISABLED
-#define        ICCR0_INIT_VAL  ICCR0_OFF                       /* ICACHE off */
-#else
-#define        ICCR0_INIT_VAL  ICCR0_ON | ICCR0_ICI            /* ICE + ICI */
-#endif
-#define        ICCR1_INIT_VAL  ICCR1_NOLOCK                    /* No locking */
-
-#if defined (CONFIG_DCACHE_DISABLED)
-#define        OCCR0_INIT_VAL  OCCR0_OFF                          /* D-cache: off  */
-#elif defined (CONFIG_DCACHE_WRITE_THROUGH)
-#define        OCCR0_INIT_VAL  OCCR0_ON | OCCR0_OCI | OCCR0_WT    /* D-cache: on,   */
-                                                          /* WT, invalidate */
-#elif defined (CONFIG_DCACHE_WRITE_BACK)
-#define        OCCR0_INIT_VAL  OCCR0_ON | OCCR0_OCI | OCCR0_WB    /* D-cache: on,   */
-                                                          /* WB, invalidate */
-#else
-#error preprocessor flag CONFIG_DCACHE_... not recognized!
-#endif
-
-#define        OCCR1_INIT_VAL  OCCR1_NOLOCK                       /* No locking     */
-
-       .section        .empty_zero_page, "aw"
-       .global empty_zero_page
-
-empty_zero_page:
-       .long   1               /* MOUNT_ROOT_RDONLY */
-       .long   0               /* RAMDISK_FLAGS */
-       .long   0x0200          /* ORIG_ROOT_DEV */
-       .long   1               /* LOADER_TYPE */
-       .long   0x00360000      /* INITRD_START */
-       .long   0x000a0000      /* INITRD_SIZE */
-       .long   0
-
-       .text
-       .balign 4096,0,4096
-
-       .section        .data, "aw"
-       .balign PAGE_SIZE
-
-       .section        .data, "aw"
-       .balign PAGE_SIZE
-
-       .global swapper_pg_dir
-swapper_pg_dir:
-       .space PAGE_SIZE, 0
-
-       .global empty_bad_page
-empty_bad_page:
-       .space PAGE_SIZE, 0
-
-       .global empty_bad_pte_table
-empty_bad_pte_table:
-       .space PAGE_SIZE, 0
-
-       .global fpu_in_use
-fpu_in_use:    .quad   0
-
-
-       .section        .text, "ax"
-       .balign L1_CACHE_BYTES
-/*
- * Condition at the entry of __stext:
- * . Reset state:
- *   . SR.FD    = 1            (FPU disabled)
- *   . SR.BL    = 1            (Exceptions disabled)
- *   . SR.MD    = 1            (Privileged Mode)
- *   . SR.MMU   = 0            (MMU Disabled)
- *   . SR.CD    = 0            (CTC User Visible)
- *   . SR.IMASK = Undefined    (Interrupt Mask)
- *
- * Operations supposed to be performed by __stext:
- * . prevent speculative fetch onto device memory while MMU is off
- * . reflect as much as possible SH5 ABI (r15, r26, r27, r18)
- * . first, save CPU state and set it to something harmless
- * . any CPU detection and/or endianness settings (?)
- * . initialize EMI/LMI (but not TMU/RTC/INTC/SCIF): TBD
- * . set initial TLB entries for cached and uncached regions
- *   (no fine granularity paging)
- * . set initial cache state
- * . enable MMU and caches
- * . set CPU to a consistent state
- *   . registers (including stack pointer and current/KCR0)
- *   . NOT expecting to set Exception handling nor VBR/RESVEC/DCR
- *     at this stage. This is all to later Linux initialization steps.
- *   . initialize FPU
- * . clear BSS
- * . jump into start_kernel()
- * . be prepared to hopeless start_kernel() returns.
- *
- */
-       .global _stext
-_stext:
-       /*
-        * Prevent speculative fetch on device memory due to
-        * uninitialized target registers.
-        */
-       ptabs/u ZERO, tr0
-       ptabs/u ZERO, tr1
-       ptabs/u ZERO, tr2
-       ptabs/u ZERO, tr3
-       ptabs/u ZERO, tr4
-       ptabs/u ZERO, tr5
-       ptabs/u ZERO, tr6
-       ptabs/u ZERO, tr7
-       synci
-
-       /*
-        * Read/Set CPU state. After this block:
-        * r29 = Initial SR
-        */
-       getcon  SR, r29
-       movi    SR_HARMLESS, r20
-       putcon  r20, SR
-
-       /*
-        * Initialize EMI/LMI. To Be Done.
-        */
-
-       /*
-        * CPU detection and/or endianness settings (?). To Be Done.
-        * Pure PIC code here, please ! Just save state into r30.
-         * After this block:
-        * r30 = CPU type/Platform Endianness
-        */
-
-       /*
-        * Set initial TLB entries for cached and uncached regions.
-        * Note: PTA/BLINK is PIC code, PTABS/BLINK isn't !
-        */
-       /* Clear ITLBs */
-       pta     clear_ITLB, tr1
-       movi    MMUIR_FIRST, r21
-       movi    MMUIR_END, r22
-clear_ITLB:
-       putcfg  r21, 0, ZERO            /* Clear MMUIR[n].PTEH.V */
-       addi    r21, MMUIR_STEP, r21
-        bne    r21, r22, tr1
-
-       /* Clear DTLBs */
-       pta     clear_DTLB, tr1
-       movi    MMUDR_FIRST, r21
-       movi    MMUDR_END, r22
-clear_DTLB:
-       putcfg  r21, 0, ZERO            /* Clear MMUDR[n].PTEH.V */
-       addi    r21, MMUDR_STEP, r21
-        bne    r21, r22, tr1
-
-       /* Map one big (512Mb) page for ITLB */
-       movi    MMUIR_FIRST, r21
-       movi    MMUIR_TEXT_L, r22       /* PTEL first */
-       add.l   r22, r63, r22           /* Sign extend */
-       putcfg  r21, 1, r22             /* Set MMUIR[0].PTEL */
-       movi    MMUIR_TEXT_H, r22       /* PTEH last */
-       add.l   r22, r63, r22           /* Sign extend */
-       putcfg  r21, 0, r22             /* Set MMUIR[0].PTEH */
-
-       /* Map one big CACHED (512Mb) page for DTLB */
-       movi    MMUDR_FIRST, r21
-       movi    MMUDR_CACHED_L, r22     /* PTEL first */
-       add.l   r22, r63, r22           /* Sign extend */
-       putcfg  r21, 1, r22             /* Set MMUDR[0].PTEL */
-       movi    MMUDR_CACHED_H, r22     /* PTEH last */
-       add.l   r22, r63, r22           /* Sign extend */
-       putcfg  r21, 0, r22             /* Set MMUDR[0].PTEH */
-
-#ifdef CONFIG_EARLY_PRINTK
-       /*
-        * Setup a DTLB translation for SCIF phys.
-        */
-       addi    r21, MMUDR_STEP, r21
-       movi    0x0a03, r22     /* SCIF phys */
-       shori   0x0148, r22
-       putcfg  r21, 1, r22     /* PTEL first */
-       movi    0xfa03, r22     /* 0xfa030000, fixed SCIF virt */
-       shori   0x0003, r22
-       putcfg  r21, 0, r22     /* PTEH last */
-#endif
-
-       /*
-        * Set cache behaviours.
-        */
-       /* ICache */
-       movi    ICCR_BASE, r21
-       movi    ICCR0_INIT_VAL, r22
-       movi    ICCR1_INIT_VAL, r23
-       putcfg  r21, ICCR_REG0, r22
-       putcfg  r21, ICCR_REG1, r23
-
-       /* OCache */
-       movi    OCCR_BASE, r21
-       movi    OCCR0_INIT_VAL, r22
-       movi    OCCR1_INIT_VAL, r23
-       putcfg  r21, OCCR_REG0, r22
-       putcfg  r21, OCCR_REG1, r23
-
-
-       /*
-        * Enable Caches and MMU. Do the first non-PIC jump.
-         * Now head.S global variables, constants and externs
-        * can be used.
-        */
-       getcon  SR, r21
-       movi    SR_ENABLE_MMU, r22
-       or      r21, r22, r21
-       putcon  r21, SSR
-       movi    hyperspace, r22
-       ori     r22, 1, r22         /* Make it SHmedia, not required but..*/
-       putcon  r22, SPC
-       synco
-       rte                         /* And now go into the hyperspace ... */
-hyperspace:                        /* ... that's the next instruction !  */
-
-       /*
-        * Set CPU to a consistent state.
-        * r31 = FPU support flag
-        * tr0/tr7 in use. Others give a chance to loop somewhere safe
-        */
-       movi    start_kernel, r32
-       ori     r32, 1, r32
-
-       ptabs   r32, tr0                    /* r32 = _start_kernel address        */
-       pta/u   hopeless, tr1
-       pta/u   hopeless, tr2
-       pta/u   hopeless, tr3
-       pta/u   hopeless, tr4
-       pta/u   hopeless, tr5
-       pta/u   hopeless, tr6
-       pta/u   hopeless, tr7
-       gettr   tr1, r28                        /* r28 = hopeless address */
-
-       /* Set initial stack pointer */
-       movi    init_thread_union, SP
-       putcon  SP, KCR0                /* Set current to init_task */
-       movi    THREAD_SIZE, r22        /* Point to the end */
-       add     SP, r22, SP
-
-       /*
-        * Initialize FPU.
-        * Keep FPU flag in r31. After this block:
-        * r31 = FPU flag
-        */
-       movi fpu_in_use, r31    /* Temporary */
-
-#ifndef CONFIG_NOFPU_SUPPORT
-       getcon  SR, r21
-       movi    SR_ENABLE_FPU, r22
-       and     r21, r22, r22
-       putcon  r22, SR                 /* Try to enable */
-       getcon  SR, r22
-       xor     r21, r22, r21
-       shlri   r21, 15, r21            /* Supposedly 0/1 */
-       st.q    r31, 0 , r21            /* Set fpu_in_use */
-#else
-       movi    0, r21
-       st.q    r31, 0 , r21            /* Set fpu_in_use */
-#endif
-       or      r21, ZERO, r31          /* Set FPU flag at last */
-
-#ifndef CONFIG_SH_NO_BSS_INIT
-/* Don't clear BSS if running on slow platforms such as an RTL simulation,
-   remote memory via SHdebug link, etc.  For these the memory can be guaranteed
-   to be all zero on boot anyway. */
-       /*
-        * Clear bss
-        */
-       pta     clear_quad, tr1
-       movi    __bss_start, r22
-       movi    _end, r23
-clear_quad:
-       st.q    r22, 0, ZERO
-       addi    r22, 8, r22
-       bne     r22, r23, tr1           /* Both quad aligned, see vmlinux.lds.S */
-#endif
-       pta/u   hopeless, tr1
-
-       /* Say bye to head.S but be prepared to wrongly get back ... */
-       blink   tr0, LINK
-
-       /* If we ever get back here through LINK/tr1-tr7 */
-       pta/u   hopeless, tr7
-
-hopeless:
-       /*
-        * Something's badly wrong here. Loop endlessly,
-         * there's nothing more we can do about it.
-        *
-        * Note on hopeless: it can be jumped into invariably
-        * before or after jumping into hyperspace. The only
-        * requirement is to be PIC called (PTA) before and
-        * any way (PTA/PTABS) after. According to Virtual
-        * to Physical mapping a simulator/emulator can easily
-        * tell where we came here from just looking at hopeless
-        * (PC) address.
-        *
-        * For debugging purposes:
-        * (r28) hopeless/loop address
-        * (r29) Original SR
-        * (r30) CPU type/Platform endianness
-        * (r31) FPU Support
-        * (r32) _start_kernel address
-        */
-       blink   tr7, ZERO
-
-
diff --git a/arch/sh64/kernel/init_task.c b/arch/sh64/kernel/init_task.c
deleted file mode 100644 (file)
index de2d07d..0000000
+++ /dev/null
@@ -1,46 +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.
- *
- * arch/sh64/kernel/init_task.c
- *
- * Copyright (C) 2000, 2001  Paolo Alberelli
- * Copyright (C) 2003  Paul Mundt
- *
- */
-#include <linux/rwsem.h>
-#include <linux/mm.h>
-#include <linux/sched.h>
-#include <linux/init_task.h>
-#include <linux/mqueue.h>
-
-#include <asm/uaccess.h>
-#include <asm/pgtable.h>
-
-static struct fs_struct init_fs = INIT_FS;
-static struct files_struct init_files = INIT_FILES;
-static struct signal_struct init_signals = INIT_SIGNALS(init_signals);
-static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand);
-struct mm_struct init_mm = INIT_MM(init_mm);
-
-struct pt_regs fake_swapper_regs;
-
-/*
- * Initial thread structure.
- *
- * We need to make sure that this is THREAD_SIZE-byte aligned due
- * to the way process stacks are handled. This is done by having a
- * special "init_task" linker map entry..
- */
-union thread_union init_thread_union
-       __attribute__((__section__(".data.init_task"))) =
-               { INIT_THREAD_INFO(init_task) };
-
-/*
- * Initial task structure.
- *
- * All other task structs will be allocated on slabs in fork.c
- */
-struct task_struct init_task = INIT_TASK(init_task);
-
diff --git a/arch/sh64/kernel/irq.c b/arch/sh64/kernel/irq.c
deleted file mode 100644 (file)
index bcf6385..0000000
+++ /dev/null
@@ -1,720 +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.
- *
- * arch/sh64/kernel/irq.c
- *
- * Copyright (C) 2000, 2001  Paolo Alberelli
- * Copyright (C) 2003  Paul Mundt
- *
- */
-
-/*
- * IRQs are in fact implemented a bit like signal handlers for the kernel.
- * Naturally it's not a 1:1 relation, but there are similarities.
- */
-
-#include <linux/config.h>
-#include <linux/errno.h>
-#include <linux/kernel_stat.h>
-#include <linux/signal.h>
-#include <linux/rwsem.h>
-#include <linux/sched.h>
-#include <linux/ioport.h>
-#include <linux/interrupt.h>
-#include <linux/timex.h>
-#include <linux/slab.h>
-#include <linux/random.h>
-#include <linux/smp.h>
-#include <linux/smp_lock.h>
-#include <linux/init.h>
-#include <linux/seq_file.h>
-#include <asm/system.h>
-#include <asm/io.h>
-#include <asm/bitops.h>
-#include <asm/smp.h>
-#include <asm/pgalloc.h>
-#include <asm/delay.h>
-#include <asm/irq.h>
-#include <linux/irq.h>
-
-/*
- * Controller mappings for all interrupt sources:
- */
-irq_desc_t irq_desc[NR_IRQS] __cacheline_aligned = {
-       [0 ... NR_IRQS-1] = {
-               .handler = &no_irq_type,
-               .lock = SPIN_LOCK_UNLOCKED
-       }
-};
-
-
-/*
- * Special irq handlers.
- */
-
-irqreturn_t no_action(int cpl, void *dev_id, struct pt_regs *regs)
-{
-       return IRQ_NONE;
-}
-
-/*
- * Generic no controller code
- */
-
-static void enable_none(unsigned int irq) { }
-static unsigned int startup_none(unsigned int irq) { return 0; }
-static void disable_none(unsigned int irq) { }
-static void ack_none(unsigned int irq)
-{
-/*
- * 'what should we do if we get a hw irq event on an illegal vector'.
- * each architecture has to answer this themselves, it doesnt deserve
- * a generic callback i think.
- */
-       printk("unexpected IRQ trap at irq %02x\n", irq);
-}
-
-/* startup is the same as "enable", shutdown is same as "disable" */
-#define shutdown_none  disable_none
-#define end_none       enable_none
-
-struct hw_interrupt_type no_irq_type = {
-       "none",
-       startup_none,
-       shutdown_none,
-       enable_none,
-       disable_none,
-       ack_none,
-       end_none
-};
-
-#if defined(CONFIG_PROC_FS)
-int show_interrupts(struct seq_file *p, void *v)
-{
-       int i = *(loff_t *) v, j;
-       struct irqaction * action;
-       unsigned long flags;
-
-       if (i == 0) {
-               seq_puts(p, "           ");
-               for (j=0; j<NR_CPUS; j++)
-                       if (cpu_online(j))
-                               seq_printf(p, "CPU%d       ",j);
-               seq_putc(p, '\n');
-       }
-
-       if (i < NR_IRQS) {
-               spin_lock_irqsave(&irq_desc[i].lock, flags);
-               action = irq_desc[i].action;
-               if (!action)
-                       goto unlock;
-               seq_printf(p, "%3d: ",i);
-               seq_printf(p, "%10u ", kstat_irqs(i));
-               seq_printf(p, " %14s", irq_desc[i].handler->typename);
-               seq_printf(p, "  %s", action->name);
-
-               for (action=action->next; action; action = action->next)
-                       seq_printf(p, ", %s", action->name);
-               seq_putc(p, '\n');
-unlock:
-               spin_unlock_irqrestore(&irq_desc[i].lock, flags);
-       }
-       return 0;
-}
-#endif
-
-/*
- * do_NMI handles all Non-Maskable Interrupts.
- */
-asmlinkage void do_NMI(unsigned long vector_num, struct pt_regs * regs)
-{
-       if (regs->sr & 0x40000000)
-               printk("unexpected NMI trap in system mode\n");
-       else
-               printk("unexpected NMI trap in user mode\n");
-
-       /* No statistics */
-}
-
-/*
- * This should really return information about whether
- * we should do bottom half handling etc. Right now we
- * end up _always_ checking the bottom half, which is a
- * waste of time and is not what some drivers would
- * prefer.
- */
-int handle_IRQ_event(unsigned int irq, struct pt_regs * regs, struct irqaction * action)
-{
-       int status;
-
-       status = 1;     /* Force the "do bottom halves" bit */
-
-        if (!(action->flags & SA_INTERRUPT))
-                local_irq_enable();
-
-       do {
-               status |= action->flags;
-               action->handler(irq, action->dev_id, regs);
-               action = action->next;
-       } while (action);
-       if (status & SA_SAMPLE_RANDOM)
-               add_interrupt_randomness(irq);
-
-       local_irq_disable();
-
-       return status;
-}
-
-/*
- * Generic enable/disable code: this just calls
- * down into the PIC-specific version for the actual
- * hardware disable after having gotten the irq
- * controller lock.
- */
-
-/**
- *     disable_irq_nosync - disable an irq without waiting
- *     @irq: Interrupt to disable
- *
- *     Disable the selected interrupt line. Disables of an interrupt
- *     stack. Unlike disable_irq(), this function does not ensure existing
- *     instances of the IRQ handler have completed before returning.
- *
- *     This function may be called from IRQ context.
- */
-void disable_irq_nosync(unsigned int irq)
-{
-       irq_desc_t *desc = irq_desc + irq;
-       unsigned long flags;
-
-       spin_lock_irqsave(&desc->lock, flags);
-       if (!desc->depth++) {
-               desc->status |= IRQ_DISABLED;
-               desc->handler->disable(irq);
-       }
-       spin_unlock_irqrestore(&desc->lock, flags);
-}
-
-/**
- *     disable_irq - disable an irq and wait for completion
- *     @irq: Interrupt to disable
- *
- *     Disable the selected interrupt line. Disables of an interrupt
- *     stack. That is for two disables you need two enables. This
- *     function waits for any pending IRQ handlers for this interrupt
- *     to complete before returning. If you use this function while
- *     holding a resource the IRQ handler may need you will deadlock.
- *
- *     This function may be called - with care - from IRQ context.
- */
-void disable_irq(unsigned int irq)
-{
-       disable_irq_nosync(irq);
-       synchronize_irq(irq);
-}
-
-/**
- *     enable_irq - enable interrupt handling on an irq
- *     @irq: Interrupt to enable
- *
- *     Re-enables the processing of interrupts on this IRQ line
- *     providing no disable_irq calls are now in effect.
- *
- *     This function may be called from IRQ context.
- */
-void enable_irq(unsigned int irq)
-{
-       irq_desc_t *desc = irq_desc + irq;
-       unsigned long flags;
-
-       spin_lock_irqsave(&desc->lock, flags);
-       switch (desc->depth) {
-       case 1: {
-               unsigned int status = desc->status & ~IRQ_DISABLED;
-               desc->status = status;
-               if ((status & (IRQ_PENDING | IRQ_REPLAY)) == IRQ_PENDING) {
-                       desc->status = status | IRQ_REPLAY;
-                       hw_resend_irq(desc->handler,irq);
-               }
-               desc->handler->enable(irq);
-               /* fall-through */
-       }
-       default:
-               desc->depth--;
-               break;
-       case 0:
-               printk("enable_irq() unbalanced from %p\n",
-                      __builtin_return_address(0));
-       }
-       spin_unlock_irqrestore(&desc->lock, flags);
-}
-
-/*
- * do_IRQ handles all normal device IRQ's.
- */
-asmlinkage int do_IRQ(unsigned long vector_num, struct pt_regs * regs)
-{
-       /*
-        * We ack quickly, we don't want the irq controller
-        * thinking we're snobs just because some other CPU has
-        * disabled global interrupts (we have already done the
-        * INT_ACK cycles, it's too late to try to pretend to the
-        * controller that we aren't taking the interrupt).
-        *
-        * 0 return value means that this irq is already being
-        * handled by some other CPU. (or is disabled)
-        */
-       int irq;
-       int cpu = smp_processor_id();
-       irq_desc_t *desc = NULL;
-       struct irqaction * action;
-       unsigned int status;
-
-       irq_enter();
-
-#ifdef CONFIG_PREEMPT
-       /*
-        * At this point we're now about to actually call handlers,
-        * and interrupts might get reenabled during them... bump
-        * preempt_count to prevent any preemption while the handler
-        * called here is pending...
-        */
-       preempt_disable();
-#endif
-
-       irq = irq_demux(vector_num);
-
-       /*
-        * Should never happen, if it does check
-        * vectorN_to_IRQ[] against trap_jtable[].
-        */
-       if (irq == -1) {
-               printk("unexpected IRQ trap at vector %03lx\n", vector_num);
-               goto out;
-       }
-
-       desc = irq_desc + irq;
-
-       kstat_cpu(cpu).irqs[irq]++;
-       spin_lock(&desc->lock);
-       desc->handler->ack(irq);
-       /*
-          REPLAY is when Linux resends an IRQ that was dropped earlier
-          WAITING is used by probe to mark irqs that are being tested
-          */
-       status = desc->status & ~(IRQ_REPLAY | IRQ_WAITING | IRQ_INPROGRESS);
-       status |= IRQ_PENDING; /* we _want_ to handle it */
-
-       /*
-        * If the IRQ is disabled for whatever reason, we cannot
-        * use the action we have.
-        */
-       action = NULL;
-       if (!(status & (IRQ_DISABLED | IRQ_INPROGRESS))) {
-               action = desc->action;
-               status &= ~IRQ_PENDING; /* we commit to handling */
-               status |= IRQ_INPROGRESS; /* we are handling it */
-       }
-       desc->status = status;
-
-       /*
-        * If there is no IRQ handler or it was disabled, exit early.
-          Since we set PENDING, if another processor is handling
-          a different instance of this same irq, the other processor
-          will take care of it.
-        */
-       if (!action)
-               goto out;
-
-       /*
-        * Edge triggered interrupts need to remember
-        * pending events.
-        * This applies to any hw interrupts that allow a second
-        * instance of the same irq to arrive while we are in do_IRQ
-        * or in the handler. But the code here only handles the _second_
-        * instance of the irq, not the third or fourth. So it is mostly
-        * useful for irq hardware that does not mask cleanly in an
-        * SMP environment.
-        */
-       for (;;) {
-               spin_unlock(&desc->lock);
-               handle_IRQ_event(irq, regs, action);
-               spin_lock(&desc->lock);
-
-               if (!(desc->status & IRQ_PENDING))
-                       break;
-               desc->status &= ~IRQ_PENDING;
-       }
-       desc->status &= ~IRQ_INPROGRESS;
-out:
-       /*
-        * The ->end() handler has to deal with interrupts which got
-        * disabled while the handler was running.
-        */
-       if (desc) {
-               desc->handler->end(irq);
-               spin_unlock(&desc->lock);
-       }
-
-       irq_exit();
-
-#ifdef CONFIG_PREEMPT
-       /*
-        * We're done with the handlers, interrupts should be
-        * currently disabled; decrement preempt_count now so
-        * as we return preemption may be allowed...
-        */
-       preempt_enable_no_resched();
-#endif
-
-       return 1;
-}
-
-/**
- *     request_irq - allocate an interrupt line
- *     @irq: Interrupt line to allocate
- *     @handler: Function to be called when the IRQ occurs
- *     @irqflags: Interrupt type flags
- *     @devname: An ascii name for the claiming device
- *     @dev_id: A cookie passed back to the handler function
- *
- *     This call allocates interrupt resources and enables the
- *     interrupt line and IRQ handling. From the point this
- *     call is made your handler function may be invoked. Since
- *     your handler function must clear any interrupt the board
- *     raises, you must take care both to initialise your hardware
- *     and to set up the interrupt handler in the right order.
- *
- *     Dev_id must be globally unique. Normally the address of the
- *     device data structure is used as the cookie. Since the handler
- *     receives this value it makes sense to use it.
- *
- *     If your interrupt is shared you must pass a non NULL dev_id
- *     as this is required when freeing the interrupt.
- *
- *     Flags:
- *
- *     SA_SHIRQ                Interrupt is shared
- *
- *     SA_INTERRUPT            Disable local interrupts while processing
- *
- *     SA_SAMPLE_RANDOM        The interrupt can be used for entropy
- *
- */
-int request_irq(unsigned int irq,
-               irqreturn_t (*handler)(int, void *, struct pt_regs *),
-               unsigned long irqflags,
-               const char * devname,
-               void *dev_id)
-{
-       int retval;
-       struct irqaction * action;
-
-#if 1
-       /*
-        * Sanity-check: shared interrupts should REALLY pass in
-        * a real dev-ID, otherwise we'll have trouble later trying
-        * to figure out which interrupt is which (messes up the
-        * interrupt freeing logic etc).
-        */
-       if (irqflags & SA_SHIRQ) {
-               if (!dev_id)
-                       printk("Bad boy: %s (at 0x%x) called us without a dev_id!\n", devname, (&irq)[-1]);
-       }
-#endif
-
-       if (irq >= NR_IRQS)
-               return -EINVAL;
-       if (!handler)
-               return -EINVAL;
-
-       action = (struct irqaction *)
-                       kmalloc(sizeof(struct irqaction), GFP_KERNEL);
-       if (!action)
-               return -ENOMEM;
-
-       action->handler = handler;
-       action->flags = irqflags;
-       cpus_clear(action->mask);
-       action->name = devname;
-       action->next = NULL;
-       action->dev_id = dev_id;
-
-       retval = setup_irq(irq, action);
-       if (retval)
-               kfree(action);
-       return retval;
-}
-
-/**
- *     free_irq - free an interrupt
- *     @irq: Interrupt line to free
- *     @dev_id: Device identity to free
- *
- *     Remove an interrupt handler. The handler is removed and if the
- *     interrupt line is no longer in use by any driver it is disabled.
- *     On a shared IRQ the caller must ensure the interrupt is disabled
- *     on the card it drives before calling this function. The function
- *     does not return until any executing interrupts for this IRQ
- *     have completed.
- *
- *     This function may be called from interrupt context.
- *
- *     Bugs: Attempting to free an irq in a handler for the same irq hangs
- *           the machine.
- */
-void free_irq(unsigned int irq, void *dev_id)
-{
-       irq_desc_t *desc;
-       struct irqaction **p;
-       unsigned long flags;
-
-       if (irq >= NR_IRQS)
-               return;
-
-       desc = irq_desc + irq;
-       spin_lock_irqsave(&desc->lock,flags);
-       p = &desc->action;
-       for (;;) {
-               struct irqaction * action = *p;
-               if (action) {
-                       struct irqaction **pp = p;
-                       p = &action->next;
-                       if (action->dev_id != dev_id)
-                               continue;
-
-                       /* Found it - now remove it from the list of entries */
-                       *pp = action->next;
-                       if (!desc->action) {
-                               desc->status |= IRQ_DISABLED;
-                               desc->handler->shutdown(irq);
-                       }
-                       spin_unlock_irqrestore(&desc->lock,flags);
-                       kfree(action);
-                       return;
-               }
-               printk("Trying to free free IRQ%d\n",irq);
-               spin_unlock_irqrestore(&desc->lock,flags);
-               return;
-       }
-}
-
-/*
- * IRQ autodetection code..
- *
- * This depends on the fact that any interrupt that
- * comes in on to an unassigned handler will get stuck
- * with "IRQ_WAITING" cleared and the interrupt
- * disabled.
- */
-
-/**
- *     probe_irq_on    - begin an interrupt autodetect
- *
- *     Commence probing for an interrupt. The interrupts are scanned
- *     and a mask of potential interrupt lines is returned.
- *
- */
-unsigned long probe_irq_on(void)
-{
-       unsigned int i;
-       irq_desc_t *desc;
-       unsigned long val;
-       unsigned long delay;
-
-       /*
-        * something may have generated an irq long ago and we want to
-        * flush such a longstanding irq before considering it as spurious.
-        */
-       for (i = NR_IRQS-1; i >= 0; i--) {
-               desc = irq_desc + i;
-
-               spin_lock_irq(&desc->lock);
-               if (!irq_desc[i].action) {
-                       irq_desc[i].handler->startup(i);
-               }
-               spin_unlock_irq(&desc->lock);
-       }
-
-       /* Wait for longstanding interrupts to trigger. */
-       for (delay = jiffies + HZ/50; time_after(delay, jiffies); )
-               /* about 20ms delay */ synchronize_irq();
-
-       /*
-        * enable any unassigned irqs
-        * (we must startup again here because if a longstanding irq
-        * happened in the previous stage, it may have masked itself)
-        */
-       for (i = NR_IRQS-1; i >= 0; i--) {
-               desc = irq_desc + 1;
-
-               spin_lock_irq(&desc->lock);
-               if (!desc->action) {
-                       desc->status |= IRQ_AUTODETECT | IRQ_WAITING;
-                       if (desc->handler->startup(i))
-                               desc->status |= IRQ_PENDING;
-               }
-               spin_unlock_irq(&desc->lock);
-       }
-
-       /*
-        * Wait for spurious interrupts to trigger
-        */
-       for (delay = jiffies + HZ/10; time_after(delay, jiffies); )
-               /* about 100ms delay */ synchronize_irq();
-
-       /*
-        * Now filter out any obviously spurious interrupts
-        */
-       val = 0;
-       for (i = 0; i < NR_IRQS; i++) {
-               irq_desc_t *desc = irq_desc + i;
-               unsigned int status;
-
-               spin_lock_irq(&desc->lock);
-               status = desc->status;
-
-               if (status & IRQ_AUTODETECT) {
-                       /* It triggered already - consider it spurious. */
-                       if (!(status & IRQ_WAITING)) {
-                               desc->status = status & ~IRQ_AUTODETECT;
-                               desc->handler->shutdown(i);
-                       } else
-                               if (i < 32)
-                                       val |= 1 << i;
-               }
-               spin_unlock_irq(&desc->lock);
-       }
-
-       return val;
-}
-
-/*
- * Return the one interrupt that triggered (this can
- * handle any interrupt source).
- */
-
-/**
- *     probe_irq_off   - end an interrupt autodetect
- *     @val: mask of potential interrupts (unused)
- *
- *     Scans the unused interrupt lines and returns the line which
- *     appears to have triggered the interrupt. If no interrupt was
- *     found then zero is returned. If more than one interrupt is
- *     found then minus the first candidate is returned to indicate
- *     their is doubt.
- *
- *     The interrupt probe logic state is returned to its previous
- *     value.
- *
- *     BUGS: When used in a module (which arguably shouldnt happen)
- *     nothing prevents two IRQ probe callers from overlapping. The
- *     results of this are non-optimal.
- */
-int probe_irq_off(unsigned long val)
-{
-       int i, irq_found, nr_irqs;
-
-       nr_irqs = 0;
-       irq_found = 0;
-       for (i=0; i<NR_IRQS; i++) {
-               irq_desc_t *desc = irq_desc + i;
-               unsigned int status;
-
-               spin_lock_irq(&desc->lock);
-               status = desc->status;
-               if (!(status & IRQ_AUTODETECT))
-                       continue;
-
-               if (status & IRQ_AUTODETECT) {
-                       if (!(status & IRQ_WAITING)) {
-                               if (!nr_irqs)
-                                       irq_found = i;
-                               nr_irqs++;
-                       }
-
-                       desc->status = status & ~IRQ_AUTODETECT;
-                       desc->handler->shutdown(i);
-               }
-               spin_unlock_irq(&desc->lock);
-       }
-
-       if (nr_irqs > 1)
-               irq_found = -irq_found;
-       return irq_found;
-}
-
-int setup_irq(unsigned int irq, struct irqaction * new)
-{
-       int shared = 0;
-       unsigned long flags;
-       struct irqaction *old, **p;
-       irq_desc_t *desc = irq_desc + irq;
-
-       /*
-        * Some drivers like serial.c use request_irq() heavily,
-        * so we have to be careful not to interfere with a
-        * running system.
-        */
-       if (new->flags & SA_SAMPLE_RANDOM) {
-               /*
-                * This function might sleep, we want to call it first,
-                * outside of the atomic block.
-                * Yes, this might clear the entropy pool if the wrong
-                * driver is attempted to be loaded, without actually
-                * installing a new handler, but is this really a problem,
-                * only the sysadmin is able to do this.
-                */
-               rand_initialize_irq(irq);
-       }
-
-       /*
-        * The following block of code has to be executed atomically
-        */
-       spin_lock_irqsave(&desc->lock,flags);
-       p = &desc->action;
-       if ((old = *p) != NULL) {
-               /* Can't share interrupts unless both agree to */
-               if (!(old->flags & new->flags & SA_SHIRQ)) {
-                       spin_unlock_irqrestore(&desc->lock,flags);
-                       return -EBUSY;
-               }
-
-               /* add new interrupt at end of irq queue */
-               do {
-                       p = &old->next;
-                       old = *p;
-               } while (old);
-               shared = 1;
-       }
-
-       *p = new;
-
-       if (!shared) {
-               desc->depth = 0;
-               desc->status &= ~IRQ_DISABLED;
-               desc->handler->startup(irq);
-       }
-       spin_unlock_irqrestore(&desc->lock,flags);
-
-       /*
-        * No PROC FS support for interrupts.
-        * For improvements in this area please check
-        * the i386 branch.
-        */
-       return 0;
-}
-
-#if defined(CONFIG_PROC_FS) && defined(CONFIG_SYSCTL)
-
-void init_irq_proc(void)
-{
-       /*
-        * No PROC FS support for interrupts.
-        * For improvements in this area please check
-        * the i386 branch.
-        */
-}
-#endif
diff --git a/arch/sh64/kernel/irq_intc.c b/arch/sh64/kernel/irq_intc.c
deleted file mode 100644 (file)
index 4062ae5..0000000
+++ /dev/null
@@ -1,272 +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.
- *
- * arch/sh64/kernel/irq_intc.c
- *
- * Copyright (C) 2000, 2001  Paolo Alberelli
- * Copyright (C) 2003  Paul Mundt
- *
- * Interrupt Controller support for SH5 INTC.
- * Per-interrupt selective. IRLM=0 (Fixed priority) is not
- * supported being useless without a cascaded interrupt
- * controller.
- *
- */
-
-#include <linux/config.h>
-#include <linux/init.h>
-#include <linux/irq.h>
-#include <linux/kernel.h>
-#include <linux/stddef.h>
-
-#include <asm/hardware.h>
-#include <asm/platform.h>
-#include <asm/bitops.h>                /* this includes also <asm/registers.h */
-                               /* which is required to remap register */
-                               /* names used into __asm__ blocks...   */
-#include <asm/page.h>
-#include <asm/io.h>
-#include <asm/irq.h>
-
-/*
- * Maybe the generic Peripheral block could move to a more
- * generic include file. INTC Block will be defined here
- * and only here to make INTC self-contained in a single
- * file.
- */
-#define        INTC_BLOCK_OFFSET       0x01000000
-
-/* Base */
-#define INTC_BASE              PHYS_PERIPHERAL_BLOCK + \
-                               INTC_BLOCK_OFFSET
-
-/* Address */
-#define INTC_ICR_SET           (intc_virt + 0x0)
-#define INTC_ICR_CLEAR         (intc_virt + 0x8)
-#define INTC_INTPRI_0          (intc_virt + 0x10)
-#define INTC_INTSRC_0          (intc_virt + 0x50)
-#define INTC_INTSRC_1          (intc_virt + 0x58)
-#define INTC_INTREQ_0          (intc_virt + 0x60)
-#define INTC_INTREQ_1          (intc_virt + 0x68)
-#define INTC_INTENB_0          (intc_virt + 0x70)
-#define INTC_INTENB_1          (intc_virt + 0x78)
-#define INTC_INTDSB_0          (intc_virt + 0x80)
-#define INTC_INTDSB_1          (intc_virt + 0x88)
-
-#define INTC_ICR_IRLM          0x1
-#define        INTC_INTPRI_PREGS       8               /* 8 Priority Registers */
-#define        INTC_INTPRI_PPREG       8               /* 8 Priorities per Register */
-
-
-/*
- * Mapper between the vector ordinal and the IRQ number
- * passed to kernel/device drivers.
- */
-int intc_evt_to_irq[(0xE20/0x20)+1] = {
-       -1, -1, -1, -1, -1, -1, -1, -1, /* 0x000 - 0x0E0 */
-       -1, -1, -1, -1, -1, -1, -1, -1, /* 0x100 - 0x1E0 */
-        0,  0,  0,  0,  0,  1,  0,  0, /* 0x200 - 0x2E0 */
-        2,  0,  0,  3,  0,  0,  0, -1, /* 0x300 - 0x3E0 */
-       32, 33, 34, 35, 36, 37, 38, -1, /* 0x400 - 0x4E0 */
-       -1, -1, -1, 63, -1, -1, -1, -1, /* 0x500 - 0x5E0 */
-       -1, -1, 18, 19, 20, 21, 22, -1, /* 0x600 - 0x6E0 */
-       39, 40, 41, 42, -1, -1, -1, -1, /* 0x700 - 0x7E0 */
-        4,  5,  6,  7, -1, -1, -1, -1, /* 0x800 - 0x8E0 */
-       -1, -1, -1, -1, -1, -1, -1, -1, /* 0x900 - 0x9E0 */
-       12, 13, 14, 15, 16, 17, -1, -1, /* 0xA00 - 0xAE0 */
-       -1, -1, -1, -1, -1, -1, -1, -1, /* 0xB00 - 0xBE0 */
-       -1, -1, -1, -1, -1, -1, -1, -1, /* 0xC00 - 0xCE0 */
-       -1, -1, -1, -1, -1, -1, -1, -1, /* 0xD00 - 0xDE0 */
-       -1, -1                          /* 0xE00 - 0xE20 */
-};
-
-/*
- * Opposite mapper.
- */
-static int IRQ_to_vectorN[NR_INTC_IRQS] = {
-       0x12, 0x15, 0x18, 0x1B, 0x40, 0x41, 0x42, 0x43, /*  0- 7 */
-         -1,   -1,   -1,   -1, 0x50, 0x51, 0x52, 0x53, /*  8-15 */
-       0x54, 0x55, 0x32, 0x33, 0x34, 0x35, 0x36,   -1, /* 16-23 */
-         -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, /* 24-31 */
-       0x20, 0x21, 0x22, 0x23, 0x24, 0x25, 0x26, 0x38, /* 32-39 */
-        0x39, 0x3A, 0x3B,   -1,   -1,   -1,   -1,   -1, /* 40-47 */
-         -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, /* 48-55 */
-         -1,   -1,   -1,   -1,   -1,   -1,   -1, 0x2B, /* 56-63 */
-
-};
-
-static unsigned long intc_virt;
-
-static unsigned int startup_intc_irq(unsigned int irq);
-static void shutdown_intc_irq(unsigned int irq);
-static void enable_intc_irq(unsigned int irq);
-static void disable_intc_irq(unsigned int irq);
-static void mask_and_ack_intc(unsigned int);
-static void end_intc_irq(unsigned int irq);
-
-static struct hw_interrupt_type intc_irq_type = {
-       "INTC",
-       startup_intc_irq,
-       shutdown_intc_irq,
-       enable_intc_irq,
-       disable_intc_irq,
-       mask_and_ack_intc,
-       end_intc_irq
-};
-
-static int irlm;               /* IRL mode */
-
-static unsigned int startup_intc_irq(unsigned int irq)
-{
-       enable_intc_irq(irq);
-       return 0; /* never anything pending */
-}
-
-static void shutdown_intc_irq(unsigned int irq)
-{
-       disable_intc_irq(irq);
-}
-
-static void enable_intc_irq(unsigned int irq)
-{
-       unsigned long reg;
-       unsigned long bitmask;
-
-       if ((irq <= IRQ_IRL3) && (irlm == NO_PRIORITY))
-               printk("Trying to use straight IRL0-3 with an encoding platform.\n");
-
-       if (irq < 32) {
-               reg = INTC_INTENB_0;
-               bitmask = 1 << irq;
-       } else {
-               reg = INTC_INTENB_1;
-               bitmask = 1 << (irq - 32);
-       }
-
-       ctrl_outl(bitmask, reg);
-}
-
-static void disable_intc_irq(unsigned int irq)
-{
-       unsigned long reg;
-       unsigned long bitmask;
-
-       if (irq < 32) {
-               reg = INTC_INTDSB_0;
-               bitmask = 1 << irq;
-       } else {
-               reg = INTC_INTDSB_1;
-               bitmask = 1 << (irq - 32);
-       }
-
-       ctrl_outl(bitmask, reg);
-}
-
-static void mask_and_ack_intc(unsigned int irq)
-{
-       disable_intc_irq(irq);
-}
-
-static void end_intc_irq(unsigned int irq)
-{
-       enable_intc_irq(irq);
-}
-
-/* For future use, if we ever support IRLM=0) */
-void make_intc_irq(unsigned int irq)
-{
-       disable_irq_nosync(irq);
-       irq_desc[irq].handler = &intc_irq_type;
-       disable_intc_irq(irq);
-}
-
-#if defined(CONFIG_PROC_FS) && defined(CONFIG_SYSCTL)
-int intc_irq_describe(char* p, int irq)
-{
-       if (irq < NR_INTC_IRQS)
-               return sprintf(p, "(0x%3x)", IRQ_to_vectorN[irq]*0x20);
-       else
-               return 0;
-}
-#endif
-
-void __init init_IRQ(void)
-{
-        unsigned long long __dummy0, __dummy1=~0x00000000100000f0;
-       unsigned long reg;
-       unsigned long data;
-       int i;
-
-       intc_virt = onchip_remap(INTC_BASE, 1024, "INTC");
-       if (!intc_virt) {
-               panic("Unable to remap INTC\n");
-       }
-
-
-       /* Set default: per-line enable/disable, priority driven ack/eoi */
-       for (i = 0; i < NR_INTC_IRQS; i++) {
-               if (platform_int_priority[i] != NO_PRIORITY) {
-                       irq_desc[i].handler = &intc_irq_type;
-               }
-       }
-
-
-       /* Disable all interrupts and set all priorities to 0 to avoid trouble */
-       ctrl_outl(-1, INTC_INTDSB_0);
-       ctrl_outl(-1, INTC_INTDSB_1);
-
-       for (reg = INTC_INTPRI_0, i = 0; i < INTC_INTPRI_PREGS; i++, reg += 8)
-               ctrl_outl( NO_PRIORITY, reg);
-
-
-       /* Set IRLM */
-       /* If all the priorities are set to 'no priority', then
-        * assume we are using encoded mode.
-        */
-       irlm = platform_int_priority[IRQ_IRL0] + platform_int_priority[IRQ_IRL1] + \
-               platform_int_priority[IRQ_IRL2] + platform_int_priority[IRQ_IRL3];
-
-       if (irlm == NO_PRIORITY) {
-               /* IRLM = 0 */
-               reg = INTC_ICR_CLEAR;
-               i = IRQ_INTA;
-               printk("Trying to use encoded IRL0-3. IRLs unsupported.\n");
-       } else {
-               /* IRLM = 1 */
-               reg = INTC_ICR_SET;
-               i = IRQ_IRL0;
-       }
-       ctrl_outl(INTC_ICR_IRLM, reg);
-
-       /* Set interrupt priorities according to platform description */
-       for (data = 0, reg = INTC_INTPRI_0; i < NR_INTC_IRQS; i++) {
-               data |= platform_int_priority[i] << ((i % INTC_INTPRI_PPREG) * 4);
-               if ((i % INTC_INTPRI_PPREG) == (INTC_INTPRI_PPREG - 1)) {
-                       /* Upon the 7th, set Priority Register */
-                       ctrl_outl(data, reg);
-                       data = 0;
-                       reg += 8;
-               }
-       }
-
-#ifdef CONFIG_SH_CAYMAN
-       {
-               extern void init_cayman_irq(void);
-
-               init_cayman_irq();
-       }
-#endif
-
-       /*
-        * And now let interrupts come in.
-        * sti() is not enough, we need to
-        * lower priority, too.
-        */
-        __asm__ __volatile__("getcon    " __SR ", %0\n\t"
-                             "and       %0, %1, %0\n\t"
-                             "putcon    %0, " __SR "\n\t"
-                             : "=&r" (__dummy0)
-                             : "r" (__dummy1));
-}
diff --git a/arch/sh64/kernel/led.c b/arch/sh64/kernel/led.c
deleted file mode 100644 (file)
index cf993c4..0000000
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * arch/sh64/kernel/led.c
- *
- * Copyright (C) 2002 Stuart Menefy <stuart.menefy@st.com>
- *
- * May be copied or modified under the terms of the GNU General Public
- * License.  See linux/COPYING for more information.
- *
- * Flash the LEDs
- */
-#include <linux/config.h>
-#include <linux/stddef.h>
-#include <linux/sched.h>
-
-void mach_led(int pos, int val);
-
-/* acts like an actual heart beat -- ie thump-thump-pause... */
-void heartbeat(void)
-{
-       static unsigned int cnt = 0, period = 0, dist = 0;
-
-       if (cnt == 0 || cnt == dist) {
-               mach_led(-1, 1);
-       } else if (cnt == 7 || cnt == dist + 7) {
-               mach_led(-1, 0);
-       }
-
-       if (++cnt > period) {
-               cnt = 0;
-
-               /*
-                * The hyperbolic function below modifies the heartbeat period
-                * length in dependency of the current (5min) load. It goes
-                * through the points f(0)=126, f(1)=86, f(5)=51, f(inf)->30.
-                */
-               period = ((672 << FSHIFT) / (5 * avenrun[0] +
-                                           (7 << FSHIFT))) + 30;
-               dist = period / 4;
-       }
-}
-
diff --git a/arch/sh64/kernel/pci-dma.c b/arch/sh64/kernel/pci-dma.c
deleted file mode 100644 (file)
index a36c3d7..0000000
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Copyright (C) 2001 David J. Mckay (david.mckay@st.com)
- * Copyright (C) 2003 Paul Mundt (lethal@linux-sh.org)
- *
- * May be copied or modified under the terms of the GNU General Public
- * License.  See linux/COPYING for more information.
- *
- * Dynamic DMA mapping support.
- */
-#include <linux/types.h>
-#include <linux/mm.h>
-#include <linux/string.h>
-#include <linux/pci.h>
-#include <asm/io.h>
-
-void *consistent_alloc(struct pci_dev *hwdev, size_t size,
-                          dma_addr_t *dma_handle)
-{
-       void *ret;
-       int gfp = GFP_ATOMIC;
-        void *vp;
-
-       if (hwdev == NULL || hwdev->dma_mask != 0xffffffff)
-               gfp |= GFP_DMA;
-
-       ret = (void *)__get_free_pages(gfp, get_order(size));
-
-       /* now call our friend ioremap_nocache to give us an uncached area */
-        vp = ioremap_nocache(virt_to_phys(ret), size);
-
-       if (vp != NULL) {
-               memset(vp, 0, size);
-               *dma_handle = virt_to_bus(ret);
-               dma_cache_wback_inv((unsigned long)ret, size);
-       }
-
-       return vp;
-}
-
-void consistent_free(struct pci_dev *hwdev, size_t size,
-                        void *vaddr, dma_addr_t dma_handle)
-{
-       void *alloc;
-
-       alloc = bus_to_virt((unsigned long)dma_handle);
-       free_pages((unsigned long)alloc, get_order(size));
-
-       iounmap(vaddr);
-}
-
diff --git a/arch/sh64/kernel/pci_sh5.c b/arch/sh64/kernel/pci_sh5.c
deleted file mode 100644 (file)
index c2b4f00..0000000
+++ /dev/null
@@ -1,546 +0,0 @@
-/*
- * Copyright (C) 2001 David J. Mckay (david.mckay@st.com)
- * Copyright (C) 2003, 2004 Paul Mundt
- * Copyright (C) 2004 Richard Curnow
- *
- * May be copied or modified under the terms of the GNU General Public
- * License.  See linux/COPYING for more information.
- *
- * Support functions for the SH5 PCI hardware.
- */
-
-#include <linux/config.h>
-#include <linux/kernel.h>
-#include <linux/rwsem.h>
-#include <linux/smp.h>
-#include <linux/smp_lock.h>
-#include <linux/interrupt.h>
-#include <linux/init.h>
-#include <linux/errno.h>
-#include <linux/pci.h>
-#include <linux/delay.h>
-#include <linux/types.h>
-#include <asm/pci.h>
-#include <linux/irq.h>
-
-#include <asm/io.h>
-#include <asm/hardware.h>
-#include "pci_sh5.h"
-
-static unsigned long pcicr_virt;
-unsigned long pciio_virt;
-
-static void __init pci_fixup_ide_bases(struct pci_dev *d)
-{
-       int i;
-
-       /*
-        * PCI IDE controllers use non-standard I/O port decoding, respect it.
-        */
-       if ((d->class >> 8) != PCI_CLASS_STORAGE_IDE)
-               return;
-       printk("PCI: IDE base address fixup for %s\n", d->slot_name);
-       for(i=0; i<4; i++) {
-               struct resource *r = &d->resource[i];
-               if ((r->start & ~0x80) == 0x374) {
-                       r->start |= 2;
-                       r->end = r->start;
-               }
-       }
-}
-
-/* Add future fixups here... */
-struct pci_fixup pcibios_fixups[] = {
-       { PCI_FIXUP_HEADER,     PCI_ANY_ID,     PCI_ANY_ID,     pci_fixup_ide_bases },
-       { 0 }
-};
-
-char * __init pcibios_setup(char *str)
-{
-       return str;
-}
-
-/* Rounds a number UP to the nearest power of two. Used for
- * sizing the PCI window.
- */
-static u32 __init r2p2(u32 num)
-{
-       int i = 31;
-       u32 tmp = num;
-
-       if (num == 0)
-               return 0;
-
-       do {
-               if (tmp & (1 << 31))
-                       break;
-               i--;
-               tmp <<= 1;
-       } while (i >= 0);
-
-       tmp = 1 << i;
-       /* If the original number isn't a power of 2, round it up */
-       if (tmp != num)
-               tmp <<= 1;
-
-       return tmp;
-}
-
-extern unsigned long long memory_start, memory_end;
-
-int __init sh5pci_init(unsigned memStart, unsigned memSize)
-{
-       u32 lsr0;
-       u32 uval;
-
-       pcicr_virt = onchip_remap(SH5PCI_ICR_BASE, 1024, "PCICR");
-       if (!pcicr_virt) {
-               panic("Unable to remap PCICR\n");
-       }
-
-       pciio_virt = onchip_remap(SH5PCI_IO_BASE, 0x10000, "PCIIO");
-       if (!pciio_virt) {
-               panic("Unable to remap PCIIO\n");
-       }
-
-       pr_debug("Register base addres is 0x%08lx\n", pcicr_virt);
-
-       /* Clear snoop registers */
-        SH5PCI_WRITE(CSCR0, 0);
-        SH5PCI_WRITE(CSCR1, 0);
-
-       pr_debug("Wrote to reg\n");
-
-        /* Switch off interrupts */
-        SH5PCI_WRITE(INTM,  0);
-        SH5PCI_WRITE(AINTM, 0);
-        SH5PCI_WRITE(PINTM, 0);
-
-        /* Set bus active, take it out of reset */
-        uval = SH5PCI_READ(CR);
-
-       /* Set command Register */
-        SH5PCI_WRITE(CR, uval | CR_LOCK_MASK | CR_CFINT| CR_FTO | CR_PFE | CR_PFCS | CR_BMAM);
-
-       uval=SH5PCI_READ(CR);
-        pr_debug("CR is actually 0x%08x\n",uval);
-
-        /* Allow it to be a master */
-       /* NB - WE DISABLE I/O ACCESS to stop overlap */
-        /* set WAIT bit to enable stepping, an attempt to improve stability */
-       SH5PCI_WRITE_SHORT(CSR_CMD,
-                           PCI_COMMAND_MEMORY | PCI_COMMAND_MASTER | PCI_COMMAND_WAIT);
-
-        /*
-        ** Set translation mapping memory in order to convert the address
-        ** used for the main bus, to the PCI internal address.
-        */
-        SH5PCI_WRITE(MBR,0x40000000);
-
-        /* Always set the max size 512M */
-        SH5PCI_WRITE(MBMR, PCISH5_MEM_SIZCONV(512*1024*1024));
-
-        /*
-        ** I/O addresses are mapped at internal PCI specific address
-        ** as is described into the configuration bridge table.
-        ** These are changed to 0, to allow cards that have legacy
-        ** io such as vga to function correctly. We set the SH5 IOBAR to
-        ** 256K, which is a bit big as we can only have 64K of address space
-        */
-
-        SH5PCI_WRITE(IOBR,0x0);
-
-       pr_debug("PCI:Writing 0x%08x to IOBR\n",0);
-
-        /* Set up a 256K window. Totally pointless waste  of address space */
-        SH5PCI_WRITE(IOBMR,0);
-       pr_debug("PCI:Writing 0x%08x to IOBMR\n",0);
-
-       /* The SH5 has a HUGE 256K I/O region, which breaks the PCI spec. Ideally,
-         * we would want to map the I/O region somewhere, but it is so big this is not
-         * that easy!
-         */
-       SH5PCI_WRITE(CSR_IBAR0,~0);
-       /* Set memory size value */
-        memSize = memory_end - memory_start;
-
-        /* Now we set up the mbars so the PCI bus can see the memory of the machine */
-        if (memSize < (1024 * 1024)) {
-                printk(KERN_ERR "PCISH5: Ridiculous memory size of 0x%x?\n", memSize);
-                return -EINVAL;
-        }
-
-        /* Set LSR 0 */
-        lsr0 = (memSize > (512 * 1024 * 1024)) ? 0x1ff00001 : ((r2p2(memSize) - 0x100000) | 0x1);
-        SH5PCI_WRITE(LSR0, lsr0);
-
-       pr_debug("PCI:Writing 0x%08x to LSR0\n",lsr0);
-
-        /* Set MBAR 0 */
-        SH5PCI_WRITE(CSR_MBAR0, memory_start);
-        SH5PCI_WRITE(LAR0, memory_start);
-
-        SH5PCI_WRITE(CSR_MBAR1,0);
-        SH5PCI_WRITE(LAR1,0);
-        SH5PCI_WRITE(LSR1,0);
-
-       pr_debug("PCI:Writing 0x%08llx to CSR_MBAR0\n",memory_start);
-       pr_debug("PCI:Writing 0x%08llx to LAR0\n",memory_start);
-
-        /* Enable the PCI interrupts on the device */
-        SH5PCI_WRITE(INTM,  ~0);
-        SH5PCI_WRITE(AINTM, ~0);
-        SH5PCI_WRITE(PINTM, ~0);
-
-       pr_debug("Switching on all error interrupts\n");
-
-        return(0);
-}
-
-static int sh5pci_read(struct pci_bus *bus, unsigned int devfn, int where,
-                       int size, u32 *val)
-{
-       SH5PCI_WRITE(PAR, CONFIG_CMD(bus, devfn, where));
-
-       switch (size) {
-               case 1:
-                       *val = (u8)SH5PCI_READ_BYTE(PDR + (where & 3));
-                       break;
-               case 2:
-                       *val = (u16)SH5PCI_READ_SHORT(PDR + (where & 2));
-                       break;
-               case 4:
-                       *val = SH5PCI_READ(PDR);
-                       break;
-       }
-
-       return PCIBIOS_SUCCESSFUL;
-}
-
-static int sh5pci_write(struct pci_bus *bus, unsigned int devfn, int where,
-                        int size, u32 val)
-{
-       SH5PCI_WRITE(PAR, CONFIG_CMD(bus, devfn, where));
-
-       switch (size) {
-               case 1:
-                       SH5PCI_WRITE_BYTE(PDR + (where & 3), (u8)val);
-                       break;
-               case 2:
-                       SH5PCI_WRITE_SHORT(PDR + (where & 2), (u16)val);
-                       break;
-               case 4:
-                       SH5PCI_WRITE(PDR, val);
-                       break;
-       }
-
-       return PCIBIOS_SUCCESSFUL;
-}
-
-static struct pci_ops pci_config_ops = {
-       .read =         sh5pci_read,
-       .write =        sh5pci_write,
-};
-
-/* Everything hangs off this */
-static struct pci_bus *pci_root_bus;
-
-
-static u8 __init no_swizzle(struct pci_dev *dev, u8 * pin)
-{
-       pr_debug("swizzle for dev %d on bus %d slot %d pin is %d\n",
-                dev->devfn,dev->bus->number, PCI_SLOT(dev->devfn),*pin);
-       return PCI_SLOT(dev->devfn);
-}
-
-static inline u8 bridge_swizzle(u8 pin, u8 slot)
-{
-       return (((pin-1) + slot) % 4) + 1;
-}
-
-u8 __init common_swizzle(struct pci_dev *dev, u8 *pinp)
-{
-       if (dev->bus->number != 0) {
-               u8 pin = *pinp;
-               do {
-                       pin = bridge_swizzle(pin, PCI_SLOT(dev->devfn));
-                       /* Move up the chain of bridges. */
-                       dev = dev->bus->self;
-               } while (dev->bus->self);
-               *pinp = pin;
-
-               /* The slot is the slot of the last bridge. */
-       }
-
-       return PCI_SLOT(dev->devfn);
-}
-
-/* This needs to be shunted out of here into the board specific bit */
-
-static int __init map_cayman_irq(struct pci_dev *dev, u8 slot, u8 pin)
-{
-       int result = -1;
-
-       /* The complication here is that the PCI IRQ lines from the Cayman's 2
-          5V slots get into the CPU via a different path from the IRQ lines
-          from the 3 3.3V slots.  Thus, we have to detect whether the card's
-          interrupts go via the 5V or 3.3V path, i.e. the 'bridge swizzling'
-          at the point where we cross from 5V to 3.3V is not the normal case.
-
-          The added complication is that we don't know that the 5V slots are
-          always bus 2, because a card containing a PCI-PCI bridge may be
-          plugged into a 3.3V slot, and this changes the bus numbering.
-
-          Also, the Cayman has an intermediate PCI bus that goes a custom
-          expansion board header (and to the secondary bridge).  This bus has
-          never been used in practice.
-
-          The 1ary onboard PCI-PCI bridge is device 3 on bus 0
-          The 2ary onboard PCI-PCI bridge is device 0 on the 2ary bus of the 1ary bridge.
-          */
-
-       struct slot_pin {
-               int slot;
-               int pin;
-       } path[4];
-       int i=0;
-
-       while (dev->bus->number > 0) {
-
-               slot = path[i].slot = PCI_SLOT(dev->devfn);
-               pin = path[i].pin = bridge_swizzle(pin, slot);
-               dev = dev->bus->self;
-               i++;
-               if (i > 3) panic("PCI path to root bus too long!\n");
-       }
-
-       slot = PCI_SLOT(dev->devfn);
-       /* This is the slot on bus 0 through which the device is eventually
-          reachable. */
-
-       /* Now work back up. */
-       if ((slot < 3) || (i == 0)) {
-               /* Bus 0 (incl. PCI-PCI bridge itself) : perform the final
-                  swizzle now. */
-               result = IRQ_INTA + bridge_swizzle(pin, slot) - 1;
-       } else {
-               i--;
-               slot = path[i].slot;
-               pin  = path[i].pin;
-               if (slot > 0) {
-                       panic("PCI expansion bus device found - not handled!\n");
-               } else {
-                       if (i > 0) {
-                               /* 5V slots */
-                               i--;
-                               slot = path[i].slot;
-                               pin  = path[i].pin;
-                               /* 'pin' was swizzled earlier wrt slot, don't do it again. */
-                               result = IRQ_P2INTA + (pin - 1);
-                       } else {
-                               /* IRQ for 2ary PCI-PCI bridge : unused */
-                               result = -1;
-                       }
-               }
-       }
-
-       return result;
-}
-
-irqreturn_t pcish5_err_irq(int irq, void *dev_id, struct pt_regs *regs)
-{
-       unsigned pci_int, pci_air, pci_cir, pci_aint;
-
-       pci_int = SH5PCI_READ(INT);
-       pci_cir = SH5PCI_READ(CIR);
-       pci_air = SH5PCI_READ(AIR);
-
-       if (pci_int) {
-               printk("PCI INTERRUPT (at %08llx)!\n", regs->pc);
-               printk("PCI INT -> 0x%x\n", pci_int & 0xffff);
-               printk("PCI AIR -> 0x%x\n", pci_air);
-               printk("PCI CIR -> 0x%x\n", pci_cir);
-               SH5PCI_WRITE(INT, ~0);
-       }
-
-       pci_aint = SH5PCI_READ(AINT);
-       if (pci_aint) {
-               printk("PCI ARB INTERRUPT!\n");
-               printk("PCI AINT -> 0x%x\n", pci_aint);
-               printk("PCI AIR -> 0x%x\n", pci_air);
-               printk("PCI CIR -> 0x%x\n", pci_cir);
-               SH5PCI_WRITE(AINT, ~0);
-       }
-
-       return IRQ_HANDLED;
-}
-
-irqreturn_t pcish5_serr_irq(int irq, void *dev_id, struct pt_regs *regs)
-{
-       printk("SERR IRQ\n");
-
-       return IRQ_NONE;
-}
-
-#define ROUND_UP(x, a)         (((x) + (a) - 1) & ~((a) - 1))
-
-static void __init
-pcibios_size_bridge(struct pci_bus *bus, struct resource *ior,
-                   struct resource *memr)
-{
-       struct resource io_res, mem_res;
-       struct pci_dev *dev;
-       struct pci_dev *bridge = bus->self;
-       struct list_head *ln;
-
-       if (!bridge)
-               return; /* host bridge, nothing to do */
-
-       /* set reasonable default locations for pcibios_align_resource */
-       io_res.start = PCIBIOS_MIN_IO;
-       mem_res.start = PCIBIOS_MIN_MEM;
-
-       io_res.end = io_res.start;
-       mem_res.end = mem_res.start;
-
-       /* Collect information about how our direct children are layed out. */
-       for (ln=bus->devices.next; ln != &bus->devices; ln=ln->next) {
-               int i;
-               dev = pci_dev_b(ln);
-
-               /* Skip bridges for now */
-               if (dev->class >> 8 == PCI_CLASS_BRIDGE_PCI)
-                       continue;
-
-               for (i = 0; i < PCI_NUM_RESOURCES; i++) {
-                       struct resource res;
-                       unsigned long size;
-
-                       memcpy(&res, &dev->resource[i], sizeof(res));
-                       size = res.end - res.start + 1;
-
-                       if (res.flags & IORESOURCE_IO) {
-                               res.start = io_res.end;
-                               pcibios_align_resource(dev, &res, size, 0);
-                               io_res.end = res.start + size;
-                       } else if (res.flags & IORESOURCE_MEM) {
-                               res.start = mem_res.end;
-                               pcibios_align_resource(dev, &res, size, 0);
-                               mem_res.end = res.start + size;
-                       }
-               }
-       }
-
-       /* And for all of the subordinate busses. */
-       for (ln=bus->children.next; ln != &bus->children; ln=ln->next)
-               pcibios_size_bridge(pci_bus_b(ln), &io_res, &mem_res);
-
-       /* turn the ending locations into sizes (subtract start) */
-       io_res.end -= io_res.start;
-       mem_res.end -= mem_res.start;
-
-       /* Align the sizes up by bridge rules */
-       io_res.end = ROUND_UP(io_res.end, 4*1024) - 1;
-       mem_res.end = ROUND_UP(mem_res.end, 1*1024*1024) - 1;
-
-       /* Adjust the bridge's allocation requirements */
-       bridge->resource[0].end = bridge->resource[0].start + io_res.end;
-       bridge->resource[1].end = bridge->resource[1].start + mem_res.end;
-
-       bridge->resource[PCI_BRIDGE_RESOURCES].end =
-           bridge->resource[PCI_BRIDGE_RESOURCES].start + io_res.end;
-       bridge->resource[PCI_BRIDGE_RESOURCES+1].end =
-           bridge->resource[PCI_BRIDGE_RESOURCES+1].start + mem_res.end;
-
-       /* adjust parent's resource requirements */
-       if (ior) {
-               ior->end = ROUND_UP(ior->end, 4*1024);
-               ior->end += io_res.end;
-       }
-
-       if (memr) {
-               memr->end = ROUND_UP(memr->end, 1*1024*1024);
-               memr->end += mem_res.end;
-       }
-}
-
-#undef ROUND_UP
-
-static void __init pcibios_size_bridges(void)
-{
-       struct resource io_res, mem_res;
-
-       memset(&io_res, 0, sizeof(io_res));
-       memset(&mem_res, 0, sizeof(mem_res));
-
-       pcibios_size_bridge(pci_root_bus, &io_res, &mem_res);
-}
-
-static int __init pcibios_init(void)
-{
-        if (request_irq(IRQ_ERR, pcish5_err_irq,
-                        SA_INTERRUPT, "PCI Error",NULL) < 0) {
-                printk(KERN_ERR "PCISH5: Cannot hook PCI_PERR interrupt\n");
-                return -EINVAL;
-        }
-
-        if (request_irq(IRQ_SERR, pcish5_serr_irq,
-                        SA_INTERRUPT, "PCI SERR interrupt", NULL) < 0) {
-                printk(KERN_ERR "PCISH5: Cannot hook PCI_SERR interrupt\n");
-                return -EINVAL;
-        }
-
-       /* The pci subsytem needs to know where memory is and how much
-        * of it there is. I've simply made these globals. A better mechanism
-        * is probably needed.
-        */
-       sh5pci_init(__pa(memory_start),
-                    __pa(memory_end) - __pa(memory_start));
-
-       pci_root_bus = pci_scan_bus(0, &pci_config_ops, NULL);
-       pcibios_size_bridges();
-       pci_assign_unassigned_resources();
-       pci_fixup_irqs(no_swizzle, map_cayman_irq);
-
-       return 0;
-}
-
-subsys_initcall(pcibios_init);
-
-void __init pcibios_fixup_bus(struct pci_bus *bus)
-{
-       struct pci_dev *dev = bus->self;
-       int i;
-
-#if 1
-       if(dev) {
-               for(i=0; i<3; i++) {
-                       bus->resource[i] =
-                               &dev->resource[PCI_BRIDGE_RESOURCES+i];
-                       bus->resource[i]->name = bus->name;
-               }
-               bus->resource[0]->flags |= IORESOURCE_IO;
-               bus->resource[1]->flags |= IORESOURCE_MEM;
-
-               /* For now, propogate host limits to the bus;
-                * we'll adjust them later. */
-
-#if 1
-               bus->resource[0]->end = 64*1024 - 1 ;
-               bus->resource[1]->end = PCIBIOS_MIN_MEM+(256*1024*1024)-1;
-               bus->resource[0]->start = PCIBIOS_MIN_IO;
-               bus->resource[1]->start = PCIBIOS_MIN_MEM;
-#else
-               bus->resource[0]->end = 0
-               bus->resource[1]->end = 0
-               bus->resource[0]->start =0
-                 bus->resource[1]->start = 0;
-#endif
-               /* Turn off downstream PF memory address range by default */
-               bus->resource[2]->start = 1024*1024;
-               bus->resource[2]->end = bus->resource[2]->start - 1;
-       }
-#endif
-
-}
-
diff --git a/arch/sh64/kernel/pci_sh5.h b/arch/sh64/kernel/pci_sh5.h
deleted file mode 100644 (file)
index 8f21f5d..0000000
+++ /dev/null
@@ -1,107 +0,0 @@
-/*
- * Copyright (C) 2001 David J. Mckay (david.mckay@st.com)
- *
- * May be copied or modified under the terms of the GNU General Public
- * License.  See linux/COPYING for more information.
- *
- * Defintions for the SH5 PCI hardware.
- */
-
-/* Product ID */
-#define PCISH5_PID             0x350d
-
-/* vendor ID */
-#define PCISH5_VID             0x1054
-
-/* Configuration types */
-#define ST_TYPE0                0x00    /* Configuration cycle type 0 */
-#define ST_TYPE1                0x01    /* Configuration cycle type 1 */
-
-/* VCR data */
-#define PCISH5_VCR_STATUS      0x00
-#define PCISH5_VCR_VERSION     0x08
-
-/*
-** ICR register offsets and bits
-*/
-#define PCISH5_ICR_CR          0x100   /* PCI control register values */
-#define CR_PBAM                 (1<<12)
-#define CR_PFCS                 (1<<11)
-#define CR_FTO                  (1<<10)
-#define CR_PFE                  (1<<9)
-#define CR_TBS                  (1<<8)
-#define CR_SPUE                 (1<<7)
-#define CR_BMAM                 (1<<6)
-#define CR_HOST                 (1<<5)
-#define CR_CLKEN                (1<<4)
-#define CR_SOCS                 (1<<3)
-#define CR_IOCS                 (1<<2)
-#define CR_RSTCTL               (1<<1)
-#define CR_CFINT                (1<<0)
-#define CR_LOCK_MASK            0xa5000000
-
-#define PCISH5_ICR_INT         0x114   /* Interrupt registert values     */
-#define INT_MADIM               (1<<2)
-
-#define PCISH5_ICR_LSR0        0X104   /* Local space register values    */
-#define PCISH5_ICR_LSR1        0X108   /* Local space register values    */
-#define PCISH5_ICR_LAR0        0x10c   /* Local address register values  */
-#define PCISH5_ICR_LAR1        0x110   /* Local address register values  */
-#define PCISH5_ICR_INTM        0x118   /* Interrupt mask register values                         */
-#define PCISH5_ICR_AIR         0x11c   /* Interrupt error address information register values    */
-#define PCISH5_ICR_CIR         0x120   /* Interrupt error command information register values    */
-#define PCISH5_ICR_AINT        0x130   /* Interrupt error arbiter interrupt register values      */
-#define PCISH5_ICR_AINTM       0x134   /* Interrupt error arbiter interrupt mask register values */
-#define PCISH5_ICR_BMIR        0x138   /* Interrupt error info register of bus master values     */
-#define PCISH5_ICR_PAR         0x1c0   /* Pio address register values                            */
-#define PCISH5_ICR_MBR         0x1c4   /* Memory space bank register values                      */
-#define PCISH5_ICR_IOBR        0x1c8   /* I/O space bank register values                         */
-#define PCISH5_ICR_PINT        0x1cc   /* power management interrupt register values             */
-#define PCISH5_ICR_PINTM       0x1d0   /* power management interrupt mask register values        */
-#define PCISH5_ICR_MBMR        0x1d8   /* memory space bank mask register values                 */
-#define PCISH5_ICR_IOBMR       0x1dc   /* I/O space bank mask register values                    */
-#define PCISH5_ICR_CSCR0       0x210   /* PCI cache snoop control register 0                     */
-#define PCISH5_ICR_CSCR1       0x214   /* PCI cache snoop control register 1                     */
-#define PCISH5_ICR_PDR         0x220   /* Pio data register values                               */
-
-/* These are configs space registers */
-#define PCISH5_ICR_CSR_VID     0x000   /* Vendor id                           */
-#define PCISH5_ICR_CSR_DID     0x002   /* Device id                           */
-#define PCISH5_ICR_CSR_CMD     0x004   /* Command register                    */
-#define PCISH5_ICR_CSR_STATUS  0x006   /* Stautus                             */
-#define PCISH5_ICR_CSR_IBAR0   0x010   /* I/O base address register           */
-#define PCISH5_ICR_CSR_MBAR0   0x014   /* First  Memory base address register */
-#define PCISH5_ICR_CSR_MBAR1   0x018   /* Second Memory base address register */
-
-
-
-/* Base address of registers */
-#define SH5PCI_ICR_BASE (PHYS_PCI_BLOCK + 0x00040000)
-#define SH5PCI_IO_BASE  (PHYS_PCI_BLOCK + 0x00800000)
-/* #define SH5PCI_VCR_BASE (P2SEG_PCICB_BLOCK + P2SEG)    */
-
-/* Register selection macro */
-#define PCISH5_ICR_REG(x)                ( pcicr_virt + (PCISH5_ICR_##x))
-/* #define PCISH5_VCR_REG(x)                ( SH5PCI_VCR_BASE (PCISH5_VCR_##x)) */
-
-/* Write I/O functions */
-#define SH5PCI_WRITE(reg,val)        ctrl_outl((u32)(val),PCISH5_ICR_REG(reg))
-#define SH5PCI_WRITE_SHORT(reg,val)  ctrl_outw((u16)(val),PCISH5_ICR_REG(reg))
-#define SH5PCI_WRITE_BYTE(reg,val)   ctrl_outb((u8)(val),PCISH5_ICR_REG(reg))
-
-/* Read I/O functions */
-#define SH5PCI_READ(reg)             ctrl_inl(PCISH5_ICR_REG(reg))
-#define SH5PCI_READ_SHORT(reg)       ctrl_inw(PCISH5_ICR_REG(reg))
-#define SH5PCI_READ_BYTE(reg)        ctrl_inb(PCISH5_ICR_REG(reg))
-
-/* Set PCI config bits */
-#define SET_CONFIG_BITS(bus,devfn,where)  ((((bus) << 16) | ((devfn) << 8) | ((where) & ~3)) | 0x80000000)
-
-/* Set PCI command register */
-#define CONFIG_CMD(bus, devfn, where)            SET_CONFIG_BITS(bus->number,devfn,where)
-
-/* Size converters */
-#define PCISH5_MEM_SIZCONV(x)            (((x / 0x40000) - 1) << 18)
-#define PCISH5_IO_SIZCONV(x)             (((x / 0x40000) - 1) << 18)
-
-
diff --git a/arch/sh64/kernel/pcibios.c b/arch/sh64/kernel/pcibios.c
deleted file mode 100644 (file)
index bc4ef39..0000000
+++ /dev/null
@@ -1,168 +0,0 @@
-/*
- * $Id: pcibios.c,v 1.1 2001/08/24 12:38:19 dwmw2 Exp $
- *
- * arch/sh/kernel/pcibios.c
- *
- * Copyright (C) 2002 STMicroelectronics Limited
- *   Author : David J. McKay
- *
- * Copyright (C) 2004 Richard Curnow, SuperH UK Limited
- *
- * 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.
- * This is GPL'd.
- *
- * Provided here are generic versions of:
- *     pcibios_update_resource()
- *     pcibios_align_resource()
- *     pcibios_enable_device()
- *     pcibios_set_master()
- *     pcibios_update_irq()
- *
- * These functions are collected here to reduce duplication of common
- * code amongst the many platform-specific PCI support code files.
- *
- * Platform-specific files are expected to provide:
- *     pcibios_fixup_bus()
- *     pcibios_init()
- *     pcibios_setup()
- *     pcibios_fixup_pbus_ranges()
- */
-
-#include <linux/kernel.h>
-#include <linux/pci.h>
-#include <linux/init.h>
-
-void
-pcibios_update_resource(struct pci_dev *dev, struct resource *root,
-                       struct resource *res, int resource)
-{
-       u32 new, check;
-       int reg;
-
-       new = res->start | (res->flags & PCI_REGION_FLAG_MASK);
-       if (resource < 6) {
-               reg = PCI_BASE_ADDRESS_0 + 4*resource;
-       } else if (resource == PCI_ROM_RESOURCE) {
-               res->flags |= PCI_ROM_ADDRESS_ENABLE;
-               new |= PCI_ROM_ADDRESS_ENABLE;
-               reg = dev->rom_base_reg;
-       } else {
-               /* Somebody might have asked allocation of a non-standard resource */
-               return;
-       }
-
-       pci_write_config_dword(dev, reg, new);
-       pci_read_config_dword(dev, reg, &check);
-       if ((new ^ check) & ((new & PCI_BASE_ADDRESS_SPACE_IO) ? PCI_BASE_ADDRESS_IO_MASK : PCI_BASE_ADDRESS_MEM_MASK)) {
-               printk(KERN_ERR "PCI: Error while updating region "
-                      "%s/%d (%08x != %08x)\n", dev->slot_name, resource,
-                      new, check);
-       }
-}
-
-/*
- * We need to avoid collisions with `mirrored' VGA ports
- * and other strange ISA hardware, so we always want the
- * addresses to be allocated in the 0x000-0x0ff region
- * modulo 0x400.
- */
-void pcibios_align_resource(void *data, struct resource *res,
-                           unsigned long size, unsigned long align)
-{
-       if (res->flags & IORESOURCE_IO) {
-               unsigned long start = res->start;
-
-               if (start & 0x300) {
-                       start = (start + 0x3ff) & ~0x3ff;
-                       res->start = start;
-               }
-       }
-}
-
-static void pcibios_enable_bridge(struct pci_dev *dev)
-{
-       struct pci_bus *bus = dev->subordinate;
-       u16 cmd, old_cmd;
-
-       pci_read_config_word(dev, PCI_COMMAND, &cmd);
-       old_cmd = cmd;
-
-       if (bus->resource[0]->flags & IORESOURCE_IO) {
-               cmd |= PCI_COMMAND_IO;
-       }
-       if ((bus->resource[1]->flags & IORESOURCE_MEM) ||
-           (bus->resource[2]->flags & IORESOURCE_PREFETCH)) {
-               cmd |= PCI_COMMAND_MEMORY;
-       }
-
-       if (cmd != old_cmd) {
-               pci_write_config_word(dev, PCI_COMMAND, cmd);
-       }
-
-       printk("PCI bridge %s, command register -> %04x\n",
-               pci_name(dev), cmd);
-
-}
-
-
-
-int pcibios_enable_device(struct pci_dev *dev, int mask)
-{
-       u16 cmd, old_cmd;
-       int idx;
-       struct resource *r;
-
-       if ((dev->class >> 8) == PCI_CLASS_BRIDGE_PCI) {
-               pcibios_enable_bridge(dev);
-       }
-
-       pci_read_config_word(dev, PCI_COMMAND, &cmd);
-       old_cmd = cmd;
-       for(idx=0; idx<6; idx++) {
-               if (!(mask & (1 << idx)))
-                       continue;
-               r = &dev->resource[idx];
-               if (!r->start && r->end) {
-                       printk(KERN_ERR "PCI: Device %s not available because of resource collisions\n", dev->slot_name);
-                       return -EINVAL;
-               }
-               if (r->flags & IORESOURCE_IO)
-                       cmd |= PCI_COMMAND_IO;
-               if (r->flags & IORESOURCE_MEM)
-                       cmd |= PCI_COMMAND_MEMORY;
-       }
-       if (dev->resource[PCI_ROM_RESOURCE].start)
-               cmd |= PCI_COMMAND_MEMORY;
-       if (cmd != old_cmd) {
-               printk(KERN_INFO "PCI: Enabling device %s (%04x -> %04x)\n", pci_name(dev), old_cmd, cmd);
-               pci_write_config_word(dev, PCI_COMMAND, cmd);
-       }
-       return 0;
-}
-
-/*
- *  If we set up a device for bus mastering, we need to check and set
- *  the latency timer as it may not be properly set.
- */
-unsigned int pcibios_max_latency = 255;
-
-void pcibios_set_master(struct pci_dev *dev)
-{
-       u8 lat;
-       pci_read_config_byte(dev, PCI_LATENCY_TIMER, &lat);
-       if (lat < 16)
-               lat = (64 <= pcibios_max_latency) ? 64 : pcibios_max_latency;
-       else if (lat > pcibios_max_latency)
-               lat = pcibios_max_latency;
-       else
-               return;
-       printk(KERN_INFO "PCI: Setting latency timer of device %s to %d\n", pci_name(dev), lat);
-       pci_write_config_byte(dev, PCI_LATENCY_TIMER, lat);
-}
-
-void __init pcibios_update_irq(struct pci_dev *dev, int irq)
-{
-       pci_write_config_byte(dev, PCI_INTERRUPT_LINE, irq);
-}
diff --git a/arch/sh64/kernel/process.c b/arch/sh64/kernel/process.c
deleted file mode 100644 (file)
index f9e8227..0000000
+++ /dev/null
@@ -1,963 +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.
- *
- * arch/sh64/kernel/process.c
- *
- * Copyright (C) 2000, 2001  Paolo Alberelli
- * Copyright (C) 2003  Paul Mundt
- * Copyright (C) 2003, 2004 Richard Curnow
- *
- * Started from SH3/4 version:
- *   Copyright (C) 1999, 2000  Niibe Yutaka & Kaz Kojima
- *
- *   In turn started from i386 version:
- *     Copyright (C) 1995  Linus Torvalds
- *
- */
-
-/*
- * This file handles the architecture-dependent parts of process handling..
- */
-
-/* Temporary flags/tests. All to be removed/undefined. BEGIN */
-#define IDLE_TRACE
-#define VM_SHOW_TABLES
-#define VM_TEST_FAULT
-#define VM_TEST_RTLBMISS
-#define VM_TEST_WTLBMISS
-
-#undef VM_SHOW_TABLES
-#undef IDLE_TRACE
-/* Temporary flags/tests. All to be removed/undefined. END */
-
-#define __KERNEL_SYSCALLS__
-#include <stdarg.h>
-
-#include <linux/config.h>
-#include <linux/kernel.h>
-#include <linux/rwsem.h>
-#include <linux/mm.h>
-#include <linux/smp.h>
-#include <linux/smp_lock.h>
-#include <linux/ptrace.h>
-#include <linux/slab.h>
-#include <linux/vmalloc.h>
-#include <linux/user.h>
-#include <linux/a.out.h>
-#include <linux/interrupt.h>
-#include <linux/unistd.h>
-#include <linux/delay.h>
-#include <linux/reboot.h>
-#include <linux/init.h>
-
-#include <asm/uaccess.h>
-#include <asm/pgtable.h>
-#include <asm/system.h>
-#include <asm/io.h>
-#include <asm/processor.h>             /* includes also <asm/registers.h> */
-#include <asm/mmu_context.h>
-#include <asm/elf.h>
-#include <asm/page.h>
-
-#include <linux/irq.h>
-
-struct task_struct *last_task_used_math = NULL;
-
-#ifdef IDLE_TRACE
-#ifdef VM_SHOW_TABLES
-/* For testing */
-static void print_PTE(long base)
-{
-       int i, skip=0;
-       long long x, y, *p = (long long *) base;
-
-       for (i=0; i< 512; i++, p++){
-               if (*p == 0) {
-                       if (!skip) {
-                               skip++;
-                               printk("(0s) ");
-                       }
-               } else {
-                       skip=0;
-                       x = (*p) >> 32;
-                       y = (*p) & 0xffffffff;
-                       printk("%08Lx%08Lx ", x, y);
-                       if (!((i+1)&0x3)) printk("\n");
-               }
-       }
-}
-
-/* For testing */
-static void print_DIR(long base)
-{
-       int i, skip=0;
-       long *p = (long *) base;
-
-       for (i=0; i< 512; i++, p++){
-               if (*p == 0) {
-                       if (!skip) {
-                               skip++;
-                               printk("(0s) ");
-                       }
-               } else {
-                       skip=0;
-                       printk("%08lx ", *p);
-                       if (!((i+1)&0x7)) printk("\n");
-               }
-       }
-}
-
-/* For testing */
-static void print_vmalloc_first_tables(void)
-{
-
-#define PRESENT        0x800   /* Bit 11 */
-
-       /*
-        * Do it really dirty by looking at raw addresses,
-         * raw offsets, no types. If we used pgtable/pgalloc
-        * macros/definitions we could hide potential bugs.
-        *
-        * Note that pointers are 32-bit for CDC.
-        */
-       long pgdt, pmdt, ptet;
-
-       pgdt = (long) &swapper_pg_dir;
-       printk("-->PGD (0x%08lx):\n", pgdt);
-       print_DIR(pgdt);
-       printk("\n");
-
-       /* VMALLOC pool is mapped at 0xc0000000, second (pointer) entry in PGD */
-       pgdt += 4;
-       pmdt = (long) (* (long *) pgdt);
-       if (!(pmdt & PRESENT)) {
-               printk("No PMD\n");
-               return;
-       } else pmdt &= 0xfffff000;
-
-       printk("-->PMD (0x%08lx):\n", pmdt);
-       print_DIR(pmdt);
-       printk("\n");
-
-       /* Get the pmdt displacement for 0xc0000000 */
-       pmdt += 2048;
-
-       /* just look at first two address ranges ... */
-        /* ... 0xc0000000 ... */
-       ptet = (long) (* (long *) pmdt);
-       if (!(ptet & PRESENT)) {
-               printk("No PTE0\n");
-               return;
-       } else ptet &= 0xfffff000;
-
-       printk("-->PTE0 (0x%08lx):\n", ptet);
-       print_PTE(ptet);
-       printk("\n");
-
-        /* ... 0xc0001000 ... */
-       ptet += 4;
-       if (!(ptet & PRESENT)) {
-               printk("No PTE1\n");
-               return;
-       } else ptet &= 0xfffff000;
-       printk("-->PTE1 (0x%08lx):\n", ptet);
-       print_PTE(ptet);
-       printk("\n");
-}
-#else
-#define print_vmalloc_first_tables()
-#endif /* VM_SHOW_TABLES */
-
-static void test_VM(void)
-{
-       void *a, *b, *c;
-
-#ifdef VM_SHOW_TABLES
-       printk("Initial PGD/PMD/PTE\n");
-#endif
-        print_vmalloc_first_tables();
-
-       printk("Allocating 2 bytes\n");
-       a = vmalloc(2);
-        print_vmalloc_first_tables();
-
-       printk("Allocating 4100 bytes\n");
-       b = vmalloc(4100);
-        print_vmalloc_first_tables();
-
-       printk("Allocating 20234 bytes\n");
-       c = vmalloc(20234);
-        print_vmalloc_first_tables();
-
-#ifdef VM_TEST_FAULT
-       /* Here you may want to fault ! */
-
-#ifdef VM_TEST_RTLBMISS
-       printk("Ready to fault upon read.\n");
-       if (* (char *) a) {
-               printk("RTLBMISSed on area a !\n");
-       }
-       printk("RTLBMISSed on area a !\n");
-#endif
-
-#ifdef VM_TEST_WTLBMISS
-       printk("Ready to fault upon write.\n");
-       *((char *) b) = 'L';
-       printk("WTLBMISSed on area b !\n");
-#endif
-
-#endif /* VM_TEST_FAULT */
-
-       printk("Deallocating the 4100 byte chunk\n");
-       vfree(b);
-        print_vmalloc_first_tables();
-
-       printk("Deallocating the 2 byte chunk\n");
-       vfree(a);
-        print_vmalloc_first_tables();
-
-       printk("Deallocating the last chunk\n");
-       vfree(c);
-        print_vmalloc_first_tables();
-}
-
-extern unsigned long volatile jiffies;
-int once = 0;
-unsigned long old_jiffies;
-int pid = -1, pgid = -1;
-
-void idle_trace(void)
-{
-
-       _syscall0(int, getpid)
-       _syscall1(int, getpgid, int, pid)
-
-       if (!once) {
-               /* VM allocation/deallocation simple test */
-               test_VM();
-               pid = getpid();
-
-               printk("Got all through to Idle !!\n");
-               printk("I'm now going to loop forever ...\n");
-               printk("Any ! below is a timer tick.\n");
-               printk("Any . below is a getpgid system call from pid = %d.\n", pid);
-
-
-               old_jiffies = jiffies;
-               once++;
-       }
-
-       if (old_jiffies != jiffies) {
-               old_jiffies = jiffies - old_jiffies;
-               switch (old_jiffies) {
-               case 1:
-                       printk("!");
-                       break;
-               case 2:
-                       printk("!!");
-                       break;
-               case 3:
-                       printk("!!!");
-                       break;
-               case 4:
-                       printk("!!!!");
-                       break;
-               default:
-                       printk("(%d!)", (int) old_jiffies);
-               }
-               old_jiffies = jiffies;
-       }
-       pgid = getpgid(pid);
-       printk(".");
-}
-#else
-#define idle_trace()   do { } while (0)
-#endif /* IDLE_TRACE */
-
-static int hlt_counter = 1;
-
-#define HARD_IDLE_TIMEOUT (HZ / 3)
-
-void disable_hlt(void)
-{
-       hlt_counter++;
-}
-
-void enable_hlt(void)
-{
-       hlt_counter--;
-}
-
-static int __init nohlt_setup(char *__unused)
-{
-       hlt_counter = 1;
-       return 1;
-}
-
-static int __init hlt_setup(char *__unused)
-{
-       hlt_counter = 0;
-       return 1;
-}
-
-__setup("nohlt", nohlt_setup);
-__setup("hlt", hlt_setup);
-
-static inline void hlt(void)
-{
-       if (hlt_counter)
-               return;
-
-       __asm__ __volatile__ ("sleep" : : : "memory");
-}
-
-/*
- * The idle loop on a uniprocessor SH..
- */
-void default_idle(void)
-{
-       /* endless idle loop with no priority at all */
-       while (1) {
-               if (hlt_counter) {
-                       while (1)
-                               if (need_resched())
-                                       break;
-               } else {
-                       local_irq_disable();
-                       while (!need_resched()) {
-                               local_irq_enable();
-                               idle_trace();
-                               hlt();
-                               local_irq_disable();
-                       }
-                       local_irq_enable();
-               }
-               schedule();
-       }
-}
-
-void cpu_idle(void *unused)
-{
-       default_idle();
-}
-
-void machine_restart(char * __unused)
-{
-       extern void phys_stext(void);
-
-       phys_stext();
-}
-
-void machine_halt(void)
-{
-       for (;;);
-}
-
-void machine_power_off(void)
-{
-       extern void enter_deep_standby(void);
-
-       enter_deep_standby();
-}
-
-void show_regs(struct pt_regs * regs)
-{
-       unsigned long long ah, al, bh, bl, ch, cl;
-
-       printk("\n");
-
-       ah = (regs->pc) >> 32;
-       al = (regs->pc) & 0xffffffff;
-       bh = (regs->regs[18]) >> 32;
-       bl = (regs->regs[18]) & 0xffffffff;
-       ch = (regs->regs[15]) >> 32;
-       cl = (regs->regs[15]) & 0xffffffff;
-       printk("PC  : %08Lx%08Lx LINK: %08Lx%08Lx SP  : %08Lx%08Lx\n",
-              ah, al, bh, bl, ch, cl);
-
-       ah = (regs->sr) >> 32;
-       al = (regs->sr) & 0xffffffff;
-        asm volatile ("getcon   " __TEA ", %0" : "=r" (bh));
-        asm volatile ("getcon   " __TEA ", %0" : "=r" (bl));
-       bh = (bh) >> 32;
-       bl = (bl) & 0xffffffff;
-        asm volatile ("getcon   " __KCR0 ", %0" : "=r" (ch));
-        asm volatile ("getcon   " __KCR0 ", %0" : "=r" (cl));
-       ch = (ch) >> 32;
-       cl = (cl) & 0xffffffff;
-       printk("SR  : %08Lx%08Lx TEA : %08Lx%08Lx KCR0: %08Lx%08Lx\n",
-              ah, al, bh, bl, ch, cl);
-
-       ah = (regs->regs[0]) >> 32;
-       al = (regs->regs[0]) & 0xffffffff;
-       bh = (regs->regs[1]) >> 32;
-       bl = (regs->regs[1]) & 0xffffffff;
-       ch = (regs->regs[2]) >> 32;
-       cl = (regs->regs[2]) & 0xffffffff;
-       printk("R0  : %08Lx%08Lx R1  : %08Lx%08Lx R2  : %08Lx%08Lx\n",
-              ah, al, bh, bl, ch, cl);
-
-       ah = (regs->regs[3]) >> 32;
-       al = (regs->regs[3]) & 0xffffffff;
-       bh = (regs->regs[4]) >> 32;
-       bl = (regs->regs[4]) & 0xffffffff;
-       ch = (regs->regs[5]) >> 32;
-       cl = (regs->regs[5]) & 0xffffffff;
-       printk("R3  : %08Lx%08Lx R4  : %08Lx%08Lx R5  : %08Lx%08Lx\n",
-              ah, al, bh, bl, ch, cl);
-
-       ah = (regs->regs[6]) >> 32;
-       al = (regs->regs[6]) & 0xffffffff;
-       bh = (regs->regs[7]) >> 32;
-       bl = (regs->regs[7]) & 0xffffffff;
-       ch = (regs->regs[8]) >> 32;
-       cl = (regs->regs[8]) & 0xffffffff;
-       printk("R6  : %08Lx%08Lx R7  : %08Lx%08Lx R8  : %08Lx%08Lx\n",
-              ah, al, bh, bl, ch, cl);
-
-       ah = (regs->regs[9]) >> 32;
-       al = (regs->regs[9]) & 0xffffffff;
-       bh = (regs->regs[10]) >> 32;
-       bl = (regs->regs[10]) & 0xffffffff;
-       ch = (regs->regs[11]) >> 32;
-       cl = (regs->regs[11]) & 0xffffffff;
-       printk("R9  : %08Lx%08Lx R10 : %08Lx%08Lx R11 : %08Lx%08Lx\n",
-              ah, al, bh, bl, ch, cl);
-
-       ah = (regs->regs[12]) >> 32;
-       al = (regs->regs[12]) & 0xffffffff;
-       bh = (regs->regs[13]) >> 32;
-       bl = (regs->regs[13]) & 0xffffffff;
-       ch = (regs->regs[14]) >> 32;
-       cl = (regs->regs[14]) & 0xffffffff;
-       printk("R12 : %08Lx%08Lx R13 : %08Lx%08Lx R14 : %08Lx%08Lx\n",
-              ah, al, bh, bl, ch, cl);
-
-       ah = (regs->regs[16]) >> 32;
-       al = (regs->regs[16]) & 0xffffffff;
-       bh = (regs->regs[17]) >> 32;
-       bl = (regs->regs[17]) & 0xffffffff;
-       ch = (regs->regs[19]) >> 32;
-       cl = (regs->regs[19]) & 0xffffffff;
-       printk("R16 : %08Lx%08Lx R17 : %08Lx%08Lx R19 : %08Lx%08Lx\n",
-              ah, al, bh, bl, ch, cl);
-
-       ah = (regs->regs[20]) >> 32;
-       al = (regs->regs[20]) & 0xffffffff;
-       bh = (regs->regs[21]) >> 32;
-       bl = (regs->regs[21]) & 0xffffffff;
-       ch = (regs->regs[22]) >> 32;
-       cl = (regs->regs[22]) & 0xffffffff;
-       printk("R20 : %08Lx%08Lx R21 : %08Lx%08Lx R22 : %08Lx%08Lx\n",
-              ah, al, bh, bl, ch, cl);
-
-       ah = (regs->regs[23]) >> 32;
-       al = (regs->regs[23]) & 0xffffffff;
-       bh = (regs->regs[24]) >> 32;
-       bl = (regs->regs[24]) & 0xffffffff;
-       ch = (regs->regs[25]) >> 32;
-       cl = (regs->regs[25]) & 0xffffffff;
-       printk("R23 : %08Lx%08Lx R24 : %08Lx%08Lx R25 : %08Lx%08Lx\n",
-              ah, al, bh, bl, ch, cl);
-
-       ah = (regs->regs[26]) >> 32;
-       al = (regs->regs[26]) & 0xffffffff;
-       bh = (regs->regs[27]) >> 32;
-       bl = (regs->regs[27]) & 0xffffffff;
-       ch = (regs->regs[28]) >> 32;
-       cl = (regs->regs[28]) & 0xffffffff;
-       printk("R26 : %08Lx%08Lx R27 : %08Lx%08Lx R28 : %08Lx%08Lx\n",
-              ah, al, bh, bl, ch, cl);
-
-       ah = (regs->regs[29]) >> 32;
-       al = (regs->regs[29]) & 0xffffffff;
-       bh = (regs->regs[30]) >> 32;
-       bl = (regs->regs[30]) & 0xffffffff;
-       ch = (regs->regs[31]) >> 32;
-       cl = (regs->regs[31]) & 0xffffffff;
-       printk("R29 : %08Lx%08Lx R30 : %08Lx%08Lx R31 : %08Lx%08Lx\n",
-              ah, al, bh, bl, ch, cl);
-
-       ah = (regs->regs[32]) >> 32;
-       al = (regs->regs[32]) & 0xffffffff;
-       bh = (regs->regs[33]) >> 32;
-       bl = (regs->regs[33]) & 0xffffffff;
-       ch = (regs->regs[34]) >> 32;
-       cl = (regs->regs[34]) & 0xffffffff;
-       printk("R32 : %08Lx%08Lx R33 : %08Lx%08Lx R34 : %08Lx%08Lx\n",
-              ah, al, bh, bl, ch, cl);
-
-       ah = (regs->regs[35]) >> 32;
-       al = (regs->regs[35]) & 0xffffffff;
-       bh = (regs->regs[36]) >> 32;
-       bl = (regs->regs[36]) & 0xffffffff;
-       ch = (regs->regs[37]) >> 32;
-       cl = (regs->regs[37]) & 0xffffffff;
-       printk("R35 : %08Lx%08Lx R36 : %08Lx%08Lx R37 : %08Lx%08Lx\n",
-              ah, al, bh, bl, ch, cl);
-
-       ah = (regs->regs[38]) >> 32;
-       al = (regs->regs[38]) & 0xffffffff;
-       bh = (regs->regs[39]) >> 32;
-       bl = (regs->regs[39]) & 0xffffffff;
-       ch = (regs->regs[40]) >> 32;
-       cl = (regs->regs[40]) & 0xffffffff;
-       printk("R38 : %08Lx%08Lx R39 : %08Lx%08Lx R40 : %08Lx%08Lx\n",
-              ah, al, bh, bl, ch, cl);
-
-       ah = (regs->regs[41]) >> 32;
-       al = (regs->regs[41]) & 0xffffffff;
-       bh = (regs->regs[42]) >> 32;
-       bl = (regs->regs[42]) & 0xffffffff;
-       ch = (regs->regs[43]) >> 32;
-       cl = (regs->regs[43]) & 0xffffffff;
-       printk("R41 : %08Lx%08Lx R42 : %08Lx%08Lx R43 : %08Lx%08Lx\n",
-              ah, al, bh, bl, ch, cl);
-
-       ah = (regs->regs[44]) >> 32;
-       al = (regs->regs[44]) & 0xffffffff;
-       bh = (regs->regs[45]) >> 32;
-       bl = (regs->regs[45]) & 0xffffffff;
-       ch = (regs->regs[46]) >> 32;
-       cl = (regs->regs[46]) & 0xffffffff;
-       printk("R44 : %08Lx%08Lx R45 : %08Lx%08Lx R46 : %08Lx%08Lx\n",
-              ah, al, bh, bl, ch, cl);
-
-       ah = (regs->regs[47]) >> 32;
-       al = (regs->regs[47]) & 0xffffffff;
-       bh = (regs->regs[48]) >> 32;
-       bl = (regs->regs[48]) & 0xffffffff;
-       ch = (regs->regs[49]) >> 32;
-       cl = (regs->regs[49]) & 0xffffffff;
-       printk("R47 : %08Lx%08Lx R48 : %08Lx%08Lx R49 : %08Lx%08Lx\n",
-              ah, al, bh, bl, ch, cl);
-
-       ah = (regs->regs[50]) >> 32;
-       al = (regs->regs[50]) & 0xffffffff;
-       bh = (regs->regs[51]) >> 32;
-       bl = (regs->regs[51]) & 0xffffffff;
-       ch = (regs->regs[52]) >> 32;
-       cl = (regs->regs[52]) & 0xffffffff;
-       printk("R50 : %08Lx%08Lx R51 : %08Lx%08Lx R52 : %08Lx%08Lx\n",
-              ah, al, bh, bl, ch, cl);
-
-       ah = (regs->regs[53]) >> 32;
-       al = (regs->regs[53]) & 0xffffffff;
-       bh = (regs->regs[54]) >> 32;
-       bl = (regs->regs[54]) & 0xffffffff;
-       ch = (regs->regs[55]) >> 32;
-       cl = (regs->regs[55]) & 0xffffffff;
-       printk("R53 : %08Lx%08Lx R54 : %08Lx%08Lx R55 : %08Lx%08Lx\n",
-              ah, al, bh, bl, ch, cl);
-
-       ah = (regs->regs[56]) >> 32;
-       al = (regs->regs[56]) & 0xffffffff;
-       bh = (regs->regs[57]) >> 32;
-       bl = (regs->regs[57]) & 0xffffffff;
-       ch = (regs->regs[58]) >> 32;
-       cl = (regs->regs[58]) & 0xffffffff;
-       printk("R56 : %08Lx%08Lx R57 : %08Lx%08Lx R58 : %08Lx%08Lx\n",
-              ah, al, bh, bl, ch, cl);
-
-       ah = (regs->regs[59]) >> 32;
-       al = (regs->regs[59]) & 0xffffffff;
-       bh = (regs->regs[60]) >> 32;
-       bl = (regs->regs[60]) & 0xffffffff;
-       ch = (regs->regs[61]) >> 32;
-       cl = (regs->regs[61]) & 0xffffffff;
-       printk("R59 : %08Lx%08Lx R60 : %08Lx%08Lx R61 : %08Lx%08Lx\n",
-              ah, al, bh, bl, ch, cl);
-
-       ah = (regs->regs[62]) >> 32;
-       al = (regs->regs[62]) & 0xffffffff;
-       bh = (regs->tregs[0]) >> 32;
-       bl = (regs->tregs[0]) & 0xffffffff;
-       ch = (regs->tregs[1]) >> 32;
-       cl = (regs->tregs[1]) & 0xffffffff;
-       printk("R62 : %08Lx%08Lx T0  : %08Lx%08Lx T1  : %08Lx%08Lx\n",
-              ah, al, bh, bl, ch, cl);
-
-       ah = (regs->tregs[2]) >> 32;
-       al = (regs->tregs[2]) & 0xffffffff;
-       bh = (regs->tregs[3]) >> 32;
-       bl = (regs->tregs[3]) & 0xffffffff;
-       ch = (regs->tregs[4]) >> 32;
-       cl = (regs->tregs[4]) & 0xffffffff;
-       printk("T2  : %08Lx%08Lx T3  : %08Lx%08Lx T4  : %08Lx%08Lx\n",
-              ah, al, bh, bl, ch, cl);
-
-       ah = (regs->tregs[5]) >> 32;
-       al = (regs->tregs[5]) & 0xffffffff;
-       bh = (regs->tregs[6]) >> 32;
-       bl = (regs->tregs[6]) & 0xffffffff;
-       ch = (regs->tregs[7]) >> 32;
-       cl = (regs->tregs[7]) & 0xffffffff;
-       printk("T5  : %08Lx%08Lx T6  : %08Lx%08Lx T7  : %08Lx%08Lx\n",
-              ah, al, bh, bl, ch, cl);
-
-       /*
-        * If we're in kernel mode, dump the stack too..
-        */
-       if (!user_mode(regs)) {
-               void show_stack(struct task_struct *tsk, unsigned long *sp);
-               unsigned long sp = regs->regs[15] & 0xffffffff;
-               struct task_struct *tsk = get_current();
-
-               tsk->thread.kregs = regs;
-
-               show_stack(tsk, (unsigned long *)sp);
-       }
-}
-
-struct task_struct * alloc_task_struct(void)
-{
-       /* Get task descriptor pages */
-       return (struct task_struct *)
-               __get_free_pages(GFP_KERNEL, get_order(THREAD_SIZE));
-}
-
-void free_task_struct(struct task_struct *p)
-{
-       free_pages((unsigned long) p, get_order(THREAD_SIZE));
-}
-
-/*
- * Create a kernel thread
- */
-
-/*
- * This is the mechanism for creating a new kernel thread.
- *
- * NOTE! Only a kernel-only process(ie the swapper or direct descendants
- * who haven't done an "execve()") should use this: it will work within
- * a system call from a "real" process, but the process memory space will
- * not be free'd until both the parent and the child have exited.
- */
-int kernel_thread(int (*fn)(void *), void * arg, unsigned long flags)
-{
-       /* A bit less processor dependent than older sh ... */
-
-       unsigned int reply;
-
-static __inline__ _syscall2(int,clone,unsigned long,flags,unsigned long,newsp)
-static __inline__ _syscall1(int,exit,int,ret)
-
-       reply = clone(flags | CLONE_VM, 0);
-       if (!reply) {
-               /* Child */
-               reply = exit(fn(arg));
-       }
-
-       return reply;
-}
-
-/*
- * Free current thread data structures etc..
- */
-void exit_thread(void)
-{
-       /* See arch/sparc/kernel/process.c for the precedent for doing this -- RPC.
-
-          The SH-5 FPU save/restore approach relies on last_task_used_math
-          pointing to a live task_struct.  When another task tries to use the
-          FPU for the 1st time, the FPUDIS trap handling (see
-          arch/sh64/kernel/fpu.c) will save the existing FPU state to the
-          FP regs field within last_task_used_math before re-loading the new
-          task's FPU state (or initialising it if the FPU has been used
-          before).  So if last_task_used_math is stale, and its page has already been
-          re-allocated for another use, the consequences are rather grim. Unless we
-          null it here, there is no other path through which it would get safely
-          nulled. */
-
-#ifndef CONFIG_NOFPU_SUPPORT
-       if (last_task_used_math == current) {
-               last_task_used_math = NULL;
-       }
-#endif
-}
-
-void flush_thread(void)
-{
-
-       /* Called by fs/exec.c (flush_old_exec) to remove traces of a
-        * previously running executable. */
-#ifndef CONFIG_NOFPU_SUPPORT
-       if (last_task_used_math == current) {
-               last_task_used_math = NULL;
-       }
-       /* Force FPU state to be reinitialised after exec */
-       current->used_math = 0;
-#endif
-
-       /* if we are a kernel thread, about to change to user thread,
-         * update kreg
-         */
-       if(current->thread.kregs==&fake_swapper_regs) {
-          current->thread.kregs =
-             ((struct pt_regs *)(THREAD_SIZE + (unsigned long) current) - 1);
-         current->thread.uregs = current->thread.kregs;
-       }
-}
-
-void release_thread(struct task_struct *dead_task)
-{
-       /* do nothing */
-}
-
-/* Fill in the fpu structure for a core dump.. */
-int dump_fpu(struct pt_regs *regs, elf_fpregset_t *fpu)
-{
-#ifndef CONFIG_NOFPU_SUPPORT
-       int fpvalid;
-       struct task_struct *tsk = current;
-
-       fpvalid = tsk->used_math;
-       if (fpvalid) {
-               if (current == last_task_used_math) {
-                       grab_fpu();
-                       fpsave(&tsk->thread.fpu.hard);
-                       release_fpu();
-                       last_task_used_math = 0;
-                       regs->sr |= SR_FD;
-               }
-
-               memcpy(fpu, &tsk->thread.fpu.hard, sizeof(*fpu));
-       }
-
-       return fpvalid;
-#else
-       return 0; /* Task didn't use the fpu at all. */
-#endif
-}
-
-asmlinkage void ret_from_fork(void);
-
-int copy_thread(int nr, unsigned long clone_flags, unsigned long usp,
-               unsigned long unused,
-               struct task_struct *p, struct pt_regs *regs)
-{
-       struct pt_regs *childregs;
-       unsigned long long se;                  /* Sign extension */
-
-#ifndef CONFIG_NOFPU_SUPPORT
-       if(last_task_used_math == current) {
-               grab_fpu();
-               fpsave(&current->thread.fpu.hard);
-               release_fpu();
-               last_task_used_math = NULL;
-               regs->sr |= SR_FD;
-       }
-#endif
-       /* Copy from sh version */
-       childregs = ((struct pt_regs *)(THREAD_SIZE + (unsigned long) p->thread_info )) - 1;
-
-       *childregs = *regs;
-
-       if (user_mode(regs)) {
-               childregs->regs[15] = usp;
-               p->thread.uregs = childregs;
-       } else {
-               childregs->regs[15] = (unsigned long)p->thread_info + THREAD_SIZE;
-       }
-
-       childregs->regs[9] = 0; /* Set return value for child */
-       childregs->sr |= SR_FD; /* Invalidate FPU flag */
-
-       /* From sh */
-       p->set_child_tid = p->clear_child_tid = NULL;
-
-       p->thread.sp = (unsigned long) childregs;
-       p->thread.pc = (unsigned long) ret_from_fork;
-
-       /*
-        * Sign extend the edited stack.
-         * Note that thread.pc and thread.pc will stay
-        * 32-bit wide and context switch must take care
-        * of NEFF sign extension.
-        */
-
-       se = childregs->regs[15];
-       se = (se & NEFF_SIGN) ? (se | NEFF_MASK) : se;
-       childregs->regs[15] = se;
-
-       return 0;
-}
-
-/*
- * fill in the user structure for a core dump..
- */
-void dump_thread(struct pt_regs * regs, struct user * dump)
-{
-       dump->magic = CMAGIC;
-       dump->start_code = current->mm->start_code;
-       dump->start_data  = current->mm->start_data;
-       dump->start_stack = regs->regs[15] & ~(PAGE_SIZE - 1);
-       dump->u_tsize = (current->mm->end_code - dump->start_code) >> PAGE_SHIFT;
-       dump->u_dsize = (current->mm->brk + (PAGE_SIZE-1) - dump->start_data) >> PAGE_SHIFT;
-       dump->u_ssize = (current->mm->start_stack - dump->start_stack +
-                        PAGE_SIZE - 1) >> PAGE_SHIFT;
-       /* Debug registers will come here. */
-
-       dump->regs = *regs;
-
-       dump->u_fpvalid = dump_fpu(regs, &dump->fpu);
-}
-
-asmlinkage int sys_fork(unsigned long r2, unsigned long r3,
-                       unsigned long r4, unsigned long r5,
-                       unsigned long r6, unsigned long r7,
-                       struct pt_regs *pregs)
-{
-       return do_fork(SIGCHLD, pregs->regs[15], pregs, 0, 0, 0);
-}
-
-asmlinkage int sys_clone(unsigned long clone_flags, unsigned long newsp,
-                        unsigned long r4, unsigned long r5,
-                        unsigned long r6, unsigned long r7,
-                        struct pt_regs *pregs)
-{
-       if (!newsp)
-               newsp = pregs->regs[15];
-       return do_fork(clone_flags & ~CLONE_IDLETASK, newsp, pregs, 0, 0, 0);
-}
-
-/*
- * This is trivial, and on the face of it looks like it
- * could equally well be done in user mode.
- *
- * Not so, for quite unobvious reasons - register pressure.
- * In user mode vfork() cannot have a stack frame, and if
- * done by calling the "clone()" system call directly, you
- * do not have enough call-clobbered registers to hold all
- * the information you need.
- */
-asmlinkage int sys_vfork(unsigned long r2, unsigned long r3,
-                        unsigned long r4, unsigned long r5,
-                        unsigned long r6, unsigned long r7,
-                        struct pt_regs *pregs)
-{
-       return do_fork(CLONE_VFORK | CLONE_VM | SIGCHLD, pregs->regs[15], pregs, 0, 0, 0);
-}
-
-/*
- * sys_execve() executes a new program.
- */
-asmlinkage int sys_execve(char *ufilename, char **uargv,
-                         char **uenvp, unsigned long r5,
-                         unsigned long r6, unsigned long r7,
-                         struct pt_regs *pregs)
-{
-       int error;
-       char *filename;
-
-       lock_kernel();
-       filename = getname((char __user *)ufilename);
-       error = PTR_ERR(filename);
-       if (IS_ERR(filename))
-               goto out;
-
-       error = do_execve(filename,
-                         (char __user * __user *)uargv,
-                         (char __user * __user *)uenvp,
-                         pregs);
-       if (error == 0)
-               current->ptrace &= ~PT_DTRACE;
-       putname(filename);
-out:
-       unlock_kernel();
-       return error;
-}
-
-/*
- * These bracket the sleeping functions..
- */
-extern void interruptible_sleep_on(wait_queue_head_t *q);
-
-#define mid_sched      ((unsigned long) interruptible_sleep_on)
-
-static int in_sh64_switch_to(unsigned long pc)
-{
-       extern char __sh64_switch_to_end;
-       /* For a sleeping task, the PC is somewhere in the middle of the function,
-          so we don't have to worry about masking the LSB off */
-       return (pc >= (unsigned long) sh64_switch_to) &&
-              (pc < (unsigned long) &__sh64_switch_to_end);
-}
-
-unsigned long get_wchan(struct task_struct *p)
-{
-       unsigned long schedule_fp;
-       unsigned long sh64_switch_to_fp;
-       unsigned long schedule_caller_pc;
-       unsigned long pc;
-
-       if (!p || p == current || p->state == TASK_RUNNING)
-               return 0;
-
-       /*
-        * The same comment as on the Alpha applies here, too ...
-        */
-       pc = thread_saved_pc(p);
-
-#if CONFIG_FRAME_POINTER
-       if (in_sh64_switch_to(pc)) {
-               sh64_switch_to_fp = (long) p->thread.sp;
-               /* r14 is saved at offset 4 in the sh64_switch_to frame */
-               schedule_fp = *(unsigned long *) (long)(sh64_switch_to_fp + 4);
-
-               /* and the caller of 'schedule' is (currently!) saved at offset 24
-                  in the frame of schedule (from disasm) */
-               schedule_caller_pc = *(unsigned long *) (long)(schedule_fp + 24);
-               return schedule_caller_pc;
-       }
-#endif
-       return pc;
-}
-
-/* Provide a /proc/asids file that lists out the
-   ASIDs currently associated with the processes.  (If the DM.PC register is
-   examined through the debug link, this shows ASID + PC.  To make use of this,
-   the PID->ASID relationship needs to be known.  This is primarily for
-   debugging.)
-   */
-
-#if defined(CONFIG_SH64_PROC_ASIDS)
-#include <linux/init.h>
-#include <linux/proc_fs.h>
-
-static int
-asids_proc_info(char *buf, char **start, off_t fpos, int length, int *eof, void *data)
-{
-       int len=0;
-       struct task_struct *p;
-       read_lock(&tasklist_lock);
-       for_each_task(p) {
-               int pid = p->pid;
-               struct mm_struct *mm;
-               if (!pid) continue;
-               mm = p->mm;
-               if (mm) {
-                       unsigned long asid, context;
-                       context = mm->context;
-                       asid = (context & 0xff);
-                       len += sprintf(buf+len, "%5d : %02x\n", pid, asid);
-               } else {
-                       len += sprintf(buf+len, "%5d : (none)\n", pid);
-               }
-       }
-       read_unlock(&tasklist_lock);
-       *eof = 1;
-       return len;
-}
-
-static int __init register_proc_asids(void)
-{
-  create_proc_read_entry("asids", 0, NULL, asids_proc_info, NULL);
-  return 0;
-}
-
-__initcall(register_proc_asids);
-#endif
-
diff --git a/arch/sh64/kernel/ptrace.c b/arch/sh64/kernel/ptrace.c
deleted file mode 100644 (file)
index 887e89a..0000000
+++ /dev/null
@@ -1,362 +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.
- *
- * arch/sh64/kernel/ptrace.c
- *
- * Copyright (C) 2000, 2001  Paolo Alberelli
- * Copyright (C) 2003  Paul Mundt
- *
- * Started from SH3/4 version:
- *   SuperH version:   Copyright (C) 1999, 2000  Kaz Kojima & Niibe Yutaka
- *
- *   Original x86 implementation:
- *     By Ross Biro 1/23/92
- *     edited by Linus Torvalds
- *
- */
-
-#include <linux/config.h>
-#include <linux/kernel.h>
-#include <linux/rwsem.h>
-#include <linux/sched.h>
-#include <linux/mm.h>
-#include <linux/smp.h>
-#include <linux/smp_lock.h>
-#include <linux/errno.h>
-#include <linux/ptrace.h>
-#include <linux/user.h>
-
-#include <asm/io.h>
-#include <asm/uaccess.h>
-#include <asm/pgtable.h>
-#include <asm/system.h>
-#include <asm/processor.h>
-#include <asm/mmu_context.h>
-
-/* This mask defines the bits of the SR which the user is not allowed to
-   change, which are everything except S, Q, M, PR, SZ, FR. */
-#define SR_MASK      (0xffff8cfd)
-
-/*
- * does not yet catch signals sent when the child dies.
- * in exit.c or in signal.c.
- */
-
-/*
- * This routine will get a word from the user area in the process kernel stack.
- */
-static inline int get_stack_long(struct task_struct *task, int offset)
-{
-       unsigned char *stack;
-
-       stack = (unsigned char *)(task->thread.uregs);
-       stack += offset;
-       return (*((int *)stack));
-}
-
-static inline unsigned long
-get_fpu_long(struct task_struct *task, unsigned long addr)
-{
-       unsigned long tmp;
-       struct pt_regs *regs;
-       regs = (struct pt_regs*)((unsigned char *)task + THREAD_SIZE) - 1;
-
-       if (!task->used_math) {
-               if (addr == offsetof(struct user_fpu_struct, fpscr)) {
-                       tmp = FPSCR_INIT;
-               } else {
-                       tmp = 0xffffffffUL; /* matches initial value in fpu.c */
-               }
-               return tmp;
-       }
-
-       if (last_task_used_math == task) {
-               grab_fpu();
-               fpsave(&task->thread.fpu.hard);
-               release_fpu();
-               last_task_used_math = 0;
-               regs->sr |= SR_FD;
-       }
-
-       tmp = ((long *)&task->thread.fpu)[addr / sizeof(unsigned long)];
-       return tmp;
-}
-
-/*
- * This routine will put a word into the user area in the process kernel stack.
- */
-static inline int put_stack_long(struct task_struct *task, int offset,
-                                unsigned long data)
-{
-       unsigned char *stack;
-
-       stack = (unsigned char *)(task->thread.uregs);
-       stack += offset;
-       *(unsigned long *) stack = data;
-       return 0;
-}
-
-static inline int
-put_fpu_long(struct task_struct *task, unsigned long addr, unsigned long data)
-{
-       struct pt_regs *regs;
-
-       regs = (struct pt_regs*)((unsigned char *)task + THREAD_SIZE) - 1;
-
-       if (!task->used_math) {
-               fpinit(&task->thread.fpu.hard);
-               task->used_math = 1;
-       } else if (last_task_used_math == task) {
-               grab_fpu();
-               fpsave(&task->thread.fpu.hard);
-               release_fpu();
-               last_task_used_math = 0;
-               regs->sr |= SR_FD;
-       }
-
-       ((long *)&task->thread.fpu)[addr / sizeof(unsigned long)] = data;
-       return 0;
-}
-
-asmlinkage int sys_ptrace(long request, long pid, long addr, long data)
-{
-       struct task_struct *child;
-       int ret;
-
-       lock_kernel();
-       ret = -EPERM;
-       if (request == PTRACE_TRACEME) {
-               /* are we already being traced? */
-               if (current->ptrace & PT_PTRACED)
-                       goto out;
-               /* set the ptrace bit in the process flags. */
-               current->ptrace |= PT_PTRACED;
-               ret = 0;
-               goto out;
-       }
-       ret = -ESRCH;
-       read_lock(&tasklist_lock);
-       child = find_task_by_pid(pid);
-       if (child)
-               get_task_struct(child);
-       read_unlock(&tasklist_lock);
-       if (!child)
-               goto out;
-
-       ret = -EPERM;
-       if (pid == 1)           /* you may not mess with init */
-               goto out_tsk;
-
-       if (request == PTRACE_ATTACH) {
-               ret = ptrace_attach(child);
-                       goto out_tsk;
-               }
-
-       ret = ptrace_check_attach(child, request == PTRACE_KILL);
-       if (ret < 0)
-               goto out_tsk;
-
-       switch (request) {
-       /* when I and D space are separate, these will need to be fixed. */
-       case PTRACE_PEEKTEXT: /* read word at location addr. */
-       case PTRACE_PEEKDATA: {
-               unsigned long tmp;
-               int copied;
-
-               copied = access_process_vm(child, addr, &tmp, sizeof(tmp), 0);
-               ret = -EIO;
-               if (copied != sizeof(tmp))
-                       break;
-               ret = put_user(tmp,(unsigned long *) data);
-               break;
-       }
-
-       /* read the word at location addr in the USER area. */
-       case PTRACE_PEEKUSR: {
-               unsigned long tmp;
-
-               ret = -EIO;
-               if ((addr & 3) || addr < 0)
-                       break;
-
-               if (addr < sizeof(struct pt_regs))
-                       tmp = get_stack_long(child, addr);
-               else if ((addr >= offsetof(struct user, fpu)) &&
-                        (addr <  offsetof(struct user, u_fpvalid))) {
-                       tmp = get_fpu_long(child, addr - offsetof(struct user, fpu));
-               } else if (addr == offsetof(struct user, u_fpvalid)) {
-                       tmp = child->used_math;
-               } else {
-                       break;
-               }
-               ret = put_user(tmp, (unsigned long *)data);
-               break;
-       }
-
-       /* when I and D space are separate, this will have to be fixed. */
-       case PTRACE_POKETEXT: /* write the word at location addr. */
-       case PTRACE_POKEDATA:
-               ret = 0;
-               if (access_process_vm(child, addr, &data, sizeof(data), 1) == sizeof(data))
-                       break;
-               ret = -EIO;
-               break;
-
-       case PTRACE_POKEUSR:
-                /* write the word at location addr in the USER area. We must
-                   disallow any changes to certain SR bits or u_fpvalid, since
-                   this could crash the kernel or result in a security
-                   loophole. */
-               ret = -EIO;
-               if ((addr & 3) || addr < 0)
-                       break;
-
-               if (addr < sizeof(struct pt_regs)) {
-                       /* Ignore change of top 32 bits of SR */
-                       if (addr == offsetof (struct pt_regs, sr)+4)
-                       {
-                               ret = 0;
-                               break;
-                       }
-                       /* If lower 32 bits of SR, ignore non-user bits */
-                       if (addr == offsetof (struct pt_regs, sr))
-                       {
-                               long cursr = get_stack_long(child, addr);
-                               data &= ~(SR_MASK);
-                               data |= (cursr & SR_MASK);
-                       }
-                       ret = put_stack_long(child, addr, data);
-               }
-               else if ((addr >= offsetof(struct user, fpu)) &&
-                        (addr <  offsetof(struct user, u_fpvalid))) {
-                       ret = put_fpu_long(child, addr - offsetof(struct user, fpu), data);
-               }
-               break;
-
-       case PTRACE_SYSCALL: /* continue and stop at next (return from) syscall */
-       case PTRACE_CONT: { /* restart after signal. */
-               ret = -EIO;
-               if ((unsigned long) data > _NSIG)
-                       break;
-               if (request == PTRACE_SYSCALL)
-                       set_tsk_thread_flag(child, TIF_SYSCALL_TRACE);
-               else
-                       clear_tsk_thread_flag(child, TIF_SYSCALL_TRACE);
-               child->exit_code = data;
-               wake_up_process(child);
-               ret = 0;
-               break;
-       }
-
-/*
- * make the child exit.  Best I can do is send it a sigkill.
- * perhaps it should be put in the status that it wants to
- * exit.
- */
-       case PTRACE_KILL: {
-               ret = 0;
-               if (child->state == TASK_ZOMBIE)        /* already dead */
-                       break;
-               child->exit_code = SIGKILL;
-               wake_up_process(child);
-               break;
-       }
-
-       case PTRACE_SINGLESTEP: {  /* set the trap flag. */
-               struct pt_regs *regs;
-
-               ret = -EIO;
-               if ((unsigned long) data > _NSIG)
-                       break;
-               clear_tsk_thread_flag(child, TIF_SYSCALL_TRACE);
-               if ((child->ptrace & PT_DTRACE) == 0) {
-                       /* Spurious delayed TF traps may occur */
-                       child->ptrace |= PT_DTRACE;
-               }
-
-               regs = child->thread.uregs;
-
-               regs->sr |= SR_SSTEP;   /* auto-resetting upon exception */
-
-               child->exit_code = data;
-               /* give it a chance to run. */
-               wake_up_process(child);
-               ret = 0;
-               break;
-       }
-
-       case PTRACE_DETACH: /* detach a process that was attached. */
-               ret = ptrace_detach(child, data);
-               break;
-
-       default:
-               ret = ptrace_request(child, request, addr, data);
-               break;
-       }
-out_tsk:
-       put_task_struct(child);
-out:
-       unlock_kernel();
-       return ret;
-}
-
-asmlinkage void syscall_trace(void)
-{
-       struct task_struct *tsk = current;
-
-       if (!test_thread_flag(TIF_SYSCALL_TRACE))
-               return;
-       if (!(tsk->ptrace & PT_PTRACED))
-               return;
-
-       tsk->exit_code = SIGTRAP | ((current->ptrace & PT_TRACESYSGOOD)
-                                   ? 0x80 : 0);
-       tsk->state = TASK_STOPPED;
-       notify_parent(tsk, SIGCHLD);
-       schedule();
-       /*
-        * this isn't the same as continuing with a signal, but it will do
-        * for normal use.  strace only continues with a signal if the
-        * stopping signal is not SIGTRAP.  -brl
-        */
-       if (tsk->exit_code) {
-               send_sig(tsk->exit_code, tsk, 1);
-               tsk->exit_code = 0;
-       }
-}
-
-/* Called with interrupts disabled */
-asmlinkage void do_single_step(unsigned long long vec, struct pt_regs *regs)
-{
-       /* This is called after a single step exception (DEBUGSS).
-          There is no need to change the PC, as it is a post-execution
-          exception, as entry.S does not do anything to the PC for DEBUGSS.
-          We need to clear the Single Step setting in SR to avoid
-          continually stepping. */
-       local_irq_enable();
-       regs->sr &= ~SR_SSTEP;
-       force_sig(SIGTRAP, current);
-}
-
-/* Called with interrupts disabled */
-asmlinkage void do_software_break_point(unsigned long long vec,
-                                       struct pt_regs *regs)
-{
-       /* We need to forward step the PC, to counteract the backstep done
-          in signal.c. */
-       local_irq_enable();
-       force_sig(SIGTRAP, current);
-       regs->pc += 4;
-}
-
-/*
- * Called by kernel/ptrace.c when detaching..
- *
- * Make sure single step bits etc are not set.
- */
-void ptrace_disable(struct task_struct *child)
-{
-        /* nothing to do.. */
-}
diff --git a/arch/sh64/kernel/semaphore.c b/arch/sh64/kernel/semaphore.c
deleted file mode 100644 (file)
index 72c1653..0000000
+++ /dev/null
@@ -1,140 +0,0 @@
-/*
- * Just taken from alpha implementation.
- * This can't work well, perhaps.
- */
-/*
- *  Generic semaphore code. Buyer beware. Do your own
- * specific changes in <asm/semaphore-helper.h>
- */
-
-#include <linux/errno.h>
-#include <linux/rwsem.h>
-#include <linux/sched.h>
-#include <linux/wait.h>
-#include <linux/init.h>
-#include <asm/semaphore.h>
-#include <asm/semaphore-helper.h>
-
-spinlock_t semaphore_wake_lock;
-
-/*
- * Semaphores are implemented using a two-way counter:
- * The "count" variable is decremented for each process
- * that tries to sleep, while the "waking" variable is
- * incremented when the "up()" code goes to wake up waiting
- * processes.
- *
- * Notably, the inline "up()" and "down()" functions can
- * efficiently test if they need to do any extra work (up
- * needs to do something only if count was negative before
- * the increment operation.
- *
- * waking_non_zero() (from asm/semaphore.h) must execute
- * atomically.
- *
- * When __up() is called, the count was negative before
- * incrementing it, and we need to wake up somebody.
- *
- * This routine adds one to the count of processes that need to
- * wake up and exit.  ALL waiting processes actually wake up but
- * only the one that gets to the "waking" field first will gate
- * through and acquire the semaphore.  The others will go back
- * to sleep.
- *
- * Note that these functions are only called when there is
- * contention on the lock, and as such all this is the
- * "non-critical" part of the whole semaphore business. The
- * critical part is the inline stuff in <asm/semaphore.h>
- * where we want to avoid any extra jumps and calls.
- */
-void __up(struct semaphore *sem)
-{
-       wake_one_more(sem);
-       wake_up(&sem->wait);
-}
-
-/*
- * Perform the "down" function.  Return zero for semaphore acquired,
- * return negative for signalled out of the function.
- *
- * If called from __down, the return is ignored and the wait loop is
- * not interruptible.  This means that a task waiting on a semaphore
- * using "down()" cannot be killed until someone does an "up()" on
- * the semaphore.
- *
- * If called from __down_interruptible, the return value gets checked
- * upon return.  If the return value is negative then the task continues
- * with the negative value in the return register (it can be tested by
- * the caller).
- *
- * Either form may be used in conjunction with "up()".
- *
- */
-
-#define DOWN_VAR                               \
-       struct task_struct *tsk = current;      \
-       wait_queue_t wait;                      \
-       init_waitqueue_entry(&wait, tsk);
-
-#define DOWN_HEAD(task_state)                                          \
-                                                                       \
-                                                                       \
-       tsk->state = (task_state);                                      \
-       add_wait_queue(&sem->wait, &wait);                              \
-                                                                       \
-       /*                                                              \
-        * Ok, we're set up.  sem->count is known to be less than zero  \
-        * so we must wait.                                             \
-        *                                                              \
-        * We can let go the lock for purposes of waiting.              \
-        * We re-acquire it after awaking so as to protect              \
-        * all semaphore operations.                                    \
-        *                                                              \
-        * If "up()" is called before we call waking_non_zero() then    \
-        * we will catch it right away.  If it is called later then     \
-        * we will have to go through a wakeup cycle to catch it.       \
-        *                                                              \
-        * Multiple waiters contend for the semaphore lock to see       \
-        * who gets to gate through and who has to wait some more.      \
-        */                                                             \
-       for (;;) {
-
-#define DOWN_TAIL(task_state)                  \
-               tsk->state = (task_state);      \
-       }                                       \
-       tsk->state = TASK_RUNNING;              \
-       remove_wait_queue(&sem->wait, &wait);
-
-void __sched __down(struct semaphore * sem)
-{
-       DOWN_VAR
-       DOWN_HEAD(TASK_UNINTERRUPTIBLE)
-       if (waking_non_zero(sem))
-               break;
-       schedule();
-       DOWN_TAIL(TASK_UNINTERRUPTIBLE)
-}
-
-int __sched __down_interruptible(struct semaphore * sem)
-{
-       int ret = 0;
-       DOWN_VAR
-       DOWN_HEAD(TASK_INTERRUPTIBLE)
-
-       ret = waking_non_zero_interruptible(sem, tsk);
-       if (ret)
-       {
-               if (ret == 1)
-                       /* ret != 0 only if we get interrupted -arca */
-                       ret = 0;
-               break;
-       }
-       schedule();
-       DOWN_TAIL(TASK_INTERRUPTIBLE)
-       return ret;
-}
-
-int __down_trylock(struct semaphore * sem)
-{
-       return waking_non_zero_trylock(sem);
-}
diff --git a/arch/sh64/kernel/setup.c b/arch/sh64/kernel/setup.c
deleted file mode 100644 (file)
index ce76634..0000000
+++ /dev/null
@@ -1,389 +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.
- *
- * arch/sh64/kernel/setup.c
- *
- * sh64 Arch Support
- *
- * This file handles the architecture-dependent parts of initialization
- *
- * Copyright (C) 2000, 2001  Paolo Alberelli
- * Copyright (C) 2003, 2004  Paul Mundt
- *
- * benedict.gaster@superh.com:   2nd May 2002
- *    Modified to use the empty_zero_page to pass command line arguments.
- *
- * benedict.gaster@superh.com:  3rd May 2002
- *    Added support for ramdisk, removing statically linked romfs at the same time.
- *
- * lethal@linux-sh.org:          15th May 2003
- *    Added generic procfs cpuinfo reporting. Make boards just export their name.
- *
- * lethal@linux-sh.org:          25th May 2003
- *    Added generic get_cpu_subtype() for subtype reporting from cpu_data->type.
- *
- */
-#include <linux/errno.h>
-#include <linux/rwsem.h>
-#include <linux/sched.h>
-#include <linux/kernel.h>
-#include <linux/mm.h>
-#include <linux/stddef.h>
-#include <linux/unistd.h>
-#include <linux/ptrace.h>
-#include <linux/slab.h>
-#include <linux/user.h>
-#include <linux/a.out.h>
-#include <linux/tty.h>
-#include <linux/ioport.h>
-#include <linux/delay.h>
-#include <linux/config.h>
-#include <linux/init.h>
-#include <linux/seq_file.h>
-#include <linux/blkdev.h>
-#include <linux/bootmem.h>
-#include <linux/console.h>
-#include <linux/root_dev.h>
-#include <linux/cpu.h>
-#include <linux/initrd.h>
-#include <asm/processor.h>
-#include <asm/page.h>
-#include <asm/pgtable.h>
-#include <asm/platform.h>
-#include <asm/uaccess.h>
-#include <asm/system.h>
-#include <asm/io.h>
-#include <asm/sections.h>
-#include <asm/setup.h>
-#include <asm/smp.h>
-
-#ifdef CONFIG_VT
-#include <linux/console.h>
-#endif
-
-struct screen_info screen_info;
-
-/* On a PC this would be initialised as a result of the BIOS detecting the
- * mouse. */
-unsigned char aux_device_present = 0xaa;
-
-#ifdef CONFIG_BLK_DEV_RAM
-extern int rd_doload;          /* 1 = load ramdisk, 0 = don't load */
-extern int rd_prompt;          /* 1 = prompt for ramdisk, 0 = don't prompt */
-extern int rd_image_start;     /* starting block # of image */
-#endif
-
-extern int root_mountflags;
-extern char *get_system_type(void);
-extern void platform_setup(void);
-extern void platform_monitor(void);
-extern void platform_reserve(void);
-extern int sh64_cache_init(void);
-extern int sh64_tlb_init(void);
-
-#define RAMDISK_IMAGE_START_MASK       0x07FF
-#define RAMDISK_PROMPT_FLAG            0x8000
-#define RAMDISK_LOAD_FLAG              0x4000
-
-static char command_line[COMMAND_LINE_SIZE] = { 0, };
-unsigned long long memory_start = CONFIG_MEMORY_START;
-unsigned long long memory_end = CONFIG_MEMORY_START + (CONFIG_MEMORY_SIZE_IN_MB * 1024 * 1024);
-
-struct sh_cpuinfo boot_cpu_data;
-
-static inline void parse_mem_cmdline (char ** cmdline_p)
-{
-        char c = ' ', *to = command_line, *from = COMMAND_LINE;
-       int len = 0;
-
-       /* Save unparsed command line copy for /proc/cmdline */
-       memcpy(saved_command_line, COMMAND_LINE, COMMAND_LINE_SIZE);
-       saved_command_line[COMMAND_LINE_SIZE-1] = '\0';
-
-       for (;;) {
-         /*
-          * "mem=XXX[kKmM]" defines a size of memory.
-          */
-               if (c == ' ' && !memcmp(from, "mem=", 4)) {
-                     if (to != command_line)
-                       to--;
-                     {
-                       unsigned long mem_size;
-
-                       mem_size = memparse(from+4, &from);
-                       memory_end = memory_start + mem_size;
-                     }
-               }
-               c = *(from++);
-               if (!c)
-                 break;
-               if (COMMAND_LINE_SIZE <= ++len)
-                 break;
-               *(to++) = c;
-       }
-       *to = '\0';
-
-       *cmdline_p = command_line;
-}
-
-static void __init sh64_cpu_type_detect(void)
-{
-       extern unsigned long long peek_real_address_q(unsigned long long addr);
-       unsigned long long cir;
-       /* Do peeks in real mode to avoid having to set up a mapping for the
-          WPC registers.  On SH5-101 cut2, such a mapping would be exposed to
-          an address translation erratum which would make it hard to set up
-          correctly. */
-       cir = peek_real_address_q(0x0d000008);
-
-       if ((cir & 0xffff) == 0x5103) {
-               boot_cpu_data.type = CPU_SH5_103;
-       } else if (((cir >> 32) & 0xffff) == 0x51e2) {
-               /* CPU.VCR aliased at CIR address on SH5-101 */
-               boot_cpu_data.type = CPU_SH5_101;
-       } else {
-               boot_cpu_data.type = CPU_SH_NONE;
-       }
-}
-
-void __init setup_arch(char **cmdline_p)
-{
-       unsigned long bootmap_size, i;
-       unsigned long first_pfn, start_pfn, last_pfn, pages;
-
-#ifdef CONFIG_EARLY_PRINTK
-       extern void enable_early_printk(void);
-
-       /*
-        * Setup Early SCIF console
-        */
-       enable_early_printk();
-#endif
-
-       /*
-        * Setup TLB mappings
-        */
-       sh64_tlb_init();
-
-       /*
-        * Caches are already initialized by the time we get here, so we just
-        * fill in cpu_data info for the caches.
-        */
-       sh64_cache_init();
-
-       platform_setup();
-       platform_monitor();
-
-       sh64_cpu_type_detect();
-
-       ROOT_DEV = old_decode_dev(ORIG_ROOT_DEV);
-
-#ifdef CONFIG_BLK_DEV_RAM
-       rd_image_start = RAMDISK_FLAGS & RAMDISK_IMAGE_START_MASK;
-       rd_prompt = ((RAMDISK_FLAGS & RAMDISK_PROMPT_FLAG) != 0);
-       rd_doload = ((RAMDISK_FLAGS & RAMDISK_LOAD_FLAG) != 0);
-#endif
-
-       if (!MOUNT_ROOT_RDONLY)
-               root_mountflags &= ~MS_RDONLY;
-       init_mm.start_code = (unsigned long) _text;
-       init_mm.end_code = (unsigned long) _etext;
-       init_mm.end_data = (unsigned long) _edata;
-       init_mm.brk = (unsigned long) _end;
-
-       code_resource.start = __pa(_text);
-       code_resource.end = __pa(_etext)-1;
-       data_resource.start = __pa(_etext);
-       data_resource.end = __pa(_edata)-1;
-
-       parse_mem_cmdline(cmdline_p);
-
-       /*
-        * Find the lowest and highest page frame numbers we have available
-        */
-       first_pfn = PFN_DOWN(memory_start);
-       last_pfn = PFN_DOWN(memory_end);
-       pages = last_pfn - first_pfn;
-
-       /*
-        * Partially used pages are not usable - thus
-        * we are rounding upwards:
-        */
-       start_pfn = PFN_UP(__pa(_end));
-
-       /*
-        * Find a proper area for the bootmem bitmap. After this
-        * bootstrap step all allocations (until the page allocator
-        * is intact) must be done via bootmem_alloc().
-        */
-       bootmap_size = init_bootmem_node(NODE_DATA(0), start_pfn,
-                                        first_pfn,
-                                        last_pfn);
-        /*
-         * Round it up.
-         */
-        bootmap_size = PFN_PHYS(PFN_UP(bootmap_size));
-
-       /*
-        * Register fully available RAM pages with the bootmem allocator.
-        */
-       free_bootmem_node(NODE_DATA(0), PFN_PHYS(first_pfn), PFN_PHYS(pages));
-
-       /*
-        * Reserve all kernel sections + bootmem bitmap + a guard page.
-        */
-       reserve_bootmem_node(NODE_DATA(0), PFN_PHYS(first_pfn),
-                       (PFN_PHYS(start_pfn) + bootmap_size + PAGE_SIZE) - PFN_PHYS(first_pfn));
-
-       /*
-        * Reserve platform dependent sections
-        */
-       platform_reserve();
-
-#ifdef CONFIG_BLK_DEV_INITRD
-       if (LOADER_TYPE && INITRD_START) {
-               if (INITRD_START + INITRD_SIZE <= (PFN_PHYS(last_pfn))) {
-                       reserve_bootmem_node(NODE_DATA(0), INITRD_START + __MEMORY_START, INITRD_SIZE);
-
-                       initrd_start =
-                         (long) INITRD_START ? INITRD_START + PAGE_OFFSET +  __MEMORY_START : 0;
-
-                       initrd_end = initrd_start + INITRD_SIZE;
-               } else {
-                       printk("initrd extends beyond end of memory "
-                           "(0x%08lx > 0x%08lx)\ndisabling initrd\n",
-                                   (long) INITRD_START + INITRD_SIZE,
-                                   PFN_PHYS(last_pfn));
-                       initrd_start = 0;
-               }
-       }
-#endif
-
-       /*
-        * Claim all RAM, ROM, and I/O resources.
-        */
-
-       /* Kernel RAM */
-       request_resource(&iomem_resource, &code_resource);
-       request_resource(&iomem_resource, &data_resource);
-
-       /* Other KRAM space */
-       for (i = 0; i < STANDARD_KRAM_RESOURCES - 2; i++)
-               request_resource(&iomem_resource,
-                                &platform_parms.kram_res_p[i]);
-
-       /* XRAM space */
-       for (i = 0; i < STANDARD_XRAM_RESOURCES; i++)
-               request_resource(&iomem_resource,
-                                &platform_parms.xram_res_p[i]);
-
-       /* ROM space */
-       for (i = 0; i < STANDARD_ROM_RESOURCES; i++)
-               request_resource(&iomem_resource,
-                                &platform_parms.rom_res_p[i]);
-
-       /* I/O space */
-       for (i = 0; i < STANDARD_IO_RESOURCES; i++)
-               request_resource(&ioport_resource,
-                                &platform_parms.io_res_p[i]);
-
-
-#ifdef CONFIG_VT
-#if defined(CONFIG_VGA_CONSOLE)
-       conswitchp = &vga_con;
-#elif defined(CONFIG_DUMMY_CONSOLE)
-       conswitchp = &dummy_con;
-#endif
-#endif
-
-       printk("Hardware FPU: %s\n", fpu_in_use ? "enabled" : "disabled");
-
-       paging_init();
-}
-
-void __xchg_called_with_bad_pointer(void)
-{
-       printk(KERN_EMERG "xchg() called with bad pointer !\n");
-}
-
-static struct cpu cpu[1];
-
-static int __init topology_init(void)
-{
-       return register_cpu(cpu, 0, NULL);
-}
-
-subsys_initcall(topology_init);
-
-/*
- *     Get CPU information
- */
-static const char *cpu_name[] = {
-       [CPU_SH5_101]   = "SH5-101",
-       [CPU_SH5_103]   = "SH5-103",
-       [CPU_SH_NONE]   = "Unknown",
-};
-
-const char *get_cpu_subtype(void)
-{
-       return cpu_name[boot_cpu_data.type];
-}
-
-#ifdef CONFIG_PROC_FS
-static int show_cpuinfo(struct seq_file *m,void *v)
-{
-       unsigned int cpu = smp_processor_id();
-
-       if (!cpu)
-               seq_printf(m, "machine\t\t: %s\n", get_system_type());
-
-       seq_printf(m, "processor\t: %d\n", cpu);
-       seq_printf(m, "cpu family\t: SH-5\n");
-       seq_printf(m, "cpu type\t: %s\n", get_cpu_subtype());
-
-       seq_printf(m, "icache size\t: %dK-bytes\n",
-                  (boot_cpu_data.icache.ways *
-                   boot_cpu_data.icache.sets *
-                   boot_cpu_data.icache.linesz) >> 10);
-       seq_printf(m, "dcache size\t: %dK-bytes\n",
-                  (boot_cpu_data.dcache.ways *
-                   boot_cpu_data.dcache.sets *
-                   boot_cpu_data.dcache.linesz) >> 10);
-       seq_printf(m, "itlb entries\t: %d\n", boot_cpu_data.itlb.entries);
-       seq_printf(m, "dtlb entries\t: %d\n", boot_cpu_data.dtlb.entries);
-
-#define PRINT_CLOCK(name, value) \
-       seq_printf(m, name " clock\t: %d.%02dMHz\n", \
-                    ((value) / 1000000), ((value) % 1000000)/10000)
-
-       PRINT_CLOCK("cpu", boot_cpu_data.cpu_clock);
-       PRINT_CLOCK("bus", boot_cpu_data.bus_clock);
-       PRINT_CLOCK("module", boot_cpu_data.module_clock);
-
-        seq_printf(m, "bogomips\t: %lu.%02lu\n\n",
-                    (loops_per_jiffy*HZ+2500)/500000,
-                    ((loops_per_jiffy*HZ+2500)/5000) % 100);
-
-       return 0;
-}
-
-static void *c_start(struct seq_file *m, loff_t *pos)
-{
-       return (void*)(*pos == 0);
-}
-static void *c_next(struct seq_file *m, void *v, loff_t *pos)
-{
-       return NULL;
-}
-static void c_stop(struct seq_file *m, void *v)
-{
-}
-struct seq_operations cpuinfo_op = {
-       .start  = c_start,
-       .next   = c_next,
-       .stop   = c_stop,
-       .show   = show_cpuinfo,
-};
-#endif /* CONFIG_PROC_FS */
diff --git a/arch/sh64/kernel/sh_ksyms.c b/arch/sh64/kernel/sh_ksyms.c
deleted file mode 100644 (file)
index 80712f1..0000000
+++ /dev/null
@@ -1,84 +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.
- *
- * arch/sh64/kernel/sh_ksyms.c
- *
- * Copyright (C) 2000, 2001  Paolo Alberelli
- *
- */
-
-#include <linux/config.h>
-#include <linux/rwsem.h>
-#include <linux/module.h>
-#include <linux/smp.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 <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>
-
-extern void dump_thread(struct pt_regs *, struct user *);
-extern int dump_fpu(struct pt_regs *, elf_fpregset_t *);
-
-#if 0
-/* Not yet - there's no declaration of drive_info anywhere. */
-#if defined(CONFIG_BLK_DEV_IDE) || defined(CONFIG_BLK_DEV_HD) || defined(CONFIG_BLK_DEV_IDE_MODULE) || defined(CONFIG_BLK_DEV_HD_MODULE)
-extern struct drive_info_struct drive_info;
-EXPORT_SYMBOL(drive_info);
-#endif
-#endif
-
-/* platform dependent support */
-EXPORT_SYMBOL(dump_thread);
-EXPORT_SYMBOL(dump_fpu);
-EXPORT_SYMBOL(iounmap);
-EXPORT_SYMBOL(enable_irq);
-EXPORT_SYMBOL(disable_irq);
-EXPORT_SYMBOL(kernel_thread);
-
-/* Networking helper routines. */
-EXPORT_SYMBOL(csum_partial_copy);
-
-EXPORT_SYMBOL(strtok);
-EXPORT_SYMBOL(strpbrk);
-EXPORT_SYMBOL(strstr);
-
-#ifdef CONFIG_VT
-EXPORT_SYMBOL(screen_info);
-#endif
-
-EXPORT_SYMBOL_NOVERS(__down);
-EXPORT_SYMBOL_NOVERS(__down_trylock);
-EXPORT_SYMBOL_NOVERS(__up);
-EXPORT_SYMBOL_NOVERS(__put_user_asm_l);
-EXPORT_SYMBOL_NOVERS(__get_user_asm_l);
-EXPORT_SYMBOL_NOVERS(memcmp);
-EXPORT_SYMBOL_NOVERS(memcpy);
-EXPORT_SYMBOL_NOVERS(memset);
-EXPORT_SYMBOL_NOVERS(memscan);
-EXPORT_SYMBOL_NOVERS(strchr);
-EXPORT_SYMBOL_NOVERS(strlen);
-
-EXPORT_SYMBOL(flush_dcache_page);
-
-/* Ugh.  These come in from libgcc.a at link time. */
-
-extern void __sdivsi3(void);
-extern void __muldi3(void);
-extern void __udivsi3(void);
-EXPORT_SYMBOL_NOVERS(__sdivsi3);
-EXPORT_SYMBOL_NOVERS(__muldi3);
-EXPORT_SYMBOL_NOVERS(__udivsi3);
-
diff --git a/arch/sh64/kernel/signal.c b/arch/sh64/kernel/signal.c
deleted file mode 100644 (file)
index 376b899..0000000
+++ /dev/null
@@ -1,737 +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.
- *
- * arch/sh64/kernel/signal.c
- *
- * Copyright (C) 2000, 2001  Paolo Alberelli
- * Copyright (C) 2003  Paul Mundt
- * Copyright (C) 2004  Richard Curnow
- *
- * Started from sh version.
- *
- */
-#include <linux/rwsem.h>
-#include <linux/sched.h>
-#include <linux/mm.h>
-#include <linux/smp.h>
-#include <linux/smp_lock.h>
-#include <linux/kernel.h>
-#include <linux/signal.h>
-#include <linux/errno.h>
-#include <linux/wait.h>
-#include <linux/personality.h>
-#include <linux/suspend.h>
-#include <linux/ptrace.h>
-#include <linux/unistd.h>
-#include <linux/stddef.h>
-#include <linux/personality.h>
-#include <asm/ucontext.h>
-#include <asm/uaccess.h>
-#include <asm/pgtable.h>
-
-
-#define REG_RET 9
-#define REG_ARG1 2
-#define REG_ARG2 3
-#define REG_ARG3 4
-#define REG_SP 15
-#define REG_PR 18
-#define REF_REG_RET regs->regs[REG_RET]
-#define REF_REG_SP regs->regs[REG_SP]
-#define DEREF_REG_PR regs->regs[REG_PR]
-
-#define DEBUG_SIG 0
-
-#define _BLOCKABLE (~(sigmask(SIGKILL) | sigmask(SIGSTOP)))
-
-asmlinkage int do_signal(struct pt_regs *regs, sigset_t *oldset);
-
-/*
- * Atomically swap in the new signal mask, and wait for a signal.
- */
-
-asmlinkage int
-sys_sigsuspend(old_sigset_t mask,
-              unsigned long r3, unsigned long r4, unsigned long r5,
-              unsigned long r6, unsigned long r7,
-              struct pt_regs * regs)
-{
-       sigset_t saveset;
-
-       mask &= _BLOCKABLE;
-       spin_lock_irq(&current->sighand->siglock);
-       saveset = current->blocked;
-       siginitset(&current->blocked, mask);
-       recalc_sigpending();
-       spin_unlock_irq(&current->sighand->siglock);
-
-       REF_REG_RET = -EINTR;
-       while (1) {
-               current->state = TASK_INTERRUPTIBLE;
-               schedule();
-               regs->pc += 4;    /* because sys_sigreturn decrements the pc */
-               if (do_signal(regs, &saveset)) {
-                       /* pc now points at signal handler. Need to decrement
-                          it because entry.S will increment it. */
-                       regs->pc -= 4;
-                       return -EINTR;
-               }
-       }
-}
-
-asmlinkage int
-sys_rt_sigsuspend(sigset_t *unewset, size_t sigsetsize,
-                 unsigned long r4, unsigned long r5, unsigned long r6,
-                 unsigned long r7,
-                 struct pt_regs * regs)
-{
-       sigset_t saveset, newset;
-
-       /* XXX: Don't preclude handling different sized sigset_t's.  */
-       if (sigsetsize != sizeof(sigset_t))
-               return -EINVAL;
-
-       if (copy_from_user(&newset, unewset, sizeof(newset)))
-               return -EFAULT;
-       sigdelsetmask(&newset, ~_BLOCKABLE);
-       spin_lock_irq(&current->sighand->siglock);
-       saveset = current->blocked;
-       current->blocked = newset;
-       recalc_sigpending();
-       spin_unlock_irq(&current->sighand->siglock);
-
-       REF_REG_RET = -EINTR;
-       while (1) {
-               current->state = TASK_INTERRUPTIBLE;
-               schedule();
-               regs->pc += 4;    /* because sys_sigreturn decrements the pc */
-               if (do_signal(regs, &saveset)) {
-                       /* pc now points at signal handler. Need to decrement
-                          it because entry.S will increment it. */
-                       regs->pc -= 4;
-                       return -EINTR;
-               }
-       }
-}
-
-asmlinkage int
-sys_sigaction(int sig, const struct old_sigaction __user *act,
-             struct old_sigaction __user *oact)
-{
-       struct k_sigaction new_ka, old_ka;
-       int ret;
-
-       if (act) {
-               old_sigset_t mask;
-               if (verify_area(VERIFY_READ, act, sizeof(*act)) ||
-                   __get_user(new_ka.sa.sa_handler, &act->sa_handler) ||
-                   __get_user(new_ka.sa.sa_restorer, &act->sa_restorer))
-                       return -EFAULT;
-               __get_user(new_ka.sa.sa_flags, &act->sa_flags);
-               __get_user(mask, &act->sa_mask);
-               siginitset(&new_ka.sa.sa_mask, mask);
-       }
-
-       ret = do_sigaction(sig, act ? &new_ka : NULL, oact ? &old_ka : NULL);
-
-       if (!ret && oact) {
-               if (verify_area(VERIFY_WRITE, oact, sizeof(*oact)) ||
-                   __put_user(old_ka.sa.sa_handler, &oact->sa_handler) ||
-                   __put_user(old_ka.sa.sa_restorer, &oact->sa_restorer))
-                       return -EFAULT;
-               __put_user(old_ka.sa.sa_flags, &oact->sa_flags);
-               __put_user(old_ka.sa.sa_mask.sig[0], &oact->sa_mask);
-       }
-
-       return ret;
-}
-
-asmlinkage int
-sys_sigaltstack(const stack_t __user *uss, stack_t __user *uoss,
-               unsigned long r4, unsigned long r5, unsigned long r6,
-               unsigned long r7,
-               struct pt_regs * regs)
-{
-       return do_sigaltstack(uss, uoss, REF_REG_SP);
-}
-
-
-/*
- * Do a signal return; undo the signal stack.
- */
-
-struct sigframe
-{
-       struct sigcontext sc;
-       unsigned long extramask[_NSIG_WORDS-1];
-       long long retcode[2];
-};
-
-struct rt_sigframe
-{
-       struct siginfo __user *pinfo;
-       void *puc;
-       struct siginfo info;
-       struct ucontext uc;
-       long long retcode[2];
-};
-
-#ifndef CONFIG_NOFPU_SUPPORT
-static inline int
-restore_sigcontext_fpu(struct pt_regs *regs, struct sigcontext __user *sc)
-{
-       int err = 0;
-       int fpvalid;
-
-       err |= __get_user (fpvalid, &sc->sc_fpvalid);
-       current->used_math = fpvalid;
-       if (! fpvalid)
-               return err;
-
-       if (current == last_task_used_math) {
-               last_task_used_math = NULL;
-               regs->sr |= SR_FD;
-       }
-
-       err |= __copy_from_user(&current->thread.fpu.hard, &sc->sc_fpregs[0],
-                               (sizeof(long long) * 32) + (sizeof(int) * 1));
-
-       return err;
-}
-
-static inline int
-setup_sigcontext_fpu(struct pt_regs *regs, struct sigcontext __user *sc)
-{
-       int err = 0;
-       int fpvalid;
-
-       fpvalid = current->used_math;
-       err |= __put_user(fpvalid, &sc->sc_fpvalid);
-       if (! fpvalid)
-               return err;
-
-       if (current == last_task_used_math) {
-               grab_fpu();
-               fpsave(&current->thread.fpu.hard);
-               release_fpu();
-               last_task_used_math = NULL;
-               regs->sr |= SR_FD;
-       }
-
-       err |= __copy_to_user(&sc->sc_fpregs[0], &current->thread.fpu.hard,
-                             (sizeof(long long) * 32) + (sizeof(int) * 1));
-       current->used_math = 0;
-
-       return err;
-}
-#else
-static inline int
-restore_sigcontext_fpu(struct pt_regs *regs, struct sigcontext __user *sc)
-{}
-static inline int
-setup_sigcontext_fpu(struct pt_regs *regs, struct sigcontext __user *sc)
-{}
-#endif
-
-static int
-restore_sigcontext(struct pt_regs *regs, struct sigcontext __user *sc, long long *r2_p)
-{
-       unsigned int err = 0;
-        unsigned long long current_sr, new_sr;
-#define SR_MASK 0xffff8cfd
-
-#define COPY(x)                err |= __get_user(regs->x, &sc->sc_##x)
-
-       COPY(regs[0]);  COPY(regs[1]);  COPY(regs[2]);  COPY(regs[3]);
-       COPY(regs[4]);  COPY(regs[5]);  COPY(regs[6]);  COPY(regs[7]);
-       COPY(regs[8]);  COPY(regs[9]);  COPY(regs[10]); COPY(regs[11]);
-       COPY(regs[12]); COPY(regs[13]); COPY(regs[14]); COPY(regs[15]);
-       COPY(regs[16]); COPY(regs[17]); COPY(regs[18]); COPY(regs[19]);
-       COPY(regs[20]); COPY(regs[21]); COPY(regs[22]); COPY(regs[23]);
-       COPY(regs[24]); COPY(regs[25]); COPY(regs[26]); COPY(regs[27]);
-       COPY(regs[28]); COPY(regs[29]); COPY(regs[30]); COPY(regs[31]);
-       COPY(regs[32]); COPY(regs[33]); COPY(regs[34]); COPY(regs[35]);
-       COPY(regs[36]); COPY(regs[37]); COPY(regs[38]); COPY(regs[39]);
-       COPY(regs[40]); COPY(regs[41]); COPY(regs[42]); COPY(regs[43]);
-       COPY(regs[44]); COPY(regs[45]); COPY(regs[46]); COPY(regs[47]);
-       COPY(regs[48]); COPY(regs[49]); COPY(regs[50]); COPY(regs[51]);
-       COPY(regs[52]); COPY(regs[53]); COPY(regs[54]); COPY(regs[55]);
-       COPY(regs[56]); COPY(regs[57]); COPY(regs[58]); COPY(regs[59]);
-       COPY(regs[60]); COPY(regs[61]); COPY(regs[62]);
-       COPY(tregs[0]); COPY(tregs[1]); COPY(tregs[2]); COPY(tregs[3]);
-       COPY(tregs[4]); COPY(tregs[5]); COPY(tregs[6]); COPY(tregs[7]);
-
-        /* Prevent the signal handler manipulating SR in a way that can
-           crash the kernel. i.e. only allow S, Q, M, PR, SZ, FR to be
-           modified */
-        current_sr = regs->sr;
-        err |= __get_user(new_sr, &sc->sc_sr);
-        regs->sr &= SR_MASK;
-        regs->sr |= (new_sr & ~SR_MASK);
-
-       COPY(pc);
-
-#undef COPY
-
-       /* Must do this last in case it sets regs->sr.fd (i.e. after rest of sr
-        * has been restored above.) */
-       err |= restore_sigcontext_fpu(regs, sc);
-
-       regs->syscall_nr = -1;          /* disable syscall checks */
-       err |= __get_user(*r2_p, &sc->sc_regs[REG_RET]);
-       return err;
-}
-
-asmlinkage int sys_sigreturn(unsigned long r2, unsigned long r3,
-                                  unsigned long r4, unsigned long r5,
-                                  unsigned long r6, unsigned long r7,
-                                  struct pt_regs * regs)
-{
-       struct sigframe __user *frame = (struct sigframe __user *) (long) REF_REG_SP;
-       sigset_t set;
-       long long ret;
-
-       if (verify_area(VERIFY_READ, frame, sizeof(*frame)))
-               goto badframe;
-
-       if (__get_user(set.sig[0], &frame->sc.oldmask)
-           || (_NSIG_WORDS > 1
-               && __copy_from_user(&set.sig[1], &frame->extramask,
-                                   sizeof(frame->extramask))))
-               goto badframe;
-
-       sigdelsetmask(&set, ~_BLOCKABLE);
-
-       spin_lock_irq(&current->sighand->siglock);
-       current->blocked = set;
-       recalc_sigpending();
-       spin_unlock_irq(&current->sighand->siglock);
-
-       if (restore_sigcontext(regs, &frame->sc, &ret))
-               goto badframe;
-       regs->pc -= 4;
-
-       return (int) ret;
-
-badframe:
-       force_sig(SIGSEGV, current);
-       return 0;
-}
-
-asmlinkage int sys_rt_sigreturn(unsigned long r2, unsigned long r3,
-                               unsigned long r4, unsigned long r5,
-                               unsigned long r6, unsigned long r7,
-                               struct pt_regs * regs)
-{
-       struct rt_sigframe __user *frame = (struct rt_sigframe __user *) (long) REF_REG_SP;
-       sigset_t set;
-       stack_t __user st;
-       long long ret;
-
-       if (verify_area(VERIFY_READ, frame, sizeof(*frame)))
-               goto badframe;
-
-       if (__copy_from_user(&set, &frame->uc.uc_sigmask, sizeof(set)))
-               goto badframe;
-
-       sigdelsetmask(&set, ~_BLOCKABLE);
-       spin_lock_irq(&current->sighand->siglock);
-       current->blocked = set;
-       recalc_sigpending();
-       spin_unlock_irq(&current->sighand->siglock);
-
-       if (restore_sigcontext(regs, &frame->uc.uc_mcontext, &ret))
-               goto badframe;
-       regs->pc -= 4;
-
-       if (__copy_from_user(&st, &frame->uc.uc_stack, sizeof(st)))
-               goto badframe;
-       /* It is more difficult to avoid calling this function than to
-          call it and ignore errors.  */
-       do_sigaltstack(&st, NULL, REF_REG_SP);
-
-       return (int) ret;
-
-badframe:
-       force_sig(SIGSEGV, current);
-       return 0;
-}
-
-/*
- * Set up a signal frame.
- */
-
-static int
-setup_sigcontext(struct sigcontext __user *sc, struct pt_regs *regs,
-                unsigned long mask)
-{
-       int err = 0;
-
-       /* Do this first, otherwise is this sets sr->fd, that value isn't preserved. */
-       err |= setup_sigcontext_fpu(regs, sc);
-
-#define COPY(x)                err |= __put_user(regs->x, &sc->sc_##x)
-
-       COPY(regs[0]);  COPY(regs[1]);  COPY(regs[2]);  COPY(regs[3]);
-       COPY(regs[4]);  COPY(regs[5]);  COPY(regs[6]);  COPY(regs[7]);
-       COPY(regs[8]);  COPY(regs[9]);  COPY(regs[10]); COPY(regs[11]);
-       COPY(regs[12]); COPY(regs[13]); COPY(regs[14]); COPY(regs[15]);
-       COPY(regs[16]); COPY(regs[17]); COPY(regs[18]); COPY(regs[19]);
-       COPY(regs[20]); COPY(regs[21]); COPY(regs[22]); COPY(regs[23]);
-       COPY(regs[24]); COPY(regs[25]); COPY(regs[26]); COPY(regs[27]);
-       COPY(regs[28]); COPY(regs[29]); COPY(regs[30]); COPY(regs[31]);
-       COPY(regs[32]); COPY(regs[33]); COPY(regs[34]); COPY(regs[35]);
-       COPY(regs[36]); COPY(regs[37]); COPY(regs[38]); COPY(regs[39]);
-       COPY(regs[40]); COPY(regs[41]); COPY(regs[42]); COPY(regs[43]);
-       COPY(regs[44]); COPY(regs[45]); COPY(regs[46]); COPY(regs[47]);
-       COPY(regs[48]); COPY(regs[49]); COPY(regs[50]); COPY(regs[51]);
-       COPY(regs[52]); COPY(regs[53]); COPY(regs[54]); COPY(regs[55]);
-       COPY(regs[56]); COPY(regs[57]); COPY(regs[58]); COPY(regs[59]);
-       COPY(regs[60]); COPY(regs[61]); COPY(regs[62]);
-       COPY(tregs[0]); COPY(tregs[1]); COPY(tregs[2]); COPY(tregs[3]);
-       COPY(tregs[4]); COPY(tregs[5]); COPY(tregs[6]); COPY(tregs[7]);
-       COPY(sr);       COPY(pc);
-
-#undef COPY
-
-       err |= __put_user(mask, &sc->oldmask);
-
-       return err;
-}
-
-/*
- * Determine which stack to use..
- */
-static inline void __user *
-get_sigframe(struct k_sigaction *ka, unsigned long sp, size_t frame_size)
-{
-       if ((ka->sa.sa_flags & SA_ONSTACK) != 0 && ! on_sig_stack(sp))
-               sp = current->sas_ss_sp + current->sas_ss_size;
-
-       return (void __user *)((sp - frame_size) & -8ul);
-}
-
-void sa_default_restorer(void);                /* See comments below */
-void sa_default_rt_restorer(void);     /* See comments below */
-
-static void setup_frame(int sig, struct k_sigaction *ka,
-                       sigset_t *set, struct pt_regs *regs)
-{
-       struct sigframe __user *frame;
-       int err = 0;
-       int signal;
-
-       frame = get_sigframe(ka, regs->regs[REG_SP], sizeof(*frame));
-
-       if (!access_ok(VERIFY_WRITE, frame, sizeof(*frame)))
-               goto give_sigsegv;
-
-       signal = current_thread_info()->exec_domain
-               && current_thread_info()->exec_domain->signal_invmap
-               && sig < 32
-               ? current_thread_info()->exec_domain->signal_invmap[sig]
-               : sig;
-
-       err |= setup_sigcontext(&frame->sc, regs, set->sig[0]);
-
-       /* Give up earlier as i386, in case */
-       if (err)
-               goto give_sigsegv;
-
-       if (_NSIG_WORDS > 1) {
-               err |= __copy_to_user(frame->extramask, &set->sig[1],
-                                     sizeof(frame->extramask)); }
-
-       /* Give up earlier as i386, in case */
-       if (err)
-               goto give_sigsegv;
-
-       /* Set up to return from userspace.  If provided, use a stub
-          already in userspace.  */
-       if (ka->sa.sa_flags & SA_RESTORER) {
-               DEREF_REG_PR = (unsigned long) ka->sa.sa_restorer | 0x1;
-
-               /*
-                * On SH5 all edited pointers are subject to NEFF
-                */
-               DEREF_REG_PR = (DEREF_REG_PR & NEFF_SIGN) ?
-                               (DEREF_REG_PR | NEFF_MASK) : DEREF_REG_PR;
-       } else {
-               /*
-                * Different approach on SH5.
-                * . Endianness independent asm code gets placed in entry.S .
-                *   This is limited to four ASM instructions corresponding
-                *   to two long longs in size.
-                * . err checking is done on the else branch only
-                * . flush_icache_range() is called upon __put_user() only
-                * . all edited pointers are subject to NEFF
-                * . being code, linker turns ShMedia bit on, always
-                *   dereference index -1.
-                */
-               DEREF_REG_PR = (unsigned long) frame->retcode | 0x01;
-               DEREF_REG_PR = (DEREF_REG_PR & NEFF_SIGN) ?
-                               (DEREF_REG_PR | NEFF_MASK) : DEREF_REG_PR;
-
-               if (__copy_to_user(frame->retcode,
-                       (unsigned long long)sa_default_restorer & (~1), 16) != 0)
-                       goto give_sigsegv;
-
-               /* Cohere the trampoline with the I-cache. */
-               flush_cache_sigtramp(DEREF_REG_PR-1, DEREF_REG_PR-1+16);
-       }
-
-       /*
-        * Set up registers for signal handler.
-        * All edited pointers are subject to NEFF.
-        */
-       regs->regs[REG_SP] = (unsigned long) frame;
-       regs->regs[REG_SP] = (regs->regs[REG_SP] & NEFF_SIGN) ?
-                        (regs->regs[REG_SP] | NEFF_MASK) : regs->regs[REG_SP];
-       regs->regs[REG_ARG1] = signal; /* Arg for signal handler */
-
-        /* FIXME:
-           The glibc profiling support for SH-5 needs to be passed a sigcontext
-           so it can retrieve the PC.  At some point during 2003 the glibc
-           support was changed to receive the sigcontext through the 2nd
-           argument, but there are still versions of libc.so in use that use
-           the 3rd argument.  Until libc.so is stabilised, pass the sigcontext
-           through both 2nd and 3rd arguments.
-        */
-
-       regs->regs[REG_ARG2] = (unsigned long long)(unsigned long)(signed long)&frame->sc;
-       regs->regs[REG_ARG3] = (unsigned long long)(unsigned long)(signed long)&frame->sc;
-
-       regs->pc = (unsigned long) ka->sa.sa_handler;
-       regs->pc = (regs->pc & NEFF_SIGN) ? (regs->pc | NEFF_MASK) : regs->pc;
-
-       set_fs(USER_DS);
-
-#if DEBUG_SIG
-       /* Broken %016Lx */
-       printk("SIG deliver (#%d,%s:%d): sp=%p pc=%08Lx%08Lx link=%08Lx%08Lx\n",
-               signal,
-               current->comm, current->pid, frame,
-               regs->pc >> 32, regs->pc & 0xffffffff,
-               DEREF_REG_PR >> 32, DEREF_REG_PR & 0xffffffff);
-#endif
-
-       return;
-
-give_sigsegv:
-       if (sig == SIGSEGV)
-               ka->sa.sa_handler = SIG_DFL;
-       force_sig(SIGSEGV, current);
-}
-
-static void setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
-                          sigset_t *set, struct pt_regs *regs)
-{
-       struct rt_sigframe __user *frame;
-       int err = 0;
-       int signal;
-
-       frame = get_sigframe(ka, regs->regs[REG_SP], sizeof(*frame));
-
-       if (!access_ok(VERIFY_WRITE, frame, sizeof(*frame)))
-               goto give_sigsegv;
-
-       signal = current_thread_info()->exec_domain
-               && current_thread_info()->exec_domain->signal_invmap
-               && sig < 32
-               ? current_thread_info()->exec_domain->signal_invmap[sig]
-               : sig;
-
-       err |= __put_user(&frame->info, &frame->pinfo);
-       err |= __put_user(&frame->uc, &frame->puc);
-       err |= copy_siginfo_to_user(&frame->info, info);
-
-       /* Give up earlier as i386, in case */
-       if (err)
-               goto give_sigsegv;
-
-       /* Create the ucontext.  */
-       err |= __put_user(0, &frame->uc.uc_flags);
-       err |= __put_user(0, &frame->uc.uc_link);
-       err |= __put_user((void *)current->sas_ss_sp,
-                         &frame->uc.uc_stack.ss_sp);
-       err |= __put_user(sas_ss_flags(regs->regs[REG_SP]),
-                         &frame->uc.uc_stack.ss_flags);
-       err |= __put_user(current->sas_ss_size, &frame->uc.uc_stack.ss_size);
-       err |= setup_sigcontext(&frame->uc.uc_mcontext,
-                               regs, set->sig[0]);
-       err |= __copy_to_user(&frame->uc.uc_sigmask, set, sizeof(*set));
-
-       /* Give up earlier as i386, in case */
-       if (err)
-               goto give_sigsegv;
-
-       /* Set up to return from userspace.  If provided, use a stub
-          already in userspace.  */
-       if (ka->sa.sa_flags & SA_RESTORER) {
-               DEREF_REG_PR = (unsigned long) ka->sa.sa_restorer | 0x1;
-
-               /*
-                * On SH5 all edited pointers are subject to NEFF
-                */
-               DEREF_REG_PR = (DEREF_REG_PR & NEFF_SIGN) ?
-                               (DEREF_REG_PR | NEFF_MASK) : DEREF_REG_PR;
-       } else {
-               /*
-                * Different approach on SH5.
-                * . Endianness independent asm code gets placed in entry.S .
-                *   This is limited to four ASM instructions corresponding
-                *   to two long longs in size.
-                * . err checking is done on the else branch only
-                * . flush_icache_range() is called upon __put_user() only
-                * . all edited pointers are subject to NEFF
-                * . being code, linker turns ShMedia bit on, always
-                *   dereference index -1.
-                */
-
-               DEREF_REG_PR = (unsigned long) frame->retcode | 0x01;
-               DEREF_REG_PR = (DEREF_REG_PR & NEFF_SIGN) ?
-                               (DEREF_REG_PR | NEFF_MASK) : DEREF_REG_PR;
-
-               if (__copy_to_user(frame->retcode,
-                       (unsigned long long)sa_default_rt_restorer & (~1), 16) != 0)
-                       goto give_sigsegv;
-
-               flush_icache_range(DEREF_REG_PR-1, DEREF_REG_PR-1+15);
-       }
-
-       /*
-        * Set up registers for signal handler.
-        * All edited pointers are subject to NEFF.
-        */
-       regs->regs[REG_SP] = (unsigned long) frame;
-       regs->regs[REG_SP] = (regs->regs[REG_SP] & NEFF_SIGN) ?
-                        (regs->regs[REG_SP] | NEFF_MASK) : regs->regs[REG_SP];
-       regs->regs[REG_ARG1] = signal; /* Arg for signal handler */
-       regs->regs[REG_ARG2] = (unsigned long long)(unsigned long)(signed long)&frame->info;
-       regs->regs[REG_ARG3] = (unsigned long long)(unsigned long)(signed long)&frame->uc.uc_mcontext;
-       regs->pc = (unsigned long) ka->sa.sa_handler;
-       regs->pc = (regs->pc & NEFF_SIGN) ? (regs->pc | NEFF_MASK) : regs->pc;
-
-       set_fs(USER_DS);
-
-#if DEBUG_SIG
-       /* Broken %016Lx */
-       printk("SIG deliver (#%d,%s:%d): sp=%p pc=%08Lx%08Lx link=%08Lx%08Lx\n",
-               signal,
-               current->comm, current->pid, frame,
-               regs->pc >> 32, regs->pc & 0xffffffff,
-               DEREF_REG_PR >> 32, DEREF_REG_PR & 0xffffffff);
-#endif
-
-       return;
-
-give_sigsegv:
-       if (sig == SIGSEGV)
-               ka->sa.sa_handler = SIG_DFL;
-       force_sig(SIGSEGV, current);
-}
-
-/*
- * OK, we're invoking a handler
- */
-
-static void
-handle_signal(unsigned long sig, siginfo_t *info, sigset_t *oldset,
-             struct pt_regs * regs)
-{
-       struct k_sigaction *ka = &current->sighand->action[sig-1];
-
-       /* Are we from a system call? */
-       if (regs->syscall_nr >= 0) {
-               /* If so, check system call restarting.. */
-               switch (regs->regs[REG_RET]) {
-                       case -ERESTARTNOHAND:
-                               regs->regs[REG_RET] = -EINTR;
-                               break;
-
-                       case -ERESTARTSYS:
-                               if (!(ka->sa.sa_flags & SA_RESTART)) {
-                                       regs->regs[REG_RET] = -EINTR;
-                                       break;
-                               }
-                       /* fallthrough */
-                       case -ERESTARTNOINTR:
-                               /* Decode syscall # */
-                               regs->regs[REG_RET] = regs->syscall_nr;
-                               regs->pc -= 4;
-               }
-       }
-
-       /* Set up the stack frame */
-       if (ka->sa.sa_flags & SA_SIGINFO)
-               setup_rt_frame(sig, ka, info, oldset, regs);
-       else
-               setup_frame(sig, ka, oldset, regs);
-
-       if (ka->sa.sa_flags & SA_ONESHOT)
-               ka->sa.sa_handler = SIG_DFL;
-
-       if (!(ka->sa.sa_flags & SA_NODEFER)) {
-               spin_lock_irq(&current->sighand->siglock);
-               sigorsets(&current->blocked,&current->blocked,&ka->sa.sa_mask);
-               sigaddset(&current->blocked,sig);
-               recalc_sigpending();
-               spin_unlock_irq(&current->sighand->siglock);
-       }
-}
-
-/*
- * Note that 'init' is a special process: it doesn't get signals it doesn't
- * want to handle. Thus you cannot kill init even with a SIGKILL even by
- * mistake.
- *
- * Note that we go through the signals twice: once to check the signals that
- * the kernel can handle, and then we build all the user-level signal handling
- * stack-frames in one go after that.
- */
-int do_signal(struct pt_regs *regs, sigset_t *oldset)
-{
-       siginfo_t info;
-       int signr;
-
-       /*
-        * We want the common case to go fast, which
-        * is why we may in certain cases get here from
-        * kernel mode. Just return without doing anything
-        * if so.
-        */
-       if (!user_mode(regs))
-               return 1;
-
-       if (current->flags & PF_FREEZE) {
-               refrigerator(0);
-               goto no_signal;
-               }
-
-       if (!oldset)
-               oldset = &current->blocked;
-
-       signr = get_signal_to_deliver(&info, regs, 0);
-
-       if (signr > 0) {
-               /* Whee!  Actually deliver the signal.  */
-               handle_signal(signr, &info, oldset, regs);
-               return 1;
-       }
-
-no_signal:
-       /* Did we come from a system call? */
-       if (regs->syscall_nr >= 0) {
-               /* Restart the system call - no handlers present */
-               if (regs->regs[REG_RET] == -ERESTARTNOHAND ||
-                   regs->regs[REG_RET] == -ERESTARTSYS ||
-                   regs->regs[REG_RET] == -ERESTARTNOINTR) {
-                       /* Decode Syscall # */
-                       regs->regs[REG_RET] = regs->syscall_nr;
-                       regs->pc -= 4;
-               }
-       }
-       return 0;
-}
diff --git a/arch/sh64/kernel/switchto.S b/arch/sh64/kernel/switchto.S
deleted file mode 100644 (file)
index 24ef14c..0000000
+++ /dev/null
@@ -1,199 +0,0 @@
-/*
- * arch/sh64/kernel/switchto.S
- *
- * sh64 context switch
- *
- * Copyright (C) 2004  Richard Curnow
- *
- * 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.
-*/
-
-       .section .text..SHmedia32,"ax"
-       .little
-
-       .balign 32
-
-       .type sh64_switch_to,@function
-       .global sh64_switch_to
-       .global __sh64_switch_to_end
-sh64_switch_to:
-
-/* Incoming args
-   r2 - prev
-   r3 - &prev->thread
-   r4 - next
-   r5 - &next->thread
-
-   Outgoing results
-   r2 - last (=prev)
-
-   Want to create a full (struct pt_regs) on the stack to allow backtracing
-   functions to work.  However, we only need to populate the callee-save
-   register slots in this structure; since we're a function our ancestors must
-   have themselves preserved all caller saved state in the stack.  This saves
-   some wasted effort since we won't need to look at the values.
-
-   In particular, all caller-save registers are immediately available for
-   scratch use.
-
-*/
-
-#define FRAME_SIZE (76*8 + 8)
-
-       movi    FRAME_SIZE, r0
-       sub.l   r15, r0, r15
-       ! Do normal-style register save to support backtrace
-
-       st.l    r15,   0, r18   ! save link reg
-       st.l    r15,   4, r14   ! save fp
-       add.l   r15, r63, r14   ! setup frame pointer
-
-       ! hopefully this looks normal to the backtrace now.
-
-       addi.l  r15,   8, r1    ! base of pt_regs
-       addi.l  r1,   24, r0    ! base of pt_regs.regs
-       addi.l  r0, (63*8), r8  ! base of pt_regs.trregs
-
-       /* Note : to be fixed?
-          struct pt_regs is really designed for holding the state on entry
-          to an exception, i.e. pc,sr,regs etc.  However, for the context
-          switch state, some of this is not required.  But the unwinder takes
-          struct pt_regs * as an arg so we have to build this structure
-          to allow unwinding switched tasks in show_state() */
-
-       st.q    r0, ( 9*8), r9
-       st.q    r0, (10*8), r10
-       st.q    r0, (11*8), r11
-       st.q    r0, (12*8), r12
-       st.q    r0, (13*8), r13
-       st.q    r0, (14*8), r14 ! for unwind, want to look as though we took a trap at
-       ! the point where the process is left in suspended animation, i.e. current
-       ! fp here, not the saved one.
-       st.q    r0, (16*8), r16
-
-       st.q    r0, (24*8), r24
-       st.q    r0, (25*8), r25
-       st.q    r0, (26*8), r26
-       st.q    r0, (27*8), r27
-       st.q    r0, (28*8), r28
-       st.q    r0, (29*8), r29
-       st.q    r0, (30*8), r30
-       st.q    r0, (31*8), r31
-       st.q    r0, (32*8), r32
-       st.q    r0, (33*8), r33
-       st.q    r0, (34*8), r34
-       st.q    r0, (35*8), r35
-
-       st.q    r0, (44*8), r44
-       st.q    r0, (45*8), r45
-       st.q    r0, (46*8), r46
-       st.q    r0, (47*8), r47
-       st.q    r0, (48*8), r48
-       st.q    r0, (49*8), r49
-       st.q    r0, (50*8), r50
-       st.q    r0, (51*8), r51
-       st.q    r0, (52*8), r52
-       st.q    r0, (53*8), r53
-       st.q    r0, (54*8), r54
-       st.q    r0, (55*8), r55
-       st.q    r0, (56*8), r56
-       st.q    r0, (57*8), r57
-       st.q    r0, (58*8), r58
-       st.q    r0, (59*8), r59
-
-       ! do this early as pta->gettr has no pipeline forwarding (=> 5 cycle latency)
-       ! Use a local label to avoid creating a symbol that will confuse the !
-       ! backtrace
-       pta     .Lsave_pc, tr0
-
-       gettr   tr5, r45
-       gettr   tr6, r46
-       gettr   tr7, r47
-       st.q    r8, (5*8), r45
-       st.q    r8, (6*8), r46
-       st.q    r8, (7*8), r47
-
-       ! Now switch context
-       gettr   tr0, r9
-       st.l    r3, 0, r15      ! prev->thread.sp
-       st.l    r3, 8, r1       ! prev->thread.kregs
-       st.l    r3, 4, r9       ! prev->thread.pc
-       st.q    r1, 0, r9       ! save prev->thread.pc into pt_regs->pc
-
-       ! Load PC for next task (init value or save_pc later)
-       ld.l    r5, 4, r18      ! next->thread.pc
-       ! Switch stacks
-       ld.l    r5, 0, r15      ! next->thread.sp
-       ptabs   r18, tr0
-
-       ! Update current
-       ld.l    r4, 4, r9       ! next->thread_info (2nd element of next task_struct)
-       putcon  r9, kcr0        ! current = next->thread_info
-
-       ! go to save_pc for a reschedule, or the initial thread.pc for a new process
-       blink   tr0, r63
-
-       ! Restore (when we come back to a previously saved task)
-.Lsave_pc:
-       addi.l  r15, 32, r0     ! r0 = next's regs
-       addi.l  r0, (63*8), r8  ! r8 = next's tr_regs
-
-       ld.q    r8, (5*8), r45
-       ld.q    r8, (6*8), r46
-       ld.q    r8, (7*8), r47
-       ptabs   r45, tr5
-       ptabs   r46, tr6
-       ptabs   r47, tr7
-
-       ld.q    r0, ( 9*8), r9
-       ld.q    r0, (10*8), r10
-       ld.q    r0, (11*8), r11
-       ld.q    r0, (12*8), r12
-       ld.q    r0, (13*8), r13
-       ld.q    r0, (14*8), r14
-       ld.q    r0, (16*8), r16
-
-       ld.q    r0, (24*8), r24
-       ld.q    r0, (25*8), r25
-       ld.q    r0, (26*8), r26
-       ld.q    r0, (27*8), r27
-       ld.q    r0, (28*8), r28
-       ld.q    r0, (29*8), r29
-       ld.q    r0, (30*8), r30
-       ld.q    r0, (31*8), r31
-       ld.q    r0, (32*8), r32
-       ld.q    r0, (33*8), r33
-       ld.q    r0, (34*8), r34
-       ld.q    r0, (35*8), r35
-
-       ld.q    r0, (44*8), r44
-       ld.q    r0, (45*8), r45
-       ld.q    r0, (46*8), r46
-       ld.q    r0, (47*8), r47
-       ld.q    r0, (48*8), r48
-       ld.q    r0, (49*8), r49
-       ld.q    r0, (50*8), r50
-       ld.q    r0, (51*8), r51
-       ld.q    r0, (52*8), r52
-       ld.q    r0, (53*8), r53
-       ld.q    r0, (54*8), r54
-       ld.q    r0, (55*8), r55
-       ld.q    r0, (56*8), r56
-       ld.q    r0, (57*8), r57
-       ld.q    r0, (58*8), r58
-       ld.q    r0, (59*8), r59
-
-       ! epilogue
-       ld.l    r15, 0, r18
-       ld.l    r15, 4, r14
-       ori     r4, 0, r2       ! last = prev
-       ptabs   r18, tr0
-       movi    FRAME_SIZE, r0
-       add     r15, r0, r15
-       blink   tr0, r63
-__sh64_switch_to_end:
-.LFE1:
-       .size   sh64_switch_to,.LFE1-sh64_switch_to
-
diff --git a/arch/sh64/kernel/sys_sh64.c b/arch/sh64/kernel/sys_sh64.c
deleted file mode 100644 (file)
index 6d99a97..0000000
+++ /dev/null
@@ -1,286 +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.
- *
- * arch/sh64/kernel/sys_sh64.c
- *
- * Copyright (C) 2000, 2001  Paolo Alberelli
- *
- * This file contains various random system calls that
- * have a non-standard calling sequence on the Linux/SH5
- * platform.
- *
- * Mostly taken from i386 version.
- *
- */
-
-#include <linux/errno.h>
-#include <linux/rwsem.h>
-#include <linux/sched.h>
-#include <linux/mm.h>
-#include <linux/smp.h>
-#include <linux/smp_lock.h>
-#include <linux/sem.h>
-#include <linux/msg.h>
-#include <linux/shm.h>
-#include <linux/stat.h>
-#include <linux/mman.h>
-#include <linux/file.h>
-#include <linux/utsname.h>
-#include <linux/syscalls.h>
-#include <asm/uaccess.h>
-#include <asm/ipc.h>
-#include <asm/ptrace.h>
-
-#define REG_3  3
-
-/*
- * sys_pipe() is the normal C calling standard for creating
- * a pipe. It's not the way Unix traditionally does this, though.
- */
-#ifdef NEW_PIPE_IMPLEMENTATION
-asmlinkage int sys_pipe(unsigned long * fildes,
-                       unsigned long   dummy_r3,
-                       unsigned long   dummy_r4,
-                       unsigned long   dummy_r5,
-                       unsigned long   dummy_r6,
-                       unsigned long   dummy_r7,
-                       struct pt_regs * regs)     /* r8 = pt_regs  forced by entry.S */
-{
-       int fd[2];
-       int ret;
-
-       ret = do_pipe(fd);
-       if (ret == 0)
-               /*
-                ***********************************************************************
-                *   To avoid the copy_to_user we prefer to break the ABIs convention, *
-                *   packing the valid pair of file IDs into a single register (r3);   *
-                *   while r2 is the return code as defined by the sh5-ABIs.           *
-                *   BE CAREFUL: pipe stub, into glibc, must be aware of this solution *
-                ***********************************************************************
-
-#ifdef __LITTLE_ENDIAN__
-               regs->regs[REG_3] = (((unsigned long long) fd[1]) << 32) | ((unsigned long long) fd[0]);
-#else
-               regs->regs[REG_3] = (((unsigned long long) fd[0]) << 32) | ((unsigned long long) fd[1]);
-#endif
-
-               */
-              /* although not very clever this is endianess independent */
-               regs->regs[REG_3] = (unsigned long long) *((unsigned long long *) fd);
-
-       return ret;
-}
-
-#else
-asmlinkage int sys_pipe(unsigned long * fildes)
-{
-        int fd[2];
-        int error;
-
-        error = do_pipe(fd);
-        if (!error) {
-                if (copy_to_user(fildes, fd, 2*sizeof(int)))
-                        error = -EFAULT;
-        }
-        return error;
-}
-
-#endif
-
-/*
- * To avoid cache alias, we map the shard page with same color.
- */
-#define COLOUR_ALIGN(addr)     (((addr)+SHMLBA-1)&~(SHMLBA-1))
-
-unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr,
-       unsigned long len, unsigned long pgoff, unsigned long flags)
-{
-       struct vm_area_struct *vma;
-
-       if (flags & MAP_FIXED) {
-               /* We do not accept a shared mapping if it would violate
-                * cache aliasing constraints.
-                */
-               if ((flags & MAP_SHARED) && (addr & (SHMLBA - 1)))
-                       return -EINVAL;
-               return addr;
-       }
-
-       if (len > TASK_SIZE)
-               return -ENOMEM;
-       if (!addr)
-               addr = TASK_UNMAPPED_BASE;
-
-       if (flags & MAP_PRIVATE)
-               addr = PAGE_ALIGN(addr);
-       else
-               addr = COLOUR_ALIGN(addr);
-
-       for (vma = find_vma(current->mm, addr); ; vma = vma->vm_next) {
-               /* At this point:  (!vma || addr < vma->vm_end). */
-               if (TASK_SIZE - len < addr)
-                       return -ENOMEM;
-               if (!vma || addr + len <= vma->vm_start)
-                       return addr;
-               addr = vma->vm_end;
-               if (!(flags & MAP_PRIVATE))
-                       addr = COLOUR_ALIGN(addr);
-       }
-}
-
-/* common code for old and new mmaps */
-static inline long do_mmap2(
-       unsigned long addr, unsigned long len,
-       unsigned long prot, unsigned long flags,
-       unsigned long fd, unsigned long pgoff)
-{
-       int error = -EBADF;
-       struct file * file = NULL;
-
-       flags &= ~(MAP_EXECUTABLE | MAP_DENYWRITE);
-       if (!(flags & MAP_ANONYMOUS)) {
-               file = fget(fd);
-               if (!file)
-                       goto out;
-       }
-
-       down_write(&current->mm->mmap_sem);
-       error = do_mmap_pgoff(file, addr, len, prot, flags, pgoff);
-       up_write(&current->mm->mmap_sem);
-
-       if (file)
-               fput(file);
-out:
-       return error;
-}
-
-asmlinkage long sys_mmap2(unsigned long addr, unsigned long len,
-       unsigned long prot, unsigned long flags,
-       unsigned long fd, unsigned long pgoff)
-{
-       return do_mmap2(addr, len, prot, flags, fd, pgoff);
-}
-
-asmlinkage int old_mmap(unsigned long addr, unsigned long len,
-       unsigned long prot, unsigned long flags,
-       int fd, unsigned long off)
-{
-       if (off & ~PAGE_MASK)
-               return -EINVAL;
-       return do_mmap2(addr, len, prot, flags, fd, off>>PAGE_SHIFT);
-}
-
-/*
- * sys_ipc() is the de-multiplexer for the SysV IPC calls..
- *
- * This is really horribly ugly.
- */
-asmlinkage int sys_ipc(uint call, int first, int second,
-                      int third, void __user *ptr, long fifth)
-{
-       int version, ret;
-
-       version = call >> 16; /* hack for backward compatibility */
-       call &= 0xffff;
-
-       if (call <= SEMCTL)
-               switch (call) {
-               case SEMOP:
-                       return sys_semtimedop(first, (struct sembuf __user *)ptr,
-                                             second, NULL);
-               case SEMTIMEDOP:
-                       return sys_semtimedop(first, (struct sembuf __user *)ptr,
-                                             second,
-                                             (const struct timespec __user *)fifth);
-               case SEMGET:
-                       return sys_semget (first, second, third);
-               case SEMCTL: {
-                       union semun fourth;
-                       if (!ptr)
-                               return -EINVAL;
-                       if (get_user(fourth.__pad, (void * __user *) ptr))
-                               return -EFAULT;
-                       return sys_semctl (first, second, third, fourth);
-                       }
-               default:
-                       return -EINVAL;
-               }
-
-       if (call <= MSGCTL)
-               switch (call) {
-               case MSGSND:
-                       return sys_msgsnd (first, (struct msgbuf __user *) ptr,
-                                         second, third);
-               case MSGRCV:
-                       switch (version) {
-                       case 0: {
-                               struct ipc_kludge tmp;
-                               if (!ptr)
-                                       return -EINVAL;
-
-                               if (copy_from_user(&tmp,
-                                                  (struct ipc_kludge __user *) ptr,
-                                                  sizeof (tmp)))
-                                       return -EFAULT;
-                               return sys_msgrcv (first, tmp.msgp, second,
-                                                  tmp.msgtyp, third);
-                               }
-                       default:
-                               return sys_msgrcv (first,
-                                                  (struct msgbuf __user *) ptr,
-                                                  second, fifth, third);
-                       }
-               case MSGGET:
-                       return sys_msgget ((key_t) first, second);
-               case MSGCTL:
-                       return sys_msgctl (first, second,
-                                          (struct msqid_ds __user *) ptr);
-               default:
-                       return -EINVAL;
-               }
-       if (call <= SHMCTL)
-               switch (call) {
-               case SHMAT:
-                       switch (version) {
-                       default: {
-                               ulong raddr;
-                               ret = do_shmat (first, (char __user *) ptr,
-                                                second, &raddr);
-                               if (ret)
-                                       return ret;
-                               return put_user (raddr, (ulong __user *) third);
-                       }
-                       case 1: /* iBCS2 emulator entry point */
-                               if (!segment_eq(get_fs(), get_ds()))
-                                       return -EINVAL;
-                               return do_shmat (first, (char __user *) ptr,
-                                                 second, (ulong *) third);
-                       }
-               case SHMDT:
-                       return sys_shmdt ((char __user *)ptr);
-               case SHMGET:
-                       return sys_shmget (first, second, third);
-               case SHMCTL:
-                       return sys_shmctl (first, second,
-                                          (struct shmid_ds __user *) ptr);
-               default:
-                       return -EINVAL;
-               }
-
-       return -EINVAL;
-}
-
-asmlinkage int sys_uname(struct old_utsname * name)
-{
-       int err;
-       if (!name)
-               return -EFAULT;
-       down_read(&uts_sem);
-       err=copy_to_user(name, &system_utsname, sizeof (*name));
-       up_read(&uts_sem);
-       return err?-EFAULT:0;
-}
-
diff --git a/arch/sh64/kernel/syscalls.S b/arch/sh64/kernel/syscalls.S
deleted file mode 100644 (file)
index 819e335..0000000
+++ /dev/null
@@ -1,340 +0,0 @@
-/*
- * arch/sh64/kernel/syscalls.S
- *
- * Copyright (C) 2000, 2001  Paolo Alberelli
- * Copyright (C) 2004  Paul Mundt
- * Copyright (C) 2003, 2004 Richard Curnow
- *
- * 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/sys.h>
-
-       .section .data, "aw"
-       .balign 32
-
-/*
- * System calls jump table
- */
-       .globl  sys_call_table
-sys_call_table:
-       .long sys_ni_syscall            /* 0  -  old "setup()" system call  */
-       .long sys_exit
-       .long sys_fork
-       .long sys_read
-       .long sys_write
-       .long sys_open                  /* 5 */
-       .long sys_close
-       .long sys_waitpid
-       .long sys_creat
-       .long sys_link
-       .long sys_unlink                /* 10 */
-       .long sys_execve
-       .long sys_chdir
-       .long sys_time
-       .long sys_mknod
-       .long sys_chmod                 /* 15 */
-       .long sys_lchown16
-       .long sys_ni_syscall    /* old break syscall holder */
-       .long sys_stat
-       .long sys_lseek
-       .long sys_getpid                /* 20 */
-       .long sys_mount
-       .long sys_oldumount
-       .long sys_setuid16
-       .long sys_getuid16
-       .long sys_stime                 /* 25 */
-       .long sys_ptrace
-       .long sys_alarm
-       .long sys_fstat
-       .long sys_pause
-       .long sys_utime                 /* 30 */
-       .long sys_ni_syscall    /* old stty syscall holder */
-       .long sys_ni_syscall    /* old gtty syscall holder */
-       .long sys_access
-       .long sys_nice
-       .long sys_ni_syscall            /* 35 */ /* old ftime syscall holder */
-       .long sys_sync
-       .long sys_kill
-       .long sys_rename
-       .long sys_mkdir
-       .long sys_rmdir                 /* 40 */
-       .long sys_dup
-       .long sys_pipe
-       .long sys_times
-       .long sys_ni_syscall    /* old prof syscall holder */
-       .long sys_brk                   /* 45 */
-       .long sys_setgid16
-       .long sys_getgid16
-       .long sys_signal
-       .long sys_geteuid16
-       .long sys_getegid16             /* 50 */
-       .long sys_acct
-       .long sys_umount                /* recycled never used phys( */
-       .long sys_ni_syscall    /* old lock syscall holder */
-       .long sys_ioctl
-       .long sys_fcntl                 /* 55 */
-       .long sys_ni_syscall    /* old mpx syscall holder */
-       .long sys_setpgid
-       .long sys_ni_syscall    /* old ulimit syscall holder */
-       .long sys_ni_syscall    /* sys_olduname */
-       .long sys_umask                 /* 60 */
-       .long sys_chroot
-       .long sys_ustat
-       .long sys_dup2
-       .long sys_getppid
-       .long sys_getpgrp               /* 65 */
-       .long sys_setsid
-       .long sys_sigaction
-       .long sys_sgetmask
-       .long sys_ssetmask
-       .long sys_setreuid16            /* 70 */
-       .long sys_setregid16
-       .long sys_sigsuspend
-       .long sys_sigpending
-       .long sys_sethostname
-       .long sys_setrlimit             /* 75 */
-       .long sys_old_getrlimit
-       .long sys_getrusage
-       .long sys_gettimeofday
-       .long sys_settimeofday
-       .long sys_getgroups16           /* 80 */
-       .long sys_setgroups16
-       .long sys_ni_syscall    /* sys_oldselect */
-       .long sys_symlink
-       .long sys_lstat
-       .long sys_readlink              /* 85 */
-       .long sys_uselib
-       .long sys_swapon
-       .long sys_reboot
-       .long old_readdir
-       .long old_mmap                  /* 90 */
-       .long sys_munmap
-       .long sys_truncate
-       .long sys_ftruncate
-       .long sys_fchmod
-       .long sys_fchown16              /* 95 */
-       .long sys_getpriority
-       .long sys_setpriority
-       .long sys_ni_syscall    /* old profil syscall holder */
-       .long sys_statfs
-       .long sys_fstatfs               /* 100 */
-       .long sys_ni_syscall    /* ioperm */
-       .long sys_socketcall    /* Obsolete implementation of socket syscall */
-       .long sys_syslog
-       .long sys_setitimer
-       .long sys_getitimer             /* 105 */
-       .long sys_newstat
-       .long sys_newlstat
-       .long sys_newfstat
-       .long sys_uname
-       .long sys_ni_syscall            /* 110 */ /* iopl */
-       .long sys_vhangup
-       .long sys_ni_syscall    /* idle */
-       .long sys_ni_syscall    /* vm86old */
-       .long sys_wait4
-       .long sys_swapoff               /* 115 */
-       .long sys_sysinfo
-       .long sys_ipc           /* Obsolete ipc syscall implementation */
-       .long sys_fsync
-       .long sys_sigreturn
-       .long sys_clone                 /* 120 */
-       .long sys_setdomainname
-       .long sys_newuname
-       .long sys_ni_syscall    /* sys_modify_ldt */
-       .long sys_adjtimex
-       .long sys_mprotect              /* 125 */
-       .long sys_sigprocmask
-       .long sys_ni_syscall            /* old "create_module" */
-       .long sys_init_module
-       .long sys_delete_module
-       .long sys_ni_syscall            /* 130: old "get_kernel_syms" */
-       .long sys_quotactl
-       .long sys_getpgid
-       .long sys_fchdir
-       .long sys_bdflush
-       .long sys_sysfs                 /* 135 */
-       .long sys_personality
-       .long sys_ni_syscall    /* for afs_syscall */
-       .long sys_setfsuid16
-       .long sys_setfsgid16
-       .long sys_llseek                /* 140 */
-       .long sys_getdents
-       .long sys_select
-       .long sys_flock
-       .long sys_msync
-       .long sys_readv                 /* 145 */
-       .long sys_writev
-       .long sys_getsid
-       .long sys_fdatasync
-       .long sys_sysctl
-       .long sys_mlock                 /* 150 */
-       .long sys_munlock
-       .long sys_mlockall
-       .long sys_munlockall
-       .long sys_sched_setparam
-       .long sys_sched_getparam        /* 155 */
-       .long sys_sched_setscheduler
-       .long sys_sched_getscheduler
-       .long sys_sched_yield
-       .long sys_sched_get_priority_max
-       .long sys_sched_get_priority_min  /* 160 */
-       .long sys_sched_rr_get_interval
-       .long sys_nanosleep
-       .long sys_mremap
-       .long sys_setresuid16
-       .long sys_getresuid16           /* 165 */
-       .long sys_ni_syscall    /* vm86 */
-       .long sys_ni_syscall    /* old "query_module" */
-       .long sys_poll
-       .long sys_nfsservctl
-       .long sys_setresgid16           /* 170 */
-       .long sys_getresgid16
-       .long sys_prctl
-       .long sys_rt_sigreturn
-       .long sys_rt_sigaction
-       .long sys_rt_sigprocmask        /* 175 */
-       .long sys_rt_sigpending
-       .long sys_rt_sigtimedwait
-       .long sys_rt_sigqueueinfo
-       .long sys_rt_sigsuspend
-       .long sys_pread64               /* 180 */
-       .long sys_pwrite64
-       .long sys_chown16
-       .long sys_getcwd
-       .long sys_capget
-       .long sys_capset                /* 185 */
-       .long sys_sigaltstack
-       .long sys_sendfile
-       .long sys_ni_syscall    /* streams1 */
-       .long sys_ni_syscall    /* streams2 */
-       .long sys_vfork                 /* 190 */
-       .long sys_getrlimit
-       .long sys_mmap2
-       .long sys_truncate64
-       .long sys_ftruncate64
-       .long sys_stat64                /* 195 */
-       .long sys_lstat64
-       .long sys_fstat64
-       .long sys_lchown
-       .long sys_getuid
-       .long sys_getgid                /* 200 */
-       .long sys_geteuid
-       .long sys_getegid
-       .long sys_setreuid
-       .long sys_setregid
-       .long sys_getgroups             /* 205 */
-       .long sys_setgroups
-       .long sys_fchown
-       .long sys_setresuid
-       .long sys_getresuid
-       .long sys_setresgid             /* 210 */
-       .long sys_getresgid
-       .long sys_chown
-       .long sys_setuid
-       .long sys_setgid
-       .long sys_setfsuid              /* 215 */
-       .long sys_setfsgid
-       .long sys_pivot_root
-       .long sys_mincore
-       .long sys_madvise
-       /* Broken-out socket family (maintain backwards compatibility in syscall
-          numbering with 2.4) */
-       .long sys_socket                /* 220 */
-       .long sys_bind
-       .long sys_connect
-       .long sys_listen
-       .long sys_accept
-       .long sys_getsockname           /* 225 */
-       .long sys_getpeername
-       .long sys_socketpair
-       .long sys_send
-       .long sys_sendto
-       .long sys_recv                  /* 230*/
-       .long sys_recvfrom
-       .long sys_shutdown
-       .long sys_setsockopt
-       .long sys_getsockopt
-       .long sys_sendmsg               /* 235 */
-       .long sys_recvmsg
-       /* Broken-out IPC family (maintain backwards compatibility in syscall
-          numbering with 2.4) */
-       .long sys_semop
-       .long sys_semget
-       .long sys_semctl
-       .long sys_msgsnd                /* 240 */
-       .long sys_msgrcv
-       .long sys_msgget
-       .long sys_msgctl
-       .long sys_ni_syscall /* sys_shmatcall */
-       .long sys_shmdt                 /* 245 */
-       .long sys_shmget
-       .long sys_shmctl
-       /* Rest of syscalls listed in 2.4 i386 unistd.h */
-       .long sys_getdents64
-       .long sys_fcntl64
-       .long sys_ni_syscall            /* 250 reserved for TUX */
-       .long sys_ni_syscall            /* Reserved for Security */
-       .long sys_gettid
-       .long sys_readahead
-       .long sys_setxattr
-       .long sys_lsetxattr             /* 255 */
-       .long sys_fsetxattr
-       .long sys_getxattr
-       .long sys_lgetxattr
-       .long sys_fgetxattr
-       .long sys_listxattr             /* 260 */
-       .long sys_llistxattr
-       .long sys_flistxattr
-       .long sys_removexattr
-       .long sys_lremovexattr
-       .long sys_fremovexattr          /* 265 */
-       .long sys_tkill
-       .long sys_sendfile64
-       .long sys_futex
-       .long sys_sched_setaffinity
-       .long sys_sched_getaffinity     /* 270 */
-       .long sys_ni_syscall
-       .long sys_ni_syscall
-       .long sys_io_setup
-       .long sys_io_destroy
-       .long sys_io_getevents          /* 275 */
-       .long sys_io_submit
-       .long sys_io_cancel
-       .long sys_fadvise64
-       .long sys_ni_syscall
-       .long sys_exit_group            /* 280 */
-       /* Rest of new 2.6 syscalls */
-       .long sys_lookup_dcookie
-       .long sys_epoll_create
-       .long sys_epoll_ctl
-       .long sys_epoll_wait
-       .long sys_remap_file_pages      /* 285 */
-       .long sys_set_tid_address
-       .long sys_timer_create
-       .long sys_timer_settime
-       .long sys_timer_gettime
-       .long sys_timer_getoverrun      /* 290 */
-       .long sys_timer_delete
-       .long sys_clock_settime
-       .long sys_clock_gettime
-       .long sys_clock_getres
-       .long sys_clock_nanosleep       /* 295 */
-       .long sys_statfs64
-       .long sys_fstatfs64
-       .long sys_tgkill
-       .long sys_utimes
-       .long sys_fadvise64_64          /* 300 */
-       .long sys_ni_syscall    /* Reserved for vserver */
-       .long sys_ni_syscall    /* Reserved for mbind */
-       .long sys_ni_syscall    /* get_mempolicy */
-       .long sys_ni_syscall    /* set_mempolicy */
-       .long sys_mq_open               /* 305 */
-       .long sys_mq_unlink
-       .long sys_mq_timedsend
-       .long sys_mq_timedreceive
-       .long sys_mq_notify
-       .long sys_mq_getsetattr         /* 310 */
-
diff --git a/arch/sh64/kernel/time.c b/arch/sh64/kernel/time.c
deleted file mode 100644 (file)
index 128bd22..0000000
+++ /dev/null
@@ -1,637 +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.
- *
- * arch/sh64/kernel/time.c
- *
- * Copyright (C) 2000, 2001  Paolo Alberelli
- * Copyright (C) 2003, 2004  Paul Mundt
- * Copyright (C) 2003  Richard Curnow
- *
- *    Original TMU/RTC code taken from sh version.
- *    Copyright (C) 1999  Tetsuya Okada & Niibe Yutaka
- *      Some code taken from i386 version.
- *      Copyright (C) 1991, 1992, 1995  Linus Torvalds
- */
-
-#include <linux/config.h>
-#include <linux/errno.h>
-#include <linux/rwsem.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/time.h>
-#include <linux/delay.h>
-#include <linux/init.h>
-#include <linux/profile.h>
-#include <linux/smp.h>
-
-#include <asm/registers.h>      /* required by inline __asm__ stmt. */
-
-#include <asm/processor.h>
-#include <asm/uaccess.h>
-#include <asm/io.h>
-#include <asm/irq.h>
-#include <asm/delay.h>
-
-#include <linux/timex.h>
-#include <linux/irq.h>
-#include <asm/hardware.h>
-
-#define TMU_TOCR_INIT  0x00
-#define TMU0_TCR_INIT  0x0020
-#define TMU_TSTR_INIT  1
-
-/* RCR1 Bits */
-#define RCR1_CF                0x80    /* Carry Flag             */
-#define RCR1_CIE       0x10    /* Carry Interrupt Enable */
-#define RCR1_AIE       0x08    /* Alarm Interrupt Enable */
-#define RCR1_AF                0x01    /* Alarm Flag             */
-
-/* RCR2 Bits */
-#define RCR2_PEF       0x80    /* PEriodic interrupt Flag */
-#define RCR2_PESMASK   0x70    /* Periodic interrupt Set  */
-#define RCR2_RTCEN     0x08    /* ENable RTC              */
-#define RCR2_ADJ       0x04    /* ADJustment (30-second)  */
-#define RCR2_RESET     0x02    /* Reset bit               */
-#define RCR2_START     0x01    /* Start bit               */
-
-/* Clock, Power and Reset Controller */
-#define        CPRC_BLOCK_OFF  0x01010000
-#define CPRC_BASE      PHYS_PERIPHERAL_BLOCK + CPRC_BLOCK_OFF
-
-#define FRQCR          (cprc_base+0x0)
-#define WTCSR          (cprc_base+0x0018)
-#define STBCR          (cprc_base+0x0030)
-
-/* Time Management Unit */
-#define        TMU_BLOCK_OFF   0x01020000
-#define TMU_BASE       PHYS_PERIPHERAL_BLOCK + TMU_BLOCK_OFF
-#define TMU0_BASE      tmu_base + 0x8 + (0xc * 0x0)
-#define TMU1_BASE      tmu_base + 0x8 + (0xc * 0x1)
-#define TMU2_BASE      tmu_base + 0x8 + (0xc * 0x2)
-
-#define TMU_TOCR       tmu_base+0x0    /* Byte access */
-#define TMU_TSTR       tmu_base+0x4    /* Byte access */
-
-#define TMU0_TCOR      TMU0_BASE+0x0   /* Long access */
-#define TMU0_TCNT      TMU0_BASE+0x4   /* Long access */
-#define TMU0_TCR       TMU0_BASE+0x8   /* Word access */
-
-/* Real Time Clock */
-#define        RTC_BLOCK_OFF   0x01040000
-#define RTC_BASE       PHYS_PERIPHERAL_BLOCK + RTC_BLOCK_OFF
-
-#define R64CNT         rtc_base+0x00
-#define RSECCNT        rtc_base+0x04
-#define RMINCNT        rtc_base+0x08
-#define RHRCNT         rtc_base+0x0c
-#define RWKCNT         rtc_base+0x10
-#define RDAYCNT        rtc_base+0x14
-#define RMONCNT        rtc_base+0x18
-#define RYRCNT         rtc_base+0x1c   /* 16bit */
-#define RSECAR         rtc_base+0x20
-#define RMINAR         rtc_base+0x24
-#define RHRAR          rtc_base+0x28
-#define RWKAR          rtc_base+0x2c
-#define RDAYAR         rtc_base+0x30
-#define RMONAR         rtc_base+0x34
-#define RCR1           rtc_base+0x38
-#define RCR2           rtc_base+0x3c
-
-#ifndef BCD_TO_BIN
-#define BCD_TO_BIN(val) ((val)=((val)&15) + ((val)>>4)*10)
-#endif
-
-#ifndef BIN_TO_BCD
-#define BIN_TO_BCD(val) ((val)=(((val)/10)<<4) + (val)%10)
-#endif
-
-#define TICK_SIZE (tick_nsec / 1000)
-
-extern unsigned long wall_jiffies;
-
-u64 jiffies_64 = INITIAL_JIFFIES;
-
-static unsigned long tmu_base, rtc_base;
-unsigned long cprc_base;
-
-/* Variables to allow interpolation of time of day to resolution better than a
- * jiffy. */
-
-/* This is effectively protected by xtime_lock */
-static unsigned long ctc_last_interrupt;
-static unsigned long long usecs_per_jiffy = 1000000/HZ; /* Approximation */
-
-#define CTC_JIFFY_SCALE_SHIFT 40
-
-/* 2**CTC_JIFFY_SCALE_SHIFT / ctc_ticks_per_jiffy */
-static unsigned long long scaled_recip_ctc_ticks_per_jiffy;
-
-/* Estimate number of microseconds that have elapsed since the last timer tick,
-   by scaling the delta that has occured in the CTC register.
-
-   WARNING WARNING WARNING : This algorithm relies on the CTC decrementing at
-   the CPU clock rate.  If the CPU sleeps, the CTC stops counting.  Bear this
-   in mind if enabling SLEEP_WORKS in process.c.  In that case, this algorithm
-   probably needs to use TMU.TCNT0 instead.  This will work even if the CPU is
-   sleeping, though will be coarser.
-
-   FIXME : What if usecs_per_tick is moving around too much, e.g. if an adjtime
-   is running or if the freq or tick arguments of adjtimex are modified after
-   we have calibrated the scaling factor?  This will result in either a jump at
-   the end of a tick period, or a wrap backwards at the start of the next one,
-   if the application is reading the time of day often enough.  I think we
-   ought to do better than this.  For this reason, usecs_per_jiffy is left
-   separated out in the calculation below.  This allows some future hook into
-   the adjtime-related stuff in kernel/timer.c to remove this hazard.
-
-*/
-
-static unsigned long usecs_since_tick(void)
-{
-       unsigned long long current_ctc;
-       long ctc_ticks_since_interrupt;
-       unsigned long long ull_ctc_ticks_since_interrupt;
-       unsigned long result;
-
-       unsigned long long mul1_out;
-       unsigned long long mul1_out_high;
-       unsigned long long mul2_out_low, mul2_out_high;
-
-       /* Read CTC register */
-       asm ("getcon cr62, %0" : "=r" (current_ctc));
-       /* Note, the CTC counts down on each CPU clock, not up.
-          Note(2), use long type to get correct wraparound arithmetic when
-          the counter crosses zero. */
-       ctc_ticks_since_interrupt = (long) ctc_last_interrupt - (long) current_ctc;
-       ull_ctc_ticks_since_interrupt = (unsigned long long) ctc_ticks_since_interrupt;
-
-       /* Inline assembly to do 32x32x32->64 multiplier */
-       asm volatile ("mulu.l %1, %2, %0" :
-            "=r" (mul1_out) :
-            "r" (ull_ctc_ticks_since_interrupt), "r" (usecs_per_jiffy));
-
-       mul1_out_high = mul1_out >> 32;
-
-       asm volatile ("mulu.l %1, %2, %0" :
-            "=r" (mul2_out_low) :
-            "r" (mul1_out), "r" (scaled_recip_ctc_ticks_per_jiffy));
-
-#if 1
-       asm volatile ("mulu.l %1, %2, %0" :
-            "=r" (mul2_out_high) :
-            "r" (mul1_out_high), "r" (scaled_recip_ctc_ticks_per_jiffy));
-#endif
-
-       result = (unsigned long) (((mul2_out_high << 32) + mul2_out_low) >> CTC_JIFFY_SCALE_SHIFT);
-
-       return result;
-}
-
-void do_gettimeofday(struct timeval *tv)
-{
-       unsigned long flags;
-       unsigned long seq;
-       unsigned long usec, sec;
-
-       do {
-               seq = read_seqbegin_irqsave(&xtime_lock, flags);
-               usec = usecs_since_tick();
-               {
-                       unsigned long lost = jiffies - wall_jiffies;
-
-                       if (lost)
-                               usec += lost * (1000000 / HZ);
-               }
-
-               sec = xtime.tv_sec;
-               usec += xtime.tv_nsec / 1000;
-       } while (read_seqretry_irqrestore(&xtime_lock, seq, flags));
-
-       while (usec >= 1000000) {
-               usec -= 1000000;
-               sec++;
-       }
-
-       tv->tv_sec = sec;
-       tv->tv_usec = usec;
-}
-
-int do_settimeofday(struct timespec *tv)
-{
-       time_t wtm_sec, sec = tv->tv_sec;
-       long wtm_nsec, nsec = tv->tv_nsec;
-
-       if ((unsigned long)tv->tv_nsec >= NSEC_PER_SEC)
-               return -EINVAL;
-
-       write_seqlock_irq(&xtime_lock);
-       /*
-        * This is revolting. We need to set "xtime" correctly. However, the
-        * value in this location is the value at the most recent update of
-        * wall time.  Discover what correction gettimeofday() would have
-        * made, and then undo it!
-        */
-       nsec -= 1000 * (usecs_since_tick() +
-                               (jiffies - wall_jiffies) * (1000000 / HZ));
-
-       wtm_sec  = wall_to_monotonic.tv_sec + (xtime.tv_sec - sec);
-       wtm_nsec = wall_to_monotonic.tv_nsec + (xtime.tv_nsec - nsec);
-
-       set_normalized_timespec(&xtime, sec, nsec);
-       set_normalized_timespec(&wall_to_monotonic, wtm_sec, wtm_nsec);
-
-       time_adjust = 0;                /* stop active adjtime() */
-       time_status |= STA_UNSYNC;
-       time_maxerror = NTP_PHASE_LIMIT;
-       time_esterror = NTP_PHASE_LIMIT;
-       write_sequnlock_irq(&xtime_lock);
-       clock_was_set();
-
-       return 0;
-}
-
-static int set_rtc_time(unsigned long nowtime)
-{
-       int retval = 0;
-       int real_seconds, real_minutes, cmos_minutes;
-
-       ctrl_outb(RCR2_RESET, RCR2);  /* Reset pre-scaler & stop RTC */
-
-       cmos_minutes = ctrl_inb(RMINCNT);
-       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) {
-               BIN_TO_BCD(real_seconds);
-               BIN_TO_BCD(real_minutes);
-               ctrl_outb(real_seconds, RSECCNT);
-               ctrl_outb(real_minutes, RMINCNT);
-       } else {
-               printk(KERN_WARNING
-                      "set_rtc_time: can't update from %d to %d\n",
-                      cmos_minutes, real_minutes);
-               retval = -1;
-       }
-
-       ctrl_outb(RCR2_RTCEN|RCR2_START, RCR2);  /* Start RTC */
-
-       return retval;
-}
-
-/* last time the RTC clock got updated */
-static long last_rtc_update = 0;
-
-static inline void sh64_do_profile(struct pt_regs *regs)
-{
-       extern int _stext;
-       unsigned long pc;
-
-       profile_hook(regs);
-
-       if (user_mode(regs))
-               return;
-
-       /* Don't profile cpu_idle..  */
-       if (!prof_buffer || !current->pid)
-               return;
-
-       pc = instruction_pointer(regs);
-       pc -= (unsigned long) &_stext;
-       pc >>= prof_shift;
-
-       /*
-        * Don't ignore out-of-bounds PC values silently, put them into the
-        * last histogram slot, so if present, they will show up as a sharp
-        * peak.
-        */
-       if (pc > prof_len - 1)
-               pc = prof_len - 1;
-
-       /* We could just be sloppy and not lock against a re-entry on this
-          increment, but the profiling code won't always be linked in anyway. */
-       atomic_inc((atomic_t *)&prof_buffer[pc]);
-}
-
-/*
- * timer_interrupt() needs to keep up the real-time clock,
- * as well as call the "do_timer()" routine every clocktick
- */
-static inline void do_timer_interrupt(int irq, void *dev_id, struct pt_regs *regs)
-{
-       unsigned long long current_ctc;
-       asm ("getcon cr62, %0" : "=r" (current_ctc));
-       ctc_last_interrupt = (unsigned long) current_ctc;
-
-       do_timer(regs);
-
-       sh64_do_profile(regs);
-
-#ifdef CONFIG_HEARTBEAT
-       {
-               extern void heartbeat(void);
-
-               heartbeat();
-       }
-#endif
-
-       /*
-        * If we have an externally synchronized Linux clock, then update
-        * RTC clock accordingly every ~11 minutes. Set_rtc_mmss() has to be
-        * called as close as possible to 500 ms before the new second starts.
-        */
-       if ((time_status & STA_UNSYNC) == 0 &&
-           xtime.tv_sec > last_rtc_update + 660 &&
-           (xtime.tv_nsec / 1000) >= 500000 - ((unsigned) TICK_SIZE) / 2 &&
-           (xtime.tv_nsec / 1000) <= 500000 + ((unsigned) TICK_SIZE) / 2) {
-               if (set_rtc_time(xtime.tv_sec) == 0)
-                       last_rtc_update = xtime.tv_sec;
-               else
-                       last_rtc_update = xtime.tv_sec - 600; /* do it again in 60 s */
-       }
-}
-
-/*
- * This is the same as the above, except we _also_ save the current
- * Time Stamp Counter value at the time of the timer interrupt, so that
- * we later on can estimate the time of day more exactly.
- */
-static irqreturn_t timer_interrupt(int irq, void *dev_id, struct pt_regs *regs)
-{
-       unsigned long timer_status;
-
-       /* Clear UNF bit */
-       timer_status = ctrl_inw(TMU0_TCR);
-       timer_status &= ~0x100;
-       ctrl_outw(timer_status, TMU0_TCR);
-
-       /*
-        * Here we are in the timer irq handler. We just have irqs locally
-        * disabled but we don't know if the timer_bh is running on the other
-        * CPU. We need to avoid to SMP race with it. NOTE: we don' t need
-        * the irq version of write_lock because as just said we have irq
-        * locally disabled. -arca
-        */
-       write_lock(&xtime_lock);
-       do_timer_interrupt(irq, NULL, regs);
-       write_unlock(&xtime_lock);
-
-       return IRQ_HANDLED;
-}
-
-static unsigned long get_rtc_time(void)
-{
-       unsigned int sec, min, hr, wk, day, mon, yr, yr100;
-
- again:
-       do {
-               ctrl_outb(0, RCR1);  /* Clear CF-bit */
-               sec = ctrl_inb(RSECCNT);
-               min = ctrl_inb(RMINCNT);
-               hr  = ctrl_inb(RHRCNT);
-               wk  = ctrl_inb(RWKCNT);
-               day = ctrl_inb(RDAYCNT);
-               mon = ctrl_inb(RMONCNT);
-               yr  = ctrl_inw(RYRCNT);
-               yr100 = (yr >> 8);
-               yr &= 0xff;
-       } while ((ctrl_inb(RCR1) & RCR1_CF) != 0);
-
-       BCD_TO_BIN(yr100);
-       BCD_TO_BIN(yr);
-       BCD_TO_BIN(mon);
-       BCD_TO_BIN(day);
-       BCD_TO_BIN(hr);
-       BCD_TO_BIN(min);
-       BCD_TO_BIN(sec);
-
-       if (yr > 99 || mon < 1 || mon > 12 || day > 31 || day < 1 ||
-           hr > 23 || min > 59 || sec > 59) {
-               printk(KERN_ERR
-                      "SH RTC: invalid value, resetting to 1 Jan 2000\n");
-               ctrl_outb(RCR2_RESET, RCR2);  /* Reset & Stop */
-               ctrl_outb(0, RSECCNT);
-               ctrl_outb(0, RMINCNT);
-               ctrl_outb(0, RHRCNT);
-               ctrl_outb(6, RWKCNT);
-               ctrl_outb(1, RDAYCNT);
-               ctrl_outb(1, RMONCNT);
-               ctrl_outw(0x2000, RYRCNT);
-               ctrl_outb(RCR2_RTCEN|RCR2_START, RCR2);  /* Start */
-               goto again;
-       }
-
-       return mktime(yr100 * 100 + yr, mon, day, hr, min, sec);
-}
-
-static __init unsigned int get_cpu_hz(void)
-{
-       unsigned int count;
-       unsigned long __dummy;
-       unsigned long ctc_val_init, ctc_val;
-
-       /*
-       ** Regardless the toolchain, force the compiler to use the
-       ** arbitrary register r3 as a clock tick counter.
-       ** NOTE: r3 must be in accordance with rtc_interrupt()
-       */
-       register unsigned long long  __rtc_irq_flag __asm__ ("r3");
-
-       sti();
-       do {} while (ctrl_inb(R64CNT) != 0);
-       ctrl_outb(RCR1_CIE, RCR1); /* Enable carry interrupt */
-
-       /*
-        * r3 is arbitrary. CDC does not support "=z".
-        */
-       ctc_val_init = 0xffffffff;
-       ctc_val = ctc_val_init;
-
-       asm volatile("gettr     tr0, %1\n\t"
-                    "putcon    %0, " __CTC "\n\t"
-                    "and       %2, r63, %2\n\t"
-                    "pta       $+4, tr0\n\t"
-                    "beq/l     %2, r63, tr0\n\t"
-                    "ptabs     %1, tr0\n\t"
-                    "getcon    " __CTC ", %0\n\t"
-               : "=r"(ctc_val), "=r" (__dummy), "=r" (__rtc_irq_flag)
-               : "0" (0));
-       cli();
-       /*
-        * SH-3:
-        * CPU clock = 4 stages * loop
-        * tst    rm,rm      if id ex
-        * bt/s   1b            if id ex
-        * add    #1,rd            if id ex
-         *                            (if) pipe line stole
-        * tst    rm,rm                  if id ex
-         * ....
-        *
-        *
-        * SH-4:
-        * CPU clock = 6 stages * loop
-        * I don't know why.
-         * ....
-        *
-        * SH-5:
-        * Use CTC register to count.  This approach returns the right value
-        * even if the I-cache is disabled (e.g. whilst debugging.)
-        *
-        */
-
-       count = ctc_val_init - ctc_val; /* CTC counts down */
-
-#if defined (CONFIG_SH_SIMULATOR)
-       /*
-        * Let's pretend we are a 5MHz SH-5 to avoid a too
-        * little timer interval. Also to keep delay
-        * calibration within a reasonable time.
-        */
-       return 5000000;
-#else
-       /*
-        * This really is count by the number of clock cycles
-         * by the ratio between a complete R64CNT
-         * wrap-around (128) and CUI interrupt being raised (64).
-        */
-       return count*2;
-#endif
-}
-
-static irqreturn_t rtc_interrupt(int irq, void *dev_id, struct pt_regs *regs)
-{
-       ctrl_outb(0, RCR1);     /* Disable Carry Interrupts */
-       regs->regs[3] = 1;      /* Using r3 */
-
-       return IRQ_HANDLED;
-}
-
-static struct irqaction irq0  = { timer_interrupt, SA_INTERRUPT, CPU_MASK_NONE, "timer", NULL, NULL};
-static struct irqaction irq1  = { rtc_interrupt, SA_INTERRUPT, CPU_MASK_NONE, "rtc", NULL, NULL};
-
-void __init time_init(void)
-{
-       unsigned int cpu_clock, master_clock, bus_clock, module_clock;
-       unsigned long interval;
-       unsigned long frqcr, ifc, pfc;
-       static int ifc_table[] = { 2, 4, 6, 8, 10, 12, 16, 24 };
-#define bfc_table ifc_table    /* Same */
-#define pfc_table ifc_table    /* Same */
-
-       tmu_base = onchip_remap(TMU_BASE, 1024, "TMU");
-       if (!tmu_base) {
-               panic("Unable to remap TMU\n");
-       }
-
-       rtc_base = onchip_remap(RTC_BASE, 1024, "RTC");
-       if (!rtc_base) {
-               panic("Unable to remap RTC\n");
-       }
-
-       cprc_base = onchip_remap(CPRC_BASE, 1024, "CPRC");
-       if (!cprc_base) {
-               panic("Unable to remap CPRC\n");
-       }
-
-       xtime.tv_sec = get_rtc_time();
-       xtime.tv_nsec = 0;
-
-       setup_irq(TIMER_IRQ, &irq0);
-       setup_irq(RTC_IRQ, &irq1);
-
-       /* Check how fast it is.. */
-       cpu_clock = get_cpu_hz();
-
-       /* Note careful order of operations to maintain reasonable precision and avoid overflow. */
-       scaled_recip_ctc_ticks_per_jiffy = ((1ULL << CTC_JIFFY_SCALE_SHIFT) / (unsigned long long)(cpu_clock / HZ));
-
-       disable_irq(RTC_IRQ);
-
-       printk("CPU clock: %d.%02dMHz\n",
-              (cpu_clock / 1000000), (cpu_clock % 1000000)/10000);
-       {
-               unsigned short bfc;
-               frqcr = ctrl_inl(FRQCR);
-               ifc  = ifc_table[(frqcr>> 6) & 0x0007];
-               bfc  = bfc_table[(frqcr>> 3) & 0x0007];
-               pfc  = pfc_table[(frqcr>> 12) & 0x0007];
-               master_clock = cpu_clock * ifc;
-               bus_clock = master_clock/bfc;
-       }
-
-       printk("Bus clock: %d.%02dMHz\n",
-              (bus_clock/1000000), (bus_clock % 1000000)/10000);
-       module_clock = master_clock/pfc;
-       printk("Module clock: %d.%02dMHz\n",
-              (module_clock/1000000), (module_clock % 1000000)/10000);
-       interval = (module_clock/(HZ*4));
-
-       printk("Interval = %ld\n", interval);
-
-       current_cpu_data.cpu_clock    = cpu_clock;
-       current_cpu_data.master_clock = master_clock;
-       current_cpu_data.bus_clock    = bus_clock;
-       current_cpu_data.module_clock = module_clock;
-
-       /* Start TMU0 */
-       ctrl_outb(TMU_TOCR_INIT, TMU_TOCR);
-       ctrl_outw(TMU0_TCR_INIT, TMU0_TCR);
-       ctrl_outl(interval, TMU0_TCOR);
-       ctrl_outl(interval, TMU0_TCNT);
-       ctrl_outb(TMU_TSTR_INIT, TMU_TSTR);
-}
-
-void enter_deep_standby(void)
-{
-       /* Disable watchdog timer */
-       ctrl_outl(0xa5000000, WTCSR);
-       /* Configure deep standby on sleep */
-       ctrl_outl(0x03, STBCR);
-
-#ifdef CONFIG_SH_ALPHANUMERIC
-       {
-               extern void mach_alphanum(int position, unsigned char value);
-               extern void mach_alphanum_brightness(int setting);
-               char halted[] = "Halted. ";
-               int i;
-               mach_alphanum_brightness(6); /* dimmest setting above off */
-               for (i=0; i<8; i++) {
-                       mach_alphanum(i, halted[i]);
-               }
-               asm __volatile__ ("synco");
-       }
-#endif
-
-       asm __volatile__ ("sleep");
-       asm __volatile__ ("synci");
-       asm __volatile__ ("nop");
-       asm __volatile__ ("nop");
-       asm __volatile__ ("nop");
-       asm __volatile__ ("nop");
-       panic("Unexpected wakeup!\n");
-}
-
-/*
- * Scheduler clock - returns current time in nanosec units.
- */
-unsigned long long sched_clock(void)
-{
-       return (unsigned long long)jiffies * (1000000000 / HZ);
-}
-
diff --git a/arch/sh64/kernel/traps.c b/arch/sh64/kernel/traps.c
deleted file mode 100644 (file)
index b2b2bde..0000000
+++ /dev/null
@@ -1,958 +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.
- *
- * arch/sh64/kernel/traps.c
- *
- * Copyright (C) 2000, 2001  Paolo Alberelli
- * Copyright (C) 2003, 2004  Paul Mundt
- * Copyright (C) 2003, 2004  Richard Curnow
- *
- */
-
-/*
- * 'Traps.c' handles hardware traps and faults after we have saved some
- * state in 'entry.S'.
- */
-#include <linux/sched.h>
-#include <linux/kernel.h>
-#include <linux/string.h>
-#include <linux/errno.h>
-#include <linux/ptrace.h>
-#include <linux/timer.h>
-#include <linux/mm.h>
-#include <linux/smp.h>
-#include <linux/smp_lock.h>
-#include <linux/init.h>
-#include <linux/delay.h>
-#include <linux/spinlock.h>
-#include <linux/kallsyms.h>
-#include <linux/interrupt.h>
-#include <linux/sysctl.h>
-
-#include <asm/system.h>
-#include <asm/uaccess.h>
-#include <asm/io.h>
-#include <asm/atomic.h>
-#include <asm/processor.h>
-#include <asm/pgtable.h>
-
-#undef DEBUG_EXCEPTION
-#ifdef DEBUG_EXCEPTION
-/* implemented in ../lib/dbg.c */
-extern void show_excp_regs(char *fname, int trapnr, int signr,
-                          struct pt_regs *regs);
-#else
-#define show_excp_regs(a, b, c, d)
-#endif
-
-static void do_unhandled_exception(int trapnr, int signr, char *str, char *fn_name,
-               unsigned long error_code, struct pt_regs *regs, struct task_struct *tsk);
-
-#define DO_ERROR(trapnr, signr, str, name, tsk) \
-asmlinkage void do_##name(unsigned long error_code, struct pt_regs *regs) \
-{ \
-       do_unhandled_exception(trapnr, signr, str, __stringify(name), error_code, regs, current); \
-}
-
-spinlock_t die_lock;
-
-void die(const char * str, struct pt_regs * regs, long err)
-{
-       console_verbose();
-       spin_lock_irq(&die_lock);
-       printk("%s: %lx\n", str, (err & 0xffffff));
-       show_regs(regs);
-       spin_unlock_irq(&die_lock);
-       do_exit(SIGSEGV);
-}
-
-static inline void die_if_kernel(const char * str, struct pt_regs * regs, long err)
-{
-       if (!user_mode(regs))
-               die(str, regs, err);
-}
-
-static void die_if_no_fixup(const char * str, struct pt_regs * regs, long err)
-{
-       if (!user_mode(regs)) {
-               const struct exception_table_entry *fixup;
-               fixup = search_exception_tables(regs->pc);
-               if (fixup) {
-                       regs->pc = fixup->fixup;
-                       return;
-               }
-               die(str, regs, err);
-       }
-}
-
-DO_ERROR(13, SIGILL,  "illegal slot instruction", illegal_slot_inst, current)
-DO_ERROR(87, SIGSEGV, "address error (exec)", address_error_exec, current)
-
-
-/* Implement misaligned load/store handling for kernel (and optionally for user
-   mode too).  Limitation : only SHmedia mode code is handled - there is no
-   handling at all for misaligned accesses occurring in SHcompact code yet. */
-
-static int misaligned_fixup(struct pt_regs *regs);
-
-asmlinkage void do_address_error_load(unsigned long error_code, struct pt_regs *regs)
-{
-       if (misaligned_fixup(regs) < 0) {
-               do_unhandled_exception(7, SIGSEGV, "address error(load)",
-                               "do_address_error_load",
-                               error_code, regs, current);
-       }
-       return;
-}
-
-asmlinkage void do_address_error_store(unsigned long error_code, struct pt_regs *regs)
-{
-       if (misaligned_fixup(regs) < 0) {
-               do_unhandled_exception(8, SIGSEGV, "address error(store)",
-                               "do_address_error_store",
-                               error_code, regs, current);
-       }
-       return;
-}
-
-#if defined(CONFIG_SH64_ID2815_WORKAROUND)
-
-#define OPCODE_INVALID      0
-#define OPCODE_USER_VALID   1
-#define OPCODE_PRIV_VALID   2
-
-/* getcon/putcon - requires checking which control register is referenced. */
-#define OPCODE_CTRL_REG     3
-
-/* Table of valid opcodes for SHmedia mode.
-   Form a 10-bit value by concatenating the major/minor opcodes i.e.
-   opcode[31:26,20:16].  The 6 MSBs of this value index into the following
-   array.  The 4 LSBs select the bit-pair in the entry (bits 1:0 correspond to
-   LSBs==4'b0000 etc). */
-static unsigned long shmedia_opcode_table[64] = {
-       0x55554044,0x54445055,0x15141514,0x14541414,0x00000000,0x10001000,0x01110055,0x04050015,
-       0x00000444,0xc0000000,0x44545515,0x40405555,0x55550015,0x10005555,0x55555505,0x04050000,
-       0x00000555,0x00000404,0x00040445,0x15151414,0x00000000,0x00000000,0x00000000,0x00000000,
-       0x00000055,0x40404444,0x00000404,0xc0009495,0x00000000,0x00000000,0x00000000,0x00000000,
-       0x55555555,0x55555555,0x55555555,0x55555555,0x55555555,0x55555555,0x55555555,0x55555555,
-       0x55555555,0x55555555,0x55555555,0x55555555,0x55555555,0x55555555,0x55555555,0x55555555,
-       0x80005050,0x04005055,0x55555555,0x55555555,0x55555555,0x55555555,0x55555555,0x55555555,
-       0x81055554,0x00000404,0x55555555,0x55555555,0x00000000,0x00000000,0x00000000,0x00000000
-};
-
-void do_reserved_inst(unsigned long error_code, struct pt_regs *regs)
-{
-       /* Workaround SH5-101 cut2 silicon defect #2815 :
-          in some situations, inter-mode branches from SHcompact -> SHmedia
-          which should take ITLBMISS or EXECPROT exceptions at the target
-          falsely take RESINST at the target instead. */
-
-       unsigned long opcode = 0x6ff4fff0; /* guaranteed reserved opcode */
-       unsigned long pc, aligned_pc;
-       int get_user_error;
-       int trapnr = 12;
-       int signr = SIGILL;
-       char *exception_name = "reserved_instruction";
-
-       pc = regs->pc;
-       if ((pc & 3) == 1) {
-               /* SHmedia : check for defect.  This requires executable vmas
-                  to be readable too. */
-               aligned_pc = pc & ~3;
-               if (!access_ok(VERIFY_READ, aligned_pc, sizeof(unsigned long))) {
-                       get_user_error = -EFAULT;
-               } else {
-                       get_user_error = __get_user(opcode, (unsigned long *)aligned_pc);
-               }
-               if (get_user_error >= 0) {
-                       unsigned long index, shift;
-                       unsigned long major, minor, combined;
-                       unsigned long reserved_field;
-                       reserved_field = opcode & 0xf; /* These bits are currently reserved as zero in all valid opcodes */
-                       major = (opcode >> 26) & 0x3f;
-                       minor = (opcode >> 16) & 0xf;
-                       combined = (major << 4) | minor;
-                       index = major;
-                       shift = minor << 1;
-                       if (reserved_field == 0) {
-                               int opcode_state = (shmedia_opcode_table[index] >> shift) & 0x3;
-                               switch (opcode_state) {
-                                       case OPCODE_INVALID:
-                                               /* Trap. */
-                                               break;
-                                       case OPCODE_USER_VALID:
-                                               /* Restart the instruction : the branch to the instruction will now be from an RTE
-                                                  not from SHcompact so the silicon defect won't be triggered. */
-                                               return;
-                                       case OPCODE_PRIV_VALID:
-                                               if (!user_mode(regs)) {
-                                                       /* Should only ever get here if a module has
-                                                          SHcompact code inside it.  If so, the same fix up is needed. */
-                                                       return; /* same reason */
-                                               }
-                                               /* Otherwise, user mode trying to execute a privileged instruction -
-                                                  fall through to trap. */
-                                               break;
-                                       case OPCODE_CTRL_REG:
-                                               /* If in privileged mode, return as above. */
-                                               if (!user_mode(regs)) return;
-                                               /* In user mode ... */
-                                               if (combined == 0x9f) { /* GETCON */
-                                                       unsigned long regno = (opcode >> 20) & 0x3f;
-                                                       if (regno >= 62) {
-                                                               return;
-                                                       }
-                                                       /* Otherwise, reserved or privileged control register, => trap */
-                                               } else if (combined == 0x1bf) { /* PUTCON */
-                                                       unsigned long regno = (opcode >> 4) & 0x3f;
-                                                       if (regno >= 62) {
-                                                               return;
-                                                       }
-                                                       /* Otherwise, reserved or privileged control register, => trap */
-                                               } else {
-                                                       /* Trap */
-                                               }
-                                               break;
-                                       default:
-                                               /* Fall through to trap. */
-                                               break;
-                               }
-                       }
-                       /* fall through to normal resinst processing */
-               } else {
-                       /* Error trying to read opcode.  This typically means a
-                          real fault, not a RESINST any more.  So change the
-                          codes. */
-                       trapnr = 87;
-                       exception_name = "address error (exec)";
-                       signr = SIGSEGV;
-               }
-       }
-
-       do_unhandled_exception(trapnr, signr, exception_name, "do_reserved_inst", error_code, regs, current);
-}
-
-#else /* CONFIG_SH64_ID2815_WORKAROUND */
-
-/* If the workaround isn't needed, this is just a straightforward reserved
-   instruction */
-DO_ERROR(12, SIGILL,  "reserved instruction", reserved_inst, current)
-
-#endif /* CONFIG_SH64_ID2815_WORKAROUND */
-
-
-#include <asm/system.h>
-
-/* Called with interrupts disabled */
-asmlinkage void do_exception_error(unsigned long ex, struct pt_regs *regs)
-{
-       PLS();
-       show_excp_regs(__FUNCTION__, -1, -1, regs);
-       die_if_kernel("exception", regs, ex);
-}
-
-int do_unknown_trapa(unsigned long scId, struct pt_regs *regs)
-{
-       /* Syscall debug */
-        printk("System call ID error: [0x1#args:8 #syscall:16  0x%lx]\n", scId);
-
-       die_if_kernel("unknown trapa", regs, scId);
-
-       return -ENOSYS;
-}
-
-void show_stack(struct task_struct *tsk, unsigned long *sp)
-{
-#ifdef CONFIG_KALLSYMS
-       extern void sh64_unwind(struct pt_regs *regs);
-       struct pt_regs *regs;
-
-       regs = tsk ? tsk->thread.kregs : NULL;
-
-       sh64_unwind(regs);
-#else
-       printk(KERN_ERR "Can't backtrace on sh64 without CONFIG_KALLSYMS\n");
-#endif
-}
-
-void show_task(unsigned long *sp)
-{
-       show_stack(NULL, sp);
-}
-
-void dump_stack(void)
-{
-       show_task(NULL);
-}
-
-static void do_unhandled_exception(int trapnr, int signr, char *str, char *fn_name,
-               unsigned long error_code, struct pt_regs *regs, struct task_struct *tsk)
-{
-       show_excp_regs(fn_name, trapnr, signr, regs);
-       tsk->thread.error_code = error_code;
-       tsk->thread.trap_no = trapnr;
-
-       if (user_mode(regs))
-               force_sig(signr, tsk);
-
-       die_if_no_fixup(str, regs, error_code);
-}
-
-static int read_opcode(unsigned long long pc, unsigned long *result_opcode, int from_user_mode)
-{
-       int get_user_error;
-       unsigned long aligned_pc;
-       unsigned long opcode;
-
-       if ((pc & 3) == 1) {
-               /* SHmedia */
-               aligned_pc = pc & ~3;
-               if (from_user_mode) {
-                       if (!access_ok(VERIFY_READ, aligned_pc, sizeof(unsigned long))) {
-                               get_user_error = -EFAULT;
-                       } else {
-                               get_user_error = __get_user(opcode, (unsigned long *)aligned_pc);
-                               *result_opcode = opcode;
-                       }
-                       return get_user_error;
-               } else {
-                       /* If the fault was in the kernel, we can either read
-                        * this directly, or if not, we fault.
-                       */
-                       *result_opcode = *(unsigned long *) aligned_pc;
-                       return 0;
-               }
-       } else if ((pc & 1) == 0) {
-               /* SHcompact */
-               /* TODO : provide handling for this.  We don't really support
-                  user-mode SHcompact yet, and for a kernel fault, this would
-                  have to come from a module built for SHcompact.  */
-               return -EFAULT;
-       } else {
-               /* misaligned */
-               return -EFAULT;
-       }
-}
-
-static int address_is_sign_extended(__u64 a)
-{
-       __u64 b;
-#if (NEFF == 32)
-       b = (__u64)(__s64)(__s32)(a & 0xffffffffUL);
-       return (b == a) ? 1 : 0;
-#else
-#error "Sign extend check only works for NEFF==32"
-#endif
-}
-
-static int generate_and_check_address(struct pt_regs *regs,
-                                     __u32 opcode,
-                                     int displacement_not_indexed,
-                                     int width_shift,
-                                     __u64 *address)
-{
-       /* return -1 for fault, 0 for OK */
-
-       __u64 base_address, addr;
-       int basereg;
-
-       basereg = (opcode >> 20) & 0x3f;
-       base_address = regs->regs[basereg];
-       if (displacement_not_indexed) {
-               __s64 displacement;
-               displacement = (opcode >> 10) & 0x3ff;
-               displacement = ((displacement << 54) >> 54); /* sign extend */
-               addr = (__u64)((__s64)base_address + (displacement << width_shift));
-       } else {
-               __u64 offset;
-               int offsetreg;
-               offsetreg = (opcode >> 10) & 0x3f;
-               offset = regs->regs[offsetreg];
-               addr = base_address + offset;
-       }
-
-       /* Check sign extended */
-       if (!address_is_sign_extended(addr)) {
-               return -1;
-       }
-
-#if defined(CONFIG_SH64_USER_MISALIGNED_FIXUP)
-       /* Check accessible.  For misaligned access in the kernel, assume the
-          address is always accessible (and if not, just fault when the
-          load/store gets done.) */
-       if (user_mode(regs)) {
-               if (addr >= TASK_SIZE) {
-                       return -1;
-               }
-               /* Do access_ok check later - it depends on whether it's a load or a store. */
-       }
-#endif
-
-       *address = addr;
-       return 0;
-}
-
-/* Default value as for sh */
-#if defined(CONFIG_SH64_USER_MISALIGNED_FIXUP)
-static int user_mode_unaligned_fixup_count = 10;
-static int user_mode_unaligned_fixup_enable = 1;
-#endif
-
-static int kernel_mode_unaligned_fixup_count = 32;
-
-static void misaligned_kernel_word_load(__u64 address, int do_sign_extend, __u64 *result)
-{
-       unsigned short x;
-       unsigned char *p, *q;
-       p = (unsigned char *) (int) address;
-       q = (unsigned char *) &x;
-       q[0] = p[0];
-       q[1] = p[1];
-
-       if (do_sign_extend) {
-               *result = (__u64)(__s64) *(short *) &x;
-       } else {
-               *result = (__u64) x;
-       }
-}
-
-static void misaligned_kernel_word_store(__u64 address, __u64 value)
-{
-       unsigned short x;
-       unsigned char *p, *q;
-       p = (unsigned char *) (int) address;
-       q = (unsigned char *) &x;
-
-       x = (__u16) value;
-       p[0] = q[0];
-       p[1] = q[1];
-}
-
-static int misaligned_load(struct pt_regs *regs,
-                          __u32 opcode,
-                          int displacement_not_indexed,
-                          int width_shift,
-                          int do_sign_extend)
-{
-       /* Return -1 for a fault, 0 for OK */
-       int error;
-       int destreg;
-       __u64 address;
-
-       error = generate_and_check_address(regs, opcode,
-                       displacement_not_indexed, width_shift, &address);
-       if (error < 0) {
-               return error;
-       }
-
-       destreg = (opcode >> 4) & 0x3f;
-#if defined(CONFIG_SH64_USER_MISALIGNED_FIXUP)
-       if (user_mode(regs)) {
-               __u64 buffer;
-
-               if (!access_ok(VERIFY_READ, (unsigned long) address, 1UL<<width_shift)) {
-                       return -1;
-               }
-
-               if (__copy_user(&buffer, (const void *)(int)address, (1 << width_shift)) > 0) {
-                       return -1; /* fault */
-               }
-               switch (width_shift) {
-               case 1:
-                       if (do_sign_extend) {
-                               regs->regs[destreg] = (__u64)(__s64) *(__s16 *) &buffer;
-                       } else {
-                               regs->regs[destreg] = (__u64) *(__u16 *) &buffer;
-                       }
-                       break;
-               case 2:
-                       regs->regs[destreg] = (__u64)(__s64) *(__s32 *) &buffer;
-                       break;
-               case 3:
-                       regs->regs[destreg] = buffer;
-                       break;
-               default:
-                       printk("Unexpected width_shift %d in misaligned_load, PC=%08lx\n",
-                               width_shift, (unsigned long) regs->pc);
-                       break;
-               }
-       } else
-#endif
-       {
-               /* kernel mode - we can take short cuts since if we fault, it's a genuine bug */
-               __u64 lo, hi;
-
-               switch (width_shift) {
-               case 1:
-                       misaligned_kernel_word_load(address, do_sign_extend, &regs->regs[destreg]);
-                       break;
-               case 2:
-                       asm ("ldlo.l %1, 0, %0" : "=r" (lo) : "r" (address));
-                       asm ("ldhi.l %1, 3, %0" : "=r" (hi) : "r" (address));
-                       regs->regs[destreg] = lo | hi;
-                       break;
-               case 3:
-                       asm ("ldlo.q %1, 0, %0" : "=r" (lo) : "r" (address));
-                       asm ("ldhi.q %1, 7, %0" : "=r" (hi) : "r" (address));
-                       regs->regs[destreg] = lo | hi;
-                       break;
-
-               default:
-                       printk("Unexpected width_shift %d in misaligned_load, PC=%08lx\n",
-                               width_shift, (unsigned long) regs->pc);
-                       break;
-               }
-       }
-
-       return 0;
-
-}
-
-static int misaligned_store(struct pt_regs *regs,
-                           __u32 opcode,
-                           int displacement_not_indexed,
-                           int width_shift)
-{
-       /* Return -1 for a fault, 0 for OK */
-       int error;
-       int srcreg;
-       __u64 address;
-
-       error = generate_and_check_address(regs, opcode,
-                       displacement_not_indexed, width_shift, &address);
-       if (error < 0) {
-               return error;
-       }
-
-       srcreg = (opcode >> 4) & 0x3f;
-#if defined(CONFIG_SH64_USER_MISALIGNED_FIXUP)
-       if (user_mode(regs)) {
-               __u64 buffer;
-
-               if (!access_ok(VERIFY_WRITE, (unsigned long) address, 1UL<<width_shift)) {
-                       return -1;
-               }
-
-               switch (width_shift) {
-               case 1:
-                       *(__u16 *) &buffer = (__u16) regs->regs[srcreg];
-                       break;
-               case 2:
-                       *(__u32 *) &buffer = (__u32) regs->regs[srcreg];
-                       break;
-               case 3:
-                       buffer = regs->regs[srcreg];
-                       break;
-               default:
-                       printk("Unexpected width_shift %d in misaligned_store, PC=%08lx\n",
-                               width_shift, (unsigned long) regs->pc);
-                       break;
-               }
-
-               if (__copy_user((void *)(int)address, &buffer, (1 << width_shift)) > 0) {
-                       return -1; /* fault */
-               }
-       } else
-#endif
-       {
-               /* kernel mode - we can take short cuts since if we fault, it's a genuine bug */
-               __u64 val = regs->regs[srcreg];
-
-               switch (width_shift) {
-               case 1:
-                       misaligned_kernel_word_store(address, val);
-                       break;
-               case 2:
-                       asm ("stlo.l %1, 0, %0" : : "r" (val), "r" (address));
-                       asm ("sthi.l %1, 3, %0" : : "r" (val), "r" (address));
-                       break;
-               case 3:
-                       asm ("stlo.q %1, 0, %0" : : "r" (val), "r" (address));
-                       asm ("sthi.q %1, 7, %0" : : "r" (val), "r" (address));
-                       break;
-
-               default:
-                       printk("Unexpected width_shift %d in misaligned_store, PC=%08lx\n",
-                               width_shift, (unsigned long) regs->pc);
-                       break;
-               }
-       }
-
-       return 0;
-
-}
-
-#if defined(CONFIG_SH64_USER_MISALIGNED_FIXUP)
-/* Never need to fix up misaligned FPU accesses within the kernel since that's a real
-   error. */
-static int misaligned_fpu_load(struct pt_regs *regs,
-                          __u32 opcode,
-                          int displacement_not_indexed,
-                          int width_shift,
-                          int do_paired_load)
-{
-       /* Return -1 for a fault, 0 for OK */
-       int error;
-       int destreg;
-       __u64 address;
-
-       error = generate_and_check_address(regs, opcode,
-                       displacement_not_indexed, width_shift, &address);
-       if (error < 0) {
-               return error;
-       }
-
-       destreg = (opcode >> 4) & 0x3f;
-       if (user_mode(regs)) {
-               __u64 buffer;
-               __u32 buflo, bufhi;
-
-               if (!access_ok(VERIFY_READ, (unsigned long) address, 1UL<<width_shift)) {
-                       return -1;
-               }
-
-               if (__copy_user(&buffer, (const void *)(int)address, (1 << width_shift)) > 0) {
-                       return -1; /* fault */
-               }
-               /* 'current' may be the current owner of the FPU state, so
-                  context switch the registers into memory so they can be
-                  indexed by register number. */
-               if (last_task_used_math == current) {
-                       grab_fpu();
-                       fpsave(&current->thread.fpu.hard);
-                       release_fpu();
-                       last_task_used_math = NULL;
-                       regs->sr |= SR_FD;
-               }
-
-               buflo = *(__u32*) &buffer;
-               bufhi = *(1 + (__u32*) &buffer);
-
-               switch (width_shift) {
-               case 2:
-                       current->thread.fpu.hard.fp_regs[destreg] = buflo;
-                       break;
-               case 3:
-                       if (do_paired_load) {
-                               current->thread.fpu.hard.fp_regs[destreg] = buflo;
-                               current->thread.fpu.hard.fp_regs[destreg+1] = bufhi;
-                       } else {
-#if defined(CONFIG_LITTLE_ENDIAN)
-                               current->thread.fpu.hard.fp_regs[destreg] = bufhi;
-                               current->thread.fpu.hard.fp_regs[destreg+1] = buflo;
-#else
-                               current->thread.fpu.hard.fp_regs[destreg] = buflo;
-                               current->thread.fpu.hard.fp_regs[destreg+1] = bufhi;
-#endif
-                       }
-                       break;
-               default:
-                       printk("Unexpected width_shift %d in misaligned_fpu_load, PC=%08lx\n",
-                               width_shift, (unsigned long) regs->pc);
-                       break;
-               }
-               return 0;
-       } else {
-               die ("Misaligned FPU load inside kernel", regs, 0);
-               return -1;
-       }
-
-
-}
-
-static int misaligned_fpu_store(struct pt_regs *regs,
-                          __u32 opcode,
-                          int displacement_not_indexed,
-                          int width_shift,
-                          int do_paired_load)
-{
-       /* Return -1 for a fault, 0 for OK */
-       int error;
-       int srcreg;
-       __u64 address;
-
-       error = generate_and_check_address(regs, opcode,
-                       displacement_not_indexed, width_shift, &address);
-       if (error < 0) {
-               return error;
-       }
-
-       srcreg = (opcode >> 4) & 0x3f;
-       if (user_mode(regs)) {
-               __u64 buffer;
-               /* Initialise these to NaNs. */
-               __u32 buflo=0xffffffffUL, bufhi=0xffffffffUL;
-
-               if (!access_ok(VERIFY_WRITE, (unsigned long) address, 1UL<<width_shift)) {
-                       return -1;
-               }
-
-               /* 'current' may be the current owner of the FPU state, so
-                  context switch the registers into memory so they can be
-                  indexed by register number. */
-               if (last_task_used_math == current) {
-                       grab_fpu();
-                       fpsave(&current->thread.fpu.hard);
-                       release_fpu();
-                       last_task_used_math = NULL;
-                       regs->sr |= SR_FD;
-               }
-
-               switch (width_shift) {
-               case 2:
-                       buflo = current->thread.fpu.hard.fp_regs[srcreg];
-                       break;
-               case 3:
-                       if (do_paired_load) {
-                               buflo = current->thread.fpu.hard.fp_regs[srcreg];
-                               bufhi = current->thread.fpu.hard.fp_regs[srcreg+1];
-                       } else {
-#if defined(CONFIG_LITTLE_ENDIAN)
-                               bufhi = current->thread.fpu.hard.fp_regs[srcreg];
-                               buflo = current->thread.fpu.hard.fp_regs[srcreg+1];
-#else
-                               buflo = current->thread.fpu.hard.fp_regs[srcreg];
-                               bufhi = current->thread.fpu.hard.fp_regs[srcreg+1];
-#endif
-                       }
-                       break;
-               default:
-                       printk("Unexpected width_shift %d in misaligned_fpu_store, PC=%08lx\n",
-                               width_shift, (unsigned long) regs->pc);
-                       break;
-               }
-
-               *(__u32*) &buffer = buflo;
-               *(1 + (__u32*) &buffer) = bufhi;
-               if (__copy_user((void *)(int)address, &buffer, (1 << width_shift)) > 0) {
-                       return -1; /* fault */
-               }
-               return 0;
-       } else {
-               die ("Misaligned FPU load inside kernel", regs, 0);
-               return -1;
-       }
-}
-#endif
-
-static int misaligned_fixup(struct pt_regs *regs)
-{
-       unsigned long opcode;
-       int error;
-       int major, minor;
-
-#if !defined(CONFIG_SH64_USER_MISALIGNED_FIXUP)
-       /* Never fixup user mode misaligned accesses without this option enabled. */
-       return -1;
-#else
-       if (!user_mode_unaligned_fixup_enable) return -1;
-#endif
-
-       error = read_opcode(regs->pc, &opcode, user_mode(regs));
-       if (error < 0) {
-               return error;
-       }
-       major = (opcode >> 26) & 0x3f;
-       minor = (opcode >> 16) & 0xf;
-
-#if defined(CONFIG_SH64_USER_MISALIGNED_FIXUP)
-       if (user_mode(regs) && (user_mode_unaligned_fixup_count > 0)) {
-               --user_mode_unaligned_fixup_count;
-               /* Only do 'count' worth of these reports, to remove a potential DoS against syslog */
-               printk("Fixing up unaligned userspace access in \"%s\" pid=%d pc=0x%08x ins=0x%08lx\n",
-                      current->comm, current->pid, (__u32)regs->pc, opcode);
-       } else
-#endif
-       if (!user_mode(regs) && (kernel_mode_unaligned_fixup_count > 0)) {
-               --kernel_mode_unaligned_fixup_count;
-               if (in_interrupt()) {
-                       printk("Fixing up unaligned kernelspace access in interrupt pc=0x%08x ins=0x%08lx\n",
-                              (__u32)regs->pc, opcode);
-               } else {
-                       printk("Fixing up unaligned kernelspace access in \"%s\" pid=%d pc=0x%08x ins=0x%08lx\n",
-                              current->comm, current->pid, (__u32)regs->pc, opcode);
-               }
-       }
-
-
-       switch (major) {
-               case (0x84>>2): /* LD.W */
-                       error = misaligned_load(regs, opcode, 1, 1, 1);
-                       break;
-               case (0xb0>>2): /* LD.UW */
-                       error = misaligned_load(regs, opcode, 1, 1, 0);
-                       break;
-               case (0x88>>2): /* LD.L */
-                       error = misaligned_load(regs, opcode, 1, 2, 1);
-                       break;
-               case (0x8c>>2): /* LD.Q */
-                       error = misaligned_load(regs, opcode, 1, 3, 0);
-                       break;
-
-               case (0xa4>>2): /* ST.W */
-                       error = misaligned_store(regs, opcode, 1, 1);
-                       break;
-               case (0xa8>>2): /* ST.L */
-                       error = misaligned_store(regs, opcode, 1, 2);
-                       break;
-               case (0xac>>2): /* ST.Q */
-                       error = misaligned_store(regs, opcode, 1, 3);
-                       break;
-
-               case (0x40>>2): /* indexed loads */
-                       switch (minor) {
-                               case 0x1: /* LDX.W */
-                                       error = misaligned_load(regs, opcode, 0, 1, 1);
-                                       break;
-                               case 0x5: /* LDX.UW */
-                                       error = misaligned_load(regs, opcode, 0, 1, 0);
-                                       break;
-                               case 0x2: /* LDX.L */
-                                       error = misaligned_load(regs, opcode, 0, 2, 1);
-                                       break;
-                               case 0x3: /* LDX.Q */
-                                       error = misaligned_load(regs, opcode, 0, 3, 0);
-                                       break;
-                               default:
-                                       error = -1;
-                                       break;
-                       }
-                       break;
-
-               case (0x60>>2): /* indexed stores */
-                       switch (minor) {
-                               case 0x1: /* STX.W */
-                                       error = misaligned_store(regs, opcode, 0, 1);
-                                       break;
-                               case 0x2: /* STX.L */
-                                       error = misaligned_store(regs, opcode, 0, 2);
-                                       break;
-                               case 0x3: /* STX.Q */
-                                       error = misaligned_store(regs, opcode, 0, 3);
-                                       break;
-                               default:
-                                       error = -1;
-                                       break;
-                       }
-                       break;
-
-#if defined(CONFIG_SH64_USER_MISALIGNED_FIXUP)
-               case (0x94>>2): /* FLD.S */
-                       error = misaligned_fpu_load(regs, opcode, 1, 2, 0);
-                       break;
-               case (0x98>>2): /* FLD.P */
-                       error = misaligned_fpu_load(regs, opcode, 1, 3, 1);
-                       break;
-               case (0x9c>>2): /* FLD.D */
-                       error = misaligned_fpu_load(regs, opcode, 1, 3, 0);
-                       break;
-               case (0x1c>>2): /* floating indexed loads */
-                       switch (minor) {
-                       case 0x8: /* FLDX.S */
-                               error = misaligned_fpu_load(regs, opcode, 0, 2, 0);
-                               break;
-                       case 0xd: /* FLDX.P */
-                               error = misaligned_fpu_load(regs, opcode, 0, 3, 1);
-                               break;
-                       case 0x9: /* FLDX.D */
-                               error = misaligned_fpu_load(regs, opcode, 0, 3, 0);
-                               break;
-                       default:
-                               error = -1;
-                               break;
-                       }
-                       break;
-               case (0xb4>>2): /* FLD.S */
-                       error = misaligned_fpu_store(regs, opcode, 1, 2, 0);
-                       break;
-               case (0xb8>>2): /* FLD.P */
-                       error = misaligned_fpu_store(regs, opcode, 1, 3, 1);
-                       break;
-               case (0xbc>>2): /* FLD.D */
-                       error = misaligned_fpu_store(regs, opcode, 1, 3, 0);
-                       break;
-               case (0x3c>>2): /* floating indexed stores */
-                       switch (minor) {
-                       case 0x8: /* FSTX.S */
-                               error = misaligned_fpu_store(regs, opcode, 0, 2, 0);
-                               break;
-                       case 0xd: /* FSTX.P */
-                               error = misaligned_fpu_store(regs, opcode, 0, 3, 1);
-                               break;
-                       case 0x9: /* FSTX.D */
-                               error = misaligned_fpu_store(regs, opcode, 0, 3, 0);
-                               break;
-                       default:
-                               error = -1;
-                               break;
-                       }
-                       break;
-#endif
-
-               default:
-                       /* Fault */
-                       error = -1;
-                       break;
-       }
-
-       if (error < 0) {
-               return error;
-       } else {
-               regs->pc += 4; /* Skip the instruction that's just been emulated */
-               return 0;
-       }
-
-}
-
-static ctl_table unaligned_table[] = {
-       {1, "kernel_reports", &kernel_mode_unaligned_fixup_count,
-               sizeof(int), 0644, NULL, &proc_dointvec},
-#if defined(CONFIG_SH64_USER_MISALIGNED_FIXUP)
-       {2, "user_reports", &user_mode_unaligned_fixup_count,
-               sizeof(int), 0644, NULL, &proc_dointvec},
-       {3, "user_enable", &user_mode_unaligned_fixup_enable,
-               sizeof(int), 0644, NULL, &proc_dointvec},
-#endif
-       {0}
-};
-
-static ctl_table unaligned_root[] = {
-       {1, "unaligned_fixup", NULL, 0, 0555, unaligned_table},
-       {0}
-};
-
-static ctl_table sh64_root[] = {
-       {1, "sh64", NULL, 0, 0555, unaligned_root},
-       {0}
-};
-static struct ctl_table_header *sysctl_header;
-static int __init init_sysctl(void)
-{
-       sysctl_header = register_sysctl_table(sh64_root, 0);
-       return 0;
-}
-
-__initcall(init_sysctl);
-
-
-asmlinkage void do_debug_interrupt(unsigned long code, struct pt_regs *regs)
-{
-       u64 peek_real_address_q(u64 addr);
-       u64 poke_real_address_q(u64 addr, u64 val);
-       unsigned long long DM_EXP_CAUSE_PHY = 0x0c100010;
-       unsigned long long exp_cause;
-       /* It's not worth ioremapping the debug module registers for the amount
-          of access we make to them - just go direct to their physical
-          addresses. */
-       exp_cause = peek_real_address_q(DM_EXP_CAUSE_PHY);
-       if (exp_cause & ~4) {
-               printk("DM.EXP_CAUSE had unexpected bits set (=%08lx)\n",
-                       (unsigned long)(exp_cause & 0xffffffff));
-       }
-       show_state();
-       /* Clear all DEBUGINT causes */
-       poke_real_address_q(DM_EXP_CAUSE_PHY, 0x0);
-}
-
diff --git a/arch/sh64/kernel/unwind.c b/arch/sh64/kernel/unwind.c
deleted file mode 100644 (file)
index f934f97..0000000
+++ /dev/null
@@ -1,326 +0,0 @@
-/*
- * arch/sh64/kernel/unwind.c
- *
- * Copyright (C) 2004  Paul Mundt
- * Copyright (C) 2004  Richard Curnow
- *
- * 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/kallsyms.h>
-#include <linux/kernel.h>
-#include <linux/types.h>
-#include <linux/errno.h>
-#include <asm/page.h>
-#include <asm/ptrace.h>
-#include <asm/processor.h>
-#include <asm/io.h>
-
-static u8 regcache[63];
-
-/*
- * Finding the previous stack frame isn't horribly straightforward as it is
- * on some other platforms. In the sh64 case, we don't have "linked" stack
- * frames, so we need to do a bit of work to determine the previous frame,
- * and in turn, the previous r14/r18 pair.
- *
- * There are generally a few cases which determine where we can find out
- * the r14/r18 values. In the general case, this can be determined by poking
- * around the prologue of the symbol PC is in (note that we absolutely must
- * have frame pointer support as well as the kernel symbol table mapped,
- * otherwise we can't even get this far).
- *
- * In other cases, such as the interrupt/exception path, we can poke around
- * the sp/fp.
- *
- * Notably, this entire approach is somewhat error prone, and in the event
- * that the previous frame cannot be determined, that's all we can do.
- * Either way, this still leaves us with a more correct backtrace then what
- * we would be able to come up with by walking the stack (which is garbage
- * for anything beyond the first frame).
- *                                             -- PFM.
- */
-static int lookup_prev_stack_frame(unsigned long fp, unsigned long pc,
-                     unsigned long *pprev_fp, unsigned long *pprev_pc,
-                     struct pt_regs *regs)
-{
-       const char *sym;
-       char *modname, namebuf[128];
-       unsigned long offset, size;
-       unsigned long prologue = 0;
-       unsigned long fp_displacement = 0;
-       unsigned long fp_prev = 0;
-       unsigned long offset_r14 = 0, offset_r18 = 0;
-       int i, found_prologue_end = 0;
-
-       sym = kallsyms_lookup(pc, &size, &offset, &modname, namebuf);
-       if (!sym)
-               return -EINVAL;
-
-       prologue = pc - offset;
-       if (!prologue)
-               return -EINVAL;
-
-       /* Validate fp, to avoid risk of dereferencing a bad pointer later.
-          Assume 128Mb since that's the amount of RAM on a Cayman.  Modify
-          when there is an SH-5 board with more. */
-       if ((fp < (unsigned long) phys_to_virt(__MEMORY_START)) ||
-           (fp >= (unsigned long)(phys_to_virt(__MEMORY_START)) + 128*1024*1024) ||
-           ((fp & 7) != 0)) {
-               return -EINVAL;
-       }
-
-       /*
-        * Depth to walk, depth is completely arbitrary.
-        */
-       for (i = 0; i < 100; i++, prologue += sizeof(unsigned long)) {
-               unsigned long op;
-               u8 major, minor;
-               u8 src, dest, disp;
-
-               op = *(unsigned long *)prologue;
-
-               major = (op >> 26) & 0x3f;
-               src   = (op >> 20) & 0x3f;
-               minor = (op >> 16) & 0xf;
-               disp  = (op >> 10) & 0x3f;
-               dest  = (op >>  4) & 0x3f;
-
-               /*
-                * Stack frame creation happens in a number of ways.. in the
-                * general case when the stack frame is less than 511 bytes,
-                * it's generally created by an addi or addi.l:
-                *
-                *      addi/addi.l r15, -FRAME_SIZE, r15
-                *
-                * in the event that the frame size is bigger than this, it's
-                * typically created using a movi/sub pair as follows:
-                *
-                *      movi    FRAME_SIZE, rX
-                *      sub     r15, rX, r15
-                */
-
-               switch (major) {
-               case (0x00 >> 2):
-                       switch (minor) {
-                       case 0x8: /* add.l */
-                       case 0x9: /* add */
-                               /* Look for r15, r63, r14 */
-                               if (src == 15 && disp == 63 && dest == 14)
-                                       found_prologue_end = 1;
-
-                               break;
-                       case 0xa: /* sub.l */
-                       case 0xb: /* sub */
-                               if (src != 15 || dest != 15)
-                                       continue;
-
-                               fp_displacement -= regcache[disp];
-                               fp_prev = fp - fp_displacement;
-                               break;
-                       }
-                       break;
-               case (0xa8 >> 2): /* st.l */
-                       if (src != 15)
-                               continue;
-
-                       switch (dest) {
-                       case 14:
-                               if (offset_r14 || fp_displacement == 0)
-                                       continue;
-
-                               offset_r14 = (u64)(((((s64)op >> 10) & 0x3ff) << 54) >> 54);
-                               offset_r14 *= sizeof(unsigned long);
-                               offset_r14 += fp_displacement;
-                               break;
-                       case 18:
-                               if (offset_r18 || fp_displacement == 0)
-                                       continue;
-
-                               offset_r18 = (u64)(((((s64)op >> 10) & 0x3ff) << 54) >> 54);
-                               offset_r18 *= sizeof(unsigned long);
-                               offset_r18 += fp_displacement;
-                               break;
-                       }
-
-                       break;
-               case (0xcc >> 2): /* movi */
-                       if (dest >= 63) {
-                               printk(KERN_NOTICE "%s: Invalid dest reg %d "
-                                      "specified in movi handler. Failed "
-                                      "opcode was 0x%lx: ", __FUNCTION__,
-                                      dest, op);
-
-                               continue;
-                       }
-
-                       /* Sign extend */
-                       regcache[dest] =
-                               ((((s64)(u64)op >> 10) & 0xffff) << 54) >> 54;
-                       break;
-               case (0xd0 >> 2): /* addi */
-               case (0xd4 >> 2): /* addi.l */
-                       /* Look for r15, -FRAME_SIZE, r15 */
-                       if (src != 15 || dest != 15)
-                               continue;
-
-                       /* Sign extended frame size.. */
-                       fp_displacement +=
-                               (u64)(((((s64)op >> 10) & 0x3ff) << 54) >> 54);
-                       fp_prev = fp - fp_displacement;
-                       break;
-               }
-
-               if (found_prologue_end && offset_r14 && (offset_r18 || *pprev_pc) && fp_prev)
-                       break;
-       }
-
-       if (offset_r14 == 0 || fp_prev == 0) {
-               if (!offset_r14)
-                       pr_debug("Unable to find r14 offset\n");
-               if (!fp_prev)
-                       pr_debug("Unable to find previous fp\n");
-
-               return -EINVAL;
-       }
-
-       /* For innermost leaf function, there might not be a offset_r18 */
-       if (!*pprev_pc && (offset_r18 == 0))
-               return -EINVAL;
-
-       *pprev_fp = *(unsigned long *)(fp_prev + offset_r14);
-
-       if (offset_r18)
-               *pprev_pc = *(unsigned long *)(fp_prev + offset_r18);
-
-       *pprev_pc &= ~1;
-
-       return 0;
-}
-
-/* Don't put this on the stack since we'll want to call sh64_unwind
- * when we're close to underflowing the stack anyway. */
-static struct pt_regs here_regs;
-
-extern const char syscall_ret;
-extern const char ret_from_syscall;
-extern const char ret_from_exception;
-extern const char ret_from_irq;
-
-static void sh64_unwind_inner(struct pt_regs *regs);
-
-static void unwind_nested (unsigned long pc, unsigned long fp)
-{
-       if ((fp >= __MEMORY_START) &&
-           ((fp & 7) == 0)) {
-               sh64_unwind_inner((struct pt_regs *) fp);
-       }
-}
-
-static void sh64_unwind_inner(struct pt_regs *regs)
-{
-       unsigned long pc, fp;
-       int ofs = 0;
-       int first_pass;
-
-       pc = regs->pc & ~1;
-       fp = regs->regs[14];
-
-       first_pass = 1;
-       for (;;) {
-               int cond;
-               unsigned long next_fp, next_pc;
-
-               if (pc == ((unsigned long) &syscall_ret & ~1)) {
-                       printk("SYSCALL\n");
-                       unwind_nested(pc,fp);
-                       return;
-               }
-
-               if (pc == ((unsigned long) &ret_from_syscall & ~1)) {
-                       printk("SYSCALL (PREEMPTED)\n");
-                       unwind_nested(pc,fp);
-                       return;
-               }
-
-               /* In this case, the PC is discovered by lookup_prev_stack_frame but
-                  it has 4 taken off it to look like the 'caller' */
-               if (pc == ((unsigned long) &ret_from_exception & ~1)) {
-                       printk("EXCEPTION\n");
-                       unwind_nested(pc,fp);
-                       return;
-               }
-
-               if (pc == ((unsigned long) &ret_from_irq & ~1)) {
-                       printk("IRQ\n");
-                       unwind_nested(pc,fp);
-                       return;
-               }
-
-               cond = ((pc >= __MEMORY_START) && (fp >= __MEMORY_START) &&
-                       ((pc & 3) == 0) && ((fp & 7) == 0));
-
-               pc -= ofs;
-
-               printk("[<%08lx>] ", pc);
-               print_symbol("%s\n", pc);
-
-               if (first_pass) {
-                       /* If the innermost frame is a leaf function, it's
-                        * possible that r18 is never saved out to the stack.
-                        */
-                       next_pc = regs->regs[18];
-               } else {
-                       next_pc = 0;
-               }
-
-               if (lookup_prev_stack_frame(fp, pc, &next_fp, &next_pc, regs) == 0) {
-                       ofs = sizeof(unsigned long);
-                       pc = next_pc & ~1;
-                       fp = next_fp;
-               } else {
-                       printk("Unable to lookup previous stack frame\n");
-                       break;
-               }
-               first_pass = 0;
-       }
-
-       printk("\n");
-
-}
-
-void sh64_unwind(struct pt_regs *regs)
-{
-       if (!regs) {
-               /*
-                * Fetch current regs if we have no other saved state to back
-                * trace from.
-                */
-               regs = &here_regs;
-
-               __asm__ __volatile__ ("ori r14, 0, %0" : "=r" (regs->regs[14]));
-               __asm__ __volatile__ ("ori r15, 0, %0" : "=r" (regs->regs[15]));
-               __asm__ __volatile__ ("ori r18, 0, %0" : "=r" (regs->regs[18]));
-
-               __asm__ __volatile__ ("gettr tr0, %0" : "=r" (regs->tregs[0]));
-               __asm__ __volatile__ ("gettr tr1, %0" : "=r" (regs->tregs[1]));
-               __asm__ __volatile__ ("gettr tr2, %0" : "=r" (regs->tregs[2]));
-               __asm__ __volatile__ ("gettr tr3, %0" : "=r" (regs->tregs[3]));
-               __asm__ __volatile__ ("gettr tr4, %0" : "=r" (regs->tregs[4]));
-               __asm__ __volatile__ ("gettr tr5, %0" : "=r" (regs->tregs[5]));
-               __asm__ __volatile__ ("gettr tr6, %0" : "=r" (regs->tregs[6]));
-               __asm__ __volatile__ ("gettr tr7, %0" : "=r" (regs->tregs[7]));
-
-               __asm__ __volatile__ (
-                       "pta 0f, tr0\n\t"
-                       "blink tr0, %0\n\t"
-                       "0: nop"
-                       : "=r" (regs->pc)
-               );
-       }
-
-       printk("\nCall Trace:\n");
-       sh64_unwind_inner(regs);
-}
-
diff --git a/arch/sh64/kernel/vmlinux.lds.S b/arch/sh64/kernel/vmlinux.lds.S
deleted file mode 100644 (file)
index a3fba81..0000000
+++ /dev/null
@@ -1,183 +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.
- *
- * arch/sh5/vmlinux.lds.S
- *
- * ld script to make ST50 Linux kernel
- *
- * Copyright (C) 2000, 2001  Paolo Alberelli
- *
- * benedict.gaster@superh.com:  2nd May 2002
- *    Add definition of empty_zero_page to be the first page of kernel image.
- *
- * benedict.gaster@superh.com:  3rd May 2002
- *    Added support for ramdisk, removing statically linked romfs at the same time.
- *
- * lethal@linux-sh.org:          9th May 2003
- *    Kill off GLOBAL_NAME() usage and other CDC-isms.
- *
- * lethal@linux-sh.org:         19th May 2003
- *    Remove support for ancient toolchains.
- */
-
-#include <linux/config.h>
-#include <asm/page.h>
-#include <asm/cache.h>
-#include <asm/processor.h>
-#include <asm/thread_info.h>
-
-#define LOAD_OFFSET    CONFIG_CACHED_MEMORY_OFFSET
-#include <asm-generic/vmlinux.lds.h>
-
-#ifdef NOTDEF
-#ifdef CONFIG_LITTLE_ENDIAN
-OUTPUT_FORMAT("elf32-sh64l-linux", "elf32-sh64l-linux", "elf32-sh64l-linux")
-#else
-OUTPUT_FORMAT("elf32-sh64", "elf32-sh64", "elf32-sh64")
-#endif
-#endif
-
-OUTPUT_ARCH(sh:sh5)
-
-#define C_PHYS(x) AT (ADDR(x) - LOAD_OFFSET)
-
-ENTRY(__start)
-SECTIONS
-{
-  . = CONFIG_CACHED_MEMORY_OFFSET + CONFIG_MEMORY_START + PAGE_SIZE;
-  _text = .;                   /* Text and read-only data */
-  text = .;                    /* Text and read-only data */
-
-  .empty_zero_page : C_PHYS(.empty_zero_page) {
-       *(.empty_zero_page)
-       } = 0
-
-  .text : C_PHYS(.text) {
-       *(.text)
-       *(.text64)
-        *(.text..SHmedia32)
-       SCHED_TEXT
-       *(.fixup)
-       *(.gnu.warning)
-#ifdef CONFIG_LITTLE_ENDIAN
-       } = 0x6ff0fff0
-#else
-       } = 0xf0fff06f
-#endif
-
-  /* We likely want __ex_table to be Cache Line aligned */
-  . = ALIGN(L1_CACHE_BYTES);           /* Exception table */
-  __start___ex_table = .;
-  __ex_table : C_PHYS(__ex_table) { *(__ex_table) }
-  __stop___ex_table = .;
-
-  RODATA
-
-  _etext = .;                  /* End of text section */
-
-  .data : C_PHYS(.data) {                      /* Data */
-       *(.data)
-       CONSTRUCTORS
-       }
-
-  . = ALIGN(PAGE_SIZE);
-  .data.page_aligned : C_PHYS(.data.page_aligned) { *(.data.page_aligned) }
-
-  . = ALIGN(L1_CACHE_BYTES);
-  __per_cpu_start = .;
-  .data.percpu : C_PHYS(.data.percpu) { *(.data.percpu) }
-  __per_cpu_end = . ;
-  .data.cacheline_aligned : C_PHYS(.data.cacheline_aligned) { *(.data.cacheline_aligned) }
-
-  _edata = .;                  /* End of data section */
-
-  . = ALIGN(THREAD_SIZE);      /* init_task: structure size aligned */
-  .data.init_task : C_PHYS(.data.init_task) { *(.data.init_task) }
-
-  . = ALIGN(PAGE_SIZE);                /* Init code and data */
-  __init_begin = .;
-  _sinittext = .;
-  .init.text : C_PHYS(.init.text) { *(.init.text) }
-  _einittext = .;
-  .init.data : C_PHYS(.init.data) { *(.init.data) }
-  . = ALIGN(L1_CACHE_BYTES);   /* Better if Cache Line aligned */
-  __setup_start = .;
-  .init.setup : C_PHYS(.init.setup) { *(.init.setup) }
-  __setup_end = .;
-  __start___param = .;
-  __param : C_PHYS(__param) { *(__param) }
-  __stop___param = .;
-  __initcall_start = .;
-  .initcall.init : C_PHYS(.initcall.init) {
-       *(.initcall1.init)
-       *(.initcall2.init)
-       *(.initcall3.init)
-       *(.initcall4.init)
-       *(.initcall5.init)
-       *(.initcall6.init)
-       *(.initcall7.init)
-  }
-  __initcall_end = .;
-  __con_initcall_start = .;
-  .con_initcall.init : C_PHYS(.con_initcall.init) { *(.con_initcall.init) }
-  __con_initcall_end = .;
-  SECURITY_INIT
-  __initramfs_start = .;
-  .init.ramfs : C_PHYS(.init.ramfs) { *(.init.ramfs) }
-  __initramfs_end = .;
-  . = ALIGN(PAGE_SIZE);
-  __init_end = .;
-
-  /* Align to the biggest single data representation, head and tail */
-  . = ALIGN(8);
-  __bss_start = .;             /* BSS */
-  .bss : C_PHYS(.bss) {
-       *(.bss)
-       }
-  . = ALIGN(8);
-  _end = . ;
-
-  /* Sections to be discarded */
-  /DISCARD/ : {
-       *(.exit.text)
-       *(.exit.data)
-       *(.exitcall.exit)
-       }
-
-  /* Stabs debugging sections.  */
-  .stab 0 : C_PHYS(.stab) { *(.stab) }
-  .stabstr 0 : C_PHYS(.stabstr) { *(.stabstr) }
-  .stab.excl 0 : C_PHYS(.stab.excl) { *(.stab.excl) }
-  .stab.exclstr 0 : C_PHYS(.stab.exclstr) { *(.stab.exclstr) }
-  .stab.index 0 : C_PHYS(.stab.index) { *(.stab.index) }
-  .stab.indexstr 0 : C_PHYS(.stab.indexstr) { *(.stab.indexstr) }
-  .comment 0 : C_PHYS(.comment) { *(.comment) }
-  /* DWARF debug sections.
-     Symbols in the DWARF debugging section are relative to the beginning
-     of the section so we begin .debug at 0.  */
-  /* DWARF 1 */
-  .debug          0 : C_PHYS(.debug) { *(.debug) }
-  .line           0 : C_PHYS(.line) { *(.line) }
-  /* GNU DWARF 1 extensions */
-  .debug_srcinfo  0 : C_PHYS(.debug_srcinfo) { *(.debug_srcinfo) }
-  .debug_sfnames  0 : C_PHYS(.debug_sfnames) { *(.debug_sfnames) }
-  /* DWARF 1.1 and DWARF 2 */
-  .debug_aranges  0 : C_PHYS(.debug_aranges) { *(.debug_aranges) }
-  .debug_pubnames 0 : C_PHYS(.debug_pubnames) { *(.debug_pubnames) }
-  /* DWARF 2 */
-  .debug_info     0 : C_PHYS(.debug_info) { *(.debug_info) }
-  .debug_abbrev   0 : C_PHYS(.debug_abbrev) { *(.debug_abbrev) }
-  .debug_line     0 : C_PHYS(.debug_line) { *(.debug_line) }
-  .debug_frame    0 : C_PHYS(.debug_frame) { *(.debug_frame) }
-  .debug_str      0 : C_PHYS(.debug_str) { *(.debug_str) }
-  .debug_loc      0 : C_PHYS(.debug_loc) { *(.debug_loc) }
-  .debug_macinfo  0 : C_PHYS(.debug_macinfo) { *(.debug_macinfo) }
-  /* SGI/MIPS DWARF 2 extensions */
-  .debug_weaknames 0 : C_PHYS(.debug_weaknames) { *(.debug_weaknames) }
-  .debug_funcnames 0 : C_PHYS(.debug_funcnames) { *(.debug_funcnames) }
-  .debug_typenames 0 : C_PHYS(.debug_typenames) { *(.debug_typenames) }
-  .debug_varnames  0 : C_PHYS(.debug_varnames) { *(.debug_varnames) }
-  /* These must appear regardless of  .  */
-}
diff --git a/arch/sh64/lib/Makefile b/arch/sh64/lib/Makefile
deleted file mode 100644 (file)
index 0a2dc69..0000000
+++ /dev/null
@@ -1,19 +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, 2001  Paolo Alberelli
-# Coprygith (C) 2003  Paul Mundt
-#
-# Makefile for the SH-5 specific library files..
-#
-# Note! Dependencies are done automagically by 'make dep', which also
-# removes any old dependencies. DON'T put your own dependencies here
-# unless it's something special (ie not a .c file).
-#
-
-# Panic should really be compiled as PIC
-lib-y  := udelay.o c-checksum.o dbg.o io.o panic.o memcpy.o copy_user_memcpy.o \
-               page_copy.o page_clear.o
-
diff --git a/arch/sh64/lib/c-checksum.c b/arch/sh64/lib/c-checksum.c
deleted file mode 100644 (file)
index 3275954..0000000
+++ /dev/null
@@ -1,231 +0,0 @@
-/*
- * arch/sh/lib/csum_parial.c
- *
- * This file contains network checksum routines that are better done
- * in an architecture-specific manner due to speed..
- */
-
-#undef DEBUG
-
-#include <linux/config.h>
-#include <linux/string.h>
-#include <linux/errno.h>
-#include <linux/kernel.h>
-#include <asm/byteorder.h>
-#include <asm/uaccess.h>
-
-static inline unsigned short from64to16(unsigned long long x)
-{
-       /* add up 32-bit words for 33 bits */
-       x = (x & 0xffffffff) + (x >> 32);
-       /* add up 16-bit and 17-bit words for 17+c bits */
-       x = (x & 0xffff) + (x >> 16);
-       /* add up 16-bit and 2-bit for 16+c bit */
-       x = (x & 0xffff) + (x >> 16);
-       /* add up carry.. */
-       x = (x & 0xffff) + (x >> 16);
-       return x;
-}
-
-static inline unsigned short foldto16(unsigned long x)
-{
-       /* add up 16-bit for 17 bits */
-       x = (x & 0xffff) + (x >> 16);
-       /* add up carry.. */
-       x = (x & 0xffff) + (x >> 16);
-       return x;
-}
-
-static inline unsigned short myfoldto16(unsigned long long x)
-{
-       /* Fold down to 32-bits so we don't loose in the typedef-less
-          network stack.  */
-       /* 64 to 33 */
-       x = (x & 0xffffffff) + (x >> 32);
-       /* 33 to 32 */
-       x = (x & 0xffffffff) + (x >> 32);
-
-       /* add up 16-bit for 17 bits */
-       x = (x & 0xffff) + (x >> 16);
-       /* add up carry.. */
-       x = (x & 0xffff) + (x >> 16);
-       return x;
-}
-
-#define odd(x) ((x)&1)
-#define U16(x) ntohs(x)
-
-static unsigned long do_csum(const unsigned char *buff, int len)
-{
-       int odd, count;
-       unsigned long result = 0;
-
-       pr_debug("do_csum buff %p, len %d (0x%x)\n", buff, len, len);
-#ifdef DEBUG
-       for (i = 0; i < len; i++) {
-               if ((i % 26) == 0)
-                       printk("\n");
-               printk("%02X ", buff[i]);
-       }
-#endif
-
-       if (len <= 0)
-               goto out;
-
-       odd = 1 & (unsigned long) buff;
-       if (odd) {
-               result = *buff << 8;
-               len--;
-               buff++;
-       }
-       count = len >> 1;       /* nr of 16-bit words.. */
-       if (count) {
-               if (2 & (unsigned long) buff) {
-                       result += *(unsigned short *) buff;
-                       count--;
-                       len -= 2;
-                       buff += 2;
-               }
-               count >>= 1;    /* nr of 32-bit words.. */
-               if (count) {
-                       unsigned long carry = 0;
-                       do {
-                               unsigned long w = *(unsigned long *) buff;
-                               buff += 4;
-                               count--;
-                               result += carry;
-                               result += w;
-                               carry = (w > result);
-                       } while (count);
-                       result += carry;
-                       result = (result & 0xffff) + (result >> 16);
-               }
-               if (len & 2) {
-                       result += *(unsigned short *) buff;
-                       buff += 2;
-               }
-       }
-       if (len & 1)
-               result += *buff;
-       result = foldto16(result);
-       if (odd)
-               result = ((result >> 8) & 0xff) | ((result & 0xff) << 8);
-
-       pr_debug("\nCHECKSUM is 0x%x\n", result);
-
-      out:
-       return result;
-}
-
-/* computes the checksum of a memory block at buff, length len,
-   and adds in "sum" (32-bit)  */
-unsigned int csum_partial(const unsigned char *buff, int len, unsigned int sum)
-{
-       unsigned long long result = do_csum(buff, len);
-
-       /* add in old sum, and carry.. */
-       result += sum;
-       /* 32+c bits -> 32 bits */
-       result = (result & 0xffffffff) + (result >> 32);
-
-       pr_debug("csum_partial, buff %p len %d sum 0x%x result=0x%016Lx\n",
-               buff, len, sum, result);
-
-       return result;
-}
-
-/* Copy while checksumming, otherwise like csum_partial.  */
-unsigned int
-csum_partial_copy(const char *src, char *dst, int len, unsigned int sum)
-{
-       sum = csum_partial(src, len, sum);
-       memcpy(dst, src, len);
-
-       return sum;
-}
-
-/* Copy from userspace and compute checksum.  If we catch an exception
-   then zero the rest of the buffer.  */
-unsigned int
-csum_partial_copy_from_user(const char *src, char *dst, int len,
-                           unsigned int sum, int *err_ptr)
-{
-       int missing;
-
-       pr_debug
-           ("csum_partial_copy_from_user src %p, dest %p, len %d, sum %08x, err_ptr %p\n",
-            src, dst, len, sum, err_ptr);
-       missing = copy_from_user(dst, src, len);
-       pr_debug("  access_ok %d\n", __access_ok((unsigned long) src, len));
-       pr_debug("  missing %d\n", missing);
-       if (missing) {
-               memset(dst + len - missing, 0, missing);
-               *err_ptr = -EFAULT;
-       }
-
-       return csum_partial(dst, len, sum);
-}
-
-/* Copy to userspace and compute checksum.  */
-unsigned int
-csum_partial_copy_to_user(const char *src, char *dst, int len,
-                         unsigned int sum, int *err_ptr)
-{
-       sum = csum_partial(src, len, sum);
-
-       if (copy_to_user(dst, src, len))
-               *err_ptr = -EFAULT;
-
-       return sum;
-}
-
-/*
- *     This is a version of ip_compute_csum() optimized for IP headers,
- *     which always checksum on 4 octet boundaries.
- */
-unsigned short ip_fast_csum(unsigned char *iph, unsigned int ihl)
-{
-       pr_debug("ip_fast_csum %p,%d\n", iph, ihl);
-
-       return ~do_csum(iph, ihl * 4);
-}
-
-unsigned int csum_tcpudp_nofold(unsigned long saddr,
-                               unsigned long daddr,
-                               unsigned short len,
-                               unsigned short proto, unsigned int sum)
-{
-       unsigned long long result;
-
-       pr_debug("ntohs(0x%x)=0x%x\n", 0xdead, ntohs(0xdead));
-       pr_debug("htons(0x%x)=0x%x\n", 0xdead, htons(0xdead));
-
-       result = ((unsigned long long) saddr +
-                 (unsigned long long) daddr +
-                 (unsigned long long) sum +
-                 ((unsigned long long) ntohs(len) << 16) +
-                 ((unsigned long long) proto << 8));
-
-       /* Fold down to 32-bits so we don't loose in the typedef-less
-          network stack.  */
-       /* 64 to 33 */
-       result = (result & 0xffffffff) + (result >> 32);
-       /* 33 to 32 */
-       result = (result & 0xffffffff) + (result >> 32);
-
-       pr_debug("%s saddr %x daddr %x len %x proto %x sum %x result %08Lx\n",
-               __FUNCTION__, saddr, daddr, len, proto, sum, result);
-
-       return result;
-}
-
-// Post SIM:
-unsigned int
-csum_partial_copy_nocheck(const char *src, char *dst, int len, unsigned int sum)
-{
-       //  unsigned dummy;
-       pr_debug("csum_partial_copy_nocheck src %p dst %p len %d\n", src, dst,
-               len);
-
-       return csum_partial_copy(src, dst, len, sum);
-}
diff --git a/arch/sh64/lib/copy_user_memcpy.S b/arch/sh64/lib/copy_user_memcpy.S
deleted file mode 100644 (file)
index 5b6ca39..0000000
+++ /dev/null
@@ -1,213 +0,0 @@
-!
-! Fast SH memcpy
-!
-! by Toshiyasu Morita (tm@netcom.com)
-! hacked by J"orn Rernnecke (joern.rennecke@superh.com) ("o for o-umlaut)
-! SH5 code Copyright 2002 SuperH Ltd.
-!
-! Entry: ARG0: destination pointer
-!        ARG1: source pointer
-!        ARG2: byte count
-!
-! Exit:  RESULT: destination pointer
-!        any other registers in the range r0-r7: trashed
-!
-! Notes: Usually one wants to do small reads and write a longword, but
-!        unfortunately it is difficult in some cases to concatanate bytes
-!        into a longword on the SH, so this does a longword read and small
-!        writes.
-!
-! This implementation makes two assumptions about how it is called:
-!
-! 1.: If the byte count is nonzero, the address of the last byte to be
-!     copied is unsigned greater than the address of the first byte to
-!     be copied.  This could be easily swapped for a signed comparison,
-!     but the algorithm used needs some comparison.
-!
-! 2.: When there are two or three bytes in the last word of an 11-or-more
-!     bytes memory chunk to b copied, the rest of the word can be read
-!     without side effects.
-!     This could be easily changed by increasing the minumum size of
-!     a fast memcpy and the amount subtracted from r7 before L_2l_loop be 2,
-!     however, this would cost a few extra cyles on average.
-!     For SHmedia, the assumption is that any quadword can be read in its
-!     enirety if at least one byte is included in the copy.
-
-/* Imported into Linux kernel by Richard Curnow.  This is used to implement the
-   __copy_user function in the general case, so it has to be a distinct
-   function from intra-kernel memcpy to allow for exception fix-ups in the
-   event that the user pointer is bad somewhere in the copy (e.g. due to
-   running off the end of the vma).
-
-   Note, this algorithm will be slightly wasteful in the case where the source
-   and destination pointers are equally aligned, because the stlo/sthi pairs
-   could then be merged back into single stores.  If there are a lot of cache
-   misses, this is probably offset by the stall lengths on the preloads.
-
-*/
-
-       .section .text..SHmedia32,"ax"
-       .little
-       .balign 32
-       .global copy_user_memcpy
-       .global copy_user_memcpy_end
-copy_user_memcpy:
-
-#define LDUAQ(P,O,D0,D1) ldlo.q P,O,D0; ldhi.q P,O+7,D1
-#define STUAQ(P,O,D0,D1) stlo.q P,O,D0; sthi.q P,O+7,D1
-#define LDUAL(P,O,D0,D1) ldlo.l P,O,D0; ldhi.l P,O+3,D1
-#define STUAL(P,O,D0,D1) stlo.l P,O,D0; sthi.l P,O+3,D1
-
-       ld.b r3,0,r63
-       pta/l Large,tr0
-       movi 25,r0
-       bgeu/u r4,r0,tr0
-       nsb r4,r0
-       shlli r0,5,r0
-       movi (L1-L0+63*32 + 1) & 0xffff,r1
-       sub r1, r0, r0
-L0:    ptrel r0,tr0
-       add r2,r4,r5
-       ptabs r18,tr1
-       add r3,r4,r6
-       blink tr0,r63
-
-/* Rearranged to make cut2 safe */
-       .balign 8
-L4_7:  /* 4..7 byte memcpy cntd. */
-       stlo.l r2, 0, r0
-       or r6, r7, r6
-       sthi.l r5, -1, r6
-       stlo.l r5, -4, r6
-       blink tr1,r63
-
-       .balign 8
-L1:    /* 0 byte memcpy */
-       nop
-       blink tr1,r63
-       nop
-       nop
-       nop
-       nop
-
-L2_3:  /* 2 or 3 byte memcpy cntd. */
-       st.b r5,-1,r6
-       blink tr1,r63
-
-       /* 1 byte memcpy */
-       ld.b r3,0,r0
-       st.b r2,0,r0
-       blink tr1,r63
-
-L8_15: /* 8..15 byte memcpy cntd. */
-       stlo.q r2, 0, r0
-       or r6, r7, r6
-       sthi.q r5, -1, r6
-       stlo.q r5, -8, r6
-       blink tr1,r63
-
-       /* 2 or 3 byte memcpy */
-       ld.b r3,0,r0
-       ld.b r2,0,r63
-       ld.b r3,1,r1
-       st.b r2,0,r0
-       pta/l L2_3,tr0
-       ld.b r6,-1,r6
-       st.b r2,1,r1
-       blink tr0, r63
-
-       /* 4 .. 7 byte memcpy */
-       LDUAL (r3, 0, r0, r1)
-       pta L4_7, tr0
-       ldlo.l r6, -4, r7
-       or r0, r1, r0
-       sthi.l r2, 3, r0
-       ldhi.l r6, -1, r6
-       blink tr0, r63
-
-       /* 8 .. 15 byte memcpy */
-       LDUAQ (r3, 0, r0, r1)
-       pta L8_15, tr0
-       ldlo.q r6, -8, r7
-       or r0, r1, r0
-       sthi.q r2, 7, r0
-       ldhi.q r6, -1, r6
-       blink tr0, r63
-
-       /* 16 .. 24 byte memcpy */
-       LDUAQ (r3, 0, r0, r1)
-       LDUAQ (r3, 8, r8, r9)
-       or r0, r1, r0
-       sthi.q r2, 7, r0
-       or r8, r9, r8
-       sthi.q r2, 15, r8
-       ldlo.q r6, -8, r7
-       ldhi.q r6, -1, r6
-       stlo.q r2, 8, r8
-       stlo.q r2, 0, r0
-       or r6, r7, r6
-       sthi.q r5, -1, r6
-       stlo.q r5, -8, r6
-       blink tr1,r63
-
-Large:
-       ld.b r2, 0, r63
-       pta/l  Loop_ua, tr1
-       ori r3, -8, r7
-       sub r2, r7, r22
-       sub r3, r2, r6
-       add r2, r4, r5
-       ldlo.q r3, 0, r0
-       addi r5, -16, r5
-       movi 64+8, r27 ! could subtract r7 from that.
-       stlo.q r2, 0, r0
-       sthi.q r2, 7, r0
-       ldx.q r22, r6, r0
-       bgtu/l r27, r4, tr1
-
-       addi r5, -48, r27
-       pta/l Loop_line, tr0
-       addi r6, 64, r36
-       addi r6, -24, r19
-       addi r6, -16, r20
-       addi r6, -8, r21
-
-Loop_line:
-       ldx.q r22, r36, r63
-       synco
-       alloco r22, 32
-       synco
-       addi r22, 32, r22
-       ldx.q r22, r19, r23
-       sthi.q r22, -25, r0
-       ldx.q r22, r20, r24
-       ldx.q r22, r21, r25
-       stlo.q r22, -32, r0
-       ldx.q r22, r6,  r0
-       sthi.q r22, -17, r23
-       sthi.q r22,  -9, r24
-       sthi.q r22,  -1, r25
-       stlo.q r22, -24, r23
-       stlo.q r22, -16, r24
-       stlo.q r22,  -8, r25
-       bgeu r27, r22, tr0
-
-Loop_ua:
-       addi r22, 8, r22
-       sthi.q r22, -1, r0
-       stlo.q r22, -8, r0
-       ldx.q r22, r6, r0
-       bgtu/l r5, r22, tr1
-
-       add r3, r4, r7
-       ldlo.q r7, -8, r1
-       sthi.q r22, 7, r0
-       ldhi.q r7, -1, r7
-       ptabs r18,tr1
-       stlo.q r22, 0, r0
-       or r1, r7, r1
-       sthi.q r5, 15, r1
-       stlo.q r5, 8, r1
-       blink tr1, r63
-copy_user_memcpy_end:
-       nop
diff --git a/arch/sh64/lib/dbg.c b/arch/sh64/lib/dbg.c
deleted file mode 100644 (file)
index d74913f..0000000
+++ /dev/null
@@ -1,394 +0,0 @@
-/*--------------------------------------------------------------------------
---
--- Identity : Linux50 Debug Funcions
---
--- File     : arch/sh64/lib/dbg.C
---
--- Copyright 2000, 2001 STMicroelectronics Limited.
--- Copyright 2004 Richard Curnow (evt_debug etc)
---
---------------------------------------------------------------------------*/
-#include <linux/types.h>
-#include <linux/kernel.h>
-#include <linux/sched.h>
-#include <linux/mm.h>
-#include <asm/mmu_context.h>
-
-typedef u64 regType_t;
-
-static regType_t getConfigReg(u64 id)
-{
-       register u64 reg __asm__("r2");
-       asm volatile ("getcfg   %1, 0, %0":"=r" (reg):"r"(id));
-       return (reg);
-}
-
-/* ======================================================================= */
-
-static char *szTab[] = { "4k", "64k", "1M", "512M" };
-static char *protTab[] = { "----",
-       "---R",
-       "--X-",
-       "--XR",
-       "-W--",
-       "-W-R",
-       "-WX-",
-       "-WXR",
-       "U---",
-       "U--R",
-       "U-X-",
-       "U-XR",
-       "UW--",
-       "UW-R",
-       "UWX-",
-       "UWXR"
-};
-#define  ITLB_BASE     0x00000000
-#define  DTLB_BASE     0x00800000
-#define  MAX_TLBs              64
-/* PTE High */
-#define  GET_VALID(pte)        ((pte) & 0x1)
-#define  GET_SHARED(pte)       ((pte) & 0x2)
-#define  GET_ASID(pte)         ((pte >> 2) & 0x0ff)
-#define  GET_EPN(pte)          ((pte) & 0xfffff000)
-
-/* PTE Low */
-#define  GET_CBEHAVIOR(pte)    ((pte) & 0x3)
-#define  GET_PAGE_SIZE(pte)    szTab[((pte >> 3) & 0x3)]
-#define  GET_PROTECTION(pte)   protTab[((pte >> 6) & 0xf)]
-#define  GET_PPN(pte)          ((pte) & 0xfffff000)
-
-#define PAGE_1K_MASK           0x00000000
-#define PAGE_4K_MASK           0x00000010
-#define PAGE_64K_MASK          0x00000080
-#define MMU_PAGESIZE_MASK      (PAGE_64K_MASK | PAGE_4K_MASK)
-#define PAGE_1MB_MASK          MMU_PAGESIZE_MASK
-#define PAGE_1K                (1024)
-#define PAGE_4K                (1024 * 4)
-#define PAGE_64K               (1024 * 64)
-#define PAGE_1MB               (1024 * 1024)
-
-#define HOW_TO_READ_TLB_CONTENT  \
-       "[ ID]  PPN         EPN        ASID  Share  CB  P.Size   PROT.\n"
-
-void print_single_tlb(unsigned long tlb, int single_print)
-{
-       regType_t pteH;
-       regType_t pteL;
-       unsigned int valid, shared, asid, epn, cb, ppn;
-       char *pSize;
-       char *pProt;
-
-       /*
-          ** in case of single print <single_print> is true, this implies:
-          **   1) print the TLB in any case also if NOT VALID
-          **   2) print out the header
-        */
-
-       pteH = getConfigReg(tlb);
-       valid = GET_VALID(pteH);
-       if (single_print)
-               printk(HOW_TO_READ_TLB_CONTENT);
-       else if (!valid)
-               return;
-
-       pteL = getConfigReg(tlb + 1);
-
-       shared = GET_SHARED(pteH);
-       asid = GET_ASID(pteH);
-       epn = GET_EPN(pteH);
-       cb = GET_CBEHAVIOR(pteL);
-       pSize = GET_PAGE_SIZE(pteL);
-       pProt = GET_PROTECTION(pteL);
-       ppn = GET_PPN(pteL);
-       printk("[%c%2ld]  0x%08x  0x%08x  %03d   %02x    %02x   %4s    %s\n",
-              ((valid) ? ' ' : 'u'), ((tlb & 0x0ffff) / TLB_STEP),
-              ppn, epn, asid, shared, cb, pSize, pProt);
-}
-
-void print_dtlb(void)
-{
-       int count;
-       unsigned long tlb;
-
-       printk(" ================= SH-5 D-TLBs Status ===================\n");
-       printk(HOW_TO_READ_TLB_CONTENT);
-       tlb = DTLB_BASE;
-       for (count = 0; count < MAX_TLBs; count++, tlb += TLB_STEP)
-               print_single_tlb(tlb, 0);
-       printk
-           (" =============================================================\n");
-}
-
-void print_itlb(void)
-{
-       int count;
-       unsigned long tlb;
-
-       printk(" ================= SH-5 I-TLBs Status ===================\n");
-       printk(HOW_TO_READ_TLB_CONTENT);
-       tlb = ITLB_BASE;
-       for (count = 0; count < MAX_TLBs; count++, tlb += TLB_STEP)
-               print_single_tlb(tlb, 0);
-       printk
-           (" =============================================================\n");
-}
-
-/* ======================================================================= */
-
-#include "syscalltab.h"
-
-struct ring_node {
-       int evt;
-       int ret_addr;
-       int event;
-       int tra;
-       int pid;
-       unsigned long sp;
-       unsigned long pc;
-};
-
-static struct ring_node event_ring[16];
-static int event_ptr = 0;
-
-void evt_debug(int evt, int ret_addr, int event, int tra, struct pt_regs *regs)
-{
-       int syscallno = tra & 0xff;
-       unsigned long sp;
-       unsigned long stack_bottom;
-       int pid;
-       struct ring_node *rr;
-
-       pid = current->pid;
-       stack_bottom = (unsigned long) current->thread_info;
-       asm volatile("ori r15, 0, %0" : "=r" (sp));
-       rr = event_ring + event_ptr;
-       rr->evt = evt;
-       rr->ret_addr = ret_addr;
-       rr->event = event;
-       rr->tra = tra;
-       rr->pid = pid;
-       rr->sp = sp;
-       rr->pc = regs->pc;
-
-       if (sp < stack_bottom + 3092) {
-               printk("evt_debug : stack underflow report\n");
-               int i, j;
-               for (j=0, i = event_ptr; j<16; j++) {
-                       rr = event_ring + i;
-                       printk("evt=%08x event=%08x tra=%08x pid=%5d sp=%08lx pc=%08lx\n",
-                               rr->evt, rr->event, rr->tra, rr->pid, rr->sp, rr->pc);
-                       i--;
-                       i &= 15;
-               }
-               panic("STACK UNDERFLOW\n");
-       }
-
-       event_ptr = (event_ptr + 1) & 15;
-
-       if ((event == 2) && (evt == 0x160)) {
-               if (syscallno < NUM_SYSCALL_INFO_ENTRIES)
-                       printk("Task %d: %s()\n",
-                              current->pid,
-                              syscall_info_table[syscallno].name);
-       }
-}
-
-void evt_debug2(unsigned int ret)
-{
-       printk("Task %d: syscall returns %08x\n", current->pid, ret);
-}
-
-void evt_debug_ret_from_irq(struct pt_regs *regs)
-{
-       int pid;
-       struct ring_node *rr;
-
-       pid = current->pid;
-       rr = event_ring + event_ptr;
-       rr->evt = 0xffff;
-       rr->ret_addr = 0;
-       rr->event = 0;
-       rr->tra = 0;
-       rr->pid = pid;
-       rr->pc = regs->pc;
-       event_ptr = (event_ptr + 1) & 15;
-}
-
-void evt_debug_ret_from_exc(struct pt_regs *regs)
-{
-       int pid;
-       struct ring_node *rr;
-
-       pid = current->pid;
-       rr = event_ring + event_ptr;
-       rr->evt = 0xfffe;
-       rr->ret_addr = 0;
-       rr->event = 0;
-       rr->tra = 0;
-       rr->pid = pid;
-       rr->pc = regs->pc;
-       event_ptr = (event_ptr + 1) & 15;
-}
-
-/* ======================================================================= */
-
-void show_excp_regs(char *from, int trapnr, int signr, struct pt_regs *regs)
-{
-
-       unsigned long long ah, al, bh, bl, ch, cl;
-
-       printk("\n");
-       printk("EXCEPTION - %s: task %d; Linux trap # %d; signal = %d\n",
-              ((from) ? from : "???"), current->pid, trapnr, signr);
-
-       asm volatile ("getcon   " __EXPEVT ", %0":"=r"(ah));
-       asm volatile ("getcon   " __EXPEVT ", %0":"=r"(al));
-       ah = (ah) >> 32;
-       al = (al) & 0xffffffff;
-       asm volatile ("getcon   " __KCR1 ", %0":"=r"(bh));
-       asm volatile ("getcon   " __KCR1 ", %0":"=r"(bl));
-       bh = (bh) >> 32;
-       bl = (bl) & 0xffffffff;
-       asm volatile ("getcon   " __INTEVT ", %0":"=r"(ch));
-       asm volatile ("getcon   " __INTEVT ", %0":"=r"(cl));
-       ch = (ch) >> 32;
-       cl = (cl) & 0xffffffff;
-       printk("EXPE: %08Lx%08Lx KCR1: %08Lx%08Lx INTE: %08Lx%08Lx\n",
-              ah, al, bh, bl, ch, cl);
-
-       asm volatile ("getcon   " __PEXPEVT ", %0":"=r"(ah));
-       asm volatile ("getcon   " __PEXPEVT ", %0":"=r"(al));
-       ah = (ah) >> 32;
-       al = (al) & 0xffffffff;
-       asm volatile ("getcon   " __PSPC ", %0":"=r"(bh));
-       asm volatile ("getcon   " __PSPC ", %0":"=r"(bl));
-       bh = (bh) >> 32;
-       bl = (bl) & 0xffffffff;
-       asm volatile ("getcon   " __PSSR ", %0":"=r"(ch));
-       asm volatile ("getcon   " __PSSR ", %0":"=r"(cl));
-       ch = (ch) >> 32;
-       cl = (cl) & 0xffffffff;
-       printk("PEXP: %08Lx%08Lx PSPC: %08Lx%08Lx PSSR: %08Lx%08Lx\n",
-              ah, al, bh, bl, ch, cl);
-
-       ah = (regs->pc) >> 32;
-       al = (regs->pc) & 0xffffffff;
-       bh = (regs->regs[18]) >> 32;
-       bl = (regs->regs[18]) & 0xffffffff;
-       ch = (regs->regs[15]) >> 32;
-       cl = (regs->regs[15]) & 0xffffffff;
-       printk("PC  : %08Lx%08Lx LINK: %08Lx%08Lx SP  : %08Lx%08Lx\n",
-              ah, al, bh, bl, ch, cl);
-
-       ah = (regs->sr) >> 32;
-       al = (regs->sr) & 0xffffffff;
-       asm volatile ("getcon   " __TEA ", %0":"=r"(bh));
-       asm volatile ("getcon   " __TEA ", %0":"=r"(bl));
-       bh = (bh) >> 32;
-       bl = (bl) & 0xffffffff;
-       asm volatile ("getcon   " __KCR0 ", %0":"=r"(ch));
-       asm volatile ("getcon   " __KCR0 ", %0":"=r"(cl));
-       ch = (ch) >> 32;
-       cl = (cl) & 0xffffffff;
-       printk("SR  : %08Lx%08Lx TEA : %08Lx%08Lx KCR0: %08Lx%08Lx\n",
-              ah, al, bh, bl, ch, cl);
-
-       ah = (regs->regs[0]) >> 32;
-       al = (regs->regs[0]) & 0xffffffff;
-       bh = (regs->regs[1]) >> 32;
-       bl = (regs->regs[1]) & 0xffffffff;
-       ch = (regs->regs[2]) >> 32;
-       cl = (regs->regs[2]) & 0xffffffff;
-       printk("R0  : %08Lx%08Lx R1  : %08Lx%08Lx R2  : %08Lx%08Lx\n",
-              ah, al, bh, bl, ch, cl);
-
-       ah = (regs->regs[3]) >> 32;
-       al = (regs->regs[3]) & 0xffffffff;
-       bh = (regs->regs[4]) >> 32;
-       bl = (regs->regs[4]) & 0xffffffff;
-       ch = (regs->regs[5]) >> 32;
-       cl = (regs->regs[5]) & 0xffffffff;
-       printk("R3  : %08Lx%08Lx R4  : %08Lx%08Lx R5  : %08Lx%08Lx\n",
-              ah, al, bh, bl, ch, cl);
-
-       ah = (regs->regs[6]) >> 32;
-       al = (regs->regs[6]) & 0xffffffff;
-       bh = (regs->regs[7]) >> 32;
-       bl = (regs->regs[7]) & 0xffffffff;
-       ch = (regs->regs[8]) >> 32;
-       cl = (regs->regs[8]) & 0xffffffff;
-       printk("R6  : %08Lx%08Lx R7  : %08Lx%08Lx R8  : %08Lx%08Lx\n",
-              ah, al, bh, bl, ch, cl);
-
-       ah = (regs->regs[9]) >> 32;
-       al = (regs->regs[9]) & 0xffffffff;
-       bh = (regs->regs[10]) >> 32;
-       bl = (regs->regs[10]) & 0xffffffff;
-       ch = (regs->regs[11]) >> 32;
-       cl = (regs->regs[11]) & 0xffffffff;
-       printk("R9  : %08Lx%08Lx R10 : %08Lx%08Lx R11 : %08Lx%08Lx\n",
-              ah, al, bh, bl, ch, cl);
-       printk("....\n");
-
-       ah = (regs->tregs[0]) >> 32;
-       al = (regs->tregs[0]) & 0xffffffff;
-       bh = (regs->tregs[1]) >> 32;
-       bl = (regs->tregs[1]) & 0xffffffff;
-       ch = (regs->tregs[2]) >> 32;
-       cl = (regs->tregs[2]) & 0xffffffff;
-       printk("T0  : %08Lx%08Lx T1  : %08Lx%08Lx T2  : %08Lx%08Lx\n",
-              ah, al, bh, bl, ch, cl);
-       printk("....\n");
-
-       print_dtlb();
-       print_itlb();
-}
-
-/* ======================================================================= */
-
-/*
-** Depending on <base> scan the MMU, Data or Instrction side
-** looking for a valid mapping matching Eaddr & asid.
-** Return -1 if not found or the TLB id entry otherwise.
-** Note: it works only for 4k pages!
-*/
-static unsigned long
-lookup_mmu_side(unsigned long base, unsigned long Eaddr, unsigned long asid)
-{
-       regType_t pteH;
-       unsigned long epn;
-       int count;
-
-       epn = Eaddr & 0xfffff000;
-
-       for (count = 0; count < MAX_TLBs; count++, base += TLB_STEP) {
-               pteH = getConfigReg(base);
-               if (GET_VALID(pteH))
-                       if ((unsigned long) GET_EPN(pteH) == epn)
-                               if ((unsigned long) GET_ASID(pteH) == asid)
-                                       break;
-       }
-       return ((unsigned long) ((count < MAX_TLBs) ? base : -1));
-}
-
-unsigned long lookup_dtlb(unsigned long Eaddr)
-{
-       unsigned long asid = get_asid();
-       return (lookup_mmu_side((u64) DTLB_BASE, Eaddr, asid));
-}
-
-unsigned long lookup_itlb(unsigned long Eaddr)
-{
-       unsigned long asid = get_asid();
-       return (lookup_mmu_side((u64) ITLB_BASE, Eaddr, asid));
-}
-
-void print_page(struct page *page)
-{
-       printk("  page[%p] -> index 0x%lx,  count 0x%x,  flags 0x%lx\n",
-              page, page->index, page_count(page), page->flags);
-       printk("       address_space = %p, pages =%ld\n", page->mapping,
-              page->mapping->nrpages);
-
-}
diff --git a/arch/sh64/lib/io.c b/arch/sh64/lib/io.c
deleted file mode 100644 (file)
index 7e8af3a..0000000
+++ /dev/null
@@ -1,207 +0,0 @@
-/*
- * Copyright (C) 2000 David J. Mckay (david.mckay@st.com)
- *
- * May be copied or modified under the terms of the GNU General Public
- * License.  See linux/COPYING for more information.
- *
- * This file contains the I/O routines for use on the overdrive board
- *
- */
-
-#include <linux/config.h>
-#include <linux/types.h>
-#include <linux/delay.h>
-#include <asm/system.h>
-#include <asm/processor.h>
-#include <asm/io.h>
-#ifdef CONFIG_SH_CAYMAN
-#include <asm/cayman.h>
-#endif
-
-/*
- * readX/writeX() are used to access memory mapped devices. On some
- * architectures the memory mapped IO stuff needs to be accessed
- * differently. On the SuperH architecture, we just read/write the
- * memory location directly.
- */
-
-#define dprintk(x...)
-
-static int io_addr(int x) {
-       if (x < 0x400) {
-#ifdef CONFIG_SH_CAYMAN
-               return (x << 2) | smsc_superio_virt;
-#else
-               panic ("Illegal access to I/O port 0x%04x\n", x);
-               return 0;
-#endif
-       } else {
-#ifdef CONFIG_PCI
-               return (x + pciio_virt);
-#else
-               panic ("Illegal access to I/O port 0x%04x\n", x);
-               return 0;
-#endif
-       }
-}
-
-unsigned long inb(unsigned long port)
-{
-       unsigned long r;
-
-       r = ctrl_inb(io_addr(port));
-       dprintk("inb(0x%x)=0x%x (0x%x)\n", port, r, io_addr(port));
-       return r;
-}
-
-unsigned long inw(unsigned long port)
-{
-       unsigned long r;
-
-       r = ctrl_inw(io_addr(port));
-       dprintk("inw(0x%x)=0x%x (0x%x)\n", port, r, io_addr(port));
-       return r;
-}
-
-unsigned long inl(unsigned long port)
-{
-       unsigned long r;
-
-       r = ctrl_inl(io_addr(port));
-       dprintk("inl(0x%x)=0x%x (0x%x)\n", port, r, io_addr(port));
-       return r;
-}
-
-void outb(unsigned long value, unsigned long port)
-{
-       dprintk("outb(0x%x,0x%x) (0x%x)\n", value, port, io_addr(port));
-       ctrl_outb(value, io_addr(port));
-}
-
-void outw(unsigned long value, unsigned long port)
-{
-       dprintk("outw(0x%x,0x%x) (0x%x)\n", value, port, io_addr(port));
-       ctrl_outw(value, io_addr(port));
-}
-
-void outl(unsigned long value, unsigned long port)
-{
-       dprintk("outw(0x%x,0x%x) (0x%x)\n", value, port, io_addr(port));
-       ctrl_outl(value, io_addr(port));
-}
-
-/* This is horrible at the moment - needs more work to do something sensible */
-#define IO_DELAY()
-
-#define OUT_DELAY(x,type) \
-void out##x##_p(unsigned type value,unsigned long port){out##x(value,port);IO_DELAY();}
-
-#define IN_DELAY(x,type) \
-unsigned type in##x##_p(unsigned long port) {unsigned type tmp=in##x(port);IO_DELAY();return tmp;}
-
-#if 1
-OUT_DELAY(b, long) OUT_DELAY(w, long) OUT_DELAY(l, long)
- IN_DELAY(b, long) IN_DELAY(w, long) IN_DELAY(l, long)
-#endif
-/*  Now for the string version of these functions */
-void outsb(unsigned long port, const void *addr, unsigned long count)
-{
-       int i;
-       unsigned char *p = (unsigned char *) addr;
-
-       for (i = 0; i < count; i++, p++) {
-               outb(*p, port);
-       }
-}
-
-void insb(unsigned long port, void *addr, unsigned long count)
-{
-       int i;
-       unsigned char *p = (unsigned char *) addr;
-
-       for (i = 0; i < count; i++, p++) {
-               *p = inb(port);
-       }
-}
-
-/* For the 16 and 32 bit string functions, we have to worry about alignment.
- * The SH does not do unaligned accesses, so we have to read as bytes and
- * then write as a word or dword.
- * This can be optimised a lot more, especially in the case where the data
- * is aligned
- */
-
-void outsw(unsigned long port, const void *addr, unsigned long count)
-{
-       int i;
-       unsigned short tmp;
-       unsigned char *p = (unsigned char *) addr;
-
-       for (i = 0; i < count; i++, p += 2) {
-               tmp = (*p) | ((*(p + 1)) << 8);
-               outw(tmp, port);
-       }
-}
-
-void insw(unsigned long port, void *addr, unsigned long count)
-{
-       int i;
-       unsigned short tmp;
-       unsigned char *p = (unsigned char *) addr;
-
-       for (i = 0; i < count; i++, p += 2) {
-               tmp = inw(port);
-               p[0] = tmp & 0xff;
-               p[1] = (tmp >> 8) & 0xff;
-       }
-}
-
-void outsl(unsigned long port, const void *addr, unsigned long count)
-{
-       int i;
-       unsigned tmp;
-       unsigned char *p = (unsigned char *) addr;
-
-       for (i = 0; i < count; i++, p += 4) {
-               tmp = (*p) | ((*(p + 1)) << 8) | ((*(p + 2)) << 16) |
-                   ((*(p + 3)) << 24);
-               outl(tmp, port);
-       }
-}
-
-void insl(unsigned long port, void *addr, unsigned long count)
-{
-       int i;
-       unsigned tmp;
-       unsigned char *p = (unsigned char *) addr;
-
-       for (i = 0; i < count; i++, p += 4) {
-               tmp = inl(port);
-               p[0] = tmp & 0xff;
-               p[1] = (tmp >> 8) & 0xff;
-               p[2] = (tmp >> 16) & 0xff;
-               p[3] = (tmp >> 24) & 0xff;
-
-       }
-}
-
-void memcpy_toio(unsigned long to, const void *from, long count)
-{
-       unsigned char *p = (unsigned char *) from;
-
-       while (count) {
-               count--;
-               writeb(*p++, to++);
-       }
-}
-
-void memcpy_fromio(void *to, unsigned long from, long count)
-{
-       int i;
-       unsigned char *p = (unsigned char *) to;
-
-       for (i = 0; i < count; i++) {
-               p[i] = readb(from);
-               from++;
-       }
-}
diff --git a/arch/sh64/lib/memcpy.c b/arch/sh64/lib/memcpy.c
deleted file mode 100644 (file)
index c785d0a..0000000
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
- * Copyright (C) 2002 Mark Debbage (Mark.Debbage@superh.com)
- *
- * May be copied or modified under the terms of the GNU General Public
- * License.  See linux/COPYING for more information.
- *
- */
-
-#include <linux/config.h>
-#include <linux/types.h>
-#include <asm/string.h>
-
-// This is a simplistic optimization of memcpy to increase the
-// granularity of access beyond one byte using aligned
-// loads and stores. This is not an optimal implementation
-// for SH-5 (especially with regard to prefetching and the cache),
-// and a better version should be provided later ...
-
-void *memcpy(void *dest, const void *src, size_t count)
-{
-       char *d = (char *) dest, *s = (char *) src;
-
-       if (count >= 32) {
-               int i = 8 - (((unsigned long) d) & 0x7);
-
-               if (i != 8)
-                       while (i-- && count--) {
-                               *d++ = *s++;
-                       }
-
-               if (((((unsigned long) d) & 0x7) == 0) &&
-                   ((((unsigned long) s) & 0x7) == 0)) {
-                       while (count >= 32) {
-                               unsigned long long t1, t2, t3, t4;
-                               t1 = *(unsigned long long *) (s);
-                               t2 = *(unsigned long long *) (s + 8);
-                               t3 = *(unsigned long long *) (s + 16);
-                               t4 = *(unsigned long long *) (s + 24);
-                               *(unsigned long long *) (d) = t1;
-                               *(unsigned long long *) (d + 8) = t2;
-                               *(unsigned long long *) (d + 16) = t3;
-                               *(unsigned long long *) (d + 24) = t4;
-                               d += 32;
-                               s += 32;
-                               count -= 32;
-                       }
-                       while (count >= 8) {
-                               *(unsigned long long *) d =
-                                   *(unsigned long long *) s;
-                               d += 8;
-                               s += 8;
-                               count -= 8;
-                       }
-               }
-
-               if (((((unsigned long) d) & 0x3) == 0) &&
-                   ((((unsigned long) s) & 0x3) == 0)) {
-                       while (count >= 4) {
-                               *(unsigned long *) d = *(unsigned long *) s;
-                               d += 4;
-                               s += 4;
-                               count -= 4;
-                       }
-               }
-
-               if (((((unsigned long) d) & 0x1) == 0) &&
-                   ((((unsigned long) s) & 0x1) == 0)) {
-                       while (count >= 2) {
-                               *(unsigned short *) d = *(unsigned short *) s;
-                               d += 2;
-                               s += 2;
-                               count -= 2;
-                       }
-               }
-       }
-
-       while (count--) {
-               *d++ = *s++;
-       }
-
-       return d;
-}
diff --git a/arch/sh64/lib/old-checksum.c b/arch/sh64/lib/old-checksum.c
deleted file mode 100644 (file)
index df74133..0000000
+++ /dev/null
@@ -1,17 +0,0 @@
-/*
- * FIXME: old compatibility stuff, will be removed soon.
- */
-
-#include <net/checksum.h>
-
-unsigned int csum_partial_copy( const char *src, char *dst, int len, int sum)
-{
-       int src_err=0, dst_err=0;
-
-       sum = csum_partial_copy_generic ( src, dst, len, sum, &src_err, &dst_err);
-
-       if (src_err || dst_err)
-               printk("old csum_partial_copy_fromuser(), tell mingo to convert me.\n");
-
-       return sum;
-}
diff --git a/arch/sh64/lib/page_clear.S b/arch/sh64/lib/page_clear.S
deleted file mode 100644 (file)
index 2aadd2c..0000000
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
-   Copyright 2003 Richard Curnow, SuperH (UK) Ltd.
-
-   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.
-
-   Tight version of memset for the case of just clearing a page.  It turns out
-   that having the alloco's spaced out slightly due to the increment/branch
-   pair causes them to contend less for access to the cache.  Similarly,
-   keeping the stores apart from the allocos causes less contention.  => Do two
-   separate loops.  Do multiple stores per loop to amortise the
-   increment/branch cost a little.
-
-   Parameters:
-   r2 : source effective address (start of page)
-
-   Always clears 4096 bytes.
-
-*/
-
-       .section .text..SHmedia32,"ax"
-       .little
-
-       .balign 8
-       .global sh64_page_clear
-sh64_page_clear:
-       pta/l 1f, tr1
-       pta/l 2f, tr2
-       ptabs/l r18, tr0
-
-       movi 4096, r7
-       add  r2, r7, r7
-       add  r2, r63, r6
-1:
-       alloco r6, 0
-       addi    r6, 32, r6
-       bgt/l   r7, r6, tr1
-
-       add  r2, r63, r6
-2:
-       st.q  r6,   0, r63
-       st.q  r6,   8, r63
-       st.q  r6,  16, r63
-       st.q  r6,  24, r63
-       addi r6, 32, r6
-       bgt/l r7, r6, tr2
-
-       blink tr0, r63
-
-
diff --git a/arch/sh64/lib/page_copy.S b/arch/sh64/lib/page_copy.S
deleted file mode 100644 (file)
index 804d2a0..0000000
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
-   Copyright 2003 Richard Curnow, SuperH (UK) Ltd.
-
-   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.
-
-   Tight version of mempy for the case of just copying a page.
-   Prefetch strategy empirically optimised against RTL simulations
-   of SH5-101 cut2 eval chip with Cayman board DDR memory.
-
-   Parameters:
-   r2 : source effective address (start of page)
-   r3 : destination effective address (start of page)
-
-   Always copies 4096 bytes.
-
-   Points to review.
-   * Currently the prefetch is 4 lines ahead and the alloco is 2 lines ahead.
-     It seems like the prefetch needs to be at at least 4 lines ahead to get
-     the data into the cache in time, and the allocos contend with outstanding
-     prefetches for the same cache set, so it's better to have the numbers
-     different.
-   */
-
-       .section .text..SHmedia32,"ax"
-       .little
-
-       .balign 8
-       .global sh64_page_copy
-sh64_page_copy:
-
-       /* Copy 4096 bytes worth of data from r2 to r3.
-          Do prefetches 4 lines ahead.
-          Do alloco 2 lines ahead */
-
-       pta 1f, tr1
-       pta 2f, tr2
-       pta 3f, tr3
-       ptabs r18, tr0
-
-       ld.q r2, 0x00, r63
-       ld.q r2, 0x20, r63
-       ld.q r2, 0x40, r63
-       ld.q r2, 0x60, r63
-       alloco r3, 0x00
-       alloco r3, 0x20
-
-       movi 3968, r6
-       add  r3, r6, r6
-       addi r6, 64, r7
-       addi r7, 64, r8
-       sub r2, r3, r60
-       addi r60, 8, r61
-       addi r61, 8, r62
-       addi r62, 8, r23
-       addi r60, 0x80, r22
-
-/* Minimal code size.  The extra branches inside the loop don't cost much
-   because they overlap with the time spent waiting for prefetches to
-   complete. */
-1:
-       bge/u r3, r6, tr2  ! skip prefetch for last 4 lines
-       ldx.q r3, r22, r63 ! prefetch 4 lines hence
-2:
-       bge/u r3, r7, tr3  ! skip alloco for last 2 lines
-       alloco r3, 0x40    ! alloc destination line 2 lines ahead
-3:
-       ldx.q r3, r60, r36
-       ldx.q r3, r61, r37
-       ldx.q r3, r62, r38
-       ldx.q r3, r23, r39
-       st.q  r3,   0, r36
-       st.q  r3,   8, r37
-       st.q  r3,  16, r38
-       st.q  r3,  24, r39
-       addi r3, 32, r3
-       bgt/l r8, r3, tr1
-
-       blink tr0, r63     ! return
-
-
diff --git a/arch/sh64/lib/panic.c b/arch/sh64/lib/panic.c
deleted file mode 100644 (file)
index c9eb1cb..0000000
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * Copyright (C) 2003  Richard Curnow, SuperH UK Limited
- *
- * 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 <asm/io.h>
-#include <asm/registers.h>
-
-/* THIS IS A PHYSICAL ADDRESS */
-#define HDSP2534_ADDR (0x04002100)
-
-#ifdef CONFIG_SH_CAYMAN
-
-static void poor_mans_delay(void)
-{
-       int i;
-       for (i = 0; i < 2500000; i++) {
-       }               /* poor man's delay */
-}
-
-static void show_value(unsigned long x)
-{
-       int i;
-       unsigned nibble;
-       for (i = 0; i < 8; i++) {
-               nibble = ((x >> (i * 4)) & 0xf);
-
-               ctrl_outb(nibble + ((nibble > 9) ? 55 : 48),
-                         HDSP2534_ADDR + 0xe0 + ((7 - i) << 2));
-       }
-}
-
-#endif
-
-void
-panic_handler(unsigned long panicPC, unsigned long panicSSR,
-             unsigned long panicEXPEVT)
-{
-#ifdef CONFIG_SH_CAYMAN
-       while (1) {
-               /* This piece of code displays the PC on the LED display */
-               show_value(panicPC);
-               poor_mans_delay();
-               show_value(panicSSR);
-               poor_mans_delay();
-               show_value(panicEXPEVT);
-               poor_mans_delay();
-       }
-#endif
-
-       /* Never return from the panic handler */
-       for (;;) ;
-
-}
diff --git a/arch/sh64/lib/udelay.c b/arch/sh64/lib/udelay.c
deleted file mode 100644 (file)
index dad2f25..0000000
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * arch/sh64/lib/udelay.c
- *
- * Delay routines, using a pre-computed "loops_per_jiffy" value.
- *
- * Copyright (C) 2000, 2001  Paolo Alberelli
- * Copyright (C) 2003, 2004  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/config.h>
-#include <linux/sched.h>
-#include <asm/param.h>
-
-extern unsigned long loops_per_jiffy;
-
-/*
- * Use only for very small delays (< 1 msec).
- *
- * The active part of our cycle counter is only 32-bits wide, and
- * we're treating the difference between two marks as signed.  On
- * a 1GHz box, that's about 2 seconds.
- */
-
-void __delay(int loops)
-{
-       long long dummy;
-       __asm__ __volatile__("gettr     tr0, %1\n\t"
-                            "pta       $+4, tr0\n\t"
-                            "addi      %0, -1, %0\n\t"
-                            "bne       %0, r63, tr0\n\t"
-                            "ptabs     %1, tr0\n\t":"=r"(loops),
-                            "=r"(dummy)
-                            :"0"(loops));
-}
-
-void __udelay(unsigned long long usecs, unsigned long lpj)
-{
-       usecs *= (((unsigned long long) HZ << 32) / 1000000) * lpj;
-       __delay((long long) usecs >> 32);
-}
-
-void __ndelay(unsigned long long nsecs, unsigned long lpj)
-{
-       nsecs *= (((unsigned long long) HZ << 32) / 1000000000) * lpj;
-       __delay((long long) nsecs >> 32);
-}
-
-void udelay(unsigned long usecs)
-{
-       __udelay(usecs, loops_per_jiffy);
-}
-
-void ndelay(unsigned long nsecs)
-{
-       __ndelay(nsecs, loops_per_jiffy);
-}
-
diff --git a/arch/sh64/mach-cayman/Makefile b/arch/sh64/mach-cayman/Makefile
deleted file mode 100644 (file)
index 4a48b53..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
-#
-# Makefile for the Hitachi Cayman specific parts of the kernel
-#
-# Note! Dependencies are done automagically by 'make dep', which also
-# removes any old dependencies. DON'T put your own dependencies here
-# unless it's something special (ie not a .c file).
-#
-
-obj-y := setup.o irq.o
-obj-$(CONFIG_HEARTBEAT)        += led.o
-
diff --git a/arch/sh64/mach-cayman/irq.c b/arch/sh64/mach-cayman/irq.c
deleted file mode 100644 (file)
index 4de9107..0000000
+++ /dev/null
@@ -1,196 +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.
- *
- * arch/sh64/kernel/irq_cayman.c
- *
- * SH-5 Cayman Interrupt Support
- *
- * This file handles the board specific parts of the Cayman interrupt system
- *
- * Copyright (C) 2002 Stuart Menefy
- */
-
-#include <linux/config.h>
-#include <asm/irq.h>
-#include <asm/page.h>
-#include <asm/io.h>
-#include <linux/irq.h>
-#include <linux/interrupt.h>
-#include <linux/signal.h>
-#include <asm/cayman.h>
-
-unsigned long epld_virt;
-
-#define EPLD_BASE        0x04002000
-#define EPLD_STATUS_BASE (epld_virt + 0x10)
-#define EPLD_MASK_BASE   (epld_virt + 0x20)
-
-/* Note the SMSC SuperIO chip and SMSC LAN chip interrupts are all muxed onto
-   the same SH-5 interrupt */
-
-static irqreturn_t cayman_interrupt_smsc(int irq, void *dev_id, struct pt_regs *regs)
-{
-        printk(KERN_INFO "CAYMAN: spurious SMSC interrupt\n");
-       return IRQ_NONE;
-}
-
-static irqreturn_t cayman_interrupt_pci2(int irq, void *dev_id, struct pt_regs *regs)
-{
-        printk(KERN_INFO "CAYMAN: spurious PCI interrupt, IRQ %d\n", irq);
-       return IRQ_NONE;
-}
-
-static struct irqaction cayman_action_smsc = {
-       .name           = "Cayman SMSC Mux",
-       .handler        = cayman_interrupt_smsc,
-       .flags          = SA_INTERRUPT,
-};
-
-static struct irqaction cayman_action_pci2 = {
-       .name           = "Cayman PCI2 Mux",
-       .handler        = cayman_interrupt_pci2,
-       .flags          = SA_INTERRUPT,
-};
-
-static void enable_cayman_irq(unsigned int irq)
-{
-       unsigned long flags;
-       unsigned long mask;
-       unsigned int reg;
-       unsigned char bit;
-
-       irq -= START_EXT_IRQS;
-       reg = EPLD_MASK_BASE + ((irq / 8) << 2);
-       bit = 1<<(irq % 8);
-       save_and_cli(flags);
-       mask = ctrl_inl(reg);
-       mask |= bit;
-       ctrl_outl(mask, reg);
-       restore_flags(flags);
-}
-
-void disable_cayman_irq(unsigned int irq)
-{
-       unsigned long flags;
-       unsigned long mask;
-       unsigned int reg;
-       unsigned char bit;
-
-       irq -= START_EXT_IRQS;
-       reg = EPLD_MASK_BASE + ((irq / 8) << 2);
-       bit = 1<<(irq % 8);
-       save_and_cli(flags);
-       mask = ctrl_inl(reg);
-       mask &= ~bit;
-       ctrl_outl(mask, reg);
-       restore_flags(flags);
-}
-
-static void ack_cayman_irq(unsigned int irq)
-{
-       disable_cayman_irq(irq);
-}
-
-static void end_cayman_irq(unsigned int irq)
-{
-       if (!(irq_desc[irq].status & (IRQ_DISABLED|IRQ_INPROGRESS)))
-               enable_cayman_irq(irq);
-}
-
-static unsigned int startup_cayman_irq(unsigned int irq)
-{
-       enable_cayman_irq(irq);
-       return 0; /* never anything pending */
-}
-
-static void shutdown_cayman_irq(unsigned int irq)
-{
-       disable_cayman_irq(irq);
-}
-
-struct hw_interrupt_type cayman_irq_type = {
-       .typename       = "Cayman-IRQ",
-       .startup        = startup_cayman_irq,
-       .shutdown       = shutdown_cayman_irq,
-       .enable         = enable_cayman_irq,
-       .disable        = disable_cayman_irq,
-       .ack            = ack_cayman_irq,
-       .end            = end_cayman_irq,
-};
-
-int cayman_irq_demux(int evt)
-{
-       int irq = intc_evt_to_irq[evt];
-
-       if (irq == SMSC_IRQ) {
-               unsigned long status;
-               int i;
-
-               status = ctrl_inl(EPLD_STATUS_BASE) &
-                        ctrl_inl(EPLD_MASK_BASE) & 0xff;
-               if (status == 0) {
-                       irq = -1;
-               } else {
-                       for (i=0; i<8; i++) {
-                               if (status & (1<<i))
-                                       break;
-                       }
-                       irq = START_EXT_IRQS + i;
-               }
-       }
-
-       if (irq == PCI2_IRQ) {
-               unsigned long status;
-               int i;
-
-               status = ctrl_inl(EPLD_STATUS_BASE + 3 * sizeof(u32)) &
-                        ctrl_inl(EPLD_MASK_BASE + 3 * sizeof(u32)) & 0xff;
-               if (status == 0) {
-                       irq = -1;
-               } else {
-                       for (i=0; i<8; i++) {
-                               if (status & (1<<i))
-                                       break;
-                       }
-                       irq = START_EXT_IRQS + (3 * 8) + i;
-               }
-       }
-
-       return irq;
-}
-
-#if defined(CONFIG_PROC_FS) && defined(CONFIG_SYSCTL)
-int cayman_irq_describe(char* p, int irq)
-{
-       if (irq < NR_INTC_IRQS) {
-               return intc_irq_describe(p, irq);
-       } else if (irq < NR_INTC_IRQS + 8) {
-               return sprintf(p, "(SMSC %d)", irq - NR_INTC_IRQS);
-       } else if ((irq >= NR_INTC_IRQS + 24) && (irq < NR_INTC_IRQS + 32)) {
-               return sprintf(p, "(PCI2 %d)", irq - (NR_INTC_IRQS + 24));
-       }
-
-       return 0;
-}
-#endif
-
-void init_cayman_irq(void)
-{
-       int i;
-
-       epld_virt = onchip_remap(EPLD_BASE, 1024, "EPLD");
-       if (!epld_virt) {
-               printk(KERN_ERR "Cayman IRQ: Unable to remap EPLD\n");
-               return;
-       }
-
-       for (i=0; i<NR_EXT_IRQS; i++) {
-               irq_desc[START_EXT_IRQS + i].handler = &cayman_irq_type;
-       }
-
-       /* Setup the SMSC interrupt */
-       setup_irq(SMSC_IRQ, &cayman_action_smsc);
-       setup_irq(PCI2_IRQ, &cayman_action_pci2);
-}
diff --git a/arch/sh64/mach-cayman/led.c b/arch/sh64/mach-cayman/led.c
deleted file mode 100644 (file)
index 8b3cc4c..0000000
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * arch/sh64/kernel/led_cayman.c
- *
- * Copyright (C) 2002 Stuart Menefy <stuart.menefy@st.com>
- *
- * May be copied or modified under the terms of the GNU General Public
- * License.  See linux/COPYING for more information.
- *
- * Flash the LEDs
- */
-#include <asm/io.h>
-
-/*
-** It is supposed these functions to be used for a low level
-** debugging (via Cayman LEDs), hence to be available as soon
-** as possible.
-** Unfortunately Cayman LEDs relies on Cayman EPLD to be mapped
-** (this happen when IRQ are initialized... quite late).
-** These triky dependencies should be removed. Temporary, it
-** may be enough to NOP until EPLD is mapped.
-*/
-
-extern unsigned long epld_virt;
-
-#define LED_ADDR      (epld_virt + 0x008)
-#define HDSP2534_ADDR (epld_virt + 0x100)
-
-void mach_led(int position, int value)
-{
-       if (!epld_virt)
-               return;
-
-       if (value)
-               ctrl_outl(0, LED_ADDR);
-       else
-               ctrl_outl(1, LED_ADDR);
-
-}
-
-void mach_alphanum(int position, unsigned char value)
-{
-       if (!epld_virt)
-               return;
-
-       ctrl_outb(value, HDSP2534_ADDR + 0xe0 + (position << 2));
-}
-
-void mach_alphanum_brightness(int setting)
-{
-       ctrl_outb(setting & 7, HDSP2534_ADDR + 0xc0);
-}
diff --git a/arch/sh64/mach-cayman/setup.c b/arch/sh64/mach-cayman/setup.c
deleted file mode 100644 (file)
index 53dfd60..0000000
+++ /dev/null
@@ -1,209 +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.
- *
- * arch/sh64/mach-cayman/setup.c
- *
- * SH5 Cayman support
- *
- * This file handles the architecture-dependent parts of initialization
- *
- * Copyright David J. Mckay.
- * Needs major work!
- *
- * benedict.gaster@superh.com:  3rd May 2002
- *    Added support for ramdisk, removing statically linked romfs at the same time.
- *
- * lethal@linux-sh.org:          15th May 2003
- *    Use the generic procfs cpuinfo interface, just return a valid board name.
- */
-
-#include <linux/stddef.h>
-#include <linux/init.h>
-#include <linux/config.h>
-#include <linux/mm.h>
-#include <linux/bootmem.h>
-#include <linux/delay.h>
-#include <linux/kernel.h>
-#include <linux/seq_file.h>
-#include <asm/processor.h>
-#include <asm/platform.h>
-#include <asm/io.h>
-#include <asm/irq.h>
-#include <asm/page.h>
-
-#define RES_COUNT(res) ((sizeof((res))/sizeof(struct resource)))
-
-/*
- * Platform Dependent Interrupt Priorities.
- */
-
-/* Using defaults defined in irq.h */
-#define        RES NO_PRIORITY         /* Disabled */
-#define IR0 IRL0_PRIORITY      /* IRLs */
-#define IR1 IRL1_PRIORITY
-#define IR2 IRL2_PRIORITY
-#define IR3 IRL3_PRIORITY
-#define PCA INTA_PRIORITY      /* PCI Ints */
-#define PCB INTB_PRIORITY
-#define PCC INTC_PRIORITY
-#define PCD INTD_PRIORITY
-#define SER TOP_PRIORITY
-#define ERR TOP_PRIORITY
-#define PW0 TOP_PRIORITY
-#define PW1 TOP_PRIORITY
-#define PW2 TOP_PRIORITY
-#define PW3 TOP_PRIORITY
-#define DM0 NO_PRIORITY                /* DMA Ints */
-#define DM1 NO_PRIORITY
-#define DM2 NO_PRIORITY
-#define DM3 NO_PRIORITY
-#define DAE NO_PRIORITY
-#define TU0 TIMER_PRIORITY     /* TMU Ints */
-#define TU1 NO_PRIORITY
-#define TU2 NO_PRIORITY
-#define TI2 NO_PRIORITY
-#define ATI NO_PRIORITY                /* RTC Ints */
-#define PRI NO_PRIORITY
-#define CUI RTC_PRIORITY
-#define ERI SCIF_PRIORITY      /* SCIF Ints */
-#define RXI SCIF_PRIORITY
-#define BRI SCIF_PRIORITY
-#define TXI SCIF_PRIORITY
-#define ITI TOP_PRIORITY       /* WDT Ints */
-
-/* Setup for the SMSC FDC37C935 */
-#define SMSC_SUPERIO_BASE      0x04000000
-#define SMSC_CONFIG_PORT_ADDR  0x3f0
-#define SMSC_INDEX_PORT_ADDR   SMSC_CONFIG_PORT_ADDR
-#define SMSC_DATA_PORT_ADDR    0x3f1
-
-#define SMSC_ENTER_CONFIG_KEY  0x55
-#define SMSC_EXIT_CONFIG_KEY   0xaa
-
-#define SMCS_LOGICAL_DEV_INDEX 0x07
-#define SMSC_DEVICE_ID_INDEX   0x20
-#define SMSC_DEVICE_REV_INDEX  0x21
-#define SMSC_ACTIVATE_INDEX    0x30
-#define SMSC_PRIMARY_INT_INDEX 0x70
-#define SMSC_SECONDARY_INT_INDEX 0x72
-
-#define SMSC_KEYBOARD_DEVICE 7
-
-#define SMSC_SUPERIO_READ_INDEXED(index) ({ \
-       outb((index), SMSC_INDEX_PORT_ADDR); \
-       inb(SMSC_DATA_PORT_ADDR); })
-#define SMSC_SUPERIO_WRITE_INDEXED(val, index) ({ \
-       outb((index), SMSC_INDEX_PORT_ADDR); \
-       outb((val),   SMSC_DATA_PORT_ADDR); })
-
-unsigned long smsc_superio_virt;
-
-/*
- * Platform dependent structures: maps and parms block.
- */
-struct resource io_resources[] = {
-       /* To be updated with external devices */
-};
-
-struct resource kram_resources[] = {
-       { "Kernel code", 0, 0 },        /* These must be last in the array */
-       { "Kernel data", 0, 0 }         /* These must be last in the array */
-};
-
-struct resource xram_resources[] = {
-       /* To be updated with external devices */
-};
-
-struct resource rom_resources[] = {
-       /* To be updated with external devices */
-};
-
-struct sh64_platform platform_parms = {
-       .readonly_rootfs =      1,
-       .initial_root_dev =     0x0100,
-       .loader_type =          1,
-       .io_res_p =             io_resources,
-       .io_res_count =         RES_COUNT(io_resources),
-       .kram_res_p =           kram_resources,
-       .kram_res_count =       RES_COUNT(kram_resources),
-       .xram_res_p =           xram_resources,
-       .xram_res_count =       RES_COUNT(xram_resources),
-       .rom_res_p =            rom_resources,
-       .rom_res_count =        RES_COUNT(rom_resources),
-};
-
-int platform_int_priority[NR_INTC_IRQS] = {
-       IR0, IR1, IR2, IR3, PCA, PCB, PCC, PCD, /* IRQ  0- 7 */
-       RES, RES, RES, RES, SER, ERR, PW3, PW2, /* IRQ  8-15 */
-       PW1, PW0, DM0, DM1, DM2, DM3, DAE, RES, /* IRQ 16-23 */
-       RES, RES, RES, RES, RES, RES, RES, RES, /* IRQ 24-31 */
-       TU0, TU1, TU2, TI2, ATI, PRI, CUI, ERI, /* IRQ 32-39 */
-       RXI, BRI, TXI, RES, RES, RES, RES, RES, /* IRQ 40-47 */
-       RES, RES, RES, RES, RES, RES, RES, RES, /* IRQ 48-55 */
-       RES, RES, RES, RES, RES, RES, RES, ITI, /* IRQ 56-63 */
-};
-
-static int __init smsc_superio_setup(void)
-{
-       unsigned char devid, devrev;
-
-       smsc_superio_virt = onchip_remap(SMSC_SUPERIO_BASE, 1024, "SMSC SuperIO");
-       if (!smsc_superio_virt) {
-               panic("Unable to remap SMSC SuperIO\n");
-       }
-
-       /* Initially the chip is in run state */
-       /* Put it into configuration state */
-       outb(SMSC_ENTER_CONFIG_KEY, SMSC_CONFIG_PORT_ADDR);
-       outb(SMSC_ENTER_CONFIG_KEY, SMSC_CONFIG_PORT_ADDR);
-
-       /* Read device ID info */
-       devid = SMSC_SUPERIO_READ_INDEXED(SMSC_DEVICE_ID_INDEX);
-       devrev = SMSC_SUPERIO_READ_INDEXED(SMSC_DEVICE_REV_INDEX);
-       printk("SMSC SuperIO devid %02x rev %02x\n", devid, devrev);
-
-       /* Select the keyboard device */
-       SMSC_SUPERIO_WRITE_INDEXED(SMSC_KEYBOARD_DEVICE, SMCS_LOGICAL_DEV_INDEX);
-
-       /* enable it */
-       SMSC_SUPERIO_WRITE_INDEXED(1, SMSC_ACTIVATE_INDEX);
-
-       /* Select the interrupts */
-       /* On a PC keyboard is IRQ1, mouse is IRQ12 */
-       SMSC_SUPERIO_WRITE_INDEXED(1, SMSC_PRIMARY_INT_INDEX);
-       SMSC_SUPERIO_WRITE_INDEXED(12, SMSC_SECONDARY_INT_INDEX);
-
-       /* Exit the configuraton state */
-       outb(SMSC_EXIT_CONFIG_KEY, SMSC_CONFIG_PORT_ADDR);
-
-       return 0;
-}
-
-/* This is grotty, but, because kernel is always referenced on the link line
- * before any devices, this is safe.
- */
-__initcall(smsc_superio_setup);
-
-void __init platform_setup(void)
-{
-       /* Cayman platform leaves the decision to head.S, for now */
-       platform_parms.fpu_flags = fpu_in_use;
-}
-
-void __init platform_monitor(void)
-{
-       /* Nothing yet .. */
-}
-
-void __init platform_reserve(void)
-{
-       /* Nothing yet .. */
-}
-
-const char *get_system_type(void)
-{
-       return "Hitachi Cayman";
-}
-
diff --git a/arch/sh64/mach-harp/Makefile b/arch/sh64/mach-harp/Makefile
deleted file mode 100644 (file)
index 63f065b..0000000
+++ /dev/null
@@ -1,14 +0,0 @@
-#
-# Makefile for the ST50 Harp specific parts of the kernel
-#
-# Note! Dependencies are done automagically by 'make dep', which also
-# removes any old dependencies. DON'T put your own dependencies here
-# unless it's something special (ie not a .c file).
-#
-
-O_TARGET := harp.o
-
-obj-y := setup.o
-
-include $(TOPDIR)/Rules.make
-
diff --git a/arch/sh64/mach-harp/setup.c b/arch/sh64/mach-harp/setup.c
deleted file mode 100644 (file)
index 3938a65..0000000
+++ /dev/null
@@ -1,139 +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.
- *
- * arch/sh64/mach-harp/setup.c
- *
- * SH-5 Simulator Platform Support
- *
- * This file handles the architecture-dependent parts of initialization
- *
- * Copyright (C) 2000, 2001  Paolo Alberelli
- *
- * benedict.gaster@superh.com:  3rd May 2002
- *    Added support for ramdisk, removing statically linked romfs at the same time. *
- *
- * lethal@linux-sh.org:          15th May 2003
- *    Use the generic procfs cpuinfo interface, just return a valid board name.
- */
-
-#include <linux/stddef.h>
-#include <linux/init.h>
-#include <linux/config.h>
-#include <linux/mm.h>
-#include <linux/bootmem.h>
-#include <linux/delay.h>
-#include <linux/kernel.h>
-#include <asm/processor.h>
-#include <asm/platform.h>
-#include <asm/io.h>
-#include <asm/irq.h>
-#include <asm/page.h>
-
-#define RES_COUNT(res) ((sizeof((res))/sizeof(struct resource)))
-
-/*
- * Platform Dependent Interrupt Priorities.
- */
-
-/* Using defaults defined in irq.h */
-#define        RES NO_PRIORITY         /* Disabled */
-#define IR0 IRL0_PRIORITY      /* IRLs */
-#define IR1 IRL1_PRIORITY
-#define IR2 IRL2_PRIORITY
-#define IR3 IRL3_PRIORITY
-#define PCA INTA_PRIORITY      /* PCI Ints */
-#define PCB INTB_PRIORITY
-#define PCC INTC_PRIORITY
-#define PCD INTD_PRIORITY
-#define SER TOP_PRIORITY
-#define ERR TOP_PRIORITY
-#define PW0 TOP_PRIORITY
-#define PW1 TOP_PRIORITY
-#define PW2 TOP_PRIORITY
-#define PW3 TOP_PRIORITY
-#define DM0 NO_PRIORITY                /* DMA Ints */
-#define DM1 NO_PRIORITY
-#define DM2 NO_PRIORITY
-#define DM3 NO_PRIORITY
-#define DAE NO_PRIORITY
-#define TU0 TIMER_PRIORITY     /* TMU Ints */
-#define TU1 NO_PRIORITY
-#define TU2 NO_PRIORITY
-#define TI2 NO_PRIORITY
-#define ATI NO_PRIORITY                /* RTC Ints */
-#define PRI NO_PRIORITY
-#define CUI RTC_PRIORITY
-#define ERI SCIF_PRIORITY      /* SCIF Ints */
-#define RXI SCIF_PRIORITY
-#define BRI SCIF_PRIORITY
-#define TXI SCIF_PRIORITY
-#define ITI TOP_PRIORITY       /* WDT Ints */
-
-/*
- * Platform dependent structures: maps and parms block.
- */
-struct resource io_resources[] = {
-       /* To be updated with external devices */
-};
-
-struct resource kram_resources[] = {
-       { "Kernel code", 0, 0 },        /* These must be last in the array */
-       { "Kernel data", 0, 0 }         /* These must be last in the array */
-};
-
-struct resource xram_resources[] = {
-       /* To be updated with external devices */
-};
-
-struct resource rom_resources[] = {
-       /* To be updated with external devices */
-};
-
-struct sh64_platform platform_parms = {
-       .readonly_rootfs =      1,
-       .initial_root_dev =     0x0100,
-       .loader_type =          1,
-       .io_res_p =             io_resources,
-       .io_res_count =         RES_COUNT(io_resources),
-       .kram_res_p =           kram_resources,
-       .kram_res_count =       RES_COUNT(kram_resources),
-       .xram_res_p =           xram_resources,
-       .xram_res_count =       RES_COUNT(xram_resources),
-       .rom_res_p =            rom_resources,
-       .rom_res_count =        RES_COUNT(rom_resources),
-};
-
-int platform_int_priority[NR_INTC_IRQS] = {
-       IR0, IR1, IR2, IR3, PCA, PCB, PCC, PCD, /* IRQ  0- 7 */
-       RES, RES, RES, RES, SER, ERR, PW3, PW2, /* IRQ  8-15 */
-       PW1, PW0, DM0, DM1, DM2, DM3, DAE, RES, /* IRQ 16-23 */
-       RES, RES, RES, RES, RES, RES, RES, RES, /* IRQ 24-31 */
-       TU0, TU1, TU2, TI2, ATI, PRI, CUI, ERI, /* IRQ 32-39 */
-       RXI, BRI, TXI, RES, RES, RES, RES, RES, /* IRQ 40-47 */
-       RES, RES, RES, RES, RES, RES, RES, RES, /* IRQ 48-55 */
-       RES, RES, RES, RES, RES, RES, RES, ITI, /* IRQ 56-63 */
-};
-
-void __init platform_setup(void)
-{
-       /* Harp platform leaves the decision to head.S, for now */
-       platform_parms.fpu_flags = fpu_in_use;
-}
-
-void __init platform_monitor(void)
-{
-       /* Nothing yet .. */
-}
-
-void __init platform_reserve(void)
-{
-       /* Nothing yet .. */
-}
-
-const char *get_system_type(void)
-{
-       return "ST50 Harp";
-}
-
diff --git a/arch/sh64/mach-romram/Makefile b/arch/sh64/mach-romram/Makefile
deleted file mode 100644 (file)
index 02d05c0..0000000
+++ /dev/null
@@ -1,14 +0,0 @@
-#
-# Makefile for the SH-5 ROM/RAM specific parts of the kernel
-#
-# Note! Dependencies are done automagically by 'make dep', which also
-# removes any old dependencies. DON'T put your own dependencies here
-# unless it's something special (ie not a .c file).
-#
-
-O_TARGET := romram.o
-
-obj-y := setup.o
-
-include $(TOPDIR)/Rules.make
-
diff --git a/arch/sh64/mach-romram/setup.c b/arch/sh64/mach-romram/setup.c
deleted file mode 100644 (file)
index a9ba03f..0000000
+++ /dev/null
@@ -1,142 +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.
- *
- * arch/sh64/mach-romram/setup.c
- *
- * SH-5 ROM/RAM Platform Support
- *
- * This file handles the architecture-dependent parts of initialization
- *
- * Copyright (C) 2000, 2001  Paolo Alberelli
- *
- * benedict.gaster@superh.com:  3rd May 2002
- *    Added support for ramdisk, removing statically linked romfs at the same time. *
- *
- * lethal@linux-sh.org:          15th May 2003
- *    Use the generic procfs cpuinfo interface, just return a valid board name.
- *
- * Sean.McGoogan@superh.com    17th Feb 2004
- *     copied from arch/sh64/mach-harp/setup.c
- */
-
-#include <linux/stddef.h>
-#include <linux/init.h>
-#include <linux/config.h>
-#include <linux/mm.h>
-#include <linux/bootmem.h>
-#include <linux/delay.h>
-#include <linux/kernel.h>
-#include <asm/processor.h>
-#include <asm/platform.h>
-#include <asm/io.h>
-#include <asm/irq.h>
-#include <asm/page.h>
-
-#define RES_COUNT(res) ((sizeof((res))/sizeof(struct resource)))
-
-/*
- * Platform Dependent Interrupt Priorities.
- */
-
-/* Using defaults defined in irq.h */
-#define        RES NO_PRIORITY         /* Disabled */
-#define IR0 IRL0_PRIORITY      /* IRLs */
-#define IR1 IRL1_PRIORITY
-#define IR2 IRL2_PRIORITY
-#define IR3 IRL3_PRIORITY
-#define PCA INTA_PRIORITY      /* PCI Ints */
-#define PCB INTB_PRIORITY
-#define PCC INTC_PRIORITY
-#define PCD INTD_PRIORITY
-#define SER TOP_PRIORITY
-#define ERR TOP_PRIORITY
-#define PW0 TOP_PRIORITY
-#define PW1 TOP_PRIORITY
-#define PW2 TOP_PRIORITY
-#define PW3 TOP_PRIORITY
-#define DM0 NO_PRIORITY                /* DMA Ints */
-#define DM1 NO_PRIORITY
-#define DM2 NO_PRIORITY
-#define DM3 NO_PRIORITY
-#define DAE NO_PRIORITY
-#define TU0 TIMER_PRIORITY     /* TMU Ints */
-#define TU1 NO_PRIORITY
-#define TU2 NO_PRIORITY
-#define TI2 NO_PRIORITY
-#define ATI NO_PRIORITY                /* RTC Ints */
-#define PRI NO_PRIORITY
-#define CUI RTC_PRIORITY
-#define ERI SCIF_PRIORITY      /* SCIF Ints */
-#define RXI SCIF_PRIORITY
-#define BRI SCIF_PRIORITY
-#define TXI SCIF_PRIORITY
-#define ITI TOP_PRIORITY       /* WDT Ints */
-
-/*
- * Platform dependent structures: maps and parms block.
- */
-struct resource io_resources[] = {
-       /* To be updated with external devices */
-};
-
-struct resource kram_resources[] = {
-       { "Kernel code", 0, 0 },        /* These must be last in the array */
-       { "Kernel data", 0, 0 }         /* These must be last in the array */
-};
-
-struct resource xram_resources[] = {
-       /* To be updated with external devices */
-};
-
-struct resource rom_resources[] = {
-       /* To be updated with external devices */
-};
-
-struct sh64_platform platform_parms = {
-       .readonly_rootfs =      1,
-       .initial_root_dev =     0x0100,
-       .loader_type =          1,
-       .io_res_p =             io_resources,
-       .io_res_count =         RES_COUNT(io_resources),
-       .kram_res_p =           kram_resources,
-       .kram_res_count =       RES_COUNT(kram_resources),
-       .xram_res_p =           xram_resources,
-       .xram_res_count =       RES_COUNT(xram_resources),
-       .rom_res_p =            rom_resources,
-       .rom_res_count =        RES_COUNT(rom_resources),
-};
-
-int platform_int_priority[NR_INTC_IRQS] = {
-       IR0, IR1, IR2, IR3, PCA, PCB, PCC, PCD, /* IRQ  0- 7 */
-       RES, RES, RES, RES, SER, ERR, PW3, PW2, /* IRQ  8-15 */
-       PW1, PW0, DM0, DM1, DM2, DM3, DAE, RES, /* IRQ 16-23 */
-       RES, RES, RES, RES, RES, RES, RES, RES, /* IRQ 24-31 */
-       TU0, TU1, TU2, TI2, ATI, PRI, CUI, ERI, /* IRQ 32-39 */
-       RXI, BRI, TXI, RES, RES, RES, RES, RES, /* IRQ 40-47 */
-       RES, RES, RES, RES, RES, RES, RES, RES, /* IRQ 48-55 */
-       RES, RES, RES, RES, RES, RES, RES, ITI, /* IRQ 56-63 */
-};
-
-void __init platform_setup(void)
-{
-       /* ROM/RAM platform leaves the decision to head.S, for now */
-       platform_parms.fpu_flags = fpu_in_use;
-}
-
-void __init platform_monitor(void)
-{
-       /* Nothing yet .. */
-}
-
-void __init platform_reserve(void)
-{
-       /* Nothing yet .. */
-}
-
-const char *get_system_type(void)
-{
-       return "ROM/RAM";
-}
-
diff --git a/arch/sh64/mach-sim/Makefile b/arch/sh64/mach-sim/Makefile
deleted file mode 100644 (file)
index 819c407..0000000
+++ /dev/null
@@ -1,14 +0,0 @@
-#
-# Makefile for the SH-5 Simulator specific parts of the kernel
-#
-# Note! Dependencies are done automagically by 'make dep', which also
-# removes any old dependencies. DON'T put your own dependencies here
-# unless it's something special (ie not a .c file).
-#
-
-O_TARGET := sim.o
-
-obj-y := setup.o
-
-include $(TOPDIR)/Rules.make
-
diff --git a/arch/sh64/mach-sim/setup.c b/arch/sh64/mach-sim/setup.c
deleted file mode 100644 (file)
index a68639c..0000000
+++ /dev/null
@@ -1,164 +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.
- *
- * arch/sh64/mach-sim/setup.c
- *
- * ST50 Simulator Platform Support
- *
- * This file handles the architecture-dependent parts of initialization
- *
- * Copyright (C) 2000, 2001  Paolo Alberelli
- *
- * lethal@linux-sh.org:          15th May 2003
- *    Use the generic procfs cpuinfo interface, just return a valid board name.
- */
-
-#include <linux/stddef.h>
-#include <linux/init.h>
-#include <linux/config.h>
-#include <linux/mm.h>
-#include <linux/bootmem.h>
-#include <linux/delay.h>
-#include <linux/kernel.h>
-#include <asm/addrspace.h>
-#include <asm/processor.h>
-#include <asm/platform.h>
-#include <asm/io.h>
-#include <asm/irq.h>
-#include <asm/page.h>
-
-#ifdef CONFIG_BLK_DEV_INITRD
-#include "../rootfs/rootfs.h"
-#endif
-
-static __init void platform_monitor(void);
-static __init void platform_setup(void);
-static __init void platform_reserve(void);
-
-
-#define        PHYS_MEMORY     CONFIG_MEMORY_SIZE_IN_MB*1024*1024
-
-#if (PHYS_MEMORY < P1SEG_FOOTPRINT_RAM)
-#error "Invalid kernel configuration. Physical memory below footprint requirements."
-#endif
-
-#define RAM_DISK_START CONFIG_MEMORY_START+P1SEG_INITRD_BLOCK  /* Top of 4MB */
-#ifdef PLATFORM_ROMFS_SIZE
-#define        RAM_DISK_SIZE   (PAGE_ALIGN(PLATFORM_ROMFS_SIZE))     /* Variable Top */
-#if ((RAM_DISK_START + RAM_DISK_SIZE) > (CONFIG_MEMORY_START + PHYS_MEMORY))
-#error "Invalid kernel configuration. ROM RootFS exceeding physical memory."
-#endif
-#else
-#define RAM_DISK_SIZE  P1SEG_INITRD_BLOCK_SIZE                 /* Top of 4MB */
-#endif
-
-#define RES_COUNT(res) ((sizeof((res))/sizeof(struct resource)))
-
-/*
- * Platform Dependent Interrupt Priorities.
- */
-
-/* Using defaults defined in irq.h */
-#define        RES NO_PRIORITY         /* Disabled */
-#define IR0 IRL0_PRIORITY      /* IRLs */
-#define IR1 IRL1_PRIORITY
-#define IR2 IRL2_PRIORITY
-#define IR3 IRL3_PRIORITY
-#define PCA INTA_PRIORITY      /* PCI Ints */
-#define PCB INTB_PRIORITY
-#define PCC INTC_PRIORITY
-#define PCD INTD_PRIORITY
-#define SER TOP_PRIORITY
-#define ERR TOP_PRIORITY
-#define PW0 TOP_PRIORITY
-#define PW1 TOP_PRIORITY
-#define PW2 TOP_PRIORITY
-#define PW3 TOP_PRIORITY
-#define DM0 NO_PRIORITY                /* DMA Ints */
-#define DM1 NO_PRIORITY
-#define DM2 NO_PRIORITY
-#define DM3 NO_PRIORITY
-#define DAE NO_PRIORITY
-#define TU0 TIMER_PRIORITY     /* TMU Ints */
-#define TU1 NO_PRIORITY
-#define TU2 NO_PRIORITY
-#define TI2 NO_PRIORITY
-#define ATI NO_PRIORITY                /* RTC Ints */
-#define PRI NO_PRIORITY
-#define CUI RTC_PRIORITY
-#define ERI SCIF_PRIORITY      /* SCIF Ints */
-#define RXI SCIF_PRIORITY
-#define BRI SCIF_PRIORITY
-#define TXI SCIF_PRIORITY
-#define ITI TOP_PRIORITY       /* WDT Ints */
-
-/*
- * Platform dependent structures: maps and parms block.
- */
-struct resource io_resources[] = {
-       /* Nothing yet .. */
-};
-
-struct resource kram_resources[] = {
-       { "Kernel code", 0, 0 },        /* These must be last in the array */
-       { "Kernel data", 0, 0 }         /* These must be last in the array */
-};
-
-struct resource xram_resources[] = {
-       /* Nothing yet .. */
-};
-
-struct resource rom_resources[] = {
-       /* Nothing yet .. */
-};
-
-struct sh64_platform platform_parms = {
-       .readonly_rootfs =      1,
-       .initial_root_dev =     0x0100,
-       .loader_type =          1,
-       .initrd_start =         RAM_DISK_START,
-       .initrd_size =          RAM_DISK_SIZE,
-       .io_res_p =             io_resources,
-       .io_res_count =         RES_COUNT(io_resources),
-       .kram_res_p =           kram_resources,
-       .kram_res_count =       RES_COUNT(kram_resources),
-       .xram_res_p =           xram_resources,
-       .xram_res_count =       RES_COUNT(xram_resources),
-       .rom_res_p =            rom_resources,
-       .rom_res_count =        RES_COUNT(rom_resources),
-};
-
-int platform_int_priority[NR_IRQS] = {
-       IR0, IR1, IR2, IR3, PCA, PCB, PCC, PCD, /* IRQ  0- 7 */
-       RES, RES, RES, RES, SER, ERR, PW3, PW2, /* IRQ  8-15 */
-       PW1, PW0, DM0, DM1, DM2, DM3, DAE, RES, /* IRQ 16-23 */
-       RES, RES, RES, RES, RES, RES, RES, RES, /* IRQ 24-31 */
-       TU0, TU1, TU2, TI2, ATI, PRI, CUI, ERI, /* IRQ 32-39 */
-       RXI, BRI, TXI, RES, RES, RES, RES, RES, /* IRQ 40-47 */
-       RES, RES, RES, RES, RES, RES, RES, RES, /* IRQ 48-55 */
-       RES, RES, RES, RES, RES, RES, RES, ITI, /* IRQ 56-63 */
-};
-
-void __init platform_setup(void)
-{
-       /* Simulator platform leaves the decision to head.S */
-       platform_parms.fpu_flags = fpu_in_use;
-}
-
-void __init platform_monitor(void)
-{
-       /* Nothing yet .. */
-}
-
-void __init platform_reserve(void)
-{
-       /* Nothing yet .. */
-}
-
-const char *get_system_type(void)
-{
-       return "SH-5 Simulator";
-}
-
diff --git a/arch/sh64/mm/Makefile b/arch/sh64/mm/Makefile
deleted file mode 100644 (file)
index ff19378..0000000
+++ /dev/null
@@ -1,44 +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, 2001  Paolo Alberelli
-# Copyright (C) 2003, 2004  Paul Mundt
-#
-# Makefile for the sh64-specific parts of the Linux memory manager.
-#
-# Note! Dependencies are done automagically by 'make dep', which also
-# removes any old dependencies. DON'T put your own dependencies here
-# unless it's something special (ie not a .c file).
-#
-
-obj-y := init.o fault.o ioremap.o extable.o cache.o tlbmiss.o tlb.o
-
-obj-$(CONFIG_HUGETLB_PAGE)     += hugetlbpage.o
-
-# Special flags for tlbmiss.o.  This puts restrictions on the number of
-# caller-save registers that the compiler can target when building this file.
-# This is required because the code is called from a context in entry.S where
-# very few registers have been saved in the exception handler (for speed
-# reasons).
-# The caller save registers that have been saved and which can be used are
-# r2,r3,r4,r5 : argument passing
-# r15, r18 : SP and LINK
-# tr0-4 : allow all caller-save TR's.  The compiler seems to be able to make
-#         use of them, so it's probably beneficial to performance to save them
-#         and have them available for it.
-#
-# The resources not listed below are callee save, i.e. the compiler is free to
-# use any of them and will spill them to the stack itself.
-
-CFLAGS_tlbmiss.o += -ffixed-r7 \
-       -ffixed-r8 -ffixed-r9 -ffixed-r10 -ffixed-r11 -ffixed-r12 \
-       -ffixed-r13 -ffixed-r14 -ffixed-r16 -ffixed-r17 -ffixed-r19 \
-       -ffixed-r20 -ffixed-r21 -ffixed-r22 -ffixed-r23 \
-       -ffixed-r24 -ffixed-r25 -ffixed-r26 -ffixed-r27 \
-       -ffixed-r36 -ffixed-r37 -ffixed-r38 -ffixed-r39 -ffixed-r40 \
-       -ffixed-r41 -ffixed-r42 -ffixed-r43  \
-       -ffixed-r60 -ffixed-r61 -ffixed-r62 \
-       -fomit-frame-pointer
-
diff --git a/arch/sh64/mm/cache.c b/arch/sh64/mm/cache.c
deleted file mode 100644 (file)
index 56fbbff..0000000
+++ /dev/null
@@ -1,1055 +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.
- *
- * arch/sh64/mm/cache.c
- *
- * Original version Copyright (C) 2000, 2001  Paolo Alberelli
- * Second version Copyright (C) benedict.gaster@superh.com 2002
- * Third version Copyright Richard.Curnow@superh.com 2003
- * Hacks to third version Copyright (C) 2003 Paul Mundt
- */
-
-/****************************************************************************/
-
-#include <linux/config.h>
-#include <linux/init.h>
-#include <linux/mman.h>
-#include <linux/mm.h>
-#include <linux/threads.h>
-#include <asm/page.h>
-#include <asm/pgtable.h>
-#include <asm/processor.h>
-#include <asm/cache.h>
-#include <asm/tlb.h>
-#include <asm/io.h>
-#include <asm/uaccess.h>
-#include <asm/mmu_context.h>
-#include <asm/pgalloc.h> /* for flush_itlb_range */
-
-#include <linux/proc_fs.h>
-
-/* This function is in entry.S */
-extern unsigned long switch_and_save_asid(unsigned long new_asid);
-
-/* Wired TLB entry for the D-cache */
-static unsigned long long dtlb_cache_slot;
-
-/**
- * sh64_cache_init()
- *
- * This is pretty much just a straightforward clone of the SH
- * detect_cpu_and_cache_system().
- *
- * This function is responsible for setting up all of the cache
- * info dynamically as well as taking care of CPU probing and
- * setting up the relevant subtype data.
- *
- * FIXME: For the time being, we only really support the SH5-101
- * out of the box, and don't support dynamic probing for things
- * like the SH5-103 or even cut2 of the SH5-101. Implement this
- * later!
- */
-int __init sh64_cache_init(void)
-{
-       /*
-        * First, setup some sane values for the I-cache.
-        */
-       cpu_data->icache.ways           = 4;
-       cpu_data->icache.sets           = 256;
-       cpu_data->icache.linesz         = L1_CACHE_BYTES;
-
-       /*
-        * FIXME: This can probably be cleaned up a bit as well.. for example,
-        * do we really need the way shift _and_ the way_step_shift ?? Judging
-        * by the existing code, I would guess no.. is there any valid reason
-        * why we need to be tracking this around?
-        */
-       cpu_data->icache.way_shift      = 13;
-       cpu_data->icache.entry_shift    = 5;
-       cpu_data->icache.set_shift      = 4;
-       cpu_data->icache.way_step_shift = 16;
-       cpu_data->icache.asid_shift     = 2;
-
-       /*
-        * way offset = cache size / associativity, so just don't factor in
-        * associativity in the first place..
-        */
-       cpu_data->icache.way_ofs        = cpu_data->icache.sets *
-                                         cpu_data->icache.linesz;
-
-       cpu_data->icache.asid_mask      = 0x3fc;
-       cpu_data->icache.idx_mask       = 0x1fe0;
-       cpu_data->icache.epn_mask       = 0xffffe000;
-       cpu_data->icache.flags          = 0;
-
-       /*
-        * Next, setup some sane values for the D-cache.
-        *
-        * On the SH5, these are pretty consistent with the I-cache settings,
-        * so we just copy over the existing definitions.. these can be fixed
-        * up later, especially if we add runtime CPU probing.
-        *
-        * Though in the meantime it saves us from having to duplicate all of
-        * the above definitions..
-        */
-       cpu_data->dcache                = cpu_data->icache;
-
-       /*
-        * Setup any cache-related flags here
-        */
-#if defined(CONFIG_DCACHE_WRITE_THROUGH)
-       set_bit(SH_CACHE_MODE_WT, &(cpu_data->dcache.flags));
-#elif defined(CONFIG_DCACHE_WRITE_BACK)
-       set_bit(SH_CACHE_MODE_WB, &(cpu_data->dcache.flags));
-#endif
-
-       /*
-        * We also need to reserve a slot for the D-cache in the DTLB, so we
-        * do this now ..
-        */
-       dtlb_cache_slot                 = sh64_get_wired_dtlb_entry();
-
-       return 0;
-}
-
-/*##########################################################################*/
-
-/* From here onwards, a rewrite of the implementation,
-   by Richard.Curnow@superh.com.
-
-   The major changes in this compared to the old version are;
-   1. use more selective purging through OCBP instead of using ALLOCO to purge
-      by natural replacement.  This avoids purging out unrelated cache lines
-      that happen to be in the same set.
-   2. exploit the APIs copy_user_page and clear_user_page better
-   3. be more selective about I-cache purging, in particular use invalidate_all
-      more sparingly.
-
-   */
-
-/*##########################################################################
-                              SUPPORT FUNCTIONS
-  ##########################################################################*/
-
-/****************************************************************************/
-/* The following group of functions deal with mapping and unmapping a temporary
-   page into the DTLB slot that have been set aside for our exclusive use. */
-/* In order to accomplish this, we use the generic interface for adding and
-   removing a wired slot entry as defined in arch/sh64/mm/tlb.c */
-/****************************************************************************/
-
-static unsigned long slot_own_flags;
-
-static inline void sh64_setup_dtlb_cache_slot(unsigned long eaddr, unsigned long asid, unsigned long paddr)
-{
-       local_irq_save(slot_own_flags);
-       sh64_setup_tlb_slot(dtlb_cache_slot, eaddr, asid, paddr);
-}
-
-static inline void sh64_teardown_dtlb_cache_slot(void)
-{
-       sh64_teardown_tlb_slot(dtlb_cache_slot);
-       local_irq_restore(slot_own_flags);
-}
-
-/****************************************************************************/
-
-#ifndef CONFIG_ICACHE_DISABLED
-
-static void __inline__ sh64_icache_inv_all(void)
-{
-       unsigned long long addr, flag, data;
-       unsigned int flags;
-
-       addr=ICCR0;
-       flag=ICCR0_ICI;
-       data=0;
-
-       /* Make this a critical section for safety (probably not strictly necessary.) */
-       local_irq_save(flags);
-
-       /* Without %1 it gets unexplicably wrong */
-       asm volatile("getcfg    %3, 0, %0\n\t"
-                       "or     %0, %2, %0\n\t"
-                       "putcfg %3, 0, %0\n\t"
-                       "synci"
-                       : "=&r" (data)
-                       : "0" (data), "r" (flag), "r" (addr));
-
-       local_irq_restore(flags);
-}
-
-static void sh64_icache_inv_kernel_range(unsigned long start, unsigned long end)
-{
-       /* Invalidate range of addresses [start,end] from the I-cache, where
-        * the addresses lie in the kernel superpage. */
-
-       unsigned long long ullend, addr, aligned_start;
-#if (NEFF == 32)
-       aligned_start = (unsigned long long)(signed long long)(signed long) start;
-#else
-#error "NEFF != 32"
-#endif
-       aligned_start &= L1_CACHE_ALIGN_MASK;
-       addr = aligned_start;
-#if (NEFF == 32)
-       ullend = (unsigned long long) (signed long long) (signed long) end;
-#else
-#error "NEFF != 32"
-#endif
-       while (addr <= ullend) {
-               asm __volatile__ ("icbi %0, 0" : : "r" (addr));
-               addr += L1_CACHE_BYTES;
-       }
-}
-
-static void sh64_icache_inv_user_page(struct vm_area_struct *vma, unsigned long eaddr)
-{
-       /* If we get called, we know that vma->vm_flags contains VM_EXEC.
-          Also, eaddr is page-aligned. */
-
-       unsigned long long addr, end_addr;
-       unsigned long flags = 0;
-       unsigned long running_asid, vma_asid;
-       addr = eaddr;
-       end_addr = addr + PAGE_SIZE;
-
-       /* Check whether we can use the current ASID for the I-cache
-          invalidation.  For example, if we're called via
-          access_process_vm->flush_cache_page->here, (e.g. when reading from
-          /proc), 'running_asid' will be that of the reader, not of the
-          victim.
-
-          Also, note the risk that we might get pre-empted between the ASID
-          compare and blocking IRQs, and before we regain control, the
-          pid->ASID mapping changes.  However, the whole cache will get
-          invalidated when the mapping is renewed, so the worst that can
-          happen is that the loop below ends up invalidating somebody else's
-          cache entries.
-       */
-
-       running_asid = get_asid();
-       vma_asid = (vma->vm_mm->context & MMU_CONTEXT_ASID_MASK);
-       if (running_asid != vma_asid) {
-               local_irq_save(flags);
-               switch_and_save_asid(vma_asid);
-       }
-       while (addr < end_addr) {
-               /* Worth unrolling a little */
-               asm __volatile__("icbi %0,  0" : : "r" (addr));
-               asm __volatile__("icbi %0, 32" : : "r" (addr));
-               asm __volatile__("icbi %0, 64" : : "r" (addr));
-               asm __volatile__("icbi %0, 96" : : "r" (addr));
-               addr += 128;
-       }
-       if (running_asid != vma_asid) {
-               switch_and_save_asid(running_asid);
-               local_irq_restore(flags);
-       }
-}
-
-/****************************************************************************/
-
-static void sh64_icache_inv_user_page_range(struct mm_struct *mm,
-                         unsigned long start, unsigned long end)
-{
-       /* Used for invalidating big chunks of I-cache, i.e. assume the range
-          is whole pages.  If 'start' or 'end' is not page aligned, the code
-          is conservative and invalidates to the ends of the enclosing pages.
-          This is functionally OK, just a performance loss. */
-
-       /* See the comments below in sh64_dcache_purge_user_range() regarding
-          the choice of algorithm.  However, for the I-cache option (2) isn't
-          available because there are no physical tags so aliases can't be
-          resolved.  The icbi instruction has to be used through the user
-          mapping.   Because icbi is cheaper than ocbp on a cache hit, it
-          would be cheaper to use the selective code for a large range than is
-          possible with the D-cache.  Just assume 64 for now as a working
-          figure.
-          */
-
-       int n_pages;
-
-       if (!mm) return;
-
-       n_pages = ((end - start) >> PAGE_SHIFT);
-       if (n_pages >= 64) {
-               sh64_icache_inv_all();
-       } else {
-               unsigned long aligned_start;
-               unsigned long eaddr;
-               unsigned long after_last_page_start;
-               unsigned long mm_asid, current_asid;
-               unsigned long long flags = 0ULL;
-
-               mm_asid = mm->context & MMU_CONTEXT_ASID_MASK;
-               current_asid = get_asid();
-
-               if (mm_asid != current_asid) {
-                       /* Switch ASID and run the invalidate loop under cli */
-                       local_irq_save(flags);
-                       switch_and_save_asid(mm_asid);
-               }
-
-               aligned_start = start & PAGE_MASK;
-               after_last_page_start = PAGE_SIZE + ((end - 1) & PAGE_MASK);
-
-               while (aligned_start < after_last_page_start) {
-                       struct vm_area_struct *vma;
-                       unsigned long vma_end;
-                       vma = find_vma(mm, aligned_start);
-                       if (!vma || (aligned_start <= vma->vm_end)) {
-                               /* Avoid getting stuck in an error condition */
-                               aligned_start += PAGE_SIZE;
-                               continue;
-                       }
-                       vma_end = vma->vm_end;
-                       if (vma->vm_flags & VM_EXEC) {
-                               /* Executable */
-                               eaddr = aligned_start;
-                               while (eaddr < vma_end) {
-                                       sh64_icache_inv_user_page(vma, eaddr);
-                                       eaddr += PAGE_SIZE;
-                               }
-                       }
-                       aligned_start = vma->vm_end; /* Skip to start of next region */
-               }
-               if (mm_asid != current_asid) {
-                       switch_and_save_asid(current_asid);
-                       local_irq_restore(flags);
-               }
-       }
-}
-
-static void sh64_icache_inv_user_small_range(struct mm_struct *mm,
-                                               unsigned long start, int len)
-{
-
-       /* Invalidate a small range of user context I-cache, not necessarily
-          page (or even cache-line) aligned. */
-
-       unsigned long long eaddr = start;
-       unsigned long long eaddr_end = start + len;
-       unsigned long current_asid, mm_asid;
-       unsigned long long flags;
-       unsigned long long epage_start;
-
-       /* Since this is used inside ptrace, the ASID in the mm context
-          typically won't match current_asid.  We'll have to switch ASID to do
-          this.  For safety, and given that the range will be small, do all
-          this under cli.
-
-          Note, there is a hazard that the ASID in mm->context is no longer
-          actually associated with mm, i.e. if the mm->context has started a
-          new cycle since mm was last active.  However, this is just a
-          performance issue: all that happens is that we invalidate lines
-          belonging to another mm, so the owning process has to refill them
-          when that mm goes live again.  mm itself can't have any cache
-          entries because there will have been a flush_cache_all when the new
-          mm->context cycle started. */
-
-       /* Align to start of cache line.  Otherwise, suppose len==8 and start
-          was at 32N+28 : the last 4 bytes wouldn't get invalidated. */
-       eaddr = start & L1_CACHE_ALIGN_MASK;
-       eaddr_end = start + len;
-
-       local_irq_save(flags);
-       mm_asid = mm->context & MMU_CONTEXT_ASID_MASK;
-       current_asid = switch_and_save_asid(mm_asid);
-
-       epage_start = eaddr & PAGE_MASK;
-
-       while (eaddr < eaddr_end)
-       {
-               asm __volatile__("icbi %0, 0" : : "r" (eaddr));
-               eaddr += L1_CACHE_BYTES;
-       }
-       switch_and_save_asid(current_asid);
-       local_irq_restore(flags);
-}
-
-static void sh64_icache_inv_current_user_range(unsigned long start, unsigned long end)
-{
-       /* The icbi instruction never raises ITLBMISS.  i.e. if there's not a
-          cache hit on the virtual tag the instruction ends there, without a
-          TLB lookup. */
-
-       unsigned long long aligned_start;
-       unsigned long long ull_end;
-       unsigned long long addr;
-
-       ull_end = end;
-
-       /* Just invalidate over the range using the natural addresses.  TLB
-          miss handling will be OK (TBC).  Since it's for the current process,
-          either we're already in the right ASID context, or the ASIDs have
-          been recycled since we were last active in which case we might just
-          invalidate another processes I-cache entries : no worries, just a
-          performance drop for him. */
-       aligned_start = start & L1_CACHE_ALIGN_MASK;
-       addr = aligned_start;
-       while (addr < ull_end) {
-               asm __volatile__ ("icbi %0, 0" : : "r" (addr));
-               asm __volatile__ ("nop");
-               asm __volatile__ ("nop");
-               addr += L1_CACHE_BYTES;
-       }
-}
-
-#endif /* !CONFIG_ICACHE_DISABLED */
-
-/****************************************************************************/
-
-#ifndef CONFIG_DCACHE_DISABLED
-
-/* Buffer used as the target of alloco instructions to purge data from cache
-   sets by natural eviction. -- RPC */
-#define DUMMY_ALLOCO_AREA_SIZE L1_CACHE_SIZE_BYTES + (1024 * 4)
-static unsigned char dummy_alloco_area[DUMMY_ALLOCO_AREA_SIZE] __cacheline_aligned = { 0, };
-
-/****************************************************************************/
-
-static void __inline__ sh64_dcache_purge_sets(int sets_to_purge_base, int n_sets)
-{
-       /* Purge all ways in a particular block of sets, specified by the base
-          set number and number of sets.  Can handle wrap-around, if that's
-          needed.  */
-
-       int dummy_buffer_base_set;
-       unsigned long long eaddr, eaddr0, eaddr1;
-       int j;
-       int set_offset;
-
-       dummy_buffer_base_set = ((int)&dummy_alloco_area & cpu_data->dcache.idx_mask) >> cpu_data->dcache.entry_shift;
-       set_offset = sets_to_purge_base - dummy_buffer_base_set;
-
-       for (j=0; j<n_sets; j++, set_offset++) {
-               set_offset &= (cpu_data->dcache.sets - 1);
-               eaddr0 = (unsigned long long)dummy_alloco_area + (set_offset << cpu_data->dcache.entry_shift);
-
-               /* Do one alloco which hits the required set per cache way.  For
-                  write-back mode, this will purge the #ways resident lines.   There's
-                  little point unrolling this loop because the allocos stall more if
-                  they're too close together. */
-               eaddr1 = eaddr0 + cpu_data->dcache.way_ofs * cpu_data->dcache.ways;
-               for (eaddr=eaddr0; eaddr<eaddr1; eaddr+=cpu_data->dcache.way_ofs) {
-                       asm __volatile__ ("alloco %0, 0" : : "r" (eaddr));
-               }
-
-               eaddr1 = eaddr0 + cpu_data->dcache.way_ofs * cpu_data->dcache.ways;
-               for (eaddr=eaddr0; eaddr<eaddr1; eaddr+=cpu_data->dcache.way_ofs) {
-                       /* Load from each address.  Required because alloco is a NOP if
-                          the cache is write-through.  Write-through is a config option. */
-                       if (test_bit(SH_CACHE_MODE_WT, &(cpu_data->dcache.flags)))
-                               *(volatile unsigned char *)(int)eaddr;
-               }
-       }
-
-       /* Don't use OCBI to invalidate the lines.  That costs cycles directly.
-          If the dummy block is just left resident, it will naturally get
-          evicted as required.  */
-
-       return;
-}
-
-/****************************************************************************/
-
-static void sh64_dcache_purge_all(void)
-{
-       /* Purge the entire contents of the dcache.  The most efficient way to
-          achieve this is to use alloco instructions on a region of unused
-          memory equal in size to the cache, thereby causing the current
-          contents to be discarded by natural eviction.  The alternative,
-          namely reading every tag, setting up a mapping for the corresponding
-          page and doing an OCBP for the line, would be much more expensive.
-          */
-
-       sh64_dcache_purge_sets(0, cpu_data->dcache.sets);
-
-       return;
-
-}
-
-/****************************************************************************/
-
-static void sh64_dcache_purge_kernel_range(unsigned long start, unsigned long end)
-{
-       /* Purge the range of addresses [start,end] from the D-cache.  The
-          addresses lie in the superpage mapping.  There's no harm if we
-          overpurge at either end - just a small performance loss. */
-       unsigned long long ullend, addr, aligned_start;
-#if (NEFF == 32)
-       aligned_start = (unsigned long long)(signed long long)(signed long) start;
-#else
-#error "NEFF != 32"
-#endif
-       aligned_start &= L1_CACHE_ALIGN_MASK;
-       addr = aligned_start;
-#if (NEFF == 32)
-       ullend = (unsigned long long) (signed long long) (signed long) end;
-#else
-#error "NEFF != 32"
-#endif
-       while (addr <= ullend) {
-               asm __volatile__ ("ocbp %0, 0" : : "r" (addr));
-               addr += L1_CACHE_BYTES;
-       }
-       return;
-}
-
-/* Assumes this address (+ (2**n_synbits) pages up from it) aren't used for
-   anything else in the kernel */
-#define MAGIC_PAGE0_START 0xffffffffec000000ULL
-
-static void sh64_dcache_purge_coloured_phy_page(unsigned long paddr, unsigned long eaddr)
-{
-       /* Purge the physical page 'paddr' from the cache.  It's known that any
-          cache lines requiring attention have the same page colour as the the
-          address 'eaddr'.
-
-          This relies on the fact that the D-cache matches on physical tags
-          when no virtual tag matches.  So we create an alias for the original
-          page and purge through that.  (Alternatively, we could have done
-          this by switching ASID to match the original mapping and purged
-          through that, but that involves ASID switching cost + probably a
-          TLBMISS + refill anyway.)
-          */
-
-       unsigned long long magic_page_start;
-       unsigned long long magic_eaddr, magic_eaddr_end;
-
-       magic_page_start = MAGIC_PAGE0_START + (eaddr & CACHE_OC_SYN_MASK);
-
-       /* As long as the kernel is not pre-emptible, this doesn't need to be
-          under cli/sti. */
-
-       sh64_setup_dtlb_cache_slot(magic_page_start, get_asid(), paddr);
-
-       magic_eaddr = magic_page_start;
-       magic_eaddr_end = magic_eaddr + PAGE_SIZE;
-       while (magic_eaddr < magic_eaddr_end) {
-               /* Little point in unrolling this loop - the OCBPs are blocking
-                  and won't go any quicker (i.e. the loop overhead is parallel
-                  to part of the OCBP execution.) */
-               asm __volatile__ ("ocbp %0, 0" : : "r" (magic_eaddr));
-               magic_eaddr += L1_CACHE_BYTES;
-       }
-
-       sh64_teardown_dtlb_cache_slot();
-}
-
-/****************************************************************************/
-
-static void sh64_dcache_purge_phy_page(unsigned long paddr)
-{
-       /* Pure a page given its physical start address, by creating a
-          temporary 1 page mapping and purging across that.  Even if we know
-          the virtual address (& vma or mm) of the page, the method here is
-          more elegant because it avoids issues of coping with page faults on
-          the purge instructions (i.e. no special-case code required in the
-          critical path in the TLB miss handling). */
-
-       unsigned long long eaddr_start, eaddr, eaddr_end;
-       int i;
-
-       /* As long as the kernel is not pre-emptible, this doesn't need to be
-          under cli/sti. */
-
-       eaddr_start = MAGIC_PAGE0_START;
-       for (i=0; i < (1 << CACHE_OC_N_SYNBITS); i++) {
-               sh64_setup_dtlb_cache_slot(eaddr_start, get_asid(), paddr);
-
-               eaddr = eaddr_start;
-               eaddr_end = eaddr + PAGE_SIZE;
-               while (eaddr < eaddr_end) {
-                       asm __volatile__ ("ocbp %0, 0" : : "r" (eaddr));
-                       eaddr += L1_CACHE_BYTES;
-               }
-
-               sh64_teardown_dtlb_cache_slot();
-               eaddr_start += PAGE_SIZE;
-       }
-}
-
-static void sh64_dcache_purge_virt_page(struct mm_struct *mm, unsigned long eaddr)
-{
-       unsigned long phys;
-       pgd_t *pgd;
-       pmd_t *pmd;
-       pte_t *pte;
-       pte_t entry;
-
-       pgd = pgd_offset(mm, eaddr);
-       pmd = pmd_offset(pgd, eaddr);
-
-       if (pmd_none(*pmd) || pmd_bad(*pmd))
-               return;
-
-       pte = pte_offset_kernel(pmd, eaddr);
-       entry = *pte;
-
-       if (pte_none(entry) || !pte_present(entry))
-               return;
-
-       phys = pte_val(entry) & PAGE_MASK;
-
-       sh64_dcache_purge_phy_page(phys);
-}
-
-static void sh64_dcache_purge_user_page(struct mm_struct *mm, unsigned long eaddr)
-{
-       pgd_t *pgd;
-       pmd_t *pmd;
-       pte_t *pte;
-       pte_t entry;
-       unsigned long paddr;
-
-       /* NOTE : all the callers of this have mm->page_table_lock held, so the
-          following page table traversal is safe even on SMP/pre-emptible. */
-
-       if (!mm) return; /* No way to find physical address of page */
-       pgd = pgd_offset(mm, eaddr);
-       if (pgd_bad(*pgd)) return;
-
-       pmd = pmd_offset(pgd, eaddr);
-       if (pmd_none(*pmd) || pmd_bad(*pmd)) return;
-
-       pte = pte_offset_kernel(pmd, eaddr);
-       entry = *pte;
-       if (pte_none(entry) || !pte_present(entry)) return;
-
-       paddr = pte_val(entry) & PAGE_MASK;
-
-       sh64_dcache_purge_coloured_phy_page(paddr, eaddr);
-
-}
-/****************************************************************************/
-
-static void sh64_dcache_purge_user_range(struct mm_struct *mm,
-                         unsigned long start, unsigned long end)
-{
-       /* There are at least 5 choices for the implementation of this, with
-          pros (+), cons(-), comments(*):
-
-          1. ocbp each line in the range through the original user's ASID
-             + no lines spuriously evicted
-             - tlbmiss handling (must either handle faults on demand => extra
-               special-case code in tlbmiss critical path), or map the page in
-               advance (=> flush_tlb_range in advance to avoid multiple hits)
-             - ASID switching
-             - expensive for large ranges
-
-          2. temporarily map each page in the range to a special effective
-             address and ocbp through the temporary mapping; relies on the
-             fact that SH-5 OCB* always do TLB lookup and match on ptags (they
-             never look at the etags)
-             + no spurious evictions
-             - expensive for large ranges
-             * surely cheaper than (1)
-
-          3. walk all the lines in the cache, check the tags, if a match
-             occurs create a page mapping to ocbp the line through
-             + no spurious evictions
-             - tag inspection overhead
-             - (especially for small ranges)
-             - potential cost of setting up/tearing down page mapping for
-               every line that matches the range
-             * cost partly independent of range size
-
-          4. walk all the lines in the cache, check the tags, if a match
-             occurs use 4 * alloco to purge the line (+3 other probably
-             innocent victims) by natural eviction
-             + no tlb mapping overheads
-             - spurious evictions
-             - tag inspection overhead
-
-          5. implement like flush_cache_all
-             + no tag inspection overhead
-             - spurious evictions
-             - bad for small ranges
-
-          (1) can be ruled out as more expensive than (2).  (2) appears best
-          for small ranges.  The choice between (3), (4) and (5) for large
-          ranges and the range size for the large/small boundary need
-          benchmarking to determine.
-
-          For now use approach (2) for small ranges and (5) for large ones.
-
-          */
-
-       int n_pages;
-
-       n_pages = ((end - start) >> PAGE_SHIFT);
-       if (n_pages >= 64) {
-#if 1
-               sh64_dcache_purge_all();
-#else
-               unsigned long long set, way;
-               unsigned long mm_asid = mm->context & MMU_CONTEXT_ASID_MASK;
-               for (set = 0; set < cpu_data->dcache.sets; set++) {
-                       unsigned long long set_base_config_addr = CACHE_OC_ADDRESS_ARRAY + (set << cpu_data->dcache.set_shift);
-                       for (way = 0; way < cpu_data->dcache.ways; way++) {
-                               unsigned long long config_addr = set_base_config_addr + (way << cpu_data->dcache.way_step_shift);
-                               unsigned long long tag0;
-                               unsigned long line_valid;
-
-                               asm __volatile__("getcfg %1, 0, %0" : "=r" (tag0) : "r" (config_addr));
-                               line_valid = tag0 & SH_CACHE_VALID;
-                               if (line_valid) {
-                                       unsigned long cache_asid;
-                                       unsigned long epn;
-
-                                       cache_asid = (tag0 & cpu_data->dcache.asid_mask) >> cpu_data->dcache.asid_shift;
-                                       /* The next line needs some
-                                          explanation.  The virtual tags
-                                          encode bits [31:13] of the virtual
-                                          address, bit [12] of the 'tag' being
-                                          implied by the cache set index. */
-                                       epn = (tag0 & cpu_data->dcache.epn_mask) | ((set & 0x80) << cpu_data->dcache.entry_shift);
-
-                                       if ((cache_asid == mm_asid) && (start <= epn) && (epn < end)) {
-                                               /* TODO : could optimise this
-                                                  call by batching multiple
-                                                  adjacent sets together. */
-                                               sh64_dcache_purge_sets(set, 1);
-                                               break; /* Don't waste time inspecting other ways for this set */
-                                       }
-                               }
-                       }
-               }
-#endif
-       } else {
-               /* 'Small' range */
-               unsigned long aligned_start;
-               unsigned long eaddr;
-               unsigned long last_page_start;
-
-               aligned_start = start & PAGE_MASK;
-               /* 'end' is 1 byte beyond the end of the range */
-               last_page_start = (end - 1) & PAGE_MASK;
-
-               eaddr = aligned_start;
-               while (eaddr <= last_page_start) {
-                       sh64_dcache_purge_user_page(mm, eaddr);
-                       eaddr += PAGE_SIZE;
-               }
-       }
-       return;
-}
-
-static void sh64_dcache_wback_current_user_range(unsigned long start, unsigned long end)
-{
-       unsigned long long aligned_start;
-       unsigned long long ull_end;
-       unsigned long long addr;
-
-       ull_end = end;
-
-       /* Just wback over the range using the natural addresses.  TLB miss
-          handling will be OK (TBC) : the range has just been written to by
-          the signal frame setup code, so the PTEs must exist.
-
-          Note, if we have CONFIG_PREEMPT and get preempted inside this loop,
-          it doesn't matter, even if the pid->ASID mapping changes whilst
-          we're away.  In that case the cache will have been flushed when the
-          mapping was renewed.  So the writebacks below will be nugatory (and
-          we'll doubtless have to fault the TLB entry/ies in again with the
-          new ASID), but it's a rare case.
-          */
-       aligned_start = start & L1_CACHE_ALIGN_MASK;
-       addr = aligned_start;
-       while (addr < ull_end) {
-               asm __volatile__ ("ocbwb %0, 0" : : "r" (addr));
-               addr += L1_CACHE_BYTES;
-       }
-}
-
-#endif /* !CONFIG_DCACHE_DISABLED */
-
-/****************************************************************************/
-
-/* These *MUST* lie in an area of virtual address space that's otherwise unused. */
-#define UNIQUE_EADDR_START 0xe0000000UL
-#define UNIQUE_EADDR_END   0xe8000000UL
-
-static unsigned long sh64_make_unique_eaddr(unsigned long user_eaddr, unsigned long paddr)
-{
-       /* Given a physical address paddr, and a user virtual address
-          user_eaddr which will eventually be mapped to it, create a one-off
-          kernel-private eaddr mapped to the same paddr.  This is used for
-          creating special destination pages for copy_user_page and
-          clear_user_page */
-
-       static unsigned long current_pointer = UNIQUE_EADDR_START;
-       unsigned long coloured_pointer;
-
-       if (current_pointer == UNIQUE_EADDR_END) {
-               sh64_dcache_purge_all();
-               current_pointer = UNIQUE_EADDR_START;
-       }
-
-       coloured_pointer = (current_pointer & ~CACHE_OC_SYN_MASK) | (user_eaddr & CACHE_OC_SYN_MASK);
-       sh64_setup_dtlb_cache_slot(coloured_pointer, get_asid(), paddr);
-
-       current_pointer += (PAGE_SIZE << CACHE_OC_N_SYNBITS);
-
-       return coloured_pointer;
-}
-
-/****************************************************************************/
-
-static void sh64_copy_user_page_coloured(void *to, void *from, unsigned long address)
-{
-       void *coloured_to;
-
-       /* Discard any existing cache entries of the wrong colour.  These are
-          present quite often, if the kernel has recently used the page
-          internally, then given it up, then it's been allocated to the user.
-          */
-       sh64_dcache_purge_coloured_phy_page(__pa(to), (unsigned long) to);
-
-       coloured_to = (void *) sh64_make_unique_eaddr(address, __pa(to));
-       sh64_page_copy(from, coloured_to);
-
-       sh64_teardown_dtlb_cache_slot();
-}
-
-static void sh64_clear_user_page_coloured(void *to, unsigned long address)
-{
-       void *coloured_to;
-
-       /* Discard any existing kernel-originated lines of the wrong colour (as
-          above) */
-       sh64_dcache_purge_coloured_phy_page(__pa(to), (unsigned long) to);
-
-       coloured_to = (void *) sh64_make_unique_eaddr(address, __pa(to));
-       sh64_page_clear(coloured_to);
-
-       sh64_teardown_dtlb_cache_slot();
-}
-
-/****************************************************************************/
-
-/*##########################################################################
-                           EXTERNALLY CALLABLE API.
-  ##########################################################################*/
-
-/* These functions are described in Documentation/cachetlb.txt.
-   Each one of these functions varies in behaviour depending on whether the
-   I-cache and/or D-cache are configured out.
-
-   Note that the Linux term 'flush' corresponds to what is termed 'purge' in
-   the sh/sh64 jargon for the D-cache, i.e. write back dirty data then
-   invalidate the cache lines, and 'invalidate' for the I-cache.
-   */
-
-#undef FLUSH_TRACE
-
-void flush_cache_all(void)
-{
-       /* Invalidate the entire contents of both caches, after writing back to
-          memory any dirty data from the D-cache. */
-       sh64_dcache_purge_all();
-       sh64_icache_inv_all();
-}
-
-/****************************************************************************/
-
-void flush_cache_mm(struct mm_struct *mm)
-{
-       /* Invalidate an entire user-address space from both caches, after
-          writing back dirty data (e.g. for shared mmap etc). */
-
-       /* This could be coded selectively by inspecting all the tags then
-          doing 4*alloco on any set containing a match (as for
-          flush_cache_range), but fork/exit/execve (where this is called from)
-          are expensive anyway. */
-
-       /* Have to do a purge here, despite the comments re I-cache below.
-          There could be odd-coloured dirty data associated with the mm still
-          in the cache - if this gets written out through natural eviction
-          after the kernel has reused the page there will be chaos.
-          */
-
-       sh64_dcache_purge_all();
-
-       /* The mm being torn down won't ever be active again, so any Icache
-          lines tagged with its ASID won't be visible for the rest of the
-          lifetime of this ASID cycle.  Before the ASID gets reused, there
-          will be a flush_cache_all.  Hence we don't need to touch the
-          I-cache.  This is similar to the lack of action needed in
-          flush_tlb_mm - see fault.c. */
-}
-
-/****************************************************************************/
-
-void flush_cache_range(struct vm_area_struct *vma, unsigned long start,
-                      unsigned long end)
-{
-       struct mm_struct *mm = vma->vm_mm;
-
-       /* Invalidate (from both caches) the range [start,end) of virtual
-          addresses from the user address space specified by mm, after writing
-          back any dirty data.
-
-          Note(1), 'end' is 1 byte beyond the end of the range to flush.
-
-          Note(2), this is called with mm->page_table_lock held.*/
-
-       sh64_dcache_purge_user_range(mm, start, end);
-       sh64_icache_inv_user_page_range(mm, start, end);
-}
-
-/****************************************************************************/
-
-void flush_cache_page(struct vm_area_struct *vma, unsigned long eaddr)
-{
-       /* Invalidate any entries in either cache for the vma within the user
-          address space vma->vm_mm for the page starting at virtual address
-          'eaddr'.   This seems to be used primarily in breaking COW.  Note,
-          the I-cache must be searched too in case the page in question is
-          both writable and being executed from (e.g. stack trampolines.)
-
-          Note(1), this is called with mm->page_table_lock held.
-          */
-
-       sh64_dcache_purge_virt_page(vma->vm_mm, eaddr);
-
-       if (vma->vm_flags & VM_EXEC) {
-               sh64_icache_inv_user_page(vma, eaddr);
-       }
-}
-
-/****************************************************************************/
-
-#ifndef CONFIG_DCACHE_DISABLED
-
-void copy_user_page(void *to, void *from, unsigned long address, struct page *page)
-{
-       /* 'from' and 'to' are kernel virtual addresses (within the superpage
-          mapping of the physical RAM).  'address' is the user virtual address
-          where the copy 'to' will be mapped after.  This allows a custom
-          mapping to be used to ensure that the new copy is placed in the
-          right cache sets for the user to see it without having to bounce it
-          out via memory.  Note however : the call to flush_page_to_ram in
-          (generic)/mm/memory.c:(break_cow) undoes all this good work in that one
-          very important case!
-
-          TBD : can we guarantee that on every call, any cache entries for
-          'from' are in the same colour sets as 'address' also?  i.e. is this
-          always used just to deal with COW?  (I suspect not). */
-
-       /* There are two possibilities here for when the page 'from' was last accessed:
-          * by the kernel : this is OK, no purge required.
-          * by the/a user (e.g. for break_COW) : need to purge.
-
-          If the potential user mapping at 'address' is the same colour as
-          'from' there is no need to purge any cache lines from the 'from'
-          page mapped into cache sets of colour 'address'.  (The copy will be
-          accessing the page through 'from').
-          */
-
-       if (((address ^ (unsigned long) from) & CACHE_OC_SYN_MASK) != 0) {
-               sh64_dcache_purge_coloured_phy_page(__pa(from), address);
-       }
-
-       if (((address ^ (unsigned long) to) & CACHE_OC_SYN_MASK) == 0) {
-               /* No synonym problem on destination */
-               sh64_page_copy(from, to);
-       } else {
-               sh64_copy_user_page_coloured(to, from, address);
-       }
-
-       /* Note, don't need to flush 'from' page from the cache again - it's
-          done anyway by the generic code */
-}
-
-void clear_user_page(void *to, unsigned long address, struct page *page)
-{
-       /* 'to' is a kernel virtual address (within the superpage
-          mapping of the physical RAM).  'address' is the user virtual address
-          where the 'to' page will be mapped after.  This allows a custom
-          mapping to be used to ensure that the new copy is placed in the
-          right cache sets for the user to see it without having to bounce it
-          out via memory.
-       */
-
-       if (((address ^ (unsigned long) to) & CACHE_OC_SYN_MASK) == 0) {
-               /* No synonym problem on destination */
-               sh64_page_clear(to);
-       } else {
-               sh64_clear_user_page_coloured(to, address);
-       }
-}
-
-#endif /* !CONFIG_DCACHE_DISABLED */
-
-/****************************************************************************/
-
-void flush_dcache_page(struct page *page)
-{
-       sh64_dcache_purge_phy_page(page_to_phys(page));
-       wmb();
-}
-
-/****************************************************************************/
-
-void flush_icache_range(unsigned long start, unsigned long end)
-{
-       /* Flush the range [start,end] of kernel virtual adddress space from
-          the I-cache.  The corresponding range must be purged from the
-          D-cache also because the SH-5 doesn't have cache snooping between
-          the caches.  The addresses will be visible through the superpage
-          mapping, therefore it's guaranteed that there no cache entries for
-          the range in cache sets of the wrong colour.
-
-          Primarily used for cohering the I-cache after a module has
-          been loaded.  */
-
-       /* We also make sure to purge the same range from the D-cache since
-          flush_page_to_ram() won't be doing this for us! */
-
-       sh64_dcache_purge_kernel_range(start, end);
-       wmb();
-       sh64_icache_inv_kernel_range(start, end);
-}
-
-/****************************************************************************/
-
-void flush_icache_user_range(struct vm_area_struct *vma,
-                       struct page *page, unsigned long addr, int len)
-{
-       /* Flush the range of user (defined by vma->vm_mm) address space
-          starting at 'addr' for 'len' bytes from the cache.  The range does
-          not straddle a page boundary, the unique physical page containing
-          the range is 'page'.  This seems to be used mainly for invalidating
-          an address range following a poke into the program text through the
-          ptrace() call from another process (e.g. for BRK instruction
-          insertion). */
-
-       sh64_dcache_purge_coloured_phy_page(page_to_phys(page), addr);
-       mb();
-
-       if (vma->vm_flags & VM_EXEC) {
-               sh64_icache_inv_user_small_range(vma->vm_mm, addr, len);
-       }
-}
-
-/*##########################################################################
-                       ARCH/SH64 PRIVATE CALLABLE API.
-  ##########################################################################*/
-
-void flush_cache_sigtramp(unsigned long start, unsigned long end)
-{
-       /* For the address range [start,end), write back the data from the
-          D-cache and invalidate the corresponding region of the I-cache for
-          the current process.  Used to flush signal trampolines on the stack
-          to make them executable. */
-
-       sh64_dcache_wback_current_user_range(start, end);
-       wmb();
-       sh64_icache_inv_current_user_range(start, end);
-}
-
diff --git a/arch/sh64/mm/extable.c b/arch/sh64/mm/extable.c
deleted file mode 100644 (file)
index 802eff8..0000000
+++ /dev/null
@@ -1,80 +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.
- *
- * arch/sh64/mm/extable.c
- *
- * Copyright (C) 2003 Richard Curnow
- * Copyright (C) 2003, 2004  Paul Mundt
- *
- * Cloned from the 2.5 SH version..
- */
-#include <linux/config.h>
-#include <linux/rwsem.h>
-#include <linux/module.h>
-#include <asm/uaccess.h>
-
-extern unsigned long copy_user_memcpy, copy_user_memcpy_end, __copy_user_fixup;
-
-static const struct exception_table_entry __copy_user_fixup_ex = {
-       .fixup = (unsigned long)&__copy_user_fixup,
-};
-
-/* Some functions that may trap due to a bad user-mode address have too many loads
-   and stores in them to make it at all practical to label each one and put them all in
-   the main exception table.
-
-   In particular, the fast memcpy routine is like this.  It's fix-up is just to fall back
-   to a slow byte-at-a-time copy, which is handled the conventional way.  So it's functionally
-   OK to just handle any trap occurring in the fast memcpy with that fixup. */
-static const struct exception_table_entry *check_exception_ranges(unsigned long addr)
-{
-       if ((addr >= (unsigned long)&copy_user_memcpy) &&
-           (addr <= (unsigned long)&copy_user_memcpy_end))
-               return &__copy_user_fixup_ex;
-
-       return NULL;
-}
-
-/* Simple binary search */
-const struct exception_table_entry *
-search_extable(const struct exception_table_entry *first,
-                const struct exception_table_entry *last,
-                unsigned long value)
-{
-       const struct exception_table_entry *mid;
-
-       mid = check_exception_ranges(value);
-       if (mid)
-               return mid;
-
-        while (first <= last) {
-               long diff;
-
-               mid = (last - first) / 2 + first;
-               diff = mid->insn - value;
-                if (diff == 0)
-                        return mid;
-                else if (diff < 0)
-                        first = mid+1;
-                else
-                        last = mid-1;
-        }
-
-        return NULL;
-}
-
-int fixup_exception(struct pt_regs *regs)
-{
-       const struct exception_table_entry *fixup;
-
-       fixup = search_exception_tables(regs->pc);
-       if (fixup) {
-               regs->pc = fixup->fixup;
-               return 1;
-       }
-
-       return 0;
-}
-
diff --git a/arch/sh64/mm/fault.c b/arch/sh64/mm/fault.c
deleted file mode 100644 (file)
index b5ab4a8..0000000
+++ /dev/null
@@ -1,591 +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.
- *
- * arch/sh64/mm/fault.c
- *
- * Copyright (C) 2000, 2001  Paolo Alberelli
- * Copyright (C) 2003  Richard Curnow (/proc/tlb, bug fixes)
- * Copyright (C) 2003  Paul Mundt
- *
- */
-
-#include <linux/signal.h>
-#include <linux/rwsem.h>
-#include <linux/sched.h>
-#include <linux/kernel.h>
-#include <linux/errno.h>
-#include <linux/string.h>
-#include <linux/types.h>
-#include <linux/ptrace.h>
-#include <linux/mman.h>
-#include <linux/mm.h>
-#include <linux/smp.h>
-#include <linux/smp_lock.h>
-#include <linux/interrupt.h>
-
-#include <asm/system.h>
-#include <asm/io.h>
-#include <asm/tlb.h>
-#include <asm/uaccess.h>
-#include <asm/pgalloc.h>
-#include <asm/hardirq.h>
-#include <asm/mmu_context.h>
-#include <asm/registers.h>             /* required by inline asm statements */
-
-#if defined(CONFIG_SH64_PROC_TLB)
-#include <linux/init.h>
-#include <linux/proc_fs.h>
-/* Count numbers of tlb refills in each region */
-static unsigned long long calls_to_update_mmu_cache = 0ULL;
-static unsigned long long calls_to_flush_tlb_page   = 0ULL;
-static unsigned long long calls_to_flush_tlb_range  = 0ULL;
-static unsigned long long calls_to_flush_tlb_mm     = 0ULL;
-static unsigned long long calls_to_flush_tlb_all    = 0ULL;
-unsigned long long calls_to_do_slow_page_fault = 0ULL;
-unsigned long long calls_to_do_fast_page_fault = 0ULL;
-
-/* Count size of ranges for flush_tlb_range */
-static unsigned long long flush_tlb_range_1         = 0ULL;
-static unsigned long long flush_tlb_range_2         = 0ULL;
-static unsigned long long flush_tlb_range_3_4       = 0ULL;
-static unsigned long long flush_tlb_range_5_7       = 0ULL;
-static unsigned long long flush_tlb_range_8_11      = 0ULL;
-static unsigned long long flush_tlb_range_12_15     = 0ULL;
-static unsigned long long flush_tlb_range_16_up     = 0ULL;
-
-static unsigned long long page_not_present          = 0ULL;
-
-#endif
-
-extern void die(const char *,struct pt_regs *,long);
-
-#define PFLAG(val,flag)   (( (val) & (flag) ) ? #flag : "" )
-#define PPROT(flag) PFLAG(pgprot_val(prot),flag)
-
-static inline void print_prots(pgprot_t prot)
-{
-       printk("prot is 0x%08lx\n",pgprot_val(prot));
-
-       printk("%s %s %s %s %s\n",PPROT(_PAGE_SHARED),PPROT(_PAGE_READ),
-              PPROT(_PAGE_EXECUTE),PPROT(_PAGE_WRITE),PPROT(_PAGE_USER));
-}
-
-static inline void print_vma(struct vm_area_struct *vma)
-{
-       printk("vma start 0x%08lx\n", vma->vm_start);
-       printk("vma end   0x%08lx\n", vma->vm_end);
-
-       print_prots(vma->vm_page_prot);
-       printk("vm_flags 0x%08lx\n", vma->vm_flags);
-}
-
-static inline void print_task(struct task_struct *tsk)
-{
-       printk("Task pid %d\n", tsk->pid);
-}
-
-static pte_t *lookup_pte(struct mm_struct *mm, unsigned long address)
-{
-       pgd_t *dir;
-       pmd_t *pmd;
-       pte_t *pte;
-       pte_t entry;
-
-       dir = pgd_offset(mm, address);
-       if (pgd_none(*dir)) {
-               return NULL;
-       }
-
-       pmd = pmd_offset(dir, address);
-       if (pmd_none(*pmd)) {
-               return NULL;
-       }
-
-       pte = pte_offset_kernel(pmd, address);
-       entry = *pte;
-
-       if (pte_none(entry)) {
-               return NULL;
-       }
-       if (!pte_present(entry)) {
-               return NULL;
-       }
-
-       return pte;
-}
-
-/*
- * This routine handles page faults.  It determines the address,
- * and the problem, and then passes it off to one of the appropriate
- * routines.
- */
-asmlinkage void do_page_fault(struct pt_regs *regs, unsigned long writeaccess,
-                             unsigned long textaccess, unsigned long address)
-{
-       struct task_struct *tsk;
-       struct mm_struct *mm;
-       struct vm_area_struct * vma;
-       const struct exception_table_entry *fixup;
-       pte_t *pte;
-
-#if defined(CONFIG_SH64_PROC_TLB)
-        ++calls_to_do_slow_page_fault;
-#endif
-
-       /* SIM
-        * Note this is now called with interrupts still disabled
-        * This is to cope with being called for a missing IO port
-        * address with interupts disabled. This should be fixed as
-        * soon as we have a better 'fast path' miss handler.
-        *
-        * Plus take care how you try and debug this stuff.
-        * For example, writing debug data to a port which you
-        * have just faulted on is not going to work.
-        */
-
-       tsk = current;
-       mm = tsk->mm;
-
-       /* Not an IO address, so reenable interrupts */
-       sti();
-
-       /*
-        * If we're in an interrupt or have no user
-        * context, we must not take the fault..
-        */
-       if (in_interrupt() || !mm)
-               goto no_context;
-
-       /* TLB misses upon some cache flushes get done under cli() */
-       down_read(&mm->mmap_sem);
-
-       vma = find_vma(mm, address);
-
-       if (!vma) {
-#ifdef DEBUG_FAULT
-               print_task(tsk);
-               printk("%s:%d fault, address is 0x%08x PC %016Lx textaccess %d writeaccess %d\n",
-                      __FUNCTION__,__LINE__,
-                      address,regs->pc,textaccess,writeaccess);
-               show_regs(regs);
-#endif
-               goto bad_area;
-       }
-       if (vma->vm_start <= address) {
-               goto good_area;
-       }
-
-       if (!(vma->vm_flags & VM_GROWSDOWN)) {
-#ifdef DEBUG_FAULT
-               print_task(tsk);
-               printk("%s:%d fault, address is 0x%08x PC %016Lx textaccess %d writeaccess %d\n",
-                      __FUNCTION__,__LINE__,
-                      address,regs->pc,textaccess,writeaccess);
-               show_regs(regs);
-
-               print_vma(vma);
-#endif
-               goto bad_area;
-       }
-       if (expand_stack(vma, address)) {
-#ifdef DEBUG_FAULT
-               print_task(tsk);
-               printk("%s:%d fault, address is 0x%08x PC %016Lx textaccess %d writeaccess %d\n",
-                      __FUNCTION__,__LINE__,
-                      address,regs->pc,textaccess,writeaccess);
-               show_regs(regs);
-#endif
-               goto bad_area;
-       }
-/*
- * Ok, we have a good vm_area for this memory access, so
- * we can handle it..
- */
-good_area:
-       if (writeaccess) {
-               if (!(vma->vm_flags & VM_WRITE))
-                       goto bad_area;
-       } else {
-               if (!(vma->vm_flags & (VM_READ | VM_EXEC)))
-                       goto bad_area;
-       }
-
-       if (textaccess) {
-               if (!(vma->vm_flags & VM_EXEC))
-                       goto bad_area;
-       }
-
-       /*
-        * If for any reason at all we couldn't handle the fault,
-        * make sure we exit gracefully rather than endlessly redo
-        * the fault.
-        */
-survive:
-       switch (handle_mm_fault(mm, vma, address, writeaccess)) {
-       case 1:
-               tsk->min_flt++;
-               break;
-       case 2:
-               tsk->maj_flt++;
-               break;
-       case 0:
-               goto do_sigbus;
-       default:
-               goto out_of_memory;
-       }
-       /* If we get here, the page fault has been handled.  Do the TLB refill
-          now from the newly-setup PTE, to avoid having to fault again right
-          away on the same instruction. */
-       pte = lookup_pte (mm, address);
-       if (!pte) {
-               /* From empirical evidence, we can get here, due to
-                  !pte_present(pte).  (e.g. if a swap-in occurs, and the page
-                  is swapped back out again before the process that wanted it
-                  gets rescheduled?) */
-               goto no_pte;
-       }
-
-       __do_tlb_refill(address, textaccess, pte);
-
-no_pte:
-
-       up_read(&mm->mmap_sem);
-       return;
-
-/*
- * Something tried to access memory that isn't in our memory map..
- * Fix it, but check if it's kernel or user first..
- */
-bad_area:
-#ifdef DEBUG_FAULT
-       printk("fault:bad area\n");
-#endif
-       up_read(&mm->mmap_sem);
-
-       if (user_mode(regs)) {
-               printk("user mode bad_area address=%08lx pid=%d (%s) pc=%08lx opcode=%08lx\n",
-                       address, current->pid, current->comm,
-                       (unsigned long) regs->pc,
-                       *(unsigned long *)(u32)(regs->pc & ~3));
-               show_regs(regs);
-               if (tsk->pid == 1) {
-                       panic("INIT had user mode bad_area\n");
-               }
-               tsk->thread.address = address;
-               tsk->thread.error_code = writeaccess;
-               force_sig(SIGSEGV, tsk);
-               return;
-       }
-
-no_context:
-#ifdef DEBUG_FAULT
-       printk("fault:No context\n");
-#endif
-       /* Are we prepared to handle this kernel fault?  */
-       fixup = search_exception_tables(regs->pc);
-       if (fixup) {
-               regs->pc = fixup->fixup;
-               return;
-       }
-
-/*
- * Oops. The kernel tried to access some bad page. We'll have to
- * terminate things with extreme prejudice.
- *
- */
-       if (address < PAGE_SIZE)
-               printk(KERN_ALERT "Unable to handle kernel NULL pointer dereference");
-       else
-               printk(KERN_ALERT "Unable to handle kernel paging request");
-       printk(" at virtual address %08lx\n", address);
-       printk(KERN_ALERT "pc = %08Lx%08Lx\n", regs->pc >> 32, regs->pc & 0xffffffff);
-       die("Oops", regs, writeaccess);
-       do_exit(SIGKILL);
-
-/*
- * We ran out of memory, or some other thing happened to us that made
- * us unable to handle the page fault gracefully.
- */
-out_of_memory:
-       if (current->pid == 1) {
-               panic("INIT out of memory\n");
-               yield();
-               goto survive;
-       }
-       printk("fault:Out of memory\n");
-       up_read(&mm->mmap_sem);
-       if (current->pid == 1) {
-               yield();
-               down_read(&mm->mmap_sem);
-               goto survive;
-       }
-       printk("VM: killing process %s\n", tsk->comm);
-       if (user_mode(regs))
-               do_exit(SIGKILL);
-       goto no_context;
-
-do_sigbus:
-       printk("fault:Do sigbus\n");
-       up_read(&mm->mmap_sem);
-
-       /*
-        * Send a sigbus, regardless of whether we were in kernel
-        * or user mode.
-        */
-       tsk->thread.address = address;
-       tsk->thread.error_code = writeaccess;
-       tsk->thread.trap_no = 14;
-       force_sig(SIGBUS, tsk);
-
-       /* Kernel mode? Handle exceptions or die */
-       if (!user_mode(regs))
-               goto no_context;
-}
-
-
-void flush_tlb_all(void);
-
-void update_mmu_cache(struct vm_area_struct * vma,
-                       unsigned long address, pte_t pte)
-{
-#if defined(CONFIG_SH64_PROC_TLB)
-       ++calls_to_update_mmu_cache;
-#endif
-
-       /*
-        * This appears to get called once for every pte entry that gets
-        * established => I don't think it's efficient to try refilling the
-        * TLBs with the pages - some may not get accessed even.  Also, for
-        * executable pages, it is impossible to determine reliably here which
-        * TLB they should be mapped into (or both even).
-        *
-        * So, just do nothing here and handle faults on demand.  In the
-        * TLBMISS handling case, the refill is now done anyway after the pte
-        * has been fixed up, so that deals with most useful cases.
-        */
-}
-
-static void __flush_tlb_page(struct vm_area_struct *vma, unsigned long page)
-{
-       unsigned long long match, pteh=0, lpage;
-       unsigned long tlb;
-       struct mm_struct *mm;
-
-       mm = vma->vm_mm;
-
-       if (mm->context == NO_CONTEXT)
-               return;
-
-       /*
-        * Sign-extend based on neff.
-        */
-       lpage = (page & NEFF_SIGN) ? (page | NEFF_MASK) : page;
-       match = ((mm->context & MMU_CONTEXT_ASID_MASK) << PTEH_ASID_SHIFT) | PTEH_VALID;
-       match |= lpage;
-
-        /* Do ITLB : don't bother for pages in non-exectutable VMAs */
-       if (vma->vm_flags & VM_EXEC) {
-               for_each_itlb_entry(tlb) {
-                       asm volatile ("getcfg   %1, 0, %0"
-                                     : "=r" (pteh)
-                                     : "r" (tlb) );
-
-                       if (pteh == match) {
-                               __flush_tlb_slot(tlb);
-                               break;
-                       }
-
-               }
-       }
-
-        /* Do DTLB : any page could potentially be in here. */
-       for_each_dtlb_entry(tlb) {
-               asm volatile ("getcfg   %1, 0, %0"
-                             : "=r" (pteh)
-                             : "r" (tlb) );
-
-               if (pteh == match) {
-                       __flush_tlb_slot(tlb);
-                       break;
-               }
-
-       }
-}
-
-void flush_tlb_page(struct vm_area_struct *vma, unsigned long page)
-{
-       unsigned long flags;
-
-#if defined(CONFIG_SH64_PROC_TLB)
-        ++calls_to_flush_tlb_page;
-#endif
-
-       if (vma->vm_mm) {
-               page &= PAGE_MASK;
-               local_irq_save(flags);
-               __flush_tlb_page(vma, page);
-               local_irq_restore(flags);
-       }
-}
-
-void flush_tlb_range(struct vm_area_struct *vma, unsigned long start,
-                    unsigned long end)
-{
-       unsigned long flags;
-       unsigned long long match, pteh=0, pteh_epn, pteh_low;
-       unsigned long tlb;
-       struct mm_struct *mm;
-
-       mm = vma->vm_mm;
-
-#if defined(CONFIG_SH64_PROC_TLB)
-       ++calls_to_flush_tlb_range;
-
-       {
-               unsigned long size = (end - 1) - start;
-               size >>= 12; /* divide by PAGE_SIZE */
-               size++; /* end=start+4096 => 1 page */
-               switch (size) {
-                 case  1        : flush_tlb_range_1++;     break;
-                 case  2        : flush_tlb_range_2++;     break;
-                 case  3 ...  4 : flush_tlb_range_3_4++;   break;
-                 case  5 ...  7 : flush_tlb_range_5_7++;   break;
-                 case  8 ... 11 : flush_tlb_range_8_11++;  break;
-                 case 12 ... 15 : flush_tlb_range_12_15++; break;
-                 default        : flush_tlb_range_16_up++; break;
-               }
-       }
-#endif
-
-       if (mm->context == NO_CONTEXT)
-               return;
-
-       local_irq_save(flags);
-
-       start &= PAGE_MASK;
-       end &= PAGE_MASK;
-
-       match = ((mm->context & MMU_CONTEXT_ASID_MASK) << PTEH_ASID_SHIFT) | PTEH_VALID;
-
-       /* Flush ITLB */
-       for_each_itlb_entry(tlb) {
-               asm volatile ("getcfg   %1, 0, %0"
-                             : "=r" (pteh)
-                             : "r" (tlb) );
-
-               pteh_epn = pteh & PAGE_MASK;
-               pteh_low = pteh & ~PAGE_MASK;
-
-               if (pteh_low == match && pteh_epn >= start && pteh_epn <= end)
-                       __flush_tlb_slot(tlb);
-       }
-
-       /* Flush DTLB */
-       for_each_dtlb_entry(tlb) {
-               asm volatile ("getcfg   %1, 0, %0"
-                             : "=r" (pteh)
-                             : "r" (tlb) );
-
-               pteh_epn = pteh & PAGE_MASK;
-               pteh_low = pteh & ~PAGE_MASK;
-
-               if (pteh_low == match && pteh_epn >= start && pteh_epn <= end)
-                       __flush_tlb_slot(tlb);
-       }
-
-       local_irq_restore(flags);
-}
-
-void flush_tlb_mm(struct mm_struct *mm)
-{
-       unsigned long flags;
-
-#if defined(CONFIG_SH64_PROC_TLB)
-       ++calls_to_flush_tlb_mm;
-#endif
-
-       if (mm->context == NO_CONTEXT)
-               return;
-
-       local_irq_save(flags);
-
-       mm->context=NO_CONTEXT;
-       if(mm==current->mm)
-               activate_context(mm);
-
-       local_irq_restore(flags);
-
-}
-
-void flush_tlb_all(void)
-{
-       /* Invalidate all, including shared pages, excluding fixed TLBs */
-
-       unsigned long flags, tlb;
-
-#if defined(CONFIG_SH64_PROC_TLB)
-       ++calls_to_flush_tlb_all;
-#endif
-
-       local_irq_save(flags);
-
-       /* Flush each ITLB entry */
-       for_each_itlb_entry(tlb) {
-               __flush_tlb_slot(tlb);
-       }
-
-       /* Flush each DTLB entry */
-       for_each_dtlb_entry(tlb) {
-               __flush_tlb_slot(tlb);
-       }
-
-       local_irq_restore(flags);
-}
-
-void flush_tlb_kernel_range(unsigned long start, unsigned long end)
-{
-        /* FIXME: Optimize this later.. */
-        flush_tlb_all();
-}
-
-#if defined(CONFIG_SH64_PROC_TLB)
-/* Procfs interface to read the performance information */
-
-static int
-tlb_proc_info(char *buf, char **start, off_t fpos, int length, int *eof, void *data)
-{
-  int len=0;
-  len += sprintf(buf+len, "do_fast_page_fault   called %12lld times\n", calls_to_do_fast_page_fault);
-  len += sprintf(buf+len, "do_slow_page_fault   called %12lld times\n", calls_to_do_slow_page_fault);
-  len += sprintf(buf+len, "update_mmu_cache     called %12lld times\n", calls_to_update_mmu_cache);
-  len += sprintf(buf+len, "flush_tlb_page       called %12lld times\n", calls_to_flush_tlb_page);
-  len += sprintf(buf+len, "flush_tlb_range      called %12lld times\n", calls_to_flush_tlb_range);
-  len += sprintf(buf+len, "flush_tlb_mm         called %12lld times\n", calls_to_flush_tlb_mm);
-  len += sprintf(buf+len, "flush_tlb_all        called %12lld times\n", calls_to_flush_tlb_all);
-  len += sprintf(buf+len, "flush_tlb_range_sizes\n"
-                          " 1      : %12lld\n"
-                          " 2      : %12lld\n"
-                          " 3 -  4 : %12lld\n"
-                          " 5 -  7 : %12lld\n"
-                          " 8 - 11 : %12lld\n"
-                          "12 - 15 : %12lld\n"
-                          "16+     : %12lld\n",
-                          flush_tlb_range_1, flush_tlb_range_2, flush_tlb_range_3_4,
-                          flush_tlb_range_5_7, flush_tlb_range_8_11, flush_tlb_range_12_15,
-                          flush_tlb_range_16_up);
-  len += sprintf(buf+len, "page not present           %12lld times\n", page_not_present);
-  *eof = 1;
-  return len;
-}
-
-static int __init register_proc_tlb(void)
-{
-  create_proc_read_entry("tlb", 0, NULL, tlb_proc_info, NULL);
-  return 0;
-}
-
-__initcall(register_proc_tlb);
-
-#endif
diff --git a/arch/sh64/mm/hugetlbpage.c b/arch/sh64/mm/hugetlbpage.c
deleted file mode 100644 (file)
index 50b2573..0000000
+++ /dev/null
@@ -1,264 +0,0 @@
-/*
- * arch/sh64/mm/hugetlbpage.c
- *
- * SuperH HugeTLB page support.
- *
- * Cloned from sparc64 by Paul Mundt.
- *
- * Copyright (C) 2002, 2003 David S. Miller (davem@redhat.com)
- */
-
-#include <linux/config.h>
-#include <linux/init.h>
-#include <linux/fs.h>
-#include <linux/mm.h>
-#include <linux/hugetlb.h>
-#include <linux/pagemap.h>
-#include <linux/smp_lock.h>
-#include <linux/slab.h>
-#include <linux/sysctl.h>
-
-#include <asm/mman.h>
-#include <asm/pgalloc.h>
-#include <asm/tlb.h>
-#include <asm/tlbflush.h>
-#include <asm/cacheflush.h>
-
-static pte_t *huge_pte_alloc(struct mm_struct *mm, unsigned long addr)
-{
-       pgd_t *pgd;
-       pmd_t *pmd;
-       pte_t *pte = NULL;
-
-       pgd = pgd_offset(mm, addr);
-       if (pgd) {
-               pmd = pmd_alloc(mm, pgd, addr);
-               if (pmd)
-                       pte = pte_alloc_map(mm, pmd, addr);
-       }
-       return pte;
-}
-
-static pte_t *huge_pte_offset(struct mm_struct *mm, unsigned long addr)
-{
-       pgd_t *pgd;
-       pmd_t *pmd;
-       pte_t *pte = NULL;
-
-       pgd = pgd_offset(mm, addr);
-       if (pgd) {
-               pmd = pmd_offset(pgd, addr);
-               if (pmd)
-                       pte = pte_offset_map(pmd, addr);
-       }
-       return pte;
-}
-
-#define mk_pte_huge(entry) do { pte_val(entry) |= _PAGE_SZHUGE; } while (0)
-
-static void set_huge_pte(struct mm_struct *mm, struct vm_area_struct *vma,
-                        struct page *page, pte_t * page_table, int write_access)
-{
-       unsigned long i;
-       pte_t entry;
-
-       mm->rss += (HPAGE_SIZE / PAGE_SIZE);
-
-       if (write_access)
-               entry = pte_mkwrite(pte_mkdirty(mk_pte(page,
-                                                      vma->vm_page_prot)));
-       else
-               entry = pte_wrprotect(mk_pte(page, vma->vm_page_prot));
-       entry = pte_mkyoung(entry);
-       mk_pte_huge(entry);
-
-       for (i = 0; i < (1 << HUGETLB_PAGE_ORDER); i++) {
-               set_pte(page_table, entry);
-               page_table++;
-
-               pte_val(entry) += PAGE_SIZE;
-       }
-}
-
-/*
- * This function checks for proper alignment of input addr and len parameters.
- */
-int is_aligned_hugepage_range(unsigned long addr, unsigned long len)
-{
-       if (len & ~HPAGE_MASK)
-               return -EINVAL;
-       if (addr & ~HPAGE_MASK)
-               return -EINVAL;
-       return 0;
-}
-
-int copy_hugetlb_page_range(struct mm_struct *dst, struct mm_struct *src,
-                           struct vm_area_struct *vma)
-{
-       pte_t *src_pte, *dst_pte, entry;
-       struct page *ptepage;
-       unsigned long addr = vma->vm_start;
-       unsigned long end = vma->vm_end;
-       int i;
-
-       while (addr < end) {
-               dst_pte = huge_pte_alloc(dst, addr);
-               if (!dst_pte)
-                       goto nomem;
-               src_pte = huge_pte_offset(src, addr);
-               BUG_ON(!src_pte || pte_none(*src_pte));
-               entry = *src_pte;
-               ptepage = pte_page(entry);
-               get_page(ptepage);
-               for (i = 0; i < (1 << HUGETLB_PAGE_ORDER); i++) {
-                       set_pte(dst_pte, entry);
-                       pte_val(entry) += PAGE_SIZE;
-                       dst_pte++;
-               }
-               dst->rss += (HPAGE_SIZE / PAGE_SIZE);
-               addr += HPAGE_SIZE;
-       }
-       return 0;
-
-nomem:
-       return -ENOMEM;
-}
-
-int follow_hugetlb_page(struct mm_struct *mm, struct vm_area_struct *vma,
-                       struct page **pages, struct vm_area_struct **vmas,
-                       unsigned long *position, int *length, int i)
-{
-       unsigned long vaddr = *position;
-       int remainder = *length;
-
-       WARN_ON(!is_vm_hugetlb_page(vma));
-
-       while (vaddr < vma->vm_end && remainder) {
-               if (pages) {
-                       pte_t *pte;
-                       struct page *page;
-
-                       pte = huge_pte_offset(mm, vaddr);
-
-                       /* hugetlb should be locked, and hence, prefaulted */
-                       BUG_ON(!pte || pte_none(*pte));
-
-                       page = pte_page(*pte);
-
-                       WARN_ON(!PageCompound(page));
-
-                       get_page(page);
-                       pages[i] = page;
-               }
-
-               if (vmas)
-                       vmas[i] = vma;
-
-               vaddr += PAGE_SIZE;
-               --remainder;
-               ++i;
-       }
-
-       *length = remainder;
-       *position = vaddr;
-
-       return i;
-}
-
-struct page *follow_huge_addr(struct mm_struct *mm,
-                             unsigned long address, int write)
-{
-       return ERR_PTR(-EINVAL);
-}
-
-int pmd_huge(pmd_t pmd)
-{
-       return 0;
-}
-
-struct page *follow_huge_pmd(struct mm_struct *mm, unsigned long address,
-                            pmd_t *pmd, int write)
-{
-       return NULL;
-}
-
-void unmap_hugepage_range(struct vm_area_struct *vma,
-                         unsigned long start, unsigned long end)
-{
-       struct mm_struct *mm = vma->vm_mm;
-       unsigned long address;
-       pte_t *pte;
-       struct page *page;
-       int i;
-
-       BUG_ON(start & (HPAGE_SIZE - 1));
-       BUG_ON(end & (HPAGE_SIZE - 1));
-
-       for (address = start; address < end; address += HPAGE_SIZE) {
-               pte = huge_pte_offset(mm, address);
-               BUG_ON(!pte);
-               if (pte_none(*pte))
-                       continue;
-               page = pte_page(*pte);
-               put_page(page);
-               for (i = 0; i < (1 << HUGETLB_PAGE_ORDER); i++) {
-                       pte_clear(pte);
-                       pte++;
-               }
-       }
-       mm->rss -= (end - start) >> PAGE_SHIFT;
-       flush_tlb_range(vma, start, end);
-}
-
-int hugetlb_prefault(struct address_space *mapping, struct vm_area_struct *vma)
-{
-       struct mm_struct *mm = current->mm;
-       unsigned long addr;
-       int ret = 0;
-
-       BUG_ON(vma->vm_start & ~HPAGE_MASK);
-       BUG_ON(vma->vm_end & ~HPAGE_MASK);
-
-       spin_lock(&mm->page_table_lock);
-       for (addr = vma->vm_start; addr < vma->vm_end; addr += HPAGE_SIZE) {
-               unsigned long idx;
-               pte_t *pte = huge_pte_alloc(mm, addr);
-               struct page *page;
-
-               if (!pte) {
-                       ret = -ENOMEM;
-                       goto out;
-               }
-               if (!pte_none(*pte))
-                       continue;
-
-               idx = ((addr - vma->vm_start) >> HPAGE_SHIFT)
-                       + (vma->vm_pgoff >> (HPAGE_SHIFT - PAGE_SHIFT));
-               page = find_get_page(mapping, idx);
-               if (!page) {
-                       /* charge the fs quota first */
-                       if (hugetlb_get_quota(mapping)) {
-                               ret = -ENOMEM;
-                               goto out;
-                       }
-                       page = alloc_huge_page();
-                       if (!page) {
-                               hugetlb_put_quota(mapping);
-                               ret = -ENOMEM;
-                               goto out;
-                       }
-                       ret = add_to_page_cache(page, mapping, idx, GFP_ATOMIC);
-                       if (! ret) {
-                               unlock_page(page);
-                       } else {
-                               hugetlb_put_quota(mapping);
-                               free_huge_page(page);
-                               goto out;
-                       }
-               }
-               set_huge_pte(mm, vma, page, pte, vma->vm_flags & VM_WRITE);
-       }
-out:
-       spin_unlock(&mm->page_table_lock);
-       return ret;
-}
diff --git a/arch/sh64/mm/init.c b/arch/sh64/mm/init.c
deleted file mode 100644 (file)
index 17cdeb4..0000000
+++ /dev/null
@@ -1,199 +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.
- *
- * arch/sh64/mm/init.c
- *
- * Copyright (C) 2000, 2001  Paolo Alberelli
- * Copyright (C) 2003, 2004  Paul Mundt
- *
- */
-
-#include <linux/init.h>
-#include <linux/rwsem.h>
-#include <linux/mm.h>
-#include <linux/swap.h>
-#include <linux/bootmem.h>
-
-#include <asm/mmu_context.h>
-#include <asm/page.h>
-#include <asm/pgalloc.h>
-#include <asm/pgtable.h>
-#include <asm/tlb.h>
-
-#ifdef CONFIG_BLK_DEV_INITRD
-#include <linux/blk.h>
-#endif
-
-DEFINE_PER_CPU(struct mmu_gather, mmu_gathers);
-
-/*
- * Cache of MMU context last used.
- */
-unsigned long mmu_context_cache;
-pgd_t * mmu_pdtp_cache;
-int after_bootmem = 0;
-
-/*
- * BAD_PAGE is the page that is used for page faults when linux
- * is out-of-memory. Older versions of linux just did a
- * do_exit(), but using this instead means there is less risk
- * for a process dying in kernel mode, possibly leaving an inode
- * unused etc..
- *
- * BAD_PAGETABLE is the accompanying page-table: it is initialized
- * to point to BAD_PAGE entries.
- *
- * ZERO_PAGE is a special page that is used for zero-initialized
- * data and COW.
- */
-
-extern unsigned char empty_zero_page[PAGE_SIZE];
-extern unsigned char empty_bad_page[PAGE_SIZE];
-extern pte_t empty_bad_pte_table[PTRS_PER_PTE];
-extern pgd_t swapper_pg_dir[PTRS_PER_PGD];
-
-extern char _text, _etext, _edata, __bss_start, _end;
-extern char __init_begin, __init_end;
-
-/* It'd be good if these lines were in the standard header file. */
-#define START_PFN      (NODE_DATA(0)->bdata->node_boot_start >> PAGE_SHIFT)
-#define MAX_LOW_PFN    (NODE_DATA(0)->bdata->node_low_pfn)
-
-
-void show_mem(void)
-{
-       int i, total = 0, reserved = 0;
-       int shared = 0, cached = 0;
-
-       printk("Mem-info:\n");
-       show_free_areas();
-       printk("Free swap:       %6ldkB\n",nr_swap_pages<<(PAGE_SHIFT-10));
-       i = max_mapnr;
-       while (i-- > 0) {
-               total++;
-               if (PageReserved(mem_map+i))
-                       reserved++;
-               else if (PageSwapCache(mem_map+i))
-                       cached++;
-               else if (page_count(mem_map+i))
-                       shared += page_count(mem_map+i) - 1;
-       }
-       printk("%d pages of RAM\n",total);
-       printk("%d reserved pages\n",reserved);
-       printk("%d pages shared\n",shared);
-       printk("%d pages swap cached\n",cached);
-       printk("%ld pages in page table cache\n",pgtable_cache_size);
-}
-
-/*
- * paging_init() sets up the page tables.
- *
- * head.S already did a lot to set up address translation for the kernel.
- * Here we comes with:
- * . MMU enabled
- * . ASID set (SR)
- * .  some 512MB regions being mapped of which the most relevant here is:
- *   . CACHED segment (ASID 0 [irrelevant], shared AND NOT user)
- * . possible variable length regions being mapped as:
- *   . UNCACHED segment (ASID 0 [irrelevant], shared AND NOT user)
- * . All of the memory regions are placed, independently from the platform
- *   on high addresses, above 0x80000000.
- * . swapper_pg_dir is already cleared out by the .space directive
- *   in any case swapper does not require a real page directory since
- *   it's all kernel contained.
- *
- * Those pesky NULL-reference errors in the kernel are then
- * dealt with by not mapping address 0x00000000 at all.
- *
- */
-void __init paging_init(void)
-{
-       unsigned long zones_size[MAX_NR_ZONES] = {0, 0, 0};
-
-       pgd_init((unsigned long)swapper_pg_dir);
-       pgd_init((unsigned long)swapper_pg_dir +
-                sizeof(pgd_t) * USER_PTRS_PER_PGD);
-
-       mmu_context_cache = MMU_CONTEXT_FIRST_VERSION;
-
-        /*
-        * All memory is good as ZONE_NORMAL (fall-through) and ZONE_DMA.
-         */
-       zones_size[ZONE_DMA] = MAX_LOW_PFN - START_PFN;
-
-       free_area_init_node(0, NODE_DATA(0), 0, zones_size, __MEMORY_START >> PAGE_SHIFT, 0);
-
-       /* XXX: MRB-remove - this doesn't seem sane, should this be done somewhere else ?*/
-       mem_map = NODE_DATA(0)->node_mem_map;
-}
-
-void __init mem_init(void)
-{
-       int codesize, reservedpages, datasize, initsize;
-       int tmp;
-
-       max_mapnr = num_physpages = MAX_LOW_PFN - START_PFN;
-       high_memory = (void *)__va(MAX_LOW_PFN * PAGE_SIZE);
-
-       /*
-         * Clear the zero-page.
-         * This is not required but we might want to re-use
-         * this very page to pass boot parameters, one day.
-         */
-       memset(empty_zero_page, 0, PAGE_SIZE);
-
-       /* this will put all low memory onto the freelists */
-       totalram_pages += free_all_bootmem_node(NODE_DATA(0));
-       reservedpages = 0;
-       for (tmp = 0; tmp < num_physpages; tmp++)
-               /*
-                * Only count reserved RAM pages
-                */
-               if (PageReserved(mem_map+tmp))
-                       reservedpages++;
-
-       after_bootmem = 1;
-
-       codesize =  (unsigned long) &_etext - (unsigned long) &_text;
-       datasize =  (unsigned long) &_edata - (unsigned long) &_etext;
-       initsize =  (unsigned long) &__init_end - (unsigned long) &__init_begin;
-
-       printk("Memory: %luk/%luk available (%dk kernel code, %dk reserved, %dk data, %dk init)\n",
-               (unsigned long) nr_free_pages() << (PAGE_SHIFT-10),
-               max_mapnr << (PAGE_SHIFT-10),
-               codesize >> 10,
-               reservedpages << (PAGE_SHIFT-10),
-               datasize >> 10,
-               initsize >> 10);
-}
-
-void free_initmem(void)
-{
-       unsigned long addr;
-
-       addr = (unsigned long)(&__init_begin);
-       for (; addr < (unsigned long)(&__init_end); addr += PAGE_SIZE) {
-               ClearPageReserved(virt_to_page(addr));
-               set_page_count(virt_to_page(addr), 1);
-               free_page(addr);
-               totalram_pages++;
-       }
-       printk ("Freeing unused kernel memory: %ldk freed\n", (&__init_end - &__init_begin) >> 10);
-}
-
-#ifdef CONFIG_BLK_DEV_INITRD
-void free_initrd_mem(unsigned long start, unsigned long end)
-{
-       unsigned long p;
-       for (p = start; p < end; p += PAGE_SIZE) {
-               ClearPageReserved(virt_to_page(p));
-               set_page_count(virt_to_page(p), 1);
-               free_page(p);
-               totalram_pages++;
-       }
-       printk ("Freeing initrd memory: %ldk freed\n", (end - start) >> 10);
-}
-#endif
-
diff --git a/arch/sh64/mm/ioremap.c b/arch/sh64/mm/ioremap.c
deleted file mode 100644 (file)
index 8e05490..0000000
+++ /dev/null
@@ -1,469 +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.
- *
- * arch/sh64/mm/ioremap.c
- *
- * Copyright (C) 2000, 2001  Paolo Alberelli
- * Copyright (C) 2003, 2004  Paul Mundt
- *
- * Mostly derived from arch/sh/mm/ioremap.c which, in turn is mostly
- * derived from arch/i386/mm/ioremap.c .
- *
- *   (C) Copyright 1995 1996 Linus Torvalds
- */
-#include <linux/kernel.h>
-#include <linux/slab.h>
-#include <linux/vmalloc.h>
-#include <linux/sched.h>
-#include <linux/string.h>
-#include <asm/io.h>
-#include <asm/pgalloc.h>
-#include <asm/tlbflush.h>
-#include <linux/ioport.h>
-#include <linux/bootmem.h>
-#include <linux/proc_fs.h>
-
-static void shmedia_mapioaddr(unsigned long, unsigned long);
-static unsigned long shmedia_ioremap(struct resource *, u32, int);
-
-static inline void remap_area_pte(pte_t * pte, unsigned long address, unsigned long size,
-       unsigned long phys_addr, unsigned long flags)
-{
-       unsigned long end;
-       unsigned long pfn;
-       pgprot_t pgprot = __pgprot(_PAGE_PRESENT  | _PAGE_READ   |
-                                  _PAGE_WRITE    | _PAGE_DIRTY  |
-                                  _PAGE_ACCESSED | _PAGE_SHARED | flags);
-
-       address &= ~PMD_MASK;
-       end = address + size;
-       if (end > PMD_SIZE)
-               end = PMD_SIZE;
-       if (address >= end)
-               BUG();
-
-       pfn = phys_addr >> PAGE_SHIFT;
-
-       pr_debug("    %s: pte %p address %lx size %lx phys_addr %lx\n",
-                __FUNCTION__,pte,address,size,phys_addr);
-
-       do {
-               if (!pte_none(*pte)) {
-                       printk("remap_area_pte: page already exists\n");
-                       BUG();
-               }
-
-               set_pte(pte, pfn_pte(pfn, pgprot));
-               address += PAGE_SIZE;
-               pfn++;
-               pte++;
-       } while (address && (address < end));
-}
-
-static inline int remap_area_pmd(pmd_t * pmd, unsigned long address, unsigned long size,
-       unsigned long phys_addr, unsigned long flags)
-{
-       unsigned long end;
-
-       address &= ~PGDIR_MASK;
-       end = address + size;
-
-       if (end > PGDIR_SIZE)
-               end = PGDIR_SIZE;
-
-       phys_addr -= address;
-
-       if (address >= end)
-               BUG();
-
-       do {
-               pte_t * pte = pte_alloc_kernel(&init_mm, pmd, address);
-               if (!pte)
-                       return -ENOMEM;
-               remap_area_pte(pte, address, end - address, address + phys_addr, flags);
-               address = (address + PMD_SIZE) & PMD_MASK;
-               pmd++;
-       } while (address && (address < end));
-       return 0;
-}
-
-static int remap_area_pages(unsigned long address, unsigned long phys_addr,
-                                unsigned long size, unsigned long flags)
-{
-       int error;
-       pgd_t * dir;
-       unsigned long end = address + size;
-
-       phys_addr -= address;
-       dir = pgd_offset_k(address);
-       flush_cache_all();
-       if (address >= end)
-               BUG();
-       spin_lock(&init_mm.page_table_lock);
-       do {
-               pmd_t *pmd = pmd_alloc(&init_mm, dir, address);
-               error = -ENOMEM;
-               if (!pmd)
-                       break;
-               if (remap_area_pmd(pmd, address, end - address,
-                                  phys_addr + address, flags)) {
-                        break;
-               }
-               error = 0;
-               address = (address + PGDIR_SIZE) & PGDIR_MASK;
-               dir++;
-       } while (address && (address < end));
-       spin_unlock(&init_mm.page_table_lock);
-       flush_tlb_all();
-       return 0;
-}
-
-/*
- * Generic mapping function (not visible outside):
- */
-
-/*
- * Remap an arbitrary physical address space into the kernel virtual
- * address space. Needed when the kernel wants to access high addresses
- * directly.
- *
- * NOTE! We need to allow non-page-aligned mappings too: we will obviously
- * have to convert them into an offset in a page-aligned mapping, but the
- * caller shouldn't need to know that small detail.
- */
-void * __ioremap(unsigned long phys_addr, unsigned long size, unsigned long flags)
-{
-       void * addr;
-       struct vm_struct * area;
-       unsigned long offset, last_addr;
-
-       /* Don't allow wraparound or zero size */
-       last_addr = phys_addr + size - 1;
-       if (!size || last_addr < phys_addr)
-               return NULL;
-
-       /*
-        * Mappings have to be page-aligned
-        */
-       offset = phys_addr & ~PAGE_MASK;
-       phys_addr &= PAGE_MASK;
-       size = PAGE_ALIGN(last_addr + 1) - phys_addr;
-
-       /*
-        * Ok, go for it..
-        */
-       area = get_vm_area(size, VM_IOREMAP);
-       pr_debug("Get vm_area returns %p addr %p\n",area,area->addr);
-       if (!area)
-               return NULL;
-       area->phys_addr = phys_addr;
-       addr = area->addr;
-       if (remap_area_pages((unsigned long)addr, phys_addr, size, flags)) {
-               vunmap(addr);
-               return NULL;
-       }
-       return (void *) (offset + (char *)addr);
-}
-
-void iounmap(void *addr)
-{
-       struct vm_struct *area;
-
-       vfree((void *) (PAGE_MASK & (unsigned long) addr));
-       area = remove_vm_area((void *) (PAGE_MASK & (unsigned long) addr));
-       if (!area) {
-               printk(KERN_ERR "iounmap: bad address %p\n", addr);
-               return;
-       }
-
-       kfree(area);
-}
-
-static struct resource shmedia_iomap = {
-        .name  = "shmedia_iomap",
-       .start  = IOBASE_VADDR,
-       .end    = IOBASE_END - 1,
-};
-
-static void shmedia_mapioaddr(unsigned long pa, unsigned long va);
-static void shmedia_unmapioaddr(unsigned long vaddr);
-static unsigned long shmedia_ioremap(struct resource *res, u32 pa, int sz);
-
-/*
- * We have the same problem as the SPARC, so lets have the same comment:
- * Our mini-allocator...
- * Boy this is gross! We need it because we must map I/O for
- * timers and interrupt controller before the kmalloc is available.
- */
-
-#define XNMLN  15
-#define XNRES  10
-
-struct xresource {
-       struct resource xres;   /* Must be first */
-       int xflag;              /* 1 == used */
-       char xname[XNMLN+1];
-};
-
-static struct xresource xresv[XNRES];
-
-static struct xresource *xres_alloc(void)
-{
-        struct xresource *xrp;
-        int n;
-
-        xrp = xresv;
-        for (n = 0; n < XNRES; n++) {
-                if (xrp->xflag == 0) {
-                        xrp->xflag = 1;
-                        return xrp;
-                }
-                xrp++;
-        }
-        return NULL;
-}
-
-static void xres_free(struct xresource *xrp)
-{
-       xrp->xflag = 0;
-}
-
-static struct resource *shmedia_find_resource(struct resource *root,
-                                             unsigned long vaddr)
-{
-       struct resource *res;
-
-       for (res = root->child; res; res = res->sibling)
-               if (res->start <= vaddr && res->end >= vaddr)
-                       return res;
-
-       return NULL;
-}
-
-static unsigned long shmedia_alloc_io(unsigned long phys, unsigned long size,
-                                     const char *name)
-{
-        static int printed_full = 0;
-        struct xresource *xres;
-        struct resource *res;
-        char *tack;
-        int tlen;
-
-        if (name == NULL) name = "???";
-
-        if ((xres = xres_alloc()) != 0) {
-                tack = xres->xname;
-                res = &xres->xres;
-        } else {
-                if (!printed_full) {
-                        printk("%s: done with statics, switching to kmalloc\n",
-                              __FUNCTION__);
-                        printed_full = 1;
-                }
-                tlen = strlen(name);
-                tack = kmalloc(sizeof (struct resource) + tlen + 1, GFP_KERNEL);
-                if (!tack)
-                       return -ENOMEM;
-                memset(tack, 0, sizeof(struct resource));
-                res = (struct resource *) tack;
-                tack += sizeof (struct resource);
-        }
-
-        strncpy(tack, name, XNMLN);
-        tack[XNMLN] = 0;
-        res->name = tack;
-
-        return shmedia_ioremap(res, phys, size);
-}
-
-static unsigned long shmedia_ioremap(struct resource *res, u32 pa, int sz)
-{
-        unsigned long offset = ((unsigned long) pa) & (~PAGE_MASK);
-       unsigned long round_sz = (offset + sz + PAGE_SIZE-1) & PAGE_MASK;
-        unsigned long va;
-        unsigned int psz;
-
-        if (allocate_resource(&shmedia_iomap, res, round_sz,
-                             shmedia_iomap.start, shmedia_iomap.end,
-                             PAGE_SIZE, NULL, NULL) != 0) {
-                panic("alloc_io_res(%s): cannot occupy\n",
-                    (res->name != NULL)? res->name: "???");
-        }
-
-        va = res->start;
-        pa &= PAGE_MASK;
-
-       psz = (res->end - res->start + (PAGE_SIZE - 1)) / PAGE_SIZE;
-
-       /* log at boot time ... */
-       printk("mapioaddr: %6s  [%2d page%s]  va 0x%08lx   pa 0x%08x\n",
-              ((res->name != NULL) ? res->name : "???"),
-              psz, psz == 1 ? " " : "s", va, pa);
-
-        for (psz = res->end - res->start + 1; psz != 0; psz -= PAGE_SIZE) {
-                shmedia_mapioaddr(pa, va);
-                va += PAGE_SIZE;
-                pa += PAGE_SIZE;
-        }
-
-        res->start += offset;
-        res->end = res->start + sz - 1;         /* not strictly necessary.. */
-
-        return res->start;
-}
-
-static void shmedia_free_io(struct resource *res)
-{
-       unsigned long len = res->end - res->start + 1;
-
-       BUG_ON((len & (PAGE_SIZE - 1)) != 0);
-
-       while (len) {
-               len -= PAGE_SIZE;
-               shmedia_unmapioaddr(res->start + len);
-       }
-
-       release_resource(res);
-}
-
-static void *sh64_get_page(void)
-{
-       extern int after_bootmem;
-       void *page;
-
-       if (after_bootmem) {
-               page = (void *)get_zeroed_page(GFP_ATOMIC);
-       } else {
-               page = alloc_bootmem_pages(PAGE_SIZE);
-       }
-
-       if (!page || ((unsigned long)page & ~PAGE_MASK))
-               panic("sh64_get_page: Out of memory already?\n");
-
-       return page;
-}
-
-static void shmedia_mapioaddr(unsigned long pa, unsigned long va)
-{
-       pgd_t *pgdp;
-       pmd_t *pmdp;
-       pte_t *ptep, pte;
-       pgprot_t prot;
-       unsigned long flags = 1; /* 1 = CB0-1 device */
-
-       pr_debug("shmedia_mapiopage pa %08lx va %08lx\n",  pa, va);
-
-       pgdp = pgd_offset_k(va);
-       if (pgd_none(*pgdp) || !pgd_present(*pgdp)) {
-               pmdp = (pmd_t *)sh64_get_page();
-               set_pgd(pgdp, __pgd((unsigned long)pmdp | _KERNPG_TABLE));
-       }
-
-       pmdp = pmd_offset(pgdp, va);
-       if (pmd_none(*pmdp) || !pmd_present(*pmdp) ) {
-               ptep = (pte_t *)sh64_get_page();
-               set_pmd(pmdp, __pmd((unsigned long)ptep + _PAGE_TABLE));
-       }
-
-       prot = __pgprot(_PAGE_PRESENT | _PAGE_READ     | _PAGE_WRITE  |
-                       _PAGE_DIRTY   | _PAGE_ACCESSED | _PAGE_SHARED | flags);
-
-       pte = pfn_pte(pa >> PAGE_SHIFT, prot);
-       ptep = pte_offset_kernel(pmdp, va);
-
-       if (!pte_none(*ptep) &&
-           pte_val(*ptep) != pte_val(pte))
-               pte_ERROR(*ptep);
-
-       set_pte(ptep, pte);
-
-       flush_tlb_kernel_range(va, PAGE_SIZE);
-}
-
-static void shmedia_unmapioaddr(unsigned long vaddr)
-{
-       pgd_t *pgdp;
-       pmd_t *pmdp;
-       pte_t *ptep;
-
-       pgdp = pgd_offset_k(vaddr);
-       pmdp = pmd_offset(pgdp, vaddr);
-
-       if (pmd_none(*pmdp) || pmd_bad(*pmdp))
-               return;
-
-       ptep = pte_offset_kernel(pmdp, vaddr);
-
-       if (pte_none(*ptep) || !pte_present(*ptep))
-               return;
-
-       clear_page((void *)ptep);
-       pte_clear(ptep);
-}
-
-unsigned long onchip_remap(unsigned long phys, unsigned long size, const char *name)
-{
-       if (size < PAGE_SIZE)
-               size = PAGE_SIZE;
-
-       return shmedia_alloc_io(phys, size, name);
-}
-
-void onchip_unmap(unsigned long vaddr)
-{
-       struct resource *res;
-       unsigned int psz;
-
-       res = shmedia_find_resource(&shmedia_iomap, vaddr);
-       if (!res) {
-               printk(KERN_ERR "%s: Failed to free 0x%08lx\n",
-                      __FUNCTION__, vaddr);
-               return;
-       }
-
-        psz = (res->end - res->start + (PAGE_SIZE - 1)) / PAGE_SIZE;
-
-        printk(KERN_DEBUG "unmapioaddr: %6s  [%2d page%s] freed\n",
-              res->name, psz, psz == 1 ? " " : "s");
-
-       shmedia_free_io(res);
-
-       if ((char *)res >= (char *)xresv &&
-           (char *)res <  (char *)&xresv[XNRES]) {
-               xres_free((struct xresource *)res);
-       } else {
-               kfree(res);
-       }
-}
-
-#ifdef CONFIG_PROC_FS
-static int
-ioremap_proc_info(char *buf, char **start, off_t fpos, int length, int *eof,
-                 void *data)
-{
-       char *p = buf, *e = buf + length;
-       struct resource *r;
-       const char *nm;
-
-       for (r = ((struct resource *)data)->child; r != NULL; r = r->sibling) {
-               if (p + 32 >= e)        /* Better than nothing */
-                       break;
-               if ((nm = r->name) == 0) nm = "???";
-               p += sprintf(p, "%08lx-%08lx: %s\n", r->start, r->end, nm);
-       }
-
-       return p-buf;
-}
-#endif /* CONFIG_PROC_FS */
-
-static int __init register_proc_onchip(void)
-{
-#ifdef CONFIG_PROC_FS
-       create_proc_read_entry("io_map",0,0, ioremap_proc_info, &shmedia_iomap);
-#endif
-       return 0;
-}
-
-__initcall(register_proc_onchip);
diff --git a/arch/sh64/mm/tlb.c b/arch/sh64/mm/tlb.c
deleted file mode 100644 (file)
index d517e7d..0000000
+++ /dev/null
@@ -1,166 +0,0 @@
-/*
- * arch/sh64/mm/tlb.c
- *
- * Copyright (C) 2003  Paul Mundt <lethal@linux-sh.org>
- * Copyright (C) 2003  Richard Curnow <richard.curnow@superh.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/mm.h>
-#include <linux/init.h>
-#include <asm/page.h>
-#include <asm/tlb.h>
-#include <asm/mmu_context.h>
-
-/**
- * sh64_tlb_init
- *
- * Perform initial setup for the DTLB and ITLB.
- */
-int __init sh64_tlb_init(void)
-{
-       /* Assign some sane DTLB defaults */
-       cpu_data->dtlb.entries  = 64;
-       cpu_data->dtlb.step     = 0x10;
-
-       cpu_data->dtlb.first    = DTLB_FIXED | cpu_data->dtlb.step;
-       cpu_data->dtlb.next     = cpu_data->dtlb.first;
-
-       cpu_data->dtlb.last     = DTLB_FIXED |
-                                 ((cpu_data->dtlb.entries - 1) *
-                                  cpu_data->dtlb.step);
-
-       /* And again for the ITLB */
-       cpu_data->itlb.entries  = 64;
-       cpu_data->itlb.step     = 0x10;
-
-       cpu_data->itlb.first    = ITLB_FIXED | cpu_data->itlb.step;
-       cpu_data->itlb.next     = cpu_data->itlb.first;
-       cpu_data->itlb.last     = ITLB_FIXED |
-                                 ((cpu_data->itlb.entries - 1) *
-                                  cpu_data->itlb.step);
-
-       return 0;
-}
-
-/**
- * sh64_next_free_dtlb_entry
- *
- * Find the next available DTLB entry
- */
-unsigned long long sh64_next_free_dtlb_entry(void)
-{
-       return cpu_data->dtlb.next;
-}
-
-/**
- * sh64_get_wired_dtlb_entry
- *
- * Allocate a wired (locked-in) entry in the DTLB
- */
-unsigned long long sh64_get_wired_dtlb_entry(void)
-{
-       unsigned long long entry = sh64_next_free_dtlb_entry();
-
-       cpu_data->dtlb.first += cpu_data->dtlb.step;
-       cpu_data->dtlb.next  += cpu_data->dtlb.step;
-
-       return entry;
-}
-
-/**
- * sh64_put_wired_dtlb_entry
- *
- * @entry:     Address of TLB slot.
- *
- * Free a wired (locked-in) entry in the DTLB.
- *
- * Works like a stack, last one to allocate must be first one to free.
- */
-int sh64_put_wired_dtlb_entry(unsigned long long entry)
-{
-       __flush_tlb_slot(entry);
-
-       /*
-        * We don't do any particularly useful tracking of wired entries,
-        * so this approach works like a stack .. last one to be allocated
-        * has to be the first one to be freed.
-        *
-        * We could potentially load wired entries into a list and work on
-        * rebalancing the list periodically (which also entails moving the
-        * contents of a TLB entry) .. though I have a feeling that this is
-        * more trouble than it's worth.
-        */
-
-       /*
-        * Entry must be valid .. we don't want any ITLB addresses!
-        */
-       if (entry <= DTLB_FIXED)
-               return -EINVAL;
-
-       /*
-        * Next, check if we're within range to be freed. (ie, must be the
-        * entry beneath the first 'free' entry!
-        */
-       if (entry < (cpu_data->dtlb.first - cpu_data->dtlb.step))
-               return -EINVAL;
-
-       /* If we are, then bring this entry back into the list */
-       cpu_data->dtlb.first    -= cpu_data->dtlb.step;
-       cpu_data->dtlb.next     = entry;
-
-       return 0;
-}
-
-/**
- * sh64_setup_tlb_slot
- *
- * @config_addr:       Address of TLB slot.
- * @eaddr:             Virtual address.
- * @asid:              Address Space Identifier.
- * @paddr:             Physical address.
- *
- * Load up a virtual<->physical translation for @eaddr<->@paddr in the
- * pre-allocated TLB slot @config_addr (see sh64_get_wired_dtlb_entry).
- */
-inline void sh64_setup_tlb_slot(unsigned long long config_addr,
-                               unsigned long eaddr,
-                               unsigned long asid,
-                               unsigned long paddr)
-{
-       unsigned long long pteh, ptel;
-
-       /* Sign extension */
-#if (NEFF == 32)
-       pteh = (unsigned long long)(signed long long)(signed long) eaddr;
-#else
-#error "Can't sign extend more than 32 bits yet"
-#endif
-       pteh &= PAGE_MASK;
-       pteh |= (asid << PTEH_ASID_SHIFT) | PTEH_VALID;
-#if (NEFF == 32)
-       ptel = (unsigned long long)(signed long long)(signed long) paddr;
-#else
-#error "Can't sign extend more than 32 bits yet"
-#endif
-       ptel &= PAGE_MASK;
-       ptel |= (_PAGE_CACHABLE | _PAGE_READ | _PAGE_WRITE);
-
-       asm volatile("putcfg %0, 1, %1\n\t"
-                       "putcfg %0, 0, %2\n"
-                       : : "r" (config_addr), "r" (ptel), "r" (pteh));
-}
-
-/**
- * sh64_teardown_tlb_slot
- *
- * @config_addr:       Address of TLB slot.
- *
- * Teardown any existing mapping in the TLB slot @config_addr.
- */
-inline void sh64_teardown_tlb_slot(unsigned long long config_addr)
-       __attribute__ ((alias("__flush_tlb_slot")));
-
diff --git a/arch/sh64/mm/tlbmiss.c b/arch/sh64/mm/tlbmiss.c
deleted file mode 100644 (file)
index a69f775..0000000
+++ /dev/null
@@ -1,282 +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.
- *
- * arch/sh64/mm/tlbmiss.c
- *
- * Original code from fault.c
- * Copyright (C) 2000, 2001  Paolo Alberelli
- *
- * Fast PTE->TLB refill path
- * Copyright (C) 2003 Richard.Curnow@superh.com
- *
- * IMPORTANT NOTES :
- * The do_fast_page_fault function is called from a context in entry.S where very few registers
- * have been saved.  In particular, the code in this file must be compiled not to use ANY
- * caller-save regiseters that are not part of the restricted save set.  Also, it means that
- * code in this file must not make calls to functions elsewhere in the kernel, or else the
- * excepting context will see corruption in its caller-save registers.  Plus, the entry.S save
- * area is non-reentrant, so this code has to run with SR.BL==1, i.e. no interrupts taken inside
- * it and panic on any exception.
- *
- */
-
-#include <linux/signal.h>
-#include <linux/sched.h>
-#include <linux/kernel.h>
-#include <linux/errno.h>
-#include <linux/string.h>
-#include <linux/types.h>
-#include <linux/ptrace.h>
-#include <linux/mman.h>
-#include <linux/mm.h>
-#include <linux/smp.h>
-#include <linux/smp_lock.h>
-#include <linux/interrupt.h>
-
-#include <asm/system.h>
-#include <asm/tlb.h>
-#include <asm/io.h>
-#include <asm/uaccess.h>
-#include <asm/pgalloc.h>
-#include <asm/hardirq.h>
-#include <asm/mmu_context.h>
-#include <asm/registers.h>             /* required by inline asm statements */
-
-/* Callable from fault.c, so not static */
-inline void __do_tlb_refill(unsigned long address,
-                            unsigned long long is_text_not_data, pte_t *pte)
-{
-       unsigned long long ptel;
-       unsigned long long pteh=0;
-       struct tlb_info *tlbp;
-       unsigned long long next;
-
-       /* Get PTEL first */
-       ptel = pte_val(*pte);
-
-       /*
-        * Set PTEH register
-        */
-       pteh = address & MMU_VPN_MASK;
-
-       /* Sign extend based on neff. */
-#if (NEFF == 32)
-       /* Faster sign extension */
-       pteh = (unsigned long long)(signed long long)(signed long)pteh;
-#else
-       /* General case */
-       pteh = (pteh & NEFF_SIGN) ? (pteh | NEFF_MASK) : pteh;
-#endif
-
-       /* Set the ASID. */
-       pteh |= get_asid() << PTEH_ASID_SHIFT;
-       pteh |= PTEH_VALID;
-
-       /* Set PTEL register, set_pte has performed the sign extension */
-       ptel &= _PAGE_FLAGS_HARDWARE_MASK; /* drop software flags */
-       ptel |= _PAGE_FLAGS_HARDWARE_DEFAULT; /* add default flags */
-
-       tlbp = is_text_not_data ? &(cpu_data->itlb) : &(cpu_data->dtlb);
-       next = tlbp->next;
-       __flush_tlb_slot(next);
-       asm volatile ("putcfg %0,1,%2\n\n\t"
-                     "putcfg %0,0,%1\n"
-                     :  : "r" (next), "r" (pteh), "r" (ptel) );
-
-       next += TLB_STEP;
-       if (next > tlbp->last) next = tlbp->first;
-       tlbp->next = next;
-
-}
-
-static int handle_vmalloc_fault(struct mm_struct *mm, unsigned long protection_flags,
-                                unsigned long long textaccess,
-                               unsigned long address)
-{
-       pgd_t *dir;
-       pmd_t *pmd;
-       static pte_t *pte;
-       pte_t entry;
-
-       dir = pgd_offset_k(address);
-       pmd = pmd_offset(dir, address);
-
-       if (pmd_none(*pmd)) {
-               return 0;
-       }
-
-       if (pmd_bad(*pmd)) {
-               pmd_clear(pmd);
-               return 0;
-       }
-
-       pte = pte_offset_kernel(pmd, address);
-       entry = *pte;
-
-       if (pte_none(entry) || !pte_present(entry)) {
-               return 0;
-       }
-
-       if ((pte_val(entry) & protection_flags) != protection_flags) {
-               return 0;
-       }
-
-        __do_tlb_refill(address, textaccess, pte);
-
-       return 1;
-}
-
-static int handle_tlbmiss(struct mm_struct *mm, unsigned long long protection_flags,
-                       unsigned long long textaccess,
-                       unsigned long address)
-{
-       pgd_t *dir;
-       pmd_t *pmd;
-       pte_t *pte;
-       pte_t entry;
-
-       /* NB. The PGD currently only contains a single entry - there is no
-          page table tree stored for the top half of the address space since
-          virtual pages in that region should never be mapped in user mode.
-          (In kernel mode, the only things in that region are the 512Mb super
-          page (locked in), and vmalloc (modules) +  I/O device pages (handled
-          by handle_vmalloc_fault), so no PGD for the upper half is required
-          by kernel mode either).
-
-          See how mm->pgd is allocated and initialised in pgd_alloc to see why
-          the next test is necessary.  - RPC */
-       if (address >= (unsigned long) TASK_SIZE) {
-               /* upper half - never has page table entries. */
-               return 0;
-       }
-       dir = pgd_offset(mm, address);
-       if (pgd_none(*dir)) {
-               return 0;
-       }
-       if (!pgd_present(*dir)) {
-               return 0;
-       }
-
-       pmd = pmd_offset(dir, address);
-       if (pmd_none(*pmd)) {
-               return 0;
-       }
-       if (!pmd_present(*pmd)) {
-               return 0;
-       }
-       pte = pte_offset_kernel(pmd, address);
-       entry = *pte;
-       if (pte_none(entry)) {
-               return 0;
-       }
-       if (!pte_present(entry)) {
-               return 0;
-       }
-
-       /* If the page doesn't have sufficient protection bits set to service the
-          kind of fault being handled, there's not much point doing the TLB refill.
-          Punt the fault to the general handler. */
-       if ((pte_val(entry) & protection_flags) != protection_flags) {
-               return 0;
-       }
-
-        __do_tlb_refill(address, textaccess, pte);
-
-       return 1;
-}
-
-/* Put all this information into one structure so that everything is just arithmetic
-   relative to a single base address.  This reduces the number of movi/shori pairs needed
-   just to load addresses of static data. */
-struct expevt_lookup {
-       unsigned short protection_flags[8];
-       unsigned char  is_text_access[8];
-       unsigned char  is_write_access[8];
-};
-
-#define PRU (1<<9)
-#define PRW (1<<8)
-#define PRX (1<<7)
-#define PRR (1<<6)
-
-#define DIRTY (_PAGE_DIRTY | _PAGE_ACCESSED)
-#define YOUNG (_PAGE_ACCESSED)
-
-/* Sized as 8 rather than 4 to allow checking the PTE's PRU bit against whether
-   the fault happened in user mode or privileged mode. */
-static struct expevt_lookup expevt_lookup_table = {
-       .protection_flags = {PRX, PRX, 0, 0, PRR, PRR, PRW, PRW},
-       .is_text_access   = {1,   1,   0, 0, 0,   0,   0,   0}
-};
-
-/*
-   This routine handles page faults that can be serviced just by refilling a
-   TLB entry from an existing page table entry.  (This case represents a very
-   large majority of page faults.) Return 1 if the fault was successfully
-   handled.  Return 0 if the fault could not be handled.  (This leads into the
-   general fault handling in fault.c which deals with mapping file-backed
-   pages, stack growth, segmentation faults, swapping etc etc)
- */
-asmlinkage int do_fast_page_fault(unsigned long long ssr_md, unsigned long long expevt,
-                                 unsigned long address)
-{
-       struct task_struct *tsk;
-       struct mm_struct *mm;
-       unsigned long long textaccess;
-       unsigned long long protection_flags;
-       unsigned long long index;
-       unsigned long long expevt4;
-
-       /* The next few lines implement a way of hashing EXPEVT into a small array index
-          which can be used to lookup parameters specific to the type of TLBMISS being
-          handled.  Note:
-          ITLBMISS has EXPEVT==0xa40
-          RTLBMISS has EXPEVT==0x040
-          WTLBMISS has EXPEVT==0x060
-       */
-
-       expevt4 = (expevt >> 4);
-       /* TODO : xor ssr_md into this expression too.  Then we can check that PRU is set
-          when it needs to be. */
-       index = expevt4 ^ (expevt4 >> 5);
-       index &= 7;
-       protection_flags = expevt_lookup_table.protection_flags[index];
-       textaccess       = expevt_lookup_table.is_text_access[index];
-
-#ifdef CONFIG_SH64_PROC_TLB
-       ++calls_to_do_fast_page_fault;
-#endif
-
-       /* SIM
-        * Note this is now called with interrupts still disabled
-        * This is to cope with being called for a missing IO port
-        * address with interupts disabled. This should be fixed as
-        * soon as we have a better 'fast path' miss handler.
-        *
-        * Plus take care how you try and debug this stuff.
-        * For example, writing debug data to a port which you
-        * have just faulted on is not going to work.
-        */
-
-       tsk = current;
-       mm = tsk->mm;
-
-       if ((address >= VMALLOC_START && address < VMALLOC_END) ||
-           (address >= IOBASE_VADDR  && address < IOBASE_END)) {
-               if (ssr_md) {
-                       /* Process-contexts can never have this address range mapped */
-                       if (handle_vmalloc_fault(mm, protection_flags, textaccess, address)) {
-                               return 1;
-                       }
-               }
-       } else if (!in_interrupt() && mm) {
-               if (handle_tlbmiss(mm, protection_flags, textaccess, address)) {
-                       return 1;
-               }
-       }
-
-       return 0;
-}
-
diff --git a/arch/sh64/oprofile/Kconfig b/arch/sh64/oprofile/Kconfig
deleted file mode 100644 (file)
index 19d3773..0000000
+++ /dev/null
@@ -1,23 +0,0 @@
-
-menu "Profiling support"
-       depends on EXPERIMENTAL
-
-config PROFILING
-       bool "Profiling support (EXPERIMENTAL)"
-       help
-         Say Y here to enable the extended profiling support mechanisms used
-         by profilers such as OProfile.
-
-
-config OPROFILE
-       tristate "OProfile system profiling (EXPERIMENTAL)"
-       depends on PROFILING
-       help
-         OProfile is a profiling system capable of profiling the
-         whole system, include the kernel, kernel modules, libraries,
-         and applications.
-
-         If unsure, say N.
-
-endmenu
-
diff --git a/arch/sh64/oprofile/Makefile b/arch/sh64/oprofile/Makefile
deleted file mode 100644 (file)
index 11a451f..0000000
+++ /dev/null
@@ -1,12 +0,0 @@
-obj-$(CONFIG_OPROFILE) += oprofile.o
-
-DRIVER_OBJS = $(addprefix ../../../drivers/oprofile/, \
-               oprof.o cpu_buffer.o buffer_sync.o \
-               event_buffer.o oprofile_files.o \
-               oprofilefs.o oprofile_stats.o \
-               timer_int.o )
-
-profdrvr-y                             := op_model_null.o
-
-oprofile-y                             := $(DRIVER_OBJS) $(profdrvr-y)
-
diff --git a/arch/sh64/oprofile/op_model_null.c b/arch/sh64/oprofile/op_model_null.c
deleted file mode 100644 (file)
index f1c795f..0000000
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * arch/sh/oprofile/op_model_null.c
- *
- * Copyright (C) 2003  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/kernel.h>
-#include <linux/oprofile.h>
-#include <linux/init.h>
-#include <linux/errno.h>
-
-int __init oprofile_arch_init(struct oprofile_operations **ops)
-{
-       return -ENODEV;
-}
-
-void oprofile_arch_exit(void)
-{
-}
-
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/crypto/mpi/Makefile b/crypto/mpi/Makefile
deleted file mode 100644 (file)
index e96597d..0000000
+++ /dev/null
@@ -1,30 +0,0 @@
-#
-# MPI multiprecision maths library (from gpg) 
-#
-
-obj-$(CONFIG_CRYPTO_MPILIB) = \
-       generic_mpih-lshift.o           \
-       generic_mpih-mul1.o             \
-       generic_mpih-mul2.o             \
-       generic_mpih-mul3.o             \
-       generic_mpih-rshift.o           \
-       generic_mpih-sub1.o             \
-       generic_mpih-add1.o             \
-       generic_udiv-w-sdiv.o           \
-       mpicoder.o                      \
-       mpi-add.o                       \
-       mpi-bit.o                       \
-       mpi-div.o                       \
-       mpi-cmp.o                       \
-       mpi-gcd.o                       \
-       mpih-cmp.o                      \
-       mpih-div.o                      \
-       mpih-mul.o                      \
-       mpi-inline.o                    \
-       mpi-inv.o                       \
-       mpi-mpow.o                      \
-       mpi-mul.o                       \
-       mpi-pow.o                       \
-       mpi-scan.o                      \
-       mpiutil.o
-
diff --git a/crypto/mpi/generic_mpi-asm-defs.h b/crypto/mpi/generic_mpi-asm-defs.h
deleted file mode 100644 (file)
index 13424e2..0000000
+++ /dev/null
@@ -1,10 +0,0 @@
-/* This file defines some basic constants for the MPI machinery.  We
- * need to define the types on a per-CPU basis, so it is done with
- * this file here.  */
-#define BYTES_PER_MPI_LIMB  (SIZEOF_UNSIGNED_LONG)
-
-
-
-
-
-
diff --git a/crypto/mpi/generic_mpih-add1.c b/crypto/mpi/generic_mpih-add1.c
deleted file mode 100644 (file)
index 891fef0..0000000
+++ /dev/null
@@ -1,62 +0,0 @@
-/* mpihelp-add_1.c  -  MPI helper functions
- * Copyright (C) 1994, 1996, 1997, 1998, 
- *               2000 Free Software Foundation, Inc.
- *
- * This file is part of GnuPG.
- *
- * GnuPG 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.
- *
- * GnuPG 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
- *
- * Note: This code is heavily based on the GNU MP Library.
- *      Actually it's the same code with only minor changes in the
- *      way the data is stored; this is to support the abstraction
- *      of an optional secure memory allocation which may be used
- *      to avoid revealing of sensitive data due to paging etc.
- *      The GNU MP Library itself is published under the LGPL;
- *      however I decided to publish this code under the plain GPL.
- */
-
-#include "mpi-internal.h"
-#include "longlong.h"
-
-mpi_limb_t
-mpihelp_add_n( mpi_ptr_t res_ptr, mpi_ptr_t s1_ptr,
-              mpi_ptr_t s2_ptr, mpi_size_t size)
-{
-    mpi_limb_t x, y, cy;
-    mpi_size_t j;
-
-    /* The loop counter and index J goes from -SIZE to -1.  This way
-       the loop becomes faster.  */
-    j = -size;
-
-    /* Offset the base pointers to compensate for the negative indices. */
-    s1_ptr -= j;
-    s2_ptr -= j;
-    res_ptr -= j;
-
-    cy = 0;
-    do {
-       y = s2_ptr[j];
-       x = s1_ptr[j];
-       y += cy;                  /* add previous carry to one addend */
-       cy = y < cy;              /* get out carry from that addition */
-       y += x;                   /* add other addend */
-       cy += y < x;              /* get out carry from that add, combine */
-       res_ptr[j] = y;
-    } while( ++j );
-
-    return cy;
-}
-
diff --git a/crypto/mpi/generic_mpih-lshift.c b/crypto/mpi/generic_mpih-lshift.c
deleted file mode 100644 (file)
index 9e159b5..0000000
+++ /dev/null
@@ -1,66 +0,0 @@
-/* mpihelp-lshift.c  - MPI helper functions
- * Copyright (C) 1994, 1996, 1998, 2001 Free Software Foundation, Inc.
- *
- * This file is part of GnuPG.
- *
- * GnuPG 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.
- *
- * GnuPG 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
- *
- * Note: This code is heavily based on the GNU MP Library.
- *      Actually it's the same code with only minor changes in the
- *      way the data is stored; this is to support the abstraction
- *      of an optional secure memory allocation which may be used
- *      to avoid revealing of sensitive data due to paging etc.
- *      The GNU MP Library itself is published under the LGPL;
- *      however I decided to publish this code under the plain GPL.
- */
-
-#include "mpi-internal.h"
-
-/* Shift U (pointed to by UP and USIZE digits long) CNT bits to the left
- * and store the USIZE least significant digits of the result at WP.
- * Return the bits shifted out from the most significant digit.
- *
- * Argument constraints:
- * 1. 0 < CNT < BITS_PER_MP_LIMB
- * 2. If the result is to be written over the input, WP must be >= UP.
- */
-
-mpi_limb_t
-mpihelp_lshift( mpi_ptr_t wp, mpi_ptr_t up, mpi_size_t usize,
-                                           unsigned int cnt)
-{
-    mpi_limb_t high_limb, low_limb;
-    unsigned sh_1, sh_2;
-    mpi_size_t i;
-    mpi_limb_t retval;
-
-    sh_1 = cnt;
-    wp += 1;
-    sh_2 = BITS_PER_MPI_LIMB - sh_1;
-    i = usize - 1;
-    low_limb = up[i];
-    retval = low_limb >> sh_2;
-    high_limb = low_limb;
-    while( --i >= 0 ) {
-       low_limb = up[i];
-       wp[i] = (high_limb << sh_1) | (low_limb >> sh_2);
-       high_limb = low_limb;
-    }
-    wp[i] = high_limb << sh_1;
-
-    return retval;
-}
-
-
diff --git a/crypto/mpi/generic_mpih-mul1.c b/crypto/mpi/generic_mpih-mul1.c
deleted file mode 100644 (file)
index 4e34d46..0000000
+++ /dev/null
@@ -1,58 +0,0 @@
-/* mpihelp-mul_1.c  -  MPI helper functions
- * Copyright (C) 1994, 1996, 1997, 1998, 2001 Free Software Foundation, Inc.
- *
- * This file is part of GnuPG.
- *
- * GnuPG 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.
- *
- * GnuPG 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
- *
- * Note: This code is heavily based on the GNU MP Library.
- *      Actually it's the same code with only minor changes in the
- *      way the data is stored; this is to support the abstraction
- *      of an optional secure memory allocation which may be used
- *      to avoid revealing of sensitive data due to paging etc.
- *      The GNU MP Library itself is published under the LGPL;
- *      however I decided to publish this code under the plain GPL.
- */
-
-#include "mpi-internal.h"
-#include "longlong.h"
-
-mpi_limb_t
-mpihelp_mul_1( mpi_ptr_t res_ptr, mpi_ptr_t s1_ptr, mpi_size_t s1_size,
-                                                   mpi_limb_t s2_limb)
-{
-    mpi_limb_t cy_limb;
-    mpi_size_t j;
-    mpi_limb_t prod_high, prod_low;
-
-    /* The loop counter and index J goes from -S1_SIZE to -1.  This way
-     * the loop becomes faster.  */
-    j = -s1_size;
-
-    /* Offset the base pointers to compensate for the negative indices.  */
-    s1_ptr -= j;
-    res_ptr -= j;
-
-    cy_limb = 0;
-    do {
-       umul_ppmm( prod_high, prod_low, s1_ptr[j], s2_limb );
-       prod_low += cy_limb;
-       cy_limb = (prod_low < cy_limb?1:0) + prod_high;
-       res_ptr[j] = prod_low;
-    } while( ++j );
-
-    return cy_limb;
-}
-
diff --git a/crypto/mpi/generic_mpih-mul2.c b/crypto/mpi/generic_mpih-mul2.c
deleted file mode 100644 (file)
index c1f41f3..0000000
+++ /dev/null
@@ -1,63 +0,0 @@
-/* mpihelp-mul_2.c  -  MPI helper functions
- * Copyright (C) 1994, 1996, 1997, 1998, 2001 Free Software Foundation, Inc.
- *
- * This file is part of GnuPG.
- *
- * GnuPG 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.
- *
- * GnuPG 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
- *
- * Note: This code is heavily based on the GNU MP Library.
- *      Actually it's the same code with only minor changes in the
- *      way the data is stored; this is to support the abstraction
- *      of an optional secure memory allocation which may be used
- *      to avoid revealing of sensitive data due to paging etc.
- *      The GNU MP Library itself is published under the LGPL;
- *      however I decided to publish this code under the plain GPL.
- */
-
-#include "mpi-internal.h"
-#include "longlong.h"
-
-
-mpi_limb_t
-mpihelp_addmul_1( mpi_ptr_t res_ptr, mpi_ptr_t s1_ptr,
-                 mpi_size_t s1_size, mpi_limb_t s2_limb)
-{
-    mpi_limb_t cy_limb;
-    mpi_size_t j;
-    mpi_limb_t prod_high, prod_low;
-    mpi_limb_t x;
-
-    /* The loop counter and index J goes from -SIZE to -1.  This way
-     * the loop becomes faster.  */
-    j = -s1_size;
-    res_ptr -= j;
-    s1_ptr -= j;
-
-    cy_limb = 0;
-    do {
-       umul_ppmm( prod_high, prod_low, s1_ptr[j], s2_limb );
-
-       prod_low += cy_limb;
-       cy_limb = (prod_low < cy_limb?1:0) + prod_high;
-
-       x = res_ptr[j];
-       prod_low = x + prod_low;
-       cy_limb += prod_low < x?1:0;
-       res_ptr[j] = prod_low;
-    } while ( ++j );
-    return cy_limb;
-}
-
-
diff --git a/crypto/mpi/generic_mpih-mul3.c b/crypto/mpi/generic_mpih-mul3.c
deleted file mode 100644 (file)
index 6b1d04b..0000000
+++ /dev/null
@@ -1,64 +0,0 @@
-/* mpihelp-mul_3.c  -  MPI helper functions
- * Copyright (C) 1994, 1996, 1997, 1998, 2001 Free Software Foundation, Inc.
- *
- * This file is part of GnuPG.
- *
- * GnuPG 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.
- *
- * GnuPG 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
- *
- * Note: This code is heavily based on the GNU MP Library.
- *      Actually it's the same code with only minor changes in the
- *      way the data is stored; this is to support the abstraction
- *      of an optional secure memory allocation which may be used
- *      to avoid revealing of sensitive data due to paging etc.
- *      The GNU MP Library itself is published under the LGPL;
- *      however I decided to publish this code under the plain GPL.
- */
-
-#include "mpi-internal.h"
-#include "longlong.h"
-
-
-mpi_limb_t
-mpihelp_submul_1( mpi_ptr_t res_ptr, mpi_ptr_t s1_ptr,
-                 mpi_size_t s1_size, mpi_limb_t s2_limb)
-{
-    mpi_limb_t cy_limb;
-    mpi_size_t j;
-    mpi_limb_t prod_high, prod_low;
-    mpi_limb_t x;
-
-    /* The loop counter and index J goes from -SIZE to -1.  This way
-     * the loop becomes faster.  */
-    j = -s1_size;
-    res_ptr -= j;
-    s1_ptr -= j;
-
-    cy_limb = 0;
-    do {
-       umul_ppmm( prod_high, prod_low, s1_ptr[j], s2_limb);
-
-       prod_low += cy_limb;
-       cy_limb = (prod_low < cy_limb?1:0) + prod_high;
-
-       x = res_ptr[j];
-       prod_low = x - prod_low;
-       cy_limb += prod_low > x?1:0;
-       res_ptr[j] = prod_low;
-    } while( ++j );
-
-    return cy_limb;
-}
-
-
diff --git a/crypto/mpi/generic_mpih-rshift.c b/crypto/mpi/generic_mpih-rshift.c
deleted file mode 100644 (file)
index 0fc3bc8..0000000
+++ /dev/null
@@ -1,65 +0,0 @@
-/* mpih-rshift.c  -  MPI helper functions
- * Copyright (C) 1994, 1996, 1998, 1999,
- *               2000, 2001 Free Software Foundation, Inc.
- *
- * This file is part of GNUPG
- *
- * GNUPG 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.
- *
- * GNUPG 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
- *
- * Note: This code is heavily based on the GNU MP Library.
- *      Actually it's the same code with only minor changes in the
- *      way the data is stored; this is to support the abstraction
- *      of an optional secure memory allocation which may be used
- *      to avoid revealing of sensitive data due to paging etc.
- *      The GNU MP Library itself is published under the LGPL;
- *      however I decided to publish this code under the plain GPL.
- */
-
-#include "mpi-internal.h"
-
-
-/* Shift U (pointed to by UP and USIZE limbs long) CNT bits to the right
- * and store the USIZE least significant limbs of the result at WP.
- * The bits shifted out to the right are returned.
- *
- * Argument constraints:
- * 1. 0 < CNT < BITS_PER_MP_LIMB
- * 2. If the result is to be written over the input, WP must be <= UP.
- */
-
-mpi_limb_t
-mpihelp_rshift( mpi_ptr_t wp, mpi_ptr_t up, mpi_size_t usize, unsigned cnt)
-{
-    mpi_limb_t high_limb, low_limb;
-    unsigned sh_1, sh_2;
-    mpi_size_t i;
-    mpi_limb_t retval;
-
-    sh_1 = cnt;
-    wp -= 1;
-    sh_2 = BITS_PER_MPI_LIMB - sh_1;
-    high_limb = up[0];
-    retval = high_limb << sh_2;
-    low_limb = high_limb;
-    for( i=1; i < usize; i++) {
-       high_limb = up[i];
-       wp[i] = (low_limb >> sh_1) | (high_limb << sh_2);
-       low_limb = high_limb;
-    }
-    wp[i] = low_limb >> sh_1;
-
-    return retval;
-}
-
diff --git a/crypto/mpi/generic_mpih-sub1.c b/crypto/mpi/generic_mpih-sub1.c
deleted file mode 100644 (file)
index 9c78f15..0000000
+++ /dev/null
@@ -1,62 +0,0 @@
-/* mpihelp-add_2.c  -  MPI helper functions
- * Copyright (C) 1994, 1996, 1997, 1998, 2001 Free Software Foundation, Inc.
- *
- * This file is part of GnuPG.
- *
- * GnuPG 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.
- *
- * GnuPG 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
- *
- * Note: This code is heavily based on the GNU MP Library.
- *      Actually it's the same code with only minor changes in the
- *      way the data is stored; this is to support the abstraction
- *      of an optional secure memory allocation which may be used
- *      to avoid revealing of sensitive data due to paging etc.
- *      The GNU MP Library itself is published under the LGPL;
- *      however I decided to publish this code under the plain GPL.
- */
-
-#include "mpi-internal.h"
-#include "longlong.h"
-
-mpi_limb_t
-mpihelp_sub_n( mpi_ptr_t res_ptr, mpi_ptr_t s1_ptr,
-                                 mpi_ptr_t s2_ptr, mpi_size_t size)
-{
-    mpi_limb_t x, y, cy;
-    mpi_size_t j;
-
-    /* The loop counter and index J goes from -SIZE to -1.  This way
-       the loop becomes faster.  */
-    j = -size;
-
-    /* Offset the base pointers to compensate for the negative indices.  */
-    s1_ptr -= j;
-    s2_ptr -= j;
-    res_ptr -= j;
-
-    cy = 0;
-    do {
-       y = s2_ptr[j];
-       x = s1_ptr[j];
-       y += cy;                  /* add previous carry to subtrahend */
-       cy = y < cy;              /* get out carry from that addition */
-       y = x - y;                /* main subtract */
-       cy += y > x;              /* get out carry from the subtract, combine */
-       res_ptr[j] = y;
-    } while( ++j );
-
-    return cy;
-}
-
-
diff --git a/crypto/mpi/generic_udiv-w-sdiv.c b/crypto/mpi/generic_udiv-w-sdiv.c
deleted file mode 100644 (file)
index 8cfc6d3..0000000
+++ /dev/null
@@ -1,130 +0,0 @@
-/* mpihelp_udiv_w_sdiv -- implement udiv_qrnnd on machines with only signed
- *                       division.
- * Copyright (C) 1992, 1994, 1996, 1998 Free Software Foundation, Inc.
- * Contributed by Peter L. Montgomery.
- *
- * This file is part of GnuPG.
- *
- * GnuPG 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.
- *
- * GnuPG 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 "mpi-internal.h"
-#include "longlong.h"
-
-
-#if 0  /* not yet ported to MPI */
-
-mpi_limb_t
-mpihelp_udiv_w_sdiv( mpi_limp_t *rp,
-                    mpi_limp_t *a1,
-                    mpi_limp_t *a0,
-                    mpi_limp_t *d   )
-{
-  mp_limb_t q, r;
-  mp_limb_t c0, c1, b1;
-
-  if ((mpi_limb_signed_t) d >= 0)
-    {
-      if (a1 < d - a1 - (a0 >> (BITS_PER_MP_LIMB - 1)))
-       {
-         /* dividend, divisor, and quotient are nonnegative */
-         sdiv_qrnnd (q, r, a1, a0, d);
-       }
-      else
-       {
-         /* Compute c1*2^32 + c0 = a1*2^32 + a0 - 2^31*d */
-         sub_ddmmss (c1, c0, a1, a0, d >> 1, d << (BITS_PER_MP_LIMB - 1));
-         /* Divide (c1*2^32 + c0) by d */
-         sdiv_qrnnd (q, r, c1, c0, d);
-         /* Add 2^31 to quotient */
-         q += (mp_limb_t) 1 << (BITS_PER_MP_LIMB - 1);
-       }
-    }
-  else
-    {
-      b1 = d >> 1;                     /* d/2, between 2^30 and 2^31 - 1 */
-      c1 = a1 >> 1;                    /* A/2 */
-      c0 = (a1 << (BITS_PER_MP_LIMB - 1)) + (a0 >> 1);
-
-      if (a1 < b1)                     /* A < 2^32*b1, so A/2 < 2^31*b1 */
-       {
-         sdiv_qrnnd (q, r, c1, c0, b1); /* (A/2) / (d/2) */
-
-         r = 2*r + (a0 & 1);           /* Remainder from A/(2*b1) */
-         if ((d & 1) != 0)
-           {
-             if (r >= q)
-               r = r - q;
-             else if (q - r <= d)
-               {
-                 r = r - q + d;
-                 q--;
-               }
-             else
-               {
-                 r = r - q + 2*d;
-                 q -= 2;
-               }
-           }
-       }
-      else if (c1 < b1)                /* So 2^31 <= (A/2)/b1 < 2^32 */
-       {
-         c1 = (b1 - 1) - c1;
-         c0 = ~c0;                     /* logical NOT */
-
-         sdiv_qrnnd (q, r, c1, c0, b1); /* (A/2) / (d/2) */
-
-         q = ~q;                       /* (A/2)/b1 */
-         r = (b1 - 1) - r;
-
-         r = 2*r + (a0 & 1);           /* A/(2*b1) */
-
-         if ((d & 1) != 0)
-           {
-             if (r >= q)
-               r = r - q;
-             else if (q - r <= d)
-               {
-                 r = r - q + d;
-                 q--;
-               }
-             else
-               {
-                 r = r - q + 2*d;
-                 q -= 2;
-               }
-           }
-       }
-      else                             /* Implies c1 = b1 */
-       {                               /* Hence a1 = d - 1 = 2*b1 - 1 */
-         if (a0 >= -d)
-           {
-             q = -1;
-             r = a0 + d;
-           }
-         else
-           {
-             q = -2;
-             r = a0 + 2*d;
-           }
-       }
-    }
-
-  *rp = r;
-  return q;
-}
-
-#endif
-
diff --git a/crypto/mpi/longlong.h b/crypto/mpi/longlong.h
deleted file mode 100644 (file)
index bf084fc..0000000
+++ /dev/null
@@ -1,1502 +0,0 @@
-/* longlong.h -- definitions for mixed size 32/64 bit arithmetic.
-   Note: I added some stuff for use with gnupg
-
-Copyright (C) 1991, 1992, 1993, 1994, 1996, 1998,
-              2000, 2001, 2002, 2003 Free Software Foundation, Inc.
-
-This file is free software; you can redistribute it and/or modify
-it under the terms of the GNU Library 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 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 Library General Public
-License for more details.
-
-You should have received a copy of the GNU Library General Public License
-along with this file; see the file COPYING.LIB.  If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
-MA 02111-1307, USA. */
-
-/* You have to define the following before including this file:
-
-   UWtype -- An unsigned type, default type for operations (typically a "word")
-   UHWtype -- An unsigned type, at least half the size of UWtype.
-   UDWtype -- An unsigned type, at least twice as large a UWtype
-   W_TYPE_SIZE -- size in bits of UWtype
-
-   SItype, USItype -- Signed and unsigned 32 bit types.
-   DItype, UDItype -- Signed and unsigned 64 bit types.
-
-   On a 32 bit machine UWtype should typically be USItype;
-   on a 64 bit machine, UWtype should typically be UDItype.
-*/
-
-#define __BITS4 (W_TYPE_SIZE / 4)
-#define __ll_B ((UWtype) 1 << (W_TYPE_SIZE / 2))
-#define __ll_lowpart(t) ((UWtype) (t) & (__ll_B - 1))
-#define __ll_highpart(t) ((UWtype) (t) >> (W_TYPE_SIZE / 2))
-
-/* This is used to make sure no undesirable sharing between different libraries
-   that use this file takes place.  */
-#ifndef __MPN
-#define __MPN(x) __##x
-#endif
-
-/* Define auxiliary asm macros.
-
-   1) umul_ppmm(high_prod, low_prod, multipler, multiplicand) multiplies two
-   UWtype integers MULTIPLER and MULTIPLICAND, and generates a two UWtype
-   word product in HIGH_PROD and LOW_PROD.
-
-   2) __umulsidi3(a,b) multiplies two UWtype integers A and B, and returns a
-   UDWtype product.  This is just a variant of umul_ppmm.
-
-   3) udiv_qrnnd(quotient, remainder, high_numerator, low_numerator,
-   denominator) divides a UDWtype, composed by the UWtype integers
-   HIGH_NUMERATOR and LOW_NUMERATOR, by DENOMINATOR and places the quotient
-   in QUOTIENT and the remainder in REMAINDER. HIGH_NUMERATOR must be less
-   than DENOMINATOR for correct operation.  If, in addition, the most
-   significant bit of DENOMINATOR must be 1, then the pre-processor symbol
-   UDIV_NEEDS_NORMALIZATION is defined to 1.
-
-   4) sdiv_qrnnd(quotient, remainder, high_numerator, low_numerator,
-   denominator).  Like udiv_qrnnd but the numbers are signed.  The quotient
-   is rounded towards 0.
-
-   5) count_leading_zeros(count, x) counts the number of zero-bits from the
-   msb to the first non-zero bit in the UWtype X.  This is the number of
-   steps X needs to be shifted left to set the msb.  Undefined for X == 0,
-   unless the symbol COUNT_LEADING_ZEROS_0 is defined to some value.
-
-   6) count_trailing_zeros(count, x) like count_leading_zeros, but counts
-   from the least significant end.
-
-   7) add_ssaaaa(high_sum, low_sum, high_addend_1, low_addend_1,
-   high_addend_2, low_addend_2) adds two UWtype integers, composed by
-   HIGH_ADDEND_1 and LOW_ADDEND_1, and HIGH_ADDEND_2 and LOW_ADDEND_2
-   respectively.  The result is placed in HIGH_SUM and LOW_SUM.  Overflow
-   (i.e. carry out) is not stored anywhere, and is lost.
-
-   8) sub_ddmmss(high_difference, low_difference, high_minuend, low_minuend,
-   high_subtrahend, low_subtrahend) subtracts two two-word UWtype integers,
-   composed by HIGH_MINUEND_1 and LOW_MINUEND_1, and HIGH_SUBTRAHEND_2 and
-   LOW_SUBTRAHEND_2 respectively.  The result is placed in HIGH_DIFFERENCE
-   and LOW_DIFFERENCE. Overflow (i.e. carry out) is not stored anywhere,
-   and is lost.
-
-   If any of these macros are left undefined for a particular CPU,
-   C macros are used.  */
-
-/* The CPUs come in alphabetical order below.
-
-   Please add support for more CPUs here, or improve the current support
-   for the CPUs below! */
-
-#if defined (__GNUC__) && !defined (NO_ASM)
-
-/* We sometimes need to clobber "cc" with gcc2, but that would not be
-   understood by gcc1. Use cpp to avoid major code duplication.  */
-#if __GNUC__ < 2
-#define __CLOBBER_CC
-#define __AND_CLOBBER_CC
-#else /* __GNUC__ >= 2 */
-#define __CLOBBER_CC : "cc"
-#define __AND_CLOBBER_CC , "cc"
-#endif /* __GNUC__ < 2 */
-
-
-/***************************************
- **************  A29K  *****************
- ***************************************/
-#if (defined (__a29k__) || defined (_AM29K)) && W_TYPE_SIZE == 32
-#define add_ssaaaa(sh, sl, ah, al, bh, bl) \
-  __asm__ ("add %1,%4,%5\n"   \
-           "addc %0,%2,%3"                                              \
-          : "=r" ((USItype)(sh)),                                      \
-           "=&r" ((USItype)(sl))                                       \
-          : "%r" ((USItype)(ah)),                                      \
-            "rI" ((USItype)(bh)),                                      \
-            "%r" ((USItype)(al)),                                      \
-            "rI" ((USItype)(bl)))
-#define sub_ddmmss(sh, sl, ah, al, bh, bl) \
-  __asm__ ("sub %1,%4,%5\n"                                             \
-          "subc %0,%2,%3"                                              \
-          : "=r" ((USItype)(sh)),                                      \
-            "=&r" ((USItype)(sl))                                      \
-          : "r" ((USItype)(ah)),                                       \
-            "rI" ((USItype)(bh)),                                      \
-            "r" ((USItype)(al)),                                       \
-            "rI" ((USItype)(bl)))
-#define umul_ppmm(xh, xl, m0, m1) \
-  do {                                                                 \
-    USItype __m0 = (m0), __m1 = (m1);                                  \
-    __asm__ ("multiplu %0,%1,%2"                                        \
-            : "=r" ((USItype)(xl))                                     \
-            : "r" (__m0),                                              \
-              "r" (__m1));                                             \
-    __asm__ ("multmu %0,%1,%2"                                          \
-            : "=r" ((USItype)(xh))                                     \
-            : "r" (__m0),                                              \
-              "r" (__m1));                                             \
-  } while (0)
-#define udiv_qrnnd(q, r, n1, n0, d) \
-  __asm__ ("dividu %0,%3,%4"                                            \
-          : "=r" ((USItype)(q)),                                       \
-            "=q" ((USItype)(r))                                        \
-          : "1" ((USItype)(n1)),                                       \
-            "r" ((USItype)(n0)),                                       \
-            "r" ((USItype)(d)))
-
-#define count_leading_zeros(count, x) \
-    __asm__ ("clz %0,%1"                                                \
-            : "=r" ((USItype)(count))                                  \
-            : "r" ((USItype)(x)))
-#define COUNT_LEADING_ZEROS_0 32
-#endif /* __a29k__ */
-
-
-#if defined (__alpha) && W_TYPE_SIZE == 64
-#define umul_ppmm(ph, pl, m0, m1) \
-  do {                                                                 \
-    UDItype __m0 = (m0), __m1 = (m1);                                  \
-    __asm__ ("umulh %r1,%2,%0"                                          \
-            : "=r" ((UDItype) ph)                                      \
-            : "%rJ" (__m0),                                            \
-              "rI" (__m1));                                            \
-    (pl) = __m0 * __m1;                                                \
-  } while (0)
-#define UMUL_TIME 46
-#ifndef LONGLONG_STANDALONE
-#define udiv_qrnnd(q, r, n1, n0, d) \
-  do { UDItype __r;                                                    \
-    (q) = __udiv_qrnnd (&__r, (n1), (n0), (d));                        \
-    (r) = __r;                                                         \
-  } while (0)
-extern UDItype __udiv_qrnnd ();
-#define UDIV_TIME 220
-#endif /* LONGLONG_STANDALONE */
-#endif /* __alpha */
-
-/***************************************
- **************  ARM  ******************
- ***************************************/
-#if defined (__arm__) && W_TYPE_SIZE == 32
-#define add_ssaaaa(sh, sl, ah, al, bh, bl) \
-  __asm__ ("adds %1, %4, %5\n"                                          \
-          "adc  %0, %2, %3"                                            \
-          : "=r" ((USItype)(sh)),                                      \
-            "=&r" ((USItype)(sl))                                      \
-          : "%r" ((USItype)(ah)),                                      \
-            "rI" ((USItype)(bh)),                                      \
-            "%r" ((USItype)(al)),                                      \
-            "rI" ((USItype)(bl)))
-#define sub_ddmmss(sh, sl, ah, al, bh, bl) \
-  __asm__ ("subs %1, %4, %5\n"                                          \
-          "sbc  %0, %2, %3"                                            \
-          : "=r" ((USItype)(sh)),                                      \
-            "=&r" ((USItype)(sl))                                      \
-          : "r" ((USItype)(ah)),                                       \
-            "rI" ((USItype)(bh)),                                      \
-            "r" ((USItype)(al)),                                       \
-            "rI" ((USItype)(bl)))
-#if defined __ARM_ARCH_2__ || defined __ARM_ARCH_3__
-#define umul_ppmm(xh, xl, a, b) \
-  __asm__ ("%@ Inlined umul_ppmm\n"                                     \
-       "mov    %|r0, %2, lsr #16               @ AAAA\n"               \
-       "mov    %|r2, %3, lsr #16               @ BBBB\n"               \
-       "bic    %|r1, %2, %|r0, lsl #16         @ aaaa\n"               \
-       "bic    %0, %3, %|r2, lsl #16           @ bbbb\n"               \
-       "mul    %1, %|r1, %|r2                  @ aaaa * BBBB\n"        \
-       "mul    %|r2, %|r0, %|r2                @ AAAA * BBBB\n"        \
-       "mul    %|r1, %0, %|r1                  @ aaaa * bbbb\n"        \
-       "mul    %0, %|r0, %0                    @ AAAA * bbbb\n"        \
-       "adds   %|r0, %1, %0                    @ central sum\n"        \
-       "addcs  %|r2, %|r2, #65536\n"                                   \
-       "adds   %1, %|r1, %|r0, lsl #16\n"                              \
-       "adc    %0, %|r2, %|r0, lsr #16"                                \
-          : "=&r" ((USItype)(xh)),                                     \
-            "=r" ((USItype)(xl))                                       \
-          : "r" ((USItype)(a)),                                        \
-            "r" ((USItype)(b))                                         \
-          : "r0", "r1", "r2")
-#else
-#define umul_ppmm(xh, xl, a, b)                                         \
-  __asm__ ("%@ Inlined umul_ppmm\n"                                     \
-          "umull %r1, %r0, %r2, %r3"                                   \
-                  : "=&r" ((USItype)(xh)),                             \
-                    "=r" ((USItype)(xl))                               \
-                  : "r" ((USItype)(a)),                                \
-                    "r" ((USItype)(b))                                 \
-                  : "r0", "r1")
-#endif
-#define UMUL_TIME 20
-#define UDIV_TIME 100
-#endif /* __arm__ */
-
-/***************************************
- **************  CLIPPER  **************
- ***************************************/
-#if defined (__clipper__) && W_TYPE_SIZE == 32
-#define umul_ppmm(w1, w0, u, v) \
-  ({union {UDItype __ll;                                               \
-          struct {USItype __l, __h;} __i;                              \
-         } __xx;                                                       \
-  __asm__ ("mulwux %2,%0"                                               \
-          : "=r" (__xx.__ll)                                           \
-          : "%0" ((USItype)(u)),                                       \
-            "r" ((USItype)(v)));                                       \
-  (w1) = __xx.__i.__h; (w0) = __xx.__i.__l;})
-#define smul_ppmm(w1, w0, u, v) \
-  ({union {DItype __ll;                                                \
-          struct {SItype __l, __h;} __i;                               \
-         } __xx;                                                       \
-  __asm__ ("mulwx %2,%0"                                                \
-          : "=r" (__xx.__ll)                                           \
-          : "%0" ((SItype)(u)),                                        \
-            "r" ((SItype)(v)));                                        \
-  (w1) = __xx.__i.__h; (w0) = __xx.__i.__l;})
-#define __umulsidi3(u, v) \
-  ({UDItype __w;                                                       \
-    __asm__ ("mulwux %2,%0"                                             \
-            : "=r" (__w)                                               \
-            : "%0" ((USItype)(u)),                                     \
-              "r" ((USItype)(v)));                                     \
-    __w; })
-#endif /* __clipper__ */
-
-
-/***************************************
- **************  GMICRO  ***************
- ***************************************/
-#if defined (__gmicro__) && W_TYPE_SIZE == 32
-#define add_ssaaaa(sh, sl, ah, al, bh, bl) \
-  __asm__ ("add.w %5,%1\n"                                              \
-          "addx %3,%0"                                                 \
-          : "=g" ((USItype)(sh)),                                      \
-            "=&g" ((USItype)(sl))                                      \
-          : "%0" ((USItype)(ah)),                                      \
-            "g" ((USItype)(bh)),                                       \
-            "%1" ((USItype)(al)),                                      \
-            "g" ((USItype)(bl)))
-#define sub_ddmmss(sh, sl, ah, al, bh, bl) \
-  __asm__ ("sub.w %5,%1\n"                                              \
-          "subx %3,%0"                                                 \
-          : "=g" ((USItype)(sh)),                                      \
-            "=&g" ((USItype)(sl))                                      \
-          : "0" ((USItype)(ah)),                                       \
-            "g" ((USItype)(bh)),                                       \
-            "1" ((USItype)(al)),                                       \
-            "g" ((USItype)(bl)))
-#define umul_ppmm(ph, pl, m0, m1) \
-  __asm__ ("mulx %3,%0,%1"                                              \
-          : "=g" ((USItype)(ph)),                                      \
-            "=r" ((USItype)(pl))                                       \
-          : "%0" ((USItype)(m0)),                                      \
-            "g" ((USItype)(m1)))
-#define udiv_qrnnd(q, r, nh, nl, d) \
-  __asm__ ("divx %4,%0,%1"                                              \
-          : "=g" ((USItype)(q)),                                       \
-            "=r" ((USItype)(r))                                        \
-          : "1" ((USItype)(nh)),                                       \
-            "0" ((USItype)(nl)),                                       \
-            "g" ((USItype)(d)))
-#define count_leading_zeros(count, x) \
-  __asm__ ("bsch/1 %1,%0"                                               \
-          : "=g" (count)                                               \
-          : "g" ((USItype)(x)),                                        \
-            "0" ((USItype)0))
-#endif
-
-
-/***************************************
- **************  HPPA  *****************
- ***************************************/
-#if defined (__hppa) && W_TYPE_SIZE == 32
-#define add_ssaaaa(sh, sl, ah, al, bh, bl) \
-  __asm__ ("   add %4,%5,%1\n"                                             \
-          "    addc %2,%3,%0"                                              \
-          : "=r" ((USItype)(sh)),                                      \
-            "=&r" ((USItype)(sl))                                      \
-          : "%rM" ((USItype)(ah)),                                     \
-            "rM" ((USItype)(bh)),                                      \
-            "%rM" ((USItype)(al)),                                     \
-            "rM" ((USItype)(bl)))
-#define sub_ddmmss(sh, sl, ah, al, bh, bl) \
-  __asm__ ("   sub %4,%5,%1\n"                                             \
-          "    subb %2,%3,%0"                                              \
-          : "=r" ((USItype)(sh)),                                      \
-            "=&r" ((USItype)(sl))                                      \
-          : "rM" ((USItype)(ah)),                                      \
-            "rM" ((USItype)(bh)),                                      \
-            "rM" ((USItype)(al)),                                      \
-            "rM" ((USItype)(bl)))
-#if defined (_PA_RISC1_1)
-#define umul_ppmm(wh, wl, u, v) \
-  do {                                                                 \
-    union {UDItype __ll;                                               \
-          struct {USItype __h, __l;} __i;                              \
-         } __xx;                                                       \
-    __asm__ (" xmpyu %1,%2,%0"                                           \
-            : "=*f" (__xx.__ll)                                        \
-            : "*f" ((USItype)(u)),                                     \
-              "*f" ((USItype)(v)));                                    \
-    (wh) = __xx.__i.__h;                                               \
-    (wl) = __xx.__i.__l;                                               \
-  } while (0)
-#define UMUL_TIME 8
-#define UDIV_TIME 60
-#else
-#define UMUL_TIME 40
-#define UDIV_TIME 80
-#endif
-#ifndef LONGLONG_STANDALONE
-#define udiv_qrnnd(q, r, n1, n0, d) \
-  do { USItype __r;                                                    \
-    (q) = __udiv_qrnnd (&__r, (n1), (n0), (d));                        \
-    (r) = __r;                                                         \
-  } while (0)
-extern USItype __udiv_qrnnd ();
-#endif /* LONGLONG_STANDALONE */
-#define count_leading_zeros(count, x) \
-  do {                                                                \
-    USItype __tmp;                                                    \
-    __asm__ (                                                         \
-       "       ldi             1,%0                                       \n" \
-       "       extru,=         %1,15,16,%%r0  ; Bits 31..16 zero?         \n" \
-       "       extru,tr        %1,15,16,%1    ; No.  Shift down, skip add.\n" \
-       "       ldo             16(%0),%0      ; Yes.   Perform add.       \n" \
-       "       extru,=         %1,23,8,%%r0   ; Bits 15..8 zero?          \n" \
-       "       extru,tr        %1,23,8,%1     ; No.  Shift down, skip add.\n" \
-       "       ldo             8(%0),%0       ; Yes.   Perform add.       \n" \
-       "       extru,=         %1,27,4,%%r0   ; Bits 7..4 zero?           \n" \
-       "       extru,tr        %1,27,4,%1     ; No.  Shift down, skip add.\n" \
-       "       ldo             4(%0),%0       ; Yes.   Perform add.       \n" \
-       "       extru,=         %1,29,2,%%r0   ; Bits 3..2 zero?           \n" \
-       "       extru,tr        %1,29,2,%1     ; No.  Shift down, skip add.\n" \
-       "       ldo             2(%0),%0       ; Yes.   Perform add.       \n" \
-       "       extru           %1,30,1,%1     ; Extract bit 1.            \n" \
-       "       sub             %0,%1,%0       ; Subtract it.              "   \
-       : "=r" (count), "=r" (__tmp) : "1" (x));                        \
-  } while (0)
-#endif /* hppa */
-
-
-/***************************************
- **************  I370  *****************
- ***************************************/
-#if (defined (__i370__) || defined (__mvs__)) && W_TYPE_SIZE == 32
-#define umul_ppmm(xh, xl, m0, m1) \
-  do {                                                                 \
-    union {UDItype __ll;                                               \
-          struct {USItype __h, __l;} __i;                              \
-         } __xx;                                                       \
-    USItype __m0 = (m0), __m1 = (m1);                                  \
-    __asm__ ("mr %0,%3"                                                 \
-            : "=r" (__xx.__i.__h),                                     \
-              "=r" (__xx.__i.__l)                                      \
-            : "%1" (__m0),                                             \
-              "r" (__m1));                                             \
-    (xh) = __xx.__i.__h; (xl) = __xx.__i.__l;                          \
-    (xh) += ((((SItype) __m0 >> 31) & __m1)                            \
-            + (((SItype) __m1 >> 31) & __m0));                         \
-  } while (0)
-#define smul_ppmm(xh, xl, m0, m1) \
-  do {                                                                 \
-    union {DItype __ll;                                                \
-          struct {USItype __h, __l;} __i;                              \
-         } __xx;                                                       \
-    __asm__ ("mr %0,%3"                                                 \
-            : "=r" (__xx.__i.__h),                                     \
-              "=r" (__xx.__i.__l)                                      \
-            : "%1" (m0),                                               \
-              "r" (m1));                                               \
-    (xh) = __xx.__i.__h; (xl) = __xx.__i.__l;                          \
-  } while (0)
-#define sdiv_qrnnd(q, r, n1, n0, d) \
-  do {                                                                 \
-    union {DItype __ll;                                                \
-          struct {USItype __h, __l;} __i;                              \
-         } __xx;                                                       \
-    __xx.__i.__h = n1; __xx.__i.__l = n0;                              \
-    __asm__ ("dr %0,%2"                                                 \
-            : "=r" (__xx.__ll)                                         \
-            : "0" (__xx.__ll), "r" (d));                               \
-    (q) = __xx.__i.__l; (r) = __xx.__i.__h;                            \
-  } while (0)
-#endif
-
-
-/***************************************
- **************  I386  *****************
- ***************************************/
-#undef __i386__
-#if (defined (__i386__) || defined (__i486__)) && W_TYPE_SIZE == 32
-#define add_ssaaaa(sh, sl, ah, al, bh, bl) \
-  __asm__ ("addl %5,%1\n"                                               \
-          "adcl %3,%0"                                                 \
-          : "=r" ((USItype)(sh)),                                      \
-            "=&r" ((USItype)(sl))                                      \
-          : "%0" ((USItype)(ah)),                                      \
-            "g" ((USItype)(bh)),                                       \
-            "%1" ((USItype)(al)),                                      \
-            "g" ((USItype)(bl)))
-#define sub_ddmmss(sh, sl, ah, al, bh, bl) \
-  __asm__ ("subl %5,%1\n"                                               \
-          "sbbl %3,%0"                                                 \
-          : "=r" ((USItype)(sh)),                                      \
-            "=&r" ((USItype)(sl))                                      \
-          : "0" ((USItype)(ah)),                                       \
-            "g" ((USItype)(bh)),                                       \
-            "1" ((USItype)(al)),                                       \
-            "g" ((USItype)(bl)))
-#define umul_ppmm(w1, w0, u, v) \
-  __asm__ ("mull %3"                                                    \
-          : "=a" ((USItype)(w0)),                                      \
-            "=d" ((USItype)(w1))                                       \
-          : "%0" ((USItype)(u)),                                       \
-            "rm" ((USItype)(v)))
-#define udiv_qrnnd(q, r, n1, n0, d) \
-  __asm__ ("divl %4"                                                    \
-          : "=a" ((USItype)(q)),                                       \
-            "=d" ((USItype)(r))                                        \
-          : "0" ((USItype)(n0)),                                       \
-            "1" ((USItype)(n1)),                                       \
-            "rm" ((USItype)(d)))
-#define count_leading_zeros(count, x) \
-  do {                                                                 \
-    USItype __cbtmp;                                                   \
-    __asm__ ("bsrl %1,%0"                                               \
-            : "=r" (__cbtmp) : "rm" ((USItype)(x)));                   \
-    (count) = __cbtmp ^ 31;                                            \
-  } while (0)
-#define count_trailing_zeros(count, x) \
-  __asm__ ("bsfl %1,%0" : "=r" (count) : "rm" ((USItype)(x)))
-#ifndef UMUL_TIME
-#define UMUL_TIME 40
-#endif
-#ifndef UDIV_TIME
-#define UDIV_TIME 40
-#endif
-#endif /* 80x86 */
-
-
-/***************************************
- **************  I860  *****************
- ***************************************/
-#if defined (__i860__) && W_TYPE_SIZE == 32
-#define rshift_rhlc(r,h,l,c) \
-  __asm__ ("shr %3,r0,r0\n"  \
-           "shrd %1,%2,%0"   \
-          "=r" (r) : "r" (h), "r" (l), "rn" (c))
-#endif /* i860 */
-
-/***************************************
- **************  I960  *****************
- ***************************************/
-#if defined (__i960__) && W_TYPE_SIZE == 32
-#define add_ssaaaa(sh, sl, ah, al, bh, bl) \
-  __asm__ ("cmpo 1,0\n"      \
-           "addc %5,%4,%1\n" \
-           "addc %3,%2,%0"   \
-          : "=r" ((USItype)(sh)),                                      \
-            "=&r" ((USItype)(sl))                                      \
-          : "%dI" ((USItype)(ah)),                                     \
-            "dI" ((USItype)(bh)),                                      \
-            "%dI" ((USItype)(al)),                                     \
-            "dI" ((USItype)(bl)))
-#define sub_ddmmss(sh, sl, ah, al, bh, bl) \
-  __asm__ ("cmpo 0,0\n"      \
-           "subc %5,%4,%1\n" \
-           "subc %3,%2,%0"   \
-          : "=r" ((USItype)(sh)),                                      \
-            "=&r" ((USItype)(sl))                                      \
-          : "dI" ((USItype)(ah)),                                      \
-            "dI" ((USItype)(bh)),                                      \
-            "dI" ((USItype)(al)),                                      \
-            "dI" ((USItype)(bl)))
-#define umul_ppmm(w1, w0, u, v) \
-  ({union {UDItype __ll;                                               \
-          struct {USItype __l, __h;} __i;                              \
-         } __xx;                                                       \
-  __asm__ ("emul        %2,%1,%0"                                       \
-          : "=d" (__xx.__ll)                                           \
-          : "%dI" ((USItype)(u)),                                      \
-            "dI" ((USItype)(v)));                                      \
-  (w1) = __xx.__i.__h; (w0) = __xx.__i.__l;})
-#define __umulsidi3(u, v) \
-  ({UDItype __w;                                                       \
-    __asm__ ("emul      %2,%1,%0"                                       \
-            : "=d" (__w)                                               \
-            : "%dI" ((USItype)(u)),                                    \
-              "dI" ((USItype)(v)));                                    \
-    __w; })
-#define udiv_qrnnd(q, r, nh, nl, d) \
-  do {                                                                 \
-    union {UDItype __ll;                                               \
-          struct {USItype __l, __h;} __i;                              \
-         } __nn;                                                       \
-    __nn.__i.__h = (nh); __nn.__i.__l = (nl);                          \
-    __asm__ ("ediv %d,%n,%0"                                            \
-          : "=d" (__rq.__ll)                                           \
-          : "dI" (__nn.__ll),                                          \
-            "dI" ((USItype)(d)));                                      \
-    (r) = __rq.__i.__l; (q) = __rq.__i.__h;                            \
-  } while (0)
-#define count_leading_zeros(count, x) \
-  do {                                                                 \
-    USItype __cbtmp;                                                   \
-    __asm__ ("scanbit %1,%0"                                            \
-            : "=r" (__cbtmp)                                           \
-            : "r" ((USItype)(x)));                                     \
-    (count) = __cbtmp ^ 31;                                            \
-  } while (0)
-#define COUNT_LEADING_ZEROS_0 (-32) /* sic */
-#if defined (__i960mx)         /* what is the proper symbol to test??? */
-#define rshift_rhlc(r,h,l,c) \
-  do {                                                                 \
-    union {UDItype __ll;                                               \
-          struct {USItype __l, __h;} __i;                              \
-         } __nn;                                                       \
-    __nn.__i.__h = (h); __nn.__i.__l = (l);                            \
-    __asm__ ("shre %2,%1,%0"                                            \
-            : "=d" (r) : "dI" (__nn.__ll), "dI" (c));                  \
-  }
-#endif /* i960mx */
-#endif /* i960 */
-
-
-/***************************************
- **************  68000 ****************
- ***************************************/
-#if (defined (__mc68000__) || defined (__mc68020__) || defined (__NeXT__) || defined(mc68020)) && W_TYPE_SIZE == 32
-#define add_ssaaaa(sh, sl, ah, al, bh, bl) \
-  __asm__ ("add%.l %5,%1\n"                                             \
-          "addx%.l %3,%0"                                              \
-          : "=d" ((USItype)(sh)),                                      \
-            "=&d" ((USItype)(sl))                                      \
-          : "%0" ((USItype)(ah)),                                      \
-            "d" ((USItype)(bh)),                                       \
-            "%1" ((USItype)(al)),                                      \
-            "g" ((USItype)(bl)))
-#define sub_ddmmss(sh, sl, ah, al, bh, bl) \
-  __asm__ ("sub%.l %5,%1\n"                                             \
-          "subx%.l %3,%0"                                              \
-          : "=d" ((USItype)(sh)),                                      \
-            "=&d" ((USItype)(sl))                                      \
-          : "0" ((USItype)(ah)),                                       \
-            "d" ((USItype)(bh)),                                       \
-            "1" ((USItype)(al)),                                       \
-            "g" ((USItype)(bl)))
-#if (defined (__mc68020__) || defined (__NeXT__) || defined(mc68020))
-#define umul_ppmm(w1, w0, u, v) \
-  __asm__ ("mulu%.l %3,%1:%0"                                           \
-          : "=d" ((USItype)(w0)),                                      \
-            "=d" ((USItype)(w1))                                       \
-          : "%0" ((USItype)(u)),                                       \
-            "dmi" ((USItype)(v)))
-#define UMUL_TIME 45
-#define udiv_qrnnd(q, r, n1, n0, d) \
-  __asm__ ("divu%.l %4,%1:%0"                                           \
-          : "=d" ((USItype)(q)),                                       \
-            "=d" ((USItype)(r))                                        \
-          : "0" ((USItype)(n0)),                                       \
-            "1" ((USItype)(n1)),                                       \
-            "dmi" ((USItype)(d)))
-#define UDIV_TIME 90
-#define sdiv_qrnnd(q, r, n1, n0, d) \
-  __asm__ ("divs%.l %4,%1:%0"                                           \
-          : "=d" ((USItype)(q)),                                       \
-            "=d" ((USItype)(r))                                        \
-          : "0" ((USItype)(n0)),                                       \
-            "1" ((USItype)(n1)),                                       \
-            "dmi" ((USItype)(d)))
-#define count_leading_zeros(count, x) \
-  __asm__ ("bfffo %1{%b2:%b2},%0"                                       \
-          : "=d" ((USItype)(count))                                    \
-          : "od" ((USItype)(x)), "n" (0))
-#define COUNT_LEADING_ZEROS_0 32
-#else /* not mc68020 */
-#define umul_ppmm(xh, xl, a, b) \
-  do { USItype __umul_tmp1, __umul_tmp2;                         \
-       __asm__ ("| Inlined umul_ppmm                         \n" \
- "        move%.l %5,%3                                       \n" \
- "        move%.l %2,%0                                       \n" \
- "        move%.w %3,%1                                       \n" \
- "        swap %3                                            \n" \
- "        swap %0                                            \n" \
- "        mulu %2,%1                                         \n" \
- "        mulu %3,%0                                         \n" \
- "        mulu %2,%3                                         \n" \
- "        swap %2                                            \n" \
- "        mulu %5,%2                                         \n" \
- "        add%.l       %3,%2                                 \n" \
- "        jcc  1f                                            \n" \
- "        add%.l       %#0x10000,%0                          \n" \
- "1:   move%.l %2,%3                                         \n" \
- "        clr%.w       %2                                    \n" \
- "        swap %2                                            \n" \
- "        swap %3                                            \n" \
- "        clr%.w       %3                                    \n" \
- "        add%.l       %3,%1                                 \n" \
- "        addx%.l %2,%0                                       \n" \
- "        | End inlined umul_ppmm"                                \
-             : "=&d" ((USItype)(xh)), "=&d" ((USItype)(xl)),     \
-               "=d" (__umul_tmp1), "=&d" (__umul_tmp2)           \
-             : "%2" ((USItype)(a)), "d" ((USItype)(b)));         \
-  } while (0)
-#define UMUL_TIME 100
-#define UDIV_TIME 400
-#endif /* not mc68020 */
-#endif /* mc68000 */
-
-
-/***************************************
- **************  88000 ****************
- ***************************************/
-#if defined (__m88000__) && W_TYPE_SIZE == 32
-#define add_ssaaaa(sh, sl, ah, al, bh, bl) \
-  __asm__ ("addu.co %1,%r4,%r5\n"                                       \
-          "addu.ci %0,%r2,%r3"                                         \
-          : "=r" ((USItype)(sh)),                                      \
-            "=&r" ((USItype)(sl))                                      \
-          : "%rJ" ((USItype)(ah)),                                     \
-            "rJ" ((USItype)(bh)),                                      \
-            "%rJ" ((USItype)(al)),                                     \
-            "rJ" ((USItype)(bl)))
-#define sub_ddmmss(sh, sl, ah, al, bh, bl) \
-  __asm__ ("subu.co %1,%r4,%r5\n"                                       \
-          "subu.ci %0,%r2,%r3"                                         \
-          : "=r" ((USItype)(sh)),                                      \
-            "=&r" ((USItype)(sl))                                      \
-          : "rJ" ((USItype)(ah)),                                      \
-            "rJ" ((USItype)(bh)),                                      \
-            "rJ" ((USItype)(al)),                                      \
-            "rJ" ((USItype)(bl)))
-#define count_leading_zeros(count, x) \
-  do {                                                                 \
-    USItype __cbtmp;                                                   \
-    __asm__ ("ff1 %0,%1"                                                \
-            : "=r" (__cbtmp)                                           \
-            : "r" ((USItype)(x)));                                     \
-    (count) = __cbtmp ^ 31;                                            \
-  } while (0)
-#define COUNT_LEADING_ZEROS_0 63 /* sic */
-#if defined (__m88110__)
-#define umul_ppmm(wh, wl, u, v) \
-  do {                                                                 \
-    union {UDItype __ll;                                               \
-          struct {USItype __h, __l;} __i;                              \
-         } __x;                                                        \
-    __asm__ ("mulu.d %0,%1,%2" : "=r" (__x.__ll) : "r" (u), "r" (v));   \
-    (wh) = __x.__i.__h;                                                \
-    (wl) = __x.__i.__l;                                                \
-  } while (0)
-#define udiv_qrnnd(q, r, n1, n0, d) \
-  ({union {UDItype __ll;                                               \
-          struct {USItype __h, __l;} __i;                              \
-         } __x, __q;                                                   \
-  __x.__i.__h = (n1); __x.__i.__l = (n0);                              \
-  __asm__ ("divu.d %0,%1,%2"                                            \
-          : "=r" (__q.__ll) : "r" (__x.__ll), "r" (d));                \
-  (r) = (n0) - __q.__l * (d); (q) = __q.__l; })
-#define UMUL_TIME 5
-#define UDIV_TIME 25
-#else
-#define UMUL_TIME 17
-#define UDIV_TIME 150
-#endif /* __m88110__ */
-#endif /* __m88000__ */
-
-/***************************************
- **************  MIPS  *****************
- ***************************************/
-#if defined (__mips__) && W_TYPE_SIZE == 32
-#if __GNUC__ > 2 || __GNUC_MINOR__ >= 7
-#define umul_ppmm(w1, w0, u, v) \
-  __asm__ ("multu %2,%3"                                                \
-          : "=l" ((USItype)(w0)),                                      \
-            "=h" ((USItype)(w1))                                       \
-          : "d" ((USItype)(u)),                                        \
-            "d" ((USItype)(v)))
-#else
-#define umul_ppmm(w1, w0, u, v) \
-  __asm__ ("multu %2,%3 \n" \
-          "mflo %0 \n"     \
-          "mfhi %1"                                                        \
-          : "=d" ((USItype)(w0)),                                      \
-            "=d" ((USItype)(w1))                                       \
-          : "d" ((USItype)(u)),                                        \
-            "d" ((USItype)(v)))
-#endif
-#define UMUL_TIME 10
-#define UDIV_TIME 100
-#endif /* __mips__ */
-
-/***************************************
- **************  MIPS/64  **************
- ***************************************/
-#if (defined (__mips) && __mips >= 3) && W_TYPE_SIZE == 64
-#if __GNUC__ > 2 || __GNUC_MINOR__ >= 7
-#define umul_ppmm(w1, w0, u, v) \
-  __asm__ ("dmultu %2,%3"                                               \
-          : "=l" ((UDItype)(w0)),                                      \
-            "=h" ((UDItype)(w1))                                       \
-          : "d" ((UDItype)(u)),                                        \
-            "d" ((UDItype)(v)))
-#else
-#define umul_ppmm(w1, w0, u, v) \
-  __asm__ ("dmultu %2,%3 \n"    \
-          "mflo %0 \n"         \
-          "mfhi %1"                                                        \
-          : "=d" ((UDItype)(w0)),                                      \
-            "=d" ((UDItype)(w1))                                       \
-          : "d" ((UDItype)(u)),                                        \
-            "d" ((UDItype)(v)))
-#endif
-#define UMUL_TIME 20
-#define UDIV_TIME 140
-#endif /* __mips__ */
-
-
-/***************************************
- **************  32000 ****************
- ***************************************/
-#if defined (__ns32000__) && W_TYPE_SIZE == 32
-#define umul_ppmm(w1, w0, u, v) \
-  ({union {UDItype __ll;                                               \
-          struct {USItype __l, __h;} __i;                              \
-         } __xx;                                                       \
-  __asm__ ("meid %2,%0"                                                 \
-          : "=g" (__xx.__ll)                                           \
-          : "%0" ((USItype)(u)),                                       \
-            "g" ((USItype)(v)));                                       \
-  (w1) = __xx.__i.__h; (w0) = __xx.__i.__l;})
-#define __umulsidi3(u, v) \
-  ({UDItype __w;                                                       \
-    __asm__ ("meid %2,%0"                                               \
-            : "=g" (__w)                                               \
-            : "%0" ((USItype)(u)),                                     \
-              "g" ((USItype)(v)));                                     \
-    __w; })
-#define udiv_qrnnd(q, r, n1, n0, d) \
-  ({union {UDItype __ll;                                               \
-          struct {USItype __l, __h;} __i;                              \
-         } __xx;                                                       \
-  __xx.__i.__h = (n1); __xx.__i.__l = (n0);                            \
-  __asm__ ("deid %2,%0"                                                 \
-          : "=g" (__xx.__ll)                                           \
-          : "0" (__xx.__ll),                                           \
-            "g" ((USItype)(d)));                                       \
-  (r) = __xx.__i.__l; (q) = __xx.__i.__h; })
-#define count_trailing_zeros(count,x) \
-  do {
-    __asm__ ("ffsd      %2,%0"                                          \
-            : "=r" ((USItype) (count))                                 \
-            : "0" ((USItype) 0),                                       \
-              "r" ((USItype) (x)));                                    \
-  } while (0)
-#endif /* __ns32000__ */
-
-
-/***************************************
- **************  PPC  ******************
- ***************************************/
-#if (defined (_ARCH_PPC) || defined (_IBMR2)) && W_TYPE_SIZE == 32
-#define add_ssaaaa(sh, sl, ah, al, bh, bl) \
-  do {                                                                 \
-    if (__builtin_constant_p (bh) && (bh) == 0)                        \
-      __asm__ ("{a%I4|add%I4c} %1,%3,%4\n\t{aze|addze} %0,%2"           \
-            : "=r" ((USItype)(sh)),                                    \
-              "=&r" ((USItype)(sl))                                    \
-            : "%r" ((USItype)(ah)),                                    \
-              "%r" ((USItype)(al)),                                    \
-              "rI" ((USItype)(bl)));                                   \
-    else if (__builtin_constant_p (bh) && (bh) ==~(USItype) 0)         \
-      __asm__ ("{a%I4|add%I4c} %1,%3,%4\n\t{ame|addme} %0,%2"           \
-            : "=r" ((USItype)(sh)),                                    \
-              "=&r" ((USItype)(sl))                                    \
-            : "%r" ((USItype)(ah)),                                    \
-              "%r" ((USItype)(al)),                                    \
-              "rI" ((USItype)(bl)));                                   \
-    else                                                               \
-      __asm__ ("{a%I5|add%I5c} %1,%4,%5\n\t{ae|adde} %0,%2,%3"          \
-            : "=r" ((USItype)(sh)),                                    \
-              "=&r" ((USItype)(sl))                                    \
-            : "%r" ((USItype)(ah)),                                    \
-              "r" ((USItype)(bh)),                                     \
-              "%r" ((USItype)(al)),                                    \
-              "rI" ((USItype)(bl)));                                   \
-  } while (0)
-#define sub_ddmmss(sh, sl, ah, al, bh, bl) \
-  do {                                                                 \
-    if (__builtin_constant_p (ah) && (ah) == 0)                        \
-      __asm__ ("{sf%I3|subf%I3c} %1,%4,%3\n\t{sfze|subfze} %0,%2"       \
-              : "=r" ((USItype)(sh)),                                  \
-                "=&r" ((USItype)(sl))                                  \
-              : "r" ((USItype)(bh)),                                   \
-                "rI" ((USItype)(al)),                                  \
-                "r" ((USItype)(bl)));                                  \
-    else if (__builtin_constant_p (ah) && (ah) ==~(USItype) 0)         \
-      __asm__ ("{sf%I3|subf%I3c} %1,%4,%3\n\t{sfme|subfme} %0,%2"       \
-              : "=r" ((USItype)(sh)),                                  \
-                "=&r" ((USItype)(sl))                                  \
-              : "r" ((USItype)(bh)),                                   \
-                "rI" ((USItype)(al)),                                  \
-                "r" ((USItype)(bl)));                                  \
-    else if (__builtin_constant_p (bh) && (bh) == 0)                   \
-      __asm__ ("{sf%I3|subf%I3c} %1,%4,%3\n\t{ame|addme} %0,%2"         \
-              : "=r" ((USItype)(sh)),                                  \
-                "=&r" ((USItype)(sl))                                  \
-              : "r" ((USItype)(ah)),                                   \
-                "rI" ((USItype)(al)),                                  \
-                "r" ((USItype)(bl)));                                  \
-    else if (__builtin_constant_p (bh) && (bh) ==~(USItype) 0)         \
-      __asm__ ("{sf%I3|subf%I3c} %1,%4,%3\n\t{aze|addze} %0,%2"         \
-              : "=r" ((USItype)(sh)),                                  \
-                "=&r" ((USItype)(sl))                                  \
-              : "r" ((USItype)(ah)),                                   \
-                "rI" ((USItype)(al)),                                  \
-                "r" ((USItype)(bl)));                                  \
-    else                                                               \
-      __asm__ ("{sf%I4|subf%I4c} %1,%5,%4\n\t{sfe|subfe} %0,%3,%2"      \
-              : "=r" ((USItype)(sh)),                                  \
-                "=&r" ((USItype)(sl))                                  \
-              : "r" ((USItype)(ah)),                                   \
-                "r" ((USItype)(bh)),                                   \
-                "rI" ((USItype)(al)),                                  \
-                "r" ((USItype)(bl)));                                  \
-  } while (0)
-#define count_leading_zeros(count, x) \
-  __asm__ ("{cntlz|cntlzw} %0,%1"                                       \
-          : "=r" ((USItype)(count))                                    \
-          : "r" ((USItype)(x)))
-#define COUNT_LEADING_ZEROS_0 32
-#if defined (_ARCH_PPC)
-#define umul_ppmm(ph, pl, m0, m1) \
-  do {                                                                 \
-    USItype __m0 = (m0), __m1 = (m1);                                  \
-    __asm__ ("mulhwu %0,%1,%2"                                          \
-            : "=r" ((USItype) ph)                                      \
-            : "%r" (__m0),                                             \
-              "r" (__m1));                                             \
-    (pl) = __m0 * __m1;                                                \
-  } while (0)
-#define UMUL_TIME 15
-#define smul_ppmm(ph, pl, m0, m1) \
-  do {                                                                 \
-    SItype __m0 = (m0), __m1 = (m1);                                   \
-    __asm__ ("mulhw %0,%1,%2"                                           \
-            : "=r" ((SItype) ph)                                       \
-            : "%r" (__m0),                                             \
-              "r" (__m1));                                             \
-    (pl) = __m0 * __m1;                                                \
-  } while (0)
-#define SMUL_TIME 14
-#define UDIV_TIME 120
-#else
-#define umul_ppmm(xh, xl, m0, m1) \
-  do {                                                                 \
-    USItype __m0 = (m0), __m1 = (m1);                                  \
-    __asm__ ("mul %0,%2,%3"                                             \
-            : "=r" ((USItype)(xh)),                                    \
-              "=q" ((USItype)(xl))                                     \
-            : "r" (__m0),                                              \
-              "r" (__m1));                                             \
-    (xh) += ((((SItype) __m0 >> 31) & __m1)                            \
-            + (((SItype) __m1 >> 31) & __m0));                         \
-  } while (0)
-#define UMUL_TIME 8
-#define smul_ppmm(xh, xl, m0, m1) \
-  __asm__ ("mul %0,%2,%3"                                               \
-          : "=r" ((SItype)(xh)),                                       \
-            "=q" ((SItype)(xl))                                        \
-          : "r" (m0),                                                  \
-            "r" (m1))
-#define SMUL_TIME 4
-#define sdiv_qrnnd(q, r, nh, nl, d) \
-  __asm__ ("div %0,%2,%4"                                               \
-          : "=r" ((SItype)(q)), "=q" ((SItype)(r))                     \
-          : "r" ((SItype)(nh)), "1" ((SItype)(nl)), "r" ((SItype)(d)))
-#define UDIV_TIME 100
-#endif
-#endif /* Power architecture variants. */
-
-
-/***************************************
- **************  PYR  ******************
- ***************************************/
-#if defined (__pyr__) && W_TYPE_SIZE == 32
-#define add_ssaaaa(sh, sl, ah, al, bh, bl) \
-  __asm__ ("addw        %5,%1 \n" \
-          "addwc       %3,%0"                                          \
-          : "=r" ((USItype)(sh)),                                      \
-            "=&r" ((USItype)(sl))                                      \
-          : "%0" ((USItype)(ah)),                                      \
-            "g" ((USItype)(bh)),                                       \
-            "%1" ((USItype)(al)),                                      \
-            "g" ((USItype)(bl)))
-#define sub_ddmmss(sh, sl, ah, al, bh, bl) \
-  __asm__ ("subw        %5,%1 \n" \
-          "subwb       %3,%0"                                          \
-          : "=r" ((USItype)(sh)),                                      \
-            "=&r" ((USItype)(sl))                                      \
-          : "0" ((USItype)(ah)),                                       \
-            "g" ((USItype)(bh)),                                       \
-            "1" ((USItype)(al)),                                       \
-            "g" ((USItype)(bl)))
-/* This insn works on Pyramids with AP, XP, or MI CPUs, but not with SP.  */
-#define umul_ppmm(w1, w0, u, v) \
-  ({union {UDItype __ll;                                               \
-          struct {USItype __h, __l;} __i;                              \
-         } __xx;                                                       \
-  __asm__ ("movw %1,%R0 \n" \
-          "uemul %2,%0"                                                \
-          : "=&r" (__xx.__ll)                                          \
-          : "g" ((USItype) (u)),                                       \
-            "g" ((USItype)(v)));                                       \
-  (w1) = __xx.__i.__h; (w0) = __xx.__i.__l;})
-#endif /* __pyr__ */
-
-
-/***************************************
- **************  RT/ROMP  **************
- ***************************************/
-#if defined (__ibm032__) /* RT/ROMP */ && W_TYPE_SIZE == 32
-#define add_ssaaaa(sh, sl, ah, al, bh, bl) \
-  __asm__ ("a %1,%5 \n" \
-          "ae %0,%3"                                                   \
-          : "=r" ((USItype)(sh)),                                      \
-            "=&r" ((USItype)(sl))                                      \
-          : "%0" ((USItype)(ah)),                                      \
-            "r" ((USItype)(bh)),                                       \
-            "%1" ((USItype)(al)),                                      \
-            "r" ((USItype)(bl)))
-#define sub_ddmmss(sh, sl, ah, al, bh, bl) \
-  __asm__ ("s %1,%5\n" \
-          "se %0,%3"                                                   \
-          : "=r" ((USItype)(sh)),                                      \
-            "=&r" ((USItype)(sl))                                      \
-          : "0" ((USItype)(ah)),                                       \
-            "r" ((USItype)(bh)),                                       \
-            "1" ((USItype)(al)),                                       \
-            "r" ((USItype)(bl)))
-#define umul_ppmm(ph, pl, m0, m1) \
-  do {                                                                 \
-    USItype __m0 = (m0), __m1 = (m1);                                  \
-    __asm__ (                                                          \
-       "s       r2,r2    \n" \
-       "mts    r10,%2   \n" \
-       "m      r2,%3    \n" \
-       "m      r2,%3    \n" \
-       "m      r2,%3    \n" \
-       "m      r2,%3    \n" \
-       "m      r2,%3    \n" \
-       "m      r2,%3    \n" \
-       "m      r2,%3    \n" \
-       "m      r2,%3    \n" \
-       "m      r2,%3    \n" \
-       "m      r2,%3    \n" \
-       "m      r2,%3    \n" \
-       "m      r2,%3    \n" \
-       "m      r2,%3    \n" \
-       "m      r2,%3    \n" \
-       "m      r2,%3    \n" \
-       "m      r2,%3    \n" \
-       "cas    %0,r2,r0 \n" \
-       "mfs    r10,%1"                                                 \
-            : "=r" ((USItype)(ph)),                                    \
-              "=r" ((USItype)(pl))                                     \
-            : "%r" (__m0),                                             \
-               "r" (__m1)                                              \
-            : "r2");                                                   \
-    (ph) += ((((SItype) __m0 >> 31) & __m1)                            \
-            + (((SItype) __m1 >> 31) & __m0));                         \
-  } while (0)
-#define UMUL_TIME 20
-#define UDIV_TIME 200
-#define count_leading_zeros(count, x) \
-  do {                                                                 \
-    if ((x) >= 0x10000)                                                \
-      __asm__ ("clz     %0,%1"                                          \
-              : "=r" ((USItype)(count))                                \
-              : "r" ((USItype)(x) >> 16));                             \
-    else                                                               \
-      {                                                                \
-       __asm__ ("clz   %0,%1"                                          \
-                : "=r" ((USItype)(count))                              \
-                : "r" ((USItype)(x)));                                 \
-       (count) += 16;                                                  \
-      }                                                                \
-  } while (0)
-#endif /* RT/ROMP */
-
-
-/***************************************
- **************  SH2  ******************
- ***************************************/
-#if (defined (__sh2__) || defined(__sh3__) || defined(__SH4__) ) \
-    && W_TYPE_SIZE == 32
-#define umul_ppmm(w1, w0, u, v) \
-  __asm__ (                                                            \
-        "dmulu.l %2,%3\n"  \
-       "sts    macl,%1\n" \
-       "sts    mach,%0"                                                \
-          : "=r" ((USItype)(w1)),                                      \
-            "=r" ((USItype)(w0))                                       \
-          : "r" ((USItype)(u)),                                        \
-            "r" ((USItype)(v))                                         \
-          : "macl", "mach")
-#define UMUL_TIME 5
-#endif
-
-/***************************************
- **************  SPARC ****************
- ***************************************/
-#if defined (__sparc__) && W_TYPE_SIZE == 32
-#define add_ssaaaa(sh, sl, ah, al, bh, bl) \
-  __asm__ ("addcc %r4,%5,%1\n" \
-          "addx %r2,%3,%0"                                             \
-          : "=r" ((USItype)(sh)),                                      \
-            "=&r" ((USItype)(sl))                                      \
-          : "%rJ" ((USItype)(ah)),                                     \
-            "rI" ((USItype)(bh)),                                      \
-            "%rJ" ((USItype)(al)),                                     \
-            "rI" ((USItype)(bl))                                       \
-          __CLOBBER_CC)
-#define sub_ddmmss(sh, sl, ah, al, bh, bl) \
-  __asm__ ("subcc %r4,%5,%1\n" \
-          "subx %r2,%3,%0"                                             \
-          : "=r" ((USItype)(sh)),                                      \
-            "=&r" ((USItype)(sl))                                      \
-          : "rJ" ((USItype)(ah)),                                      \
-            "rI" ((USItype)(bh)),                                      \
-            "rJ" ((USItype)(al)),                                      \
-            "rI" ((USItype)(bl))                                       \
-          __CLOBBER_CC)
-#if defined (__sparc_v8__)
-/* Don't match immediate range because, 1) it is not often useful,
-   2) the 'I' flag thinks of the range as a 13 bit signed interval,
-   while we want to match a 13 bit interval, sign extended to 32 bits,
-   but INTERPRETED AS UNSIGNED.  */
-#define umul_ppmm(w1, w0, u, v) \
-  __asm__ ("umul %2,%3,%1;rd %%y,%0"                                    \
-          : "=r" ((USItype)(w1)),                                      \
-            "=r" ((USItype)(w0))                                       \
-          : "r" ((USItype)(u)),                                        \
-            "r" ((USItype)(v)))
-#define UMUL_TIME 5
-#ifndef SUPERSPARC     /* SuperSPARC's udiv only handles 53 bit dividends */
-#define udiv_qrnnd(q, r, n1, n0, d) \
-  do {                                                                 \
-    USItype __q;                                                       \
-    __asm__ ("mov %1,%%y;nop;nop;nop;udiv %2,%3,%0"                     \
-            : "=r" ((USItype)(__q))                                    \
-            : "r" ((USItype)(n1)),                                     \
-              "r" ((USItype)(n0)),                                     \
-              "r" ((USItype)(d)));                                     \
-    (r) = (n0) - __q * (d);                                            \
-    (q) = __q;                                                         \
-  } while (0)
-#define UDIV_TIME 25
-#endif /* SUPERSPARC */
-#else /* ! __sparc_v8__ */
-#if defined (__sparclite__)
-/* This has hardware multiply but not divide.  It also has two additional
-   instructions scan (ffs from high bit) and divscc.  */
-#define umul_ppmm(w1, w0, u, v) \
-  __asm__ ("umul %2,%3,%1;rd %%y,%0"                                    \
-          : "=r" ((USItype)(w1)),                                      \
-            "=r" ((USItype)(w0))                                       \
-          : "r" ((USItype)(u)),                                        \
-            "r" ((USItype)(v)))
-#define UMUL_TIME 5
-#define udiv_qrnnd(q, r, n1, n0, d) \
-  __asm__ ("! Inlined udiv_qrnnd                                     \n" \
- "        wr   %%g0,%2,%%y     ! Not a delayed write for sparclite  \n" \
- "        tst  %%g0                                                 \n" \
- "        divscc       %3,%4,%%g1                                   \n" \
- "        divscc       %%g1,%4,%%g1                                 \n" \
- "        divscc       %%g1,%4,%%g1                                 \n" \
- "        divscc       %%g1,%4,%%g1                                 \n" \
- "        divscc       %%g1,%4,%%g1                                 \n" \
- "        divscc       %%g1,%4,%%g1                                 \n" \
- "        divscc       %%g1,%4,%%g1                                 \n" \
- "        divscc       %%g1,%4,%%g1                                 \n" \
- "        divscc       %%g1,%4,%%g1                                 \n" \
- "        divscc       %%g1,%4,%%g1                                 \n" \
- "        divscc       %%g1,%4,%%g1                                 \n" \
- "        divscc       %%g1,%4,%%g1                                 \n" \
- "        divscc       %%g1,%4,%%g1                                 \n" \
- "        divscc       %%g1,%4,%%g1                                 \n" \
- "        divscc       %%g1,%4,%%g1                                 \n" \
- "        divscc       %%g1,%4,%%g1                                 \n" \
- "        divscc       %%g1,%4,%%g1                                 \n" \
- "        divscc       %%g1,%4,%%g1                                 \n" \
- "        divscc       %%g1,%4,%%g1                                 \n" \
- "        divscc       %%g1,%4,%%g1                                 \n" \
- "        divscc       %%g1,%4,%%g1                                 \n" \
- "        divscc       %%g1,%4,%%g1                                 \n" \
- "        divscc       %%g1,%4,%%g1                                 \n" \
- "        divscc       %%g1,%4,%%g1                                 \n" \
- "        divscc       %%g1,%4,%%g1                                 \n" \
- "        divscc       %%g1,%4,%%g1                                 \n" \
- "        divscc       %%g1,%4,%%g1                                 \n" \
- "        divscc       %%g1,%4,%%g1                                 \n" \
- "        divscc       %%g1,%4,%%g1                                 \n" \
- "        divscc       %%g1,%4,%%g1                                 \n" \
- "        divscc       %%g1,%4,%%g1                                 \n" \
- "        divscc       %%g1,%4,%0                                   \n" \
- "        rd   %%y,%1                                               \n" \
- "        bl,a 1f                                                    \n" \
- "        add  %1,%4,%1                                             \n" \
- "1:   ! End of inline udiv_qrnnd"                                     \
-          : "=r" ((USItype)(q)),                                       \
-            "=r" ((USItype)(r))                                        \
-          : "r" ((USItype)(n1)),                                       \
-            "r" ((USItype)(n0)),                                       \
-            "rI" ((USItype)(d))                                        \
-          : "%g1" __AND_CLOBBER_CC)
-#define UDIV_TIME 37
-#define count_leading_zeros(count, x) \
-  __asm__ ("scan %1,0,%0"                                               \
-          : "=r" ((USItype)(x))                                        \
-          : "r" ((USItype)(count)))
-/* Early sparclites return 63 for an argument of 0, but they warn that future
-   implementations might change this.  Therefore, leave COUNT_LEADING_ZEROS_0
-   undefined.  */
-#endif /* __sparclite__ */
-#endif /* __sparc_v8__ */
-/* Default to sparc v7 versions of umul_ppmm and udiv_qrnnd.  */
-#ifndef umul_ppmm
-#define umul_ppmm(w1, w0, u, v) \
-  __asm__ ("! Inlined umul_ppmm                                        \n" \
- "        wr   %%g0,%2,%%y     ! SPARC has 0-3 delay insn after a wr  \n" \
- "        sra  %3,31,%%g2      ! Don't move this insn                 \n" \
- "        and  %2,%%g2,%%g2    ! Don't move this insn                 \n" \
- "        andcc        %%g0,0,%%g1     ! Don't move this insn                 \n" \
- "        mulscc       %%g1,%3,%%g1                                   \n" \
- "        mulscc       %%g1,%3,%%g1                                   \n" \
- "        mulscc       %%g1,%3,%%g1                                   \n" \
- "        mulscc       %%g1,%3,%%g1                                   \n" \
- "        mulscc       %%g1,%3,%%g1                                   \n" \
- "        mulscc       %%g1,%3,%%g1                                   \n" \
- "        mulscc       %%g1,%3,%%g1                                   \n" \
- "        mulscc       %%g1,%3,%%g1                                   \n" \
- "        mulscc       %%g1,%3,%%g1                                   \n" \
- "        mulscc       %%g1,%3,%%g1                                   \n" \
- "        mulscc       %%g1,%3,%%g1                                   \n" \
- "        mulscc       %%g1,%3,%%g1                                   \n" \
- "        mulscc       %%g1,%3,%%g1                                   \n" \
- "        mulscc       %%g1,%3,%%g1                                   \n" \
- "        mulscc       %%g1,%3,%%g1                                   \n" \
- "        mulscc       %%g1,%3,%%g1                                   \n" \
- "        mulscc       %%g1,%3,%%g1                                   \n" \
- "        mulscc       %%g1,%3,%%g1                                   \n" \
- "        mulscc       %%g1,%3,%%g1                                   \n" \
- "        mulscc       %%g1,%3,%%g1                                   \n" \
- "        mulscc       %%g1,%3,%%g1                                   \n" \
- "        mulscc       %%g1,%3,%%g1                                   \n" \
- "        mulscc       %%g1,%3,%%g1                                   \n" \
- "        mulscc       %%g1,%3,%%g1                                   \n" \
- "        mulscc       %%g1,%3,%%g1                                   \n" \
- "        mulscc       %%g1,%3,%%g1                                   \n" \
- "        mulscc       %%g1,%3,%%g1                                   \n" \
- "        mulscc       %%g1,%3,%%g1                                   \n" \
- "        mulscc       %%g1,%3,%%g1                                   \n" \
- "        mulscc       %%g1,%3,%%g1                                   \n" \
- "        mulscc       %%g1,%3,%%g1                                   \n" \
- "        mulscc       %%g1,%3,%%g1                                   \n" \
- "        mulscc       %%g1,0,%%g1                                    \n" \
- "        add  %%g1,%%g2,%0                                           \n" \
- "        rd   %%y,%1"                                                 \
-          : "=r" ((USItype)(w1)),                                      \
-            "=r" ((USItype)(w0))                                       \
-          : "%rI" ((USItype)(u)),                                      \
-            "r" ((USItype)(v))                                         \
-          : "%g1", "%g2" __AND_CLOBBER_CC)
-#define UMUL_TIME 39           /* 39 instructions */
-#endif
-#ifndef udiv_qrnnd
-#ifndef LONGLONG_STANDALONE
-#define udiv_qrnnd(q, r, n1, n0, d) \
-  do { USItype __r;                                                    \
-    (q) = __udiv_qrnnd (&__r, (n1), (n0), (d));                        \
-    (r) = __r;                                                         \
-  } while (0)
-extern USItype __udiv_qrnnd ();
-#define UDIV_TIME 140
-#endif /* LONGLONG_STANDALONE */
-#endif /* udiv_qrnnd */
-#endif /* __sparc__ */
-
-
-/***************************************
- **************  VAX  ******************
- ***************************************/
-#if defined (__vax__) && W_TYPE_SIZE == 32
-#define add_ssaaaa(sh, sl, ah, al, bh, bl) \
-  __asm__ ("addl2 %5,%1\n" \
-          "adwc %3,%0"                                                 \
-          : "=g" ((USItype)(sh)),                                      \
-            "=&g" ((USItype)(sl))                                      \
-          : "%0" ((USItype)(ah)),                                      \
-            "g" ((USItype)(bh)),                                       \
-            "%1" ((USItype)(al)),                                      \
-            "g" ((USItype)(bl)))
-#define sub_ddmmss(sh, sl, ah, al, bh, bl) \
-  __asm__ ("subl2 %5,%1\n" \
-          "sbwc %3,%0"                                                 \
-          : "=g" ((USItype)(sh)),                                      \
-            "=&g" ((USItype)(sl))                                      \
-          : "0" ((USItype)(ah)),                                       \
-            "g" ((USItype)(bh)),                                       \
-            "1" ((USItype)(al)),                                       \
-            "g" ((USItype)(bl)))
-#define umul_ppmm(xh, xl, m0, m1) \
-  do {                                                                 \
-    union {UDItype __ll;                                               \
-          struct {USItype __l, __h;} __i;                              \
-         } __xx;                                                       \
-    USItype __m0 = (m0), __m1 = (m1);                                  \
-    __asm__ ("emul %1,%2,$0,%0"                                         \
-            : "=g" (__xx.__ll)                                         \
-            : "g" (__m0),                                              \
-              "g" (__m1));                                             \
-    (xh) = __xx.__i.__h; (xl) = __xx.__i.__l;                          \
-    (xh) += ((((SItype) __m0 >> 31) & __m1)                            \
-            + (((SItype) __m1 >> 31) & __m0));                         \
-  } while (0)
-#define sdiv_qrnnd(q, r, n1, n0, d) \
-  do {                                                                 \
-    union {DItype __ll;                                                \
-          struct {SItype __l, __h;} __i;                               \
-         } __xx;                                                       \
-    __xx.__i.__h = n1; __xx.__i.__l = n0;                              \
-    __asm__ ("ediv %3,%2,%0,%1"                                         \
-            : "=g" (q), "=g" (r)                                       \
-            : "g" (__xx.__ll), "g" (d));                               \
-  } while (0)
-#endif /* __vax__ */
-
-
-/***************************************
- **************  Z8000 ****************
- ***************************************/
-#if defined (__z8000__) && W_TYPE_SIZE == 16
-#define add_ssaaaa(sh, sl, ah, al, bh, bl) \
-  __asm__ ("add %H1,%H5\n\tadc  %H0,%H3"                                \
-          : "=r" ((unsigned int)(sh)),                                 \
-            "=&r" ((unsigned int)(sl))                                 \
-          : "%0" ((unsigned int)(ah)),                                 \
-            "r" ((unsigned int)(bh)),                                  \
-            "%1" ((unsigned int)(al)),                                 \
-            "rQR" ((unsigned int)(bl)))
-#define sub_ddmmss(sh, sl, ah, al, bh, bl) \
-  __asm__ ("sub %H1,%H5\n\tsbc  %H0,%H3"                                \
-          : "=r" ((unsigned int)(sh)),                                 \
-            "=&r" ((unsigned int)(sl))                                 \
-          : "0" ((unsigned int)(ah)),                                  \
-            "r" ((unsigned int)(bh)),                                  \
-            "1" ((unsigned int)(al)),                                  \
-            "rQR" ((unsigned int)(bl)))
-#define umul_ppmm(xh, xl, m0, m1) \
-  do {                                                                 \
-    union {long int __ll;                                              \
-          struct {unsigned int __h, __l;} __i;                         \
-         } __xx;                                                       \
-    unsigned int __m0 = (m0), __m1 = (m1);                             \
-    __asm__ ("mult      %S0,%H3"                                        \
-            : "=r" (__xx.__i.__h),                                     \
-              "=r" (__xx.__i.__l)                                      \
-            : "%1" (__m0),                                             \
-              "rQR" (__m1));                                           \
-    (xh) = __xx.__i.__h; (xl) = __xx.__i.__l;                          \
-    (xh) += ((((signed int) __m0 >> 15) & __m1)                        \
-            + (((signed int) __m1 >> 15) & __m0));                     \
-  } while (0)
-#endif /* __z8000__ */
-
-#endif /* __GNUC__ */
-
-
-/***************************************
- ***********  Generic Versions ********
- ***************************************/
-#if !defined (umul_ppmm) && defined (__umulsidi3)
-#define umul_ppmm(ph, pl, m0, m1) \
-  {                                                                    \
-    UDWtype __ll = __umulsidi3 (m0, m1);                               \
-    ph = (UWtype) (__ll >> W_TYPE_SIZE);                               \
-    pl = (UWtype) __ll;                                                \
-  }
-#endif
-
-#if !defined (__umulsidi3)
-#define __umulsidi3(u, v) \
-  ({UWtype __hi, __lo;                                                 \
-    umul_ppmm (__hi, __lo, u, v);                                      \
-    ((UDWtype) __hi << W_TYPE_SIZE) | __lo; })
-#endif
-
-/* If this machine has no inline assembler, use C macros.  */
-
-#if !defined (add_ssaaaa)
-#define add_ssaaaa(sh, sl, ah, al, bh, bl) \
-  do {                                                                 \
-    UWtype __x;                                                        \
-    __x = (al) + (bl);                                                 \
-    (sh) = (ah) + (bh) + (__x < (al));                                 \
-    (sl) = __x;                                                        \
-  } while (0)
-#endif
-
-#if !defined (sub_ddmmss)
-#define sub_ddmmss(sh, sl, ah, al, bh, bl) \
-  do {                                                                 \
-    UWtype __x;                                                        \
-    __x = (al) - (bl);                                                 \
-    (sh) = (ah) - (bh) - (__x > (al));                                 \
-    (sl) = __x;                                                        \
-  } while (0)
-#endif
-
-#if !defined (umul_ppmm)
-#define umul_ppmm(w1, w0, u, v)                                        \
-  do {                                                                 \
-    UWtype __x0, __x1, __x2, __x3;                                     \
-    UHWtype __ul, __vl, __uh, __vh;                                    \
-    UWtype __u = (u), __v = (v);                                       \
-                                                                       \
-    __ul = __ll_lowpart (__u);                                         \
-    __uh = __ll_highpart (__u);                                        \
-    __vl = __ll_lowpart (__v);                                         \
-    __vh = __ll_highpart (__v);                                        \
-                                                                       \
-    __x0 = (UWtype) __ul * __vl;                                       \
-    __x1 = (UWtype) __ul * __vh;                                       \
-    __x2 = (UWtype) __uh * __vl;                                       \
-    __x3 = (UWtype) __uh * __vh;                                       \
-                                                                       \
-    __x1 += __ll_highpart (__x0);/* this can't give carry */            \
-    __x1 += __x2;              /* but this indeed can */               \
-    if (__x1 < __x2)           /* did we get it? */                    \
-      __x3 += __ll_B;          /* yes, add it in the proper pos. */    \
-                                                                       \
-    (w1) = __x3 + __ll_highpart (__x1);                                \
-    (w0) = (__ll_lowpart (__x1) << W_TYPE_SIZE/2) + __ll_lowpart (__x0);\
-  } while (0)
-#endif
-
-#if !defined (umul_ppmm)
-#define smul_ppmm(w1, w0, u, v)                                        \
-  do {                                                                 \
-    UWtype __w1;                                                       \
-    UWtype __m0 = (u), __m1 = (v);                                     \
-    umul_ppmm (__w1, w0, __m0, __m1);                                  \
-    (w1) = __w1 - (-(__m0 >> (W_TYPE_SIZE - 1)) & __m1)                \
-               - (-(__m1 >> (W_TYPE_SIZE - 1)) & __m0);                \
-  } while (0)
-#endif
-
-/* Define this unconditionally, so it can be used for debugging.  */
-#define __udiv_qrnnd_c(q, r, n1, n0, d) \
-  do {                                                                 \
-    UWtype __d1, __d0, __q1, __q0, __r1, __r0, __m;                    \
-    __d1 = __ll_highpart (d);                                          \
-    __d0 = __ll_lowpart (d);                                           \
-                                                                       \
-    __r1 = (n1) % __d1;                                                \
-    __q1 = (n1) / __d1;                                                \
-    __m = (UWtype) __q1 * __d0;                                        \
-    __r1 = __r1 * __ll_B | __ll_highpart (n0);                         \
-    if (__r1 < __m)                                                    \
-      {                                                                \
-       __q1--, __r1 += (d);                                            \
-       if (__r1 >= (d)) /* i.e. we didn't get carry when adding to __r1 */\
-         if (__r1 < __m)                                               \
-           __q1--, __r1 += (d);                                        \
-      }                                                                \
-    __r1 -= __m;                                                       \
-                                                                       \
-    __r0 = __r1 % __d1;                                                \
-    __q0 = __r1 / __d1;                                                \
-    __m = (UWtype) __q0 * __d0;                                        \
-    __r0 = __r0 * __ll_B | __ll_lowpart (n0);                          \
-    if (__r0 < __m)                                                    \
-      {                                                                \
-       __q0--, __r0 += (d);                                            \
-       if (__r0 >= (d))                                                \
-         if (__r0 < __m)                                               \
-           __q0--, __r0 += (d);                                        \
-      }                                                                \
-    __r0 -= __m;                                                       \
-                                                                       \
-    (q) = (UWtype) __q1 * __ll_B | __q0;                               \
-    (r) = __r0;                                                        \
-  } while (0)
-
-/* If the processor has no udiv_qrnnd but sdiv_qrnnd, go through
-   __udiv_w_sdiv (defined in libgcc or elsewhere).  */
-#if !defined (udiv_qrnnd) && defined (sdiv_qrnnd)
-#define udiv_qrnnd(q, r, nh, nl, d) \
-  do {                                                                 \
-    UWtype __r;                                                        \
-    (q) = __MPN(udiv_w_sdiv) (&__r, nh, nl, d);                        \
-    (r) = __r;                                                         \
-  } while (0)
-#endif
-
-/* If udiv_qrnnd was not defined for this processor, use __udiv_qrnnd_c.  */
-#if !defined (udiv_qrnnd)
-#define UDIV_NEEDS_NORMALIZATION 1
-#define udiv_qrnnd __udiv_qrnnd_c
-#endif
-
-#undef count_leading_zeros
-#if !defined (count_leading_zeros)
-extern
-#ifdef __STDC__
-const
-#endif
-unsigned char __clz_tab[];
-#define count_leading_zeros(count, x) \
-  do {                                                                 \
-    UWtype __xr = (x);                                                 \
-    UWtype __a;                                                        \
-                                                                       \
-    if (W_TYPE_SIZE <= 32)                                             \
-      {                                                                \
-       __a = __xr < ((UWtype) 1 << 2*__BITS4)                          \
-         ? (__xr < ((UWtype) 1 << __BITS4) ? 0 : __BITS4)              \
-         : (__xr < ((UWtype) 1 << 3*__BITS4) ?  2*__BITS4 : 3*__BITS4);\
-      }                                                                \
-    else                                                               \
-      {                                                                \
-       for (__a = W_TYPE_SIZE - 8; __a > 0; __a -= 8)                  \
-         if (((__xr >> __a) & 0xff) != 0)                              \
-           break;                                                      \
-      }                                                                \
-                                                                       \
-    (count) = W_TYPE_SIZE - (__clz_tab[__xr >> __a] + __a);            \
-  } while (0)
-/* This version gives a well-defined value for zero. */
-#define COUNT_LEADING_ZEROS_0 W_TYPE_SIZE
-#endif
-
-#if !defined (count_trailing_zeros)
-/* Define count_trailing_zeros using count_leading_zeros.  The latter might be
-   defined in asm, but if it is not, the C version above is good enough.  */
-#define count_trailing_zeros(count, x) \
-  do {                                                                 \
-    UWtype __ctz_x = (x);                                              \
-    UWtype __ctz_c;                                                    \
-    count_leading_zeros (__ctz_c, __ctz_x & -__ctz_x);                 \
-    (count) = W_TYPE_SIZE - 1 - __ctz_c;                               \
-  } while (0)
-#endif
-
-#ifndef UDIV_NEEDS_NORMALIZATION
-#define UDIV_NEEDS_NORMALIZATION 0
-#endif
diff --git a/crypto/mpi/mpi-add.c b/crypto/mpi/mpi-add.c
deleted file mode 100644 (file)
index 2004206..0000000
+++ /dev/null
@@ -1,258 +0,0 @@
-/* mpi-add.c  -  MPI functions
- *     Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
- *     Copyright (C) 1994, 1996 Free Software Foundation, Inc.
- *
- * This file is part of GnuPG.
- *
- * GnuPG 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.
- *
- * GnuPG 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
- *
- * Note: This code is heavily based on the GNU MP Library.
- *      Actually it's the same code with only minor changes in the
- *      way the data is stored; this is to support the abstraction
- *      of an optional secure memory allocation which may be used
- *      to avoid revealing of sensitive data due to paging etc.
- *      The GNU MP Library itself is published under the LGPL;
- *      however I decided to publish this code under the plain GPL.
- */
-
-#include "mpi-internal.h"
-
-/****************
- * Add the unsigned integer V to the mpi-integer U and store the
- * result in W. U and V may be the same.
- */
-int
-mpi_add_ui(MPI w, const MPI u, unsigned long v )
-{
-    mpi_ptr_t wp, up;
-    mpi_size_t usize, wsize;
-    int usign, wsign;
-
-    usize = u->nlimbs;
-    usign = u->sign;
-    wsign = 0;
-
-    /* If not space for W (and possible carry), increase space.  */
-    wsize = usize + 1;
-    if( w->alloced < wsize )
-           if (mpi_resize(w, wsize) < 0)
-                   return -ENOMEM;
-
-    /* These must be after realloc (U may be the same as W).  */
-    up = u->d;
-    wp = w->d;
-
-    if( !usize ) {  /* simple */
-       wp[0] = v;
-       wsize = v? 1:0;
-    }
-    else if( !usign ) {  /* mpi is not negative */
-       mpi_limb_t cy;
-       cy = mpihelp_add_1(wp, up, usize, v);
-       wp[usize] = cy;
-       wsize = usize + cy;
-    }
-    else {  /* The signs are different.  Need exact comparison to determine
-            * which operand to subtract from which.  */
-       if( usize == 1 && up[0] < v ) {
-           wp[0] = v - up[0];
-           wsize = 1;
-       }
-       else {
-           mpihelp_sub_1(wp, up, usize, v);
-           /* Size can decrease with at most one limb. */
-           wsize = usize - (wp[usize-1]==0);
-           wsign = 1;
-       }
-    }
-
-    w->nlimbs = wsize;
-    w->sign   = wsign;
-    return 0;
-}
-
-
-int
-mpi_add(MPI w, MPI u, MPI v)
-{
-    mpi_ptr_t wp, up, vp;
-    mpi_size_t usize, vsize, wsize;
-    int usign, vsign, wsign;
-
-    if( u->nlimbs < v->nlimbs ) { /* Swap U and V. */
-       usize = v->nlimbs;
-       usign = v->sign;
-       vsize = u->nlimbs;
-       vsign = u->sign;
-       wsize = usize + 1;
-       if (RESIZE_IF_NEEDED(w, wsize) < 0)
-               return -ENOMEM;
-       /* These must be after realloc (u or v may be the same as w).  */
-       up    = v->d;
-       vp    = u->d;
-    }
-    else {
-       usize = u->nlimbs;
-       usign = u->sign;
-       vsize = v->nlimbs;
-       vsign = v->sign;
-       wsize = usize + 1;
-       if (RESIZE_IF_NEEDED(w, wsize) < 0)
-               return -ENOMEM;
-       /* These must be after realloc (u or v may be the same as w).  */
-       up    = u->d;
-       vp    = v->d;
-    }
-    wp = w->d;
-    wsign = 0;
-
-    if( !vsize ) {  /* simple */
-        MPN_COPY(wp, up, usize );
-       wsize = usize;
-       wsign = usign;
-    }
-    else if( usign != vsign ) { /* different sign */
-       /* This test is right since USIZE >= VSIZE */
-       if( usize != vsize ) {
-           mpihelp_sub(wp, up, usize, vp, vsize);
-           wsize = usize;
-           MPN_NORMALIZE(wp, wsize);
-           wsign = usign;
-       }
-       else if( mpihelp_cmp(up, vp, usize) < 0 ) {
-           mpihelp_sub_n(wp, vp, up, usize);
-           wsize = usize;
-           MPN_NORMALIZE(wp, wsize);
-           if( !usign )
-               wsign = 1;
-       }
-       else {
-           mpihelp_sub_n(wp, up, vp, usize);
-           wsize = usize;
-           MPN_NORMALIZE(wp, wsize);
-           if( usign )
-               wsign = 1;
-       }
-    }
-    else { /* U and V have same sign. Add them. */
-       mpi_limb_t cy = mpihelp_add(wp, up, usize, vp, vsize);
-       wp[usize] = cy;
-       wsize = usize + cy;
-       if( usign )
-           wsign = 1;
-    }
-
-    w->nlimbs = wsize;
-    w->sign = wsign;
-    return 0;
-}
-
-
-/****************
- * Subtract the unsigned integer V from the mpi-integer U and store the
- * result in W.
- */
-int
-mpi_sub_ui(MPI w, MPI u, unsigned long v )
-{
-    mpi_ptr_t wp, up;
-    mpi_size_t usize, wsize;
-    int usign, wsign;
-
-    usize = u->nlimbs;
-    usign = u->sign;
-    wsign = 0;
-
-    /* If not space for W (and possible carry), increase space.  */
-    wsize = usize + 1;
-    if( w->alloced < wsize )
-           if (mpi_resize(w, wsize) < 0)
-                   return -ENOMEM;
-
-    /* These must be after realloc (U may be the same as W).  */
-    up = u->d;
-    wp = w->d;
-
-    if( !usize ) {  /* simple */
-       wp[0] = v;
-       wsize = v? 1:0;
-       wsign = 1;
-    }
-    else if( usign ) { /* mpi and v are negative */
-       mpi_limb_t cy;
-       cy = mpihelp_add_1(wp, up, usize, v);
-       wp[usize] = cy;
-       wsize = usize + cy;
-    }
-    else {  /* The signs are different.  Need exact comparison to determine
-            * which operand to subtract from which.  */
-       if( usize == 1 && up[0] < v ) {
-           wp[0] = v - up[0];
-           wsize = 1;
-           wsign = 1;
-       }
-       else {
-           mpihelp_sub_1(wp, up, usize, v);
-           /* Size can decrease with at most one limb. */
-           wsize = usize - (wp[usize-1]==0);
-       }
-    }
-
-    w->nlimbs = wsize;
-    w->sign   = wsign;
-    return 0;
-}
-
-int
-mpi_sub(MPI w, MPI u, MPI v)
-{
-       int rc;
-
-    if( w == v ) {
-           MPI vv;
-       if (mpi_copy(&vv, v) < 0)
-               return -ENOMEM;
-       vv->sign = !vv->sign;
-       rc = mpi_add( w, u, vv );
-       mpi_free(vv);
-    }
-    else {
-       /* fixme: this is not thread-save (we temp. modify v) */
-       v->sign = !v->sign;
-       rc = mpi_add( w, u, v );
-       v->sign = !v->sign;
-    }
-    return rc;
-}
-
-
-int
-mpi_addm( MPI w, MPI u, MPI v, MPI m)
-{
-       if (mpi_add(w, u, v) < 0 ||
-           mpi_fdiv_r( w, w, m ) < 0)
-               return -ENOMEM;
-       return 0;
-}
-
-int
-mpi_subm( MPI w, MPI u, MPI v, MPI m)
-{
-       if (mpi_sub(w, u, v) < 0 ||
-           mpi_fdiv_r( w, w, m ) < 0)
-               return -ENOMEM;
-       return 0;
-}
-
diff --git a/crypto/mpi/mpi-bit.c b/crypto/mpi/mpi-bit.c
deleted file mode 100644 (file)
index f155cc2..0000000
+++ /dev/null
@@ -1,245 +0,0 @@
-/* mpi-bit.c  -  MPI bit level fucntions
- * Copyright (C) 1998, 1999 Free Software Foundation, Inc.
- *
- * This file is part of GnuPG.
- *
- * GnuPG 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.
- *
- * GnuPG 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 "mpi-internal.h"
-#include "longlong.h"
-
-const unsigned char __clz_tab[] = {
-       0,1,2,2,3,3,3,3,4,4,4,4,4,4,4,4,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,
-       6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,
-       7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,
-       7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,
-       8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,
-       8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,
-       8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,
-       8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,
-};
-
-#define A_LIMB_1 ((mpi_limb_t) 1)
-
-
-/****************
- * Sometimes we have MSL (most significant limbs) which are 0;
- * this is for some reasons not good, so this function removes them.
- */
-void
-mpi_normalize( MPI a )
-{
-    for( ; a->nlimbs && !a->d[a->nlimbs-1]; a->nlimbs-- )
-       ;
-}
-
-
-
-/****************
- * Return the number of bits in A.
- */
-unsigned
-mpi_get_nbits( MPI a )
-{
-    unsigned n;
-
-    mpi_normalize( a );
-
-    if( a->nlimbs ) {
-       mpi_limb_t alimb = a->d[a->nlimbs-1];
-       if( alimb ) {
-         count_leading_zeros( n, alimb );
-       }
-       else
-           n = BITS_PER_MPI_LIMB;
-       n = BITS_PER_MPI_LIMB - n + (a->nlimbs-1) * BITS_PER_MPI_LIMB;
-    }
-    else
-       n = 0;
-    return n;
-}
-
-
-/****************
- * Test whether bit N is set.
- */
-int
-mpi_test_bit( MPI a, unsigned n )
-{
-    unsigned limbno, bitno;
-    mpi_limb_t limb;
-
-    limbno = n / BITS_PER_MPI_LIMB;
-    bitno  = n % BITS_PER_MPI_LIMB;
-
-    if( limbno >= a->nlimbs )
-       return 0; /* too far left: this is a 0 */
-    limb = a->d[limbno];
-    return (limb & (A_LIMB_1 << bitno))? 1: 0;
-}
-
-
-/****************
- * Set bit N of A.
- */
-int
-mpi_set_bit( MPI a, unsigned n )
-{
-    unsigned limbno, bitno;
-
-    limbno = n / BITS_PER_MPI_LIMB;
-    bitno  = n % BITS_PER_MPI_LIMB;
-
-    if( limbno >= a->nlimbs ) { /* resize */
-       if( a->alloced >= limbno )
-           if (mpi_resize(a, limbno+1 ) < 0) return -ENOMEM;
-       a->nlimbs = limbno+1;
-    }
-    a->d[limbno] |= (A_LIMB_1<<bitno);
-    return 0;
-}
-
-/****************
- * Set bit N of A. and clear all bits above
- */
-int
-mpi_set_highbit( MPI a, unsigned n )
-{
-    unsigned limbno, bitno;
-
-    limbno = n / BITS_PER_MPI_LIMB;
-    bitno  = n % BITS_PER_MPI_LIMB;
-
-    if( limbno >= a->nlimbs ) { /* resize */
-       if( a->alloced >= limbno )
-           if (mpi_resize(a, limbno+1 ) < 0) return -ENOMEM;
-       a->nlimbs = limbno+1;
-    }
-    a->d[limbno] |= (A_LIMB_1<<bitno);
-    for( bitno++; bitno < BITS_PER_MPI_LIMB; bitno++ )
-       a->d[limbno] &= ~(A_LIMB_1 << bitno);
-    a->nlimbs = limbno+1;
-    return 0;
-}
-
-/****************
- * clear bit N of A and all bits above
- */
-void
-mpi_clear_highbit( MPI a, unsigned n )
-{
-    unsigned limbno, bitno;
-
-    limbno = n / BITS_PER_MPI_LIMB;
-    bitno  = n % BITS_PER_MPI_LIMB;
-
-    if( limbno >= a->nlimbs )
-       return; /* not allocated, so need to clear bits :-) */
-
-    for( ; bitno < BITS_PER_MPI_LIMB; bitno++ )
-       a->d[limbno] &= ~(A_LIMB_1 << bitno);
-    a->nlimbs = limbno+1;
-}
-
-/****************
- * Clear bit N of A.
- */
-void
-mpi_clear_bit( MPI a, unsigned n )
-{
-    unsigned limbno, bitno;
-
-    limbno = n / BITS_PER_MPI_LIMB;
-    bitno  = n % BITS_PER_MPI_LIMB;
-
-    if( limbno >= a->nlimbs )
-       return; /* don't need to clear this bit, it's to far to left */
-    a->d[limbno] &= ~(A_LIMB_1 << bitno);
-}
-
-
-/****************
- * Shift A by N bits to the right
- * FIXME: should use alloc_limb if X and A are same.
- */
-int
-mpi_rshift( MPI x, MPI a, unsigned n )
-{
-    mpi_ptr_t xp;
-    mpi_size_t xsize;
-
-    xsize = a->nlimbs;
-    x->sign = a->sign;
-    if (RESIZE_IF_NEEDED(x, (size_t)xsize) < 0) return -ENOMEM;
-    xp = x->d;
-
-    if( xsize ) {
-       mpihelp_rshift( xp, a->d, xsize, n);
-       MPN_NORMALIZE( xp, xsize);
-    }
-    x->nlimbs = xsize;
-    return 0;
-}
-
-
-/****************
- * Shift A by COUNT limbs to the left
- * This is used only within the MPI library
- */
-int
-mpi_lshift_limbs( MPI a, unsigned int count )
-{
-    mpi_ptr_t ap = a->d;
-    int n = a->nlimbs;
-    int i;
-
-    if( !count || !n )
-       return 0;
-
-    if (RESIZE_IF_NEEDED( a, n+count ) < 0) return -ENOMEM;
-
-    for( i = n-1; i >= 0; i-- )
-       ap[i+count] = ap[i];
-    for(i=0; i < count; i++ )
-       ap[i] = 0;
-    a->nlimbs += count;
-    return 0;
-}
-
-
-/****************
- * Shift A by COUNT limbs to the right
- * This is used only within the MPI library
- */
-void
-mpi_rshift_limbs( MPI a, unsigned int count )
-{
-    mpi_ptr_t ap = a->d;
-    mpi_size_t n = a->nlimbs;
-    unsigned int i;
-
-    if( count >= n ) {
-       a->nlimbs = 0;
-       return;
-    }
-
-    for( i = 0; i < n - count; i++ )
-       ap[i] = ap[i+count];
-    ap[i] = 0;
-    a->nlimbs -= count;
-}
-
-
diff --git a/crypto/mpi/mpi-cmp.c b/crypto/mpi/mpi-cmp.c
deleted file mode 100644 (file)
index c183cd5..0000000
+++ /dev/null
@@ -1,71 +0,0 @@
-/* mpi-cmp.c  -  MPI functions
- * Copyright (C) 1998, 1999 Free Software Foundation, Inc.
- *
- * This file is part of GnuPG.
- *
- * GnuPG 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.
- *
- * GnuPG 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 "mpi-internal.h"
-
-int
-mpi_cmp_ui( MPI u, unsigned long v )
-{
-    mpi_limb_t limb = v;
-
-    mpi_normalize( u );
-    if( !u->nlimbs && !limb )
-       return 0;
-    if( u->sign )
-       return -1;
-    if( u->nlimbs > 1 )
-       return 1;
-
-    if( u->d[0] == limb )
-       return 0;
-    else if( u->d[0] > limb )
-       return 1;
-    else
-       return -1;
-}
-
-int
-mpi_cmp( MPI u, MPI v )
-{
-    mpi_size_t usize, vsize;
-    int cmp;
-
-    mpi_normalize( u );
-    mpi_normalize( v );
-    usize = u->nlimbs;
-    vsize = v->nlimbs;
-    if( !u->sign && v->sign )
-       return 1;
-    if( u->sign && !v->sign )
-       return -1;
-    if( usize != vsize && !u->sign && !v->sign )
-       return usize - vsize;
-    if( usize != vsize && u->sign && v->sign )
-       return vsize + usize;
-    if( !usize )
-       return 0;
-    if( !(cmp=mpihelp_cmp( u->d, v->d, usize )) )
-       return 0;
-    if( (cmp < 0?1:0) == (u->sign?1:0))
-       return 1;
-    return -1;
-}
-
-
diff --git a/crypto/mpi/mpi-div.c b/crypto/mpi/mpi-div.c
deleted file mode 100644 (file)
index dee9146..0000000
+++ /dev/null
@@ -1,345 +0,0 @@
-/* mpi-div.c  -  MPI functions
- *     Copyright (C) 1994, 1996 Free Software Foundation, Inc.
- *     Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
- *
- * This file is part of GnuPG.
- *
- * GnuPG 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.
- *
- * GnuPG 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
- *
- * Note: This code is heavily based on the GNU MP Library.
- *      Actually it's the same code with only minor changes in the
- *      way the data is stored; this is to support the abstraction
- *      of an optional secure memory allocation which may be used
- *      to avoid revealing of sensitive data due to paging etc.
- *      The GNU MP Library itself is published under the LGPL;
- *      however I decided to publish this code under the plain GPL.
- */
-
-#include <linux/string.h>
-#include "mpi-internal.h"
-#include "longlong.h"
-
-
-int
-mpi_fdiv_r( MPI rem, MPI dividend, MPI divisor )
-{
-       int rc = -ENOMEM;
-       int divisor_sign = divisor->sign;
-       MPI temp_divisor = NULL;
-
-       /* We need the original value of the divisor after the remainder has been
-        * preliminary calculated.      We have to copy it to temporary space if it's
-        * the same variable as REM.  */
-       if( rem == divisor ) {
-               if (mpi_copy( &temp_divisor, divisor ) < 0) goto nomem;
-               divisor = temp_divisor;
-       }
-
-       if (mpi_tdiv_qr(NULL, rem, dividend, divisor ) < 0) goto nomem;
-       if( ((divisor_sign?1:0) ^ (dividend->sign?1:0)) && rem->nlimbs )
-               if (mpi_add( rem, rem, divisor) < 0) goto nomem;
-
-       rc = 0;
-
- nomem:
-       if( temp_divisor )
-               mpi_free(temp_divisor);
-       return rc;
-}
-
-
-/****************
- * Division rounding the quotient towards -infinity.
- * The remainder gets the same sign as the denominator.
- * rem is optional
- */
-
-ulong
-mpi_fdiv_r_ui( MPI rem, MPI dividend, ulong divisor )
-{
-    mpi_limb_t rlimb;
-
-    rlimb = mpihelp_mod_1( dividend->d, dividend->nlimbs, divisor );
-    if( rlimb && dividend->sign )
-       rlimb = divisor - rlimb;
-
-    if( rem ) {
-       rem->d[0] = rlimb;
-       rem->nlimbs = rlimb? 1:0;
-    }
-    return rlimb;
-}
-
-
-int
-mpi_fdiv_q( MPI quot, MPI dividend, MPI divisor )
-{
-    MPI tmp = mpi_alloc( mpi_get_nlimbs(quot) );
-    if (!tmp)
-           return -ENOMEM;
-    mpi_fdiv_qr( quot, tmp, dividend, divisor);
-    mpi_free(tmp);
-    return 0;
-}
-
-int
-mpi_fdiv_qr( MPI quot, MPI rem, MPI dividend, MPI divisor )
-{
-    int divisor_sign = divisor->sign;
-    MPI temp_divisor = NULL;
-
-    if( quot == divisor || rem == divisor ) {
-       if (mpi_copy( &temp_divisor, divisor ) < 0);
-       return -ENOMEM;
-       divisor = temp_divisor;
-    }
-
-    if (mpi_tdiv_qr( quot, rem, dividend, divisor ) < 0)
-           goto nomem;
-
-    if( (divisor_sign ^ dividend->sign) && rem->nlimbs ) {
-           if (mpi_sub_ui( quot, quot, 1 ) < 0)
-                   goto nomem;
-           if (mpi_add( rem, rem, divisor) < 0)
-                   goto nomem;
-    }
-
-    if( temp_divisor )
-       mpi_free(temp_divisor);
-
-    return 0;
-
- nomem:
-    mpi_free(temp_divisor);
-    return -ENOMEM;
-}
-
-
-/* If den == quot, den needs temporary storage.
- * If den == rem, den needs temporary storage.
- * If num == quot, num needs temporary storage.
- * If den has temporary storage, it can be normalized while being copied,
- *   i.e no extra storage should be allocated.
- */
-
-int
-mpi_tdiv_r( MPI rem, MPI num, MPI den)
-{
-    return mpi_tdiv_qr(NULL, rem, num, den );
-}
-
-int
-mpi_tdiv_qr( MPI quot, MPI rem, MPI num, MPI den)
-{
-       int rc = -ENOMEM;
-       mpi_ptr_t np, dp;
-       mpi_ptr_t qp, rp;
-       mpi_size_t nsize = num->nlimbs;
-       mpi_size_t dsize = den->nlimbs;
-       mpi_size_t qsize, rsize;
-       mpi_size_t sign_remainder = num->sign;
-       mpi_size_t sign_quotient = num->sign ^ den->sign;
-       unsigned normalization_steps;
-       mpi_limb_t q_limb;
-       mpi_ptr_t marker[5];
-       int markidx=0;
-
-       memset(marker,0,sizeof(marker));
-
-       /* Ensure space is enough for quotient and remainder.
-        * We need space for an extra limb in the remainder, because it's
-        * up-shifted (normalized) below.  */
-       rsize = nsize + 1;
-       if (mpi_resize( rem, rsize) < 0) goto nomem;
-
-       qsize = rsize - dsize;    /* qsize cannot be bigger than this.  */
-       if( qsize <= 0 ) {
-               if( num != rem ) {
-                       rem->nlimbs = num->nlimbs;
-                       rem->sign = num->sign;
-                       MPN_COPY(rem->d, num->d, nsize);
-               }
-               if( quot ) {
-                       /* This needs to follow the assignment to rem, in case the
-                        * numerator and quotient are the same.  */
-                       quot->nlimbs = 0;
-                       quot->sign = 0;
-               }
-               return 0;
-       }
-
-       if( quot )
-               if (mpi_resize( quot, qsize) < 0) goto nomem;
-
-       /* Read pointers here, when reallocation is finished.  */
-       np = num->d;
-       dp = den->d;
-       rp = rem->d;
-
-       /* Optimize division by a single-limb divisor.  */
-       if( dsize == 1 ) {
-               mpi_limb_t rlimb;
-               if( quot ) {
-                       qp = quot->d;
-                       rlimb = mpihelp_divmod_1( qp, np, nsize, dp[0] );
-                       qsize -= qp[qsize - 1] == 0;
-                       quot->nlimbs = qsize;
-                       quot->sign = sign_quotient;
-               }
-               else
-                       rlimb = mpihelp_mod_1( np, nsize, dp[0] );
-               rp[0] = rlimb;
-               rsize = rlimb != 0?1:0;
-               rem->nlimbs = rsize;
-               rem->sign = sign_remainder;
-               return 0;
-       }
-
-
-       if( quot ) {
-               qp = quot->d;
-               /* Make sure QP and NP point to different objects.  Otherwise the
-                * numerator would be gradually overwritten by the quotient limbs.  */
-               if(qp == np) { /* Copy NP object to temporary space.  */
-                       np = marker[markidx++] = mpi_alloc_limb_space(nsize);
-                       MPN_COPY(np, qp, nsize);
-               }
-       }
-       else /* Put quotient at top of remainder. */
-               qp = rp + dsize;
-
-       count_leading_zeros( normalization_steps, dp[dsize - 1] );
-
-       /* Normalize the denominator, i.e. make its most significant bit set by
-        * shifting it NORMALIZATION_STEPS bits to the left.  Also shift the
-        * numerator the same number of steps (to keep the quotient the same!).
-        */
-       if( normalization_steps ) {
-               mpi_ptr_t tp;
-               mpi_limb_t nlimb;
-
-               /* Shift up the denominator setting the most significant bit of
-                * the most significant word.  Use temporary storage not to clobber
-                * the original contents of the denominator.  */
-               tp = marker[markidx++] = mpi_alloc_limb_space(dsize);
-               if (!tp) goto nomem;
-               mpihelp_lshift( tp, dp, dsize, normalization_steps );
-               dp = tp;
-
-               /* Shift up the numerator, possibly introducing a new most
-                * significant word.  Move the shifted numerator in the remainder
-                * meanwhile.  */
-               nlimb = mpihelp_lshift(rp, np, nsize, normalization_steps);
-               if( nlimb ) {
-                       rp[nsize] = nlimb;
-                       rsize = nsize + 1;
-               }
-               else
-                       rsize = nsize;
-       }
-       else {
-               /* The denominator is already normalized, as required.  Copy it to
-                * temporary space if it overlaps with the quotient or remainder.  */
-               if( dp == rp || (quot && (dp == qp))) {
-                       mpi_ptr_t tp;
-
-                       tp = marker[markidx++] = mpi_alloc_limb_space(dsize);
-                       if (!tp) goto nomem;
-                       MPN_COPY( tp, dp, dsize );
-                       dp = tp;
-               }
-
-               /* Move the numerator to the remainder.  */
-               if( rp != np )
-                       MPN_COPY(rp, np, nsize);
-
-               rsize = nsize;
-       }
-
-       q_limb = mpihelp_divrem( qp, 0, rp, rsize, dp, dsize );
-
-       if( quot ) {
-               qsize = rsize - dsize;
-               if(q_limb) {
-                       qp[qsize] = q_limb;
-                       qsize += 1;
-               }
-
-               quot->nlimbs = qsize;
-               quot->sign = sign_quotient;
-       }
-
-       rsize = dsize;
-       MPN_NORMALIZE (rp, rsize);
-
-       if( normalization_steps && rsize ) {
-               mpihelp_rshift(rp, rp, rsize, normalization_steps);
-               rsize -= rp[rsize - 1] == 0?1:0;
-       }
-
-       rem->nlimbs = rsize;
-       rem->sign       = sign_remainder;
-
-       rc = 0;
- nomem:
-       while( markidx )
-               mpi_free_limb_space(marker[--markidx]);
-       return rc;
-}
-
-int
-mpi_tdiv_q_2exp( MPI w, MPI u, unsigned count )
-{
-    mpi_size_t usize, wsize;
-    mpi_size_t limb_cnt;
-
-    usize = u->nlimbs;
-    limb_cnt = count / BITS_PER_MPI_LIMB;
-    wsize = usize - limb_cnt;
-    if( limb_cnt >= usize )
-       w->nlimbs = 0;
-    else {
-       mpi_ptr_t wp;
-       mpi_ptr_t up;
-
-       if (RESIZE_IF_NEEDED( w, wsize ) < 0)
-               return -ENOMEM;
-       wp = w->d;
-       up = u->d;
-
-       count %= BITS_PER_MPI_LIMB;
-       if( count ) {
-           mpihelp_rshift( wp, up + limb_cnt, wsize, count );
-           wsize -= !wp[wsize - 1];
-       }
-       else {
-           MPN_COPY_INCR( wp, up + limb_cnt, wsize);
-       }
-
-       w->nlimbs = wsize;
-    }
-    return 0;
-}
-
-/****************
- * Check whether dividend is divisible by divisor
- * (note: divisor must fit into a limb)
- */
-int
-mpi_divisible_ui(MPI dividend, ulong divisor )
-{
-    return !mpihelp_mod_1( dividend->d, dividend->nlimbs, divisor );
-}
-
diff --git a/crypto/mpi/mpi-gcd.c b/crypto/mpi/mpi-gcd.c
deleted file mode 100644 (file)
index 2841b9f..0000000
+++ /dev/null
@@ -1,60 +0,0 @@
-/* mpi-gcd.c  -  MPI functions
- * Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
- *
- * This file is part of GnuPG.
- *
- * GnuPG 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.
- *
- * GnuPG 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 "mpi-internal.h"
-
-/****************
- * Find the greatest common divisor G of A and B.
- * Return: true if this 1, false in all other cases
- */
-int
-mpi_gcd( MPI g, const MPI xa, const MPI xb )
-{
-    MPI a = NULL, b = NULL;
-
-    if (mpi_copy(&a, xa) < 0)
-           goto nomem;
-
-    if (mpi_copy(&b, xb) < 0)
-           goto nomem;
-
-    /* TAOCP Vol II, 4.5.2, Algorithm A */
-    a->sign = 0;
-    b->sign = 0;
-    while( mpi_cmp_ui( b, 0 ) ) {
-           if (mpi_fdiv_r( g, a, b ) < 0) /* g used as temorary variable */
-                   goto nomem;
-           if (mpi_set(a,b) < 0)
-                   goto nomem;
-           if (mpi_set(b,g) < 0)
-                   goto nomem;
-    }
-    if (mpi_set(g, a) < 0)
-           goto nomem;
-
-    mpi_free(a);
-    mpi_free(b);
-    return !mpi_cmp_ui( g, 1);
-
- nomem:
-    mpi_free(a);
-    mpi_free(b);
-    return -ENOMEM;
-}
diff --git a/crypto/mpi/mpi-inline.c b/crypto/mpi/mpi-inline.c
deleted file mode 100644 (file)
index da53e2d..0000000
+++ /dev/null
@@ -1,33 +0,0 @@
-/* mpi-inline.c
- * Copyright (C) 1999, 2000, 2001 Free Software Foundation, Inc.
- *
- * This file is part of GnuPG.
- *
- * GnuPG 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.
- *
- * GnuPG 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
- */
-
-
-/* put the inline functions as real functions into the lib */
-#define G10_MPI_INLINE_DECL
-
-#include "mpi-internal.h"
-
-/* always include the header becuase it is only
- * included by mpi-internal if __GCC__ is defined but we
- * need it here in all cases and the above definition of
- * of the macro allows us to do so
- */
-#include "mpi-inline.h"
-
diff --git a/crypto/mpi/mpi-inline.h b/crypto/mpi/mpi-inline.h
deleted file mode 100644 (file)
index 02481b6..0000000
+++ /dev/null
@@ -1,128 +0,0 @@
-/* mpi-inline.h  -  Internal to the Multi Precision Integers
- *     Copyright (C) 1994, 1996, 1998, 1999 Free Software Foundation, Inc.
- *
- * This file is part of GnuPG.
- *
- * GnuPG 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.
- *
- * GnuPG 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
- *
- * Note: This code is heavily based on the GNU MP Library.
- *      Actually it's the same code with only minor changes in the
- *      way the data is stored; this is to support the abstraction
- *      of an optional secure memory allocation which may be used
- *      to avoid revealing of sensitive data due to paging etc.
- *      The GNU MP Library itself is published under the LGPL;
- *      however I decided to publish this code under the plain GPL.
- */
-
-#ifndef G10_MPI_INLINE_H
-#define G10_MPI_INLINE_H
-
-#ifndef G10_MPI_INLINE_DECL
-  #define G10_MPI_INLINE_DECL  extern __inline__
-#endif
-
-G10_MPI_INLINE_DECL  mpi_limb_t
-mpihelp_add_1( mpi_ptr_t res_ptr, mpi_ptr_t s1_ptr,
-              mpi_size_t s1_size, mpi_limb_t s2_limb)
-{
-    mpi_limb_t x;
-
-    x = *s1_ptr++;
-    s2_limb += x;
-    *res_ptr++ = s2_limb;
-    if( s2_limb < x ) { /* sum is less than the left operand: handle carry */
-       while( --s1_size ) {
-           x = *s1_ptr++ + 1;  /* add carry */
-           *res_ptr++ = x;     /* and store */
-           if( x )             /* not 0 (no overflow): we can stop */
-               goto leave;
-       }
-       return 1; /* return carry (size of s1 to small) */
-    }
-
-  leave:
-    if( res_ptr != s1_ptr ) { /* not the same variable */
-       mpi_size_t i;          /* copy the rest */
-       for( i=0; i < s1_size-1; i++ )
-           res_ptr[i] = s1_ptr[i];
-    }
-    return 0; /* no carry */
-}
-
-
-
-G10_MPI_INLINE_DECL mpi_limb_t
-mpihelp_add(mpi_ptr_t res_ptr, mpi_ptr_t s1_ptr, mpi_size_t s1_size,
-                              mpi_ptr_t s2_ptr, mpi_size_t s2_size)
-{
-    mpi_limb_t cy = 0;
-
-    if( s2_size )
-       cy = mpihelp_add_n( res_ptr, s1_ptr, s2_ptr, s2_size );
-
-    if( s1_size - s2_size )
-       cy = mpihelp_add_1( res_ptr + s2_size, s1_ptr + s2_size,
-                           s1_size - s2_size, cy);
-    return cy;
-}
-
-
-G10_MPI_INLINE_DECL mpi_limb_t
-mpihelp_sub_1(mpi_ptr_t res_ptr,  mpi_ptr_t s1_ptr,
-             mpi_size_t s1_size, mpi_limb_t s2_limb )
-{
-    mpi_limb_t x;
-
-    x = *s1_ptr++;
-    s2_limb = x - s2_limb;
-    *res_ptr++ = s2_limb;
-    if( s2_limb > x ) {
-       while( --s1_size ) {
-           x = *s1_ptr++;
-           *res_ptr++ = x - 1;
-           if( x )
-               goto leave;
-       }
-       return 1;
-    }
-
-  leave:
-    if( res_ptr != s1_ptr ) {
-       mpi_size_t i;
-       for( i=0; i < s1_size-1; i++ )
-           res_ptr[i] = s1_ptr[i];
-    }
-    return 0;
-}
-
-
-
-G10_MPI_INLINE_DECL   mpi_limb_t
-mpihelp_sub( mpi_ptr_t res_ptr, mpi_ptr_t s1_ptr, mpi_size_t s1_size,
-                               mpi_ptr_t s2_ptr, mpi_size_t s2_size)
-{
-    mpi_limb_t cy = 0;
-
-    if( s2_size )
-       cy = mpihelp_sub_n(res_ptr, s1_ptr, s2_ptr, s2_size);
-
-    if( s1_size - s2_size )
-       cy = mpihelp_sub_1(res_ptr + s2_size, s1_ptr + s2_size,
-                                     s1_size - s2_size, cy);
-    return cy;
-}
-
-
-#endif /*G10_MPI_INLINE_H*/
diff --git a/crypto/mpi/mpi-internal.h b/crypto/mpi/mpi-internal.h
deleted file mode 100644 (file)
index 9ed7166..0000000
+++ /dev/null
@@ -1,265 +0,0 @@
-/* mpi-internal.h  -  Internal to the Multi Precision Integers
- *     Copyright (C) 1994, 1996 Free Software Foundation, Inc.
- *     Copyright (C) 1998, 2000 Free Software Foundation, Inc.
- *
- * This file is part of GnuPG.
- *
- * GnuPG 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.
- *
- * GnuPG 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
- *
- * Note: This code is heavily based on the GNU MP Library.
- *      Actually it's the same code with only minor changes in the
- *      way the data is stored; this is to support the abstraction
- *      of an optional secure memory allocation which may be used
- *      to avoid revealing of sensitive data due to paging etc.
- *      The GNU MP Library itself is published under the LGPL;
- *      however I decided to publish this code under the plain GPL.
- */
-
-#ifndef G10_MPI_INTERNAL_H
-#define G10_MPI_INTERNAL_H
-
-#include <linux/kernel.h>
-#include <linux/slab.h>
-#include <linux/string.h>
-#include <linux/crypto/mpi.h>
-#include <asm/errno.h>
-
-#define log_debug printk
-#define log_bug printk
-
-#define assert(x) do { \
-               if (!x) log_bug("failed assertion\n"); \
-              } while(0);
-
-/* If KARATSUBA_THRESHOLD is not already defined, define it to a
- * value which is good on most machines.  */
-
-/* tested 4, 16, 32 and 64, where 16 gave the best performance when
- * checking a 768 and a 1024 bit ElGamal signature.
- * (wk 22.12.97) */
-#ifndef KARATSUBA_THRESHOLD
-    #define KARATSUBA_THRESHOLD 16
-#endif
-
-/* The code can't handle KARATSUBA_THRESHOLD smaller than 2.  */
-#if KARATSUBA_THRESHOLD < 2
-    #undef KARATSUBA_THRESHOLD
-    #define KARATSUBA_THRESHOLD 2
-#endif
-
-
-typedef mpi_limb_t *mpi_ptr_t; /* pointer to a limb */
-typedef int mpi_size_t;        /* (must be a signed type) */
-
-#define ABS(x) (x >= 0 ? x : -x)
-#define MIN(l,o) ((l) < (o) ? (l) : (o))
-#define MAX(h,i) ((h) > (i) ? (h) : (i))
-
-static inline int RESIZE_IF_NEEDED(MPI a, unsigned b)
-{
-       if (a->alloced < b)
-               return mpi_resize(a,b);
-       return 0;
-}
-
-/* Copy N limbs from S to D.  */
-#define MPN_COPY( d, s, n) \
-    do {                               \
-       mpi_size_t _i;                  \
-       for( _i = 0; _i < (n); _i++ )   \
-           (d)[_i] = (s)[_i];          \
-    } while(0)
-
-#define MPN_COPY_INCR( d, s, n)        \
-    do {                               \
-       mpi_size_t _i;                  \
-       for( _i = 0; _i < (n); _i++ )   \
-           (d)[_i] = (d)[_i];          \
-    } while (0)
-
-#define MPN_COPY_DECR( d, s, n ) \
-    do {                               \
-       mpi_size_t _i;                  \
-       for( _i = (n)-1; _i >= 0; _i--) \
-          (d)[_i] = (s)[_i];           \
-    } while(0)
-
-/* Zero N limbs at D */
-#define MPN_ZERO(d, n) \
-    do {                                 \
-       int  _i;                          \
-       for( _i = 0; _i < (n); _i++ )  \
-           (d)[_i] = 0;                    \
-    } while (0)
-
-#define MPN_NORMALIZE(d, n)  \
-    do {                      \
-       while( (n) > 0 ) {     \
-           if( (d)[(n)-1] ) \
-               break;         \
-           (n)--;             \
-       }                      \
-    } while(0)
-
-#define MPN_NORMALIZE_NOT_ZERO(d, n) \
-    do {                                   \
-       for(;;) {                           \
-           if( (d)[(n)-1] )                \
-               break;                      \
-           (n)--;                          \
-       }                                   \
-    } while(0)
-
-#define MPN_MUL_N_RECURSE(prodp, up, vp, size, tspace) \
-    do {                                               \
-       if( (size) < KARATSUBA_THRESHOLD )              \
-           mul_n_basecase (prodp, up, vp, size);       \
-       else                                            \
-           mul_n (prodp, up, vp, size, tspace);        \
-    } while (0);
-
-
-/* Divide the two-limb number in (NH,,NL) by D, with DI being the largest
- * limb not larger than (2**(2*BITS_PER_MP_LIMB))/D - (2**BITS_PER_MP_LIMB).
- * If this would yield overflow, DI should be the largest possible number
- * (i.e., only ones).  For correct operation, the most significant bit of D
- * has to be set.  Put the quotient in Q and the remainder in R.
- */
-#define UDIV_QRNND_PREINV(q, r, nh, nl, d, di) \
-    do {                                                           \
-       mpi_limb_t _q, _ql, _r;                                     \
-       mpi_limb_t _xh, _xl;                                        \
-       umul_ppmm (_q, _ql, (nh), (di));                            \
-       _q += (nh);     /* DI is 2**BITS_PER_MPI_LIMB too small */  \
-       umul_ppmm (_xh, _xl, _q, (d));                              \
-       sub_ddmmss (_xh, _r, (nh), (nl), _xh, _xl);                 \
-       if( _xh ) {                                                 \
-           sub_ddmmss (_xh, _r, _xh, _r, 0, (d));                  \
-           _q++;                                                   \
-           if( _xh) {                                              \
-               sub_ddmmss (_xh, _r, _xh, _r, 0, (d));              \
-               _q++;                                               \
-           }                                                       \
-       }                                                           \
-       if( _r >= (d) ) {                                           \
-           _r -= (d);                                              \
-           _q++;                                                   \
-       }                                                           \
-       (r) = _r;                                                   \
-       (q) = _q;                                                   \
-    } while (0)
-
-
-/*-- mpiutil.c --*/
-mpi_ptr_t mpi_alloc_limb_space( unsigned nlimbs );
-void mpi_free_limb_space( mpi_ptr_t a );
-void mpi_assign_limb_space( MPI a, mpi_ptr_t ap, unsigned nlimbs );
-
-/*-- mpi-bit.c --*/
-void mpi_rshift_limbs( MPI a, unsigned int count );
-int mpi_lshift_limbs( MPI a, unsigned int count );
-
-
-/*-- mpihelp-add.c --*/
-mpi_limb_t mpihelp_add_1(mpi_ptr_t res_ptr,  mpi_ptr_t s1_ptr,
-                        mpi_size_t s1_size, mpi_limb_t s2_limb );
-mpi_limb_t mpihelp_add_n( mpi_ptr_t res_ptr, mpi_ptr_t s1_ptr,
-                         mpi_ptr_t s2_ptr,  mpi_size_t size);
-mpi_limb_t mpihelp_add(mpi_ptr_t res_ptr, mpi_ptr_t s1_ptr, mpi_size_t s1_size,
-                      mpi_ptr_t s2_ptr, mpi_size_t s2_size);
-
-/*-- mpihelp-sub.c --*/
-mpi_limb_t mpihelp_sub_1( mpi_ptr_t res_ptr,  mpi_ptr_t s1_ptr,
-                         mpi_size_t s1_size, mpi_limb_t s2_limb );
-mpi_limb_t mpihelp_sub_n( mpi_ptr_t res_ptr, mpi_ptr_t s1_ptr,
-                         mpi_ptr_t s2_ptr, mpi_size_t size);
-mpi_limb_t mpihelp_sub(mpi_ptr_t res_ptr, mpi_ptr_t s1_ptr, mpi_size_t s1_size,
-                      mpi_ptr_t s2_ptr, mpi_size_t s2_size);
-
-/*-- mpihelp-cmp.c --*/
-int mpihelp_cmp( mpi_ptr_t op1_ptr, mpi_ptr_t op2_ptr, mpi_size_t size );
-
-/*-- mpihelp-mul.c --*/
-
-struct karatsuba_ctx {
-    struct karatsuba_ctx *next;
-    mpi_ptr_t tspace;
-    mpi_size_t tspace_size;
-    mpi_ptr_t tp;
-    mpi_size_t tp_size;
-};
-
-void mpihelp_release_karatsuba_ctx( struct karatsuba_ctx *ctx );
-
-mpi_limb_t mpihelp_addmul_1( mpi_ptr_t res_ptr, mpi_ptr_t s1_ptr,
-                            mpi_size_t s1_size, mpi_limb_t s2_limb);
-mpi_limb_t mpihelp_submul_1( mpi_ptr_t res_ptr, mpi_ptr_t s1_ptr,
-                            mpi_size_t s1_size, mpi_limb_t s2_limb);
-int mpihelp_mul_n( mpi_ptr_t prodp, mpi_ptr_t up, mpi_ptr_t vp,
-                                                  mpi_size_t size);
-int mpihelp_mul( mpi_ptr_t prodp, mpi_ptr_t up, mpi_size_t usize,
-                mpi_ptr_t vp, mpi_size_t vsize, mpi_limb_t *_result);
-void mpih_sqr_n_basecase( mpi_ptr_t prodp, mpi_ptr_t up, mpi_size_t size );
-void mpih_sqr_n( mpi_ptr_t prodp, mpi_ptr_t up, mpi_size_t size,
-                                               mpi_ptr_t tspace);
-
-int mpihelp_mul_karatsuba_case( mpi_ptr_t prodp,
-                                mpi_ptr_t up, mpi_size_t usize,
-                                mpi_ptr_t vp, mpi_size_t vsize,
-                                struct karatsuba_ctx *ctx );
-
-
-/*-- mpihelp-mul_1.c (or xxx/cpu/ *.S) --*/
-mpi_limb_t mpihelp_mul_1( mpi_ptr_t res_ptr, mpi_ptr_t s1_ptr,
-                         mpi_size_t s1_size, mpi_limb_t s2_limb);
-
-/*-- mpihelp-div.c --*/
-mpi_limb_t mpihelp_mod_1(mpi_ptr_t dividend_ptr, mpi_size_t dividend_size,
-                                                mpi_limb_t divisor_limb);
-mpi_limb_t mpihelp_divrem( mpi_ptr_t qp, mpi_size_t qextra_limbs,
-                          mpi_ptr_t np, mpi_size_t nsize,
-                          mpi_ptr_t dp, mpi_size_t dsize);
-mpi_limb_t mpihelp_divmod_1( mpi_ptr_t quot_ptr,
-                            mpi_ptr_t dividend_ptr, mpi_size_t dividend_size,
-                            mpi_limb_t divisor_limb);
-
-/*-- mpihelp-shift.c --*/
-mpi_limb_t mpihelp_lshift( mpi_ptr_t wp, mpi_ptr_t up, mpi_size_t usize,
-                                                          unsigned cnt);
-mpi_limb_t mpihelp_rshift( mpi_ptr_t wp, mpi_ptr_t up, mpi_size_t usize,
-                                                          unsigned cnt);
-
-
-/* Define stuff for longlong.h.  */
-#define W_TYPE_SIZE BITS_PER_MPI_LIMB
-  typedef mpi_limb_t   UWtype;
-  typedef unsigned int UHWtype;
-#if defined (__GNUC__)
-  typedef unsigned int UQItype   __attribute__ ((mode (QI)));
-  typedef         int SItype     __attribute__ ((mode (SI)));
-  typedef unsigned int USItype   __attribute__ ((mode (SI)));
-  typedef         int DItype     __attribute__ ((mode (DI)));
-  typedef unsigned int UDItype   __attribute__ ((mode (DI)));
-#else
-  typedef unsigned char UQItype;
-  typedef         long SItype;
-  typedef unsigned long USItype;
-#endif
-
-#ifdef __GNUC__
-  #include "mpi-inline.h"
-#endif
-
-#endif /*G10_MPI_INTERNAL_H*/
diff --git a/crypto/mpi/mpi-inv.c b/crypto/mpi/mpi-inv.c
deleted file mode 100644 (file)
index 0e0f282..0000000
+++ /dev/null
@@ -1,148 +0,0 @@
-/* mpi-inv.c  -  MPI functions
- * Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
- *
- * This file is part of GnuPG.
- *
- * GnuPG 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.
- *
- * GnuPG 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 "mpi-internal.h"
-
-
-/****************
- * Calculate the multiplicative inverse X of A mod N
- * That is: Find the solution x for
- *             1 = (a*x) mod n
- */
-int
-mpi_invm( MPI x, const MPI a, const MPI n )
-{
-       /* Extended Euclid's algorithm (See TAOPC Vol II, 4.5.2, Alg X)
-        * modified according to Michael Penk's solution for Exercice 35
-        * with further enhancement */
-       MPI u = NULL, v = NULL;
-       MPI u1 = NULL, u2 = NULL, u3 = NULL;
-       MPI v1 = NULL, v2 = NULL, v3 = NULL;
-       MPI t1 = NULL, t2 = NULL, t3 = NULL;
-       unsigned k;
-       int sign;
-       int odd = 0;
-       int rc = -ENOMEM;
-
-       if (mpi_copy(&u, a) < 0) goto cleanup;
-       if (mpi_copy(&v, n) < 0) goto cleanup;
-
-       for(k=0; !mpi_test_bit(u,0) && !mpi_test_bit(v,0); k++ ) {
-               if (mpi_rshift(u, u, 1) < 0) goto cleanup;
-               if (mpi_rshift(v, v, 1) < 0) goto cleanup;
-       }
-       odd = mpi_test_bit(v,0);
-
-       u1 = mpi_alloc_set_ui(1); if (!u1) goto cleanup;
-       if( !odd ) {
-               u2 = mpi_alloc_set_ui(0);
-               if (!u2) goto cleanup;
-       }
-       if (mpi_copy(&u3, u) < 0) goto cleanup;
-       if (mpi_copy(&v1, v) < 0) goto cleanup;
-       if( !odd ) {
-               v2 = mpi_alloc( mpi_get_nlimbs(u) );  if (!v2) goto cleanup;
-               if (mpi_sub( v2, u1, u ) < 0) goto cleanup; /* U is used as const 1 */
-       }
-       if (mpi_copy(&v3, v) < 0) goto cleanup;
-       if( mpi_test_bit(u, 0) ) { /* u is odd */
-               t1 = mpi_alloc_set_ui(0); if (!t1) goto cleanup;
-               if( !odd ) {
-                       t2 = mpi_alloc_set_ui(1); if (!t2) goto cleanup;
-                       t2->sign = 1; 
-               }
-               if (mpi_copy(&t3, v) < 0) goto cleanup;
-               t3->sign = !t3->sign;
-               goto Y4;
-       }
-       else {
-               t1 = mpi_alloc_set_ui(1); if (!t1) goto cleanup;
-               if( !odd ) {
-                       t2 = mpi_alloc_set_ui(0); if (!t2) goto cleanup;
-               }
-               if (mpi_copy(&t3, u) < 0) goto cleanup;
-       }
-       do {
-               do {
-                       if( !odd ) {
-                               if( mpi_test_bit(t1, 0) || mpi_test_bit(t2, 0) ) { /* one is odd */
-                                       if (mpi_add(t1, t1, v) < 0) goto cleanup;
-                                       if (mpi_sub(t2, t2, u) < 0) goto cleanup;
-                               }
-                               if (mpi_rshift(t1, t1, 1) < 0) goto cleanup;
-                               if (mpi_rshift(t2, t2, 1) < 0) goto cleanup;
-                               if (mpi_rshift(t3, t3, 1) < 0) goto cleanup;
-                       }
-                       else {
-                               if( mpi_test_bit(t1, 0) )
-                                       if (mpi_add(t1, t1, v) < 0) goto cleanup;
-                               if (mpi_rshift(t1, t1, 1) < 0) goto cleanup;
-                               if (mpi_rshift(t3, t3, 1) < 0) goto cleanup;
-                       }
-               Y4:
-                       ;
-               } while( !mpi_test_bit( t3, 0 ) ); /* while t3 is even */
-
-               if( !t3->sign ) {
-                       if (mpi_set(u1, t1) < 0) goto cleanup;
-                       if( !odd )
-                               if (mpi_set(u2, t2) < 0) goto cleanup;
-                       if (mpi_set(u3, t3) < 0) goto cleanup;
-               }
-               else {
-                       if (mpi_sub(v1, v, t1) < 0) goto cleanup;
-                       sign = u->sign; u->sign = !u->sign;
-                       if( !odd )
-                               if (mpi_sub(v2, u, t2) < 0) goto cleanup;
-                       u->sign = sign;
-                       sign = t3->sign; t3->sign = !t3->sign;
-                       if (mpi_set(v3, t3) < 0) goto cleanup;
-                       t3->sign = sign;
-               }
-               if (mpi_sub(t1, u1, v1) < 0) goto cleanup;
-               if( !odd )
-                       if (mpi_sub(t2, u2, v2) < 0) goto cleanup;
-               if (mpi_sub(t3, u3, v3) < 0) goto cleanup;
-               if( t1->sign ) {
-                       if (mpi_add(t1, t1, v) < 0) goto cleanup;
-                       if( !odd )
-                               if (mpi_sub(t2, t2, u) < 0) goto cleanup;
-               }
-       } while( mpi_cmp_ui( t3, 0 ) ); /* while t3 != 0 */
-       /* mpi_lshift( u3, k ); */
-       rc = mpi_set(x, u1);
-
- cleanup:
-       mpi_free(u1);
-       mpi_free(v1);
-       mpi_free(t1);
-       if( !odd ) {
-               mpi_free(u2);
-               mpi_free(v2);
-               mpi_free(t2);
-       }
-       mpi_free(u3);
-       mpi_free(v3);
-       mpi_free(t3);
-
-       mpi_free(u);
-       mpi_free(v);
-       return rc;
-}
diff --git a/crypto/mpi/mpi-mpow.c b/crypto/mpi/mpi-mpow.c
deleted file mode 100644 (file)
index eb6d3c7..0000000
+++ /dev/null
@@ -1,113 +0,0 @@
-/* mpi-mpow.c  -  MPI functions
- * Copyright (C) 1998, 1999, 2000 Free Software Foundation, Inc.
- *
- * This file is part of GnuPG.
- *
- * GnuPG 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.
- *
- * GnuPG 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 "mpi-internal.h"
-#include "longlong.h"
-
-
-static int
-build_index(const MPI *exparray, int k, int i, int t )
-{
-    int j, bitno;
-    int index = 0;
-
-    bitno = t-i;
-    for(j=k-1; j >= 0; j-- ) {
-       index <<= 1;
-       if( mpi_test_bit( exparray[j], bitno ) )
-           index |= 1;
-    }
-    return index;
-}
-
-/****************
- * RES = (BASE[0] ^ EXP[0]) *  (BASE[1] ^ EXP[1]) * ... * mod M
- */
-int
-mpi_mulpowm( MPI res, MPI *basearray, MPI *exparray, MPI m)
-{
-       int rc = -ENOMEM;
-       int k;  /* number of elements */
-       int t;  /* bit size of largest exponent */
-       int i, j, idx;
-       MPI *G = NULL;  /* table with precomputed values of size 2^k */
-       MPI tmp = NULL;
-
-       for(k=0; basearray[k]; k++ )
-               ;
-       if (!k) { printk("mpi_mulpowm: assert(k) failed\n"); BUG(); }
-       for(t=0, i=0; (tmp=exparray[i]); i++ ) {
-               j = mpi_get_nbits(tmp);
-               if( j > t )
-                       t = j;
-       }
-       if (i!=k) { printk("mpi_mulpowm: assert(i==k) failed\n"); BUG(); }
-       if (!t)   { printk("mpi_mulpowm: assert(t) failed\n"); BUG(); }
-       if (k>=10) { printk("mpi_mulpowm: assert(k<10) failed\n"); BUG(); }
-
-       G = kmalloc( (1<<k) * sizeof *G, GFP_KERNEL );
-       if (!G) goto nomem;
-       memset(G,0,(1<<k) * sizeof *G);
-       /* and calculate */
-       tmp =  mpi_alloc( mpi_get_nlimbs(m)+1 ); if (!tmp) goto nomem;
-       if (mpi_set_ui( res, 1 ) < 0) goto nomem;
-       for(i = 1; i <= t; i++ ) {
-               if (mpi_mulm(tmp, res, res, m ) < 0) goto nomem;
-               idx = build_index( exparray, k, i, t );
-               if (!(idx >= 0 && idx < (1<<k))) {
-                       printk("mpi_mulpowm: assert(idx >= 0 && idx < (1<<k)) failed\n");
-                       BUG();
-               }
-               if( !G[idx] ) {
-                       if( !idx ) {
-                               G[0] = mpi_alloc_set_ui( 1 );
-                               if (!G[0]) goto nomem;
-                       }
-                       else {
-                               for(j=0; j < k; j++ ) {
-                                       if( (idx & (1<<j) ) ) {
-                                               if( !G[idx] ) {
-                                                       if (mpi_copy( &G[idx], basearray[j] ) < 0)
-                                                               goto nomem;
-                                               }
-                                               else {
-                                                       if (mpi_mulm(G[idx],G[idx],basearray[j],m) < 0)
-                                                               goto nomem;
-                                               }
-                                       }
-                               }
-                               if( !G[idx] ) {
-                                       G[idx] = mpi_alloc(0);
-                                       if (!G[idx]) goto nomem;
-                               }
-                       }
-               }
-               if (mpi_mulm(res, tmp, G[idx], m ) < 0) goto nomem;
-       }
-
-       rc = 0;
- nomem:
-       /* cleanup */
-       mpi_free(tmp);
-       for(i=0; i < (1<<k); i++ )
-               mpi_free(G[i]);
-       kfree(G);
-       return rc;
-}
diff --git a/crypto/mpi/mpi-mul.c b/crypto/mpi/mpi-mul.c
deleted file mode 100644 (file)
index 14fd2a4..0000000
+++ /dev/null
@@ -1,202 +0,0 @@
-/* mpi-mul.c  -  MPI functions
- *     Copyright (C) 1994, 1996 Free Software Foundation, Inc.
- *     Copyright (C) 1998, 2001 Free Software Foundation, Inc.
- *
- * This file is part of GnuPG.
- *
- * GnuPG 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.
- *
- * GnuPG 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
- *
- * Note: This code is heavily based on the GNU MP Library.
- *      Actually it's the same code with only minor changes in the
- *      way the data is stored; this is to support the abstraction
- *      of an optional secure memory allocation which may be used
- *      to avoid revealing of sensitive data due to paging etc.
- *      The GNU MP Library itself is published under the LGPL;
- *      however I decided to publish this code under the plain GPL.
- */
-
-#include "mpi-internal.h"
-
-
-int
-mpi_mul_ui( MPI prod, MPI mult, unsigned long small_mult )
-{
-    mpi_size_t size, prod_size;
-    mpi_ptr_t  prod_ptr;
-    mpi_limb_t cy;
-    int sign;
-
-    size = mult->nlimbs;
-    sign = mult->sign;
-
-    if( !size || !small_mult ) {
-       prod->nlimbs = 0;
-       prod->sign = 0;
-       return 0;
-    }
-
-    prod_size = size + 1;
-    if( prod->alloced < prod_size )
-           if (mpi_resize( prod, prod_size ) < 0)
-                   return -ENOMEM;
-    prod_ptr = prod->d;
-
-    cy = mpihelp_mul_1( prod_ptr, mult->d, size, (mpi_limb_t)small_mult );
-    if( cy )
-       prod_ptr[size++] = cy;
-    prod->nlimbs = size;
-    prod->sign = sign;
-    return 0;
-}
-
-
-int
-mpi_mul_2exp( MPI w, MPI u, unsigned long cnt)
-{
-    mpi_size_t usize, wsize, limb_cnt;
-    mpi_ptr_t wp;
-    mpi_limb_t wlimb;
-    int usign, wsign;
-
-    usize = u->nlimbs;
-    usign = u->sign;
-
-    if( !usize ) {
-       w->nlimbs = 0;
-       w->sign = 0;
-       return 0;
-    }
-
-    limb_cnt = cnt / BITS_PER_MPI_LIMB;
-    wsize = usize + limb_cnt + 1;
-    if( w->alloced < wsize )
-           if (mpi_resize(w, wsize ) < 0)
-                   return -ENOMEM;
-    wp = w->d;
-    wsize = usize + limb_cnt;
-    wsign = usign;
-
-    cnt %= BITS_PER_MPI_LIMB;
-    if( cnt ) {
-       wlimb = mpihelp_lshift( wp + limb_cnt, u->d, usize, cnt );
-       if( wlimb ) {
-           wp[wsize] = wlimb;
-           wsize++;
-       }
-    }
-    else {
-       MPN_COPY_DECR( wp + limb_cnt, u->d, usize );
-    }
-
-    /* Zero all whole limbs at low end.  Do it here and not before calling
-     * mpn_lshift, not to lose for U == W.  */
-    MPN_ZERO( wp, limb_cnt );
-
-    w->nlimbs = wsize;
-    w->sign = wsign;
-    return 0;
-}
-
-int
-mpi_mul( MPI w, MPI u, MPI v)
-{
-       int rc = -ENOMEM;
-       mpi_size_t usize, vsize, wsize;
-       mpi_ptr_t up, vp, wp;
-       mpi_limb_t cy;
-       int usign, vsign, sign_product;
-       int assign_wp=0;
-       mpi_ptr_t tmp_limb=NULL;
-
-
-       if( u->nlimbs < v->nlimbs ) { /* Swap U and V. */
-               usize = v->nlimbs;
-               usign = v->sign;
-               up    = v->d;
-               vsize = u->nlimbs;
-               vsign = u->sign;
-               vp    = u->d;
-       }
-       else {
-               usize = u->nlimbs;
-               usign = u->sign;
-               up    = u->d;
-               vsize = v->nlimbs;
-               vsign = v->sign;
-               vp    = v->d;
-       }
-       sign_product = usign ^ vsign;
-       wp = w->d;
-
-       /* Ensure W has space enough to store the result.  */
-       wsize = usize + vsize;
-       if( w->alloced < (size_t)wsize ) {
-               if( wp == up || wp == vp ) {
-                       wp = mpi_alloc_limb_space(wsize);
-                       if (!wp) goto nomem;
-                       assign_wp = 1;
-               }
-               else {
-                       if (mpi_resize(w, wsize ) < 0) goto nomem;
-                       wp = w->d;
-               }
-       }
-       else { /* Make U and V not overlap with W.      */
-               if( wp == up ) {
-                       /* W and U are identical.  Allocate temporary space for U.      */
-                       up = tmp_limb = mpi_alloc_limb_space( usize);
-                       if (!up) goto nomem;
-                       /* Is V identical too?  Keep it identical with U.  */
-                       if( wp == vp )
-                               vp = up;
-                       /* Copy to the temporary space.  */
-                       MPN_COPY( up, wp, usize );
-               }
-               else if( wp == vp ) {
-                       /* W and V are identical.  Allocate temporary space for V.      */
-                       vp = tmp_limb = mpi_alloc_limb_space( vsize);
-                       if (!vp) goto nomem;
-                       /* Copy to the temporary space.  */
-                       MPN_COPY( vp, wp, vsize );
-               }
-       }
-
-       if( !vsize )
-               wsize = 0;
-       else {
-               if (mpihelp_mul( wp, up, usize, vp, vsize, &cy) < 0)
-                       goto nomem;
-               wsize -= cy? 0:1;
-       }
-
-       if( assign_wp )
-               mpi_assign_limb_space( w, wp, wsize );
-
-       w->nlimbs = wsize;
-       w->sign = sign_product;
-       rc = 0;
- nomem:
-       if( tmp_limb )
-               mpi_free_limb_space( tmp_limb );
-       return rc;
-}
-
-int
-mpi_mulm( MPI w, MPI u, MPI v, MPI m)
-{
-       if (mpi_mul(w, u, v) < 0)
-               return -ENOMEM;
-       return mpi_fdiv_r( w, w, m );
-}
diff --git a/crypto/mpi/mpi-pow.c b/crypto/mpi/mpi-pow.c
deleted file mode 100644 (file)
index fa0efa5..0000000
+++ /dev/null
@@ -1,312 +0,0 @@
-/* mpi-pow.c  -  MPI functions
- *     Copyright (C) 1994, 1996, 1998, 2000 Free Software Foundation, Inc.
- *
- * This file is part of GnuPG.
- *
- * GnuPG 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.
- *
- * GnuPG 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
- *
- * Note: This code is heavily based on the GNU MP Library.
- *      Actually it's the same code with only minor changes in the
- *      way the data is stored; this is to support the abstraction
- *      of an optional secure memory allocation which may be used
- *      to avoid revealing of sensitive data due to paging etc.
- *      The GNU MP Library itself is published under the LGPL;
- *      however I decided to publish this code under the plain GPL.
- */
-
-#include <linux/string.h>
-#include "mpi-internal.h"
-#include "longlong.h"
-
-
-/****************
- * RES = BASE ^ EXP mod MOD
- */
-int
-mpi_powm( MPI res, MPI base, MPI exp, MPI mod)
-{
-    mpi_ptr_t mp_marker=NULL, bp_marker=NULL, ep_marker=NULL;
-    mpi_ptr_t xp_marker=NULL;
-    mpi_ptr_t tspace = NULL;
-    mpi_ptr_t  rp, ep, mp, bp;
-    mpi_size_t esize, msize, bsize, rsize;
-    int        esign, msign, bsign, rsign;
-    mpi_size_t size;
-    int mod_shift_cnt;
-    int negative_result;
-    int assign_rp=0;
-    mpi_size_t tsize=0;   /* to avoid compiler warning */
-                         /* fixme: we should check that the warning is void*/
-    int rc = -ENOMEM;
-
-    esize = exp->nlimbs;
-    msize = mod->nlimbs;
-    size = 2 * msize;
-    esign = exp->sign;
-    msign = mod->sign;
-
-    rp = res->d;
-    ep = exp->d;
-
-    if( !msize )
-       msize = 1 / msize;          /* provoke a signal */
-
-    if( !esize ) {
-       /* Exponent is zero, result is 1 mod MOD, i.e., 1 or 0
-        * depending on if MOD equals 1.  */
-       rp[0] = 1;
-       res->nlimbs = (msize == 1 && mod->d[0] == 1) ? 0 : 1;
-       res->sign = 0;
-       goto leave;
-    }
-
-    /* Normalize MOD (i.e. make its most significant bit set) as required by
-     * mpn_divrem.  This will make the intermediate values in the calculation
-     * slightly larger, but the correct result is obtained after a final
-     * reduction using the original MOD value. */
-    mp = mp_marker = mpi_alloc_limb_space(msize);
-    if (!mp)
-           goto enomem;
-    count_leading_zeros( mod_shift_cnt, mod->d[msize-1] );
-    if( mod_shift_cnt )
-       mpihelp_lshift( mp, mod->d, msize, mod_shift_cnt );
-    else
-       MPN_COPY( mp, mod->d, msize );
-
-    bsize = base->nlimbs;
-    bsign = base->sign;
-    if( bsize > msize ) { /* The base is larger than the module. Reduce it. */
-       /* Allocate (BSIZE + 1) with space for remainder and quotient.
-        * (The quotient is (bsize - msize + 1) limbs.)  */
-       bp = bp_marker = mpi_alloc_limb_space( bsize + 1);
-       if (!bp)
-               goto enomem;
-       MPN_COPY( bp, base->d, bsize );
-       /* We don't care about the quotient, store it above the remainder,
-        * at BP + MSIZE.  */
-       mpihelp_divrem( bp + msize, 0, bp, bsize, mp, msize );
-       bsize = msize;
-       /* Canonicalize the base, since we are going to multiply with it
-        * quite a few times.  */
-       MPN_NORMALIZE( bp, bsize );
-    }
-    else
-       bp = base->d;
-
-    if( !bsize ) {
-       res->nlimbs = 0;
-       res->sign = 0;
-       goto leave;
-    }
-
-    if( res->alloced < size ) {
-       /* We have to allocate more space for RES.  If any of the input
-        * parameters are identical to RES, defer deallocation of the old
-        * space.  */
-       if( rp == ep || rp == mp || rp == bp ) {
-           rp = mpi_alloc_limb_space(size);
-           if (!rp)
-                   goto enomem;
-           assign_rp = 1;
-       }
-       else {
-               if (mpi_resize( res, size ) < 0)
-                       goto enomem;
-           rp = res->d;
-       }
-    }
-    else { /* Make BASE, EXP and MOD not overlap with RES.  */
-       if( rp == bp ) {
-           /* RES and BASE are identical.  Allocate temp. space for BASE.  */
-               BUG_ON(bp_marker);
-           bp = bp_marker = mpi_alloc_limb_space(bsize);
-           if (!bp)
-                   goto enomem;
-           MPN_COPY(bp, rp, bsize);
-       }
-       if( rp == ep ) {
-           /* RES and EXP are identical.  Allocate temp. space for EXP.  */
-           ep = ep_marker = mpi_alloc_limb_space(esize);
-           if (!ep)
-                   goto enomem;  
-           MPN_COPY(ep, rp, esize);
-       }
-       if( rp == mp ) {
-           /* RES and MOD are identical.  Allocate temporary space for MOD.*/
-           BUG_ON(mp_marker);
-           mp = mp_marker = mpi_alloc_limb_space(msize);
-           if (!mp)
-                   goto enomem;
-           MPN_COPY(mp, rp, msize);
-       }
-    }
-
-    MPN_COPY( rp, bp, bsize );
-    rsize = bsize;
-    rsign = bsign;
-
-    {
-       mpi_size_t i;
-       mpi_ptr_t xp;
-       int c;
-       mpi_limb_t e;
-       mpi_limb_t carry_limb;
-       struct karatsuba_ctx karactx;
-
-       xp = xp_marker = mpi_alloc_limb_space(2 * (msize + 1));
-       if (xp)
-               goto enomem;
-
-       memset( &karactx, 0, sizeof karactx );
-       negative_result = (ep[0] & 1) && base->sign;
-
-       i = esize - 1;
-       e = ep[i];
-       count_leading_zeros (c, e);
-       e = (e << c) << 1;     /* shift the exp bits to the left, lose msb */
-       c = BITS_PER_MPI_LIMB - 1 - c;
-
-       /* Main loop.
-        *
-        * Make the result be pointed to alternately by XP and RP.  This
-        * helps us avoid block copying, which would otherwise be necessary
-        * with the overlap restrictions of mpihelp_divmod. With 50% probability
-        * the result after this loop will be in the area originally pointed
-        * by RP (==RES->d), and with 50% probability in the area originally
-        * pointed to by XP.
-        */
-
-       for(;;) {
-           while( c ) {
-               mpi_ptr_t tp;
-               mpi_size_t xsize;
-
-               /*if (mpihelp_mul_n(xp, rp, rp, rsize) < 0) goto enomem */
-               if( rsize < KARATSUBA_THRESHOLD )
-                   mpih_sqr_n_basecase( xp, rp, rsize );
-               else {
-                   if( !tspace ) {
-                       tsize = 2 * rsize;
-                       tspace = mpi_alloc_limb_space(tsize);
-                       if (!tspace)
-                               goto enomem;
-                   }
-                   else if( tsize < (2*rsize) ) {
-                       mpi_free_limb_space( tspace );
-                       tsize = 2 * rsize;
-                       tspace = mpi_alloc_limb_space(tsize);
-                       if (!tspace)
-                               goto enomem;
-                   }
-                   mpih_sqr_n( xp, rp, rsize, tspace );
-               }
-
-               xsize = 2 * rsize;
-               if( xsize > msize ) {
-                   mpihelp_divrem(xp + msize, 0, xp, xsize, mp, msize);
-                   xsize = msize;
-               }
-
-               tp = rp; rp = xp; xp = tp;
-               rsize = xsize;
-
-               if( (mpi_limb_signed_t)e < 0 ) {
-                   /*mpihelp_mul( xp, rp, rsize, bp, bsize );*/
-                   if( bsize < KARATSUBA_THRESHOLD ) {
-                           mpi_limb_t tmp;
-                           if (mpihelp_mul( xp, rp, rsize, bp, bsize, &tmp ) < 0)
-                                   goto enomem;
-                   }
-                   else {
-                           if (mpihelp_mul_karatsuba_case(
-                                       xp, rp, rsize, bp, bsize, &karactx ) < 0)
-                                   goto enomem;
-                   }
-
-                   xsize = rsize + bsize;
-                   if( xsize > msize ) {
-                       mpihelp_divrem(xp + msize, 0, xp, xsize, mp, msize);
-                       xsize = msize;
-                   }
-
-                   tp = rp; rp = xp; xp = tp;
-                   rsize = xsize;
-               }
-               e <<= 1;
-               c--;
-           }
-
-           i--;
-           if( i < 0 )
-               break;
-           e = ep[i];
-           c = BITS_PER_MPI_LIMB;
-       }
-
-       /* We shifted MOD, the modulo reduction argument, left MOD_SHIFT_CNT
-        * steps.  Adjust the result by reducing it with the original MOD.
-        *
-        * Also make sure the result is put in RES->d (where it already
-        * might be, see above).
-        */
-       if( mod_shift_cnt ) {
-           carry_limb = mpihelp_lshift( res->d, rp, rsize, mod_shift_cnt);
-           rp = res->d;
-           if( carry_limb ) {
-               rp[rsize] = carry_limb;
-               rsize++;
-           }
-       }
-       else {
-           MPN_COPY( res->d, rp, rsize);
-           rp = res->d;
-       }
-
-       if( rsize >= msize ) {
-           mpihelp_divrem(rp + msize, 0, rp, rsize, mp, msize);
-           rsize = msize;
-       }
-
-       /* Remove any leading zero words from the result.  */
-       if( mod_shift_cnt )
-           mpihelp_rshift( rp, rp, rsize, mod_shift_cnt);
-       MPN_NORMALIZE (rp, rsize);
-
-       mpihelp_release_karatsuba_ctx( &karactx );
-    }
-
-    if( negative_result && rsize ) {
-       if( mod_shift_cnt )
-           mpihelp_rshift( mp, mp, msize, mod_shift_cnt);
-       mpihelp_sub( rp, mp, msize, rp, rsize);
-       rsize = msize;
-       rsign = msign;
-       MPN_NORMALIZE(rp, rsize);
-    }
-    res->nlimbs = rsize;
-    res->sign = rsign;
-
- leave:
-    rc = 0;
- enomem:
-    if( assign_rp ) mpi_assign_limb_space( res, rp, size );
-    if( mp_marker ) mpi_free_limb_space( mp_marker );
-    if( bp_marker ) mpi_free_limb_space( bp_marker );
-    if( ep_marker ) mpi_free_limb_space( ep_marker );
-    if( xp_marker ) mpi_free_limb_space( xp_marker );
-    if( tspace )    mpi_free_limb_space( tspace );
-    return rc;
-}
-
diff --git a/crypto/mpi/mpi-scan.c b/crypto/mpi/mpi-scan.c
deleted file mode 100644 (file)
index 0f080fb..0000000
+++ /dev/null
@@ -1,129 +0,0 @@
-/* mpi-scan.c  -  MPI functions
- * Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
- *
- * This file is part of GnuPG.
- *
- * GnuPG 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.
- *
- * GnuPG 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 "mpi-internal.h"
-#include "longlong.h"
-
-/****************
- * Scan through an mpi and return byte for byte. a -1 is returned to indicate
- * the end of the mpi. Scanning is done from the lsb to the msb, returned
- * values are in the range of 0 .. 255.
- *
- * FIXME: This code is VERY ugly!
- */
-int
-mpi_getbyte( const MPI a, unsigned idx )
-{
-    int i, j;
-    unsigned n;
-    mpi_ptr_t ap;
-    mpi_limb_t limb;
-
-    ap = a->d;
-    for(n=0,i=0; i < a->nlimbs; i++ ) {
-       limb = ap[i];
-       for( j=0; j < BYTES_PER_MPI_LIMB; j++, n++ )
-           if( n == idx )
-               return (limb >> j*8) & 0xff;
-    }
-    return -1;
-}
-
-
-/****************
- * Put a value at position IDX into A. idx counts from lsb to msb
- */
-void
-mpi_putbyte( MPI a, unsigned idx, int xc )
-{
-    int i, j;
-    unsigned n;
-    mpi_ptr_t ap;
-    mpi_limb_t limb, c;
-
-    c = xc & 0xff;
-    ap = a->d;
-    for(n=0,i=0; i < a->alloced; i++ ) {
-       limb = ap[i];
-       for( j=0; j < BYTES_PER_MPI_LIMB; j++, n++ )
-           if( n == idx ) {
-             #if BYTES_PER_MPI_LIMB == 4
-               if( j == 0 )
-                   limb = (limb & 0xffffff00) | c;
-               else if( j == 1 )
-                   limb = (limb & 0xffff00ff) | (c<<8);
-               else if( j == 2 )
-                   limb = (limb & 0xff00ffff) | (c<<16);
-               else
-                   limb = (limb & 0x00ffffff) | (c<<24);
-             #elif BYTES_PER_MPI_LIMB == 8
-               if( j == 0 )
-                   limb = (limb & 0xffffffffffffff00) | c;
-               else if( j == 1 )
-                   limb = (limb & 0xffffffffffff00ff) | (c<<8);
-               else if( j == 2 )
-                   limb = (limb & 0xffffffffff00ffff) | (c<<16);
-               else if( j == 3 )
-                   limb = (limb & 0xffffffff00ffffff) | (c<<24);
-               else if( j == 4 )
-                   limb = (limb & 0xffffff00ffffffff) | (c<<32);
-               else if( j == 5 )
-                   limb = (limb & 0xffff00ffffffffff) | (c<<40);
-               else if( j == 6 )
-                   limb = (limb & 0xff00ffffffffffff) | (c<<48);
-               else
-                   limb = (limb & 0x00ffffffffffffff) | (c<<56);
-             #else
-                #error please enhance this function, its ugly - i know.
-             #endif
-               if( a->nlimbs <= i )
-                   a->nlimbs = i+1;
-               ap[i] = limb;
-               return;
-           }
-    }
-    log_bug("index out of range\n");
-}
-
-
-/****************
- * Count the number of zerobits at the low end of A
- */
-unsigned
-mpi_trailing_zeros( const MPI a )
-{
-    unsigned n, count = 0;
-
-    for(n=0; n < a->nlimbs; n++ ) {
-       if( a->d[n] ) {
-           unsigned nn;
-           mpi_limb_t alimb = a->d[n];
-
-           count_trailing_zeros( nn, alimb );
-           count += nn;
-           break;
-       }
-       count += BITS_PER_MPI_LIMB;
-    }
-    return count;
-
-}
-
-
diff --git a/crypto/mpi/mpicoder.c b/crypto/mpi/mpicoder.c
deleted file mode 100644 (file)
index 14bfcc6..0000000
+++ /dev/null
@@ -1,359 +0,0 @@
-/* mpicoder.c  -  Coder for the external representation of MPIs
- * Copyright (C) 1998, 1999 Free Software Foundation, Inc.
- *
- * This file is part of GnuPG.
- *
- * GnuPG 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.
- *
- * GnuPG 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 "mpi-internal.h"
-
-#define DIM(v) (sizeof(v)/sizeof((v)[0]))
-#define MAX_EXTERN_MPI_BITS 16384
-
-
-static uint8_t asn[15] = /* Object ID is 1.3.14.3.2.26 */
-  { 0x30, 0x21, 0x30, 0x09, 0x06, 0x05, 0x2b, 0x0e, 0x03,
-    0x02, 0x1a, 0x05, 0x00, 0x04, 0x14 };
-
-
-MPI
-do_encode_md(const void *sha_buffer, unsigned nbits)
-{
-  int nframe = (nbits+7) / 8;
-  uint8_t *frame, *fr_pt;
-  int i = 0, n;
-  size_t asnlen = DIM(asn);
-  MPI a = MPI_NULL;
-
-  if(SHA1_DIGEST_LENGTH + asnlen + 4  > nframe )
-    printk("MPI: can't encode a %d bit MD into a %d bits frame\n",
-         (int)(SHA1_DIGEST_LENGTH*8), (int)nbits);
-
-  /* We encode the MD in this way:
-   *
-   *      0  A PAD(n bytes)   0  ASN(asnlen bytes)  MD(len bytes)
-   *
-   * PAD consists of FF bytes.
-   */
-  frame = kmalloc(nframe, GFP_KERNEL);
-  if (!frame)
-         return MPI_NULL;
-  n = 0;
-  frame[n++] = 0;
-  frame[n++] = 1; /* block type */
-  i = nframe - SHA1_DIGEST_LENGTH - asnlen -3 ;
-  
-  if(i <= 1) {
-    printk("MPI: message digest encoding failed\n");
-    kfree(frame);
-    return a;
-  }
-
-  memset( frame+n, 0xff, i ); n += i;
-  frame[n++] = 0;
-  memcpy( frame+n, &asn, asnlen ); n += asnlen;
-  memcpy( frame+n, sha_buffer, SHA1_DIGEST_LENGTH ); n += SHA1_DIGEST_LENGTH;
-  
-  i = nframe;
-  fr_pt = frame;
-
-  if (n != nframe) {
-    printk("MPI: message digest encoding failed, frame length is wrong\n");
-    kfree(frame);
-    return a;
-  }
-  
-  a = mpi_alloc( (nframe+BYTES_PER_MPI_LIMB-1) / BYTES_PER_MPI_LIMB );
-  mpi_set_buffer( a, frame, nframe, 0 );
-  kfree(frame);
-
-  return a;
-}
-
-
-MPI
-mpi_read_from_buffer(const void *xbuffer, unsigned *ret_nread)
-{
-  const uint8_t *buffer = xbuffer;
-  int i, j;
-  unsigned nbits, nbytes, nlimbs, nread=0;
-  mpi_limb_t a;
-  MPI val = MPI_NULL;
-
-  if( *ret_nread < 2 )
-    goto leave;
-  nbits = buffer[0] << 8 | buffer[1];
-
-  if( nbits > MAX_EXTERN_MPI_BITS ) {
-    printk("MPI: mpi too large (%u bits)\n", nbits);
-    goto leave;
-  }
-  buffer += 2;
-  nread = 2;
-
-  nbytes = (nbits+7) / 8;
-  nlimbs = (nbytes+BYTES_PER_MPI_LIMB-1) / BYTES_PER_MPI_LIMB;
-  val = mpi_alloc( nlimbs );
-  if (!val)
-         return MPI_NULL;
-  i = BYTES_PER_MPI_LIMB - nbytes % BYTES_PER_MPI_LIMB;
-  i %= BYTES_PER_MPI_LIMB;
-  val->nbits = nbits;
-  j= val->nlimbs = nlimbs;
-  val->sign = 0;
-  for( ; j > 0; j-- ) {
-    a = 0;
-    for(; i < BYTES_PER_MPI_LIMB; i++ ) {
-      if( ++nread > *ret_nread ) {
-       printk("MPI: mpi larger than buffer nread=%d ret_nread=%d\n", nread, *ret_nread);
-       goto leave;
-      }
-      a <<= 8;
-      a |= *buffer++;
-    }
-    i = 0;
-    val->d[j-1] = a;
-  }
-
- leave:
-  *ret_nread = nread;
-  return val;
-}
-
-
-/****************
- * Make an mpi from a character string.
- */
-int
-mpi_fromstr(MPI val, const char *str)
-{
-    int hexmode=0, sign=0, prepend_zero=0, i, j, c, c1, c2;
-    unsigned nbits, nbytes, nlimbs;
-    mpi_limb_t a;
-
-    if( *str == '-' ) {
-       sign = 1;
-       str++;
-    }
-    if( *str == '0' && str[1] == 'x' )
-       hexmode = 1;
-    else
-       return -EINVAL; /* other bases are not yet supported */
-    str += 2;
-
-    nbits = strlen(str)*4;
-    if( nbits % 8 )
-       prepend_zero = 1;
-    nbytes = (nbits+7) / 8;
-    nlimbs = (nbytes+BYTES_PER_MPI_LIMB-1) / BYTES_PER_MPI_LIMB;
-    if( val->alloced < nlimbs )
-           if (!mpi_resize(val, nlimbs ))
-                   return -ENOMEM;
-    i = BYTES_PER_MPI_LIMB - nbytes % BYTES_PER_MPI_LIMB;
-    i %= BYTES_PER_MPI_LIMB;
-    j= val->nlimbs = nlimbs;
-    val->sign = sign;
-    for( ; j > 0; j-- ) {
-       a = 0;
-       for(; i < BYTES_PER_MPI_LIMB; i++ ) {
-           if( prepend_zero ) {
-               c1 = '0';
-               prepend_zero = 0;
-           }
-           else
-               c1 = *str++;
-           assert(c1);
-           c2 = *str++;
-           assert(c2);
-           if( c1 >= '0' && c1 <= '9' )
-               c = c1 - '0';
-           else if( c1 >= 'a' && c1 <= 'f' )
-               c = c1 - 'a' + 10;
-           else if( c1 >= 'A' && c1 <= 'F' )
-               c = c1 - 'A' + 10;
-           else {
-               mpi_clear(val);
-               return 1;
-           }
-           c <<= 4;
-           if( c2 >= '0' && c2 <= '9' )
-               c |= c2 - '0';
-           else if( c2 >= 'a' && c2 <= 'f' )
-               c |= c2 - 'a' + 10;
-           else if( c2 >= 'A' && c2 <= 'F' )
-               c |= c2 - 'A' + 10;
-           else {
-               mpi_clear(val);
-               return 1;
-           }
-           a <<= 8;
-           a |= c;
-       }
-       i = 0;
-
-       val->d[j-1] = a;
-    }
-
-    return 0;
-}
-
-
-/****************
- * Special function to get the low 8 bytes from an mpi.
- * This can be used as a keyid; KEYID is an 2 element array.
- * Return the low 4 bytes.
- */
-u32
-mpi_get_keyid( const MPI a, u32 *keyid )
-{
-#if BYTES_PER_MPI_LIMB == 4
-    if( keyid ) {
-       keyid[0] = a->nlimbs >= 2? a->d[1] : 0;
-       keyid[1] = a->nlimbs >= 1? a->d[0] : 0;
-    }
-    return a->nlimbs >= 1? a->d[0] : 0;
-#elif BYTES_PER_MPI_LIMB == 8
-    if( keyid ) {
-       keyid[0] = a->nlimbs? (u32)(a->d[0] >> 32) : 0;
-       keyid[1] = a->nlimbs? (u32)(a->d[0] & 0xffffffff) : 0;
-    }
-    return a->nlimbs? (u32)(a->d[0] & 0xffffffff) : 0;
-#else
-  #error Make this function work with other LIMB sizes
-#endif
-}
-
-
-/****************
- * Return an allocated buffer with the MPI (msb first).
- * NBYTES receives the length of this buffer. Caller must free the
- * return string (This function does return a 0 byte buffer with NBYTES
- * set to zero if the value of A is zero. If sign is not NULL, it will
- * be set to the sign of the A.
- */
-void *
-mpi_get_buffer( MPI a, unsigned *nbytes, int *sign )
-{
-    uint8_t *p, *buffer;
-    mpi_limb_t alimb;
-    int i;
-    unsigned int n;
-
-    if( sign )
-       *sign = a->sign;
-    *nbytes = n = a->nlimbs * BYTES_PER_MPI_LIMB;
-    if (!n)
-      n++; /* avoid zero length allocation */
-    p = buffer = kmalloc(n, GFP_KERNEL);
-
-    for(i=a->nlimbs-1; i >= 0; i-- ) {
-       alimb = a->d[i];
-#if BYTES_PER_MPI_LIMB == 4
-       *p++ = alimb >> 24;
-       *p++ = alimb >> 16;
-       *p++ = alimb >>  8;
-       *p++ = alimb      ;
-#elif BYTES_PER_MPI_LIMB == 8
-       *p++ = alimb >> 56;
-       *p++ = alimb >> 48;
-       *p++ = alimb >> 40;
-       *p++ = alimb >> 32;
-       *p++ = alimb >> 24;
-       *p++ = alimb >> 16;
-       *p++ = alimb >>  8;
-       *p++ = alimb      ;
-#else
-#error please implement for this limb size.
-#endif
-    }
-
-    /* this is sub-optimal but we need to do the shift operation
-     * because the caller has to free the returned buffer */
-    for(p=buffer; !*p && *nbytes; p++, --*nbytes )
-      ;
-    if( p != buffer )
-      memmove(buffer,p, *nbytes);
-
-    return buffer;
-}
-
-
-/****************
- * Use BUFFER to update MPI.
- */
-int
-mpi_set_buffer( MPI a, const void *xbuffer, unsigned nbytes, int sign )
-{
-    const uint8_t *buffer = xbuffer, *p;
-    mpi_limb_t alimb;
-    int nlimbs;
-    int i;
-
-    nlimbs = (nbytes + BYTES_PER_MPI_LIMB - 1) / BYTES_PER_MPI_LIMB;
-    if (RESIZE_IF_NEEDED(a, nlimbs) < 0)
-           return -ENOMEM;
-    a->sign = sign;
-
-    for(i=0, p = buffer+nbytes-1; p >= buffer+BYTES_PER_MPI_LIMB; ) {
-      #if BYTES_PER_MPI_LIMB == 4
-       alimb  = (mpi_limb_t)*p-- ;
-       alimb |= (mpi_limb_t)*p-- <<  8 ;
-       alimb |= (mpi_limb_t)*p-- << 16 ;
-       alimb |= (mpi_limb_t)*p-- << 24 ;
-      #elif BYTES_PER_MPI_LIMB == 8
-       alimb  = (mpi_limb_t)*p--       ;
-       alimb |= (mpi_limb_t)*p-- <<  8 ;
-       alimb |= (mpi_limb_t)*p-- << 16 ;
-       alimb |= (mpi_limb_t)*p-- << 24 ;
-       alimb |= (mpi_limb_t)*p-- << 32 ;
-       alimb |= (mpi_limb_t)*p-- << 40 ;
-       alimb |= (mpi_limb_t)*p-- << 48 ;
-       alimb |= (mpi_limb_t)*p-- << 56 ;
-      #else
-       #error please implement for this limb size.
-      #endif
-       a->d[i++] = alimb;
-    }
-    if( p >= buffer ) {
-      #if BYTES_PER_MPI_LIMB == 4
-       alimb  = *p--       ;
-       if( p >= buffer ) alimb |= (mpi_limb_t)*p-- <<  8 ;
-       if( p >= buffer ) alimb |= (mpi_limb_t)*p-- << 16 ;
-       if( p >= buffer ) alimb |= (mpi_limb_t)*p-- << 24 ;
-      #elif BYTES_PER_MPI_LIMB == 8
-       alimb  = (mpi_limb_t)*p-- ;
-       if( p >= buffer ) alimb |= (mpi_limb_t)*p-- <<  8 ;
-       if( p >= buffer ) alimb |= (mpi_limb_t)*p-- << 16 ;
-       if( p >= buffer ) alimb |= (mpi_limb_t)*p-- << 24 ;
-       if( p >= buffer ) alimb |= (mpi_limb_t)*p-- << 32 ;
-       if( p >= buffer ) alimb |= (mpi_limb_t)*p-- << 40 ;
-       if( p >= buffer ) alimb |= (mpi_limb_t)*p-- << 48 ;
-       if( p >= buffer ) alimb |= (mpi_limb_t)*p-- << 56 ;
-      #else
-       #error please implement for this limb size.
-      #endif
-       a->d[i++] = alimb;
-    }
-    a->nlimbs = i;
-
-    if (i != nlimbs) {
-           printk("MPI: mpi_set_buffer: Assertion failed (%d != %d)", i, nlimbs);
-           BUG();
-    }
-    return 0;
-}
-
diff --git a/crypto/mpi/mpih-cmp.c b/crypto/mpi/mpih-cmp.c
deleted file mode 100644 (file)
index 0ffd64e..0000000
+++ /dev/null
@@ -1,58 +0,0 @@
-/* mpihelp-sub.c  -  MPI helper functions
- *     Copyright (C) 1994, 1996 Free Software Foundation, Inc.
- *     Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
- *
- * This file is part of GnuPG.
- *
- * GnuPG 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.
- *
- * GnuPG 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
- *
- * Note: This code is heavily based on the GNU MP Library.
- *      Actually it's the same code with only minor changes in the
- *      way the data is stored; this is to support the abstraction
- *      of an optional secure memory allocation which may be used
- *      to avoid revealing of sensitive data due to paging etc.
- *      The GNU MP Library itself is published under the LGPL;
- *      however I decided to publish this code under the plain GPL.
- */
-
-#include "mpi-internal.h"
-
-/****************
- * Compare OP1_PTR/OP1_SIZE with OP2_PTR/OP2_SIZE.
- * There are no restrictions on the relative sizes of
- * the two arguments.
- * Return 1 if OP1 > OP2, 0 if they are equal, and -1 if OP1 < OP2.
- */
-int
-mpihelp_cmp( mpi_ptr_t op1_ptr, mpi_ptr_t op2_ptr, mpi_size_t size )
-{
-    mpi_size_t i;
-    mpi_limb_t op1_word, op2_word;
-
-    for( i = size - 1; i >= 0 ; i--) {
-       op1_word = op1_ptr[i];
-       op2_word = op2_ptr[i];
-       if( op1_word != op2_word )
-           goto diff;
-    }
-    return 0;
-
-  diff:
-    /* This can *not* be simplified to
-     *  op2_word - op2_word
-     * since that expression might give signed overflow.  */
-    return (op1_word > op2_word) ? 1 : -1;
-}
-
diff --git a/crypto/mpi/mpih-div.c b/crypto/mpi/mpih-div.c
deleted file mode 100644 (file)
index e4e80fe..0000000
+++ /dev/null
@@ -1,534 +0,0 @@
-/* mpihelp-div.c  -  MPI helper functions
- *     Copyright (C) 1994, 1996 Free Software Foundation, Inc.
- *     Copyright (C) 1998, 1999 Free Software Foundation, Inc.
- *
- * This file is part of GnuPG.
- *
- * GnuPG 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.
- *
- * GnuPG 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
- *
- * Note: This code is heavily based on the GNU MP Library.
- *      Actually it's the same code with only minor changes in the
- *      way the data is stored; this is to support the abstraction
- *      of an optional secure memory allocation which may be used
- *      to avoid revealing of sensitive data due to paging etc.
- *      The GNU MP Library itself is published under the LGPL;
- *      however I decided to publish this code under the plain GPL.
- */
-
-#include "mpi-internal.h"
-#include "longlong.h"
-
-#ifndef UMUL_TIME
-  #define UMUL_TIME 1
-#endif
-#ifndef UDIV_TIME
-  #define UDIV_TIME UMUL_TIME
-#endif
-
-/* FIXME: We should be using invert_limb (or invert_normalized_limb)
- * here (not udiv_qrnnd).
- */
-
-mpi_limb_t
-mpihelp_mod_1(mpi_ptr_t dividend_ptr, mpi_size_t dividend_size,
-                                     mpi_limb_t divisor_limb)
-{
-    mpi_size_t i;
-    mpi_limb_t n1, n0, r;
-    int dummy;
-
-    /* Botch: Should this be handled at all?  Rely on callers? */
-    if( !dividend_size )
-       return 0;
-
-    /* If multiplication is much faster than division, and the
-     * dividend is large, pre-invert the divisor, and use
-     * only multiplications in the inner loop.
-     *
-     * This test should be read:
-     *  Does it ever help to use udiv_qrnnd_preinv?
-     *    && Does what we save compensate for the inversion overhead?
-     */
-    if( UDIV_TIME > (2 * UMUL_TIME + 6)
-       && (UDIV_TIME - (2 * UMUL_TIME + 6)) * dividend_size > UDIV_TIME ) {
-       int normalization_steps;
-
-       count_leading_zeros( normalization_steps, divisor_limb );
-       if( normalization_steps ) {
-           mpi_limb_t divisor_limb_inverted;
-
-           divisor_limb <<= normalization_steps;
-
-           /* Compute (2**2N - 2**N * DIVISOR_LIMB) / DIVISOR_LIMB.  The
-            * result is a (N+1)-bit approximation to 1/DIVISOR_LIMB, with the
-            * most significant bit (with weight 2**N) implicit.
-            *
-            * Special case for DIVISOR_LIMB == 100...000.
-            */
-           if( !(divisor_limb << 1) )
-               divisor_limb_inverted = ~(mpi_limb_t)0;
-           else
-               udiv_qrnnd(divisor_limb_inverted, dummy,
-                          -divisor_limb, 0, divisor_limb);
-
-           n1 = dividend_ptr[dividend_size - 1];
-           r = n1 >> (BITS_PER_MPI_LIMB - normalization_steps);
-
-           /* Possible optimization:
-            * if (r == 0
-            * && divisor_limb > ((n1 << normalization_steps)
-            *                 | (dividend_ptr[dividend_size - 2] >> ...)))
-            * ...one division less...
-            */
-           for( i = dividend_size - 2; i >= 0; i--) {
-               n0 = dividend_ptr[i];
-               UDIV_QRNND_PREINV(dummy, r, r,
-                                  ((n1 << normalization_steps)
-                         | (n0 >> (BITS_PER_MPI_LIMB - normalization_steps))),
-                         divisor_limb, divisor_limb_inverted);
-               n1 = n0;
-           }
-           UDIV_QRNND_PREINV(dummy, r, r,
-                             n1 << normalization_steps,
-                             divisor_limb, divisor_limb_inverted);
-           return r >> normalization_steps;
-       }
-       else {
-           mpi_limb_t divisor_limb_inverted;
-
-           /* Compute (2**2N - 2**N * DIVISOR_LIMB) / DIVISOR_LIMB.  The
-            * result is a (N+1)-bit approximation to 1/DIVISOR_LIMB, with the
-            * most significant bit (with weight 2**N) implicit.
-            *
-            * Special case for DIVISOR_LIMB == 100...000.
-            */
-           if( !(divisor_limb << 1) )
-               divisor_limb_inverted = ~(mpi_limb_t)0;
-           else
-               udiv_qrnnd(divisor_limb_inverted, dummy,
-                           -divisor_limb, 0, divisor_limb);
-
-           i = dividend_size - 1;
-           r = dividend_ptr[i];
-
-           if( r >= divisor_limb )
-               r = 0;
-           else
-               i--;
-
-           for( ; i >= 0; i--) {
-               n0 = dividend_ptr[i];
-               UDIV_QRNND_PREINV(dummy, r, r,
-                                 n0, divisor_limb, divisor_limb_inverted);
-           }
-           return r;
-       }
-    }
-    else {
-       if( UDIV_NEEDS_NORMALIZATION ) {
-           int normalization_steps;
-
-           count_leading_zeros(normalization_steps, divisor_limb);
-           if( normalization_steps ) {
-               divisor_limb <<= normalization_steps;
-
-               n1 = dividend_ptr[dividend_size - 1];
-               r = n1 >> (BITS_PER_MPI_LIMB - normalization_steps);
-
-               /* Possible optimization:
-                * if (r == 0
-                * && divisor_limb > ((n1 << normalization_steps)
-                *                 | (dividend_ptr[dividend_size - 2] >> ...)))
-                * ...one division less...
-                */
-               for(i = dividend_size - 2; i >= 0; i--) {
-                   n0 = dividend_ptr[i];
-                   udiv_qrnnd (dummy, r, r,
-                               ((n1 << normalization_steps)
-                        | (n0 >> (BITS_PER_MPI_LIMB - normalization_steps))),
-                        divisor_limb);
-                   n1 = n0;
-               }
-               udiv_qrnnd (dummy, r, r,
-                           n1 << normalization_steps,
-                           divisor_limb);
-               return r >> normalization_steps;
-           }
-       }
-       /* No normalization needed, either because udiv_qrnnd doesn't require
-        * it, or because DIVISOR_LIMB is already normalized.  */
-       i = dividend_size - 1;
-       r = dividend_ptr[i];
-
-       if(r >= divisor_limb)
-           r = 0;
-       else
-           i--;
-
-       for(; i >= 0; i--) {
-           n0 = dividend_ptr[i];
-           udiv_qrnnd (dummy, r, r, n0, divisor_limb);
-       }
-       return r;
-    }
-}
-
-/* Divide num (NP/NSIZE) by den (DP/DSIZE) and write
- * the NSIZE-DSIZE least significant quotient limbs at QP
- * and the DSIZE long remainder at NP. If QEXTRA_LIMBS is
- * non-zero, generate that many fraction bits and append them after the
- * other quotient limbs.
- * Return the most significant limb of the quotient, this is always 0 or 1.
- *
- * Preconditions:
- * 0. NSIZE >= DSIZE.
- * 1. The most significant bit of the divisor must be set.
- * 2. QP must either not overlap with the input operands at all, or
- *    QP + DSIZE >= NP must hold true. (This means that it's
- *    possible to put the quotient in the high part of NUM, right after the
- *    remainder in NUM.
- * 3. NSIZE >= DSIZE, even if QEXTRA_LIMBS is non-zero.
- */
-
-mpi_limb_t
-mpihelp_divrem( mpi_ptr_t qp, mpi_size_t qextra_limbs,
-               mpi_ptr_t np, mpi_size_t nsize,
-               mpi_ptr_t dp, mpi_size_t dsize)
-{
-    mpi_limb_t most_significant_q_limb = 0;
-
-    switch(dsize) {
-      case 0:
-       /* We are asked to divide by zero, so go ahead and do it!  (To make
-          the compiler not remove this statement, return the value.)  */
-       return 1 / dsize;
-
-      case 1:
-       {
-           mpi_size_t i;
-           mpi_limb_t n1;
-           mpi_limb_t d;
-
-           d = dp[0];
-           n1 = np[nsize - 1];
-
-           if( n1 >= d ) {
-               n1 -= d;
-               most_significant_q_limb = 1;
-           }
-
-           qp += qextra_limbs;
-           for( i = nsize - 2; i >= 0; i--)
-               udiv_qrnnd( qp[i], n1, n1, np[i], d );
-           qp -= qextra_limbs;
-
-           for( i = qextra_limbs - 1; i >= 0; i-- )
-               udiv_qrnnd (qp[i], n1, n1, 0, d);
-
-           np[0] = n1;
-       }
-       break;
-
-      case 2:
-       {
-           mpi_size_t i;
-           mpi_limb_t n1, n0, n2;
-           mpi_limb_t d1, d0;
-
-           np += nsize - 2;
-           d1 = dp[1];
-           d0 = dp[0];
-           n1 = np[1];
-           n0 = np[0];
-
-           if( n1 >= d1 && (n1 > d1 || n0 >= d0) ) {
-               sub_ddmmss (n1, n0, n1, n0, d1, d0);
-               most_significant_q_limb = 1;
-           }
-
-           for( i = qextra_limbs + nsize - 2 - 1; i >= 0; i-- ) {
-               mpi_limb_t q;
-               mpi_limb_t r;
-
-               if( i >= qextra_limbs )
-                   np--;
-               else
-                   np[0] = 0;
-
-               if( n1 == d1 ) {
-                   /* Q should be either 111..111 or 111..110.  Need special
-                    * treatment of this rare case as normal division would
-                    * give overflow.  */
-                   q = ~(mpi_limb_t)0;
-
-                   r = n0 + d1;
-                   if( r < d1 ) {   /* Carry in the addition? */
-                       add_ssaaaa( n1, n0, r - d0, np[0], 0, d0 );
-                       qp[i] = q;
-                       continue;
-                   }
-                   n1 = d0 - (d0 != 0?1:0);
-                   n0 = -d0;
-               }
-               else {
-                   udiv_qrnnd (q, r, n1, n0, d1);
-                   umul_ppmm (n1, n0, d0, q);
-               }
-
-               n2 = np[0];
-             q_test:
-               if( n1 > r || (n1 == r && n0 > n2) ) {
-                   /* The estimated Q was too large.  */
-                   q--;
-                   sub_ddmmss (n1, n0, n1, n0, 0, d0);
-                   r += d1;
-                   if( r >= d1 )    /* If not carry, test Q again.  */
-                       goto q_test;
-               }
-
-               qp[i] = q;
-               sub_ddmmss (n1, n0, r, n2, n1, n0);
-           }
-           np[1] = n1;
-           np[0] = n0;
-       }
-       break;
-
-      default:
-       {
-           mpi_size_t i;
-           mpi_limb_t dX, d1, n0;
-
-           np += nsize - dsize;
-           dX = dp[dsize - 1];
-           d1 = dp[dsize - 2];
-           n0 = np[dsize - 1];
-
-           if( n0 >= dX ) {
-               if(n0 > dX || mpihelp_cmp(np, dp, dsize - 1) >= 0 ) {
-                   mpihelp_sub_n(np, np, dp, dsize);
-                   n0 = np[dsize - 1];
-                   most_significant_q_limb = 1;
-               }
-           }
-
-           for( i = qextra_limbs + nsize - dsize - 1; i >= 0; i--) {
-               mpi_limb_t q;
-               mpi_limb_t n1, n2;
-               mpi_limb_t cy_limb;
-
-               if( i >= qextra_limbs ) {
-                   np--;
-                   n2 = np[dsize];
-               }
-               else {
-                   n2 = np[dsize - 1];
-                   MPN_COPY_DECR (np + 1, np, dsize - 1);
-                   np[0] = 0;
-               }
-
-               if( n0 == dX ) {
-                   /* This might over-estimate q, but it's probably not worth
-                    * the extra code here to find out.  */
-                   q = ~(mpi_limb_t)0;
-               }
-               else {
-                   mpi_limb_t r;
-
-                   udiv_qrnnd(q, r, n0, np[dsize - 1], dX);
-                   umul_ppmm(n1, n0, d1, q);
-
-                   while( n1 > r || (n1 == r && n0 > np[dsize - 2])) {
-                       q--;
-                       r += dX;
-                       if( r < dX ) /* I.e. "carry in previous addition?" */
-                           break;
-                       n1 -= n0 < d1;
-                       n0 -= d1;
-                   }
-               }
-
-               /* Possible optimization: We already have (q * n0) and (1 * n1)
-                * after the calculation of q.  Taking advantage of that, we
-                * could make this loop make two iterations less.  */
-               cy_limb = mpihelp_submul_1(np, dp, dsize, q);
-
-               if( n2 != cy_limb ) {
-                   mpihelp_add_n(np, np, dp, dsize);
-                   q--;
-               }
-
-               qp[i] = q;
-               n0 = np[dsize - 1];
-           }
-       }
-    }
-
-    return most_significant_q_limb;
-}
-
-
-/****************
- * Divide (DIVIDEND_PTR,,DIVIDEND_SIZE) by DIVISOR_LIMB.
- * Write DIVIDEND_SIZE limbs of quotient at QUOT_PTR.
- * Return the single-limb remainder.
- * There are no constraints on the value of the divisor.
- *
- * QUOT_PTR and DIVIDEND_PTR might point to the same limb.
- */
-
-mpi_limb_t
-mpihelp_divmod_1( mpi_ptr_t quot_ptr,
-                 mpi_ptr_t dividend_ptr, mpi_size_t dividend_size,
-                 mpi_limb_t divisor_limb)
-{
-    mpi_size_t i;
-    mpi_limb_t n1, n0, r;
-    int dummy;
-
-    if( !dividend_size )
-       return 0;
-
-    /* If multiplication is much faster than division, and the
-     * dividend is large, pre-invert the divisor, and use
-     * only multiplications in the inner loop.
-     *
-     * This test should be read:
-     * Does it ever help to use udiv_qrnnd_preinv?
-     * && Does what we save compensate for the inversion overhead?
-     */
-    if( UDIV_TIME > (2 * UMUL_TIME + 6)
-       && (UDIV_TIME - (2 * UMUL_TIME + 6)) * dividend_size > UDIV_TIME ) {
-       int normalization_steps;
-
-       count_leading_zeros( normalization_steps, divisor_limb );
-       if( normalization_steps ) {
-           mpi_limb_t divisor_limb_inverted;
-
-           divisor_limb <<= normalization_steps;
-
-           /* Compute (2**2N - 2**N * DIVISOR_LIMB) / DIVISOR_LIMB.  The
-            * result is a (N+1)-bit approximation to 1/DIVISOR_LIMB, with the
-            * most significant bit (with weight 2**N) implicit.
-            */
-           /* Special case for DIVISOR_LIMB == 100...000.  */
-           if( !(divisor_limb << 1) )
-               divisor_limb_inverted = ~(mpi_limb_t)0;
-           else
-               udiv_qrnnd(divisor_limb_inverted, dummy,
-                          -divisor_limb, 0, divisor_limb);
-
-           n1 = dividend_ptr[dividend_size - 1];
-           r = n1 >> (BITS_PER_MPI_LIMB - normalization_steps);
-
-           /* Possible optimization:
-            * if (r == 0
-            * && divisor_limb > ((n1 << normalization_steps)
-            *                 | (dividend_ptr[dividend_size - 2] >> ...)))
-            * ...one division less...
-            */
-           for( i = dividend_size - 2; i >= 0; i--) {
-               n0 = dividend_ptr[i];
-               UDIV_QRNND_PREINV( quot_ptr[i + 1], r, r,
-                                  ((n1 << normalization_steps)
-                        | (n0 >> (BITS_PER_MPI_LIMB - normalization_steps))),
-                             divisor_limb, divisor_limb_inverted);
-               n1 = n0;
-           }
-           UDIV_QRNND_PREINV( quot_ptr[0], r, r,
-                              n1 << normalization_steps,
-                              divisor_limb, divisor_limb_inverted);
-           return r >> normalization_steps;
-       }
-       else {
-           mpi_limb_t divisor_limb_inverted;
-
-           /* Compute (2**2N - 2**N * DIVISOR_LIMB) / DIVISOR_LIMB.  The
-            * result is a (N+1)-bit approximation to 1/DIVISOR_LIMB, with the
-            * most significant bit (with weight 2**N) implicit.
-            */
-           /* Special case for DIVISOR_LIMB == 100...000.  */
-           if( !(divisor_limb << 1) )
-               divisor_limb_inverted = ~(mpi_limb_t) 0;
-           else
-               udiv_qrnnd(divisor_limb_inverted, dummy,
-                          -divisor_limb, 0, divisor_limb);
-
-           i = dividend_size - 1;
-           r = dividend_ptr[i];
-
-           if( r >= divisor_limb )
-               r = 0;
-           else
-               quot_ptr[i--] = 0;
-
-           for( ; i >= 0; i-- ) {
-               n0 = dividend_ptr[i];
-               UDIV_QRNND_PREINV( quot_ptr[i], r, r,
-                                  n0, divisor_limb, divisor_limb_inverted);
-           }
-           return r;
-       }
-    }
-    else {
-       if(UDIV_NEEDS_NORMALIZATION) {
-           int normalization_steps;
-
-           count_leading_zeros (normalization_steps, divisor_limb);
-           if( normalization_steps ) {
-               divisor_limb <<= normalization_steps;
-
-               n1 = dividend_ptr[dividend_size - 1];
-               r = n1 >> (BITS_PER_MPI_LIMB - normalization_steps);
-
-               /* Possible optimization:
-                * if (r == 0
-                * && divisor_limb > ((n1 << normalization_steps)
-                *                 | (dividend_ptr[dividend_size - 2] >> ...)))
-                * ...one division less...
-                */
-               for( i = dividend_size - 2; i >= 0; i--) {
-                   n0 = dividend_ptr[i];
-                   udiv_qrnnd (quot_ptr[i + 1], r, r,
-                            ((n1 << normalization_steps)
-                        | (n0 >> (BITS_PER_MPI_LIMB - normalization_steps))),
-                               divisor_limb);
-                   n1 = n0;
-               }
-               udiv_qrnnd (quot_ptr[0], r, r,
-                           n1 << normalization_steps,
-                           divisor_limb);
-               return r >> normalization_steps;
-           }
-       }
-       /* No normalization needed, either because udiv_qrnnd doesn't require
-        * it, or because DIVISOR_LIMB is already normalized.  */
-       i = dividend_size - 1;
-       r = dividend_ptr[i];
-
-       if(r >= divisor_limb)
-           r = 0;
-       else
-           quot_ptr[i--] = 0;
-
-       for(; i >= 0; i--) {
-           n0 = dividend_ptr[i];
-           udiv_qrnnd( quot_ptr[i], r, r, n0, divisor_limb );
-       }
-       return r;
-    }
-}
-
-
diff --git a/crypto/mpi/mpih-mul.c b/crypto/mpi/mpih-mul.c
deleted file mode 100644 (file)
index c4eaca7..0000000
+++ /dev/null
@@ -1,547 +0,0 @@
-/* mpihelp-mul.c  -  MPI helper functions
- * Copyright (C) 1994, 1996, 1998, 1999,
- *               2000 Free Software Foundation, Inc.
- *
- * This file is part of GnuPG.
- *
- * GnuPG 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.
- *
- * GnuPG 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
- *
- * Note: This code is heavily based on the GNU MP Library.
- *      Actually it's the same code with only minor changes in the
- *      way the data is stored; this is to support the abstraction
- *      of an optional secure memory allocation which may be used
- *      to avoid revealing of sensitive data due to paging etc.
- *      The GNU MP Library itself is published under the LGPL;
- *      however I decided to publish this code under the plain GPL.
- */
-
-#include <linux/string.h>
-#include "mpi-internal.h"
-#include "longlong.h"
-
-
-
-#define MPN_MUL_N_RECURSE(prodp, up, vp, size, tspace) \
-    do {                                               \
-       if( (size) < KARATSUBA_THRESHOLD )              \
-           mul_n_basecase (prodp, up, vp, size);       \
-       else                                            \
-           mul_n (prodp, up, vp, size, tspace);        \
-    } while (0);
-
-#define MPN_SQR_N_RECURSE(prodp, up, size, tspace) \
-    do {                                           \
-       if ((size) < KARATSUBA_THRESHOLD)           \
-           mpih_sqr_n_basecase (prodp, up, size);       \
-       else                                        \
-           mpih_sqr_n (prodp, up, size, tspace);        \
-    } while (0);
-
-
-
-
-/* Multiply the natural numbers u (pointed to by UP) and v (pointed to by VP),
- * both with SIZE limbs, and store the result at PRODP.  2 * SIZE limbs are
- * always stored.  Return the most significant limb.
- *
- * Argument constraints:
- * 1. PRODP != UP and PRODP != VP, i.e. the destination
- *    must be distinct from the multiplier and the multiplicand.
- *
- *
- * Handle simple cases with traditional multiplication.
- *
- * This is the most critical code of multiplication.  All multiplies rely
- * on this, both small and huge.  Small ones arrive here immediately.  Huge
- * ones arrive here as this is the base case for Karatsuba's recursive
- * algorithm below.
- */
-
-static mpi_limb_t
-mul_n_basecase( mpi_ptr_t prodp, mpi_ptr_t up,
-                                mpi_ptr_t vp, mpi_size_t size)
-{
-    mpi_size_t i;
-    mpi_limb_t cy;
-    mpi_limb_t v_limb;
-
-    /* Multiply by the first limb in V separately, as the result can be
-     * stored (not added) to PROD.  We also avoid a loop for zeroing.  */
-    v_limb = vp[0];
-    if( v_limb <= 1 ) {
-       if( v_limb == 1 )
-           MPN_COPY( prodp, up, size );
-       else
-           MPN_ZERO( prodp, size );
-       cy = 0;
-    }
-    else
-       cy = mpihelp_mul_1( prodp, up, size, v_limb );
-
-    prodp[size] = cy;
-    prodp++;
-
-    /* For each iteration in the outer loop, multiply one limb from
-     * U with one limb from V, and add it to PROD.  */
-    for( i = 1; i < size; i++ ) {
-       v_limb = vp[i];
-       if( v_limb <= 1 ) {
-           cy = 0;
-           if( v_limb == 1 )
-              cy = mpihelp_add_n(prodp, prodp, up, size);
-       }
-       else
-           cy = mpihelp_addmul_1(prodp, up, size, v_limb);
-
-       prodp[size] = cy;
-       prodp++;
-    }
-
-    return cy;
-}
-
-
-static void
-mul_n( mpi_ptr_t prodp, mpi_ptr_t up, mpi_ptr_t vp,
-                       mpi_size_t size, mpi_ptr_t tspace )
-{
-    if( size & 1 ) {
-      /* The size is odd, and the code below doesn't handle that.
-       * Multiply the least significant (size - 1) limbs with a recursive
-       * call, and handle the most significant limb of S1 and S2
-       * separately.
-       * A slightly faster way to do this would be to make the Karatsuba
-       * code below behave as if the size were even, and let it check for
-       * odd size in the end.  I.e., in essence move this code to the end.
-       * Doing so would save us a recursive call, and potentially make the
-       * stack grow a lot less.
-       */
-      mpi_size_t esize = size - 1;      /* even size */
-      mpi_limb_t cy_limb;
-
-      MPN_MUL_N_RECURSE( prodp, up, vp, esize, tspace );
-      cy_limb = mpihelp_addmul_1( prodp + esize, up, esize, vp[esize] );
-      prodp[esize + esize] = cy_limb;
-      cy_limb = mpihelp_addmul_1( prodp + esize, vp, size, up[esize] );
-      prodp[esize + size] = cy_limb;
-    }
-    else {
-       /* Anatolij Alekseevich Karatsuba's divide-and-conquer algorithm.
-        *
-        * Split U in two pieces, U1 and U0, such that
-        * U = U0 + U1*(B**n),
-        * and V in V1 and V0, such that
-        * V = V0 + V1*(B**n).
-        *
-        * UV is then computed recursively using the identity
-        *
-        *        2n   n          n                     n
-        * UV = (B  + B )U V  +  B (U -U )(V -V )  +  (B + 1)U V
-        *                1 1        1  0   0  1              0 0
-        *
-        * Where B = 2**BITS_PER_MP_LIMB.
-        */
-       mpi_size_t hsize = size >> 1;
-       mpi_limb_t cy;
-       int negflg;
-
-       /* Product H.      ________________  ________________
-        *                |_____U1 x V1____||____U0 x V0_____|
-        * Put result in upper part of PROD and pass low part of TSPACE
-        * as new TSPACE.
-        */
-       MPN_MUL_N_RECURSE(prodp + size, up + hsize, vp + hsize, hsize, tspace);
-
-       /* Product M.      ________________
-        *                |_(U1-U0)(V0-V1)_|
-        */
-       if( mpihelp_cmp(up + hsize, up, hsize) >= 0 ) {
-           mpihelp_sub_n(prodp, up + hsize, up, hsize);
-           negflg = 0;
-       }
-       else {
-           mpihelp_sub_n(prodp, up, up + hsize, hsize);
-           negflg = 1;
-       }
-       if( mpihelp_cmp(vp + hsize, vp, hsize) >= 0 ) {
-           mpihelp_sub_n(prodp + hsize, vp + hsize, vp, hsize);
-           negflg ^= 1;
-       }
-       else {
-           mpihelp_sub_n(prodp + hsize, vp, vp + hsize, hsize);
-           /* No change of NEGFLG.  */
-       }
-       /* Read temporary operands from low part of PROD.
-        * Put result in low part of TSPACE using upper part of TSPACE
-        * as new TSPACE.
-        */
-       MPN_MUL_N_RECURSE(tspace, prodp, prodp + hsize, hsize, tspace + size);
-
-       /* Add/copy product H. */
-       MPN_COPY (prodp + hsize, prodp + size, hsize);
-       cy = mpihelp_add_n( prodp + size, prodp + size,
-                           prodp + size + hsize, hsize);
-
-       /* Add product M (if NEGFLG M is a negative number) */
-       if(negflg)
-           cy -= mpihelp_sub_n(prodp + hsize, prodp + hsize, tspace, size);
-       else
-           cy += mpihelp_add_n(prodp + hsize, prodp + hsize, tspace, size);
-
-       /* Product L.      ________________  ________________
-        *                |________________||____U0 x V0_____|
-        * Read temporary operands from low part of PROD.
-        * Put result in low part of TSPACE using upper part of TSPACE
-        * as new TSPACE.
-        */
-       MPN_MUL_N_RECURSE(tspace, up, vp, hsize, tspace + size);
-
-       /* Add/copy Product L (twice) */
-
-       cy += mpihelp_add_n(prodp + hsize, prodp + hsize, tspace, size);
-       if( cy )
-         mpihelp_add_1(prodp + hsize + size, prodp + hsize + size, hsize, cy);
-
-       MPN_COPY(prodp, tspace, hsize);
-       cy = mpihelp_add_n(prodp + hsize, prodp + hsize, tspace + hsize, hsize);
-       if( cy )
-           mpihelp_add_1(prodp + size, prodp + size, size, 1);
-    }
-}
-
-
-void
-mpih_sqr_n_basecase( mpi_ptr_t prodp, mpi_ptr_t up, mpi_size_t size )
-{
-    mpi_size_t i;
-    mpi_limb_t cy_limb;
-    mpi_limb_t v_limb;
-
-    /* Multiply by the first limb in V separately, as the result can be
-     * stored (not added) to PROD.  We also avoid a loop for zeroing.  */
-    v_limb = up[0];
-    if( v_limb <= 1 ) {
-       if( v_limb == 1 )
-           MPN_COPY( prodp, up, size );
-       else
-           MPN_ZERO(prodp, size);
-       cy_limb = 0;
-    }
-    else
-       cy_limb = mpihelp_mul_1( prodp, up, size, v_limb );
-
-    prodp[size] = cy_limb;
-    prodp++;
-
-    /* For each iteration in the outer loop, multiply one limb from
-     * U with one limb from V, and add it to PROD.  */
-    for( i=1; i < size; i++) {
-       v_limb = up[i];
-       if( v_limb <= 1 ) {
-           cy_limb = 0;
-           if( v_limb == 1 )
-               cy_limb = mpihelp_add_n(prodp, prodp, up, size);
-       }
-       else
-           cy_limb = mpihelp_addmul_1(prodp, up, size, v_limb);
-
-       prodp[size] = cy_limb;
-       prodp++;
-    }
-}
-
-
-void
-mpih_sqr_n( mpi_ptr_t prodp, mpi_ptr_t up, mpi_size_t size, mpi_ptr_t tspace)
-{
-    if( size & 1 ) {
-       /* The size is odd, and the code below doesn't handle that.
-        * Multiply the least significant (size - 1) limbs with a recursive
-        * call, and handle the most significant limb of S1 and S2
-        * separately.
-        * A slightly faster way to do this would be to make the Karatsuba
-        * code below behave as if the size were even, and let it check for
-        * odd size in the end.  I.e., in essence move this code to the end.
-        * Doing so would save us a recursive call, and potentially make the
-        * stack grow a lot less.
-        */
-       mpi_size_t esize = size - 1;       /* even size */
-       mpi_limb_t cy_limb;
-
-       MPN_SQR_N_RECURSE( prodp, up, esize, tspace );
-       cy_limb = mpihelp_addmul_1( prodp + esize, up, esize, up[esize] );
-       prodp[esize + esize] = cy_limb;
-       cy_limb = mpihelp_addmul_1( prodp + esize, up, size, up[esize] );
-
-       prodp[esize + size] = cy_limb;
-    }
-    else {
-       mpi_size_t hsize = size >> 1;
-       mpi_limb_t cy;
-
-       /* Product H.      ________________  ________________
-        *                |_____U1 x U1____||____U0 x U0_____|
-        * Put result in upper part of PROD and pass low part of TSPACE
-        * as new TSPACE.
-        */
-       MPN_SQR_N_RECURSE(prodp + size, up + hsize, hsize, tspace);
-
-       /* Product M.      ________________
-        *                |_(U1-U0)(U0-U1)_|
-        */
-       if( mpihelp_cmp( up + hsize, up, hsize) >= 0 )
-           mpihelp_sub_n( prodp, up + hsize, up, hsize);
-       else
-           mpihelp_sub_n (prodp, up, up + hsize, hsize);
-
-       /* Read temporary operands from low part of PROD.
-        * Put result in low part of TSPACE using upper part of TSPACE
-        * as new TSPACE.  */
-       MPN_SQR_N_RECURSE(tspace, prodp, hsize, tspace + size);
-
-       /* Add/copy product H  */
-       MPN_COPY(prodp + hsize, prodp + size, hsize);
-       cy = mpihelp_add_n(prodp + size, prodp + size,
-                          prodp + size + hsize, hsize);
-
-       /* Add product M (if NEGFLG M is a negative number).  */
-       cy -= mpihelp_sub_n (prodp + hsize, prodp + hsize, tspace, size);
-
-       /* Product L.      ________________  ________________
-        *                |________________||____U0 x U0_____|
-        * Read temporary operands from low part of PROD.
-        * Put result in low part of TSPACE using upper part of TSPACE
-        * as new TSPACE.  */
-       MPN_SQR_N_RECURSE (tspace, up, hsize, tspace + size);
-
-       /* Add/copy Product L (twice).  */
-       cy += mpihelp_add_n (prodp + hsize, prodp + hsize, tspace, size);
-       if( cy )
-           mpihelp_add_1(prodp + hsize + size, prodp + hsize + size,
-                                                           hsize, cy);
-
-       MPN_COPY(prodp, tspace, hsize);
-       cy = mpihelp_add_n (prodp + hsize, prodp + hsize, tspace + hsize, hsize);
-       if( cy )
-           mpihelp_add_1 (prodp + size, prodp + size, size, 1);
-    }
-}
-
-
-/* This should be made into an inline function in gmp.h.  */
-int
-mpihelp_mul_n( mpi_ptr_t prodp, mpi_ptr_t up, mpi_ptr_t vp, mpi_size_t size)
-{
-    if( up == vp ) {
-       if( size < KARATSUBA_THRESHOLD )
-           mpih_sqr_n_basecase( prodp, up, size );
-       else {
-           mpi_ptr_t tspace;
-           tspace = mpi_alloc_limb_space( 2 * size );
-           if (!tspace)
-                   return -ENOMEM;
-           mpih_sqr_n( prodp, up, size, tspace );
-           mpi_free_limb_space( tspace );
-       }
-    }
-    else {
-       if( size < KARATSUBA_THRESHOLD )
-           mul_n_basecase( prodp, up, vp, size );
-       else {
-           mpi_ptr_t tspace;
-           tspace = mpi_alloc_limb_space( 2 * size );
-           if (!tspace)
-                   return -ENOMEM;
-           mul_n (prodp, up, vp, size, tspace);
-           mpi_free_limb_space( tspace );
-       }
-    }
-
-    return 0;
-}
-
-
-
-int
-mpihelp_mul_karatsuba_case( mpi_ptr_t prodp,
-                           mpi_ptr_t up, mpi_size_t usize,
-                           mpi_ptr_t vp, mpi_size_t vsize,
-                           struct karatsuba_ctx *ctx )
-{
-    mpi_limb_t cy;
-
-    if( !ctx->tspace || ctx->tspace_size < vsize ) {
-       if( ctx->tspace )
-           mpi_free_limb_space( ctx->tspace );
-       ctx->tspace = mpi_alloc_limb_space( 2 * vsize);
-       if (!ctx->tspace)
-               return -ENOMEM;
-       ctx->tspace_size = vsize;
-    }
-
-    MPN_MUL_N_RECURSE( prodp, up, vp, vsize, ctx->tspace );
-
-    prodp += vsize;
-    up += vsize;
-    usize -= vsize;
-    if( usize >= vsize ) {
-       if( !ctx->tp || ctx->tp_size < vsize ) {
-           if( ctx->tp )
-               mpi_free_limb_space( ctx->tp );
-           ctx->tp = mpi_alloc_limb_space( 2 * vsize );
-           if (!ctx->tp) {
-                   if( ctx->tspace )
-                           mpi_free_limb_space( ctx->tspace );
-                   ctx->tspace = NULL;
-                   return -ENOMEM;
-           }
-           ctx->tp_size = vsize;
-       }
-
-       do {
-           MPN_MUL_N_RECURSE( ctx->tp, up, vp, vsize, ctx->tspace );
-           cy = mpihelp_add_n( prodp, prodp, ctx->tp, vsize );
-           mpihelp_add_1( prodp + vsize, ctx->tp + vsize, vsize, cy );
-           prodp += vsize;
-           up += vsize;
-           usize -= vsize;
-       } while( usize >= vsize );
-    }
-
-    if( usize ) {
-       if( usize < KARATSUBA_THRESHOLD ) {
-               mpi_limb_t tmp;
-               if (mpihelp_mul( ctx->tspace, vp, vsize, up, usize, &tmp) < 0)
-                       return -ENOMEM;
-       }
-       else {
-           if( !ctx->next ) {
-               ctx->next = kmalloc( sizeof *ctx, GFP_KERNEL );
-               if (!ctx->next)
-                       return -ENOMEM;
-               memset(ctx->next, 0, sizeof(ctx));
-           }
-           if (mpihelp_mul_karatsuba_case( ctx->tspace,
-                                           vp, vsize,
-                                           up, usize,
-                                           ctx->next ) < 0)
-                   return -ENOMEM;
-       }
-
-       cy = mpihelp_add_n( prodp, prodp, ctx->tspace, vsize);
-       mpihelp_add_1( prodp + vsize, ctx->tspace + vsize, usize, cy );
-    }
-
-    return 0;
-}
-
-
-void
-mpihelp_release_karatsuba_ctx( struct karatsuba_ctx *ctx )
-{
-    struct karatsuba_ctx *ctx2;
-
-    if( ctx->tp )
-       mpi_free_limb_space( ctx->tp );
-    if( ctx->tspace )
-       mpi_free_limb_space( ctx->tspace );
-    for( ctx=ctx->next; ctx; ctx = ctx2 ) {
-       ctx2 = ctx->next;
-       if( ctx->tp )
-           mpi_free_limb_space( ctx->tp );
-       if( ctx->tspace )
-           mpi_free_limb_space( ctx->tspace );
-       kfree( ctx );
-    }
-}
-
-/* Multiply the natural numbers u (pointed to by UP, with USIZE limbs)
- * and v (pointed to by VP, with VSIZE limbs), and store the result at
- * PRODP.  USIZE + VSIZE limbs are always stored, but if the input
- * operands are normalized.  Return the most significant limb of the
- * result.
- *
- * NOTE: The space pointed to by PRODP is overwritten before finished
- * with U and V, so overlap is an error.
- *
- * Argument constraints:
- * 1. USIZE >= VSIZE.
- * 2. PRODP != UP and PRODP != VP, i.e. the destination
- *    must be distinct from the multiplier and the multiplicand.
- */
-
-int
-mpihelp_mul( mpi_ptr_t prodp, mpi_ptr_t up, mpi_size_t usize,
-            mpi_ptr_t vp, mpi_size_t vsize,
-            mpi_limb_t *_result)
-{
-    mpi_ptr_t prod_endp = prodp + usize + vsize - 1;
-    mpi_limb_t cy;
-    struct karatsuba_ctx ctx;
-
-    if( vsize < KARATSUBA_THRESHOLD ) {
-       mpi_size_t i;
-       mpi_limb_t v_limb;
-
-       if( !vsize ) {
-               *_result = 0;
-               return 0;
-       }
-
-       /* Multiply by the first limb in V separately, as the result can be
-        * stored (not added) to PROD.  We also avoid a loop for zeroing.  */
-       v_limb = vp[0];
-       if( v_limb <= 1 ) {
-           if( v_limb == 1 )
-               MPN_COPY( prodp, up, usize );
-           else
-               MPN_ZERO( prodp, usize );
-           cy = 0;
-       }
-       else
-           cy = mpihelp_mul_1( prodp, up, usize, v_limb );
-
-       prodp[usize] = cy;
-       prodp++;
-
-       /* For each iteration in the outer loop, multiply one limb from
-        * U with one limb from V, and add it to PROD.  */
-       for( i = 1; i < vsize; i++ ) {
-           v_limb = vp[i];
-           if( v_limb <= 1 ) {
-               cy = 0;
-               if( v_limb == 1 )
-                  cy = mpihelp_add_n(prodp, prodp, up, usize);
-           }
-           else
-               cy = mpihelp_addmul_1(prodp, up, usize, v_limb);
-
-           prodp[usize] = cy;
-           prodp++;
-       }
-
-       *_result = cy;
-       return 0;
-    }
-
-    memset( &ctx, 0, sizeof ctx );
-    if (mpihelp_mul_karatsuba_case( prodp, up, usize, vp, vsize, &ctx ) < 0)
-           return -ENOMEM;
-    mpihelp_release_karatsuba_ctx( &ctx );
-    *_result = *prod_endp;
-    return 0;
-}
-
-
diff --git a/crypto/mpi/mpiutil.c b/crypto/mpi/mpiutil.c
deleted file mode 100644 (file)
index 5bec431..0000000
+++ /dev/null
@@ -1,214 +0,0 @@
-/* mpiutil.ac  -  Utility functions for MPI
- * Copyright (C) 1998, 1999 Free Software Foundation, Inc.
- *
- * This file is part of GnuPG.
- *
- * GnuPG 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.
- *
- * GnuPG 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 "mpi-internal.h"
-
-
-/****************
- * Note:  It was a bad idea to use the number of limbs to allocate
- *       because on a alpha the limbs are large but we normally need
- *       integers of n bits - So we should chnage this to bits (or bytes).
- *
- *       But mpi_alloc is used in a lot of places :-)
- */
-MPI mpi_alloc(unsigned nlimbs)
-{
-       MPI a;
-
-       a = (MPI) kmalloc(sizeof *a,GFP_KERNEL);
-       if (!a)
-               return a;
-
-       if (nlimbs) {
-               a->d = mpi_alloc_limb_space(nlimbs);
-               if (!a->d) {
-                       kfree(a);
-                       return NULL;
-               }
-       }
-       else {
-               a->d = NULL;
-       }
-
-       a->alloced = nlimbs;
-       a->nlimbs = 0;
-       a->sign = 0;
-       a->flags = 0;
-       a->nbits = 0;
-       return a;
-}
-
-mpi_ptr_t mpi_alloc_limb_space( unsigned nlimbs )
-{
-    size_t len = nlimbs * sizeof(mpi_limb_t);
-
-    return kmalloc(len,GFP_KERNEL);
-}
-
-void mpi_free_limb_space( mpi_ptr_t a )
-{
-    if( !a )
-       return;
-
-    kfree(a);
-}
-
-
-void mpi_assign_limb_space(MPI a, mpi_ptr_t ap, unsigned nlimbs)
-{
-    mpi_free_limb_space(a->d);
-    a->d = ap;
-    a->alloced = nlimbs;
-}
-
-/****************
- * Resize the array of A to NLIMBS. the additional space is cleared
- * (set to 0) [done by m_realloc()]
- */
-int mpi_resize(MPI a, unsigned nlimbs)
-{
-       void *p;
-
-       if (nlimbs <= a->alloced)
-               return 0; /* no need to do it */
-
-       if (a->d) {
-               p = kmalloc(nlimbs * sizeof(mpi_limb_t), GFP_KERNEL);
-               if (!p)
-                       return -ENOMEM;
-               memcpy(p, a->d, a->alloced * sizeof(mpi_limb_t));
-               kfree(a->d);
-               a->d = p;
-       } else {
-               a->d = kmalloc( nlimbs * sizeof(mpi_limb_t), GFP_KERNEL);
-               if (!a->d)
-                       return -ENOMEM;
-               memset(a->d, 0, nlimbs * sizeof(mpi_limb_t) );
-       }
-       a->alloced = nlimbs;
-       return 0;
-}
-
-void mpi_clear(MPI a)
-{
-       a->nlimbs = 0;
-       a->nbits = 0;
-       a->flags = 0;
-}
-
-void mpi_free(MPI a)
-{
-       if (!a)
-               return;
-
-       if (a->flags & 4)
-               kfree(a->d);
-       else {
-               mpi_free_limb_space(a->d);
-       }
-
-       if (a->flags & ~7 )
-               printk("invalid flag value in mpi\n");
-       kfree(a);
-}
-
-
-/****************
- * Note: This copy function should not interpret the MPI
- *      but copy it transparently.
- */
-int mpi_copy(MPI *copied, const MPI a )
-{
-       size_t i;
-       MPI b;
-
-       *copied = MPI_NULL;
-
-       if ( a ) {
-               b = mpi_alloc( a->nlimbs );
-               if (!b)
-                       return -ENOMEM;
-
-               b->nlimbs = a->nlimbs;
-               b->sign = a->sign;
-               b->flags  = a->flags;
-               b->nbits = a->nbits;
-
-               for (i = 0; i < b->nlimbs; i++ )
-                       b->d[i] = a->d[i];
-
-               *copied = b;
-       }
-
-       return 0;
-}
-
-
-int mpi_set(MPI w, const MPI u)
-{
-       mpi_ptr_t wp, up;
-       mpi_size_t usize = u->nlimbs;
-       int usign = u->sign;
-
-       if (RESIZE_IF_NEEDED(w, (size_t) usize) < 0)
-               return -ENOMEM;
-
-       wp = w->d;
-       up = u->d;
-       MPN_COPY(wp, up, usize);
-       w->nlimbs = usize;
-       w->nbits = u->nbits;
-       w->flags = u->flags;
-       w->sign = usign;
-       return 0;
-}
-
-
-int mpi_set_ui(MPI w, unsigned long u)
-{
-       if (RESIZE_IF_NEEDED(w, 1) < 0)
-               return -ENOMEM;
-       w->d[0] = u;
-       w->nlimbs = u? 1:0;
-       w->sign = 0;
-       w->nbits = 0;
-       w->flags = 0;
-       return 0;
-}
-
-MPI mpi_alloc_set_ui(unsigned long u)
-{
-       MPI w = mpi_alloc(1);
-       if (!w)
-               return w;
-       w->d[0] = u;
-       w->nlimbs = u? 1:0;
-       w->sign = 0;
-       return w;
-}
-
-
-void mpi_swap(MPI a, MPI b)
-{
-       struct gcry_mpi tmp;
-
-       tmp = *a; *a = *b; *b = tmp;
-}
-
diff --git a/crypto/signature/Makefile b/crypto/signature/Makefile
deleted file mode 100644 (file)
index 4d1042e..0000000
+++ /dev/null
@@ -1,10 +0,0 @@
-#
-# Makefile for the signature checker
-#
-
-obj-y := \
-       ksign.o \
-       ksign-parse.o \
-       ksign-keyring.o \
-       ksign-publickey.o \
-       dsa.o
diff --git a/crypto/signature/dsa.c b/crypto/signature/dsa.c
deleted file mode 100644 (file)
index 5b5c736..0000000
+++ /dev/null
@@ -1,98 +0,0 @@
-/* dsa.c  -  DSA signature algorithm
- *     Copyright (C) 1998, 1999, 2000 Free Software Foundation, Inc.
- *
- * This file is part of GnuPG.
- *
- * GnuPG 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.
- *
- * GnuPG 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/crypto/mpi.h>
-#include <asm/errno.h>
-#include "local.h"
-
-/*****************************************************************************/
-/*
- * perform DSA algorithm signature verification
- */
-int DSA_verify(const MPI datahash, const MPI sig[], const MPI pkey[])
-{
-       MPI p, q, g, y, r, s;
-       MPI w = NULL, u1 = NULL, u2 = NULL, v = NULL;
-       MPI base[3];
-       MPI exp[3];
-       int rc;
-
-       if (!datahash ||
-           !sig[0] || !sig[1] ||
-           !pkey[0] || !pkey[1] || !pkey[2] || !pkey[3]
-           )
-               return -EINVAL;
-
-       p = pkey[0];    /* prime */
-       q = pkey[1];    /* group order */
-       g = pkey[2];    /* group generator */
-       y = pkey[3];    /* g^x mod p */
-       r = sig[0];
-       s = sig[1];
-
-       if (!(mpi_cmp_ui(r, 0) > 0 && mpi_cmp(r, q) < 0)) {
-               printk("DSA_verify assertion failed [0 < r < q]\n");
-               return -EPERM;
-       }
-
-       if (!(mpi_cmp_ui(s, 0) > 0 && mpi_cmp(s, q) < 0)) {
-               printk("DSA_verify assertion failed [0 < s < q]\n");
-               return -EPERM;
-       }
-
-       rc = -ENOMEM;
-       w  = mpi_alloc(mpi_get_nlimbs(q)); if (!w ) goto cleanup;
-       u1 = mpi_alloc(mpi_get_nlimbs(q)); if (!u1) goto cleanup;
-       u2 = mpi_alloc(mpi_get_nlimbs(q)); if (!u2) goto cleanup;
-       v  = mpi_alloc(mpi_get_nlimbs(p)); if (!v ) goto cleanup;
-
-       /* w = s^(-1) mod q */
-       if (mpi_invm(w, s, q) < 0)
-               goto cleanup;
-
-       /* u1 = (datahash * w) mod q */
-       if (mpi_mulm(u1, datahash, w, q) < 0)
-               goto cleanup;
-
-       /* u2 = r * w mod q  */
-       if (mpi_mulm(u2, r, w, q) < 0)
-               goto cleanup;
-
-       /* v =  g^u1 * y^u2 mod p mod q */
-       base[0] = g;    exp[0] = u1;
-       base[1] = y;    exp[1] = u2;
-       base[2] = NULL; exp[2] = NULL;
-
-       if (mpi_mulpowm(v, base, exp, p) < 0)
-               goto cleanup;
-
-       if (mpi_fdiv_r(v, v, q) < 0)
-               goto cleanup;
-
-       rc = mpi_cmp(v, r) == 0 ? 0 : -EPERM;
-
- cleanup:
-       mpi_free(w);
-       mpi_free(u1);
-       mpi_free(u2);
-       mpi_free(v);
-       return rc;
-} /* end DSA_verify() */
diff --git a/crypto/signature/key.h b/crypto/signature/key.h
deleted file mode 100644 (file)
index a1ecccb..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-
-/* automatically generated by bin2hex */
-static unsigned char ksign_def_public_key[] __initdata =
-{
-       0x00, 0x09, 0x00, 0x00, 0x00, 0x00
-};
-
diff --git a/crypto/signature/ksign-keyring.c b/crypto/signature/ksign-keyring.c
deleted file mode 100644 (file)
index a1bbd85..0000000
+++ /dev/null
@@ -1,112 +0,0 @@
-/* ksign-keyring.c: public key cache
- *
- * Copyright (C) 2001 Red Hat, Inc. All Rights Reserved.
- * Written by David Howells (dhowells@redhat.com)
- *
- * This file is derived from part of GnuPG.
- *
- * GnuPG 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.
- *
- * GnuPG 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/rwsem.h>
-#include "local.h"
-
-static LIST_HEAD(keyring);
-static DECLARE_RWSEM(keyring_sem);
-
-static int add_keyblock_key(struct ksign_public_key *pk, void *data)
-{
-       printk("- Added public key %X%X\n", pk->keyid[0], pk->keyid[1]);
-
-       if (pk->expiredate && pk->expiredate < xtime.tv_sec)
-               printk("  - public key has expired\n");
-
-       if (pk->timestamp > xtime.tv_sec )
-               printk("  - key was been created %lu seconds in future\n",
-                      pk->timestamp - xtime.tv_sec);
-
-       atomic_inc(&pk->count);
-
-       down_write(&keyring_sem);
-       list_add_tail(&pk->link, &keyring);
-       up_write(&keyring_sem);
-
-       return 0;
-}
-
-static int add_keyblock_uid(struct ksign_user_id *uid, void *data)
-{
-       printk("- User ID: %s\n", uid->name);
-       return 1;
-}
-
-/*****************************************************************************/
-/*
- *
- */
-int ksign_load_keyring_from_buffer(const void *buffer, size_t size)
-{
-    printk("Loading keyring\n");
-
-    return ksign_parse_packets((const uint8_t *) buffer,
-                              size,
-                              NULL,
-                              add_keyblock_key,
-                              add_keyblock_uid,
-                              NULL);
-} /* end ksign_load_keyring_from_buffer() */
-
-/*****************************************************************************/
-/*
- *
- */
-struct ksign_public_key *ksign_get_public_key(const uint32_t *keyid)
-{
-       struct ksign_public_key *pk;
-
-       down_read(&keyring_sem);
-
-       list_for_each_entry(pk, &keyring, link) {
-               if (memcmp(pk->keyid, keyid, sizeof(pk->keyid)) == 0) {
-                       atomic_inc(&pk->count);
-                       goto found;
-               }
-       }
-
- found:
-       up_read(&keyring_sem);
-
-       return pk;
-} /* end ksign_get_public_key() */
-
-/*****************************************************************************/
-/*
- * clear the public key keyring
- */
-void ksign_clear_keyring(void)
-{
-       struct ksign_public_key *pk;
-
-       down_write(&keyring_sem);
-
-       while (!list_empty(&keyring)) {
-               pk = list_entry(keyring.next, struct ksign_public_key, link);
-               list_del(&pk->link);
-
-               ksign_put_public_key(pk);
-       }
-
-       up_write(&keyring_sem);
-} /* end ksign_clear_keyring() */
diff --git a/crypto/signature/ksign-parse.c b/crypto/signature/ksign-parse.c
deleted file mode 100644 (file)
index acc2d1f..0000000
+++ /dev/null
@@ -1,609 +0,0 @@
-/* parse-packet.c  - read packets
- * Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
- *
- * This file is part of GnuPG.
- *
- * GnuPG 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.
- *
- * GnuPG 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/slab.h>
-#include <asm/errno.h>
-#include "local.h"
-
-static inline uint32_t buffer_to_u32(const uint8_t *buffer)
-{
-       uint32_t a;
-       a =  *buffer << 24;
-       a |= buffer[1] << 16;
-       a |= buffer[2] << 8;
-       a |= buffer[3];
-       return a;
-}
-
-static inline uint16_t read_16(const uint8_t **datap)
-{
-       uint16_t a;
-       a = *(*datap)++ << 8;
-       a |= *(*datap)++;
-       return a;
-}
-
-static inline uint32_t read_32(const uint8_t **datap)
-{
-       uint32_t a;
-       a =  *(*datap)++ << 24;
-       a |= *(*datap)++ << 16;
-       a |= *(*datap)++ << 8;
-       a |= *(*datap)++;
-       return a;
-}
-
-void ksign_free_signature(struct ksign_signature *sig)
-{
-       int i;
-
-       if (!sig)
-               return;
-
-       for (i = 0; i < DSA_NSIG; i++)
-               mpi_free(sig->data[i]);
-       kfree(sig->hashed_data);
-       kfree(sig->unhashed_data);
-       kfree(sig);
-}
-
-void ksign_free_public_key(struct ksign_public_key *pk)
-{
-       int i;
-
-       if (pk) {
-               for (i = 0; i < DSA_NPKEY; i++)
-                       mpi_free(pk->pkey[i]);
-               kfree(pk);
-       }
-}
-
-void ksign_free_user_id(struct ksign_user_id *uid)
-{
-       if (uid)
-               kfree(uid);
-}
-
-/*****************************************************************************/
-/*
- *
- */
-static void ksign_calc_pk_keyid(struct crypto_tfm *sha1,
-                               struct ksign_public_key *pk)
-{
-       unsigned n;
-       unsigned nb[DSA_NPKEY];
-       unsigned nn[DSA_NPKEY];
-       uint8_t *pp[DSA_NPKEY];
-       uint32_t a32;
-       int i;
-       int npkey = DSA_NPKEY;
-
-       crypto_digest_init(sha1);
-
-       n = pk->version < 4 ? 8 : 6;
-       for (i = 0; i < npkey; i++) {
-               nb[i] = mpi_get_nbits(pk->pkey[i]);
-               pp[i] = mpi_get_buffer( pk->pkey[i], nn + i, NULL);
-               n += 2 + nn[i];
-       }
-
-       SHA1_putc(sha1, 0x99);     /* ctb */
-       SHA1_putc(sha1, n >> 8);   /* 2 uint8_t length header */
-       SHA1_putc(sha1, n);
-
-       if( pk->version < 4)
-               SHA1_putc(sha1, 3);
-       else
-               SHA1_putc(sha1, 4);
-
-       a32 = pk->timestamp;
-       SHA1_putc(sha1, a32 >> 24 );
-       SHA1_putc(sha1, a32 >> 16 );
-       SHA1_putc(sha1, a32 >>  8 );
-       SHA1_putc(sha1, a32 >>  0 );
-
-       if (pk->version < 4) {
-               uint16_t a16;
-
-               if( pk->expiredate )
-                       a16 = (uint16_t) ((pk->expiredate - pk->timestamp) / 86400L);
-               else
-                       a16 = 0;
-               SHA1_putc(sha1, a16 >> 8);
-               SHA1_putc(sha1, a16 >> 0);
-       }
-
-       SHA1_putc(sha1, PUBKEY_ALGO_DSA);
-
-       for (i = 0; i < npkey; i++) {
-               SHA1_putc(sha1, nb[i] >> 8);
-               SHA1_putc(sha1, nb[i]);
-               SHA1_write(sha1, pp[i], nn[i]);
-               kfree(pp[i]);
-       }
-
-} /* end ksign_calc_pk_keyid() */
-
-/*****************************************************************************/
-/*
- * parse a user ID embedded in a signature
- */
-static int ksign_parse_user_id(const uint8_t *datap, const uint8_t *endp,
-                              ksign_user_id_actor_t uidfnx, void *fnxdata)
-{
-       struct ksign_user_id *uid;
-       int rc = 0;
-       int n;
-
-       if (!uidfnx)
-               return 0;
-
-       n = endp - datap;
-       uid = kmalloc(sizeof(*uid) + n + 1, GFP_KERNEL);
-       if (!uid)
-               return -ENOMEM;
-       uid->len = n;
-
-       memcpy(uid->name, datap, n);
-       uid->name[n] = 0;
-
-       rc = uidfnx(uid, fnxdata);
-       if (rc == 0)
-               return rc; /* uidfnx keeps the record */
-       if (rc == 1)
-               rc = 0;
-
-       ksign_free_user_id(uid);
-       return rc;
-} /* end ksign_parse_user_id() */
-
-/*****************************************************************************/
-/*
- * extract a public key embedded in a signature
- */
-static int ksign_parse_key(const uint8_t *datap, const uint8_t *endp,
-                          uint8_t *hdr, int hdrlen,
-                          ksign_public_key_actor_t pkfnx, void *fnxdata)
-{
-       struct ksign_public_key *pk;
-       struct crypto_tfm *sha1_tfm;
-       unsigned long timestamp, expiredate;
-       uint8_t sha1[SHA1_DIGEST_SIZE];
-       int i, version;
-       int is_v4 = 0;
-       int rc = 0;
-
-       if (endp - datap < 12) {
-               printk("ksign: public key packet too short\n");
-               return -EBADMSG;
-       }
-
-       version = *datap++;
-       switch (version) {
-       case 4:
-               is_v4 = 1;
-       case 2:
-       case 3:
-               break;
-       default:
-               printk("ksign: public key packet with unknown version %d\n",
-                      version);
-               return -EBADMSG;
-       }
-
-       timestamp = read_32(&datap);
-       if (is_v4)
-               expiredate = 0; /* have to get it from the selfsignature */
-       else {
-               unsigned short ndays;
-               ndays = read_16(&datap);
-               if (ndays)
-                       expiredate = timestamp + ndays * 86400L;
-               else
-                       expiredate = 0;
-       }
-
-       if (*datap++ != PUBKEY_ALGO_DSA) {
-               printk("ksign: public key packet with unknown version %d\n",
-                      version);
-               return 0;
-       }
-
-       /* extract the stuff from the DSA public key */
-       pk = kmalloc(sizeof(struct ksign_public_key), GFP_KERNEL);
-       if (!pk)
-               return -ENOMEM;
-
-       memset(pk, 0, sizeof(struct ksign_public_key));
-       atomic_set(&pk->count, 1);
-       pk->timestamp   = timestamp;
-       pk->expiredate  = expiredate;
-       pk->hdrbytes    = hdrlen;
-       pk->version     = version;
-
-       for (i = 0; i < DSA_NPKEY; i++) {
-               unsigned int remaining = endp - datap;
-               pk->pkey[i] = mpi_read_from_buffer(datap, &remaining);
-               datap += remaining;
-       }
-
-       rc = -ENOMEM;
-
-       sha1_tfm = crypto_alloc_tfm2("sha1", 0, 1);
-       if (!sha1_tfm)
-               goto cleanup;
-
-       ksign_calc_pk_keyid(sha1_tfm, pk);
-       crypto_digest_final(sha1_tfm, sha1);
-       crypto_free_tfm(sha1_tfm);
-
-       pk->keyid[0] = sha1[12] << 24 | sha1[13] << 16 | sha1[14] << 8 | sha1[15];
-       pk->keyid[1] = sha1[16] << 24 | sha1[17] << 16 | sha1[18] << 8 | sha1[19];
-
-       rc = 0;
-       if (pkfnx)
-               rc = pkfnx(pk, fnxdata);
-
- cleanup:
-       ksign_put_public_key(pk);
-       return rc;
-} /* end ksign_parse_key() */
-
-/*****************************************************************************/
-/*
- *
- */
-static const uint8_t *ksign_find_sig_issuer(const uint8_t *buffer)
-{
-       size_t buflen;
-       size_t n;
-       int type;
-       int seq = 0;
-
-       if (!buffer)
-               return NULL;
-
-       buflen = read_16(&buffer);
-       while (buflen) {
-               n = *buffer++; buflen--;
-               if (n == 255) {
-                       if (buflen < 4)
-                               goto too_short;
-                       n = read_32(&buffer);
-                       buflen -= 4;
-               }
-               else if (n >= 192) {
-                       if(buflen < 2)
-                               goto too_short;
-                       n = ((n - 192) << 8) + *buffer + 192;
-                       buffer++;
-                       buflen--;
-               }
-
-               if (buflen < n)
-                       goto too_short;
-
-               type = *buffer & 0x7f;
-               if (!(++seq > 0))
-                       ;
-               else if (type == SIGSUBPKT_ISSUER) { /* found */
-                       buffer++;
-                       n--;
-                       if (n > buflen || n < 8)
-                               goto too_short;
-                       return buffer;
-               }
-
-               buffer += n;
-               buflen -= n;
-       }
-
- too_short:
-       return NULL; /* end of subpackets; not found */
-} /* end ksign_find_sig_issuer() */
-
-/*****************************************************************************/
-/*
- * extract signature data embedded in a signature
- */
-static int ksign_parse_signature(const uint8_t *datap, const uint8_t *endp,
-                                ksign_signature_actor_t sigfnx, void *fnxdata)
-{
-       struct ksign_signature *sig;
-       size_t n;
-       int version, is_v4 = 0;
-       int rc;
-       int i;
-
-       if (endp - datap < 16) {
-               printk("ksign: signature packet too short\n");
-               return -EBADMSG;
-       }
-
-       version = *datap++;
-       switch (version) {
-       case 4:
-               is_v4 = 1;
-       case 3:
-       case 2:
-               break;
-       default:
-               printk("ksign: signature packet with unknown version %d\n", version);
-               return 0;
-       }
-
-       /* store information */
-       sig = kmalloc(sizeof(*sig), GFP_KERNEL);
-       if (!sig)
-               return -ENOMEM;
-
-       memset(sig, 0, sizeof(*sig));
-       sig->version = version;
-
-       if (!is_v4)
-               datap++; /* ignore md5 length */
-
-       sig->sig_class = *datap++;
-       if (!is_v4) {
-               sig->timestamp = read_32(&datap);
-               sig->keyid[0] = read_32(&datap);
-               sig->keyid[1] = read_32(&datap);
-       }
-
-       rc = 0;
-       if (*datap++ != PUBKEY_ALGO_DSA) {
-               printk("ksign: ignoring non-DSA signature\n");
-               goto leave;
-       }
-       if (*datap++ != DIGEST_ALGO_SHA1) {
-               printk("ksign: ignoring non-SHA1 signature\n");
-               goto leave;
-       }
-
-       rc = -EBADMSG;
-       if (is_v4) { /* read subpackets */
-               n = read_16(&datap); /* length of hashed data */
-               if (n > 10000) {
-                       printk("ksign: signature packet: hashed data too long\n");
-                       goto leave;
-               }
-               if (n) {
-                       if ((size_t)(endp - datap) < n) {
-                               printk("ksign: signature packet: available data too short\n");
-                               goto leave;
-                       }
-                       sig->hashed_data = kmalloc(n + 2, GFP_KERNEL);
-                       if (!sig->hashed_data) {
-                               rc = -ENOMEM;
-                               goto leave;
-                       }
-                       sig->hashed_data[0] = n >> 8;
-                       sig->hashed_data[1] = n;
-                       memcpy(sig->hashed_data + 2, datap, n);
-                       datap += n;
-               }
-
-               n = read_16(&datap); /* length of unhashed data */
-               if (n > 10000) {
-                       printk("ksign: signature packet: unhashed data too long\n");
-                       goto leave;
-               }
-               if (n) {
-                       if ((size_t) (endp - datap) < n) {
-                               printk("ksign: signature packet: available data too short\n");
-                               goto leave;
-                       }
-                       sig->unhashed_data = kmalloc(n + 2, GFP_KERNEL);
-                       if (!sig->unhashed_data) {
-                               rc = -ENOMEM;
-                               goto leave;
-                       }
-                       sig->unhashed_data[0] = n >> 8;
-                       sig->unhashed_data[1] = n;
-                       memcpy(sig->unhashed_data + 2, datap, n);
-                       datap += n;
-               }
-       }
-
-       if (endp - datap < 5) { /* sanity check */
-               printk("ksign: signature packet too short\n");
-               goto leave;
-       }
-
-       sig->digest_start[0] = *datap++;
-       sig->digest_start[1] = *datap++;
-
-       if (is_v4) {
-               const uint8_t *p;
-
-               p = ksign_find_sig_issuer(sig->hashed_data);
-               if (!p)
-                       p = ksign_find_sig_issuer(sig->unhashed_data);
-               if (!p)
-                       printk("ksign: signature packet without issuer\n");
-               else {
-                       sig->keyid[0] = buffer_to_u32(p);
-                       sig->keyid[1] = buffer_to_u32(p + 4);
-               }
-       }
-
-       for (i = 0; i < DSA_NSIG; i++) {
-               size_t remaining = endp - datap;
-               sig->data[i] = mpi_read_from_buffer(datap, &remaining);
-               datap += remaining;
-       }
-
-       rc = 0;
-       if (sigfnx) {
-               rc = sigfnx(sig, fnxdata);
-               if (rc == 0)
-                       return rc; /* sigfnx keeps the signature */
-               if (rc == 1)
-                       rc = 0;
-       }
-
- leave:
-       ksign_free_signature(sig);
-       return rc;
-} /* end ksign_parse_signature() */
-
-/*****************************************************************************/
-/*
- * parse the next packet and call appropriate handler function for known types
- * - returns:
- *     0 on EOF
- *     1 if there might be more packets
- *     -EBADMSG if the packet is in an invalid format
- *     -ve on other error
- */
-static int ksign_parse_one_packet(const uint8_t **datap,
-                                 const uint8_t *endp,
-                                 ksign_signature_actor_t sigfnx,
-                                 ksign_public_key_actor_t pkfnx,
-                                 ksign_user_id_actor_t uidfnx,
-                                 void *data)
-{
-       int rc, c, ctb, pkttype, lenuint8_ts;
-       unsigned long pktlen;
-       uint8_t hdr[8];
-       int hdrlen;
-
-       /* extract the next packet and dispatch it */
-       rc = 0;
-       if (*datap >= endp)
-               goto leave;
-       ctb = *(*datap)++;
-
-       rc = -EBADMSG;
-
-       hdrlen = 0;
-       hdr[hdrlen++] = ctb;
-       if (!(ctb & 0x80)) {
-               printk("ksign: invalid packet (ctb=%02x)\n", ctb);
-               goto leave;
-       }
-
-       pktlen = 0;
-       if (ctb & 0x40) {
-               pkttype = ctb & 0x3f;
-               if (*datap >= endp) {
-                       printk("ksign: 1st length byte missing\n");
-                       goto leave;
-               }
-               c = *(*datap)++;
-               hdr[hdrlen++] = c;
-
-               if (c < 192) {
-                       pktlen = c;
-               }
-               else if (c < 224) {
-                       pktlen = (c - 192) * 256;
-                       if (*datap >= endp) {
-                               printk("ksign: 2nd length uint8_t missing\n");
-                               goto leave;
-                       }
-                       c = *(*datap)++;
-                       hdr[hdrlen++] = c;
-                       pktlen += c + 192;
-               }
-               else if (c == 255) {
-                       if (*datap + 3 >= endp) {
-                               printk("ksign: 4 uint8_t length invalid\n");
-                               goto leave;
-                       }
-                       pktlen  = (hdr[hdrlen++] = *(*datap)++ << 24    );
-                       pktlen |= (hdr[hdrlen++] = *(*datap)++ << 16    );
-                       pktlen |= (hdr[hdrlen++] = *(*datap)++ <<  8    );
-                       pktlen |= (hdr[hdrlen++] = *(*datap)++ <<  0    );
-               }
-               else {
-                       pktlen = 0;/* to indicate partial length */
-               }
-       }
-       else {
-               pkttype = (ctb >> 2) & 0xf;
-               lenuint8_ts = ((ctb & 3) == 3) ? 0 : (1 << (ctb & 3));
-               if( !lenuint8_ts ) {
-                       pktlen = 0; /* don't know the value */
-               }
-               else {
-                       if (*datap + lenuint8_ts > endp) {
-                               printk("ksign: length uint8_ts missing\n");
-                               goto leave;
-                       }
-                       for( ; lenuint8_ts; lenuint8_ts-- ) {
-                               pktlen <<= 8;
-                               pktlen |= hdr[hdrlen++] = *(*datap)++;
-                       }
-               }
-       }
-
-       if (*datap + pktlen > endp) {
-               printk("ksign: packet length longer than available data\n");
-               goto leave;
-       }
-
-       /* deal with the next packet appropriately */
-       switch (pkttype) {
-       case PKT_PUBLIC_KEY:
-               rc = ksign_parse_key(*datap, *datap + pktlen, hdr, hdrlen, pkfnx, data);
-               break;
-       case PKT_SIGNATURE:
-               rc = ksign_parse_signature(*datap, *datap + pktlen, sigfnx, data);
-               break;
-       case PKT_USER_ID:
-               rc = ksign_parse_user_id(*datap, *datap + pktlen, uidfnx, data);
-               break;
-       default:
-               rc = 0; /* unknown packet */
-               break;
-       }
-
-       *datap += pktlen;
- leave:
-       return rc;
-} /* end ksign_parse_one_packet() */
-
-/*****************************************************************************/
-/*
- * parse the contents of a packet buffer, passing the signature, public key and
- * user ID to the caller's callback functions
- */
-int ksign_parse_packets(const uint8_t *buf,
-                       size_t size,
-                       ksign_signature_actor_t sigfnx,
-                       ksign_public_key_actor_t pkfnx,
-                       ksign_user_id_actor_t uidfnx,
-                       void *data)
-{
-       const uint8_t *datap, *endp;
-       int rc;
-
-       datap = buf;
-       endp = buf + size;
-       do {
-               rc = ksign_parse_one_packet(&datap, endp,
-                                           sigfnx, pkfnx, uidfnx, data);
-       } while (rc == 0 && datap < endp);
-
-       return rc;
-} /* end ksign_parse_packets() */
diff --git a/crypto/signature/ksign-publickey.c b/crypto/signature/ksign-publickey.c
deleted file mode 100644 (file)
index 762e2a8..0000000
+++ /dev/null
@@ -1,19 +0,0 @@
-#include "local.h"
-
-#include "key.h"
-
-static int __init ksign_init(void)
-{
-       int rc;
-
-       printk("ksign: Installing public key data\n");
-
-       rc = ksign_load_keyring_from_buffer(ksign_def_public_key,
-                                           sizeof(ksign_def_public_key));
-       if (rc < 0)
-               printk("Unable to load default keyring: error=%d\n", -rc);
-
-       return rc;
-}
-
-module_init(ksign_init)
diff --git a/crypto/signature/ksign.c b/crypto/signature/ksign.c
deleted file mode 100644 (file)
index 32b0b63..0000000
+++ /dev/null
@@ -1,179 +0,0 @@
-/* ksign.c: signature checker
- *
- * Copyright (C) 2004 Red Hat, Inc. All Rights Reserved.
- * Written by David Howells (dhowells@redhat.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.
- */
-
-#include <linux/kernel.h>
-#include <asm/errno.h>
-#include "local.h"
-
-#if 0
-#define _debug(FMT, ...) printk(KERN_DEBUG FMT, ##__VA_ARGS__)
-#else
-#define _debug(FMT, ...) do { ; } while (0)
-#endif
-
-/*****************************************************************************/
-/*
- * check the signature which is contained in SIG.
- */
-static int ksign_signature_check(const struct ksign_signature *sig,
-                                struct crypto_tfm *sha1_tfm)
-{
-       struct ksign_public_key *pk;
-       uint8_t sha1[SHA1_DIGEST_SIZE];
-       MPI result = NULL;
-       int rc = 0, i;
-
-       pk = ksign_get_public_key(sig->keyid);
-       if (!pk) {
-               printk("ksign: module signed with unknown public key\n");
-               printk("- signature keyid: %08x%08x ver=%u\n",
-                      sig->keyid[0], sig->keyid[1], sig->version);
-               return -EPERM;
-       }
-
-       if (pk->timestamp > sig->timestamp)
-               printk("ksign:"
-                      " public key is %lu seconds newer than the signature\n",
-                      pk->timestamp - sig->timestamp);
-
-       /* complete the digest */
-       if (sig->version >= 4)
-               SHA1_putc(sha1_tfm, sig->version);
-       SHA1_putc(sha1_tfm, sig->sig_class);
-
-       if (sig->version < 4) {
-               u32 a = sig->timestamp;
-               SHA1_putc(sha1_tfm, (a >> 24) & 0xff);
-               SHA1_putc(sha1_tfm, (a >> 16) & 0xff);
-               SHA1_putc(sha1_tfm, (a >>  8) & 0xff);
-               SHA1_putc(sha1_tfm, (a >>  0) & 0xff);
-       }
-       else {
-               uint8_t buf[6];
-               size_t n;
-               SHA1_putc(sha1_tfm, PUBKEY_ALGO_DSA);
-               SHA1_putc(sha1_tfm, DIGEST_ALGO_SHA1);
-               if (sig->hashed_data) {
-                       n = (sig->hashed_data[0] << 8) | sig->hashed_data[1];
-                       SHA1_write(sha1_tfm, sig->hashed_data, n + 2);
-                       n += 6;
-               }
-               else {
-                       n = 6;
-               }
-
-               /* add some magic */
-               buf[0] = sig->version;
-               buf[1] = 0xff;
-               buf[2] = n >> 24;
-               buf[3] = n >> 16;
-               buf[4] = n >>  8;
-               buf[5] = n;
-               SHA1_write(sha1_tfm, buf, 6);
-       }
-
-       crypto_digest_final(sha1_tfm, sha1);
-       crypto_free_tfm(sha1_tfm);
-
-
-
-
-
-
-       rc = -ENOMEM;
-       result = mpi_alloc((SHA1_DIGEST_SIZE + BYTES_PER_MPI_LIMB - 1) / BYTES_PER_MPI_LIMB);
-       if (!result)
-               goto cleanup;
-
-       rc = mpi_set_buffer(result, sha1, SHA1_DIGEST_SIZE, 0);
-       if (rc < 0)
-               goto cleanup;
-
-       rc = DSA_verify(result, sig->data, pk->pkey);
-
- cleanup:
-       mpi_free(result);
-       ksign_put_public_key(pk);
-
-       return rc;
-} /* end ksign_signature_check() */
-
-/*****************************************************************************/
-/*
- * examine the signatures that are parsed out of the signature data - we keep
- * the first one that's appropriate and ignore the rest
- * - return 0 if signature of interest (sig not freed by caller)
- * - return 1 if no interest (caller frees)
- */
-static int ksign_grab_signature(struct ksign_signature *sig, void *fnxdata)
-{
-       struct ksign_signature **_sig = fnxdata;
-
-       if (sig->sig_class != 0x00) {
-               _debug("ksign: standalone signature of class 0x%02x\n",
-                      sig->sig_class);
-               return 1;
-       }
-
-       if (*_sig)
-               return 1;
-
-       *_sig = sig;
-       return 0;
-} /* end ksign_grab_signature() */
-
-/*****************************************************************************/
-/*
- * verify the signature of some data with one of the kernel's known public keys
- * - the SHA1 context should be currently open with the signed data digested
- *   into it so that more data can be appended
- * - the SHA1 context is finalised and freed before returning
- */
-int ksign_verify_signature(const char *sigdata, unsigned sig_size,
-                          struct crypto_tfm *sha1)
-{
-       struct ksign_signature *sig = NULL;
-       int retval;
-
-       /* parse the signature data to get the actual signature */
-       retval = ksign_parse_packets(sigdata, sig_size,
-                                    &ksign_grab_signature, NULL, NULL,
-                                    &sig);
-       if (retval < 0)
-               goto cleanup;
-
-       if (!sig) {
-               printk("Couldn't find valid DSA signature in module\n");
-               return -ENOENT;
-       }
-
-       _debug("signature keyid: %08x%08x ver=%u\n",
-              sig->keyid[0], sig->keyid[1], sig->version);
-
-       /* check the data SHA1 transformation against the public key */
-       retval = ksign_signature_check(sig, sha1);
-       if (retval == 0) {
-               _debug("ksign: Signature check succeeded\n");
-       }
-       else if (retval != -ENOMEM) {
-               _debug("ksign: Signature check failed\n");
-               retval = -EPERM;
-       }
-       else {
-               _debug("ksign: Signature check ENOMEM\n");
-       }
-
- cleanup:
-       if (sig)
-               ksign_free_signature(sig);
-
-       return retval;
-} /* end ksign_verify_signature() */
diff --git a/crypto/signature/local.h b/crypto/signature/local.h
deleted file mode 100644 (file)
index 5d2fa52..0000000
+++ /dev/null
@@ -1,163 +0,0 @@
-/* local.h: kernel signature checker internal defs
- *
- * Copyright (C) 2004 Red Hat, Inc. All Rights Reserved.
- * Written by David Howells (dhowells@redhat.com)
- * - Derived from GnuPG packet.h - packet definitions
- *   - Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
- *
- * GnuPG 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.
- *
- * GnuPG 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/list.h>
-#include <linux/crypto.h>
-#include <linux/crypto/ksign.h>
-#include <linux/crypto/mpi.h>
-#include <asm/atomic.h>
-
-#define SHA1_DIGEST_SIZE       20
-
-#define PUBKEY_USAGE_SIG       1           /* key is good for signatures */
-#define PUBKEY_USAGE_ENC       2           /* key is good for encryption */
-
-#define PUBKEY_ALGO_DSA                17
-#define DSA_NPKEY              4       /* number of MPI's in DSA public key */
-#define DSA_NSIG               2       /* number of MPI's in DSA signature */
-
-#define DIGEST_ALGO_SHA1       2
-
-typedef enum {
-       PKT_NONE                        = 0,
-       PKT_SIGNATURE                   = 2,    /* secret key encrypted packet */
-       PKT_PUBLIC_KEY                  = 6,    /* public key */
-       PKT_USER_ID                     = 13,   /* user id packet */
-} pkttype_t;
-
-typedef enum {
-       SIGSUBPKT_TEST_CRITICAL         = -3,
-       SIGSUBPKT_NONE                  = 0,
-       SIGSUBPKT_SIG_CREATED           = 2,    /* signature creation time */
-       SIGSUBPKT_SIG_EXPIRE            = 3,    /* signature expiration time */
-       SIGSUBPKT_EXPORTABLE            = 4,    /* exportable */
-       SIGSUBPKT_TRUST                 = 5,    /* trust signature */
-       SIGSUBPKT_REGEXP                = 6,    /* regular expression */
-       SIGSUBPKT_REVOCABLE             = 7,    /* revocable */
-       SIGSUBPKT_KEY_EXPIRE            = 9,    /* key expiration time */
-       SIGSUBPKT_ARR                   = 10,   /* additional recipient request */
-       SIGSUBPKT_PREF_SYM              = 11,   /* preferred symmetric algorithms */
-       SIGSUBPKT_REV_KEY               = 12,   /* revocation key */
-       SIGSUBPKT_ISSUER                = 16,   /* issuer key ID */
-       SIGSUBPKT_NOTATION              = 20,   /* notation data */
-       SIGSUBPKT_PREF_HASH             = 21,   /* preferred hash algorithms */
-       SIGSUBPKT_PREF_COMPR            = 22,   /* preferred compression algorithms */
-       SIGSUBPKT_KS_FLAGS              = 23,   /* key server preferences */
-       SIGSUBPKT_PREF_KS               = 24,   /* preferred key server */
-       SIGSUBPKT_PRIMARY_UID           = 25,   /* primary user id */
-       SIGSUBPKT_POLICY                = 26,   /* policy URL */
-       SIGSUBPKT_KEY_FLAGS             = 27,   /* key flags */
-       SIGSUBPKT_SIGNERS_UID           = 28,   /* signer's user id */
-       SIGSUBPKT_REVOC_REASON          = 29,   /* reason for revocation */
-       SIGSUBPKT_PRIV_VERIFY_CACHE     = 101,  /* cache verification result */
-
-       SIGSUBPKT_FLAG_CRITICAL         = 128
-} sigsubpkttype_t;
-
-/*
- * signature record
- */
-struct ksign_signature
-{
-       uint32_t        keyid[2];               /* 64 bit keyid */
-       time_t          timestamp;              /* signature made */
-       uint8_t         version;
-       uint8_t         sig_class;              /* sig classification, append for MD calculation*/
-       uint8_t         *hashed_data;           /* all subpackets with hashed  data (v4 only) */
-       uint8_t         *unhashed_data;         /* ditto for unhashed data */
-       uint8_t         digest_start[2];        /* first 2 uint8_ts of the digest */
-       MPI             data[DSA_NSIG];
-};
-
-extern void ksign_free_signature(struct ksign_signature *sig);
-
-/*
- * public key record
- */
-struct ksign_public_key
-{
-       struct list_head link;
-       atomic_t        count;                  /* ref count */
-       time_t          timestamp;              /* key made */
-       time_t          expiredate;             /* expires at this date or 0 if not at all */
-       uint8_t         hdrbytes;               /* number of header bytes */
-       uint8_t         version;
-       int             is_valid;               /* key (especially subkey) is valid */
-       unsigned long   local_id;               /* internal use, valid if > 0 */
-       uint32_t        main_keyid[2];          /* keyid of the primary key */
-       uint32_t        keyid[2];               /* calculated by keyid_from_pk() */
-       MPI             pkey[DSA_NPKEY];
-};
-
-extern void ksign_free_public_key(struct ksign_public_key *pk);
-
-static inline void ksign_put_public_key(struct ksign_public_key *pk)
-{
-       if (atomic_dec_and_test(&pk->count))
-               ksign_free_public_key(pk);
-}
-
-extern int ksign_load_keyring_from_buffer(const void *buffer, size_t size);
-
-extern struct ksign_public_key *ksign_get_public_key(const uint32_t *keyid);
-
-/*
- * user ID record
- */
-struct ksign_user_id
-{
-       int             len;                    /* length of the name */
-       char            name[0];
-};
-
-extern void ksign_free_user_id(struct ksign_user_id *uid);
-
-/*
- *
- */
-typedef int (*ksign_signature_actor_t)(struct ksign_signature *, void *fnxdata);
-typedef int (*ksign_public_key_actor_t)(struct ksign_public_key *, void *fnxdata);
-typedef int (*ksign_user_id_actor_t)(struct ksign_user_id *, void *fnxdata);
-
-extern int ksign_parse_packets(const uint8_t *buf,
-                              size_t size,
-                              ksign_signature_actor_t sigfnx,
-                              ksign_public_key_actor_t pkfnx,
-                              ksign_user_id_actor_t uidfnx,
-                              void *data);
-
-extern int DSA_verify(const MPI datahash, const MPI sig[], const MPI pkey[]);
-
-/*
- * fast access to the digest
- * - we _know_ the data is locked into kernel memory, so we don't want to have
- *   to kmap() it
- */
-static inline void SHA1_putc(struct crypto_tfm *sha1, uint8_t ch)
-{
-       crypto_digest_update_kernel(sha1, &ch, 1);
-}
-
-static inline void SHA1_write(struct crypto_tfm *sha1, const void *s, size_t n)
-{
-       crypto_digest_update_kernel(sha1, s, n);
-}
diff --git a/crypto/tea.c b/crypto/tea.c
deleted file mode 100644 (file)
index bf94329..0000000
+++ /dev/null
@@ -1,248 +0,0 @@
-/* 
- * Cryptographic API.
- *
- * TEA and Xtended TEA Algorithms
- *
- * The TEA and Xtended TEA algorithms were developed by David Wheeler 
- * and Roger Needham at the Computer Laboratory of Cambridge University.
- *
- * Copyright (c) 2004 Aaron Grothe ajgrothe@yahoo.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.
- *
- */
-
-#include <linux/init.h>
-#include <linux/module.h>
-#include <linux/mm.h>
-#include <asm/scatterlist.h>
-#include <linux/crypto.h>
-
-#define TEA_KEY_SIZE           16
-#define TEA_BLOCK_SIZE         8
-#define TEA_ROUNDS             32
-#define TEA_DELTA              0x9e3779b9
-
-#define XTEA_KEY_SIZE          16
-#define XTEA_BLOCK_SIZE                8
-#define XTEA_ROUNDS            32
-#define XTEA_DELTA             0x9e3779b9
-
-#define u32_in(x) le32_to_cpu(*(const u32 *)(x))
-#define u32_out(to, from) (*(u32 *)(to) = cpu_to_le32(from))
-
-struct tea_ctx {
-       u32 KEY[4];
-};
-
-struct xtea_ctx {
-       u32 KEY[4];
-};
-
-static int tea_setkey(void *ctx_arg, const u8 *in_key,
-                       unsigned int key_len, u32 *flags)
-{ 
-
-       struct tea_ctx *ctx = ctx_arg;
-       
-       if (key_len != 16)
-       {
-               *flags |= CRYPTO_TFM_RES_BAD_KEY_LEN;
-               return -EINVAL;
-       }
-
-       ctx->KEY[0] = u32_in (in_key);
-       ctx->KEY[1] = u32_in (in_key + 4);
-       ctx->KEY[2] = u32_in (in_key + 8);
-       ctx->KEY[3] = u32_in (in_key + 12);
-
-       return 0; 
-
-}
-
-static void tea_encrypt(void *ctx_arg, u8 *dst, const u8 *src)
-{ 
-       u32 y, z, n, sum = 0;
-       u32 k0, k1, k2, k3;
-
-       struct tea_ctx *ctx = ctx_arg;
-
-       y = u32_in (src);
-       z = u32_in (src + 4);
-
-       k0 = ctx->KEY[0];
-       k1 = ctx->KEY[1];
-       k2 = ctx->KEY[2];
-       k3 = ctx->KEY[3];
-
-       n = TEA_ROUNDS;
-
-       while (n-- > 0) {
-               sum += TEA_DELTA;
-               y += ((z << 4) + k0) ^ (z + sum) ^ ((z >> 5) + k1);
-               z += ((y << 4) + k2) ^ (y + sum) ^ ((y >> 5) + k3);
-       }
-       
-       u32_out (dst, y);
-       u32_out (dst + 4, z);
-}
-
-static void tea_decrypt(void *ctx_arg, u8 *dst, const u8 *src)
-{ 
-       u32 y, z, n, sum;
-       u32 k0, k1, k2, k3;
-
-       struct tea_ctx *ctx = ctx_arg;
-
-       y = u32_in (src);
-       z = u32_in (src + 4);
-
-       k0 = ctx->KEY[0];
-       k1 = ctx->KEY[1];
-       k2 = ctx->KEY[2];
-       k3 = ctx->KEY[3];
-
-       sum = TEA_DELTA << 5;
-
-       n = TEA_ROUNDS;
-
-       while (n-- > 0) {
-               z -= ((y << 4) + k2) ^ (y + sum) ^ ((y >> 5) + k3);
-               y -= ((z << 4) + k0) ^ (z + sum) ^ ((z >> 5) + k1);
-               sum -= TEA_DELTA;
-       }
-       
-       u32_out (dst, y);
-       u32_out (dst + 4, z);
-
-}
-
-static int xtea_setkey(void *ctx_arg, const u8 *in_key,
-                       unsigned int key_len, u32 *flags)
-{ 
-
-       struct xtea_ctx *ctx = ctx_arg;
-       
-       if (key_len != 16)
-       {
-               *flags |= CRYPTO_TFM_RES_BAD_KEY_LEN;
-               return -EINVAL;
-       }
-
-       ctx->KEY[0] = u32_in (in_key);
-       ctx->KEY[1] = u32_in (in_key + 4);
-       ctx->KEY[2] = u32_in (in_key + 8);
-       ctx->KEY[3] = u32_in (in_key + 12);
-
-       return 0; 
-
-}
-
-static void xtea_encrypt(void *ctx_arg, u8 *dst, const u8 *src)
-{ 
-
-       u32 y, z, sum = 0;
-       u32 limit = XTEA_DELTA * XTEA_ROUNDS;
-
-       struct xtea_ctx *ctx = ctx_arg;
-
-       y = u32_in (src);
-       z = u32_in (src + 4);
-
-       while (sum != limit) {
-               y += (z << 4 ^ z >> 5) + (z ^ sum) + ctx->KEY[sum&3]; 
-               sum += TEA_DELTA;
-               z += (y << 4 ^ y >> 5) + (y ^ sum) + ctx->KEY[sum>>11 &3]; 
-       }
-       
-       u32_out (dst, y);
-       u32_out (dst + 4, z);
-
-}
-
-static void xtea_decrypt(void *ctx_arg, u8 *dst, const u8 *src)
-{ 
-
-       u32 y, z, sum;
-       struct tea_ctx *ctx = ctx_arg;
-
-       y = u32_in (src);
-       z = u32_in (src + 4);
-
-       sum = XTEA_DELTA * XTEA_ROUNDS;
-
-       while (sum) {
-               z -= (y << 4 ^ y >> 5) + (y ^ sum) + ctx->KEY[sum>>11 & 3];
-               sum -= XTEA_DELTA;
-               y -= (z << 4 ^ z >> 5) + (z ^ sum) + ctx->KEY[sum & 3];
-       }
-       
-       u32_out (dst, y);
-       u32_out (dst + 4, z);
-
-}
-
-static struct crypto_alg tea_alg = {
-       .cra_name               =       "tea",
-       .cra_flags              =       CRYPTO_ALG_TYPE_CIPHER,
-       .cra_blocksize          =       TEA_BLOCK_SIZE,
-       .cra_ctxsize            =       sizeof (struct tea_ctx),
-       .cra_module             =       THIS_MODULE,
-       .cra_list               =       LIST_HEAD_INIT(tea_alg.cra_list),
-       .cra_u                  =       { .cipher = {
-       .cia_min_keysize        =       TEA_KEY_SIZE,
-       .cia_max_keysize        =       TEA_KEY_SIZE,
-       .cia_setkey             =       tea_setkey,
-       .cia_encrypt            =       tea_encrypt,
-       .cia_decrypt            =       tea_decrypt } }
-};
-
-static struct crypto_alg xtea_alg = {
-       .cra_name               =       "xtea",
-       .cra_flags              =       CRYPTO_ALG_TYPE_CIPHER,
-       .cra_blocksize          =       XTEA_BLOCK_SIZE,
-       .cra_ctxsize            =       sizeof (struct xtea_ctx),
-       .cra_module             =       THIS_MODULE,
-       .cra_list               =       LIST_HEAD_INIT(xtea_alg.cra_list),
-       .cra_u                  =       { .cipher = {
-       .cia_min_keysize        =       XTEA_KEY_SIZE,
-       .cia_max_keysize        =       XTEA_KEY_SIZE,
-       .cia_setkey             =       xtea_setkey,
-       .cia_encrypt            =       xtea_encrypt,
-       .cia_decrypt            =       xtea_decrypt } }
-};
-
-static int __init init(void)
-{
-       int ret = 0;
-       
-       ret = crypto_register_alg(&tea_alg);
-       if (ret < 0)
-               goto out;
-
-       ret = crypto_register_alg(&xtea_alg);
-       if (ret < 0) {
-               crypto_unregister_alg(&tea_alg);
-               goto out;
-       }
-
-out:   
-       return ret;
-}
-
-static void __exit fini(void)
-{
-       crypto_unregister_alg(&tea_alg);
-       crypto_unregister_alg(&xtea_alg);
-}
-
-MODULE_ALIAS("xtea");
-
-module_init(init);
-module_exit(fini);
-
-MODULE_LICENSE("GPL");
-MODULE_DESCRIPTION("TEA & XTEA Cryptographic Algorithms");
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/block/sx8.c b/drivers/block/sx8.c
deleted file mode 100644 (file)
index 0a02341..0000000
+++ /dev/null
@@ -1,1763 +0,0 @@
-/*
- *  sx8.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 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 "sx8"
-#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/char/ds1286.c b/drivers/char/ds1286.c
deleted file mode 100644 (file)
index bc042fb..0000000
+++ /dev/null
@@ -1,578 +0,0 @@
-/*
- * DS1286 Real Time Clock interface for Linux
- *
- * Copyright (C) 1998, 1999, 2000 Ralf Baechle
- *
- * Based on code written by Paul Gortmaker.
- *
- * This driver allows use of the real time clock (built into nearly all
- * computers) from user space. It exports the /dev/rtc interface supporting
- * various ioctl() and also the /proc/rtc pseudo-file for status
- * information.
- *
- * The ioctls can be used to set the interrupt behaviour and generation rate
- * from the RTC via IRQ 8. Then the /dev/rtc interface can be used to make
- * use of these timer interrupts, be they interval or alarm based.
- *
- * The /dev/rtc interface will block on reads until an interrupt has been
- * received. If a RTC interrupt has already happened, it will output an
- * unsigned long and then block. The output value contains the interrupt
- * status in the low byte and the number of interrupts since the last read
- * in the remaining high bytes. The /dev/rtc interface can also be used with
- * the select(2) call.
- *
- * 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/ds1286.h>
-#include <linux/types.h>
-#include <linux/errno.h>
-#include <linux/miscdevice.h>
-#include <linux/slab.h>
-#include <linux/ioport.h>
-#include <linux/fcntl.h>
-#include <linux/init.h>
-#include <linux/poll.h>
-#include <linux/rtc.h>
-#include <linux/spinlock.h>
-#include <linux/bcd.h>
-#include <linux/proc_fs.h>
-
-#include <asm/uaccess.h>
-#include <asm/system.h>
-
-#define DS1286_VERSION         "1.0"
-
-/*
- *     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 DECLARE_WAIT_QUEUE_HEAD(ds1286_wait);
-
-static ssize_t ds1286_read(struct file *file, char *buf,
-                       size_t count, loff_t *ppos);
-
-static int ds1286_ioctl(struct inode *inode, struct file *file,
-                        unsigned int cmd, unsigned long arg);
-
-static unsigned int ds1286_poll(struct file *file, poll_table *wait);
-
-static void ds1286_get_alm_time (struct rtc_time *alm_tm);
-static void ds1286_get_time(struct rtc_time *rtc_tm);
-static int ds1286_set_time(struct rtc_time *rtc_tm);
-
-static inline unsigned char ds1286_is_updating(void);
-
-static spinlock_t ds1286_lock = SPIN_LOCK_UNLOCKED;
-
-static int ds1286_read_proc(char *page, char **start, off_t off,
-                            int count, int *eof, void *data);
-
-/*
- *     Bits in rtc_status. (7 bits of room for future expansion)
- */
-
-#define RTC_IS_OPEN            0x01    /* means /dev/rtc is in use     */
-#define RTC_TIMER_ON           0x02    /* missed irq timer active      */
-
-static unsigned char ds1286_status;    /* bitmapped status byte.       */
-
-static unsigned char days_in_mo[] = {
-       0, 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31
-};
-
-/*
- *     Now all the various file operations that we export.
- */
-
-static ssize_t ds1286_read(struct file *file, char *buf,
-                           size_t count, loff_t *ppos)
-{
-       return -EIO;
-}
-
-static int ds1286_ioctl(struct inode *inode, struct file *file,
-                        unsigned int cmd, unsigned long arg)
-{
-       struct rtc_time wtime;
-
-       switch (cmd) {
-       case RTC_AIE_OFF:       /* Mask alarm int. enab. bit    */
-       {
-               unsigned int flags;
-               unsigned char val;
-
-               if (!capable(CAP_SYS_TIME))
-                       return -EACCES;
-
-               spin_lock_irqsave(&ds1286_lock, flags);
-               val = rtc_read(RTC_CMD);
-               val |=  RTC_TDM;
-               rtc_write(val, RTC_CMD);
-               spin_unlock_irqrestore(&ds1286_lock, flags);
-
-               return 0;
-       }
-       case RTC_AIE_ON:        /* Allow alarm interrupts.      */
-       {
-               unsigned int flags;
-               unsigned char val;
-
-               if (!capable(CAP_SYS_TIME))
-                       return -EACCES;
-
-               spin_lock_irqsave(&ds1286_lock, flags);
-               val = rtc_read(RTC_CMD);
-               val &=  ~RTC_TDM;
-               rtc_write(val, RTC_CMD);
-               spin_unlock_irqrestore(&ds1286_lock, flags);
-
-               return 0;
-       }
-       case RTC_WIE_OFF:       /* Mask watchdog int. enab. bit */
-       {
-               unsigned int flags;
-               unsigned char val;
-
-               if (!capable(CAP_SYS_TIME))
-                       return -EACCES;
-
-               spin_lock_irqsave(&ds1286_lock, flags);
-               val = rtc_read(RTC_CMD);
-               val |= RTC_WAM;
-               rtc_write(val, RTC_CMD);
-               spin_unlock_irqrestore(&ds1286_lock, flags);
-
-               return 0;
-       }
-       case RTC_WIE_ON:        /* Allow watchdog interrupts.   */
-       {
-               unsigned int flags;
-               unsigned char val;
-
-               if (!capable(CAP_SYS_TIME))
-                       return -EACCES;
-
-               spin_lock_irqsave(&ds1286_lock, flags);
-               val = rtc_read(RTC_CMD);
-               val &= ~RTC_WAM;
-               rtc_write(val, RTC_CMD);
-               spin_unlock_irqrestore(&ds1286_lock, flags);
-
-               return 0;
-       }
-       case RTC_ALM_READ:      /* Read the present alarm time */
-       {
-               /*
-                * This returns a struct rtc_time. Reading >= 0xc0
-                * means "don't care" or "match all". Only the tm_hour,
-                * tm_min, and tm_sec values are filled in.
-                */
-
-               memset(&wtime, 0, sizeof(wtime));
-               ds1286_get_alm_time(&wtime);
-               break;
-       }
-       case RTC_ALM_SET:       /* Store a time into the alarm */
-       {
-               /*
-                * This expects a struct rtc_time. Writing 0xff means
-                * "don't care" or "match all". Only the tm_hour,
-                * tm_min and tm_sec are used.
-                */
-               unsigned char hrs, min, sec;
-               struct rtc_time alm_tm;
-
-               if (!capable(CAP_SYS_TIME))
-                       return -EACCES;
-
-               if (copy_from_user(&alm_tm, (struct rtc_time*)arg,
-                                  sizeof(struct rtc_time)))
-                       return -EFAULT;
-
-               hrs = alm_tm.tm_hour;
-               min = alm_tm.tm_min;
-
-               if (hrs >= 24)
-                       hrs = 0xff;
-
-               if (min >= 60)
-                       min = 0xff;
-
-               BIN_TO_BCD(sec);
-               BIN_TO_BCD(min);
-               BIN_TO_BCD(hrs);
-
-               spin_lock(&ds1286_lock);
-               rtc_write(hrs, RTC_HOURS_ALARM);
-               rtc_write(min, RTC_MINUTES_ALARM);
-               spin_unlock(&ds1286_lock);
-
-               return 0;
-       }
-       case RTC_RD_TIME:       /* Read the time/date from RTC  */
-       {
-               memset(&wtime, 0, sizeof(wtime));
-               ds1286_get_time(&wtime);
-               break;
-       }
-       case RTC_SET_TIME:      /* Set the RTC */
-       {
-               struct rtc_time rtc_tm;
-
-               if (!capable(CAP_SYS_TIME))
-                       return -EACCES;
-
-               if (copy_from_user(&rtc_tm, (struct rtc_time*)arg,
-                                  sizeof(struct rtc_time)))
-                       return -EFAULT;
-
-               return ds1286_set_time(&rtc_tm);
-       }
-       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 ds1286_open(struct inode *inode, struct file *file)
-{
-       spin_lock_irq(&ds1286_lock);
-
-       if (ds1286_status & RTC_IS_OPEN)
-               goto out_busy;
-
-       ds1286_status |= RTC_IS_OPEN;
-
-       spin_unlock_irq(&ds1286_lock);
-       return 0;
-
-out_busy:
-       spin_lock_irq(&ds1286_lock);
-       return -EBUSY;
-}
-
-static int ds1286_release(struct inode *inode, struct file *file)
-{
-       ds1286_status &= ~RTC_IS_OPEN;
-
-       return 0;
-}
-
-static unsigned int ds1286_poll(struct file *file, poll_table *wait)
-{
-       poll_wait(file, &ds1286_wait, wait);
-
-       return 0;
-}
-
-/*
- *     The various file operations we support.
- */
-
-static struct file_operations ds1286_fops = {
-       .llseek         = no_llseek,
-       .read           = ds1286_read,
-       .poll           = ds1286_poll,
-       .ioctl          = ds1286_ioctl,
-       .open           = ds1286_open,
-       .release        = ds1286_release,
-};
-
-static struct miscdevice ds1286_dev=
-{
-       .minor  = RTC_MINOR,
-       .name   = "rtc",
-       .fops   = &ds1286_fops,
-};
-
-static int __init ds1286_init(void)
-{
-       int err;
-
-       printk(KERN_INFO "DS1286 Real Time Clock Driver v%s\n", DS1286_VERSION);
-
-       err = misc_register(&ds1286_dev);
-       if (err)
-               goto out;
-
-       if (!create_proc_read_entry("driver/rtc", 0, 0, ds1286_read_proc, NULL)) {
-               err = -ENOMEM;
-
-               goto out_deregister;
-       }
-
-       return 0;
-
-out_deregister:
-       misc_deregister(&ds1286_dev);
-
-out:
-       return err;
-}
-
-static void __exit ds1286_exit(void)
-{
-       remove_proc_entry("driver/rtc", NULL);
-       misc_deregister(&ds1286_dev);
-}
-
-static char *days[] = {
-       "***", "Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"
-};
-
-/*
- *     Info exported via "/proc/rtc".
- */
-static int ds1286_proc_output(char *buf)
-{
-       char *p, *s;
-       struct rtc_time tm;
-       unsigned char hundredth, month, cmd, amode;
-
-       p = buf;
-
-       ds1286_get_time(&tm);
-       hundredth = rtc_read(RTC_HUNDREDTH_SECOND);
-       BCD_TO_BIN(hundredth);
-
-       p += sprintf(p,
-                    "rtc_time\t: %02d:%02d:%02d.%02d\n"
-                    "rtc_date\t: %04d-%02d-%02d\n",
-                    tm.tm_hour, tm.tm_min, tm.tm_sec, hundredth,
-                    tm.tm_year + 1900, tm.tm_mon + 1, tm.tm_mday);
-
-       /*
-        * We implicitly assume 24hr mode here. Alarm values >= 0xc0 will
-        * match any value for that particular field. Values that are
-        * greater than a valid time, but less than 0xc0 shouldn't appear.
-        */
-       ds1286_get_alm_time(&tm);
-       p += sprintf(p, "alarm\t\t: %s ", days[tm.tm_wday]);
-       if (tm.tm_hour <= 24)
-               p += sprintf(p, "%02d:", tm.tm_hour);
-       else
-               p += sprintf(p, "**:");
-
-       if (tm.tm_min <= 59)
-               p += sprintf(p, "%02d\n", tm.tm_min);
-       else
-               p += sprintf(p, "**\n");
-
-       month = rtc_read(RTC_MONTH);
-       p += sprintf(p,
-                    "oscillator\t: %s\n"
-                    "square_wave\t: %s\n",
-                    (month & RTC_EOSC) ? "disabled" : "enabled",
-                    (month & RTC_ESQW) ? "disabled" : "enabled");
-
-       amode = ((rtc_read(RTC_MINUTES_ALARM) & 0x80) >> 5) |
-               ((rtc_read(RTC_HOURS_ALARM) & 0x80) >> 6) |
-               ((rtc_read(RTC_DAY_ALARM) & 0x80) >> 7);
-       if (amode == 7)      s = "each minute";
-       else if (amode == 3) s = "minutes match";
-       else if (amode == 1) s = "hours and minutes match";
-       else if (amode == 0) s = "days, hours and minutes match";
-       else                 s = "invalid";
-       p += sprintf(p, "alarm_mode\t: %s\n", s);
-
-       cmd = rtc_read(RTC_CMD);
-       p += sprintf(p,
-                    "alarm_enable\t: %s\n"
-                    "wdog_alarm\t: %s\n"
-                    "alarm_mask\t: %s\n"
-                    "wdog_alarm_mask\t: %s\n"
-                    "interrupt_mode\t: %s\n"
-                    "INTB_mode\t: %s_active\n"
-                    "interrupt_pins\t: %s\n",
-                    (cmd & RTC_TDF) ? "yes" : "no",
-                    (cmd & RTC_WAF) ? "yes" : "no",
-                    (cmd & RTC_TDM) ? "disabled" : "enabled",
-                    (cmd & RTC_WAM) ? "disabled" : "enabled",
-                    (cmd & RTC_PU_LVL) ? "pulse" : "level",
-                    (cmd & RTC_IBH_LO) ? "low" : "high",
-                    (cmd & RTC_IPSW) ? "unswapped" : "swapped");
-
-       return  p - buf;
-}
-
-static int ds1286_read_proc(char *page, char **start, off_t off,
-                         int count, int *eof, void *data)
-{
-       int len = ds1286_proc_output (page);
-       if (len <= off+count) *eof = 1;
-       *start = page + off;
-       len -= off;
-       if (len>count)
-               len = count;
-       if (len<0)
-               len = 0;
-
-       return len;
-}
-
-/*
- * Returns true if a clock update is in progress
- */
-static inline unsigned char ds1286_is_updating(void)
-{
-       return rtc_read(RTC_CMD) & RTC_TE;
-}
-
-
-static void ds1286_get_time(struct rtc_time *rtc_tm)
-{
-       unsigned char save_control;
-       unsigned int flags;
-       unsigned long uip_watchdog = jiffies;
-
-       /*
-        * read RTC once any update in progress is done. The update
-        * can take just over 2ms. We wait 10 to 20ms. There is no need to
-        * to poll-wait (up to 1s - eeccch) for the falling edge of RTC_UIP.
-        * If you need to know *exactly* when a second has started, enable
-        * periodic update complete interrupts, (via ioctl) and then
-        * immediately read /dev/rtc which will block until you get the IRQ.
-        * Once the read clears, read the RTC time (again via ioctl). Easy.
-        */
-
-       if (ds1286_is_updating() != 0)
-               while (jiffies - uip_watchdog < 2*HZ/100)
-                       barrier();
-
-       /*
-        * Only the values that we read from the RTC are set. We leave
-        * tm_wday, tm_yday and tm_isdst untouched. Even though the
-        * RTC has RTC_DAY_OF_WEEK, we ignore it, as it is only updated
-        * by the RTC when initially set to a non-zero value.
-        */
-       spin_lock_irqsave(&ds1286_lock, flags);
-       save_control = rtc_read(RTC_CMD);
-       rtc_write((save_control|RTC_TE), RTC_CMD);
-
-       rtc_tm->tm_sec = rtc_read(RTC_SECONDS);
-       rtc_tm->tm_min = rtc_read(RTC_MINUTES);
-       rtc_tm->tm_hour = rtc_read(RTC_HOURS) & 0x3f;
-       rtc_tm->tm_mday = rtc_read(RTC_DATE);
-       rtc_tm->tm_mon = rtc_read(RTC_MONTH) & 0x1f;
-       rtc_tm->tm_year = rtc_read(RTC_YEAR);
-
-       rtc_write(save_control, RTC_CMD);
-       spin_unlock_irqrestore(&ds1286_lock, flags);
-
-       BCD_TO_BIN(rtc_tm->tm_sec);
-       BCD_TO_BIN(rtc_tm->tm_min);
-       BCD_TO_BIN(rtc_tm->tm_hour);
-       BCD_TO_BIN(rtc_tm->tm_mday);
-       BCD_TO_BIN(rtc_tm->tm_mon);
-       BCD_TO_BIN(rtc_tm->tm_year);
-
-       /*
-        * Account for differences between how the RTC uses the values
-        * and how they are defined in a struct rtc_time;
-        */
-       if (rtc_tm->tm_year < 45)
-               rtc_tm->tm_year += 30;
-       if ((rtc_tm->tm_year += 40) < 70)
-               rtc_tm->tm_year += 100;
-
-       rtc_tm->tm_mon--;
-}
-
-static int ds1286_set_time(struct rtc_time *rtc_tm)
-{
-       unsigned char mon, day, hrs, min, sec, leap_yr;
-       unsigned char save_control;
-       unsigned int yrs, flags;
-
-
-       yrs = rtc_tm->tm_year + 1900;
-       mon = rtc_tm->tm_mon + 1;   /* tm_mon starts at zero */
-       day = rtc_tm->tm_mday;
-       hrs = rtc_tm->tm_hour;
-       min = rtc_tm->tm_min;
-       sec = rtc_tm->tm_sec;
-
-       if (yrs < 1970)
-               return -EINVAL;
-
-       leap_yr = ((!(yrs % 4) && (yrs % 100)) || !(yrs % 400));
-
-       if ((mon > 12) || (day == 0))
-               return -EINVAL;
-
-       if (day > (days_in_mo[mon] + ((mon == 2) && leap_yr)))
-               return -EINVAL;
-
-       if ((hrs >= 24) || (min >= 60) || (sec >= 60))
-               return -EINVAL;
-
-       if ((yrs -= 1940) > 255)    /* They are unsigned */
-               return -EINVAL;
-
-       if (yrs >= 100)
-               yrs -= 100;
-
-       BIN_TO_BCD(sec);
-       BIN_TO_BCD(min);
-       BIN_TO_BCD(hrs);
-       BIN_TO_BCD(day);
-       BIN_TO_BCD(mon);
-       BIN_TO_BCD(yrs);
-
-       spin_lock_irqsave(&ds1286_lock, flags);
-       save_control = rtc_read(RTC_CMD);
-       rtc_write((save_control|RTC_TE), RTC_CMD);
-
-       rtc_write(yrs, RTC_YEAR);
-       rtc_write(mon, RTC_MONTH);
-       rtc_write(day, RTC_DATE);
-       rtc_write(hrs, RTC_HOURS);
-       rtc_write(min, RTC_MINUTES);
-       rtc_write(sec, RTC_SECONDS);
-       rtc_write(0, RTC_HUNDREDTH_SECOND);
-
-       rtc_write(save_control, RTC_CMD);
-       spin_unlock_irqrestore(&ds1286_lock, flags);
-
-       return 0;
-}
-
-static void ds1286_get_alm_time(struct rtc_time *alm_tm)
-{
-       unsigned char cmd;
-       unsigned int flags;
-
-       /*
-        * Only the values that we read from the RTC are set. That
-        * means only tm_wday, tm_hour, tm_min.
-        */
-       spin_lock_irqsave(&ds1286_lock, flags);
-       alm_tm->tm_min = rtc_read(RTC_MINUTES_ALARM) & 0x7f;
-       alm_tm->tm_hour = rtc_read(RTC_HOURS_ALARM)  & 0x1f;
-       alm_tm->tm_wday = rtc_read(RTC_DAY_ALARM)    & 0x07;
-       cmd = rtc_read(RTC_CMD);
-       spin_unlock_irqrestore(&ds1286_lock, flags);
-
-       BCD_TO_BIN(alm_tm->tm_min);
-       BCD_TO_BIN(alm_tm->tm_hour);
-       alm_tm->tm_sec = 0;
-}
-
-module_init(ds1286_init);
-module_exit(ds1286_exit);
-
-MODULE_AUTHOR("Ralf Baechle");
-MODULE_LICENSE("GPL");
-MODULE_ALIAS_MISCDEV(RTC_MINOR);
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/ip27-rtc.c b/drivers/char/ip27-rtc.c
deleted file mode 100644 (file)
index 3acdac3..0000000
+++ /dev/null
@@ -1,327 +0,0 @@
-/*
- *     Driver for the SGS-Thomson M48T35 Timekeeper RAM chip
- *
- *     Real Time Clock interface for Linux
- *
- *     TODO: Implement periodic interrupts.
- *
- *     Copyright (C) 2000 Silicon Graphics, Inc.
- *     Written by Ulf Carlsson (ulfc@engr.sgi.com)
- *
- *     Based on code written by Paul Gortmaker.
- *
- *     This driver allows use of the real time clock (built into
- *     nearly all computers) from user space. It exports the /dev/rtc
- *     interface supporting various ioctl() and also the /proc/rtc
- *     pseudo-file for status information.
- *
- *     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 RTC_VERSION            "1.09b"
-
-#include <linux/bcd.h>
-#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/init.h>
-#include <linux/poll.h>
-#include <linux/proc_fs.h>
-#include <linux/smp_lock.h>
-
-#include <asm/m48t35.h>
-#include <asm/sn/ioc3.h>
-#include <asm/io.h>
-#include <asm/uaccess.h>
-#include <asm/system.h>
-#include <asm/sn/klconfig.h>
-#include <asm/sn/sn0/ip27.h>
-#include <asm/sn/sn0/hub.h>
-#include <asm/sn/sn_private.h>
-
-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);
-
-static void get_rtc_time(struct rtc_time *rtc_tm);
-
-/*
- *     Bits in rtc_status. (6 bits of room for future expansion)
- */
-
-#define RTC_IS_OPEN            0x01    /* means /dev/rtc is in use     */
-#define RTC_TIMER_ON           0x02    /* missed irq timer active      */
-
-static unsigned char rtc_status;       /* bitmapped status byte.       */
-static unsigned long rtc_freq; /* Current periodic IRQ rate    */
-static struct m48t35_rtc *rtc;
-
-/*
- *     If this driver ever becomes modularised, it will be really nice
- *     to make the epoch retain its value across module reload...
- */
-
-static unsigned long epoch = 1970;     /* year corresponding to 0x00   */
-
-static const unsigned char days_in_mo[] =
-{0, 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31};
-
-static int rtc_ioctl(struct inode *inode, struct file *file, unsigned int cmd,
-                    unsigned long arg)
-{
-
-       struct rtc_time wtime;
-
-       switch (cmd) {
-       case RTC_RD_TIME:       /* Read the time/date from RTC  */
-       {
-               get_rtc_time(&wtime);
-               break;
-       }
-       case RTC_SET_TIME:      /* Set the RTC */
-       {
-               struct rtc_time rtc_tm;
-               unsigned char mon, day, hrs, min, sec, leap_yr;
-               unsigned int yrs;
-
-               if (!capable(CAP_SYS_TIME))
-                       return -EACCES;
-
-               if (copy_from_user(&rtc_tm, (struct rtc_time*)arg,
-                                  sizeof(struct rtc_time)))
-                       return -EFAULT;
-
-               yrs = rtc_tm.tm_year + 1900;
-               mon = rtc_tm.tm_mon + 1;   /* tm_mon starts at zero */
-               day = rtc_tm.tm_mday;
-               hrs = rtc_tm.tm_hour;
-               min = rtc_tm.tm_min;
-               sec = rtc_tm.tm_sec;
-
-               if (yrs < 1970)
-                       return -EINVAL;
-
-               leap_yr = ((!(yrs % 4) && (yrs % 100)) || !(yrs % 400));
-
-               if ((mon > 12) || (day == 0))
-                       return -EINVAL;
-
-               if (day > (days_in_mo[mon] + ((mon == 2) && leap_yr)))
-                       return -EINVAL;
-
-               if ((hrs >= 24) || (min >= 60) || (sec >= 60))
-                       return -EINVAL;
-
-               if ((yrs -= epoch) > 255)    /* They are unsigned */
-                       return -EINVAL;
-
-               if (yrs > 169)
-                       return -EINVAL;
-
-               if (yrs >= 100)
-                       yrs -= 100;
-
-               sec = BIN2BCD(sec);
-               min = BIN2BCD(min);
-               hrs = BIN2BCD(hrs);
-               day = BIN2BCD(day);
-               mon = BIN2BCD(mon);
-               yrs = BIN2BCD(yrs);
-
-               spin_lock_irq(&rtc_lock);
-               rtc->control |= M48T35_RTC_SET;
-               rtc->year = yrs;
-               rtc->month = mon;
-               rtc->date = day;
-               rtc->hour = hrs;
-               rtc->min = min;
-               rtc->sec = sec;
-               rtc->control &= ~M48T35_RTC_SET;
-               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) {
-               spin_unlock_irq(&rtc_lock);
-               return -EBUSY;
-       }
-
-       rtc_status |= RTC_IS_OPEN;
-       spin_unlock_irq(&rtc_lock);
-
-       return 0;
-}
-
-static int rtc_release(struct inode *inode, struct file *file)
-{
-       /*
-        * Turn off all interrupts once the device is no longer
-        * in use, and clear the data.
-        */
-
-       spin_lock_irq(&rtc_lock);
-       rtc_status &= ~RTC_IS_OPEN;
-       spin_unlock_irq(&rtc_lock);
-
-       return 0;
-}
-
-/*
- *     The various file operations we support.
- */
-
-static struct file_operations rtc_fops = {
-       .owner          = THIS_MODULE,
-       .ioctl          = rtc_ioctl,
-       .open           = rtc_open,
-       .release        = rtc_release,
-};
-
-static struct miscdevice rtc_dev=
-{
-       RTC_MINOR,
-       "rtc",
-       &rtc_fops
-};
-
-static int __init rtc_init(void)
-{
-       rtc = (struct m48t35_rtc *)
-       (KL_CONFIG_CH_CONS_INFO(master_nasid)->memory_base + IOC3_BYTEBUS_DEV0);
-
-       printk(KERN_INFO "Real Time Clock Driver v%s\n", RTC_VERSION);
-       if (misc_register(&rtc_dev)) {
-               printk(KERN_ERR "rtc: cannot register misc device.\n");
-               return -ENODEV;
-       }
-       if (!create_proc_read_entry("driver/rtc", 0, NULL, rtc_read_proc, NULL)) {
-               printk(KERN_ERR "rtc: cannot create /proc/rtc.\n");
-               misc_deregister(&rtc_dev);
-               return -ENOENT;
-       }
-
-       rtc_freq = 1024;
-
-       return 0;
-}
-
-static void __exit rtc_exit (void)
-{
-       /* interrupts and timer disabled at this point by rtc_release */
-
-       remove_proc_entry ("rtc", NULL);
-       misc_deregister(&rtc_dev);
-}
-
-module_init(rtc_init);
-module_exit(rtc_exit);
-
-/*
- *     Info exported via "/proc/rtc".
- */
-
-static int rtc_get_status(char *buf)
-{
-       char *p;
-       struct rtc_time tm;
-
-       /*
-        * Just emulate the standard /proc/rtc
-        */
-
-       p = buf;
-
-       get_rtc_time(&tm);
-
-       /*
-        * 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.
-        */
-       p += sprintf(p,
-                    "rtc_time\t: %02d:%02d:%02d\n"
-                    "rtc_date\t: %04d-%02d-%02d\n"
-                    "rtc_epoch\t: %04lu\n"
-                    "24hr\t\t: yes\n",
-                    tm.tm_hour, tm.tm_min, tm.tm_sec,
-                    tm.tm_year + 1900, tm.tm_mon + 1, tm.tm_mday, epoch);
-
-       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;
-}
-
-static void get_rtc_time(struct rtc_time *rtc_tm)
-{
-       /*
-        * Do we need to wait for the last update to finish?
-        */
-
-       /*
-        * Only the values that we read from the RTC are set. We leave
-        * tm_wday, tm_yday and tm_isdst untouched. Even though the
-        * RTC has RTC_DAY_OF_WEEK, we ignore it, as it is only updated
-        * by the RTC when initially set to a non-zero value.
-        */
-       spin_lock_irq(&rtc_lock);
-       rtc->control |= M48T35_RTC_READ;
-       rtc_tm->tm_sec = rtc->sec;
-       rtc_tm->tm_min = rtc->min;
-       rtc_tm->tm_hour = rtc->hour;
-       rtc_tm->tm_mday = rtc->date;
-       rtc_tm->tm_mon = rtc->month;
-       rtc_tm->tm_year = rtc->year;
-       rtc->control &= ~M48T35_RTC_READ;
-       spin_unlock_irq(&rtc_lock);
-
-       rtc_tm->tm_sec = BCD2BIN(rtc_tm->tm_sec);
-       rtc_tm->tm_min = BCD2BIN(rtc_tm->tm_min);
-       rtc_tm->tm_hour = BCD2BIN(rtc_tm->tm_hour);
-       rtc_tm->tm_mday = BCD2BIN(rtc_tm->tm_mday);
-       rtc_tm->tm_mon = BCD2BIN(rtc_tm->tm_mon);
-       rtc_tm->tm_year = BCD2BIN(rtc_tm->tm_year);
-
-       /*
-        * Account for differences between how the RTC uses the values
-        * and how they are defined in a struct rtc_time;
-        */
-       if ((rtc_tm->tm_year += (epoch - 1900)) <= 69)
-               rtc_tm->tm_year += 100;
-
-       rtc_tm->tm_mon--;
-}
diff --git a/drivers/char/lcd.h b/drivers/char/lcd.h
deleted file mode 100644 (file)
index 8aed498..0000000
+++ /dev/null
@@ -1,184 +0,0 @@
-/*
- * LED, LCD and Button panel driver for Cobalt
- *
- * 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) 1996, 1997 by Andrew Bose
- *
- * Linux kernel version history:
- *       March 2001: Ported from 2.0.34  by Liam Davies
- *
- */
-
-// function headers
-
-static int dqpoll(volatile unsigned long, volatile unsigned char );
-static int timeout(volatile unsigned long);
-
-#define LCD_CHARS_PER_LINE 40
-#define FLASH_SIZE 524288
-#define MAX_IDLE_TIME 120
-
-struct lcd_display {
-        unsigned long buttons;
-        int size1;
-        int size2;
-        unsigned char line1[LCD_CHARS_PER_LINE];
-        unsigned char line2[LCD_CHARS_PER_LINE];
-        unsigned char cursor_address;
-        unsigned char character;
-        unsigned char leds;
-        unsigned char *RomImage;
-};
-
-
-
-#define LCD_DRIVER     "Cobalt LCD Driver v2.10"
-
-#define kLCD_IR                0x0F000000
-#define kLCD_DR                0x0F000010
-#define kGPI           0x0D000000
-#define kLED           0x0C000000
-
-#define kDD_R00         0x00
-#define kDD_R01         0x27
-#define kDD_R10         0x40
-#define kDD_R11         0x67
-
-#define kLCD_Addr       0x00000080
-
-#define LCDTimeoutValue        0xfff
-
-
-// Flash definitions AMD 29F040
-#define kFlashBase     0x0FC00000
-
-#define kFlash_Addr1    0x5555
-#define kFlash_Addr2    0x2AAA
-#define kFlash_Data1    0xAA
-#define kFlash_Data2    0x55
-#define kFlash_Prog     0xA0
-#define kFlash_Erase3   0x80
-#define kFlash_Erase6   0x10
-#define kFlash_Read     0xF0
-
-#define kFlash_ID       0x90
-#define kFlash_VenAddr  0x00
-#define kFlash_DevAddr  0x01
-#define kFlash_VenID    0x01
-#define kFlash_DevID    0xA4    // 29F040
-//#define kFlash_DevID  0xAD    // 29F016
-
-
-// Macros
-
-#define LCDWriteData(x)        outl((x << 24), kLCD_DR)
-#define LCDWriteInst(x)        outl((x << 24), kLCD_IR)
-
-#define LCDReadData    (inl(kLCD_DR) >> 24)
-#define LCDReadInst    (inl(kLCD_IR) >> 24)
-
-#define GPIRead                (inl(kGPI) >> 24)
-
-#define LEDSet(x)      outb((char)x, kLED)
-
-#define WRITE_GAL(x,y) outl(y, 0x04000000 | (x))
-#define BusyCheck()    while ((LCDReadInst & 0x80) == 0x80)
-
-#define WRITE_FLASH(x,y) outb((char)y, kFlashBase | (x))
-#define READ_FLASH(x)  (inb(kFlashBase | (x)))
-
-
-
-/*
- * Function command codes for io_ctl.
- */
-#define LCD_On                 1
-#define LCD_Off                        2
-#define LCD_Clear              3
-#define LCD_Reset              4
-#define LCD_Cursor_Left                5
-#define LCD_Cursor_Right       6
-#define LCD_Disp_Left          7
-#define LCD_Disp_Right         8
-#define LCD_Get_Cursor         9
-#define LCD_Set_Cursor         10
-#define LCD_Home               11
-#define LCD_Read               12
-#define LCD_Write              13
-#define LCD_Cursor_Off         14
-#define LCD_Cursor_On          15
-#define LCD_Get_Cursor_Pos     16
-#define LCD_Set_Cursor_Pos     17
-#define LCD_Blink_Off           18
-
-#define LED_Set                        40
-#define LED_Bit_Set            41
-#define LED_Bit_Clear          42
-
-
-//  Button defs
-#define BUTTON_Read             50
-
-//  Flash command codes
-#define FLASH_Erase            60
-#define FLASH_Burn             61
-#define FLASH_Read             62
-
-
-// Ethernet LINK check hackaroo
-#define LINK_Check              90
-#define LINK_Check_2           91
-
-//  Button patterns  _B - single layer lcd boards
-
-#define BUTTON_NONE               0x3F
-#define BUTTON_NONE_B             0xFE
-
-#define BUTTON_Left               0x3B
-#define BUTTON_Left_B             0xFA
-
-#define BUTTON_Right              0x37
-#define BUTTON_Right_B            0xDE
-
-#define BUTTON_Up                 0x2F
-#define BUTTON_Up_B               0xF6
-
-#define BUTTON_Down               0x1F
-#define BUTTON_Down_B             0xEE
-
-#define BUTTON_Next               0x3D
-#define BUTTON_Next_B             0x7E
-
-#define BUTTON_Enter              0x3E
-#define BUTTON_Enter_B            0xBE
-
-#define BUTTON_Reset_B            0xFC
-
-
-// debounce constants
-
-#define BUTTON_SENSE            160000
-#define BUTTON_DEBOUNCE                5000
-
-
-//  Galileo register stuff
-
-#define kGal_DevBank2Cfg        0x1466DB33
-#define kGal_DevBank2PReg       0x464
-#define kGal_DevBank3Cfg        0x146FDFFB
-#define kGal_DevBank3PReg       0x468
-
-// Network
-
-#define kIPADDR                        1
-#define kNETMASK               2
-#define kGATEWAY               3
-#define kDNS                   4
-
-#define kClassA                        5
-#define kClassB                        6
-#define kClassC                        7
-
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/firmware/pcdp.c b/drivers/firmware/pcdp.c
deleted file mode 100644 (file)
index 61457c5..0000000
+++ /dev/null
@@ -1,213 +0,0 @@
-/*
- * Copyright (C) 2002, 2003, 2004 Hewlett-Packard Co.
- *     Khalid Aziz <khalid_aziz@hp.com>
- *     Alex Williamson <alex.williamson@hp.com>
- *     Bjorn Helgaas <bjorn.helgaas@hp.com>
- *
- * Parse the EFI PCDP table to locate the console device.
- */
-
-#include <linux/acpi.h>
-#include <linux/console.h>
-#include <linux/efi.h>
-#include <linux/tty.h>
-#include <linux/serial.h>
-#include <linux/serial_core.h>
-#include <asm/io.h>
-#include <asm/serial.h>
-#include "pcdp.h"
-
-static inline int
-uart_irq_supported(int rev, struct pcdp_uart *uart)
-{
-       if (rev < 3)
-               return uart->pci_func & PCDP_UART_IRQ;
-       return uart->flags & PCDP_UART_IRQ;
-}
-
-static inline int
-uart_pci(int rev, struct pcdp_uart *uart)
-{
-       if (rev < 3)
-               return uart->pci_func & PCDP_UART_PCI;
-       return uart->flags & PCDP_UART_PCI;
-}
-
-static inline int
-uart_active_high_low(int rev, struct pcdp_uart *uart)
-{
-       if (uart_pci(rev, uart) || uart->flags & PCDP_UART_ACTIVE_LOW)
-               return ACPI_ACTIVE_LOW;
-       return ACPI_ACTIVE_HIGH;
-}
-
-static inline int
-uart_edge_level(int rev, struct pcdp_uart *uart)
-{
-       if (uart_pci(rev, uart))
-               return ACPI_LEVEL_SENSITIVE;
-       if (rev < 3 || uart->flags & PCDP_UART_EDGE_SENSITIVE)
-               return ACPI_EDGE_SENSITIVE;
-       return ACPI_LEVEL_SENSITIVE;
-}
-
-static void __init
-setup_serial_console(int rev, struct pcdp_uart *uart)
-{
-#ifdef CONFIG_SERIAL_8250_CONSOLE
-       struct uart_port port;
-       static char options[16];
-       int mapsize = 64;
-
-       memset(&port, 0, sizeof(port));
-       port.uartclk = uart->clock_rate;
-       if (!port.uartclk)      /* some FW doesn't supply this */
-               port.uartclk = BASE_BAUD * 16;
-
-       if (uart->addr.address_space_id == ACPI_ADR_SPACE_SYSTEM_MEMORY) {
-               port.mapbase = uart->addr.address;
-               port.membase = ioremap(port.mapbase, mapsize);
-               if (!port.membase) {
-                       printk(KERN_ERR "%s: couldn't ioremap 0x%lx-0x%lx\n",
-                               __FUNCTION__, port.mapbase, port.mapbase + mapsize);
-                       return;
-               }
-               port.iotype = UPIO_MEM;
-       } else if (uart->addr.address_space_id == ACPI_ADR_SPACE_SYSTEM_IO) {
-               port.iobase = uart->addr.address;
-               port.iotype = UPIO_PORT;
-       } else
-               return;
-
-       switch (uart->pci_prog_intfc) {
-               case 0x0: port.type = PORT_8250;    break;
-               case 0x1: port.type = PORT_16450;   break;
-               case 0x2: port.type = PORT_16550;   break;
-               case 0x3: port.type = PORT_16650;   break;
-               case 0x4: port.type = PORT_16750;   break;
-               case 0x5: port.type = PORT_16850;   break;
-               case 0x6: port.type = PORT_16C950;  break;
-               default:  port.type = PORT_UNKNOWN; break;
-       }
-
-       port.flags = UPF_SKIP_TEST | UPF_BOOT_AUTOCONF;
-
-       if (uart_irq_supported(rev, uart)) {
-               port.irq = acpi_register_gsi(uart->gsi,
-                       uart_active_high_low(rev, uart),
-                       uart_edge_level(rev, uart));
-               port.flags |= UPF_AUTO_IRQ;  /* some FW reported wrong GSI */
-               if (uart_pci(rev, uart))
-                       port.flags |= UPF_SHARE_IRQ;
-       }
-
-       if (early_serial_setup(&port) < 0)
-               return;
-
-       snprintf(options, sizeof(options), "%lun%d", uart->baud,
-               uart->bits ? uart->bits : 8);
-       add_preferred_console("ttyS", port.line, options);
-
-       printk(KERN_INFO "PCDP: serial console at %s 0x%lx (ttyS%d, options %s)\n",
-               port.iotype == UPIO_MEM ? "MMIO" : "I/O",
-               uart->addr.address, port.line, options);
-#endif
-}
-
-static void __init
-setup_vga_console(struct pcdp_vga *vga)
-{
-#ifdef CONFIG_VT
-#ifdef CONFIG_VGA_CONSOLE
-       if (efi_mem_type(0xA0000) == EFI_CONVENTIONAL_MEMORY) {
-               printk(KERN_ERR "PCDP: VGA selected, but frame buffer is not MMIO!\n");
-               return;
-       }
-
-       conswitchp = &vga_con;
-       printk(KERN_INFO "PCDP: VGA console\n");
-#endif
-#endif
-}
-
-void __init
-efi_setup_pcdp_console(char *cmdline)
-{
-       struct pcdp *pcdp;
-       struct pcdp_uart *uart;
-       struct pcdp_device *dev, *end;
-       int i, serial = 0;
-
-       pcdp = efi.hcdp;
-       if (!pcdp)
-               return;
-
-       printk(KERN_INFO "PCDP: v%d at 0x%p\n", pcdp->rev, pcdp);
-
-       if (pcdp->rev < 3) {
-               if (strstr(cmdline, "console=ttyS0") || efi_uart_console_only())
-                       serial = 1;
-       }
-
-       for (i = 0, uart = pcdp->uart; i < pcdp->num_uarts; i++, uart++) {
-               if (uart->flags & PCDP_UART_PRIMARY_CONSOLE || serial) {
-                       if (uart->type == PCDP_CONSOLE_UART) {
-                               setup_serial_console(pcdp->rev, uart);
-                               return;
-                       }
-               }
-       }
-
-       end = (struct pcdp_device *) ((u8 *) pcdp + pcdp->length);
-       for (dev = (struct pcdp_device *) (pcdp->uart + pcdp->num_uarts);
-            dev < end;
-            dev = (struct pcdp_device *) ((u8 *) dev + dev->length)) {
-               if (dev->flags & PCDP_PRIMARY_CONSOLE) {
-                       if (dev->type == PCDP_CONSOLE_VGA) {
-                               setup_vga_console((struct pcdp_vga *) dev);
-                               return;
-                       }
-               }
-       }
-}
-
-#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;
-       struct pcdp *pcdp = 0;
-       struct pcdp_uart *uart;
-       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) {
-                       pcdp = (struct pcdp *) config_tables[i].table;
-                       break;
-               }
-       }
-       if (!pcdp)
-               return 0;
-       pcdp = __va(pcdp);
-
-       for (i = 0, uart = pcdp->uart; i < pcdp->num_uarts; i++, uart++) {
-               if (uart->type == PCDP_CONSOLE_UART) {
-                       addr = uart->addr.address;
-                       break;
-               }
-       }
-       return addr;
-}
-#endif /* CONFIG_IA64_EARLY_PRINTK_UART */
diff --git a/drivers/firmware/pcdp.h b/drivers/firmware/pcdp.h
deleted file mode 100644 (file)
index 4217c3b..0000000
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
- * Copyright (C) 2002, 2004 Hewlett-Packard Co.
- *     Khalid Aziz <khalid_aziz@hp.com>
- *     Bjorn Helgaas <bjorn.helgaas@hp.com>
- *
- * Definitions for PCDP-defined console devices
- *
- * v1.0a: http://www.dig64.org/specifications/DIG64_HCDPv10a_01.pdf
- * v2.0:  http://www.dig64.org/specifications/DIG64_HCDPv20_042804.pdf
- */
-
-#define PCDP_CONSOLE                   0
-#define PCDP_DEBUG                     1
-#define PCDP_CONSOLE_OUTPUT            2
-#define PCDP_CONSOLE_INPUT             3
-
-#define PCDP_UART                      (0 << 3)
-#define PCDP_VGA                       (1 << 3)
-#define PCDP_USB                       (2 << 3)
-
-/* pcdp_uart.type and pcdp_device.type */
-#define PCDP_CONSOLE_UART              (PCDP_UART | PCDP_CONSOLE)
-#define PCDP_DEBUG_UART                        (PCDP_UART | PCDP_DEBUG)
-#define PCDP_CONSOLE_VGA               (PCDP_VGA  | PCDP_CONSOLE_OUTPUT)
-#define PCDP_CONSOLE_USB               (PCDP_USB  | PCDP_CONSOLE_INPUT)
-
-/* pcdp_uart.flags */
-#define PCDP_UART_EDGE_SENSITIVE       (1 << 0)
-#define PCDP_UART_ACTIVE_LOW           (1 << 1)
-#define PCDP_UART_PRIMARY_CONSOLE      (1 << 2)
-#define PCDP_UART_IRQ                  (1 << 6) /* in pci_func for rev < 3 */
-#define PCDP_UART_PCI                  (1 << 7) /* in pci_func for rev < 3 */
-
-struct pcdp_uart {
-       u8                              type;
-       u8                              bits;
-       u8                              parity;
-       u8                              stop_bits;
-       u8                              pci_seg;
-       u8                              pci_bus;
-       u8                              pci_dev;
-       u8                              pci_func;
-       u64                             baud;
-       struct acpi_generic_address     addr;
-       u16                             pci_dev_id;
-       u16                             pci_vendor_id;
-       u32                             gsi;
-       u32                             clock_rate;
-       u8                              pci_prog_intfc;
-       u8                              flags;
-};
-
-struct pcdp_vga {
-       u8                      count;          /* address space descriptors */
-};
-
-/* pcdp_device.flags */
-#define PCDP_PRIMARY_CONSOLE   1
-
-struct pcdp_device {
-       u8                      type;
-       u8                      flags;
-       u16                     length;
-       u16                     efi_index;
-};
-
-struct pcdp {
-       u8                      signature[4];
-       u32                     length;
-       u8                      rev;            /* PCDP v2.0 is rev 3 */
-       u8                      chksum;
-       u8                      oemid[6];
-       u8                      oem_tabid[8];
-       u32                     oem_rev;
-       u8                      creator_id[4];
-       u32                     creator_rev;
-       u32                     num_uarts;
-       struct pcdp_uart        uart[0];        /* actual size is num_uarts */
-       /* remainder of table is pcdp_device structures */
-};
diff --git a/drivers/i2c/chips/adm1025.c b/drivers/i2c/chips/adm1025.c
deleted file mode 100644 (file)
index d38336f..0000000
+++ /dev/null
@@ -1,570 +0,0 @@
-/*
- * adm1025.c
- *
- * Copyright (C) 2000       Chen-Yuan Wu <gwu@esoft.com>
- * Copyright (C) 2003-2004  Jean Delvare <khali@linux-fr.org>
- *
- * The ADM1025 is a sensor chip made by Analog Devices. It reports up to 6
- * voltages (including its own power source) and up to two temperatures
- * (its own plus up to one external one). Voltages are scaled internally
- * (which is not the common way) with ratios such that the nominal value
- * of each voltage correspond to a register value of 192 (which means a
- * resolution of about 0.5% of the nominal value). Temperature values are
- * reported with a 1 deg resolution and a 3 deg accuracy. Complete
- * datasheet can be obtained from Analog's website at:
- *   http://www.analog.com/Analog_Root/productPage/productHome/0,2121,ADM1025,00.html
- *
- * This driver also supports the ADM1025A, which differs from the ADM1025
- * only in that it has "open-drain VID inputs while the ADM1025 has
- * on-chip 100k pull-ups on the VID inputs". It doesn't make any
- * difference for us.
- *
- * This driver also supports the NE1619, a sensor chip made by Philips.
- * That chip is similar to the ADM1025A, with a few differences. The only
- * difference that matters to us is that the NE1619 has only two possible
- * addresses while the ADM1025A has a third one. Complete datasheet can be
- * obtained from Philips's website at:
- *   http://www.semiconductors.philips.com/pip/NE1619DS.html
- *
- * Since the ADM1025 was the first chipset supported by this driver, most
- * comments will refer to this chipset, but are actually general and
- * concern all supported chipsets, unless mentioned otherwise.
- *
- * 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.
- */
-
-#include <linux/config.h>
-#include <linux/module.h>
-#include <linux/init.h>
-#include <linux/slab.h>
-#include <linux/i2c.h>
-#include <linux/i2c-sensor.h>
-#include <linux/i2c-vid.h>
-
-/*
- * Addresses to scan
- * ADM1025 and ADM1025A have three possible addresses: 0x2c, 0x2d and 0x2e.
- * NE1619 has two possible addresses: 0x2c and 0x2d.
- */
-
-static unsigned short normal_i2c[] = { I2C_CLIENT_END };
-static unsigned short normal_i2c_range[] = { 0x2c, 0x2e, I2C_CLIENT_END };
-static unsigned int normal_isa[] = { I2C_CLIENT_ISA_END };
-static unsigned int normal_isa_range[] = { I2C_CLIENT_ISA_END };
-
-/*
- * Insmod parameters
- */
-
-SENSORS_INSMOD_2(adm1025, ne1619);
-
-/*
- * The ADM1025 registers
- */
-
-#define ADM1025_REG_MAN_ID             0x3E
-#define ADM1025_REG_CHIP_ID            0x3F
-#define ADM1025_REG_CONFIG             0x40
-#define ADM1025_REG_STATUS1            0x41
-#define ADM1025_REG_STATUS2            0x42
-#define ADM1025_REG_IN(nr)             (0x20 + (nr))
-#define ADM1025_REG_IN_MAX(nr)         (0x2B + (nr) * 2)
-#define ADM1025_REG_IN_MIN(nr)         (0x2C + (nr) * 2)
-#define ADM1025_REG_TEMP(nr)           (0x26 + (nr))
-#define ADM1025_REG_TEMP_HIGH(nr)      (0x37 + (nr) * 2)
-#define ADM1025_REG_TEMP_LOW(nr)       (0x38 + (nr) * 2)
-#define ADM1025_REG_VID                        0x47
-#define ADM1025_REG_VID4               0x49
-
-/*
- * Conversions and various macros
- * The ADM1025 uses signed 8-bit values for temperatures.
- */
-
-static int in_scale[6] = { 2500, 2250, 3300, 5000, 12000, 3300 };
-
-#define IN_FROM_REG(reg,scale) (((reg) * (scale) + 96) / 192)
-#define IN_TO_REG(val,scale)   ((val) <= 0 ? 0 : \
-                                (val) * 192 >= (scale) * 255 ? 255 : \
-                                ((val) * 192 + (scale)/2) / (scale))
-
-#define TEMP_FROM_REG(reg)     ((reg) * 1000)
-#define TEMP_TO_REG(val)       ((val) <= -127500 ? -128 : \
-                                (val) >= 126500 ? 127 : \
-                                (((val) < 0 ? (val)-500 : (val)+500) / 1000))
-
-/*
- * Functions declaration
- */
-
-static int adm1025_attach_adapter(struct i2c_adapter *adapter);
-static int adm1025_detect(struct i2c_adapter *adapter, int address, int kind);
-static void adm1025_init_client(struct i2c_client *client);
-static int adm1025_detach_client(struct i2c_client *client);
-static struct adm1025_data *adm1025_update_device(struct device *dev);
-
-/*
- * Driver data (common to all clients)
- */
-
-static struct i2c_driver adm1025_driver = {
-       .owner          = THIS_MODULE,
-       .name           = "adm1025",
-       .id             = I2C_DRIVERID_ADM1025,
-       .flags          = I2C_DF_NOTIFY,
-       .attach_adapter = adm1025_attach_adapter,
-       .detach_client  = adm1025_detach_client,
-};
-
-/*
- * Client data (each client gets its own)
- */
-
-struct adm1025_data {
-       struct i2c_client client;
-       struct semaphore update_lock;
-       char valid; /* zero until following fields are valid */
-       unsigned long last_updated; /* in jiffies */
-
-       u8 in[6];               /* register value */
-       u8 in_max[6];           /* register value */
-       u8 in_min[6];           /* register value */
-       s8 temp[2];             /* register value */
-       s8 temp_min[2];         /* register value */
-       s8 temp_max[2];         /* register value */
-       u16 alarms;             /* register values, combined */
-       u8 vid;                 /* register values, combined */
-       u8 vrm;
-};
-
-/*
- * Internal variables
- */
-
-static int adm1025_id = 0;
-
-/*
- * Sysfs stuff
- */
-
-#define show_in(offset) \
-static ssize_t show_in##offset(struct device *dev, char *buf) \
-{ \
-       struct adm1025_data *data = adm1025_update_device(dev); \
-       return sprintf(buf, "%u\n", IN_FROM_REG(data->in[offset], \
-                      in_scale[offset])); \
-} \
-static ssize_t show_in##offset##_min(struct device *dev, char *buf) \
-{ \
-       struct adm1025_data *data = adm1025_update_device(dev); \
-       return sprintf(buf, "%u\n", IN_FROM_REG(data->in_min[offset], \
-                      in_scale[offset])); \
-} \
-static ssize_t show_in##offset##_max(struct device *dev, char *buf) \
-{ \
-       struct adm1025_data *data = adm1025_update_device(dev); \
-       return sprintf(buf, "%u\n", IN_FROM_REG(data->in_max[offset], \
-                      in_scale[offset])); \
-} \
-static DEVICE_ATTR(in##offset##_input, S_IRUGO, show_in##offset, NULL);
-show_in(0);
-show_in(1);
-show_in(2);
-show_in(3);
-show_in(4);
-show_in(5);
-
-#define show_temp(offset) \
-static ssize_t show_temp##offset(struct device *dev, char *buf) \
-{ \
-       struct adm1025_data *data = adm1025_update_device(dev); \
-       return sprintf(buf, "%d\n", TEMP_FROM_REG(data->temp[offset-1])); \
-} \
-static ssize_t show_temp##offset##_min(struct device *dev, char *buf) \
-{ \
-       struct adm1025_data *data = adm1025_update_device(dev); \
-       return sprintf(buf, "%d\n", TEMP_FROM_REG(data->temp_min[offset-1])); \
-} \
-static ssize_t show_temp##offset##_max(struct device *dev, char *buf) \
-{ \
-       struct adm1025_data *data = adm1025_update_device(dev); \
-       return sprintf(buf, "%d\n", TEMP_FROM_REG(data->temp_max[offset-1])); \
-}\
-static DEVICE_ATTR(temp##offset##_input, S_IRUGO, show_temp##offset, NULL);
-show_temp(1);
-show_temp(2);
-
-#define set_in(offset) \
-static ssize_t set_in##offset##_min(struct device *dev, const char *buf, \
-       size_t count) \
-{ \
-       struct i2c_client *client = to_i2c_client(dev); \
-       struct adm1025_data *data = i2c_get_clientdata(client); \
-       data->in_min[offset] = IN_TO_REG(simple_strtol(buf, NULL, 10), \
-                              in_scale[offset]); \
-       i2c_smbus_write_byte_data(client, ADM1025_REG_IN_MIN(offset), \
-                                 data->in_min[offset]); \
-       return count; \
-} \
-static ssize_t set_in##offset##_max(struct device *dev, const char *buf, \
-       size_t count) \
-{ \
-       struct i2c_client *client = to_i2c_client(dev); \
-       struct adm1025_data *data = i2c_get_clientdata(client); \
-       data->in_max[offset] = IN_TO_REG(simple_strtol(buf, NULL, 10), \
-                              in_scale[offset]); \
-       i2c_smbus_write_byte_data(client, ADM1025_REG_IN_MAX(offset), \
-                                 data->in_max[offset]); \
-       return count; \
-} \
-static DEVICE_ATTR(in##offset##_min, S_IWUSR | S_IRUGO, \
-       show_in##offset##_min, set_in##offset##_min); \
-static DEVICE_ATTR(in##offset##_max, S_IWUSR | S_IRUGO, \
-       show_in##offset##_max, set_in##offset##_max);
-set_in(0);
-set_in(1);
-set_in(2);
-set_in(3);
-set_in(4);
-set_in(5);
-
-#define set_temp(offset) \
-static ssize_t set_temp##offset##_min(struct device *dev, const char *buf, \
-       size_t count) \
-{ \
-       struct i2c_client *client = to_i2c_client(dev); \
-       struct adm1025_data *data = i2c_get_clientdata(client); \
-       data->temp_min[offset-1] = TEMP_TO_REG(simple_strtol(buf, NULL, 10)); \
-       i2c_smbus_write_byte_data(client, ADM1025_REG_TEMP_LOW(offset-1), \
-                                 data->temp_min[offset-1]); \
-       return count; \
-} \
-static ssize_t set_temp##offset##_max(struct device *dev, const char *buf, \
-       size_t count) \
-{ \
-       struct i2c_client *client = to_i2c_client(dev); \
-       struct adm1025_data *data = i2c_get_clientdata(client); \
-       data->temp_max[offset-1] = TEMP_TO_REG(simple_strtol(buf, NULL, 10)); \
-       i2c_smbus_write_byte_data(client, ADM1025_REG_TEMP_HIGH(offset-1), \
-                                 data->temp_max[offset-1]); \
-       return count; \
-} \
-static DEVICE_ATTR(temp##offset##_min, S_IWUSR | S_IRUGO, \
-       show_temp##offset##_min, set_temp##offset##_min); \
-static DEVICE_ATTR(temp##offset##_max, S_IWUSR | S_IRUGO, \
-       show_temp##offset##_max, set_temp##offset##_max);
-set_temp(1);
-set_temp(2);
-
-static ssize_t show_alarms(struct device *dev, char *buf)
-{
-       struct adm1025_data *data = adm1025_update_device(dev);
-       return sprintf(buf, "%u\n", data->alarms);
-}
-static DEVICE_ATTR(alarms, S_IRUGO, show_alarms, NULL);
-
-static ssize_t show_vid(struct device *dev, char *buf)
-{
-       struct adm1025_data *data = adm1025_update_device(dev);
-       return sprintf(buf, "%u\n", vid_from_reg(data->vid, data->vrm));
-}
-static DEVICE_ATTR(in1_ref, S_IRUGO, show_vid, NULL);
-
-static ssize_t show_vrm(struct device *dev, char *buf)
-{
-       struct adm1025_data *data = adm1025_update_device(dev);
-       return sprintf(buf, "%u\n", data->vrm);
-}
-static ssize_t set_vrm(struct device *dev, const char *buf, size_t count)
-{
-       struct i2c_client *client = to_i2c_client(dev);
-       struct adm1025_data *data = i2c_get_clientdata(client);
-       data->vrm = simple_strtoul(buf, NULL, 10);
-       return count;
-}
-static DEVICE_ATTR(vrm, S_IRUGO | S_IWUSR, show_vrm, set_vrm);
-
-/*
- * Real code
- */
-
-static int adm1025_attach_adapter(struct i2c_adapter *adapter)
-{
-       if (!(adapter->class & I2C_CLASS_HWMON))
-               return 0;
-       return i2c_detect(adapter, &addr_data, adm1025_detect);
-}
-
-/*
- * The following function does more than just detection. If detection
- * succeeds, it also registers the new chip.
- */
-static int adm1025_detect(struct i2c_adapter *adapter, int address, int kind)
-{
-       struct i2c_client *new_client;
-       struct adm1025_data *data;
-       int err = 0;
-       const char *name = "";
-       u8 config;
-
-       if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_BYTE_DATA))
-               goto exit;
-
-       if (!(data = kmalloc(sizeof(struct adm1025_data), GFP_KERNEL))) {
-               err = -ENOMEM;
-               goto exit;
-       }
-       memset(data, 0, sizeof(struct adm1025_data));
-
-       /* The common I2C client data is placed right before the
-          ADM1025-specific data. */
-       new_client = &data->client;
-       i2c_set_clientdata(new_client, data);
-       new_client->addr = address;
-       new_client->adapter = adapter;
-       new_client->driver = &adm1025_driver;
-       new_client->flags = 0;
-
-       /*
-        * Now we do the remaining detection. A negative kind means that
-        * the driver was loaded with no force parameter (default), so we
-        * must both detect and identify the chip. A zero kind means that
-        * the driver was loaded with the force parameter, the detection
-        * step shall be skipped. A positive kind means that the driver
-        * was loaded with the force parameter and a given kind of chip is
-        * requested, so both the detection and the identification steps
-        * are skipped.
-        */
-       config = i2c_smbus_read_byte_data(new_client, ADM1025_REG_CONFIG);
-       if (kind < 0) { /* detection */
-               if ((config & 0x80) != 0x00
-                || (i2c_smbus_read_byte_data(new_client,
-                    ADM1025_REG_STATUS1) & 0xC0) != 0x00
-                || (i2c_smbus_read_byte_data(new_client,
-                    ADM1025_REG_STATUS2) & 0xBC) != 0x00) {
-                       dev_dbg(&adapter->dev,
-                               "ADM1025 detection failed at 0x%02x.\n",
-                               address);
-                       goto exit_free;
-               }
-       }
-
-       if (kind <= 0) { /* identification */
-               u8 man_id, chip_id;
-
-               man_id = i2c_smbus_read_byte_data(new_client,
-                        ADM1025_REG_MAN_ID);
-               chip_id = i2c_smbus_read_byte_data(new_client,
-                         ADM1025_REG_CHIP_ID);
-               
-               if (man_id == 0x41) { /* Analog Devices */
-                       if ((chip_id & 0xF0) == 0x20) { /* ADM1025/ADM1025A */
-                               kind = adm1025;
-                       }
-               } else
-               if (man_id == 0xA1) { /* Philips */
-                       if (address != 0x2E
-                        && (chip_id & 0xF0) == 0x20) { /* NE1619 */
-                               kind = ne1619;
-                       }
-               }
-
-               if (kind <= 0) { /* identification failed */
-                       dev_info(&adapter->dev,
-                           "Unsupported chip (man_id=0x%02X, "
-                           "chip_id=0x%02X).\n", man_id, chip_id);
-                       goto exit_free;
-               }
-       }
-
-       if (kind == adm1025) {
-               name = "adm1025";
-       } else if (kind == ne1619) {
-               name = "ne1619";
-       }
-
-       /* We can fill in the remaining client fields */
-       strlcpy(new_client->name, name, I2C_NAME_SIZE);
-       new_client->id = adm1025_id++;
-       data->valid = 0;
-       init_MUTEX(&data->update_lock);
-
-       /* Tell the I2C layer a new client has arrived */
-       if ((err = i2c_attach_client(new_client)))
-               goto exit_free;
-
-       /* Initialize the ADM1025 chip */
-       adm1025_init_client(new_client);
-
-       /* Register sysfs hooks */
-       device_create_file(&new_client->dev, &dev_attr_in0_input);
-       device_create_file(&new_client->dev, &dev_attr_in1_input);
-       device_create_file(&new_client->dev, &dev_attr_in2_input);
-       device_create_file(&new_client->dev, &dev_attr_in3_input);
-       device_create_file(&new_client->dev, &dev_attr_in5_input);
-       device_create_file(&new_client->dev, &dev_attr_in0_min);
-       device_create_file(&new_client->dev, &dev_attr_in1_min);
-       device_create_file(&new_client->dev, &dev_attr_in2_min);
-       device_create_file(&new_client->dev, &dev_attr_in3_min);
-       device_create_file(&new_client->dev, &dev_attr_in5_min);
-       device_create_file(&new_client->dev, &dev_attr_in0_max);
-       device_create_file(&new_client->dev, &dev_attr_in1_max);
-       device_create_file(&new_client->dev, &dev_attr_in2_max);
-       device_create_file(&new_client->dev, &dev_attr_in3_max);
-       device_create_file(&new_client->dev, &dev_attr_in5_max);
-       device_create_file(&new_client->dev, &dev_attr_temp1_input);
-       device_create_file(&new_client->dev, &dev_attr_temp2_input);
-       device_create_file(&new_client->dev, &dev_attr_temp1_min);
-       device_create_file(&new_client->dev, &dev_attr_temp2_min);
-       device_create_file(&new_client->dev, &dev_attr_temp1_max);
-       device_create_file(&new_client->dev, &dev_attr_temp2_max);
-       device_create_file(&new_client->dev, &dev_attr_alarms);
-       device_create_file(&new_client->dev, &dev_attr_in1_ref);
-       device_create_file(&new_client->dev, &dev_attr_vrm);
-
-       /* Pin 11 is either in4 (+12V) or VID4 */
-       if (!(config & 0x20)) {
-               device_create_file(&new_client->dev, &dev_attr_in4_input);
-               device_create_file(&new_client->dev, &dev_attr_in4_min);
-               device_create_file(&new_client->dev, &dev_attr_in4_max);
-       }
-
-       return 0;
-
-exit_free:
-       kfree(data);
-exit:
-       return err;
-}
-
-static void adm1025_init_client(struct i2c_client *client)
-{
-       u8 reg;
-       struct adm1025_data *data = i2c_get_clientdata(client);
-       int i;
-
-       data->vrm = 82;
-
-       /*
-        * Set high limits
-        * Usually we avoid setting limits on driver init, but it happens
-        * that the ADM1025 comes with stupid default limits (all registers
-        * set to 0). In case the chip has not gone through any limit
-        * setting yet, we better set the high limits to the max so that
-        * no alarm triggers.
-        */
-       for (i=0; i<6; i++) {
-               reg = i2c_smbus_read_byte_data(client,
-                                              ADM1025_REG_IN_MAX(i));
-               if (reg == 0)
-                       i2c_smbus_write_byte_data(client,
-                                                 ADM1025_REG_IN_MAX(i),
-                                                 0xFF);
-       }
-       for (i=0; i<2; i++) {
-               reg = i2c_smbus_read_byte_data(client,
-                                              ADM1025_REG_TEMP_HIGH(i));
-               if (reg == 0)
-                       i2c_smbus_write_byte_data(client,
-                                                 ADM1025_REG_TEMP_HIGH(i),
-                                                 0x7F);
-       }
-
-       /*
-        * Start the conversions
-        */
-       reg = i2c_smbus_read_byte_data(client, ADM1025_REG_CONFIG);
-       if (!(reg & 0x01))
-               i2c_smbus_write_byte_data(client, ADM1025_REG_CONFIG,
-                                         (reg&0x7E)|0x01);
-}
-
-static int adm1025_detach_client(struct i2c_client *client)
-{
-       int err;
-
-       if ((err = i2c_detach_client(client))) {
-               dev_err(&client->dev, "Client deregistration failed, "
-                       "client not detached.\n");
-               return err;
-       }
-
-       kfree(i2c_get_clientdata(client));
-       return 0;
-}
-
-static struct adm1025_data *adm1025_update_device(struct device *dev)
-{
-       struct i2c_client *client = to_i2c_client(dev);
-       struct adm1025_data *data = i2c_get_clientdata(client);
-
-       down(&data->update_lock);
-
-       if ((jiffies - data->last_updated > HZ * 2) ||
-           (jiffies < data->last_updated) ||
-           !data->valid) {
-               int i;
-
-               dev_dbg(&client->dev, "Updating data.\n");
-               for (i=0; i<6; i++) {
-                       data->in[i] = i2c_smbus_read_byte_data(client,
-                                     ADM1025_REG_IN(i));
-                       data->in_min[i] = i2c_smbus_read_byte_data(client,
-                                         ADM1025_REG_IN_MIN(i));
-                       data->in_max[i] = i2c_smbus_read_byte_data(client,
-                                         ADM1025_REG_IN_MAX(i));
-               }
-               for (i=0; i<2; i++) {
-                       data->temp[i] = i2c_smbus_read_byte_data(client,
-                                       ADM1025_REG_TEMP(i));
-                       data->temp_min[i] = i2c_smbus_read_byte_data(client,
-                                           ADM1025_REG_TEMP_LOW(i));
-                       data->temp_max[i] = i2c_smbus_read_byte_data(client,
-                                           ADM1025_REG_TEMP_HIGH(i));
-               }
-               data->alarms = i2c_smbus_read_byte_data(client,
-                              ADM1025_REG_STATUS1)
-                            | (i2c_smbus_read_byte_data(client,
-                               ADM1025_REG_STATUS2) << 8);
-               data->vid = (i2c_smbus_read_byte_data(client,
-                            ADM1025_REG_VID) & 0x0f)
-                         | ((i2c_smbus_read_byte_data(client,
-                             ADM1025_REG_VID4) & 0x01) << 4);
-
-               data->last_updated = jiffies;
-               data->valid = 1;
-       }
-
-       up(&data->update_lock);
-
-       return data;
-}
-
-static int __init sensors_adm1025_init(void)
-{
-       return i2c_add_driver(&adm1025_driver);
-}
-
-static void __exit sensors_adm1025_exit(void)
-{
-       i2c_del_driver(&adm1025_driver);
-}
-
-MODULE_AUTHOR("Jean Delvare <khali@linux-fr.org>");
-MODULE_DESCRIPTION("ADM1025 driver");
-MODULE_LICENSE("GPL");
-
-module_init(sensors_adm1025_init);
-module_exit(sensors_adm1025_exit);
diff --git a/drivers/i2c/chips/adm1031.c b/drivers/i2c/chips/adm1031.c
deleted file mode 100644 (file)
index 23c323e..0000000
+++ /dev/null
@@ -1,985 +0,0 @@
-/*
-  adm1031.c - Part of lm_sensors, Linux kernel modules for hardware
-  monitoring
-  Based on lm75.c and lm85.c
-  Supports adm1030 / adm1031
-  Copyright (C) 2004 Alexandre d'Alton <alex@alexdalton.org>
-  Reworked by Jean Delvare <khali@linux-fr.org>
-  
-  This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; either version 2 of the License, or
-  (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
-#include <linux/module.h>
-#include <linux/init.h>
-#include <linux/slab.h>
-#include <linux/i2c.h>
-#include <linux/i2c-sensor.h>
-
-/* Following macros takes channel parameter starting from 0 to 2 */
-#define ADM1031_REG_FAN_SPEED(nr)      (0x08 + (nr))
-#define ADM1031_REG_FAN_DIV(nr)                (0x20  + (nr))
-#define ADM1031_REG_PWM                        (0x22)
-#define ADM1031_REG_FAN_MIN(nr)                (0x10 + (nr))
-
-#define ADM1031_REG_TEMP_MAX(nr)       (0x14  + 4*(nr))
-#define ADM1031_REG_TEMP_MIN(nr)       (0x15  + 4*(nr))
-#define ADM1031_REG_TEMP_CRIT(nr)      (0x16  + 4*(nr))
-
-#define ADM1031_REG_TEMP(nr)           (0xa + (nr))
-#define ADM1031_REG_AUTO_TEMP(nr)      (0x24 + (nr))
-
-#define ADM1031_REG_STATUS(nr)         (0x2 + (nr))
-
-#define ADM1031_REG_CONF1              0x0
-#define ADM1031_REG_CONF2              0x1
-#define ADM1031_REG_EXT_TEMP           0x6
-
-#define ADM1031_CONF1_MONITOR_ENABLE   0x01    /* Monitoring enable */
-#define ADM1031_CONF1_PWM_INVERT       0x08    /* PWM Invert */
-#define ADM1031_CONF1_AUTO_MODE                0x80    /* Auto FAN */
-
-#define ADM1031_CONF2_PWM1_ENABLE      0x01
-#define ADM1031_CONF2_PWM2_ENABLE      0x02
-#define ADM1031_CONF2_TACH1_ENABLE     0x04
-#define ADM1031_CONF2_TACH2_ENABLE     0x08
-#define ADM1031_CONF2_TEMP_ENABLE(chan)        (0x10 << (chan))
-
-/* Addresses to scan */
-static unsigned short normal_i2c[] = { I2C_CLIENT_END };
-static unsigned short normal_i2c_range[] = { 0x2c, 0x2e, I2C_CLIENT_END };
-static unsigned int normal_isa[] = { I2C_CLIENT_ISA_END };
-static unsigned int normal_isa_range[] = { I2C_CLIENT_ISA_END };
-
-/* Insmod parameters */
-SENSORS_INSMOD_2(adm1030, adm1031);
-
-typedef u8 auto_chan_table_t[8][2];
-
-/* Each client has this additional data */
-struct adm1031_data {
-       struct i2c_client client;
-       struct semaphore update_lock;
-       int chip_type;
-       char valid;             /* !=0 if following fields are valid */
-       unsigned long last_updated;     /* In jiffies */
-       /* The chan_select_table contains the possible configurations for
-        * auto fan control.
-        */
-       auto_chan_table_t *chan_select_table;
-       u16 alarm;
-       u8 conf1;
-       u8 conf2;
-       u8 fan[2];
-       u8 fan_div[2];
-       u8 fan_min[2];
-       u8 pwm[2];
-       u8 old_pwm[2];
-       s8 temp[3];
-       u8 ext_temp[3];
-       u8 auto_temp[3];
-       u8 auto_temp_min[3];
-       u8 auto_temp_off[3];
-       u8 auto_temp_max[3];
-       s8 temp_min[3];
-       s8 temp_max[3];
-       s8 temp_crit[3];
-};
-
-static int adm1031_attach_adapter(struct i2c_adapter *adapter);
-static int adm1031_detect(struct i2c_adapter *adapter, int address, int kind);
-static void adm1031_init_client(struct i2c_client *client);
-static int adm1031_detach_client(struct i2c_client *client);
-static struct adm1031_data *adm1031_update_device(struct device *dev);
-
-/* This is the driver that will be inserted */
-static struct i2c_driver adm1031_driver = {
-       .owner = THIS_MODULE,
-       .name = "adm1031",
-       .flags = I2C_DF_NOTIFY,
-       .attach_adapter = adm1031_attach_adapter,
-       .detach_client = adm1031_detach_client,
-};
-
-static int adm1031_id;
-
-static inline u8 adm1031_read_value(struct i2c_client *client, u8 reg)
-{
-       return i2c_smbus_read_byte_data(client, reg);
-}
-
-static inline int
-adm1031_write_value(struct i2c_client *client, u8 reg, unsigned int value)
-{
-       return i2c_smbus_write_byte_data(client, reg, value);
-}
-
-
-#define TEMP_TO_REG(val)               (((val) < 0 ? ((val - 500) / 1000) : \
-                                       ((val + 500) / 1000)))
-
-#define TEMP_FROM_REG(val)             ((val) * 1000)
-
-#define TEMP_FROM_REG_EXT(val, ext)    (TEMP_FROM_REG(val) + (ext) * 125)
-
-#define FAN_FROM_REG(reg, div)         ((reg) ? (11250 * 60) / ((reg) * (div)) : 0)
-
-static int FAN_TO_REG(int reg, int div)
-{
-       int tmp;
-       tmp = FAN_FROM_REG(SENSORS_LIMIT(reg, 0, 65535), div);
-       return tmp > 255 ? 255 : tmp;
-}
-
-#define FAN_DIV_FROM_REG(reg)          (1<<(((reg)&0xc0)>>6))
-
-#define PWM_TO_REG(val)                        (SENSORS_LIMIT((val), 0, 255) >> 4)
-#define PWM_FROM_REG(val)              ((val) << 4)
-
-#define FAN_CHAN_FROM_REG(reg)         (((reg) >> 5) & 7)
-#define FAN_CHAN_TO_REG(val, reg)      \
-       (((reg) & 0x1F) | (((val) << 5) & 0xe0))
-
-#define AUTO_TEMP_MIN_TO_REG(val, reg) \
-       ((((val)/500) & 0xf8)|((reg) & 0x7))
-#define AUTO_TEMP_RANGE_FROM_REG(reg)  (5000 * (1<< ((reg)&0x7)))
-#define AUTO_TEMP_MIN_FROM_REG(reg)    (1000 * ((((reg) >> 3) & 0x1f) << 2))
-
-#define AUTO_TEMP_MIN_FROM_REG_DEG(reg)        ((((reg) >> 3) & 0x1f) << 2)
-
-#define AUTO_TEMP_OFF_FROM_REG(reg)            \
-       (AUTO_TEMP_MIN_FROM_REG(reg) - 5000)
-
-#define AUTO_TEMP_MAX_FROM_REG(reg)            \
-       (AUTO_TEMP_RANGE_FROM_REG(reg) +        \
-       AUTO_TEMP_MIN_FROM_REG(reg))
-
-static int AUTO_TEMP_MAX_TO_REG(int val, int reg, int pwm)
-{
-       int ret;
-       int range = val - AUTO_TEMP_MIN_FROM_REG(reg);
-
-       range = ((val - AUTO_TEMP_MIN_FROM_REG(reg))*10)/(16 - pwm);
-       ret = ((reg & 0xf8) |
-              (range < 10000 ? 0 :
-               range < 20000 ? 1 :
-               range < 40000 ? 2 : range < 80000 ? 3 : 4));
-       return ret;
-}
-
-/* FAN auto control */
-#define GET_FAN_AUTO_BITFIELD(data, idx)       \
-       (*(data)->chan_select_table)[FAN_CHAN_FROM_REG((data)->conf1)][idx%2]
-
-/* The tables below contains the possible values for the auto fan 
- * control bitfields. the index in the table is the register value.
- * MSb is the auto fan control enable bit, so the four first entries
- * in the table disables auto fan control when both bitfields are zero.
- */
-static auto_chan_table_t auto_channel_select_table_adm1031 = {
-       {0, 0}, {0, 0}, {0, 0}, {0, 0},
-       {2 /*0b010 */ , 4 /*0b100 */ },
-       {2 /*0b010 */ , 2 /*0b010 */ },
-       {4 /*0b100 */ , 4 /*0b100 */ },
-       {7 /*0b111 */ , 7 /*0b111 */ },
-};
-
-static auto_chan_table_t auto_channel_select_table_adm1030 = {
-       {0, 0}, {0, 0}, {0, 0}, {0, 0},
-       {2 /*0b10 */            , 0},
-       {0xff /*invalid */      , 0},
-       {0xff /*invalid */      , 0},
-       {3 /*0b11 */            , 0},
-};
-
-/* That function checks if a bitfield is valid and returns the other bitfield
- * nearest match if no exact match where found.
- */
-static int
-get_fan_auto_nearest(struct adm1031_data *data,
-                    int chan, u8 val, u8 reg, u8 * new_reg)
-{
-       int i;
-       int first_match = -1, exact_match = -1;
-       u8 other_reg_val =
-           (*data->chan_select_table)[FAN_CHAN_FROM_REG(reg)][chan ? 0 : 1];
-
-       if (val == 0) {
-               *new_reg = 0;
-               return 0;
-       }
-
-       for (i = 0; i < 8; i++) {
-               if ((val == (*data->chan_select_table)[i][chan]) &&
-                   ((*data->chan_select_table)[i][chan ? 0 : 1] ==
-                    other_reg_val)) {
-                       /* We found an exact match */
-                       exact_match = i;
-                       break;
-               } else if (val == (*data->chan_select_table)[i][chan] &&
-                          first_match == -1) {
-                       /* Save the first match in case of an exact match has not been
-                        * found 
-                        */
-                       first_match = i;
-               }
-       }
-
-       if (exact_match >= 0) {
-               *new_reg = exact_match;
-       } else if (first_match >= 0) {
-               *new_reg = first_match;
-       } else {
-               return -EINVAL;
-       }
-       return 0;
-}
-
-static ssize_t show_fan_auto_channel(struct device *dev, char *buf, int nr)
-{
-       struct adm1031_data *data = adm1031_update_device(dev);
-       return sprintf(buf, "%d\n", GET_FAN_AUTO_BITFIELD(data, nr));
-}
-
-static ssize_t
-set_fan_auto_channel(struct device *dev, const char *buf, size_t count, int nr)
-{
-       struct i2c_client *client = to_i2c_client(dev);
-       struct adm1031_data *data = i2c_get_clientdata(client);
-       int val;
-       u8 reg;
-       int ret;
-       u8 old_fan_mode;
-
-       old_fan_mode = data->conf1;
-
-       down(&data->update_lock);
-       val = simple_strtol(buf, NULL, 10);
-       
-       if ((ret = get_fan_auto_nearest(data, nr, val, data->conf1, &reg))) {
-               up(&data->update_lock);
-               return ret;
-       }
-       if (((data->conf1 = FAN_CHAN_TO_REG(reg, data->conf1)) & ADM1031_CONF1_AUTO_MODE) ^ 
-           (old_fan_mode & ADM1031_CONF1_AUTO_MODE)) {
-               if (data->conf1 & ADM1031_CONF1_AUTO_MODE){
-                       /* Switch to Auto Fan Mode 
-                        * Save PWM registers 
-                        * Set PWM registers to 33% Both */
-                       data->old_pwm[0] = data->pwm[0];
-                       data->old_pwm[1] = data->pwm[1];
-                       adm1031_write_value(client, ADM1031_REG_PWM, 0x55);
-               } else {
-                       /* Switch to Manual Mode */
-                       data->pwm[0] = data->old_pwm[0];
-                       data->pwm[1] = data->old_pwm[1];
-                       /* Restore PWM registers */
-                       adm1031_write_value(client, ADM1031_REG_PWM, 
-                                           data->pwm[0] | (data->pwm[1] << 4));
-               }
-       }
-       data->conf1 = FAN_CHAN_TO_REG(reg, data->conf1);
-       adm1031_write_value(client, ADM1031_REG_CONF1, data->conf1);
-       up(&data->update_lock);
-       return count;
-}
-
-#define fan_auto_channel_offset(offset)                                                \
-static ssize_t show_fan_auto_channel_##offset (struct device *dev, char *buf)  \
-{                                                                              \
-       return show_fan_auto_channel(dev, buf, 0x##offset - 1);                 \
-}                                                                              \
-static ssize_t set_fan_auto_channel_##offset (struct device *dev,              \
-       const char *buf, size_t count)                                          \
-{                                                                              \
-       return set_fan_auto_channel(dev, buf, count, 0x##offset - 1);           \
-}                                                                              \
-static DEVICE_ATTR(auto_fan##offset##_channel, S_IRUGO | S_IWUSR,              \
-                  show_fan_auto_channel_##offset,                              \
-                  set_fan_auto_channel_##offset)
-
-fan_auto_channel_offset(1);
-fan_auto_channel_offset(2);
-
-/* Auto Temps */
-static ssize_t show_auto_temp_off(struct device *dev, char *buf, int nr)
-{
-       struct adm1031_data *data = adm1031_update_device(dev);
-       return sprintf(buf, "%d\n", 
-                      AUTO_TEMP_OFF_FROM_REG(data->auto_temp[nr]));
-}
-static ssize_t show_auto_temp_min(struct device *dev, char *buf, int nr)
-{
-       struct adm1031_data *data = adm1031_update_device(dev);
-       return sprintf(buf, "%d\n",
-                      AUTO_TEMP_MIN_FROM_REG(data->auto_temp[nr]));
-}
-static ssize_t
-set_auto_temp_min(struct device *dev, const char *buf, size_t count, int nr)
-{
-       struct i2c_client *client = to_i2c_client(dev);
-       struct adm1031_data *data = i2c_get_clientdata(client);
-       int val;
-
-       down(&data->update_lock);
-       val = simple_strtol(buf, NULL, 10);
-       data->auto_temp[nr] = AUTO_TEMP_MIN_TO_REG(val, data->auto_temp[nr]);
-       adm1031_write_value(client, ADM1031_REG_AUTO_TEMP(nr),
-                           data->auto_temp[nr]);
-       up(&data->update_lock);
-       return count;
-}
-static ssize_t show_auto_temp_max(struct device *dev, char *buf, int nr)
-{
-       struct adm1031_data *data = adm1031_update_device(dev);
-       return sprintf(buf, "%d\n",
-                      AUTO_TEMP_MAX_FROM_REG(data->auto_temp[nr]));
-}
-static ssize_t
-set_auto_temp_max(struct device *dev, const char *buf, size_t count, int nr)
-{
-       struct i2c_client *client = to_i2c_client(dev);
-       struct adm1031_data *data = i2c_get_clientdata(client);
-       int val;
-
-       down(&data->update_lock);
-       val = simple_strtol(buf, NULL, 10);
-       data->temp_max[nr] = AUTO_TEMP_MAX_TO_REG(val, data->auto_temp[nr], data->pwm[nr]);
-       adm1031_write_value(client, ADM1031_REG_AUTO_TEMP(nr),
-                           data->temp_max[nr]);
-       up(&data->update_lock);
-       return count;
-}
-
-#define auto_temp_reg(offset)                                                  \
-static ssize_t show_auto_temp_##offset##_off (struct device *dev, char *buf)   \
-{                                                                              \
-       return show_auto_temp_off(dev, buf, 0x##offset - 1);                    \
-}                                                                              \
-static ssize_t show_auto_temp_##offset##_min (struct device *dev, char *buf)   \
-{                                                                              \
-       return show_auto_temp_min(dev, buf, 0x##offset - 1);                    \
-}                                                                              \
-static ssize_t show_auto_temp_##offset##_max (struct device *dev, char *buf)   \
-{                                                                              \
-       return show_auto_temp_max(dev, buf, 0x##offset - 1);                    \
-}                                                                              \
-static ssize_t set_auto_temp_##offset##_min (struct device *dev,               \
-                                            const char *buf, size_t count)     \
-{                                                                              \
-       return set_auto_temp_min(dev, buf, count, 0x##offset - 1);              \
-}                                                                              \
-static ssize_t set_auto_temp_##offset##_max (struct device *dev,               \
-                                            const char *buf, size_t count)     \
-{                                                                              \
-       return set_auto_temp_max(dev, buf, count, 0x##offset - 1);              \
-}                                                                              \
-static DEVICE_ATTR(auto_temp##offset##_off, S_IRUGO,                           \
-                  show_auto_temp_##offset##_off, NULL);                        \
-static DEVICE_ATTR(auto_temp##offset##_min, S_IRUGO | S_IWUSR,                 \
-                  show_auto_temp_##offset##_min, set_auto_temp_##offset##_min);\
-static DEVICE_ATTR(auto_temp##offset##_max, S_IRUGO | S_IWUSR,                 \
-                  show_auto_temp_##offset##_max, set_auto_temp_##offset##_max)
-
-auto_temp_reg(1);
-auto_temp_reg(2);
-auto_temp_reg(3);
-
-/* pwm */
-static ssize_t show_pwm(struct device *dev, char *buf, int nr)
-{
-       struct adm1031_data *data = adm1031_update_device(dev);
-       return sprintf(buf, "%d\n", PWM_FROM_REG(data->pwm[nr]));
-}
-static ssize_t
-set_pwm(struct device *dev, const char *buf, size_t count, int nr)
-{
-       struct i2c_client *client = to_i2c_client(dev);
-       struct adm1031_data *data = i2c_get_clientdata(client);
-       int val;
-       int reg;
-       down(&data->update_lock);
-       val = simple_strtol(buf, NULL, 10);
-       if ((data->conf1 & ADM1031_CONF1_AUTO_MODE) && 
-           (((val>>4) & 0xf) != 5)) {
-               /* In automatic mode, the only PWM accepted is 33% */
-               up(&data->update_lock);
-               return -EINVAL;
-       }
-       data->pwm[nr] = PWM_TO_REG(val);
-       reg = adm1031_read_value(client, ADM1031_REG_PWM);
-       adm1031_write_value(client, ADM1031_REG_PWM,
-                           nr ? ((data->pwm[nr] << 4) & 0xf0) | (reg & 0xf)
-                           : (data->pwm[nr] & 0xf) | (reg & 0xf0));
-       up(&data->update_lock);
-       return count;
-}
-
-#define pwm_reg(offset)                                                        \
-static ssize_t show_pwm_##offset (struct device *dev, char *buf)       \
-{                                                                      \
-       return show_pwm(dev, buf, 0x##offset - 1);                      \
-}                                                                      \
-static ssize_t set_pwm_##offset (struct device *dev,                   \
-                                const char *buf, size_t count)         \
-{                                                                      \
-       return set_pwm(dev, buf, count, 0x##offset - 1);                \
-}                                                                      \
-static DEVICE_ATTR(fan##offset##_pwm, S_IRUGO | S_IWUSR,               \
-                  show_pwm_##offset, set_pwm_##offset)
-
-pwm_reg(1);
-pwm_reg(2);
-
-/* Fans */
-
-/*
- * That function checks the cases where the fan reading is not
- * relevent.  It is used to provide 0 as fan reading when the fan is
- * not supposed to run
- */
-static int trust_fan_readings(struct adm1031_data *data, int chan)
-{
-       int res = 0;
-
-       if (data->conf1 & ADM1031_CONF1_AUTO_MODE) {
-               switch (data->conf1 & 0x60) {
-               case 0x00:      /* remote temp1 controls fan1 remote temp2 controls fan2 */
-                       res = data->temp[chan+1] >=
-                             AUTO_TEMP_MIN_FROM_REG_DEG(data->auto_temp[chan+1]);
-                       break;
-               case 0x20:      /* remote temp1 controls both fans */
-                       res =
-                           data->temp[1] >=
-                           AUTO_TEMP_MIN_FROM_REG_DEG(data->auto_temp[1]);
-                       break;
-               case 0x40:      /* remote temp2 controls both fans */
-                       res =
-                           data->temp[2] >=
-                           AUTO_TEMP_MIN_FROM_REG_DEG(data->auto_temp[2]);
-                       break;
-               case 0x60:      /* max controls both fans */
-                       res =
-                           data->temp[0] >=
-                           AUTO_TEMP_MIN_FROM_REG_DEG(data->auto_temp[0])
-                           || data->temp[1] >=
-                           AUTO_TEMP_MIN_FROM_REG_DEG(data->auto_temp[1])
-                           || (data->chip_type == adm1031 
-                               && data->temp[2] >=
-                               AUTO_TEMP_MIN_FROM_REG_DEG(data->auto_temp[2]));
-                       break;
-               }
-       } else {
-               res = data->pwm[chan] > 0;
-       }
-       return res;
-}
-
-
-static ssize_t show_fan(struct device *dev, char *buf, int nr)
-{
-       struct adm1031_data *data = adm1031_update_device(dev);
-       int value;
-
-       value = trust_fan_readings(data, nr) ? FAN_FROM_REG(data->fan[nr],
-                                FAN_DIV_FROM_REG(data->fan_div[nr])) : 0;
-       return sprintf(buf, "%d\n", value);
-}
-
-static ssize_t show_fan_div(struct device *dev, char *buf, int nr)
-{
-       struct adm1031_data *data = adm1031_update_device(dev);
-       return sprintf(buf, "%d\n", FAN_DIV_FROM_REG(data->fan_div[nr]));
-}
-static ssize_t show_fan_min(struct device *dev, char *buf, int nr)
-{
-       struct adm1031_data *data = adm1031_update_device(dev);
-       return sprintf(buf, "%d\n",
-                      FAN_FROM_REG(data->fan_min[nr],
-                                   FAN_DIV_FROM_REG(data->fan_div[nr])));
-}
-static ssize_t
-set_fan_min(struct device *dev, const char *buf, size_t count, int nr)
-{
-       struct i2c_client *client = to_i2c_client(dev);
-       struct adm1031_data *data = i2c_get_clientdata(client);
-       int val;
-
-       down(&data->update_lock);
-       val = simple_strtol(buf, NULL, 10);
-       if (val) {
-               data->fan_min[nr] = 
-                       FAN_TO_REG(val, FAN_DIV_FROM_REG(data->fan_div[nr]));
-       } else {
-               data->fan_min[nr] = 0xff;
-       }
-       adm1031_write_value(client, ADM1031_REG_FAN_MIN(nr), data->fan_min[nr]);
-       up(&data->update_lock);
-       return count;
-}
-static ssize_t
-set_fan_div(struct device *dev, const char *buf, size_t count, int nr)
-{
-       struct i2c_client *client = to_i2c_client(dev);
-       struct adm1031_data *data = i2c_get_clientdata(client);
-       int val;
-       u8 tmp;
-       int old_div = FAN_DIV_FROM_REG(data->fan_div[nr]);
-       int new_min;
-
-       val = simple_strtol(buf, NULL, 10);
-       tmp = val == 8 ? 0xc0 :
-             val == 4 ? 0x80 :
-             val == 2 ? 0x40 : 
-             val == 1 ? 0x00 :  
-             0xff;
-       if (tmp == 0xff)
-               return -EINVAL;
-       down(&data->update_lock);
-       data->fan_div[nr] = (tmp & 0xC0) | (0x3f & data->fan_div[nr]);
-       new_min = data->fan_min[nr] * old_div / 
-               FAN_DIV_FROM_REG(data->fan_div[nr]);
-       data->fan_min[nr] = new_min > 0xff ? 0xff : new_min;
-       data->fan[nr] = data->fan[nr] * old_div / 
-               FAN_DIV_FROM_REG(data->fan_div[nr]);
-
-       adm1031_write_value(client, ADM1031_REG_FAN_DIV(nr), 
-                           data->fan_div[nr]);
-       adm1031_write_value(client, ADM1031_REG_FAN_MIN(nr), 
-                           data->fan_min[nr]);
-       up(&data->update_lock);
-       return count;
-}
-
-#define fan_offset(offset)                                             \
-static ssize_t show_fan_##offset (struct device *dev, char *buf)       \
-{                                                                      \
-       return show_fan(dev, buf, 0x##offset - 1);                      \
-}                                                                      \
-static ssize_t show_fan_##offset##_min (struct device *dev, char *buf) \
-{                                                                      \
-       return show_fan_min(dev, buf, 0x##offset - 1);                  \
-}                                                                      \
-static ssize_t show_fan_##offset##_div (struct device *dev, char *buf) \
-{                                                                      \
-       return show_fan_div(dev, buf, 0x##offset - 1);                  \
-}                                                                      \
-static ssize_t set_fan_##offset##_min (struct device *dev,             \
-       const char *buf, size_t count)                                  \
-{                                                                      \
-       return set_fan_min(dev, buf, count, 0x##offset - 1);            \
-}                                                                      \
-static ssize_t set_fan_##offset##_div (struct device *dev,             \
-       const char *buf, size_t count)                                  \
-{                                                                      \
-       return set_fan_div(dev, buf, count, 0x##offset - 1);            \
-}                                                                      \
-static DEVICE_ATTR(fan##offset##_input, S_IRUGO, show_fan_##offset,    \
-                  NULL);                                               \
-static DEVICE_ATTR(fan##offset##_min, S_IRUGO | S_IWUSR,               \
-                  show_fan_##offset##_min, set_fan_##offset##_min);    \
-static DEVICE_ATTR(fan##offset##_div, S_IRUGO | S_IWUSR,               \
-                  show_fan_##offset##_div, set_fan_##offset##_div);    \
-static DEVICE_ATTR(auto_fan##offset##_min_pwm, S_IRUGO | S_IWUSR,      \
-                  show_pwm_##offset, set_pwm_##offset)
-
-fan_offset(1);
-fan_offset(2);
-
-
-/* Temps */
-static ssize_t show_temp(struct device *dev, char *buf, int nr)
-{
-       struct adm1031_data *data = adm1031_update_device(dev);
-       int ext;
-       ext = nr == 0 ?
-           ((data->ext_temp[nr] >> 6) & 0x3) * 2 :
-           (((data->ext_temp[nr] >> ((nr - 1) * 3)) & 7));
-       return sprintf(buf, "%d\n", TEMP_FROM_REG_EXT(data->temp[nr], ext));
-}
-static ssize_t show_temp_min(struct device *dev, char *buf, int nr)
-{
-       struct adm1031_data *data = adm1031_update_device(dev);
-       return sprintf(buf, "%d\n", TEMP_FROM_REG(data->temp_min[nr]));
-}
-static ssize_t show_temp_max(struct device *dev, char *buf, int nr)
-{
-       struct adm1031_data *data = adm1031_update_device(dev);
-       return sprintf(buf, "%d\n", TEMP_FROM_REG(data->temp_max[nr]));
-}
-static ssize_t show_temp_crit(struct device *dev, char *buf, int nr)
-{
-       struct adm1031_data *data = adm1031_update_device(dev);
-       return sprintf(buf, "%d\n", TEMP_FROM_REG(data->temp_crit[nr]));
-}
-static ssize_t
-set_temp_min(struct device *dev, const char *buf, size_t count, int nr)
-{
-       struct i2c_client *client = to_i2c_client(dev);
-       struct adm1031_data *data = i2c_get_clientdata(client);
-       int val;
-
-       val = simple_strtol(buf, NULL, 10);
-       val = SENSORS_LIMIT(val, -55000, nr == 0 ? 127750 : 127875);
-       down(&data->update_lock);
-       data->temp_min[nr] = TEMP_TO_REG(val);
-       adm1031_write_value(client, ADM1031_REG_TEMP_MIN(nr),
-                           data->temp_min[nr]);
-       up(&data->update_lock);
-       return count;
-}
-static ssize_t
-set_temp_max(struct device *dev, const char *buf, size_t count, int nr)
-{
-       struct i2c_client *client = to_i2c_client(dev);
-       struct adm1031_data *data = i2c_get_clientdata(client);
-       int val;
-
-       val = simple_strtol(buf, NULL, 10);
-       val = SENSORS_LIMIT(val, -55000, nr == 0 ? 127750 : 127875);
-       down(&data->update_lock);
-       data->temp_max[nr] = TEMP_TO_REG(val);
-       adm1031_write_value(client, ADM1031_REG_TEMP_MAX(nr),
-                           data->temp_max[nr]);
-       up(&data->update_lock);
-       return count;
-}
-static ssize_t
-set_temp_crit(struct device *dev, const char *buf, size_t count, int nr)
-{
-       struct i2c_client *client = to_i2c_client(dev);
-       struct adm1031_data *data = i2c_get_clientdata(client);
-       int val;
-
-       val = simple_strtol(buf, NULL, 10);
-       val = SENSORS_LIMIT(val, -55000, nr == 0 ? 127750 : 127875);
-       down(&data->update_lock);
-       data->temp_crit[nr] = TEMP_TO_REG(val);
-       adm1031_write_value(client, ADM1031_REG_TEMP_CRIT(nr),
-                           data->temp_crit[nr]);
-       up(&data->update_lock);
-       return count;
-}
-
-#define temp_reg(offset)                                                       \
-static ssize_t show_temp_##offset (struct device *dev, char *buf)              \
-{                                                                              \
-       return show_temp(dev, buf, 0x##offset - 1);                             \
-}                                                                              \
-static ssize_t show_temp_##offset##_min (struct device *dev, char *buf)                \
-{                                                                              \
-       return show_temp_min(dev, buf, 0x##offset - 1);                         \
-}                                                                              \
-static ssize_t show_temp_##offset##_max (struct device *dev, char *buf)                \
-{                                                                              \
-       return show_temp_max(dev, buf, 0x##offset - 1);                         \
-}                                                                              \
-static ssize_t show_temp_##offset##_crit (struct device *dev, char *buf)       \
-{                                                                              \
-       return show_temp_crit(dev, buf, 0x##offset - 1);                        \
-}                                                                              \
-static ssize_t set_temp_##offset##_min (struct device *dev,                    \
-                                       const char *buf, size_t count)          \
-{                                                                              \
-       return set_temp_min(dev, buf, count, 0x##offset - 1);                   \
-}                                                                              \
-static ssize_t set_temp_##offset##_max (struct device *dev,                    \
-                                       const char *buf, size_t count)          \
-{                                                                              \
-       return set_temp_max(dev, buf, count, 0x##offset - 1);                   \
-}                                                                              \
-static ssize_t set_temp_##offset##_crit (struct device *dev,                   \
-                                        const char *buf, size_t count)         \
-{                                                                              \
-       return set_temp_crit(dev, buf, count, 0x##offset - 1);                  \
-}                                                                              \
-static DEVICE_ATTR(temp##offset##_input, S_IRUGO, show_temp_##offset,          \
-                  NULL);                                                       \
-static DEVICE_ATTR(temp##offset##_min, S_IRUGO | S_IWUSR,                      \
-                  show_temp_##offset##_min, set_temp_##offset##_min);          \
-static DEVICE_ATTR(temp##offset##_max, S_IRUGO | S_IWUSR,                      \
-                  show_temp_##offset##_max, set_temp_##offset##_max);          \
-static DEVICE_ATTR(temp##offset##_crit, S_IRUGO | S_IWUSR,                     \
-                  show_temp_##offset##_crit, set_temp_##offset##_crit)
-
-temp_reg(1);
-temp_reg(2);
-temp_reg(3);
-
-/* Alarms */
-static ssize_t show_alarms(struct device *dev, char *buf)
-{
-       struct adm1031_data *data = adm1031_update_device(dev);
-       return sprintf(buf, "%d\n", data->alarm);
-}
-
-static DEVICE_ATTR(alarms, S_IRUGO, show_alarms, NULL);
-
-
-static int adm1031_attach_adapter(struct i2c_adapter *adapter)
-{
-       if (!(adapter->class & I2C_CLASS_HWMON))
-               return 0;
-       return i2c_detect(adapter, &addr_data, adm1031_detect);
-}
-
-/* This function is called by i2c_detect */
-static int adm1031_detect(struct i2c_adapter *adapter, int address, int kind)
-{
-       struct i2c_client *new_client;
-       struct adm1031_data *data;
-       int err = 0;
-       const char *name = "";
-
-       if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_BYTE_DATA))
-               goto exit;
-
-       if (!(data = kmalloc(sizeof(struct adm1031_data), GFP_KERNEL))) {
-               err = -ENOMEM;
-               goto exit;
-       }
-       memset(data, 0, sizeof(struct adm1031_data));
-
-       new_client = &data->client;
-       i2c_set_clientdata(new_client, data);
-       new_client->addr = address;
-       new_client->adapter = adapter;
-       new_client->driver = &adm1031_driver;
-       new_client->flags = 0;
-
-       if (kind < 0) {
-               int id, co;
-               id = i2c_smbus_read_byte_data(new_client, 0x3d);
-               co = i2c_smbus_read_byte_data(new_client, 0x3e);
-
-               if (!((id == 0x31 || id == 0x30) && co == 0x41))
-                       goto exit_free;
-               kind = (id == 0x30) ? adm1030 : adm1031;
-       }
-
-       if (kind <= 0)
-               kind = adm1031;
-
-       /* Given the detected chip type, set the chip name and the
-        * auto fan control helper table. */
-       if (kind == adm1030) {
-               name = "adm1030";
-               data->chan_select_table = &auto_channel_select_table_adm1030;
-       } else if (kind == adm1031) {
-               name = "adm1031";
-               data->chan_select_table = &auto_channel_select_table_adm1031;
-       }
-       data->chip_type = kind;
-
-       strlcpy(new_client->name, name, I2C_NAME_SIZE);
-
-       new_client->id = adm1031_id++;
-       data->valid = 0;
-       init_MUTEX(&data->update_lock);
-
-       /* Tell the I2C layer a new client has arrived */
-       if ((err = i2c_attach_client(new_client)))
-               goto exit_free;
-
-       /* Initialize the ADM1031 chip */
-       adm1031_init_client(new_client);
-
-       /* Register sysfs hooks */
-       device_create_file(&new_client->dev, &dev_attr_fan1_input);
-       device_create_file(&new_client->dev, &dev_attr_fan1_div);
-       device_create_file(&new_client->dev, &dev_attr_fan1_min);
-       device_create_file(&new_client->dev, &dev_attr_fan1_pwm);
-       device_create_file(&new_client->dev, &dev_attr_auto_fan1_channel);
-       device_create_file(&new_client->dev, &dev_attr_temp1_input);
-       device_create_file(&new_client->dev, &dev_attr_temp1_min);
-       device_create_file(&new_client->dev, &dev_attr_temp1_max);
-       device_create_file(&new_client->dev, &dev_attr_temp1_crit);
-       device_create_file(&new_client->dev, &dev_attr_temp2_input);
-       device_create_file(&new_client->dev, &dev_attr_temp2_min);
-       device_create_file(&new_client->dev, &dev_attr_temp2_max);
-       device_create_file(&new_client->dev, &dev_attr_temp2_crit);
-
-       device_create_file(&new_client->dev, &dev_attr_auto_temp1_off);
-       device_create_file(&new_client->dev, &dev_attr_auto_temp1_min);
-       device_create_file(&new_client->dev, &dev_attr_auto_temp1_max);
-
-       device_create_file(&new_client->dev, &dev_attr_auto_temp2_off);
-       device_create_file(&new_client->dev, &dev_attr_auto_temp2_min);
-       device_create_file(&new_client->dev, &dev_attr_auto_temp2_max);
-
-       device_create_file(&new_client->dev, &dev_attr_auto_fan1_min_pwm);
-
-       device_create_file(&new_client->dev, &dev_attr_alarms);
-
-       if (kind == adm1031) {
-               device_create_file(&new_client->dev, &dev_attr_fan2_input);
-               device_create_file(&new_client->dev, &dev_attr_fan2_div);
-               device_create_file(&new_client->dev, &dev_attr_fan2_min);
-               device_create_file(&new_client->dev, &dev_attr_fan2_pwm);
-               device_create_file(&new_client->dev,
-                                  &dev_attr_auto_fan2_channel);
-               device_create_file(&new_client->dev, &dev_attr_temp3_input);
-               device_create_file(&new_client->dev, &dev_attr_temp3_min);
-               device_create_file(&new_client->dev, &dev_attr_temp3_max);
-               device_create_file(&new_client->dev, &dev_attr_temp3_crit);
-               device_create_file(&new_client->dev, &dev_attr_auto_temp3_off);
-               device_create_file(&new_client->dev, &dev_attr_auto_temp3_min);
-               device_create_file(&new_client->dev, &dev_attr_auto_temp3_max);
-               device_create_file(&new_client->dev, &dev_attr_auto_fan2_min_pwm);
-       }
-
-       return 0;
-
-exit_free:
-       kfree(new_client);
-exit:
-       return err;
-}
-
-static int adm1031_detach_client(struct i2c_client *client)
-{
-       int ret;
-       if ((ret = i2c_detach_client(client)) != 0) {
-               return ret;
-       }
-       kfree(client);
-       return 0;
-}
-
-static void adm1031_init_client(struct i2c_client *client)
-{
-       unsigned int read_val;
-       unsigned int mask;
-       struct adm1031_data *data = i2c_get_clientdata(client);
-
-       mask = (ADM1031_CONF2_PWM1_ENABLE | ADM1031_CONF2_TACH1_ENABLE);
-       if (data->chip_type == adm1031) {
-               mask |= (ADM1031_CONF2_PWM2_ENABLE |
-                       ADM1031_CONF2_TACH2_ENABLE);
-       } 
-       /* Initialize the ADM1031 chip (enables fan speed reading ) */
-       read_val = adm1031_read_value(client, ADM1031_REG_CONF2);
-       if ((read_val | mask) != read_val) {
-           adm1031_write_value(client, ADM1031_REG_CONF2, read_val | mask);
-       }
-
-       read_val = adm1031_read_value(client, ADM1031_REG_CONF1);
-       if ((read_val | ADM1031_CONF1_MONITOR_ENABLE) != read_val) {
-           adm1031_write_value(client, ADM1031_REG_CONF1, read_val |
-                               ADM1031_CONF1_MONITOR_ENABLE);
-       }
-
-}
-
-static struct adm1031_data *adm1031_update_device(struct device *dev)
-{
-       struct i2c_client *client = to_i2c_client(dev);
-       struct adm1031_data *data = i2c_get_clientdata(client);
-       int chan;
-
-       down(&data->update_lock);
-
-       if ((jiffies - data->last_updated > HZ + HZ / 2) ||
-           (jiffies < data->last_updated) || !data->valid) {
-
-               dev_dbg(&client->dev, "Starting adm1031 update\n");
-               for (chan = 0;
-                    chan < ((data->chip_type == adm1031) ? 3 : 2); chan++) {
-                       u8 oldh, newh;
-
-                       oldh =
-                           adm1031_read_value(client, ADM1031_REG_TEMP(chan));
-                       data->ext_temp[chan] =
-                           adm1031_read_value(client, ADM1031_REG_EXT_TEMP);
-                       newh =
-                           adm1031_read_value(client, ADM1031_REG_TEMP(chan));
-                       if (newh != oldh) {
-                               data->ext_temp[chan] =
-                                   adm1031_read_value(client,
-                                                      ADM1031_REG_EXT_TEMP);
-#ifdef DEBUG
-                               oldh =
-                                   adm1031_read_value(client,
-                                                      ADM1031_REG_TEMP(chan));
-
-                               /* oldh is actually newer */
-                               if (newh != oldh)
-                                       dev_warn(&client->dev,
-                                                "Remote temperature may be "
-                                                "wrong.\n");
-#endif
-                       }
-                       data->temp[chan] = newh;
-
-                       data->temp_min[chan] =
-                           adm1031_read_value(client,
-                                              ADM1031_REG_TEMP_MIN(chan));
-                       data->temp_max[chan] =
-                           adm1031_read_value(client,
-                                              ADM1031_REG_TEMP_MAX(chan));
-                       data->temp_crit[chan] =
-                           adm1031_read_value(client,
-                                              ADM1031_REG_TEMP_CRIT(chan));
-                       data->auto_temp[chan] =
-                           adm1031_read_value(client,
-                                              ADM1031_REG_AUTO_TEMP(chan));
-
-               }
-
-               data->conf1 = adm1031_read_value(client, ADM1031_REG_CONF1);
-               data->conf2 = adm1031_read_value(client, ADM1031_REG_CONF2);
-
-               data->alarm = adm1031_read_value(client, ADM1031_REG_STATUS(0))
-                            | (adm1031_read_value(client, ADM1031_REG_STATUS(1))
-                               << 8);
-               if (data->chip_type == adm1030) {
-                       data->alarm &= 0xc0ff;
-               }
-               
-               for (chan=0; chan<(data->chip_type == adm1030 ? 1 : 2); chan++) {
-                       data->fan_div[chan] =
-                           adm1031_read_value(client, ADM1031_REG_FAN_DIV(chan));
-                       data->fan_min[chan] =
-                           adm1031_read_value(client, ADM1031_REG_FAN_MIN(chan));
-                       data->fan[chan] =
-                           adm1031_read_value(client, ADM1031_REG_FAN_SPEED(chan));
-                       data->pwm[chan] =
-                           0xf & (adm1031_read_value(client, ADM1031_REG_PWM) >> 
-                                  (4*chan));
-               }
-               data->last_updated = jiffies;
-               data->valid = 1;
-       }
-
-       up(&data->update_lock);
-
-       return data;
-}
-
-static int __init sensors_adm1031_init(void)
-{
-       return i2c_add_driver(&adm1031_driver);
-}
-
-static void __exit sensors_adm1031_exit(void)
-{
-       i2c_del_driver(&adm1031_driver);
-}
-
-MODULE_AUTHOR("Alexandre d'Alton <alex@alexdalton.org>");
-MODULE_DESCRIPTION("ADM1031/ADM1030 driver");
-MODULE_LICENSE("GPL");
-
-module_init(sensors_adm1031_init);
-module_exit(sensors_adm1031_exit);
diff --git a/drivers/i2c/chips/lm77.c b/drivers/i2c/chips/lm77.c
deleted file mode 100644 (file)
index a6fc781..0000000
+++ /dev/null
@@ -1,413 +0,0 @@
-/*
-    lm77.c - Part of lm_sensors, Linux kernel modules for hardware
-             monitoring
-
-    Copyright (c) 2004  Andras BALI <drewie@freemail.hu>
-
-    Heavily based on lm75.c by Frodo Looijaard <frodol@dds.nl>.  The LM77
-    is a temperature sensor and thermal window comparator with 0.5 deg
-    resolution made by National Semiconductor.  Complete datasheet can be
-    obtained at their site:
-       http://www.national.com/pf/LM/LM77.html
-
-    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.
-*/
-
-#include <linux/config.h>
-#include <linux/module.h>
-#include <linux/init.h>
-#include <linux/slab.h>
-#include <linux/i2c.h>
-#include <linux/i2c-sensor.h>
-
-
-/* Addresses to scan */
-static unsigned short normal_i2c[] = { I2C_CLIENT_END };
-static unsigned short normal_i2c_range[] = { 0x48, 0x4b, I2C_CLIENT_END };
-static unsigned int normal_isa[] = { I2C_CLIENT_ISA_END };
-static unsigned int normal_isa_range[] = { I2C_CLIENT_ISA_END };
-
-/* Insmod parameters */
-SENSORS_INSMOD_1(lm77);
-
-/* The LM77 registers */
-#define LM77_REG_TEMP          0x00
-#define LM77_REG_CONF          0x01
-#define LM77_REG_TEMP_HYST     0x02
-#define LM77_REG_TEMP_CRIT     0x03
-#define LM77_REG_TEMP_MIN      0x04
-#define LM77_REG_TEMP_MAX      0x05
-
-/* Each client has this additional data */
-struct lm77_data {
-       struct i2c_client       client;
-       struct semaphore        update_lock;
-       char                    valid;
-       unsigned long           last_updated;   /* In jiffies */
-       int                     temp_input;     /* Temperatures */
-       int                     temp_crit;
-       int                     temp_min;
-       int                     temp_max;
-       int                     temp_hyst;
-       u8                      alarms;
-};
-
-static int lm77_attach_adapter(struct i2c_adapter *adapter);
-static int lm77_detect(struct i2c_adapter *adapter, int address, int kind);
-static void lm77_init_client(struct i2c_client *client);
-static int lm77_detach_client(struct i2c_client *client);
-static u16 lm77_read_value(struct i2c_client *client, u8 reg);
-static int lm77_write_value(struct i2c_client *client, u8 reg, u16 value);
-
-static struct lm77_data *lm77_update_device(struct device *dev);
-
-
-/* This is the driver that will be inserted */
-static struct i2c_driver lm77_driver = {
-       .owner          = THIS_MODULE,
-       .name           = "lm77",
-       .flags          = I2C_DF_NOTIFY,
-       .attach_adapter = lm77_attach_adapter,
-       .detach_client  = lm77_detach_client,
-};
-
-static int lm77_id = 0;
-
-/* straight from the datasheet */
-#define LM77_TEMP_MIN (-55000)
-#define LM77_TEMP_MAX 125000
-
-/* In the temperature registers, the low 3 bits are not part of the
-   temperature values; they are the status bits. */
-static inline u16 LM77_TEMP_TO_REG(int temp)
-{
-       int ntemp = SENSORS_LIMIT(temp, LM77_TEMP_MIN, LM77_TEMP_MAX);
-       return (u16)((ntemp / 500) * 8);
-}
-
-static inline int LM77_TEMP_FROM_REG(u16 reg)
-{
-       return ((int)reg / 8) * 500;
-}
-
-/* sysfs stuff */
-
-/* read routines for temperature limits */
-#define show(value)    \
-static ssize_t show_##value(struct device *dev, char *buf)     \
-{                                                              \
-       struct lm77_data *data = lm77_update_device(dev);       \
-       return sprintf(buf, "%d\n", data->value);               \
-}
-
-show(temp_input);
-show(temp_crit);
-show(temp_min);
-show(temp_max);
-show(alarms);
-
-/* read routines for hysteresis values */
-static ssize_t show_temp_crit_hyst(struct device *dev, char *buf)
-{
-       struct lm77_data *data = lm77_update_device(dev);
-       return sprintf(buf, "%d\n", data->temp_crit - data->temp_hyst);
-}
-static ssize_t show_temp_min_hyst(struct device *dev, char *buf)
-{
-       struct lm77_data *data = lm77_update_device(dev);
-       return sprintf(buf, "%d\n", data->temp_min + data->temp_hyst);
-}
-static ssize_t show_temp_max_hyst(struct device *dev, char *buf)
-{
-       struct lm77_data *data = lm77_update_device(dev);
-       return sprintf(buf, "%d\n", data->temp_max - data->temp_hyst);
-}
-
-/* write routines */
-#define set(value, reg)        \
-static ssize_t set_##value(struct device *dev, const char *buf, size_t count)  \
-{                                                                              \
-       struct i2c_client *client = to_i2c_client(dev);                         \
-       struct lm77_data *data = i2c_get_clientdata(client);                    \
-       data->value = simple_strtoul(buf, NULL, 10);                            \
-       lm77_write_value(client, reg, LM77_TEMP_TO_REG(data->value));           \
-       return count;                                                           \
-}
-
-set(temp_min, LM77_REG_TEMP_MIN);
-set(temp_max, LM77_REG_TEMP_MAX);
-
-/* hysteresis is stored as a relative value on the chip, so it has to be
-   converted first */
-static ssize_t set_temp_crit_hyst(struct device *dev, const char *buf, size_t count)
-{
-       struct i2c_client *client = to_i2c_client(dev);
-       struct lm77_data *data = i2c_get_clientdata(client);
-       data->temp_hyst = data->temp_crit - simple_strtoul(buf, NULL, 10);
-       lm77_write_value(client, LM77_REG_TEMP_HYST,
-                        LM77_TEMP_TO_REG(data->temp_hyst));
-       return count;
-}
-
-/* preserve hysteresis when setting T_crit */
-static ssize_t set_temp_crit(struct device *dev, const char *buf, size_t count)
-{
-       struct i2c_client *client = to_i2c_client(dev);
-       struct lm77_data *data = i2c_get_clientdata(client);
-       int oldcrithyst = data->temp_crit - data->temp_hyst;
-       data->temp_crit = simple_strtoul(buf, NULL, 10);
-       data->temp_hyst = data->temp_crit - oldcrithyst;
-       lm77_write_value(client, LM77_REG_TEMP_CRIT,
-                        LM77_TEMP_TO_REG(data->temp_crit));
-       lm77_write_value(client, LM77_REG_TEMP_HYST,
-                        LM77_TEMP_TO_REG(data->temp_hyst));
-       return count;
-}
-
-static DEVICE_ATTR(temp1_input, S_IRUGO,
-                  show_temp_input, NULL);
-static DEVICE_ATTR(temp1_crit, S_IWUSR | S_IRUGO,
-                  show_temp_crit, set_temp_crit);
-static DEVICE_ATTR(temp1_min, S_IWUSR | S_IRUGO,
-                  show_temp_min, set_temp_min);
-static DEVICE_ATTR(temp1_max, S_IWUSR | S_IRUGO,
-                  show_temp_max, set_temp_max);
-
-static DEVICE_ATTR(temp1_crit_hyst, S_IWUSR | S_IRUGO,
-                  show_temp_crit_hyst, set_temp_crit_hyst);
-static DEVICE_ATTR(temp1_min_hyst, S_IRUGO,
-                  show_temp_min_hyst, NULL);
-static DEVICE_ATTR(temp1_max_hyst, S_IRUGO,
-                  show_temp_max_hyst, NULL);
-
-static DEVICE_ATTR(alarms, S_IRUGO,
-                  show_alarms, NULL);
-
-static int lm77_attach_adapter(struct i2c_adapter *adapter)
-{
-       if (!(adapter->class & I2C_CLASS_HWMON))
-               return 0;
-       return i2c_detect(adapter, &addr_data, lm77_detect);
-}
-
-/* This function is called by i2c_detect */
-static int lm77_detect(struct i2c_adapter *adapter, int address, int kind)
-{
-       struct i2c_client *new_client;
-       struct lm77_data *data;
-       int err = 0;
-       const char *name = "";
-
-       if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_BYTE_DATA |
-                                    I2C_FUNC_SMBUS_WORD_DATA))
-               goto exit;
-
-       /* OK. For now, we presume we have a valid client. We now create the
-          client structure, even though we cannot fill it completely yet.
-          But it allows us to access lm77_{read,write}_value. */
-       if (!(data = kmalloc(sizeof(struct lm77_data), GFP_KERNEL))) {
-               err = -ENOMEM;
-               goto exit;
-       }
-       memset(data, 0, sizeof(struct lm77_data));
-
-       new_client = &data->client;
-       i2c_set_clientdata(new_client, data);
-       new_client->addr = address;
-       new_client->adapter = adapter;
-       new_client->driver = &lm77_driver;
-       new_client->flags = 0;
-
-       /* Here comes the remaining detection.  Since the LM77 has no
-          register dedicated to identification, we have to rely on the
-          following tricks:
-
-          1. the high 4 bits represent the sign and thus they should
-             always be the same
-          2. the high 3 bits are unused in the configuration register
-          3. addresses 0x06 and 0x07 return the last read value
-          4. registers cycling over 8-address boundaries
-
-          Word-sized registers are high-byte first. */
-       if (kind < 0) {
-               int i, cur, conf, hyst, crit, min, max;
-
-               /* addresses cycling */
-               cur = i2c_smbus_read_word_data(new_client, 0);
-               conf = i2c_smbus_read_byte_data(new_client, 1);
-               hyst = i2c_smbus_read_word_data(new_client, 2);
-               crit = i2c_smbus_read_word_data(new_client, 3);
-               min = i2c_smbus_read_word_data(new_client, 4);
-               max = i2c_smbus_read_word_data(new_client, 5);
-               for (i = 8; i <= 0xff; i += 8)
-                       if (i2c_smbus_read_byte_data(new_client, i + 1) != conf
-                           || i2c_smbus_read_word_data(new_client, i + 2) != hyst
-                           || i2c_smbus_read_word_data(new_client, i + 3) != crit
-                           || i2c_smbus_read_word_data(new_client, i + 4) != min
-                           || i2c_smbus_read_word_data(new_client, i + 5) != max)
-                               goto exit_free;
-
-               /* sign bits */
-               if (((cur & 0x00f0) != 0xf0 && (cur & 0x00f0) != 0x0)
-                   || ((hyst & 0x00f0) != 0xf0 && (hyst & 0x00f0) != 0x0)
-                   || ((crit & 0x00f0) != 0xf0 && (crit & 0x00f0) != 0x0)
-                   || ((min & 0x00f0) != 0xf0 && (min & 0x00f0) != 0x0)
-                   || ((max & 0x00f0) != 0xf0 && (max & 0x00f0) != 0x0))
-                       goto exit_free;
-
-               /* unused bits */
-               if (conf & 0xe0)
-                       goto exit_free;
-
-               /* 0x06 and 0x07 return the last read value */
-               cur = i2c_smbus_read_word_data(new_client, 0);
-               if (i2c_smbus_read_word_data(new_client, 6) != cur
-                   || i2c_smbus_read_word_data(new_client, 7) != cur)
-                       goto exit_free;
-               hyst = i2c_smbus_read_word_data(new_client, 2);
-               if (i2c_smbus_read_word_data(new_client, 6) != hyst
-                   || i2c_smbus_read_word_data(new_client, 7) != hyst)
-                       goto exit_free;
-               min = i2c_smbus_read_word_data(new_client, 4);
-               if (i2c_smbus_read_word_data(new_client, 6) != min
-                   || i2c_smbus_read_word_data(new_client, 7) != min)
-                       goto exit_free;
-
-       }
-
-       /* Determine the chip type - only one kind supported! */
-       if (kind <= 0)
-               kind = lm77;
-
-       if (kind == lm77) {
-               name = "lm77";
-       }
-
-       /* Fill in the remaining client fields and put it into the global list */
-       strlcpy(new_client->name, name, I2C_NAME_SIZE);
-
-       new_client->id = lm77_id++;
-       data->valid = 0;
-       init_MUTEX(&data->update_lock);
-
-       /* Tell the I2C layer a new client has arrived */
-       if ((err = i2c_attach_client(new_client)))
-               goto exit_free;
-
-       /* Initialize the LM77 chip */
-       lm77_init_client(new_client);
-
-       /* Register sysfs hooks */
-       device_create_file(&new_client->dev, &dev_attr_temp1_input);
-       device_create_file(&new_client->dev, &dev_attr_temp1_crit);
-       device_create_file(&new_client->dev, &dev_attr_temp1_min);
-       device_create_file(&new_client->dev, &dev_attr_temp1_max);
-       device_create_file(&new_client->dev, &dev_attr_temp1_crit_hyst);
-       device_create_file(&new_client->dev, &dev_attr_temp1_min_hyst);
-       device_create_file(&new_client->dev, &dev_attr_temp1_max_hyst);
-       device_create_file(&new_client->dev, &dev_attr_alarms);
-       return 0;
-
-exit_free:
-       kfree(data);
-exit:
-       return err;
-}
-
-static int lm77_detach_client(struct i2c_client *client)
-{
-       i2c_detach_client(client);
-       kfree(i2c_get_clientdata(client));
-       return 0;
-}
-
-/* All registers are word-sized, except for the configuration register.
-   The LM77 uses the high-byte first convention. */
-static u16 lm77_read_value(struct i2c_client *client, u8 reg)
-{
-       if (reg == LM77_REG_CONF)
-               return i2c_smbus_read_byte_data(client, reg);
-       else
-               return swab16(i2c_smbus_read_word_data(client, reg));
-}
-
-static int lm77_write_value(struct i2c_client *client, u8 reg, u16 value)
-{
-       if (reg == LM77_REG_CONF)
-               return i2c_smbus_write_byte_data(client, reg, value);
-       else
-               return i2c_smbus_write_word_data(client, reg, swab16(value));
-}
-
-static void lm77_init_client(struct i2c_client *client)
-{
-       /* Initialize the LM77 chip - turn off shutdown mode */
-       int conf = lm77_read_value(client, LM77_REG_CONF);
-       if (conf & 1)
-               lm77_write_value(client, LM77_REG_CONF, conf & 0xfe);
-}
-
-static struct lm77_data *lm77_update_device(struct device *dev)
-{
-       struct i2c_client *client = to_i2c_client(dev);
-       struct lm77_data *data = i2c_get_clientdata(client);
-
-       down(&data->update_lock);
-
-       if ((jiffies - data->last_updated > HZ + HZ / 2) ||
-           (jiffies < data->last_updated) || !data->valid) {
-               dev_dbg(&client->dev, "Starting lm77 update\n");
-               data->temp_input =
-                       LM77_TEMP_FROM_REG(lm77_read_value(client,
-                                                          LM77_REG_TEMP));
-               data->temp_hyst =
-                       LM77_TEMP_FROM_REG(lm77_read_value(client,
-                                                          LM77_REG_TEMP_HYST));
-               data->temp_crit =
-                       LM77_TEMP_FROM_REG(lm77_read_value(client,
-                                                          LM77_REG_TEMP_CRIT));
-               data->temp_min =
-                       LM77_TEMP_FROM_REG(lm77_read_value(client,
-                                                          LM77_REG_TEMP_MIN));
-               data->temp_max =
-                       LM77_TEMP_FROM_REG(lm77_read_value(client,
-                                                          LM77_REG_TEMP_MAX));
-               data->alarms =
-                       lm77_read_value(client, LM77_REG_TEMP) & 0x0007;
-               data->last_updated = jiffies;
-               data->valid = 1;
-       }
-
-       up(&data->update_lock);
-
-       return data;
-}
-
-static int __init sensors_lm77_init(void)
-{
-       return i2c_add_driver(&lm77_driver);
-}
-
-static void __exit sensors_lm77_exit(void)
-{
-       i2c_del_driver(&lm77_driver);
-}
-
-MODULE_AUTHOR("Andras BALI <drewie@freemail.hu>");
-MODULE_DESCRIPTION("LM77 driver");
-MODULE_LICENSE("GPL");
-
-module_init(sensors_lm77_init);
-module_exit(sensors_lm77_exit);
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/media/video/ovcamchip/Makefile b/drivers/media/video/ovcamchip/Makefile
deleted file mode 100644 (file)
index bca41ad..0000000
+++ /dev/null
@@ -1,4 +0,0 @@
-ovcamchip-objs     := ovcamchip_core.o ov6x20.o ov6x30.o ov7x10.o ov7x20.o \
-                      ov76be.o
-
-obj-$(CONFIG_VIDEO_OVCAMCHIP) += ovcamchip.o
diff --git a/drivers/media/video/ovcamchip/ov6x20.c b/drivers/media/video/ovcamchip/ov6x20.c
deleted file mode 100644 (file)
index 3433619..0000000
+++ /dev/null
@@ -1,415 +0,0 @@
-/* OmniVision OV6620/OV6120 Camera Chip Support Code
- *
- * Copyright (c) 1999-2004 Mark McClelland <mark@alpha.dyndns.org>
- * http://alpha.dyndns.org/ov511/
- *
- * 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. NO WARRANTY OF ANY KIND is expressed or implied.
- */
-
-#define DEBUG
-
-#include <linux/slab.h>
-#include "ovcamchip_priv.h"
-
-/* Registers */
-#define REG_GAIN               0x00    /* gain [5:0] */
-#define REG_BLUE               0x01    /* blue gain */
-#define REG_RED                        0x02    /* red gain */
-#define REG_SAT                        0x03    /* saturation */
-#define REG_CNT                        0x05    /* Y contrast */
-#define REG_BRT                        0x06    /* Y brightness */
-#define REG_WB_BLUE            0x0C    /* WB blue ratio [5:0] */
-#define REG_WB_RED             0x0D    /* WB red ratio [5:0] */
-#define REG_EXP                        0x10    /* exposure */
-
-/* Window parameters */
-#define HWSBASE 0x38
-#define HWEBASE 0x3A
-#define VWSBASE 0x05
-#define VWEBASE 0x06
-
-struct ov6x20 {
-       int auto_brt;
-       int auto_exp;
-       int backlight;
-       int bandfilt;
-       int mirror;
-};
-
-/* Initial values for use with OV511/OV511+ cameras */
-static struct ovcamchip_regvals regvals_init_6x20_511[] = {
-       { 0x12, 0x80 }, /* reset */
-       { 0x11, 0x01 },
-       { 0x03, 0x60 },
-       { 0x05, 0x7f }, /* For when autoadjust is off */
-       { 0x07, 0xa8 },
-       { 0x0c, 0x24 },
-       { 0x0d, 0x24 },
-       { 0x0f, 0x15 }, /* COMS */
-       { 0x10, 0x75 }, /* AEC Exposure time */
-       { 0x12, 0x24 }, /* Enable AGC and AWB */
-       { 0x14, 0x04 },
-       { 0x16, 0x03 },
-       { 0x26, 0xb2 }, /* BLC enable */
-       /* 0x28: 0x05 Selects RGB format if RGB on */
-       { 0x28, 0x05 },
-       { 0x2a, 0x04 }, /* Disable framerate adjust */
-       { 0x2d, 0x99 },
-       { 0x33, 0xa0 }, /* Color Processing Parameter */
-       { 0x34, 0xd2 }, /* Max A/D range */
-       { 0x38, 0x8b },
-       { 0x39, 0x40 },
-
-       { 0x3c, 0x39 }, /* Enable AEC mode changing */
-       { 0x3c, 0x3c }, /* Change AEC mode */
-       { 0x3c, 0x24 }, /* Disable AEC mode changing */
-
-       { 0x3d, 0x80 },
-       /* These next two registers (0x4a, 0x4b) are undocumented. They
-        * control the color balance */
-       { 0x4a, 0x80 },
-       { 0x4b, 0x80 },
-       { 0x4d, 0xd2 }, /* This reduces noise a bit */
-       { 0x4e, 0xc1 },
-       { 0x4f, 0x04 },
-       { 0xff, 0xff }, /* END MARKER */
-};
-
-/* Initial values for use with OV518 cameras */
-static struct ovcamchip_regvals regvals_init_6x20_518[] = {
-       { 0x12, 0x80 }, /* Do a reset */
-       { 0x03, 0xc0 }, /* Saturation */
-       { 0x05, 0x8a }, /* Contrast */
-       { 0x0c, 0x24 }, /* AWB blue */
-       { 0x0d, 0x24 }, /* AWB red */
-       { 0x0e, 0x8d }, /* Additional 2x gain */
-       { 0x0f, 0x25 }, /* Black expanding level = 1.3V */
-       { 0x11, 0x01 }, /* Clock div. */
-       { 0x12, 0x24 }, /* Enable AGC and AWB */
-       { 0x13, 0x01 }, /* (default) */
-       { 0x14, 0x80 }, /* Set reserved bit 7 */
-       { 0x15, 0x01 }, /* (default) */
-       { 0x16, 0x03 }, /* (default) */
-       { 0x17, 0x38 }, /* (default) */
-       { 0x18, 0xea }, /* (default) */
-       { 0x19, 0x04 },
-       { 0x1a, 0x93 },
-       { 0x1b, 0x00 }, /* (default) */
-       { 0x1e, 0xc4 }, /* (default) */
-       { 0x1f, 0x04 }, /* (default) */
-       { 0x20, 0x20 }, /* Enable 1st stage aperture correction */
-       { 0x21, 0x10 }, /* Y offset */
-       { 0x22, 0x88 }, /* U offset */
-       { 0x23, 0xc0 }, /* Set XTAL power level */
-       { 0x24, 0x53 }, /* AEC bright ratio */
-       { 0x25, 0x7a }, /* AEC black ratio */
-       { 0x26, 0xb2 }, /* BLC enable */
-       { 0x27, 0xa2 }, /* Full output range */
-       { 0x28, 0x01 }, /* (default) */
-       { 0x29, 0x00 }, /* (default) */
-       { 0x2a, 0x84 }, /* (default) */
-       { 0x2b, 0xa8 }, /* Set custom frame rate */
-       { 0x2c, 0xa0 }, /* (reserved) */
-       { 0x2d, 0x95 }, /* Enable banding filter */
-       { 0x2e, 0x88 }, /* V offset */
-       { 0x33, 0x22 }, /* Luminance gamma on */
-       { 0x34, 0xc7 }, /* A/D bias */
-       { 0x36, 0x12 }, /* (reserved) */
-       { 0x37, 0x63 }, /* (reserved) */
-       { 0x38, 0x8b }, /* Quick AEC/AEB */
-       { 0x39, 0x00 }, /* (default) */
-       { 0x3a, 0x0f }, /* (default) */
-       { 0x3b, 0x3c }, /* (default) */
-       { 0x3c, 0x5c }, /* AEC controls */
-       { 0x3d, 0x80 }, /* Drop 1 (bad) frame when AEC change */
-       { 0x3e, 0x80 }, /* (default) */
-       { 0x3f, 0x02 }, /* (default) */
-       { 0x40, 0x10 }, /* (reserved) */
-       { 0x41, 0x10 }, /* (reserved) */
-       { 0x42, 0x00 }, /* (reserved) */
-       { 0x43, 0x7f }, /* (reserved) */
-       { 0x44, 0x80 }, /* (reserved) */
-       { 0x45, 0x1c }, /* (reserved) */
-       { 0x46, 0x1c }, /* (reserved) */
-       { 0x47, 0x80 }, /* (reserved) */
-       { 0x48, 0x5f }, /* (reserved) */
-       { 0x49, 0x00 }, /* (reserved) */
-       { 0x4a, 0x00 }, /* Color balance (undocumented) */
-       { 0x4b, 0x80 }, /* Color balance (undocumented) */
-       { 0x4c, 0x58 }, /* (reserved) */
-       { 0x4d, 0xd2 }, /* U *= .938, V *= .838 */
-       { 0x4e, 0xa0 }, /* (default) */
-       { 0x4f, 0x04 }, /* UV 3-point average */
-       { 0x50, 0xff }, /* (reserved) */
-       { 0x51, 0x58 }, /* (reserved) */
-       { 0x52, 0xc0 }, /* (reserved) */
-       { 0x53, 0x42 }, /* (reserved) */
-       { 0x27, 0xa6 }, /* Enable manual offset adj. (reg 21 & 22) */
-       { 0x12, 0x20 },
-       { 0x12, 0x24 },
-
-       { 0xff, 0xff }, /* END MARKER */
-};
-
-/* This initializes the OV6x20 camera chip and relevant variables. */
-static int ov6x20_init(struct i2c_client *c)
-{
-       struct ovcamchip *ov = i2c_get_clientdata(c);
-       struct ov6x20 *s;
-       int rc;
-
-       DDEBUG(4, &c->dev, "entered");
-
-       switch (c->adapter->id) {
-       case I2C_ALGO_SMBUS | I2C_HW_SMBUS_OV511:
-               rc = ov_write_regvals(c, regvals_init_6x20_511);
-               break;
-       case I2C_ALGO_SMBUS | I2C_HW_SMBUS_OV518:
-               rc = ov_write_regvals(c, regvals_init_6x20_518);
-               break;
-       default:
-               dev_err(&c->dev, "ov6x20: Unsupported adapter\n");
-               rc = -ENODEV;
-       }
-
-       if (rc < 0)
-               return rc;
-
-       ov->spriv = s = kmalloc(sizeof *s, GFP_KERNEL);
-       if (!s)
-               return -ENOMEM;
-       memset(s, 0, sizeof *s);
-
-       s->auto_brt = 1;
-       s->auto_exp = 1;
-
-       return rc;
-}
-
-static int ov6x20_free(struct i2c_client *c)
-{
-       struct ovcamchip *ov = i2c_get_clientdata(c);
-
-       kfree(ov->spriv);
-       return 0;
-}
-
-static int ov6x20_set_control(struct i2c_client *c,
-                             struct ovcamchip_control *ctl)
-{
-       struct ovcamchip *ov = i2c_get_clientdata(c);
-       struct ov6x20 *s = ov->spriv;
-       int rc;
-       int v = ctl->value;
-
-       switch (ctl->id) {
-       case OVCAMCHIP_CID_CONT:
-               rc = ov_write(c, REG_CNT, v >> 8);
-               break;
-       case OVCAMCHIP_CID_BRIGHT:
-               rc = ov_write(c, REG_BRT, v >> 8);
-               break;
-       case OVCAMCHIP_CID_SAT:
-               rc = ov_write(c, REG_SAT, v >> 8);
-               break;
-       case OVCAMCHIP_CID_HUE:
-               rc = ov_write(c, REG_RED, 0xFF - (v >> 8));
-               if (rc < 0)
-                       goto out;
-
-               rc = ov_write(c, REG_BLUE, v >> 8);
-               break;
-       case OVCAMCHIP_CID_EXP:
-               rc = ov_write(c, REG_EXP, v);
-               break;
-       case OVCAMCHIP_CID_FREQ:
-       {
-               int sixty = (v == 60);
-
-               rc = ov_write(c, 0x2b, sixty?0xa8:0x28);
-               if (rc < 0)
-                       goto out;
-
-               rc = ov_write(c, 0x2a, sixty?0x84:0xa4);
-               break;
-       }
-       case OVCAMCHIP_CID_BANDFILT:
-               rc = ov_write_mask(c, 0x2d, v?0x04:0x00, 0x04);
-               s->bandfilt = v;
-               break;
-       case OVCAMCHIP_CID_AUTOBRIGHT:
-               rc = ov_write_mask(c, 0x2d, v?0x10:0x00, 0x10);
-               s->auto_brt = v;
-               break;
-       case OVCAMCHIP_CID_AUTOEXP:
-               rc = ov_write_mask(c, 0x13, v?0x01:0x00, 0x01);
-               s->auto_exp = v;
-               break;
-       case OVCAMCHIP_CID_BACKLIGHT:
-       {
-               rc = ov_write_mask(c, 0x4e, v?0xe0:0xc0, 0xe0);
-               if (rc < 0)
-                       goto out;
-
-               rc = ov_write_mask(c, 0x29, v?0x08:0x00, 0x08);
-               if (rc < 0)
-                       goto out;
-
-               rc = ov_write_mask(c, 0x0e, v?0x80:0x00, 0x80);
-               s->backlight = v;
-               break;
-       }
-       case OVCAMCHIP_CID_MIRROR:
-               rc = ov_write_mask(c, 0x12, v?0x40:0x00, 0x40);
-               s->mirror = v;
-               break;
-       default:
-               DDEBUG(2, &c->dev, "control not supported: %d", ctl->id);
-               return -EPERM;
-       }
-
-out:
-       DDEBUG(3, &c->dev, "id=%d, arg=%d, rc=%d", ctl->id, v, rc);
-       return rc;
-}
-
-static int ov6x20_get_control(struct i2c_client *c,
-                             struct ovcamchip_control *ctl)
-{
-       struct ovcamchip *ov = i2c_get_clientdata(c);
-       struct ov6x20 *s = ov->spriv;
-       int rc = 0;
-       unsigned char val = 0;
-
-       switch (ctl->id) {
-       case OVCAMCHIP_CID_CONT:
-               rc = ov_read(c, REG_CNT, &val);
-               ctl->value = val << 8;
-               break;
-       case OVCAMCHIP_CID_BRIGHT:
-               rc = ov_read(c, REG_BRT, &val);
-               ctl->value = val << 8;
-               break;
-       case OVCAMCHIP_CID_SAT:
-               rc = ov_read(c, REG_SAT, &val);
-               ctl->value = val << 8;
-               break;
-       case OVCAMCHIP_CID_HUE:
-               rc = ov_read(c, REG_BLUE, &val);
-               ctl->value = val << 8;
-               break;
-       case OVCAMCHIP_CID_EXP:
-               rc = ov_read(c, REG_EXP, &val);
-               ctl->value = val;
-               break;
-       case OVCAMCHIP_CID_BANDFILT:
-               ctl->value = s->bandfilt;
-               break;
-       case OVCAMCHIP_CID_AUTOBRIGHT:
-               ctl->value = s->auto_brt;
-               break;
-       case OVCAMCHIP_CID_AUTOEXP:
-               ctl->value = s->auto_exp;
-               break;
-       case OVCAMCHIP_CID_BACKLIGHT:
-               ctl->value = s->backlight;
-               break;
-       case OVCAMCHIP_CID_MIRROR:
-               ctl->value = s->mirror;
-               break;
-       default:
-               DDEBUG(2, &c->dev, "control not supported: %d", ctl->id);
-               return -EPERM;
-       }
-
-       DDEBUG(3, &c->dev, "id=%d, arg=%d, rc=%d", ctl->id, ctl->value, rc);
-       return rc;
-}
-
-static int ov6x20_mode_init(struct i2c_client *c, struct ovcamchip_window *win)
-{
-       /******** QCIF-specific regs ********/
-
-       ov_write(c, 0x14, win->quarter?0x24:0x04);
-
-       /******** Palette-specific regs ********/
-
-       /* OV518 needs 8 bit multiplexed in color mode, and 16 bit in B&W */
-       if (c->adapter->id == (I2C_ALGO_SMBUS | I2C_HW_SMBUS_OV518)) {
-               if (win->format == VIDEO_PALETTE_GREY)
-                       ov_write_mask(c, 0x13, 0x00, 0x20);
-               else
-                       ov_write_mask(c, 0x13, 0x20, 0x20);
-       } else {
-               if (win->format == VIDEO_PALETTE_GREY)
-                       ov_write_mask(c, 0x13, 0x20, 0x20);
-               else
-                       ov_write_mask(c, 0x13, 0x00, 0x20);
-       }
-
-       /******** Clock programming ********/
-
-       /* The OV6620 needs special handling. This prevents the
-        * severe banding that normally occurs */
-
-       /* Clock down */
-       ov_write(c, 0x2a, 0x04);
-
-       ov_write(c, 0x11, win->clockdiv);
-
-       ov_write(c, 0x2a, 0x84);
-       /* This next setting is critical. It seems to improve
-        * the gain or the contrast. The "reserved" bits seem
-        * to have some effect in this case. */
-       ov_write(c, 0x2d, 0x85); /* FIXME: This messes up banding filter */
-
-       return 0;
-}
-
-static int ov6x20_set_window(struct i2c_client *c, struct ovcamchip_window *win)
-{
-       int ret, hwscale, vwscale;
-
-       ret = ov6x20_mode_init(c, win);
-       if (ret < 0)
-               return ret;
-
-       if (win->quarter) {
-               hwscale = 0;
-               vwscale = 0;
-       } else {
-               hwscale = 1;
-               vwscale = 1;    /* The datasheet says 0; it's wrong */
-       }
-
-       ov_write(c, 0x17, HWSBASE + (win->x >> hwscale));
-       ov_write(c, 0x18, HWEBASE + ((win->x + win->width) >> hwscale));
-       ov_write(c, 0x19, VWSBASE + (win->y >> vwscale));
-       ov_write(c, 0x1a, VWEBASE + ((win->y + win->height) >> vwscale));
-
-       return 0;
-}
-
-static int ov6x20_command(struct i2c_client *c, unsigned int cmd, void *arg)
-{
-       switch (cmd) {
-       case OVCAMCHIP_CMD_S_CTRL:
-               return ov6x20_set_control(c, arg);
-       case OVCAMCHIP_CMD_G_CTRL:
-               return ov6x20_get_control(c, arg);
-       case OVCAMCHIP_CMD_S_MODE:
-               return ov6x20_set_window(c, arg);
-       default:
-               DDEBUG(2, &c->dev, "command not supported: %d", cmd);
-               return -ENOIOCTLCMD;
-       }
-}
-
-struct ovcamchip_ops ov6x20_ops = {
-       .init    =      ov6x20_init,
-       .free    =      ov6x20_free,
-       .command =      ov6x20_command,
-};
diff --git a/drivers/media/video/ovcamchip/ov6x30.c b/drivers/media/video/ovcamchip/ov6x30.c
deleted file mode 100644 (file)
index 44a8423..0000000
+++ /dev/null
@@ -1,374 +0,0 @@
-/* OmniVision OV6630/OV6130 Camera Chip Support Code
- *
- * Copyright (c) 1999-2004 Mark McClelland <mark@alpha.dyndns.org>
- * http://alpha.dyndns.org/ov511/
- *
- * 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. NO WARRANTY OF ANY KIND is expressed or implied.
- */
-
-#define DEBUG
-
-#include <linux/slab.h>
-#include "ovcamchip_priv.h"
-
-/* Registers */
-#define REG_GAIN               0x00    /* gain [5:0] */
-#define REG_BLUE               0x01    /* blue gain */
-#define REG_RED                        0x02    /* red gain */
-#define REG_SAT                        0x03    /* saturation [7:3] */
-#define REG_CNT                        0x05    /* Y contrast [3:0] */
-#define REG_BRT                        0x06    /* Y brightness */
-#define REG_SHARP              0x07    /* sharpness */
-#define REG_WB_BLUE            0x0C    /* WB blue ratio [5:0] */
-#define REG_WB_RED             0x0D    /* WB red ratio [5:0] */
-#define REG_EXP                        0x10    /* exposure */
-
-/* Window parameters */
-#define HWSBASE 0x38
-#define HWEBASE 0x3A
-#define VWSBASE 0x05
-#define VWEBASE 0x06
-
-struct ov6x30 {
-       int auto_brt;
-       int auto_exp;
-       int backlight;
-       int bandfilt;
-       int mirror;
-};
-
-static struct ovcamchip_regvals regvals_init_6x30[] = {
-       { 0x12, 0x80 }, /* reset */
-       { 0x00, 0x1f }, /* Gain */
-       { 0x01, 0x99 }, /* Blue gain */
-       { 0x02, 0x7c }, /* Red gain */
-       { 0x03, 0xc0 }, /* Saturation */
-       { 0x05, 0x0a }, /* Contrast */
-       { 0x06, 0x95 }, /* Brightness */
-       { 0x07, 0x2d }, /* Sharpness */
-       { 0x0c, 0x20 },
-       { 0x0d, 0x20 },
-       { 0x0e, 0x20 },
-       { 0x0f, 0x05 },
-       { 0x10, 0x9a }, /* "exposure check" */
-       { 0x11, 0x00 }, /* Pixel clock = fastest */
-       { 0x12, 0x24 }, /* Enable AGC and AWB */
-       { 0x13, 0x21 },
-       { 0x14, 0x80 },
-       { 0x15, 0x01 },
-       { 0x16, 0x03 },
-       { 0x17, 0x38 },
-       { 0x18, 0xea },
-       { 0x19, 0x04 },
-       { 0x1a, 0x93 },
-       { 0x1b, 0x00 },
-       { 0x1e, 0xc4 },
-       { 0x1f, 0x04 },
-       { 0x20, 0x20 },
-       { 0x21, 0x10 },
-       { 0x22, 0x88 },
-       { 0x23, 0xc0 }, /* Crystal circuit power level */
-       { 0x25, 0x9a }, /* Increase AEC black pixel ratio */
-       { 0x26, 0xb2 }, /* BLC enable */
-       { 0x27, 0xa2 },
-       { 0x28, 0x00 },
-       { 0x29, 0x00 },
-       { 0x2a, 0x84 }, /* (keep) */
-       { 0x2b, 0xa8 }, /* (keep) */
-       { 0x2c, 0xa0 },
-       { 0x2d, 0x95 }, /* Enable auto-brightness */
-       { 0x2e, 0x88 },
-       { 0x33, 0x26 },
-       { 0x34, 0x03 },
-       { 0x36, 0x8f },
-       { 0x37, 0x80 },
-       { 0x38, 0x83 },
-       { 0x39, 0x80 },
-       { 0x3a, 0x0f },
-       { 0x3b, 0x3c },
-       { 0x3c, 0x1a },
-       { 0x3d, 0x80 },
-       { 0x3e, 0x80 },
-       { 0x3f, 0x0e },
-       { 0x40, 0x00 }, /* White bal */
-       { 0x41, 0x00 }, /* White bal */
-       { 0x42, 0x80 },
-       { 0x43, 0x3f }, /* White bal */
-       { 0x44, 0x80 },
-       { 0x45, 0x20 },
-       { 0x46, 0x20 },
-       { 0x47, 0x80 },
-       { 0x48, 0x7f },
-       { 0x49, 0x00 },
-       { 0x4a, 0x00 },
-       { 0x4b, 0x80 },
-       { 0x4c, 0xd0 },
-       { 0x4d, 0x10 }, /* U = 0.563u, V = 0.714v */
-       { 0x4e, 0x40 },
-       { 0x4f, 0x07 }, /* UV average mode, color killer: strongest */
-       { 0x50, 0xff },
-       { 0x54, 0x23 }, /* Max AGC gain: 18dB */
-       { 0x55, 0xff },
-       { 0x56, 0x12 },
-       { 0x57, 0x81 }, /* (default) */
-       { 0x58, 0x75 },
-       { 0x59, 0x01 }, /* AGC dark current compensation: +1 */
-       { 0x5a, 0x2c },
-       { 0x5b, 0x0f }, /* AWB chrominance levels */
-       { 0x5c, 0x10 },
-       { 0x3d, 0x80 },
-       { 0x27, 0xa6 },
-       /* Toggle AWB off and on */
-       { 0x12, 0x20 },
-       { 0x12, 0x24 },
-
-       { 0xff, 0xff }, /* END MARKER */
-};
-
-/* This initializes the OV6x30 camera chip and relevant variables. */
-static int ov6x30_init(struct i2c_client *c)
-{
-       struct ovcamchip *ov = i2c_get_clientdata(c);
-       struct ov6x30 *s;
-       int rc;
-
-       DDEBUG(4, &c->dev, "entered");
-
-       rc = ov_write_regvals(c, regvals_init_6x30);
-       if (rc < 0)
-               return rc;
-
-       ov->spriv = s = kmalloc(sizeof *s, GFP_KERNEL);
-       if (!s)
-               return -ENOMEM;
-       memset(s, 0, sizeof *s);
-
-       s->auto_brt = 1;
-       s->auto_exp = 1;
-
-       return rc;
-}
-
-static int ov6x30_free(struct i2c_client *c)
-{
-       struct ovcamchip *ov = i2c_get_clientdata(c);
-
-       kfree(ov->spriv);
-       return 0;
-}
-
-static int ov6x30_set_control(struct i2c_client *c,
-                             struct ovcamchip_control *ctl)
-{
-       struct ovcamchip *ov = i2c_get_clientdata(c);
-       struct ov6x30 *s = ov->spriv;
-       int rc;
-       int v = ctl->value;
-
-       switch (ctl->id) {
-       case OVCAMCHIP_CID_CONT:
-               rc = ov_write_mask(c, REG_CNT, v >> 12, 0x0f);
-               break;
-       case OVCAMCHIP_CID_BRIGHT:
-               rc = ov_write(c, REG_BRT, v >> 8);
-               break;
-       case OVCAMCHIP_CID_SAT:
-               rc = ov_write(c, REG_SAT, v >> 8);
-               break;
-       case OVCAMCHIP_CID_HUE:
-               rc = ov_write(c, REG_RED, 0xFF - (v >> 8));
-               if (rc < 0)
-                       goto out;
-
-               rc = ov_write(c, REG_BLUE, v >> 8);
-               break;
-       case OVCAMCHIP_CID_EXP:
-               rc = ov_write(c, REG_EXP, v);
-               break;
-       case OVCAMCHIP_CID_FREQ:
-       {
-               int sixty = (v == 60);
-
-               rc = ov_write(c, 0x2b, sixty?0xa8:0x28);
-               if (rc < 0)
-                       goto out;
-
-               rc = ov_write(c, 0x2a, sixty?0x84:0xa4);
-               break;
-       }
-       case OVCAMCHIP_CID_BANDFILT:
-               rc = ov_write_mask(c, 0x2d, v?0x04:0x00, 0x04);
-               s->bandfilt = v;
-               break;
-       case OVCAMCHIP_CID_AUTOBRIGHT:
-               rc = ov_write_mask(c, 0x2d, v?0x10:0x00, 0x10);
-               s->auto_brt = v;
-               break;
-       case OVCAMCHIP_CID_AUTOEXP:
-               rc = ov_write_mask(c, 0x28, v?0x00:0x10, 0x10);
-               s->auto_exp = v;
-               break;
-       case OVCAMCHIP_CID_BACKLIGHT:
-       {
-               rc = ov_write_mask(c, 0x4e, v?0x80:0x60, 0xe0);
-               if (rc < 0)
-                       goto out;
-
-               rc = ov_write_mask(c, 0x29, v?0x08:0x00, 0x08);
-               if (rc < 0)
-                       goto out;
-
-               rc = ov_write_mask(c, 0x28, v?0x02:0x00, 0x02);
-               s->backlight = v;
-               break;
-       }
-       case OVCAMCHIP_CID_MIRROR:
-               rc = ov_write_mask(c, 0x12, v?0x40:0x00, 0x40);
-               s->mirror = v;
-               break;
-       default:
-               DDEBUG(2, &c->dev, "control not supported: %d", ctl->id);
-               return -EPERM;
-       }
-
-out:
-       DDEBUG(3, &c->dev, "id=%d, arg=%d, rc=%d", ctl->id, v, rc);
-       return rc;
-}
-
-static int ov6x30_get_control(struct i2c_client *c,
-                             struct ovcamchip_control *ctl)
-{
-       struct ovcamchip *ov = i2c_get_clientdata(c);
-       struct ov6x30 *s = ov->spriv;
-       int rc = 0;
-       unsigned char val = 0;
-
-       switch (ctl->id) {
-       case OVCAMCHIP_CID_CONT:
-               rc = ov_read(c, REG_CNT, &val);
-               ctl->value = (val & 0x0f) << 12;
-               break;
-       case OVCAMCHIP_CID_BRIGHT:
-               rc = ov_read(c, REG_BRT, &val);
-               ctl->value = val << 8;
-               break;
-       case OVCAMCHIP_CID_SAT:
-               rc = ov_read(c, REG_SAT, &val);
-               ctl->value = val << 8;
-               break;
-       case OVCAMCHIP_CID_HUE:
-               rc = ov_read(c, REG_BLUE, &val);
-               ctl->value = val << 8;
-               break;
-       case OVCAMCHIP_CID_EXP:
-               rc = ov_read(c, REG_EXP, &val);
-               ctl->value = val;
-               break;
-       case OVCAMCHIP_CID_BANDFILT:
-               ctl->value = s->bandfilt;
-               break;
-       case OVCAMCHIP_CID_AUTOBRIGHT:
-               ctl->value = s->auto_brt;
-               break;
-       case OVCAMCHIP_CID_AUTOEXP:
-               ctl->value = s->auto_exp;
-               break;
-       case OVCAMCHIP_CID_BACKLIGHT:
-               ctl->value = s->backlight;
-               break;
-       case OVCAMCHIP_CID_MIRROR:
-               ctl->value = s->mirror;
-               break;
-       default:
-               DDEBUG(2, &c->dev, "control not supported: %d", ctl->id);
-               return -EPERM;
-       }
-
-       DDEBUG(3, &c->dev, "id=%d, arg=%d, rc=%d", ctl->id, ctl->value, rc);
-       return rc;
-}
-
-static int ov6x30_mode_init(struct i2c_client *c, struct ovcamchip_window *win)
-{
-       /******** QCIF-specific regs ********/
-
-       ov_write_mask(c, 0x14, win->quarter?0x20:0x00, 0x20);
-
-       /******** Palette-specific regs ********/
-
-       if (win->format == VIDEO_PALETTE_GREY) {
-               if (c->adapter->id == (I2C_ALGO_SMBUS | I2C_HW_SMBUS_OV518)) {
-                       /* Do nothing - we're already in 8-bit mode */
-               } else {
-                       ov_write_mask(c, 0x13, 0x20, 0x20);
-               }
-       } else {
-               /* The OV518 needs special treatment. Although both the OV518
-                * and the OV6630 support a 16-bit video bus, only the 8 bit Y
-                * bus is actually used. The UV bus is tied to ground.
-                * Therefore, the OV6630 needs to be in 8-bit multiplexed
-                * output mode */
-
-               if (c->adapter->id == (I2C_ALGO_SMBUS | I2C_HW_SMBUS_OV518)) {
-                       /* Do nothing - we want to stay in 8-bit mode */
-                       /* Warning: Messing with reg 0x13 breaks OV518 color */
-               } else {
-                       ov_write_mask(c, 0x13, 0x00, 0x20);
-               }
-       }
-
-       /******** Clock programming ********/
-
-       ov_write(c, 0x11, win->clockdiv);
-
-       return 0;
-}
-
-static int ov6x30_set_window(struct i2c_client *c, struct ovcamchip_window *win)
-{
-       int ret, hwscale, vwscale;
-
-       ret = ov6x30_mode_init(c, win);
-       if (ret < 0)
-               return ret;
-
-       if (win->quarter) {
-               hwscale = 0;
-               vwscale = 0;
-       } else {
-               hwscale = 1;
-               vwscale = 1;    /* The datasheet says 0; it's wrong */
-       }
-
-       ov_write(c, 0x17, HWSBASE + (win->x >> hwscale));
-       ov_write(c, 0x18, HWEBASE + ((win->x + win->width) >> hwscale));
-       ov_write(c, 0x19, VWSBASE + (win->y >> vwscale));
-       ov_write(c, 0x1a, VWEBASE + ((win->y + win->height) >> vwscale));
-
-       return 0;
-}
-
-static int ov6x30_command(struct i2c_client *c, unsigned int cmd, void *arg)
-{
-       switch (cmd) {
-       case OVCAMCHIP_CMD_S_CTRL:
-               return ov6x30_set_control(c, arg);
-       case OVCAMCHIP_CMD_G_CTRL:
-               return ov6x30_get_control(c, arg);
-       case OVCAMCHIP_CMD_S_MODE:
-               return ov6x30_set_window(c, arg);
-       default:
-               DDEBUG(2, &c->dev, "command not supported: %d", cmd);
-               return -ENOIOCTLCMD;
-       }
-}
-
-struct ovcamchip_ops ov6x30_ops = {
-       .init    =      ov6x30_init,
-       .free    =      ov6x30_free,
-       .command =      ov6x30_command,
-};
diff --git a/drivers/media/video/ovcamchip/ov76be.c b/drivers/media/video/ovcamchip/ov76be.c
deleted file mode 100644 (file)
index 29bbdc0..0000000
+++ /dev/null
@@ -1,303 +0,0 @@
-/* OmniVision OV76BE Camera Chip Support Code
- *
- * Copyright (c) 1999-2004 Mark McClelland <mark@alpha.dyndns.org>
- * http://alpha.dyndns.org/ov511/
- *
- * 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. NO WARRANTY OF ANY KIND is expressed or implied.
- */
-
-#define DEBUG
-
-#include <linux/slab.h>
-#include "ovcamchip_priv.h"
-
-/* OV7610 registers: Since the OV76BE is undocumented, we'll settle for these
- * for now. */
-#define REG_GAIN               0x00    /* gain [5:0] */
-#define REG_BLUE               0x01    /* blue channel balance */
-#define REG_RED                        0x02    /* red channel balance */
-#define REG_SAT                        0x03    /* saturation */
-#define REG_CNT                        0x05    /* Y contrast */
-#define REG_BRT                        0x06    /* Y brightness */
-#define REG_BLUE_BIAS          0x0C    /* blue channel bias [5:0] */
-#define REG_RED_BIAS           0x0D    /* red channel bias [5:0] */
-#define REG_GAMMA_COEFF                0x0E    /* gamma settings */
-#define REG_WB_RANGE           0x0F    /* AEC/ALC/S-AWB settings */
-#define REG_EXP                        0x10    /* manual exposure setting */
-#define REG_CLOCK              0x11    /* polarity/clock prescaler */
-#define REG_FIELD_DIVIDE       0x16    /* field interval/mode settings */
-#define REG_HWIN_START         0x17    /* horizontal window start */
-#define REG_HWIN_END           0x18    /* horizontal window end */
-#define REG_VWIN_START         0x19    /* vertical window start */
-#define REG_VWIN_END           0x1A    /* vertical window end */
-#define REG_PIXEL_SHIFT        0x1B    /* pixel shift */
-#define REG_YOFFSET            0x21    /* Y channel offset */
-#define REG_UOFFSET            0x22    /* U channel offset */
-#define REG_ECW                        0x24    /* exposure white level for AEC */
-#define REG_ECB                        0x25    /* exposure black level for AEC */
-#define REG_FRAMERATE_H                0x2A    /* frame rate MSB + misc */
-#define REG_FRAMERATE_L                0x2B    /* frame rate LSB */
-#define REG_ALC                        0x2C    /* Auto Level Control settings */
-#define REG_VOFFSET            0x2E    /* V channel offset adjustment */
-#define REG_ARRAY_BIAS         0x2F    /* array bias -- don't change */
-#define REG_YGAMMA             0x33    /* misc gamma settings [7:6] */
-#define REG_BIAS_ADJUST                0x34    /* misc bias settings */
-
-/* Window parameters */
-#define HWSBASE 0x38
-#define HWEBASE 0x3a
-#define VWSBASE 0x05
-#define VWEBASE 0x05
-
-struct ov76be {
-       int auto_brt;
-       int auto_exp;
-       int bandfilt;
-       int mirror;
-};
-
-/* NOTE: These are the same as the 7x10 settings, but should eventually be
- * optimized for the OV76BE */
-static struct ovcamchip_regvals regvals_init_76be[] = {
-       { 0x10, 0xff },
-       { 0x16, 0x03 },
-       { 0x28, 0x24 },
-       { 0x2b, 0xac },
-       { 0x12, 0x00 },
-       { 0x38, 0x81 },
-       { 0x28, 0x24 }, /* 0c */
-       { 0x0f, 0x85 }, /* lg's setting */
-       { 0x15, 0x01 },
-       { 0x20, 0x1c },
-       { 0x23, 0x2a },
-       { 0x24, 0x10 },
-       { 0x25, 0x8a },
-       { 0x26, 0xa2 },
-       { 0x27, 0xc2 },
-       { 0x2a, 0x04 },
-       { 0x2c, 0xfe },
-       { 0x2d, 0x93 },
-       { 0x30, 0x71 },
-       { 0x31, 0x60 },
-       { 0x32, 0x26 },
-       { 0x33, 0x20 },
-       { 0x34, 0x48 },
-       { 0x12, 0x24 },
-       { 0x11, 0x01 },
-       { 0x0c, 0x24 },
-       { 0x0d, 0x24 },
-       { 0xff, 0xff }, /* END MARKER */
-};
-
-/* This initializes the OV76be camera chip and relevant variables. */
-static int ov76be_init(struct i2c_client *c)
-{
-       struct ovcamchip *ov = i2c_get_clientdata(c);
-       struct ov76be *s;
-       int rc;
-
-       DDEBUG(4, &c->dev, "entered");
-
-       rc = ov_write_regvals(c, regvals_init_76be);
-       if (rc < 0)
-               return rc;
-
-       ov->spriv = s = kmalloc(sizeof *s, GFP_KERNEL);
-       if (!s)
-               return -ENOMEM;
-       memset(s, 0, sizeof *s);
-
-       s->auto_brt = 1;
-       s->auto_exp = 1;
-
-       return rc;
-}
-
-static int ov76be_free(struct i2c_client *c)
-{
-       struct ovcamchip *ov = i2c_get_clientdata(c);
-
-       kfree(ov->spriv);
-       return 0;
-}
-
-static int ov76be_set_control(struct i2c_client *c,
-                             struct ovcamchip_control *ctl)
-{
-       struct ovcamchip *ov = i2c_get_clientdata(c);
-       struct ov76be *s = ov->spriv;
-       int rc;
-       int v = ctl->value;
-
-       switch (ctl->id) {
-       case OVCAMCHIP_CID_BRIGHT:
-               rc = ov_write(c, REG_BRT, v >> 8);
-               break;
-       case OVCAMCHIP_CID_SAT:
-               rc = ov_write(c, REG_SAT, v >> 8);
-               break;
-       case OVCAMCHIP_CID_EXP:
-               rc = ov_write(c, REG_EXP, v);
-               break;
-       case OVCAMCHIP_CID_FREQ:
-       {
-               int sixty = (v == 60);
-
-               rc = ov_write_mask(c, 0x2a, sixty?0x00:0x80, 0x80);
-               if (rc < 0)
-                       goto out;
-
-               rc = ov_write(c, 0x2b, sixty?0x00:0xac);
-               if (rc < 0)
-                       goto out;
-
-               rc = ov_write_mask(c, 0x76, 0x01, 0x01);
-               break;
-       }
-       case OVCAMCHIP_CID_BANDFILT:
-               rc = ov_write_mask(c, 0x2d, v?0x04:0x00, 0x04);
-               s->bandfilt = v;
-               break;
-       case OVCAMCHIP_CID_AUTOBRIGHT:
-               rc = ov_write_mask(c, 0x2d, v?0x10:0x00, 0x10);
-               s->auto_brt = v;
-               break;
-       case OVCAMCHIP_CID_AUTOEXP:
-               rc = ov_write_mask(c, 0x13, v?0x01:0x00, 0x01);
-               s->auto_exp = v;
-               break;
-       case OVCAMCHIP_CID_MIRROR:
-               rc = ov_write_mask(c, 0x12, v?0x40:0x00, 0x40);
-               s->mirror = v;
-               break;
-       default:
-               DDEBUG(2, &c->dev, "control not supported: %d", ctl->id);
-               return -EPERM;
-       }
-
-out:
-       DDEBUG(3, &c->dev, "id=%d, arg=%d, rc=%d", ctl->id, v, rc);
-       return rc;
-}
-
-static int ov76be_get_control(struct i2c_client *c,
-                             struct ovcamchip_control *ctl)
-{
-       struct ovcamchip *ov = i2c_get_clientdata(c);
-       struct ov76be *s = ov->spriv;
-       int rc = 0;
-       unsigned char val = 0;
-
-       switch (ctl->id) {
-       case OVCAMCHIP_CID_BRIGHT:
-               rc = ov_read(c, REG_BRT, &val);
-               ctl->value = val << 8;
-               break;
-       case OVCAMCHIP_CID_SAT:
-               rc = ov_read(c, REG_SAT, &val);
-               ctl->value = val << 8;
-               break;
-       case OVCAMCHIP_CID_EXP:
-               rc = ov_read(c, REG_EXP, &val);
-               ctl->value = val;
-               break;
-       case OVCAMCHIP_CID_BANDFILT:
-               ctl->value = s->bandfilt;
-               break;
-       case OVCAMCHIP_CID_AUTOBRIGHT:
-               ctl->value = s->auto_brt;
-               break;
-       case OVCAMCHIP_CID_AUTOEXP:
-               ctl->value = s->auto_exp;
-               break;
-       case OVCAMCHIP_CID_MIRROR:
-               ctl->value = s->mirror;
-               break;
-       default:
-               DDEBUG(2, &c->dev, "control not supported: %d", ctl->id);
-               return -EPERM;
-       }
-
-       DDEBUG(3, &c->dev, "id=%d, arg=%d, rc=%d", ctl->id, ctl->value, rc);
-       return rc;
-}
-
-static int ov76be_mode_init(struct i2c_client *c, struct ovcamchip_window *win)
-{
-       int qvga = win->quarter;
-
-       /******** QVGA-specific regs ********/
-
-       ov_write(c, 0x14, qvga?0xa4:0x84);
-
-       /******** Palette-specific regs ********/
-
-       if (win->format == VIDEO_PALETTE_GREY) {
-               ov_write_mask(c, 0x0e, 0x40, 0x40);
-               ov_write_mask(c, 0x13, 0x20, 0x20);
-       } else {
-               ov_write_mask(c, 0x0e, 0x00, 0x40);
-               ov_write_mask(c, 0x13, 0x00, 0x20);
-       }
-
-       /******** Clock programming ********/
-
-       ov_write(c, 0x11, win->clockdiv);
-
-       /******** Resolution-specific ********/
-
-       if (win->width == 640 && win->height == 480)
-               ov_write(c, 0x35, 0x9e);
-       else
-               ov_write(c, 0x35, 0x1e);
-
-       return 0;
-}
-
-static int ov76be_set_window(struct i2c_client *c, struct ovcamchip_window *win)
-{
-       int ret, hwscale, vwscale;
-
-       ret = ov76be_mode_init(c, win);
-       if (ret < 0)
-               return ret;
-
-       if (win->quarter) {
-               hwscale = 1;
-               vwscale = 0;
-       } else {
-               hwscale = 2;
-               vwscale = 1;
-       }
-
-       ov_write(c, 0x17, HWSBASE + (win->x >> hwscale));
-       ov_write(c, 0x18, HWEBASE + ((win->x + win->width) >> hwscale));
-       ov_write(c, 0x19, VWSBASE + (win->y >> vwscale));
-       ov_write(c, 0x1a, VWEBASE + ((win->y + win->height) >> vwscale));
-
-       return 0;
-}
-
-static int ov76be_command(struct i2c_client *c, unsigned int cmd, void *arg)
-{
-       switch (cmd) {
-       case OVCAMCHIP_CMD_S_CTRL:
-               return ov76be_set_control(c, arg);
-       case OVCAMCHIP_CMD_G_CTRL:
-               return ov76be_get_control(c, arg);
-       case OVCAMCHIP_CMD_S_MODE:
-               return ov76be_set_window(c, arg);
-       default:
-               DDEBUG(2, &c->dev, "command not supported: %d", cmd);
-               return -ENOIOCTLCMD;
-       }
-}
-
-struct ovcamchip_ops ov76be_ops = {
-       .init    =      ov76be_init,
-       .free    =      ov76be_free,
-       .command =      ov76be_command,
-};
diff --git a/drivers/media/video/ovcamchip/ov7x10.c b/drivers/media/video/ovcamchip/ov7x10.c
deleted file mode 100644 (file)
index 6c383d4..0000000
+++ /dev/null
@@ -1,335 +0,0 @@
-/* OmniVision OV7610/OV7110 Camera Chip Support Code
- *
- * Copyright (c) 1999-2004 Mark McClelland <mark@alpha.dyndns.org>
- * http://alpha.dyndns.org/ov511/
- *
- * Color fixes by by Orion Sky Lawlor <olawlor@acm.org> (2/26/2000)
- *
- * 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. NO WARRANTY OF ANY KIND is expressed or implied.
- */
-
-#define DEBUG
-
-#include <linux/slab.h>
-#include "ovcamchip_priv.h"
-
-/* Registers */
-#define REG_GAIN               0x00    /* gain [5:0] */
-#define REG_BLUE               0x01    /* blue channel balance */
-#define REG_RED                        0x02    /* red channel balance */
-#define REG_SAT                        0x03    /* saturation */
-#define REG_CNT                        0x05    /* Y contrast */
-#define REG_BRT                        0x06    /* Y brightness */
-#define REG_BLUE_BIAS          0x0C    /* blue channel bias [5:0] */
-#define REG_RED_BIAS           0x0D    /* red channel bias [5:0] */
-#define REG_GAMMA_COEFF                0x0E    /* gamma settings */
-#define REG_WB_RANGE           0x0F    /* AEC/ALC/S-AWB settings */
-#define REG_EXP                        0x10    /* manual exposure setting */
-#define REG_CLOCK              0x11    /* polarity/clock prescaler */
-#define REG_FIELD_DIVIDE       0x16    /* field interval/mode settings */
-#define REG_HWIN_START         0x17    /* horizontal window start */
-#define REG_HWIN_END           0x18    /* horizontal window end */
-#define REG_VWIN_START         0x19    /* vertical window start */
-#define REG_VWIN_END           0x1A    /* vertical window end */
-#define REG_PIXEL_SHIFT        0x1B    /* pixel shift */
-#define REG_YOFFSET            0x21    /* Y channel offset */
-#define REG_UOFFSET            0x22    /* U channel offset */
-#define REG_ECW                        0x24    /* exposure white level for AEC */
-#define REG_ECB                        0x25    /* exposure black level for AEC */
-#define REG_FRAMERATE_H                0x2A    /* frame rate MSB + misc */
-#define REG_FRAMERATE_L                0x2B    /* frame rate LSB */
-#define REG_ALC                        0x2C    /* Auto Level Control settings */
-#define REG_VOFFSET            0x2E    /* V channel offset adjustment */
-#define REG_ARRAY_BIAS         0x2F    /* array bias -- don't change */
-#define REG_YGAMMA             0x33    /* misc gamma settings [7:6] */
-#define REG_BIAS_ADJUST                0x34    /* misc bias settings */
-
-/* Window parameters */
-#define HWSBASE 0x38
-#define HWEBASE 0x3a
-#define VWSBASE 0x05
-#define VWEBASE 0x05
-
-struct ov7x10 {
-       int auto_brt;
-       int auto_exp;
-       int bandfilt;
-       int mirror;
-};
-
-/* Lawrence Glaister <lg@jfm.bc.ca> reports:
- *
- * Register 0x0f in the 7610 has the following effects:
- *
- * 0x85 (AEC method 1): Best overall, good contrast range
- * 0x45 (AEC method 2): Very overexposed
- * 0xa5 (spec sheet default): Ok, but the black level is
- *     shifted resulting in loss of contrast
- * 0x05 (old driver setting): very overexposed, too much
- *     contrast
- */
-static struct ovcamchip_regvals regvals_init_7x10[] = {
-       { 0x10, 0xff },
-       { 0x16, 0x03 },
-       { 0x28, 0x24 },
-       { 0x2b, 0xac },
-       { 0x12, 0x00 },
-       { 0x38, 0x81 },
-       { 0x28, 0x24 }, /* 0c */
-       { 0x0f, 0x85 }, /* lg's setting */
-       { 0x15, 0x01 },
-       { 0x20, 0x1c },
-       { 0x23, 0x2a },
-       { 0x24, 0x10 },
-       { 0x25, 0x8a },
-       { 0x26, 0xa2 },
-       { 0x27, 0xc2 },
-       { 0x2a, 0x04 },
-       { 0x2c, 0xfe },
-       { 0x2d, 0x93 },
-       { 0x30, 0x71 },
-       { 0x31, 0x60 },
-       { 0x32, 0x26 },
-       { 0x33, 0x20 },
-       { 0x34, 0x48 },
-       { 0x12, 0x24 },
-       { 0x11, 0x01 },
-       { 0x0c, 0x24 },
-       { 0x0d, 0x24 },
-       { 0xff, 0xff }, /* END MARKER */
-};
-
-/* This initializes the OV7x10 camera chip and relevant variables. */
-static int ov7x10_init(struct i2c_client *c)
-{
-       struct ovcamchip *ov = i2c_get_clientdata(c);
-       struct ov7x10 *s;
-       int rc;
-
-       DDEBUG(4, &c->dev, "entered");
-
-       rc = ov_write_regvals(c, regvals_init_7x10);
-       if (rc < 0)
-               return rc;
-
-       ov->spriv = s = kmalloc(sizeof *s, GFP_KERNEL);
-       if (!s)
-               return -ENOMEM;
-       memset(s, 0, sizeof *s);
-
-       s->auto_brt = 1;
-       s->auto_exp = 1;
-
-       return rc;
-}
-
-static int ov7x10_free(struct i2c_client *c)
-{
-       struct ovcamchip *ov = i2c_get_clientdata(c);
-
-       kfree(ov->spriv);
-       return 0;
-}
-
-static int ov7x10_set_control(struct i2c_client *c,
-                             struct ovcamchip_control *ctl)
-{
-       struct ovcamchip *ov = i2c_get_clientdata(c);
-       struct ov7x10 *s = ov->spriv;
-       int rc;
-       int v = ctl->value;
-
-       switch (ctl->id) {
-       case OVCAMCHIP_CID_CONT:
-               rc = ov_write(c, REG_CNT, v >> 8);
-               break;
-       case OVCAMCHIP_CID_BRIGHT:
-               rc = ov_write(c, REG_BRT, v >> 8);
-               break;
-       case OVCAMCHIP_CID_SAT:
-               rc = ov_write(c, REG_SAT, v >> 8);
-               break;
-       case OVCAMCHIP_CID_HUE:
-               rc = ov_write(c, REG_RED, 0xFF - (v >> 8));
-               if (rc < 0)
-                       goto out;
-
-               rc = ov_write(c, REG_BLUE, v >> 8);
-               break;
-       case OVCAMCHIP_CID_EXP:
-               rc = ov_write(c, REG_EXP, v);
-               break;
-       case OVCAMCHIP_CID_FREQ:
-       {
-               int sixty = (v == 60);
-
-               rc = ov_write_mask(c, 0x2a, sixty?0x00:0x80, 0x80);
-               if (rc < 0)
-                       goto out;
-
-               rc = ov_write(c, 0x2b, sixty?0x00:0xac);
-               if (rc < 0)
-                       goto out;
-
-               rc = ov_write_mask(c, 0x13, 0x10, 0x10);
-               if (rc < 0)
-                       goto out;
-
-               rc = ov_write_mask(c, 0x13, 0x00, 0x10);
-               break;
-       }
-       case OVCAMCHIP_CID_BANDFILT:
-               rc = ov_write_mask(c, 0x2d, v?0x04:0x00, 0x04);
-               s->bandfilt = v;
-               break;
-       case OVCAMCHIP_CID_AUTOBRIGHT:
-               rc = ov_write_mask(c, 0x2d, v?0x10:0x00, 0x10);
-               s->auto_brt = v;
-               break;
-       case OVCAMCHIP_CID_AUTOEXP:
-               rc = ov_write_mask(c, 0x29, v?0x00:0x80, 0x80);
-               s->auto_exp = v;
-               break;
-       case OVCAMCHIP_CID_MIRROR:
-               rc = ov_write_mask(c, 0x12, v?0x40:0x00, 0x40);
-               s->mirror = v;
-               break;
-       default:
-               DDEBUG(2, &c->dev, "control not supported: %d", ctl->id);
-               return -EPERM;
-       }
-
-out:
-       DDEBUG(3, &c->dev, "id=%d, arg=%d, rc=%d", ctl->id, v, rc);
-       return rc;
-}
-
-static int ov7x10_get_control(struct i2c_client *c,
-                             struct ovcamchip_control *ctl)
-{
-       struct ovcamchip *ov = i2c_get_clientdata(c);
-       struct ov7x10 *s = ov->spriv;
-       int rc = 0;
-       unsigned char val = 0;
-
-       switch (ctl->id) {
-       case OVCAMCHIP_CID_CONT:
-               rc = ov_read(c, REG_CNT, &val);
-               ctl->value = val << 8;
-               break;
-       case OVCAMCHIP_CID_BRIGHT:
-               rc = ov_read(c, REG_BRT, &val);
-               ctl->value = val << 8;
-               break;
-       case OVCAMCHIP_CID_SAT:
-               rc = ov_read(c, REG_SAT, &val);
-               ctl->value = val << 8;
-               break;
-       case OVCAMCHIP_CID_HUE:
-               rc = ov_read(c, REG_BLUE, &val);
-               ctl->value = val << 8;
-               break;
-       case OVCAMCHIP_CID_EXP:
-               rc = ov_read(c, REG_EXP, &val);
-               ctl->value = val;
-               break;
-       case OVCAMCHIP_CID_BANDFILT:
-               ctl->value = s->bandfilt;
-               break;
-       case OVCAMCHIP_CID_AUTOBRIGHT:
-               ctl->value = s->auto_brt;
-               break;
-       case OVCAMCHIP_CID_AUTOEXP:
-               ctl->value = s->auto_exp;
-               break;
-       case OVCAMCHIP_CID_MIRROR:
-               ctl->value = s->mirror;
-               break;
-       default:
-               DDEBUG(2, &c->dev, "control not supported: %d", ctl->id);
-               return -EPERM;
-       }
-
-       DDEBUG(3, &c->dev, "id=%d, arg=%d, rc=%d", ctl->id, ctl->value, rc);
-       return rc;
-}
-
-static int ov7x10_mode_init(struct i2c_client *c, struct ovcamchip_window *win)
-{
-       int qvga = win->quarter;
-
-       /******** QVGA-specific regs ********/
-
-       ov_write(c, 0x14, qvga?0x24:0x04);
-
-       /******** Palette-specific regs ********/
-
-       if (win->format == VIDEO_PALETTE_GREY) {
-               ov_write_mask(c, 0x0e, 0x40, 0x40);
-               ov_write_mask(c, 0x13, 0x20, 0x20);
-       } else {
-               ov_write_mask(c, 0x0e, 0x00, 0x40);
-               ov_write_mask(c, 0x13, 0x00, 0x20);
-       }
-
-       /******** Clock programming ********/
-
-       ov_write(c, 0x11, win->clockdiv);
-
-       /******** Resolution-specific ********/
-
-       if (win->width == 640 && win->height == 480)
-               ov_write(c, 0x35, 0x9e);
-       else
-               ov_write(c, 0x35, 0x1e);
-
-       return 0;
-}
-
-static int ov7x10_set_window(struct i2c_client *c, struct ovcamchip_window *win)
-{
-       int ret, hwscale, vwscale;
-
-       ret = ov7x10_mode_init(c, win);
-       if (ret < 0)
-               return ret;
-
-       if (win->quarter) {
-               hwscale = 1;
-               vwscale = 0;
-       } else {
-               hwscale = 2;
-               vwscale = 1;
-       }
-
-       ov_write(c, 0x17, HWSBASE + (win->x >> hwscale));
-       ov_write(c, 0x18, HWEBASE + ((win->x + win->width) >> hwscale));
-       ov_write(c, 0x19, VWSBASE + (win->y >> vwscale));
-       ov_write(c, 0x1a, VWEBASE + ((win->y + win->height) >> vwscale));
-
-       return 0;
-}
-
-static int ov7x10_command(struct i2c_client *c, unsigned int cmd, void *arg)
-{
-       switch (cmd) {
-       case OVCAMCHIP_CMD_S_CTRL:
-               return ov7x10_set_control(c, arg);
-       case OVCAMCHIP_CMD_G_CTRL:
-               return ov7x10_get_control(c, arg);
-       case OVCAMCHIP_CMD_S_MODE:
-               return ov7x10_set_window(c, arg);
-       default:
-               DDEBUG(2, &c->dev, "command not supported: %d", cmd);
-               return -ENOIOCTLCMD;
-       }
-}
-
-struct ovcamchip_ops ov7x10_ops = {
-       .init    =      ov7x10_init,
-       .free    =      ov7x10_free,
-       .command =      ov7x10_command,
-};
diff --git a/drivers/media/video/ovcamchip/ov7x20.c b/drivers/media/video/ovcamchip/ov7x20.c
deleted file mode 100644 (file)
index 3c8c48f..0000000
+++ /dev/null
@@ -1,455 +0,0 @@
-/* OmniVision OV7620/OV7120 Camera Chip Support Code
- *
- * Copyright (c) 1999-2004 Mark McClelland <mark@alpha.dyndns.org>
- * http://alpha.dyndns.org/ov511/
- *
- * OV7620 fixes by Charl P. Botha <cpbotha@ieee.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. NO WARRANTY OF ANY KIND is expressed or implied.
- */
-
-#define DEBUG
-
-#include <linux/slab.h>
-#include "ovcamchip_priv.h"
-
-/* Registers */
-#define REG_GAIN               0x00    /* gain [5:0] */
-#define REG_BLUE               0x01    /* blue gain */
-#define REG_RED                        0x02    /* red gain */
-#define REG_SAT                        0x03    /* saturation */
-#define REG_BRT                        0x06    /* Y brightness */
-#define REG_SHARP              0x07    /* analog sharpness */
-#define REG_BLUE_BIAS          0x0C    /* WB blue ratio [5:0] */
-#define REG_RED_BIAS           0x0D    /* WB red ratio [5:0] */
-#define REG_EXP                        0x10    /* exposure */
-
-/* Default control settings. Values are in terms of V4L2 controls. */
-#define OV7120_DFL_BRIGHT     0x60
-#define OV7620_DFL_BRIGHT     0x60
-#define OV7120_DFL_SAT        0xb0
-#define OV7620_DFL_SAT        0xc0
-#define DFL_AUTO_EXP             1
-#define DFL_AUTO_GAIN            1
-#define OV7120_DFL_GAIN       0x00
-#define OV7620_DFL_GAIN       0x00
-/* NOTE: Since autoexposure is the default, these aren't programmed into the
- * OV7x20 chip. They are just here because V4L2 expects a default */
-#define OV7120_DFL_EXP        0x7f
-#define OV7620_DFL_EXP        0x7f
-
-/* Window parameters */
-#define HWSBASE 0x2F   /* From 7620.SET (spec is wrong) */
-#define HWEBASE 0x2F
-#define VWSBASE 0x05
-#define VWEBASE 0x05
-
-struct ov7x20 {
-       int auto_brt;
-       int auto_exp;
-       int auto_gain;
-       int backlight;
-       int bandfilt;
-       int mirror;
-};
-
-/* Contrast look-up table */
-static unsigned char ctab[] = {
-       0x01, 0x05, 0x09, 0x11, 0x15, 0x35, 0x37, 0x57,
-       0x5b, 0xa5, 0xa7, 0xc7, 0xc9, 0xcf, 0xef, 0xff
-};
-
-/* Settings for (Black & White) OV7120 camera chip */
-static struct ovcamchip_regvals regvals_init_7120[] = {
-       { 0x12, 0x80 }, /* reset */
-       { 0x13, 0x00 }, /* Autoadjust off */
-       { 0x12, 0x20 }, /* Disable AWB */
-       { 0x13, DFL_AUTO_GAIN?0x01:0x00 }, /* Autoadjust on (if desired) */
-       { 0x00, OV7120_DFL_GAIN },
-       { 0x01, 0x80 },
-       { 0x02, 0x80 },
-       { 0x03, OV7120_DFL_SAT },
-       { 0x06, OV7120_DFL_BRIGHT },
-       { 0x07, 0x00 },
-       { 0x0c, 0x20 },
-       { 0x0d, 0x20 },
-       { 0x11, 0x01 },
-       { 0x14, 0x84 },
-       { 0x15, 0x01 },
-       { 0x16, 0x03 },
-       { 0x17, 0x2f },
-       { 0x18, 0xcf },
-       { 0x19, 0x06 },
-       { 0x1a, 0xf5 },
-       { 0x1b, 0x00 },
-       { 0x20, 0x08 },
-       { 0x21, 0x80 },
-       { 0x22, 0x80 },
-       { 0x23, 0x00 },
-       { 0x26, 0xa0 },
-       { 0x27, 0xfa },
-       { 0x28, 0x20 }, /* DON'T set bit 6. It is for the OV7620 only */
-       { 0x29, DFL_AUTO_EXP?0x00:0x80 },
-       { 0x2a, 0x10 },
-       { 0x2b, 0x00 },
-       { 0x2c, 0x88 },
-       { 0x2d, 0x95 },
-       { 0x2e, 0x80 },
-       { 0x2f, 0x44 },
-       { 0x60, 0x20 },
-       { 0x61, 0x02 },
-       { 0x62, 0x5f },
-       { 0x63, 0xd5 },
-       { 0x64, 0x57 },
-       { 0x65, 0x83 }, /* OV says "don't change this value" */
-       { 0x66, 0x55 },
-       { 0x67, 0x92 },
-       { 0x68, 0xcf },
-       { 0x69, 0x76 },
-       { 0x6a, 0x22 },
-       { 0x6b, 0xe2 },
-       { 0x6c, 0x40 },
-       { 0x6d, 0x48 },
-       { 0x6e, 0x80 },
-       { 0x6f, 0x0d },
-       { 0x70, 0x89 },
-       { 0x71, 0x00 },
-       { 0x72, 0x14 },
-       { 0x73, 0x54 },
-       { 0x74, 0xa0 },
-       { 0x75, 0x8e },
-       { 0x76, 0x00 },
-       { 0x77, 0xff },
-       { 0x78, 0x80 },
-       { 0x79, 0x80 },
-       { 0x7a, 0x80 },
-       { 0x7b, 0xe6 },
-       { 0x7c, 0x00 },
-       { 0x24, 0x3a },
-       { 0x25, 0x60 },
-       { 0xff, 0xff }, /* END MARKER */
-};
-
-/* Settings for (color) OV7620 camera chip */
-static struct ovcamchip_regvals regvals_init_7620[] = {
-       { 0x12, 0x80 }, /* reset */
-       { 0x00, OV7620_DFL_GAIN },
-       { 0x01, 0x80 },
-       { 0x02, 0x80 },
-       { 0x03, OV7620_DFL_SAT },
-       { 0x06, OV7620_DFL_BRIGHT },
-       { 0x07, 0x00 },
-       { 0x0c, 0x24 },
-       { 0x0c, 0x24 },
-       { 0x0d, 0x24 },
-       { 0x11, 0x01 },
-       { 0x12, 0x24 },
-       { 0x13, DFL_AUTO_GAIN?0x01:0x00 },
-       { 0x14, 0x84 },
-       { 0x15, 0x01 },
-       { 0x16, 0x03 },
-       { 0x17, 0x2f },
-       { 0x18, 0xcf },
-       { 0x19, 0x06 },
-       { 0x1a, 0xf5 },
-       { 0x1b, 0x00 },
-       { 0x20, 0x18 },
-       { 0x21, 0x80 },
-       { 0x22, 0x80 },
-       { 0x23, 0x00 },
-       { 0x26, 0xa2 },
-       { 0x27, 0xea },
-       { 0x28, 0x20 },
-       { 0x29, DFL_AUTO_EXP?0x00:0x80 },
-       { 0x2a, 0x10 },
-       { 0x2b, 0x00 },
-       { 0x2c, 0x88 },
-       { 0x2d, 0x91 },
-       { 0x2e, 0x80 },
-       { 0x2f, 0x44 },
-       { 0x60, 0x27 },
-       { 0x61, 0x02 },
-       { 0x62, 0x5f },
-       { 0x63, 0xd5 },
-       { 0x64, 0x57 },
-       { 0x65, 0x83 },
-       { 0x66, 0x55 },
-       { 0x67, 0x92 },
-       { 0x68, 0xcf },
-       { 0x69, 0x76 },
-       { 0x6a, 0x22 },
-       { 0x6b, 0x00 },
-       { 0x6c, 0x02 },
-       { 0x6d, 0x44 },
-       { 0x6e, 0x80 },
-       { 0x6f, 0x1d },
-       { 0x70, 0x8b },
-       { 0x71, 0x00 },
-       { 0x72, 0x14 },
-       { 0x73, 0x54 },
-       { 0x74, 0x00 },
-       { 0x75, 0x8e },
-       { 0x76, 0x00 },
-       { 0x77, 0xff },
-       { 0x78, 0x80 },
-       { 0x79, 0x80 },
-       { 0x7a, 0x80 },
-       { 0x7b, 0xe2 },
-       { 0x7c, 0x00 },
-       { 0xff, 0xff }, /* END MARKER */
-};
-
-/* Returns index into the specified look-up table, with 'n' elements, for which
- * the value is greater than or equal to "val". If a match isn't found, (n-1)
- * is returned. The entries in the table must be in ascending order. */
-static inline int ov7x20_lut_find(unsigned char lut[], int n, unsigned char val)
-{
-       int i = 0;
-
-       while (lut[i] < val && i < n)
-               i++;
-
-       return i;
-}
-
-/* This initializes the OV7x20 camera chip and relevant variables. */
-static int ov7x20_init(struct i2c_client *c)
-{
-       struct ovcamchip *ov = i2c_get_clientdata(c);
-       struct ov7x20 *s;
-       int rc;
-
-       DDEBUG(4, &c->dev, "entered");
-
-       if (ov->mono)
-               rc = ov_write_regvals(c, regvals_init_7120);
-       else
-               rc = ov_write_regvals(c, regvals_init_7620);
-
-       if (rc < 0)
-               return rc;
-
-       ov->spriv = s = kmalloc(sizeof *s, GFP_KERNEL);
-       if (!s)
-               return -ENOMEM;
-       memset(s, 0, sizeof *s);
-
-       s->auto_brt = 1;
-       s->auto_exp = DFL_AUTO_EXP;
-       s->auto_gain = DFL_AUTO_GAIN;
-
-       return 0;
-}
-
-static int ov7x20_free(struct i2c_client *c)
-{
-       struct ovcamchip *ov = i2c_get_clientdata(c);
-
-       kfree(ov->spriv);
-       return 0;
-}
-
-static int ov7x20_set_v4l1_control(struct i2c_client *c,
-                                  struct ovcamchip_control *ctl)
-{
-       struct ovcamchip *ov = i2c_get_clientdata(c);
-       struct ov7x20 *s = ov->spriv;
-       int rc;
-       int v = ctl->value;
-
-       switch (ctl->id) {
-       case OVCAMCHIP_CID_CONT:
-       {
-               /* Use Y gamma control instead. Bit 0 enables it. */
-               rc = ov_write(c, 0x64, ctab[v >> 12]);
-               break;
-       }
-       case OVCAMCHIP_CID_BRIGHT:
-               /* 7620 doesn't like manual changes when in auto mode */
-               if (!s->auto_brt)
-                       rc = ov_write(c, REG_BRT, v >> 8);
-               else
-                       rc = 0;
-               break;
-       case OVCAMCHIP_CID_SAT:
-               rc = ov_write(c, REG_SAT, v >> 8);
-               break;
-       case OVCAMCHIP_CID_EXP:
-               if (!s->auto_exp)
-                       rc = ov_write(c, REG_EXP, v);
-               else
-                       rc = -EBUSY;
-               break;
-       case OVCAMCHIP_CID_FREQ:
-       {
-               int sixty = (v == 60);
-
-               rc = ov_write_mask(c, 0x2a, sixty?0x00:0x80, 0x80);
-               if (rc < 0)
-                       goto out;
-
-               rc = ov_write(c, 0x2b, sixty?0x00:0xac);
-               if (rc < 0)
-                       goto out;
-
-               rc = ov_write_mask(c, 0x76, 0x01, 0x01);
-               break;
-       }
-       case OVCAMCHIP_CID_BANDFILT:
-               rc = ov_write_mask(c, 0x2d, v?0x04:0x00, 0x04);
-               s->bandfilt = v;
-               break;
-       case OVCAMCHIP_CID_AUTOBRIGHT:
-               rc = ov_write_mask(c, 0x2d, v?0x10:0x00, 0x10);
-               s->auto_brt = v;
-               break;
-       case OVCAMCHIP_CID_AUTOEXP:
-               rc = ov_write_mask(c, 0x13, v?0x01:0x00, 0x01);
-               s->auto_exp = v;
-               break;
-       case OVCAMCHIP_CID_BACKLIGHT:
-       {
-               rc = ov_write_mask(c, 0x68, v?0xe0:0xc0, 0xe0);
-               if (rc < 0)
-                       goto out;
-
-               rc = ov_write_mask(c, 0x29, v?0x08:0x00, 0x08);
-               if (rc < 0)
-                       goto out;
-
-               rc = ov_write_mask(c, 0x28, v?0x02:0x00, 0x02);
-               s->backlight = v;
-               break;
-       }
-       case OVCAMCHIP_CID_MIRROR:
-               rc = ov_write_mask(c, 0x12, v?0x40:0x00, 0x40);
-               s->mirror = v;
-               break;
-       default:
-               DDEBUG(2, &c->dev, "control not supported: %d", ctl->id);
-               return -EPERM;
-       }
-
-out:
-       DDEBUG(3, &c->dev, "id=%d, arg=%d, rc=%d", ctl->id, v, rc);
-       return rc;
-}
-
-static int ov7x20_get_v4l1_control(struct i2c_client *c,
-                                  struct ovcamchip_control *ctl)
-{
-       struct ovcamchip *ov = i2c_get_clientdata(c);
-       struct ov7x20 *s = ov->spriv;
-       int rc = 0;
-       unsigned char val = 0;
-
-       switch (ctl->id) {
-       case OVCAMCHIP_CID_CONT:
-               rc = ov_read(c, 0x64, &val);
-               ctl->value = ov7x20_lut_find(ctab, 16, val) << 12;
-               break;
-       case OVCAMCHIP_CID_BRIGHT:
-               rc = ov_read(c, REG_BRT, &val);
-               ctl->value = val << 8;
-               break;
-       case OVCAMCHIP_CID_SAT:
-               rc = ov_read(c, REG_SAT, &val);
-               ctl->value = val << 8;
-               break;
-       case OVCAMCHIP_CID_EXP:
-               rc = ov_read(c, REG_EXP, &val);
-               ctl->value = val;
-               break;
-       case OVCAMCHIP_CID_BANDFILT:
-               ctl->value = s->bandfilt;
-               break;
-       case OVCAMCHIP_CID_AUTOBRIGHT:
-               ctl->value = s->auto_brt;
-               break;
-       case OVCAMCHIP_CID_AUTOEXP:
-               ctl->value = s->auto_exp;
-               break;
-       case OVCAMCHIP_CID_BACKLIGHT:
-               ctl->value = s->backlight;
-               break;
-       case OVCAMCHIP_CID_MIRROR:
-               ctl->value = s->mirror;
-               break;
-       default:
-               DDEBUG(2, &c->dev, "control not supported: %d", ctl->id);
-               return -EPERM;
-       }
-
-       DDEBUG(3, &c->dev, "id=%d, arg=%d, rc=%d", ctl->id, ctl->value, rc);
-       return rc;
-}
-
-static int ov7x20_mode_init(struct i2c_client *c, struct ovcamchip_window *win)
-{
-       struct ovcamchip *ov = i2c_get_clientdata(c);
-       int qvga = win->quarter;
-
-       /******** QVGA-specific regs ********/
-       ov_write_mask(c, 0x14, qvga?0x20:0x00, 0x20);
-       ov_write_mask(c, 0x28, qvga?0x00:0x20, 0x20);
-       ov_write(c, 0x24, qvga?0x20:0x3a);
-       ov_write(c, 0x25, qvga?0x30:0x60);
-       ov_write_mask(c, 0x2d, qvga?0x40:0x00, 0x40);
-       if (!ov->mono)
-               ov_write_mask(c, 0x67, qvga?0xf0:0x90, 0xf0);
-       ov_write_mask(c, 0x74, qvga?0x20:0x00, 0x20);
-
-       /******** Clock programming ********/
-
-       ov_write(c, 0x11, win->clockdiv);
-
-       return 0;
-}
-
-static int ov7x20_set_window(struct i2c_client *c, struct ovcamchip_window *win)
-{
-       int ret, hwscale, vwscale;
-
-       ret = ov7x20_mode_init(c, win);
-       if (ret < 0)
-               return ret;
-
-       if (win->quarter) {
-               hwscale = 1;
-               vwscale = 0;
-       } else {
-               hwscale = 2;
-               vwscale = 1;
-       }
-
-       ov_write(c, 0x17, HWSBASE + (win->x >> hwscale));
-       ov_write(c, 0x18, HWEBASE + ((win->x + win->width) >> hwscale));
-       ov_write(c, 0x19, VWSBASE + (win->y >> vwscale));
-       ov_write(c, 0x1a, VWEBASE + ((win->y + win->height) >> vwscale));
-
-       return 0;
-}
-
-static int ov7x20_command(struct i2c_client *c, unsigned int cmd, void *arg)
-{
-       switch (cmd) {
-       case OVCAMCHIP_CMD_S_CTRL:
-               return ov7x20_set_v4l1_control(c, arg);
-       case OVCAMCHIP_CMD_G_CTRL:
-               return ov7x20_get_v4l1_control(c, arg);
-       case OVCAMCHIP_CMD_S_MODE:
-               return ov7x20_set_window(c, arg);
-       default:
-               DDEBUG(2, &c->dev, "command not supported: %d", cmd);
-               return -ENOIOCTLCMD;
-       }
-}
-
-struct ovcamchip_ops ov7x20_ops = {
-       .init    =      ov7x20_init,
-       .free    =      ov7x20_free,
-       .command =      ov7x20_command,
-};
diff --git a/drivers/media/video/ovcamchip/ovcamchip_core.c b/drivers/media/video/ovcamchip/ovcamchip_core.c
deleted file mode 100644 (file)
index d88956a..0000000
+++ /dev/null
@@ -1,446 +0,0 @@
-/* Shared Code for OmniVision Camera Chip Drivers
- *
- * Copyright (c) 2004 Mark McClelland <mark@alpha.dyndns.org>
- * http://alpha.dyndns.org/ov511/
- *
- * 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. NO WARRANTY OF ANY KIND is expressed or implied.
- */
-
-#define DEBUG
-
-#include <linux/init.h>
-#include <linux/module.h>
-#include <linux/moduleparam.h>
-#include <linux/slab.h>
-#include "ovcamchip_priv.h"
-
-#define DRIVER_VERSION "v2.27 for Linux 2.6"
-#define DRIVER_AUTHOR "Mark McClelland <mark@alpha.dyndns.org>"
-#define DRIVER_DESC "OV camera chip I2C driver"
-
-#define PINFO(fmt, args...) printk(KERN_INFO "ovcamchip: " fmt "\n" , ## args);
-#define PERROR(fmt, args...) printk(KERN_ERR "ovcamchip: " fmt "\n" , ## args);
-
-#ifdef DEBUG
-int ovcamchip_debug = 0;
-static int debug;
-module_param(debug, int, 0);
-MODULE_PARM_DESC(debug,
-  "Debug level: 0=none, 1=inits, 2=warning, 3=config, 4=functions, 5=all");
-#endif
-
-/* By default, let bridge driver tell us if chip is monochrome. mono=0
- * will ignore that and always treat chips as color. mono=1 will force
- * monochrome mode for all chips. */
-static int mono = -1;
-module_param(mono, int, 0);
-MODULE_PARM_DESC(mono,
-  "1=chips are monochrome (OVx1xx), 0=force color, -1=autodetect (default)");
-
-MODULE_AUTHOR(DRIVER_AUTHOR);
-MODULE_DESCRIPTION(DRIVER_DESC);
-MODULE_LICENSE("GPL");
-
-/* Registers common to all chips, that are needed for detection */
-#define GENERIC_REG_ID_HIGH       0x1C /* manufacturer ID MSB */
-#define GENERIC_REG_ID_LOW        0x1D /* manufacturer ID LSB */
-#define GENERIC_REG_COM_I         0x29 /* misc ID bits */
-
-extern struct ovcamchip_ops ov6x20_ops;
-extern struct ovcamchip_ops ov6x30_ops;
-extern struct ovcamchip_ops ov7x10_ops;
-extern struct ovcamchip_ops ov7x20_ops;
-extern struct ovcamchip_ops ov76be_ops;
-
-static char *chip_names[NUM_CC_TYPES] = {
-       [CC_UNKNOWN]    = "Unknown chip",
-       [CC_OV76BE]     = "OV76BE",
-       [CC_OV7610]     = "OV7610",
-       [CC_OV7620]     = "OV7620",
-       [CC_OV7620AE]   = "OV7620AE",
-       [CC_OV6620]     = "OV6620",
-       [CC_OV6630]     = "OV6630",
-       [CC_OV6630AE]   = "OV6630AE",
-       [CC_OV6630AF]   = "OV6630AF",
-};
-
-/* Forward declarations */
-static struct i2c_driver driver;
-static struct i2c_client client_template;
-
-/* ----------------------------------------------------------------------- */
-
-int ov_write_regvals(struct i2c_client *c, struct ovcamchip_regvals *rvals)
-{
-       int rc;
-
-       while (rvals->reg != 0xff) {
-               rc = ov_write(c, rvals->reg, rvals->val);
-               if (rc < 0)
-                       return rc;
-               rvals++;
-       }
-
-       return 0;
-}
-
-/* Writes bits at positions specified by mask to an I2C reg. Bits that are in
- * the same position as 1's in "mask" are cleared and set to "value". Bits
- * that are in the same position as 0's in "mask" are preserved, regardless
- * of their respective state in "value".
- */
-int ov_write_mask(struct i2c_client *c,
-                 unsigned char reg,
-                 unsigned char value,
-                 unsigned char mask)
-{
-       int rc;
-       unsigned char oldval, newval;
-
-       if (mask == 0xff) {
-               newval = value;
-       } else {
-               rc = ov_read(c, reg, &oldval);
-               if (rc < 0)
-                       return rc;
-
-               oldval &= (~mask);              /* Clear the masked bits */
-               value &= mask;                  /* Enforce mask on value */
-               newval = oldval | value;        /* Set the desired bits */
-       }
-
-       return ov_write(c, reg, newval);
-}
-
-/* ----------------------------------------------------------------------- */
-
-/* Reset the chip and ensure that I2C is synchronized. Returns <0 if failure.
- */
-static int init_camchip(struct i2c_client *c)
-{
-       int i, success;
-       unsigned char high, low;
-
-       /* Reset the chip */
-       ov_write(c, 0x12, 0x80);
-
-       /* Wait for it to initialize */
-       set_current_state(TASK_UNINTERRUPTIBLE);
-       schedule_timeout(1 + 150 * HZ / 1000);
-
-       for (i = 0, success = 0; i < I2C_DETECT_RETRIES && !success; i++) {
-               if (ov_read(c, GENERIC_REG_ID_HIGH, &high) >= 0) {
-                       if (ov_read(c, GENERIC_REG_ID_LOW, &low) >= 0) {
-                               if (high == 0x7F && low == 0xA2) {
-                                       success = 1;
-                                       continue;
-                               }
-                       }
-               }
-
-               /* Reset the chip */
-               ov_write(c, 0x12, 0x80);
-
-               /* Wait for it to initialize */
-               set_current_state(TASK_UNINTERRUPTIBLE);
-               schedule_timeout(1 + 150 * HZ / 1000);
-
-               /* Dummy read to sync I2C */
-               ov_read(c, 0x00, &low);
-       }
-
-       if (!success)
-               return -EIO;
-
-       PDEBUG(1, "I2C synced in %d attempt(s)", i);
-
-       return 0;
-}
-
-/* This detects the OV7610, OV7620, or OV76BE chip. */
-static int ov7xx0_detect(struct i2c_client *c)
-{
-       struct ovcamchip *ov = i2c_get_clientdata(c);
-       int rc;
-       unsigned char val;
-
-       PDEBUG(4, "");
-
-       /* Detect chip (sub)type */
-       rc = ov_read(c, GENERIC_REG_COM_I, &val);
-       if (rc < 0) {
-               PERROR("Error detecting ov7xx0 type");
-               return rc;
-       }
-
-       if ((val & 3) == 3) {
-               PINFO("Camera chip is an OV7610");
-               ov->subtype = CC_OV7610;
-       } else if ((val & 3) == 1) {
-               rc = ov_read(c, 0x15, &val);
-               if (rc < 0) {
-                       PERROR("Error detecting ov7xx0 type");
-                       return rc;
-               }
-
-               if (val & 1) {
-                       PINFO("Camera chip is an OV7620AE");
-                       /* OV7620 is a close enough match for now. There are
-                        * some definite differences though, so this should be
-                        * fixed */
-                       ov->subtype = CC_OV7620;
-               } else {
-                       PINFO("Camera chip is an OV76BE");
-                       ov->subtype = CC_OV76BE;
-               }
-       } else if ((val & 3) == 0) {
-               PINFO("Camera chip is an OV7620");
-               ov->subtype = CC_OV7620;
-       } else {
-               PERROR("Unknown camera chip version: %d", val & 3);
-               return -ENOSYS;
-       }
-
-       if (ov->subtype == CC_OV76BE)
-               ov->sops = &ov76be_ops;
-       else if (ov->subtype == CC_OV7620)
-               ov->sops = &ov7x20_ops;
-       else
-               ov->sops = &ov7x10_ops;
-
-       return 0;
-}
-
-/* This detects the OV6620, OV6630, OV6630AE, or OV6630AF chip. */
-static int ov6xx0_detect(struct i2c_client *c)
-{
-       struct ovcamchip *ov = i2c_get_clientdata(c);
-       int rc;
-       unsigned char val;
-
-       PDEBUG(4, "");
-
-       /* Detect chip (sub)type */
-       rc = ov_read(c, GENERIC_REG_COM_I, &val);
-       if (rc < 0) {
-               PERROR("Error detecting ov6xx0 type");
-               return -1;
-       }
-
-       if ((val & 3) == 0) {
-               ov->subtype = CC_OV6630;
-               PINFO("Camera chip is an OV6630");
-       } else if ((val & 3) == 1) {
-               ov->subtype = CC_OV6620;
-               PINFO("Camera chip is an OV6620");
-       } else if ((val & 3) == 2) {
-               ov->subtype = CC_OV6630;
-               PINFO("Camera chip is an OV6630AE");
-       } else if ((val & 3) == 3) {
-               ov->subtype = CC_OV6630;
-               PINFO("Camera chip is an OV6630AF");
-       }
-
-       if (ov->subtype == CC_OV6620)
-               ov->sops = &ov6x20_ops;
-       else
-               ov->sops = &ov6x30_ops;
-
-       return 0;
-}
-
-static int ovcamchip_detect(struct i2c_client *c)
-{
-       /* Ideally we would just try a single register write and see if it NAKs.
-        * That isn't possible since the OV518 can't report I2C transaction
-        * failures. So, we have to try to initialize the chip (i.e. reset it
-        * and check the ID registers) to detect its presence. */
-
-       /* Test for 7xx0 */
-       PDEBUG(3, "Testing for 0V7xx0");
-       c->addr = OV7xx0_SID;
-       if (init_camchip(c) < 0) {
-               /* Test for 6xx0 */
-               PDEBUG(3, "Testing for 0V6xx0");
-               c->addr = OV6xx0_SID;
-               if (init_camchip(c) < 0) {
-                       return -ENODEV;
-               } else {
-                       if (ov6xx0_detect(c) < 0) {
-                               PERROR("Failed to init OV6xx0");
-                               return -EIO;
-                       }
-               }
-       } else {
-               if (ov7xx0_detect(c) < 0) {
-                       PERROR("Failed to init OV7xx0");
-                       return -EIO;
-               }
-       }
-
-       return 0;
-}
-
-/* ----------------------------------------------------------------------- */
-
-static int ovcamchip_attach(struct i2c_adapter *adap)
-{
-       int rc = 0;
-       struct ovcamchip *ov;
-       struct i2c_client *c;
-
-       /* I2C is not a PnP bus, so we can never be certain that we're talking
-        * to the right chip. To prevent damage to EEPROMS and such, only
-        * attach to adapters that are known to contain OV camera chips. */
-
-       switch (adap->id) {
-       case (I2C_ALGO_SMBUS | I2C_HW_SMBUS_OV511):
-       case (I2C_ALGO_SMBUS | I2C_HW_SMBUS_OV518):
-       case (I2C_ALGO_SMBUS | I2C_HW_SMBUS_OVFX2):
-       case (I2C_ALGO_SMBUS | I2C_HW_SMBUS_W9968CF):
-               PDEBUG(1, "Adapter ID 0x%06x accepted", adap->id);
-               break;
-       default:
-               PDEBUG(1, "Adapter ID 0x%06x rejected", adap->id);
-               return -ENODEV;
-       }
-
-       c = kmalloc(sizeof *c, GFP_KERNEL);
-       if (!c) {
-               rc = -ENOMEM;
-               goto no_client;
-       }
-       memcpy(c, &client_template, sizeof *c);
-       c->adapter = adap;
-       strcpy(i2c_clientname(c), "OV????");
-
-       ov = kmalloc(sizeof *ov, GFP_KERNEL);
-       if (!ov) {
-               rc = -ENOMEM;
-               goto no_ov;
-       }
-       memset(ov, 0, sizeof *ov);
-       i2c_set_clientdata(c, ov);
-
-       rc = ovcamchip_detect(c);
-       if (rc < 0)
-               goto error;
-
-       strcpy(i2c_clientname(c), chip_names[ov->subtype]);
-
-       PDEBUG(1, "Camera chip detection complete");
-
-       i2c_attach_client(c);
-
-       return rc;
-error:
-       kfree(ov);
-no_ov:
-       kfree(c);
-no_client:
-       PDEBUG(1, "returning %d", rc);
-       return rc;
-}
-
-static int ovcamchip_detach(struct i2c_client *c)
-{
-       struct ovcamchip *ov = i2c_get_clientdata(c);
-       int rc;
-
-       rc = ov->sops->free(c);
-       if (rc < 0)
-               return rc;
-
-       i2c_detach_client(c);
-
-       kfree(ov);
-       kfree(c);
-       return 0;
-}
-
-static int ovcamchip_command(struct i2c_client *c, unsigned int cmd, void *arg)
-{
-       struct ovcamchip *ov = i2c_get_clientdata(c);
-
-       if (!ov->initialized &&
-           cmd != OVCAMCHIP_CMD_Q_SUBTYPE &&
-           cmd != OVCAMCHIP_CMD_INITIALIZE) {
-               dev_err(&c->dev, "ERROR: Camera chip not initialized yet!\n");
-               return -EPERM;
-       }
-
-       switch (cmd) {
-       case OVCAMCHIP_CMD_Q_SUBTYPE:
-       {
-               *(int *)arg = ov->subtype;
-               return 0;
-       }
-       case OVCAMCHIP_CMD_INITIALIZE:
-       {
-               int rc;
-
-               if (mono == -1)
-                       ov->mono = *(int *)arg;
-               else
-                       ov->mono = mono;
-
-               if (ov->mono) {
-                       if (ov->subtype != CC_OV7620)
-                               dev_warn(&c->dev, "Warning: Monochrome not "
-                                       "implemented for this chip\n");
-                       else
-                               dev_info(&c->dev, "Initializing chip as "
-                                       "monochrome\n");
-               }
-
-               rc = ov->sops->init(c);
-               if (rc < 0)
-                       return rc;
-
-               ov->initialized = 1;
-               return 0;
-       }
-       default:
-               return ov->sops->command(c, cmd, arg);
-       }
-}
-
-/* ----------------------------------------------------------------------- */
-
-static struct i2c_driver driver = {
-       .owner =                THIS_MODULE,
-       .name =                 "ovcamchip",
-       .id =                   I2C_DRIVERID_OVCAMCHIP,
-       .class =                I2C_CLASS_CAM_DIGITAL,
-       .flags =                I2C_DF_NOTIFY,
-       .attach_adapter =       ovcamchip_attach,
-       .detach_client =        ovcamchip_detach,
-       .command =              ovcamchip_command,
-};
-
-static struct i2c_client client_template = {
-       I2C_DEVNAME("(unset)"),
-       .id =           -1,
-       .driver =       &driver,
-};
-
-static int __init ovcamchip_init(void)
-{
-#ifdef DEBUG
-       ovcamchip_debug = debug;
-#endif
-
-       PINFO(DRIVER_VERSION " : " DRIVER_DESC);
-       return i2c_add_driver(&driver);
-}
-
-static void __exit ovcamchip_exit(void)
-{
-       i2c_del_driver(&driver);
-}
-
-module_init(ovcamchip_init);
-module_exit(ovcamchip_exit);
diff --git a/drivers/media/video/ovcamchip/ovcamchip_priv.h b/drivers/media/video/ovcamchip/ovcamchip_priv.h
deleted file mode 100644 (file)
index 575e612..0000000
+++ /dev/null
@@ -1,87 +0,0 @@
-/* OmniVision* camera chip driver private definitions for core code and
- * chip-specific code
- *
- * Copyright (c) 1999-2004 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. NO WARRANTY OF ANY KIND is expressed or implied.
- *
- * * OmniVision is a trademark of OmniVision Technologies, Inc. This driver
- * is not sponsored or developed by them.
- */
-
-#ifndef __LINUX_OVCAMCHIP_PRIV_H
-#define __LINUX_OVCAMCHIP_PRIV_H
-
-#include <media/ovcamchip.h>
-
-#ifdef DEBUG
-extern int ovcamchip_debug;
-#endif
-
-#define PDEBUG(level, fmt, args...) \
-       if (ovcamchip_debug >= (level)) pr_debug("[%s:%d] " fmt "\n", \
-               __FUNCTION__, __LINE__ , ## args)
-
-#define DDEBUG(level, dev, fmt, args...) \
-       if (ovcamchip_debug >= (level)) dev_dbg(dev, "[%s:%d] " fmt "\n", \
-               __FUNCTION__, __LINE__ , ## args)
-
-/* Number of times to retry chip detection. Increase this if you are getting
- * "Failed to init camera chip" */
-#define I2C_DETECT_RETRIES     10
-
-struct ovcamchip_regvals {
-       unsigned char reg;
-       unsigned char val;
-};
-
-struct ovcamchip_ops {
-       int (*init)(struct i2c_client *);
-       int (*free)(struct i2c_client *);
-       int (*command)(struct i2c_client *, unsigned int, void *);
-};
-
-struct ovcamchip {
-       struct ovcamchip_ops *sops;
-       void *spriv;               /* Private data for OV7x10.c etc... */
-       int subtype;               /* = SEN_OV7610 etc... */
-       int mono;                  /* Monochrome chip? (invalid until init) */
-       int initialized;           /* OVCAMCHIP_CMD_INITIALIZE was successful */
-};
-
-/* --------------------------------- */
-/*              I2C I/O              */
-/* --------------------------------- */
-
-static inline int ov_read(struct i2c_client *c, unsigned char reg,
-                         unsigned char *value)
-{
-       int rc;
-
-       rc = i2c_smbus_read_byte_data(c, reg);
-       *value = (unsigned char) rc;
-       return rc;
-}
-
-static inline int ov_write(struct i2c_client *c, unsigned char reg,
-                          unsigned char value )
-{
-       return i2c_smbus_write_byte_data(c, reg, value);
-}
-
-/* --------------------------------- */
-/*        FUNCTION PROTOTYPES        */
-/* --------------------------------- */
-
-/* Functions in ovcamchip_core.c */
-
-extern int ov_write_regvals(struct i2c_client *c,
-                           struct ovcamchip_regvals *rvals);
-
-extern int ov_write_mask(struct i2c_client *c, unsigned char reg,
-                        unsigned char value, unsigned char mask);
-
-#endif
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/fec_8xx/Kconfig b/drivers/net/fec_8xx/Kconfig
deleted file mode 100644 (file)
index db36ac3..0000000
+++ /dev/null
@@ -1,14 +0,0 @@
-config FEC_8XX
-       tristate "Motorola 8xx FEC driver"
-       depends on NET_ETHERNET && 8xx && (NETTA || NETPHONE)
-       select MII
-
-config FEC_8XX_GENERIC_PHY
-       bool "Support any generic PHY"
-       depends on FEC_8XX
-       default y
-
-config FEC_8XX_DM9161_PHY
-       bool "Support DM9161 PHY"
-       depends on FEC_8XX
-       default n
diff --git a/drivers/net/fec_8xx/Makefile b/drivers/net/fec_8xx/Makefile
deleted file mode 100644 (file)
index 70c54f8..0000000
+++ /dev/null
@@ -1,12 +0,0 @@
-#
-# Makefile for the Motorola 8xx FEC ethernet controller
-#
-
-obj-$(CONFIG_FEC_8XX) += fec_8xx.o
-
-fec_8xx-objs := fec_main.o fec_mii.o
-
-# the platform instantatiation objects
-ifeq ($(CONFIG_NETTA),y)
-fec_8xx-objs   += fec_8xx-netta.o
-endif
diff --git a/drivers/net/fec_8xx/fec_8xx-netta.c b/drivers/net/fec_8xx/fec_8xx-netta.c
deleted file mode 100644 (file)
index 7d73661..0000000
+++ /dev/null
@@ -1,153 +0,0 @@
-/*
- * FEC instantatiation file for NETTA
- */
-
-#include <linux/config.h>
-#include <linux/kernel.h>
-#include <linux/types.h>
-#include <linux/sched.h>
-#include <linux/string.h>
-#include <linux/ptrace.h>
-#include <linux/errno.h>
-#include <linux/ioport.h>
-#include <linux/slab.h>
-#include <linux/interrupt.h>
-#include <linux/pci.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/mii.h>
-#include <linux/ethtool.h>
-
-#include <asm/8xx_immap.h>
-#include <asm/pgtable.h>
-#include <asm/mpc8xx.h>
-#include <asm/irq.h>
-#include <asm/bitops.h>
-#include <asm/uaccess.h>
-#include <asm/commproc.h>
-
-#include "fec_8xx.h"
-
-/*************************************************/
-
-static struct fec_platform_info fec1_info = {
-       .fec_no = 0,
-       .use_mdio = 1,
-       .phy_addr = 8,
-       .fec_irq = SIU_LEVEL1,
-       .phy_irq = CPM_IRQ_OFFSET + CPMVEC_PIO_PC6,
-       .rx_ring = 128,
-       .tx_ring = 16,
-       .rx_copybreak = 240,
-       .use_napi = 1,
-       .napi_weight = 17,
-};
-
-static struct fec_platform_info fec2_info = {
-       .fec_no = 1,
-       .use_mdio = 1,
-       .phy_addr = 2,
-       .fec_irq = SIU_LEVEL3,
-       .phy_irq = CPM_IRQ_OFFSET + CPMVEC_PIO_PC7,
-       .rx_ring = 128,
-       .tx_ring = 16,
-       .rx_copybreak = 240,
-       .use_napi = 1,
-       .napi_weight = 17,
-};
-
-static struct net_device *fec1_dev;
-static struct net_device *fec2_dev;
-
-/* XXX custom u-boot & Linux startup needed */
-extern const char *__fw_getenv(const char *var);
-
-/* access ports */
-#define setbits32(_addr, _v) __fec_out32(&(_addr), __fec_in32(&(_addr)) |  (_v))
-#define clrbits32(_addr, _v) __fec_out32(&(_addr), __fec_in32(&(_addr)) & ~(_v))
-
-#define setbits16(_addr, _v) __fec_out16(&(_addr), __fec_in16(&(_addr)) |  (_v))
-#define clrbits16(_addr, _v) __fec_out16(&(_addr), __fec_in16(&(_addr)) & ~(_v))
-
-int fec_8xx_platform_init(void)
-{
-       immap_t *immap = (immap_t *)IMAP_ADDR;
-       bd_t *bd = (bd_t *) __res;
-       const char *s;
-       char *e;
-       int i;
-
-       /* use MDC for MII */
-       setbits16(immap->im_ioport.iop_pdpar, 0x0080);
-       clrbits16(immap->im_ioport.iop_pddir, 0x0080);
-
-       /* configure FEC1 pins */
-       setbits16(immap->im_ioport.iop_papar, 0xe810);
-       setbits16(immap->im_ioport.iop_padir, 0x0810);
-       clrbits16(immap->im_ioport.iop_padir, 0xe000);
-
-       setbits32(immap->im_cpm.cp_pbpar, 0x00000001);
-       clrbits32(immap->im_cpm.cp_pbdir, 0x00000001);
-
-       setbits32(immap->im_cpm.cp_cptr, 0x00000100);
-       clrbits32(immap->im_cpm.cp_cptr, 0x00000050);
-
-       clrbits16(immap->im_ioport.iop_pcpar, 0x0200);
-       clrbits16(immap->im_ioport.iop_pcdir, 0x0200);
-       clrbits16(immap->im_ioport.iop_pcso, 0x0200);
-       setbits16(immap->im_ioport.iop_pcint, 0x0200);
-
-       /* configure FEC2 pins */
-       setbits32(immap->im_cpm.cp_pepar, 0x00039620);
-       setbits32(immap->im_cpm.cp_pedir, 0x00039620);
-       setbits32(immap->im_cpm.cp_peso, 0x00031000);
-       clrbits32(immap->im_cpm.cp_peso, 0x00008620);
-
-       setbits32(immap->im_cpm.cp_cptr, 0x00000080);
-       clrbits32(immap->im_cpm.cp_cptr, 0x00000028);
-
-       clrbits16(immap->im_ioport.iop_pcpar, 0x0200);
-       clrbits16(immap->im_ioport.iop_pcdir, 0x0200);
-       clrbits16(immap->im_ioport.iop_pcso, 0x0200);
-       setbits16(immap->im_ioport.iop_pcint, 0x0200);
-
-       /* fill up */
-       fec1_info.sys_clk = bd->bi_intfreq;
-       fec2_info.sys_clk = bd->bi_intfreq;
-
-       s = __fw_getenv("ethaddr");
-       if (s != NULL) {
-               for (i = 0; i < 6; i++) {
-                       fec1_info.macaddr[i] = simple_strtoul(s, &e, 16);
-                       if (*e)
-                               s = e + 1;
-               }
-       }
-
-       s = __fw_getenv("eth1addr");
-       if (s != NULL) {
-               for (i = 0; i < 6; i++) {
-                       fec2_info.macaddr[i] = simple_strtoul(s, &e, 16);
-                       if (*e)
-                               s = e + 1;
-               }
-       }
-
-       fec_8xx_init_one(&fec1_info, &fec1_dev);
-       fec_8xx_init_one(&fec2_info, &fec2_dev);
-
-       return fec1_dev != NULL && fec2_dev != NULL ? 0 : -1;
-}
-
-void fec_8xx_platform_cleanup(void)
-{
-       if (fec2_dev != NULL)
-               fec_8xx_cleanup_one(fec2_dev);
-
-       if (fec1_dev != NULL)
-               fec_8xx_cleanup_one(fec1_dev);
-}
diff --git a/drivers/net/fec_8xx/fec_8xx.h b/drivers/net/fec_8xx/fec_8xx.h
deleted file mode 100644 (file)
index 5af60b0..0000000
+++ /dev/null
@@ -1,218 +0,0 @@
-#ifndef FEC_8XX_H
-#define FEC_8XX_H
-
-#include <linux/mii.h>
-#include <linux/netdevice.h>
-
-#include <linux/types.h>
-
-/* HW info */
-
-/* CRC polynomium used by the FEC for the multicast group filtering */
-#define FEC_CRC_POLY   0x04C11DB7
-
-#define MII_ADVERTISE_HALF     (ADVERTISE_100HALF | \
-                                ADVERTISE_10HALF | ADVERTISE_CSMA)
-#define MII_ADVERTISE_ALL      (ADVERTISE_100FULL | \
-                                ADVERTISE_10FULL | MII_ADVERTISE_HALF)
-
-/* Interrupt events/masks.
-*/
-#define FEC_ENET_HBERR 0x80000000U     /* Heartbeat error          */
-#define FEC_ENET_BABR  0x40000000U     /* Babbling receiver        */
-#define FEC_ENET_BABT  0x20000000U     /* Babbling transmitter     */
-#define FEC_ENET_GRA   0x10000000U     /* Graceful stop complete   */
-#define FEC_ENET_TXF   0x08000000U     /* Full frame transmitted   */
-#define FEC_ENET_TXB   0x04000000U     /* A buffer was transmitted */
-#define FEC_ENET_RXF   0x02000000U     /* Full frame received      */
-#define FEC_ENET_RXB   0x01000000U     /* A buffer was received    */
-#define FEC_ENET_MII   0x00800000U     /* MII interrupt            */
-#define FEC_ENET_EBERR 0x00400000U     /* SDMA bus error           */
-
-#define FEC_ECNTRL_PINMUX      0x00000004
-#define FEC_ECNTRL_ETHER_EN    0x00000002
-#define FEC_ECNTRL_RESET       0x00000001
-
-#define FEC_RCNTRL_BC_REJ      0x00000010
-#define FEC_RCNTRL_PROM                0x00000008
-#define FEC_RCNTRL_MII_MODE    0x00000004
-#define FEC_RCNTRL_DRT         0x00000002
-#define FEC_RCNTRL_LOOP                0x00000001
-
-#define FEC_TCNTRL_FDEN                0x00000004
-#define FEC_TCNTRL_HBC         0x00000002
-#define FEC_TCNTRL_GTS         0x00000001
-
-/* values for MII phy_status */
-
-#define PHY_CONF_ANE   0x0001  /* 1 auto-negotiation enabled     */
-#define PHY_CONF_LOOP  0x0002  /* 1 loopback mode enabled        */
-#define PHY_CONF_SPMASK        0x00f0  /* mask for speed                 */
-#define PHY_CONF_10HDX 0x0010  /* 10 Mbit half duplex supported  */
-#define PHY_CONF_10FDX 0x0020  /* 10 Mbit full duplex supported  */
-#define PHY_CONF_100HDX        0x0040  /* 100 Mbit half duplex supported */
-#define PHY_CONF_100FDX        0x0080  /* 100 Mbit full duplex supported */
-
-#define PHY_STAT_LINK  0x0100  /* 1 up - 0 down                  */
-#define PHY_STAT_FAULT 0x0200  /* 1 remote fault                 */
-#define PHY_STAT_ANC   0x0400  /* 1 auto-negotiation complete    */
-#define PHY_STAT_SPMASK        0xf000  /* mask for speed                 */
-#define PHY_STAT_10HDX 0x1000  /* 10 Mbit half duplex selected   */
-#define PHY_STAT_10FDX 0x2000  /* 10 Mbit full duplex selected   */
-#define PHY_STAT_100HDX        0x4000  /* 100 Mbit half duplex selected  */
-#define PHY_STAT_100FDX        0x8000  /* 100 Mbit full duplex selected  */
-
-typedef struct phy_info {
-       unsigned int id;
-       const char *name;
-       void (*startup) (struct net_device * dev);
-       void (*shutdown) (struct net_device * dev);
-       void (*ack_int) (struct net_device * dev);
-} phy_info_t;
-
-/* The FEC stores dest/src/type, data, and checksum for receive packets.
- */
-#define MAX_MTU 1508           /* Allow fullsized pppoe packets over VLAN */
-#define MIN_MTU 46             /* this is data size */
-#define CRC_LEN 4
-
-#define PKT_MAXBUF_SIZE                (MAX_MTU+ETH_HLEN+CRC_LEN)
-#define PKT_MINBUF_SIZE                (MIN_MTU+ETH_HLEN+CRC_LEN)
-
-/* Must be a multiple of 4 */
-#define PKT_MAXBLR_SIZE                ((PKT_MAXBUF_SIZE+3) & ~3)
-/* This is needed so that invalidate_xxx wont invalidate too much */
-#define ENET_RX_FRSIZE         L1_CACHE_ALIGN(PKT_MAXBUF_SIZE)
-
-/* platform interface */
-
-struct fec_platform_info {
-       int fec_no;             /* FEC index                  */
-       int use_mdio;           /* use external MII           */
-       int phy_addr;           /* the phy address            */
-       int fec_irq, phy_irq;   /* the irq for the controller */
-       int rx_ring, tx_ring;   /* number of buffers on rx    */
-       int sys_clk;            /* system clock               */
-       __u8 macaddr[6];        /* mac address                */
-       int rx_copybreak;       /* limit we copy small frames */
-       int use_napi;           /* use NAPI                   */
-       int napi_weight;        /* NAPI weight                */
-};
-
-/* forward declaration */
-struct fec;
-
-struct fec_enet_private {
-       spinlock_t lock;        /* during all ops except TX pckt processing */
-       spinlock_t tx_lock;     /* during fec_start_xmit and fec_tx         */
-       int fecno;
-       struct fec *fecp;
-       const struct fec_platform_info *fpi;
-       int rx_ring, tx_ring;
-       dma_addr_t ring_mem_addr;
-       void *ring_base;
-       struct sk_buff **rx_skbuff;
-       struct sk_buff **tx_skbuff;
-       cbd_t *rx_bd_base;      /* Address of Rx and Tx buffers.    */
-       cbd_t *tx_bd_base;
-       cbd_t *dirty_tx;        /* ring entries to be free()ed.     */
-       cbd_t *cur_rx;
-       cbd_t *cur_tx;
-       int tx_free;
-       struct net_device_stats stats;
-       struct timer_list phy_timer_list;
-       const struct phy_info *phy;
-       unsigned int fec_phy_speed;
-       __u32 msg_enable;
-       struct mii_if_info mii_if;
-};
-
-/***************************************************************************/
-
-void fec_restart(struct net_device *dev, int duplex, int speed);
-void fec_stop(struct net_device *dev);
-
-/***************************************************************************/
-
-int fec_mii_read(struct net_device *dev, int phy_id, int location);
-void fec_mii_write(struct net_device *dev, int phy_id, int location, int value);
-
-int fec_mii_phy_id_detect(struct net_device *dev);
-void fec_mii_startup(struct net_device *dev);
-void fec_mii_shutdown(struct net_device *dev);
-void fec_mii_ack_int(struct net_device *dev);
-
-void fec_mii_link_status_change_check(struct net_device *dev, int init_media);
-
-/***************************************************************************/
-
-#define FEC1_NO        0x00
-#define FEC2_NO        0x01
-#define FEC3_NO        0x02
-
-int fec_8xx_init_one(const struct fec_platform_info *fpi,
-                    struct net_device **devp);
-int fec_8xx_cleanup_one(struct net_device *dev);
-
-/***************************************************************************/
-
-#define DRV_MODULE_NAME                "fec_8xx"
-#define PFX DRV_MODULE_NAME    ": "
-#define DRV_MODULE_VERSION     "0.1"
-#define DRV_MODULE_RELDATE     "May 6, 2004"
-
-/***************************************************************************/
-
-int fec_8xx_platform_init(void);
-void fec_8xx_platform_cleanup(void);
-
-/***************************************************************************/
-
-/* FEC access macros */
-#if defined(CONFIG_8xx)
-/* for a 8xx __raw_xxx's are sufficient */
-#define __fec_out32(addr, x)   __raw_writel(x, addr)
-#define __fec_out16(addr, x)   __raw_writew(x, addr)
-#define __fec_in32(addr)       __raw_readl(addr)
-#define __fec_in16(addr)       __raw_readw(addr)
-#else
-/* for others play it safe */
-#define __fec_out32(addr, x)   out_be32(addr, x)
-#define __fec_out16(addr, x)   out_be16(addr, x)
-#define __fec_in32(addr)       in_be32(addr)
-#define __fec_in16(addr)       in_be16(addr)
-#endif
-
-/* write */
-#define FW(_fecp, _reg, _v) __fec_out32(&(_fecp)->fec_ ## _reg, (_v))
-
-/* read */
-#define FR(_fecp, _reg)        __fec_in32(&(_fecp)->fec_ ## _reg)
-
-/* set bits */
-#define FS(_fecp, _reg, _v) FW(_fecp, _reg, FR(_fecp, _reg) | (_v))
-
-/* clear bits */
-#define FC(_fecp, _reg, _v) FW(_fecp, _reg, FR(_fecp, _reg) & ~(_v))
-
-/* buffer descriptor access macros */
-
-/* write */
-#define CBDW_SC(_cbd, _sc)             __fec_out16(&(_cbd)->cbd_sc, (_sc))
-#define CBDW_DATLEN(_cbd, _datlen)     __fec_out16(&(_cbd)->cbd_datlen, (_datlen))
-#define CBDW_BUFADDR(_cbd, _bufaddr)   __fec_out32(&(_cbd)->cbd_bufaddr, (_bufaddr))
-
-/* read */
-#define CBDR_SC(_cbd)                  __fec_in16(&(_cbd)->cbd_sc)
-#define CBDR_DATLEN(_cbd)              __fec_in16(&(_cbd)->cbd_datlen)
-#define CBDR_BUFADDR(_cbd)             __fec_in32(&(_cbd)->cbd_bufaddr)
-
-/* set bits */
-#define CBDS_SC(_cbd, _sc)             CBDW_SC(_cbd, CBDR_SC(_cbd) | (_sc))
-
-/* clear bits */
-#define CBDC_SC(_cbd, _sc)             CBDW_SC(_cbd, CBDR_SC(_cbd) & ~(_sc))
-
-/***************************************************************************/
-
-#endif
diff --git a/drivers/net/fec_8xx/fec_main.c b/drivers/net/fec_8xx/fec_main.c
deleted file mode 100644 (file)
index 1bf15ee..0000000
+++ /dev/null
@@ -1,1275 +0,0 @@
-/*
- * Fast Ethernet Controller (FEC) driver for Motorola MPC8xx.
- *
- * Copyright (c) 2003 Intracom S.A. 
- *  by Pantelis Antoniou <panto@intracom.gr>
- *
- * Heavily based on original FEC driver by Dan Malek <dan@embeddededge.com>
- * and modifications by Joakim Tjernlund <joakim.tjernlund@lumentis.se>
- *
- * Released under the GPL
- */
-
-#include <linux/config.h>
-#include <linux/module.h>
-#include <linux/kernel.h>
-#include <linux/types.h>
-#include <linux/sched.h>
-#include <linux/string.h>
-#include <linux/ptrace.h>
-#include <linux/errno.h>
-#include <linux/ioport.h>
-#include <linux/slab.h>
-#include <linux/interrupt.h>
-#include <linux/pci.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/mii.h>
-#include <linux/ethtool.h>
-
-#include <asm/8xx_immap.h>
-#include <asm/pgtable.h>
-#include <asm/mpc8xx.h>
-#include <asm/irq.h>
-#include <asm/bitops.h>
-#include <asm/uaccess.h>
-#include <asm/commproc.h>
-#include <asm/dma-mapping.h>
-
-#include "fec_8xx.h"
-
-/*************************************************/
-
-#define FEC_MAX_MULTICAST_ADDRS        64
-
-/*************************************************/
-
-static char version[] __devinitdata =
-    DRV_MODULE_NAME ".c:v" DRV_MODULE_VERSION " (" DRV_MODULE_RELDATE ")" "\n";
-
-MODULE_AUTHOR("Pantelis Antoniou <panto@intracom.gr>");
-MODULE_DESCRIPTION("Motorola 8xx FEC ethernet driver");
-MODULE_LICENSE("GPL");
-
-MODULE_PARM(fec_8xx_debug, "i");
-MODULE_PARM_DESC(fec_8xx_debug,
-                "FEC 8xx bitmapped debugging message enable value");
-
-int fec_8xx_debug = -1;                /* -1 == use FEC_8XX_DEF_MSG_ENABLE as value */
-
-/*************************************************/
-
-/*
- * Delay to wait for FEC reset command to complete (in us) 
- */
-#define FEC_RESET_DELAY                50
-
-/*****************************************************************************************/
-
-static void fec_whack_reset(fec_t * fecp)
-{
-       int i;
-
-       /*
-        * Whack a reset.  We should wait for this.  
-        */
-       FW(fecp, ecntrl, FEC_ECNTRL_PINMUX | FEC_ECNTRL_RESET);
-       for (i = 0;
-            (FR(fecp, ecntrl) & FEC_ECNTRL_RESET) != 0 && i < FEC_RESET_DELAY;
-            i++)
-               udelay(1);
-
-       if (i == FEC_RESET_DELAY)
-               printk(KERN_WARNING "FEC Reset timeout!\n");
-
-}
-
-/****************************************************************************/
-
-/*
- * Transmitter timeout.  
- */
-#define TX_TIMEOUT (2*HZ)
-
-/****************************************************************************/
-
-/*
- * Returns the CRC needed when filling in the hash table for
- * multicast group filtering
- * pAddr must point to a MAC address (6 bytes)
- */
-static __u32 fec_mulicast_calc_crc(char *pAddr)
-{
-       u8 byte;
-       int byte_count;
-       int bit_count;
-       __u32 crc = 0xffffffff;
-       u8 msb;
-
-       for (byte_count = 0; byte_count < 6; byte_count++) {
-               byte = pAddr[byte_count];
-               for (bit_count = 0; bit_count < 8; bit_count++) {
-                       msb = crc >> 31;
-                       crc <<= 1;
-                       if (msb ^ (byte & 0x1)) {
-                               crc ^= FEC_CRC_POLY;
-                       }
-                       byte >>= 1;
-               }
-       }
-       return (crc);
-}
-
-/*
- * Set or clear the multicast filter for this adaptor.
- * Skeleton taken from sunlance driver.
- * The CPM Ethernet implementation allows Multicast as well as individual
- * MAC address filtering.  Some of the drivers check to make sure it is
- * a group multicast address, and discard those that are not.  I guess I
- * will do the same for now, but just remove the test if you want
- * individual filtering as well (do the upper net layers want or support
- * this kind of feature?).
- */
-static void fec_set_multicast_list(struct net_device *dev)
-{
-       struct fec_enet_private *fep = netdev_priv(dev);
-       fec_t *fecp = fep->fecp;
-       struct dev_mc_list *pmc;
-       __u32 crc;
-       int temp;
-       __u32 csrVal;
-       int hash_index;
-       __u32 hthi, htlo;
-       unsigned long flags;
-
-
-       if ((dev->flags & IFF_PROMISC) != 0) {
-
-               spin_lock_irqsave(&fep->lock, flags);
-               FS(fecp, r_cntrl, FEC_RCNTRL_PROM);
-               spin_unlock_irqrestore(&fep->lock, flags);
-
-               /*
-                * Log any net taps. 
-                */
-               printk(KERN_WARNING DRV_MODULE_NAME
-                      ": %s: Promiscuous mode enabled.\n", dev->name);
-               return;
-
-       }
-
-       if ((dev->flags & IFF_ALLMULTI) != 0 ||
-           dev->mc_count > FEC_MAX_MULTICAST_ADDRS) {
-               /*
-                * Catch all multicast addresses, set the filter to all 1's.
-                */
-               hthi = 0xffffffffU;
-               htlo = 0xffffffffU;
-       } else {
-               hthi = 0;
-               htlo = 0;
-
-               /*
-                * Now populate the hash table 
-                */
-               for (pmc = dev->mc_list; pmc != NULL; pmc = pmc->next) {
-                       crc = fec_mulicast_calc_crc(pmc->dmi_addr);
-                       temp = (crc & 0x3f) >> 1;
-                       hash_index = ((temp & 0x01) << 4) |
-                                    ((temp & 0x02) << 2) |
-                                    ((temp & 0x04)) |
-                                    ((temp & 0x08) >> 2) |
-                                    ((temp & 0x10) >> 4);
-                       csrVal = (1 << hash_index);
-                       if (crc & 1)
-                               hthi |= csrVal;
-                       else
-                               htlo |= csrVal;
-               }
-       }
-
-       spin_lock_irqsave(&fep->lock, flags);
-       FC(fecp, r_cntrl, FEC_RCNTRL_PROM);
-       FW(fecp, hash_table_high, hthi);
-       FW(fecp, hash_table_low, htlo);
-       spin_unlock_irqrestore(&fep->lock, flags);
-}
-
-static int fec_set_mac_address(struct net_device *dev, void *addr)
-{
-       struct sockaddr *mac = addr;
-       struct fec_enet_private *fep = netdev_priv(dev);
-       struct fec *fecp = fep->fecp;
-       int i;
-       __u32 addrhi, addrlo;
-       unsigned long flags;
-
-       /* Get pointer to SCC area in parameter RAM. */
-       for (i = 0; i < 6; i++)
-               dev->dev_addr[i] = mac->sa_data[i];
-
-       /*
-        * Set station address. 
-        */
-       addrhi = ((__u32) dev->dev_addr[0] << 24) |
-                ((__u32) dev->dev_addr[1] << 16) |
-                ((__u32) dev->dev_addr[2] <<  8) |
-                 (__u32) dev->dev_addr[3];
-       addrlo = ((__u32) dev->dev_addr[4] << 24) |
-                ((__u32) dev->dev_addr[5] << 16);
-
-       spin_lock_irqsave(&fep->lock, flags);
-       FW(fecp, addr_low, addrhi);
-       FW(fecp, addr_high, addrlo);
-       spin_unlock_irqrestore(&fep->lock, flags);
-
-       return 0;
-}
-
-/*
- * This function is called to start or restart the FEC during a link
- * change.  This only happens when switching between half and full
- * duplex.
- */
-void fec_restart(struct net_device *dev, int duplex, int speed)
-{
-#ifdef CONFIG_DUET
-       immap_t *immap = (immap_t *) IMAP_ADDR;
-       __u32 cptr;
-#endif
-       struct fec_enet_private *fep = netdev_priv(dev);
-       struct fec *fecp = fep->fecp;
-       const struct fec_platform_info *fpi = fep->fpi;
-       cbd_t *bdp;
-       struct sk_buff *skb;
-       int i;
-       __u32 addrhi, addrlo;
-
-       fec_whack_reset(fep->fecp);
-
-       /*
-        * Set station address. 
-        */
-       addrhi = ((__u32) dev->dev_addr[0] << 24) |
-                ((__u32) dev->dev_addr[1] << 16) |
-                ((__u32) dev->dev_addr[2] <<  8) |
-                (__u32) dev->dev_addr[3];
-       addrlo = ((__u32) dev->dev_addr[4] << 24) |
-                ((__u32) dev->dev_addr[5] << 16);
-       FW(fecp, addr_low, addrhi);
-       FW(fecp, addr_high, addrlo);
-
-       /*
-        * Reset all multicast. 
-        */
-       FW(fecp, hash_table_high, 0);
-       FW(fecp, hash_table_low, 0);
-
-       /*
-        * Set maximum receive buffer size. 
-        */
-       FW(fecp, r_buff_size, PKT_MAXBLR_SIZE);
-       FW(fecp, r_hash, PKT_MAXBUF_SIZE);
-
-       /*
-        * Set receive and transmit descriptor base. 
-        */
-       FW(fecp, r_des_start, iopa((__u32) (fep->rx_bd_base)));
-       FW(fecp, x_des_start, iopa((__u32) (fep->tx_bd_base)));
-
-       fep->dirty_tx = fep->cur_tx = fep->tx_bd_base;
-       fep->tx_free = fep->tx_ring;
-       fep->cur_rx = fep->rx_bd_base;
-
-       /*
-        * Reset SKB receive buffers 
-        */
-       for (i = 0; i < fep->rx_ring; i++) {
-               if ((skb = fep->rx_skbuff[i]) == NULL)
-                       continue;
-               fep->rx_skbuff[i] = NULL;
-               dev_kfree_skb(skb);
-       }
-
-       /*
-        * Initialize the receive buffer descriptors. 
-        */
-       for (i = 0, bdp = fep->rx_bd_base; i < fep->rx_ring; i++, bdp++) {
-               skb = dev_alloc_skb(ENET_RX_FRSIZE);
-               if (skb == NULL) {
-                       printk(KERN_WARNING DRV_MODULE_NAME
-                              ": %s Memory squeeze, unable to allocate skb\n",
-                              dev->name);
-                       fep->stats.rx_dropped++;
-                       break;
-               }
-               fep->rx_skbuff[i] = skb;
-               skb->dev = dev;
-               CBDW_BUFADDR(bdp, dma_map_single(NULL, skb->data,
-                                        L1_CACHE_ALIGN(PKT_MAXBUF_SIZE),
-                                        DMA_FROM_DEVICE));
-               CBDW_DATLEN(bdp, 0);    /* zero */
-               CBDW_SC(bdp, BD_ENET_RX_EMPTY |
-                       ((i < fep->rx_ring - 1) ? 0 : BD_SC_WRAP));
-       }
-       /*
-        * if we failed, fillup remainder 
-        */
-       for (; i < fep->rx_ring; i++, bdp++) {
-               fep->rx_skbuff[i] = NULL;
-               CBDW_SC(bdp, (i < fep->rx_ring - 1) ? 0 : BD_SC_WRAP);
-       }
-
-       /*
-        * Reset SKB transmit buffers.  
-        */
-       for (i = 0; i < fep->tx_ring; i++) {
-               if ((skb = fep->tx_skbuff[i]) == NULL)
-                       continue;
-               fep->tx_skbuff[i] = NULL;
-               dev_kfree_skb(skb);
-       }
-
-       /*
-        * ...and the same for transmit.  
-        */
-       for (i = 0, bdp = fep->tx_bd_base; i < fep->tx_ring; i++, bdp++) {
-               fep->tx_skbuff[i] = NULL;
-               CBDW_BUFADDR(bdp, virt_to_bus(NULL));
-               CBDW_DATLEN(bdp, 0);
-               CBDW_SC(bdp, (i < fep->tx_ring - 1) ? 0 : BD_SC_WRAP);
-       }
-
-       /*
-        * Enable big endian and don't care about SDMA FC. 
-        */
-       FW(fecp, fun_code, 0x78000000);
-
-       /*
-        * Set MII speed. 
-        */
-       FW(fecp, mii_speed, fep->fec_phy_speed);
-
-       /*
-        * Clear any outstanding interrupt. 
-        */
-       FW(fecp, ievent, 0xffc0);
-       FW(fecp, ivec, (fpi->fec_irq / 2) << 29);
-
-       /*
-        * adjust to speed (only for DUET & RMII) 
-        */
-#ifdef CONFIG_DUET
-       cptr = in_be32(&immap->im_cpm.cp_cptr);
-       switch (fpi->fec_no) {
-       case 0:
-               /*
-                * check if in RMII mode 
-                */
-               if ((cptr & 0x100) == 0)
-                       break;
-
-               if (speed == 10)
-                       cptr |= 0x0000010;
-               else if (speed == 100)
-                       cptr &= ~0x0000010;
-               break;
-       case 1:
-               /*
-                * check if in RMII mode 
-                */
-               if ((cptr & 0x80) == 0)
-                       break;
-
-               if (speed == 10)
-                       cptr |= 0x0000008;
-               else if (speed == 100)
-                       cptr &= ~0x0000008;
-               break;
-       default:
-               break;
-       }
-       out_be32(&immap->im_cpm.cp_cptr, cptr);
-#endif
-
-       FW(fecp, r_cntrl, FEC_RCNTRL_MII_MODE); /* MII enable */
-       /*
-        * adjust to duplex mode 
-        */
-       if (duplex) {
-               FC(fecp, r_cntrl, FEC_RCNTRL_DRT);
-               FS(fecp, x_cntrl, FEC_TCNTRL_FDEN);     /* FD enable */
-       } else {
-               FS(fecp, r_cntrl, FEC_RCNTRL_DRT);
-               FC(fecp, x_cntrl, FEC_TCNTRL_FDEN);     /* FD disable */
-       }
-
-       /*
-        * Enable interrupts we wish to service. 
-        */
-       FW(fecp, imask, FEC_ENET_TXF | FEC_ENET_TXB |
-          FEC_ENET_RXF | FEC_ENET_RXB);
-
-       /*
-        * And last, enable the transmit and receive processing. 
-        */
-       FW(fecp, ecntrl, FEC_ECNTRL_PINMUX | FEC_ECNTRL_ETHER_EN);
-       FW(fecp, r_des_active, 0x01000000);
-}
-
-void fec_stop(struct net_device *dev)
-{
-       struct fec_enet_private *fep = netdev_priv(dev);
-       fec_t *fecp = fep->fecp;
-       struct sk_buff *skb;
-       int i;
-
-       if ((FR(fecp, ecntrl) & FEC_ECNTRL_ETHER_EN) == 0)
-               return;         /* already down */
-
-       FW(fecp, x_cntrl, 0x01);        /* Graceful transmit stop */
-       for (i = 0; ((FR(fecp, ievent) & 0x10000000) == 0) &&
-            i < FEC_RESET_DELAY; i++)
-               udelay(1);
-
-       if (i == FEC_RESET_DELAY)
-               printk(KERN_WARNING DRV_MODULE_NAME
-                      ": %s FEC timeout on graceful transmit stop\n",
-                      dev->name);
-       /*
-        * Disable FEC. Let only MII interrupts. 
-        */
-       FW(fecp, imask, 0);
-       FW(fecp, ecntrl, ~FEC_ECNTRL_ETHER_EN);
-
-       /*
-        * Reset SKB transmit buffers.  
-        */
-       for (i = 0; i < fep->tx_ring; i++) {
-               if ((skb = fep->tx_skbuff[i]) == NULL)
-                       continue;
-               fep->tx_skbuff[i] = NULL;
-               dev_kfree_skb(skb);
-       }
-
-       /*
-        * Reset SKB receive buffers 
-        */
-       for (i = 0; i < fep->rx_ring; i++) {
-               if ((skb = fep->rx_skbuff[i]) == NULL)
-                       continue;
-               fep->rx_skbuff[i] = NULL;
-               dev_kfree_skb(skb);
-       }
-}
-
-/* common receive function */
-static int fec_enet_rx_common(struct net_device *dev, int *budget)
-{
-       struct fec_enet_private *fep = netdev_priv(dev);
-       fec_t *fecp = fep->fecp;
-       const struct fec_platform_info *fpi = fep->fpi;
-       cbd_t *bdp;
-       struct sk_buff *skb, *skbn, *skbt;
-       int received = 0;
-       __u16 pkt_len, sc;
-       int curidx;
-       int rx_work_limit;
-
-       if (fpi->use_napi) {
-               rx_work_limit = min(dev->quota, *budget);
-
-               if (!netif_running(dev))
-                       return 0;
-       }
-
-       /*
-        * First, grab all of the stats for the incoming packet.
-        * These get messed up if we get called due to a busy condition.
-        */
-       bdp = fep->cur_rx;
-
-       /* clear RX status bits for napi*/
-       if (fpi->use_napi)
-               FW(fecp, ievent, FEC_ENET_RXF | FEC_ENET_RXB);
-
-       while (((sc = CBDR_SC(bdp)) & BD_ENET_RX_EMPTY) == 0) {
-
-               curidx = bdp - fep->rx_bd_base;
-
-               /*
-                * Since we have allocated space to hold a complete frame,
-                * the last indicator should be set.
-                */
-               if ((sc & BD_ENET_RX_LAST) == 0)
-                       printk(KERN_WARNING DRV_MODULE_NAME
-                              ": %s rcv is not +last\n",
-                              dev->name);
-
-               /*
-                * Check for errors. 
-                */
-               if (sc & (BD_ENET_RX_LG | BD_ENET_RX_SH | BD_ENET_RX_CL |
-                         BD_ENET_RX_NO | BD_ENET_RX_CR | BD_ENET_RX_OV)) {
-                       fep->stats.rx_errors++;
-                       /* Frame too long or too short. */
-                       if (sc & (BD_ENET_RX_LG | BD_ENET_RX_SH))
-                               fep->stats.rx_length_errors++;
-                       /* Frame alignment */
-                       if (sc & (BD_ENET_RX_NO | BD_ENET_RX_CL))
-                               fep->stats.rx_frame_errors++;
-                       /* CRC Error */
-                       if (sc & BD_ENET_RX_CR)
-                               fep->stats.rx_crc_errors++;
-                       /* FIFO overrun */
-                       if (sc & BD_ENET_RX_OV)
-                               fep->stats.rx_crc_errors++;
-
-                       skbn = fep->rx_skbuff[curidx];
-                       BUG_ON(skbn == NULL);
-
-               } else {
-
-                       /* napi, got packet but no quota */
-                       if (fpi->use_napi && --rx_work_limit < 0)
-                               break;
-
-                       skb = fep->rx_skbuff[curidx];
-                       BUG_ON(skb == NULL);
-
-                       /*
-                        * Process the incoming frame.
-                        */
-                       fep->stats.rx_packets++;
-                       pkt_len = CBDR_DATLEN(bdp) - 4; /* remove CRC */
-                       fep->stats.rx_bytes += pkt_len + 4;
-
-                       if (pkt_len <= fpi->rx_copybreak) {
-                               /* +2 to make IP header L1 cache aligned */
-                               skbn = dev_alloc_skb(pkt_len + 2);
-                               if (skbn != NULL) {
-                                       skb_reserve(skbn, 2);   /* align IP header */
-                                       memcpy(skbn->data, skb->data, pkt_len);
-                                       /* swap */
-                                       skbt = skb;
-                                       skb = skbn;
-                                       skbn = skbt;
-                               }
-                       } else
-                               skbn = dev_alloc_skb(ENET_RX_FRSIZE);
-
-                       if (skbn != NULL) {
-                               skb->dev = dev;
-                               skb_put(skb, pkt_len);  /* Make room */
-                               skb->protocol = eth_type_trans(skb, dev);
-                               received++;
-                               if (!fpi->use_napi)
-                                       netif_rx(skb);
-                               else
-                                       netif_receive_skb(skb);
-                       } else {
-                               printk(KERN_WARNING DRV_MODULE_NAME
-                                      ": %s Memory squeeze, dropping packet.\n",
-                                      dev->name);
-                               fep->stats.rx_dropped++;
-                               skbn = skb;
-                       }
-               }
-
-               fep->rx_skbuff[curidx] = skbn;
-               CBDW_BUFADDR(bdp, dma_map_single(NULL, skbn->data,
-                                                L1_CACHE_ALIGN(PKT_MAXBUF_SIZE),
-                                                DMA_FROM_DEVICE));
-               CBDW_DATLEN(bdp, 0);
-               CBDW_SC(bdp, (sc & ~BD_ENET_RX_STATS) | BD_ENET_RX_EMPTY);
-
-               /*
-                * Update BD pointer to next entry. 
-                */
-               if ((sc & BD_ENET_RX_WRAP) == 0)
-                       bdp++;
-               else
-                       bdp = fep->rx_bd_base;
-
-               /*
-                * Doing this here will keep the FEC running while we process
-                * incoming frames.  On a heavily loaded network, we should be
-                * able to keep up at the expense of system resources.
-                */
-               FW(fecp, r_des_active, 0x01000000);
-       }
-
-       fep->cur_rx = bdp;
-
-       if (fpi->use_napi) {
-               dev->quota -= received;
-               *budget -= received;
-
-               if (rx_work_limit < 0)
-                       return 1;       /* not done */
-
-               /* done */
-               netif_rx_complete(dev);
-
-               /* enable RX interrupt bits */
-               FS(fecp, imask, FEC_ENET_RXF | FEC_ENET_RXB);
-       }
-
-       return 0;
-}
-
-static void fec_enet_tx(struct net_device *dev)
-{
-       struct fec_enet_private *fep = netdev_priv(dev);
-       cbd_t *bdp;
-       struct sk_buff *skb;
-       int dirtyidx, do_wake;
-       __u16 sc;
-
-       spin_lock(&fep->lock);
-       bdp = fep->dirty_tx;
-
-       do_wake = 0;
-       while (((sc = CBDR_SC(bdp)) & BD_ENET_TX_READY) == 0) {
-
-               dirtyidx = bdp - fep->tx_bd_base;
-
-               if (fep->tx_free == fep->tx_ring)
-                       break;
-
-               skb = fep->tx_skbuff[dirtyidx];
-
-               /*
-                * Check for errors. 
-                */
-               if (sc & (BD_ENET_TX_HB | BD_ENET_TX_LC |
-                         BD_ENET_TX_RL | BD_ENET_TX_UN | BD_ENET_TX_CSL)) {
-                       fep->stats.tx_errors++;
-                       if (sc & BD_ENET_TX_HB) /* No heartbeat */
-                               fep->stats.tx_heartbeat_errors++;
-                       if (sc & BD_ENET_TX_LC) /* Late collision */
-                               fep->stats.tx_window_errors++;
-                       if (sc & BD_ENET_TX_RL) /* Retrans limit */
-                               fep->stats.tx_aborted_errors++;
-                       if (sc & BD_ENET_TX_UN) /* Underrun */
-                               fep->stats.tx_fifo_errors++;
-                       if (sc & BD_ENET_TX_CSL)        /* Carrier lost */
-                               fep->stats.tx_carrier_errors++;
-               } else
-                       fep->stats.tx_packets++;
-
-               if (sc & BD_ENET_TX_READY)
-                       printk(KERN_WARNING DRV_MODULE_NAME
-                              ": %s HEY! Enet xmit interrupt and TX_READY.\n",
-                              dev->name);
-
-               /*
-                * Deferred means some collisions occurred during transmit,
-                * but we eventually sent the packet OK.
-                */
-               if (sc & BD_ENET_TX_DEF)
-                       fep->stats.collisions++;
-
-               /*
-                * Free the sk buffer associated with this last transmit. 
-                */
-               dev_kfree_skb_irq(skb);
-               fep->tx_skbuff[dirtyidx] = NULL;
-
-               /*
-                * Update pointer to next buffer descriptor to be transmitted. 
-                */
-               if ((sc & BD_ENET_TX_WRAP) == 0)
-                       bdp++;
-               else
-                       bdp = fep->tx_bd_base;
-
-               /*
-                * Since we have freed up a buffer, the ring is no longer
-                * full.
-                */
-               if (!fep->tx_free++)
-                       do_wake = 1;
-       }
-
-       fep->dirty_tx = bdp;
-
-       spin_unlock(&fep->lock);
-
-       if (do_wake && netif_queue_stopped(dev))
-               netif_wake_queue(dev);
-}
-
-/*
- * The interrupt handler.
- * This is called from the MPC core interrupt.
- */
-static irqreturn_t
-fec_enet_interrupt(int irq, void *dev_id, struct pt_regs *regs)
-{
-       struct net_device *dev = dev_id;
-       struct fec_enet_private *fep;
-       const struct fec_platform_info *fpi;
-       fec_t *fecp;
-       __u32 int_events;
-       __u32 int_events_napi;
-
-       if (unlikely(dev == NULL))
-               return IRQ_NONE;
-
-       fep = netdev_priv(dev);
-       fecp = fep->fecp;
-       fpi = fep->fpi;
-
-       /*
-        * Get the interrupt events that caused us to be here.
-        */
-       while ((int_events = FR(fecp, ievent) & FR(fecp, imask)) != 0) {
-
-               if (!fpi->use_napi)
-                       FW(fecp, ievent, int_events);
-               else {
-                       int_events_napi = int_events & ~(FEC_ENET_RXF | FEC_ENET_RXB);
-                       FW(fecp, ievent, int_events_napi);
-               }
-
-               if ((int_events & (FEC_ENET_HBERR | FEC_ENET_BABR |
-                                  FEC_ENET_BABT | FEC_ENET_EBERR)) != 0)
-                       printk(KERN_WARNING DRV_MODULE_NAME
-                              ": %s FEC ERROR(s) 0x%x\n",
-                              dev->name, int_events);
-
-               if ((int_events & FEC_ENET_RXF) != 0) {
-                       if (!fpi->use_napi)
-                               fec_enet_rx_common(dev, NULL);
-                       else {
-                               if (netif_rx_schedule_prep(dev)) {
-                                       /* disable rx interrupts */
-                                       FC(fecp, imask, FEC_ENET_RXF | FEC_ENET_RXB);
-                                       __netif_rx_schedule(dev);
-                               } else {
-                                       printk(KERN_ERR DRV_MODULE_NAME
-                                              ": %s driver bug! interrupt while in poll!\n",
-                                              dev->name);
-                                       FC(fecp, imask, FEC_ENET_RXF | FEC_ENET_RXB);
-                               }
-                       }
-               }
-
-               if ((int_events & FEC_ENET_TXF) != 0)
-                       fec_enet_tx(dev);
-       }
-
-       return IRQ_HANDLED;
-}
-
-/* This interrupt occurs when the PHY detects a link change. */
-static irqreturn_t
-fec_mii_link_interrupt(int irq, void *dev_id, struct pt_regs *regs)
-{
-       struct net_device *dev = dev_id;
-       struct fec_enet_private *fep;
-       const struct fec_platform_info *fpi;
-
-       if (unlikely(dev == NULL))
-               return IRQ_NONE;
-
-       fep = netdev_priv(dev);
-       fpi = fep->fpi;
-
-       if (!fpi->use_mdio)
-               return IRQ_NONE;
-
-       /*
-        * Acknowledge the interrupt if possible. If we have not
-        * found the PHY yet we can't process or acknowledge the
-        * interrupt now. Instead we ignore this interrupt for now,
-        * which we can do since it is edge triggered. It will be
-        * acknowledged later by fec_enet_open().
-        */
-       if (!fep->phy)
-               return IRQ_NONE;
-
-       fec_mii_ack_int(dev);
-       fec_mii_link_status_change_check(dev, 0);
-
-       return IRQ_HANDLED;
-}
-
-
-/**********************************************************************************/
-
-static int fec_enet_start_xmit(struct sk_buff *skb, struct net_device *dev)
-{
-       struct fec_enet_private *fep = netdev_priv(dev);
-       fec_t *fecp = fep->fecp;
-       cbd_t *bdp;
-       int curidx;
-       unsigned long flags;
-
-       spin_lock_irqsave(&fep->tx_lock, flags);
-
-       /*
-        * Fill in a Tx ring entry 
-        */
-       bdp = fep->cur_tx;
-
-       if (!fep->tx_free || (CBDR_SC(bdp) & BD_ENET_TX_READY)) {
-               netif_stop_queue(dev);
-               spin_unlock_irqrestore(&fep->tx_lock, flags);
-
-               /*
-                * Ooops.  All transmit buffers are full.  Bail out.
-                * This should not happen, since the tx queue should be stopped.
-                */
-               printk(KERN_WARNING DRV_MODULE_NAME
-                      ": %s tx queue full!.\n", dev->name);
-               return 1;
-       }
-
-       curidx = bdp - fep->tx_bd_base;
-       /*
-        * Clear all of the status flags. 
-        */
-       CBDC_SC(bdp, BD_ENET_TX_STATS);
-
-       /*
-        * Save skb pointer. 
-        */
-       fep->tx_skbuff[curidx] = skb;
-
-       fep->stats.tx_bytes += skb->len;
-
-       /*
-        * Push the data cache so the CPM does not get stale memory data. 
-        */
-       CBDW_BUFADDR(bdp, dma_map_single(NULL, skb->data,
-                                        skb->len, DMA_TO_DEVICE));
-       CBDW_DATLEN(bdp, skb->len);
-
-       dev->trans_start = jiffies;
-
-       /*
-        * If this was the last BD in the ring, start at the beginning again. 
-        */
-       if ((CBDR_SC(bdp) & BD_ENET_TX_WRAP) == 0)
-               fep->cur_tx++;
-       else
-               fep->cur_tx = fep->tx_bd_base;
-
-       if (!--fep->tx_free)
-               netif_stop_queue(dev);
-
-       /*
-        * Trigger transmission start 
-        */
-       CBDS_SC(bdp, BD_ENET_TX_READY | BD_ENET_TX_INTR |
-               BD_ENET_TX_LAST | BD_ENET_TX_TC);
-       FW(fecp, x_des_active, 0x01000000);
-
-       spin_unlock_irqrestore(&fep->tx_lock, flags);
-
-       return 0;
-}
-
-static void fec_timeout(struct net_device *dev)
-{
-       struct fec_enet_private *fep = netdev_priv(dev);
-
-       fep->stats.tx_errors++;
-
-       if (fep->tx_free)
-               netif_wake_queue(dev);
-
-       /* check link status again */
-       fec_mii_link_status_change_check(dev, 0);
-}
-
-static int fec_enet_open(struct net_device *dev)
-{
-       struct fec_enet_private *fep = netdev_priv(dev);
-       const struct fec_platform_info *fpi = fep->fpi;
-       unsigned long flags;
-
-       /* Install our interrupt handler. */
-       if (request_irq(fpi->fec_irq, fec_enet_interrupt, 0, "fec", dev) != 0) {
-               printk(KERN_ERR DRV_MODULE_NAME
-                      ": %s Could not allocate FEC IRQ!", dev->name);
-               return -EINVAL;
-       }
-
-       /* Install our phy interrupt handler */
-       if (fpi->phy_irq != -1 && 
-               request_irq(fpi->phy_irq, fec_mii_link_interrupt, 0, "fec-phy",
-                               dev) != 0) {
-               printk(KERN_ERR DRV_MODULE_NAME
-                      ": %s Could not allocate PHY IRQ!", dev->name);
-               free_irq(fpi->fec_irq, dev);
-               return -EINVAL;
-       }
-
-       if (fpi->use_mdio) {
-               fec_mii_startup(dev);
-               netif_carrier_off(dev);
-               fec_mii_link_status_change_check(dev, 1);
-       } else {
-               spin_lock_irqsave(&fep->lock, flags);
-               fec_restart(dev, 1, 100);       /* XXX this sucks */
-               spin_unlock_irqrestore(&fep->lock, flags);
-
-               netif_carrier_on(dev);
-               netif_start_queue(dev);
-       }
-       return 0;
-}
-
-static int fec_enet_close(struct net_device *dev)
-{
-       struct fec_enet_private *fep = netdev_priv(dev);
-       const struct fec_platform_info *fpi = fep->fpi;
-       unsigned long flags;
-
-       netif_stop_queue(dev);
-       netif_carrier_off(dev);
-
-       if (fpi->use_mdio)
-               fec_mii_shutdown(dev);
-
-       spin_lock_irqsave(&fep->lock, flags);
-       fec_stop(dev);
-       spin_unlock_irqrestore(&fep->lock, flags);
-
-       /* release any irqs */
-       if (fpi->phy_irq != -1)
-               free_irq(fpi->phy_irq, dev);
-       free_irq(fpi->fec_irq, dev);
-
-       return 0;
-}
-
-static struct net_device_stats *fec_enet_get_stats(struct net_device *dev)
-{
-       struct fec_enet_private *fep = netdev_priv(dev);
-       return &fep->stats;
-}
-
-static int fec_enet_poll(struct net_device *dev, int *budget)
-{
-       return fec_enet_rx_common(dev, budget);
-}
-
-/*************************************************************************/
-
-static void fec_get_drvinfo(struct net_device *dev,
-                           struct ethtool_drvinfo *info)
-{
-       strcpy(info->driver, DRV_MODULE_NAME);
-       strcpy(info->version, DRV_MODULE_VERSION);
-}
-
-static int fec_get_regs_len(struct net_device *dev)
-{
-       return sizeof(fec_t);
-}
-
-static void fec_get_regs(struct net_device *dev, struct ethtool_regs *regs,
-                        void *p)
-{
-       struct fec_enet_private *fep = netdev_priv(dev);
-       unsigned long flags;
-
-       if (regs->len < sizeof(fec_t))
-               return;
-
-       regs->version = 0;
-       spin_lock_irqsave(&fep->lock, flags);
-       memcpy_fromio(p, fep->fecp, sizeof(fec_t));
-       spin_unlock_irqrestore(&fep->lock, flags);
-}
-
-static int fec_get_settings(struct net_device *dev, struct ethtool_cmd *cmd)
-{
-       struct fec_enet_private *fep = netdev_priv(dev);
-       unsigned long flags;
-       int rc;
-
-       spin_lock_irqsave(&fep->lock, flags);
-       rc = mii_ethtool_gset(&fep->mii_if, cmd);
-       spin_unlock_irqrestore(&fep->lock, flags);
-
-       return rc;
-}
-
-static int fec_set_settings(struct net_device *dev, struct ethtool_cmd *cmd)
-{
-       struct fec_enet_private *fep = netdev_priv(dev);
-       unsigned long flags;
-       int rc;
-
-       spin_lock_irqsave(&fep->lock, flags);
-       rc = mii_ethtool_sset(&fep->mii_if, cmd);
-       spin_unlock_irqrestore(&fep->lock, flags);
-
-       return rc;
-}
-
-static int fec_nway_reset(struct net_device *dev)
-{
-       struct fec_enet_private *fep = netdev_priv(dev);
-       return mii_nway_restart(&fep->mii_if);
-}
-
-static __u32 fec_get_msglevel(struct net_device *dev)
-{
-       struct fec_enet_private *fep = netdev_priv(dev);
-       return fep->msg_enable;
-}
-
-static void fec_set_msglevel(struct net_device *dev, __u32 value)
-{
-       struct fec_enet_private *fep = netdev_priv(dev);
-       fep->msg_enable = value;
-}
-
-static struct ethtool_ops fec_ethtool_ops = {
-       .get_drvinfo = fec_get_drvinfo,
-       .get_regs_len = fec_get_regs_len,
-       .get_settings = fec_get_settings,
-       .set_settings = fec_set_settings,
-       .nway_reset = fec_nway_reset,
-       .get_link = ethtool_op_get_link,
-       .get_msglevel = fec_get_msglevel,
-       .set_msglevel = fec_set_msglevel,
-       .get_tx_csum = ethtool_op_get_tx_csum,
-       .set_tx_csum = ethtool_op_set_tx_csum,  /* local! */
-       .get_sg = ethtool_op_get_sg,
-       .set_sg = ethtool_op_set_sg,
-       .get_regs = fec_get_regs,
-};
-
-static int fec_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
-{
-       struct fec_enet_private *fep = netdev_priv(dev);
-       struct mii_ioctl_data *mii = (struct mii_ioctl_data *)&rq->ifr_data;
-       unsigned long flags;
-       int rc;
-
-       if (!netif_running(dev))
-               return -EINVAL;
-
-       spin_lock_irqsave(&fep->lock, flags);
-       rc = generic_mii_ioctl(&fep->mii_if, mii, cmd, NULL);
-       spin_unlock_irqrestore(&fep->lock, flags);
-       return rc;
-}
-
-int fec_8xx_init_one(const struct fec_platform_info *fpi,
-                    struct net_device **devp)
-{
-       immap_t *immap = (immap_t *) IMAP_ADDR;
-       static int fec_8xx_version_printed = 0;
-       struct net_device *dev = NULL;
-       struct fec_enet_private *fep = NULL;
-       fec_t *fecp = NULL;
-       int i;
-       int err = 0;
-       int registered = 0;
-       __u32 siel;
-
-       *devp = NULL;
-
-       switch (fpi->fec_no) {
-       case 0:
-               fecp = &((immap_t *) IMAP_ADDR)->im_cpm.cp_fec;
-               break;
-#ifdef CONFIG_DUET
-       case 1:
-               fecp = &((immap_t *) IMAP_ADDR)->im_cpm.cp_fec2;
-               break;
-#endif
-       default:
-               return -EINVAL;
-       }
-
-       if (fec_8xx_version_printed++ == 0)
-               printk(KERN_INFO "%s", version);
-
-       i = sizeof(*fep) + (sizeof(struct sk_buff **) *
-                           (fpi->rx_ring + fpi->tx_ring));
-
-       dev = alloc_etherdev(i);
-       if (!dev) {
-               err = -ENOMEM;
-               goto err;
-       }
-       SET_MODULE_OWNER(dev);
-
-       fep = netdev_priv(dev);
-
-       /* partial reset of FEC */
-       fec_whack_reset(fecp);
-
-       /* point rx_skbuff, tx_skbuff */
-       fep->rx_skbuff = (struct sk_buff **)&fep[1];
-       fep->tx_skbuff = fep->rx_skbuff + fpi->rx_ring;
-
-       fep->fecp = fecp;
-       fep->fpi = fpi;
-
-       /* init locks */
-       spin_lock_init(&fep->lock);
-       spin_lock_init(&fep->tx_lock);
-
-       /*
-        * Set the Ethernet address. 
-        */
-       for (i = 0; i < 6; i++)
-               dev->dev_addr[i] = fpi->macaddr[i];
-
-       fep->ring_base = dma_alloc_coherent(NULL,
-                                           (fpi->tx_ring + fpi->rx_ring) *
-                                           sizeof(cbd_t), &fep->ring_mem_addr,
-                                           GFP_KERNEL);
-       if (fep->ring_base == NULL) {
-               printk(KERN_ERR DRV_MODULE_NAME
-                      ": %s dma alloc failed.\n", dev->name);
-               err = -ENOMEM;
-               goto err;
-       }
-
-       /*
-        * Set receive and transmit descriptor base.
-        */
-       fep->rx_bd_base = fep->ring_base;
-       fep->tx_bd_base = fep->rx_bd_base + fpi->rx_ring;
-
-       /* initialize ring size variables */
-       fep->tx_ring = fpi->tx_ring;
-       fep->rx_ring = fpi->rx_ring;
-
-       /* SIU interrupt */
-       if (fpi->phy_irq != -1 &&
-               (fpi->phy_irq >= SIU_IRQ0 && fpi->phy_irq < SIU_LEVEL7)) {
-
-               siel = in_be32(&immap->im_siu_conf.sc_siel);
-               if ((fpi->phy_irq & 1) == 0)
-                       siel |= (0x80000000 >> fpi->phy_irq);
-               else
-                       siel &= ~(0x80000000 >> (fpi->phy_irq & ~1));
-               out_be32(&immap->im_siu_conf.sc_siel, siel);
-       }
-
-       /*
-        * The FEC Ethernet specific entries in the device structure. 
-        */
-       dev->open = fec_enet_open;
-       dev->hard_start_xmit = fec_enet_start_xmit;
-       dev->tx_timeout = fec_timeout;
-       dev->watchdog_timeo = TX_TIMEOUT;
-       dev->stop = fec_enet_close;
-       dev->get_stats = fec_enet_get_stats;
-       dev->set_multicast_list = fec_set_multicast_list;
-       dev->set_mac_address = fec_set_mac_address;
-       if (fpi->use_napi) {
-               dev->poll = fec_enet_poll;
-               dev->weight = fpi->napi_weight;
-       }
-       dev->ethtool_ops = &fec_ethtool_ops;
-       dev->do_ioctl = fec_ioctl;
-
-       fep->fec_phy_speed =
-           ((((fpi->sys_clk + 4999999) / 2500000) / 2) & 0x3F) << 1;
-
-       init_timer(&fep->phy_timer_list);
-
-       /* partial reset of FEC so that only MII works */
-       FW(fecp, mii_speed, fep->fec_phy_speed);
-       FW(fecp, ievent, 0xffc0);
-       FW(fecp, ivec, (fpi->fec_irq / 2) << 29);
-       FW(fecp, imask, 0);
-       FW(fecp, r_cntrl, FEC_RCNTRL_MII_MODE); /* MII enable */
-       FW(fecp, ecntrl, FEC_ECNTRL_PINMUX | FEC_ECNTRL_ETHER_EN);
-
-       netif_carrier_off(dev);
-
-       err = register_netdev(dev);
-       if (err != 0)
-               goto err;
-       registered = 1;
-
-       if (fpi->use_mdio) {
-               fep->mii_if.dev = dev;
-               fep->mii_if.mdio_read = fec_mii_read;
-               fep->mii_if.mdio_write = fec_mii_write;
-               fep->mii_if.phy_id_mask = 0x1f;
-               fep->mii_if.reg_num_mask = 0x1f;
-               fep->mii_if.phy_id = fec_mii_phy_id_detect(dev);
-       }
-
-       *devp = dev;
-
-       return 0;
-
-      err:
-       if (dev != NULL) {
-               if (fecp != NULL)
-                       fec_whack_reset(fecp);
-
-               if (registered)
-                       unregister_netdev(dev);
-
-               if (fep != NULL) {
-                       if (fep->ring_base)
-                               dma_free_coherent(NULL,
-                                                 (fpi->tx_ring +
-                                                  fpi->rx_ring) *
-                                                 sizeof(cbd_t), fep->ring_base,
-                                                 fep->ring_mem_addr);
-               }
-               free_netdev(dev);
-       }
-       return err;
-}
-
-int fec_8xx_cleanup_one(struct net_device *dev)
-{
-       struct fec_enet_private *fep = netdev_priv(dev);
-       fec_t *fecp = fep->fecp;
-       const struct fec_platform_info *fpi = fep->fpi;
-
-       fec_whack_reset(fecp);
-
-       unregister_netdev(dev);
-
-       dma_free_coherent(NULL, (fpi->tx_ring + fpi->rx_ring) * sizeof(cbd_t),
-                         fep->ring_base, fep->ring_mem_addr);
-
-       free_netdev(dev);
-
-       return 0;
-}
-
-/**************************************************************************************/
-/**************************************************************************************/
-/**************************************************************************************/
-
-static int __init fec_8xx_init(void)
-{
-       return fec_8xx_platform_init();
-}
-
-static void __exit fec_8xx_cleanup(void)
-{
-       fec_8xx_platform_cleanup();
-}
-
-/**************************************************************************************/
-/**************************************************************************************/
-/**************************************************************************************/
-
-module_init(fec_8xx_init);
-module_exit(fec_8xx_cleanup);
diff --git a/drivers/net/fec_8xx/fec_mii.c b/drivers/net/fec_8xx/fec_mii.c
deleted file mode 100644 (file)
index 7002336..0000000
+++ /dev/null
@@ -1,380 +0,0 @@
-/*
- * Fast Ethernet Controller (FEC) driver for Motorola MPC8xx.
- *
- * Copyright (c) 2003 Intracom S.A. 
- *  by Pantelis Antoniou <panto@intracom.gr>
- *
- * Heavily based on original FEC driver by Dan Malek <dan@embeddededge.com>
- * and modifications by Joakim Tjernlund <joakim.tjernlund@lumentis.se>
- *
- * Released under the GPL
- */
-
-#include <linux/config.h>
-#include <linux/module.h>
-#include <linux/types.h>
-#include <linux/kernel.h>
-#include <linux/sched.h>
-#include <linux/string.h>
-#include <linux/ptrace.h>
-#include <linux/errno.h>
-#include <linux/ioport.h>
-#include <linux/slab.h>
-#include <linux/interrupt.h>
-#include <linux/pci.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/mii.h>
-#include <linux/ethtool.h>
-
-#include <asm/8xx_immap.h>
-#include <asm/pgtable.h>
-#include <asm/mpc8xx.h>
-#include <asm/irq.h>
-#include <asm/bitops.h>
-#include <asm/uaccess.h>
-#include <asm/commproc.h>
-
-/*************************************************/
-
-#include "fec_8xx.h"
-
-/*************************************************/
-
-/* Make MII read/write commands for the FEC.
-*/
-#define mk_mii_read(REG)       (0x60020000 | ((REG & 0x1f) << 18))
-#define mk_mii_write(REG, VAL) (0x50020000 | ((REG & 0x1f) << 18) | (VAL & 0xffff))
-#define mk_mii_end             0
-
-/*************************************************/
-
-/* XXX both FECs use the MII interface of FEC1 */
-static spinlock_t fec_mii_lock = SPIN_LOCK_UNLOCKED;
-
-#define FEC_MII_LOOPS  10000
-
-int fec_mii_read(struct net_device *dev, int phy_id, int location)
-{
-       struct fec_enet_private *fep = netdev_priv(dev);
-       fec_t *fecp;
-       int i, ret = -1;
-       unsigned long flags;
-
-       /* XXX MII interface is only connected to FEC1 */
-       fecp = &((immap_t *) IMAP_ADDR)->im_cpm.cp_fec;
-
-       spin_lock_irqsave(&fec_mii_lock, flags);
-
-       if ((FR(fecp, r_cntrl) & FEC_RCNTRL_MII_MODE) == 0) {
-               FS(fecp, r_cntrl, FEC_RCNTRL_MII_MODE); /* MII enable */
-               FS(fecp, ecntrl, FEC_ECNTRL_PINMUX | FEC_ECNTRL_ETHER_EN);
-               FW(fecp, ievent, FEC_ENET_MII);
-       }
-
-       /* Add PHY address to register command.  */
-       FW(fecp, mii_speed, fep->fec_phy_speed);
-       FW(fecp, mii_data, (phy_id << 23) | mk_mii_read(location));
-
-       for (i = 0; i < FEC_MII_LOOPS; i++)
-               if ((FR(fecp, ievent) & FEC_ENET_MII) != 0)
-                       break;
-
-       if (i < FEC_MII_LOOPS) {
-               FW(fecp, ievent, FEC_ENET_MII);
-               ret = FR(fecp, mii_data) & 0xffff;
-       }
-
-       spin_unlock_irqrestore(&fec_mii_lock, flags);
-
-       return ret;
-}
-
-void fec_mii_write(struct net_device *dev, int phy_id, int location, int value)
-{
-       struct fec_enet_private *fep = netdev_priv(dev);
-       fec_t *fecp;
-       unsigned long flags;
-       int i;
-
-       /* XXX MII interface is only connected to FEC1 */
-       fecp = &((immap_t *) IMAP_ADDR)->im_cpm.cp_fec;
-
-       spin_lock_irqsave(&fec_mii_lock, flags);
-
-       if ((FR(fecp, r_cntrl) & FEC_RCNTRL_MII_MODE) == 0) {
-               FS(fecp, r_cntrl, FEC_RCNTRL_MII_MODE); /* MII enable */
-               FS(fecp, ecntrl, FEC_ECNTRL_PINMUX | FEC_ECNTRL_ETHER_EN);
-               FW(fecp, ievent, FEC_ENET_MII);
-       }
-
-       /* Add PHY address to register command.  */
-       FW(fecp, mii_speed, fep->fec_phy_speed);        /* always adapt mii speed */
-       FW(fecp, mii_data, (phy_id << 23) | mk_mii_write(location, value));
-
-       for (i = 0; i < FEC_MII_LOOPS; i++)
-               if ((FR(fecp, ievent) & FEC_ENET_MII) != 0)
-                       break;
-
-       if (i < FEC_MII_LOOPS)
-               FW(fecp, ievent, FEC_ENET_MII);
-
-       spin_unlock_irqrestore(&fec_mii_lock, flags);
-}
-
-/*************************************************/
-
-#ifdef CONFIG_FEC_8XX_GENERIC_PHY
-
-/*
- * Generic PHY support.
- * Should work for all PHYs, but link change is detected by polling
- */
-
-static void generic_timer_callback(unsigned long data)
-{
-       struct net_device *dev = (struct net_device *)data;
-       struct fec_enet_private *fep = netdev_priv(dev);
-
-       fep->phy_timer_list.expires = jiffies + HZ / 2;
-
-       add_timer(&fep->phy_timer_list);
-
-       fec_mii_link_status_change_check(dev, 0);
-}
-
-static void generic_startup(struct net_device *dev)
-{
-       struct fec_enet_private *fep = netdev_priv(dev);
-
-       fep->phy_timer_list.expires = jiffies + HZ / 2; /* every 500ms */
-       fep->phy_timer_list.data = (unsigned long)dev;
-       fep->phy_timer_list.function = generic_timer_callback;
-       add_timer(&fep->phy_timer_list);
-}
-
-static void generic_shutdown(struct net_device *dev)
-{
-       struct fec_enet_private *fep = netdev_priv(dev);
-
-       del_timer_sync(&fep->phy_timer_list);
-}
-
-#endif
-
-#ifdef CONFIG_FEC_8XX_DM9161_PHY
-
-/* ------------------------------------------------------------------------- */
-/* The Davicom DM9161 is used on the NETTA board                            */
-
-/* register definitions */
-
-#define MII_DM9161_ACR         16      /* Aux. Config Register         */
-#define MII_DM9161_ACSR                17      /* Aux. Config/Status Register  */
-#define MII_DM9161_10TCSR      18      /* 10BaseT Config/Status Reg.   */
-#define MII_DM9161_INTR                21      /* Interrupt Register           */
-#define MII_DM9161_RECR                22      /* Receive Error Counter Reg.   */
-#define MII_DM9161_DISCR       23      /* Disconnect Counter Register  */
-
-static void dm9161_startup(struct net_device *dev)
-{
-       struct fec_enet_private *fep = netdev_priv(dev);
-
-       fec_mii_write(dev, fep->mii_if.phy_id, MII_DM9161_INTR, 0x0000);
-}
-
-static void dm9161_ack_int(struct net_device *dev)
-{
-       struct fec_enet_private *fep = netdev_priv(dev);
-
-       fec_mii_read(dev, fep->mii_if.phy_id, MII_DM9161_INTR);
-}
-
-static void dm9161_shutdown(struct net_device *dev)
-{
-       struct fec_enet_private *fep = netdev_priv(dev);
-
-       fec_mii_write(dev, fep->mii_if.phy_id, MII_DM9161_INTR, 0x0f00);
-}
-
-#endif
-
-/**********************************************************************************/
-
-static const struct phy_info phy_info[] = {
-#ifdef CONFIG_FEC_8XX_DM9161_PHY
-       {
-        .id = 0x00181b88,
-        .name = "DM9161",
-        .startup = dm9161_startup,
-        .ack_int = dm9161_ack_int,
-        .shutdown = dm9161_shutdown,
-        },
-#endif
-#ifdef CONFIG_FEC_8XX_GENERIC_PHY
-       {
-        .id = 0,
-        .name = "GENERIC",
-        .startup = generic_startup,
-        .shutdown = generic_shutdown,
-        },
-#endif
-};
-
-/**********************************************************************************/
-
-int fec_mii_phy_id_detect(struct net_device *dev)
-{
-       struct fec_enet_private *fep = netdev_priv(dev);
-       const struct fec_platform_info *fpi = fep->fpi;
-       int i, r, start, end, phytype, physubtype;
-       const struct phy_info *phy;
-       int phy_hwid, phy_id;
-
-       /* if no MDIO */
-       if (fpi->use_mdio == 0)
-               return -1;
-
-       phy_hwid = -1;
-       fep->phy = NULL;
-
-       /* auto-detect? */
-       if (fpi->phy_addr == -1) {
-               start = 0;
-               end = 32;
-       } else {                /* direct */
-               start = fpi->phy_addr;
-               end = start + 1;
-       }
-
-       for (phy_id = start; phy_id < end; phy_id++) {
-               r = fec_mii_read(dev, phy_id, MII_PHYSID1);
-               if (r == -1 || (phytype = (r & 0xffff)) == 0xffff)
-                       continue;
-               r = fec_mii_read(dev, phy_id, MII_PHYSID2);
-               if (r == -1 || (physubtype = (r & 0xffff)) == 0xffff)
-                       continue;
-               phy_hwid = (phytype << 16) | physubtype;
-               if (phy_hwid != -1)
-                       break;
-       }
-
-       if (phy_hwid == -1) {
-               printk(KERN_ERR DRV_MODULE_NAME
-                      ": %s No PHY detected!\n", dev->name);
-               return -1;
-       }
-
-       for (i = 0, phy = phy_info; i < sizeof(phy_info) / sizeof(phy_info[0]);
-            i++, phy++)
-               if (phy->id == (phy_hwid >> 4) || phy->id == 0)
-                       break;
-
-       if (i >= sizeof(phy_info) / sizeof(phy_info[0])) {
-               printk(KERN_ERR DRV_MODULE_NAME
-                      ": %s PHY id 0x%08x is not supported!\n",
-                      dev->name, phy_hwid);
-               return -1;
-       }
-
-       fep->phy = phy;
-
-       printk(KERN_INFO DRV_MODULE_NAME
-              ": %s Phy @ 0x%x, type %s (0x%08x)\n",
-              dev->name, phy_id, fep->phy->name, phy_hwid);
-
-       return phy_id;
-}
-
-void fec_mii_startup(struct net_device *dev)
-{
-       struct fec_enet_private *fep = netdev_priv(dev);
-       const struct fec_platform_info *fpi = fep->fpi;
-
-       if (!fpi->use_mdio || fep->phy == NULL)
-               return;
-
-       if (fep->phy->startup == NULL)
-               return;
-
-       (*fep->phy->startup) (dev);
-}
-
-void fec_mii_shutdown(struct net_device *dev)
-{
-       struct fec_enet_private *fep = netdev_priv(dev);
-       const struct fec_platform_info *fpi = fep->fpi;
-
-       if (!fpi->use_mdio || fep->phy == NULL)
-               return;
-
-       if (fep->phy->shutdown == NULL)
-               return;
-
-       (*fep->phy->shutdown) (dev);
-}
-
-void fec_mii_ack_int(struct net_device *dev)
-{
-       struct fec_enet_private *fep = netdev_priv(dev);
-       const struct fec_platform_info *fpi = fep->fpi;
-
-       if (!fpi->use_mdio || fep->phy == NULL)
-               return;
-
-       if (fep->phy->ack_int == NULL)
-               return;
-
-       (*fep->phy->ack_int) (dev);
-}
-
-/* helper function */
-static int mii_negotiated(struct mii_if_info *mii)
-{
-       int advert, lpa, val;
-
-       if (!mii_link_ok(mii))
-               return 0;
-
-       val = (*mii->mdio_read) (mii->dev, mii->phy_id, MII_BMSR);
-       if ((val & BMSR_ANEGCOMPLETE) == 0)
-               return 0;
-
-       advert = (*mii->mdio_read) (mii->dev, mii->phy_id, MII_ADVERTISE);
-       lpa = (*mii->mdio_read) (mii->dev, mii->phy_id, MII_LPA);
-
-       return mii_nway_result(advert & lpa);
-}
-
-void fec_mii_link_status_change_check(struct net_device *dev, int init_media)
-{
-       struct fec_enet_private *fep = netdev_priv(dev);
-       unsigned int media;
-       unsigned long flags;
-
-       if (mii_check_media(&fep->mii_if, netif_msg_link(fep), init_media) == 0)
-               return;
-
-       media = mii_negotiated(&fep->mii_if);
-
-       if (netif_carrier_ok(dev)) {
-               spin_lock_irqsave(&fep->lock, flags);
-               fec_restart(dev, !!(media & ADVERTISE_FULL),
-                           (media & (ADVERTISE_100FULL | ADVERTISE_100HALF)) ?
-                           100 : 10);
-               spin_unlock_irqrestore(&fep->lock, flags);
-
-               netif_start_queue(dev);
-       } else {
-               netif_stop_queue(dev);
-
-               spin_lock_irqsave(&fep->lock, flags);
-               fec_stop(dev);
-               spin_unlock_irqrestore(&fep->lock, flags);
-
-       }
-}
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/netdump.c b/drivers/net/netdump.c
deleted file mode 100644 (file)
index 3ebea07..0000000
+++ /dev/null
@@ -1,534 +0,0 @@
-/*
- *  linux/drivers/net/netdump.c
- *
- *  Copyright (C) 2001  Ingo Molnar <mingo@redhat.com>
- *  Copyright (C) 2002  Red Hat, Inc.
- *  Copyright (C) 2004  Red Hat, Inc.
- *
- *  This file contains the implementation of an IRQ-safe, crash-safe
- *  kernel console implementation that outputs kernel messages to the
- *  network.
- *
- * Modification history:
- *
- * 2001-09-17    started by Ingo Molnar.
- * 2002-03-14    simultaneous syslog packet option by Michael K. Johnson
- * 2004-04-07    port to 2.6 netpoll facility by Dave Anderson and Jeff Moyer.
- */
-#include <linux/mm.h>
-#include <linux/init.h>
-#include <linux/delay.h>
-#include <linux/random.h>
-#include <linux/reboot.h>
-#include <linux/module.h>
-#include <linux/moduleparam.h>
-#include <asm/unaligned.h>
-#include <asm/pgtable.h>
-#include <linux/console.h>
-#include <linux/smp_lock.h>
-#include <linux/elf.h>
-#include <linux/preempt.h>
-
-#include "netdump.h"
-#include <linux/netpoll.h>
-
-/*
- *  prototypes.
- */
-void netdump_rx(struct netpoll *np, short source, char *data, int dlen);
-static void send_netdump_msg(struct netpoll *np, const char *msg, unsigned int msg_len, reply_t *reply);
-static void send_netdump_mem(struct netpoll *np, req_t *req);
-static void netdump_startup_handshake(struct netpoll *np);
-static void netpoll_netdump(struct pt_regs *regs);
-static void netpoll_start_netdump(struct pt_regs *regs);
-
-
-#include <asm/netdump.h>
-
-
-#undef Dprintk
-#define DEBUG 0
-#if DEBUG
-# define Dprintk(x...) printk(KERN_INFO x)
-#else
-# define Dprintk(x...)
-#endif
-
-MODULE_AUTHOR("Maintainer: Dave Anderson <anderson@redhat.com>");
-MODULE_DESCRIPTION("Network kernel crash dump module");
-MODULE_LICENSE("GPL");
-
-static char config[256];
-module_param_string(netdump, config, 256, 0);
-MODULE_PARM_DESC(netdump, 
-     " netdump=[src-port]@[src-ip]/[dev],[tgt-port]@<tgt-ip>/[tgt-macaddr]\n");
-
-static u32 magic1, magic2;
-module_param(magic1, uint, 000);
-module_param(magic2, uint, 000);
-
-static struct netpoll np = {
-       .name = "netdump",
-       .dev_name = "eth0",
-       .local_port = 6666,
-       .remote_port = 6666,
-       .remote_mac = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-       .rx_hook = netdump_rx,
-       .dump_func = netpoll_start_netdump,
-};
-
-
-/*
- * NOTE: security depends on the trusted path between the netconsole
- *       server and netconsole client, since none of the packets are
- *       encrypted. The random magic number protects the protocol
- *       against spoofing.
- */
-static u64 netdump_magic;
-
-static spinlock_t req_lock = SPIN_LOCK_UNLOCKED;
-static int nr_req = 0;
-static LIST_HEAD(request_list);
-
-static unsigned long long t0, jiffy_cycles;
-void *netdump_stack;
-
-
-static void update_jiffies(void)
-{
-       static unsigned long long prev_tick;
-       platform_timestamp(t0);
-
-       /* maintain jiffies in a polling fashion, based on rdtsc. */
-       if (t0 - prev_tick >= jiffy_cycles) {
-               prev_tick += jiffy_cycles;
-               jiffies++;
-       }
-}
-
-static void add_new_req(req_t *req)
-{
-       unsigned long flags;
-
-       spin_lock_irqsave(&req_lock, flags);
-       list_add_tail(&req->list, &request_list);
-       nr_req++;
-       Dprintk("pending requests: %d.\n", nr_req);
-       spin_unlock_irqrestore(&req_lock, flags);
-}
-
-static req_t *get_new_req(void)
-{
-       req_t *req = NULL;
-       unsigned long flags;
-
-       update_jiffies();
-
-       spin_lock_irqsave(&req_lock, flags);
-       if (nr_req) {
-               req = list_entry(request_list.next, req_t, list);
-               list_del(&req->list);
-               nr_req--;
-       }
-       spin_unlock_irqrestore(&req_lock, flags);
-
-       return req;
-}
-
-static req_t *alloc_req(void)
-{
-       req_t *req;
-
-       req = (req_t *) kmalloc(sizeof(*req), GFP_ATOMIC);
-       return req;
-}
-
-static inline void print_status (req_t *req)
-{
-       static int count = 0;
-       static int prev_jiffies = 0;
-
-       if (jiffies/HZ != prev_jiffies/HZ) {
-               prev_jiffies = jiffies;
-               count++;
-               switch (count & 3) {
-                       case 0: printk("%d(%ld)/\r", nr_req, jiffies); break;
-                       case 1: printk("%d(%ld)|\r", nr_req, jiffies); break;
-                       case 2: printk("%d(%ld)\\\r", nr_req, jiffies); break;
-                       case 3: printk("%d(%ld)-\r", nr_req, jiffies); break;
-               }
-       }
-}
-
-void netdump_rx(struct netpoll *np, short source, char *data, int dlen)
-{
-       req_t *req, *__req = (req_t *)data;
-
-       if (!netdump_mode)
-               return;
-#if DEBUG
-       {
-               static int packet_count;
-               Dprintk("        %d\r", ++packet_count);
-       }
-#endif
-
-       if (dlen < NETDUMP_REQ_SIZE) {
-               Dprintk("... netdump_rx: len not ok.\n");
-               return;
-       }
-
-       req = alloc_req();
-       if (!req) {
-               printk("no more RAM to allocate request - dropping it.\n");
-               return;
-       }
-
-       req->magic = ntohl(__req->magic);
-       req->command = ntohl(__req->command);
-       req->from = ntohl(__req->from);
-       req->to = ntohl(__req->to);
-       req->nr = ntohl(__req->nr);
-
-       Dprintk("... netdump magic:   %08Lx.\n", req->magic);
-       Dprintk("... netdump command: %08x.\n", req->command);
-       Dprintk("... netdump from:    %08x.\n", req->from);
-       Dprintk("... netdump to:      %08x.\n", req->to);
-
-       add_new_req(req);
-       return;
-}
-
-#define MAX_MSG_LEN HEADER_LEN + 1024
-
-static void send_netdump_msg(struct netpoll *np, const char *msg, unsigned int msg_len, reply_t *reply)
-{
-       /* max len should be 1024 + HEADER_LEN */
-       static unsigned char netpoll_msg[MAX_MSG_LEN + 1];
-
-       if (msg_len + HEADER_LEN > MAX_MSG_LEN + 1) {
-               printk("CODER ERROR!!! msg_len %ud too big for send msg\n",
-                      msg_len);
-               for (;;) local_irq_disable();
-               /* NOTREACHED */
-       }
-
-       netpoll_msg[0] = NETDUMP_VERSION;
-       put_unaligned(htonl(reply->nr), (u32 *) (&netpoll_msg[1]));
-       put_unaligned(htonl(reply->code), (u32 *) (&netpoll_msg[5]));
-       put_unaligned(htonl(reply->info), (u32 *) (&netpoll_msg[9]));
-       memcpy(&netpoll_msg[HEADER_LEN], msg, msg_len);
-
-       netpoll_send_udp(np, netpoll_msg, HEADER_LEN + msg_len);
-}
-
-static void send_netdump_mem(struct netpoll *np, req_t *req)
-{
-       int i;
-       char *kaddr;
-       char str[1024];
-       struct page *page;
-       unsigned long nr = req->from;
-       int nr_chunks = PAGE_SIZE/1024;
-       reply_t reply;
-       
-       Dprintk(" ... send_netdump_mem\n");
-       reply.nr = req->nr;
-       reply.info = 0;
-       if (req->from >= platform_max_pfn()) {
-               sprintf(str, "page %08lx is bigger than max page # %08lx!\n", 
-                       nr, platform_max_pfn());
-               reply.code = REPLY_ERROR;
-               send_netdump_msg(np, str, strlen(str), &reply);
-               return;
-       }
-       if (page_is_ram(nr))
-               page = pfn_to_page(nr);
-       else
-               page = ZERO_PAGE(0);
-
-       kaddr = (char *)kmap_atomic(page, KM_NETDUMP);
-
-       for (i = 0; i < nr_chunks; i++) {
-               unsigned int offset = i*1024;
-               reply.code = REPLY_MEM;
-               reply.info = offset;
-               Dprintk(" ... send_netdump_mem: sending message\n");
-               send_netdump_msg(np, kaddr + offset, 1024, &reply);
-               Dprintk(" ... send_netdump_mem: sent message\n");
-       }
-
-       kunmap_atomic(kaddr, KM_NETDUMP);
-       Dprintk(" ... send_netdump_mem: returning\n");
-}
-
-/*
- * This function waits for the client to acknowledge the receipt
- * of the netdump startup reply, with the possibility of packets
- * getting lost. We resend the startup packet if no ACK is received,
- * after a 1 second delay.
- *
- * (The client can test the success of the handshake via the HELLO
- * command, and send ACKs until we enter netdump mode.)
- */
-static void netdump_startup_handshake(struct netpoll *np)
-{
-       char tmp[200];
-       reply_t reply;
-       req_t *req = NULL;
-       int i;
-
-repeat:
-       sprintf(tmp, "NETDUMP start, waiting for start-ACK.\n");
-       reply.code = REPLY_START_NETDUMP;
-       reply.nr = 0;
-       reply.info = 0;
-
-       send_netdump_msg(np, tmp, strlen(tmp), &reply);
-
-       for (i = 0; i < 10000; i++) {
-               // wait 1 sec.
-               udelay(100);
-               Dprintk("handshake: polling controller ...\n");
-               netpoll_poll(np);
-               req = get_new_req();
-               if (req)
-                       break;
-       }
-       if (!req)
-               goto repeat;
-       if (req->command != COMM_START_NETDUMP_ACK) {
-               kfree(req);
-               goto repeat;
-       }
-       kfree(req);
-
-       printk("NETDUMP START!\n");
-}
-
-static char cpus_frozen[NR_CPUS] = { 0 }; 
-
-static void freeze_cpu (void * dummy)
-{
-       cpus_frozen[smp_processor_id()] = 1;
-       for (;;) local_irq_disable();
-}
-
-static void netpoll_start_netdump(struct pt_regs *regs)
-{
-       int i;
-       unsigned long flags;
-
-       /*
-        *  The netdump code is not re-entrant for several reasons.  Most
-        *  immediately, we will switch to the base of our stack and 
-        *  overwrite all of our call history.
-        */
-       if (netdump_mode) {
-               printk(KERN_ERR
-               "netpoll_start_netdump: called recursively.  rebooting.\n");
-               mdelay(3000);
-               machine_restart(NULL);
-       }
-       netdump_mode = 1;
-
-       local_irq_save(flags);
-       preempt_disable();
-
-       smp_call_function(freeze_cpu, NULL, 1, -1);
-       mdelay(3000);
-       for (i = 0; i < NR_CPUS; i++) {
-               if (cpus_frozen[i])
-                       printk("CPU#%d is frozen.\n", i);
-               else if (i == smp_processor_id())
-                       printk("CPU#%d is executing netdump.\n", i);
-       }
-
-       /*
-        *  Some platforms may want to execute netdump on its own stack.
-        */
-       platform_start_netdump(netdump_stack, regs);
-
-       preempt_enable_no_resched();
-       local_irq_restore(flags);
-       return;
-}
-
-static void netpoll_netdump(struct pt_regs *regs)
-{
-       reply_t reply;
-       char tmp[200];
-       struct pt_regs myregs;
-       req_t *req;
-
-       /*
-        * Just in case we are crashing within the networking code
-        * ... attempt to fix up.
-        */
-       netpoll_reset_locks(&np);
-       platform_fix_regs();
-       platform_timestamp(t0);
-       netpoll_set_trap(1); /* bypass networking stack */
-
-       printk("< netdump activated - performing handshake with the server. >\n");
-       netdump_startup_handshake(&np);
-
-       printk("< handshake completed - listening for dump requests. >\n");
-
-       while (netdump_mode) {
-               local_irq_disable();
-               Dprintk("main netdump loop: polling controller ...\n");
-               netpoll_poll(&np);
-
-               req = get_new_req();
-               if (!req)
-                       continue;
-
-               Dprintk("got new req, command %d.\n", req->command);
-               print_status(req);
-               switch (req->command) {
-               case COMM_NONE:
-                       Dprintk("got NO command.\n");
-                       break;
-
-               case COMM_SEND_MEM:
-                       Dprintk("got MEM command.\n");
-                       send_netdump_mem(&np, req);
-                       break;
-
-               case COMM_EXIT:
-                       Dprintk("got EXIT command.\n");
-                       netdump_mode = 0;
-                       netpoll_set_trap(0);
-                       break;
-
-               case COMM_REBOOT:
-                       Dprintk("got REBOOT command.\n");
-                       printk("netdump: rebooting in 3 seconds.\n");
-                       mdelay(3000);
-                       machine_restart(NULL);
-                       break;
-
-               case COMM_HELLO:
-                       sprintf(tmp, "Hello, this is netdump version 0.%02d\n",
-                               NETDUMP_VERSION);
-                       reply.code = REPLY_HELLO;
-                       reply.nr = req->nr;
-                       reply.info = NETDUMP_VERSION;
-                       send_netdump_msg(&np, tmp, strlen(tmp), &reply);
-                       break;
-
-               case COMM_GET_PAGE_SIZE:
-                       sprintf(tmp, "PAGE_SIZE: %ld\n", PAGE_SIZE);
-                       reply.code = REPLY_PAGE_SIZE;
-                       reply.nr = req->nr;
-                       reply.info = PAGE_SIZE;
-                       send_netdump_msg(&np, tmp, strlen(tmp), &reply);
-                       break;
-
-               case COMM_GET_REGS:
-               {
-                       char *tmp2 = tmp;
-                       elf_gregset_t elf_regs;
-
-                       reply.code = REPLY_REGS;
-                       reply.nr = req->nr;
-                       reply.info = platform_max_pfn();
-                       tmp2 = tmp + sprintf(tmp, "Sending register info.\n");
-                       ELF_CORE_COPY_REGS(elf_regs, (&myregs));
-                       memcpy(tmp2, &elf_regs, sizeof(elf_regs));
-                       Dprintk("netdump: sending regs\n");
-                       send_netdump_msg(&np, tmp, 
-                               strlen(tmp) + sizeof(elf_regs), &reply);
-                       Dprintk("netdump: sent regs\n");
-                       break;
-               }
-
-               case COMM_GET_NR_PAGES:
-                       reply.code = REPLY_NR_PAGES;
-                       reply.nr = req->nr;
-                       reply.info = platform_max_pfn();
-                       sprintf(tmp, 
-                               "Number of pages: %ld\n", platform_max_pfn());
-                       send_netdump_msg(&np, tmp, strlen(tmp), &reply);
-                       break;
-
-               case COMM_SHOW_STATE:
-                       /* send response first */
-                       reply.code = REPLY_SHOW_STATE;
-                       reply.nr = req->nr;
-                       reply.info = 0;
-
-                       send_netdump_msg(&np, tmp, strlen(tmp), &reply);
-
-                       netdump_mode = 0;
-                       if (regs)
-                               show_regs(regs);
-                       show_state();
-                       show_mem();
-                       netdump_mode = 1;
-                       break;
-
-               default:
-                       reply.code = REPLY_ERROR;
-                       reply.nr = req->nr;
-                       reply.info = req->command;
-                       Dprintk("got UNKNOWN command!\n");
-                       sprintf(tmp, "Got unknown command code %d!\n", 
-                               req->command);
-                       send_netdump_msg(&np, tmp, strlen(tmp), &reply);
-                       break;
-               }
-               kfree(req);
-               req = NULL;
-       }
-       sprintf(tmp, "NETDUMP end.\n");
-       reply.code = REPLY_END_NETDUMP;
-       reply.nr = 0;
-       reply.info = 0;
-       send_netdump_msg(&np, tmp, strlen(tmp), &reply);
-       printk("NETDUMP END!\n");
-}
-
-static int option_setup(char *opt)
-{
-       return !netpoll_parse_options(&np, opt);
-}
-
-__setup("netdump=", option_setup);
-
-static int init_netdump(void)
-{
-       int configured = 0;
-
-       if (strlen(config))
-               configured = option_setup(config);
-
-       if (!configured) {
-               printk(KERN_ERR "netdump: not configured, aborting\n");
-               return -EINVAL;
-       }
-
-       if (netpoll_setup(&np))
-               return -EINVAL;
-
-       if (magic1 || magic2)
-               netdump_magic = magic1 + (((u64)magic2)<<32);
-
-       /*
-        *  Allocate a separate stack for netdump.
-        */
-       platform_init_stack(&netdump_stack);
-
-       printk(KERN_INFO "netdump: network crash dump enabled\n");
-       return 0;
-}
-
-static void cleanup_netdump(void)
-{
-       netpoll_cleanup(&np);
-       platform_cleanup_stack(netdump_stack);
-}
-
-module_init(init_netdump);
-module_exit(cleanup_netdump);
diff --git a/drivers/net/netdump.h b/drivers/net/netdump.h
deleted file mode 100644 (file)
index cc3100e..0000000
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- *  linux/drivers/net/netdump.h
- *
- *  Copyright (C) 2001  Ingo Molnar <mingo@redhat.com>
- *
- *  This file contains the implementation of an IRQ-safe, crash-safe
- *  kernel console implementation that outputs kernel messages to the
- *  network.
- *
- * Modification history:
- *
- * 2001-09-17    started by Ingo Molnar.
- */
-
-/****************************************************************
- *      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 NETDUMP_VERSION 0x04
-
-enum netdump_commands {
-       COMM_NONE = 0,
-       COMM_SEND_MEM = 1,
-       COMM_EXIT = 2,
-       COMM_REBOOT = 3,
-       COMM_HELLO = 4,
-       COMM_GET_NR_PAGES = 5,
-       COMM_GET_PAGE_SIZE = 6,
-       COMM_START_NETDUMP_ACK = 7,
-       COMM_GET_REGS = 8,
-       COMM_SHOW_STATE = 9,
-};
-
-#define NETDUMP_REQ_SIZE (8+4*4)
-
-typedef struct netdump_req_s {
-       u64 magic;
-       u32 nr;
-       u32 command;
-       u32 from;
-       u32 to;
-       struct list_head list; 
-} req_t;
-
-enum netdump_replies {
-       REPLY_NONE = 0,
-       REPLY_ERROR = 1,
-       REPLY_LOG = 2,
-       REPLY_MEM = 3,
-       REPLY_RESERVED = 4,
-       REPLY_HELLO = 5,
-       REPLY_NR_PAGES = 6,
-       REPLY_PAGE_SIZE = 7,
-       REPLY_START_NETDUMP = 8,
-       REPLY_END_NETDUMP = 9,
-       REPLY_REGS = 10,
-       REPLY_MAGIC = 11,
-       REPLY_SHOW_STATE = 12,
-};
-
-typedef struct netdump_reply_s {
-       u32 nr;
-       u32 code;
-       u32 info;
-} reply_t;
-
-#define HEADER_LEN (1 + sizeof(reply_t))
-
diff --git a/drivers/net/smc91x.c b/drivers/net/smc91x.c
deleted file mode 100644 (file)
index 85fae09..0000000
+++ /dev/null
@@ -1,2172 +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/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++;
-
-       if (tx_status & TS_LATCOL) {
-               PRINTK("%s: late collision occurred on last xmit\n", dev->name);
-               lp->stats.tx_window_errors++;
-               if (!(lp->stats.tx_window_errors & 63) && net_ratelimit()) {
-                       printk(KERN_INFO "%s: unexpectedly large numbers of "
-                              "late collisions. Please check duplex "
-                              "setting.\n", dev->name);
-               }
-       }
-
-       /* kill the packet */
-       SMC_WAIT_MMU_BUSY();
-       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/smc91x.h b/drivers/net/smc91x.h
deleted file mode 100644 (file)
index 7679022..0000000
+++ /dev/null
@@ -1,866 +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_REDWOOD_5) || defined(CONFIG_REDWOOD_6)
-
-/* 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
-
-#define SMC_IO_SHIFT           0
-
-#define SMC_inw(a, r)          in_be16((volatile u16 *)((a) + (r)))
-#define SMC_outw(v, a, r)      out_be16((volatile u16 *)((a) + (r)), v)
-#define SMC_insw(a, r, p, l)                                           \
-       do {                                                            \
-               unsigned long __port = (a) + (r);                       \
-               u16 *__p = (u16 *)(p);                                  \
-               int __l = (l);                                          \
-               insw(__port, __p, __l);                                 \
-               while (__l > 0) {                                       \
-                       *__p = swab16(*__p);                            \
-                       __p++;                                          \
-                       __l--;                                          \
-               }                                                       \
-       } while (0)
-#define SMC_outsw(a, r, p, l)                                          \
-       do {                                                            \
-               unsigned long __port = (a) + (r);                       \
-               u16 *__p = (u16 *)(p);                                  \
-               int __l = (l);                                          \
-               while (__l > 0) {                                       \
-                       /* Believe it or not, the swab isn't needed. */ \
-                       outw( /* swab16 */ (*__p++), __port);           \
-                       __l--;                                          \
-               }                                                       \
-       } while (0)
-#define set_irq_type(irq, type)
-
-#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/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/pcmcia/pd6729.c b/drivers/pcmcia/pd6729.c
deleted file mode 100644 (file)
index 694e13f..0000000
+++ /dev/null
@@ -1,732 +0,0 @@
-/*
- * Driver for the Cirrus PD6729 PCI-PCMCIA bridge.
- *
- * Based on the i82092.c driver.
- *
- * This software may be used and distributed according to the terms of
- * the GNU General Public License, incorporated herein by reference.
- */
-
-#include <linux/kernel.h>
-#include <linux/config.h>
-#include <linux/module.h>
-#include <linux/pci.h>
-#include <linux/init.h>
-#include <linux/workqueue.h>
-#include <linux/interrupt.h>
-#include <linux/device.h>
-
-#include <pcmcia/cs_types.h>
-#include <pcmcia/ss.h>
-#include <pcmcia/cs.h>
-
-#include <asm/system.h>
-#include <asm/io.h>
-
-#include "pd6729.h"
-#include "i82365.h"
-#include "cirrus.h"
-
-MODULE_LICENSE("GPL");
-
-#define MAX_SOCKETS 2
-
-/* simple helper functions */
-/* External clock time, in nanoseconds.  120 ns = 8.33 MHz */
-#define to_cycles(ns)  ((ns)/120)
-
-static spinlock_t port_lock = SPIN_LOCK_UNLOCKED;
-
-/* basic value read/write functions */
-
-static unsigned char indirect_read(struct pd6729_socket *socket, unsigned short reg)
-{
-       unsigned long port;
-       unsigned char val;
-       unsigned long flags;
-
-       spin_lock_irqsave(&port_lock, flags);
-       reg += socket->number * 0x40;
-       port = socket->io_base;
-       outb(reg, port);
-       val = inb(port + 1);
-       spin_unlock_irqrestore(&port_lock, flags);
-
-       return val;
-}
-
-static unsigned short indirect_read16(struct pd6729_socket *socket, unsigned short reg)
-{
-       unsigned long port;
-       unsigned short tmp;
-       unsigned long flags;
-
-       spin_lock_irqsave(&port_lock, flags);
-       reg  = reg + socket->number * 0x40;
-       port = socket->io_base;
-       outb(reg, port);
-       tmp = inb(port + 1);
-       reg++;
-       outb(reg, port);
-       tmp = tmp | (inb(port + 1) << 8);
-       spin_unlock_irqrestore(&port_lock, flags);
-
-       return tmp;
-}
-
-static void indirect_write(struct pd6729_socket *socket, unsigned short reg, unsigned char value)
-{
-       unsigned long port;
-       unsigned long flags;
-
-       spin_lock_irqsave(&port_lock, flags);
-       reg = reg + socket->number * 0x40;
-       port = socket->io_base;
-       outb(reg, port);
-       outb(value, port + 1);
-       spin_unlock_irqrestore(&port_lock, flags);
-}
-
-static void indirect_setbit(struct pd6729_socket *socket, unsigned short reg, unsigned char mask)
-{
-       unsigned long port;
-       unsigned char val;
-       unsigned long flags;
-
-       spin_lock_irqsave(&port_lock, flags);
-       reg = reg + socket->number * 0x40;
-       port = socket->io_base;
-       outb(reg, port);
-       val = inb(port + 1);
-       val |= mask;
-       outb(reg, port);
-       outb(val, port + 1);
-       spin_unlock_irqrestore(&port_lock, flags);
-}
-
-static void indirect_resetbit(struct pd6729_socket *socket, unsigned short reg, unsigned char mask)
-{
-       unsigned long port;
-       unsigned char val;
-       unsigned long flags;
-
-       spin_lock_irqsave(&port_lock, flags);
-       reg = reg + socket->number * 0x40;
-       port = socket->io_base;
-       outb(reg, port);
-       val = inb(port + 1);
-       val &= ~mask;
-       outb(reg, port);
-       outb(val, port + 1);
-       spin_unlock_irqrestore(&port_lock, flags);
-}
-
-static void indirect_write16(struct pd6729_socket *socket, unsigned short reg, unsigned short value)
-{
-       unsigned long port;
-       unsigned char val;
-       unsigned long flags;
-
-       spin_lock_irqsave(&port_lock, flags);
-       reg = reg + socket->number * 0x40;
-       port = socket->io_base;
-
-       outb(reg, port);
-       val = value & 255;
-       outb(val, port + 1);
-
-       reg++;
-
-       outb(reg, port);
-       val = value >> 8;
-       outb(val, port + 1);
-       spin_unlock_irqrestore(&port_lock, flags);
-}
-
-/* Interrupt handler functionality */
-
-static irqreturn_t pd6729_interrupt(int irq, void *dev, struct pt_regs *regs)
-{
-       struct pd6729_socket *socket = (struct pd6729_socket *)dev;
-       int i;
-       int loopcount = 0;
-       int handled = 0;
-       unsigned int events, active = 0;
-
-       while (1) {
-               loopcount++;
-               if (loopcount > 20) {
-                       printk(KERN_ERR "pd6729: infinite eventloop in interrupt\n");
-                       break;
-               }
-
-               active = 0;
-
-               for (i = 0; i < MAX_SOCKETS; i++) {
-                       unsigned int csc;
-
-                       /* card status change register */
-                       csc = indirect_read(&socket[i], I365_CSC);
-                       if (csc == 0)  /* no events on this socket */
-                               continue;
-
-                       handled = 1;
-                       events = 0;
-
-                       if (csc & I365_CSC_DETECT) {
-                               events |= SS_DETECT;
-                               dprintk("Card detected in socket %i!\n", i);
-                       }
-
-                       if (indirect_read(&socket[i], I365_INTCTL) & I365_PC_IOCARD) {
-                               /* For IO/CARDS, bit 0 means "read the card" */
-                               events |= (csc & I365_CSC_STSCHG) ? SS_STSCHG : 0;
-                       } else {
-                               /* Check for battery/ready events */
-                               events |= (csc & I365_CSC_BVD1) ? SS_BATDEAD : 0;
-                               events |= (csc & I365_CSC_BVD2) ? SS_BATWARN : 0;
-                               events |= (csc & I365_CSC_READY) ? SS_READY : 0;
-                       }
-
-                       if (events) {
-                               pcmcia_parse_events(&socket[i].socket, events);
-                       }
-                       active |= events;
-               }
-
-               if (active == 0) /* no more events to handle */
-                       break;
-       }
-       return IRQ_RETVAL(handled);
-}
-
-/* socket functions */
-
-static void set_bridge_state(struct pd6729_socket *socket)
-{
-       indirect_write(socket, I365_GBLCTL, 0x00);
-       indirect_write(socket, I365_GENCTL, 0x00);
-
-       indirect_setbit(socket, I365_INTCTL, 0x08);
-}
-
-static int pd6729_get_status(struct pcmcia_socket *sock, u_int *value)
-{
-       struct pd6729_socket *socket = container_of(sock, struct pd6729_socket, socket);
-       unsigned int status;
-       unsigned int data;
-       struct pd6729_socket *t;
-
-       /* Interface Status Register */
-       status = indirect_read(socket, I365_STATUS);
-       *value = 0;
-
-       if ((status & I365_CS_DETECT) == I365_CS_DETECT) {
-               *value |= SS_DETECT;
-       }
-
-       /* IO cards have a different meaning of bits 0,1 */
-       /* Also notice the inverse-logic on the bits */
-       if (indirect_read(socket, I365_INTCTL) & I365_PC_IOCARD) {
-               /* IO card */
-               if (!(status & I365_CS_STSCHG))
-                       *value |= SS_STSCHG;
-       } else {
-               /* non I/O card */
-               if (!(status & I365_CS_BVD1))
-                       *value |= SS_BATDEAD;
-               if (!(status & I365_CS_BVD2))
-                       *value |= SS_BATWARN;
-       }
-
-       if (status & I365_CS_WRPROT)
-               *value |= SS_WRPROT;    /* card is write protected */
-
-       if (status & I365_CS_READY)
-               *value |= SS_READY;     /* card is not busy */
-
-       if (status & I365_CS_POWERON)
-               *value |= SS_POWERON;   /* power is applied to the card */
-
-       t = (socket->number) ? socket : socket + 1;
-       indirect_write(t, PD67_EXT_INDEX, PD67_EXTERN_DATA);
-       data = indirect_read16(t, PD67_EXT_DATA);
-       *value |= (data & PD67_EXD_VS1(socket->number)) ? 0 : SS_3VCARD;
-
-       return 0;
-}
-
-
-static int pd6729_get_socket(struct pcmcia_socket *sock, socket_state_t *state)
-{
-       struct pd6729_socket *socket = container_of(sock, struct pd6729_socket, socket);
-       unsigned char reg, vcc, vpp;
-
-       state->flags    = 0;
-       state->Vcc      = 0;
-       state->Vpp      = 0;
-       state->io_irq   = 0;
-       state->csc_mask = 0;
-
-       /* First the power status of the socket */
-       /* PCTRL - Power Control Register */
-       reg = indirect_read(socket, I365_POWER);
-
-       if (reg & I365_PWR_AUTO)
-               state->flags |= SS_PWR_AUTO;  /* Automatic Power Switch */
-
-       if (reg & I365_PWR_OUT)
-               state->flags |= SS_OUTPUT_ENA; /* Output signals are enabled */
-
-       vcc = reg & I365_VCC_MASK;    vpp = reg & I365_VPP1_MASK;
-
-       if (reg & I365_VCC_5V) {
-               state->Vcc = (indirect_read(socket, PD67_MISC_CTL_1) &
-                       PD67_MC1_VCC_3V) ? 33 : 50;
-
-               if (vpp == I365_VPP1_5V) {
-                       if (state->Vcc == 50)
-                               state->Vpp = 50;
-                       else
-                               state->Vpp = 33;
-               }
-               if (vpp == I365_VPP1_12V)
-                       state->Vpp = 120;
-       }
-
-       /* Now the IO card, RESET flags and IO interrupt */
-       /* IGENC, Interrupt and General Control */
-       reg = indirect_read(socket, I365_INTCTL);
-
-       if ((reg & I365_PC_RESET) == 0)
-               state->flags |= SS_RESET;
-       if (reg & I365_PC_IOCARD)
-               state->flags |= SS_IOCARD; /* This is an IO card */
-
-       /* Set the IRQ number */
-       state->io_irq = socket->socket.pci_irq;
-
-       /* Card status change */
-       /* CSCICR, Card Status Change Interrupt Configuration */
-       reg = indirect_read(socket, I365_CSCINT);
-
-       if (reg & I365_CSC_DETECT)
-               state->csc_mask |= SS_DETECT; /* Card detect is enabled */
-
-       if (state->flags & SS_IOCARD) {/* IO Cards behave different */
-               if (reg & I365_CSC_STSCHG)
-                       state->csc_mask |= SS_STSCHG;
-       } else {
-               if (reg & I365_CSC_BVD1)
-                       state->csc_mask |= SS_BATDEAD;
-               if (reg & I365_CSC_BVD2)
-                       state->csc_mask |= SS_BATWARN;
-               if (reg & I365_CSC_READY)
-                       state->csc_mask |= SS_READY;
-       }
-
-       return 0;
-}
-
-static int pd6729_set_socket(struct pcmcia_socket *sock, socket_state_t *state)
-{
-       struct pd6729_socket *socket = container_of(sock, struct pd6729_socket, socket);
-       unsigned char reg;
-
-       /* First, set the global controller options */
-
-       set_bridge_state(socket);
-
-       /* Values for the IGENC register */
-
-       reg = 0;
-       /* The reset bit has "inverse" logic */
-       if (!(state->flags & SS_RESET))
-               reg = reg | I365_PC_RESET;
-       if (state->flags & SS_IOCARD)
-               reg = reg | I365_PC_IOCARD;
-
-       /* IGENC, Interrupt and General Control Register */
-       indirect_write(socket, I365_INTCTL, reg);
-
-       /* Power registers */
-
-       reg = I365_PWR_NORESET; /* default: disable resetdrv on resume */
-
-       if (state->flags & SS_PWR_AUTO) {
-               dprintk("Auto power\n");
-               reg |= I365_PWR_AUTO;   /* automatic power mngmnt */
-       }
-       if (state->flags & SS_OUTPUT_ENA) {
-               dprintk("Power Enabled\n");
-               reg |= I365_PWR_OUT;    /* enable power */
-       }
-
-       switch (state->Vcc) {
-       case 0:
-               break;
-       case 33:
-               dprintk("setting voltage to Vcc to 3.3V on socket %i\n",
-                       socket->number);
-               reg |= I365_VCC_5V;
-               indirect_setbit(socket, PD67_MISC_CTL_1, PD67_MC1_VCC_3V);
-               break;
-       case 50:
-               dprintk("setting voltage to Vcc to 5V on socket %i\n",
-                       socket->number);
-               reg |= I365_VCC_5V;
-               indirect_resetbit(socket, PD67_MISC_CTL_1, PD67_MC1_VCC_3V);
-               break;
-       default:
-               dprintk("pd6729: pd6729_set_socket called with invalid VCC power value: %i\n",
-                       state->Vcc);
-               return -EINVAL;
-       }
-
-       switch (state->Vpp) {
-       case 0:
-               dprintk("not setting Vpp on socket %i\n", socket->number);
-               break;
-       case 33:
-       case 50:
-               dprintk("setting Vpp to Vcc for socket %i\n", socket->number);
-               reg |= I365_VPP1_5V;
-               break;
-       case 120:
-               dprintk("setting Vpp to 12.0\n");
-               reg |= I365_VPP1_12V;
-               break;
-       default:
-               dprintk("pd6729: pd6729_set_socket called with invalid VPP power value: %i\n",
-                       state->Vpp);
-               return -EINVAL;
-       }
-
-       /* only write if changed */
-       if (reg != indirect_read(socket, I365_POWER))
-               indirect_write(socket, I365_POWER, reg);
-
-       /* Now, specifiy that all interrupts are to be done as PCI interrupts */
-       indirect_write(socket, PD67_EXT_INDEX, PD67_EXT_CTL_1);
-       indirect_write(socket, PD67_EXT_DATA, PD67_EC1_INV_MGMT_IRQ | PD67_EC1_INV_CARD_IRQ);
-
-       /* Enable specific interrupt events */
-
-       reg = 0x00;
-       if (state->csc_mask & SS_DETECT) {
-               reg |= I365_CSC_DETECT;
-       }
-       if (state->flags & SS_IOCARD) {
-               if (state->csc_mask & SS_STSCHG)
-                       reg |= I365_CSC_STSCHG;
-       } else {
-               if (state->csc_mask & SS_BATDEAD)
-                       reg |= I365_CSC_BVD1;
-               if (state->csc_mask & SS_BATWARN)
-                       reg |= I365_CSC_BVD2;
-               if (state->csc_mask & SS_READY)
-                       reg |= I365_CSC_READY;
-       }
-       reg |= 0x30;    /* management IRQ: PCI INTA# = "irq 3" */
-       indirect_write(socket, I365_CSCINT, reg);
-
-       reg = indirect_read(socket, I365_INTCTL);
-       reg |= 0x03;    /* card IRQ: PCI INTA# = "irq 3" */
-       indirect_write(socket, I365_INTCTL, reg);
-
-       /* now clear the (probably bogus) pending stuff by doing a dummy read */
-       (void)indirect_read(socket, I365_CSC);
-
-       return 0;
-}
-
-static int pd6729_set_io_map(struct pcmcia_socket *sock, struct pccard_io_map *io)
-{
-       struct pd6729_socket *socket = container_of(sock, struct pd6729_socket, socket);
-       unsigned char map, ioctl;
-
-       map = io->map;
-
-       /* Check error conditions */
-       if (map > 1) {
-               dprintk("pd6729_set_io_map with invalid map");
-               return -EINVAL;
-       }
-
-       /* Turn off the window before changing anything */
-       if (indirect_read(socket, I365_ADDRWIN) & I365_ENA_IO(map))
-               indirect_resetbit(socket, I365_ADDRWIN, I365_ENA_IO(map));
-
-/*     dprintk("set_io_map: Setting range to %x - %x\n", io->start, io->stop);*/
-
-       /* write the new values */
-       indirect_write16(socket, I365_IO(map)+I365_W_START, io->start);
-       indirect_write16(socket, I365_IO(map)+I365_W_STOP, io->stop);
-
-       ioctl = indirect_read(socket, I365_IOCTL) & ~I365_IOCTL_MASK(map);
-
-       if (io->flags & MAP_0WS) ioctl |= I365_IOCTL_0WS(map);
-       if (io->flags & MAP_16BIT) ioctl |= I365_IOCTL_16BIT(map);
-       if (io->flags & MAP_AUTOSZ) ioctl |= I365_IOCTL_IOCS16(map);
-
-       indirect_write(socket, I365_IOCTL, ioctl);
-
-       /* Turn the window back on if needed */
-       if (io->flags & MAP_ACTIVE)
-               indirect_setbit(socket, I365_ADDRWIN, I365_ENA_IO(map));
-
-       return 0;
-}
-
-static int pd6729_set_mem_map(struct pcmcia_socket *sock, struct pccard_mem_map *mem)
-{
-       struct pd6729_socket *socket = container_of(sock, struct pd6729_socket, socket);
-       unsigned short base, i;
-       unsigned char map;
-
-       map = mem->map;
-       if (map > 4) {
-               printk("pd6729_set_mem_map: invalid map");
-               return -EINVAL;
-       }
-
-       if ((mem->sys_start > mem->sys_stop) || (mem->speed > 1000)) {
-               printk("pd6729_set_mem_map: invalid address / speed");
-               /* printk("invalid mem map for socket %i : %lx to %lx with a start of %x\n",
-                        sock, mem->sys_start, mem->sys_stop, mem->card_start); */
-               return -EINVAL;
-       }
-
-       /* Turn off the window before changing anything */
-       if (indirect_read(socket, I365_ADDRWIN) & I365_ENA_MEM(map))
-               indirect_resetbit(socket, I365_ADDRWIN, I365_ENA_MEM(map));
-
-       /* write the start address */
-       base = I365_MEM(map);
-       i = (mem->sys_start >> 12) & 0x0fff;
-       if (mem->flags & MAP_16BIT)
-               i |= I365_MEM_16BIT;
-       if (mem->flags & MAP_0WS)
-               i |= I365_MEM_0WS;
-       indirect_write16(socket, base + I365_W_START, i);
-
-       /* write the stop address */
-
-       i= (mem->sys_stop >> 12) & 0x0fff;
-       switch (to_cycles(mem->speed)) {
-       case 0:
-               break;
-       case 1:
-               i |= I365_MEM_WS0;
-               break;
-       case 2:
-               i |= I365_MEM_WS1;
-               break;
-       default:
-               i |= I365_MEM_WS1 | I365_MEM_WS0;
-               break;
-       }
-
-       indirect_write16(socket, base + I365_W_STOP, i);
-
-       /* Take care of high byte */
-       indirect_write(socket, PD67_EXT_INDEX, PD67_MEM_PAGE(map));
-       indirect_write(socket, PD67_EXT_DATA, mem->sys_start >> 24);
-
-       /* card start */
-
-       i = ((mem->card_start - mem->sys_start) >> 12) & 0x3fff;
-       if (mem->flags & MAP_WRPROT)
-               i |= I365_MEM_WRPROT;
-       if (mem->flags & MAP_ATTRIB) {
-/*             dprintk("requesting attribute memory for socket %i\n",
-                       socket->number);*/
-               i |= I365_MEM_REG;
-       } else {
-/*             dprintk("requesting normal memory for socket %i\n",
-                       socket->number);*/
-       }
-       indirect_write16(socket, base + I365_W_OFF, i);
-
-       /* Enable the window if necessary */
-       if (mem->flags & MAP_ACTIVE)
-               indirect_setbit(socket, I365_ADDRWIN, I365_ENA_MEM(map));
-
-       return 0;
-}
-
-static int pd6729_suspend(struct pcmcia_socket *sock)
-{
-       return pd6729_set_socket(sock, &dead_socket);
-}
-
-static int pd6729_init(struct pcmcia_socket *sock)
-{
-       int i;
-       struct resource res = { .end = 0x0fff };
-       pccard_io_map io = { 0, 0, 0, 0, 1 };
-       pccard_mem_map mem = { .res = &res, .sys_stop = 0x0fff };
-
-       pd6729_set_socket(sock, &dead_socket);
-       for (i = 0; i < 2; i++) {
-               io.map = i;
-               pd6729_set_io_map(sock, &io);
-       }
-       for (i = 0; i < 5; i++) {
-               mem.map = i;
-               pd6729_set_mem_map(sock, &mem);
-       }
-
-       return 0;
-}
-
-
-/* the pccard structure and its functions */
-static struct pccard_operations pd6729_operations = {
-       .init                   = pd6729_init,
-       .suspend                = pd6729_suspend,
-       .get_status             = pd6729_get_status,
-       .get_socket             = pd6729_get_socket,
-       .set_socket             = pd6729_set_socket,
-       .set_io_map             = pd6729_set_io_map,
-       .set_mem_map            = pd6729_set_mem_map,
-};
-
-static int __devinit pd6729_pci_probe(struct pci_dev *dev, const struct pci_device_id *id)
-{
-       int i, j, ret;
-       char configbyte;
-       struct pd6729_socket *socket;
-
-       socket = kmalloc(sizeof(struct pd6729_socket) * MAX_SOCKETS, GFP_KERNEL);
-       if (!socket)
-               return -ENOMEM;
-
-       memset(socket, 0, sizeof(struct pd6729_socket) * MAX_SOCKETS);
-
-       if ((ret = pci_enable_device(dev)))
-               goto err_out_free_mem;
-
-       printk(KERN_INFO "pd6729: Cirrus PD6729 PCI to PCMCIA Bridge at 0x%lx on irq %d\n",
-               pci_resource_start(dev, 0), dev->irq);
-       printk(KERN_INFO "pd6729: configured as a %d socket device.\n", MAX_SOCKETS);
-       /* Since we have no memory BARs some firmware we may not
-          have had PCI_COMMAND_MEM enabled, yet the device needs
-          it. */
-       pci_read_config_byte(dev, PCI_COMMAND, &configbyte);
-       if (!(configbyte & PCI_COMMAND_MEMORY)) {
-               printk(KERN_DEBUG "pd6729: Enabling PCI_COMMAND_MEMORY.\n");
-               configbyte |= PCI_COMMAND_MEMORY;
-               pci_write_config_byte(dev, PCI_COMMAND, configbyte);
-       }
-
-       ret = pci_request_regions(dev, "pd6729");
-       if (ret) {
-               printk(KERN_INFO "pd6729: pci request region failed.\n");
-               goto err_out_disable;
-       }
-
-       for (i = 0; i < MAX_SOCKETS; i++) {
-               socket[i].io_base = pci_resource_start(dev, 0);
-               socket[i].socket.features |= SS_CAP_PCCARD;
-               socket[i].socket.map_size = 0x1000;
-               socket[i].socket.irq_mask = 0;
-               socket[i].socket.pci_irq  = dev->irq;
-               socket[i].socket.owner = THIS_MODULE;
-
-               socket[i].number = i;
-
-               socket[i].socket.ops = &pd6729_operations;
-               socket[i].socket.dev.dev = &dev->dev;
-               socket[i].socket.driver_data = &socket[i];
-       }
-
-       pci_set_drvdata(dev, socket);
-
-       /* Register the interrupt handler */
-       if ((ret = request_irq(dev->irq, pd6729_interrupt, SA_SHIRQ, "pd6729", socket))) {
-               printk(KERN_ERR "pd6729: Failed to register irq %d, aborting\n", dev->irq);
-               goto err_out_free_res;
-       }
-
-       for (i = 0; i < MAX_SOCKETS; i++) {
-               ret = pcmcia_register_socket(&socket[i].socket);
-               if (ret) {
-                       printk(KERN_INFO "pd6729: pcmcia_register_socket failed.\n");
-                       for (j = 0; j < i ; j++)
-                               pcmcia_unregister_socket(&socket[j].socket);
-                       goto err_out_free_res2;
-               }
-       }
-
-       return 0;
-
- err_out_free_res2:
-       free_irq(dev->irq, socket);
- err_out_free_res:
-       pci_release_regions(dev);
- err_out_disable:
-       pci_disable_device(dev);
-
- err_out_free_mem:
-       kfree(socket);
-       return ret;
-}
-
-static void __devexit pd6729_pci_remove(struct pci_dev *dev)
-{
-       int i;
-       struct pd6729_socket *socket = pci_get_drvdata(dev);
-
-       for (i = 0; i < MAX_SOCKETS; i++)
-               pcmcia_unregister_socket(&socket[i].socket);
-
-       free_irq(dev->irq, socket);
-       pci_release_regions(dev);
-       pci_disable_device(dev);
-
-       kfree(socket);
-}
-
-static int pd6729_socket_suspend(struct pci_dev *dev, u32 state)
-{
-       return pcmcia_socket_dev_suspend(&dev->dev, state);
-}
-
-static int pd6729_socket_resume(struct pci_dev *dev)
-{
-       return pcmcia_socket_dev_resume(&dev->dev);
-}
-
-static struct pci_device_id pd6729_pci_ids[] = {
-       {
-               .vendor         = PCI_VENDOR_ID_CIRRUS,
-               .device         = PCI_DEVICE_ID_CIRRUS_6729,
-               .subvendor      = PCI_ANY_ID,
-               .subdevice      = PCI_ANY_ID,
-       },
-       { }
-};
-MODULE_DEVICE_TABLE(pci, pd6729_pci_ids);
-
-static struct pci_driver pd6729_pci_drv = {
-       .name           = "pd6729",
-       .id_table       = pd6729_pci_ids,
-       .probe          = pd6729_pci_probe,
-       .remove         = __devexit_p(pd6729_pci_remove),
-       .suspend        = pd6729_socket_suspend,
-       .resume         = pd6729_socket_resume,
-};
-
-static int pd6729_module_init(void)
-{
-       return pci_module_init(&pd6729_pci_drv);
-}
-
-static void pd6729_module_exit(void)
-{
-       pci_unregister_driver(&pd6729_pci_drv);
-}
-
-module_init(pd6729_module_init);
-module_exit(pd6729_module_exit);
diff --git a/drivers/pcmcia/pd6729.h b/drivers/pcmcia/pd6729.h
deleted file mode 100644 (file)
index 9e90520..0000000
+++ /dev/null
@@ -1,28 +0,0 @@
-#ifndef _INCLUDE_GUARD_PD6729_H_
-#define _INCLUDE_GUARD_PD6729_H_
-
-/* Debuging defines */
-#ifdef NOTRACE
-#define dprintk(fmt, args...) printk(fmt , ## args)
-#else
-#define dprintk(fmt, args...) do {} while (0)
-#endif
-
-/* Flags for I365_GENCTL */
-#define I365_DF_VS1            0x40    /* DF-step Voltage Sense */
-#define I365_DF_VS2            0x80
-
-/* Fields in PD67_EXTERN_DATA */
-#define PD67_EXD_VS1(s)                (0x01 << ((s) << 1))
-#define PD67_EXD_VS2(s)                (0x02 << ((s) << 1))
-
-
-
-
-struct pd6729_socket {
-       int     number;
-       unsigned long io_base;  /* base io address of the socket */
-       struct pcmcia_socket socket;
-};
-
-#endif
diff --git a/drivers/pcmcia/socket_sysfs.c b/drivers/pcmcia/socket_sysfs.c
deleted file mode 100644 (file)
index 23288e6..0000000
+++ /dev/null
@@ -1,161 +0,0 @@
-/*
- * socket_sysfs.c -- most of socket-related sysfs output
- *
- * 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.
- *
- * (C) 2003 - 2004             Dominik Brodowski
- */
-
-#include <linux/module.h>
-#include <linux/moduleparam.h>
-#include <linux/init.h>
-#include <linux/kernel.h>
-#include <linux/config.h>
-#include <linux/string.h>
-#include <linux/major.h>
-#include <linux/errno.h>
-#include <linux/slab.h>
-#include <linux/mm.h>
-#include <linux/interrupt.h>
-#include <linux/timer.h>
-#include <linux/ioport.h>
-#include <linux/delay.h>
-#include <linux/pm.h>
-#include <linux/pci.h>
-#include <linux/device.h>
-#include <linux/suspend.h>
-#include <asm/system.h>
-#include <asm/irq.h>
-
-#define IN_CARD_SERVICES
-#include <pcmcia/version.h>
-#include <pcmcia/cs_types.h>
-#include <pcmcia/ss.h>
-#include <pcmcia/cs.h>
-#include <pcmcia/bulkmem.h>
-#include <pcmcia/cistpl.h>
-#include <pcmcia/cisreg.h>
-#include <pcmcia/ds.h>
-#include "cs_internal.h"
-
-#define to_socket(_dev) container_of(_dev, struct pcmcia_socket, dev)
-
-static ssize_t pccard_show_type(struct class_device *dev, char *buf)
-{
-       int val;
-       struct pcmcia_socket *s = to_socket(dev);
-
-       if (!(s->state & SOCKET_PRESENT))
-               return -ENODEV;
-       s->ops->get_status(s, &val);
-       if (val & SS_CARDBUS)
-               return sprintf(buf, "32-bit\n");
-       if (val & SS_DETECT)
-               return sprintf(buf, "16-bit\n");
-       return sprintf(buf, "invalid\n");
-}
-static CLASS_DEVICE_ATTR(card_type, 0400, pccard_show_type, NULL);
-
-static ssize_t pccard_show_voltage(struct class_device *dev, char *buf)
-{
-       int val;
-       struct pcmcia_socket *s = to_socket(dev);
-
-       if (!(s->state & SOCKET_PRESENT))
-               return -ENODEV;
-       s->ops->get_status(s, &val);
-       if (val & SS_3VCARD)
-               return sprintf(buf, "3.3V\n");
-       if (val & SS_XVCARD)
-               return sprintf(buf, "X.XV\n");
-       return sprintf(buf, "5.0V\n");
-}
-static CLASS_DEVICE_ATTR(card_voltage, 0400, pccard_show_voltage, NULL);
-
-static ssize_t pccard_show_vpp(struct class_device *dev, char *buf)
-{
-       struct pcmcia_socket *s = to_socket(dev);
-       if (!(s->state & SOCKET_PRESENT))
-               return -ENODEV;
-       return sprintf(buf, "%d.%dV\n", s->socket.Vpp / 10, s->socket.Vpp % 10);
-}
-static CLASS_DEVICE_ATTR(card_vpp, 0400, pccard_show_vpp, NULL);
-
-static ssize_t pccard_show_vcc(struct class_device *dev, char *buf)
-{
-       struct pcmcia_socket *s = to_socket(dev);
-       if (!(s->state & SOCKET_PRESENT))
-               return -ENODEV;
-       return sprintf(buf, "%d.%dV\n", s->socket.Vcc / 10, s->socket.Vcc % 10);
-}
-static CLASS_DEVICE_ATTR(card_vcc, 0400, pccard_show_vcc, NULL);
-
-
-static ssize_t pccard_store_insert(struct class_device *dev, const char *buf, size_t count)
-{
-       ssize_t ret;
-       struct pcmcia_socket *s = to_socket(dev);
-
-       if (!count)
-               return -EINVAL;
-
-       ret = pcmcia_insert_card(s);
-
-       return ret ? ret : count;
-}
-static CLASS_DEVICE_ATTR(card_insert, 0200, NULL, pccard_store_insert);
-
-static ssize_t pccard_store_eject(struct class_device *dev, const char *buf, size_t count)
-{
-       ssize_t ret;
-       struct pcmcia_socket *s = to_socket(dev);
-
-       if (!count)
-               return -EINVAL;
-
-       ret = pcmcia_eject_card(s);
-
-       return ret ? ret : count;
-}
-static CLASS_DEVICE_ATTR(card_eject, 0200, NULL, pccard_store_eject);
-
-
-static struct class_device_attribute *pccard_socket_attributes[] = {
-       &class_device_attr_card_type,
-       &class_device_attr_card_voltage,
-       &class_device_attr_card_vpp,
-       &class_device_attr_card_vcc,
-       &class_device_attr_card_insert,
-       &class_device_attr_card_eject,
-       NULL,
-};
-
-static int __devinit pccard_sysfs_add_socket(struct class_device *class_dev)
-{
-       struct class_device_attribute **attr;
-       int ret = 0;
-
-       for (attr = pccard_socket_attributes; *attr; attr++) {
-               ret = class_device_create_file(class_dev, *attr);
-               if (ret)
-                       break;
-       }
-
-       return ret;
-}
-
-static void __devexit pccard_sysfs_remove_socket(struct class_device *class_dev)
-{
-       struct class_device_attribute **attr;
-
-       for (attr = pccard_socket_attributes; *attr; attr++)
-               class_device_remove_file(class_dev, *attr);
-}
-
-struct class_interface pccard_sysfs_interface = {
-       .class = &pcmcia_socket_class,
-       .add = &pccard_sysfs_add_socket,
-       .remove = __devexit_p(&pccard_sysfs_remove_socket),
-};
diff --git a/drivers/s390/net/ctcdbug.c b/drivers/s390/net/ctcdbug.c
deleted file mode 100644 (file)
index ba004e0..0000000
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
- *
- * linux/drivers/s390/net/ctcdbug.c ($Revision: 1.1 $)
- *
- * Linux on zSeries OSA Express and HiperSockets support
- *
- * Copyright 2000,2003 IBM Corporation
- *
- *    Author(s): Original Code written by
- *                       Peter Tiedemann (ptiedem@de.ibm.com)
- *
- *    $Revision: 1.1 $  $Date: 2004/07/02 16:31:22 $
- *
- * 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 "ctcdbug.h"
-
-/**
- * Debug Facility Stuff
- */
-debug_info_t *dbf_setup = NULL;
-debug_info_t *dbf_data = NULL;
-debug_info_t *dbf_trace = NULL;
-
-DEFINE_PER_CPU(char[256], dbf_txt_buf);
-
-void
-unregister_dbf_views(void)
-{
-       if (dbf_setup)
-               debug_unregister(dbf_setup);
-       if (dbf_data)
-               debug_unregister(dbf_data);
-       if (dbf_trace)
-               debug_unregister(dbf_trace);
-}
-int
-register_dbf_views(void)
-{
-       dbf_setup = debug_register(CTC_DBF_SETUP_NAME,
-                                       CTC_DBF_SETUP_INDEX,
-                                       CTC_DBF_SETUP_NR_AREAS,
-                                       CTC_DBF_SETUP_LEN);
-       dbf_data = debug_register(CTC_DBF_DATA_NAME,
-                                      CTC_DBF_DATA_INDEX,
-                                      CTC_DBF_DATA_NR_AREAS,
-                                      CTC_DBF_DATA_LEN);
-       dbf_trace = debug_register(CTC_DBF_TRACE_NAME,
-                                       CTC_DBF_TRACE_INDEX,
-                                       CTC_DBF_TRACE_NR_AREAS,
-                                       CTC_DBF_TRACE_LEN);
-
-       if ((dbf_setup == NULL) || (dbf_data == NULL) ||
-           (dbf_trace == NULL)) {
-               unregister_dbf_views();
-               return -ENOMEM;
-       }
-       debug_register_view(dbf_setup, &debug_hex_ascii_view);
-       debug_set_level(dbf_setup, CTC_DBF_SETUP_LEVEL);
-
-       debug_register_view(dbf_data, &debug_hex_ascii_view);
-       debug_set_level(dbf_data, CTC_DBF_DATA_LEVEL);
-
-       debug_register_view(dbf_trace, &debug_hex_ascii_view);
-       debug_set_level(dbf_trace, CTC_DBF_TRACE_LEVEL);
-
-       return 0;
-}
-
-
diff --git a/drivers/s390/net/ctcdbug.h b/drivers/s390/net/ctcdbug.h
deleted file mode 100644 (file)
index 447fd1a..0000000
+++ /dev/null
@@ -1,123 +0,0 @@
-/*
- *
- * linux/drivers/s390/net/ctcdbug.h ($Revision: 1.1 $)
- *
- * Linux on zSeries OSA Express and HiperSockets support
- *
- * Copyright 2000,2003 IBM Corporation
- *
- *    Author(s): Original Code written by
- *                       Peter Tiedemann (ptiedem@de.ibm.com)
- *
- *    $Revision: 1.1 $  $Date: 2004/07/02 16:31:22 $
- *
- * 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 <asm/debug.h>
-/**
- * Debug Facility stuff
- */
-#define CTC_DBF_SETUP_NAME "ctc_setup"
-#define CTC_DBF_SETUP_LEN 16
-#define CTC_DBF_SETUP_INDEX 3
-#define CTC_DBF_SETUP_NR_AREAS 1
-#define CTC_DBF_SETUP_LEVEL 3
-
-#define CTC_DBF_DATA_NAME "ctc_data"
-#define CTC_DBF_DATA_LEN 128
-#define CTC_DBF_DATA_INDEX 3
-#define CTC_DBF_DATA_NR_AREAS 1
-#define CTC_DBF_DATA_LEVEL 2
-
-#define CTC_DBF_TRACE_NAME "ctc_trace"
-#define CTC_DBF_TRACE_LEN 16
-#define CTC_DBF_TRACE_INDEX 2
-#define CTC_DBF_TRACE_NR_AREAS 2
-#define CTC_DBF_TRACE_LEVEL 3
-
-#define DBF_TEXT(name,level,text) \
-       do { \
-               debug_text_event(dbf_##name,level,text); \
-       } while (0)
-
-#define DBF_HEX(name,level,addr,len) \
-       do { \
-               debug_event(dbf_##name,level,(void*)(addr),len); \
-       } while (0)
-
-extern DEFINE_PER_CPU(char[256], dbf_txt_buf);
-extern debug_info_t *dbf_setup;
-extern debug_info_t *dbf_data;
-extern debug_info_t *dbf_trace;
-
-
-#define DBF_TEXT_(name,level,text...)                          \
-       do {                                                            \
-               char* dbf_txt_buf = get_cpu_var(dbf_txt_buf);   \
-               sprintf(dbf_txt_buf, text);                             \
-               debug_text_event(dbf_##name,level,dbf_txt_buf); \
-               put_cpu_var(dbf_txt_buf);                               \
-       } while (0)
-
-#define DBF_SPRINTF(name,level,text...) \
-       do { \
-               debug_sprintf_event(dbf_trace, level, ##text ); \
-               debug_sprintf_event(dbf_trace, level, text ); \
-       } while (0)
-
-
-int register_dbf_views(void);
-
-void unregister_dbf_views(void);
-
-/**
- * some more debug stuff
- */
-
-#define HEXDUMP16(importance,header,ptr) \
-PRINT_##importance(header "%02x %02x %02x %02x  %02x %02x %02x %02x  " \
-                  "%02x %02x %02x %02x  %02x %02x %02x %02x\n", \
-                  *(((char*)ptr)),*(((char*)ptr)+1),*(((char*)ptr)+2), \
-                  *(((char*)ptr)+3),*(((char*)ptr)+4),*(((char*)ptr)+5), \
-                  *(((char*)ptr)+6),*(((char*)ptr)+7),*(((char*)ptr)+8), \
-                  *(((char*)ptr)+9),*(((char*)ptr)+10),*(((char*)ptr)+11), \
-                  *(((char*)ptr)+12),*(((char*)ptr)+13), \
-                  *(((char*)ptr)+14),*(((char*)ptr)+15)); \
-PRINT_##importance(header "%02x %02x %02x %02x  %02x %02x %02x %02x  " \
-                  "%02x %02x %02x %02x  %02x %02x %02x %02x\n", \
-                  *(((char*)ptr)+16),*(((char*)ptr)+17), \
-                  *(((char*)ptr)+18),*(((char*)ptr)+19), \
-                  *(((char*)ptr)+20),*(((char*)ptr)+21), \
-                  *(((char*)ptr)+22),*(((char*)ptr)+23), \
-                  *(((char*)ptr)+24),*(((char*)ptr)+25), \
-                  *(((char*)ptr)+26),*(((char*)ptr)+27), \
-                  *(((char*)ptr)+28),*(((char*)ptr)+29), \
-                  *(((char*)ptr)+30),*(((char*)ptr)+31));
-
-static inline void
-hex_dump(unsigned char *buf, size_t len)
-{
-       size_t i;
-
-       for (i = 0; i < len; i++) {
-               if (i && !(i % 16))
-                       printk("\n");
-               printk("%02x ", *(buf + i));
-       }
-       printk("\n");
-}
-
diff --git a/drivers/scsi/fdomain.h b/drivers/scsi/fdomain.h
deleted file mode 100644 (file)
index 47021d9..0000000
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * fdomain.c -- Future Domain TMC-16x0 SCSI driver
- * Author: Rickard E. Faith, faith@cs.unc.edu
- * Copyright 1992-1996, 1998 Rickard E. Faith (faith@acm.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, 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.
- */
-
-extern struct scsi_host_template fdomain_driver_template;
-extern int fdomain_setup(char *str);
-extern struct Scsi_Host *__fdomain_16x0_detect(struct  scsi_host_template *tpnt );
-extern int fdomain_16x0_bus_reset(struct scsi_cmnd *SCpnt);
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/sata_nv.c b/drivers/scsi/sata_nv.c
deleted file mode 100644 (file)
index bf1932e..0000000
+++ /dev/null
@@ -1,355 +0,0 @@
-/*
- *  sata_nv.c - NVIDIA nForce SATA
- *
- *  Copyright 2004 NVIDIA Corp.  All rights reserved.
- *  Copyright 2004 Andrew Chew
- *
- *  The contents of this file are subject to the Open
- *  Software License version 1.1 that can be found at
- *  http://www.opensource.org/licenses/osl-1.1.txt and is included herein
- *  by reference.
- *
- *  Alternatively, the contents of this file may be used under the terms
- *  of the GNU General Public License version 2 (the "GPL") as distributed
- *  in the kernel source COPYING file, in which case the provisions of
- *  the GPL are applicable instead of the above.  If you wish to allow
- *  the use of your version of this file only under the terms of the
- *  GPL and not to allow others to use your version of this file under
- *  the OSL, indicate your decision by deleting the provisions above and
- *  replace them with the notice and other provisions required by the GPL.
- *  If you do not delete the provisions above, a recipient may use your
- *  version of this file under either the OSL or the GPL.
- *
- */
-
-#include <linux/config.h>
-#include <linux/kernel.h>
-#include <linux/module.h>
-#include <linux/pci.h>
-#include <linux/init.h>
-#include <linux/blkdev.h>
-#include <linux/delay.h>
-#include <linux/interrupt.h>
-#include "scsi.h"
-#include <scsi/scsi_host.h>
-#include <linux/libata.h>
-
-#define DRV_NAME                       "sata_nv"
-#define DRV_VERSION                    "0.01"
-
-#define NV_PORTS                       2
-#define NV_PIO_MASK                    0x1f
-#define NV_UDMA_MASK                   0x7f
-#define NV_PORT0_BMDMA_REG_OFFSET      0x00
-#define NV_PORT1_BMDMA_REG_OFFSET      0x08
-#define NV_PORT0_SCR_REG_OFFSET                0x00
-#define NV_PORT1_SCR_REG_OFFSET                0x40
-
-#define NV_INT_STATUS                  0x10
-#define NV_INT_STATUS_PDEV_INT         0x01
-#define NV_INT_STATUS_PDEV_PM          0x02
-#define NV_INT_STATUS_PDEV_ADDED       0x04
-#define NV_INT_STATUS_PDEV_REMOVED     0x08
-#define NV_INT_STATUS_SDEV_INT         0x10
-#define NV_INT_STATUS_SDEV_PM          0x20
-#define NV_INT_STATUS_SDEV_ADDED       0x40
-#define NV_INT_STATUS_SDEV_REMOVED     0x80
-#define NV_INT_STATUS_PDEV_HOTPLUG     (NV_INT_STATUS_PDEV_ADDED | \
-                                       NV_INT_STATUS_PDEV_REMOVED)
-#define NV_INT_STATUS_SDEV_HOTPLUG     (NV_INT_STATUS_SDEV_ADDED | \
-                                       NV_INT_STATUS_SDEV_REMOVED)
-#define NV_INT_STATUS_HOTPLUG          (NV_INT_STATUS_PDEV_HOTPLUG | \
-                                       NV_INT_STATUS_SDEV_HOTPLUG)
-
-#define NV_INT_ENABLE                  0x11
-#define NV_INT_ENABLE_PDEV_MASK                0x01
-#define NV_INT_ENABLE_PDEV_PM          0x02
-#define NV_INT_ENABLE_PDEV_ADDED       0x04
-#define NV_INT_ENABLE_PDEV_REMOVED     0x08
-#define NV_INT_ENABLE_SDEV_MASK                0x10
-#define NV_INT_ENABLE_SDEV_PM          0x20
-#define NV_INT_ENABLE_SDEV_ADDED       0x40
-#define NV_INT_ENABLE_SDEV_REMOVED     0x80
-#define NV_INT_ENABLE_PDEV_HOTPLUG     (NV_INT_ENABLE_PDEV_ADDED | \
-                                       NV_INT_ENABLE_PDEV_REMOVED)
-#define NV_INT_ENABLE_SDEV_HOTPLUG     (NV_INT_ENABLE_SDEV_ADDED | \
-                                       NV_INT_ENABLE_SDEV_REMOVED)
-#define NV_INT_ENABLE_HOTPLUG          (NV_INT_ENABLE_PDEV_HOTPLUG | \
-                                       NV_INT_ENABLE_SDEV_HOTPLUG)
-
-#define NV_INT_CONFIG                  0x12
-#define NV_INT_CONFIG_METHD            0x01 // 0 = INT, 1 = SMI
-
-static int nv_init_one (struct pci_dev *pdev, const struct pci_device_id *ent);
-irqreturn_t nv_interrupt (int irq, void *dev_instance, struct pt_regs *regs);
-static u32 nv_scr_read (struct ata_port *ap, unsigned int sc_reg);
-static void nv_scr_write (struct ata_port *ap, unsigned int sc_reg, u32 val);
-static void nv_host_stop (struct ata_host_set *host_set);
-
-static struct pci_device_id nv_pci_tbl[] = {
-       { PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE2S_SATA,
-               PCI_ANY_ID, PCI_ANY_ID, },
-       { PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE3S_SATA,
-               PCI_ANY_ID, PCI_ANY_ID, },
-       { PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE3S_SATA2,
-               PCI_ANY_ID, PCI_ANY_ID, },
-       { PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE_CK804_SATA,
-               PCI_ANY_ID, PCI_ANY_ID, },
-       { PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE_CK804_SATA2,
-               PCI_ANY_ID, PCI_ANY_ID, },
-       { PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE_MCP04_SATA,
-               PCI_ANY_ID, PCI_ANY_ID, },
-       { PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE_MCP04_SATA2,
-               PCI_ANY_ID, PCI_ANY_ID, },
-       { 0, } /* terminate list */
-};
-
-static struct pci_driver nv_pci_driver = {
-       .name                   = DRV_NAME,
-       .id_table               = nv_pci_tbl,
-       .probe                  = nv_init_one,
-       .remove                 = ata_pci_remove_one,
-};
-
-static Scsi_Host_Template nv_sht = {
-       .module                 = THIS_MODULE,
-       .name                   = DRV_NAME,
-       .queuecommand           = ata_scsi_queuecmd,
-       .eh_strategy_handler    = ata_scsi_error,
-       .can_queue              = ATA_DEF_QUEUE,
-       .this_id                = ATA_SHT_THIS_ID,
-       .sg_tablesize           = ATA_MAX_PRD,
-       .max_sectors            = ATA_MAX_SECTORS,
-       .cmd_per_lun            = ATA_SHT_CMD_PER_LUN,
-       .emulated               = ATA_SHT_EMULATED,
-       .use_clustering         = ATA_SHT_USE_CLUSTERING,
-       .proc_name              = DRV_NAME,
-       .dma_boundary           = ATA_DMA_BOUNDARY,
-       .slave_configure        = ata_scsi_slave_config,
-       .bios_param             = ata_std_bios_param,
-};
-
-static struct ata_port_operations nv_ops = {
-       .port_disable           = ata_port_disable,
-       .tf_load                = ata_tf_load_pio,
-       .tf_read                = ata_tf_read_pio,
-       .exec_command           = ata_exec_command_pio,
-       .check_status           = ata_check_status_pio,
-       .phy_reset              = sata_phy_reset,
-       .bmdma_setup            = ata_bmdma_setup_pio,
-       .bmdma_start            = ata_bmdma_start_pio,
-       .qc_prep                = ata_qc_prep,
-       .qc_issue               = ata_qc_issue_prot,
-       .eng_timeout            = ata_eng_timeout,
-       .irq_handler            = nv_interrupt,
-       .irq_clear              = ata_bmdma_irq_clear,
-       .scr_read               = nv_scr_read,
-       .scr_write              = nv_scr_write,
-       .port_start             = ata_port_start,
-       .port_stop              = ata_port_stop,
-       .host_stop              = nv_host_stop,
-};
-
-MODULE_AUTHOR("NVIDIA");
-MODULE_DESCRIPTION("low-level driver for NVIDIA nForce SATA controller");
-MODULE_LICENSE("GPL");
-MODULE_DEVICE_TABLE(pci, nv_pci_tbl);
-
-irqreturn_t nv_interrupt (int irq, void *dev_instance, struct pt_regs *regs)
-{
-       struct ata_host_set *host_set = dev_instance;
-       unsigned int i;
-       unsigned int handled = 0;
-       unsigned long flags;
-       u8 intr_status;
-       u8 intr_enable;
-
-       spin_lock_irqsave(&host_set->lock, flags);
-
-       for (i = 0; i < host_set->n_ports; i++) {
-               struct ata_port *ap;
-
-               ap = host_set->ports[i];
-               if (ap && (!(ap->flags & ATA_FLAG_PORT_DISABLED))) {
-                       struct ata_queued_cmd *qc;
-
-                       qc = ata_qc_from_tag(ap, ap->active_tag);
-                       if (qc && (!(qc->tf.ctl & ATA_NIEN)))
-                               handled += ata_host_intr(ap, qc);
-               }
-
-               intr_status = inb(ap->ioaddr.scr_addr + NV_INT_STATUS);
-               intr_enable = inb(ap->ioaddr.scr_addr + NV_INT_ENABLE);
-
-               // Clear interrupt status.
-               outb(0xff, ap->ioaddr.scr_addr + NV_INT_STATUS);
-
-               if (intr_status & NV_INT_STATUS_HOTPLUG) {
-                       if (intr_status & NV_INT_STATUS_PDEV_ADDED) {
-                               printk(KERN_WARNING "ata%u: "
-                                       "Primary device added\n", ap->id);
-                       }
-
-                       if (intr_status & NV_INT_STATUS_PDEV_REMOVED) {
-                               printk(KERN_WARNING "ata%u: "
-                                       "Primary device removed\n", ap->id);
-                       }
-
-                       if (intr_status & NV_INT_STATUS_SDEV_ADDED) {
-                               printk(KERN_WARNING "ata%u: "
-                                       "Secondary device added\n", ap->id);
-                       }
-
-                       if (intr_status & NV_INT_STATUS_SDEV_REMOVED) {
-                               printk(KERN_WARNING "ata%u: "
-                                       "Secondary device removed\n", ap->id);
-                       }
-               }
-       }
-
-       spin_unlock_irqrestore(&host_set->lock, flags);
-
-       return IRQ_RETVAL(handled);
-}
-
-static u32 nv_scr_read (struct ata_port *ap, unsigned int sc_reg)
-{
-       if (sc_reg > SCR_CONTROL)
-               return 0xffffffffU;
-
-       return inl(ap->ioaddr.scr_addr + (sc_reg * 4));
-}
-
-static void nv_scr_write (struct ata_port *ap, unsigned int sc_reg, u32 val)
-{
-       if (sc_reg > SCR_CONTROL)
-               return;
-
-       outl(val, ap->ioaddr.scr_addr + (sc_reg * 4));
-}
-
-static void nv_host_stop (struct ata_host_set *host_set)
-{
-       int i;
-
-       for (i=0; i<host_set->n_ports; i++) {
-               u8 intr_mask;
-
-               // Disable hotplug event interrupts.
-               intr_mask = inb(host_set->ports[i]->ioaddr.scr_addr +
-                               NV_INT_ENABLE);
-               intr_mask &= ~(NV_INT_ENABLE_HOTPLUG);
-               outb(intr_mask, host_set->ports[i]->ioaddr.scr_addr +
-                               NV_INT_ENABLE);
-       }
-}
-
-static int nv_init_one (struct pci_dev *pdev, const struct pci_device_id *ent)
-{
-       static int printed_version = 0;
-       struct ata_probe_ent *probe_ent = NULL;
-       int i;
-       int rc;
-
-       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;
-
-       rc = pci_set_dma_mask(pdev, ATA_DMA_MASK);
-       if (rc)
-               goto err_out_regions;
-       rc = pci_set_consistent_dma_mask(pdev, ATA_DMA_MASK);
-       if (rc)
-               goto err_out_regions;
-
-       probe_ent = kmalloc(sizeof(*probe_ent), GFP_KERNEL);
-       if (!probe_ent) {
-               rc = -ENOMEM;
-               goto err_out_regions;
-       }
-
-       memset(probe_ent, 0, sizeof(*probe_ent));
-       INIT_LIST_HEAD(&probe_ent->node);
-
-       probe_ent->pdev = pdev;
-       probe_ent->sht = &nv_sht;
-       probe_ent->host_flags = ATA_FLAG_SATA |
-                               ATA_FLAG_SATA_RESET |
-                               ATA_FLAG_SRST |
-                               ATA_FLAG_NO_LEGACY;
-       probe_ent->port_ops = &nv_ops;
-       probe_ent->n_ports = NV_PORTS;
-       probe_ent->irq = pdev->irq;
-       probe_ent->irq_flags = SA_SHIRQ;
-       probe_ent->pio_mask = NV_PIO_MASK;
-       probe_ent->udma_mask = NV_UDMA_MASK;
-
-       probe_ent->port[0].cmd_addr = pci_resource_start(pdev, 0);
-       ata_std_ports(&probe_ent->port[0]);
-       probe_ent->port[0].altstatus_addr =
-       probe_ent->port[0].ctl_addr =
-               pci_resource_start(pdev, 1) | ATA_PCI_CTL_OFS;
-       probe_ent->port[0].bmdma_addr =
-               pci_resource_start(pdev, 4) | NV_PORT0_BMDMA_REG_OFFSET;
-       probe_ent->port[0].scr_addr =
-               pci_resource_start(pdev, 5) | NV_PORT0_SCR_REG_OFFSET;
-
-       probe_ent->port[1].cmd_addr = pci_resource_start(pdev, 2);
-       ata_std_ports(&probe_ent->port[1]);
-       probe_ent->port[1].altstatus_addr =
-       probe_ent->port[1].ctl_addr =
-               pci_resource_start(pdev, 3) | ATA_PCI_CTL_OFS;
-       probe_ent->port[1].bmdma_addr =
-               pci_resource_start(pdev, 4) | NV_PORT1_BMDMA_REG_OFFSET;
-       probe_ent->port[1].scr_addr =
-               pci_resource_start(pdev, 5) | NV_PORT1_SCR_REG_OFFSET;
-
-       pci_set_master(pdev);
-
-       rc = ata_device_add(probe_ent);
-       if (rc != NV_PORTS)
-               goto err_out_regions;
-
-       // Enable hotplug event interrupts.
-       for (i=0; i<probe_ent->n_ports; i++) {
-               u8 intr_mask;
-
-               outb(NV_INT_STATUS_HOTPLUG, probe_ent->port[i].scr_addr +
-                                               NV_INT_STATUS);
-
-               intr_mask = inb(probe_ent->port[i].scr_addr + NV_INT_ENABLE);
-               intr_mask |= NV_INT_ENABLE_HOTPLUG;
-               outb(intr_mask, probe_ent->port[i].scr_addr + NV_INT_ENABLE);
-       }
-
-       kfree(probe_ent);
-
-       return 0;
-
-err_out_regions:
-       pci_release_regions(pdev);
-
-err_out:
-       pci_disable_device(pdev);
-       return rc;
-}
-
-static int __init nv_init(void)
-{
-       return pci_module_init(&nv_pci_driver);
-}
-
-static void __exit nv_exit(void)
-{
-       pci_unregister_driver(&nv_pci_driver);
-}
-
-module_init(nv_init);
-module_exit(nv_exit);
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/cpm_uart/Makefile b/drivers/serial/cpm_uart/Makefile
deleted file mode 100644 (file)
index e072724..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
-#
-# Makefile for the Motorola 8xx FEC ethernet controller
-#
-
-obj-$(CONFIG_SERIAL_CPM) += cpm_uart.o
-
-# Select the correct platform objects.
-cpm_uart-objs-$(CONFIG_CPM2)   += cpm_uart_cpm2.o
-cpm_uart-objs-$(CONFIG_8xx)    += cpm_uart_cpm1.o
-
-cpm_uart-objs  := cpm_uart_core.o $(cpm_uart-objs-y)
diff --git a/drivers/serial/cpm_uart/cpm_uart.h b/drivers/serial/cpm_uart/cpm_uart.h
deleted file mode 100644 (file)
index 598704e..0000000
+++ /dev/null
@@ -1,92 +0,0 @@
-/*
- *  linux/drivers/serial/cpm_uart.h
- *
- *  Driver for CPM (SCC/SMC) serial ports
- *
- *  Copyright (C) 2004 Freescale Semiconductor, Inc.
- *
- */
-#ifndef CPM_UART_H
-#define CPM_UART_H
-
-#include <linux/config.h>
-
-#if defined(CONFIG_CPM2)
-#include "cpm_uart_cpm2.h"
-#elif defined(CONFIG_8xx)
-#include "cpm_uart_cpm1.h"
-#endif
-
-#ifndef CONFIG_SERIAL_8250
-#define SERIAL_CPM_MAJOR       TTY_MAJOR
-#define SERIAL_CPM_MINOR       64
-#else
-#define SERIAL_CPM_MAJOR       204
-#define SERIAL_CPM_MINOR       42
-#endif
-
-#define IS_SMC(pinfo)          (pinfo->flags & FLAG_SMC)
-#define IS_DISCARDING(pinfo)   (pinfo->flags & FLAG_DISCARDING)
-#define FLAG_DISCARDING        0x00000004      /* when set, don't discard */
-#define FLAG_SMC       0x00000002
-#define FLAG_CONSOLE   0x00000001
-
-#define UART_SMC1      0
-#define UART_SMC2      1
-#define UART_SCC1      2
-#define UART_SCC2      3
-#define UART_SCC3      4
-#define UART_SCC4      5
-
-#define UART_NR        6
-
-#define RX_NUM_FIFO    4
-#define RX_BUF_SIZE    32
-#define TX_NUM_FIFO    4
-#define TX_BUF_SIZE    32
-
-struct uart_cpm_port {
-       struct uart_port        port;
-       u16                     rx_nrfifos;     
-       u16                     rx_fifosize;
-       u16                     tx_nrfifos;     
-       u16                     tx_fifosize;
-       smc_t                   *smcp;  
-       smc_uart_t              *smcup;
-       scc_t                   *sccp;
-       scc_uart_t              *sccup;
-       volatile cbd_t          *rx_bd_base;
-       volatile cbd_t          *rx_cur;
-       volatile cbd_t          *tx_bd_base;
-       volatile cbd_t          *tx_cur;
-       unsigned char           *tx_buf;
-       unsigned char           *rx_buf;
-       u32                     flags;
-       void                    (*set_lineif)(struct uart_cpm_port *);
-       u8                      brg;
-       uint                     dp_addr;
-       void                    *mem_addr;
-       dma_addr_t               dma_addr;
-       /* helpers */
-       int                      baud;
-       int                      bits;
-};
-
-extern int cpm_uart_port_map[UART_NR];
-extern int cpm_uart_nr;
-extern struct uart_cpm_port cpm_uart_ports[UART_NR];
-
-/* these are located in their respective files */
-void cpm_line_cr_cmd(int line, int cmd);
-int cpm_uart_init_portdesc(void);
-int cpm_uart_allocbuf(struct uart_cpm_port *pinfo, unsigned int is_con);
-void cpm_uart_freebuf(struct uart_cpm_port *pinfo);
-
-void smc1_lineif(struct uart_cpm_port *pinfo);
-void smc2_lineif(struct uart_cpm_port *pinfo);
-void scc1_lineif(struct uart_cpm_port *pinfo);
-void scc2_lineif(struct uart_cpm_port *pinfo);
-void scc3_lineif(struct uart_cpm_port *pinfo);
-void scc4_lineif(struct uart_cpm_port *pinfo);
-
-#endif /* CPM_UART_H */
diff --git a/drivers/serial/cpm_uart/cpm_uart_core.c b/drivers/serial/cpm_uart/cpm_uart_core.c
deleted file mode 100644 (file)
index 0612e94..0000000
+++ /dev/null
@@ -1,1179 +0,0 @@
-/*
- *  linux/drivers/serial/cpm_uart.c
- *
- *  Driver for CPM (SCC/SMC) serial ports; core driver
- *
- *  Based on arch/ppc/cpm2_io/uart.c by Dan Malek
- *  Based on ppc8xx.c by Thomas Gleixner
- *  Based on drivers/serial/amba.c by Russell King
- *
- *  Maintainer: Kumar Gala (kumar.gala@freescale.com) (CPM2)
- *              Pantelis Antoniou (panto@intracom.gr) (CPM1)
- * 
- *  Copyright (C) 2004 Freescale Semiconductor, Inc.
- *            (C) 2004 Intracom, S.A.
- *
- * 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/tty.h>
-#include <linux/ioport.h>
-#include <linux/init.h>
-#include <linux/serial.h>
-#include <linux/console.h>
-#include <linux/sysrq.h>
-#include <linux/device.h>
-#include <linux/bootmem.h>
-#include <linux/dma-mapping.h>
-
-#include <asm/io.h>
-#include <asm/irq.h>
-#include <asm/delay.h>
-
-#if defined(CONFIG_SERIAL_CPM_CONSOLE) && defined(CONFIG_MAGIC_SYSRQ)
-#define SUPPORT_SYSRQ
-#endif
-
-#include <linux/serial_core.h>
-#include <linux/kernel.h>
-
-#include "cpm_uart.h"
-
-/***********************************************************************/
-
-/* Track which ports are configured as uarts */
-int cpm_uart_port_map[UART_NR];
-/* How many ports did we config as uarts */
-int cpm_uart_nr;
-
-/**************************************************************/
-
-static int  cpm_uart_tx_pump(struct uart_port *port);
-static void cpm_uart_init_smc(struct uart_cpm_port *pinfo, int bits, u16 cval);
-static void cpm_uart_init_scc(struct uart_cpm_port *pinfo, int sbits, u16 sval);
-
-/**************************************************************/
-
-/*
- * Check, if transmit buffers are processed            
-*/
-static unsigned int cpm_uart_tx_empty(struct uart_port *port)
-{
-       struct uart_cpm_port *pinfo = (struct uart_cpm_port *)port;
-       volatile cbd_t *bdp = pinfo->tx_bd_base;
-       int ret = 0;
-
-       while (1) {
-               if (bdp->cbd_sc & BD_SC_READY)
-                       break;
-
-               if (bdp->cbd_sc & BD_SC_WRAP) {
-                       ret = TIOCSER_TEMT;
-                       break;
-               }
-               bdp++;
-       }
-
-       pr_debug("CPM uart[%d]:tx_empty: %d\n", port->line, ret);
-
-       return ret;
-}
-
-static void cpm_uart_set_mctrl(struct uart_port *port, unsigned int mctrl)
-{
-       /* Whee. Do nothing. */
-}
-
-static unsigned int cpm_uart_get_mctrl(struct uart_port *port)
-{
-       /* Whee. Do nothing. */
-       return TIOCM_CAR | TIOCM_DSR | TIOCM_CTS;
-}
-
-/*
- * Stop transmitter
- */
-static void cpm_uart_stop_tx(struct uart_port *port, unsigned int tty_stop)
-{
-       struct uart_cpm_port *pinfo = (struct uart_cpm_port *)port;
-       volatile smc_t *smcp = pinfo->smcp;
-       volatile scc_t *sccp = pinfo->sccp;
-
-       pr_debug("CPM uart[%d]:stop tx\n", port->line);
-
-       if (IS_SMC(pinfo))
-               smcp->smc_smcm &= ~SMCM_TX;
-       else
-               sccp->scc_sccm &= ~UART_SCCM_TX;
-}
-
-/*
- * Start transmitter
- */
-static void cpm_uart_start_tx(struct uart_port *port, unsigned int tty_start)
-{
-       struct uart_cpm_port *pinfo = (struct uart_cpm_port *)port;
-       volatile smc_t *smcp = pinfo->smcp;
-       volatile scc_t *sccp = pinfo->sccp;
-
-       pr_debug("CPM uart[%d]:start tx\n", port->line);
-
-       /* if in the middle of discarding return */
-       if (IS_DISCARDING(pinfo))
-               return;
-
-       if (IS_SMC(pinfo)) {
-               if (smcp->smc_smcm & SMCM_TX)
-                       return;
-       } else {
-               if (sccp->scc_sccm & UART_SCCM_TX)
-                       return;
-       }
-
-       if (cpm_uart_tx_pump(port) != 0) {
-               if (IS_SMC(pinfo))
-                       smcp->smc_smcm |= SMCM_TX;
-               else
-                       sccp->scc_sccm |= UART_SCCM_TX;
-       }
-}
-
-/*
- * Stop receiver 
- */
-static void cpm_uart_stop_rx(struct uart_port *port)
-{
-       struct uart_cpm_port *pinfo = (struct uart_cpm_port *)port;
-       volatile smc_t *smcp = pinfo->smcp;
-       volatile scc_t *sccp = pinfo->sccp;
-
-       pr_debug("CPM uart[%d]:stop rx\n", port->line);
-
-       if (IS_SMC(pinfo))
-               smcp->smc_smcm &= ~SMCM_RX;
-       else
-               sccp->scc_sccm &= ~UART_SCCM_RX;
-}
-
-/*
- * Enable Modem status interrupts
- */
-static void cpm_uart_enable_ms(struct uart_port *port)
-{
-       pr_debug("CPM uart[%d]:enable ms\n", port->line);
-}
-
-/*
- * Generate a break. 
- */
-static void cpm_uart_break_ctl(struct uart_port *port, int break_state)
-{
-       struct uart_cpm_port *pinfo = (struct uart_cpm_port *)port;
-       int line = pinfo - cpm_uart_ports;
-
-       pr_debug("CPM uart[%d]:break ctrl, break_state: %d\n", port->line,
-               break_state);
-
-       if (break_state)
-               cpm_line_cr_cmd(line, CPM_CR_STOP_TX);
-       else
-               cpm_line_cr_cmd(line, CPM_CR_RESTART_TX);
-}
-
-/*
- * Transmit characters, refill buffer descriptor, if possible
- */
-static void cpm_uart_int_tx(struct uart_port *port, struct pt_regs *regs)
-{
-       pr_debug("CPM uart[%d]:TX INT\n", port->line);
-
-       cpm_uart_tx_pump(port);
-}
-
-/*
- * Receive characters
- */
-static void cpm_uart_int_rx(struct uart_port *port, struct pt_regs *regs)
-{
-       int i;
-       unsigned char ch, *cp;
-       struct tty_struct *tty = port->info->tty;
-       struct uart_cpm_port *pinfo = (struct uart_cpm_port *)port;
-       volatile cbd_t *bdp;
-       u16 status;
-       unsigned int flg;
-
-       pr_debug("CPM uart[%d]:RX INT\n", port->line);
-
-       /* Just loop through the closed BDs and copy the characters into
-        * the buffer.
-        */
-       bdp = pinfo->rx_cur;
-       for (;;) {
-               /* get status */
-               status = bdp->cbd_sc;
-               /* If this one is empty, return happy */
-               if (status & BD_SC_EMPTY)
-                       break;
-
-               /* get number of characters, and check spce in flip-buffer */
-               i = bdp->cbd_datlen;
-
-               /* If we have not enough room in tty flip buffer, then we try 
-                * later, which will be the next rx-interrupt or a timeout
-                */
-               if ((tty->flip.count + i) >= TTY_FLIPBUF_SIZE) {
-                       tty->flip.work.func((void *)tty);
-                       if ((tty->flip.count + i) >= TTY_FLIPBUF_SIZE) {
-                               printk(KERN_WARNING "TTY_DONT_FLIP set\n");
-                               return;
-                       }
-               }
-
-               /* get pointer */
-               cp = (unsigned char *)bus_to_virt(bdp->cbd_bufaddr);
-
-               /* loop through the buffer */
-               while (i-- > 0) {
-                       ch = *cp++;
-                       port->icount.rx++;
-                       flg = TTY_NORMAL;
-
-                       if (status &
-                           (BD_SC_BR | BD_SC_FR | BD_SC_PR | BD_SC_OV))
-                               goto handle_error;
-                       if (uart_handle_sysrq_char(port, ch, regs))
-                               continue;
-
-                     error_return:
-                       *tty->flip.char_buf_ptr++ = ch;
-                       *tty->flip.flag_buf_ptr++ = flg;
-                       tty->flip.count++;
-
-               }               /* End while (i--) */
-
-               /* This BD is ready to be used again. Clear status. get next */
-               bdp->cbd_sc &= ~(BD_SC_BR | BD_SC_FR | BD_SC_PR | BD_SC_OV);
-               bdp->cbd_sc |= BD_SC_EMPTY;
-
-               if (bdp->cbd_sc & BD_SC_WRAP)
-                       bdp = pinfo->rx_bd_base;
-               else
-                       bdp++;
-       } /* End for (;;) */
-
-       /* Write back buffer pointer */
-       pinfo->rx_cur = (volatile cbd_t *) bdp;
-
-       /* activate BH processing */
-       tty_flip_buffer_push(tty);
-
-       return;
-
-       /* Error processing */
-
-      handle_error:
-       /* Statistics */
-       if (status & BD_SC_BR)
-               port->icount.brk++;
-       if (status & BD_SC_PR)
-               port->icount.parity++;
-       if (status & BD_SC_FR)
-               port->icount.frame++;
-       if (status & BD_SC_OV)
-               port->icount.overrun++;
-
-       /* Mask out ignored conditions */
-       status &= port->read_status_mask;
-
-       /* Handle the remaining ones */
-       if (status & BD_SC_BR)
-               flg = TTY_BREAK;
-       else if (status & BD_SC_PR)
-               flg = TTY_PARITY;
-       else if (status & BD_SC_FR)
-               flg = TTY_FRAME;
-
-       /* overrun does not affect the current character ! */
-       if (status & BD_SC_OV) {
-               ch = 0;
-               flg = TTY_OVERRUN;
-               /* We skip this buffer */
-               /* CHECK: Is really nothing senseful there */
-               /* ASSUMPTION: it contains nothing valid */
-               i = 0;
-       }
-#ifdef SUPPORT_SYSRQ
-       port->sysrq = 0;
-#endif
-       goto error_return;
-}
-
-/*
- * Asynchron mode interrupt handler
- */
-static irqreturn_t cpm_uart_int(int irq, void *data, struct pt_regs *regs)
-{
-       u8 events;
-       struct uart_port *port = (struct uart_port *)data;
-       struct uart_cpm_port *pinfo = (struct uart_cpm_port *)port;
-       volatile smc_t *smcp = pinfo->smcp;
-       volatile scc_t *sccp = pinfo->sccp;
-
-       pr_debug("CPM uart[%d]:IRQ\n", port->line);
-
-       if (IS_SMC(pinfo)) {
-               events = smcp->smc_smce;
-               if (events & SMCM_BRKE)
-                       uart_handle_break(port);
-               if (events & SMCM_RX)
-                       cpm_uart_int_rx(port, regs);
-               if (events & SMCM_TX)
-                       cpm_uart_int_tx(port, regs);
-               smcp->smc_smce = events;
-       } else {
-               events = sccp->scc_scce;
-               if (events & UART_SCCM_BRKE)
-                       uart_handle_break(port);
-               if (events & UART_SCCM_RX)
-                       cpm_uart_int_rx(port, regs);
-               if (events & UART_SCCM_TX)
-                       cpm_uart_int_tx(port, regs);
-               sccp->scc_scce = events;
-       }
-       return (events) ? IRQ_HANDLED : IRQ_NONE;
-}
-
-static int cpm_uart_startup(struct uart_port *port)
-{
-       int retval;
-
-       pr_debug("CPM uart[%d]:startup\n", port->line);
-
-       /* Install interrupt handler. */
-       retval = request_irq(port->irq, cpm_uart_int, 0, "cpm_uart", port);
-       if (retval)
-               return retval;
-
-       return 0;
-}
-
-/*
- * Shutdown the uart
- */
-static void cpm_uart_shutdown(struct uart_port *port)
-{
-       struct uart_cpm_port *pinfo = (struct uart_cpm_port *)port;
-       int line = pinfo - cpm_uart_ports;
-
-       pr_debug("CPM uart[%d]:shutdown\n", port->line);
-
-       /* free interrupt handler */
-       free_irq(port->irq, port);
-
-       /* If the port is not the console, disable Rx and Tx. */
-       if (!(pinfo->flags & FLAG_CONSOLE)) {
-               /* Stop uarts */
-               if (IS_SMC(pinfo)) {
-                       volatile smc_t *smcp = pinfo->smcp;
-                       smcp->smc_smcmr &= ~(SMCMR_REN | SMCMR_TEN);
-                       smcp->smc_smcm &= ~(SMCM_RX | SMCM_TX);
-               } else {
-                       volatile scc_t *sccp = pinfo->sccp;
-                       sccp->scc_gsmrl &= ~(SCC_GSMRL_ENR | SCC_GSMRL_ENT);
-                       sccp->scc_sccm &= ~(UART_SCCM_TX | UART_SCCM_RX);
-               }
-
-               /* Shut them really down and reinit buffer descriptors */
-               cpm_line_cr_cmd(line, CPM_CR_INIT_TRX);
-       }
-}
-
-static void cpm_uart_set_termios(struct uart_port *port,
-                                struct termios *termios, struct termios *old)
-{
-       int baud;
-       unsigned long flags;
-       u16 cval, scval;
-       int bits, sbits;
-       struct uart_cpm_port *pinfo = (struct uart_cpm_port *)port;
-       int line = pinfo - cpm_uart_ports;
-       volatile cbd_t *bdp;
-
-       pr_debug("CPM uart[%d]:set_termios\n", port->line);
-
-       spin_lock_irqsave(&port->lock, flags);
-       /* disable uart interrupts */
-       if (IS_SMC(pinfo))
-               pinfo->smcp->smc_smcm &= ~(SMCM_RX | SMCM_TX);
-       else
-               pinfo->sccp->scc_sccm &= ~(UART_SCCM_TX | UART_SCCM_RX);
-       pinfo->flags |= FLAG_DISCARDING;
-       spin_unlock_irqrestore(&port->lock, flags);
-
-       /* if previous configuration exists wait for tx to finish */
-       if (pinfo->baud != 0 && pinfo->bits != 0) {
-
-               /* point to the last txed bd */
-               bdp = pinfo->tx_cur;
-               if (bdp == pinfo->tx_bd_base)
-                       bdp = pinfo->tx_bd_base + (pinfo->tx_nrfifos - 1);
-               else
-                       bdp--;
-
-               /* wait for it to be transmitted */
-               while ((bdp->cbd_sc & BD_SC_READY) != 0)
-                       schedule();
-
-               /* and delay for the hw fifo to drain */
-               udelay((3 * 1000000 * pinfo->bits) / pinfo->baud);
-       }
-
-       spin_lock_irqsave(&port->lock, flags);
-
-       /* Send the CPM an initialize command. */
-       cpm_line_cr_cmd(line, CPM_CR_STOP_TX);
-
-       /* Stop uart */
-       if (IS_SMC(pinfo))
-               pinfo->smcp->smc_smcmr &= ~(SMCMR_REN | SMCMR_TEN);
-       else
-               pinfo->sccp->scc_gsmrl &= ~(SCC_GSMRL_ENR | SCC_GSMRL_ENT);
-
-       /* Send the CPM an initialize command. */
-       cpm_line_cr_cmd(line, CPM_CR_INIT_TRX);
-
-       spin_unlock_irqrestore(&port->lock, flags);
-
-       baud = uart_get_baud_rate(port, termios, old, 0, port->uartclk / 16);
-
-       /* 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 */
-       switch (termios->c_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 (termios->c_cflag & CSTOPB) {
-               cval |= SMCMR_SL;       /* Two stops */
-               scval |= SCU_PSMR_SL;
-               bits++;
-       }
-
-       if (termios->c_cflag & PARENB) {
-               cval |= SMCMR_PEN;
-               scval |= SCU_PSMR_PEN;
-               bits++;
-               if (!(termios->c_cflag & PARODD)) {
-                       cval |= SMCMR_PM_EVEN;
-                       scval |= (SCU_PSMR_REVP | SCU_PSMR_TEVP);
-               }
-       }
-
-       /*
-        * Set up parity check flag
-        */
-#define RELEVANT_IFLAG(iflag) (iflag & (IGNBRK|BRKINT|IGNPAR|PARMRK|INPCK))
-
-       port->read_status_mask = (BD_SC_EMPTY | BD_SC_OV);
-       if (termios->c_iflag & INPCK)
-               port->read_status_mask |= BD_SC_FR | BD_SC_PR;
-       if ((termios->c_iflag & BRKINT) || (termios->c_iflag & PARMRK))
-               port->read_status_mask |= BD_SC_BR;
-
-       /*
-        * Characters to ignore
-        */
-       port->ignore_status_mask = 0;
-       if (termios->c_iflag & IGNPAR)
-               port->ignore_status_mask |= BD_SC_PR | BD_SC_FR;
-       if (termios->c_iflag & IGNBRK) {
-               port->ignore_status_mask |= BD_SC_BR;
-               /*
-                * If we're ignore parity and break indicators, ignore
-                * overruns too.  (For real raw support).
-                */
-               if (termios->c_iflag & IGNPAR)
-                       port->ignore_status_mask |= BD_SC_OV;
-       }
-       /*
-        * !!! ignore all characters if CREAD is not set
-        */
-       if ((termios->c_cflag & CREAD) == 0)
-               port->read_status_mask &= ~BD_SC_EMPTY;
-       
-       spin_lock_irqsave(&port->lock, flags);
-
-       cpm_set_brg(pinfo->brg - 1, baud);
-
-       /* 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++;
-
-       /* re-init */
-       if (IS_SMC(pinfo))
-               cpm_uart_init_smc(pinfo, bits, cval);
-       else
-               cpm_uart_init_scc(pinfo, sbits, scval);
-
-       pinfo->baud = baud;
-       pinfo->bits = bits;
-
-       pinfo->flags &= ~FLAG_DISCARDING;
-       spin_unlock_irqrestore(&port->lock, flags);
-
-}
-
-static const char *cpm_uart_type(struct uart_port *port)
-{
-       pr_debug("CPM uart[%d]:uart_type\n", port->line);
-
-       return port->type == PORT_CPM ? "CPM UART" : NULL;
-}
-
-/*
- * verify the new serial_struct (for TIOCSSERIAL).
- */
-static int cpm_uart_verify_port(struct uart_port *port,
-                               struct serial_struct *ser)
-{
-       int ret = 0;
-
-       pr_debug("CPM uart[%d]:verify_port\n", port->line);
-
-       if (ser->type != PORT_UNKNOWN && ser->type != PORT_CPM)
-               ret = -EINVAL;
-       if (ser->irq < 0 || ser->irq >= NR_IRQS)
-               ret = -EINVAL;
-       if (ser->baud_base < 9600)
-               ret = -EINVAL;
-       return ret;
-}
-
-/*
- * Transmit characters, refill buffer descriptor, if possible
- */
-static int cpm_uart_tx_pump(struct uart_port *port)
-{
-       volatile cbd_t *bdp;
-       unsigned char *p;
-       int count;
-       struct uart_cpm_port *pinfo = (struct uart_cpm_port *)port;
-       struct circ_buf *xmit = &port->info->xmit;
-
-       /* Handle xon/xoff */
-       if (port->x_char) {
-               /* Pick next descriptor and fill from buffer */
-               bdp = pinfo->tx_cur;
-
-               p = bus_to_virt(bdp->cbd_bufaddr);
-               *p++ = xmit->buf[xmit->tail];
-               bdp->cbd_datlen = 1;
-               bdp->cbd_sc |= BD_SC_READY;
-               /* Get next BD. */
-               if (bdp->cbd_sc & BD_SC_WRAP)
-                       bdp = pinfo->tx_bd_base;
-               else
-                       bdp++;
-               pinfo->tx_cur = bdp;
-
-               port->icount.tx++;
-               port->x_char = 0;
-               return 1;
-       }
-
-       if (uart_circ_empty(xmit) || uart_tx_stopped(port)) {
-               cpm_uart_stop_tx(port, 0);
-               return 0;
-       }
-
-       /* Pick next descriptor and fill from buffer */
-       bdp = pinfo->tx_cur;
-
-       while (!(bdp->cbd_sc & BD_SC_READY) && (xmit->tail != xmit->head)) {
-               count = 0;
-               p = bus_to_virt(bdp->cbd_bufaddr);
-               while (count < pinfo->tx_fifosize) {
-                       *p++ = xmit->buf[xmit->tail];
-                       xmit->tail = (xmit->tail + 1) & (UART_XMIT_SIZE - 1);
-                       port->icount.tx++;
-                       count++;
-                       if (xmit->head == xmit->tail)
-                               break;
-               }
-               bdp->cbd_datlen = count;
-               bdp->cbd_sc |= BD_SC_READY;
-               /* Get next BD. */
-               if (bdp->cbd_sc & BD_SC_WRAP)
-                       bdp = pinfo->tx_bd_base;
-               else
-                       bdp++;
-       }
-       pinfo->tx_cur = bdp;
-
-       if (uart_circ_chars_pending(xmit) < WAKEUP_CHARS)
-               uart_write_wakeup(port);
-
-       if (uart_circ_empty(xmit)) {
-               cpm_uart_stop_tx(port, 0);
-               return 0;
-       }
-
-       return 1;
-}
-
-static void cpm_uart_init_scc(struct uart_cpm_port *pinfo, int bits, u16 scval)
-{
-       int line = pinfo - cpm_uart_ports;
-       volatile scc_t *scp;
-       volatile scc_uart_t *sup;
-       u8 *mem_addr;
-       volatile cbd_t *bdp;
-       int i;
-
-       pr_debug("CPM uart[%d]:init_scc\n", pinfo->port.line);
-
-       scp = pinfo->sccp;
-       sup = pinfo->sccup;
-
-       /* Set the physical address of the host memory
-        * buffers in the buffer descriptors, and the
-        * virtual address for us to work with.
-        */
-       pinfo->rx_cur = pinfo->rx_bd_base;
-       mem_addr = pinfo->mem_addr;
-       for (bdp = pinfo->rx_bd_base, i = 0; i < pinfo->rx_nrfifos; i++, bdp++) {
-               bdp->cbd_bufaddr = virt_to_bus(mem_addr);
-               bdp->cbd_sc = BD_SC_EMPTY | BD_SC_INTRPT | (i < (pinfo->rx_nrfifos - 1) ? 0 : BD_SC_WRAP);
-               mem_addr += pinfo->rx_fifosize;
-       }
-
-       /* Set the physical address of the host memory
-        * buffers in the buffer descriptors, and the
-        * virtual address for us to work with.
-        */
-       mem_addr = pinfo->mem_addr + L1_CACHE_ALIGN(pinfo->rx_nrfifos * pinfo->rx_fifosize);
-       pinfo->tx_cur = pinfo->tx_bd_base;
-       for (bdp = pinfo->tx_bd_base, i = 0; i < pinfo->tx_nrfifos; i++, bdp++) {
-               bdp->cbd_bufaddr = virt_to_bus(mem_addr);
-               bdp->cbd_sc = BD_SC_INTRPT | (i < (pinfo->tx_nrfifos - 1) ? 0 : BD_SC_WRAP);
-               mem_addr += pinfo->tx_fifosize;
-               bdp++;
-       }
-
-       /* Store address */
-       pinfo->sccup->scc_genscc.scc_rbase = (unsigned char *)pinfo->rx_bd_base - DPRAM_BASE;
-       pinfo->sccup->scc_genscc.scc_tbase = (unsigned char *)pinfo->tx_bd_base - DPRAM_BASE;
-
-       /* Set up the uart parameters in the
-        * parameter ram.
-        */
-
-       cpm_set_scc_fcr(sup);
-
-       sup->scc_genscc.scc_mrblr = pinfo->rx_fifosize;
-       sup->scc_maxidl = pinfo->rx_fifosize;
-       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.
-        */
-       cpm_line_cr_cmd(line, CPM_CR_INIT_TRX);
-
-       /* 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);
-
-       /* Enable rx interrupts  and clear all pending events.  */
-       scp->scc_sccm = UART_SCCM_RX;
-       scp->scc_scce = 0xffff;
-       scp->scc_dsr = 0x7e7e;
-       scp->scc_psmr = (bits << 12) | scval;
-
-       scp->scc_gsmrl |= (SCC_GSMRL_ENR | SCC_GSMRL_ENT);
-}
-
-static void cpm_uart_init_smc(struct uart_cpm_port *pinfo, int bits, u16 cval)
-{
-       int line = pinfo - cpm_uart_ports;
-       volatile smc_t *sp;
-       volatile smc_uart_t *up;
-       volatile u8 *mem_addr;
-       volatile cbd_t *bdp;
-       int i;
-
-       pr_debug("CPM uart[%d]:init_smc\n", pinfo->port.line);
-
-       sp = pinfo->smcp;
-       up = pinfo->smcup;
-
-       /* Set the physical address of the host memory
-        * buffers in the buffer descriptors, and the
-        * virtual address for us to work with.
-        */
-       mem_addr = pinfo->mem_addr;
-       pinfo->rx_cur = pinfo->rx_bd_base;
-       for (bdp = pinfo->rx_bd_base, i = 0; i < pinfo->rx_nrfifos; i++, bdp++) {
-               bdp->cbd_bufaddr = virt_to_bus(mem_addr);
-               bdp->cbd_sc = BD_SC_EMPTY | BD_SC_INTRPT | (i < (pinfo->rx_nrfifos - 1) ? 0 : BD_SC_WRAP);
-               mem_addr += pinfo->rx_fifosize;
-       }
-
-       /* Set the physical address of the host memory
-        * buffers in the buffer descriptors, and the
-        * virtual address for us to work with.
-        */
-       mem_addr = pinfo->mem_addr + L1_CACHE_ALIGN(pinfo->rx_nrfifos * pinfo->rx_fifosize);
-       pinfo->tx_cur = pinfo->tx_bd_base;
-       for (bdp = pinfo->tx_bd_base, i = 0; i < pinfo->tx_nrfifos; i++, bdp++) {
-               bdp->cbd_bufaddr = virt_to_bus(mem_addr);
-               bdp->cbd_sc = BD_SC_INTRPT | (i < (pinfo->tx_nrfifos - 1) ? 0 : BD_SC_WRAP);
-               mem_addr += pinfo->tx_fifosize;
-       }
-
-       /* Store address */
-       pinfo->smcup->smc_rbase = (u_char *)pinfo->rx_bd_base - DPRAM_BASE;
-       pinfo->smcup->smc_tbase = (u_char *)pinfo->tx_bd_base - DPRAM_BASE;
-
-       /* Set up the uart parameters in the
-        * parameter ram.
-        */
-       cpm_set_smc_fcr(up);
-
-       /* Using idle charater time requires some additional tuning.  */
-       up->smc_mrblr = pinfo->rx_fifosize;
-       up->smc_maxidl = pinfo->rx_fifosize;
-       up->smc_brkcr = 1;
-
-       cpm_line_cr_cmd(line, CPM_CR_INIT_TRX);
-
-       /* Set UART mode, according to the parameters */
-       sp->smc_smcmr = smcr_mk_clen(bits) | cval | SMCMR_SM_UART;
-
-       /* Enable only rx interrupts clear all pending events. */
-       sp->smc_smcm = SMCM_RX;
-       sp->smc_smce = 0xff;
-
-       sp->smc_smcmr |= (SMCMR_REN | SMCMR_TEN);
-}
-
-/*
- * Initialize port. This is called from early_console stuff
- * so we have to be careful here !
- */
-static int cpm_uart_request_port(struct uart_port *port)
-{
-       struct uart_cpm_port *pinfo = (struct uart_cpm_port *)port;
-       int ret;
-
-       pr_debug("CPM uart[%d]:request port\n", port->line);
-
-       if (pinfo->flags & FLAG_CONSOLE)
-               return 0;
-
-       /*
-        * Setup any port IO, connect any baud rate generators,
-        * etc.  This is expected to be handled by board
-        * dependant code 
-        */
-       if (pinfo->set_lineif)
-               pinfo->set_lineif(pinfo);
-
-       ret = cpm_uart_allocbuf(pinfo, 0);
-       if (ret)
-               return ret;
-
-       return 0;
-}
-
-static void cpm_uart_release_port(struct uart_port *port)
-{
-       struct uart_cpm_port *pinfo = (struct uart_cpm_port *)port;
-
-       if (!(pinfo->flags & FLAG_CONSOLE))
-               cpm_uart_freebuf(pinfo);
-}
-
-/*
- * Configure/autoconfigure the port.
- */
-static void cpm_uart_config_port(struct uart_port *port, int flags)
-{
-       pr_debug("CPM uart[%d]:config_port\n", port->line);
-
-       if (flags & UART_CONFIG_TYPE) {
-               port->type = PORT_CPM;
-               cpm_uart_request_port(port);
-       }
-}
-static struct uart_ops cpm_uart_pops = {
-       .tx_empty       = cpm_uart_tx_empty,
-       .set_mctrl      = cpm_uart_set_mctrl,
-       .get_mctrl      = cpm_uart_get_mctrl,
-       .stop_tx        = cpm_uart_stop_tx,
-       .start_tx       = cpm_uart_start_tx,
-       .stop_rx        = cpm_uart_stop_rx,
-       .enable_ms      = cpm_uart_enable_ms,
-       .break_ctl      = cpm_uart_break_ctl,
-       .startup        = cpm_uart_startup,
-       .shutdown       = cpm_uart_shutdown,
-       .set_termios    = cpm_uart_set_termios,
-       .type           = cpm_uart_type,
-       .release_port   = cpm_uart_release_port,
-       .request_port   = cpm_uart_request_port,
-       .config_port    = cpm_uart_config_port,
-       .verify_port    = cpm_uart_verify_port,
-};
-
-struct uart_cpm_port cpm_uart_ports[UART_NR] = {
-       [UART_SMC1] = {
-               .port = {
-                       .irq            = SMC1_IRQ,
-                       .ops            = &cpm_uart_pops,
-                       .iotype         = SERIAL_IO_MEM,
-               },
-               .flags = FLAG_SMC,
-               .tx_nrfifos = TX_NUM_FIFO,
-               .tx_fifosize = TX_BUF_SIZE,
-               .rx_nrfifos = RX_NUM_FIFO, 
-               .rx_fifosize = RX_BUF_SIZE,
-               .set_lineif = smc1_lineif,
-       },
-       [UART_SMC2] = {
-               .port = {
-                       .irq            = SMC2_IRQ,
-                       .ops            = &cpm_uart_pops,
-                       .iotype         = SERIAL_IO_MEM,
-               },
-               .flags = FLAG_SMC,
-               .tx_nrfifos = TX_NUM_FIFO,
-               .tx_fifosize = TX_BUF_SIZE,
-               .rx_nrfifos = RX_NUM_FIFO, 
-               .rx_fifosize = RX_BUF_SIZE,
-               .set_lineif = smc2_lineif,
-       },
-       [UART_SCC1] = {
-               .port = {
-                       .irq            = SCC1_IRQ,
-                       .ops            = &cpm_uart_pops,
-                       .iotype         = SERIAL_IO_MEM,
-               },
-               .tx_nrfifos = TX_NUM_FIFO,
-               .tx_fifosize = TX_BUF_SIZE,
-               .rx_nrfifos = RX_NUM_FIFO, 
-               .rx_fifosize = RX_BUF_SIZE,
-               .set_lineif = scc1_lineif,
-       },
-       [UART_SCC2] = {
-               .port = {
-                       .irq            = SCC2_IRQ,
-                       .ops            = &cpm_uart_pops,
-                       .iotype         = SERIAL_IO_MEM,
-               },
-               .tx_nrfifos = TX_NUM_FIFO,
-               .tx_fifosize = TX_BUF_SIZE,
-               .rx_nrfifos = RX_NUM_FIFO, 
-               .rx_fifosize = RX_BUF_SIZE,
-               .set_lineif = scc2_lineif,
-       },
-       [UART_SCC3] = {
-               .port = {
-                       .irq            = SCC3_IRQ,
-                       .ops            = &cpm_uart_pops,
-                       .iotype         = SERIAL_IO_MEM,
-               },
-               .tx_nrfifos = TX_NUM_FIFO,
-               .tx_fifosize = TX_BUF_SIZE,
-               .rx_nrfifos = RX_NUM_FIFO, 
-               .rx_fifosize = RX_BUF_SIZE,
-               .set_lineif = scc3_lineif,
-       },
-       [UART_SCC4] = {
-               .port = {
-                       .irq            = SCC4_IRQ,
-                       .ops            = &cpm_uart_pops,
-                       .iotype         = SERIAL_IO_MEM,
-               },
-               .tx_nrfifos = TX_NUM_FIFO,
-               .tx_fifosize = TX_BUF_SIZE,
-               .rx_nrfifos = RX_NUM_FIFO, 
-               .rx_fifosize = RX_BUF_SIZE,
-               .set_lineif = scc4_lineif,
-       },
-};
-
-#ifdef CONFIG_SERIAL_CPM_CONSOLE
-/*
- *     Print a string to the serial port trying not to disturb
- *     any possible real use of the port...
- *
- *     Note that this is called with interrupts already disabled
- */
-static void cpm_uart_console_write(struct console *co, const char *s,
-                                  u_int count)
-{
-       struct uart_cpm_port *pinfo =
-           &cpm_uart_ports[cpm_uart_port_map[co->index]];
-       unsigned int i;
-       volatile cbd_t *bdp, *bdbase;
-       volatile unsigned char *cp;
-
-       if (IS_DISCARDING(pinfo))
-               return;
-
-       /* Get the address of the host memory buffer.
-        */
-       bdp = pinfo->tx_cur;
-       bdbase = pinfo->tx_bd_base;
-
-       /*
-        * 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) != 0)
-                       ;
-
-               /* Send the character out.
-                * If the buffer address is in the CPM DPRAM, don't
-                * convert it.
-                */
-               if ((uint) (bdp->cbd_bufaddr) > (uint) CPM_ADDR)
-                       cp = (unsigned char *) (bdp->cbd_bufaddr);
-               else
-                       cp = bus_to_virt(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) != 0)
-                               ;
-
-                       if ((uint) (bdp->cbd_bufaddr) > (uint) CPM_ADDR)
-                               cp = (unsigned char *) (bdp->cbd_bufaddr);
-                       else
-                               cp = bus_to_virt(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) != 0)
-               ;
-
-       pinfo->tx_cur = (volatile cbd_t *) bdp;
-}
-
-/*
- * Setup console. Be careful is called early !
- */
-static int __init cpm_uart_console_setup(struct console *co, char *options)
-{
-       struct uart_port *port;
-       struct uart_cpm_port *pinfo;
-       int baud = 38400;
-       int bits = 8;
-       int parity = 'n';
-       int flow = 'n';
-       int ret;
-
-       port =
-           (struct uart_port *)&cpm_uart_ports[cpm_uart_port_map[co->index]];
-       pinfo = (struct uart_cpm_port *)port;
-       
-       pinfo->flags |= FLAG_CONSOLE;
-
-       if (options) {
-               uart_parse_options(options, &baud, &parity, &bits, &flow);
-       } else {
-               bd_t *bd = (bd_t *) __res;
-
-               if (bd->bi_baudrate)
-                       baud = bd->bi_baudrate;
-               else
-                       baud = 9600;
-       }
-
-       /*
-        * Setup any port IO, connect any baud rate generators,
-        * etc.  This is expected to be handled by board
-        * dependant code 
-        */
-       if (pinfo->set_lineif)
-               pinfo->set_lineif(pinfo);
-
-       ret = cpm_uart_allocbuf(pinfo, 1);
-       if (ret)
-               return ret;
-
-       uart_set_options(port, co, baud, parity, bits, flow);
-
-       return 0;
-}
-
-extern struct uart_driver cpm_reg;
-static struct console cpm_scc_uart_console = {
-       .name           "ttyCPM",
-       .write          cpm_uart_console_write,
-       .device         uart_console_device,
-       .setup          cpm_uart_console_setup,
-       .flags          CON_PRINTBUFFER,
-       .index          -1,
-       .data           = &cpm_reg,
-};
-
-int __init cpm_uart_console_init(void)
-{
-       int ret = cpm_uart_init_portdesc();
-
-       if (!ret)
-               register_console(&cpm_scc_uart_console);
-       return ret;
-}
-
-console_initcall(cpm_uart_console_init);
-
-#define CPM_UART_CONSOLE       &cpm_scc_uart_console
-#else
-#define CPM_UART_CONSOLE       NULL
-#endif
-
-static struct uart_driver cpm_reg = {
-       .owner          = THIS_MODULE,
-       .driver_name    = "ttyCPM",
-       .dev_name       = "ttyCPM",
-       .major          = SERIAL_CPM_MAJOR,
-       .minor          = SERIAL_CPM_MINOR,
-       .cons           = CPM_UART_CONSOLE,
-};
-
-static int __init cpm_uart_init(void)
-{
-       int ret, i;
-
-       printk(KERN_INFO "Serial: CPM driver $Revision: 0.01 $\n");
-
-#ifndef CONFIG_SERIAL_CPM_CONSOLE
-       ret = cpm_uart_init_portdesc();
-       if (ret)
-               return ret;
-#endif
-
-       cpm_reg.nr = cpm_uart_nr;
-       ret = uart_register_driver(&cpm_reg);
-
-       if (ret)
-               return ret;
-
-       for (i = 0; i < cpm_uart_nr; i++) {
-               int con = cpm_uart_port_map[i];
-               cpm_uart_ports[con].port.line = i;
-               cpm_uart_ports[con].port.flags = UPF_BOOT_AUTOCONF;
-               uart_add_one_port(&cpm_reg, &cpm_uart_ports[con].port);
-       }
-
-       return ret;
-}
-
-static void __exit cpm_uart_exit(void)
-{
-       int i;
-
-       for (i = 0; i < cpm_uart_nr; i++) {
-               int con = cpm_uart_port_map[i];
-               uart_remove_one_port(&cpm_reg, &cpm_uart_ports[con].port);
-       }
-
-       uart_unregister_driver(&cpm_reg);
-}
-
-module_init(cpm_uart_init);
-module_exit(cpm_uart_exit);
-
-MODULE_AUTHOR("Kumar Gala/Antoniou Pantelis");
-MODULE_DESCRIPTION("CPM SCC/SMC port driver $Revision: 0.01 $");
-MODULE_LICENSE("GPL");
-MODULE_ALIAS_CHARDEV(SERIAL_CPM_MAJOR, SERIAL_CPM_MINOR);
diff --git a/drivers/serial/cpm_uart/cpm_uart_cpm1.c b/drivers/serial/cpm_uart/cpm_uart_cpm1.c
deleted file mode 100644 (file)
index 7c940b5..0000000
+++ /dev/null
@@ -1,275 +0,0 @@
-/*
- *  linux/drivers/serial/cpm_uart.c
- *
- *  Driver for CPM (SCC/SMC) serial ports; CPM1 definitions
- *
- *  Maintainer: Kumar Gala (kumar.gala@freescale.com) (CPM2)
- *              Pantelis Antoniou (panto@intracom.gr) (CPM1)
- * 
- *  Copyright (C) 2004 Freescale Semiconductor, Inc.
- *            (C) 2004 Intracom, S.A.
- *
- * 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/tty.h>
-#include <linux/ioport.h>
-#include <linux/init.h>
-#include <linux/serial.h>
-#include <linux/console.h>
-#include <linux/sysrq.h>
-#include <linux/device.h>
-#include <linux/bootmem.h>
-#include <linux/dma-mapping.h>
-
-#include <asm/io.h>
-#include <asm/irq.h>
-
-#include <linux/serial_core.h>
-#include <linux/kernel.h>
-
-#include "cpm_uart.h"
-
-/**************************************************************/
-
-void cpm_line_cr_cmd(int line, int cmd)
-{
-       ushort val;
-       volatile cpm8xx_t *cp = cpmp;
-
-       switch (line) {
-       case UART_SMC1:
-               val = mk_cr_cmd(CPM_CR_CH_SMC1, cmd) | CPM_CR_FLG;
-               break;
-       case UART_SMC2:
-               val = mk_cr_cmd(CPM_CR_CH_SMC2, cmd) | CPM_CR_FLG;
-               break;
-       case UART_SCC1:
-               val = mk_cr_cmd(CPM_CR_CH_SCC1, cmd) | CPM_CR_FLG;
-               break;
-       case UART_SCC2:
-               val = mk_cr_cmd(CPM_CR_CH_SCC2, cmd) | CPM_CR_FLG;
-               break;
-       case UART_SCC3:
-               val = mk_cr_cmd(CPM_CR_CH_SCC3, cmd) | CPM_CR_FLG;
-               break;
-       case UART_SCC4:
-               val = mk_cr_cmd(CPM_CR_CH_SCC4, cmd) | CPM_CR_FLG;
-               break;
-       default:
-               return;
-
-       }
-       cp->cp_cpcr = val;
-       while (cp->cp_cpcr & CPM_CR_FLG) ;
-}
-
-void smc1_lineif(struct uart_cpm_port *pinfo)
-{
-       volatile cpm8xx_t *cp = cpmp;
-
-       cp->cp_pbpar |= 0x000000c0;
-       cp->cp_pbdir &= ~0x000000c0;
-       cp->cp_pbodr &= ~0x000000c0;
-
-       pinfo->brg = 1;
-}
-
-void smc2_lineif(struct uart_cpm_port *pinfo)
-{
-       /* XXX SMC2: insert port configuration here */
-       pinfo->brg = 2;
-}
-
-void scc1_lineif(struct uart_cpm_port *pinfo)
-{
-       /* XXX SCC1: insert port configuration here */
-       pinfo->brg = 1;
-}
-
-void scc2_lineif(struct uart_cpm_port *pinfo)
-{
-       /* XXX SCC2: insert port configuration here */
-       pinfo->brg = 2;
-}
-
-void scc3_lineif(struct uart_cpm_port *pinfo)
-{
-       /* XXX SCC3: insert port configuration here */
-       pinfo->brg = 3;
-}
-
-void scc4_lineif(struct uart_cpm_port *pinfo)
-{
-       /* XXX SCC4: insert port configuration here */
-       pinfo->brg = 4;
-}
-
-/*
- * Allocate DP-Ram and memory buffers. We need to allocate a transmit and 
- * receive buffer descriptors from dual port ram, and a character
- * buffer area from host mem. If we are allocating for the console we need
- * to do it from bootmem
- */
-int cpm_uart_allocbuf(struct uart_cpm_port *pinfo, unsigned int is_con)
-{
-       int dpmemsz, memsz;
-       u8 *dp_mem;
-       uint dp_addr;
-       u8 *mem_addr;
-       dma_addr_t dma_addr;
-
-       pr_debug("CPM uart[%d]:allocbuf\n", pinfo->port.line);
-
-       dpmemsz = sizeof(cbd_t) * (pinfo->rx_nrfifos + pinfo->tx_nrfifos);
-       dp_mem = m8xx_cpm_dpalloc(dpmemsz);
-       if (dp_mem == NULL) {
-               printk(KERN_ERR
-                      "cpm_uart_cpm1.c: could not allocate buffer descriptors\n");
-               return -ENOMEM;
-       }
-       dp_addr = m8xx_cpm_dpram_offset(dp_mem);
-
-       memsz = L1_CACHE_ALIGN(pinfo->rx_nrfifos * pinfo->rx_fifosize) +
-           L1_CACHE_ALIGN(pinfo->tx_nrfifos * pinfo->tx_fifosize);
-       if (is_con) {
-               mem_addr = (u8 *) m8xx_cpm_hostalloc(memsz);
-               dma_addr = 0;
-       } else
-               mem_addr = dma_alloc_coherent(NULL, memsz, &dma_addr,
-                                             GFP_KERNEL);
-
-       if (mem_addr == NULL) {
-               m8xx_cpm_dpfree(dp_mem);
-               printk(KERN_ERR
-                      "cpm_uart_cpm1.c: could not allocate coherent memory\n");
-               return -ENOMEM;
-       }
-
-       pinfo->dp_addr = dp_addr;
-       pinfo->mem_addr = mem_addr;
-       pinfo->dma_addr = dma_addr;
-
-       pinfo->rx_buf = mem_addr;
-       pinfo->tx_buf = pinfo->rx_buf + L1_CACHE_ALIGN(pinfo->rx_nrfifos
-                                                      * pinfo->rx_fifosize);
-
-       pinfo->rx_bd_base = (volatile cbd_t *)dp_mem;
-       pinfo->tx_bd_base = pinfo->rx_bd_base + pinfo->rx_nrfifos;
-
-       return 0;
-}
-
-void cpm_uart_freebuf(struct uart_cpm_port *pinfo)
-{
-       dma_free_coherent(NULL, L1_CACHE_ALIGN(pinfo->rx_nrfifos *
-                                              pinfo->rx_fifosize) +
-                         L1_CACHE_ALIGN(pinfo->tx_nrfifos *
-                                        pinfo->tx_fifosize), pinfo->mem_addr,
-                         pinfo->dma_addr);
-
-       m8xx_cpm_dpfree(m8xx_cpm_dpram_addr(pinfo->dp_addr));
-}
-
-/* Setup any dynamic params in the uart desc */
-int cpm_uart_init_portdesc(void)
-{
-       pr_debug("CPM uart[-]:init portdesc\n");
-
-       cpm_uart_nr = 0;
-#ifdef CONFIG_SERIAL_CPM_SMC1
-       cpm_uart_ports[UART_SMC1].smcp = &cpmp->cp_smc[0];
-       cpm_uart_ports[UART_SMC1].smcup =
-           (smc_uart_t *) & cpmp->cp_dparam[PROFF_SMC1];
-       cpm_uart_ports[UART_SMC1].port.mapbase =
-           (unsigned long)&cpmp->cp_smc[0];
-       cpm_uart_ports[UART_SMC1].smcp->smc_smcm |= (SMCM_RX | SMCM_TX);
-       cpm_uart_ports[UART_SMC1].smcp->smc_smcmr &= ~(SMCMR_REN | SMCMR_TEN);
-       cpm_uart_ports[UART_SMC1].port.uartclk = (((bd_t *) __res)->bi_intfreq);
-       cpm_uart_port_map[cpm_uart_nr++] = UART_SMC1;
-#endif
-
-#ifdef CONFIG_SERIAL_CPM_SMC2
-       cpm_uart_ports[UART_SMC2].smcp = &cpmp->cp_smc[1];
-       cpm_uart_ports[UART_SMC2].smcup =
-           (smc_uart_t *) & cpmp->cp_dparam[PROFF_SMC2];
-       cpm_uart_ports[UART_SMC2].port.mapbase =
-           (unsigned long)&cpmp->cp_smc[1];
-       cpm_uart_ports[UART_SMC2].smcp->smc_smcm |= (SMCM_RX | SMCM_TX);
-       cpm_uart_ports[UART_SMC2].smcp->smc_smcmr &= ~(SMCMR_REN | SMCMR_TEN);
-       cpm_uart_ports[UART_SMC2].port.uartclk = (((bd_t *) __res)->bi_intfreq);
-       cpm_uart_port_map[cpm_uart_nr++] = UART_SMC2;
-#endif
-
-#ifdef CONFIG_SERIAL_CPM_SCC1
-       cpm_uart_ports[UART_SCC1].sccp = &cpmp->cp_scc[0];
-       cpm_uart_ports[UART_SCC1].sccup =
-           (scc_uart_t *) & cpmp->cp_dparam[PROFF_SCC1];
-       cpm_uart_ports[UART_SCC1].port.mapbase =
-           (unsigned long)&cpmp->cp_scc[0];
-       cpm_uart_ports[UART_SCC1].sccp->scc_sccm &=
-           ~(UART_SCCM_TX | UART_SCCM_RX);
-       cpm_uart_ports[UART_SCC1].sccp->scc_gsmrl &=
-           ~(SCC_GSMRL_ENR | SCC_GSMRL_ENT);
-       cpm_uart_ports[UART_SCC1].port.uartclk = (((bd_t *) __res)->bi_intfreq);
-       cpm_uart_port_map[cpm_uart_nr++] = UART_SCC1;
-#endif
-
-#ifdef CONFIG_SERIAL_CPM_SCC2
-       cpm_uart_ports[UART_SCC2].sccp = &cpmp->cp_scc[1];
-       cpm_uart_ports[UART_SCC2].sccup =
-           (scc_uart_t *) & cpmp->cp_dparam[PROFF_SCC2];
-       cpm_uart_ports[UART_SCC2].port.mapbase =
-           (unsigned long)&cpmp->cp_scc[1];
-       cpm_uart_ports[UART_SCC2].sccp->scc_sccm &=
-           ~(UART_SCCM_TX | UART_SCCM_RX);
-       cpm_uart_ports[UART_SCC2].sccp->scc_gsmrl &=
-           ~(SCC_GSMRL_ENR | SCC_GSMRL_ENT);
-       cpm_uart_ports[UART_SCC2].port.uartclk = (((bd_t *) __res)->bi_intfreq);
-       cpm_uart_port_map[cpm_uart_nr++] = UART_SCC2;
-#endif
-
-#ifdef CONFIG_SERIAL_CPM_SCC3
-       cpm_uart_ports[UART_SCC3].sccp = &cpmp->cp_scc[2];
-       cpm_uart_ports[UART_SCC3].sccup =
-           (scc_uart_t *) & cpmp->cp_dparam[PROFF_SCC3];
-       cpm_uart_ports[UART_SCC3].port.mapbase =
-           (unsigned long)&cpmp->cp_scc[2];
-       cpm_uart_ports[UART_SCC3].sccp->scc_sccm &=
-           ~(UART_SCCM_TX | UART_SCCM_RX);
-       cpm_uart_ports[UART_SCC3].sccp->scc_gsmrl &=
-           ~(SCC_GSMRL_ENR | SCC_GSMRL_ENT);
-       cpm_uart_ports[UART_SCC3].port.uartclk = (((bd_t *) __res)->bi_intfreq);
-       cpm_uart_port_map[cpm_uart_nr++] = UART_SCC3;
-#endif
-
-#ifdef CONFIG_SERIAL_CPM_SCC4
-       cpm_uart_ports[UART_SCC4].sccp = &cpmp->cp_scc[3];
-       cpm_uart_ports[UART_SCC4].sccup =
-           (scc_uart_t *) & cpmp->cp_dparam[PROFF_SCC4];
-       cpm_uart_ports[UART_SCC4].port.mapbase =
-           (unsigned long)&cpmp->cp_scc[3];
-       cpm_uart_ports[UART_SCC4].sccp->scc_sccm &=
-           ~(UART_SCCM_TX | UART_SCCM_RX);
-       cpm_uart_ports[UART_SCC4].sccp->scc_gsmrl &=
-           ~(SCC_GSMRL_ENR | SCC_GSMRL_ENT);
-       cpm_uart_ports[UART_SCC4].port.uartclk = (((bd_t *) __res)->bi_intfreq);
-       cpm_uart_port_map[cpm_uart_nr++] = UART_SCC4;
-#endif
-       return 0;
-}
diff --git a/drivers/serial/cpm_uart/cpm_uart_cpm1.h b/drivers/serial/cpm_uart/cpm_uart_cpm1.h
deleted file mode 100644 (file)
index 155050b..0000000
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * linux/drivers/serial/cpm_uart_cpm1.h
- *
- * Driver for CPM (SCC/SMC) serial ports
- * 
- * definitions for cpm1
- *
- */
-
-#ifndef CPM_UART_CPM1_H
-#define CPM_UART_CPM1_H
-
-#include <asm/commproc.h>
-
-/* defines for IRQs */
-#define SMC1_IRQ       (CPM_IRQ_OFFSET + CPMVEC_SMC1)
-#define SMC2_IRQ       (CPM_IRQ_OFFSET + CPMVEC_SMC2)
-#define SCC1_IRQ       (CPM_IRQ_OFFSET + CPMVEC_SCC1)
-#define SCC2_IRQ       (CPM_IRQ_OFFSET + CPMVEC_SCC2)
-#define SCC3_IRQ       (CPM_IRQ_OFFSET + CPMVEC_SCC3)
-#define SCC4_IRQ       (CPM_IRQ_OFFSET + CPMVEC_SCC4)
-
-/* the CPM address */
-#define CPM_ADDR       IMAP_ADDR
-
-static inline void cpm_set_brg(int brg, int baud)
-{
-       m8xx_cpm_setbrg(brg, baud);
-}
-
-static inline void cpm_set_scc_fcr(volatile scc_uart_t * sup)
-{
-       sup->scc_genscc.scc_rfcr = SMC_EB;
-       sup->scc_genscc.scc_tfcr = SMC_EB;
-}
-
-static inline void cpm_set_smc_fcr(volatile smc_uart_t * up)
-{
-       up->smc_rfcr = SMC_EB;
-       up->smc_tfcr = SMC_EB;
-}
-
-#define DPRAM_BASE     ((unsigned char *)&cpmp->cp_dpmem[0])
-
-#endif
diff --git a/drivers/serial/cpm_uart/cpm_uart_cpm2.c b/drivers/serial/cpm_uart/cpm_uart_cpm2.c
deleted file mode 100644 (file)
index d256688..0000000
+++ /dev/null
@@ -1,328 +0,0 @@
-/*
- *  linux/drivers/serial/cpm_uart_cpm2.c
- *
- *  Driver for CPM (SCC/SMC) serial ports; CPM2 definitions
- *
- *  Maintainer: Kumar Gala (kumar.gala@freescale.com) (CPM2)
- *              Pantelis Antoniou (panto@intracom.gr) (CPM1)
- * 
- *  Copyright (C) 2004 Freescale Semiconductor, Inc.
- *            (C) 2004 Intracom, S.A.
- *
- * 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/tty.h>
-#include <linux/ioport.h>
-#include <linux/init.h>
-#include <linux/serial.h>
-#include <linux/console.h>
-#include <linux/sysrq.h>
-#include <linux/device.h>
-#include <linux/bootmem.h>
-#include <linux/dma-mapping.h>
-
-#include <asm/io.h>
-#include <asm/irq.h>
-
-#include <linux/serial_core.h>
-#include <linux/kernel.h>
-
-#include "cpm_uart.h"
-
-/**************************************************************/
-
-void cpm_line_cr_cmd(int line, int cmd)
-{
-       volatile cpm_cpm2_t *cp = cpmp;
-       ulong val;
-
-       switch (line) {
-       case UART_SMC1:
-               val = mk_cr_cmd(CPM_CR_SMC1_PAGE, CPM_CR_SMC1_SBLOCK, 0,
-                               cmd) | CPM_CR_FLG;
-               break;
-       case UART_SMC2:
-               val = mk_cr_cmd(CPM_CR_SMC2_PAGE, CPM_CR_SMC2_SBLOCK, 0,
-                               cmd) | CPM_CR_FLG;
-               break;
-       case UART_SCC1:
-               val = mk_cr_cmd(CPM_CR_SCC1_PAGE, CPM_CR_SCC1_SBLOCK, 0,
-                               cmd) | CPM_CR_FLG;
-               break;
-       case UART_SCC2:
-               val = mk_cr_cmd(CPM_CR_SCC2_PAGE, CPM_CR_SCC2_SBLOCK, 0,
-                               cmd) | CPM_CR_FLG;
-               break;
-       case UART_SCC3:
-               val = mk_cr_cmd(CPM_CR_SCC3_PAGE, CPM_CR_SCC3_SBLOCK, 0,
-                               cmd) | CPM_CR_FLG;
-               break;
-       case UART_SCC4:
-               val = mk_cr_cmd(CPM_CR_SCC4_PAGE, CPM_CR_SCC4_SBLOCK, 0,
-                               cmd) | CPM_CR_FLG;
-               break;
-       default:
-               return;
-
-       }
-       cp->cp_cpcr = val;
-       while (cp->cp_cpcr & CPM_CR_FLG) ;
-}
-
-void smc1_lineif(struct uart_cpm_port *pinfo)
-{
-       volatile iop_cpm2_t *io = &cpm2_immr->im_ioport;
-
-       /* SMC1 is only on port D */
-       io->iop_ppard |= 0x00c00000;
-       io->iop_pdird |= 0x00400000;
-       io->iop_pdird &= ~0x00800000;
-       io->iop_psord &= ~0x00c00000;
-
-       /* Wire BRG1 to SMC1 */
-       cpm2_immr->im_cpmux.cmx_smr &= 0x0f;
-       pinfo->brg = 1;
-}
-
-void smc2_lineif(struct uart_cpm_port *pinfo)
-{
-       volatile iop_cpm2_t *io = &cpm2_immr->im_ioport;
-
-       /* SMC2 is only on port A */
-       io->iop_ppara |= 0x00c00000;
-       io->iop_pdira |= 0x00400000;
-       io->iop_pdira &= ~0x00800000;
-       io->iop_psora &= ~0x00c00000;
-
-       /* Wire BRG2 to SMC2 */
-       cpm2_immr->im_cpmux.cmx_smr &= 0xf0;
-       pinfo->brg = 2;
-}
-
-void scc1_lineif(struct uart_cpm_port *pinfo)
-{
-       volatile iop_cpm2_t *io = &cpm2_immr->im_ioport;
-
-       /* 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 */
-
-       /* Wire BRG1 to SCC1 */
-       cpm2_immr->im_cpmux.cmx_scr &= ~0x00ffffff;
-       cpm2_immr->im_cpmux.cmx_scr |= 0x00000000;
-       pinfo->brg = 1;
-}
-
-void scc2_lineif(struct uart_cpm_port *pinfo)
-{
-       volatile iop_cpm2_t *io = &cpm2_immr->im_ioport;
-       io->iop_pparb |= 0x008b0000;
-       io->iop_pdirb |= 0x00880000;
-       io->iop_psorb |= 0x00880000;
-       io->iop_pdirb &= ~0x00030000;
-       io->iop_psorb &= ~0x00030000;
-       cpm2_immr->im_cpmux.cmx_scr &= ~0xff00ffff;
-       cpm2_immr->im_cpmux.cmx_scr |= 0x00090000;
-       pinfo->brg = 2;
-}
-
-void scc3_lineif(struct uart_cpm_port *pinfo)
-{
-       volatile iop_cpm2_t *io = &cpm2_immr->im_ioport;
-       io->iop_pparb |= 0x008b0000;
-       io->iop_pdirb |= 0x00880000;
-       io->iop_psorb |= 0x00880000;
-       io->iop_pdirb &= ~0x00030000;
-       io->iop_psorb &= ~0x00030000;
-       cpm2_immr->im_cpmux.cmx_scr &= ~0xffff00ff;
-       cpm2_immr->im_cpmux.cmx_scr |= 0x00001200;
-       pinfo->brg = 3;
-}
-
-void scc4_lineif(struct uart_cpm_port *pinfo)
-{
-       volatile iop_cpm2_t *io = &cpm2_immr->im_ioport;
-
-       io->iop_ppard |= 0x00000600;
-       io->iop_psord &= ~0x00000600;   /* Tx/Rx */
-       io->iop_pdird &= ~0x00000200;   /* Rx */
-       io->iop_pdird |= 0x00000400;    /* Tx */
-
-       cpm2_immr->im_cpmux.cmx_scr &= ~0xffffff00;
-       cpm2_immr->im_cpmux.cmx_scr |= 0x0000001b;
-       pinfo->brg = 4;
-}
-
-/*
- * Allocate DP-Ram and memory buffers. We need to allocate a transmit and 
- * receive buffer descriptors from dual port ram, and a character
- * buffer area from host mem. If we are allocating for the console we need
- * to do it from bootmem
- */
-int cpm_uart_allocbuf(struct uart_cpm_port *pinfo, unsigned int is_con)
-{
-       int dpmemsz, memsz;
-       u8 *dp_mem;
-       uint dp_addr;
-       u8 *mem_addr;
-       dma_addr_t dma_addr = 0;
-
-       pr_debug("CPM uart[%d]:allocbuf\n", pinfo->port.line);
-
-       dpmemsz = sizeof(cbd_t) * (pinfo->rx_nrfifos + pinfo->tx_nrfifos);
-       dp_mem = cpm2_dpalloc(dpmemsz, 8);
-       if (dp_mem == NULL) {
-               printk(KERN_ERR
-                      "cpm_uart_cpm1.c: could not allocate buffer descriptors\n");
-               return -ENOMEM;
-       }
-
-       dp_addr = cpm2_dpram_offset(dp_mem);
-
-       memsz = L1_CACHE_ALIGN(pinfo->rx_nrfifos * pinfo->rx_fifosize) +
-           L1_CACHE_ALIGN(pinfo->tx_nrfifos * pinfo->tx_fifosize);
-       if (is_con)
-               mem_addr = alloc_bootmem(memsz);
-       else
-               mem_addr = dma_alloc_coherent(NULL, memsz, &dma_addr,
-                                             GFP_KERNEL);
-
-       if (mem_addr == NULL) {
-               cpm2_dpfree(dp_mem);
-               printk(KERN_ERR
-                      "cpm_uart_cpm1.c: could not allocate coherent memory\n");
-               return -ENOMEM;
-       }
-
-       pinfo->dp_addr = dp_addr;
-       pinfo->mem_addr = mem_addr;
-       pinfo->dma_addr = dma_addr;
-
-       pinfo->rx_buf = mem_addr;
-       pinfo->tx_buf = pinfo->rx_buf + L1_CACHE_ALIGN(pinfo->rx_nrfifos
-                                                      * pinfo->rx_fifosize);
-
-       pinfo->rx_bd_base = (volatile cbd_t *)dp_mem;
-       pinfo->tx_bd_base = pinfo->rx_bd_base + pinfo->rx_nrfifos;
-
-       return 0;
-}
-
-void cpm_uart_freebuf(struct uart_cpm_port *pinfo)
-{
-       dma_free_coherent(NULL, L1_CACHE_ALIGN(pinfo->rx_nrfifos *
-                                              pinfo->rx_fifosize) +
-                         L1_CACHE_ALIGN(pinfo->tx_nrfifos *
-                                        pinfo->tx_fifosize), pinfo->mem_addr,
-                         pinfo->dma_addr);
-
-       cpm2_dpfree(&pinfo->dp_addr);
-}
-
-/* Setup any dynamic params in the uart desc */
-int cpm_uart_init_portdesc(void)
-{
-       pr_debug("CPM uart[-]:init portdesc\n");
-
-       cpm_uart_nr = 0;
-#ifdef CONFIG_SERIAL_CPM_SMC1
-       cpm_uart_ports[UART_SMC1].smcp = (smc_t *) & cpm2_immr->im_smc[0];
-       cpm_uart_ports[UART_SMC1].smcup =
-           (smc_uart_t *) & cpm2_immr->im_dprambase[PROFF_SMC1];
-       cpm_uart_ports[UART_SMC1].port.mapbase =
-           (unsigned long)&cpm2_immr->im_smc[0];
-       cpm_uart_ports[UART_SMC1].smcp->smc_smcm |= (SMCM_RX | SMCM_TX);
-       cpm_uart_ports[UART_SMC1].smcp->smc_smcmr &= ~(SMCMR_REN | SMCMR_TEN);
-       cpm_uart_ports[UART_SMC1].port.uartclk = (((bd_t *) __res)->bi_intfreq);
-       cpm_uart_port_map[cpm_uart_nr++] = UART_SMC1;
-#endif
-
-#ifdef CONFIG_SERIAL_CPM_SMC2
-       cpm_uart_ports[UART_SMC2].smcp = (smc_t *) & cpm2_immr->im_smc[1];
-       cpm_uart_ports[UART_SMC2].smcup =
-           (smc_uart_t *) & cpm2_immr->im_dprambase[PROFF_SMC2];
-       cpm_uart_ports[UART_SMC2].port.mapbase =
-           (unsigned long)&cpm2_immr->im_smc[1];
-       cpm_uart_ports[UART_SMC2].smcp->smc_smcm |= (SMCM_RX | SMCM_TX);
-       cpm_uart_ports[UART_SMC2].smcp->smc_smcmr &= ~(SMCMR_REN | SMCMR_TEN);
-       cpm_uart_ports[UART_SMC2].port.uartclk = (((bd_t *) __res)->bi_intfreq);
-       cpm_uart_port_map[cpm_uart_nr++] = UART_SMC2;
-#endif
-
-#ifdef CONFIG_SERIAL_CPM_SCC1
-       cpm_uart_ports[UART_SCC1].sccp = (scc_t *) & cpm2_immr->im_scc[0];
-       cpm_uart_ports[UART_SCC1].sccup =
-           (scc_uart_t *) & cpm2_immr->im_dprambase[PROFF_SCC1];
-       cpm_uart_ports[UART_SCC1].port.mapbase =
-           (unsigned long)&cpm2_immr->im_scc[0];
-       cpm_uart_ports[UART_SCC1].sccp->scc_sccm &=
-           ~(UART_SCCM_TX | UART_SCCM_RX);
-       cpm_uart_ports[UART_SCC1].sccp->scc_gsmrl &=
-           ~(SCC_GSMRL_ENR | SCC_GSMRL_ENT);
-       cpm_uart_ports[UART_SCC1].port.uartclk = (((bd_t *) __res)->bi_intfreq);
-       cpm_uart_port_map[cpm_uart_nr++] = UART_SCC1;
-#endif
-
-#ifdef CONFIG_SERIAL_CPM_SCC2
-       cpm_uart_ports[UART_SCC2].sccp = (scc_t *) & cpm2_immr->im_scc[1];
-       cpm_uart_ports[UART_SCC2].sccup =
-           (scc_uart_t *) & cpm2_immr->im_dprambase[PROFF_SCC2];
-       cpm_uart_ports[UART_SCC2].port.mapbase =
-           (unsigned long)&cpm2_immr->im_scc[1];
-       cpm_uart_ports[UART_SCC2].sccp->scc_sccm &=
-           ~(UART_SCCM_TX | UART_SCCM_RX);
-       cpm_uart_ports[UART_SCC2].sccp->scc_gsmrl &=
-           ~(SCC_GSMRL_ENR | SCC_GSMRL_ENT);
-       cpm_uart_ports[UART_SCC2].port.uartclk = (((bd_t *) __res)->bi_intfreq);
-       cpm_uart_port_map[cpm_uart_nr++] = UART_SCC2;
-#endif
-
-#ifdef CONFIG_SERIAL_CPM_SCC3
-       cpm_uart_ports[UART_SCC3].sccp = (scc_t *) & cpm2_immr->im_scc[2];
-       cpm_uart_ports[UART_SCC3].sccup =
-           (scc_uart_t *) & cpm2_immr->im_dprambase[PROFF_SCC3];
-       cpm_uart_ports[UART_SCC3].port.mapbase =
-           (unsigned long)&cpm2_immr->im_scc[2];
-       cpm_uart_ports[UART_SCC3].sccp->scc_sccm &=
-           ~(UART_SCCM_TX | UART_SCCM_RX);
-       cpm_uart_ports[UART_SCC3].sccp->scc_gsmrl &=
-           ~(SCC_GSMRL_ENR | SCC_GSMRL_ENT);
-       cpm_uart_ports[UART_SCC3].port.uartclk = (((bd_t *) __res)->bi_intfreq);
-       cpm_uart_port_map[cpm_uart_nr++] = UART_SCC3;
-#endif
-
-#ifdef CONFIG_SERIAL_CPM_SCC4
-       cpm_uart_ports[UART_SCC4].sccp = (scc_t *) & cpm2_immr->im_scc[3];
-       cpm_uart_ports[UART_SCC4].sccup =
-           (scc_uart_t *) & cpm2_immr->im_dprambase[PROFF_SCC4];
-       cpm_uart_ports[UART_SCC4].port.mapbase =
-           (unsigned long)&cpm2_immr->im_scc[3];
-       cpm_uart_ports[UART_SCC4].sccp->scc_sccm &=
-           ~(UART_SCCM_TX | UART_SCCM_RX);
-       cpm_uart_ports[UART_SCC4].sccp->scc_gsmrl &=
-           ~(SCC_GSMRL_ENR | SCC_GSMRL_ENT);
-       cpm_uart_ports[UART_SCC4].port.uartclk = (((bd_t *) __res)->bi_intfreq);
-       cpm_uart_port_map[cpm_uart_nr++] = UART_SCC4;
-#endif
-
-       return 0;
-}
diff --git a/drivers/serial/cpm_uart/cpm_uart_cpm2.h b/drivers/serial/cpm_uart/cpm_uart_cpm2.h
deleted file mode 100644 (file)
index eb620bd..0000000
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * linux/drivers/serial/cpm_uart_cpm2.h
- *
- * Driver for CPM (SCC/SMC) serial ports
- * 
- * definitions for cpm2
- *
- */
-
-#ifndef CPM_UART_CPM2_H
-#define CPM_UART_CPM2_H
-
-#include <asm/cpm2.h>
-
-/* defines for IRQs */
-#define SMC1_IRQ       SIU_INT_SMC1
-#define SMC2_IRQ       SIU_INT_SMC2
-#define SCC1_IRQ       SIU_INT_SCC1
-#define SCC2_IRQ       SIU_INT_SCC2
-#define SCC3_IRQ       SIU_INT_SCC3
-#define SCC4_IRQ       SIU_INT_SCC4
-
-/* the CPM address */
-#define CPM_ADDR       CPM_MAP_ADDR
-
-static inline void cpm_set_brg(int brg, int baud)
-{
-       cpm2_setbrg(brg, baud);
-}
-
-static inline void cpm_set_scc_fcr(volatile scc_uart_t * sup)
-{
-       sup->scc_genscc.scc_rfcr = CPMFCR_GBL | CPMFCR_EB;
-       sup->scc_genscc.scc_tfcr = CPMFCR_GBL | CPMFCR_EB;
-}
-
-static inline void cpm_set_smc_fcr(volatile smc_uart_t * up)
-{
-       up->smc_rfcr = CPMFCR_GBL | CPMFCR_EB;
-       up->smc_tfcr = CPMFCR_GBL | CPMFCR_EB;
-}
-
-#define DPRAM_BASE     ((unsigned char *)&cpm2_immr->im_dprambase[0])
-
-#endif
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/serial_lh7a40x.c b/drivers/serial/serial_lh7a40x.c
deleted file mode 100644 (file)
index d863368..0000000
+++ /dev/null
@@ -1,708 +0,0 @@
-/* drivers/serial/serial_lh7a40x.c
- *
- *  Copyright (C) 2004 Coastal Environmental Systems
- *
- *  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.
- *
- */
-
-/* Driver for Sharp LH7A40X embedded serial ports
- *
- *  Based on drivers/char/serial.c, by Linus Torvalds, Theodore Ts'o.
- *  Based on drivers/serial/amba.c, by Deep Blue Solutions Ltd.
- *
- *  ---
- *
- * This driver supports the embedded UARTs of the Sharp LH7A40X series
- * CPUs.  While similar to the 16550 and other UART chips, there is
- * nothing close to register compatibility.  Moreover, some of the
- * modem control lines are not available, either in the chip or they
- * are lacking in the board-level implementation.
- *
- * - Use of SIRDIS
- *   For simplicity, we disable the IR functions of any UART whenever
- *   we enable it.
- *
- */
-
-#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 <asm/io.h>
-#include <asm/irq.h>
-
-#if defined(CONFIG_SERIAL_LH7A40X_CONSOLE) && defined(CONFIG_MAGIC_SYSRQ)
-#define SUPPORT_SYSRQ
-#endif
-
-#include <linux/serial_core.h>
-
-#include <asm/arch/serial.h>
-
-#define DEV_MAJOR      204
-#define DEV_MINOR      16
-#define DEV_NR         3
-
-#define ISR_LOOP_LIMIT 256
-
-#define UR(p,o)        _UR ((p)->membase, o)
-#define _UR(b,o) (*((volatile unsigned int*)(((unsigned char*) b) + (o))))
-#define BIT_CLR(p,o,m) UR(p,o) = UR(p,o) & (~(unsigned int)m)
-#define BIT_SET(p,o,m) UR(p,o) = UR(p,o) | ( (unsigned int)m)
-
-#define UART_REG_SIZE  32
-
-#define UARTEN         (0x01)          /* UART enable */
-#define SIRDIS         (0x02)          /* Serial IR disable (UART1 only) */
-
-#define RxEmpty                (0x10)
-#define TxEmpty                (0x80)
-#define TxFull         (0x20)
-#define nRxRdy         RxEmpty
-#define nTxRdy         TxFull
-#define TxBusy         (0x08)
-
-#define RxBreak                (0x0800)
-#define RxOverrunError (0x0400)
-#define RxParityError  (0x0200)
-#define RxFramingError (0x0100)
-#define RxError     (RxBreak | RxOverrunError | RxParityError | RxFramingError)
-
-#define DCD            (0x04)
-#define DSR            (0x02)
-#define CTS            (0x01)
-
-#define RxInt          (0x01)
-#define TxInt          (0x02)
-#define ModemInt       (0x04)
-#define RxTimeoutInt   (0x08)
-
-#define MSEOI          (0x10)
-
-#define WLEN_8         (0x60)
-#define WLEN_7         (0x40)
-#define WLEN_6         (0x20)
-#define WLEN_5         (0x00)
-#define WLEN           (0x60)  /* Mask for all word-length bits */
-#define STP2           (0x08)
-#define PEN            (0x02)  /* Parity Enable */
-#define EPS            (0x04)  /* Even Parity Set */
-#define FEN            (0x10)  /* FIFO Enable */
-#define BRK            (0x01)  /* Send Break */
-
-
-struct uart_port_lh7a40x {
-       struct uart_port port;
-       unsigned int statusPrev; /* Most recently read modem status */
-};
-
-static void lh7a40xuart_stop_tx (struct uart_port* port, unsigned int tty_stop)
-{
-       BIT_CLR (port, UART_R_INTEN, TxInt);
-}
-
-static void lh7a40xuart_start_tx (struct uart_port* port,
-                                 unsigned int tty_start)
-{
-       BIT_SET (port, UART_R_INTEN, TxInt);
-
-       /* *** FIXME: do I need to check for startup of the
-                     transmitter?  The old driver did, but AMBA
-                     doesn't . */
-}
-
-static void lh7a40xuart_stop_rx (struct uart_port* port)
-{
-       BIT_SET (port, UART_R_INTEN, RxTimeoutInt | RxInt);
-}
-
-static void lh7a40xuart_enable_ms (struct uart_port* port)
-{
-       BIT_SET (port, UART_R_INTEN, ModemInt);
-}
-
-static void
-#ifdef SUPPORT_SYSRQ
-lh7a40xuart_rx_chars (struct uart_port* port, struct pt_regs* regs)
-#else
-lh7a40xuart_rx_chars (struct uart_port* port)
-#endif
-{
-       struct tty_struct* tty = port->info->tty;
-       int cbRxMax = 256;      /* (Gross) limit on receive */
-       unsigned int data;      /* Received data and status */
-
-       while (!(UR (port, UART_R_STATUS) & nRxRdy) && --cbRxMax) {
-               if (tty->flip.count >= TTY_FLIPBUF_SIZE) {
-                       tty->flip.work.func((void*)tty);
-                       if (tty->flip.count >= TTY_FLIPBUF_SIZE) {
-                               printk(KERN_WARNING "TTY_DONT_FLIP set\n");
-                               return;
-                       }
-               }
-
-               data = UR (port, UART_R_DATA);
-
-               *tty->flip.char_buf_ptr = (unsigned char) data;
-               *tty->flip.flag_buf_ptr = TTY_NORMAL;
-               ++port->icount.rx;
-
-               if (data & RxError) {   /* Quick check, short-circuit */
-                       if (data & RxBreak) {
-                               data &= ~(RxFramingError | RxParityError);
-                               ++port->icount.brk;
-                               if (uart_handle_break (port))
-                                       continue;
-                       }
-                       else if (data & RxParityError)
-                               ++port->icount.parity;
-                       else if (data & RxFramingError)
-                               ++port->icount.frame;
-                       if (data & RxOverrunError)
-                               ++port->icount.overrun;
-
-                               /* Mask by termios, leave Rx'd byte */
-                       data &= port->read_status_mask | 0xff;
-
-                       if (data & RxBreak)
-                               *tty->flip.flag_buf_ptr = TTY_BREAK;
-                       else if (data & RxParityError)
-                               *tty->flip.flag_buf_ptr = TTY_PARITY;
-                       else if (data & RxFramingError)
-                               *tty->flip.flag_buf_ptr = TTY_FRAME;
-               }
-
-               if (uart_handle_sysrq_char (port, (unsigned char) data, regs))
-                       continue;
-
-               if ((data & port->ignore_status_mask) == 0) {
-                       ++tty->flip.flag_buf_ptr;
-                       ++tty->flip.char_buf_ptr;
-                       ++tty->flip.count;
-               }
-               if ((data & RxOverrunError)
-                   && tty->flip.count < TTY_FLIPBUF_SIZE) {
-                       /*
-                        * Overrun is special, since it's reported
-                        * immediately, and doesn't affect the current
-                        * character
-                        */
-                       *tty->flip.char_buf_ptr++ = 0;
-                       *tty->flip.flag_buf_ptr++ = TTY_OVERRUN;
-                       ++tty->flip.count;
-               }
-       }
-       tty_flip_buffer_push (tty);
-       return;
-}
-
-static void lh7a40xuart_tx_chars (struct uart_port* port)
-{
-       struct circ_buf* xmit = &port->info->xmit;
-       int cbTxMax = port->fifosize;
-
-       if (port->x_char) {
-               UR (port, UART_R_DATA) = port->x_char;
-               ++port->icount.tx;
-               port->x_char = 0;
-               return;
-       }
-       if (uart_circ_empty (xmit) || uart_tx_stopped (port)) {
-               lh7a40xuart_stop_tx (port, 0);
-               return;
-       }
-
-       /* Unlike the AMBA UART, the lh7a40x UART does not guarantee
-          that at least half of the FIFO is empty.  Instead, we check
-          status for every character.  Using the AMBA method causes
-          the transmitter to drop characters. */
-
-       do {
-               UR (port, UART_R_DATA) = xmit->buf[xmit->tail];
-               xmit->tail = (xmit->tail + 1) & (UART_XMIT_SIZE - 1);
-               ++port->icount.tx;
-               if (uart_circ_empty(xmit))
-                       break;
-       } while (!(UR (port, UART_R_STATUS) & nTxRdy)
-                && cbTxMax--);
-
-       if (uart_circ_chars_pending (xmit) < WAKEUP_CHARS)
-               uart_write_wakeup (port);
-
-       if (uart_circ_empty (xmit))
-               lh7a40xuart_stop_tx (port, 0);
-}
-
-static void lh7a40xuart_modem_status (struct uart_port* port)
-{
-       unsigned int status = UR (port, UART_R_STATUS);
-       unsigned int delta
-               = status ^ ((struct uart_port_lh7a40x*) port)->statusPrev;
-
-       BIT_SET (port, UART_R_RAWISR, MSEOI); /* Clear modem status intr */
-
-       if (!delta)             /* Only happens if we missed 2 transitions */
-               return;
-
-       ((struct uart_port_lh7a40x*) port)->statusPrev = status;
-
-       if (delta & DCD)
-               uart_handle_dcd_change (port, status & DCD);
-
-       if (delta & DSR)
-               ++port->icount.dsr;
-
-       if (delta & CTS)
-               uart_handle_cts_change (port, status & CTS);
-
-       wake_up_interruptible (&port->info->delta_msr_wait);
-}
-
-static irqreturn_t lh7a40xuart_int (int irq, void* dev_id,
-                                   struct pt_regs* regs)
-{
-       struct uart_port* port = dev_id;
-       unsigned int cLoopLimit = ISR_LOOP_LIMIT;
-       unsigned int isr = UR (port, UART_R_ISR);
-
-
-       do {
-               if (isr & (RxInt | RxTimeoutInt))
-#ifdef SUPPORT_SYSRQ
-                       lh7a40xuart_rx_chars(port, regs);
-#else
-                       lh7a40xuart_rx_chars(port);
-#endif
-               if (isr & ModemInt)
-                       lh7a40xuart_modem_status (port);
-               if (isr & TxInt)
-                       lh7a40xuart_tx_chars (port);
-
-               if (--cLoopLimit == 0)
-                       break;
-
-               isr = UR (port, UART_R_ISR);
-       } while (isr & (RxInt | TxInt | RxTimeoutInt));
-
-       return IRQ_HANDLED;
-}
-
-static unsigned int lh7a40xuart_tx_empty (struct uart_port* port)
-{
-       return (UR (port, UART_R_STATUS) & TxEmpty) ? TIOCSER_TEMT : 0;
-}
-
-static unsigned int lh7a40xuart_get_mctrl (struct uart_port* port)
-{
-       unsigned int result = 0;
-       unsigned int status = UR (port, UART_R_STATUS);
-
-       if (status & DCD)
-               result |= TIOCM_CAR;
-       if (status & DSR)
-               result |= TIOCM_DSR;
-       if (status & CTS)
-               result |= TIOCM_CTS;
-
-       return result;
-}
-
-static void lh7a40xuart_set_mctrl (struct uart_port* port, unsigned int mctrl)
-{
-       /* None of the ports supports DTR. UART1 supports RTS through GPIO. */
-       /* Note, kernel appears to be setting DTR and RTS on console. */
-
-       /* *** FIXME: this deserves more work.  There's some work in
-               tracing all of the IO pins. */
-#if 0
-       if( port->mapbase == UART1_PHYS) {
-               gpioRegs_t *gpio = (gpioRegs_t *)IO_ADDRESS(GPIO_PHYS);
-
-               if (mctrl & TIOCM_RTS)
-                       gpio->pbdr &= ~GPIOB_UART1_RTS;
-               else
-                       gpio->pbdr |= GPIOB_UART1_RTS;
-       }
-#endif
-}
-
-static void lh7a40xuart_break_ctl (struct uart_port* port, int break_state)
-{
-       unsigned long flags;
-
-       spin_lock_irqsave(&port->lock, flags);
-       if (break_state == -1)
-               BIT_SET (port, UART_R_FCON, BRK); /* Assert break */
-       else
-               BIT_CLR (port, UART_R_FCON, BRK); /* Deassert break */
-       spin_unlock_irqrestore(&port->lock, flags);
-}
-
-static int lh7a40xuart_startup (struct uart_port* port)
-{
-       int retval;
-
-       retval = request_irq (port->irq, lh7a40xuart_int, 0,
-                             "serial_lh7a40x", port);
-       if (retval)
-               return retval;
-
-                               /* Initial modem control-line settings */
-       ((struct uart_port_lh7a40x*) port)->statusPrev
-               = UR (port, UART_R_STATUS);
-
-       /* There is presently no configuration option to enable IR.
-          Thus, we always disable it. */
-
-       BIT_SET (port, UART_R_CON, UARTEN | SIRDIS);
-       BIT_SET (port, UART_R_INTEN, RxTimeoutInt | RxInt);
-
-       return 0;
-}
-
-static void lh7a40xuart_shutdown (struct uart_port* port)
-{
-       free_irq (port->irq, port);
-       BIT_CLR (port, UART_R_FCON, BRK | FEN);
-       BIT_CLR (port, UART_R_CON, UARTEN);
-}
-
-static void lh7a40xuart_set_termios (struct uart_port* port,
-                                    struct termios* termios,
-                                    struct termios* old)
-{
-       unsigned int con;
-       unsigned int inten;
-       unsigned int fcon;
-       unsigned long flags;
-       unsigned int baud;
-       unsigned int quot;
-
-       baud = uart_get_baud_rate (port, termios, old, 8, port->uartclk/16);
-       quot = uart_get_divisor (port, baud); /* -1 performed elsewhere */
-
-       switch (termios->c_cflag & CSIZE) {
-       case CS5:
-               fcon = WLEN_5;
-               break;
-       case CS6:
-               fcon = WLEN_6;
-               break;
-       case CS7:
-               fcon = WLEN_7;
-               break;
-       case CS8:
-       default:
-               fcon = WLEN_8;
-               break;
-       }
-       if (termios->c_cflag & CSTOPB)
-               fcon |= STP2;
-       if (termios->c_cflag & PARENB) {
-               fcon |= PEN;
-               if (!(termios->c_cflag & PARODD))
-                       fcon |= EPS;
-       }
-       if (port->fifosize > 1)
-               fcon |= FEN;
-
-       spin_lock_irqsave (&port->lock, flags);
-
-       uart_update_timeout (port, termios->c_cflag, baud);
-
-       port->read_status_mask = RxOverrunError;
-       if (termios->c_iflag & INPCK)
-               port->read_status_mask |= RxFramingError | RxParityError;
-       if (termios->c_iflag & (BRKINT | PARMRK))
-               port->read_status_mask |= RxBreak;
-
-               /* Figure mask for status we ignore */
-       port->ignore_status_mask = 0;
-       if (termios->c_iflag & IGNPAR)
-               port->ignore_status_mask |= RxFramingError | RxParityError;
-       if (termios->c_iflag & IGNBRK) {
-               port->ignore_status_mask |= RxBreak;
-               /* Ignore overrun when ignorning parity */
-               /* *** FIXME: is this in the right place? */
-               if (termios->c_iflag & IGNPAR)
-                       port->ignore_status_mask |= RxOverrunError;
-       }
-
-               /* Ignore all receive errors when receive disabled */
-       if ((termios->c_cflag & CREAD) == 0)
-               port->ignore_status_mask |= RxError;
-
-       con   = UR (port, UART_R_CON);
-       inten = (UR (port, UART_R_INTEN) & ~ModemInt);
-
-       if (UART_ENABLE_MS (port, termios->c_cflag))
-               inten |= ModemInt;
-
-       BIT_CLR (port, UART_R_CON, UARTEN);     /* Disable UART */
-       UR (port, UART_R_INTEN) = 0;            /* Disable interrupts */
-       UR (port, UART_R_BRCON) = quot - 1;     /* Set baud rate divisor */
-       UR (port, UART_R_FCON)  = fcon;         /* Set FIFO and frame ctrl */
-       UR (port, UART_R_INTEN) = inten;        /* Enable interrupts */
-       UR (port, UART_R_CON)   = con;          /* Restore UART mode */
-
-       spin_unlock_irqrestore(&port->lock, flags);
-}
-
-static const char* lh7a40xuart_type (struct uart_port* port)
-{
-       return port->type == PORT_LH7A40X ? "LH7A40X" : NULL;
-}
-
-static void lh7a40xuart_release_port (struct uart_port* port)
-{
-       release_mem_region (port->mapbase, UART_REG_SIZE);
-}
-
-static int lh7a40xuart_request_port (struct uart_port* port)
-{
-       return request_mem_region (port->mapbase, UART_REG_SIZE,
-                                  "serial_lh7a40x") != NULL
-               ? 0 : -EBUSY;
-}
-
-static void lh7a40xuart_config_port (struct uart_port* port, int flags)
-{
-       if (flags & UART_CONFIG_TYPE) {
-               port->type = PORT_LH7A40X;
-               lh7a40xuart_request_port (port);
-       }
-}
-
-static int lh7a40xuart_verify_port (struct uart_port* port,
-                                   struct serial_struct* ser)
-{
-       int ret = 0;
-
-       if (ser->type != PORT_UNKNOWN && ser->type != PORT_LH7A40X)
-               ret = -EINVAL;
-       if (ser->irq < 0 || ser->irq >= NR_IRQS)
-               ret = -EINVAL;
-       if (ser->baud_base < 9600) /* *** FIXME: is this true? */
-               ret = -EINVAL;
-       return ret;
-}
-
-static struct uart_ops lh7a40x_uart_ops = {
-       .tx_empty       = lh7a40xuart_tx_empty,
-       .set_mctrl      = lh7a40xuart_set_mctrl,
-       .get_mctrl      = lh7a40xuart_get_mctrl,
-       .stop_tx        = lh7a40xuart_stop_tx,
-       .start_tx       = lh7a40xuart_start_tx,
-       .stop_rx        = lh7a40xuart_stop_rx,
-       .enable_ms      = lh7a40xuart_enable_ms,
-       .break_ctl      = lh7a40xuart_break_ctl,
-       .startup        = lh7a40xuart_startup,
-       .shutdown       = lh7a40xuart_shutdown,
-       .set_termios    = lh7a40xuart_set_termios,
-       .type           = lh7a40xuart_type,
-       .release_port   = lh7a40xuart_release_port,
-       .request_port   = lh7a40xuart_request_port,
-       .config_port    = lh7a40xuart_config_port,
-       .verify_port    = lh7a40xuart_verify_port,
-};
-
-static struct uart_port_lh7a40x lh7a40x_ports[DEV_NR] = {
-       {
-               .port = {
-                       .membase        = (void*) io_p2v (UART1_PHYS),
-                       .mapbase        = UART1_PHYS,
-                       .iotype         = SERIAL_IO_MEM,
-                       .irq            = IRQ_UART1INTR,
-                       .uartclk        = 14745600/2,
-                       .fifosize       = 16,
-                       .ops            = &lh7a40x_uart_ops,
-                       .flags          = ASYNC_BOOT_AUTOCONF,
-                       .line           = 0,
-               },
-       },
-       {
-               .port = {
-                       .membase        = (void*) io_p2v (UART2_PHYS),
-                       .mapbase        = UART2_PHYS,
-                       .iotype         = SERIAL_IO_MEM,
-                       .irq            = IRQ_UART2INTR,
-                       .uartclk        = 14745600/2,
-                       .fifosize       = 16,
-                       .ops            = &lh7a40x_uart_ops,
-                       .flags          = ASYNC_BOOT_AUTOCONF,
-                       .line           = 1,
-               },
-       },
-       {
-               .port = {
-                       .membase        = (void*) io_p2v (UART3_PHYS),
-                       .mapbase        = UART3_PHYS,
-                       .iotype         = SERIAL_IO_MEM,
-                       .irq            = IRQ_UART3INTR,
-                       .uartclk        = 14745600/2,
-                       .fifosize       = 16,
-                       .ops            = &lh7a40x_uart_ops,
-                       .flags          = ASYNC_BOOT_AUTOCONF,
-                       .line           = 2,
-               },
-       },
-};
-
-#ifndef CONFIG_SERIAL_LH7A40X_CONSOLE
-# define LH7A40X_CONSOLE NULL
-#else
-# define LH7A40X_CONSOLE &lh7a40x_console
-
-
-static void lh7a40xuart_console_write (struct console* co,
-                                      const char* s,
-                                      unsigned int count)
-{
-       struct uart_port* port = &lh7a40x_ports[co->index].port;
-       unsigned int con = UR (port, UART_R_CON);
-       unsigned int inten = UR (port, UART_R_INTEN);
-
-
-       UR (port, UART_R_INTEN) = 0;            /* Disable all interrupts */
-       BIT_SET (port, UART_R_CON, UARTEN | SIRDIS); /* Enable UART */
-
-       for (; count-- > 0; ++s) {
-               while (UR (port, UART_R_STATUS) & nTxRdy)
-                       ;
-               UR (port, UART_R_DATA) = *s;
-               if (*s == '\n') {
-                       while ((UR (port, UART_R_STATUS) & TxBusy))
-                               ;
-                       UR (port, UART_R_DATA) = '\r';
-               }
-       }
-
-                               /* Wait until all characters are sent */
-       while (UR (port, UART_R_STATUS) & TxBusy)
-               ;
-
-                               /* Restore control and interrupt mask */
-       UR (port, UART_R_CON) = con;
-       UR (port, UART_R_INTEN) = inten;
-}
-
-static void __init lh7a40xuart_console_get_options (struct uart_port* port,
-                                                   int* baud,
-                                                   int* parity,
-                                                   int* bits)
-{
-       if (UR (port, UART_R_CON) & UARTEN) {
-               unsigned int fcon = UR (port, UART_R_FCON);
-               unsigned int quot = UR (port, UART_R_BRCON) + 1;
-
-               switch (fcon & (PEN | EPS)) {
-               default:        *parity = 'n'; break;
-               case PEN:       *parity = 'o'; break;
-               case PEN | EPS: *parity = 'e'; break;
-               }
-
-               switch (fcon & WLEN) {
-               default:
-               case WLEN_8: *bits = 8; break;
-               case WLEN_7: *bits = 7; break;
-               case WLEN_6: *bits = 6; break;
-               case WLEN_5: *bits = 5; break;
-               }
-
-               *baud = port->uartclk/(16*quot);
-       }
-}
-
-static int __init lh7a40xuart_console_setup (struct console* co, char* options)
-{
-       struct uart_port* port;
-       int baud = 38400;
-       int bits = 8;
-       int parity = 'n';
-       int flow = 'n';
-
-       if (co->index >= DEV_NR) /* Bounds check on device number */
-               co->index = 0;
-       port = &lh7a40x_ports[co->index].port;
-
-       if (options)
-               uart_parse_options (options, &baud, &parity, &bits, &flow);
-       else
-               lh7a40xuart_console_get_options (port, &baud, &parity, &bits);
-
-       return uart_set_options (port, co, baud, parity, bits, flow);
-}
-
-extern struct uart_driver lh7a40x_reg;
-static struct console lh7a40x_console = {
-       .name           = "ttyAM",
-       .write          = lh7a40xuart_console_write,
-       .device         = uart_console_device,
-       .setup          = lh7a40xuart_console_setup,
-       .flags          = CON_PRINTBUFFER,
-       .index          = -1,
-       .data           = &lh7a40x_reg,
-};
-
-static int __init lh7a40xuart_console_init(void)
-{
-       register_console (&lh7a40x_console);
-       return 0;
-}
-
-console_initcall (lh7a40xuart_console_init);
-
-#endif
-
-static struct uart_driver lh7a40x_reg = {
-       .owner                  = THIS_MODULE,
-       .driver_name            = "ttyAM",
-       .dev_name               = "ttyAM",
-       .major                  = DEV_MAJOR,
-       .minor                  = DEV_MINOR,
-       .nr                     = DEV_NR,
-       .cons                   = LH7A40X_CONSOLE,
-};
-
-static int __init lh7a40xuart_init(void)
-{
-       int ret;
-
-       printk (KERN_INFO "serial: LH7A40X serial driver\n");
-
-       ret = uart_register_driver (&lh7a40x_reg);
-
-       if (ret == 0) {
-               int i;
-
-               for (i = 0; i < DEV_NR; i++)
-                       uart_add_one_port (&lh7a40x_reg,
-                                          &lh7a40x_ports[i].port);
-       }
-       return ret;
-}
-
-static void __exit lh7a40xuart_exit(void)
-{
-       int i;
-
-       for (i = 0; i < DEV_NR; i++)
-               uart_remove_one_port (&lh7a40x_reg, &lh7a40x_ports[i].port);
-
-       uart_unregister_driver (&lh7a40x_reg);
-}
-
-module_init (lh7a40xuart_init);
-module_exit (lh7a40xuart_exit);
-
-MODULE_AUTHOR ("Marc Singer");
-MODULE_DESCRIPTION ("Sharp LH7A40X serial port driver");
-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/sn9c102.h b/drivers/usb/media/sn9c102.h
deleted file mode 100644 (file)
index fc9cb47..0000000
+++ /dev/null
@@ -1,181 +0,0 @@
-/***************************************************************************
- * V4L2 driver for SN9C10[12] PC Camera Controllers                        *
- *                                                                         *
- * Copyright (C) 2004 by Luca Risolia <luca.risolia@studio.unibo.it>       *
- *                                                                         *
- * 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 _SN9C102_H_
-#define _SN9C102_H_
-
-#include <linux/version.h>
-#include <linux/usb.h>
-#include <linux/videodev.h>
-#include <linux/device.h>
-#include <linux/list.h>
-#include <linux/spinlock.h>
-#include <linux/wait.h>
-#include <linux/types.h>
-#include <linux/param.h>
-#include <linux/rwsem.h>
-
-#include "sn9c102_sensor.h"
-
-/*****************************************************************************/
-
-#define SN9C102_DEBUG
-#define SN9C102_DEBUG_LEVEL       2
-#define SN9C102_MAX_DEVICES       64
-#define SN9C102_MAX_FRAMES        32
-#define SN9C102_URBS              2
-#define SN9C102_ISO_PACKETS       7
-#define SN9C102_ALTERNATE_SETTING 8
-#define SN9C102_CTRL_TIMEOUT      10*HZ
-
-/*****************************************************************************/
-
-#define SN9C102_MODULE_NAME  "V4L2 driver for SN9C10[12] PC Camera Controllers"
-#define SN9C102_MODULE_AUTHOR   "(C) 2004 Luca Risolia"
-#define SN9C102_AUTHOR_EMAIL    "<luca.risolia@studio.unibo.it>"
-#define SN9C102_MODULE_LICENSE  "GPL"
-#define SN9C102_MODULE_VERSION  "1:1.01-beta"
-#define SN9C102_MODULE_VERSION_CODE  KERNEL_VERSION(1, 0, 1)
-
-SN9C102_ID_TABLE;
-SN9C102_SENSOR_TABLE;
-
-enum sn9c102_frame_state {
-       F_UNUSED,
-       F_QUEUED,
-       F_GRABBING,
-       F_DONE,
-       F_ERROR,
-};
-
-struct sn9c102_frame_t {
-       void* bufmem;
-       struct v4l2_buffer buf;
-       enum sn9c102_frame_state state;
-       struct list_head frame;
-       unsigned long vma_use_count;
-};
-
-enum sn9c102_dev_state {
-       DEV_INITIALIZED = 0x01,
-       DEV_DISCONNECTED = 0x02,
-       DEV_MISCONFIGURED = 0x04,
-};
-
-enum sn9c102_io_method {
-       IO_NONE,
-       IO_READ,
-       IO_MMAP,
-};
-
-enum sn9c102_stream_state {
-       STREAM_OFF,
-       STREAM_INTERRUPT,
-       STREAM_ON,
-};
-
-struct sn9c102_sysfs_attr {
-       u8 reg, val, i2c_reg, i2c_val;
-};
-
-static DECLARE_MUTEX(sn9c102_sysfs_lock);
-static DECLARE_RWSEM(sn9c102_disconnect);
-
-struct sn9c102_device {
-       struct device dev;
-
-       struct video_device* v4ldev;
-
-       struct sn9c102_sensor* sensor;
-
-       struct usb_device* usbdev;
-       struct urb* urb[SN9C102_URBS];
-       void* transfer_buffer[SN9C102_URBS];
-       u8* control_buffer;
-
-       struct sn9c102_frame_t *frame_current, frame[SN9C102_MAX_FRAMES];
-       struct list_head inqueue, outqueue;
-       u32 frame_count, nbuffers;
-
-       enum sn9c102_io_method io;
-       enum sn9c102_stream_state stream;
-
-       struct sn9c102_sysfs_attr sysfs;
-       u16 reg[32];
-
-       enum sn9c102_dev_state state;
-       u8 users;
-
-       struct semaphore dev_sem, fileop_sem;
-       spinlock_t queue_lock;
-       wait_queue_head_t open, wait_frame, wait_stream;
-};
-
-/*****************************************************************************/
-
-void
-sn9c102_attach_sensor(struct sn9c102_device* cam,
-                      struct sn9c102_sensor* sensor)
-{
-       cam->sensor = sensor;
-       cam->sensor->dev = &cam->dev;
-       cam->sensor->usbdev = cam->usbdev;
-}
-
-/*****************************************************************************/
-
-#undef DBG
-#undef KDBG
-#ifdef SN9C102_DEBUG
-#      define DBG(level, fmt, args...)                                       \
-{                                                                             \
-       if (debug >= (level)) {                                               \
-               if ((level) == 1)                                             \
-                       dev_err(&cam->dev, fmt "\n", ## args);                \
-               else if ((level) == 2)                                        \
-                       dev_info(&cam->dev, fmt "\n", ## args);               \
-               else if ((level) >= 3)                                        \
-                       dev_info(&cam->dev, "[%s:%d] " fmt "\n",              \
-                                __FUNCTION__, __LINE__ , ## args);           \
-       }                                                                     \
-}
-#      define KDBG(level, fmt, args...)                                      \
-{                                                                             \
-       if (debug >= (level)) {                                               \
-               if ((level) == 1 || (level) == 2)                             \
-                       pr_info("sn9c102: " fmt "\n", ## args);               \
-               else if ((level) == 3)                                        \
-                       pr_debug("sn9c102: [%s:%d] " fmt "\n", __FUNCTION__,  \
-                                __LINE__ , ## args);                         \
-       }                                                                     \
-}
-#else
-#      define KDBG(level, fmt, args...) do {;} while(0);
-#      define DBG(level, fmt, args...) do {;} while(0);
-#endif
-
-#undef PDBG
-#define PDBG(fmt, args...)                                                    \
-dev_info(&cam->dev, "[%s:%d] " fmt "\n", __FUNCTION__, __LINE__ , ## args);
-
-#undef PDBGG
-#define PDBGG(fmt, args...) do {;} while(0); /* placeholder */
-
-#endif /* _SN9C102_H_ */
diff --git a/drivers/usb/media/sn9c102_core.c b/drivers/usb/media/sn9c102_core.c
deleted file mode 100644 (file)
index bcd9fbd..0000000
+++ /dev/null
@@ -1,2439 +0,0 @@
-/***************************************************************************
- * V4L2 driver for SN9C10[12] PC Camera Controllers                        *
- *                                                                         *
- * Copyright (C) 2004 by Luca Risolia <luca.risolia@studio.unibo.it>       *
- *                                                                         *
- * 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.               *
- ***************************************************************************/
-
-#include <linux/module.h>
-#include <linux/init.h>
-#include <linux/kernel.h>
-#include <linux/param.h>
-#include <linux/moduleparam.h>
-#include <linux/errno.h>
-#include <linux/slab.h>
-#include <linux/string.h>
-#include <linux/device.h>
-#include <linux/fs.h>
-#include <linux/time.h>
-#include <linux/delay.h>
-#include <linux/stddef.h>
-#include <linux/ioctl.h>
-#include <linux/poll.h>
-#include <linux/stat.h>
-#include <linux/mm.h>
-#include <linux/vmalloc.h>
-#include <linux/page-flags.h>
-#include <asm/page.h>
-#include <asm/uaccess.h>
-
-#include "sn9c102.h"
-
-/*****************************************************************************/
-
-MODULE_DEVICE_TABLE(usb, sn9c102_id_table);
-
-MODULE_AUTHOR(SN9C102_MODULE_AUTHOR " " SN9C102_AUTHOR_EMAIL);
-MODULE_DESCRIPTION(SN9C102_MODULE_NAME);
-MODULE_VERSION(SN9C102_MODULE_VERSION);
-MODULE_LICENSE(SN9C102_MODULE_LICENSE);
-
-static short video_nr[] = {[0 ... SN9C102_MAX_DEVICES-1] = -1};
-static unsigned int nv;
-module_param_array(video_nr, short, nv, 0444);
-MODULE_PARM_DESC(video_nr,
-                 "\n<-1|n[,...]> Specify V4L2 minor mode number."
-                 "\n -1 = use next available (default)"
-                 "\n  n = use minor number n (integer >= 0)"
-                 "\nYou can specify up to "__MODULE_STRING(SN9C102_MAX_DEVICES)
-                 " cameras this way."
-                 "\nFor example:"
-                 "\nvideo_nr=-1,2,-1 would assign minor number 2 to"
-                 "\nthe second camera and use auto for the first"
-                 "\none and for every other camera."
-                 "\n");
-
-#ifdef SN9C102_DEBUG
-static unsigned short debug = SN9C102_DEBUG_LEVEL;
-module_param(debug, ushort, 0644);
-MODULE_PARM_DESC(debug,
-                 "\n<n> Debugging information level, from 0 to 3:"
-                 "\n0 = none (use carefully)"
-                 "\n1 = critical errors"
-                 "\n2 = significant informations"
-                 "\n3 = more verbose messages"
-                 "\nLevel 3 is useful for testing only, when only "
-                 "one device is used."
-                 "\nDefault value is "__MODULE_STRING(SN9C102_DEBUG_LEVEL)"."
-                 "\n");
-#endif
-
-/*****************************************************************************/
-
-typedef char sn9c102_sof_header_t[7];
-typedef char sn9c102_eof_header_t[4];
-
-static sn9c102_sof_header_t sn9c102_sof_header[] = {
-       {0xff, 0xff, 0x00, 0xc4, 0xc4, 0x96, 0x00},
-       {0xff, 0xff, 0x00, 0xc4, 0xc4, 0x96, 0x01},
-};
-
-/* Number of random bytes that complete the SOF above headers */
-#define SN9C102_SOFLEN 5
-
-static sn9c102_eof_header_t sn9c102_eof_header[] = {
-       {0x00, 0x00, 0x00, 0x00},
-       {0x40, 0x00, 0x00, 0x00},
-       {0x80, 0x00, 0x00, 0x00},
-       {0xc0, 0x00, 0x00, 0x00},
-};
-
-/*****************************************************************************/
-
-static inline unsigned long kvirt_to_pa(unsigned long adr)
-{
-       unsigned long kva, ret;
-
-       kva = (unsigned long)page_address(vmalloc_to_page((void *)adr));
-       kva |= adr & (PAGE_SIZE-1);
-       ret = __pa(kva);
-       return ret;
-}
-
-
-static void* rvmalloc(size_t size)
-{
-       void* mem;
-       unsigned long adr;
-
-       size = PAGE_ALIGN(size);
-
-       mem = vmalloc_32((unsigned long)size);
-       if (!mem)
-               return NULL;
-
-       memset(mem, 0, size);
-
-       adr = (unsigned long)mem;
-       while (size > 0) {
-               SetPageReserved(vmalloc_to_page((void *)adr));
-               adr += PAGE_SIZE;
-               size -= PAGE_SIZE;
-       }
-
-       return mem;
-}
-
-
-static void rvfree(void* mem, size_t size)
-{
-       unsigned long adr;
-
-       if (!mem)
-               return;
-
-       size = PAGE_ALIGN(size);
-
-       adr = (unsigned long)mem;
-       while (size > 0) {
-               ClearPageReserved(vmalloc_to_page((void *)adr));
-               adr += PAGE_SIZE;
-               size -= PAGE_SIZE;
-       }
-
-       vfree(mem);
-}
-
-
-static u32 sn9c102_request_buffers(struct sn9c102_device* cam, u32 count)
-{
-       struct v4l2_pix_format* p = &(cam->sensor->pix_format);
-       const size_t imagesize = (p->width * p->height * p->priv)/8;
-       void* buff = NULL;
-       u32 i;
-
-       if (count > SN9C102_MAX_FRAMES)
-               count = SN9C102_MAX_FRAMES;
-
-       cam->nbuffers = count;
-       while (cam->nbuffers > 0) {
-               if ((buff = rvmalloc(cam->nbuffers * imagesize)))
-                       break;
-               cam->nbuffers--;
-       }
-
-       for (i = 0; i < cam->nbuffers; i++) {
-               cam->frame[i].bufmem = buff + i*imagesize;
-               cam->frame[i].buf.index = i;
-               cam->frame[i].buf.m.offset = i*imagesize;
-               cam->frame[i].buf.length = imagesize;
-               cam->frame[i].buf.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
-               cam->frame[i].buf.sequence = 0;
-               cam->frame[i].buf.field = V4L2_FIELD_NONE;
-               cam->frame[i].buf.memory = V4L2_MEMORY_MMAP;
-               cam->frame[i].buf.flags = 0;
-       }
-
-       return cam->nbuffers;
-}
-
-
-static void sn9c102_release_buffers(struct sn9c102_device* cam)
-{
-       if (cam->nbuffers) {
-               rvfree(cam->frame[0].bufmem,
-                      cam->nbuffers * cam->frame[0].buf.length);
-               cam->nbuffers = 0;
-       }
-}
-
-
-static void sn9c102_empty_framequeues(struct sn9c102_device* cam)
-{
-       u32 i;
-
-       INIT_LIST_HEAD(&cam->inqueue);
-       INIT_LIST_HEAD(&cam->outqueue);
-
-       for (i = 0; i < SN9C102_MAX_FRAMES; i++) {
-               cam->frame[i].state = F_UNUSED;
-               cam->frame[i].buf.bytesused = 0;
-       }
-}
-
-
-static void sn9c102_queue_unusedframes(struct sn9c102_device* cam)
-{
-       unsigned long lock_flags;
-       u32 i;
-
-       for (i = 0; i < cam->nbuffers; i++)
-               if (cam->frame[i].state == F_UNUSED) {
-                       cam->frame[i].state = F_QUEUED;
-                       spin_lock_irqsave(&cam->queue_lock, lock_flags);
-                       list_add_tail(&cam->frame[i].frame, &cam->inqueue);
-                       spin_unlock_irqrestore(&cam->queue_lock, lock_flags);
-               }
-}
-
-/*****************************************************************************/
-
-int sn9c102_write_reg(struct sn9c102_device* cam, u8 value, u16 index)
-{
-       struct usb_device* udev = cam->usbdev;
-       u8* buff = cam->control_buffer;
-       int res;
-
-       if (index == 0x18)
-               value = (value & 0xcf) | (cam->reg[0x18] & 0x30);
-
-       *buff = value;
-
-       res = usb_control_msg(udev, usb_sndctrlpipe(udev, 0), 0x08, 0x41,
-                             index, 0, buff, 1, SN9C102_CTRL_TIMEOUT);
-       if (res < 0) {
-               DBG(3, "Failed to write a register (value 0x%02X, index "
-                      "0x%02X, error %d)", value, index, res)
-               return -1;
-       }
-
-       cam->reg[index] = value;
-
-       return 0;
-}
-
-
-/* NOTE: reading some registers always returns 0 */
-static int sn9c102_read_reg(struct sn9c102_device* cam, u16 index)
-{
-       struct usb_device* udev = cam->usbdev;
-       u8* buff = cam->control_buffer;
-       int res;
-
-       res = usb_control_msg(udev, usb_rcvctrlpipe(udev, 0), 0x00, 0xc1,
-                             index, 0, buff, 1, SN9C102_CTRL_TIMEOUT);
-       if (res < 0)
-               DBG(3, "Failed to read a register (index 0x%02X, error %d)",
-                   index, res)
-
-       return (res >= 0) ? (int)(*buff) : -1;
-}
-
-
-int sn9c102_pread_reg(struct sn9c102_device* cam, u16 index)
-{
-       if (index > 0x1f)
-               return -EINVAL;
-
-       return cam->reg[index];
-}
-
-
-static int
-sn9c102_i2c_wait(struct sn9c102_device* cam, struct sn9c102_sensor* sensor)
-{
-       int i, r;
-
-       for (i = 1; i <= 5; i++) {
-               r = sn9c102_read_reg(cam, 0x08);
-               if (r < 0)
-                       return -EIO;
-               if (r & 0x04)
-                       return 0;
-               if (sensor->frequency & SN9C102_I2C_400KHZ)
-                       udelay(5*8);
-               else
-                       udelay(16*8);
-       }
-       return -EBUSY;
-}
-
-
-static int
-sn9c102_i2c_detect_read_error(struct sn9c102_device* cam, 
-                              struct sn9c102_sensor* sensor)
-{
-       int r;
-       r = sn9c102_read_reg(cam, 0x08);
-       return (r < 0 || (r >= 0 && !(r & 0x08))) ? -EIO : 0;
-}
-
-
-static int
-sn9c102_i2c_detect_write_error(struct sn9c102_device* cam, 
-                               struct sn9c102_sensor* sensor)
-{
-       int r;
-       r = sn9c102_read_reg(cam, 0x08);
-       return (r < 0 || (r >= 0 && (r & 0x08))) ? -EIO : 0;
-}
-
-
-int 
-sn9c102_i2c_try_read(struct sn9c102_device* cam,
-                     struct sn9c102_sensor* sensor, u8 address)
-{
-       struct usb_device* udev = cam->usbdev;
-       u8* data = cam->control_buffer;
-       int err = 0, res;
-
-       /* Write cycle - address */
-       data[0] = ((sensor->interface == SN9C102_I2C_2WIRES) ? 0x80 : 0) |
-                 ((sensor->frequency & SN9C102_I2C_400KHZ) ? 0x01 : 0) | 0x10;
-       data[1] = sensor->slave_write_id;
-       data[2] = address;
-       data[7] = 0x10;
-       res = usb_control_msg(udev, usb_sndctrlpipe(udev, 0), 0x08, 0x41,
-                             0x08, 0, data, 8, SN9C102_CTRL_TIMEOUT);
-       if (res < 0)
-               err += res;
-
-       err += sn9c102_i2c_wait(cam, sensor);
-
-       /* Read cycle - 1 byte */
-       data[0] = ((sensor->interface == SN9C102_I2C_2WIRES) ? 0x80 : 0) |
-                 ((sensor->frequency & SN9C102_I2C_400KHZ) ? 0x01 : 0) |
-                 0x10 | 0x02;
-       data[1] = sensor->slave_read_id;
-       data[7] = 0x10;
-       res = usb_control_msg(udev, usb_sndctrlpipe(udev, 0), 0x08, 0x41,
-                             0x08, 0, data, 8, SN9C102_CTRL_TIMEOUT);
-       if (res < 0)
-               err += res;
-
-       err += sn9c102_i2c_wait(cam, sensor);
-
-       /* The read byte will be placed in data[4] */
-       res = usb_control_msg(udev, usb_rcvctrlpipe(udev, 0), 0x00, 0xc1,
-                             0x0a, 0, data, 5, SN9C102_CTRL_TIMEOUT);
-       if (res < 0)
-               err += res;
-
-       err += sn9c102_i2c_detect_read_error(cam, sensor);
-
-       if (err)
-               DBG(3, "I2C read failed for %s image sensor", sensor->name)
-
-       PDBGG("I2C read: address 0x%02X, value: 0x%02X", address, data[4])
-
-       return err ? -1 : (int)data[4];
-}
-
-
-int 
-sn9c102_i2c_try_raw_write(struct sn9c102_device* cam,
-                          struct sn9c102_sensor* sensor, u8 n, u8 data0,
-                          u8 data1, u8 data2, u8 data3, u8 data4, u8 data5)
-{
-       struct usb_device* udev = cam->usbdev;
-       u8* data = cam->control_buffer;
-       int err = 0, res;
-
-       /* Write cycle. It usually is address + value */
-       data[0] = ((sensor->interface == SN9C102_I2C_2WIRES) ? 0x80 : 0) |
-                 ((sensor->frequency & SN9C102_I2C_400KHZ) ? 0x01 : 0)
-                 | ((n - 1) << 4);
-       data[1] = data0;
-       data[2] = data1;
-       data[3] = data2;
-       data[4] = data3;
-       data[5] = data4;
-       data[6] = data5;
-       data[7] = 0x10;
-       res = usb_control_msg(udev, usb_sndctrlpipe(udev, 0), 0x08, 0x41,
-                             0x08, 0, data, 8, SN9C102_CTRL_TIMEOUT);
-       if (res < 0)
-               err += res;
-
-       err += sn9c102_i2c_wait(cam, sensor);
-       err += sn9c102_i2c_detect_write_error(cam, sensor);
-
-       if (err)
-               DBG(3, "I2C write failed for %s image sensor", sensor->name)
-
-       PDBGG("I2C write: %u bytes, data0 = 0x%02X, data1 = 0x%02X, "
-             "data2 = 0x%02X, data3 = 0x%02X, data4 = 0x%02X, data5 = 0x%02X",
-             n, data0, data1, data2, data3, data4, data5)
-
-       return err ? -1 : 0;
-}
-
-
-int 
-sn9c102_i2c_try_write(struct sn9c102_device* cam,
-                      struct sn9c102_sensor* sensor, u8 address, u8 value)
-{
-       return sn9c102_i2c_try_raw_write(cam, sensor, 3, 
-                                        sensor->slave_write_id, address,
-                                        value, 0, 0, 0);
-}
-
-
-int sn9c102_i2c_read(struct sn9c102_device* cam, u8 address)
-{
-       if (!cam->sensor)
-               return -1;
-
-       return sn9c102_i2c_try_read(cam, cam->sensor, address);
-}
-
-
-int sn9c102_i2c_write(struct sn9c102_device* cam, u8 address, u8 value)
-{
-       if (!cam->sensor)
-               return -1;
-
-       return sn9c102_i2c_try_write(cam, cam->sensor, address, value);
-}
-
-/*****************************************************************************/
-
-static void* sn9c102_find_sof_header(void* mem, size_t len)
-{
-       size_t soflen=sizeof(sn9c102_sof_header_t), SOFLEN=SN9C102_SOFLEN, i;
-       u8 j, n = sizeof(sn9c102_sof_header) / soflen;
-
-       for (i = 0; (len >= soflen+SOFLEN) && (i <= len-soflen-SOFLEN); i++)
-               for (j = 0; j < n; j++)
-                       if (!memcmp(mem + i, sn9c102_sof_header[j], soflen))
-                               /* Skips the header */
-                               return mem + i + soflen + SOFLEN;
-
-       return NULL;
-}
-
-
-static void* sn9c102_find_eof_header(void* mem, size_t len)
-{
-       size_t eoflen = sizeof(sn9c102_eof_header_t), i;
-       unsigned j, n = sizeof(sn9c102_eof_header) / eoflen;
-
-       for (i = 0; (len >= eoflen) && (i <= len - eoflen); i++)
-               for (j = 0; j < n; j++)
-                       if (!memcmp(mem + i, sn9c102_eof_header[j], eoflen))
-                               return mem + i;
-
-       return NULL;
-}
-
-
-static void sn9c102_urb_complete(struct urb *urb, struct pt_regs* regs)
-{
-       struct sn9c102_device* cam = urb->context;
-       struct sn9c102_frame_t** f;
-       unsigned long lock_flags;
-       u8 i;
-       int err = 0;
-
-       if (urb->status == -ENOENT)
-               return;
-
-       f = &cam->frame_current;
-
-       if (cam->stream == STREAM_INTERRUPT) {
-               cam->stream = STREAM_OFF;
-               if ((*f))
-                       (*f)->state = F_QUEUED;
-               DBG(3, "Stream interrupted")
-               wake_up_interruptible(&cam->wait_stream);
-       }
-
-       if ((cam->state & DEV_DISCONNECTED)||(cam->state & DEV_MISCONFIGURED))
-               return;
-
-       if (cam->stream == STREAM_OFF || list_empty(&cam->inqueue))
-               goto resubmit_urb;
-
-       if (!(*f))
-               (*f) = list_entry(cam->inqueue.next, struct sn9c102_frame_t,
-                                 frame);
-
-       for (i = 0; i < urb->number_of_packets; i++) {
-               unsigned int img, len, status;
-               void *pos, *sof, *eof;
-
-               len = urb->iso_frame_desc[i].actual_length;
-               status = urb->iso_frame_desc[i].status;
-               pos = urb->iso_frame_desc[i].offset + urb->transfer_buffer;
-
-               if (status) {
-                       DBG(3, "Error in isochronous frame")
-                       (*f)->state = F_ERROR;
-                       continue;
-               }
-
-               PDBGG("Isochrnous frame: length %u, #%u i", len, i)
-
-               /* NOTE: It is probably correct to assume that SOF and EOF
-                        headers do not occur between two consecutive packets,
-                        but who knows..Whatever is the truth, this assumption
-                        doesn't introduce bugs. */
-
-redo:
-               sof = sn9c102_find_sof_header(pos, len);
-               if (!sof) {
-                       eof = sn9c102_find_eof_header(pos, len);
-                       if ((*f)->state == F_GRABBING) {
-end_of_frame:
-                               img = len;
-
-                               if (eof)
-                                       img = (eof > pos) ? eof - pos - 1 : 0;
-
-                               if ((*f)->buf.bytesused+img>(*f)->buf.length) {
-                                       u32 b = (*f)->buf.bytesused + img -
-                                               (*f)->buf.length;
-                                       img = (*f)->buf.length - 
-                                             (*f)->buf.bytesused;
-                                       DBG(3, "Expected EOF not found: "
-                                              "video frame cut")
-                                       if (eof)
-                                               DBG(3, "Exceeded limit: +%u "
-                                                      "bytes", (unsigned)(b))
-                               }
-
-                               memcpy((*f)->bufmem + (*f)->buf.bytesused, pos,
-                                      img);
-
-                               if ((*f)->buf.bytesused == 0)
-                                       do_gettimeofday(&(*f)->buf.timestamp);
-
-                               (*f)->buf.bytesused += img;
-
-                               if ((*f)->buf.bytesused == (*f)->buf.length) {
-                                       u32 b = (*f)->buf.bytesused;
-                                       (*f)->state = F_DONE;
-                                       (*f)->buf.sequence= ++cam->frame_count;
-                                       spin_lock_irqsave(&cam->queue_lock,
-                                                         lock_flags);
-                                       list_move_tail(&(*f)->frame,
-                                                      &cam->outqueue);
-                                       if (!list_empty(&cam->inqueue))
-                                               (*f) = list_entry(
-                                                       cam->inqueue.next,
-                                                       struct sn9c102_frame_t,
-                                                       frame );
-                                       else
-                                               (*f) = NULL;
-                                       spin_unlock_irqrestore(&cam->queue_lock
-                                                              , lock_flags);
-                                       DBG(3, "Video frame captured: "
-                                              "%lu bytes", (unsigned long)(b))
-
-                                       if (!(*f))
-                                               goto resubmit_urb;
-
-                               } else if (eof) {
-                                       (*f)->state = F_ERROR;
-                                       DBG(3, "Not expected EOF after %lu "
-                                              "bytes of image data", 
-                                         (unsigned long)((*f)->buf.bytesused))
-                               }
-
-                               if (sof) /* (1) */
-                                       goto start_of_frame;
-
-                       } else if (eof) {
-                               DBG(3, "EOF without SOF")
-                               continue;
-
-                       } else {
-                               PDBGG("Ignoring pointless isochronous frame")
-                               continue;
-                       }
-
-               } else if ((*f)->state == F_QUEUED || (*f)->state == F_ERROR) {
-start_of_frame:
-                       (*f)->state = F_GRABBING;
-                       (*f)->buf.bytesused = 0;
-                       len -= (sof - pos);
-                       pos = sof;
-                       DBG(3, "SOF detected: new video frame")
-                       if (len)
-                               goto redo;
-
-               } else if ((*f)->state == F_GRABBING) {
-                       eof = sn9c102_find_eof_header(pos, len);
-                       if (eof && eof < sof)
-                               goto end_of_frame; /* (1) */
-                       else {
-                               DBG(3, "SOF before expected EOF after %lu "
-                                      "bytes of image data", 
-                                   (unsigned long)((*f)->buf.bytesused))
-                               goto start_of_frame;
-                       }
-               }
-       }
-
-resubmit_urb:
-       urb->dev = cam->usbdev;
-       err = usb_submit_urb(urb, GFP_ATOMIC);
-       if (err < 0 && err != -EPERM) {
-               cam->state |= DEV_MISCONFIGURED;
-               DBG(1, "usb_submit_urb() failed")
-       }
-
-       wake_up_interruptible(&cam->wait_frame);
-}
-
-
-static int sn9c102_start_transfer(struct sn9c102_device* cam)
-{
-       struct usb_device *udev = cam->usbdev;
-       struct urb* urb;
-       const unsigned int wMaxPacketSize[] = {0, 128, 256, 384, 512,
-                                               680, 800, 900, 1023};
-       const unsigned int psz = wMaxPacketSize[SN9C102_ALTERNATE_SETTING];
-       s8 i, j;
-       int err = 0;
-
-       for (i = 0; i < SN9C102_URBS; i++) {
-               cam->transfer_buffer[i] = kmalloc(SN9C102_ISO_PACKETS * psz,
-                                                 GFP_KERNEL);
-               if (!cam->transfer_buffer[i]) {
-                       err = -ENOMEM;
-                       DBG(1, "Not enough memory")
-                       goto free_buffers;
-               }
-       }
-
-       for (i = 0; i < SN9C102_URBS; i++) {
-               urb = usb_alloc_urb(SN9C102_ISO_PACKETS, GFP_KERNEL);
-               cam->urb[i] = urb;
-               if (!urb) {
-                       err = -ENOMEM;
-                       DBG(1, "usb_alloc_urb() failed")
-                       goto free_urbs;
-               }
-               urb->dev = udev;
-               urb->context = cam;
-               urb->pipe = usb_rcvisocpipe(udev, 1);
-               urb->transfer_flags = URB_ISO_ASAP;
-               urb->number_of_packets = SN9C102_ISO_PACKETS;
-               urb->complete = sn9c102_urb_complete;
-               urb->transfer_buffer = cam->transfer_buffer[i];
-               urb->transfer_buffer_length = psz * SN9C102_ISO_PACKETS;
-               urb->interval = 1;
-               for (j = 0; j < SN9C102_ISO_PACKETS; j++) {
-                       urb->iso_frame_desc[j].offset = psz * j;
-                       urb->iso_frame_desc[j].length = psz;
-               }
-       }
-
-       /* Enable video */
-       if (!(cam->reg[0x01] & 0x04)) {
-               err = sn9c102_write_reg(cam, cam->reg[0x01] | 0x04, 0x01);
-               if (err) {
-                       err = -EIO;
-                       DBG(1, "I/O hardware error")
-                       goto free_urbs;
-               }
-       }
-
-       err = usb_set_interface(udev, 0, SN9C102_ALTERNATE_SETTING);
-       if (err) {
-               DBG(1, "usb_set_interface() failed")
-               goto free_urbs;
-       }
-
-       cam->frame_current = NULL;
-
-       for (i = 0; i < SN9C102_URBS; i++) {
-               err = usb_submit_urb(cam->urb[i], GFP_KERNEL);
-               if (err) {
-                       for (j = i-1; j >= 0; j--)
-                               usb_kill_urb(cam->urb[j]);
-                       DBG(1, "usb_submit_urb() failed, error %d", err)
-                       goto free_urbs;
-               }
-       }
-
-       return 0;
-
-free_urbs:
-       for (i = 0; (i < SN9C102_URBS) &&  cam->urb[i]; i++)
-               usb_free_urb(cam->urb[i]);
-
-free_buffers:
-       for (i = 0; (i < SN9C102_URBS) && cam->transfer_buffer[i]; i++)
-               kfree(cam->transfer_buffer[i]);
-
-       return err;
-}
-
-
-static int sn9c102_stop_transfer(struct sn9c102_device* cam)
-{
-       struct usb_device *udev = cam->usbdev;
-       s8 i;
-       int err = 0;
-
-       if (cam->state & DEV_DISCONNECTED)
-               return 0;
-
-       for (i = SN9C102_URBS-1; i >= 0; i--) {
-               usb_kill_urb(cam->urb[i]);
-               usb_free_urb(cam->urb[i]);
-               kfree(cam->transfer_buffer[i]);
-       }
-
-       err = usb_set_interface(udev, 0, 0); /* 0 Mb/s */
-       if (err)
-               DBG(3, "usb_set_interface() failed")
-
-       return err;
-}
-
-/*****************************************************************************/
-
-static u8 sn9c102_strtou8(const char* buff, size_t len, ssize_t* count)
-{
-       char str[5];
-       char* endp;
-       unsigned long val;
-
-       if (len < 4) {
-               strncpy(str, buff, len);
-               str[len+1] = '\0';
-       } else {
-               strncpy(str, buff, 4);
-               str[4] = '\0';
-       }
-
-       val = simple_strtoul(str, &endp, 0);
-
-       *count = 0;
-       if (val <= 0xff)
-               *count = (ssize_t)(endp - str);
-       if ((*count) && (len == *count+1) && (buff[*count] == '\n'))
-               *count += 1;
-
-       return (u8)val;
-}
-
-/* NOTE 1: being inside one of the following methods implies that the v4l
-           device exists for sure (see kobjects and reference counters)
-   NOTE 2: buffers are PAGE_SIZE long */
-
-static ssize_t sn9c102_show_reg(struct class_device* cd, char* buf)
-{
-       struct sn9c102_device* cam;
-       ssize_t count;
-
-       if (down_interruptible(&sn9c102_sysfs_lock))
-               return -ERESTARTSYS;
-
-       cam = video_get_drvdata(to_video_device(cd));
-       if (!cam) {
-               up(&sn9c102_sysfs_lock);
-               return -ENODEV;
-       }
-
-       count = sprintf(buf, "%u\n", cam->sysfs.reg);
-
-       up(&sn9c102_sysfs_lock);
-
-       return count;
-} 
-
-
-static ssize_t 
-sn9c102_store_reg(struct class_device* cd, const char* buf, size_t len)
-{
-       struct sn9c102_device* cam;
-       u8 index;
-       ssize_t count;
-
-       if (down_interruptible(&sn9c102_sysfs_lock))
-               return -ERESTARTSYS;
-
-       cam = video_get_drvdata(to_video_device(cd));
-       if (!cam) {
-               up(&sn9c102_sysfs_lock);
-               return -ENODEV;
-       }
-
-       index = sn9c102_strtou8(buf, len, &count);
-       if (index > 0x1f || !count) {
-               up(&sn9c102_sysfs_lock);
-               return -EINVAL;
-       }
-
-       cam->sysfs.reg = index;
-
-       DBG(2, "Moved SN9C10X register index to 0x%02X", cam->sysfs.reg)
-       DBG(3, "Written bytes: %zd", count)
-
-       up(&sn9c102_sysfs_lock);
-
-       return count;
-}
-
-
-static ssize_t sn9c102_show_val(struct class_device* cd, char* buf)
-{
-       struct sn9c102_device* cam;
-       ssize_t count;
-       int val;
-
-       if (down_interruptible(&sn9c102_sysfs_lock))
-               return -ERESTARTSYS;
-
-       cam = video_get_drvdata(to_video_device(cd));
-       if (!cam) {
-               up(&sn9c102_sysfs_lock);
-               return -ENODEV;
-       }
-
-       if ((val = sn9c102_read_reg(cam, cam->sysfs.reg)) < 0) {
-               up(&sn9c102_sysfs_lock);
-               return -EIO;
-       }
-
-       count = sprintf(buf, "%d\n", val);
-
-       DBG(3, "Read bytes: %zd", count)
-
-       up(&sn9c102_sysfs_lock);
-
-       return count;
-} 
-
-
-static ssize_t
-sn9c102_store_val(struct class_device* cd, const char* buf, size_t len)
-{
-       struct sn9c102_device* cam;
-       u8 value;
-       ssize_t count;
-       int err;
-
-       if (down_interruptible(&sn9c102_sysfs_lock))
-               return -ERESTARTSYS;
-
-       cam = video_get_drvdata(to_video_device(cd));
-       if (!cam) {
-               up(&sn9c102_sysfs_lock);
-               return -ENODEV;
-       }
-
-       value = sn9c102_strtou8(buf, len, &count);
-       if (!count) {
-               up(&sn9c102_sysfs_lock);
-               return -EINVAL;
-       }
-
-       err = sn9c102_write_reg(cam, value, cam->sysfs.reg);
-       if (err) {
-               up(&sn9c102_sysfs_lock);
-               return -EIO;
-       }
-
-       DBG(2, "Written SN9C10X reg. 0x%02X, val. 0x%02X",
-           cam->sysfs.reg, value)
-       DBG(3, "Written bytes: %zd", count)
-
-       up(&sn9c102_sysfs_lock);
-
-       return count;
-}
-
-
-static ssize_t sn9c102_show_i2c_reg(struct class_device* cd, char* buf)
-{
-       struct sn9c102_device* cam;
-       ssize_t count;
-
-       if (down_interruptible(&sn9c102_sysfs_lock))
-               return -ERESTARTSYS;
-
-       cam = video_get_drvdata(to_video_device(cd));
-       if (!cam) {
-               up(&sn9c102_sysfs_lock);
-               return -ENODEV;
-       }
-
-       count = sprintf(buf, "%u\n", cam->sysfs.i2c_reg);
-
-       DBG(3, "Read bytes: %zd", count)
-
-       up(&sn9c102_sysfs_lock);
-
-       return count;
-} 
-
-
-static ssize_t 
-sn9c102_store_i2c_reg(struct class_device* cd, const char* buf, size_t len)
-{
-       struct sn9c102_device* cam;
-       u8 index;
-       ssize_t count;
-
-       if (down_interruptible(&sn9c102_sysfs_lock))
-               return -ERESTARTSYS;
-
-       cam = video_get_drvdata(to_video_device(cd));
-       if (!cam) {
-               up(&sn9c102_sysfs_lock);
-               return -ENODEV;
-       }
-
-       index = sn9c102_strtou8(buf, len, &count);
-       if (!count) {
-               up(&sn9c102_sysfs_lock);
-               return -EINVAL;
-       }
-
-       cam->sysfs.i2c_reg = index;
-
-       DBG(2, "Moved sensor register index to 0x%02X", cam->sysfs.i2c_reg)
-       DBG(3, "Written bytes: %zd", count)
-
-       up(&sn9c102_sysfs_lock);
-
-       return count;
-}
-
-
-static ssize_t sn9c102_show_i2c_val(struct class_device* cd, char* buf)
-{
-       struct sn9c102_device* cam;
-       ssize_t count;
-       int val;
-
-       if (down_interruptible(&sn9c102_sysfs_lock))
-               return -ERESTARTSYS;
-
-       cam = video_get_drvdata(to_video_device(cd));
-       if (!cam) {
-               up(&sn9c102_sysfs_lock);
-               return -ENODEV;
-       }
-
-       if ((val = sn9c102_i2c_read(cam, cam->sysfs.i2c_reg)) < 0) {
-               up(&sn9c102_sysfs_lock);
-               return -EIO;
-       }
-
-       count = sprintf(buf, "%d\n", val);
-
-       DBG(3, "Read bytes: %zd", count)
-
-       up(&sn9c102_sysfs_lock);
-
-       return count;
-} 
-
-
-static ssize_t
-sn9c102_store_i2c_val(struct class_device* cd, const char* buf, size_t len)
-{
-       struct sn9c102_device* cam;
-       u8 value;
-       ssize_t count;
-       int err;
-
-       if (down_interruptible(&sn9c102_sysfs_lock))
-               return -ERESTARTSYS;
-
-       cam = video_get_drvdata(to_video_device(cd));
-       if (!cam) {
-               up(&sn9c102_sysfs_lock);
-               return -ENODEV;
-       }
-
-       value = sn9c102_strtou8(buf, len, &count);
-       if (!count) {
-               up(&sn9c102_sysfs_lock);
-               return -EINVAL;
-       }
-
-       err = sn9c102_i2c_write(cam, cam->sysfs.i2c_reg, value);
-       if (err) {
-               up(&sn9c102_sysfs_lock);
-               return -EIO;
-       }
-
-       DBG(2, "Written sensor reg. 0x%02X, val. 0x%02X",
-           cam->sysfs.i2c_reg, value)
-       DBG(3, "Written bytes: %zd", count)
-
-       up(&sn9c102_sysfs_lock);
-
-       return count;
-}
-
-
-static ssize_t
-sn9c102_store_redblue(struct class_device* cd, const char* buf, size_t len)
-{
-       ssize_t res = 0;
-       u8 value;
-       ssize_t count;
-
-       value = sn9c102_strtou8(buf, len, &count);
-       if (!count)
-               return -EINVAL;
-
-       if ((res = sn9c102_store_reg(cd, "0x10", 4)) >= 0)
-               res = sn9c102_store_val(cd, buf, len);
-
-       return res;
-}
-
-
-static ssize_t
-sn9c102_store_green(struct class_device* cd, const char* buf, size_t len)
-{
-       ssize_t res = 0;
-       u8 value;
-       ssize_t count;
-
-       value = sn9c102_strtou8(buf, len, &count);
-       if (!count || value > 0x0f)
-               return -EINVAL;
-
-       if ((res = sn9c102_store_reg(cd, "0x11", 4)) >= 0)
-               res = sn9c102_store_val(cd, buf, len);
-
-       return res;
-}
-
-
-static CLASS_DEVICE_ATTR(reg, S_IRUGO | S_IWUSR,
-                         sn9c102_show_reg, sn9c102_store_reg);
-static CLASS_DEVICE_ATTR(val, S_IRUGO | S_IWUSR,
-                         sn9c102_show_val, sn9c102_store_val);
-static CLASS_DEVICE_ATTR(i2c_reg, S_IRUGO | S_IWUSR,
-                         sn9c102_show_i2c_reg, sn9c102_store_i2c_reg);
-static CLASS_DEVICE_ATTR(i2c_val, S_IRUGO | S_IWUSR,
-                         sn9c102_show_i2c_val, sn9c102_store_i2c_val);
-static CLASS_DEVICE_ATTR(redblue, S_IWUGO, NULL, sn9c102_store_redblue);
-static CLASS_DEVICE_ATTR(green, S_IWUGO, NULL, sn9c102_store_green);
-
-
-static void sn9c102_create_sysfs(struct sn9c102_device* cam)
-{
-       struct video_device *v4ldev = cam->v4ldev;
-
-       video_device_create_file(v4ldev, &class_device_attr_reg);
-       video_device_create_file(v4ldev, &class_device_attr_val);
-       video_device_create_file(v4ldev, &class_device_attr_redblue);
-       video_device_create_file(v4ldev, &class_device_attr_green);
-       if (cam->sensor->slave_write_id && cam->sensor->slave_read_id) {
-               video_device_create_file(v4ldev, &class_device_attr_i2c_reg);
-               video_device_create_file(v4ldev, &class_device_attr_i2c_val);
-       }
-}
-
-/*****************************************************************************/
-
-static int sn9c102_set_scale(struct sn9c102_device* cam, u8 scale)
-{
-       u8 r = 0;
-       int err = 0;
-
-       if (scale == 1)
-               r = cam->reg[0x18] & 0xcf;
-       else if (scale == 2) {
-               r = cam->reg[0x18] & 0xcf;
-               r |= 0x10;
-       } else if (scale == 4)
-               r = cam->reg[0x18] | 0x20;
-
-       err += sn9c102_write_reg(cam, r, 0x18);
-       if (err)
-               return -EIO;
-
-       PDBGG("Scaling factor: %u", scale)
-
-       return 0;
-}
-
-
-static int sn9c102_set_crop(struct sn9c102_device* cam, struct v4l2_rect* rect)
-{
-       struct sn9c102_sensor* s = cam->sensor;
-       u8 h_start = (u8)(rect->left - s->cropcap.bounds.left),
-          v_start = (u8)(rect->top - s->cropcap.bounds.top),
-          h_size = (u8)(rect->width / 16),
-          v_size = (u8)(rect->height / 16),
-          ae_strx = 0x00,
-          ae_stry = 0x00,
-          ae_endx = h_size / 2,
-          ae_endy = v_size / 2;
-       int err = 0;
-
-       /* These are a sort of stroboscopic signal for some sensors */
-       err += sn9c102_write_reg(cam, h_size, 0x1a);
-       err += sn9c102_write_reg(cam, v_size, 0x1b);
-
-       err += sn9c102_write_reg(cam, h_start, 0x12);
-       err += sn9c102_write_reg(cam, v_start, 0x13);
-       err += sn9c102_write_reg(cam, h_size, 0x15);
-       err += sn9c102_write_reg(cam, v_size, 0x16);
-       err += sn9c102_write_reg(cam, ae_strx, 0x1c);
-       err += sn9c102_write_reg(cam, ae_stry, 0x1d);
-       err += sn9c102_write_reg(cam, ae_endx, 0x1e);
-       err += sn9c102_write_reg(cam, ae_endy, 0x1f);
-       if (err)
-               return -EIO;
-
-       PDBGG("h_start, v_start, h_size, v_size, ho_size, vo_size "
-             "%u %u %u %u %u %u", h_start, v_start, h_size, v_size, ho_size,
-             vo_size)
-
-       return 0;
-}
-
-
-static int sn9c102_init(struct sn9c102_device* cam)
-{
-       struct sn9c102_sensor* s = cam->sensor;
-       struct v4l2_control ctrl;
-       struct v4l2_queryctrl *qctrl;
-       struct v4l2_rect* rect;
-       u8 i = 0, n = 0;
-       int err = 0;
-
-       if (!(cam->state & DEV_INITIALIZED)) {
-               init_waitqueue_head(&cam->open);
-               qctrl = s->qctrl;
-               rect = &(s->cropcap.defrect);
-       } else { /* use current values */
-               qctrl = s->_qctrl;
-               rect = &(s->_rect);
-       }
-
-       err += sn9c102_set_scale(cam, rect->width / s->pix_format.width);
-       err += sn9c102_set_crop(cam, rect);
-       if (err)
-               return err;
-
-       if (s->init) {
-               err = s->init(cam);
-               if (err) {
-                       DBG(3, "Sensor initialization failed")
-                       return err;
-               }
-       }
-
-       if (s->set_crop)
-               if ((err = s->set_crop(cam, rect))) {
-                       DBG(3, "set_crop() failed")
-                       return err;
-               }
-
-       if (s->set_ctrl) {
-               n = sizeof(s->qctrl) / sizeof(s->qctrl[0]);
-               for (i = 0; i < n; i++)
-                       if (s->qctrl[i].id != 0 && 
-                           !(s->qctrl[i].flags & V4L2_CTRL_FLAG_DISABLED)) {
-                               ctrl.id = s->qctrl[i].id;
-                               ctrl.value = qctrl[i].default_value;
-                               err = s->set_ctrl(cam, &ctrl);
-                               if (err) {
-                                       DBG(3, "Set control failed")
-                                       return err;
-                               }
-                       }
-       }
-
-       if (!(cam->state & DEV_INITIALIZED)) {
-               init_MUTEX(&cam->fileop_sem);
-               spin_lock_init(&cam->queue_lock);
-               init_waitqueue_head(&cam->wait_frame);
-               init_waitqueue_head(&cam->wait_stream);
-               memcpy(s->_qctrl, s->qctrl, sizeof(s->qctrl));
-               memcpy(&(s->_rect), &(s->cropcap.defrect), 
-                      sizeof(struct v4l2_rect));
-               cam->state |= DEV_INITIALIZED;
-       }
-
-       DBG(2, "Initialization succeeded")
-       return 0;
-}
-
-
-static void sn9c102_release_resources(struct sn9c102_device* cam)
-{
-       down(&sn9c102_sysfs_lock);
-
-       DBG(2, "V4L2 device /dev/video%d deregistered", cam->v4ldev->minor)
-       video_set_drvdata(cam->v4ldev, NULL);
-       video_unregister_device(cam->v4ldev);
-
-       up(&sn9c102_sysfs_lock);
-
-       kfree(cam->control_buffer);
-}
-
-/*****************************************************************************/
-
-static int sn9c102_open(struct inode* inode, struct file* filp)
-{
-       struct sn9c102_device* cam;
-       int err = 0;
-
-       /* This the only safe way to prevent race conditions with disconnect */
-       if (!down_read_trylock(&sn9c102_disconnect))
-               return -ERESTARTSYS;
-
-       cam = video_get_drvdata(video_devdata(filp));
-
-       if (down_interruptible(&cam->dev_sem)) {
-               up_read(&sn9c102_disconnect);
-               return -ERESTARTSYS;
-       }
-
-       if (cam->users) {
-               DBG(2, "Device /dev/video%d is busy...", cam->v4ldev->minor)
-               if ((filp->f_flags & O_NONBLOCK) ||
-                   (filp->f_flags & O_NDELAY)) {
-                       err = -EWOULDBLOCK;
-                       goto out;
-               }
-               up(&cam->dev_sem);
-               err = wait_event_interruptible_exclusive(cam->open,
-                                                 cam->state & DEV_DISCONNECTED
-                                                        || !cam->users);
-               if (err) {
-                       up_read(&sn9c102_disconnect);
-                       return err;
-               }
-               if (cam->state & DEV_DISCONNECTED) {
-                       up_read(&sn9c102_disconnect);
-                       return -ENODEV;
-               }
-               down(&cam->dev_sem);
-       }
-
-
-       if (cam->state & DEV_MISCONFIGURED) {
-               err = sn9c102_init(cam);
-               if (err) {
-                       DBG(1, "Initialization failed again. "
-                              "I will retry on next open().")
-                       goto out;
-               }
-               cam->state &= ~DEV_MISCONFIGURED;
-       }
-
-       if ((err = sn9c102_start_transfer(cam)))
-               goto out;
-
-       filp->private_data = cam;
-       cam->users++;
-       cam->io = IO_NONE;
-       cam->stream = STREAM_OFF;
-       cam->nbuffers = 0;
-       cam->frame_count = 0;
-       sn9c102_empty_framequeues(cam);
-
-       DBG(3, "Video device /dev/video%d is open", cam->v4ldev->minor)
-
-out:
-       up(&cam->dev_sem);
-       up_read(&sn9c102_disconnect);
-       return err;
-}
-
-
-static int sn9c102_release(struct inode* inode, struct file* filp)
-{
-       struct sn9c102_device* cam = video_get_drvdata(video_devdata(filp));
-
-       down(&cam->dev_sem); /* prevent disconnect() to be called */
-
-       sn9c102_stop_transfer(cam);
-
-       sn9c102_release_buffers(cam);
-
-       if (cam->state & DEV_DISCONNECTED) {
-               sn9c102_release_resources(cam);
-               up(&cam->dev_sem);
-               kfree(cam);
-               return 0;
-       }
-
-       cam->users--;
-       wake_up_interruptible_nr(&cam->open, 1);
-
-       DBG(3, "Video device /dev/video%d closed", cam->v4ldev->minor)
-
-       up(&cam->dev_sem);
-
-       return 0;
-}
-
-
-static ssize_t
-sn9c102_read(struct file* filp, char __user * buf, size_t count, loff_t* f_pos)
-{
-       struct sn9c102_device* cam = video_get_drvdata(video_devdata(filp));
-       struct sn9c102_frame_t* f, * i;
-       unsigned long lock_flags;
-       int err = 0;
-
-       if (down_interruptible(&cam->fileop_sem))
-               return -ERESTARTSYS;
-
-       if (cam->state & DEV_DISCONNECTED) {
-               DBG(1, "Device not present")
-               up(&cam->fileop_sem);
-               return -ENODEV;
-       }
-
-       if (cam->state & DEV_MISCONFIGURED) {
-               DBG(1, "The camera is misconfigured. Close and open it again.")
-               up(&cam->fileop_sem);
-               return -EIO;
-       }
-
-       if (cam->io == IO_MMAP) {
-               DBG(3, "Close and open the device again to choose "
-                      "the read method")
-               up(&cam->fileop_sem);
-               return -EINVAL;
-       }
-
-       if (cam->io == IO_NONE) {
-               if (!sn9c102_request_buffers(cam, 2)) {
-                       DBG(1, "read() failed, not enough memory")
-                       up(&cam->fileop_sem);
-                       return -ENOMEM;
-               }
-               cam->io = IO_READ;
-               cam->stream = STREAM_ON;
-               sn9c102_queue_unusedframes(cam);
-       }
-
-       if (!count) {
-               up(&cam->fileop_sem);
-               return 0;
-       }
-
-       if (list_empty(&cam->outqueue)) {
-               if (filp->f_flags & O_NONBLOCK) {
-                       up(&cam->fileop_sem);
-                       return -EAGAIN;
-               }
-               err = wait_event_interruptible
-                     ( cam->wait_frame, 
-                       (!list_empty(&cam->outqueue)) ||
-                       (cam->state & DEV_DISCONNECTED) );
-               if (err) {
-                       up(&cam->fileop_sem);
-                       return err;
-               }
-               if (cam->state & DEV_DISCONNECTED) {
-                       up(&cam->fileop_sem);
-                       return -ENODEV;
-               }
-       }
-
-       f = list_entry(cam->outqueue.prev, struct sn9c102_frame_t, frame);
-
-       spin_lock_irqsave(&cam->queue_lock, lock_flags);
-       list_for_each_entry(i, &cam->outqueue, frame)
-               i->state = F_UNUSED;
-       INIT_LIST_HEAD(&cam->outqueue);
-       spin_unlock_irqrestore(&cam->queue_lock, lock_flags);
-
-       sn9c102_queue_unusedframes(cam);
-
-       if (count > f->buf.length)
-               count = f->buf.length;
-
-       if (copy_to_user(buf, f->bufmem, count)) {
-               up(&cam->fileop_sem);
-               return -EFAULT;
-       }
-       *f_pos += count;
-
-       PDBGG("Frame #%lu, bytes read: %zu", (unsigned long)f->buf.index,count)
-
-       up(&cam->fileop_sem);
-
-       return count;
-}
-
-
-static unsigned int sn9c102_poll(struct file *filp, poll_table *wait)
-{
-       struct sn9c102_device* cam = video_get_drvdata(video_devdata(filp));
-       unsigned int mask = 0;
-
-       if (down_interruptible(&cam->fileop_sem))
-               return POLLERR;
-
-       if (cam->state & DEV_DISCONNECTED) {
-               DBG(1, "Device not present")
-               goto error;
-       }
-
-       if (cam->state & DEV_MISCONFIGURED) {
-               DBG(1, "The camera is misconfigured. Close and open it again.")
-               goto error;
-       }
-
-       if (cam->io == IO_NONE) {
-               if (!sn9c102_request_buffers(cam, 2)) {
-                       DBG(1, "poll() failed, not enough memory")
-                       goto error;
-               }
-               cam->io = IO_READ;
-               cam->stream = STREAM_ON;
-       }
-
-       if (cam->io == IO_READ)
-               sn9c102_queue_unusedframes(cam);
-
-       poll_wait(filp, &cam->wait_frame, wait);
-
-       if (!list_empty(&cam->outqueue))
-               mask |= POLLIN | POLLRDNORM;
-
-       up(&cam->fileop_sem);
-
-       return mask;
-
-error:
-       up(&cam->fileop_sem);
-       return POLLERR;
-}
-
-
-static void sn9c102_vm_open(struct vm_area_struct* vma)
-{
-       struct sn9c102_frame_t* f = vma->vm_private_data;
-       f->vma_use_count++;
-}
-
-
-static void sn9c102_vm_close(struct vm_area_struct* vma)
-{
-       /* NOTE: buffers are not freed here */
-       struct sn9c102_frame_t* f = vma->vm_private_data;
-       f->vma_use_count--;
-}
-
-
-static struct vm_operations_struct sn9c102_vm_ops = {
-       .open = sn9c102_vm_open,
-       .close = sn9c102_vm_close,
-};
-
-
-static int sn9c102_mmap(struct file* filp, struct vm_area_struct *vma)
-{
-       struct sn9c102_device* cam = video_get_drvdata(video_devdata(filp));
-       unsigned long size = vma->vm_end - vma->vm_start,
-                     start = vma->vm_start,
-                     pos,
-                     page;
-       u32 i;
-
-       if (down_interruptible(&cam->fileop_sem))
-               return -ERESTARTSYS;
-
-       if (cam->state & DEV_DISCONNECTED) {
-               DBG(1, "Device not present")
-               up(&cam->fileop_sem);
-               return -ENODEV;
-       }
-
-       if (cam->state & DEV_MISCONFIGURED) {
-               DBG(1, "The camera is misconfigured. Close and open it again.")
-               up(&cam->fileop_sem);
-               return -EIO;
-       }
-
-       if (cam->io != IO_MMAP || !(vma->vm_flags & VM_WRITE) ||
-           size != PAGE_ALIGN(cam->frame[0].buf.length)) {
-               up(&cam->fileop_sem);
-               return -EINVAL;
-       }
-
-       for (i = 0; i < cam->nbuffers; i++) {
-               if ((cam->frame[i].buf.m.offset>>PAGE_SHIFT) == vma->vm_pgoff)
-                       break;
-       }
-       if (i == cam->nbuffers) {
-               up(&cam->fileop_sem);
-               return -EINVAL;
-       }
-
-       pos = (unsigned long)cam->frame[i].bufmem;
-       while (size > 0) { /* size is page-aligned */
-               page = kvirt_to_pa(pos);
-               if (remap_page_range(vma, start, page, PAGE_SIZE, 
-                                    vma->vm_page_prot)) {
-                       up(&cam->fileop_sem);
-                       return -EAGAIN;
-               }
-               start += PAGE_SIZE;
-               pos += PAGE_SIZE;
-               size -= PAGE_SIZE;
-       }
-
-       vma->vm_ops = &sn9c102_vm_ops;
-       vma->vm_flags &= ~VM_IO; /* not I/O memory */
-       vma->vm_flags |= VM_RESERVED; /* avoid to swap out this VMA */
-       vma->vm_private_data = &cam->frame[i];
-
-       sn9c102_vm_open(vma);
-
-       up(&cam->fileop_sem);
-
-       return 0;
-}
-
-
-static int sn9c102_v4l2_ioctl(struct inode* inode, struct file* filp,
-                              unsigned int cmd, void __user * arg)
-{
-       struct sn9c102_device* cam = video_get_drvdata(video_devdata(filp));
-
-       switch (cmd) {
-
-       case VIDIOC_QUERYCAP:
-       {
-               struct v4l2_capability cap = {
-                       .driver = "sn9c102",
-                       .version = SN9C102_MODULE_VERSION_CODE,
-                       .capabilities = V4L2_CAP_VIDEO_CAPTURE | 
-                                       V4L2_CAP_READWRITE |
-                                       V4L2_CAP_STREAMING,
-               };
-
-               strlcpy(cap.card, cam->v4ldev->name, sizeof(cap.card));
-               strlcpy(cap.bus_info, cam->dev.bus_id, sizeof(cap.bus_info));
-
-               if (copy_to_user(arg, &cap, sizeof(cap)))
-                       return -EFAULT;
-
-               return 0;
-       }
-
-       case VIDIOC_ENUMINPUT:
-       {
-               struct v4l2_input i;
-
-               if (copy_from_user(&i, arg, sizeof(i)))
-                       return -EFAULT;
-
-               if (i.index)
-                       return -EINVAL;
-
-               memset(&i, 0, sizeof(i));
-               strcpy(i.name, "USB");
-
-               if (copy_to_user(arg, &i, sizeof(i)))
-                       return -EFAULT;
-
-               return 0;
-       }
-
-       case VIDIOC_G_INPUT:
-       case VIDIOC_S_INPUT:
-       {
-               int index;
-
-               if (copy_from_user(&index, arg, sizeof(index)))
-                       return -EFAULT;
-
-               if (index != 0)
-                       return -EINVAL;
-
-               return 0;
-       }
-
-       case VIDIOC_QUERYCTRL:
-       {
-               struct sn9c102_sensor* s = cam->sensor;
-               struct v4l2_queryctrl qc;
-               u8 i, n;
-
-               if (copy_from_user(&qc, arg, sizeof(qc)))
-                       return -EFAULT;
-
-               n = sizeof(s->qctrl) / sizeof(s->qctrl[0]);
-               for (i = 0; i < n; i++)
-                       if (qc.id && qc.id == s->qctrl[i].id) {
-                               memcpy(&qc, &(s->qctrl[i]), sizeof(qc));
-                               if (copy_to_user(arg, &qc, sizeof(qc)))
-                                       return -EFAULT;
-                               return 0;
-                       }
-
-               return -EINVAL;
-       }
-
-       case VIDIOC_G_CTRL:
-       {
-               struct sn9c102_sensor* s = cam->sensor;
-               struct v4l2_control ctrl;
-               int err = 0;
-
-               if (!s->get_ctrl)
-                       return -EINVAL;
-
-               if (copy_from_user(&ctrl, arg, sizeof(ctrl)))
-                       return -EFAULT;
-
-               err = s->get_ctrl(cam, &ctrl);
-
-               if (copy_to_user(arg, &ctrl, sizeof(ctrl)))
-                       return -EFAULT;
-
-               return err;
-       }
-
-       case VIDIOC_S_CTRL:
-       {
-               struct sn9c102_sensor* s = cam->sensor;
-               struct v4l2_control ctrl;
-               u8 i, n;
-               int err = 0;
-
-               if (!s->set_ctrl)
-                       return -EINVAL;
-
-               if (copy_from_user(&ctrl, arg, sizeof(ctrl)))
-                       return -EFAULT;
-
-               if ((err = s->set_ctrl(cam, &ctrl)))
-                       return err;
-
-               n = sizeof(s->qctrl) / sizeof(s->qctrl[0]);
-               for (i = 0; i < n; i++)
-                       if (ctrl.id == s->qctrl[i].id) {
-                               s->_qctrl[i].default_value = ctrl.value;
-                               break;
-                       }
-
-               return 0;
-       }
-
-       case VIDIOC_CROPCAP:
-       {
-               struct v4l2_cropcap* cc = &(cam->sensor->cropcap);
-
-               cc->type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
-               cc->pixelaspect.numerator = 1;
-               cc->pixelaspect.denominator = 1;
-
-               if (copy_to_user(arg, cc, sizeof(*cc)))
-                       return -EFAULT;
-
-               return 0;
-       }
-
-       case VIDIOC_G_CROP:
-       {
-               struct sn9c102_sensor* s = cam->sensor;
-               struct v4l2_crop crop = {
-                       .type = V4L2_BUF_TYPE_VIDEO_CAPTURE,
-               };
-
-               memcpy(&(crop.c), &(s->_rect), sizeof(struct v4l2_rect));
-
-               if (copy_to_user(arg, &crop, sizeof(crop)))
-                       return -EFAULT;
-
-               return 0;
-       }
-
-       case VIDIOC_S_CROP:
-       {
-               struct sn9c102_sensor* s = cam->sensor;
-               struct v4l2_crop crop;
-               struct v4l2_rect* rect;
-               struct v4l2_rect* bounds = &(s->cropcap.bounds);
-               struct v4l2_pix_format* pix_format = &(s->pix_format);
-               u8 scale;
-               const enum sn9c102_stream_state stream = cam->stream;
-               const u32 nbuffers = cam->nbuffers;
-               u32 i;
-               int err = 0;
-
-               if (copy_from_user(&crop, arg, sizeof(crop)))
-                       return -EFAULT;
-
-               rect = &(crop.c);
-
-               if (crop.type != V4L2_BUF_TYPE_VIDEO_CAPTURE)
-                       return -EINVAL;
-
-               for (i = 0; i < cam->nbuffers; i++)
-                       if (cam->frame[i].vma_use_count) {
-                               DBG(3, "VIDIOC_S_CROP failed. "
-                                      "Unmap the buffers first.")
-                               return -EINVAL;
-                       }
-
-               if (rect->width < 16)
-                       rect->width = 16;
-               if (rect->height < 16)
-                       rect->height = 16;
-               if (rect->width > bounds->width)
-                       rect->width = bounds->width;
-               if (rect->height > bounds->height)
-                       rect->height = bounds->height;
-               if (rect->left < bounds->left)
-                       rect->left = bounds->left;
-               if (rect->top < bounds->top)
-                       rect->top = bounds->top;
-               if (rect->left + rect->width > bounds->left + bounds->width)
-                       rect->left = bounds->left+bounds->width - rect->width;
-               if (rect->top + rect->height > bounds->top + bounds->height)
-                       rect->top = bounds->top+bounds->height - rect->height;
-
-               rect->width &= ~15L;
-               rect->height &= ~15L;
-
-               { /* calculate the scaling factor */
-                       u32 a, b;
-                       a = rect->width * rect->height;
-                       b = pix_format->width * pix_format->height;
-                       scale = b ? (u8)((a / b) <= 1 ? 1 : ((a / b) == 3 ? 2 :
-                                   ((a / b) > 4 ? 4 : (a / b)))) : 1;
-               }
-
-               if (cam->stream == STREAM_ON) {
-                       cam->stream = STREAM_INTERRUPT;
-                       err = wait_event_interruptible
-                             ( cam->wait_stream, 
-                               (cam->stream == STREAM_OFF) ||
-                               (cam->state & DEV_DISCONNECTED) );
-                       if (err) {
-                               cam->state |= DEV_MISCONFIGURED;
-                               DBG(1, "The camera is misconfigured. To use "
-                                      "it, close and open /dev/video%d "
-                                      "again.", cam->v4ldev->minor)
-                               return err;
-                       }
-                       if (cam->state & DEV_DISCONNECTED)
-                               return -ENODEV;
-               }
-
-               if (copy_to_user(arg, &crop, sizeof(crop))) {
-                       cam->stream = stream;
-                       return -EFAULT;
-               }
-
-               sn9c102_release_buffers(cam);
-
-               err = sn9c102_set_crop(cam, rect);
-               if (s->set_crop)
-                       err += s->set_crop(cam, rect);
-               err += sn9c102_set_scale(cam, scale);
-
-               if (err) { /* atomic, no rollback in ioctl() */
-                       cam->state |= DEV_MISCONFIGURED;
-                       DBG(1, "VIDIOC_S_CROP failed because of hardware "
-                              "problems. To use the camera, close and open "
-                              "/dev/video%d again.", cam->v4ldev->minor)
-                       return err;
-               }
-
-               s->pix_format.width = rect->width/scale;
-               s->pix_format.height = rect->height/scale;
-               memcpy(&(s->_rect), rect, sizeof(*rect));
-
-               if (nbuffers != sn9c102_request_buffers(cam, nbuffers)) {
-                       cam->state |= DEV_MISCONFIGURED;
-                       DBG(1, "VIDIOC_S_CROP failed because of not enough "
-                              "memory. To use the camera, close and open "
-                              "/dev/video%d again.", cam->v4ldev->minor)
-                       return -ENOMEM;
-               }
-
-               cam->stream = stream;
-
-               return 0;
-       }
-
-       case VIDIOC_ENUM_FMT:
-       {
-               struct sn9c102_sensor* s = cam->sensor;
-               struct v4l2_fmtdesc fmtd;
-
-               if (copy_from_user(&fmtd, arg, sizeof(fmtd)))
-                       return -EFAULT;
-
-               if (fmtd.index != 0)
-                       return -EINVAL;
-
-               memset(&fmtd, 0, sizeof(fmtd));
-
-               fmtd.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
-               strcpy(fmtd.description, "bayer rgb");
-               fmtd.pixelformat = s->pix_format.pixelformat;
-
-               if (copy_to_user(arg, &fmtd, sizeof(fmtd)))
-                       return -EFAULT;
-
-               return 0;
-       }
-
-       case VIDIOC_G_FMT:
-       {
-               struct v4l2_format format;
-               struct v4l2_pix_format* pfmt = &(cam->sensor->pix_format);
-
-               if (copy_from_user(&format, arg, sizeof(format)))
-                       return -EFAULT;
-
-               if (format.type != V4L2_BUF_TYPE_VIDEO_CAPTURE)
-                       return -EINVAL;
-
-               pfmt->bytesperline = (pfmt->width * pfmt->priv) / 8;
-               pfmt->sizeimage = pfmt->height * pfmt->bytesperline;
-               pfmt->field = V4L2_FIELD_NONE;
-               memcpy(&(format.fmt.pix), pfmt, sizeof(*pfmt));
-
-               if (copy_to_user(arg, &format, sizeof(format)))
-                       return -EFAULT;
-
-               return 0;
-       }
-
-       case VIDIOC_TRY_FMT:
-       case VIDIOC_S_FMT:
-       {
-               struct sn9c102_sensor* s = cam->sensor;
-               struct v4l2_format format;
-               struct v4l2_pix_format* pix;
-               struct v4l2_pix_format* pfmt = &(s->pix_format);
-               struct v4l2_rect* bounds = &(s->cropcap.bounds);
-               struct v4l2_rect rect;
-               u8 scale;
-               const enum sn9c102_stream_state stream = cam->stream;
-               const u32 nbuffers = cam->nbuffers;
-               u32 i;
-               int err = 0;
-
-               if (copy_from_user(&format, arg, sizeof(format)))
-                       return -EFAULT;
-
-               pix = &(format.fmt.pix);
-
-               if (format.type != V4L2_BUF_TYPE_VIDEO_CAPTURE)
-                       return -EINVAL;
-
-               memcpy(&rect, &(s->_rect), sizeof(rect));
-
-               { /* calculate the scaling factor */
-                       u32 a, b;
-                       a = rect.width * rect.height;
-                       b = pix->width * pix->height;
-                       scale = b ? (u8)((a / b) <= 1 ? 1 : ((a / b) == 3 ? 2 :
-                                   ((a / b) > 4 ? 4 : (a / b)))) : 1;
-               }
-
-               rect.width = scale * pix->width;
-               rect.height = scale * pix->height;
-
-               if (rect.width < 16)
-                       rect.width = 16;
-               if (rect.height < 16)
-                       rect.height = 16;
-               if (rect.width > bounds->left + bounds->width - rect.left)
-                       rect.width = bounds->left+bounds->width - rect.left;
-               if (rect.height > bounds->top + bounds->height - rect.top)
-                       rect.height = bounds->top + bounds->height - rect.top;
-
-               rect.width &= ~15L;
-               rect.height &= ~15L;
-
-               pix->width = rect.width / scale;
-               pix->height = rect.height / scale;
-
-               pix->pixelformat = pfmt->pixelformat;
-               pix->priv = pfmt->priv; /* bpp */
-               pix->colorspace = pfmt->colorspace;
-               pix->bytesperline = (pix->width * pix->priv) / 8;
-               pix->sizeimage = pix->height * pix->bytesperline;
-               pix->field = V4L2_FIELD_NONE;
-
-               if (cmd == VIDIOC_TRY_FMT)
-                       return 0;
-
-               for (i = 0; i < cam->nbuffers; i++)
-                       if (cam->frame[i].vma_use_count) {
-                               DBG(3, "VIDIOC_S_FMT failed. "
-                                      "Unmap the buffers first.")
-                               return -EINVAL;
-                       }
-
-               if (cam->stream == STREAM_ON) {
-                       cam->stream = STREAM_INTERRUPT;
-                       err = wait_event_interruptible
-                             ( cam->wait_stream, 
-                               (cam->stream == STREAM_OFF) ||
-                               (cam->state & DEV_DISCONNECTED) );
-                       if (err) {
-                               cam->state |= DEV_MISCONFIGURED;
-                               DBG(1, "The camera is misconfigured. To use "
-                                      "it, close and open /dev/video%d "
-                                      "again.", cam->v4ldev->minor)
-                               return err;
-                       }
-                       if (cam->state & DEV_DISCONNECTED)
-                               return -ENODEV;
-               }
-
-               if (copy_to_user(arg, &format, sizeof(format))) {
-                       cam->stream = stream;
-                       return -EFAULT;
-               }
-
-               sn9c102_release_buffers(cam);
-
-               err = sn9c102_set_crop(cam, &rect);
-               if (s->set_crop)
-                       err += s->set_crop(cam, &rect);
-               err += sn9c102_set_scale(cam, scale);
-
-               if (err) { /* atomic, no rollback in ioctl() */
-                       cam->state |= DEV_MISCONFIGURED;
-                       DBG(1, "VIDIOC_S_FMT failed because of hardware "
-                              "problems. To use the camera, close and open "
-                              "/dev/video%d again.", cam->v4ldev->minor)
-                       return err;
-               }
-
-               memcpy(pfmt, pix, sizeof(*pix));
-               memcpy(&(s->_rect), &rect, sizeof(rect));
-
-               if (nbuffers != sn9c102_request_buffers(cam, nbuffers)) {
-                       cam->state |= DEV_MISCONFIGURED;
-                       DBG(1, "VIDIOC_S_FMT failed because of not enough "
-                              "memory. To use the camera, close and open "
-                              "/dev/video%d again.", cam->v4ldev->minor)
-                       return -ENOMEM;
-               }
-
-               cam->stream = stream;
-
-               return 0;
-       }
-
-       case VIDIOC_REQBUFS:
-       {
-               struct v4l2_requestbuffers rb;
-               u32 i;
-               int err;
-
-               if (copy_from_user(&rb, arg, sizeof(rb)))
-                       return -EFAULT;
-
-               if (rb.type != V4L2_BUF_TYPE_VIDEO_CAPTURE ||
-                   rb.memory != V4L2_MEMORY_MMAP)
-                       return -EINVAL;
-
-               if (cam->io == IO_READ) {
-                       DBG(3, "Close and open the device again to choose "
-                              "the mmap I/O method")
-                       return -EINVAL;
-               }
-
-               for (i = 0; i < cam->nbuffers; i++)
-                       if (cam->frame[i].vma_use_count) {
-                               DBG(3, "VIDIOC_REQBUFS failed. "
-                                      "Previous buffers are still mapped.")
-                               return -EINVAL;
-                       }
-
-               if (cam->stream == STREAM_ON) {
-                       cam->stream = STREAM_INTERRUPT;
-                       err = wait_event_interruptible
-                             ( cam->wait_stream, 
-                               (cam->stream == STREAM_OFF) ||
-                               (cam->state & DEV_DISCONNECTED) );
-                       if (err) {
-                               cam->state |= DEV_MISCONFIGURED;
-                               DBG(1, "The camera is misconfigured. To use "
-                                      "it, close and open /dev/video%d "
-                                      "again.", cam->v4ldev->minor)
-                               return err;
-                       }
-                       if (cam->state & DEV_DISCONNECTED)
-                               return -ENODEV;
-               }
-
-               sn9c102_empty_framequeues(cam);
-
-               sn9c102_release_buffers(cam);
-               if (rb.count)
-                       rb.count = sn9c102_request_buffers(cam, rb.count);
-
-               if (copy_to_user(arg, &rb, sizeof(rb))) {
-                       sn9c102_release_buffers(cam);
-                       cam->io = IO_NONE;
-                       return -EFAULT;
-               }
-
-               cam->io = rb.count ? IO_MMAP : IO_NONE;
-
-               return 0;
-       }
-
-       case VIDIOC_QUERYBUF:
-       {
-               struct v4l2_buffer b;
-
-               if (copy_from_user(&b, arg, sizeof(b)))
-                       return -EFAULT;
-
-               if (b.type != V4L2_BUF_TYPE_VIDEO_CAPTURE ||
-                   b.index >= cam->nbuffers || cam->io != IO_MMAP)
-                       return -EINVAL;
-
-               memcpy(&b, &cam->frame[b.index].buf, sizeof(b));
-
-               if (cam->frame[b.index].vma_use_count)
-                       b.flags |= V4L2_BUF_FLAG_MAPPED;
-
-               if (cam->frame[b.index].state == F_DONE)
-                       b.flags |= V4L2_BUF_FLAG_DONE;
-               else if (cam->frame[b.index].state != F_UNUSED)
-                       b.flags |= V4L2_BUF_FLAG_QUEUED;
-
-               if (copy_to_user(arg, &b, sizeof(b)))
-                       return -EFAULT;
-
-               return 0;
-       }
-
-       case VIDIOC_QBUF:
-       {
-               struct v4l2_buffer b;
-               unsigned long lock_flags;
-
-               if (copy_from_user(&b, arg, sizeof(b)))
-                       return -EFAULT;
-
-               if (b.type != V4L2_BUF_TYPE_VIDEO_CAPTURE ||
-                   b.index >= cam->nbuffers || cam->io != IO_MMAP)
-                       return -EINVAL;
-
-               if (cam->frame[b.index].state != F_UNUSED)
-                       return -EINVAL;
-
-               cam->frame[b.index].state = F_QUEUED;
-
-               spin_lock_irqsave(&cam->queue_lock, lock_flags);
-               list_add_tail(&cam->frame[b.index].frame, &cam->inqueue);
-               spin_unlock_irqrestore(&cam->queue_lock, lock_flags);
-
-               PDBGG("Frame #%lu queued", (unsigned long)b.index)
-
-               return 0;
-       }
-
-       case VIDIOC_DQBUF:
-       {
-               struct v4l2_buffer b;
-               struct sn9c102_frame_t *f;
-               unsigned long lock_flags;
-               int err = 0;
-
-               if (copy_from_user(&b, arg, sizeof(b)))
-                       return -EFAULT;
-
-               if (b.type != V4L2_BUF_TYPE_VIDEO_CAPTURE || cam->io!= IO_MMAP)
-                       return -EINVAL;
-
-               if (list_empty(&cam->outqueue)) {
-                       if (cam->stream == STREAM_OFF)
-                               return -EINVAL;
-                       if (filp->f_flags & O_NONBLOCK)
-                               return -EAGAIN;
-                       err = wait_event_interruptible
-                             ( cam->wait_frame, 
-                               (!list_empty(&cam->outqueue)) ||
-                               (cam->state & DEV_DISCONNECTED) );
-                       if (err)
-                               return err;
-                       if (cam->state & DEV_DISCONNECTED)
-                               return -ENODEV;
-               }
-
-               spin_lock_irqsave(&cam->queue_lock, lock_flags);
-               f = list_entry(cam->outqueue.next, struct sn9c102_frame_t,
-                              frame);
-               list_del(&cam->outqueue);
-               spin_unlock_irqrestore(&cam->queue_lock, lock_flags);
-
-               f->state = F_UNUSED;
-
-               memcpy(&b, &f->buf, sizeof(b));
-               if (f->vma_use_count)
-                       b.flags |= V4L2_BUF_FLAG_MAPPED;
-
-               if (copy_to_user(arg, &b, sizeof(b)))
-                       return -EFAULT;
-
-               PDBGG("Frame #%lu dequeued", (unsigned long)f->buf.index)
-
-               return 0;
-       }
-
-       case VIDIOC_STREAMON:
-       {
-               int type;
-
-               if (copy_from_user(&type, arg, sizeof(type)))
-                       return -EFAULT;
-
-               if (type != V4L2_BUF_TYPE_VIDEO_CAPTURE || cam->io != IO_MMAP)
-                       return -EINVAL;
-
-               if (list_empty(&cam->inqueue))
-                       return -EINVAL;
-
-               cam->stream = STREAM_ON;
-
-               DBG(3, "Stream on")
-
-               return 0;
-       }
-
-       case VIDIOC_STREAMOFF:
-       {
-               int type, err;
-
-               if (copy_from_user(&type, arg, sizeof(type)))
-                       return -EFAULT;
-
-               if (type != V4L2_BUF_TYPE_VIDEO_CAPTURE || cam->io != IO_MMAP)
-                       return -EINVAL;
-
-               if (cam->stream == STREAM_ON) {
-                       cam->stream = STREAM_INTERRUPT;
-                       err = wait_event_interruptible
-                             ( cam->wait_stream, 
-                               (cam->stream == STREAM_OFF) ||
-                               (cam->state & DEV_DISCONNECTED) );
-                       if (err) {
-                               cam->state |= DEV_MISCONFIGURED;
-                               DBG(1, "The camera is misconfigured. To use "
-                                      "it, close and open /dev/video%d "
-                                      "again.", cam->v4ldev->minor)
-                               return err;
-                       }
-                       if (cam->state & DEV_DISCONNECTED)
-                               return -ENODEV;
-               }
-
-               sn9c102_empty_framequeues(cam);
-
-               DBG(3, "Stream off")
-
-               return 0;
-       }
-
-       case VIDIOC_G_STD:
-       case VIDIOC_S_STD:
-       case VIDIOC_QUERYSTD:
-       case VIDIOC_ENUMSTD:
-       case VIDIOC_QUERYMENU:
-       case VIDIOC_G_PARM:
-       case VIDIOC_S_PARM:
-               return -EINVAL;
-
-       default:
-               return -EINVAL;
-
-       }
-}
-
-
-static int sn9c102_ioctl(struct inode* inode, struct file* filp,
-                         unsigned int cmd, unsigned long arg)
-{
-       struct sn9c102_device* cam = video_get_drvdata(video_devdata(filp));
-       int err = 0;
-
-       if (down_interruptible(&cam->fileop_sem))
-               return -ERESTARTSYS;
-
-       if (cam->state & DEV_DISCONNECTED) {
-               DBG(1, "Device not present")
-               up(&cam->fileop_sem);
-               return -ENODEV;
-       }
-
-       if (cam->state & DEV_MISCONFIGURED) {
-               DBG(1, "The camera is misconfigured. Close and open it again.")
-               up(&cam->fileop_sem);
-               return -EIO;
-       }
-
-       err = sn9c102_v4l2_ioctl(inode, filp, cmd, (void __user *)arg);
-
-       up(&cam->fileop_sem);
-
-       return err;
-}
-
-
-static struct file_operations sn9c102_fops = {
-       .owner =   THIS_MODULE,
-       .open =    sn9c102_open,
-       .release = sn9c102_release,
-       .ioctl =   sn9c102_ioctl,
-       .read =    sn9c102_read,
-       .poll =    sn9c102_poll,
-       .mmap =    sn9c102_mmap,
-       .llseek =  no_llseek,
-};
-
-/*****************************************************************************/
-
-/* It exists a single interface only. We do not need to validate anything. */
-static int
-sn9c102_usb_probe(struct usb_interface* intf, const struct usb_device_id* id)
-{
-       struct usb_device *udev = interface_to_usbdev(intf);
-       struct sn9c102_device* cam;
-       static unsigned int dev_nr = 0;
-       unsigned int i, n;
-       int err = 0, r;
-
-       n = sizeof(sn9c102_id_table)/sizeof(sn9c102_id_table[0]);
-       for (i = 0; i < n-1; i++)
-               if (udev->descriptor.idVendor==sn9c102_id_table[i].idVendor &&
-                   udev->descriptor.idProduct==sn9c102_id_table[i].idProduct)
-                       break;
-       if (i == n-1)
-               return -ENODEV;
-
-       if (!(cam = kmalloc(sizeof(struct sn9c102_device), GFP_KERNEL)))
-               return -ENOMEM;
-       memset(cam, 0, sizeof(*cam));
-
-       cam->usbdev = udev;
-
-       memcpy(&cam->dev, &udev->dev, sizeof(struct device));
-
-       if (!(cam->control_buffer = kmalloc(8, GFP_KERNEL))) {
-               DBG(1, "kmalloc() failed")
-               err = -ENOMEM;
-               goto fail;
-       }
-       memset(cam->control_buffer, 0, 8);
-
-       if (!(cam->v4ldev = video_device_alloc())) {
-               DBG(1, "video_device_alloc() failed")
-               err = -ENOMEM;
-               goto fail;
-       }
-
-       init_MUTEX(&cam->dev_sem);
-
-       r = sn9c102_read_reg(cam, 0x00);
-       if (r < 0 || r != 0x10) {
-               DBG(1, "Sorry, this is not a SN9C10[12] based camera "
-                      "(vid/pid 0x%04X/0x%04X)",
-                   sn9c102_id_table[i].idVendor,sn9c102_id_table[i].idProduct)
-               err = -ENODEV;
-               goto fail;
-       }
-
-       DBG(2, "SN9C10[12] PC Camera Controller detected "
-              "(vid/pid 0x%04X/0x%04X)",
-           sn9c102_id_table[i].idVendor, sn9c102_id_table[i].idProduct)
-
-       for  (i = 0; sn9c102_sensor_table[i]; i++) {
-               err = sn9c102_sensor_table[i](cam);
-               if (!err)
-                       break;
-       }
-
-       if (!err && cam->sensor) {
-               DBG(2, "%s image sensor detected", cam->sensor->name)
-               DBG(3, "Support for %s maintained by %s",
-                   cam->sensor->name, cam->sensor->maintainer)
-       } else {
-               DBG(1, "No supported image sensor detected")
-               err = -ENODEV;
-               goto fail;
-       }
-
-       if (sn9c102_init(cam)) {
-               DBG(1, "Initialization failed. I will retry on open().")
-               cam->state |= DEV_MISCONFIGURED;
-       }
-
-       strcpy(cam->v4ldev->name, "SN9C10[12] PC Camera");
-       cam->v4ldev->owner = THIS_MODULE;
-       cam->v4ldev->type = VID_TYPE_CAPTURE | VID_TYPE_SCALES;
-       cam->v4ldev->hardware = VID_HARDWARE_SN9C102;
-       cam->v4ldev->fops = &sn9c102_fops;
-       cam->v4ldev->minor = video_nr[dev_nr];
-       cam->v4ldev->release = video_device_release;
-       video_set_drvdata(cam->v4ldev, cam);
-
-       down(&cam->dev_sem);
-
-       err = video_register_device(cam->v4ldev, VFL_TYPE_GRABBER,
-                                   video_nr[dev_nr]);
-       if (err) {
-               DBG(1, "V4L2 device registration failed")
-               if (err == -ENFILE && video_nr[dev_nr] == -1)
-                       DBG(1, "Free /dev/videoX node not found")
-               video_nr[dev_nr] = -1;
-               dev_nr = (dev_nr < SN9C102_MAX_DEVICES-1) ? dev_nr+1 : 0;
-               up(&cam->dev_sem);
-               goto fail;
-       }
-
-       DBG(2, "V4L2 device registered as /dev/video%d", cam->v4ldev->minor)
-
-       sn9c102_create_sysfs(cam);
-
-       usb_set_intfdata(intf, cam);
-
-       up(&cam->dev_sem);
-
-       return 0;
-
-fail:
-       if (cam) {
-               kfree(cam->control_buffer);
-               if (cam->v4ldev)
-                       video_device_release(cam->v4ldev);
-               kfree(cam);
-       }
-       return err;
-}
-
-
-static void sn9c102_usb_disconnect(struct usb_interface* intf)
-{
-       struct sn9c102_device* cam = usb_get_intfdata(intf);
-
-       if (!cam)
-               return;
-
-       down_write(&sn9c102_disconnect);
-
-       down(&cam->dev_sem); 
-
-       DBG(2, "Disconnecting %s...", cam->v4ldev->name)
-
-       wake_up_interruptible_all(&cam->open);
-
-       if (cam->users) {
-               DBG(2, "Device /dev/video%d is open! Deregistration and "
-                      "memory deallocation are deferred on close.",
-                   cam->v4ldev->minor)
-               cam->state |= DEV_MISCONFIGURED;
-               sn9c102_stop_transfer(cam);
-               cam->state |= DEV_DISCONNECTED;
-               wake_up_interruptible(&cam->wait_frame);
-               wake_up_interruptible(&cam->wait_stream);
-       } else {
-               cam->state |= DEV_DISCONNECTED;
-               sn9c102_release_resources(cam);
-       }
-
-       up(&cam->dev_sem);
-
-       if (!cam->users)
-               kfree(cam);
-
-       up_write(&sn9c102_disconnect);
-}
-
-
-static struct usb_driver sn9c102_usb_driver = {
-       .owner =      THIS_MODULE,
-       .name =       "sn9c102",
-       .id_table =   sn9c102_id_table,
-       .probe =      sn9c102_usb_probe,
-       .disconnect = sn9c102_usb_disconnect,
-};
-
-/*****************************************************************************/
-
-static int __init sn9c102_module_init(void)
-{
-       int err = 0;
-
-       KDBG(2, SN9C102_MODULE_NAME " v" SN9C102_MODULE_VERSION)
-       KDBG(3, SN9C102_MODULE_AUTHOR)
-
-       if ((err = usb_register(&sn9c102_usb_driver)))
-               KDBG(1, "usb_register() failed")
-
-       return err;
-}
-
-
-static void __exit sn9c102_module_exit(void)
-{
-       usb_deregister(&sn9c102_usb_driver);
-}
-
-
-module_init(sn9c102_module_init);
-module_exit(sn9c102_module_exit);
diff --git a/drivers/usb/media/sn9c102_pas106b.c b/drivers/usb/media/sn9c102_pas106b.c
deleted file mode 100644 (file)
index 34bdfcf..0000000
+++ /dev/null
@@ -1,209 +0,0 @@
-/***************************************************************************
- * Driver for PAS106B image sensor connected to the SN9C10[12] PC Camera   *
- * Controllers                                                             *
- *                                                                         *
- * Copyright (C) 2004 by Luca Risolia <luca.risolia@studio.unibo.it>       *
- *                                                                         *
- * 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.               *
- ***************************************************************************/
-
-#include <linux/delay.h>
-#include "sn9c102_sensor.h"
-
-
-static struct sn9c102_sensor pas106b;
-
-
-static int pas106b_init(struct sn9c102_device* cam)
-{
-       int err = 0;
-
-       err += sn9c102_write_reg(cam, 0x00, 0x10);
-       err += sn9c102_write_reg(cam, 0x00, 0x11);
-       err += sn9c102_write_reg(cam, 0x00, 0x14);
-       err += sn9c102_write_reg(cam, 0x20, 0x17);
-       err += sn9c102_write_reg(cam, 0x20, 0x19);
-       err += sn9c102_write_reg(cam, 0x09, 0x18);
-
-       err += sn9c102_i2c_write(cam, 0x02, 0x0c);
-       err += sn9c102_i2c_write(cam, 0x03, 0x12);
-       err += sn9c102_i2c_write(cam, 0x04, 0x05);
-       err += sn9c102_i2c_write(cam, 0x05, 0x22);
-       err += sn9c102_i2c_write(cam, 0x06, 0xac);
-       err += sn9c102_i2c_write(cam, 0x07, 0x00);
-       err += sn9c102_i2c_write(cam, 0x08, 0x01);
-       err += sn9c102_i2c_write(cam, 0x0a, 0x00);
-       err += sn9c102_i2c_write(cam, 0x0b, 0x00);
-       err += sn9c102_i2c_write(cam, 0x0d, 0x00);
-       err += sn9c102_i2c_write(cam, 0x10, 0x06);
-       err += sn9c102_i2c_write(cam, 0x11, 0x06);
-       err += sn9c102_i2c_write(cam, 0x12, 0x00);
-       err += sn9c102_i2c_write(cam, 0x14, 0x02);
-       err += sn9c102_i2c_write(cam, 0x13, 0x01);
-
-       msleep(400);
-
-       return err;
-}
-
-
-static int pas106b_get_ctrl(struct sn9c102_device* cam, 
-                            struct v4l2_control* ctrl)
-{
-       switch (ctrl->id) {
-       case V4L2_CID_RED_BALANCE:
-               return (ctrl->value = sn9c102_i2c_read(cam, 0x0c))<0 ? -EIO:0;
-       case V4L2_CID_BLUE_BALANCE:
-               return (ctrl->value = sn9c102_i2c_read(cam, 0x09))<0 ? -EIO:0;
-       case V4L2_CID_BRIGHTNESS:
-               return (ctrl->value = sn9c102_i2c_read(cam, 0x0e))<0 ? -EIO:0;
-       default:
-               return -EINVAL;
-       }
-}
-
-
-static int pas106b_set_ctrl(struct sn9c102_device* cam, 
-                            const struct v4l2_control* ctrl)
-{
-       int err = 0;
-
-       switch (ctrl->id) {
-       case V4L2_CID_RED_BALANCE:
-               err += sn9c102_i2c_write(cam, 0x0c, ctrl->value & 0x1f);
-               break;
-       case V4L2_CID_BLUE_BALANCE:
-               err += sn9c102_i2c_write(cam, 0x09, ctrl->value & 0x1f);
-               break;
-       case V4L2_CID_BRIGHTNESS:
-               err += sn9c102_i2c_write(cam, 0x0e, ctrl->value & 0x1f);
-               break;
-       default:
-               return -EINVAL;
-       }
-       err += sn9c102_i2c_write(cam, 0x13, 0x01);
-
-       return err;
-}
-
-
-static int pas106b_set_crop(struct sn9c102_device* cam, 
-                            const struct v4l2_rect* rect)
-{
-       struct sn9c102_sensor* s = &pas106b;
-       int err = 0;
-       u8 h_start = (u8)(rect->left - s->cropcap.bounds.left) + 4,
-          v_start = (u8)(rect->top - s->cropcap.bounds.top) + 3;
-
-       err += sn9c102_write_reg(cam, h_start, 0x12);
-       err += sn9c102_write_reg(cam, v_start, 0x13);
-
-       return err;
-}
-
-
-static struct sn9c102_sensor pas106b = {
-       .name = "PAS106B",
-       .maintainer = "Luca Risolia <luca.risolia@studio.unibo.it>",
-       .frequency = SN9C102_I2C_400KHZ | SN9C102_I2C_100KHZ,
-       .interface = SN9C102_I2C_2WIRES,
-       .slave_read_id = 0x40,
-       .slave_write_id = 0x40,
-       .init = &pas106b_init,
-       .qctrl = {
-               {
-                       .id = V4L2_CID_RED_BALANCE,
-                       .type = V4L2_CTRL_TYPE_INTEGER,
-                       .name = "red balance",
-                       .minimum = 0x00,
-                       .maximum = 0x1f,
-                       .step = 0x01,
-                       .default_value = 0x03,
-                       .flags = 0,
-               },
-               {
-                       .id = V4L2_CID_BLUE_BALANCE,
-                       .type = V4L2_CTRL_TYPE_INTEGER,
-                       .name = "blue balance",
-                       .minimum = 0x00,
-                       .maximum = 0x1f,
-                       .step = 0x01,
-                       .default_value = 0x02,
-                       .flags = 0,
-               },
-               {
-                       .id = V4L2_CID_BRIGHTNESS,
-                       .type = V4L2_CTRL_TYPE_INTEGER,
-                       .name = "brightness",
-                       .minimum = 0x00,
-                       .maximum = 0x1f,
-                       .step = 0x01,
-                       .default_value = 0x06,
-                       .flags = 0,
-               },
-       },
-       .get_ctrl = &pas106b_get_ctrl,
-       .set_ctrl = &pas106b_set_ctrl,
-       .cropcap = {
-               .bounds = {
-                       .left = 0,
-                       .top = 0,
-                       .width = 352,
-                       .height = 288,
-               },
-               .defrect = {
-                       .left = 0,
-                       .top = 0,
-                       .width = 352,
-                       .height = 288,
-               },
-       },
-       .set_crop = &pas106b_set_crop,
-       .pix_format = {
-               .width = 352,
-               .height = 288,
-               .pixelformat = V4L2_PIX_FMT_SBGGR8,
-               .priv = 8, /* we use this field as 'bits per pixel' */
-       }
-};
-
-
-int sn9c102_probe_pas106b(struct sn9c102_device* cam)
-{
-       int r0 = 0, r1 = 0, err = 0;
-       unsigned int pid = 0;
-
-       /* Minimal initialization to enable the I2C communication
-          NOTE: do NOT change the values! */
-       err += sn9c102_write_reg(cam, 0x01, 0x01); /* sensor power down */
-       err += sn9c102_write_reg(cam, 0x00, 0x01); /* sensor power on */
-       err += sn9c102_write_reg(cam, 0x28, 0x17); /* sensor clock at 48 MHz */
-       if (err)
-               return -EIO;
-
-       r0 = sn9c102_i2c_try_read(cam, &pas106b, 0x00);
-       r1 = sn9c102_i2c_try_read(cam, &pas106b, 0x01);
-
-       if (r0 < 0 || r1 < 0)
-               return -EIO;
-
-       pid = (r0 << 11) | ((r1 & 0xf0) >> 4);
-       if (pid != 0x007)
-               return -ENODEV;
-
-       sn9c102_attach_sensor(cam, &pas106b);
-
-       return 0;
-}
diff --git a/drivers/usb/media/sn9c102_sensor.h b/drivers/usb/media/sn9c102_sensor.h
deleted file mode 100644 (file)
index 54a3499..0000000
+++ /dev/null
@@ -1,270 +0,0 @@
-/***************************************************************************
- * API for image sensors connected to the SN9C10[12] PC Camera Controllers *
- *                                                                         *
- * Copyright (C) 2004 by Luca Risolia <luca.risolia@studio.unibo.it>       *
- *                                                                         *
- * 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 _SN9C102_SENSOR_H_
-#define _SN9C102_SENSOR_H_
-
-#include <linux/usb.h>
-#include <linux/videodev.h>
-#include <linux/device.h>
-#include <linux/stddef.h>
-#include <linux/errno.h>
-#include <asm/types.h>
-
-struct sn9c102_device;
-struct sn9c102_sensor;
-
-/*****************************************************************************/
-
-/* OVERVIEW.
-   This is a small interface that allows you to add support for any CCD/CMOS
-   image sensors connected to the SN9C10X bridges. The entire API is documented
-   below. In the most general case, to support a sensor there are three steps
-   you have to follow:
-   1) define the main "sn9c102_sensor" structure by setting the basic fields;
-   2) write a probing function to be called by the core module when the USB
-      camera is recognized, then add both the USB ids and the name of that
-      function to the two corresponding tables SENSOR_TABLE and ID_TABLE (see
-      below);
-   3) implement the methods that you want/need (and fill the rest of the main
-      structure accordingly).
-   "sn9c102_pas106b.c" is an example of all this stuff. Remember that you do
-   NOT need to touch the source code of the core module for the things to work
-   properly, unless you find bugs or flaws in it. Finally, do not forget to
-   read the V4L2 API for completeness. */
-
-/*****************************************************************************/
-/* Probing functions: on success, you must attach the sensor to the camera
-   by calling sn9c102_attach_sensor() provided below.
-   To enable the I2C communication, you might need to perform a really basic
-   initialization of the SN9C10X chip by using the write function declared 
-   ahead.
-   Functions must return 0 on success, the appropriate error otherwise. */
-extern int sn9c102_probe_pas106b(struct sn9c102_device* cam);
-extern int sn9c102_probe_tas5110c1b(struct sn9c102_device* cam);
-extern int sn9c102_probe_tas5130d1b(struct sn9c102_device* cam);
-
-/* Add the above entries to this table. Be sure to add the entry in the right
-   place, since, on failure, the next probing routine is called according to 
-   the order of the list below, from top to bottom */
-#define SN9C102_SENSOR_TABLE                                                  \
-static int (*sn9c102_sensor_table[])(struct sn9c102_device*) = {              \
-       &sn9c102_probe_pas106b, /* strong detection based on SENSOR vid/pid */\
-       &sn9c102_probe_tas5110c1b, /* detection based on USB pid/vid */       \
-       &sn9c102_probe_tas5130d1b, /* detection based on USB pid/vid */       \
-       NULL,                                                                 \
-};
-
-/* Attach a probed sensor to the camera. */
-extern void 
-sn9c102_attach_sensor(struct sn9c102_device* cam,
-                      struct sn9c102_sensor* sensor);
-
-/* Each SN9C10X camera has proper PID/VID identifiers. Add them here in case.*/
-#define SN9C102_ID_TABLE                                                      \
-static const struct usb_device_id sn9c102_id_table[] = {                      \
-       { USB_DEVICE(0xc45, 0x6001), },                                       \
-       { USB_DEVICE(0xc45, 0x6005), }, /* TAS5110C1B */                      \
-       { USB_DEVICE(0xc45, 0x6009), }, /* PAS106B */                         \
-       { USB_DEVICE(0xc45, 0x600d), }, /* PAS106B */                         \
-       { USB_DEVICE(0xc45, 0x6024), },                                       \
-       { USB_DEVICE(0xc45, 0x6025), }, /* TAS5130D1B Maybe also TAS5110C1B */\
-       { USB_DEVICE(0xc45, 0x6028), }, /* Maybe PAS202B */                   \
-       { USB_DEVICE(0xc45, 0x6029), },                                       \
-       { USB_DEVICE(0xc45, 0x602a), }, /* Maybe HV7131[D|E1] */              \
-       { USB_DEVICE(0xc45, 0x602c), }, /* Maybe OV7620 */                    \
-       { USB_DEVICE(0xc45, 0x6030), }, /* Maybe MI03 */                      \
-       { USB_DEVICE(0xc45, 0x8001), },                                       \
-       { }                                                                   \
-};
-
-/*****************************************************************************/
-
-/* Read/write routines: they always return -1 on error, 0 or the read value
-   otherwise. NOTE that a real read operation is not supported by the SN9C10X
-   chip for some of its registers. To work around this problem, a pseudo-read
-   call is provided instead: it returns the last successfully written value 
-   on the register (0 if it has never been written), the usual -1 on error. */
-
-/* The "try" I2C I/O versions are used when probing the sensor */
-extern int sn9c102_i2c_try_write(struct sn9c102_device*,struct sn9c102_sensor*,
-                                 u8 address, u8 value);
-extern int sn9c102_i2c_try_read(struct sn9c102_device*,struct sn9c102_sensor*,
-                                u8 address);
-
-/* This must be used if and only if the sensor doesn't implement the standard
-   I2C protocol, like the TASC sensors. There a number of good reasons why you
-   must use the single-byte versions of this function: do not abuse. It writes
-   n bytes, from data0 to datan, (registers 0x09 - 0x09+n of SN9C10X chip) */
-extern int sn9c102_i2c_try_raw_write(struct sn9c102_device* cam,
-                                     struct sn9c102_sensor* sensor, u8 n, 
-                                     u8 data0, u8 data1, u8 data2, u8 data3,
-                                     u8 data4, u8 data5);
-
-/* To be used after the sensor struct has been attached to the camera struct */
-extern int sn9c102_i2c_write(struct sn9c102_device*, u8 address, u8 value);
-extern int sn9c102_i2c_read(struct sn9c102_device*, u8 address);
-
-/* I/O on registers in the bridge. Could be used by the sensor methods too */
-extern int sn9c102_write_reg(struct sn9c102_device*, u8 value, u16 index);
-extern int sn9c102_pread_reg(struct sn9c102_device*, u16 index);
-
-/* NOTE: there are no debugging functions here. To uniform the output you must
-   use the dev_info()/dev_warn()/dev_err() macros defined in device.h, already
-   included here, the argument being the struct device 'dev' of the sensor
-   structure. Do NOT use these macros before the sensor is attached or the
-   kernel will crash! However you should not need to notify the user about
-   common errors or other messages, since this is done by the master module. */
-
-/*****************************************************************************/
-
-enum sn9c102_i2c_frequency { /* sensors may support both the frequencies */
-       SN9C102_I2C_100KHZ = 0x01,
-       SN9C102_I2C_400KHZ = 0x02,
-};
-
-enum sn9c102_i2c_interface {
-       SN9C102_I2C_2WIRES,
-       SN9C102_I2C_3WIRES,
-};
-
-struct sn9c102_sensor {
-       char name[32], /* sensor name */
-            maintainer[64]; /* name of the mantainer <email> */
-
-       /* These sensor capabilities must be provided if the SN9C10X controller
-          needs to communicate through the sensor serial interface by using
-          at least one of the i2c functions available */
-       enum sn9c102_i2c_frequency frequency;
-       enum sn9c102_i2c_interface interface;
-
-       /* These identifiers must be provided if the image sensor implements
-          the standard I2C protocol. TASC sensors don't, although they have a
-          serial interface: so this is a case where the "raw" I2C version
-          could be helpful. */
-       u8 slave_read_id, slave_write_id; /* reg. 0x09 */
-
-       /* NOTE: Where not noted,most of the functions below are not mandatory.
-                Set to null if you do not implement them. If implemented,
-                they must return 0 on success, the proper error otherwise. */
-
-       int (*init)(struct sn9c102_device* cam);
-       /* This function is called after the sensor has been attached. 
-          It should be used to initialize the sensor only, but may also
-          configure part of the SN9C10X chip if necessary. You don't need to
-          setup picture settings like brightness, contrast, etc.. here, if
-          the corrisponding controls are implemented (see below), since 
-          they are adjusted in the core driver by calling the set_ctrl()
-          method after init(), where the arguments are the default values
-          specified in the v4l2_queryctrl list of supported controls;
-          Same suggestions apply for other settings, _if_ the corresponding
-          methods are present; if not, the initialization must configure the
-          sensor according to the default configuration structures below. */
-
-       struct v4l2_queryctrl qctrl[V4L2_CID_LASTP1-V4L2_CID_BASE];
-       /* Optional list of default controls, defined as indicated in the 
-          V4L2 API. Menu type controls are not handled by this interface. */
-
-       int (*get_ctrl)(struct sn9c102_device* cam, struct v4l2_control* ctrl);
-       int (*set_ctrl)(struct sn9c102_device* cam,
-                       const struct v4l2_control* ctrl);
-       /* You must implement at least the set_ctrl method if you have defined
-          the list above. The returned value must follow the V4L2
-          specifications for the VIDIOC_G|C_CTRL ioctls. V4L2_CID_H|VCENTER
-          are not supported by this driver, so do not implement them. Also,
-          passed values are NOT checked to see if they are out of bounds. */
-
-       struct v4l2_cropcap cropcap;
-       /* Think the image sensor as a grid of R,G,B monochromatic pixels
-          disposed according to a particular Bayer pattern, which describes
-          the complete array of pixels, from (0,0) to (xmax, ymax). We will
-          use this coordinate system from now on. It is assumed the sensor
-          chip can be programmed to capture/transmit a subsection of that
-          array of pixels: we will call this subsection "active window".
-          It is not always true that the largest achievable active window can
-          cover the whole array of pixels. The V4L2 API defines another
-          area called "source rectangle", which, in turn, is a subrectangle of
-          the active window. The SN9C10X chip is always programmed to read the
-          source rectangle.
-          The bounds of both the active window and the source rectangle are
-          specified in the cropcap substructures 'bounds' and 'defrect'.
-          By default, the source rectangle should cover the largest possible
-          area. Again, it is not always true that the largest source rectangle
-          can cover the entire active window, although it is a rare case for 
-          the hardware we have. The bounds of the source rectangle _must_ be
-          multiple of 16 and must use the same coordinate system as indicated
-          before; their centers shall align initially.
-          If necessary, the sensor chip must be initialized during init() to
-          set the bounds of the active sensor window; however, by default, it
-          usually covers the largest achievable area (maxwidth x maxheight)
-          of pixels, so no particular initialization is needed, if you have
-          defined the correct default bounds in the structures.
-          See the V4L2 API for further details.
-          NOTE: once you have defined the bounds of the active window
-                (struct cropcap.bounds) you must not change them.anymore.
-          Only 'bounds' and 'defrect' fields are mandatory, other fields
-          will be ignored. */
-
-       int (*set_crop)(struct sn9c102_device* cam,
-                       const struct v4l2_rect* rect);
-       /* To be called on VIDIOC_C_SETCROP. The core module always calls a
-          default routine which configures the appropriate SN9C10X regs (also
-          scaling), but you may need to override/adjust specific stuff.
-          'rect' contains width and height values that are multiple of 16: in
-          case you override the default function, you always have to program
-          the chip to match those values; on error return the corresponding
-          error code without rolling back.
-          NOTE: in case, you must program the SN9C10X chip to get rid of 
-                blank pixels or blank lines at the _start_ of each line or
-                frame after each HSYNC or VSYNC, so that the image starts with
-                real RGB data (see regs 0x12,0x13) (having set H_SIZE and,
-                V_SIZE you don't have to care about blank pixels or blank
-                lines at the end of each line or frame). */
-
-       struct v4l2_pix_format pix_format;
-       /* What you have to define here are: initial 'width' and 'height' of
-          the target rectangle, the bayer 'pixelformat' and 'priv' which we'll
-          be used to indicate the number of bits per pixel, 8 or 9. 
-          Nothing more.
-          NOTE 1: both 'width' and 'height' _must_ be either 1/1 or 1/2 or 1/4
-                  of cropcap.defrect.width and cropcap.defrect.height. I
-                  suggest 1/1.
-          NOTE 2: as said above, you have to program the SN9C10X chip to get
-                  rid of any blank pixels, so that the output of the sensor
-                  matches the RGB bayer sequence (i.e. BGBGBG...GRGRGR). */
-
-       const struct device* dev;
-       /* This is the argument for dev_err(), dev_info() and dev_warn(). It
-          is used for debugging purposes. You must not access the struct
-          before the sensor is attached. */
-
-       const struct usb_device* usbdev;
-       /* Points to the usb_device struct after the sensor is attached.
-          Do not touch unless you know what you are doing. */
-
-       /* Do NOT write to the data below, it's READ ONLY. It is used by the
-          core module to store successfully updated values of the above
-          settings, for rollbacks..etc..in case of errors during atomic I/O */
-       struct v4l2_queryctrl _qctrl[V4L2_CID_LASTP1-V4L2_CID_BASE];
-       struct v4l2_rect _rect;
-};
-
-#endif /* _SN9C102_SENSOR_H_ */
diff --git a/drivers/usb/media/sn9c102_tas5110c1b.c b/drivers/usb/media/sn9c102_tas5110c1b.c
deleted file mode 100644 (file)
index d674700..0000000
+++ /dev/null
@@ -1,98 +0,0 @@
-/***************************************************************************
- * Driver for TAS5110C1B image sensor connected to the SN9C10[12] PC       *
- * Camera Controllers                                                      *
- *                                                                         *
- * Copyright (C) 2004 by Luca Risolia <luca.risolia@studio.unibo.it>       *
- *                                                                         *
- * 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.               *
- ***************************************************************************/
-
-#include "sn9c102_sensor.h"
-
-
-static struct sn9c102_sensor tas5110c1b;
-
-
-static int tas5110c1b_init(struct sn9c102_device* cam)
-{
-       int err = 0;
-
-       err += sn9c102_write_reg(cam, 0x01, 0x01);
-       err += sn9c102_write_reg(cam, 0x44, 0x01);
-       err += sn9c102_write_reg(cam, 0x00, 0x10);
-       err += sn9c102_write_reg(cam, 0x00, 0x11);
-       err += sn9c102_write_reg(cam, 0x00, 0x14);
-       err += sn9c102_write_reg(cam, 0x60, 0x17);
-       err += sn9c102_write_reg(cam, 0x06, 0x18);
-       err += sn9c102_write_reg(cam, 0xcb, 0x19);
-
-       return err;
-}
-
-
-static int tas5110c1b_set_crop(struct sn9c102_device* cam, 
-                               const struct v4l2_rect* rect)
-{
-       struct sn9c102_sensor* s = &tas5110c1b;
-       int err = 0;
-       u8 h_start = (u8)(rect->left - s->cropcap.bounds.left) + 69,
-          v_start = (u8)(rect->top - s->cropcap.bounds.top) + 9;
-
-       err += sn9c102_write_reg(cam, h_start, 0x12);
-       err += sn9c102_write_reg(cam, v_start, 0x13);
-
-       return err;
-}
-
-
-static struct sn9c102_sensor tas5110c1b = {
-       .name = "TAS5110C1B",
-       .maintainer = "Luca Risolia <luca.risolia@studio.unibo.it>",
-       .init = &tas5110c1b_init,
-       .cropcap = {
-               .bounds = {
-                       .left = 0,
-                       .top = 0,
-                       .width = 352,
-                       .height = 288,
-               },
-               .defrect = {
-                       .left = 0,
-                       .top = 0,
-                       .width = 352,
-                       .height = 288,
-               },
-       },
-       .set_crop = &tas5110c1b_set_crop,
-       .pix_format = {
-               .width = 352,
-               .height = 288,
-               .pixelformat = V4L2_PIX_FMT_SBGGR8,
-               .priv = 8,
-       }
-};
-
-
-int sn9c102_probe_tas5110c1b(struct sn9c102_device* cam)
-{
-       /* This sensor has no identifiers, so let's attach it anyway */
-       sn9c102_attach_sensor(cam, &tas5110c1b);
-
-       /* At the moment, only devices whose PID is 0x6005 have this sensor */
-       if (tas5110c1b.usbdev->descriptor.idProduct != 0x6005)
-               return -ENODEV;
-
-       return 0;
-}
diff --git a/drivers/usb/media/sn9c102_tas5130d1b.c b/drivers/usb/media/sn9c102_tas5130d1b.c
deleted file mode 100644 (file)
index 5f1b0f9..0000000
+++ /dev/null
@@ -1,120 +0,0 @@
-/***************************************************************************
- * Driver for TAS5130D1B image sensor connected to the SN9C10[12] PC       *
- * Camera Controllers                                                      *
- *                                                                         *
- * Copyright (C) 2004 by Luca Risolia <luca.risolia@studio.unibo.it>       *
- *                                                                         *
- * 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.               *
- ***************************************************************************/
-
-#include "sn9c102_sensor.h"
-
-
-static struct sn9c102_sensor tas5130d1b;
-
-
-static int tas5130d1b_init(struct sn9c102_device* cam)
-{
-       int err = 0;
-
-       err += sn9c102_write_reg(cam, 0x01, 0x01);
-       err += sn9c102_write_reg(cam, 0x20, 0x17);
-       err += sn9c102_write_reg(cam, 0x04, 0x01);
-       err += sn9c102_write_reg(cam, 0x01, 0x10);
-       err += sn9c102_write_reg(cam, 0x00, 0x11);
-       err += sn9c102_write_reg(cam, 0x00, 0x14);
-       err += sn9c102_write_reg(cam, 0x60, 0x17);
-       err += sn9c102_write_reg(cam, 0x07, 0x18);
-       err += sn9c102_write_reg(cam, 0x33, 0x19);
-
-       err += sn9c102_i2c_try_raw_write(cam, &tas5130d1b, 4, 0x11, 0x00, 0x40,
-                                        0x47, 0, 0);
-       err += sn9c102_i2c_try_raw_write(cam, &tas5130d1b, 4, 0x11, 0x02, 0x20,
-                                        0xa9, 0, 0);
-       err += sn9c102_i2c_try_raw_write(cam, &tas5130d1b, 4, 0x11, 0x00, 0xc0,
-                                        0x49, 0, 0);
-       err += sn9c102_i2c_try_raw_write(cam, &tas5130d1b, 4, 0x11, 0x02, 0x20,
-                                        0x6c, 0, 0);
-       err += sn9c102_i2c_try_raw_write(cam, &tas5130d1b, 4, 0x11, 0x00, 0xc0,
-                                        0x08, 0, 0);
-       err += sn9c102_i2c_try_raw_write(cam, &tas5130d1b, 4, 0x11, 0x00, 0x20,
-                                        0x00, 0, 0);
-
-       err += sn9c102_write_reg(cam, 0x63, 0x19);
-
-       return err;
-}
-
-
-static int tas5130d1b_set_crop(struct sn9c102_device* cam, 
-                               const struct v4l2_rect* rect)
-{
-       struct sn9c102_sensor* s = &tas5130d1b;
-       int err = 0;
-       u8 h_start = (u8)(rect->left - s->cropcap.bounds.left) + 104,
-          v_start = (u8)(rect->top - s->cropcap.bounds.top) + 12;
-
-       err += sn9c102_write_reg(cam, h_start, 0x12);
-       err += sn9c102_write_reg(cam, v_start, 0x13);
-
-       return err;
-}
-
-
-static struct sn9c102_sensor tas5130d1b = {
-       .name = "TAS5130D1B",
-       .maintainer = "Luca Risolia <luca.risolia@studio.unibo.it>",
-       .frequency = SN9C102_I2C_100KHZ,
-       .interface = SN9C102_I2C_3WIRES,
-       .init = &tas5130d1b_init,
-       .cropcap = {
-               .bounds = {
-                       .left = 0,
-                       .top = 0,
-                       .width = 640,
-                       .height = 480,
-               },
-               .defrect = {
-                       .left = 0,
-                       .top = 0,
-                       .width = 640,
-                       .height = 480,
-               },
-       },
-       .set_crop = &tas5130d1b_set_crop,
-       .pix_format = {
-               .width = 640,
-               .height = 480,
-               .pixelformat = V4L2_PIX_FMT_SBGGR8,
-               .priv = 8,
-       }
-};
-
-
-int sn9c102_probe_tas5130d1b(struct sn9c102_device* cam)
-{
-       /* This sensor has no identifiers, so let's attach it anyway */
-       sn9c102_attach_sensor(cam, &tas5130d1b);
-
-       /* At the moment, only devices whose PID is 0x6025 have this sensor */
-       if (tas5130d1b.usbdev->descriptor.idProduct != 0x6025)
-               return -ENODEV;
-
-       dev_info(tas5130d1b.dev, "TAS5130D1B detected, but the support for it "
-                                "is disabled at the moment - needs further "
-                                "testing -\n");
-
-       return -ENODEV;
-}
diff --git a/drivers/usb/media/w9968cf_vpp.h b/drivers/usb/media/w9968cf_vpp.h
deleted file mode 100644 (file)
index 3f5317d..0000000
+++ /dev/null
@@ -1,43 +0,0 @@
-/***************************************************************************
- * Interface for video post-processing functions for the W996[87]CF driver *
- * for Linux.                                                              *
- *                                                                         *
- * Copyright (C) 2002-2004 by Luca Risolia <luca.risolia@studio.unibo.it>  *
- *                                                                         *
- * 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_VPP_H_
-#define _W9968CF_VPP_H_
-
-#include <linux/module.h>
-#include <asm/types.h>
-
-struct w9968cf_vpp_t {
-       struct module* owner;
-       int (*check_headers)(const unsigned char*, const unsigned long);
-       int (*decode)(const char*, const unsigned long, const unsigned,
-                     const unsigned, char*);
-       void (*swap_yuvbytes)(void*, unsigned long);
-       void (*uyvy_to_rgbx)(u8*, unsigned long, u8*, u16, u8);
-       void (*scale_up)(u8*, u8*, u16, u16, u16, u16, u16);
-
-       u8 busy; /* read-only flag: module is/is not in use */
-};
-
-extern int w9968cf_vppmod_register(struct w9968cf_vpp_t*);
-extern int w9968cf_vppmod_deregister(struct w9968cf_vpp_t*);
-
-#endif /* _W9968CF_VPP_H_ */
diff --git a/drivers/w1/Kconfig b/drivers/w1/Kconfig
deleted file mode 100644 (file)
index f416b64..0000000
+++ /dev/null
@@ -1,31 +0,0 @@
-menu "Dallas's 1-wire bus"
-
-config W1
-       tristate "Dallas's 1-wire support"
-       ---help---
-         Dallas's 1-wire bus is usefull to connect slow 1-pin devices 
-         such as iButtons and thermal sensors.
-         
-         If you want W1 support, you should say Y here.
-
-         This W1 support can also be built as a module.  If so, the module
-         will be called wire.ko.
-
-config W1_MATROX
-       tristate "Matrox G400 transport layer for 1-wire"
-       depends on W1
-       help
-         Say Y here if you want to communicate with your 1-wire devices
-         using Matrox's G400 GPIO pins.
-         
-         This support is also available as a module.  If so, the module 
-         will be called matrox_w1.ko.
-
-config W1_THERM
-       tristate "Thermal family implementation"
-       depends on W1
-       help
-         Say Y here if you want to connect 1-wire thermal sensors to you
-         wire.
-
-endmenu
diff --git a/drivers/w1/Makefile b/drivers/w1/Makefile
deleted file mode 100644 (file)
index 7d005d9..0000000
+++ /dev/null
@@ -1,9 +0,0 @@
-#
-# Makefile for the Dallas's 1-wire bus.
-#
-
-obj-$(CONFIG_W1)       += wire.o
-wire-objs              := w1.o w1_int.o w1_family.o w1_netlink.o w1_io.o
-
-obj-$(CONFIG_W1_MATROX)                += matrox_w1.o
-obj-$(CONFIG_W1_THERM)         += w1_therm.o
diff --git a/drivers/w1/matrox_w1.c b/drivers/w1/matrox_w1.c
deleted file mode 100644 (file)
index 55b1faf..0000000
+++ /dev/null
@@ -1,246 +0,0 @@
-/*
- *     matrox_w1.c
- *
- * Copyright (c) 2004 Evgeniy Polyakov <johnpol@2ka.mipt.ru>
- * 
- *
- * 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/atomic.h>
-#include <asm/types.h>
-#include <asm/io.h>
-#include <asm/delay.h>
-
-#include <linux/kernel.h>
-#include <linux/module.h>
-#include <linux/list.h>
-#include <linux/interrupt.h>
-#include <linux/spinlock.h>
-#include <linux/timer.h>
-#include <linux/slab.h>
-#include <linux/pci_ids.h>
-#include <linux/pci.h>
-#include <linux/timer.h>
-
-#include "w1.h"
-#include "w1_int.h"
-#include "w1_log.h"
-
-MODULE_LICENSE("GPL");
-MODULE_AUTHOR("Evgeniy Polyakov <johnpol@2ka.mipt.ru>");
-MODULE_DESCRIPTION("Driver for transport(Dallas 1-wire prtocol) over VGA DDC(matrox gpio).");
-
-static struct pci_device_id matrox_w1_tbl[] = {
-       { PCI_DEVICE(PCI_VENDOR_ID_MATROX, PCI_DEVICE_ID_MATROX_G400) },
-       { },
-};
-MODULE_DEVICE_TABLE(pci, matrox_w1_tbl);
-
-static int __devinit matrox_w1_probe(struct pci_dev *, const struct pci_device_id *);
-static void __devexit matrox_w1_remove(struct pci_dev *);
-
-static struct pci_driver matrox_w1_pci_driver = {
-       .name = "matrox_w1",
-       .id_table = matrox_w1_tbl,
-       .probe = matrox_w1_probe,
-       .remove = __devexit_p(matrox_w1_remove),
-};
-
-/* 
- * Matrox G400 DDC registers.
- */
-
-#define MATROX_G400_DDC_CLK            (1<<4)
-#define MATROX_G400_DDC_DATA           (1<<1)
-
-#define MATROX_BASE                    0x3C00
-#define MATROX_STATUS                  0x1e14
-
-#define MATROX_PORT_INDEX_OFFSET       0x00
-#define MATROX_PORT_DATA_OFFSET                0x0A
-
-#define MATROX_GET_CONTROL             0x2A
-#define MATROX_GET_DATA                        0x2B
-#define MATROX_CURSOR_CTL              0x06
-
-struct matrox_device
-{
-       unsigned long base_addr;
-       unsigned long port_index, port_data;
-       u8 data_mask;
-
-       unsigned long phys_addr, virt_addr;
-       unsigned long found;
-
-       struct w1_bus_master *bus_master;
-};
-
-static u8 matrox_w1_read_ddc_bit(unsigned long);
-static void matrox_w1_write_ddc_bit(unsigned long, u8);
-
-/*
- * These functions read and write DDC Data bit.
- *
- * Using tristate pins, since i can't  fin any open-drain pin in whole motherboard.
- * Unfortunately we can't connect to Intel's 82801xx IO controller
- * since we don't know motherboard schema, wich has pretty unused(may be not) GPIO.
- *
- * I've heard that PIIX also has open drain pin.
- *
- * Port mapping.
- */
-static __inline__ u8 matrox_w1_read_reg(struct matrox_device *dev, u8 reg)
-{
-       u8 ret;
-
-       writeb(reg, dev->port_index);
-       ret = readb(dev->port_data);
-       barrier();
-
-       return ret;
-}
-
-static __inline__ void matrox_w1_write_reg(struct matrox_device *dev, u8 reg, u8 val)
-{
-       writeb(reg, dev->port_index);
-       writeb(val, dev->port_data);
-       wmb();
-}
-
-static void matrox_w1_write_ddc_bit(unsigned long data, u8 bit)
-{
-       u8 ret;
-       struct matrox_device *dev = (struct matrox_device *) data;
-
-       if (bit)
-               bit = 0;
-       else
-               bit = dev->data_mask;
-
-       ret = matrox_w1_read_reg(dev, MATROX_GET_CONTROL);
-       matrox_w1_write_reg(dev, MATROX_GET_CONTROL, ((ret & ~dev->data_mask) | bit));
-       matrox_w1_write_reg(dev, MATROX_GET_DATA, 0x00);
-}
-
-static u8 matrox_w1_read_ddc_bit(unsigned long data)
-{
-       u8 ret;
-       struct matrox_device *dev = (struct matrox_device *) data;
-
-       ret = matrox_w1_read_reg(dev, MATROX_GET_DATA);
-
-       return ret;
-}
-
-static void matrox_w1_hw_init(struct matrox_device *dev)
-{
-       matrox_w1_write_reg(dev, MATROX_GET_DATA, 0xFF);
-       matrox_w1_write_reg(dev, MATROX_GET_CONTROL, 0x00);
-}
-
-static int __devinit matrox_w1_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
-{
-       struct matrox_device *dev;
-       int err;
-
-       assert(pdev != NULL);
-       assert(ent != NULL);
-
-       if (pdev->vendor != PCI_VENDOR_ID_MATROX || pdev->device != PCI_DEVICE_ID_MATROX_G400)
-               return -ENODEV;
-
-       dev = kmalloc(sizeof(struct matrox_device) +
-                      sizeof(struct w1_bus_master), GFP_KERNEL);
-       if (!dev) {
-               dev_err(&pdev->dev,
-                       "%s: Failed to create new matrox_device object.\n",
-                       __func__);
-               return -ENOMEM;
-       }
-
-       memset(dev, 0, sizeof(struct matrox_device) + sizeof(struct w1_bus_master));
-
-       dev->bus_master = (struct w1_bus_master *)(dev + 1);
-
-       /* 
-        * True for G400, for some other we need resource 0, see drivers/video/matrox/matroxfb_base.c 
-        */
-
-       dev->phys_addr = pci_resource_start(pdev, 1);
-
-       dev->virt_addr =
-               (unsigned long) ioremap_nocache(dev->phys_addr, 16384);
-       if (!dev->virt_addr) {
-               dev_err(&pdev->dev, "%s: failed to ioremap(0x%lx, %d).\n",
-                       __func__, dev->phys_addr, 16384);
-               err = -EIO;
-               goto err_out_free_device;
-       }
-
-       dev->base_addr = dev->virt_addr + MATROX_BASE;
-       dev->port_index = dev->base_addr + MATROX_PORT_INDEX_OFFSET;
-       dev->port_data = dev->base_addr + MATROX_PORT_DATA_OFFSET;
-       dev->data_mask = (MATROX_G400_DDC_DATA);
-
-       matrox_w1_hw_init(dev);
-
-       dev->bus_master->data = (unsigned long) dev;
-       dev->bus_master->read_bit = &matrox_w1_read_ddc_bit;
-       dev->bus_master->write_bit = &matrox_w1_write_ddc_bit;
-
-       err = w1_add_master_device(dev->bus_master);
-       if (err)
-               goto err_out_free_device;
-
-       pci_set_drvdata(pdev, dev);
-
-       dev->found = 1;
-
-       dev_info(&pdev->dev, "Matrox G400 GPIO transport layer for 1-wire.\n");
-
-       return 0;
-
-err_out_free_device:
-       kfree(dev);
-
-       return err;
-}
-
-static void __devexit matrox_w1_remove(struct pci_dev *pdev)
-{
-       struct matrox_device *dev = pci_get_drvdata(pdev);
-
-       assert(dev != NULL);
-
-       if (dev->found) {
-               w1_remove_master_device(dev->bus_master);
-               iounmap((void *) dev->virt_addr);
-       }
-       kfree(dev);
-}
-
-static int __init matrox_w1_init(void)
-{
-       return pci_module_init(&matrox_w1_pci_driver);
-}
-
-static void __exit matrox_w1_fini(void)
-{
-       pci_unregister_driver(&matrox_w1_pci_driver);
-}
-
-module_init(matrox_w1_init);
-module_exit(matrox_w1_fini);
diff --git a/drivers/w1/w1.c b/drivers/w1/w1.c
deleted file mode 100644 (file)
index d956f5e..0000000
+++ /dev/null
@@ -1,623 +0,0 @@
-/*
- *     w1.c
- *
- * Copyright (c) 2004 Evgeniy Polyakov <johnpol@2ka.mipt.ru>
- * 
- *
- * 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/atomic.h>
-#include <asm/delay.h>
-
-#include <linux/kernel.h>
-#include <linux/module.h>
-#include <linux/moduleparam.h>
-#include <linux/list.h>
-#include <linux/interrupt.h>
-#include <linux/spinlock.h>
-#include <linux/timer.h>
-#include <linux/device.h>
-#include <linux/slab.h>
-#include <linux/sched.h>
-#include <linux/suspend.h>
-
-#include "w1.h"
-#include "w1_io.h"
-#include "w1_log.h"
-#include "w1_int.h"
-#include "w1_family.h"
-#include "w1_netlink.h"
-
-MODULE_LICENSE("GPL");
-MODULE_AUTHOR("Evgeniy Polyakov <johnpol@2ka.mipt.ru>");
-MODULE_DESCRIPTION("Driver for 1-wire Dallas network protocol.");
-
-static int w1_timeout = 5 * HZ;
-int w1_max_slave_count = 10;
-
-module_param_named(timeout, w1_timeout, int, 0);
-module_param_named(max_slave_count, w1_max_slave_count, int, 0);
-
-spinlock_t w1_mlock = SPIN_LOCK_UNLOCKED;
-LIST_HEAD(w1_masters);
-
-static pid_t control_thread;
-static int control_needs_exit;
-static DECLARE_COMPLETION(w1_control_complete);
-static DECLARE_WAIT_QUEUE_HEAD(w1_control_wait);
-
-static int w1_master_match(struct device *dev, struct device_driver *drv)
-{
-       return 1;
-}
-
-static int w1_master_probe(struct device *dev)
-{
-       return -ENODEV;
-}
-
-static int w1_master_remove(struct device *dev)
-{
-       return 0;
-}
-
-static void w1_master_release(struct device *dev)
-{
-       struct w1_master *md = container_of(dev, struct w1_master, dev);
-
-       complete(&md->dev_released);
-}
-
-static void w1_slave_release(struct device *dev)
-{
-       struct w1_slave *sl = container_of(dev, struct w1_slave, dev);
-
-       complete(&sl->dev_released);
-}
-
-static ssize_t w1_default_read_name(struct device *dev, char *buf)
-{
-       return sprintf(buf, "No family registered.\n");
-}
-
-static ssize_t w1_default_read_bin(struct kobject *kobj, char *buf, loff_t off,
-                    size_t count)
-{
-       return sprintf(buf, "No family registered.\n");
-}
-
-struct bus_type w1_bus_type = {
-       .name = "w1",
-       .match = w1_master_match,
-};
-
-struct device_driver w1_driver = {
-       .name = "w1_driver",
-       .bus = &w1_bus_type,
-       .probe = w1_master_probe,
-       .remove = w1_master_remove,
-};
-
-struct device w1_device = {
-       .parent = NULL,
-       .bus = &w1_bus_type,
-       .bus_id = "w1 bus master",
-       .driver = &w1_driver,
-       .release = &w1_master_release
-};
-
-static struct device_attribute w1_slave_attribute = {
-       .attr = {
-                       .name = "name",
-                       .mode = S_IRUGO,
-                       .owner = THIS_MODULE
-       },
-       .show = &w1_default_read_name,
-};
-
-static struct device_attribute w1_slave_attribute_val = {
-       .attr = {
-                       .name = "value",
-                       .mode = S_IRUGO,
-                       .owner = THIS_MODULE
-       },
-       .show = &w1_default_read_name,
-};
-
-static ssize_t w1_master_attribute_show(struct device *dev, char *buf)
-{
-       return sprintf(buf, "please fix me\n");
-#if 0
-       struct w1_master *md = container_of(dev, struct w1_master, dev);
-       int c = PAGE_SIZE;
-
-       if (down_interruptible(&md->mutex))
-               return -EBUSY;
-
-       c -= snprintf(buf + PAGE_SIZE - c, c, "%s\n", md->name);
-       c -= snprintf(buf + PAGE_SIZE - c, c,
-                      "bus_master=0x%p, timeout=%d, max_slave_count=%d, attempts=%lu\n",
-                      md->bus_master, w1_timeout, md->max_slave_count,
-                      md->attempts);
-       c -= snprintf(buf + PAGE_SIZE - c, c, "%d slaves: ",
-                      md->slave_count);
-       if (md->slave_count == 0)
-               c -= snprintf(buf + PAGE_SIZE - c, c, "no.\n");
-       else {
-               struct list_head *ent, *n;
-               struct w1_slave *sl;
-
-               list_for_each_safe(ent, n, &md->slist) {
-                       sl = list_entry(ent, struct w1_slave, w1_slave_entry);
-
-                       c -= snprintf(buf + PAGE_SIZE - c, c, "%s[%p] ",
-                                      sl->name, sl);
-               }
-               c -= snprintf(buf + PAGE_SIZE - c, c, "\n");
-       }
-
-       up(&md->mutex);
-
-       return PAGE_SIZE - c;
-#endif
-}
-
-struct device_attribute w1_master_attribute = {
-       .attr = {
-                       .name = "w1_master_stats",
-                       .mode = S_IRUGO,
-                       .owner = THIS_MODULE,
-       },
-       .show = &w1_master_attribute_show,
-};
-
-static struct bin_attribute w1_slave_bin_attribute = {
-       .attr = {
-                       .name = "w1_slave",
-                       .mode = S_IRUGO,
-                       .owner = THIS_MODULE,
-       },
-       .size = W1_SLAVE_DATA_SIZE,
-       .read = &w1_default_read_bin,
-};
-
-static int __w1_attach_slave_device(struct w1_slave *sl)
-{
-       int err;
-
-       sl->dev.parent = &sl->master->dev;
-       sl->dev.driver = sl->master->driver;
-       sl->dev.bus = &w1_bus_type;
-       sl->dev.release = &w1_slave_release;
-
-       snprintf(&sl->dev.bus_id[0], sizeof(sl->dev.bus_id),
-                 "%x-%llx",
-                 (unsigned int) sl->reg_num.family,
-                 (unsigned long long) sl->reg_num.id);
-       snprintf (&sl->name[0], sizeof(sl->name),
-                 "%x-%llx",
-                 (unsigned int) sl->reg_num.family,
-                 (unsigned long long) sl->reg_num.id);
-
-       dev_dbg(&sl->dev, "%s: registering %s.\n", __func__,
-               &sl->dev.bus_id[0]);
-
-       err = device_register(&sl->dev);
-       if (err < 0) {
-               dev_err(&sl->dev,
-                        "Device registration [%s] failed. err=%d\n",
-                        sl->dev.bus_id, err);
-               return err;
-       }
-
-       w1_slave_bin_attribute.read = sl->family->fops->rbin;
-       w1_slave_attribute.show = sl->family->fops->rname;
-       w1_slave_attribute_val.show = sl->family->fops->rval;
-       w1_slave_attribute_val.attr.name = sl->family->fops->rvalname;
-
-       err = device_create_file(&sl->dev, &w1_slave_attribute);
-       if (err < 0) {
-               dev_err(&sl->dev,
-                        "sysfs file creation for [%s] failed. err=%d\n",
-                        sl->dev.bus_id, err);
-               device_unregister(&sl->dev);
-               return err;
-       }
-
-       err = device_create_file(&sl->dev, &w1_slave_attribute_val);
-       if (err < 0) {
-               dev_err(&sl->dev,
-                        "sysfs file creation for [%s] failed. err=%d\n",
-                        sl->dev.bus_id, err);
-               device_remove_file(&sl->dev, &w1_slave_attribute);
-               device_unregister(&sl->dev);
-               return err;
-       }
-
-       err = sysfs_create_bin_file(&sl->dev.kobj, &w1_slave_bin_attribute);
-       if (err < 0) {
-               dev_err(&sl->dev,
-                        "sysfs file creation for [%s] failed. err=%d\n",
-                        sl->dev.bus_id, err);
-               device_remove_file(&sl->dev, &w1_slave_attribute);
-               device_remove_file(&sl->dev, &w1_slave_attribute_val);
-               device_unregister(&sl->dev);
-               return err;
-       }
-
-       list_add_tail(&sl->w1_slave_entry, &sl->master->slist);
-
-       return 0;
-}
-
-static int w1_attach_slave_device(struct w1_master *dev, struct w1_reg_num *rn)
-{
-       struct w1_slave *sl;
-       struct w1_family *f;
-       int err;
-
-       sl = kmalloc(sizeof(struct w1_slave), GFP_KERNEL);
-       if (!sl) {
-               dev_err(&dev->dev,
-                        "%s: failed to allocate new slave device.\n",
-                        __func__);
-               return -ENOMEM;
-       }
-
-       memset(sl, 0, sizeof(*sl));
-
-       sl->owner = THIS_MODULE;
-       sl->master = dev;
-
-       memcpy(&sl->reg_num, rn, sizeof(sl->reg_num));
-       atomic_set(&sl->refcnt, 0);
-       init_completion(&sl->dev_released);
-
-       spin_lock(&w1_flock);
-       f = w1_family_registered(rn->family);
-       if (!f) {
-               spin_unlock(&w1_flock);
-               dev_info(&dev->dev, "Family %x is not registered.\n",
-                         rn->family);
-               kfree(sl);
-               return -ENODEV;
-       }
-       __w1_family_get(f);
-       spin_unlock(&w1_flock);
-
-       sl->family = f;
-
-
-       err = __w1_attach_slave_device(sl);
-       if (err < 0) {
-               dev_err(&dev->dev, "%s: Attaching %s failed.\n", __func__,
-                        sl->name);
-               w1_family_put(sl->family);
-               kfree(sl);
-               return err;
-       }
-
-       dev->slave_count++;
-
-       return 0;
-}
-
-static void w1_slave_detach(struct w1_slave *sl)
-{
-       dev_info(&sl->dev, "%s: detaching %s.\n", __func__, sl->name);
-
-       while (atomic_read(&sl->refcnt))
-               schedule_timeout(10);
-
-       sysfs_remove_bin_file(&sl->dev.kobj, &w1_slave_bin_attribute);
-       device_remove_file(&sl->dev, &w1_slave_attribute);
-       device_unregister(&sl->dev);
-       w1_family_put(sl->family);
-}
-
-static void w1_search(struct w1_master *dev)
-{
-       u64 last, rn, tmp;
-       int i, count = 0, slave_count;
-       int last_family_desc, last_zero, last_device;
-       int search_bit, id_bit, comp_bit, desc_bit;
-       struct list_head *ent;
-       struct w1_slave *sl;
-       int family_found = 0;
-       struct w1_netlink_msg msg;
-
-       dev->attempts++;
-
-       memset(&msg, 0, sizeof(msg));
-
-       search_bit = id_bit = comp_bit = 0;
-       rn = tmp = last = 0;
-       last_device = last_zero = last_family_desc = 0;
-
-       desc_bit = 64;
-
-       while (!(id_bit && comp_bit) && !last_device
-               && count++ < dev->max_slave_count) {
-               last = rn;
-               rn = 0;
-
-               last_family_desc = 0;
-
-               /*
-                * Reset bus and all 1-wire device state machines
-                * so they can respond to our requests.
-                *
-                * Return 0 - device(s) present, 1 - no devices present.
-                */
-               if (w1_reset_bus(dev)) {
-                       dev_info(&dev->dev, "No devices present on the wire.\n");
-                       break;
-               }
-
-#if 1
-               memset(&msg, 0, sizeof(msg));
-
-               w1_write_8(dev, W1_SEARCH);
-               for (i = 0; i < 64; ++i) {
-                       /*
-                        * Read 2 bits from bus.
-                        * All who don't sleep must send ID bit and COMPLEMENT ID bit.
-                        * They actually are ANDed between all senders.
-                        */
-                       id_bit = w1_read_bit(dev);
-                       comp_bit = w1_read_bit(dev);
-
-                       if (id_bit && comp_bit)
-                               break;
-
-                       if (id_bit == 0 && comp_bit == 0) {
-                               if (i == desc_bit)
-                                       search_bit = 1;
-                               else if (i > desc_bit)
-                                       search_bit = 0;
-                               else
-                                       search_bit = ((last >> i) & 0x1);
-
-                               if (search_bit == 0) {
-                                       last_zero = i;
-                                       if (last_zero < 9)
-                                               last_family_desc = last_zero;
-                               }
-
-                       }
-                       else
-                               search_bit = id_bit;
-
-                       tmp = search_bit;
-                       rn |= (tmp << i);
-
-                       /*
-                        * Write 1 bit to bus
-                        * and make all who don't have "search_bit" in "i"'th position
-                        * in it's registration number sleep.
-                        */
-                       w1_write_bit(dev, search_bit);
-
-               }
-#endif
-               msg.id.w1_id = rn;
-               msg.val = w1_calc_crc8((u8 *) & rn, 7);
-               w1_netlink_send(dev, &msg);
-
-               if (desc_bit == last_zero)
-                       last_device = 1;
-
-               desc_bit = last_zero;
-
-               slave_count = 0;
-               list_for_each(ent, &dev->slist) {
-                       struct w1_reg_num *tmp;
-
-                       tmp = (struct w1_reg_num *) &rn;
-
-                       sl = list_entry(ent, struct w1_slave, w1_slave_entry);
-
-                       if (sl->reg_num.family == tmp->family &&
-                           sl->reg_num.id == tmp->id &&
-                           sl->reg_num.crc == tmp->crc)
-                               break;
-                       else if (sl->reg_num.family == tmp->family) {
-                               family_found = 1;
-                               break;
-                       }
-
-                       slave_count++;
-               }
-
-               if (slave_count == dev->slave_count &&
-                   msg.val && (*((__u8 *) & msg.val) == msg.id.id.crc)) {
-                       w1_attach_slave_device(dev, (struct w1_reg_num *) &rn);
-               }
-       }
-}
-
-int w1_control(void *data)
-{
-       struct w1_slave *sl;
-       struct w1_master *dev;
-       struct list_head *ent, *ment, *n, *mn;
-       int err, have_to_wait = 0, timeout;
-
-       daemonize("w1_control");
-       allow_signal(SIGTERM);
-
-       while (!control_needs_exit || have_to_wait) {
-               have_to_wait = 0;
-
-               timeout = w1_timeout;
-               do {
-                       timeout = interruptible_sleep_on_timeout(&w1_control_wait, timeout);
-                       if (current->flags & PF_FREEZE)
-                               refrigerator(PF_FREEZE);
-               } while (!signal_pending(current) && (timeout > 0));
-
-               if (signal_pending(current))
-                       flush_signals(current);
-
-               list_for_each_safe(ment, mn, &w1_masters) {
-                       dev = list_entry(ment, struct w1_master, w1_master_entry);
-
-                       if (!control_needs_exit && !dev->need_exit)
-                               continue;
-                       /*
-                        * Little race: we can create thread but not set the flag.
-                        * Get a chance for external process to set flag up.
-                        */
-                       if (!dev->initialized) {
-                               have_to_wait = 1;
-                               continue;
-                       }
-
-                       spin_lock(&w1_mlock);
-                       list_del(&dev->w1_master_entry);
-                       spin_unlock(&w1_mlock);
-
-                       if (control_needs_exit) {
-                               dev->need_exit = 1;
-
-                               err = kill_proc(dev->kpid, SIGTERM, 1);
-                               if (err)
-                                       dev_err(&dev->dev,
-                                                "Failed to send signal to w1 kernel thread %d.\n",
-                                                dev->kpid);
-                       }
-
-                       wait_for_completion(&dev->dev_exited);
-
-                       list_for_each_safe(ent, n, &dev->slist) {
-                               sl = list_entry(ent, struct w1_slave, w1_slave_entry);
-
-                               if (!sl)
-                                       dev_warn(&dev->dev,
-                                                 "%s: slave entry is NULL.\n",
-                                                 __func__);
-                               else {
-                                       list_del(&sl->w1_slave_entry);
-
-                                       w1_slave_detach(sl);
-                                       kfree(sl);
-                               }
-                       }
-                       device_remove_file(&dev->dev, &w1_master_attribute);
-                       atomic_dec(&dev->refcnt);
-               }
-       }
-
-       complete_and_exit(&w1_control_complete, 0);
-}
-
-int w1_process(void *data)
-{
-       struct w1_master *dev = (struct w1_master *) data;
-       unsigned long timeout;
-
-       daemonize("%s", dev->name);
-       allow_signal(SIGTERM);
-
-       while (!dev->need_exit) {
-               timeout = w1_timeout;
-               do {
-                       timeout = interruptible_sleep_on_timeout(&dev->kwait, timeout);
-                       if (current->flags & PF_FREEZE)
-                               refrigerator(PF_FREEZE);
-               } while (!signal_pending(current) && (timeout > 0));
-
-               if (signal_pending(current))
-                       flush_signals(current);
-
-               if (dev->need_exit)
-                       break;
-
-               if (!dev->initialized)
-                       continue;
-
-               if (down_interruptible(&dev->mutex))
-                       continue;
-               w1_search(dev);
-               up(&dev->mutex);
-       }
-
-       atomic_dec(&dev->refcnt);
-       complete_and_exit(&dev->dev_exited, 0);
-
-       return 0;
-}
-
-int w1_init(void)
-{
-       int retval;
-
-       printk(KERN_INFO "Driver for 1-wire Dallas network protocol.\n");
-
-       retval = bus_register(&w1_bus_type);
-       if (retval) {
-               printk(KERN_ERR "Failed to register bus. err=%d.\n", retval);
-               goto err_out_exit_init;
-       }
-
-       retval = driver_register(&w1_driver);
-       if (retval) {
-               printk(KERN_ERR
-                       "Failed to register master driver. err=%d.\n",
-                       retval);
-               goto err_out_bus_unregister;
-       }
-
-       control_thread = kernel_thread(&w1_control, NULL, 0);
-       if (control_thread < 0) {
-               printk(KERN_ERR "Failed to create control thread. err=%d\n",
-                       control_thread);
-               retval = control_thread;
-               goto err_out_driver_unregister;
-       }
-
-       return 0;
-
-err_out_driver_unregister:
-       driver_unregister(&w1_driver);
-
-err_out_bus_unregister:
-       bus_unregister(&w1_bus_type);
-
-err_out_exit_init:
-       return retval;
-}
-
-void w1_fini(void)
-{
-       struct w1_master *dev;
-       struct list_head *ent, *n;
-
-       list_for_each_safe(ent, n, &w1_masters) {
-               dev = list_entry(ent, struct w1_master, w1_master_entry);
-               __w1_remove_master_device(dev);
-       }
-
-       control_needs_exit = 1;
-
-       wait_for_completion(&w1_control_complete);
-
-       driver_unregister(&w1_driver);
-       bus_unregister(&w1_bus_type);
-}
-
-module_init(w1_init);
-module_exit(w1_fini);
diff --git a/drivers/w1/w1.h b/drivers/w1/w1.h
deleted file mode 100644 (file)
index aba042d..0000000
+++ /dev/null
@@ -1,112 +0,0 @@
-/*
- *     w1.h
- *
- * Copyright (c) 2004 Evgeniy Polyakov <johnpol@2ka.mipt.ru>
- * 
- *
- * 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 __W1_H
-#define __W1_H
-
-struct w1_reg_num
-{
-       __u64   family:8,
-               id:48,
-               crc:8;
-};
-
-#ifdef __KERNEL__
-
-#include <linux/completion.h>
-#include <linux/device.h>
-
-#include <net/sock.h>
-
-#include <asm/semaphore.h>
-
-#include "w1_family.h"
-
-#define W1_MAXNAMELEN          32
-#define W1_SLAVE_DATA_SIZE     128
-
-#define W1_SEARCH              0xF0
-#define W1_CONDITIONAL_SEARCH  0xEC
-#define W1_CONVERT_TEMP                0x44
-#define W1_SKIP_ROM            0xCC
-#define W1_READ_SCRATCHPAD     0xBE
-#define W1_READ_ROM            0x33
-#define W1_READ_PSUPPLY                0xB4
-#define W1_MATCH_ROM           0x55
-
-struct w1_slave
-{
-       struct module           *owner;
-       unsigned char           name[W1_MAXNAMELEN];
-       struct list_head        w1_slave_entry;
-       struct w1_reg_num       reg_num;
-       atomic_t                refcnt;
-       u8                      rom[9];
-
-       struct w1_master        *master;
-       struct w1_family        *family;
-       struct device           dev;
-       struct completion       dev_released;
-};
-
-struct w1_bus_master
-{
-       unsigned long           data;
-
-       u8                      (*read_bit)(unsigned long);
-       void                    (*write_bit)(unsigned long, u8);
-};
-
-struct w1_master
-{
-       struct list_head        w1_master_entry;
-       struct module           *owner;
-       unsigned char           name[W1_MAXNAMELEN];
-       struct list_head        slist;
-       int                     max_slave_count, slave_count;
-       unsigned long           attempts;
-       int                     initialized;
-       u32                     id;
-
-       atomic_t                refcnt;
-
-       void                    *priv;
-       int                     priv_size;
-
-       int                     need_exit;
-       pid_t                   kpid;
-       wait_queue_head_t       kwait;
-       struct semaphore        mutex;
-
-       struct device_driver    *driver;
-       struct device           dev;
-       struct completion       dev_released;
-       struct completion       dev_exited;
-
-       struct w1_bus_master    *bus_master;
-
-       u32                     seq, groups;
-       struct sock             *nls;
-};
-
-#endif /* __KERNEL__ */
-
-#endif /* __W1_H */
diff --git a/drivers/w1/w1_family.c b/drivers/w1/w1_family.c
deleted file mode 100644 (file)
index 9b8443c..0000000
+++ /dev/null
@@ -1,133 +0,0 @@
-/*
- *     w1_family.c
- *
- * Copyright (c) 2004 Evgeniy Polyakov <johnpol@2ka.mipt.ru>
- * 
- *
- * 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/spinlock.h>
-#include <linux/list.h>
-
-#include "w1_family.h"
-
-spinlock_t w1_flock = SPIN_LOCK_UNLOCKED;
-static LIST_HEAD(w1_families);
-
-int w1_register_family(struct w1_family *newf)
-{
-       struct list_head *ent, *n;
-       struct w1_family *f;
-       int ret = 0;
-
-       spin_lock(&w1_flock);
-       list_for_each_safe(ent, n, &w1_families) {
-               f = list_entry(ent, struct w1_family, family_entry);
-
-               if (f->fid == newf->fid) {
-                       ret = -EEXIST;
-                       break;
-               }
-       }
-
-       if (!ret) {
-               atomic_set(&newf->refcnt, 0);
-               newf->need_exit = 0;
-               list_add_tail(&newf->family_entry, &w1_families);
-       }
-
-       spin_unlock(&w1_flock);
-
-       return ret;
-}
-
-void w1_unregister_family(struct w1_family *fent)
-{
-       struct list_head *ent, *n;
-       struct w1_family *f;
-
-       spin_lock(&w1_flock);
-       list_for_each_safe(ent, n, &w1_families) {
-               f = list_entry(ent, struct w1_family, family_entry);
-
-               if (f->fid == fent->fid) {
-                       list_del(&fent->family_entry);
-                       break;
-               }
-       }
-
-       fent->need_exit = 1;
-
-       spin_unlock(&w1_flock);
-
-       while (atomic_read(&fent->refcnt))
-               schedule_timeout(10);
-}
-
-/*
- * Should be called under w1_flock held.
- */
-struct w1_family * w1_family_registered(u8 fid)
-{
-       struct list_head *ent, *n;
-       struct w1_family *f = NULL;
-       int ret = 0;
-
-       list_for_each_safe(ent, n, &w1_families) {
-               f = list_entry(ent, struct w1_family, family_entry);
-
-               if (f->fid == fid) {
-                       ret = 1;
-                       break;
-               }
-       }
-
-       return (ret) ? f : NULL;
-}
-
-void w1_family_put(struct w1_family *f)
-{
-       spin_lock(&w1_flock);
-       __w1_family_put(f);
-       spin_unlock(&w1_flock);
-}
-
-void __w1_family_put(struct w1_family *f)
-{
-       if (atomic_dec_and_test(&f->refcnt))
-               f->need_exit = 1;
-}
-
-void w1_family_get(struct w1_family *f)
-{
-       spin_lock(&w1_flock);
-       __w1_family_get(f);
-       spin_unlock(&w1_flock);
-
-}
-
-void __w1_family_get(struct w1_family *f)
-{
-       atomic_inc(&f->refcnt);
-}
-
-EXPORT_SYMBOL(w1_family_get);
-EXPORT_SYMBOL(w1_family_put);
-EXPORT_SYMBOL(__w1_family_get);
-EXPORT_SYMBOL(__w1_family_put);
-EXPORT_SYMBOL(w1_family_registered);
-EXPORT_SYMBOL(w1_unregister_family);
-EXPORT_SYMBOL(w1_register_family);
diff --git a/drivers/w1/w1_family.h b/drivers/w1/w1_family.h
deleted file mode 100644 (file)
index 15f44fe..0000000
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- *     w1_family.h
- *
- * Copyright (c) 2004 Evgeniy Polyakov <johnpol@2ka.mipt.ru>
- * 
- *
- * 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 __W1_FAMILY_H
-#define __W1_FAMILY_H
-
-#include <linux/types.h>
-#include <linux/device.h>
-#include <asm/atomic.h>
-
-#define W1_FAMILY_DEFAULT      0
-#define W1_FAMILY_THERM                0x10
-#define W1_FAMILY_IBUT         0xff /* ? */
-
-#define MAXNAMELEN             32
-
-struct w1_family_ops
-{
-       ssize_t (* rname)(struct device *, char *);
-       ssize_t (* rbin)(struct kobject *, char *, loff_t, size_t);
-       
-       ssize_t (* rval)(struct device *, char *);
-       unsigned char rvalname[MAXNAMELEN];
-};
-
-struct w1_family
-{
-       struct list_head        family_entry;
-       u8                      fid;
-       
-       struct w1_family_ops    *fops;
-       
-       atomic_t                refcnt;
-       u8                      need_exit;
-};
-
-extern spinlock_t w1_flock;
-
-void w1_family_get(struct w1_family *);
-void w1_family_put(struct w1_family *);
-void __w1_family_get(struct w1_family *);
-void __w1_family_put(struct w1_family *);
-struct w1_family * w1_family_registered(u8);
-void w1_unregister_family(struct w1_family *);
-int w1_register_family(struct w1_family *);
-
-#endif /* __W1_FAMILY_H */
diff --git a/drivers/w1/w1_int.c b/drivers/w1/w1_int.c
deleted file mode 100644 (file)
index 291a6d1..0000000
+++ /dev/null
@@ -1,207 +0,0 @@
-/*
- *     w1_int.c
- *
- * Copyright (c) 2004 Evgeniy Polyakov <johnpol@2ka.mipt.ru>
- * 
- *
- * 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 "w1.h"
-#include "w1_log.h"
-
-static u32 w1_ids = 1;
-
-extern struct device_driver w1_driver;
-extern struct bus_type w1_bus_type;
-extern struct device w1_device;
-extern struct device_attribute w1_master_attribute;
-extern int w1_max_slave_count;
-extern struct list_head w1_masters;
-extern spinlock_t w1_mlock;
-
-extern int w1_process(void *);
-
-struct w1_master * w1_alloc_dev(u32 id, int slave_count,
-             struct device_driver *driver, struct device *device)
-{
-       struct w1_master *dev;
-       int err;
-
-       /*
-        * We are in process context(kernel thread), so can sleep.
-        */
-       dev = kmalloc(sizeof(struct w1_master) + sizeof(struct w1_bus_master), GFP_KERNEL);
-       if (!dev) {
-               printk(KERN_ERR
-                       "Failed to allocate %d bytes for new w1 device.\n",
-                       sizeof(struct w1_master));
-               return NULL;
-       }
-
-       memset(dev, 0, sizeof(struct w1_master) + sizeof(struct w1_bus_master));
-
-       dev->bus_master = (struct w1_bus_master *)(dev + 1);
-
-       dev->owner              = THIS_MODULE;
-       dev->max_slave_count    = slave_count;
-       dev->slave_count        = 0;
-       dev->attempts           = 0;
-       dev->kpid               = -1;
-       dev->initialized        = 0;
-       dev->id                 = id;
-
-       atomic_set(&dev->refcnt, 2);
-
-       INIT_LIST_HEAD(&dev->slist);
-       init_MUTEX(&dev->mutex);
-
-       init_waitqueue_head(&dev->kwait);
-       init_completion(&dev->dev_released);
-       init_completion(&dev->dev_exited);
-
-       memcpy(&dev->dev, device, sizeof(struct device));
-       snprintf(dev->dev.bus_id, sizeof(dev->dev.bus_id),
-                 "w1_bus_master%u", dev->id);
-       snprintf(dev->name, sizeof(dev->name), "w1_bus_master%u", dev->id);
-
-       dev->driver = driver;
-
-       dev->groups = 23;
-       dev->seq = 1;
-       dev->nls = netlink_kernel_create(NETLINK_NFLOG, NULL);
-       if (!dev->nls) {
-               printk(KERN_ERR "Failed to create new netlink socket(%u).\n",
-                       NETLINK_NFLOG);
-               memset(dev, 0, sizeof(struct w1_master));
-               kfree(dev);
-               dev = NULL;
-       }
-
-       err = device_register(&dev->dev);
-       if (err) {
-               printk(KERN_ERR "Failed to register master device. err=%d\n", err);
-               if (dev->nls->sk_socket)
-                       sock_release(dev->nls->sk_socket);
-               memset(dev, 0, sizeof(struct w1_master));
-               kfree(dev);
-               dev = NULL;
-       }
-
-       return dev;
-}
-
-void w1_free_dev(struct w1_master *dev)
-{
-       device_unregister(&dev->dev);
-       if (dev->nls->sk_socket)
-               sock_release(dev->nls->sk_socket);
-       memset(dev, 0, sizeof(struct w1_master) + sizeof(struct w1_bus_master));
-       kfree(dev);
-}
-
-int w1_add_master_device(struct w1_bus_master *master)
-{
-       struct w1_master *dev;
-       int retval = 0;
-
-       dev = w1_alloc_dev(w1_ids++, w1_max_slave_count, &w1_driver, &w1_device);
-       if (!dev)
-               return -ENOMEM;
-
-       dev->kpid = kernel_thread(&w1_process, dev, 0);
-       if (dev->kpid < 0) {
-               dev_err(&dev->dev,
-                        "Failed to create new kernel thread. err=%d\n",
-                        dev->kpid);
-               retval = dev->kpid;
-               goto err_out_free_dev;
-       }
-
-       retval = device_create_file(&dev->dev, &w1_master_attribute);
-       if (retval)
-               goto err_out_kill_thread;
-
-       memcpy(dev->bus_master, master, sizeof(struct w1_bus_master));
-
-       dev->initialized = 1;
-
-       spin_lock(&w1_mlock);
-       list_add(&dev->w1_master_entry, &w1_masters);
-       spin_unlock(&w1_mlock);
-
-       return 0;
-
-err_out_kill_thread:
-       dev->need_exit = 1;
-       if (kill_proc(dev->kpid, SIGTERM, 1))
-               dev_err(&dev->dev,
-                        "Failed to send signal to w1 kernel thread %d.\n",
-                        dev->kpid);
-       wait_for_completion(&dev->dev_exited);
-
-err_out_free_dev:
-       w1_free_dev(dev);
-
-       return retval;
-}
-
-void __w1_remove_master_device(struct w1_master *dev)
-{
-       int err;
-
-       dev->need_exit = 1;
-       err = kill_proc(dev->kpid, SIGTERM, 1);
-       if (err)
-               dev_err(&dev->dev,
-                        "%s: Failed to send signal to w1 kernel thread %d.\n",
-                        __func__, dev->kpid);
-
-       while (atomic_read(&dev->refcnt))
-               schedule_timeout(10);
-
-       w1_free_dev(dev);
-}
-
-void w1_remove_master_device(struct w1_bus_master *bm)
-{
-       struct w1_master *dev = NULL;
-       struct list_head *ent, *n;
-
-       list_for_each_safe(ent, n, &w1_masters) {
-               dev = list_entry(ent, struct w1_master, w1_master_entry);
-               if (!dev->initialized)
-                       continue;
-
-               if (dev->bus_master->data == bm->data)
-                       break;
-       }
-
-       if (!dev) {
-               printk(KERN_ERR "Device doesn't exist.\n");
-               return;
-       }
-
-       __w1_remove_master_device(dev);
-}
-
-EXPORT_SYMBOL(w1_alloc_dev);
-EXPORT_SYMBOL(w1_free_dev);
-EXPORT_SYMBOL(w1_add_master_device);
-EXPORT_SYMBOL(w1_remove_master_device);
-EXPORT_SYMBOL(__w1_remove_master_device);
diff --git a/drivers/w1/w1_int.h b/drivers/w1/w1_int.h
deleted file mode 100644 (file)
index a5aeb76..0000000
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- *     w1_int.h
- *
- * Copyright (c) 2004 Evgeniy Polyakov <johnpol@2ka.mipt.ru>
- * 
- *
- * 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 __W1_INT_H
-#define __W1_INT_H
-
-#include <linux/kernel.h>
-#include <linux/device.h>
-
-#include "w1.h"
-
-struct w1_master * w1_alloc_dev(int, struct device_driver *, struct device *);
-void w1_free_dev(struct w1_master *dev);
-int w1_add_master_device(struct w1_bus_master *);
-void w1_remove_master_device(struct w1_bus_master *);
-void __w1_remove_master_device(struct w1_master *);
-
-#endif /* __W1_INT_H */
diff --git a/drivers/w1/w1_io.c b/drivers/w1/w1_io.c
deleted file mode 100644 (file)
index 75d538b..0000000
+++ /dev/null
@@ -1,138 +0,0 @@
-/*
- *     w1_io.c
- *
- * Copyright (c) 2004 Evgeniy Polyakov <johnpol@2ka.mipt.ru>
- * 
- *
- * 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/io.h>
-#include <asm/delay.h>
-
-#include <linux/moduleparam.h>
-
-#include "w1.h"
-#include "w1_log.h"
-#include "w1_io.h"
-
-int w1_delay_parm = 1;
-module_param_named(delay_coef, w1_delay_parm, int, 0);
-
-static u8 w1_crc8_table[] = {
-       0, 94, 188, 226, 97, 63, 221, 131, 194, 156, 126, 32, 163, 253, 31, 65,
-       157, 195, 33, 127, 252, 162, 64, 30, 95, 1, 227, 189, 62, 96, 130, 220,
-       35, 125, 159, 193, 66, 28, 254, 160, 225, 191, 93, 3, 128, 222, 60, 98,
-       190, 224, 2, 92, 223, 129, 99, 61, 124, 34, 192, 158, 29, 67, 161, 255,
-       70, 24, 250, 164, 39, 121, 155, 197, 132, 218, 56, 102, 229, 187, 89, 7,
-       219, 133, 103, 57, 186, 228, 6, 88, 25, 71, 165, 251, 120, 38, 196, 154,
-       101, 59, 217, 135, 4, 90, 184, 230, 167, 249, 27, 69, 198, 152, 122, 36,
-       248, 166, 68, 26, 153, 199, 37, 123, 58, 100, 134, 216, 91, 5, 231, 185,
-       140, 210, 48, 110, 237, 179, 81, 15, 78, 16, 242, 172, 47, 113, 147, 205,
-       17, 79, 173, 243, 112, 46, 204, 146, 211, 141, 111, 49, 178, 236, 14, 80,
-       175, 241, 19, 77, 206, 144, 114, 44, 109, 51, 209, 143, 12, 82, 176, 238,
-       50, 108, 142, 208, 83, 13, 239, 177, 240, 174, 76, 18, 145, 207, 45, 115,
-       202, 148, 118, 40, 171, 245, 23, 73, 8, 86, 180, 234, 105, 55, 213, 139,
-       87, 9, 235, 181, 54, 104, 138, 212, 149, 203, 41, 119, 244, 170, 72, 22,
-       233, 183, 85, 11, 136, 214, 52, 106, 43, 117, 151, 201, 74, 20, 246, 168,
-       116, 42, 200, 150, 21, 75, 169, 247, 182, 232, 10, 84, 215, 137, 107, 53
-};
-
-void w1_delay(unsigned long tm)
-{
-       udelay(tm * w1_delay_parm);
-}
-
-void w1_write_bit(struct w1_master *dev, int bit)
-{
-       if (bit) {
-               dev->bus_master->write_bit(dev->bus_master->data, 0);
-               w1_delay(6);
-               dev->bus_master->write_bit(dev->bus_master->data, 1);
-               w1_delay(64);
-       } else {
-               dev->bus_master->write_bit(dev->bus_master->data, 0);
-               w1_delay(60);
-               dev->bus_master->write_bit(dev->bus_master->data, 1);
-               w1_delay(10);
-       }
-}
-
-void w1_write_8(struct w1_master *dev, u8 byte)
-{
-       int i;
-
-       for (i = 0; i < 8; ++i)
-               w1_write_bit(dev, (byte >> i) & 0x1);
-}
-
-u8 w1_read_bit(struct w1_master *dev)
-{
-       int result;
-
-       dev->bus_master->write_bit(dev->bus_master->data, 0);
-       w1_delay(6);
-       dev->bus_master->write_bit(dev->bus_master->data, 1);
-       w1_delay(9);
-
-       result = dev->bus_master->read_bit(dev->bus_master->data);
-       w1_delay(55);
-
-       return result & 0x1;
-}
-
-u8 w1_read_8(struct w1_master * dev)
-{
-       int i;
-       u8 res = 0;
-
-       for (i = 0; i < 8; ++i)
-               res |= (w1_read_bit(dev) << i);
-
-       return res;
-}
-
-int w1_reset_bus(struct w1_master *dev)
-{
-       int result;
-
-       dev->bus_master->write_bit(dev->bus_master->data, 0);
-       w1_delay(480);
-       dev->bus_master->write_bit(dev->bus_master->data, 1);
-       w1_delay(70);
-
-       result = dev->bus_master->read_bit(dev->bus_master->data) & 0x1;
-       w1_delay(410);
-
-       return result;
-}
-
-u8 w1_calc_crc8(u8 * data, int len)
-{
-       u8 crc = 0;
-
-       while (len--)
-               crc = w1_crc8_table[crc ^ *data++];
-
-       return crc;
-}
-
-EXPORT_SYMBOL(w1_write_bit);
-EXPORT_SYMBOL(w1_write_8);
-EXPORT_SYMBOL(w1_read_bit);
-EXPORT_SYMBOL(w1_read_8);
-EXPORT_SYMBOL(w1_reset_bus);
-EXPORT_SYMBOL(w1_calc_crc8);
-EXPORT_SYMBOL(w1_delay);
diff --git a/drivers/w1/w1_io.h b/drivers/w1/w1_io.h
deleted file mode 100644 (file)
index e493a87..0000000
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- *     w1_io.h
- *
- * Copyright (c) 2004 Evgeniy Polyakov <johnpol@2ka.mipt.ru>
- * 
- *
- * 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 __W1_IO_H
-#define __W1_IO_H
-
-#include "w1.h"
-
-void w1_delay(unsigned long);
-void w1_write_bit(struct w1_master *, int);
-void w1_write_8(struct w1_master *, u8);
-u8 w1_read_bit(struct w1_master *);
-u8 w1_read_8(struct w1_master *);
-int w1_reset_bus(struct w1_master *);
-u8 w1_calc_crc8(u8 *, int);
-
-#endif /* __W1_IO_H */
diff --git a/drivers/w1/w1_log.h b/drivers/w1/w1_log.h
deleted file mode 100644 (file)
index a6bf6f4..0000000
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- *     w1_log.h
- *
- * Copyright (c) 2004 Evgeniy Polyakov <johnpol@2ka.mipt.ru>
- * 
- *
- * 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 __W1_LOG_H
-#define __W1_LOG_H
-
-#define DEBUG
-
-#ifdef W1_DEBUG
-#  define assert(expr) do {} while (0)
-#else
-#  define assert(expr) \
-        if(unlikely(!(expr))) {                                        \
-        printk(KERN_ERR "Assertion failed! %s,%s,%s,line=%d\n",        \
-        #expr,__FILE__,__FUNCTION__,__LINE__);                 \
-        }
-#endif
-
-#endif /* __W1_LOG_H */
-
diff --git a/drivers/w1/w1_netlink.c b/drivers/w1/w1_netlink.c
deleted file mode 100644 (file)
index df9d3e7..0000000
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * w1_netlink.c
- *
- * Copyright (c) 2003 Evgeniy Polyakov <johnpol@2ka.mipt.ru>
- *
- *
- * 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/skbuff.h>
-#include <linux/netlink.h>
-
-#include "w1.h"
-#include "w1_log.h"
-#include "w1_netlink.h"
-
-void w1_netlink_send(struct w1_master *dev, struct w1_netlink_msg *msg)
-{
-       unsigned int size;
-       struct sk_buff *skb;
-       struct w1_netlink_msg *data;
-       struct nlmsghdr *nlh;
-
-       size = NLMSG_SPACE(sizeof(struct w1_netlink_msg));
-
-       skb = alloc_skb(size, GFP_ATOMIC);
-       if (!skb) {
-               dev_err(&dev->dev, "skb_alloc() failed.\n");
-               return;
-       }
-
-       nlh = NLMSG_PUT(skb, 0, dev->seq++, NLMSG_DONE, size - sizeof(*nlh));
-
-       data = (struct w1_netlink_msg *)NLMSG_DATA(nlh);
-
-       memcpy(data, msg, sizeof(struct w1_netlink_msg));
-
-       NETLINK_CB(skb).dst_groups = dev->groups;
-       netlink_broadcast(dev->nls, skb, 0, dev->groups, GFP_ATOMIC);
-
-nlmsg_failure:
-       return;
-}
diff --git a/drivers/w1/w1_netlink.h b/drivers/w1/w1_netlink.h
deleted file mode 100644 (file)
index 7064ded..0000000
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * w1_netlink.h
- *
- * Copyright (c) 2003 Evgeniy Polyakov <johnpol@2ka.mipt.ru>
- *
- *
- * 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 __W1_NETLINK_H
-#define __W1_NETLINK_H
-
-#include <asm/types.h>
-
-#include "w1.h"
-
-struct w1_netlink_msg 
-{
-       union
-       {
-               struct w1_reg_num       id;
-               __u64                   w1_id;
-       } id;
-       __u64                           val;
-};
-
-#ifdef __KERNEL__
-
-void w1_netlink_send(struct w1_master *, struct w1_netlink_msg *);
-
-#endif /* __KERNEL__ */
-#endif /* __W1_NETLINK_H */
diff --git a/drivers/w1/w1_therm.c b/drivers/w1/w1_therm.c
deleted file mode 100644 (file)
index 3eed829..0000000
+++ /dev/null
@@ -1,177 +0,0 @@
-/*
- *     w1_therm.c
- *
- * Copyright (c) 2004 Evgeniy Polyakov <johnpol@2ka.mipt.ru>
- * 
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the therms 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/types.h>
-
-#include <linux/kernel.h>
-#include <linux/module.h>
-#include <linux/moduleparam.h>
-#include <linux/device.h>
-#include <linux/types.h>
-
-#include "w1.h"
-#include "w1_io.h"
-#include "w1_int.h"
-#include "w1_family.h"
-
-MODULE_LICENSE("GPL");
-MODULE_AUTHOR("Evgeniy Polyakov <johnpol@2ka.mipt.ru>");
-MODULE_DESCRIPTION("Driver for 1-wire Dallas network protocol, temperature family.");
-
-static ssize_t w1_therm_read_name(struct device *, char *);
-static ssize_t w1_therm_read_temp(struct device *, char *);
-static ssize_t w1_therm_read_bin(struct kobject *, char *, loff_t, size_t);
-
-static struct w1_family_ops w1_therm_fops = {
-       .rname = &w1_therm_read_name,
-       .rbin = &w1_therm_read_bin,
-       .rval = &w1_therm_read_temp,
-       .rvalname = "temp1_input",
-};
-
-static ssize_t w1_therm_read_name(struct device *dev, char *buf)
-{
-       struct w1_slave *sl = container_of(dev, struct w1_slave, dev);
-
-       return sprintf(buf, "%s\n", sl->name);
-}
-
-static ssize_t w1_therm_read_temp(struct device *dev, char *buf)
-{
-       struct w1_slave *sl = container_of(dev, struct w1_slave, dev);
-       s16 temp;
-
-       /* 
-        * Must be more precise.
-        */
-       temp = 0;
-       temp <<= sl->rom[1] / 2;
-       temp |= sl->rom[0] / 2;
-
-       return sprintf(buf, "%d\n", temp * 1000);
-}
-
-static ssize_t w1_therm_read_bin(struct kobject *kobj, char *buf, loff_t off, size_t count)
-{
-       struct w1_slave *sl = container_of(container_of(kobj, struct device, kobj),
-                                               struct w1_slave, dev);
-       struct w1_master *dev = sl->master;
-       u8 rom[9], crc, verdict;
-       size_t icount;
-       int i;
-       u16 temp;
-
-       atomic_inc(&sl->refcnt);
-       if (down_interruptible(&sl->master->mutex)) {
-               count = 0;
-               goto out_dec;
-       }
-
-       if (off > W1_SLAVE_DATA_SIZE) {
-               count = 0;
-               goto out;
-       }
-       if (off + count > W1_SLAVE_DATA_SIZE)
-               count = W1_SLAVE_DATA_SIZE - off;
-
-       icount = count;
-
-       memset(buf, 0, count);
-       memset(rom, 0, sizeof(rom));
-
-       count = 0;
-       verdict = 0;
-       crc = 0;
-       if (!w1_reset_bus(dev)) {
-               u64 id = *(u64 *) & sl->reg_num;
-               int count = 0;
-
-               w1_write_8(dev, W1_MATCH_ROM);
-               for (i = 0; i < 8; ++i)
-                       w1_write_8(dev, (id >> i * 8) & 0xff);
-
-               w1_write_8(dev, W1_CONVERT_TEMP);
-
-               while (dev->bus_master->read_bit(dev->bus_master->data) == 0
-                      && count < 10) {
-                       w1_delay(1);
-                       count++;
-               }
-
-               if (count < 10) {
-                       if (!w1_reset_bus(dev)) {
-                               w1_write_8(dev, W1_MATCH_ROM);
-                               for (i = 0; i < 8; ++i)
-                                       w1_write_8(dev,
-                                                  (id >> i * 8) & 0xff);
-
-                               w1_write_8(dev, W1_READ_SCRATCHPAD);
-                               for (i = 0; i < 9; ++i)
-                                       rom[i] = w1_read_8(dev);
-
-                               crc = w1_calc_crc8(rom, 8);
-
-                               if (rom[8] == crc && rom[0])
-                                       verdict = 1;
-                       }
-               }
-               else
-                       dev_warn(&dev->dev,
-                                 "18S20 doesn't respond to CONVERT_TEMP.\n");
-       }
-
-       for (i = 0; i < 9; ++i)
-               count += snprintf(buf + count, icount - count, "%02x ", rom[i]);
-       count += snprintf(buf + count, icount - count, ": crc=%02x %s\n",
-                          crc, (verdict) ? "YES" : "NO");
-       if (verdict)
-               memcpy(sl->rom, rom, sizeof(sl->rom));
-       for (i = 0; i < 9; ++i)
-               count += snprintf(buf + count, icount - count, "%02x ", sl->rom[i]);
-       temp = 0;
-       temp <<= sl->rom[1] / 2;
-       temp |= sl->rom[0] / 2;
-       count += snprintf(buf + count, icount - count, "t=%u\n", temp);
-out:
-       up(&dev->mutex);
-out_dec:
-       atomic_dec(&sl->refcnt);
-
-       return count;
-}
-
-static struct w1_family w1_therm_family = {
-       .fid = W1_FAMILY_THERM,
-       .fops = &w1_therm_fops,
-};
-
-static int __init w1_therm_init(void)
-{
-       return w1_register_family(&w1_therm_family);
-}
-
-static void __exit w1_therm_fini(void)
-{
-       w1_unregister_family(&w1_therm_family);
-}
-
-module_init(w1_therm_init);
-module_exit(w1_therm_fini);
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/nls/nls_ascii.c b/fs/nls/nls_ascii.c
deleted file mode 100644 (file)
index 347487f..0000000
+++ /dev/null
@@ -1,167 +0,0 @@
-/*
- * linux/fs/nls_ascii.c
- *
- * Charset ascii translation tables.
- * Generated automatically from the Unicode and charset
- * tables from the Unicode Organization (www.unicode.org).
- * The Unicode to charset table has only exact mappings.
- */
-
-#include <linux/module.h>
-#include <linux/kernel.h>
-#include <linux/string.h>
-#include <linux/nls.h>
-#include <linux/errno.h>
-
-static wchar_t charset2uni[128] = {
-       /* 0x00*/
-       0x0000, 0x0001, 0x0002, 0x0003,
-       0x0004, 0x0005, 0x0006, 0x0007,
-       0x0008, 0x0009, 0x000a, 0x000b,
-       0x000c, 0x000d, 0x000e, 0x000f,
-       /* 0x10*/
-       0x0010, 0x0011, 0x0012, 0x0013,
-       0x0014, 0x0015, 0x0016, 0x0017,
-       0x0018, 0x0019, 0x001a, 0x001b,
-       0x001c, 0x001d, 0x001e, 0x001f,
-       /* 0x20*/
-       0x0020, 0x0021, 0x0022, 0x0023,
-       0x0024, 0x0025, 0x0026, 0x0027,
-       0x0028, 0x0029, 0x002a, 0x002b,
-       0x002c, 0x002d, 0x002e, 0x002f,
-       /* 0x30*/
-       0x0030, 0x0031, 0x0032, 0x0033,
-       0x0034, 0x0035, 0x0036, 0x0037,
-       0x0038, 0x0039, 0x003a, 0x003b,
-       0x003c, 0x003d, 0x003e, 0x003f,
-       /* 0x40*/
-       0x0040, 0x0041, 0x0042, 0x0043,
-       0x0044, 0x0045, 0x0046, 0x0047,
-       0x0048, 0x0049, 0x004a, 0x004b,
-       0x004c, 0x004d, 0x004e, 0x004f,
-       /* 0x50*/
-       0x0050, 0x0051, 0x0052, 0x0053,
-       0x0054, 0x0055, 0x0056, 0x0057,
-       0x0058, 0x0059, 0x005a, 0x005b,
-       0x005c, 0x005d, 0x005e, 0x005f,
-       /* 0x60*/
-       0x0060, 0x0061, 0x0062, 0x0063,
-       0x0064, 0x0065, 0x0066, 0x0067,
-       0x0068, 0x0069, 0x006a, 0x006b,
-       0x006c, 0x006d, 0x006e, 0x006f,
-       /* 0x70*/
-       0x0070, 0x0071, 0x0072, 0x0073,
-       0x0074, 0x0075, 0x0076, 0x0077,
-       0x0078, 0x0079, 0x007a, 0x007b,
-       0x007c, 0x007d, 0x007e, 0x007f,
-};
-
-static unsigned char page00[128] = {
-       0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, /* 0x00-0x07 */
-       0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, /* 0x08-0x0f */
-       0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, /* 0x10-0x17 */
-       0x18, 0x19, 0x1a, 0x1b, 0x1c, 0x1d, 0x1e, 0x1f, /* 0x18-0x1f */
-       0x20, 0x21, 0x22, 0x23, 0x24, 0x25, 0x26, 0x27, /* 0x20-0x27 */
-       0x28, 0x29, 0x2a, 0x2b, 0x2c, 0x2d, 0x2e, 0x2f, /* 0x28-0x2f */
-       0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37, /* 0x30-0x37 */
-       0x38, 0x39, 0x3a, 0x3b, 0x3c, 0x3d, 0x3e, 0x3f, /* 0x38-0x3f */
-       0x40, 0x41, 0x42, 0x43, 0x44, 0x45, 0x46, 0x47, /* 0x40-0x47 */
-       0x48, 0x49, 0x4a, 0x4b, 0x4c, 0x4d, 0x4e, 0x4f, /* 0x48-0x4f */
-       0x50, 0x51, 0x52, 0x53, 0x54, 0x55, 0x56, 0x57, /* 0x50-0x57 */
-       0x58, 0x59, 0x5a, 0x5b, 0x5c, 0x5d, 0x5e, 0x5f, /* 0x58-0x5f */
-       0x60, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67, /* 0x60-0x67 */
-       0x68, 0x69, 0x6a, 0x6b, 0x6c, 0x6d, 0x6e, 0x6f, /* 0x68-0x6f */
-       0x70, 0x71, 0x72, 0x73, 0x74, 0x75, 0x76, 0x77, /* 0x70-0x77 */
-       0x78, 0x79, 0x7a, 0x7b, 0x7c, 0x7d, 0x7e, 0x7f, /* 0x78-0x7f */
-};
-
-static unsigned char *page_uni2charset[128] = {
-       page00, NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,
-};
-
-static unsigned char charset2lower[128] = {
-       0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, /* 0x00-0x07 */
-       0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, /* 0x08-0x0f */
-       0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, /* 0x10-0x17 */
-       0x18, 0x19, 0x1a, 0x1b, 0x1c, 0x1d, 0x1e, 0x1f, /* 0x18-0x1f */
-       0x20, 0x21, 0x22, 0x23, 0x24, 0x25, 0x26, 0x27, /* 0x20-0x27 */
-       0x28, 0x29, 0x2a, 0x2b, 0x2c, 0x2d, 0x2e, 0x2f, /* 0x28-0x2f */
-       0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37, /* 0x30-0x37 */
-       0x38, 0x39, 0x3a, 0x3b, 0x3c, 0x3d, 0x3e, 0x3f, /* 0x38-0x3f */
-       0x40, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67, /* 0x40-0x47 */
-       0x68, 0x69, 0x6a, 0x6b, 0x6c, 0x6d, 0x6e, 0x6f, /* 0x48-0x4f */
-       0x70, 0x71, 0x72, 0x73, 0x74, 0x75, 0x76, 0x77, /* 0x50-0x57 */
-       0x78, 0x79, 0x7a, 0x5b, 0x5c, 0x5d, 0x5e, 0x5f, /* 0x58-0x5f */
-       0x60, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67, /* 0x60-0x67 */
-       0x68, 0x69, 0x6a, 0x6b, 0x6c, 0x6d, 0x6e, 0x6f, /* 0x68-0x6f */
-       0x70, 0x71, 0x72, 0x73, 0x74, 0x75, 0x76, 0x77, /* 0x70-0x77 */
-       0x78, 0x79, 0x7a, 0x7b, 0x7c, 0x7d, 0x7e, 0x7f, /* 0x78-0x7f */
-};
-
-static unsigned char charset2upper[128] = {
-       0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, /* 0x00-0x07 */
-       0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, /* 0x08-0x0f */
-       0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, /* 0x10-0x17 */
-       0x18, 0x19, 0x1a, 0x1b, 0x1c, 0x1d, 0x1e, 0x1f, /* 0x18-0x1f */
-       0x20, 0x21, 0x22, 0x23, 0x24, 0x25, 0x26, 0x27, /* 0x20-0x27 */
-       0x28, 0x29, 0x2a, 0x2b, 0x2c, 0x2d, 0x2e, 0x2f, /* 0x28-0x2f */
-       0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37, /* 0x30-0x37 */
-       0x38, 0x39, 0x3a, 0x3b, 0x3c, 0x3d, 0x3e, 0x3f, /* 0x38-0x3f */
-       0x40, 0x41, 0x42, 0x43, 0x44, 0x45, 0x46, 0x47, /* 0x40-0x47 */
-       0x48, 0x49, 0x4a, 0x4b, 0x4c, 0x4d, 0x4e, 0x4f, /* 0x48-0x4f */
-       0x50, 0x51, 0x52, 0x53, 0x54, 0x55, 0x56, 0x57, /* 0x50-0x57 */
-       0x58, 0x59, 0x5a, 0x5b, 0x5c, 0x5d, 0x5e, 0x5f, /* 0x58-0x5f */
-       0x60, 0x41, 0x42, 0x43, 0x44, 0x45, 0x46, 0x47, /* 0x60-0x67 */
-       0x48, 0x49, 0x4a, 0x4b, 0x4c, 0x4d, 0x4e, 0x4f, /* 0x68-0x6f */
-       0x50, 0x51, 0x52, 0x53, 0x54, 0x55, 0x56, 0x57, /* 0x70-0x77 */
-       0x58, 0x59, 0x5a, 0x7b, 0x7c, 0x7d, 0x7e, 0x7f, /* 0x78-0x7f */
-};
-
-static int uni2char(wchar_t uni, unsigned char *out, int boundlen)
-{
-       unsigned char *uni2charset;
-       unsigned char cl = uni & 0x00ff;
-       unsigned char ch = (uni & 0xff00) >> 8;
-
-       if (boundlen <= 0)
-               return -ENAMETOOLONG;
-
-       uni2charset = page_uni2charset[ch];
-       if (uni2charset && uni2charset[cl])
-               out[0] = uni2charset[cl];
-       else
-               return -EINVAL;
-       return 1;
-}
-
-static int char2uni(const unsigned char *rawstring, int boundlen, wchar_t *uni)
-{
-       *uni = charset2uni[*rawstring];
-       if (*uni == 0x0000)
-               return -EINVAL;
-       return 1;
-}
-
-static struct nls_table table = {
-       .charset        = "ascii",
-       .uni2char       = uni2char,
-       .char2uni       = char2uni,
-       .charset2lower  = charset2lower,
-       .charset2upper  = charset2upper,
-       .owner          = THIS_MODULE,
-};
-
-static int __init init_nls_ascii(void)
-{
-       return register_nls(&table);
-}
-
-static void __exit exit_nls_ascii(void)
-{
-       unregister_nls(&table);
-}
-
-module_init(init_nls_ascii)
-module_exit(exit_nls_ascii)
-
-MODULE_LICENSE("Dual BSD/GPL");
diff --git a/fs/ntfs/collate.c b/fs/ntfs/collate.c
deleted file mode 100644 (file)
index 2a4a25f..0000000
+++ /dev/null
@@ -1,121 +0,0 @@
-/*
- * collate.c - NTFS kernel collation handling.  Part of the Linux-NTFS project.
- *
- * Copyright (c) 2004 Anton Altaparmakov
- *
- * This program/include file 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/include file 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 (in the main directory of the Linux-NTFS
- * distribution in the file COPYING); if not, write to the Free Software
- * Foundation,Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
-
-#include "ntfs.h"
-#include "collate.h"
-
-static int ntfs_collate_binary(ntfs_volume *vol,
-               const void *data1, const int data1_len,
-               const void *data2, const int data2_len)
-{
-       int rc;
-
-       ntfs_debug("Entering.");
-       rc = memcmp(data1, data2, min(data1_len, data2_len));
-       if (!rc && (data1_len != data2_len)) {
-               if (data1_len < data2_len)
-                       rc = -1;
-               else
-                       rc = 1;
-       }
-       ntfs_debug("Done, returning %i", rc);
-       return rc;
-}
-
-static int ntfs_collate_ntofs_ulong(ntfs_volume *vol,
-               const void *data1, const int data1_len,
-               const void *data2, const int data2_len)
-{
-       int rc;
-       u32 d1, d2;
-
-       ntfs_debug("Entering.");
-       // FIXME:  We don't really want to bug here.
-       BUG_ON(data1_len != data2_len);
-       BUG_ON(data1_len != 4);
-       d1 = le32_to_cpup(data1);
-       d2 = le32_to_cpup(data2);
-       if (d1 < d2)
-               rc = -1;
-       else {
-               if (d1 == d2)
-                       rc = 0;
-               else
-                       rc = 1;
-       }
-       ntfs_debug("Done, returning %i", rc);
-       return rc;
-}
-
-typedef int (*ntfs_collate_func_t)(ntfs_volume *, const void *, const int,
-               const void *, const int);
-
-static ntfs_collate_func_t ntfs_do_collate0x0[3] = {
-       ntfs_collate_binary,
-       NULL/*ntfs_collate_file_name*/,
-       NULL/*ntfs_collate_unicode_string*/,
-};
-
-static ntfs_collate_func_t ntfs_do_collate0x1[4] = {
-       ntfs_collate_ntofs_ulong,
-       NULL/*ntfs_collate_ntofs_sid*/,
-       NULL/*ntfs_collate_ntofs_security_hash*/,
-       NULL/*ntfs_collate_ntofs_ulongs*/,
-};
-
-/**
- * ntfs_collate - collate two data items using a specified collation rule
- * @vol:       ntfs volume to which the data items belong
- * @cr:                collation rule to use when comparing the items
- * @data1:     first data item to collate
- * @data1_len: length in bytes of @data1
- * @data2:     second data item to collate
- * @data2_len: length in bytes of @data2
- *
- * Collate the two data items @data1 and @data2 using the collation rule @cr
- * and return -1, 0, ir 1 if @data1 is found, respectively, to collate before,
- * to match, or to collate after @data2.
- *
- * For speed we use the collation rule @cr as an index into two tables of
- * function pointers to call the appropriate collation function.
- */
-int ntfs_collate(ntfs_volume *vol, COLLATION_RULES cr,
-               const void *data1, const int data1_len,
-               const void *data2, const int data2_len) {
-       ntfs_debug("Entering.");
-       /*
-        * FIXME:  At the moment we only support COLLATION_BINARY and
-        * COLLATION_NTOFS_ULONG, so we BUG() for everything else for now.
-        */
-       BUG_ON(cr != COLLATION_BINARY && cr != COLLATION_NTOFS_ULONG);
-       cr = le32_to_cpu(cr);
-       BUG_ON(cr < 0);
-       if (cr <= 0x02)
-               return ntfs_do_collate0x0[cr](vol, data1, data1_len,
-                               data2, data2_len);
-       BUG_ON(cr < 0x10);
-       cr -= 0x10;
-       if (likely(cr <= 3))
-               return ntfs_do_collate0x1[cr](vol, data1, data1_len,
-                               data2, data2_len);
-       BUG();
-       return 0;
-}
diff --git a/fs/ntfs/collate.h b/fs/ntfs/collate.h
deleted file mode 100644 (file)
index 14a67a6..0000000
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * collate.h - Defines for NTFS kernel collation handling.  Part of the
- *            Linux-NTFS project.
- *
- * Copyright (c) 2004 Anton Altaparmakov
- *
- * This program/include file 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/include file 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 (in the main directory of the Linux-NTFS
- * distribution in the file COPYING); if not, write to the Free Software
- * Foundation,Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
-
-#ifndef _LINUX_NTFS_COLLATE_H
-#define _LINUX_NTFS_COLLATE_H
-
-#include "types.h"
-#include "volume.h"
-
-static inline BOOL ntfs_is_collation_rule_supported(COLLATION_RULES cr) {
-       /*
-        * FIXME:  At the moment we only support COLLATION_BINARY and
-        * COLLATION_NTOFS_ULONG, so we return false for everything else for
-        * now.
-        */
-       if (unlikely(cr != COLLATION_BINARY && cr != COLLATION_NTOFS_ULONG))
-               return FALSE;
-       cr = le32_to_cpu(cr);
-       if (likely(((cr >= 0) && (cr <= 0x02)) ||
-                       ((cr >= 0x10) && (cr <= 0x13))))
-               return TRUE;
-       return FALSE;
-}
-
-extern int ntfs_collate(ntfs_volume *vol, COLLATION_RULES cr,
-               const void *data1, const int data1_len,
-               const void *data2, const int data2_len);
-
-#endif /* _LINUX_NTFS_COLLATE_H */
diff --git a/fs/ntfs/index.c b/fs/ntfs/index.c
deleted file mode 100644 (file)
index f4396a0..0000000
+++ /dev/null
@@ -1,514 +0,0 @@
-/*
- * index.c - NTFS kernel index handling.  Part of the Linux-NTFS project.
- *
- * Copyright (c) 2004 Anton Altaparmakov
- *
- * This program/include file 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/include file 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 (in the main directory of the Linux-NTFS
- * distribution in the file COPYING); if not, write to the Free Software
- * Foundation,Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
-
-#include "ntfs.h"
-#include "collate.h"
-#include "index.h"
-
-/**
- * ntfs_index_ctx_get - allocate and initialize a new index context
- * @idx_ni:    ntfs index inode with which to initialize the context
- *
- * Allocate a new index context, initialize it with @idx_ni and return it.
- * Return NULL if allocation failed.
- *
- * Locking:  Caller must hold i_sem on the index inode.
- */
-ntfs_index_context *ntfs_index_ctx_get(ntfs_inode *idx_ni)
-{
-       ntfs_index_context *ictx;
-
-       ictx = kmem_cache_alloc(ntfs_index_ctx_cache, SLAB_NOFS);
-       if (ictx) {
-               ictx->idx_ni = idx_ni;
-               ictx->entry = NULL;
-               ictx->data = NULL;
-               ictx->data_len = 0;
-               ictx->is_in_root = 0;
-               ictx->ir = NULL;
-               ictx->actx = NULL;
-               ictx->base_ni = NULL;
-               ictx->ia = NULL;
-               ictx->page = NULL;
-       }
-       return ictx;
-}
-
-/**
- * ntfs_index_ctx_put - release an index context
- * @ictx:      index context to free
- *
- * Release the index context @ictx, releasing all associated resources.
- *
- * Locking:  Caller must hold i_sem on the index inode.
- */
-void ntfs_index_ctx_put(ntfs_index_context *ictx)
-{
-       if (ictx->entry) {
-               if (ictx->is_in_root) {
-                       if (ictx->actx)
-                               put_attr_search_ctx(ictx->actx);
-                       if (ictx->base_ni)
-                               unmap_mft_record(ictx->base_ni);
-               } else {
-                       struct page *page = ictx->page;
-                       if (page) {
-                               BUG_ON(!PageLocked(page));
-                               unlock_page(page);
-                               ntfs_unmap_page(page);
-                       }
-               }
-       }
-       kmem_cache_free(ntfs_index_ctx_cache, ictx);
-       return;
-}
-
-/**
- * ntfs_index_lookup - find a key in an index and return its index entry
- * @key:       [IN] key for which to search in the index
- * @key_len:   [IN] length of @key in bytes
- * @ictx:      [IN/OUT] context describing the index and the returned entry
- *
- * Before calling ntfs_index_lookup(), @ictx must have been obtained from a
- * call to ntfs_index_ctx_get().
- *
- * Look for the @key in the index specified by the index lookup context @ictx.
- * ntfs_index_lookup() walks the contents of the index looking for the @key.
- *
- * If the @key is found in the index, 0 is returned and @ictx is setup to
- * describe the index entry containing the matching @key.  @ictx->entry is the
- * index entry and @ictx->data and @ictx->data_len are the index entry data and
- * its length in bytes, respectively.
- *
- * If the @key is not found in the index, -ENOENT is returned and @ictx is
- * setup to describe the index entry whose key collates immediately after the
- * search @key, i.e. this is the position in the index at which an index entry
- * with a key of @key would need to be inserted.
- *
- * If an error occurs return the negative error code and @ictx is left
- * untouched.
- *
- * When finished with the entry and its data, call ntfs_index_ctx_put() to free
- * the context and other associated resources.
- *
- * If the index entry was modified, call flush_dcache_index_entry_page()
- * immediately after the modification and either ntfs_index_entry_mark_dirty()
- * or ntfs_index_entry_write() before the call to ntfs_index_ctx_put() to
- * ensure that the changes are written to disk.
- *
- * Locking:  - Caller must hold i_sem on the index inode.
- *          - Each page cache page in the index allocation mapping must be
- *            locked whilst being accessed otherwise we may find a corrupt
- *            page due to it being under ->writepage at the moment which
- *            applies the mst protection fixups before writing out and then
- *            removes them again after the write is complete after which it 
- *            unlocks the page.
- */
-int ntfs_index_lookup(const void *key, const int key_len,
-               ntfs_index_context *ictx)
-{
-       ntfs_inode *idx_ni = ictx->idx_ni;
-       ntfs_volume *vol = idx_ni->vol;
-       struct super_block *sb = vol->sb;
-       ntfs_inode *base_ni = idx_ni->ext.base_ntfs_ino;
-       MFT_RECORD *m;
-       INDEX_ROOT *ir;
-       INDEX_ENTRY *ie;
-       INDEX_ALLOCATION *ia;
-       u8 *index_end;
-       attr_search_context *actx;
-       int rc, err = 0;
-       VCN vcn, old_vcn;
-       struct address_space *ia_mapping;
-       struct page *page;
-       u8 *kaddr;
-
-       ntfs_debug("Entering.");
-       BUG_ON(!NInoAttr(idx_ni));
-       BUG_ON(idx_ni->type != AT_INDEX_ALLOCATION);
-       BUG_ON(idx_ni->nr_extents != -1);
-       BUG_ON(!base_ni);
-       BUG_ON(!key);
-       BUG_ON(key_len <= 0);
-       if (!ntfs_is_collation_rule_supported(
-                       idx_ni->itype.index.collation_rule)) {
-               ntfs_error(sb, "Index uses unsupported collation rule 0x%x.  "
-                               "Aborting lookup.", le32_to_cpu(
-                               idx_ni->itype.index.collation_rule));
-               return -EOPNOTSUPP;
-       }
-       /* Get hold of the mft record for the index inode. */
-       m = map_mft_record(base_ni);
-       if (unlikely(IS_ERR(m))) {
-               ntfs_error(sb, "map_mft_record() failed with error code %ld.",
-                               -PTR_ERR(m));
-               return PTR_ERR(m);
-       }
-       actx = get_attr_search_ctx(base_ni, m);
-       if (unlikely(!actx)) {
-               err = -ENOMEM;
-               goto err_out;
-       }
-       /* Find the index root attribute in the mft record. */
-       if (!lookup_attr(AT_INDEX_ROOT, idx_ni->name, idx_ni->name_len,
-                       CASE_SENSITIVE, 0, NULL, 0, actx)) {
-               ntfs_error(sb, "Index root attribute missing in inode 0x%lx.",
-                               idx_ni->mft_no);
-               err = -EIO;
-               goto err_out;
-       }
-       /* Get to the index root value (it has been verified in read_inode). */
-       ir = (INDEX_ROOT*)((u8*)actx->attr +
-                       le16_to_cpu(actx->attr->data.resident.value_offset));
-       index_end = (u8*)&ir->index + le32_to_cpu(ir->index.index_length);
-       /* The first index entry. */
-       ie = (INDEX_ENTRY*)((u8*)&ir->index +
-                       le32_to_cpu(ir->index.entries_offset));
-       /*
-        * Loop until we exceed valid memory (corruption case) or until we
-        * reach the last entry.
-        */
-       for (;; ie = (INDEX_ENTRY*)((u8*)ie + le16_to_cpu(ie->length))) {
-               /* Bounds checks. */
-               if ((u8*)ie < (u8*)actx->mrec || (u8*)ie +
-                               sizeof(INDEX_ENTRY_HEADER) > index_end ||
-                               (u8*)ie + le16_to_cpu(ie->length) > index_end)
-                       goto idx_err_out;
-               /*
-                * The last entry cannot contain a key.  It can however contain
-                * a pointer to a child node in the B+tree so we just break out.
-                */
-               if (ie->flags & INDEX_ENTRY_END)
-                       break;
-               /* Further bounds checks. */
-               if ((u32)sizeof(INDEX_ENTRY_HEADER) +
-                               le16_to_cpu(ie->key_length) >
-                               le16_to_cpu(ie->data.vi.data_offset) ||
-                               (u32)le16_to_cpu(ie->data.vi.data_offset) +
-                               le16_to_cpu(ie->data.vi.data_length) >
-                               le16_to_cpu(ie->length))
-                       goto idx_err_out;
-               /* If the keys match perfectly, we setup @ictx and return 0. */
-               if ((key_len == le16_to_cpu(ie->key_length)) && !memcmp(key,
-                               &ie->key, key_len)) {
-ir_done:
-                       ictx->is_in_root = TRUE;
-                       ictx->actx = actx;
-                       ictx->base_ni = base_ni;
-                       ictx->ia = NULL;
-                       ictx->page = NULL;
-done:
-                       ictx->entry = ie;
-                       ictx->data = (u8*)ie +
-                                       le16_to_cpu(ie->data.vi.data_offset);
-                       ictx->data_len = le16_to_cpu(ie->data.vi.data_length);
-                       ntfs_debug("Done.");
-                       return err;
-               }
-               /*
-                * Not a perfect match, need to do full blown collation so we
-                * know which way in the B+tree we have to go.
-                */
-               rc = ntfs_collate(vol, idx_ni->itype.index.collation_rule, key,
-                               key_len, &ie->key, le16_to_cpu(ie->key_length));
-               /*
-                * If @key collates before the key of the current entry, there
-                * is definitely no such key in this index but we might need to
-                * descend into the B+tree so we just break out of the loop.
-                */
-               if (rc == -1)
-                       break;
-               /*
-                * A match should never happen as the memcmp() call should have
-                * cought it, but we still treat it correctly.
-                */
-               if (!rc)
-                       goto ir_done;
-               /* The keys are not equal, continue the search. */
-       }
-       /*
-        * We have finished with this index without success.  Check for the
-        * presence of a child node and if not present setup @ictx and return
-        * -ENOENT.
-        */
-       if (!(ie->flags & INDEX_ENTRY_NODE)) {
-               ntfs_debug("Entry not found.");
-               err = -ENOENT;
-               goto ir_done;
-       } /* Child node present, descend into it. */
-       /* Consistency check: Verify that an index allocation exists. */
-       if (!NInoIndexAllocPresent(idx_ni)) {
-               ntfs_error(sb, "No index allocation attribute but index entry "
-                               "requires one.  Inode 0x%lx is corrupt or "
-                               "driver bug.", idx_ni->mft_no);
-               err = -EIO;
-               goto err_out;
-       }
-       /* Get the starting vcn of the index_block holding the child node. */
-       vcn = sle64_to_cpup((u8*)ie + le16_to_cpu(ie->length) - 8);
-       ia_mapping = VFS_I(idx_ni)->i_mapping;
-       /*
-        * We are done with the index root and the mft record.  Release them,
-        * otherwise we deadlock with ntfs_map_page().
-        */
-       put_attr_search_ctx(actx);
-       unmap_mft_record(base_ni);
-       m = NULL;
-       actx = NULL;
-descend_into_child_node:
-       /*
-        * Convert vcn to index into the index allocation attribute in units
-        * of PAGE_CACHE_SIZE and map the page cache page, reading it from
-        * disk if necessary.
-        */
-       page = ntfs_map_page(ia_mapping, vcn <<
-                       idx_ni->itype.index.vcn_size_bits >> PAGE_CACHE_SHIFT);
-       if (IS_ERR(page)) {
-               ntfs_error(sb, "Failed to map index page, error %ld.",
-                               -PTR_ERR(page));
-               err = PTR_ERR(page);
-               goto err_out;
-       }
-       lock_page(page);
-       kaddr = (u8*)page_address(page);
-fast_descend_into_child_node:
-       /* Get to the index allocation block. */
-       ia = (INDEX_ALLOCATION*)(kaddr + ((vcn <<
-                       idx_ni->itype.index.vcn_size_bits) & ~PAGE_CACHE_MASK));
-       /* Bounds checks. */
-       if ((u8*)ia < kaddr || (u8*)ia > kaddr + PAGE_CACHE_SIZE) {
-               ntfs_error(sb, "Out of bounds check failed.  Corrupt inode "
-                               "0x%lx or driver bug.", idx_ni->mft_no);
-               err = -EIO;
-               goto unm_err_out;
-       }
-       if (sle64_to_cpu(ia->index_block_vcn) != vcn) {
-               ntfs_error(sb, "Actual VCN (0x%llx) of index buffer is "
-                               "different from expected VCN (0x%llx).  Inode "
-                               "0x%lx is corrupt or driver bug.",
-                               (unsigned long long)
-                               sle64_to_cpu(ia->index_block_vcn),
-                               (unsigned long long)vcn, idx_ni->mft_no);
-               err = -EIO;
-               goto unm_err_out;
-       }
-       if (le32_to_cpu(ia->index.allocated_size) + 0x18 !=
-                       idx_ni->itype.index.block_size) {
-               ntfs_error(sb, "Index buffer (VCN 0x%llx) of inode 0x%lx has "
-                               "a size (%u) differing from the index "
-                               "specified size (%u).  Inode is corrupt or "
-                               "driver bug.", (unsigned long long)vcn,
-                               idx_ni->mft_no,
-                               le32_to_cpu(ia->index.allocated_size) + 0x18,
-                               idx_ni->itype.index.block_size);
-               err = -EIO;
-               goto unm_err_out;
-       }
-       index_end = (u8*)ia + idx_ni->itype.index.block_size;
-       if (index_end > kaddr + PAGE_CACHE_SIZE) {
-               ntfs_error(sb, "Index buffer (VCN 0x%llx) of inode 0x%lx "
-                               "crosses page boundary.  Impossible!  Cannot "
-                               "access!  This is probably a bug in the "
-                               "driver.", (unsigned long long)vcn,
-                               idx_ni->mft_no);
-               err = -EIO;
-               goto unm_err_out;
-       }
-       index_end = (u8*)&ia->index + le32_to_cpu(ia->index.index_length);
-       if (index_end > (u8*)ia + idx_ni->itype.index.block_size) {
-               ntfs_error(sb, "Size of index buffer (VCN 0x%llx) of inode "
-                               "0x%lx exceeds maximum size.",
-                               (unsigned long long)vcn, idx_ni->mft_no);
-               err = -EIO;
-               goto unm_err_out;
-       }
-       /* The first index entry. */
-       ie = (INDEX_ENTRY*)((u8*)&ia->index +
-                       le32_to_cpu(ia->index.entries_offset));
-       /*
-        * Iterate similar to above big loop but applied to index buffer, thus
-        * loop until we exceed valid memory (corruption case) or until we
-        * reach the last entry.
-        */
-       for (;; ie = (INDEX_ENTRY*)((u8*)ie + le16_to_cpu(ie->length))) {
-               /* Bounds checks. */
-               if ((u8*)ie < (u8*)ia || (u8*)ie +
-                               sizeof(INDEX_ENTRY_HEADER) > index_end ||
-                               (u8*)ie + le16_to_cpu(ie->length) > index_end) {
-                       ntfs_error(sb, "Index entry out of bounds in inode "
-                                       "0x%lx.", idx_ni->mft_no);
-                       err = -EIO;
-                       goto unm_err_out;
-               }
-               /*
-                * The last entry cannot contain a ket.  It can however contain
-                * a pointer to a child node in the B+tree so we just break out.
-                */
-               if (ie->flags & INDEX_ENTRY_END)
-                       break;
-               /* Further bounds checks. */
-               if ((u32)sizeof(INDEX_ENTRY_HEADER) +
-                               le16_to_cpu(ie->key_length) >
-                               le16_to_cpu(ie->data.vi.data_offset) ||
-                               (u32)le16_to_cpu(ie->data.vi.data_offset) +
-                               le16_to_cpu(ie->data.vi.data_length) >
-                               le16_to_cpu(ie->length)) {
-                       ntfs_error(sb, "Index entry out of bounds in inode "
-                                       "0x%lx.", idx_ni->mft_no);
-                       err = -EIO;
-                       goto unm_err_out;
-               }
-               /* If the keys match perfectly, we setup @ictx and return 0. */
-               if ((key_len == le16_to_cpu(ie->key_length)) && !memcmp(key,
-                               &ie->key, key_len)) {
-ia_done:
-                       ictx->is_in_root = FALSE;
-                       ictx->actx = NULL;
-                       ictx->base_ni = NULL;
-                       ictx->ia = ia;
-                       ictx->page = page;
-                       goto done;
-               }
-               /*
-                * Not a perfect match, need to do full blown collation so we
-                * know which way in the B+tree we have to go.
-                */
-               rc = ntfs_collate(vol, idx_ni->itype.index.collation_rule, key,
-                               key_len, &ie->key, le16_to_cpu(ie->key_length));
-               /*
-                * If @key collates before the key of the current entry, there
-                * is definitely no such key in this index but we might need to
-                * descend into the B+tree so we just break out of the loop.
-                */
-               if (rc == -1)
-                       break;
-               /*
-                * A match should never happen as the memcmp() call should have
-                * cought it, but we still treat it correctly.
-                */
-               if (!rc)
-                       goto ia_done;
-               /* The keys are not equal, continue the search. */
-       }
-       /*
-        * We have finished with this index buffer without success.  Check for
-        * the presence of a child node and if not present return -ENOENT.
-        */
-       if (!(ie->flags & INDEX_ENTRY_NODE)) {
-               ntfs_debug("Entry not found.");
-               err = -ENOENT;
-               goto ia_done;
-       }
-       if ((ia->index.flags & NODE_MASK) == LEAF_NODE) {
-               ntfs_error(sb, "Index entry with child node found in a leaf "
-                               "node in inode 0x%lx.", idx_ni->mft_no);
-               err = -EIO;
-               goto unm_err_out;
-       }
-       /* Child node present, descend into it. */
-       old_vcn = vcn;
-       vcn = sle64_to_cpup((u8*)ie + le16_to_cpu(ie->length) - 8);
-       if (vcn >= 0) {
-               /*
-                * If vcn is in the same page cache page as old_vcn we recycle
-                * the mapped page.
-                */
-               if (old_vcn << vol->cluster_size_bits >>
-                               PAGE_CACHE_SHIFT == vcn <<
-                               vol->cluster_size_bits >>
-                               PAGE_CACHE_SHIFT)
-                       goto fast_descend_into_child_node;
-               unlock_page(page);
-               ntfs_unmap_page(page);
-               goto descend_into_child_node;
-       }
-       ntfs_error(sb, "Negative child node vcn in inode 0x%lx.",
-                       idx_ni->mft_no);
-       err = -EIO;
-unm_err_out:
-       unlock_page(page);
-       ntfs_unmap_page(page);
-err_out:
-       if (actx)
-               put_attr_search_ctx(actx);
-       if (m)
-               unmap_mft_record(base_ni);
-       return err;
-idx_err_out:
-       ntfs_error(sb, "Corrupt index.  Aborting lookup.");
-       err = -EIO;
-       goto err_out;
-}
-
-#ifdef NTFS_RW
-
-/**
- * __ntfs_index_entry_mark_dirty - mark an index allocation entry dirty
- * @ictx:      ntfs index context describing the index entry
- *
- * NOTE: You want to use fs/ntfs/index.h::ntfs_index_entry_mark_dirty() instead!
- * 
- * Mark the index allocation entry described by the index entry context @ictx
- * dirty.
- *
- * The index entry must be in an index block belonging to the index allocation
- * attribute.  Mark the buffers belonging to the index record as well as the
- * page cache page the index block is in dirty.  This automatically marks the
- * VFS inode of the ntfs index inode to which the index entry belongs dirty,
- * too (I_DIRTY_PAGES) and this in turn ensures the page buffers, and hence the
- * dirty index block, will be written out to disk later.
- */
-void __ntfs_index_entry_mark_dirty(ntfs_index_context *ictx)
-{
-       ntfs_inode *ni;
-       struct page *page;
-       struct buffer_head *bh, *head;
-       unsigned int rec_start, rec_end, bh_size, bh_start, bh_end;
-
-       BUG_ON(ictx->is_in_root);
-       ni = ictx->idx_ni;
-       page = ictx->page;
-       BUG_ON(!page_has_buffers(page));
-       /*
-        * If the index block is the same size as the page cache page, set all
-        * the buffers in the page, as well as the page itself, dirty.
-        */
-       if (ni->itype.index.block_size == PAGE_CACHE_SIZE) {
-               __set_page_dirty_buffers(page);
-               return;
-       }
-       /* Set only the buffers in which the index block is located dirty. */
-       rec_start = (unsigned int)((u8*)ictx->ia - (u8*)page_address(page));
-       rec_end = rec_start + ni->itype.index.block_size;
-       bh_size = ni->vol->sb->s_blocksize;
-       bh_start = 0;
-       bh = head = page_buffers(page);
-       do {
-               bh_end = bh_start + bh_size;
-               if ((bh_start >= rec_start) && (bh_end <= rec_end))
-                       set_buffer_dirty(bh);
-               bh_start = bh_end;
-       } while ((bh = bh->b_this_page) != head);
-       /* Finally, set the page itself dirty, too. */
-       __set_page_dirty_nobuffers(page);
-}
-
-#endif /* NTFS_RW */
diff --git a/fs/ntfs/index.h b/fs/ntfs/index.h
deleted file mode 100644 (file)
index 8ed9436..0000000
+++ /dev/null
@@ -1,148 +0,0 @@
-/*
- * index.h - Defines for NTFS kernel index handling.  Part of the Linux-NTFS
- *          project.
- *
- * Copyright (c) 2004 Anton Altaparmakov
- *
- * This program/include file 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/include file 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 (in the main directory of the Linux-NTFS
- * distribution in the file COPYING); if not, write to the Free Software
- * Foundation,Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
-
-#ifndef _LINUX_NTFS_INDEX_H
-#define _LINUX_NTFS_INDEX_H
-
-#include <linux/fs.h>
-
-#include "types.h"
-#include "layout.h"
-#include "inode.h"
-#include "attrib.h"
-#include "mft.h"
-
-/**
- * @idx_ni:    index inode containing the @entry described by this context
- * @entry:     index entry (points into @ir or @ia)
- * @data:      index entry data (points into @entry)
- * @data_len:  length in bytes of @data
- * @is_in_root:        TRUE if @entry is in @ir and FALSE if it is in @ia
- * @ir:                index root if @is_in_root and NULL otherwise
- * @actx:      attribute search context if @is_in_root and NULL otherwise
- * @base_ni:   base inode if @is_in_root and NULL otherwise
- * @ia:                index block if @is_in_root is FALSE and NULL otherwise
- * @page:      page if @is_in_root is FALSE and NULL otherwise
- *
- * @idx_ni is the index inode this context belongs to.
- *
- * @entry is the index entry described by this context.  @data and @data_len
- * are the index entry data and its length in bytes, respectively.  @data
- * simply points into @entry.  This is probably what the user is interested in.
- *
- * If @is_in_root is TRUE, @entry is in the index root attribute @ir described
- * by the attribute search context @actx and the base inode @base_ni.  @ia and
- * @page are NULL in this case.
- *
- * If @is_in_root is FALSE, @entry is in the index allocation attribute and @ia
- * and @page point to the index allocation block and the mapped, locked page it
- * is in, respectively.  @ir, @actx and @base_ni are NULL in this case.
- *
- * To obtain a context call ntfs_index_ctx_get().
- *
- * We use this context to allow ntfs_index_lookup() to return the found index
- * @entry and its @data without having to allocate a buffer and copy the @entry
- * and/or its @data into it.
- *
- * When finished with the @entry and its @data, call ntfs_index_ctx_put() to
- * free the context and other associated resources.
- *
- * If the index entry was modified, call flush_dcache_index_entry_page()
- * immediately after the modification and either ntfs_index_entry_mark_dirty()
- * or ntfs_index_entry_write() before the call to ntfs_index_ctx_put() to
- * ensure that the changes are written to disk.
- */
-typedef struct {
-       ntfs_inode *idx_ni;
-       INDEX_ENTRY *entry;
-       void *data;
-       u16 data_len;
-       BOOL is_in_root;
-       INDEX_ROOT *ir;
-       attr_search_context *actx;
-       ntfs_inode *base_ni;
-       INDEX_ALLOCATION *ia;
-       struct page *page;
-} ntfs_index_context;
-
-extern ntfs_index_context *ntfs_index_ctx_get(ntfs_inode *idx_ni);
-extern void ntfs_index_ctx_put(ntfs_index_context *ictx);
-
-extern int ntfs_index_lookup(const void *key, const int key_len,
-               ntfs_index_context *ictx);
-
-#ifdef NTFS_RW
-
-/**
- * ntfs_index_entry_flush_dcache_page - flush_dcache_page() for index entries
- * @ictx:      ntfs index context describing the index entry
- *
- * Call flush_dcache_page() for the page in which an index entry resides.
- *
- * This must be called every time an index entry is modified, just after the
- * modification.
- *
- * If the index entry is in the index root attribute, simply flush the page
- * containing the mft record containing the index root attribute.
- *
- * If the index entry is in an index block belonging to the index allocation
- * attribute, simply flush the page cache page containing the index block.
- */
-static inline void ntfs_index_entry_flush_dcache_page(ntfs_index_context *ictx)
-{
-       if (ictx->is_in_root)
-               flush_dcache_mft_record_page(ictx->actx->ntfs_ino);
-       else
-               flush_dcache_page(ictx->page);
-}
-
-extern void __ntfs_index_entry_mark_dirty(ntfs_index_context *ictx);
-
-/**
- * ntfs_index_entry_mark_dirty - mark an index entry dirty
- * @ictx:      ntfs index context describing the index entry
- *
- * Mark the index entry described by the index entry context @ictx dirty.
- *
- * If the index entry is in the index root attribute, simply mark the mft
- * record containing the index root attribute dirty.  This ensures the mft
- * record, and hence the index root attribute, will be written out to disk
- * later.
- *
- * If the index entry is in an index block belonging to the index allocation
- * attribute, mark the buffers belonging to the index record as well as the
- * page cache page the index block is in dirty.  This automatically marks the
- * VFS inode of the ntfs index inode to which the index entry belongs dirty,
- * too (I_DIRTY_PAGES) and this in turn ensures the page buffers, and hence the
- * dirty index block, will be written out to disk later.
- */
-static inline void ntfs_index_entry_mark_dirty(ntfs_index_context *ictx)
-{
-       if (ictx->is_in_root)
-               mark_mft_record_dirty(ictx->actx->ntfs_ino);
-       else
-               __ntfs_index_entry_mark_dirty(ictx);
-}
-
-#endif /* NTFS_RW */
-
-#endif /* _LINUX_NTFS_INDEX_H */
diff --git a/fs/ntfs/quota.c b/fs/ntfs/quota.c
deleted file mode 100644 (file)
index d66ca9e..0000000
+++ /dev/null
@@ -1,115 +0,0 @@
-/*
- * quota.c - NTFS kernel quota ($Quota) handling.  Part of the Linux-NTFS
- *          project.
- *
- * Copyright (c) 2004 Anton Altaparmakov
- *
- * This program/include file 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/include file 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 (in the main directory of the Linux-NTFS
- * distribution in the file COPYING); if not, write to the Free Software
- * Foundation,Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
-
-#ifdef NTFS_RW
-
-#include "ntfs.h"
-#include "index.h"
-#include "quota.h"
-
-/**
- * ntfs_mark_quotas_out_of_date - mark the quotas out of date on an ntfs volume
- * @vol:       ntfs volume on which to mark the quotas out of date
- *
- * Mark the quotas out of date on the ntfs volume @vol and return TRUE on
- * success and FALSE on error.
- */
-BOOL ntfs_mark_quotas_out_of_date(ntfs_volume *vol)
-{
-       ntfs_index_context *ictx;
-       QUOTA_CONTROL_ENTRY *qce;
-       const u32 qid = QUOTA_DEFAULTS_ID;
-       int err;
-
-       ntfs_debug("Entering.");
-       if (NVolQuotaOutOfDate(vol))
-               goto done;
-       if (!vol->quota_ino || !vol->quota_q_ino) {
-               ntfs_error(vol->sb, "Quota inodes are not open.");
-               return FALSE;
-       }
-       down(&vol->quota_q_ino->i_sem);
-       ictx = ntfs_index_ctx_get(NTFS_I(vol->quota_q_ino));
-       if (!ictx) {
-               ntfs_error(vol->sb, "Failed to get index context.");
-               return FALSE;
-       }
-       err = ntfs_index_lookup(&qid, sizeof(qid), ictx);
-       if (err) {
-               if (err == -ENOENT)
-                       ntfs_error(vol->sb, "Quota defaults entry is not "
-                                       "present.");
-               else
-                       ntfs_error(vol->sb, "Lookup of quota defaults entry "
-                                       "failed.");
-               goto err_out;
-       }
-       if (ictx->data_len < offsetof(QUOTA_CONTROL_ENTRY, sid)) {
-               ntfs_error(vol->sb, "Quota defaults entry size is invalid.  "
-                               "Run chkdsk.");
-               goto err_out;
-       }
-       qce = (QUOTA_CONTROL_ENTRY*)ictx->data;
-       if (le32_to_cpu(qce->version) != QUOTA_VERSION) {
-               ntfs_error(vol->sb, "Quota defaults entry version 0x%x is not "
-                               "supported.", le32_to_cpu(qce->version));
-               goto err_out;
-       }
-       ntfs_debug("Quota defaults flags = 0x%x.", le32_to_cpu(qce->flags));
-       /* If quotas are already marked out of date, no need to do anything. */
-       if (qce->flags & QUOTA_FLAG_OUT_OF_DATE)
-               goto set_done;
-       /*
-        * If quota tracking is neither requested, nor enabled and there are no
-        * pending deletes, no need to mark the quotas out of date.
-        */
-       if (!(qce->flags & (QUOTA_FLAG_TRACKING_ENABLED |
-                       QUOTA_FLAG_TRACKING_REQUESTED |
-                       QUOTA_FLAG_PENDING_DELETES)))
-               goto set_done;
-       /*
-        * Set the QUOTA_FLAG_OUT_OF_DATE bit thus marking quotas out of date.
-        * This is verified on WinXP to be sufficient to cause windows to
-        * rescan the volume on boot and update all quota entries.
-        */
-       qce->flags |= QUOTA_FLAG_OUT_OF_DATE;
-       /* Ensure the modified flags are written to disk. */
-       ntfs_index_entry_flush_dcache_page(ictx);
-       ntfs_index_entry_mark_dirty(ictx);
-set_done:
-       ntfs_index_ctx_put(ictx);
-       up(&vol->quota_q_ino->i_sem);
-       /*
-        * We set the flag so we do not try to mark the quotas out of date
-        * again on remount.
-        */
-       NVolSetQuotaOutOfDate(vol);
-done:
-       ntfs_debug("Done.");
-       return TRUE;
-err_out:
-       ntfs_index_ctx_put(ictx);
-       up(&vol->quota_q_ino->i_sem);
-       return FALSE;
-}
-
-#endif /* NTFS_RW */
diff --git a/fs/ntfs/quota.h b/fs/ntfs/quota.h
deleted file mode 100644 (file)
index 40e4763..0000000
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * quota.h - Defines for NTFS kernel quota ($Quota) handling.  Part of the
- *          Linux-NTFS project.
- *
- * Copyright (c) 2004 Anton Altaparmakov
- *
- * This program/include file 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/include file 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 (in the main directory of the Linux-NTFS
- * distribution in the file COPYING); if not, write to the Free Software
- * Foundation,Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
-
-#ifndef _LINUX_NTFS_QUOTA_H
-#define _LINUX_NTFS_QUOTA_H
-
-#ifdef NTFS_RW
-
-#include "types.h"
-#include "volume.h"
-
-extern BOOL ntfs_mark_quotas_out_of_date(ntfs_volume *vol);
-
-#endif /* NTFS_RW */
-
-#endif /* _LINUX_NTFS_QUOTA_H */
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/fs/xfs/linux-2.6/kmem.c b/fs/xfs/linux-2.6/kmem.c
deleted file mode 100644 (file)
index fae7176..0000000
+++ /dev/null
@@ -1,127 +0,0 @@
-/*
- * Copyright (c) 2000-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., 1600 Amphitheatre Pkwy,
- * Mountain View, CA  94043, or:
- *
- * http://www.sgi.com
- *
- * For further information regarding this notice, see:
- *
- * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/
- */
-
-#include <linux/sched.h>
-#include <linux/mm.h>
-#include <linux/vmalloc.h>
-#include <linux/highmem.h>
-#include <linux/swap.h>
-
-#include "time.h"
-#include "kmem.h"
-
-#define MAX_VMALLOCS   6
-#define MAX_SLAB_SIZE  0x20000
-
-
-void *
-kmem_alloc(size_t size, int flags)
-{
-       int     retries = 0, lflags = kmem_flags_convert(flags);
-       void    *ptr;
-
-       do {
-               if (size < MAX_SLAB_SIZE || retries > MAX_VMALLOCS)
-                       ptr = kmalloc(size, lflags);
-               else
-                       ptr = __vmalloc(size, lflags, PAGE_KERNEL);
-               if (ptr || (flags & (KM_MAYFAIL|KM_NOSLEEP)))
-                       return ptr;
-               if (!(++retries % 100))
-                       printk(KERN_ERR "possible deadlock in %s (mode:0x%x)\n",
-                                       __FUNCTION__, lflags);
-       } while (1);
-}
-
-void *
-kmem_zalloc(size_t size, int flags)
-{
-       void    *ptr;
-
-       ptr = kmem_alloc(size, flags);
-       if (ptr)
-               memset((char *)ptr, 0, (int)size);
-       return ptr;
-}
-
-void
-kmem_free(void *ptr, size_t size)
-{
-       if (((unsigned long)ptr < VMALLOC_START) ||
-           ((unsigned long)ptr >= VMALLOC_END)) {
-               kfree(ptr);
-       } else {
-               vfree(ptr);
-       }
-}
-
-void *
-kmem_realloc(void *ptr, size_t newsize, size_t oldsize, int flags)
-{
-       void    *new;
-
-       new = kmem_alloc(newsize, flags);
-       if (ptr) {
-               if (new)
-                       memcpy(new, ptr,
-                               ((oldsize < newsize) ? oldsize : newsize));
-               kmem_free(ptr, oldsize);
-       }
-       return new;
-}
-
-void *
-kmem_zone_alloc(kmem_zone_t *zone, int flags)
-{
-       int     retries = 0, lflags = kmem_flags_convert(flags);
-       void    *ptr;
-
-       do {
-               ptr = kmem_cache_alloc(zone, lflags);
-               if (ptr || (flags & (KM_MAYFAIL|KM_NOSLEEP)))
-                       return ptr;
-               if (!(++retries % 100))
-                       printk(KERN_ERR "possible deadlock in %s (mode:0x%x)\n",
-                                       __FUNCTION__, lflags);
-       } while (1);
-}
-
-void *
-kmem_zone_zalloc(kmem_zone_t *zone, int flags)
-{
-       void    *ptr;
-
-       ptr = kmem_zone_alloc(zone, flags);
-       if (ptr)
-               memset((char *)ptr, 0, kmem_cache_size(zone));
-       return ptr;
-}
diff --git a/include/asm-alpha/setup.h b/include/asm-alpha/setup.h
deleted file mode 100644 (file)
index 2e023a4..0000000
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef __ALPHA_SETUP_H
-#define __ALPHA_SETUP_H
-
-#define COMMAND_LINE_SIZE      256
-
-#endif
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-sa1100/collie.h b/include/asm-arm/arch-sa1100/collie.h
deleted file mode 100644 (file)
index c070f70..0000000
+++ /dev/null
@@ -1,150 +0,0 @@
-/*
- * linux/include/asm-arm/arch-sa1100/collie.h
- *
- * This file contains the hardware specific definitions for Assabet
- * Only include this file from SA1100-specific files.
- *
- * ChangeLog:
- *   04-06-2001 Lineo Japan, Inc.
- *   04-16-2001 SHARP Corporation
- *   07-07-2002 Chris Larson <clarson@digi.com>
- *
- */
-#ifndef __ASM_ARCH_COLLIE_H
-#define __ASM_ARCH_COLLIE_H
-
-#include <linux/config.h>
-
-#define CF_BUF_CTRL_BASE 0xF0800000
-#define        COLLIE_SCP_REG(adr) (*(volatile unsigned short*)(CF_BUF_CTRL_BASE+(adr)))
-#define        COLLIE_SCP_MCR  0x00
-#define        COLLIE_SCP_CDR  0x04
-#define        COLLIE_SCP_CSR  0x08
-#define        COLLIE_SCP_CPR  0x0C
-#define        COLLIE_SCP_CCR  0x10
-#define        COLLIE_SCP_IRR  0x14
-#define        COLLIE_SCP_IRM  0x14
-#define        COLLIE_SCP_IMR  0x18
-#define        COLLIE_SCP_ISR  0x1C
-#define        COLLIE_SCP_GPCR 0x20
-#define        COLLIE_SCP_GPWR 0x24
-#define        COLLIE_SCP_GPRR 0x28
-#define        COLLIE_SCP_REG_MCR      COLLIE_SCP_REG(COLLIE_SCP_MCR)
-#define        COLLIE_SCP_REG_CDR      COLLIE_SCP_REG(COLLIE_SCP_CDR)
-#define        COLLIE_SCP_REG_CSR      COLLIE_SCP_REG(COLLIE_SCP_CSR)
-#define        COLLIE_SCP_REG_CPR      COLLIE_SCP_REG(COLLIE_SCP_CPR)
-#define        COLLIE_SCP_REG_CCR      COLLIE_SCP_REG(COLLIE_SCP_CCR)
-#define        COLLIE_SCP_REG_IRR      COLLIE_SCP_REG(COLLIE_SCP_IRR)
-#define        COLLIE_SCP_REG_IRM      COLLIE_SCP_REG(COLLIE_SCP_IRM)
-#define        COLLIE_SCP_REG_IMR      COLLIE_SCP_REG(COLLIE_SCP_IMR)
-#define        COLLIE_SCP_REG_ISR      COLLIE_SCP_REG(COLLIE_SCP_ISR)
-#define        COLLIE_SCP_REG_GPCR     COLLIE_SCP_REG(COLLIE_SCP_GPCR)
-#define        COLLIE_SCP_REG_GPWR     COLLIE_SCP_REG(COLLIE_SCP_GPWR)
-#define        COLLIE_SCP_REG_GPRR     COLLIE_SCP_REG(COLLIE_SCP_GPRR)
-
-#define COLLIE_SCP_GPCR_PA19   ( 1 << 9 )
-#define COLLIE_SCP_GPCR_PA18   ( 1 << 8 )
-#define COLLIE_SCP_GPCR_PA17   ( 1 << 7 )
-#define COLLIE_SCP_GPCR_PA16   ( 1 << 6 )
-#define COLLIE_SCP_GPCR_PA15   ( 1 << 5 )
-#define COLLIE_SCP_GPCR_PA14   ( 1 << 4 )
-#define COLLIE_SCP_GPCR_PA13   ( 1 << 3 )
-#define COLLIE_SCP_GPCR_PA12   ( 1 << 2 )
-#define COLLIE_SCP_GPCR_PA11   ( 1 << 1 )
-
-#define COLLIE_SCP_CHARGE_ON   COLLIE_SCP_GPCR_PA11
-#define COLLIE_SCP_DIAG_BOOT1  COLLIE_SCP_GPCR_PA12
-#define COLLIE_SCP_DIAG_BOOT2  COLLIE_SCP_GPCR_PA13
-#define COLLIE_SCP_MUTE_L      COLLIE_SCP_GPCR_PA14
-#define COLLIE_SCP_MUTE_R      COLLIE_SCP_GPCR_PA15
-#define COLLIE_SCP_5VON        COLLIE_SCP_GPCR_PA16
-#define COLLIE_SCP_AMP_ON      COLLIE_SCP_GPCR_PA17
-#define COLLIE_SCP_VPEN        COLLIE_SCP_GPCR_PA18
-#define COLLIE_SCP_LB_VOL_CHG  COLLIE_SCP_GPCR_PA19
-
-#define COLLIE_SCP_IO_DIR      ( COLLIE_SCP_CHARGE_ON | COLLIE_SCP_MUTE_L | COLLIE_SCP_MUTE_R | \
-                               COLLIE_SCP_5VON | COLLIE_SCP_AMP_ON | COLLIE_SCP_VPEN | \
-                               COLLIE_SCP_LB_VOL_CHG )
-#define COLLIE_SCP_IO_OUT      ( COLLIE_SCP_MUTE_L | COLLIE_SCP_MUTE_R | COLLIE_SCP_VPEN | \
-                               COLLIE_SCP_CHARGE_ON )
-
-/* GPIOs for which the generic definition doesn't say much */
-
-#define COLLIE_GPIO_ON_KEY             GPIO_GPIO (0)
-#define COLLIE_GPIO_AC_IN              GPIO_GPIO (1)
-#define COLLIE_GPIO_CF_IRQ             GPIO_GPIO (14)
-#define COLLIE_GPIO_nREMOCON_INT       GPIO_GPIO (15)
-#define COLLIE_GPIO_UCB1x00_RESET      GPIO_GPIO (16)
-#define COLLIE_GPIO_CO                 GPIO_GPIO (20)
-#define COLLIE_GPIO_MCP_CLK            GPIO_GPIO (21)
-#define COLLIE_GPIO_CF_CD              GPIO_GPIO (22)
-#define COLLIE_GPIO_UCB1x00_IRQ                GPIO_GPIO (23)
-#define COLLIE_GPIO_WAKEUP             GPIO_GPIO (24)
-#define COLLIE_GPIO_GA_INT             GPIO_GPIO (25)
-#define COLLIE_GPIO_MAIN_BAT_LOW       GPIO_GPIO (26)
-
-/* Interrupts */
-
-#define COLLIE_IRQ_GPIO_ON_KEY         IRQ_GPIO0
-#define COLLIE_IRQ_GPIO_AC_IN          IRQ_GPIO1
-#define COLLIE_IRQ_GPIO_CF_IRQ         IRQ_GPIO14
-#define COLLIE_IRQ_GPIO_nREMOCON_INT   IRQ_GPIO15
-#define COLLIE_IRQ_GPIO_CO             IRQ_GPIO20
-#define COLLIE_IRQ_GPIO_CF_CD          IRQ_GPIO22
-#define COLLIE_IRQ_GPIO_UCB1x00_IRQ    IRQ_GPIO23
-#define COLLIE_IRQ_GPIO_WAKEUP         IRQ_GPIO24
-#define COLLIE_IRQ_GPIO_GA_INT         IRQ_GPIO25
-#define COLLIE_IRQ_GPIO_MAIN_BAT_LOW   IRQ_GPIO26
-
-#define COLLIE_LCM_IRQ_GPIO_RTS                IRQ_LOCOMO_GPIO0
-#define COLLIE_LCM_IRQ_GPIO_CTS                IRQ_LOCOMO_GPIO1
-#define COLLIE_LCM_IRQ_GPIO_DSR                IRQ_LOCOMO_GPIO2
-#define COLLIE_LCM_IRQ_GPIO_DTR                IRQ_LOCOMO_GPIO3
-#define COLLIE_LCM_IRQ_GPIO_nSD_DETECT IRQ_LOCOMO_GPIO13
-#define COLLIE_LCM_IRQ_GPIO_nSD_WP     IRQ_LOCOMO_GPIO14
-
-/*
- * Flash Memory mappings
- *
- */
-
-#define FLASH_MEM_BASE 0xe8ffc000
-#define        FLASH_DATA(adr) (*(volatile unsigned int*)(FLASH_MEM_BASE+(adr)))
-#define        FLASH_DATA_F(adr) (*(volatile float32 *)(FLASH_MEM_BASE+(adr)))
-#define FLASH_MAGIC_CHG(a,b,c,d) ( ( d << 24 ) | ( c << 16 )  | ( b << 8 ) | a )
-
-// COMADJ
-#define FLASH_COMADJ_MAJIC     FLASH_MAGIC_CHG('C','M','A','D')
-#define        FLASH_COMADJ_MAGIC_ADR  0x00
-#define        FLASH_COMADJ_DATA_ADR   0x04
-
-// TOUCH PANEL
-#define FLASH_TOUCH_MAJIC      FLASH_MAGIC_CHG('T','U','C','H')
-#define        FLASH_TOUCH_MAGIC_ADR   0x1C
-#define        FLASH_TOUCH_XP_DATA_ADR 0x20
-#define        FLASH_TOUCH_YP_DATA_ADR 0x24
-#define        FLASH_TOUCH_XD_DATA_ADR 0x28
-#define        FLASH_TOUCH_YD_DATA_ADR 0x2C
-
-// AD
-#define FLASH_AD_MAJIC FLASH_MAGIC_CHG('B','V','A','D')
-#define        FLASH_AD_MAGIC_ADR      0x30
-#define        FLASH_AD_DATA_ADR       0x34
-
-/* GPIO's on the TC35143AF (Toshiba Analog Frontend) */
-#define COLLIE_TC35143_GPIO_VERSION0    UCB_IO_0       /* GPIO0=Version                 */
-#define COLLIE_TC35143_GPIO_TBL_CHK     UCB_IO_1       /* GPIO1=TBL_CHK                 */
-#define COLLIE_TC35143_GPIO_VPEN_ON     UCB_IO_2       /* GPIO2=VPNE_ON                 */
-#define COLLIE_TC35143_GPIO_IR_ON       UCB_IO_3       /* GPIO3=IR_ON                   */
-#define COLLIE_TC35143_GPIO_AMP_ON      UCB_IO_4       /* GPIO4=AMP_ON                  */
-#define COLLIE_TC35143_GPIO_VERSION1    UCB_IO_5       /* GPIO5=Version                 */
-#define COLLIE_TC35143_GPIO_FS8KLPF     UCB_IO_5       /* GPIO5=fs 8k LPF               */
-#define COLLIE_TC35143_GPIO_BUZZER_BIAS UCB_IO_6       /* GPIO6=BUZZER BIAS             */
-#define COLLIE_TC35143_GPIO_MBAT_ON     UCB_IO_7       /* GPIO7=MBAT_ON                 */
-#define COLLIE_TC35143_GPIO_BBAT_ON     UCB_IO_8       /* GPIO8=BBAT_ON                 */
-#define COLLIE_TC35143_GPIO_TMP_ON      UCB_IO_9       /* GPIO9=TMP_ON                  */
-#define COLLIE_TC35143_GPIO_IN         ( UCB_IO_0 | UCB_IO_2 | UCB_IO_5 )
-#define COLLIE_TC35143_GPIO_OUT                ( UCB_IO_1 | UCB_IO_3 | UCB_IO_4 | UCB_IO_6 | \
-                                       UCB_IO_7 | UCB_IO_8 | UCB_IO_9 )
-
-#endif
diff --git a/include/asm-arm/hardware/locomo.h b/include/asm-arm/hardware/locomo.h
deleted file mode 100644 (file)
index 98d6da2..0000000
+++ /dev/null
@@ -1,204 +0,0 @@
-/*
- * linux/include/asm-arm/hardware/locomo.h
- *
- * This file contains the definitions for the LoCoMo G/A Chip
- *
- * (C) Copyright 2004 John Lenz
- *
- * May be copied or modified under the terms of the GNU General Public
- * License.  See linux/COPYING for more information.
- *
- * Based on sa1111.h
- */
-#ifndef _ASM_ARCH_LOCOMO
-#define _ASM_ARCH_LOCOMO
-
-#define locomo_writel(val,addr)        ({ *(volatile u16 *)(addr) = (val); })
-#define locomo_readl(addr)     (*(volatile u16 *)(addr))
-
-/* LOCOMO version */
-#define LOCOMO_VER     0x00
-
-/* Pin status */
-#define LOCOMO_ST      0x04
-
-/* Pin status */
-#define LOCOMO_C32K    0x08
-
-/* Interrupt controller */
-#define LOCOMO_ICR     0x0C
-
-/* MCS decoder for boot selecting */
-#define LOCOMO_MCSX0   0x10
-#define LOCOMO_MCSX1   0x14
-#define LOCOMO_MCSX2   0x18
-#define LOCOMO_MCSX3   0x1c
-
-/* Touch panel controller */
-#define LOCOMO_ASD     0x20    /* AD start delay */
-#define LOCOMO_HSD     0x28    /* HSYS delay */
-#define LOCOMO_HSC     0x2c    /* HSYS period */
-#define LOCOMO_TADC    0x30    /* tablet ADC clock */
-
-/* TFT signal */
-#define LOCOMO_TC      0x38    /* TFT control signal */
-#define LOCOMO_CPSD    0x3c    /* CPS delay */
-
-/* Key controller */
-#define LOCOMO_KIB     0x40    /* KIB level */
-#define LOCOMO_KSC     0x44    /* KSTRB control */
-#define LOCOMO_KCMD    0x48    /* KSTRB command */
-#define LOCOMO_KIC     0x4c    /* Key interrupt */
-
-/* Audio clock */
-#define LOCOMO_ACC     0x54
-
-/* SPI interface */
-#define LOCOMO_SPIMD   0x60    /* SPI mode setting */
-#define LOCOMO_SPICT   0x64    /* SPI mode control */
-#define LOCOMO_SPIST   0x68    /* SPI status */
-#define LOCOMO_SPIIS   0x70    /* SPI interrupt status */
-#define LOCOMO_SPIWE   0x74    /* SPI interrupt status write enable */
-#define LOCOMO_SPIIE   0x78    /* SPI interrupt enable */
-#define LOCOMO_SPIIR   0x7c    /* SPI interrupt request */
-#define LOCOMO_SPITD   0x80    /* SPI transfer data write */
-#define LOCOMO_SPIRD   0x84    /* SPI receive data read */
-#define LOCOMO_SPITS   0x88    /* SPI transfer data shift */
-#define LOCOMO_SPIRS   0x8C    /* SPI receive data shift */
-
-#define        LOCOMO_SPI_TEND (1 << 3)        /* Transfer end bit */
-#define        LOCOMO_SPI_OVRN (1 << 2)        /* Over Run bit */
-#define        LOCOMO_SPI_RFW  (1 << 1)        /* write buffer bit */
-#define        LOCOMO_SPI_RFR  (1)             /* read buffer bit */
-
-/* GPIO */
-#define LOCOMO_GPD     0x90    /* GPIO direction */
-#define LOCOMO_GPE     0x94    /* GPIO input enable */
-#define LOCOMO_GPL     0x98    /* GPIO level */
-#define LOCOMO_GPO     0x9c    /* GPIO out data setteing */
-#define LOCOMO_GRIE    0xa0    /* GPIO rise detection */
-#define LOCOMO_GFIE    0xa4    /* GPIO fall detection */
-#define LOCOMO_GIS     0xa8    /* GPIO edge detection status */
-#define LOCOMO_GWE     0xac    /* GPIO status write enable */
-#define LOCOMO_GIE     0xb0    /* GPIO interrupt enable */
-#define LOCOMO_GIR     0xb4    /* GPIO interrupt request */
-
-#define LOCOMO_GPIO0   (1<<0)
-#define LOCOMO_GPIO1   (1<<1)
-#define LOCOMO_GPIO2   (1<<2)
-#define LOCOMO_GPIO3   (1<<3)
-#define LOCOMO_GPIO4   (1<<4)
-#define LOCOMO_GPIO5   (1<<5)
-#define LOCOMO_GPIO6   (1<<6)
-#define LOCOMO_GPIO7   (1<<7)
-#define LOCOMO_GPIO8   (1<<8)
-#define LOCOMO_GPIO9   (1<<9)
-#define LOCOMO_GPIO10  (1<<10)
-#define LOCOMO_GPIO11  (1<<11)
-#define LOCOMO_GPIO12  (1<<12)
-#define LOCOMO_GPIO13  (1<<13)
-#define LOCOMO_GPIO14  (1<<14)
-#define LOCOMO_GPIO15  (1<<15)
-
-/* Front light adjustment controller */
-#define LOCOMO_ALS     0xc8    /* Adjust light cycle */
-#define LOCOMO_ALD     0xcc    /* Adjust light duty */
-
-/* PCM audio interface */
-#define LOCOMO_PAIF    0xd0
-
-/* Long time timer */
-#define LOCOMO_LTC     0xd8    /* LTC interrupt setting */
-#define LOCOMO_LTINT   0xdc    /* LTC interrupt */
-
-/* DAC control signal for LCD (COMADJ ) */
-#define LOCOMO_DAC     0xe0
-
-/* DAC control */
-#define        LOCOMO_DAC_SCLOEB       0x08    /* SCL pin output data       */
-#define        LOCOMO_DAC_TEST         0x04    /* Test bit                  */
-#define        LOCOMO_DAC_SDA          0x02    /* SDA pin level (read-only) */
-#define        LOCOMO_DAC_SDAOEB       0x01    /* SDA pin output data       */
-
-/* LED controller */
-#define LOCOMO_LPT0            0xe8    /* LEDPWM0 timer */
-#define LOCOMO_LPT1            0xec    /* LEDPWM1 timer */
-
-#define LOCOMO_LPT_TOFH                0x80                    /* */
-#define LOCOMO_LPT_TOFL                0x08                    /* */
-#define LOCOMO_LPT_TOH(TOH)    ((TOH & 0x7) << 4)      /* */
-#define LOCOMO_LPT_TOL(TOL)    ((TOL & 0x7))           /* */
-
-/* Audio clock */
-#define        LOCOMO_ACC_XON          0x80    /*  */
-#define        LOCOMO_ACC_XEN          0x40    /*  */
-#define        LOCOMO_ACC_XSEL0        0x00    /*  */
-#define        LOCOMO_ACC_XSEL1        0x20    /*  */
-#define        LOCOMO_ACC_MCLKEN       0x10    /*  */
-#define        LOCOMO_ACC_64FSEN       0x08    /*  */
-#define        LOCOMO_ACC_CLKSEL000    0x00    /* mclk  2 */
-#define        LOCOMO_ACC_CLKSEL001    0x01    /* mclk  3 */
-#define        LOCOMO_ACC_CLKSEL010    0x02    /* mclk  4 */
-#define        LOCOMO_ACC_CLKSEL011    0x03    /* mclk  6 */
-#define        LOCOMO_ACC_CLKSEL100    0x04    /* mclk  8 */
-#define        LOCOMO_ACC_CLKSEL101    0x05    /* mclk 12 */
-
-/* PCM audio interface */
-#define        LOCOMO_PAIF_SCINV       0x20    /*  */
-#define        LOCOMO_PAIF_SCEN        0x10    /*  */
-#define        LOCOMO_PAIF_LRCRST      0x08    /*  */
-#define        LOCOMO_PAIF_LRCEVE      0x04    /*  */
-#define        LOCOMO_PAIF_LRCINV      0x02    /*  */
-#define        LOCOMO_PAIF_LRCEN       0x01    /*  */
-
-/* GPIO */
-#define        LOCOMO_GPIO(Nb)         (0x01 << (Nb))  /* LoCoMo GPIO [0...15] */
-#define LOCOMO_GPIO_RTS                LOCOMO_GPIO(0)  /* LoCoMo GPIO  [0] */
-#define LOCOMO_GPIO_CTS                LOCOMO_GPIO(1)  /* LoCoMo GPIO  [1] */
-#define LOCOMO_GPIO_DSR                LOCOMO_GPIO(2)  /* LoCoMo GPIO  [2] */
-#define LOCOMO_GPIO_DTR                LOCOMO_GPIO(3)  /* LoCoMo GPIO  [3] */
-#define LOCOMO_GPIO_LCD_VSHA_ON        LOCOMO_GPIO(4)  /* LoCoMo GPIO  [4] */
-#define LOCOMO_GPIO_LCD_VSHD_ON        LOCOMO_GPIO(5)  /* LoCoMo GPIO  [5] */
-#define LOCOMO_GPIO_LCD_VEE_ON LOCOMO_GPIO(6)  /* LoCoMo GPIO  [6] */
-#define LOCOMO_GPIO_LCD_MOD    LOCOMO_GPIO(7)  /* LoCoMo GPIO  [7] */
-#define LOCOMO_GPIO_DAC_ON     LOCOMO_GPIO(8)  /* LoCoMo GPIO  [8] */
-#define LOCOMO_GPIO_FL_VR      LOCOMO_GPIO(9)  /* LoCoMo GPIO  [9] */
-#define LOCOMO_GPIO_DAC_SDATA  LOCOMO_GPIO(10) /* LoCoMo GPIO [10] */
-#define LOCOMO_GPIO_DAC_SCK    LOCOMO_GPIO(11) /* LoCoMo GPIO [11] */
-#define LOCOMO_GPIO_DAC_SLOAD  LOCOMO_GPIO(12) /* LoCoMo GPIO [12] */
-
-extern struct bus_type locomo_bus_type;
-
-struct locomo_dev {
-       struct device   dev;
-       unsigned int    devid;
-       struct resource res;
-       void            *mapbase;
-       unsigned int    irq[1];
-       u64             dma_mask;
-};
-
-#define LOCOMO_DEV(_d) container_of((_d), struct locomo_dev, dev)
-
-#define locomo_get_drvdata(d)  dev_get_drvdata(&(d)->dev)
-#define locomo_set_drvdata(d,p)        dev_set_drvdata(&(d)->dev, p)
-
-struct locomo_driver {
-       struct device_driver    drv;
-       unsigned int            devid;
-       int (*probe)(struct locomo_dev *);
-       int (*remove)(struct locomo_dev *);
-       int (*suspend)(struct locomo_dev *, u32);
-       int (*resume)(struct locomo_dev *);
-};
-
-#define LOCOMO_DRV(_d) container_of((_d), struct locomo_driver, drv)
-
-#define LOCOMO_DRIVER_NAME(_ldev) ((_ldev)->dev.driver->name)
-
-void locomo_lcd_power(struct locomo_dev *, int, unsigned int);
-
-int locomo_driver_register(struct locomo_driver *);
-void locomo_driver_unregister(struct locomo_driver *);
-
-#endif
diff --git a/include/asm-arm/mach/time.h b/include/asm-arm/mach/time.h
deleted file mode 100644 (file)
index edb6fcc..0000000
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * linux/include/asm-arm/mach/time.h
- *
- * Copyright (C) 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 version 2 as
- * published by the Free Software Foundation.
- */
-#ifndef __ASM_ARM_MACH_TIME_H
-#define __ASM_ARM_MACH_TIME_H
-
-extern void (*init_arch_time)(void);
-
-extern int (*set_rtc)(void);
-extern unsigned long(*gettimeoffset)(void);
-
-void timer_tick(struct pt_regs *);
-
-#endif
diff --git a/include/asm-generic/netdump.h b/include/asm-generic/netdump.h
deleted file mode 100644 (file)
index 5cf447f..0000000
+++ /dev/null
@@ -1,61 +0,0 @@
-#ifndef _ASM_GENERIC_NETDUMP_H_
-#define _ASM_GENERIC_NETDUMP_H_
-
-/*
- * linux/include/asm-generic/netdump.h
- *
- * Copyright (c) 2003, 2004 Red Hat, Inc. 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, 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.
- */
-
-#ifdef __KERNEL__
-
-#warning netdump is not supported on this platform
-const static int platform_supports_netdump = 0;
-
-static inline int page_is_ram(unsigned long x) { return 0; }
-
-#define platform_timestamp(x) do { (x) = 0; } while (0)  
-
-#define platform_fix_regs() do { } while (0)
-#define platform_init_stack(stackptr) do { } while (0)
-#define platform_cleanup_stack(stackptr) do { } while (0)
-#define platform_start_netdump(stackptr,regs) do { } while (0)
-#define platform_max_pfn() do { int ret = 0; } while (0)
-
-#undef ELF_CORE_COPY_REGS
-#define ELF_CORE_COPY_REGS(x, y) do { struct pt_regs *z; z = (y); } while (0)
-
-#define show_mem() do {} while (0)
-
-#define show_state() do {} while (0)
-
-#define show_regs(x) do { struct pt_regs *z; z = (x); } while (0)
-
-#undef ZERO_PAGE
-static inline struct page *ZERO_PAGE(void *x) { return NULL; }
-
-#undef KM_NETDUMP
-#define KM_NETDUMP 0
-
-#undef kmap_atomic
-#undef kunmap_atomic
-static inline char *kmap_atomic(void *page, int idx)  { return NULL; }
-#define kunmap_atomic(addr, idx)  do { } while (0)
-
-#endif /* __KERNEL__ */
-
-#endif /* _ASM_GENERIC_NETDUMP_H */
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/netdump.h b/include/asm-i386/netdump.h
deleted file mode 100644 (file)
index 988c276..0000000
+++ /dev/null
@@ -1,100 +0,0 @@
-#ifndef _ASM_I386_NETDUMP_H
-#define _ASM_I386_NETDUMP_H
-
-/*
- * linux/include/asm-i386/netdump.h
- *
- * Copyright (c) 2003, 2004 Red Hat, Inc. 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, 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.
- *
- */
-
-#ifdef __KERNEL__
-
-#include <asm/irq.h>
-
-extern int page_is_ram (unsigned long);
-const static int platform_supports_netdump = 1;
-extern union irq_ctx *netdump_irq_ctx;
-
-#define platform_timestamp(x) rdtscll(x)
-
-#define platform_fix_regs()                                            \
-{                                                                      \
-       unsigned long esp;                                              \
-       unsigned short ss;                                              \
-       esp = (unsigned long) ((char *)regs + sizeof (struct pt_regs)); \
-       ss = __KERNEL_DS;                                               \
-       if (regs->xcs & 3) {                                            \
-               esp = regs->esp;                                                \
-               ss = regs->xss & 0xffff;                                        \
-       }                                                               \
-       myregs = *regs;                                                 \
-       myregs.esp = esp;                                               \
-       myregs.xss = (myregs.xss & 0xffff0000) | ss;                    \
-};
-
-static inline void platform_init_stack(void **stackptr)
-{
-       *stackptr = (void *)kmalloc(sizeof(union irq_ctx), GFP_KERNEL);
-       if (*stackptr)
-               memset(*stackptr, 0, sizeof(union irq_ctx));
-       else
-               printk(KERN_WARNING
-                      "netdump: unable to allocate separate stack\n");
-}
-
-static inline void platform_start_netdump(void *stackptr, struct pt_regs *regs)
-{
-       u32 *dsp;
-       union irq_ctx * curctx;
-       union irq_ctx * dumpctx;
-
-       if (!stackptr)
-               netpoll_netdump(regs);
-       else {
-               curctx = (union irq_ctx *) current_thread_info();
-               dumpctx = (union irq_ctx *) stackptr;
-
-               /* build the stack frame on the IRQ stack */
-               dsp = (u32*) ((char*)dumpctx + sizeof(*dumpctx));
-               dumpctx->tinfo.task = curctx->tinfo.task;
-               dumpctx->tinfo.real_stack = curctx->tinfo.real_stack;
-               dumpctx->tinfo.virtual_stack = curctx->tinfo.virtual_stack;
-               dumpctx->tinfo.previous_esp = current_stack_pointer();
-
-               *--dsp = (u32) regs;
-
-               asm volatile(
-                       "       xchgl   %%ebx,%%esp     \n"
-                       "       call    netpoll_netdump \n"
-                       "       xchgl   %%ebx,%%esp     \n"
-                       : : "b"(dsp) :  "memory", "cc", "edx", "ecx"
-               );
-       }
-}
-
-#define platform_cleanup_stack(stackptr)       \
-do {                                           \
-       if (stackptr)                           \
-               kfree(stackptr);                \
-} while (0)
-
-#define platform_max_pfn() (num_physpages)
-
-#endif /* __KERNEL__ */
-
-#endif /* _ASM_I386_NETDUMP_H */
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/pgtable-2level-defs.h b/include/asm-i386/pgtable-2level-defs.h
deleted file mode 100644 (file)
index 2a16f7a..0000000
+++ /dev/null
@@ -1,20 +0,0 @@
-#ifndef _I386_PGTABLE_2LEVEL_DEFS_H
-#define _I386_PGTABLE_2LEVEL_DEFS_H
-
-/*
- * traditional i386 two-level paging structure:
- */
-
-#define PGDIR_SHIFT    22
-#define PTRS_PER_PGD   1024
-
-/*
- * the i386 is two-level, so we don't really have any
- * PMD directory physically.
- */
-#define PMD_SHIFT      22
-#define PTRS_PER_PMD   1
-
-#define PTRS_PER_PTE   1024
-
-#endif /* _I386_PGTABLE_2LEVEL_DEFS_H */
diff --git a/include/asm-i386/pgtable-3level-defs.h b/include/asm-i386/pgtable-3level-defs.h
deleted file mode 100644 (file)
index eb3a1ea..0000000
+++ /dev/null
@@ -1,22 +0,0 @@
-#ifndef _I386_PGTABLE_3LEVEL_DEFS_H
-#define _I386_PGTABLE_3LEVEL_DEFS_H
-
-/*
- * PGDIR_SHIFT determines what a top-level page table entry can map
- */
-#define PGDIR_SHIFT    30
-#define PTRS_PER_PGD   4
-
-/*
- * PMD_SHIFT determines the size of the area a middle-level
- * page table can map
- */
-#define PMD_SHIFT      21
-#define PTRS_PER_PMD   512
-
-/*
- * entries per page directory level
- */
-#define PTRS_PER_PTE   512
-
-#endif /* _I386_PGTABLE_3LEVEL_DEFS_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-ia64/netdump.h b/include/asm-ia64/netdump.h
deleted file mode 100644 (file)
index 49f3fbd..0000000
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef _ASM_IA64_NETDUMP_H_
-#define _ASM_IA64_NETDUMP_H_
-
-#include <asm-generic/netdump.h>
-
-#endif /* _ASM_IA64_NETDUMP_H_ */
diff --git a/include/asm-ia64/setup.h b/include/asm-ia64/setup.h
deleted file mode 100644 (file)
index ea29b57..0000000
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef __IA64_SETUP_H
-#define __IA64_SETUP_H
-
-#define COMMAND_LINE_SIZE      512
-
-#endif
diff --git a/include/asm-mips/gt64240.h b/include/asm-mips/gt64240.h
deleted file mode 100644 (file)
index 8f9bd34..0000000
+++ /dev/null
@@ -1,1235 +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 - Galileo technology.
- * Copyright (C) 2004 by Ralf Baechle
- */
-#ifndef __ASM_MIPS_MV64240_H
-#define __ASM_MIPS_MV64240_H
-
-#include <asm/addrspace.h>
-#include <asm/marvell.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
-
-#if 0 /* Disabled because PCI_* namespace belongs to PCI subsystem ... */
-
-/*
- * 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
-#endif
-
-/*
- * 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 /* __ASM_MIPS_MV64240_H */
diff --git a/include/asm-mips/mach-yosemite/cpu-feature-overrides.h b/include/asm-mips/mach-yosemite/cpu-feature-overrides.h
deleted file mode 100644 (file)
index 1de5c32..0000000
+++ /dev/null
@@ -1,38 +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) 2003, 2004 Ralf Baechle
- */
-#ifndef __ASM_MACH_YOSEMITE_CPU_FEATURE_OVERRIDES_H
-#define __ASM_MACH_YOSEMITE_CPU_FEATURE_OVERRIDES_H
-
-/*
- * Momentum Jaguar ATX always has the RM9000 processor.
- */
-#define cpu_has_watch          1
-#define cpu_has_mips16         0
-#define cpu_has_divec          0
-#define cpu_has_vce            0
-#define cpu_has_cache_cdex_p   0
-#define cpu_has_cache_cdex_s   0
-#define cpu_has_prefetch       1
-#define cpu_has_mcheck         0
-#define cpu_has_ejtag          0
-
-#define cpu_has_llsc           1
-#define cpu_has_vtag_icache    0
-#define cpu_has_dc_aliases     0
-#define cpu_has_ic_fills_f_dc  0
-
-#define cpu_has_nofpuex                0
-#define cpu_has_64bits         1
-
-#define cpu_has_subset_pcaches 0
-
-#define cpu_dcache_line_size() 32
-#define cpu_icache_line_size() 32
-#define cpu_scache_line_size() 32
-
-#endif /* __ASM_MACH_YOSEMITE_CPU_FEATURE_OVERRIDES_H */
diff --git a/include/asm-mips/marvell.h b/include/asm-mips/marvell.h
deleted file mode 100644 (file)
index 2e3bc67..0000000
+++ /dev/null
@@ -1,57 +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) 2004 by Ralf Baechle
- */
-#ifndef __ASM_MIPS_MARVELL_H
-#define __ASM_MIPS_MARVELL_H
-
-#include <linux/pci.h>
-
-#include <asm/byteorder.h>
-#include <asm/pci_channel.h>
-
-extern unsigned long marvell_base;
-
-/*
- * Because of an error/peculiarity in the Galileo chip, we need to swap the
- * bytes when running bigendian.
- */
-#define __MV_READ(ofs)                                                 \
-       (*(volatile u32 *)(marvell_base+(ofs)))
-#define __MV_WRITE(ofs, data)                                          \
-       do { *(volatile u32 *)(marvell_base+(ofs)) = (data); } while (0)
-
-#define MV_READ(ofs)           le32_to_cpu(__MV_READ(ofs))
-#define MV_WRITE(ofs, data)    __MV_WRITE(ofs, cpu_to_le32(data))
-
-#define MV_READ_16(ofs)                                                        \
-        le16_to_cpu(*(volatile u16 *)(marvell_base+(ofs)))
-#define MV_WRITE_16(ofs, data)  \
-        *(volatile u16 *)(marvell_base+(ofs)) = cpu_to_le16(data)
-
-#define MV_READ_8(ofs)                                                 \
-       *(volatile u8 *)(marvell_base+(ofs))
-#define MV_WRITE_8(ofs, data)                                          \
-       *(volatile u8 *)(marvell_base+(ofs)) = data
-
-#define MV_SET_REG_BITS(ofs, bits)                                     \
-       (*((volatile u32 *)(marvell_base + (ofs)))) |= ((u32)cpu_to_le32(bits))
-#define MV_RESET_REG_BITS(ofs, bits)                                   \
-       (*((volatile u32 *)(marvell_base + (ofs)))) &= ~((u32)cpu_to_le32(bits))
-
-extern struct pci_ops mv_pci_ops;
-
-struct mv_pci_controller {
-       struct pci_controller   pcic;
-
-       /*
-        * GT-64240/MV-64340 specific, per host bus information
-        */
-       unsigned long   config_addr;
-       unsigned long   config_vreg;
-};
-
-#endif /* __ASM_MIPS_MARVELL_H */
diff --git a/include/asm-mips/setup.h b/include/asm-mips/setup.h
deleted file mode 100644 (file)
index 737fa4a..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-#ifdef __KERNEL__
-#ifndef _MIPS_SETUP_H
-#define _MIPS_SETUP_H
-
-#define COMMAND_LINE_SIZE      256
-
-#endif /* __SETUP_H */
-#endif /* __KERNEL__ */
diff --git a/include/asm-mips/vr41xx/tb0219.h b/include/asm-mips/vr41xx/tb0219.h
deleted file mode 100644 (file)
index 273c639..0000000
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- *  tb0219.h, Include file for TANBAC TB0219.
- *
- *  Copyright (C) 2002-2004  Yoichi Yuasa <yuasa@hh.iij4u.or.jp>
- *
- *  Modified for TANBAC TB0219:
- *  Copyright (C) 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.
- *
- *  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 __TANBAC_TB0219_H
-#define __TANBAC_TB0219_H
-
-#include <asm/vr41xx/vr41xx.h>
-
-/*
- * 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)
-
-#endif /* __TANBAC_TB0219_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/cpm2.h b/include/asm-ppc/cpm2.h
deleted file mode 100644 (file)
index dc899d3..0000000
+++ /dev/null
@@ -1,1041 +0,0 @@
-/*
- * Communication Processor Module v2.
- *
- * 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 CPM2 internal
- * memory map.  See immap_cpm2.h for details.
- */
-#ifdef __KERNEL__
-#ifndef __CPM2__
-#define __CPM2__
-
-#include <asm/immap_cpm2.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 CPM_CR_START_IDMA      ((ushort)0x0009)
-#define CPM_CR_STOP_IDMA       ((ushort)0x000b)
-
-#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_DP_NOSPACE         ((uint)0x7fffffff)
-#ifdef CONFIG_8272
-#define CPM_DATAONLY_SIZE      ((uint)(8 * 1024) - CPM_DATAONLY_BASE)
-#define CPM_FCC_SPECIAL_BASE   ((uint)0x00009000)
-#else
-#define CPM_DATAONLY_SIZE      ((uint)(16 * 1024) - CPM_DATAONLY_BASE)
-#define CPM_FCC_SPECIAL_BASE   ((uint)0x0000b000)
-#endif
-
-/* 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         cpm_cpm2_t      *cpmp;   /* Pointer to comm processor */
-extern void *cpm2_dpalloc(uint size, uint align);
-extern int cpm2_dpfree(void *addr);
-extern void *cpm2_dpalloc_fixed(void *addr, uint size, uint allign);
-extern void cpm2_dpdump(void);
-extern unsigned int cpm2_dpram_offset(void *addr);
-extern void *cpm2_dpram_addr(int offset);
-extern void cpm2_setbrg(uint brg, uint rate);
-extern void cpm2_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 PSMR when used as a UART.
-*/
-#define SCU_PSMR_FLC           ((ushort)0x8000)
-#define SCU_PSMR_SL            ((ushort)0x4000)
-#define SCU_PSMR_CL            ((ushort)0x3000)
-#define SCU_PSMR_UM            ((ushort)0x0c00)
-#define SCU_PSMR_FRZ           ((ushort)0x0200)
-#define SCU_PSMR_RZS           ((ushort)0x0100)
-#define SCU_PSMR_SYN           ((ushort)0x0080)
-#define SCU_PSMR_DRT           ((ushort)0x0040)
-#define SCU_PSMR_PEN           ((ushort)0x0010)
-#define SCU_PSMR_RPM           ((ushort)0x000c)
-#define SCU_PSMR_REVP          ((ushort)0x0008)
-#define SCU_PSMR_TPM           ((ushort)0x0003)
-#define SCU_PSMR_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_ibdstart;   /* 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;
-
-/* SPI parameter RAM.
-*/
-typedef struct spi {
-       ushort  spi_rbase;      /* Rx Buffer descriptor base address */
-       ushort  spi_tbase;      /* Tx Buffer descriptor base address */
-       u_char  spi_rfcr;       /* Rx function code */
-       u_char  spi_tfcr;       /* Tx function code */
-       ushort  spi_mrblr;      /* Max receive buffer length */
-       uint    spi_rstate;     /* Internal */
-       uint    spi_rdp;        /* Internal */
-       ushort  spi_rbptr;      /* Internal */
-       ushort  spi_rbc;        /* Internal */
-       uint    spi_rxtmp;      /* Internal */
-       uint    spi_tstate;     /* Internal */
-       uint    spi_tdp;        /* Internal */
-       ushort  spi_tbptr;      /* Internal */
-       ushort  spi_tbc;        /* Internal */
-       uint    spi_txtmp;      /* Internal */
-       uint    spi_res;        /* Tx temp. */
-       uint    spi_res1[4];    /* SDMA temp. */
-} spi_t;
-
-/* SPI Mode register.
-*/
-#define SPMODE_LOOP    ((ushort)0x4000)        /* Loopback */
-#define SPMODE_CI      ((ushort)0x2000)        /* Clock Invert */
-#define SPMODE_CP      ((ushort)0x1000)        /* Clock Phase */
-#define SPMODE_DIV16   ((ushort)0x0800)        /* BRG/16 mode */
-#define SPMODE_REV     ((ushort)0x0400)        /* Reversed Data */
-#define SPMODE_MSTR    ((ushort)0x0200)        /* SPI Master */
-#define SPMODE_EN      ((ushort)0x0100)        /* Enable */
-#define SPMODE_LENMSK  ((ushort)0x00f0)        /* character length */
-#define SPMODE_PMMSK   ((ushort)0x000f)        /* prescale modulus */
-
-#define SPMODE_LEN(x)  ((((x)-1)&0xF)<<4)
-#define SPMODE_PM(x)   ((x) &0xF)
-
-#define SPI_EB         ((u_char)0x10)          /* big endian byte order */
-
-#define BD_IIC_START           ((ushort)0x0400)
-
-/* IDMA parameter RAM
-*/
-typedef struct idma {
-       ushort ibase;           /* IDMA buffer descriptor table base address */
-       ushort dcm;             /* DMA channel mode */
-       ushort ibdptr;          /* IDMA current buffer descriptor pointer */
-       ushort dpr_buf;         /* IDMA transfer buffer base address */
-       ushort buf_inv;         /* internal buffer inventory */
-       ushort ss_max;          /* steady-state maximum transfer size */
-       ushort dpr_in_ptr;      /* write pointer inside the internal buffer */
-       ushort sts;             /* source transfer size */
-       ushort dpr_out_ptr;     /* read pointer inside the internal buffer */
-       ushort seob;            /* source end of burst */
-       ushort deob;            /* destination end of burst */
-       ushort dts;             /* destination transfer size */
-       ushort ret_add;         /* return address when working in ERM=1 mode */
-       ushort res0;            /* reserved */
-       uint   bd_cnt;          /* internal byte count */
-       uint   s_ptr;           /* source internal data pointer */
-       uint   d_ptr;           /* destination internal data pointer */
-       uint   istate;          /* internal state */
-       u_char res1[20];        /* pad to 64-byte length */
-} idma_t;
-
-/* DMA channel mode bit fields
-*/
-#define IDMA_DCM_FB            ((ushort)0x8000) /* fly-by mode */
-#define IDMA_DCM_LP            ((ushort)0x4000) /* low priority */
-#define IDMA_DCM_TC2           ((ushort)0x0400) /* value driven on TC[2] */
-#define IDMA_DCM_DMA_WRAP_MASK ((ushort)0x01c0) /* mask for DMA wrap */
-#define IDMA_DCM_DMA_WRAP_64   ((ushort)0x0000) /* 64-byte DMA xfer buffer */
-#define IDMA_DCM_DMA_WRAP_128  ((ushort)0x0040) /* 128-byte DMA xfer buffer */
-#define IDMA_DCM_DMA_WRAP_256  ((ushort)0x0080) /* 256-byte DMA xfer buffer */
-#define IDMA_DCM_DMA_WRAP_512  ((ushort)0x00c0) /* 512-byte DMA xfer buffer */
-#define IDMA_DCM_DMA_WRAP_1024 ((ushort)0x0100) /* 1024-byte DMA xfer buffer */
-#define IDMA_DCM_DMA_WRAP_2048 ((ushort)0x0140) /* 2048-byte DMA xfer buffer */
-#define IDMA_DCM_SINC          ((ushort)0x0020) /* source inc addr */
-#define IDMA_DCM_DINC          ((ushort)0x0010) /* destination inc addr */
-#define IDMA_DCM_ERM           ((ushort)0x0008) /* external request mode */
-#define IDMA_DCM_DT            ((ushort)0x0004) /* DONE treatment */
-#define IDMA_DCM_SD_MASK       ((ushort)0x0003) /* mask for SD bit field */
-#define IDMA_DCM_SD_MEM2MEM    ((ushort)0x0000) /* memory-to-memory xfer */
-#define IDMA_DCM_SD_PER2MEM    ((ushort)0x0002) /* peripheral-to-memory xfer */
-#define IDMA_DCM_SD_MEM2PER    ((ushort)0x0001) /* memory-to-peripheral xfer */
-
-/* IDMA Buffer Descriptors
-*/
-typedef struct idma_bd {
-       uint flags;
-       uint len;       /* data length */
-       uint src;       /* source data buffer pointer */
-       uint dst;       /* destination data buffer pointer */
-} idma_bd_t;
-
-/* IDMA buffer descriptor flag bit fields
-*/
-#define IDMA_BD_V      ((uint)0x80000000)      /* valid */
-#define IDMA_BD_W      ((uint)0x20000000)      /* wrap */
-#define IDMA_BD_I      ((uint)0x10000000)      /* interrupt */
-#define IDMA_BD_L      ((uint)0x08000000)      /* last */
-#define IDMA_BD_CM     ((uint)0x02000000)      /* continuous mode */
-#define IDMA_BD_SDN    ((uint)0x00400000)      /* source done */
-#define IDMA_BD_DDN    ((uint)0x00200000)      /* destination done */
-#define IDMA_BD_DGBL   ((uint)0x00100000)      /* destination global */
-#define IDMA_BD_DBO_LE ((uint)0x00040000)      /* little-end dest byte order */
-#define IDMA_BD_DBO_BE ((uint)0x00080000)      /* big-end dest byte order */
-#define IDMA_BD_DDTB   ((uint)0x00010000)      /* destination data bus */
-#define IDMA_BD_SGBL   ((uint)0x00002000)      /* source global */
-#define IDMA_BD_SBO_LE ((uint)0x00000800)      /* little-end src byte order */
-#define IDMA_BD_SBO_BE ((uint)0x00001000)      /* big-end src byte order */
-#define IDMA_BD_SDTB   ((uint)0x00000200)      /* source data bus */
-
-/* per-channel IDMA registers
-*/
-typedef struct im_idma {
-       u_char idsr;                    /* IDMAn event status register */
-       u_char res0[3];
-       u_char idmr;                    /* IDMAn event mask register */
-       u_char res1[3];
-} im_idma_t;
-
-/* IDMA event register bit fields
-*/
-#define IDMA_EVENT_SC  ((unsigned char)0x08)   /* stop completed */
-#define IDMA_EVENT_OB  ((unsigned char)0x04)   /* out of buffers */
-#define IDMA_EVENT_EDN ((unsigned char)0x02)   /* external DONE asserted */
-#define IDMA_EVENT_BC  ((unsigned char)0x01)   /* buffer descriptor complete */
-
-/* RISC Controller Configuration Register (RCCR) bit fields
-*/
-#define RCCR_TIME      ((uint)0x80000000) /* timer enable */
-#define RCCR_TIMEP_MASK        ((uint)0x3f000000) /* mask for timer period bit field */
-#define RCCR_DR0M      ((uint)0x00800000) /* IDMA0 request mode */
-#define RCCR_DR1M      ((uint)0x00400000) /* IDMA1 request mode */
-#define RCCR_DR2M      ((uint)0x00000080) /* IDMA2 request mode */
-#define RCCR_DR3M      ((uint)0x00000040) /* IDMA3 request mode */
-#define RCCR_DR0QP_MASK        ((uint)0x00300000) /* mask for IDMA0 req priority */
-#define RCCR_DR0QP_HIGH ((uint)0x00000000) /* IDMA0 has high req priority */
-#define RCCR_DR0QP_MED ((uint)0x00100000) /* IDMA0 has medium req priority */
-#define RCCR_DR0QP_LOW ((uint)0x00200000) /* IDMA0 has low req priority */
-#define RCCR_DR1QP_MASK        ((uint)0x00030000) /* mask for IDMA1 req priority */
-#define RCCR_DR1QP_HIGH ((uint)0x00000000) /* IDMA1 has high req priority */
-#define RCCR_DR1QP_MED ((uint)0x00010000) /* IDMA1 has medium req priority */
-#define RCCR_DR1QP_LOW ((uint)0x00020000) /* IDMA1 has low req priority */
-#define RCCR_DR2QP_MASK        ((uint)0x00000030) /* mask for IDMA2 req priority */
-#define RCCR_DR2QP_HIGH ((uint)0x00000000) /* IDMA2 has high req priority */
-#define RCCR_DR2QP_MED ((uint)0x00000010) /* IDMA2 has medium req priority */
-#define RCCR_DR2QP_LOW ((uint)0x00000020) /* IDMA2 has low req priority */
-#define RCCR_DR3QP_MASK        ((uint)0x00000003) /* mask for IDMA3 req priority */
-#define RCCR_DR3QP_HIGH ((uint)0x00000000) /* IDMA3 has high req priority */
-#define RCCR_DR3QP_MED ((uint)0x00000001) /* IDMA3 has medium req priority */
-#define RCCR_DR3QP_LOW ((uint)0x00000002) /* IDMA3 has low req priority */
-#define RCCR_EIE       ((uint)0x00080000) /* external interrupt enable */
-#define RCCR_SCD       ((uint)0x00040000) /* scheduler configuration */
-#define RCCR_ERAM_MASK ((uint)0x0000e000) /* mask for enable RAM microcode */
-#define RCCR_ERAM_0KB  ((uint)0x00000000) /* use 0KB of dpram for microcode */
-#define RCCR_ERAM_2KB  ((uint)0x00002000) /* use 2KB of dpram for microcode */
-#define RCCR_ERAM_4KB  ((uint)0x00004000) /* use 4KB of dpram for microcode */
-#define RCCR_ERAM_6KB  ((uint)0x00006000) /* use 6KB of dpram for microcode */
-#define RCCR_ERAM_8KB  ((uint)0x00008000) /* use 8KB of dpram for microcode */
-#define RCCR_ERAM_10KB ((uint)0x0000a000) /* use 10KB of dpram for microcode */
-#define RCCR_ERAM_12KB ((uint)0x0000c000) /* use 12KB of dpram for microcode */
-#define RCCR_EDM0      ((uint)0x00000800) /* DREQ0 edge detect mode */
-#define RCCR_EDM1      ((uint)0x00000400) /* DREQ1 edge detect mode */
-#define RCCR_EDM2      ((uint)0x00000200) /* DREQ2 edge detect mode */
-#define RCCR_EDM3      ((uint)0x00000100) /* DREQ3 edge detect mode */
-#define RCCR_DEM01     ((uint)0x00000008) /* DONE0/DONE1 edge detect mode */
-#define RCCR_DEM23     ((uint)0x00000004) /* DONE2/DONE3 edge detect mode */
-
-/*-----------------------------------------------------------------------
- * CMXFCR - CMX FCC Clock Route Register
- */
-#define CMXFCR_FC1         0x40000000   /* FCC1 connection              */
-#define CMXFCR_RF1CS_MSK   0x38000000   /* Receive FCC1 Clock Source Mask */
-#define CMXFCR_TF1CS_MSK   0x07000000   /* Transmit FCC1 Clock Source Mask */
-#define CMXFCR_FC2         0x00400000   /* FCC2 connection              */
-#define CMXFCR_RF2CS_MSK   0x00380000   /* Receive FCC2 Clock Source Mask */
-#define CMXFCR_TF2CS_MSK   0x00070000   /* Transmit FCC2 Clock Source Mask */
-#define CMXFCR_FC3         0x00004000   /* FCC3 connection              */
-#define CMXFCR_RF3CS_MSK   0x00003800   /* Receive FCC3 Clock Source Mask */
-#define CMXFCR_TF3CS_MSK   0x00000700   /* Transmit FCC3 Clock Source Mask */
-
-#define CMXFCR_RF1CS_BRG5  0x00000000   /* Receive FCC1 Clock Source is BRG5 */
-#define CMXFCR_RF1CS_BRG6  0x08000000   /* Receive FCC1 Clock Source is BRG6 */
-#define CMXFCR_RF1CS_BRG7  0x10000000   /* Receive FCC1 Clock Source is BRG7 */
-#define CMXFCR_RF1CS_BRG8  0x18000000   /* Receive FCC1 Clock Source is BRG8 */
-#define CMXFCR_RF1CS_CLK9  0x20000000   /* Receive FCC1 Clock Source is CLK9 */
-#define CMXFCR_RF1CS_CLK10 0x28000000   /* Receive FCC1 Clock Source is CLK10 */
-#define CMXFCR_RF1CS_CLK11 0x30000000   /* Receive FCC1 Clock Source is CLK11 */
-#define CMXFCR_RF1CS_CLK12 0x38000000   /* Receive FCC1 Clock Source is CLK12 */
-
-#define CMXFCR_TF1CS_BRG5  0x00000000   /* Transmit FCC1 Clock Source is BRG5 */
-#define CMXFCR_TF1CS_BRG6  0x01000000   /* Transmit FCC1 Clock Source is BRG6 */
-#define CMXFCR_TF1CS_BRG7  0x02000000   /* Transmit FCC1 Clock Source is BRG7 */
-#define CMXFCR_TF1CS_BRG8  0x03000000   /* Transmit FCC1 Clock Source is BRG8 */
-#define CMXFCR_TF1CS_CLK9  0x04000000   /* Transmit FCC1 Clock Source is CLK9 */
-#define CMXFCR_TF1CS_CLK10 0x05000000   /* Transmit FCC1 Clock Source is CLK10 */
-#define CMXFCR_TF1CS_CLK11 0x06000000   /* Transmit FCC1 Clock Source is CLK11 */
-#define CMXFCR_TF1CS_CLK12 0x07000000   /* Transmit FCC1 Clock Source is CLK12 */
-
-#define CMXFCR_RF2CS_BRG5  0x00000000   /* Receive FCC2 Clock Source is BRG5 */
-#define CMXFCR_RF2CS_BRG6  0x00080000   /* Receive FCC2 Clock Source is BRG6 */
-#define CMXFCR_RF2CS_BRG7  0x00100000   /* Receive FCC2 Clock Source is BRG7 */
-#define CMXFCR_RF2CS_BRG8  0x00180000   /* Receive FCC2 Clock Source is BRG8 */
-#define CMXFCR_RF2CS_CLK13 0x00200000   /* Receive FCC2 Clock Source is CLK13 */
-#define CMXFCR_RF2CS_CLK14 0x00280000   /* Receive FCC2 Clock Source is CLK14 */
-#define CMXFCR_RF2CS_CLK15 0x00300000   /* Receive FCC2 Clock Source is CLK15 */
-#define CMXFCR_RF2CS_CLK16 0x00380000   /* Receive FCC2 Clock Source is CLK16 */
-
-#define CMXFCR_TF2CS_BRG5  0x00000000   /* Transmit FCC2 Clock Source is BRG5 */
-#define CMXFCR_TF2CS_BRG6  0x00010000   /* Transmit FCC2 Clock Source is BRG6 */
-#define CMXFCR_TF2CS_BRG7  0x00020000   /* Transmit FCC2 Clock Source is BRG7 */
-#define CMXFCR_TF2CS_BRG8  0x00030000   /* Transmit FCC2 Clock Source is BRG8 */
-#define CMXFCR_TF2CS_CLK13 0x00040000   /* Transmit FCC2 Clock Source is CLK13 */
-#define CMXFCR_TF2CS_CLK14 0x00050000   /* Transmit FCC2 Clock Source is CLK14 */
-#define CMXFCR_TF2CS_CLK15 0x00060000   /* Transmit FCC2 Clock Source is CLK15 */
-#define CMXFCR_TF2CS_CLK16 0x00070000   /* Transmit FCC2 Clock Source is CLK16 */
-
-#define CMXFCR_RF3CS_BRG5  0x00000000   /* Receive FCC3 Clock Source is BRG5 */
-#define CMXFCR_RF3CS_BRG6  0x00000800   /* Receive FCC3 Clock Source is BRG6 */
-#define CMXFCR_RF3CS_BRG7  0x00001000   /* Receive FCC3 Clock Source is BRG7 */
-#define CMXFCR_RF3CS_BRG8  0x00001800   /* Receive FCC3 Clock Source is BRG8 */
-#define CMXFCR_RF3CS_CLK13 0x00002000   /* Receive FCC3 Clock Source is CLK13 */
-#define CMXFCR_RF3CS_CLK14 0x00002800   /* Receive FCC3 Clock Source is CLK14 */
-#define CMXFCR_RF3CS_CLK15 0x00003000   /* Receive FCC3 Clock Source is CLK15 */
-#define CMXFCR_RF3CS_CLK16 0x00003800   /* Receive FCC3 Clock Source is CLK16 */
-
-#define CMXFCR_TF3CS_BRG5  0x00000000   /* Transmit FCC3 Clock Source is BRG5 */
-#define CMXFCR_TF3CS_BRG6  0x00000100   /* Transmit FCC3 Clock Source is BRG6 */
-#define CMXFCR_TF3CS_BRG7  0x00000200   /* Transmit FCC3 Clock Source is BRG7 */
-#define CMXFCR_TF3CS_BRG8  0x00000300   /* Transmit FCC3 Clock Source is BRG8 */
-#define CMXFCR_TF3CS_CLK13 0x00000400   /* Transmit FCC3 Clock Source is CLK13 */
-#define CMXFCR_TF3CS_CLK14 0x00000500   /* Transmit FCC3 Clock Source is CLK14 */
-#define CMXFCR_TF3CS_CLK15 0x00000600   /* Transmit FCC3 Clock Source is CLK15 */
-#define CMXFCR_TF3CS_CLK16 0x00000700   /* Transmit FCC3 Clock Source is CLK16 */
-
-/*-----------------------------------------------------------------------
- * CMXSCR - CMX SCC Clock Route Register
- */
-#define CMXSCR_GR1         0x80000000   /* Grant Support of SCC1        */
-#define CMXSCR_SC1         0x40000000   /* SCC1 connection              */
-#define CMXSCR_RS1CS_MSK   0x38000000   /* Receive SCC1 Clock Source Mask */
-#define CMXSCR_TS1CS_MSK   0x07000000   /* Transmit SCC1 Clock Source Mask */
-#define CMXSCR_GR2         0x00800000   /* Grant Support of SCC2        */
-#define CMXSCR_SC2         0x00400000   /* SCC2 connection              */
-#define CMXSCR_RS2CS_MSK   0x00380000   /* Receive SCC2 Clock Source Mask */
-#define CMXSCR_TS2CS_MSK   0x00070000   /* Transmit SCC2 Clock Source Mask */
-#define CMXSCR_GR3         0x00008000   /* Grant Support of SCC3        */
-#define CMXSCR_SC3         0x00004000   /* SCC3 connection              */
-#define CMXSCR_RS3CS_MSK   0x00003800   /* Receive SCC3 Clock Source Mask */
-#define CMXSCR_TS3CS_MSK   0x00000700   /* Transmit SCC3 Clock Source Mask */
-#define CMXSCR_GR4         0x00000080   /* Grant Support of SCC4        */
-#define CMXSCR_SC4         0x00000040   /* SCC4 connection              */
-#define CMXSCR_RS4CS_MSK   0x00000038   /* Receive SCC4 Clock Source Mask */
-#define CMXSCR_TS4CS_MSK   0x00000007   /* Transmit SCC4 Clock Source Mask */
-
-#define CMXSCR_RS1CS_BRG1  0x00000000   /* SCC1 Rx Clock Source is BRG1 */
-#define CMXSCR_RS1CS_BRG2  0x08000000   /* SCC1 Rx Clock Source is BRG2 */
-#define CMXSCR_RS1CS_BRG3  0x10000000   /* SCC1 Rx Clock Source is BRG3 */
-#define CMXSCR_RS1CS_BRG4  0x18000000   /* SCC1 Rx Clock Source is BRG4 */
-#define CMXSCR_RS1CS_CLK11 0x20000000   /* SCC1 Rx Clock Source is CLK11 */
-#define CMXSCR_RS1CS_CLK12 0x28000000   /* SCC1 Rx Clock Source is CLK12 */
-#define CMXSCR_RS1CS_CLK3  0x30000000   /* SCC1 Rx Clock Source is CLK3 */
-#define CMXSCR_RS1CS_CLK4  0x38000000   /* SCC1 Rx Clock Source is CLK4 */
-
-#define CMXSCR_TS1CS_BRG1  0x00000000   /* SCC1 Tx Clock Source is BRG1 */
-#define CMXSCR_TS1CS_BRG2  0x01000000   /* SCC1 Tx Clock Source is BRG2 */
-#define CMXSCR_TS1CS_BRG3  0x02000000   /* SCC1 Tx Clock Source is BRG3 */
-#define CMXSCR_TS1CS_BRG4  0x03000000   /* SCC1 Tx Clock Source is BRG4 */
-#define CMXSCR_TS1CS_CLK11 0x04000000   /* SCC1 Tx Clock Source is CLK11 */
-#define CMXSCR_TS1CS_CLK12 0x05000000   /* SCC1 Tx Clock Source is CLK12 */
-#define CMXSCR_TS1CS_CLK3  0x06000000   /* SCC1 Tx Clock Source is CLK3 */
-#define CMXSCR_TS1CS_CLK4  0x07000000   /* SCC1 Tx Clock Source is CLK4 */
-
-#define CMXSCR_RS2CS_BRG1  0x00000000   /* SCC2 Rx Clock Source is BRG1 */
-#define CMXSCR_RS2CS_BRG2  0x00080000   /* SCC2 Rx Clock Source is BRG2 */
-#define CMXSCR_RS2CS_BRG3  0x00100000   /* SCC2 Rx Clock Source is BRG3 */
-#define CMXSCR_RS2CS_BRG4  0x00180000   /* SCC2 Rx Clock Source is BRG4 */
-#define CMXSCR_RS2CS_CLK11 0x00200000   /* SCC2 Rx Clock Source is CLK11 */
-#define CMXSCR_RS2CS_CLK12 0x00280000   /* SCC2 Rx Clock Source is CLK12 */
-#define CMXSCR_RS2CS_CLK3  0x00300000   /* SCC2 Rx Clock Source is CLK3 */
-#define CMXSCR_RS2CS_CLK4  0x00380000   /* SCC2 Rx Clock Source is CLK4 */
-
-#define CMXSCR_TS2CS_BRG1  0x00000000   /* SCC2 Tx Clock Source is BRG1 */
-#define CMXSCR_TS2CS_BRG2  0x00010000   /* SCC2 Tx Clock Source is BRG2 */
-#define CMXSCR_TS2CS_BRG3  0x00020000   /* SCC2 Tx Clock Source is BRG3 */
-#define CMXSCR_TS2CS_BRG4  0x00030000   /* SCC2 Tx Clock Source is BRG4 */
-#define CMXSCR_TS2CS_CLK11 0x00040000   /* SCC2 Tx Clock Source is CLK11 */
-#define CMXSCR_TS2CS_CLK12 0x00050000   /* SCC2 Tx Clock Source is CLK12 */
-#define CMXSCR_TS2CS_CLK3  0x00060000   /* SCC2 Tx Clock Source is CLK3 */
-#define CMXSCR_TS2CS_CLK4  0x00070000   /* SCC2 Tx Clock Source is CLK4 */
-
-#define CMXSCR_RS3CS_BRG1  0x00000000   /* SCC3 Rx Clock Source is BRG1 */
-#define CMXSCR_RS3CS_BRG2  0x00000800   /* SCC3 Rx Clock Source is BRG2 */
-#define CMXSCR_RS3CS_BRG3  0x00001000   /* SCC3 Rx Clock Source is BRG3 */
-#define CMXSCR_RS3CS_BRG4  0x00001800   /* SCC3 Rx Clock Source is BRG4 */
-#define CMXSCR_RS3CS_CLK5  0x00002000   /* SCC3 Rx Clock Source is CLK5 */
-#define CMXSCR_RS3CS_CLK6  0x00002800   /* SCC3 Rx Clock Source is CLK6 */
-#define CMXSCR_RS3CS_CLK7  0x00003000   /* SCC3 Rx Clock Source is CLK7 */
-#define CMXSCR_RS3CS_CLK8  0x00003800   /* SCC3 Rx Clock Source is CLK8 */
-
-#define CMXSCR_TS3CS_BRG1  0x00000000   /* SCC3 Tx Clock Source is BRG1 */
-#define CMXSCR_TS3CS_BRG2  0x00000100   /* SCC3 Tx Clock Source is BRG2 */
-#define CMXSCR_TS3CS_BRG3  0x00000200   /* SCC3 Tx Clock Source is BRG3 */
-#define CMXSCR_TS3CS_BRG4  0x00000300   /* SCC3 Tx Clock Source is BRG4 */
-#define CMXSCR_TS3CS_CLK5  0x00000400   /* SCC3 Tx Clock Source is CLK5 */
-#define CMXSCR_TS3CS_CLK6  0x00000500   /* SCC3 Tx Clock Source is CLK6 */
-#define CMXSCR_TS3CS_CLK7  0x00000600   /* SCC3 Tx Clock Source is CLK7 */
-#define CMXSCR_TS3CS_CLK8  0x00000700   /* SCC3 Tx Clock Source is CLK8 */
-
-#define CMXSCR_RS4CS_BRG1  0x00000000   /* SCC4 Rx Clock Source is BRG1 */
-#define CMXSCR_RS4CS_BRG2  0x00000008   /* SCC4 Rx Clock Source is BRG2 */
-#define CMXSCR_RS4CS_BRG3  0x00000010   /* SCC4 Rx Clock Source is BRG3 */
-#define CMXSCR_RS4CS_BRG4  0x00000018   /* SCC4 Rx Clock Source is BRG4 */
-#define CMXSCR_RS4CS_CLK5  0x00000020   /* SCC4 Rx Clock Source is CLK5 */
-#define CMXSCR_RS4CS_CLK6  0x00000028   /* SCC4 Rx Clock Source is CLK6 */
-#define CMXSCR_RS4CS_CLK7  0x00000030   /* SCC4 Rx Clock Source is CLK7 */
-#define CMXSCR_RS4CS_CLK8  0x00000038   /* SCC4 Rx Clock Source is CLK8 */
-
-#define CMXSCR_TS4CS_BRG1  0x00000000   /* SCC4 Tx Clock Source is BRG1 */
-#define CMXSCR_TS4CS_BRG2  0x00000001   /* SCC4 Tx Clock Source is BRG2 */
-#define CMXSCR_TS4CS_BRG3  0x00000002   /* SCC4 Tx Clock Source is BRG3 */
-#define CMXSCR_TS4CS_BRG4  0x00000003   /* SCC4 Tx Clock Source is BRG4 */
-#define CMXSCR_TS4CS_CLK5  0x00000004   /* SCC4 Tx Clock Source is CLK5 */
-#define CMXSCR_TS4CS_CLK6  0x00000005   /* SCC4 Tx Clock Source is CLK6 */
-#define CMXSCR_TS4CS_CLK7  0x00000006   /* SCC4 Tx Clock Source is CLK7 */
-#define CMXSCR_TS4CS_CLK8  0x00000007   /* SCC4 Tx Clock Source is CLK8 */
-
-#endif /* __CPM2__ */
-#endif /* __KERNEL__ */
-
-
diff --git a/include/asm-ppc/immap_cpm2.h b/include/asm-ppc/immap_cpm2.h
deleted file mode 100644 (file)
index 4d56515..0000000
+++ /dev/null
@@ -1,648 +0,0 @@
-/*
- * CPM2 Internal Memory Map
- * Copyright (c) 1999 Dan Malek (dmalek@jlc.net)
- *
- * The Internal Memory Map for devices with CPM2 on them.  This
- * is the superset of all CPM2 devices (8260, 8266, 8280, 8272,
- * 8560). 
- */
-#ifdef __KERNEL__
-#ifndef __IMMAP_CPM2__
-#define __IMMAP_CPM2__
-
-/* System configuration registers.
-*/
-typedef        struct sys_82xx_conf {
-       u32     sc_siumcr;
-       u32     sc_sypcr;
-       u8      res1[6];
-       u16     sc_swsr;
-       u8      res2[20];
-       u32     sc_bcr;
-       u8      sc_ppc_acr;
-       u8      res3[3];
-       u32     sc_ppc_alrh;
-       u32     sc_ppc_alrl;
-       u8      sc_lcl_acr;
-       u8      res4[3];
-       u32     sc_lcl_alrh;
-       u32     sc_lcl_alrl;
-       u32     sc_tescr1;
-       u32     sc_tescr2;
-       u32     sc_ltescr1;
-       u32     sc_ltescr2;
-       u32     sc_pdtea;
-       u8      sc_pdtem;
-       u8      res5[3];
-       u32     sc_ldtea;
-       u8      sc_ldtem;
-       u8      res6[163];
-} sysconf_82xx_cpm2_t;
-
-typedef        struct sys_85xx_conf {
-       u32     sc_cear;
-       u16     sc_ceer;
-       u16     sc_cemr;
-       u8      res1[70];
-       u32     sc_smaer;
-       u8      res2[4];
-       u32     sc_smevr;
-       u32     sc_smctr;
-       u32     sc_lmaer;
-       u8      res3[4];
-       u32     sc_lmevr;
-       u32     sc_lmctr;
-       u8      res4[144];
-} sysconf_85xx_cpm2_t;
-
-typedef union sys_conf {
-       sysconf_82xx_cpm2_t     siu_82xx;
-       sysconf_85xx_cpm2_t     siu_85xx;
-} sysconf_cpm2_t;
-
-
-
-/* Memory controller registers.
-*/
-typedef struct mem_ctlr {
-       u32     memc_br0;
-       u32     memc_or0;
-       u32     memc_br1;
-       u32     memc_or1;
-       u32     memc_br2;
-       u32     memc_or2;
-       u32     memc_br3;
-       u32     memc_or3;
-       u32     memc_br4;
-       u32     memc_or4;
-       u32     memc_br5;
-       u32     memc_or5;
-       u32     memc_br6;
-       u32     memc_or6;
-       u32     memc_br7;
-       u32     memc_or7;
-       u32     memc_br8;
-       u32     memc_or8;
-       u32     memc_br9;
-       u32     memc_or9;
-       u32     memc_br10;
-       u32     memc_or10;
-       u32     memc_br11;
-       u32     memc_or11;
-       u8      res1[8];
-       u32     memc_mar;
-       u8      res2[4];
-       u32     memc_mamr;
-       u32     memc_mbmr;
-       u32     memc_mcmr;
-       u8      res3[8];
-       u16     memc_mptpr;
-       u8      res4[2];
-       u32     memc_mdr;
-       u8      res5[4];
-       u32     memc_psdmr;
-       u32     memc_lsdmr;
-       u8      memc_purt;
-       u8      res6[3];
-       u8      memc_psrt;
-       u8      res7[3];
-       u8      memc_lurt;
-       u8      res8[3];
-       u8      memc_lsrt;
-       u8      res9[3];
-       u32     memc_immr;
-       u32     memc_pcibr0;
-       u32     memc_pcibr1;
-       u8      res10[16];
-       u32     memc_pcimsk0;
-       u32     memc_pcimsk1;
-       u8      res11[52];
-} memctl_cpm2_t;
-
-/* System Integration Timers.
-*/
-typedef struct sys_int_timers {
-       u8      res1[32];
-       u16     sit_tmcntsc;
-       u8      res2[2];
-       u32     sit_tmcnt;
-       u8      res3[4];
-       u32     sit_tmcntal;
-       u8      res4[16];
-       u16     sit_piscr;
-       u8      res5[2];
-       u32     sit_pitc;
-       u32     sit_pitr;
-       u8      res6[92];
-       u8      res7[390];
-} sit_cpm2_t;
-
-#define PISCR_PIRQ_MASK                ((u16)0xff00)
-#define PISCR_PS               ((u16)0x0080)
-#define PISCR_PIE              ((u16)0x0004)
-#define PISCR_PTF              ((u16)0x0002)
-#define PISCR_PTE              ((u16)0x0001)
-
-/* PCI Controller.
-*/
-typedef struct pci_ctlr {
-       u32     pci_omisr;
-       u32     pci_omimr;
-       u8      res1[8];
-       u32     pci_ifqpr;
-       u32     pci_ofqpr;
-       u8      res2[8];
-       u32     pci_imr0;
-       u32     pci_imr1;
-       u32     pci_omr0;
-       u32     pci_omr1;
-       u32     pci_odr;
-       u8      res3[4];
-       u32     pci_idr;
-       u8      res4[20];
-       u32     pci_imisr;
-       u32     pci_imimr;
-       u8      res5[24];
-       u32     pci_ifhpr;
-       u8      res6[4];
-       u32     pci_iftpr;
-       u8      res7[4];
-       u32     pci_iphpr;
-       u8      res8[4];
-       u32     pci_iptpr;
-       u8      res9[4];
-       u32     pci_ofhpr;
-       u8      res10[4];
-       u32     pci_oftpr;
-       u8      res11[4];
-       u32     pci_ophpr;
-       u8      res12[4];
-       u32     pci_optpr;
-       u8      res13[8];
-       u32     pci_mucr;
-       u8      res14[8];
-       u32     pci_qbar;
-       u8      res15[12];
-       u32     pci_dmamr0;
-       u32     pci_dmasr0;
-       u32     pci_dmacdar0;
-       u8      res16[4];
-       u32     pci_dmasar0;
-       u8      res17[4];
-       u32     pci_dmadar0;
-       u8      res18[4];
-       u32     pci_dmabcr0;
-       u32     pci_dmandar0;
-       u8      res19[86];
-       u32     pci_dmamr1;
-       u32     pci_dmasr1;
-       u32     pci_dmacdar1;
-       u8      res20[4];
-       u32     pci_dmasar1;
-       u8      res21[4];
-       u32     pci_dmadar1;
-       u8      res22[4];
-       u32     pci_dmabcr1;
-       u32     pci_dmandar1;
-       u8      res23[88];
-       u32     pci_dmamr2;
-       u32     pci_dmasr2;
-       u32     pci_dmacdar2;
-       u8      res24[4];
-       u32     pci_dmasar2;
-       u8      res25[4];
-       u32     pci_dmadar2;
-       u8      res26[4];
-       u32     pci_dmabcr2;
-       u32     pci_dmandar2;
-       u8      res27[88];
-       u32     pci_dmamr3;
-       u32     pci_dmasr3;
-       u32     pci_dmacdar3;
-       u8      res28[4];
-       u32     pci_dmasar3;
-       u8      res29[4];
-       u32     pci_dmadar3;
-       u8      res30[4];
-       u32     pci_dmabcr3;
-       u32     pci_dmandar3;
-       u8      res31[344];
-       u32     pci_potar0;
-       u8      res32[4];
-       u32     pci_pobar0;
-       u8      res33[4];
-       u32     pci_pocmr0;
-       u8      res34[4];
-       u32     pci_potar1;
-       u8      res35[4];
-       u32     pci_pobar1;
-       u8      res36[4];
-       u32     pci_pocmr1;
-       u8      res37[4];
-       u32     pci_potar2;
-       u8      res38[4];
-       u32     pci_pobar2;
-       u8      res39[4];
-       u32     pci_pocmr2;
-       u8      res40[50];
-       u32     pci_ptcr;
-       u32     pci_gpcr;
-       u32     pci_gcr;
-       u32     pci_esr;
-       u32     pci_emr;
-       u32     pci_ecr;
-       u32     pci_eacr;
-       u8      res41[4];
-       u32     pci_edcr;
-       u8      res42[4];
-       u32     pci_eccr;
-       u8      res43[44];
-       u32     pci_pitar1;
-       u8      res44[4];
-       u32     pci_pibar1;
-       u8      res45[4];
-       u32     pci_picmr1;
-       u8      res46[4];
-       u32     pci_pitar0;
-       u8      res47[4];
-       u32     pci_pibar0;
-       u8      res48[4];
-       u32     pci_picmr0;
-       u8      res49[4];
-       u32     pci_cfg_addr;
-       u32     pci_cfg_data;
-       u32     pci_int_ack;
-       u8      res50[756];
-} pci_cpm2_t;
-
-/* Interrupt Controller.
-*/
-typedef struct interrupt_controller {
-       u16     ic_sicr;
-       u8      res1[2];
-       u32     ic_sivec;
-       u32     ic_sipnrh;
-       u32     ic_sipnrl;
-       u32     ic_siprr;
-       u32     ic_scprrh;
-       u32     ic_scprrl;
-       u32     ic_simrh;
-       u32     ic_simrl;
-       u32     ic_siexr;
-       u8      res2[88];
-} intctl_cpm2_t;
-
-/* Clocks and Reset.
-*/
-typedef struct clk_and_reset {
-       u32     car_sccr;
-       u8      res1[4];
-       u32     car_scmr;
-       u8      res2[4];
-       u32     car_rsr;
-       u32     car_rmr;
-       u8      res[104];
-} car_cpm2_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 {
-       u32     iop_pdira;
-       u32     iop_ppara;
-       u32     iop_psora;
-       u32     iop_podra;
-       u32     iop_pdata;
-       u8      res1[12];
-       u32     iop_pdirb;
-       u32     iop_pparb;
-       u32     iop_psorb;
-       u32     iop_podrb;
-       u32     iop_pdatb;
-       u8      res2[12];
-       u32     iop_pdirc;
-       u32     iop_pparc;
-       u32     iop_psorc;
-       u32     iop_podrc;
-       u32     iop_pdatc;
-       u8      res3[12];
-       u32     iop_pdird;
-       u32     iop_ppard;
-       u32     iop_psord;
-       u32     iop_podrd;
-       u32     iop_pdatd;
-       u8      res4[12];
-} iop_cpm2_t;
-
-/* Communication Processor Module Timers
-*/
-typedef struct cpm_timers {
-       u8      cpmt_tgcr1;
-       u8      res1[3];
-       u8      cpmt_tgcr2;
-       u8      res2[11];
-       u16     cpmt_tmr1;
-       u16     cpmt_tmr2;
-       u16     cpmt_trr1;
-       u16     cpmt_trr2;
-       u16     cpmt_tcr1;
-       u16     cpmt_tcr2;
-       u16     cpmt_tcn1;
-       u16     cpmt_tcn2;
-       u16     cpmt_tmr3;
-       u16     cpmt_tmr4;
-       u16     cpmt_trr3;
-       u16     cpmt_trr4;
-       u16     cpmt_tcr3;
-       u16     cpmt_tcr4;
-       u16     cpmt_tcn3;
-       u16     cpmt_tcn4;
-       u16     cpmt_ter1;
-       u16     cpmt_ter2;
-       u16     cpmt_ter3;
-       u16     cpmt_ter4;
-       u8      res3[584];
-} cpmtimer_cpm2_t;
-
-/* DMA control/status registers.
-*/
-typedef struct sdma_csr {
-       u8      res0[24];
-       u8      sdma_sdsr;
-       u8      res1[3];
-       u8      sdma_sdmr;
-       u8      res2[3];
-       u8      sdma_idsr1;
-       u8      res3[3];
-       u8      sdma_idmr1;
-       u8      res4[3];
-       u8      sdma_idsr2;
-       u8      res5[3];
-       u8      sdma_idmr2;
-       u8      res6[3];
-       u8      sdma_idsr3;
-       u8      res7[3];
-       u8      sdma_idmr3;
-       u8      res8[3];
-       u8      sdma_idsr4;
-       u8      res9[3];
-       u8      sdma_idmr4;
-       u8      res10[707];
-} sdma_cpm2_t;
-
-/* Fast controllers
-*/
-typedef struct fcc {
-       u32     fcc_gfmr;
-       u32     fcc_fpsmr;
-       u16     fcc_ftodr;
-       u8      res1[2];
-       u16     fcc_fdsr;
-       u8      res2[2];
-       u16     fcc_fcce;
-       u8      res3[2];
-       u16     fcc_fccm;
-       u8      res4[2];
-       u8      fcc_fccs;
-       u8      res5[3];
-       u8      fcc_ftirr_phy[4];
-} fcc_t;
-
-/* Fast controllers continued
- */
-typedef struct fcc_c {
-       u32     fcc_firper;
-       u32     fcc_firer;
-       u32     fcc_firsr_hi;
-       u32     fcc_firsr_lo;
-       u8      fcc_gfemr;
-       u8      res1[15];
-} fcc_c_t;
-
-/* TC Layer
- */
-typedef struct tclayer {
-       u16     tc_tcmode;
-       u16     tc_cdsmr;
-       u16     tc_tcer;
-       u16     tc_rcc;
-       u16     tc_tcmr;
-       u16     tc_fcc;
-       u16     tc_ccc;
-       u16     tc_icc;
-       u16     tc_tcc;
-       u16     tc_ecc;
-       u8      res1[12];
-} tclayer_t;
-
-
-/* I2C
-*/
-typedef struct i2c {
-       u8      i2c_i2mod;
-       u8      res1[3];
-       u8      i2c_i2add;
-       u8      res2[3];
-       u8      i2c_i2brg;
-       u8      res3[3];
-       u8      i2c_i2com;
-       u8      res4[3];
-       u8      i2c_i2cer;
-       u8      res5[3];
-       u8      i2c_i2cmr;
-       u8      res6[331];
-} i2c_cpm2_t;
-
-typedef struct scc {           /* Serial communication channels */
-       u32     scc_gsmrl;
-       u32     scc_gsmrh;
-       u16     scc_psmr;
-       u8      res1[2];
-       u16     scc_todr;
-       u16     scc_dsr;
-       u16     scc_scce;
-       u8      res2[2];
-       u16     scc_sccm;
-       u8      res3;
-       u8      scc_sccs;
-       u8      res4[8];
-} scc_t;
-
-typedef struct smc {           /* Serial management channels */
-       u8      res1[2];
-       u16     smc_smcmr;
-       u8      res2[2];
-       u8      smc_smce;
-       u8      res3[3];
-       u8      smc_smcm;
-       u8      res4[5];
-} smc_t;
-
-/* Serial Peripheral Interface.
-*/
-typedef struct spi_ctrl {
-       u16     spi_spmode;
-       u8      res1[4];
-       u8      spi_spie;
-       u8      res2[3];
-       u8      spi_spim;
-       u8      res3[2];
-       u8      spi_spcom;
-       u8      res4[82];
-} spictl_cpm2_t;
-
-/* CPM Mux.
-*/
-typedef struct cpmux {
-       u8      cmx_si1cr;
-       u8      res1;
-       u8      cmx_si2cr;
-       u8      res2;
-       u32     cmx_fcr;
-       u32     cmx_scr;
-       u8      cmx_smr;
-       u8      res3;
-       u16     cmx_uar;
-       u8      res4[16];
-} cpmux_t;
-
-/* SIRAM control
-*/
-typedef struct siram {
-       u16     si_amr;
-       u16     si_bmr;
-       u16     si_cmr;
-       u16     si_dmr;
-       u8      si_gmr;
-       u8      res1;
-       u8      si_cmdr;
-       u8      res2;
-       u8      si_str;
-       u8      res3;
-       u16     si_rsr;
-} siramctl_t;
-
-typedef struct mcc {
-       u16     mcc_mcce;
-       u8      res1[2];
-       u16     mcc_mccm;
-       u8      res2[2];
-       u8      mcc_mccf;
-       u8      res3[7];
-} mcc_t;
-
-typedef struct comm_proc {
-       u32     cp_cpcr;
-       u32     cp_rccr;
-       u8      res1[14];
-       u16     cp_rter;
-       u8      res2[2];
-       u16     cp_rtmr;
-       u16     cp_rtscr;
-       u8      res3[2];
-       u32     cp_rtsr;
-       u8      res4[12];
-} cpm_cpm2_t;
-
-/* USB Controller.
-*/
-typedef struct usb_ctlr {
-       u8      usb_usmod;
-       u8      usb_usadr;
-       u8      usb_uscom;
-       u8      res1[1];
-       u16     usb_usep1;
-       u16     usb_usep2;
-       u16     usb_usep3;
-       u16     usb_usep4;
-       u8      res2[4];
-       u16     usb_usber;
-       u8      res3[2];
-       u16     usb_usbmr;
-       u8      usb_usbs;
-       u8      res4[7];
-} usb_cpm2_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
-       u8              im_dpram1[16*1024];
-       u8              res1[16*1024];
-       u8              im_dpram2[4*1024];
-       u8              res2[8*1024];
-       u8              im_dpram3[4*1024];
-       u8              res3[16*1024];
-
-       sysconf_cpm2_t  im_siu_conf;    /* SIU Configuration */
-       memctl_cpm2_t   im_memctl;      /* Memory Controller */
-       sit_cpm2_t      im_sit;         /* System Integration Timers */
-       pci_cpm2_t      im_pci;         /* PCI Controller */
-       intctl_cpm2_t   im_intctl;      /* Interrupt Controller */
-       car_cpm2_t      im_clkrst;      /* Clocks and reset */
-       iop_cpm2_t      im_ioport;      /* IO Port control/status */
-       cpmtimer_cpm2_t im_cpmtimer;    /* CPM timers */
-       sdma_cpm2_t     im_sdma;        /* SDMA control/status */
-
-       fcc_t           im_fcc[3];      /* Three FCCs */
-       u8              res4z[32];
-       fcc_c_t         im_fcc_c[3];    /* Continued FCCs */
-
-       u8              res4[32];
-
-       tclayer_t       im_tclayer[8];  /* Eight TCLayers */
-       u16             tc_tcgsr;
-       u16             tc_tcger;
-       
-       /* First set of baud rate generators.
-       */
-       u8              res[236];
-       u32             im_brgc5;
-       u32             im_brgc6;
-       u32             im_brgc7;
-       u32             im_brgc8;
-
-       u8              res5[608];
-
-       i2c_cpm2_t      im_i2c;         /* I2C control/status */
-       cpm_cpm2_t      im_cpm;         /* Communication processor */
-
-       /* Second set of baud rate generators.
-       */
-       u32             im_brgc1;
-       u32             im_brgc2;
-       u32             im_brgc3;
-       u32             im_brgc4;
-
-       scc_t           im_scc[4];      /* Four SCCs */
-       smc_t           im_smc[2];      /* Couple of SMCs */
-       spictl_cpm2_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 */
-       usb_cpm2_t      im_usb;         /* USB Controller */
-
-       u8              res6[1153];
-
-       u16             im_si1txram[256];
-       u8              res7[512];
-       u16             im_si1rxram[256];
-       u8              res8[512];
-       u16             im_si2txram[256];
-       u8              res9[512];
-       u16             im_si2rxram[256];
-       u8              res10[512];
-       u8              res11[4096];
-} cpm2_map_t;
-
-extern cpm2_map_t      *cpm2_immr;
-
-#endif /* __IMMAP_CPM2__ */
-#endif /* __KERNEL__ */
diff --git a/include/asm-ppc/m8260_pci.h b/include/asm-ppc/m8260_pci.h
deleted file mode 100644 (file)
index 163a6b9..0000000
+++ /dev/null
@@ -1,186 +0,0 @@
-/*
- * include/asm-ppc/m8260_pci.h
- *
- * Definitions for the MPC8250/MPC8265/MPC8266 integrated PCI host bridge.
- *
- * 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.
- */
-
-#ifdef __KERNEL__
-#ifndef __M8260_PCI_H
-#define __M8260_PCI_H
-
-#include <linux/pci_ids.h>
-
-/*
- * Define the vendor/device ID for the MPC8265.
- */
-#define        PCI_DEVICE_ID_MPC8265   ((0x18C0 << 16) | PCI_VENDOR_ID_MOTOROLA)
-
-#define M8265_PCIBR0   0x101ac
-#define M8265_PCIBR1   0x101b0
-#define M8265_PCIMSK0  0x101c4
-#define M8265_PCIMSK1  0x101c8
-
-/* Bit definitions for PCIBR registers */
-
-#define PCIBR_ENABLE        0x00000001
-
-/* Bit definitions for PCIMSK registers */
-
-#define PCIMSK_32KiB         0xFFFF8000  /* Size of window, smallest */
-#define PCIMSK_64KiB         0xFFFF0000
-#define PCIMSK_128KiB        0xFFFE0000
-#define PCIMSK_256KiB        0xFFFC0000
-#define PCIMSK_512KiB        0xFFF80000
-#define PCIMSK_1MiB          0xFFF00000
-#define PCIMSK_2MiB          0xFFE00000
-#define PCIMSK_4MiB          0xFFC00000
-#define PCIMSK_8MiB          0xFF800000
-#define PCIMSK_16MiB         0xFF000000
-#define PCIMSK_32MiB         0xFE000000
-#define PCIMSK_64MiB         0xFC000000
-#define PCIMSK_128MiB        0xF8000000
-#define PCIMSK_256MiB        0xF0000000
-#define PCIMSK_512MiB        0xE0000000
-#define PCIMSK_1GiB          0xC0000000  /* Size of window, largest */
-
-
-#define M826X_SCCR_PCI_MODE_EN 0x100
-
-
-/*
- * Outbound ATU registers (3 sets). These registers control how 60x bus (local) 
- * addresses are translated to PCI addresses when the MPC826x is a PCI bus 
- * master (initiator).
- */
-
-#define POTAR_REG0          0x10800     /* PCI Outbound Translation Addr registers */
-#define POTAR_REG1          0x10818
-#define POTAR_REG2          0x10830
-
-#define POBAR_REG0          0x10808     /* PCI Outbound Base Addr registers */
-#define POBAR_REG1          0x10820
-#define POBAR_REG2          0x10838
-
-#define POCMR_REG0          0x10810     /* PCI Outbound Comparison Mask registers */
-#define POCMR_REG1          0x10828
-#define POCMR_REG2          0x10840
-
-/* Bit definitions for POMCR registers */
-
-#define POCMR_MASK_4KiB      0x000FFFFF
-#define POCMR_MASK_8KiB      0x000FFFFE
-#define POCMR_MASK_16KiB     0x000FFFFC
-#define POCMR_MASK_32KiB     0x000FFFF8
-#define POCMR_MASK_64KiB     0x000FFFF0
-#define POCMR_MASK_128KiB    0x000FFFE0
-#define POCMR_MASK_256KiB    0x000FFFC0
-#define POCMR_MASK_512KiB    0x000FFF80
-#define POCMR_MASK_1MiB      0x000FFF00
-#define POCMR_MASK_2MiB      0x000FFE00
-#define POCMR_MASK_4MiB      0x000FFC00
-#define POCMR_MASK_8MiB      0x000FF800
-#define POCMR_MASK_16MiB     0x000FF000
-#define POCMR_MASK_32MiB     0x000FE000
-#define POCMR_MASK_64MiB     0x000FC000
-#define POCMR_MASK_128MiB    0x000F8000
-#define POCMR_MASK_256MiB    0x000F0000
-#define POCMR_MASK_512MiB    0x000E0000
-#define POCMR_MASK_1GiB      0x000C0000
-
-#define POCMR_ENABLE        0x80000000
-#define POCMR_PCI_IO        0x40000000
-#define POCMR_PREFETCH_EN   0x20000000
-
-/* Soft PCI reset */
-
-#define PCI_GCR_REG         0x10880
-
-/* Bit definitions for PCI_GCR registers */
-
-#define PCIGCR_PCI_BUS_EN   0x1
-
-#define PCI_EMR_REG        0x10888
-/*
- * Inbound ATU registers (2 sets). These registers control how PCI addresses 
- * are translated to 60x bus (local) addresses when the MPC826x is a PCI bus target.
- */
-
-#define PITAR_REG1          0x108D0
-#define PIBAR_REG1          0x108D8
-#define PICMR_REG1          0x108E0
-#define PITAR_REG0          0x108E8
-#define PIBAR_REG0          0x108F0
-#define PICMR_REG0          0x108F8
-
-/* Bit definitions for PCI Inbound Comparison Mask registers */
-
-#define PICMR_MASK_4KiB       0x000FFFFF
-#define PICMR_MASK_8KiB       0x000FFFFE
-#define PICMR_MASK_16KiB      0x000FFFFC
-#define PICMR_MASK_32KiB      0x000FFFF8
-#define PICMR_MASK_64KiB      0x000FFFF0
-#define PICMR_MASK_128KiB     0x000FFFE0
-#define PICMR_MASK_256KiB     0x000FFFC0
-#define PICMR_MASK_512KiB     0x000FFF80
-#define PICMR_MASK_1MiB       0x000FFF00
-#define PICMR_MASK_2MiB       0x000FFE00
-#define PICMR_MASK_4MiB       0x000FFC00
-#define PICMR_MASK_8MiB       0x000FF800
-#define PICMR_MASK_16MiB      0x000FF000
-#define PICMR_MASK_32MiB      0x000FE000
-#define PICMR_MASK_64MiB      0x000FC000
-#define PICMR_MASK_128MiB     0x000F8000
-#define PICMR_MASK_256MiB     0x000F0000
-#define PICMR_MASK_512MiB     0x000E0000
-#define PICMR_MASK_1GiB       0x000C0000
-
-#define PICMR_ENABLE         0x80000000
-#define PICMR_NO_SNOOP_EN    0x40000000
-#define PICMR_PREFETCH_EN    0x20000000
-
-/* PCI error Registers */
-
-#define        PCI_ERROR_STATUS_REG            0x10884
-#define        PCI_ERROR_MASK_REG              0x10888
-#define        PCI_ERROR_CONTROL_REG           0x1088C
-#define PCI_ERROR_ADRS_CAPTURE_REG      0x10890
-#define PCI_ERROR_DATA_CAPTURE_REG      0x10898
-#define PCI_ERROR_CTRL_CAPTURE_REG      0x108A0
-
-/* PCI error Register bit defines */
-
-#define        PCI_ERROR_PCI_ADDR_PAR                  0x00000001
-#define        PCI_ERROR_PCI_DATA_PAR_WR               0x00000002
-#define        PCI_ERROR_PCI_DATA_PAR_RD               0x00000004
-#define        PCI_ERROR_PCI_NO_RSP                    0x00000008
-#define        PCI_ERROR_PCI_TAR_ABT                   0x00000010
-#define        PCI_ERROR_PCI_SERR                      0x00000020
-#define        PCI_ERROR_PCI_PERR_RD                   0x00000040
-#define        PCI_ERROR_PCI_PERR_WR                   0x00000080
-#define        PCI_ERROR_I2O_OFQO                      0x00000100
-#define        PCI_ERROR_I2O_IPQO                      0x00000200
-#define        PCI_ERROR_IRA                           0x00000400
-#define        PCI_ERROR_NMI                           0x00000800
-#define        PCI_ERROR_I2O_DBMC                      0x00001000
-
-/*
- * Register pair used to generate configuration cycles on the PCI bus
- * and access the MPC826x's own PCI configuration registers.
- */
-
-#define PCI_CFG_ADDR_REG     0x10900
-#define PCI_CFG_DATA_REG     0x10904
-
-/* Bus parking decides where the bus control sits when idle */
-/* If modifying memory controllers for PCI park on the core */
-
-#define PPC_ACR_BUS_PARK_CORE 0x6
-#define PPC_ACR_BUS_PARK_PCI  0x3
-
-#endif /* __M8260_PCI_H */
-#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/mpc8260_pci9.h b/include/asm-ppc/mpc8260_pci9.h
deleted file mode 100644 (file)
index 26b3f6e..0000000
+++ /dev/null
@@ -1,51 +0,0 @@
-/* include/asm-ppc/mpc8260_pci9.h
- *
- * Undefine the PCI read* and in* macros so we can define them as functions
- * that implement the workaround for the MPC8260 device erratum PCI 9.
- *
- * This header file should only be included at the end of include/asm-ppc/io.h
- * and never included directly anywhere else.
- *
- * Author:  andy_lowe@mvista.com
- *
- * 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.
- */
-#ifndef _PPC_IO_H
-#error "Do not include mpc8260_pci9.h directly."
-#endif
-
-#ifdef __KERNEL__
-#ifndef __CONFIG_8260_PCI9_DEFS
-#define __CONFIG_8260_PCI9_DEFS
-
-#undef readb
-#undef readw
-#undef readl
-#undef insb
-#undef insw
-#undef insl
-#undef inb
-#undef inw
-#undef inl
-#undef insw_ns
-#undef insl_ns
-#undef memcpy_fromio
-
-extern int readb(volatile unsigned char *addr);
-extern int readw(volatile unsigned short *addr);
-extern unsigned readl(volatile unsigned *addr);
-extern void insb(unsigned port, void *buf, int ns);
-extern void insw(unsigned port, void *buf, int ns);
-extern void insl(unsigned port, void *buf, int nl);
-extern int inb(unsigned port);
-extern int inw(unsigned port);
-extern unsigned inl(unsigned port);
-extern void insw_ns(unsigned port, void *buf, int ns);
-extern void insl_ns(unsigned port, void *buf, int nl);
-extern void *memcpy_fromio(void *dest, unsigned long src, size_t count);
-
-#endif /* !__CONFIG_8260_PCI9_DEFS */
-#endif /* __KERNEL__ */
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-ppc/rheap.h b/include/asm-ppc/rheap.h
deleted file mode 100644 (file)
index e6ca1f6..0000000
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
- * include/asm-ppc/rheap.c
- *
- * Header file for the implementation of a remote heap.
- *
- * Author: Pantelis Antoniou <panto@intracom.gr>
- *
- * 2004 (c) INTRACOM S.A. Greece. 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_PPC_RHEAP_H__
-#define __ASM_PPC_RHEAP_H__
-
-#include <linux/list.h>
-
-typedef struct _rh_block {
-       struct list_head list;
-       void *start;
-       int size;
-       const char *owner;
-} rh_block_t;
-
-typedef struct _rh_info {
-       unsigned int alignment;
-       int max_blocks;
-       int empty_slots;
-       rh_block_t *block;
-       struct list_head empty_list;
-       struct list_head free_list;
-       struct list_head taken_list;
-       unsigned int flags;
-} rh_info_t;
-
-#define RHIF_STATIC_INFO       0x1
-#define RHIF_STATIC_BLOCK      0x2
-
-typedef struct rh_stats_t {
-       void *start;
-       int size;
-       const char *owner;
-} rh_stats_t;
-
-#define RHGS_FREE      0
-#define RHGS_TAKEN     1
-
-/* Create a remote heap dynamically */
-extern rh_info_t *rh_create(unsigned int alignment);
-
-/* Destroy a remote heap, created by rh_create() */
-extern void rh_destroy(rh_info_t * info);
-
-/* Initialize in place a remote info block */
-extern void rh_init(rh_info_t * info, unsigned int alignment, int max_blocks,
-                   rh_block_t * block);
-
-/* Attach a free region to manage */
-extern int rh_attach_region(rh_info_t * info, void *start, int size);
-
-/* Detach a free region */
-extern void *rh_detach_region(rh_info_t * info, void *start, int size);
-
-/* Allocate the given size from the remote heap */
-extern void *rh_alloc(rh_info_t * info, int size, const char *owner);
-
-/* Allocate the given size from the given address */
-extern void *rh_alloc_fixed(rh_info_t * info, void *start, int size,
-                           const char *owner);
-
-/* Free the allocated area */
-extern int rh_free(rh_info_t * info, void *start);
-
-/* Get stats for debugging purposes */
-extern int rh_get_stats(rh_info_t * info, int what, int max_stats,
-                       rh_stats_t * stats);
-
-/* Simple dump of remote heap info */
-extern void rh_dump(rh_info_t * info);
-
-/* Set owner of taken block */
-extern int rh_set_owner(rh_info_t * info, void *start, const char *owner);
-
-#endif                         /* __ASM_PPC_RHEAP_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/netdump.h b/include/asm-ppc64/netdump.h
deleted file mode 100644 (file)
index 8b9fef2..0000000
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef _ASM_PPC64_NETDUMP_H_
-#define _ASM_PPC64_NETDUMP_H_
-
-#include <asm-generic/netdump.h>
-
-#endif /* _ASM_PPC64_NETDUMP_H_ */
diff --git a/include/asm-s390/netdump.h b/include/asm-s390/netdump.h
deleted file mode 100644 (file)
index 0ad1104..0000000
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef _ASM_S390_NETDUMP_H_
-#define _ASM_S390_NETDUMP_H_
-
-#include <asm-generic/netdump.h>
-
-#endif /* _ASM_S390_NETDUMP_H_ */
diff --git a/include/asm-sh/adc.h b/include/asm-sh/adc.h
deleted file mode 100644 (file)
index 64747dc..0000000
+++ /dev/null
@@ -1,12 +0,0 @@
-#ifndef __ASM_ADC_H
-#define __ASM_ADC_H
-
-/*
- * Copyright (C) 2004  Andriy Skulysh
- */
-
-#include <asm/cpu/adc.h>
-
-int adc_single(unsigned int channel);
-
-#endif /* __ASM_ADC_H */
diff --git a/include/asm-sh/bus-sh.h b/include/asm-sh/bus-sh.h
deleted file mode 100644 (file)
index f782a33..0000000
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * include/asm-sh/bus-sh.h
- *
- * Copyright (C) 2004 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.
- */
-#ifndef __ASM_SH_BUS_SH_H
-#define __ASM_SH_BUS_SH_H
-
-extern struct bus_type sh_bus_types[];
-
-struct sh_dev {
-       struct device   dev;
-       char            *name;
-       unsigned int    dev_id;
-       unsigned int    bus_id;
-       struct resource res;
-       void            *mapbase;
-       unsigned int    irq[6];
-       u64             *dma_mask;
-};
-
-#define to_sh_dev(d)   container_of((d), struct sh_dev, dev)
-
-#define sh_get_drvdata(d)      dev_get_drvdata(&(d)->dev)
-#define sh_set_drvdata(d,p)    dev_set_drvdata(&(d)->dev, (p))
-
-struct sh_driver {
-       struct device_driver    drv;
-       unsigned int            dev_id;
-       unsigned int            bus_id;
-       int (*probe)(struct sh_dev *);
-       int (*remove)(struct sh_dev *);
-       int (*suspend)(struct sh_dev *, u32);
-       int (*resume)(struct sh_dev *);
-};
-
-#define to_sh_driver(d)        container_of((d), struct sh_driver, drv)
-#define sh_name(d)     ((d)->dev.driver->name)
-
-/*
- * Device ID numbers for bus types
- */
-enum {
-       SH_DEV_ID_USB_OHCI,
-};
-
-#define SH_NR_BUSES            1
-#define SH_BUS_NAME_VIRT       "shbus"
-
-enum {
-       SH_BUS_VIRT,
-};
-
-/* arch/sh/kernel/cpu/bus.c */
-extern int sh_device_register(struct sh_dev *dev);
-extern void sh_device_unregister(struct sh_dev *dev);
-extern int sh_driver_register(struct sh_driver *drv);
-extern void sh_driver_unregister(struct sh_driver *drv);
-
-#endif /* __ASM_SH_BUS_SH_H */
-
diff --git a/include/asm-sh/cpu-sh3/adc.h b/include/asm-sh/cpu-sh3/adc.h
deleted file mode 100644 (file)
index b289e3c..0000000
+++ /dev/null
@@ -1,28 +0,0 @@
-#ifndef __ASM_CPU_SH3_ADC_H
-#define __ASM_CPU_SH3_ADC_H
-
-/*
- * Copyright (C) 2004  Andriy Skulysh
- */
-
-
-#define ADDRAH 0xa4000080
-#define ADDRAL 0xa4000082
-#define ADDRBH 0xa4000084
-#define ADDRBL 0xa4000086
-#define ADDRCH 0xa4000088
-#define ADDRCL 0xa400008a
-#define ADDRDH 0xa400008c
-#define ADDRDL 0xa400008e
-#define ADCSR  0xa4000090
-
-#define ADCSR_ADF      0x80
-#define ADCSR_ADIE     0x40
-#define ADCSR_ADST     0x20
-#define ADCSR_MULTI    0x10
-#define ADCSR_CKS      0x08
-#define ADCSR_CH_MASK  0x07
-
-#define ADCR   0xa4000092
-
-#endif /* __ASM_CPU_SH3_ADC_H */
diff --git a/include/asm-sh/fixmap.h b/include/asm-sh/fixmap.h
deleted file mode 100644 (file)
index 509224b..0000000
+++ /dev/null
@@ -1,111 +0,0 @@
-/*
- * fixmap.h: compile-time virtual memory allocation
- *
- * 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) 1998 Ingo Molnar
- *
- * Support of BIGMEM added by Gerhard Wichert, Siemens AG, July 1999
- */
-
-#ifndef _ASM_FIXMAP_H
-#define _ASM_FIXMAP_H
-
-#include <linux/config.h>
-#include <linux/kernel.h>
-#include <asm/page.h>
-#ifdef CONFIG_HIGHMEM
-#include <linux/threads.h>
-#include <asm/kmap_types.h>
-#endif
-
-/*
- * Here we define all the compile-time 'special' virtual
- * addresses. The point is to have a constant address at
- * compile time, but to set the physical address only
- * in the boot process. We allocate these special  addresses
- * from the end of virtual memory (0xfffff000) backwards.
- * Also this lets us do fail-safe vmalloc(), we
- * can guarantee that these special addresses and
- * vmalloc()-ed addresses never overlap.
- *
- * these 'compile-time allocated' memory buffers are
- * fixed-size 4k pages. (or larger if used with an increment
- * highger than 1) use fixmap_set(idx,phys) to associate
- * physical memory with fixmap indices.
- *
- * TLB entries of such buffers will not be flushed across
- * task switches.
- */
-
-/*
- * on UP currently we will have no trace of the fixmap mechanizm,
- * no page table allocations, etc. This might change in the
- * future, say framebuffers for the console driver(s) could be
- * fix-mapped?
- */
-enum fixed_addresses {
-#ifdef CONFIG_HIGHMEM
-       FIX_KMAP_BEGIN, /* reserved pte's for temporary kernel mappings */
-       FIX_KMAP_END = FIX_KMAP_BEGIN+(KM_TYPE_NR*NR_CPUS)-1,
-#endif
-       __end_of_fixed_addresses
-};
-
-extern void __set_fixmap (enum fixed_addresses idx,
-                                       unsigned long phys, pgprot_t flags);
-
-#define set_fixmap(idx, phys) \
-               __set_fixmap(idx, phys, PAGE_KERNEL)
-/*
- * Some hardware wants to get fixmapped without caching.
- */
-#define set_fixmap_nocache(idx, phys) \
-               __set_fixmap(idx, phys, PAGE_KERNEL_NOCACHE)
-/*
- * used by vmalloc.c.
- *
- * Leave one empty page between vmalloc'ed areas and
- * the start of the fixmap, and leave one page empty
- * at the top of mem..
- */
-#define FIXADDR_TOP    (P4SEG - PAGE_SIZE)
-#define FIXADDR_SIZE   (__end_of_fixed_addresses << PAGE_SHIFT)
-#define FIXADDR_START  (FIXADDR_TOP - FIXADDR_SIZE)
-
-#define __fix_to_virt(x)       (FIXADDR_TOP - ((x) << PAGE_SHIFT))
-#define __virt_to_fix(x)       ((FIXADDR_TOP - ((x)&PAGE_MASK)) >> PAGE_SHIFT)
-
-extern void __this_fixmap_does_not_exist(void);
-
-/*
- * 'index to address' translation. If anyone tries to use the idx
- * directly without tranlation, we catch the bug with a NULL-deference
- * kernel oops. Illegal ranges of incoming indices are caught too.
- */
-static inline unsigned long fix_to_virt(const unsigned int idx)
-{
-       /*
-        * this branch gets completely eliminated after inlining,
-        * except when someone tries to use fixaddr indices in an
-        * illegal way. (such as mixing up address types or using
-        * out-of-range indices).
-        *
-        * If it doesn't get removed, the linker will complain
-        * loudly with a reasonably clear error message..
-        */
-       if (idx >= __end_of_fixed_addresses)
-               __this_fixmap_does_not_exist();
-
-        return __fix_to_virt(idx);
-}
-
-static inline unsigned long virt_to_fix(const unsigned long vaddr)
-{
-       BUG_ON(vaddr >= FIXADDR_TOP || vaddr < FIXADDR_START);
-       return __virt_to_fix(vaddr);
-}
-
-#endif
diff --git a/include/asm-sh/hp6xx/ide.h b/include/asm-sh/hp6xx/ide.h
deleted file mode 100644 (file)
index 570395a..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-#ifndef __ASM_SH_HP6XX_IDE_H
-#define __ASM_SH_HP6XX_IDE_H
-
-#define IRQ_CFCARD     93
-#define IRQ_PCMCIA     94
-
-#endif /* __ASM_SH_HP6XX_IDE_H */
-
diff --git a/include/asm-sh/hs7751rvoip/hs7751rvoip.h b/include/asm-sh/hs7751rvoip/hs7751rvoip.h
deleted file mode 100644 (file)
index 5f995f9..0000000
+++ /dev/null
@@ -1,47 +0,0 @@
-#ifndef __ASM_SH_RENESAS_HS7751RVOIP_H
-#define __ASM_SH_RENESAS_HS7751RVOIP_H
-
-/*
- * linux/include/asm-sh/hs7751rvoip/hs7751rvoip.h
- *
- * Copyright (C) 2000  Atom Create Engineering Co., Ltd.
- *
- * Renesas Technology Sales HS7751RVoIP support
- */
-
-/* Box specific addresses.  */
-
-#define PA_BCR         0xa4000000      /* FPGA */
-#define PA_SLICCNTR1   0xa4000006      /* SLIC PIO Control 1 */
-#define PA_SLICCNTR2   0xa4000008      /* SLIC PIO Control 2 */
-#define PA_DMACNTR     0xa400000a      /* USB DMA Control */
-#define PA_INPORTR     0xa400000c      /* Input Port Register */
-#define PA_OUTPORTR    0xa400000e      /* Output Port Reguster */
-#define PA_VERREG      0xa4000014      /* FPGA Version Register */
-
-#define PA_AREA5_IO    0xb4000000      /* Area 5 IO Memory */
-#define PA_AREA6_IO    0xb8000000      /* Area 6 IO Memory */
-#define PA_IDE_OFFSET  0x1f0           /* CF IDE Offset */
-
-#define IRLCNTR1       (PA_BCR + 0)    /* Interrupt Control Register1 */
-#define IRLCNTR2       (PA_BCR + 2)    /* Interrupt Control Register2 */
-#define IRLCNTR3       (PA_BCR + 4)    /* Interrupt Control Register3 */
-#define IRLCNTR4       (PA_BCR + 16)   /* Interrupt Control Register4 */
-#define IRLCNTR5       (PA_BCR + 18)   /* Interrupt Control Register5 */
-
-#define IRQ_PCIETH     6               /* PCI Ethernet IRQ */
-#define IRQ_PCIHUB     7               /* PCI Ethernet Hub IRQ */
-#define IRQ_USBCOM     8               /* USB Comunication IRQ */
-#define IRQ_USBCON     9               /* USB Connect IRQ */
-#define IRQ_USBDMA     10              /* USB DMA IRQ */
-#define IRQ_CFCARD     11              /* CF Card IRQ */
-#define IRQ_PCMCIA     12              /* PCMCIA IRQ */
-#define IRQ_PCISLOT    13              /* PCI Slot #1 IRQ */
-#define IRQ_ONHOOK1    0               /* ON HOOK1 IRQ */
-#define IRQ_OFFHOOK1   1               /* OFF HOOK1 IRQ */
-#define IRQ_ONHOOK2    2               /* ON HOOK2 IRQ */
-#define IRQ_OFFHOOK2   3               /* OFF HOOK2 IRQ */
-#define        IRQ_RINGING     4               /* Ringing IRQ */
-#define        IRQ_CODEC       5               /* CODEC IRQ */
-
-#endif  /* __ASM_SH_RENESAS_HS7751RVOIP */
diff --git a/include/asm-sh/hs7751rvoip/ide.h b/include/asm-sh/hs7751rvoip/ide.h
deleted file mode 100644 (file)
index 65ad1d0..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-#ifndef __ASM_SH_HS7751RVOIP_IDE_H
-#define __ASM_SH_HS7751RVOIP_IDE_H
-
-/* Nothing to see here.. */
-#include <asm/hs7751rvoip/hs7751rvoip.h>
-
-#endif /* __ASM_SH_HS7751RVOIP_IDE_H */
-
diff --git a/include/asm-sh/hs7751rvoip/io.h b/include/asm-sh/hs7751rvoip/io.h
deleted file mode 100644 (file)
index 513c851..0000000
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * include/asm-sh/hs7751rvoip/hs7751rvoip.h
- *
- * Modified version of io_se.h for the hs7751rvoip-specific functions.
- *
- * May be copied or modified under the terms of the GNU General Public
- * License.  See linux/COPYING for more information.
- *
- * IO functions for an Renesas Technology sales HS7751RVOIP
- */
-
-#ifndef _ASM_SH_IO_HS7751RVOIP_H
-#define _ASM_SH_IO_HS7751RVOIP_H
-
-#include <asm/io_generic.h>
-
-extern unsigned char hs7751rvoip_inb(unsigned long port);
-extern unsigned short hs7751rvoip_inw(unsigned long port);
-extern unsigned int hs7751rvoip_inl(unsigned long port);
-
-extern void hs7751rvoip_outb(unsigned char value, unsigned long port);
-extern void hs7751rvoip_outw(unsigned short value, unsigned long port);
-extern void hs7751rvoip_outl(unsigned int value, unsigned long port);
-
-extern unsigned char hs7751rvoip_inb_p(unsigned long port);
-extern void hs7751rvoip_outb_p(unsigned char value, unsigned long port);
-
-extern void hs7751rvoip_insb(unsigned long port, void *addr, unsigned long count);
-extern void hs7751rvoip_insw(unsigned long port, void *addr, unsigned long count);
-extern void hs7751rvoip_insl(unsigned long port, void *addr, unsigned long count);
-extern void hs7751rvoip_outsb(unsigned long port, const void *addr, unsigned long count);
-extern void hs7751rvoip_outsw(unsigned long port, const void *addr, unsigned long count);
-extern void hs7751rvoip_outsl(unsigned long port, const void *addr, unsigned long count);
-
-extern void *hs7751rvoip_ioremap(unsigned long offset, unsigned long size);
-
-extern unsigned long hs7751rvoip_isa_port2addr(unsigned long offset);
-
-#endif /* _ASM_SH_IO_HS7751RVOIP_H */
diff --git a/include/asm-sh/rts7751r2d/ide.h b/include/asm-sh/rts7751r2d/ide.h
deleted file mode 100644 (file)
index 416f96b..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-#ifndef __ASM_SH_RTS7751R2D_IDE_H
-#define __ASM_SH_RTS7751R2D_IDE_H
-
-/* Nothing to see here.. */
-#include <asm/rts7751r2d/rts7751r2d.h>
-
-#endif /* __ASM_SH_RTS7751R2D_IDE_H */
-
diff --git a/include/asm-sh/rts7751r2d/io.h b/include/asm-sh/rts7751r2d/io.h
deleted file mode 100644 (file)
index 2410940..0000000
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * include/asm-sh/io_rts7751r2d.h
- *
- * Modified version of io_se.h for the rts7751r2d-specific functions.
- *
- * May be copied or modified under the terms of the GNU General Public
- * License.  See linux/COPYING for more information.
- *
- * IO functions for an Renesas Technology sales RTS7751R2D
- */
-
-#ifndef _ASM_SH_IO_RTS7751R2D_H
-#define _ASM_SH_IO_RTS7751R2D_H
-
-extern unsigned char rts7751r2d_inb(unsigned long port);
-extern unsigned short rts7751r2d_inw(unsigned long port);
-extern unsigned int rts7751r2d_inl(unsigned long port);
-
-extern void rts7751r2d_outb(unsigned char value, unsigned long port);
-extern void rts7751r2d_outw(unsigned short value, unsigned long port);
-extern void rts7751r2d_outl(unsigned int value, unsigned long port);
-
-extern unsigned char rts7751r2d_inb_p(unsigned long port);
-extern void rts7751r2d_outb_p(unsigned char value, unsigned long port);
-
-extern void rts7751r2d_insb(unsigned long port, void *addr, unsigned long count);
-extern void rts7751r2d_insw(unsigned long port, void *addr, unsigned long count);
-extern void rts7751r2d_insl(unsigned long port, void *addr, unsigned long count);
-extern void rts7751r2d_outsb(unsigned long port, const void *addr, unsigned long count);
-extern void rts7751r2d_outsw(unsigned long port, const void *addr, unsigned long count);
-extern void rts7751r2d_outsl(unsigned long port, const void *addr, unsigned long count);
-
-extern void *rts7751r2d_ioremap(unsigned long offset, unsigned long size);
-
-extern unsigned long rts7751r2d_isa_port2addr(unsigned long offset);
-
-#endif /* _ASM_SH_IO_RTS7751R2D_H */
diff --git a/include/asm-sh/rts7751r2d/rts7751r2d.h b/include/asm-sh/rts7751r2d/rts7751r2d.h
deleted file mode 100644 (file)
index 4e09ba5..0000000
+++ /dev/null
@@ -1,73 +0,0 @@
-#ifndef __ASM_SH_RENESAS_RTS7751R2D_H
-#define __ASM_SH_RENESAS_RTS7751R2D_H
-
-/*
- * linux/include/asm-sh/renesas_rts7751r2d.h
- *
- * Copyright (C) 2000  Atom Create Engineering Co., Ltd.
- *
- * Renesas Technology Sales RTS7751R2D support
- */
-
-/* Box specific addresses.  */
-
-#define PA_BCR         0xa4000000      /* FPGA */
-#define PA_IRLMON      0xa4000002      /* Interrupt Status control */
-#define PA_CFCTL       0xa4000004      /* CF Timing control */
-#define PA_CFPOW       0xa4000006      /* CF Power control */
-#define PA_DISPCTL     0xa4000008      /* Display Timing control */
-#define PA_SDMPOW      0xa400000a      /* SD Power control */
-#define PA_RTCCE       0xa400000c      /* RTC(9701) Enable control */
-#define PA_PCICD       0xa400000e      /* PCI Extention detect control */
-#define PA_VOYAGERRTS  0xa4000020      /* VOYAGER Reset control */
-#if defined(CONFIG_RTS7751R2D_REV11)
-#define PA_AXRST       0xa4000022      /* AX_LAN Reset control */
-#define PA_CFRST       0xa4000024      /* CF Reset control */
-#define        PA_ADMRTS       0xa4000026      /* SD Reset control */
-#define PA_EXTRST      0xa4000028      /* Extention Reset control */
-#define PA_CFCDINTCLR  0xa400002a      /* CF Insert Interrupt clear */
-#else
-#define PA_CFRST       0xa4000022      /* CF Reset control */
-#define        PA_ADMRTS       0xa4000024      /* SD Reset control */
-#define PA_EXTRST      0xa4000026      /* Extention Reset control */
-#define PA_CFCDINTCLR  0xa4000028      /* CF Insert Interrupt clear */
-#define        PA_KEYCTLCLR    0xa400002a      /* Key Interrupt clear */
-#endif
-#define PA_POWOFF      0xa4000030      /* Board Power OFF control */
-#define PA_VERREG      0xa4000032      /* FPGA Version Register */
-#define PA_INPORT      0xa4000034      /* KEY Input Port control */
-#define PA_OUTPORT     0xa4000036      /* LED control */
-#define PA_DMPORT      0xa4000038      /* DM270 Output Port control */
-
-#define PA_AX88796L    0xaa000400      /* AX88796L Area */
-#define PA_VOYAGER     0xab000000      /* VOYAGER GX Area */
-#define PA_AREA5_IO    0xb4000000      /* Area 5 IO Memory */
-#define PA_AREA6_IO    0xb8000000      /* Area 6 IO Memory */
-#define PA_IDE_OFFSET  0x1f0           /* CF IDE Offset */
-#define AX88796L_IO_BASE       0x1000  /* AX88796L IO Base Address */
-
-#define IRLCNTR1       (PA_BCR + 0)    /* Interrupt Control Register1 */
-
-#if defined(CONFIG_RTS7751R2D_REV11)
-#define IRQ_PCIETH     0               /* PCI Ethernet IRQ */
-#define IRQ_CFCARD     1               /* CF Card IRQ */
-#define IRQ_CFINST     2               /* CF Card Insert IRQ */
-#define IRQ_PCMCIA     3               /* PCMCIA IRQ */
-#define IRQ_VOYAGER    4               /* VOYAGER IRQ */
-#define IRQ_ONETH      5               /* On board Ethernet IRQ */
-#else
-#define IRQ_KEYIN      0               /* Key Input IRQ */
-#define IRQ_PCIETH     1               /* PCI Ethernet IRQ */
-#define IRQ_CFCARD     2               /* CF Card IRQ */
-#define IRQ_CFINST     3               /* CF Card Insert IRQ */
-#define IRQ_PCMCIA     4               /* PCMCIA IRQ */
-#define IRQ_VOYAGER    5               /* VOYAGER IRQ */
-#endif
-#define IRQ_RTCALM     6               /* RTC Alarm IRQ */
-#define IRQ_RTCTIME    7               /* RTC Timer IRQ */
-#define IRQ_SDCARD     8               /* SD Card IRQ */
-#define IRQ_PCISLOT1   9               /* PCI Slot #1 IRQ */
-#define IRQ_PCISLOT2   10              /* PCI Slot #2 IRQ */
-#define        IRQ_EXTENTION   11              /* EXTn IRQ */
-
-#endif  /* __ASM_SH_RENESAS_RTS7751R2D */
diff --git a/include/asm-sh/rts7751r2d/voyagergx_reg.h b/include/asm-sh/rts7751r2d/voyagergx_reg.h
deleted file mode 100644 (file)
index f031b5d..0000000
+++ /dev/null
@@ -1,313 +0,0 @@
-/* -------------------------------------------------------------------- */
-/* voyagergx_reg.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., 675 Mass Ave, Cambridge, MA 02139, USA.
-
-    Copyright 2003 (c) Lineo uSolutions,Inc.
-*/
-/* -------------------------------------------------------------------- */
-
-#ifndef _VOYAGER_GX_REG_H
-#define _VOYAGER_GX_REG_H
-
-#define VOYAGER_BASE                   0xb3e00000
-#define VOYAGER_USBH_BASE              (0x40000 + VOYAGER_BASE)
-#define VOYAGER_UART_BASE              (0x30000 + VOYAGER_BASE)
-#define        VOYAGER_AC97_BASE               (0xa0000 + VOYAGER_BASE)
-
-#define VOYAGER_IRQ_NUM                        32
-#define VOYAGER_IRQ_BASE               50
-#define VOYAGER_USBH_IRQ               VOYAGER_IRQ_BASE + 6
-#define VOYAGER_8051_IRQ               VOYAGER_IRQ_BASE + 10
-#define VOYAGER_UART0_IRQ              VOYAGER_IRQ_BASE + 12
-#define VOYAGER_UART1_IRQ              VOYAGER_IRQ_BASE + 13
-#define        VOYAGER_AC97_IRQ                VOYAGER_IRQ_BASE + 17
-
-/* ----- MISC controle  register ------------------------------ */
-#define MISC_CTRL                      (0x000004 + VOYAGER_BASE)
-#define MISC_CTRL_USBCLK_48            (3 << 28)
-#define MISC_CTRL_USBCLK_96            (2 << 28)
-#define MISC_CTRL_USBCLK_CRYSTAL       (1 << 28)
-
-/* ----- GPIO[31:0] register --------------------------------- */
-#define GPIO_MUX_LOW                   (0x000008 + VOYAGER_BASE)
-#define GPIO_MUX_LOW_AC97              0x1F000000
-#define GPIO_MUX_LOW_8051              0x0000ffff
-#define GPIO_MUX_LOW_PWM               (1 << 29)
-
-/* ----- GPIO[63:32] register --------------------------------- */
-#define GPIO_MUX_HIGH                  (0x00000C + VOYAGER_BASE)
-
-/* ----- DRAM controle  register ------------------------------- */
-#define DRAM_CTRL                      (0x000010 + VOYAGER_BASE)
-#define DRAM_CTRL_EMBEDDED             (1 << 31)
-#define DRAM_CTRL_CPU_BURST_1          (0 << 28)
-#define DRAM_CTRL_CPU_BURST_2          (1 << 28)
-#define DRAM_CTRL_CPU_BURST_4          (2 << 28)
-#define DRAM_CTRL_CPU_BURST_8          (3 << 28)
-#define DRAM_CTRL_CPU_CAS_LATENCY      (1 << 27)
-#define DRAM_CTRL_CPU_SIZE_2           (0 << 24)
-#define DRAM_CTRL_CPU_SIZE_4           (1 << 24)
-#define DRAM_CTRL_CPU_SIZE_64          (4 << 24)
-#define DRAM_CTRL_CPU_SIZE_32          (5 << 24)
-#define DRAM_CTRL_CPU_SIZE_16          (6 << 24)
-#define DRAM_CTRL_CPU_SIZE_8           (7 << 24)
-#define DRAM_CTRL_CPU_COLUMN_SIZE_1024 (0 << 22)
-#define DRAM_CTRL_CPU_COLUMN_SIZE_512  (2 << 22)
-#define DRAM_CTRL_CPU_COLUMN_SIZE_256  (3 << 22)
-#define DRAM_CTRL_CPU_ACTIVE_PRECHARGE (1 << 21)
-#define DRAM_CTRL_CPU_RESET            (1 << 20)
-#define DRAM_CTRL_CPU_BANKS            (1 << 19)
-#define DRAM_CTRL_CPU_WRITE_PRECHARGE  (1 << 18)
-#define DRAM_CTRL_BLOCK_WRITE          (1 << 17)
-#define DRAM_CTRL_REFRESH_COMMAND      (1 << 16)
-#define DRAM_CTRL_SIZE_4               (0 << 13)
-#define DRAM_CTRL_SIZE_8               (1 << 13)
-#define DRAM_CTRL_SIZE_16              (2 << 13)
-#define DRAM_CTRL_SIZE_32              (3 << 13)
-#define DRAM_CTRL_SIZE_64              (4 << 13)
-#define DRAM_CTRL_SIZE_2               (5 << 13)
-#define DRAM_CTRL_COLUMN_SIZE_256      (0 << 11)
-#define DRAM_CTRL_COLUMN_SIZE_512      (2 << 11)
-#define DRAM_CTRL_COLUMN_SIZE_1024     (3 << 11)
-#define DRAM_CTRL_BLOCK_WRITE_TIME     (1 << 10)
-#define DRAM_CTRL_BLOCK_WRITE_PRECHARGE        (1 << 9)
-#define DRAM_CTRL_ACTIVE_PRECHARGE     (1 << 8)
-#define DRAM_CTRL_RESET                        (1 << 7)
-#define DRAM_CTRL_REMAIN_ACTIVE                (1 << 6)
-#define DRAM_CTRL_BANKS                        (1 << 1)
-#define DRAM_CTRL_WRITE_PRECHARGE      (1 << 0)
-
-/* ----- Arvitration control register -------------------------- */
-#define ARBITRATION_CTRL               (0x000014 + VOYAGER_BASE)
-#define ARBITRATION_CTRL_CPUMEM                (1 << 29)
-#define ARBITRATION_CTRL_INTMEM                (1 << 28)
-#define ARBITRATION_CTRL_USB_OFF       (0 << 24)
-#define ARBITRATION_CTRL_USB_PRIORITY_1        (1 << 24)
-#define ARBITRATION_CTRL_USB_PRIORITY_2        (2 << 24)
-#define ARBITRATION_CTRL_USB_PRIORITY_3        (3 << 24)
-#define ARBITRATION_CTRL_USB_PRIORITY_4        (4 << 24)
-#define ARBITRATION_CTRL_USB_PRIORITY_5        (5 << 24)
-#define ARBITRATION_CTRL_USB_PRIORITY_6        (6 << 24)
-#define ARBITRATION_CTRL_USB_PRIORITY_7        (7 << 24)
-#define ARBITRATION_CTRL_PANEL_OFF     (0 << 20)
-#define ARBITRATION_CTRL_PANEL_PRIORITY_1      (1 << 20)
-#define ARBITRATION_CTRL_PANEL_PRIORITY_2      (2 << 20)
-#define ARBITRATION_CTRL_PANEL_PRIORITY_3      (3 << 20)
-#define ARBITRATION_CTRL_PANEL_PRIORITY_4      (4 << 20)
-#define ARBITRATION_CTRL_PANEL_PRIORITY_5      (5 << 20)
-#define ARBITRATION_CTRL_PANEL_PRIORITY_6      (6 << 20)
-#define ARBITRATION_CTRL_PANEL_PRIORITY_7      (7 << 20)
-#define ARBITRATION_CTRL_ZVPORT_OFF    (0 << 16)
-#define ARBITRATION_CTRL_ZVPORTL_PRIORITY_1    (1 << 16)
-#define ARBITRATION_CTRL_ZVPORTL_PRIORITY_2    (2 << 16)
-#define ARBITRATION_CTRL_ZVPORTL_PRIORITY_3    (3 << 16)
-#define ARBITRATION_CTRL_ZVPORTL_PRIORITY_4    (4 << 16)
-#define ARBITRATION_CTRL_ZVPORTL_PRIORITY_5    (5 << 16)
-#define ARBITRATION_CTRL_ZVPORTL_PRIORITY_6    (6 << 16)
-#define ARBITRATION_CTRL_ZVPORTL_PRIORITY_7    (7 << 16)
-#define ARBITRATION_CTRL_CMD_INTPR_OFF (0 << 12)
-#define ARBITRATION_CTRL_CMD_INTPR_PRIORITY_1  (1 << 12)
-#define ARBITRATION_CTRL_CMD_INTPR_PRIORITY_2  (2 << 12)
-#define ARBITRATION_CTRL_CMD_INTPR_PRIORITY_3  (3 << 12)
-#define ARBITRATION_CTRL_CMD_INTPR_PRIORITY_4  (4 << 12)
-#define ARBITRATION_CTRL_CMD_INTPR_PRIORITY_5  (5 << 12)
-#define ARBITRATION_CTRL_CMD_INTPR_PRIORITY_6  (6 << 12)
-#define ARBITRATION_CTRL_CMD_INTPR_PRIORITY_7  (7 << 12)
-#define ARBITRATION_CTRL_DMA_OFF       (0 << 8)
-#define ARBITRATION_CTRL_DMA_PRIORITY_1        (1 << 8)
-#define ARBITRATION_CTRL_DMA_PRIORITY_2        (2 << 8)
-#define ARBITRATION_CTRL_DMA_PRIORITY_3        (3 << 8)
-#define ARBITRATION_CTRL_DMA_PRIORITY_4        (4 << 8)
-#define ARBITRATION_CTRL_DMA_PRIORITY_5        (5 << 8)
-#define ARBITRATION_CTRL_DMA_PRIORITY_6        (6 << 8)
-#define ARBITRATION_CTRL_DMA_PRIORITY_7        (7 << 8)
-#define ARBITRATION_CTRL_VIDEO_OFF     (0 << 4)
-#define ARBITRATION_CTRL_VIDEO_PRIORITY_1      (1 << 4)
-#define ARBITRATION_CTRL_VIDEO_PRIORITY_2      (2 << 4)
-#define ARBITRATION_CTRL_VIDEO_PRIORITY_3      (3 << 4)
-#define ARBITRATION_CTRL_VIDEO_PRIORITY_4      (4 << 4)
-#define ARBITRATION_CTRL_VIDEO_PRIORITY_5      (5 << 4)
-#define ARBITRATION_CTRL_VIDEO_PRIORITY_6      (6 << 4)
-#define ARBITRATION_CTRL_VIDEO_PRIORITY_7      (7 << 4)
-#define ARBITRATION_CTRL_CRT_OFF       (0 << 0)
-#define ARBITRATION_CTRL_CRT_PRIORITY_1        (1 << 0)
-#define ARBITRATION_CTRL_CRT_PRIORITY_2        (2 << 0)
-#define ARBITRATION_CTRL_CRT_PRIORITY_3        (3 << 0)
-#define ARBITRATION_CTRL_CRT_PRIORITY_4        (4 << 0)
-#define ARBITRATION_CTRL_CRT_PRIORITY_5        (5 << 0)
-#define ARBITRATION_CTRL_CRT_PRIORITY_6        (6 << 0)
-#define ARBITRATION_CTRL_CRT_PRIORITY_7        (7 << 0)
-
-/* ----- Command list status register -------------------------- */
-#define CMD_INTPR_STATUS               (0x000024 + VOYAGER_BASE)
-
-/* ----- Interrupt status register ----------------------------- */
-#define INT_STATUS                     (0x00002c + VOYAGER_BASE)
-#define INT_STATUS_UH                  (1 << 6)
-#define INT_STATUS_MC                  (1 << 10)
-#define INT_STATUS_U0                  (1 << 12)
-#define INT_STATUS_U1                  (1 << 13)
-#define        INT_STATUS_AC                   (1 << 17)
-
-/* ----- Interrupt mask register ------------------------------ */
-#define VOYAGER_INT_MASK               (0x000030 + VOYAGER_BASE)
-#define VOYAGER_INT_MASK_AC            (1 << 17)
-
-/* ----- Current Gate register ---------------------------------*/
-#define CURRENT_GATE                   (0x000038 + VOYAGER_BASE)
-
-/* ----- Power mode 0 gate register --------------------------- */
-#define POWER_MODE0_GATE               (0x000040 + VOYAGER_BASE)
-#define POWER_MODE0_GATE_G             (1 << 6)
-#define POWER_MODE0_GATE_U0            (1 << 7)
-#define POWER_MODE0_GATE_U1            (1 << 8)
-#define POWER_MODE0_GATE_UH            (1 << 11)
-#define        POWER_MODE0_GATE_AC             (1 << 18)
-
-/* ----- Power mode 1 gate register --------------------------- */
-#define POWER_MODE1_GATE               (0x000048 + VOYAGER_BASE)
-#define POWER_MODE1_GATE_G             (1 << 6)
-#define POWER_MODE1_GATE_U0            (1 << 7)
-#define POWER_MODE1_GATE_U1            (1 << 8)
-#define POWER_MODE1_GATE_UH            (1 << 11)
-#define        POWER_MODE1_GATE_AC             (1 << 18)
-
-/* ----- Power mode 0 clock register -------------------------- */
-#define POWER_MODE0_CLOCK              (0x000044 + VOYAGER_BASE)
-
-/* ----- Power mode 1 clock register -------------------------- */
-#define POWER_MODE1_CLOCK              (0x00004C + VOYAGER_BASE)
-
-/* ----- Power mode controll register ------------------------- */
-#define POWER_MODE_CTRL                        (0x000054 + VOYAGER_BASE)
-
-/* ----- Miscellaneous Timing register ------------------------ */
-#define SYSTEM_DRAM_CTRL               (0x000068 + VOYAGER_BASE)
-
-/* ----- PWM register ------------------------------------------*/
-#define PWM_0                          (0x010020 + VOYAGER_BASE)
-#define PWM_0_HC(x)                    (((x)&0x0fff)<<20)
-#define PWM_0_LC(x)                    (((x)&0x0fff)<<8 )
-#define PWM_0_CLK_DEV(x)               (((x)&0x000f)<<4 )
-#define PWM_0_EN                       (1<<0)
-
-/* ----- I2C register ----------------------------------------- */
-#define I2C_BYTECOUNT                  (0x010040 + VOYAGER_BASE)
-#define I2C_CONTROL                    (0x010041 + VOYAGER_BASE)
-#define I2C_STATUS                     (0x010042 + VOYAGER_BASE)
-#define I2C_RESET                      (0x010042 + VOYAGER_BASE)
-#define I2C_SADDRESS                   (0x010043 + VOYAGER_BASE)
-#define I2C_DATA                       (0x010044 + VOYAGER_BASE)
-
-/* ----- Controle register bits ----------------------------------------- */
-#define I2C_CONTROL_E                  (1 << 0)
-#define I2C_CONTROL_MODE               (1 << 1)
-#define I2C_CONTROL_STATUS             (1 << 2)
-#define I2C_CONTROL_INT                        (1 << 4)
-#define I2C_CONTROL_INTACK             (1 << 5)
-#define I2C_CONTROL_REPEAT             (1 << 6)
-
-/* ----- Status register bits ----------------------------------------- */
-#define I2C_STATUS_BUSY                        (1 << 0)
-#define I2C_STATUS_ACK                 (1 << 1)
-#define I2C_STATUS_ERROR               (1 << 2)
-#define I2C_STATUS_COMPLETE            (1 << 3)
-
-/* ----- Reset register  ---------------------------------------------- */
-#define I2C_RESET_ERROR                        (1 << 2)
-
-/* ----- transmission frequencies ------------------------------------- */
-#define I2C_SADDRESS_SELECT            (1 << 0)
-
-/* ----- Display Controll register ----------------------------------------- */
-#define PANEL_DISPLAY_CTRL             (0x080000 + VOYAGER_BASE)
-#define PANEL_DISPLAY_CTRL_BIAS         (1<<26)
-#define PANEL_PAN_CTRL                 (0x080004 + VOYAGER_BASE)
-#define PANEL_COLOR_KEY                        (0x080008 + VOYAGER_BASE)
-#define PANEL_FB_ADDRESS               (0x08000C + VOYAGER_BASE)
-#define PANEL_FB_WIDTH                 (0x080010 + VOYAGER_BASE)
-#define PANEL_WINDOW_WIDTH             (0x080014 + VOYAGER_BASE)
-#define PANEL_WINDOW_HEIGHT            (0x080018 + VOYAGER_BASE)
-#define PANEL_PLANE_TL                 (0x08001C + VOYAGER_BASE)
-#define PANEL_PLANE_BR                 (0x080020 + VOYAGER_BASE)
-#define PANEL_HORIZONTAL_TOTAL         (0x080024 + VOYAGER_BASE)
-#define PANEL_HORIZONTAL_SYNC          (0x080028 + VOYAGER_BASE)
-#define PANEL_VERTICAL_TOTAL           (0x08002C + VOYAGER_BASE)
-#define PANEL_VERTICAL_SYNC            (0x080030 + VOYAGER_BASE)
-#define PANEL_CURRENT_LINE             (0x080034 + VOYAGER_BASE)
-#define VIDEO_DISPLAY_CTRL             (0x080040 + VOYAGER_BASE)
-#define VIDEO_FB_0_ADDRESS             (0x080044 + VOYAGER_BASE)
-#define VIDEO_FB_WIDTH                 (0x080048 + VOYAGER_BASE)
-#define VIDEO_FB_0_LAST_ADDRESS                (0x08004C + VOYAGER_BASE)
-#define VIDEO_PLANE_TL                 (0x080050 + VOYAGER_BASE)
-#define VIDEO_PLANE_BR                 (0x080054 + VOYAGER_BASE)
-#define VIDEO_SCALE                    (0x080058 + VOYAGER_BASE)
-#define VIDEO_INITIAL_SCALE            (0x08005C + VOYAGER_BASE)
-#define VIDEO_YUV_CONSTANTS            (0x080060 + VOYAGER_BASE)
-#define VIDEO_FB_1_ADDRESS             (0x080064 + VOYAGER_BASE)
-#define VIDEO_FB_1_LAST_ADDRESS                (0x080068 + VOYAGER_BASE)
-#define VIDEO_ALPHA_DISPLAY_CTRL       (0x080080 + VOYAGER_BASE)
-#define VIDEO_ALPHA_FB_ADDRESS         (0x080084 + VOYAGER_BASE)
-#define VIDEO_ALPHA_FB_WIDTH           (0x080088 + VOYAGER_BASE)
-#define VIDEO_ALPHA_FB_LAST_ADDRESS    (0x08008C + VOYAGER_BASE)
-#define VIDEO_ALPHA_PLANE_TL           (0x080090 + VOYAGER_BASE)
-#define VIDEO_ALPHA_PLANE_BR           (0x080094 + VOYAGER_BASE)
-#define VIDEO_ALPHA_SCALE              (0x080098 + VOYAGER_BASE)
-#define VIDEO_ALPHA_INITIAL_SCALE      (0x08009C + VOYAGER_BASE)
-#define VIDEO_ALPHA_CHROMA_KEY         (0x0800A0 + VOYAGER_BASE)
-#define PANEL_HWC_ADDRESS              (0x0800F0 + VOYAGER_BASE)
-#define PANEL_HWC_LOCATION             (0x0800F4 + VOYAGER_BASE)
-#define PANEL_HWC_COLOR_12             (0x0800F8 + VOYAGER_BASE)
-#define PANEL_HWC_COLOR_3              (0x0800FC + VOYAGER_BASE)
-#define ALPHA_DISPLAY_CTRL             (0x080100 + VOYAGER_BASE)
-#define ALPHA_FB_ADDRESS               (0x080104 + VOYAGER_BASE)
-#define ALPHA_FB_WIDTH                 (0x080108 + VOYAGER_BASE)
-#define ALPHA_PLANE_TL                 (0x08010C + VOYAGER_BASE)
-#define ALPHA_PLANE_BR                 (0x080110 + VOYAGER_BASE)
-#define ALPHA_CHROMA_KEY               (0x080114 + VOYAGER_BASE)
-#define CRT_DISPLAY_CTRL               (0x080200 + VOYAGER_BASE)
-#define CRT_FB_ADDRESS                 (0x080204 + VOYAGER_BASE)
-#define CRT_FB_WIDTH                   (0x080208 + VOYAGER_BASE)
-#define CRT_HORIZONTAL_TOTAL           (0x08020C + VOYAGER_BASE)
-#define CRT_HORIZONTAL_SYNC            (0x080210 + VOYAGER_BASE)
-#define CRT_VERTICAL_TOTAL             (0x080214 + VOYAGER_BASE)
-#define CRT_VERTICAL_SYNC              (0x080218 + VOYAGER_BASE)
-#define CRT_SIGNATURE_ANALYZER         (0x08021C + VOYAGER_BASE)
-#define CRT_CURRENT_LINE               (0x080220 + VOYAGER_BASE)
-#define CRT_MONITOR_DETECT             (0x080224 + VOYAGER_BASE)
-#define CRT_HWC_ADDRESS                        (0x080230 + VOYAGER_BASE)
-#define CRT_HWC_LOCATION               (0x080234 + VOYAGER_BASE)
-#define CRT_HWC_COLOR_12               (0x080238 + VOYAGER_BASE)
-#define CRT_HWC_COLOR_3                        (0x08023C + VOYAGER_BASE)
-#define CRT_PALETTE_RAM                        (0x080400 + VOYAGER_BASE)
-#define PANEL_PALETTE_RAM              (0x080800 + VOYAGER_BASE)
-#define VIDEO_PALETTE_RAM              (0x080C00 + VOYAGER_BASE)
-
-/* ----- 8051 Controle register ----------------------------------------- */
-#define VOYAGER_8051_BASE              (0x000c0000 + VOYAGER_BASE)
-#define VOYAGER_8051_RESET             (0x000b0000 + VOYAGER_BASE)
-#define VOYAGER_8051_SELECT            (0x000b0004 + VOYAGER_BASE)
-#define VOYAGER_8051_CPU_INT           (0x000b000c + VOYAGER_BASE)
-
-/* ----- AC97 Controle register ----------------------------------------- */
-#define AC97_TX_SLOT0                  (0x00000000 + VOYAGER_AC97_BASE)
-#define AC97_CONTROL_STATUS            (0x00000080 + VOYAGER_AC97_BASE)
-#define AC97C_READ                     (1 << 19)
-#define AC97C_WD_BIT                   (1 << 2)
-#define AC97C_INDEX_MASK               0x7f
-/* -------------------------------------------------------------------- */
-
-#endif /* _VOYAGER_GX_REG_H */
diff --git a/include/asm-sh/se7300/io.h b/include/asm-sh/se7300/io.h
deleted file mode 100644 (file)
index c6af855..0000000
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * include/asm-sh/se7300/io.h
- *
- * Copyright (C) 2003 Takashi Kusuda <kusuda-takashi@hitachi-ul.co.jp>
- * IO functions for SH-Mobile(SH7300) SolutionEngine
- */
-
-#ifndef _ASM_SH_IO_7300SE_H
-#define _ASM_SH_IO_7300SE_H
-
-extern unsigned char sh7300se_inb(unsigned long port);
-extern unsigned short sh7300se_inw(unsigned long port);
-extern unsigned int sh7300se_inl(unsigned long port);
-
-extern void sh7300se_outb(unsigned char value, unsigned long port);
-extern void sh7300se_outw(unsigned short value, unsigned long port);
-extern void sh7300se_outl(unsigned int value, unsigned long port);
-
-extern unsigned char sh7300se_inb_p(unsigned long port);
-extern void sh7300se_outb_p(unsigned char value, unsigned long port);
-
-extern void sh7300se_insb(unsigned long port, void *addr, unsigned long count);
-extern void sh7300se_insw(unsigned long port, void *addr, unsigned long count);
-extern void sh7300se_insl(unsigned long port, void *addr, unsigned long count);
-extern void sh7300se_outsb(unsigned long port, const void *addr, unsigned long count);
-extern void sh7300se_outsw(unsigned long port, const void *addr, unsigned long count);
-extern void sh7300se_outsl(unsigned long port, const void *addr, unsigned long count);
-
-#endif /* _ASM_SH_IO_7300SE_H */
diff --git a/include/asm-sh/se7300/se7300.h b/include/asm-sh/se7300/se7300.h
deleted file mode 100644 (file)
index 3ec1ded..0000000
+++ /dev/null
@@ -1,61 +0,0 @@
-#ifndef __ASM_SH_HITACHI_SE7300_H
-#define __ASM_SH_HITACHI_SE7300_H
-
-/*
- * linux/include/asm-sh/se/se7300.h
- *
- * Copyright (C) 2003 Takashi Kusuda <kusuda-takashi@hitachi-ul.co.jp>
- *
- * SH-Mobile SolutionEngine 7300 support
- */
-
-/* Box specific addresses.  */
-
-/* Area 0 */
-#define PA_ROM         0x00000000      /* EPROM */
-#define PA_ROM_SIZE    0x00400000      /* EPROM size 4M byte(Actually 2MB) */
-#define PA_FROM                0x00400000      /* Flash ROM */
-#define PA_FROM_SIZE   0x00400000      /* Flash size 4M byte */
-#define PA_SRAM                0x00800000      /* SRAM */
-#define PA_FROM_SIZE   0x00400000      /* SRAM size 4M byte */
-/* Area 1 */
-#define PA_EXT1                0x04000000
-#define PA_EXT1_SIZE   0x04000000
-/* Area 2 */
-#define PA_EXT2                0x08000000
-#define PA_EXT2_SIZE   0x04000000
-/* Area 3 */
-#define PA_SDRAM       0x0c000000
-#define PA_SDRAM_SIZE  0x04000000
-/* Area 4 */
-#define PA_PCIC                0x10000000      /* MR-SHPC-01 PCMCIA */
-#define PA_MRSHPC       0xb03fffe0      /* MR-SHPC-01 PCMCIA controller */
-#define PA_MRSHPC_MW1   0xb0400000      /* MR-SHPC-01 memory window base */
-#define PA_MRSHPC_MW2   0xb0500000      /* MR-SHPC-01 attribute window base */
-#define PA_MRSHPC_IO    0xb0600000      /* MR-SHPC-01 I/O window base */
-#define MRSHPC_OPTION   (PA_MRSHPC + 6)
-#define MRSHPC_CSR      (PA_MRSHPC + 8)
-#define MRSHPC_ISR      (PA_MRSHPC + 10)
-#define MRSHPC_ICR      (PA_MRSHPC + 12)
-#define MRSHPC_CPWCR    (PA_MRSHPC + 14)
-#define MRSHPC_MW0CR1   (PA_MRSHPC + 16)
-#define MRSHPC_MW1CR1   (PA_MRSHPC + 18)
-#define MRSHPC_IOWCR1   (PA_MRSHPC + 20)
-#define MRSHPC_MW0CR2   (PA_MRSHPC + 22)
-#define MRSHPC_MW1CR2   (PA_MRSHPC + 24)
-#define MRSHPC_IOWCR2   (PA_MRSHPC + 26)
-#define MRSHPC_CDCR     (PA_MRSHPC + 28)
-#define MRSHPC_PCIC_INFO (PA_MRSHPC + 30)
-#define PA_LED         0xb0800000      /* LED */
-#define PA_DIPSW       0xb0900000      /* Dip switch 31 */
-#define PA_EPLD_MODESET        0xb0a00000      /* FPGA Mode set register */
-#define PA_EPLD_ST1    0xb0a80000      /* FPGA Interrupt status register1 */
-#define PA_EPLD_ST2    0xb0ac0000      /* FPGA Interrupt status register2 */
-/* Area 5 */
-#define PA_EXT5                0x14000000
-#define PA_EXT5_SIZE   0x04000000
-/* Area 6 */
-#define PA_LCD1                0xb8000000
-#define PA_LCD2                0xb8800000
-
-#endif  /* __ASM_SH_HITACHI_SE7300_H */
diff --git a/include/asm-sh/setup.h b/include/asm-sh/setup.h
deleted file mode 100644 (file)
index d19de7c..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-#ifdef __KERNEL__
-#ifndef _SH_SETUP_H
-#define _SH_SETUP_H
-
-#define COMMAND_LINE_SIZE 256
-
-#endif /* _SH_SETUP_H */
-#endif /* __KERNEL__ */
diff --git a/include/asm-sh64/a.out.h b/include/asm-sh64/a.out.h
deleted file mode 100644 (file)
index e1995e8..0000000
+++ /dev/null
@@ -1,37 +0,0 @@
-#ifndef __ASM_SH64_A_OUT_H
-#define __ASM_SH64_A_OUT_H
-
-/*
- * 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/asm-sh64/a.out.h
- *
- * Copyright (C) 2000, 2001  Paolo Alberelli
- *
- */
-
-struct exec
-{
-  unsigned long a_info;                /* Use macros N_MAGIC, etc for access */
-  unsigned a_text;             /* length of text, in bytes */
-  unsigned a_data;             /* length of data, in bytes */
-  unsigned a_bss;              /* length of uninitialized data area for file, in bytes */
-  unsigned a_syms;             /* length of symbol table data in file, in bytes */
-  unsigned a_entry;            /* start address */
-  unsigned a_trsize;           /* length of relocation info for text, in bytes */
-  unsigned a_drsize;           /* length of relocation info for data, in bytes */
-};
-
-#define N_TRSIZE(a)    ((a).a_trsize)
-#define N_DRSIZE(a)    ((a).a_drsize)
-#define N_SYMSIZE(a)   ((a).a_syms)
-
-#ifdef __KERNEL__
-
-#define STACK_TOP      TASK_SIZE
-
-#endif
-
-#endif /* __ASM_SH64_A_OUT_H */
diff --git a/include/asm-sh64/atomic.h b/include/asm-sh64/atomic.h
deleted file mode 100644 (file)
index 8c3872d..0000000
+++ /dev/null
@@ -1,126 +0,0 @@
-#ifndef __ASM_SH64_ATOMIC_H
-#define __ASM_SH64_ATOMIC_H
-
-/*
- * 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/asm-sh64/atomic.h
- *
- * Copyright (C) 2000, 2001  Paolo Alberelli
- * Copyright (C) 2003  Paul Mundt
- *
- */
-
-/*
- * Atomic operations that C can't guarantee us.  Useful for
- * resource counting etc..
- *
- */
-
-typedef struct { volatile int counter; } atomic_t;
-
-#define ATOMIC_INIT(i) ( (atomic_t) { (i) } )
-
-#define atomic_read(v)         ((v)->counter)
-#define atomic_set(v,i)                ((v)->counter = (i))
-
-#include <asm/system.h>
-
-/*
- * To get proper branch prediction for the main line, we must branch
- * forward to code at the end of this object's .text section, then
- * branch back to restart the operation.
- */
-
-static __inline__ void atomic_add(int i, atomic_t * v)
-{
-       unsigned long flags;
-
-       local_irq_save(flags);
-       *(long *)v += i;
-       local_irq_restore(flags);
-}
-
-static __inline__ void atomic_sub(int i, atomic_t *v)
-{
-       unsigned long flags;
-
-       local_irq_save(flags);
-       *(long *)v -= i;
-       local_irq_restore(flags);
-}
-
-static __inline__ int atomic_add_return(int i, atomic_t * v)
-{
-       unsigned long temp, flags;
-
-       local_irq_save(flags);
-       temp = *(long *)v;
-       temp += i;
-       *(long *)v = temp;
-       local_irq_restore(flags);
-
-       return temp;
-}
-
-#define atomic_add_negative(a, v)      (atomic_add_return((a), (v)) < 0)
-
-static __inline__ int atomic_sub_return(int i, atomic_t * v)
-{
-       unsigned long temp, flags;
-
-       local_irq_save(flags);
-       temp = *(long *)v;
-       temp -= i;
-       *(long *)v = temp;
-       local_irq_restore(flags);
-
-       return temp;
-}
-
-#define atomic_dec_return(v) atomic_sub_return(1,(v))
-#define atomic_inc_return(v) atomic_add_return(1,(v))
-
-/*
- * atomic_inc_and_test - increment and test
- * @v: pointer of type atomic_t
- *
- * Atomically increments @v by 1
- * and returns true if the result is zero, or false for all
- * other cases.
- */
-#define atomic_inc_and_test(v) (atomic_inc_return(v) == 0)
-
-#define atomic_sub_and_test(i,v) (atomic_sub_return((i), (v)) == 0)
-#define atomic_dec_and_test(v) (atomic_sub_return(1, (v)) == 0)
-
-#define atomic_inc(v) atomic_add(1,(v))
-#define atomic_dec(v) atomic_sub(1,(v))
-
-static __inline__ void atomic_clear_mask(unsigned int mask, atomic_t *v)
-{
-       unsigned long flags;
-
-       local_irq_save(flags);
-       *(long *)v &= ~mask;
-       local_irq_restore(flags);
-}
-
-static __inline__ void atomic_set_mask(unsigned int mask, atomic_t *v)
-{
-       unsigned long flags;
-
-       local_irq_save(flags);
-       *(long *)v |= mask;
-       local_irq_restore(flags);
-}
-
-/* Atomic operations are already serializing on SH */
-#define smp_mb__before_atomic_dec()    barrier()
-#define smp_mb__after_atomic_dec()     barrier()
-#define smp_mb__before_atomic_inc()    barrier()
-#define smp_mb__after_atomic_inc()     barrier()
-
-#endif /* __ASM_SH64_ATOMIC_H */
diff --git a/include/asm-sh64/bitops.h b/include/asm-sh64/bitops.h
deleted file mode 100644 (file)
index e1ff63e..0000000
+++ /dev/null
@@ -1,516 +0,0 @@
-#ifndef __ASM_SH64_BITOPS_H
-#define __ASM_SH64_BITOPS_H
-
-/*
- * 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/asm-sh64/bitops.h
- *
- * Copyright (C) 2000, 2001  Paolo Alberelli
- * Copyright (C) 2003  Paul Mundt
- */
-
-#ifdef __KERNEL__
-#include <linux/compiler.h>
-#include <asm/system.h>
-/* For __swab32 */
-#include <asm/byteorder.h>
-
-static __inline__ void set_bit(int nr, volatile void * addr)
-{
-       int     mask;
-       volatile unsigned int *a = addr;
-       unsigned long flags;
-
-       a += nr >> 5;
-       mask = 1 << (nr & 0x1f);
-       local_irq_save(flags);
-       *a |= mask;
-       local_irq_restore(flags);
-}
-
-static inline void __set_bit(int nr, void *addr)
-{
-       int     mask;
-       unsigned int *a = addr;
-
-       a += nr >> 5;
-       mask = 1 << (nr & 0x1f);
-       *a |= mask;
-}
-
-/*
- * clear_bit() doesn't provide any barrier for the compiler.
- */
-#define smp_mb__before_clear_bit()     barrier()
-#define smp_mb__after_clear_bit()      barrier()
-static inline void clear_bit(int nr, volatile unsigned long *a)
-{
-       int     mask;
-       unsigned long flags;
-
-       a += nr >> 5;
-       mask = 1 << (nr & 0x1f);
-       local_irq_save(flags);
-       *a &= ~mask;
-       local_irq_restore(flags);
-}
-
-static inline void __clear_bit(int nr, volatile unsigned long *a)
-{
-       int     mask;
-
-       a += nr >> 5;
-       mask = 1 << (nr & 0x1f);
-       *a &= ~mask;
-}
-
-static __inline__ void change_bit(int nr, volatile void * addr)
-{
-       int     mask;
-       volatile unsigned int *a = addr;
-       unsigned long flags;
-
-       a += nr >> 5;
-       mask = 1 << (nr & 0x1f);
-       local_irq_save(flags);
-       *a ^= mask;
-       local_irq_restore(flags);
-}
-
-static __inline__ void __change_bit(int nr, volatile void * addr)
-{
-       int     mask;
-       volatile unsigned int *a = addr;
-
-       a += nr >> 5;
-       mask = 1 << (nr & 0x1f);
-       *a ^= mask;
-}
-
-static __inline__ int test_and_set_bit(int nr, volatile void * addr)
-{
-       int     mask, retval;
-       volatile unsigned int *a = addr;
-       unsigned long flags;
-
-       a += nr >> 5;
-       mask = 1 << (nr & 0x1f);
-       local_irq_save(flags);
-       retval = (mask & *a) != 0;
-       *a |= mask;
-       local_irq_restore(flags);
-
-       return retval;
-}
-
-static __inline__ int __test_and_set_bit(int nr, volatile void * addr)
-{
-       int     mask, retval;
-       volatile unsigned int *a = addr;
-
-       a += nr >> 5;
-       mask = 1 << (nr & 0x1f);
-       retval = (mask & *a) != 0;
-       *a |= mask;
-
-       return retval;
-}
-
-static __inline__ int test_and_clear_bit(int nr, volatile void * addr)
-{
-       int     mask, retval;
-       volatile unsigned int *a = addr;
-       unsigned long flags;
-
-       a += nr >> 5;
-       mask = 1 << (nr & 0x1f);
-       local_irq_save(flags);
-       retval = (mask & *a) != 0;
-       *a &= ~mask;
-       local_irq_restore(flags);
-
-       return retval;
-}
-
-static __inline__ int __test_and_clear_bit(int nr, volatile void * addr)
-{
-       int     mask, retval;
-       volatile unsigned int *a = addr;
-
-       a += nr >> 5;
-       mask = 1 << (nr & 0x1f);
-       retval = (mask & *a) != 0;
-       *a &= ~mask;
-
-       return retval;
-}
-
-static __inline__ int test_and_change_bit(int nr, volatile void * addr)
-{
-       int     mask, retval;
-       volatile unsigned int *a = addr;
-       unsigned long flags;
-
-       a += nr >> 5;
-       mask = 1 << (nr & 0x1f);
-       local_irq_save(flags);
-       retval = (mask & *a) != 0;
-       *a ^= mask;
-       local_irq_restore(flags);
-
-       return retval;
-}
-
-static __inline__ int __test_and_change_bit(int nr, volatile void * addr)
-{
-       int     mask, retval;
-       volatile unsigned int *a = addr;
-
-       a += nr >> 5;
-       mask = 1 << (nr & 0x1f);
-       retval = (mask & *a) != 0;
-       *a ^= mask;
-
-       return retval;
-}
-
-static __inline__ int test_bit(int nr, const volatile void *addr)
-{
-       return 1UL & (((const volatile unsigned int *) addr)[nr >> 5] >> (nr & 31));
-}
-
-static __inline__ unsigned long ffz(unsigned long word)
-{
-       unsigned long result, __d2, __d3;
-
-        __asm__("gettr  tr0, %2\n\t"
-                "pta    $+32, tr0\n\t"
-                "andi   %1, 1, %3\n\t"
-                "beq    %3, r63, tr0\n\t"
-                "pta    $+4, tr0\n"
-                "0:\n\t"
-                "shlri.l        %1, 1, %1\n\t"
-                "addi   %0, 1, %0\n\t"
-                "andi   %1, 1, %3\n\t"
-                "beqi   %3, 1, tr0\n"
-                "1:\n\t"
-                "ptabs  %2, tr0\n\t"
-                : "=r" (result), "=r" (word), "=r" (__d2), "=r" (__d3)
-                : "0" (0L), "1" (word));
-
-       return result;
-}
-
-/**
- * __ffs - find first bit in word
- * @word: The word to search
- *
- * Undefined if no bit exists, so code should check against 0 first.
- */
-static inline unsigned long __ffs(unsigned long word)
-{
-       int r = 0;
-
-       if (!word)
-               return 0;
-       if (!(word & 0xffff)) {
-               word >>= 16;
-               r += 16;
-       }
-       if (!(word & 0xff)) {
-               word >>= 8;
-               r += 8;
-       }
-       if (!(word & 0xf)) {
-               word >>= 4;
-               r += 4;
-       }
-       if (!(word & 3)) {
-               word >>= 2;
-               r += 2;
-       }
-       if (!(word & 1)) {
-               word >>= 1;
-               r += 1;
-       }
-       return r;
-}
-
-/**
- * find_next_bit - find the next set bit in a memory region
- * @addr: The address to base the search on
- * @offset: The bitnumber to start searching at
- * @size: The maximum size to search
- */
-static inline unsigned long find_next_bit(const unsigned long *addr,
-       unsigned long size, unsigned long offset)
-{
-       unsigned int *p = ((unsigned int *) addr) + (offset >> 5);
-       unsigned int result = offset & ~31UL;
-       unsigned int tmp;
-
-       if (offset >= size)
-               return size;
-       size -= result;
-       offset &= 31UL;
-       if (offset) {
-               tmp = *p++;
-               tmp &= ~0UL << offset;
-               if (size < 32)
-                       goto found_first;
-               if (tmp)
-                       goto found_middle;
-               size -= 32;
-               result += 32;
-       }
-       while (size >= 32) {
-               if ((tmp = *p++) != 0)
-                       goto found_middle;
-               result += 32;
-               size -= 32;
-       }
-       if (!size)
-               return result;
-       tmp = *p;
-
-found_first:
-       tmp &= ~0UL >> (32 - size);
-       if (tmp == 0UL)        /* Are any bits set? */
-               return result + size; /* Nope. */
-found_middle:
-       return result + __ffs(tmp);
-}
-
-/**
- * find_first_bit - find the first set bit in a memory region
- * @addr: The address to start the search at
- * @size: The maximum size to search
- *
- * Returns the bit-number of the first set bit, not the number of the byte
- * containing a bit.
- */
-#define find_first_bit(addr, size) \
-       find_next_bit((addr), (size), 0)
-
-
-static inline int find_next_zero_bit(void *addr, int size, int offset)
-{
-       unsigned long *p = ((unsigned long *) addr) + (offset >> 5);
-       unsigned long result = offset & ~31UL;
-       unsigned long tmp;
-
-       if (offset >= size)
-               return size;
-       size -= result;
-       offset &= 31UL;
-       if (offset) {
-               tmp = *(p++);
-               tmp |= ~0UL >> (32-offset);
-               if (size < 32)
-                       goto found_first;
-               if (~tmp)
-                       goto found_middle;
-               size -= 32;
-               result += 32;
-       }
-       while (size & ~31UL) {
-               if (~(tmp = *(p++)))
-                       goto found_middle;
-               result += 32;
-               size -= 32;
-       }
-       if (!size)
-               return result;
-       tmp = *p;
-
-found_first:
-       tmp |= ~0UL << size;
-found_middle:
-       return result + ffz(tmp);
-}
-
-#define find_first_zero_bit(addr, size) \
-        find_next_zero_bit((addr), (size), 0)
-
-/*
- * hweightN: returns the hamming weight (i.e. the number
- * of bits set) of a N-bit word
- */
-
-#define hweight32(x)   generic_hweight32(x)
-#define hweight16(x)   generic_hweight16(x)
-#define hweight8(x)    generic_hweight8(x)
-
-/*
- * Every architecture must define this function. It's the fastest
- * way of searching a 140-bit bitmap where the first 100 bits are
- * unlikely to be set. It's guaranteed that at least one of the 140
- * bits is cleared.
- */
-
-static inline int sched_find_first_bit(unsigned long *b)
-{
-       if (unlikely(b[0]))
-               return __ffs(b[0]);
-       if (unlikely(b[1]))
-               return __ffs(b[1]) + 32;
-       if (unlikely(b[2]))
-               return __ffs(b[2]) + 64;
-       if (b[3])
-               return __ffs(b[3]) + 96;
-       return __ffs(b[4]) + 128;
-}
-
-/*
- * ffs: find first bit set. This is defined the same way as
- * the libc and compiler builtin ffs routines, therefore
- * differs in spirit from the above ffz (man ffs).
- */
-
-#define ffs(x) generic_ffs(x)
-
-/*
- * hweightN: returns the hamming weight (i.e. the number
- * of bits set) of a N-bit word
- */
-
-#define hweight32(x) generic_hweight32(x)
-#define hweight16(x) generic_hweight16(x)
-#define hweight8(x) generic_hweight8(x)
-
-#ifdef __LITTLE_ENDIAN__
-#define ext2_set_bit(nr, addr) test_and_set_bit((nr), (addr))
-#define ext2_clear_bit(nr, addr) test_and_clear_bit((nr), (addr))
-#define ext2_test_bit(nr, addr) test_bit((nr), (addr))
-#define ext2_find_first_zero_bit(addr, size) find_first_zero_bit((addr), (size))
-#define ext2_find_next_zero_bit(addr, size, offset) \
-                find_next_zero_bit((addr), (size), (offset))
-#else
-static __inline__ int ext2_set_bit(int nr, volatile void * addr)
-{
-       int             mask, retval;
-       unsigned long   flags;
-       volatile unsigned char  *ADDR = (unsigned char *) addr;
-
-       ADDR += nr >> 3;
-       mask = 1 << (nr & 0x07);
-       local_irq_save(flags);
-       retval = (mask & *ADDR) != 0;
-       *ADDR |= mask;
-       local_irq_restore(flags);
-       return retval;
-}
-
-static __inline__ int ext2_clear_bit(int nr, volatile void * addr)
-{
-       int             mask, retval;
-       unsigned long   flags;
-       volatile unsigned char  *ADDR = (unsigned char *) addr;
-
-       ADDR += nr >> 3;
-       mask = 1 << (nr & 0x07);
-       local_irq_save(flags);
-       retval = (mask & *ADDR) != 0;
-       *ADDR &= ~mask;
-       local_irq_restore(flags);
-       return retval;
-}
-
-static __inline__ int ext2_test_bit(int nr, const volatile void * addr)
-{
-       int                     mask;
-       const volatile unsigned char    *ADDR = (const unsigned char *) addr;
-
-       ADDR += nr >> 3;
-       mask = 1 << (nr & 0x07);
-       return ((mask & *ADDR) != 0);
-}
-
-#define ext2_find_first_zero_bit(addr, size) \
-        ext2_find_next_zero_bit((addr), (size), 0)
-
-static __inline__ unsigned long ext2_find_next_zero_bit(void *addr, unsigned long size, unsigned long offset)
-{
-       unsigned long *p = ((unsigned long *) addr) + (offset >> 5);
-       unsigned long result = offset & ~31UL;
-       unsigned long tmp;
-
-       if (offset >= size)
-               return size;
-       size -= result;
-       offset &= 31UL;
-       if(offset) {
-               /* We hold the little endian value in tmp, but then the
-                * shift is illegal. So we could keep a big endian value
-                * in tmp, like this:
-                *
-                * tmp = __swab32(*(p++));
-                * tmp |= ~0UL >> (32-offset);
-                *
-                * but this would decrease preformance, so we change the
-                * shift:
-                */
-               tmp = *(p++);
-               tmp |= __swab32(~0UL >> (32-offset));
-               if(size < 32)
-                       goto found_first;
-               if(~tmp)
-                       goto found_middle;
-               size -= 32;
-               result += 32;
-       }
-       while(size & ~31UL) {
-               if(~(tmp = *(p++)))
-                       goto found_middle;
-               result += 32;
-               size -= 32;
-       }
-       if(!size)
-               return result;
-       tmp = *p;
-
-found_first:
-       /* tmp is little endian, so we would have to swab the shift,
-        * see above. But then we have to swab tmp below for ffz, so
-        * we might as well do this here.
-        */
-       return result + ffz(__swab32(tmp) | (~0UL << size));
-found_middle:
-       return result + ffz(__swab32(tmp));
-}
-#endif
-
-#define ext2_set_bit_atomic(lock, nr, addr)            \
-       ({                                              \
-               int ret;                                \
-               spin_lock(lock);                        \
-               ret = ext2_set_bit((nr), (addr));       \
-               spin_unlock(lock);                      \
-               ret;                                    \
-       })
-
-#define ext2_clear_bit_atomic(lock, nr, addr)          \
-       ({                                              \
-               int ret;                                \
-               spin_lock(lock);                        \
-               ret = ext2_clear_bit((nr), (addr));     \
-               spin_unlock(lock);                      \
-               ret;                                    \
-       })
-
-/* Bitmap functions for the minix filesystem.  */
-#define minix_test_and_set_bit(nr,addr) test_and_set_bit(nr,addr)
-#define minix_set_bit(nr,addr) set_bit(nr,addr)
-#define minix_test_and_clear_bit(nr,addr) test_and_clear_bit(nr,addr)
-#define minix_test_bit(nr,addr) test_bit(nr,addr)
-#define minix_find_first_zero_bit(addr,size) find_first_zero_bit(addr,size)
-
-#define ffs(x) generic_ffs(x)
-#define fls(x) generic_fls(x)
-
-#endif /* __KERNEL__ */
-
-#endif /* __ASM_SH64_BITOPS_H */
diff --git a/include/asm-sh64/bug.h b/include/asm-sh64/bug.h
deleted file mode 100644 (file)
index 9a81b72..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-#ifndef __ASM_SH64_BUG_H
-#define __ASM_SH64_BUG_H
-
-#include <asm-sh/bug.h>
-
-#endif /* __ASM_SH64_BUG_H */
-
diff --git a/include/asm-sh64/bugs.h b/include/asm-sh64/bugs.h
deleted file mode 100644 (file)
index 05554aa..0000000
+++ /dev/null
@@ -1,38 +0,0 @@
-#ifndef __ASM_SH64_BUGS_H
-#define __ASM_SH64_BUGS_H
-
-/*
- * 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/asm-sh64/bugs.h
- *
- * Copyright (C) 2000, 2001  Paolo Alberelli
- * Copyright (C) 2003  Paul Mundt
- *
- */
-
-/*
- * This is included by init/main.c to check for architecture-dependent bugs.
- *
- * Needs:
- *     void check_bugs(void);
- */
-
-/*
- * I don't know of any Super-H bugs yet.
- */
-
-#include <asm/processor.h>
-
-static void __init check_bugs(void)
-{
-       extern char *get_cpu_subtype(void);
-       extern unsigned long loops_per_jiffy;
-
-       cpu_data->loops_per_jiffy = loops_per_jiffy;
-
-       printk("CPU: %s\n", get_cpu_subtype());
-}
-#endif /* __ASM_SH64_BUGS_H */
diff --git a/include/asm-sh64/byteorder.h b/include/asm-sh64/byteorder.h
deleted file mode 100644 (file)
index f602ebe..0000000
+++ /dev/null
@@ -1,49 +0,0 @@
-#ifndef __ASM_SH64_BYTEORDER_H
-#define __ASM_SH64_BYTEORDER_H
-
-/*
- * 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/asm-sh64/byteorder.h
- *
- * Copyright (C) 2000, 2001  Paolo Alberelli
- *
- */
-
-#include <asm/types.h>
-
-static __inline__ __const__ __u32 ___arch__swab32(__u32 x)
-{
-       __asm__("byterev        %0, %0\n\t"
-               "shari          %0, 32, %0"
-               : "=r" (x)
-               : "0" (x));
-       return x;
-}
-
-static __inline__ __const__ __u16 ___arch__swab16(__u16 x)
-{
-       __asm__("byterev        %0, %0\n\t"
-               "shari          %0, 48, %0"
-               : "=r" (x)
-               : "0" (x));
-       return x;
-}
-
-#define __arch__swab32(x) ___arch__swab32(x)
-#define __arch__swab16(x) ___arch__swab16(x)
-
-#if !defined(__STRICT_ANSI__) || defined(__KERNEL__)
-#  define __BYTEORDER_HAS_U64__
-#  define __SWAB_64_THRU_32__
-#endif
-
-#ifdef __LITTLE_ENDIAN__
-#include <linux/byteorder/little_endian.h>
-#else
-#include <linux/byteorder/big_endian.h>
-#endif
-
-#endif /* __ASM_SH64_BYTEORDER_H */
diff --git a/include/asm-sh64/cache.h b/include/asm-sh64/cache.h
deleted file mode 100644 (file)
index f54e85e..0000000
+++ /dev/null
@@ -1,141 +0,0 @@
-#ifndef __ASM_SH64_CACHE_H
-#define __ASM_SH64_CACHE_H
-
-/*
- * 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/asm-sh64/cache.h
- *
- * Copyright (C) 2000, 2001  Paolo Alberelli
- * Copyright (C) 2003, 2004  Paul Mundt
- *
- */
-#include <asm/cacheflush.h>
-
-#define L1_CACHE_SHIFT         5
-/* bytes per L1 cache line */
-#define L1_CACHE_BYTES         (1 << L1_CACHE_SHIFT)
-#define L1_CACHE_ALIGN_MASK    (~(L1_CACHE_BYTES - 1))
-#define L1_CACHE_ALIGN(x)      (((x)+(L1_CACHE_BYTES - 1)) & L1_CACHE_ALIGN_MASK)
-#define L1_CACHE_SIZE_BYTES    (L1_CACHE_BYTES << 10)
-/* Largest L1 which this arch supports */
-#define L1_CACHE_SHIFT_MAX     5
-
-#ifdef MODULE
-#define __cacheline_aligned __attribute__((__aligned__(L1_CACHE_BYTES)))
-#else
-#define __cacheline_aligned                                    \
-  __attribute__((__aligned__(L1_CACHE_BYTES),                  \
-                __section__(".data.cacheline_aligned")))
-#endif
-
-/*
- * Control Registers.
- */
-#define ICCR_BASE      0x01600000      /* Instruction Cache Control Register */
-#define ICCR_REG0      0               /* Register 0 offset */
-#define ICCR_REG1      1               /* Register 1 offset */
-#define ICCR0          ICCR_BASE+ICCR_REG0
-#define ICCR1          ICCR_BASE+ICCR_REG1
-
-#define ICCR0_OFF      0x0             /* Set ICACHE off */
-#define ICCR0_ON       0x1             /* Set ICACHE on */
-#define ICCR0_ICI      0x2             /* Invalidate all in IC */
-
-#define ICCR1_NOLOCK   0x0             /* Set No Locking */
-
-#define OCCR_BASE      0x01E00000      /* Operand Cache Control Register */
-#define OCCR_REG0      0               /* Register 0 offset */
-#define OCCR_REG1      1               /* Register 1 offset */
-#define OCCR0          OCCR_BASE+OCCR_REG0
-#define OCCR1          OCCR_BASE+OCCR_REG1
-
-#define OCCR0_OFF      0x0             /* Set OCACHE off */
-#define OCCR0_ON       0x1             /* Set OCACHE on */
-#define OCCR0_OCI      0x2             /* Invalidate all in OC */
-#define OCCR0_WT       0x4             /* Set OCACHE in WT Mode */
-#define OCCR0_WB       0x0             /* Set OCACHE in WB Mode */
-
-#define OCCR1_NOLOCK   0x0             /* Set No Locking */
-
-
-/*
- * SH-5
- * A bit of description here, for neff=32.
- *
- *                               |<--- tag  (19 bits) --->|
- * +-----------------------------+-----------------+------+----------+------+
- * |                             |                 | ways |set index |offset|
- * +-----------------------------+-----------------+------+----------+------+
- *                                ^                 2 bits   8 bits   5 bits
- *                                +- Bit 31
- *
- * Cacheline size is based on offset: 5 bits = 32 bytes per line
- * A cache line is identified by a tag + set but OCACHETAG/ICACHETAG
- * have a broader space for registers. These are outlined by
- * CACHE_?C_*_STEP below.
- *
- */
-
-/* Valid and Dirty bits */
-#define SH_CACHE_VALID         (1LL<<0)
-#define SH_CACHE_UPDATED       (1LL<<57)
-
-/* Cache flags */
-#define SH_CACHE_MODE_WT       (1LL<<0)
-#define SH_CACHE_MODE_WB       (1LL<<1)
-
-#ifndef __ASSEMBLY__
-
-/*
- * Cache information structure.
- *
- * Defined for both I and D cache, per-processor.
- */
-struct cache_info {
-       unsigned int ways;
-       unsigned int sets;
-       unsigned int linesz;
-
-       unsigned int way_shift;
-       unsigned int entry_shift;
-       unsigned int set_shift;
-       unsigned int way_step_shift;
-       unsigned int asid_shift;
-
-       unsigned int way_ofs;
-
-       unsigned int asid_mask;
-       unsigned int idx_mask;
-       unsigned int epn_mask;
-
-       unsigned long flags;
-};
-
-#endif /* __ASSEMBLY__ */
-
-/* Instruction cache */
-#define CACHE_IC_ADDRESS_ARRAY 0x01000000
-
-/* Operand Cache */
-#define CACHE_OC_ADDRESS_ARRAY 0x01800000
-
-/* These declarations relate to cache 'synonyms' in the operand cache.  A
-   'synonym' occurs where effective address bits overlap between those used for
-   indexing the cache sets and those passed to the MMU for translation.  In the
-   case of SH5-101 & SH5-103, only bit 12 is affected for 4k pages. */
-
-#define CACHE_OC_N_SYNBITS  1               /* Number of synonym bits */
-#define CACHE_OC_SYN_SHIFT  12
-/* Mask to select synonym bit(s) */
-#define CACHE_OC_SYN_MASK   (((1UL<<CACHE_OC_N_SYNBITS)-1)<<CACHE_OC_SYN_SHIFT)
-
-
-/*
- * Instruction cache can't be invalidated based on physical addresses.
- * No Instruction Cache defines required, then.
- */
-
-#endif /* __ASM_SH64_CACHE_H */
diff --git a/include/asm-sh64/cacheflush.h b/include/asm-sh64/cacheflush.h
deleted file mode 100644 (file)
index 6dcc872..0000000
+++ /dev/null
@@ -1,44 +0,0 @@
-#ifndef __ASM_SH64_CACHEFLUSH_H
-#define __ASM_SH64_CACHEFLUSH_H
-
-#ifndef __ASSEMBLY__
-
-#include <asm/page.h>
-
-struct vm_area_struct;
-struct page;
-struct mm_struct;
-
-extern void flush_cache_all(void);
-extern void flush_cache_mm(struct mm_struct *mm);
-extern void flush_cache_sigtramp(unsigned long start, unsigned long end);
-extern void flush_cache_range(struct vm_area_struct *vma, unsigned long start,
-                             unsigned long end);
-extern void flush_cache_page(struct vm_area_struct *vma, unsigned long addr);
-extern void flush_dcache_page(struct page *pg);
-extern void flush_icache_range(unsigned long start, unsigned long end);
-extern void flush_icache_user_range(struct vm_area_struct *vma,
-                                   struct page *page, unsigned long addr,
-                                   int len);
-
-#define flush_dcache_mmap_lock(mapping)                do { } while (0)
-#define flush_dcache_mmap_unlock(mapping)      do { } while (0)
-
-#define flush_cache_vmap(start, end)           flush_cache_all()
-#define flush_cache_vunmap(start, end)         flush_cache_all()
-
-#define flush_icache_page(vma, page)   do { } while (0)
-
-#define copy_to_user_page(vma, page, vaddr, dst, src, len) \
-do { memcpy(dst, src, len); \
-     flush_icache_user_range(vma, page, vaddr, len); \
-} while (0)
-
-#define copy_from_user_page(vma, page, vaddr, dst, src, len) \
-       memcpy(dst, src, len)
-
-
-#endif /* __ASSEMBLY__ */
-
-#endif /* __ASM_SH64_CACHEFLUSH_H */
-
diff --git a/include/asm-sh64/cayman.h b/include/asm-sh64/cayman.h
deleted file mode 100644 (file)
index 7b6b968..0000000
+++ /dev/null
@@ -1,20 +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.
- *
- * include/asm-sh64/cayman.h
- *
- * Cayman definitions
- *
- * Global defintions for the SH5 Cayman board
- *
- * Copyright (C) 2002 Stuart Menefy
- */
-
-
-/* Setup for the SMSC FDC37C935 / LAN91C100FD */
-#define SMSC_IRQ         IRQ_IRL1
-
-/* Setup for PCI Bus 2, which transmits interrupts via the EPLD */
-#define PCI2_IRQ         IRQ_IRL3
diff --git a/include/asm-sh64/checksum.h b/include/asm-sh64/checksum.h
deleted file mode 100644 (file)
index aa3911a..0000000
+++ /dev/null
@@ -1,95 +0,0 @@
-#ifndef __ASM_SH64_CHECKSUM_H
-#define __ASM_SH64_CHECKSUM_H
-
-/*
- * 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/asm-sh64/checksum.h
- *
- * Copyright (C) 2000, 2001  Paolo Alberelli
- *
- */
-
-#include <asm/registers.h>
-
-/*
- * computes the checksum of a memory block at buff, length len,
- * and adds in "sum" (32-bit)
- *
- * returns a 32-bit number suitable for feeding into itself
- * or csum_tcpudp_magic
- *
- * this function must be called with even lengths, except
- * for the last fragment, which may be odd
- *
- * it's best to have buff aligned on a 32-bit boundary
- */
-asmlinkage unsigned int csum_partial(const unsigned char *buff, int len,
-                                    unsigned int sum);
-
-/*
- *     Note: when you get a NULL pointer exception here this means someone
- *     passed in an incorrect kernel address to one of these functions.
- *
- *     If you use these functions directly please don't forget the
- *     verify_area().
- */
-
-
-unsigned int csum_partial_copy_nocheck(const char *src, char *dst, int len,
-                                      unsigned int sum);
-
-unsigned int csum_partial_copy_from_user(const char *src, char *dst,
-                                        int len, int sum, int *err_ptr);
-
-/*
- * These are the old (and unsafe) way of doing checksums, a warning message will be
- * printed if they are used and an exeption occurs.
- *
- * these functions should go away after some time.
- */
-
-#define csum_partial_copy_fromuser csum_partial_copy
-
-unsigned int csum_partial_copy(const char *src, char *dst, int len,
-                              unsigned int sum);
-
-static inline unsigned short csum_fold(unsigned int sum)
-{
-        sum = (sum & 0xffff) + (sum >> 16);
-        sum = (sum & 0xffff) + (sum >> 16);
-        return ~(sum);
-}
-
-unsigned short ip_fast_csum(unsigned char * iph, unsigned int ihl);
-
-unsigned long csum_tcpudp_nofold(unsigned long saddr, unsigned long daddr,
-                                unsigned short len, unsigned short proto,
-                                unsigned int sum);
-
-/*
- * computes the checksum of the TCP/UDP pseudo-header
- * returns a 16-bit checksum, already complemented
- */
-static inline unsigned short int csum_tcpudp_magic(unsigned long saddr,
-                                                  unsigned long daddr,
-                                                  unsigned short len,
-                                                  unsigned short proto,
-                                                  unsigned int sum)
-{
-       return csum_fold(csum_tcpudp_nofold(saddr,daddr,len,proto,sum));
-}
-
-/*
- * this routine is used for miscellaneous IP-like checksums, mainly
- * in icmp.c
- */
-static inline unsigned short ip_compute_csum(unsigned char * buff, int len)
-{
-       return csum_fold(csum_partial(buff, len, 0));
-}
-
-#endif /* __ASM_SH64_CHECKSUM_H */
-
diff --git a/include/asm-sh64/cpumask.h b/include/asm-sh64/cpumask.h
deleted file mode 100644 (file)
index b7b105d..0000000
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef __ASM_SH64_CPUMASK_H
-#define __ASM_SH64_CPUMASK_H
-
-#include <asm-generic/cpumask.h>
-
-#endif /* __ASM_SH64_CPUMASK_H */
diff --git a/include/asm-sh64/current.h b/include/asm-sh64/current.h
deleted file mode 100644 (file)
index 2612243..0000000
+++ /dev/null
@@ -1,28 +0,0 @@
-#ifndef __ASM_SH64_CURRENT_H
-#define __ASM_SH64_CURRENT_H
-
-/*
- * 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/asm-sh64/current.h
- *
- * Copyright (C) 2000, 2001  Paolo Alberelli
- * Copyright (C) 2003  Paul Mundt
- *
- */
-
-#include <linux/thread_info.h>
-
-struct task_struct;
-
-static __inline__ struct task_struct * get_current(void)
-{
-       return current_thread_info()->task;
-}
-
-#define current get_current()
-
-#endif /* __ASM_SH64_CURRENT_H */
-
diff --git a/include/asm-sh64/delay.h b/include/asm-sh64/delay.h
deleted file mode 100644 (file)
index 6ae3130..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
-#ifndef __ASM_SH64_DELAY_H
-#define __ASM_SH64_DELAY_H
-
-extern void __delay(int loops);
-extern void __udelay(unsigned long long usecs, unsigned long lpj);
-extern void __ndelay(unsigned long long nsecs, unsigned long lpj);
-extern void udelay(unsigned long usecs);
-extern void ndelay(unsigned long nsecs);
-
-#endif /* __ASM_SH64_DELAY_H */
-
diff --git a/include/asm-sh64/div64.h b/include/asm-sh64/div64.h
deleted file mode 100644 (file)
index f758695..0000000
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef __ASM_SH64_DIV64_H
-#define __ASM_SH64_DIV64_H
-
-#include <asm-generic/div64.h>
-
-#endif /* __ASM_SH64_DIV64_H */
diff --git a/include/asm-sh64/dma-mapping.h b/include/asm-sh64/dma-mapping.h
deleted file mode 100644 (file)
index 3a64249..0000000
+++ /dev/null
@@ -1,163 +0,0 @@
-#ifndef __ASM_SH_DMA_MAPPING_H
-#define __ASM_SH_DMA_MAPPING_H
-
-#include <linux/config.h>
-#include <linux/mm.h>
-#include <linux/device.h>
-#include <asm/scatterlist.h>
-#include <asm/io.h>
-
-struct pci_dev;
-extern void *consistent_alloc(struct pci_dev *hwdev, size_t size,
-                                   dma_addr_t *dma_handle);
-extern void consistent_free(struct pci_dev *hwdev, size_t size,
-                                 void *vaddr, dma_addr_t dma_handle);
-
-#define dma_supported(dev, mask)       (1)
-
-static inline int dma_set_mask(struct device *dev, u64 mask)
-{
-       if (!dev->dma_mask || !dma_supported(dev, mask))
-               return -EIO;
-
-       *dev->dma_mask = mask;
-
-       return 0;
-}
-
-static inline void *dma_alloc_coherent(struct device *dev, size_t size,
-                        dma_addr_t *dma_handle, int flag)
-{
-       return consistent_alloc(NULL, size, dma_handle);
-}
-
-static inline void dma_free_coherent(struct device *dev, size_t size,
-                      void *vaddr, dma_addr_t dma_handle)
-{
-       consistent_free(NULL, size, vaddr, dma_handle);
-}
-
-static inline void dma_cache_sync(void *vaddr, size_t size,
-                                 enum dma_data_direction dir)
-{
-       dma_cache_wback_inv((unsigned long)vaddr, size);
-}
-
-static inline dma_addr_t dma_map_single(struct device *dev,
-                                       void *ptr, size_t size,
-                                       enum dma_data_direction dir)
-{
-#if defined(CONFIG_PCI) && !defined(CONFIG_SH_PCIDMA_NONCOHERENT)
-       if (dev->bus == &pci_bus_type)
-               return virt_to_bus(ptr);
-#endif
-       dma_cache_sync(ptr, size, dir);
-
-       return virt_to_bus(ptr);
-}
-
-#define dma_unmap_single(dev, addr, size, dir) do { } while (0)
-
-static inline int dma_map_sg(struct device *dev, struct scatterlist *sg,
-                            int nents, enum dma_data_direction dir)
-{
-       int i;
-
-       for (i = 0; i < nents; i++) {
-#if !defined(CONFIG_PCI) || defined(CONFIG_SH_PCIDMA_NONCOHERENT)
-               dma_cache_sync(page_address(sg[i].page) + sg[i].offset,
-                              sg[i].length, dir);
-#endif
-               sg[i].dma_address = page_to_phys(sg[i].page) + sg[i].offset;
-       }
-
-       return nents;
-}
-
-#define dma_unmap_sg(dev, sg, nents, dir)      do { } while (0)
-
-static inline dma_addr_t dma_map_page(struct device *dev, struct page *page,
-                                     unsigned long offset, size_t size,
-                                     enum dma_data_direction dir)
-{
-       return dma_map_single(dev, page_address(page) + offset, size, dir);
-}
-
-static inline void dma_unmap_page(struct device *dev, dma_addr_t dma_address,
-                                 size_t size, enum dma_data_direction dir)
-{
-       dma_unmap_single(dev, dma_address, size, dir);
-}
-
-static inline void dma_sync_single(struct device *dev, dma_addr_t dma_handle,
-                                  size_t size, enum dma_data_direction dir)
-{
-#if defined(CONFIG_PCI) && !defined(CONFIG_SH_PCIDMA_NONCOHERENT)
-       if (dev->bus == &pci_bus_type)
-               return;
-#endif
-       dma_cache_sync(bus_to_virt(dma_handle), size, dir);
-}
-
-static inline void dma_sync_single_range(struct device *dev,
-                                        dma_addr_t dma_handle,
-                                        unsigned long offset, size_t size,
-                                        enum dma_data_direction dir)
-{
-#if defined(CONFIG_PCI) && !defined(CONFIG_SH_PCIDMA_NONCOHERENT)
-       if (dev->bus == &pci_bus_type)
-               return;
-#endif
-       dma_cache_sync(bus_to_virt(dma_handle) + offset, size, dir);
-}
-
-static inline void dma_sync_sg(struct device *dev, struct scatterlist *sg,
-                              int nelems, enum dma_data_direction dir)
-{
-       int i;
-
-       for (i = 0; i < nelems; i++) {
-#if !defined(CONFIG_PCI) || defined(CONFIG_SH_PCIDMA_NONCOHERENT)
-               dma_cache_sync(page_address(sg[i].page) + sg[i].offset,
-                              sg[i].length, dir);
-#endif
-               sg[i].dma_address = page_to_phys(sg[i].page) + sg[i].offset;
-       }
-}
-
-static inline void dma_sync_single_for_cpu(struct device *dev,
-                                          dma_addr_t dma_handle, size_t size,
-                                          enum dma_data_direction dir)
-       __attribute__ ((alias("dma_sync_single")));
-
-static inline void dma_sync_single_for_device(struct device *dev,
-                                          dma_addr_t dma_handle, size_t size,
-                                          enum dma_data_direction dir)
-       __attribute__ ((alias("dma_sync_single")));
-
-static inline void dma_sync_sg_for_cpu(struct device *dev,
-                                      struct scatterlist *sg, int nelems,
-                                      enum dma_data_direction dir)
-       __attribute__ ((alias("dma_sync_sg")));
-
-static inline void dma_sync_sg_for_device(struct device *dev,
-                                      struct scatterlist *sg, int nelems,
-                                      enum dma_data_direction dir)
-       __attribute__ ((alias("dma_sync_sg")));
-
-static inline int dma_get_cache_alignment(void)
-{
-       /*
-        * Each processor family will define its own L1_CACHE_SHIFT,
-        * L1_CACHE_BYTES wraps to this, so this is always safe.
-        */
-       return L1_CACHE_BYTES;
-}
-
-static inline int dma_mapping_error(dma_addr_t dma_addr)
-{
-       return dma_addr == 0;
-}
-
-#endif /* __ASM_SH_DMA_MAPPING_H */
-
diff --git a/include/asm-sh64/dma.h b/include/asm-sh64/dma.h
deleted file mode 100644 (file)
index e701f39..0000000
+++ /dev/null
@@ -1,41 +0,0 @@
-#ifndef __ASM_SH64_DMA_H
-#define __ASM_SH64_DMA_H
-
-/*
- * 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/asm-sh64/dma.h
- *
- * Copyright (C) 2000, 2001  Paolo Alberelli
- * Copyright (C) 2003  Paul Mundt
- *
- */
-
-#include <linux/mm.h>
-#include <asm/io.h>
-#include <asm/pgtable.h>
-
-#define MAX_DMA_CHANNELS       4
-
-/*
- * SH5 can DMA in any memory area.
- *
- * The static definition is dodgy because it should limit
- * the highest DMA-able address based on the actual
- * Physical memory available. This is actually performed
- * at run time in defining the memory allowed to DMA_ZONE.
- */
-#define MAX_DMA_ADDRESS                ~(NPHYS_MASK)
-
-#define DMA_MODE_READ          0
-#define DMA_MODE_WRITE         1
-
-#ifdef CONFIG_PCI
-extern int isa_dma_bridge_buggy;
-#else
-#define isa_dma_bridge_buggy   (0)
-#endif
-
-#endif /* __ASM_SH64_DMA_H */
diff --git a/include/asm-sh64/elf.h b/include/asm-sh64/elf.h
deleted file mode 100644 (file)
index bc48366..0000000
+++ /dev/null
@@ -1,101 +0,0 @@
-#ifndef __ASM_SH64_ELF_H
-#define __ASM_SH64_ELF_H
-
-/*
- * 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/asm-sh64/elf.h
- *
- * Copyright (C) 2000, 2001  Paolo Alberelli
- *
- */
-
-/*
- * ELF register definitions..
- */
-
-#include <asm/ptrace.h>
-#include <asm/user.h>
-#include <asm/byteorder.h>
-
-typedef unsigned long elf_greg_t;
-
-#define ELF_NGREG (sizeof (struct pt_regs) / sizeof(elf_greg_t))
-typedef elf_greg_t elf_gregset_t[ELF_NGREG];
-
-typedef struct user_fpu_struct elf_fpregset_t;
-
-/*
- * This is used to ensure we don't load something for the wrong architecture.
- */
-#define elf_check_arch(x) ( (x)->e_machine == EM_SH )
-
-/*
- * These are used to set parameters in the core dumps.
- */
-#define ELF_CLASS      ELFCLASS32
-#ifdef __LITTLE_ENDIAN__
-#define ELF_DATA       ELFDATA2LSB
-#else
-#define ELF_DATA       ELFDATA2MSB
-#endif
-#define ELF_ARCH       EM_SH
-
-#define USE_ELF_CORE_DUMP
-#define ELF_EXEC_PAGESIZE      4096
-
-/* This is the location that an ET_DYN program is loaded if exec'ed.  Typical
-   use of this is to invoke "./ld.so someprog" to test out a new version of
-   the loader.  We need to make sure that it is out of the way of the program
-   that it will "exec", and that there is sufficient room for the brk.  */
-
-#define ELF_ET_DYN_BASE         (2 * TASK_SIZE / 3)
-
-
-#define ELF_CORE_COPY_REGS(_dest,_regs)                                \
-       memcpy((char *) &_dest, (char *) _regs,                 \
-              sizeof(struct pt_regs));
-
-/* This yields a mask that user programs can use to figure out what
-   instruction set this CPU supports.  This could be done in user space,
-   but it's not easy, and we've already done it here.  */
-
-#define ELF_HWCAP      (0)
-
-/* This yields a string that ld.so will use to load implementation
-   specific libraries for optimization.  This is more specific in
-   intent than poking at uname or /proc/cpuinfo.
-
-   For the moment, we have only optimizations for the Intel generations,
-   but that could change... */
-
-#define ELF_PLATFORM  (NULL)
-
-#define ELF_PLAT_INIT(_r, load_addr) \
-  do { _r->regs[0]=0; _r->regs[1]=0; _r->regs[2]=0; _r->regs[3]=0; \
-       _r->regs[4]=0; _r->regs[5]=0; _r->regs[6]=0; _r->regs[7]=0; \
-       _r->regs[8]=0; _r->regs[9]=0; _r->regs[10]=0; _r->regs[11]=0; \
-       _r->regs[12]=0; _r->regs[13]=0; _r->regs[14]=0; _r->regs[15]=0; \
-       _r->regs[16]=0; _r->regs[17]=0; _r->regs[18]=0; _r->regs[19]=0; \
-       _r->regs[20]=0; _r->regs[21]=0; _r->regs[22]=0; _r->regs[23]=0; \
-       _r->regs[24]=0; _r->regs[25]=0; _r->regs[26]=0; _r->regs[27]=0; \
-       _r->regs[28]=0; _r->regs[29]=0; _r->regs[30]=0; _r->regs[31]=0; \
-       _r->regs[32]=0; _r->regs[33]=0; _r->regs[34]=0; _r->regs[35]=0; \
-       _r->regs[36]=0; _r->regs[37]=0; _r->regs[38]=0; _r->regs[39]=0; \
-       _r->regs[40]=0; _r->regs[41]=0; _r->regs[42]=0; _r->regs[43]=0; \
-       _r->regs[44]=0; _r->regs[45]=0; _r->regs[46]=0; _r->regs[47]=0; \
-       _r->regs[48]=0; _r->regs[49]=0; _r->regs[50]=0; _r->regs[51]=0; \
-       _r->regs[52]=0; _r->regs[53]=0; _r->regs[54]=0; _r->regs[55]=0; \
-       _r->regs[56]=0; _r->regs[57]=0; _r->regs[58]=0; _r->regs[59]=0; \
-       _r->regs[60]=0; _r->regs[61]=0; _r->regs[62]=0; \
-       _r->tregs[0]=0; _r->tregs[1]=0; _r->tregs[2]=0; _r->tregs[3]=0; \
-       _r->tregs[4]=0; _r->tregs[5]=0; _r->tregs[6]=0; _r->tregs[7]=0; \
-       _r->sr = SR_FD | SR_MMU; } while (0)
-
-#ifdef __KERNEL__
-#define SET_PERSONALITY(ex, ibcs2) set_personality(PER_LINUX_32BIT)
-#endif
-
-#endif /* __ASM_SH64_ELF_H */
diff --git a/include/asm-sh64/errno.h b/include/asm-sh64/errno.h
deleted file mode 100644 (file)
index 57b46d4..0000000
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef __ASM_SH64_ERRNO_H
-#define __ASM_SH64_ERRNO_H
-
-#include <asm-generic/errno.h>
-
-#endif /* __ASM_SH64_ERRNO_H */
diff --git a/include/asm-sh64/fcntl.h b/include/asm-sh64/fcntl.h
deleted file mode 100644 (file)
index ffcc36c..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-#ifndef __ASM_SH64_FCNTL_H
-#define __ASM_SH64_FCNTL_H
-
-#include <asm-sh/fcntl.h>
-
-#endif /* __ASM_SH64_FCNTL_H */
-
diff --git a/include/asm-sh64/hardirq.h b/include/asm-sh64/hardirq.h
deleted file mode 100644 (file)
index 75bb083..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-#ifndef __ASM_SH64_HARDIRQ_H
-#define __ASM_SH64_HARDIRQ_H
-
-#include <asm-sh/hardirq.h>
-
-#endif /* __ASM_SH64_HARDIRQ_H */
-
diff --git a/include/asm-sh64/hardware.h b/include/asm-sh64/hardware.h
deleted file mode 100644 (file)
index a2e6112..0000000
+++ /dev/null
@@ -1,45 +0,0 @@
-#ifndef __ASM_SH64_HARDWARE_H
-#define __ASM_SH64_HARDWARE_H
-
-/*
- * 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/asm-sh64/hardware.h
- *
- * Copyright (C) 2002 Stuart Menefy
- * Copyright (C) 2003 Paul Mundt
- *
- * Defitions of the locations of registers in the physical address space.
- */
-
-#define        PHYS_PERIPHERAL_BLOCK   0x09000000
-#define PHYS_DMAC_BLOCK                0x0e000000
-#define PHYS_PCI_BLOCK         0x60000000
-
-#ifndef __ASSEMBLY__
-#include <linux/types.h>
-#include <asm/io.h>
-
-struct vcr_info {
-       u8      perr_flags;     /* P-port Error flags */
-       u8      merr_flags;     /* Module Error flags */
-       u16     mod_vers;       /* Module Version */
-       u16     mod_id;         /* Module ID */
-       u8      bot_mb;         /* Bottom Memory block */
-       u8      top_mb;         /* Top Memory block */
-};
-
-static inline struct vcr_info sh64_get_vcr_info(unsigned long base)
-{
-       unsigned long long tmp;
-
-       tmp = sh64_in64(base);
-
-       return *((struct vcr_info *)&tmp);
-}
-
-#endif /* __ASSEMBLY__ */
-
-#endif /* __ASM_SH64_HARDWARE_H */
diff --git a/include/asm-sh64/hdreg.h b/include/asm-sh64/hdreg.h
deleted file mode 100644 (file)
index 52d9836..0000000
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef __ASM_SH64_HDREG_H
-#define __ASM_SH64_HDREG_H
-
-#include <asm-generic/hdreg.h>
-
-#endif /* __ASM_SH64_HDREG_H */
diff --git a/include/asm-sh64/hw_irq.h b/include/asm-sh64/hw_irq.h
deleted file mode 100644 (file)
index ae718d1..0000000
+++ /dev/null
@@ -1,16 +0,0 @@
-#ifndef __ASM_SH64_HW_IRQ_H
-#define __ASM_SH64_HW_IRQ_H
-
-/*
- * 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/asm-sh64/hw_irq.h
- *
- * Copyright (C) 2000, 2001  Paolo Alberelli
- *
- */
-static __inline__ void hw_resend_irq(struct hw_interrupt_type *h, unsigned int i) { /* Nothing to do */ }
-
-#endif /* __ASM_SH64_HW_IRQ_H */
diff --git a/include/asm-sh64/ide.h b/include/asm-sh64/ide.h
deleted file mode 100644 (file)
index 900315a..0000000
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- *  linux/include/asm-sh64/ide.h
- *
- *  Copyright (C) 1994-1996  Linus Torvalds & authors
- *
- *  sh64 version by Richard Curnow & Paul Mundt
- */
-
-/*
- *  This file contains the sh64 architecture specific IDE code.
- */
-
-#ifndef __ASM_SH64_IDE_H
-#define __ASM_SH64_IDE_H
-
-#ifdef __KERNEL__
-
-#include <linux/config.h>
-
-#ifndef MAX_HWIFS
-#define MAX_HWIFS      CONFIG_IDE_MAX_HWIFS
-#endif
-
-#define ide_default_io_ctl(base)       (0)
-
-#include <asm-generic/ide_iops.h>
-
-#endif /* __KERNEL__ */
-
-#endif /* __ASM_SH64_IDE_H */
diff --git a/include/asm-sh64/io.h b/include/asm-sh64/io.h
deleted file mode 100644 (file)
index 8e99f5b..0000000
+++ /dev/null
@@ -1,217 +0,0 @@
-#ifndef __ASM_SH64_IO_H
-#define __ASM_SH64_IO_H
-
-/*
- * 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/asm-sh64/io.h
- *
- * Copyright (C) 2000, 2001  Paolo Alberelli
- * Copyright (C) 2003  Paul Mundt
- *
- */
-
-/*
- * Convention:
- *    read{b,w,l}/write{b,w,l} are for PCI,
- *    while in{b,w,l}/out{b,w,l} are for ISA
- * These may (will) be platform specific function.
- *
- * In addition, we have
- *   ctrl_in{b,w,l}/ctrl_out{b,w,l} for SuperH specific I/O.
- * which are processor specific. Address should be the result of
- * onchip_remap();
- */
-
-#include <asm/cache.h>
-#include <asm/system.h>
-#include <asm/page.h>
-
-#define virt_to_bus virt_to_phys
-#define bus_to_virt phys_to_virt
-#define page_to_bus page_to_phys
-
-/*
- * Nothing overly special here.. instead of doing the same thing
- * over and over again, we just define a set of sh64_in/out functions
- * with an implicit size. The traditional read{b,w,l}/write{b,w,l}
- * mess is wrapped to this, as are the SH-specific ctrl_in/out routines.
- */
-static inline unsigned char sh64_in8(unsigned long addr)
-{
-       return *(volatile unsigned char *)addr;
-}
-
-static inline unsigned short sh64_in16(unsigned long addr)
-{
-       return *(volatile unsigned short *)addr;
-}
-
-static inline unsigned long sh64_in32(unsigned long addr)
-{
-       return *(volatile unsigned long *)addr;
-}
-
-static inline unsigned long long sh64_in64(unsigned long addr)
-{
-       return *(volatile unsigned long long *)addr;
-}
-
-static inline void sh64_out8(unsigned char b, unsigned long addr)
-{
-       *(volatile unsigned char *)addr = b;
-       wmb();
-}
-
-static inline void sh64_out16(unsigned short b, unsigned long addr)
-{
-       *(volatile unsigned short *)addr = b;
-       wmb();
-}
-
-static inline void sh64_out32(unsigned long b, unsigned long addr)
-{
-       *(volatile unsigned long *)addr = b;
-       wmb();
-}
-
-static inline void sh64_out64(unsigned long long b, unsigned long addr)
-{
-       *(volatile unsigned long long *)addr = b;
-       wmb();
-}
-
-#define readb(addr)            sh64_in8(addr)
-#define readw(addr)            sh64_in16(addr)
-#define readl(addr)            sh64_in32(addr)
-
-#define writeb(b, addr)                sh64_out8(b, addr)
-#define writew(b, addr)                sh64_out16(b, addr)
-#define writel(b, addr)                sh64_out32(b, addr)
-
-#define ctrl_inb(addr)         sh64_in8(addr)
-#define ctrl_inw(addr)         sh64_in16(addr)
-#define ctrl_inl(addr)         sh64_in32(addr)
-
-#define ctrl_outb(b, addr)     sh64_out8(b, addr)
-#define ctrl_outw(b, addr)     sh64_out16(b, addr)
-#define ctrl_outl(b, addr)     sh64_out32(b, addr)
-
-unsigned long inb(unsigned long port);
-unsigned long inw(unsigned long port);
-unsigned long inl(unsigned long port);
-void outb(unsigned long value, unsigned long port);
-void outw(unsigned long value, unsigned long port);
-void outl(unsigned long value, unsigned long port);
-
-#ifdef __KERNEL__
-
-#ifdef CONFIG_SH_CAYMAN
-extern unsigned long smsc_superio_virt;
-#endif
-#ifdef CONFIG_PCI
-extern unsigned long pciio_virt;
-#endif
-
-#define IO_SPACE_LIMIT 0xffffffff
-
-/*
- * Change virtual addresses to physical addresses and vv.
- * These are trivial on the 1:1 Linux/SuperH mapping
- */
-extern __inline__ unsigned long virt_to_phys(volatile void * address)
-{
-       return __pa(address);
-}
-
-extern __inline__ void * phys_to_virt(unsigned long address)
-{
-       return __va(address);
-}
-
-extern void * __ioremap(unsigned long phys_addr, unsigned long size,
-                       unsigned long flags);
-
-extern __inline__ void * ioremap(unsigned long phys_addr, unsigned long size)
-{
-       return __ioremap(phys_addr, size, 1);
-}
-
-extern __inline__ void * ioremap_nocache (unsigned long phys_addr, unsigned long size)
-{
-       return __ioremap(phys_addr, size, 0);
-}
-
-extern void iounmap(void *addr);
-
-unsigned long onchip_remap(unsigned long addr, unsigned long size, const char* name);
-extern void onchip_unmap(unsigned long vaddr);
-
-static __inline__ int check_signature(unsigned long io_addr,
-                       const unsigned char *signature, int length)
-{
-       int retval = 0;
-       do {
-               if (readb(io_addr) != *signature)
-                       goto out;
-               io_addr++;
-               signature++;
-               length--;
-       } while (length);
-       retval = 1;
-out:
-       return retval;
-}
-
-/*
- * The caches on some architectures aren't dma-coherent and have need to
- * handle this in software.  There are three types of operations that
- * can be applied to dma buffers.
- *
- *  - dma_cache_wback_inv(start, size) makes caches and RAM coherent by
- *    writing the content of the caches back to memory, if necessary.
- *    The function also invalidates the affected part of the caches as
- *    necessary before DMA transfers from outside to memory.
- *  - dma_cache_inv(start, size) invalidates the affected parts of the
- *    caches.  Dirty lines of the caches may be written back or simply
- *    be discarded.  This operation is necessary before dma operations
- *    to the memory.
- *  - dma_cache_wback(start, size) writes back any dirty lines but does
- *    not invalidate the cache.  This can be used before DMA reads from
- *    memory,
- */
-
-static __inline__ void dma_cache_wback_inv (unsigned long start, unsigned long size)
-{
-       unsigned long s = start & L1_CACHE_ALIGN_MASK;
-       unsigned long e = (start + size) & L1_CACHE_ALIGN_MASK;
-
-       for (; s <= e; s += L1_CACHE_BYTES)
-               asm volatile ("ocbp     %0, 0" : : "r" (s));
-}
-
-static __inline__ void dma_cache_inv (unsigned long start, unsigned long size)
-{
-       // Note that caller has to be careful with overzealous
-       // invalidation should there be partial cache lines at the extremities
-       // of the specified range
-       unsigned long s = start & L1_CACHE_ALIGN_MASK;
-       unsigned long e = (start + size) & L1_CACHE_ALIGN_MASK;
-
-       for (; s <= e; s += L1_CACHE_BYTES)
-               asm volatile ("ocbi     %0, 0" : : "r" (s));
-}
-
-static __inline__ void dma_cache_wback (unsigned long start, unsigned long size)
-{
-       unsigned long s = start & L1_CACHE_ALIGN_MASK;
-       unsigned long e = (start + size) & L1_CACHE_ALIGN_MASK;
-
-       for (; s <= e; s += L1_CACHE_BYTES)
-               asm volatile ("ocbwb    %0, 0" : : "r" (s));
-}
-
-#endif /* __KERNEL__ */
-#endif /* __ASM_SH64_IO_H */
diff --git a/include/asm-sh64/ioctl.h b/include/asm-sh64/ioctl.h
deleted file mode 100644 (file)
index c089a6f..0000000
+++ /dev/null
@@ -1,83 +0,0 @@
-#ifndef __ASM_SH64_IOCTL_H
-#define __ASM_SH64_IOCTL_H
-
-/*
- * 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/asm-sh64/ioctl.h
- *
- * Copyright (C) 2000, 2001  Paolo Alberelli
- *
- * linux/ioctl.h for Linux by H.H. Bergman.
- *
- */
-
-/* ioctl command encoding: 32 bits total, command in lower 16 bits,
- * size of the parameter structure in the lower 14 bits of the
- * upper 16 bits.
- * Encoding the size of the parameter structure in the ioctl request
- * is useful for catching programs compiled with old versions
- * and to avoid overwriting user space outside the user buffer area.
- * The highest 2 bits are reserved for indicating the ``access mode''.
- * NOTE: This limits the max parameter size to 16kB -1 !
- */
-
-/*
- * The following is for compatibility across the various Linux
- * platforms.  The i386 ioctl numbering scheme doesn't really enforce
- * a type field.  De facto, however, the top 8 bits of the lower 16
- * bits are indeed used as a type field, so we might just as well make
- * this explicit here.  Please be sure to use the decoding macros
- * below from now on.
- */
-#define _IOC_NRBITS    8
-#define _IOC_TYPEBITS  8
-#define _IOC_SIZEBITS  14
-#define _IOC_DIRBITS   2
-
-#define _IOC_NRMASK    ((1 << _IOC_NRBITS)-1)
-#define _IOC_TYPEMASK  ((1 << _IOC_TYPEBITS)-1)
-#define _IOC_SIZEMASK  ((1 << _IOC_SIZEBITS)-1)
-#define _IOC_DIRMASK   ((1 << _IOC_DIRBITS)-1)
-
-#define _IOC_NRSHIFT   0
-#define _IOC_TYPESHIFT (_IOC_NRSHIFT+_IOC_NRBITS)
-#define _IOC_SIZESHIFT (_IOC_TYPESHIFT+_IOC_TYPEBITS)
-#define _IOC_DIRSHIFT  (_IOC_SIZESHIFT+_IOC_SIZEBITS)
-
-/*
- * Direction bits.
- */
-#define _IOC_NONE      0U
-#define _IOC_WRITE     1U
-#define _IOC_READ      2U
-
-#define _IOC(dir,type,nr,size) \
-       (((dir)  << _IOC_DIRSHIFT) | \
-        ((type) << _IOC_TYPESHIFT) | \
-        ((nr)   << _IOC_NRSHIFT) | \
-        ((size) << _IOC_SIZESHIFT))
-
-/* used to create numbers */
-#define _IO(type,nr)           _IOC(_IOC_NONE,(type),(nr),0)
-#define _IOR(type,nr,size)     _IOC(_IOC_READ,(type),(nr),sizeof(size))
-#define _IOW(type,nr,size)     _IOC(_IOC_WRITE,(type),(nr),sizeof(size))
-#define _IOWR(type,nr,size)    _IOC(_IOC_READ|_IOC_WRITE,(type),(nr),sizeof(size))
-
-/* used to decode ioctl numbers.. */
-#define _IOC_DIR(nr)           (((nr) >> _IOC_DIRSHIFT) & _IOC_DIRMASK)
-#define _IOC_TYPE(nr)          (((nr) >> _IOC_TYPESHIFT) & _IOC_TYPEMASK)
-#define _IOC_NR(nr)            (((nr) >> _IOC_NRSHIFT) & _IOC_NRMASK)
-#define _IOC_SIZE(nr)          (((nr) >> _IOC_SIZESHIFT) & _IOC_SIZEMASK)
-
-/* ...and for the drivers/sound files... */
-
-#define IOC_IN         (_IOC_WRITE << _IOC_DIRSHIFT)
-#define IOC_OUT                (_IOC_READ << _IOC_DIRSHIFT)
-#define IOC_INOUT      ((_IOC_WRITE|_IOC_READ) << _IOC_DIRSHIFT)
-#define IOCSIZE_MASK   (_IOC_SIZEMASK << _IOC_SIZESHIFT)
-#define IOCSIZE_SHIFT  (_IOC_SIZESHIFT)
-
-#endif /* __ASM_SH64_IOCTL_H */
diff --git a/include/asm-sh64/ioctls.h b/include/asm-sh64/ioctls.h
deleted file mode 100644 (file)
index e5d5562..0000000
+++ /dev/null
@@ -1,111 +0,0 @@
-#ifndef __ASM_SH64_IOCTLS_H
-#define __ASM_SH64_IOCTLS_H
-
-/*
- * 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/asm-sh64/ioctls.h
- *
- * Copyright (C) 2000, 2001  Paolo Alberelli
- *
- */
-
-#include <asm/ioctl.h>
-
-#define FIOCLEX                _IO('f', 1)
-#define FIONCLEX       _IO('f', 2)
-#define FIOASYNC       _IOW('f', 125, int)
-#define FIONBIO                _IOW('f', 126, int)
-#define FIONREAD       _IOR('f', 127, int)
-#define TIOCINQ                FIONREAD
-#define FIOQSIZE       _IOR('f', 128, loff_t)
-
-#define TCGETS         0x5401
-#define TCSETS         0x5402
-#define TCSETSW                0x5403
-#define TCSETSF                0x5404
-
-#define TCGETA         _IOR('t', 23, struct termio)
-#define TCSETA         _IOW('t', 24, struct termio)
-#define TCSETAW                _IOW('t', 25, struct termio)
-#define TCSETAF                _IOW('t', 28, struct termio)
-
-#define TCSBRK         _IO('t', 29)
-#define TCXONC         _IO('t', 30)
-#define TCFLSH         _IO('t', 31)
-
-#define TIOCSWINSZ     _IOW('t', 103, struct winsize)
-#define TIOCGWINSZ     _IOR('t', 104, struct winsize)
-#define        TIOCSTART       _IO('t', 110)           /* start output, like ^Q */
-#define        TIOCSTOP        _IO('t', 111)           /* stop output, like ^S */
-#define TIOCOUTQ        _IOR('t', 115, int)     /* output queue size */
-
-#define TIOCSPGRP      _IOW('t', 118, int)
-#define TIOCGPGRP      _IOR('t', 119, int)
-
-#define TIOCEXCL       _IO('T', 12) /* 0x540C */
-#define TIOCNXCL       _IO('T', 13) /* 0x540D */
-#define TIOCSCTTY      _IO('T', 14) /* 0x540E */
-
-#define TIOCSTI                _IOW('T', 18, char) /* 0x5412 */
-#define TIOCMGET       _IOR('T', 21, unsigned int) /* 0x5415 */
-#define TIOCMBIS       _IOW('T', 22, unsigned int) /* 0x5416 */
-#define TIOCMBIC       _IOW('T', 23, unsigned int) /* 0x5417 */
-#define TIOCMSET       _IOW('T', 24, unsigned int) /* 0x5418 */
-# define TIOCM_LE      0x001
-# define TIOCM_DTR     0x002
-# define TIOCM_RTS     0x004
-# define TIOCM_ST      0x008
-# define TIOCM_SR      0x010
-# define TIOCM_CTS     0x020
-# define TIOCM_CAR     0x040
-# define TIOCM_RNG     0x080
-# define TIOCM_DSR     0x100
-# define TIOCM_CD      TIOCM_CAR
-# define TIOCM_RI      TIOCM_RNG
-
-#define TIOCGSOFTCAR   _IOR('T', 25, unsigned int) /* 0x5419 */
-#define TIOCSSOFTCAR   _IOW('T', 26, unsigned int) /* 0x541A */
-#define TIOCLINUX      _IOW('T', 28, char) /* 0x541C */
-#define TIOCCONS       _IO('T', 29) /* 0x541D */
-#define TIOCGSERIAL    _IOR('T', 30, struct serial_struct) /* 0x541E */
-#define TIOCSSERIAL    _IOW('T', 31, struct serial_struct) /* 0x541F */
-#define TIOCPKT                _IOW('T', 32, int) /* 0x5420 */
-# define TIOCPKT_DATA           0
-# define TIOCPKT_FLUSHREAD      1
-# define TIOCPKT_FLUSHWRITE     2
-# define TIOCPKT_STOP           4
-# define TIOCPKT_START          8
-# define TIOCPKT_NOSTOP                16
-# define TIOCPKT_DOSTOP                32
-
-
-#define TIOCNOTTY      _IO('T', 34) /* 0x5422 */
-#define TIOCSETD       _IOW('T', 35, int) /* 0x5423 */
-#define TIOCGETD       _IOR('T', 36, int) /* 0x5424 */
-#define TCSBRKP                _IOW('T', 37, int) /* 0x5425 */ /* Needed for POSIX tcsendbreak() */
-#define TIOCTTYGSTRUCT _IOR('T', 38, struct tty_struct) /* 0x5426 */ /* For debugging only */
-#define TIOCSBRK       _IO('T', 39) /* 0x5427 */ /* BSD compatibility */
-#define TIOCCBRK       _IO('T', 40) /* 0x5428 */ /* BSD compatibility */
-#define TIOCGSID       _IOR('T', 41, pid_t) /* 0x5429 */ /* Return the session ID of FD */
-#define TIOCGPTN       _IOR('T',0x30, unsigned int) /* Get Pty Number (of pty-mux device) */
-#define TIOCSPTLCK     _IOW('T',0x31, int)  /* Lock/unlock Pty */
-
-#define TIOCSERCONFIG  _IO('T', 83) /* 0x5453 */
-#define TIOCSERGWILD   _IOR('T', 84,  int) /* 0x5454 */
-#define TIOCSERSWILD   _IOW('T', 85,  int) /* 0x5455 */
-#define TIOCGLCKTRMIOS 0x5456
-#define TIOCSLCKTRMIOS 0x5457
-#define TIOCSERGSTRUCT _IOR('T', 88, struct async_struct) /* 0x5458 */ /* For debugging only */
-#define TIOCSERGETLSR   _IOR('T', 89, unsigned int) /* 0x5459 */ /* Get line status register */
-  /* ioctl (fd, TIOCSERGETLSR, &result) where result may be as below */
-# define TIOCSER_TEMT    0x01  /* Transmitter physically empty */
-#define TIOCSERGETMULTI _IOR('T', 90, struct serial_multiport_struct) /* 0x545A */ /* Get multiport config  */
-#define TIOCSERSETMULTI _IOW('T', 91, struct serial_multiport_struct) /* 0x545B */ /* Set multiport config */
-
-#define TIOCMIWAIT     _IO('T', 92) /* 0x545C */       /* wait for a change on serial input line(s) */
-#define TIOCGICOUNT    _IOR('T', 93, struct async_icount) /* 0x545D */ /* read serial port inline interrupt counts */
-
-#endif /* __ASM_SH64_IOCTLS_H */
diff --git a/include/asm-sh64/ipc.h b/include/asm-sh64/ipc.h
deleted file mode 100644 (file)
index d8d9389..0000000
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef __ASM_SH64_IPC_H
-#define __ASM_SH64_IPC_H
-
-#include <asm-sh/ipc.h>
-
-#endif /* __ASM_SH64_IPC_H */
diff --git a/include/asm-sh64/ipcbuf.h b/include/asm-sh64/ipcbuf.h
deleted file mode 100644 (file)
index c441e35..0000000
+++ /dev/null
@@ -1,40 +0,0 @@
-#ifndef __ASM_SH64_IPCBUF_H__
-#define __ASM_SH64_IPCBUF_H__
-
-/*
- * 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/asm-sh64/ipcbuf.h
- *
- * Copyright (C) 2000, 2001  Paolo Alberelli
- *
- */
-
-/*
- * The ipc64_perm structure for i386 architecture.
- * Note extra padding because this structure is passed back and forth
- * between kernel and user space.
- *
- * Pad space is left for:
- * - 32-bit mode_t and seq
- * - 2 miscellaneous 32-bit values
- */
-
-struct ipc64_perm
-{
-       __kernel_key_t          key;
-       __kernel_uid32_t        uid;
-       __kernel_gid32_t        gid;
-       __kernel_uid32_t        cuid;
-       __kernel_gid32_t        cgid;
-       __kernel_mode_t         mode;
-       unsigned short          __pad1;
-       unsigned short          seq;
-       unsigned short          __pad2;
-       unsigned long           __unused1;
-       unsigned long           __unused2;
-};
-
-#endif /* __ASM_SH64_IPCBUF_H__ */
diff --git a/include/asm-sh64/irq.h b/include/asm-sh64/irq.h
deleted file mode 100644 (file)
index 95056a0..0000000
+++ /dev/null
@@ -1,148 +0,0 @@
-#ifndef __ASM_SH64_IRQ_H
-#define __ASM_SH64_IRQ_H
-
-/*
- * 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/asm-sh64/irq.h
- *
- * Copyright (C) 2000, 2001  Paolo Alberelli
- *
- */
-
-#include <linux/config.h>
-
-/*
- * Encoded IRQs are not considered worth to be supported.
- * Main reason is that there's no per-encoded-interrupt
- * enable/disable mechanism (as there was in SH3/4).
- * An all enabled/all disabled is worth only if there's
- * a cascaded IC to disable/enable/ack on. Until such
- * IC is available there's no such support.
- *
- * Presumably Encoded IRQs may use extra IRQs beyond 64,
- * below. Some logic must be added to cope with IRQ_IRL?
- * in an exclusive way.
- *
- * Priorities are set at Platform level, when IRQ_IRL0-3
- * are set to 0 Encoding is allowed. Otherwise it's not
- * allowed.
- */
-
-/* Independent IRQs */
-#define IRQ_IRL0       0
-#define IRQ_IRL1       1
-#define IRQ_IRL2       2
-#define IRQ_IRL3       3
-
-#define IRQ_INTA       4
-#define IRQ_INTB       5
-#define IRQ_INTC       6
-#define IRQ_INTD       7
-
-#define IRQ_SERR       12
-#define IRQ_ERR                13
-#define IRQ_PWR3       14
-#define IRQ_PWR2       15
-#define IRQ_PWR1       16
-#define IRQ_PWR0       17
-
-#define IRQ_DMTE0      18
-#define IRQ_DMTE1      19
-#define IRQ_DMTE2      20
-#define IRQ_DMTE3      21
-#define IRQ_DAERR      22
-
-#define IRQ_TUNI0      32
-#define IRQ_TUNI1      33
-#define IRQ_TUNI2      34
-#define IRQ_TICPI2     35
-
-#define IRQ_ATI                36
-#define IRQ_PRI                37
-#define IRQ_CUI                38
-
-#define IRQ_ERI                39
-#define IRQ_RXI                40
-#define IRQ_BRI                41
-#define IRQ_TXI                42
-
-#define IRQ_ITI                63
-
-#define NR_INTC_IRQS   64
-
-#ifdef CONFIG_SH_CAYMAN
-#define NR_EXT_IRQS     32
-#define START_EXT_IRQS  64
-
-/* PCI bus 2 uses encoded external interrupts on the Cayman board */
-#define IRQ_P2INTA      (START_EXT_IRQS + (3*8) + 0)
-#define IRQ_P2INTB      (START_EXT_IRQS + (3*8) + 1)
-#define IRQ_P2INTC      (START_EXT_IRQS + (3*8) + 2)
-#define IRQ_P2INTD      (START_EXT_IRQS + (3*8) + 3)
-
-#define START_EXT_IRQS  64
-
-#define I8042_KBD_IRQ  (START_EXT_IRQS + 2)
-#define I8042_AUX_IRQ  (START_EXT_IRQS + 6)
-
-#else
-#define NR_EXT_IRQS    0
-#endif
-
-#define NR_IRQS                (NR_INTC_IRQS+NR_EXT_IRQS)
-
-
-/* Default IRQs, fixed */
-#define TIMER_IRQ      IRQ_TUNI0
-#define RTC_IRQ                IRQ_CUI
-
-/* Default Priorities, Platform may choose differently */
-#define        NO_PRIORITY     0       /* Disabled */
-#define TIMER_PRIORITY 2
-#define RTC_PRIORITY   TIMER_PRIORITY
-#define SCIF_PRIORITY  3
-#define INTD_PRIORITY  3
-#define        IRL3_PRIORITY   4
-#define INTC_PRIORITY  6
-#define        IRL2_PRIORITY   7
-#define INTB_PRIORITY  9
-#define        IRL1_PRIORITY   10
-#define INTA_PRIORITY  12
-#define        IRL0_PRIORITY   13
-#define TOP_PRIORITY   15
-
-extern void disable_irq(unsigned int);
-extern void disable_irq_nosync(unsigned int);
-extern void enable_irq(unsigned int);
-
-extern int intc_evt_to_irq[(0xE20/0x20)+1];
-int intc_irq_describe(char* p, int irq);
-
-#define irq_canonicalize(irq)  (irq)
-
-#ifdef CONFIG_SH_CAYMAN
-int cayman_irq_demux(int evt);
-int cayman_irq_describe(char* p, int irq);
-#define irq_demux(x) cayman_irq_demux(x)
-#define irq_describe(p, x) cayman_irq_describe(p, x)
-#else
-#define irq_demux(x) (intc_evt_to_irq[x])
-#define irq_describe(p, x) intc_irq_describe(p, x)
-#endif
-
-/*
- * Function for "on chip support modules".
- */
-
-/*
- * SH-5 supports Priority based interrupts only.
- * Interrupt priorities are defined at platform level.
- */
-#define set_ipr_data(a, b, c, d)
-#define make_ipr_irq(a)
-#define make_imask_irq(a)
-
-#endif /* __ASM_SH64_IRQ_H */
diff --git a/include/asm-sh64/keyboard.h b/include/asm-sh64/keyboard.h
deleted file mode 100644 (file)
index cda75f6..0000000
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- *  linux/include/asm-shmedia/keyboard.h
- *
- * Copied from i386 version:
- *    Created 3 Nov 1996 by Geert Uytterhoeven
- */
-
-/*
- *  This file contains the i386 architecture specific keyboard definitions
- */
-
-#ifndef __ASM_SH64_KEYBOARD_H
-#define __ASM_SH64_KEYBOARD_H
-
-#ifdef __KERNEL__
-
-#include <linux/kernel.h>
-#include <linux/ioport.h>
-#include <asm/io.h>
-
-#ifdef CONFIG_SH_CAYMAN
-#define KEYBOARD_IRQ                   (START_EXT_IRQS + 2) /* SMSC SuperIO IRQ 1 */
-#endif
-#define DISABLE_KBD_DURING_INTERRUPTS  0
-
-extern int pckbd_setkeycode(unsigned int scancode, unsigned int keycode);
-extern int pckbd_getkeycode(unsigned int scancode);
-extern int pckbd_translate(unsigned char scancode, unsigned char *keycode,
-                          char raw_mode);
-extern char pckbd_unexpected_up(unsigned char keycode);
-extern void pckbd_leds(unsigned char leds);
-extern void pckbd_init_hw(void);
-extern unsigned char pckbd_sysrq_xlate[128];
-
-#define kbd_setkeycode         pckbd_setkeycode
-#define kbd_getkeycode         pckbd_getkeycode
-#define kbd_translate          pckbd_translate
-#define kbd_unexpected_up      pckbd_unexpected_up
-#define kbd_leds               pckbd_leds
-#define kbd_init_hw            pckbd_init_hw
-#define kbd_sysrq_xlate                pckbd_sysrq_xlate
-
-#define SYSRQ_KEY 0x54
-
-/* resource allocation */
-#define kbd_request_region()
-#define kbd_request_irq(handler) request_irq(KEYBOARD_IRQ, handler, 0, \
-                                             "keyboard", NULL)
-
-/* How to access the keyboard macros on this platform.  */
-#define kbd_read_input() inb(KBD_DATA_REG)
-#define kbd_read_status() inb(KBD_STATUS_REG)
-#define kbd_write_output(val) outb(val, KBD_DATA_REG)
-#define kbd_write_command(val) outb(val, KBD_CNTL_REG)
-
-/* Some stoneage hardware needs delays after some operations.  */
-#define kbd_pause() do { } while(0)
-
-/*
- * Machine specific bits for the PS/2 driver
- */
-
-#ifdef CONFIG_SH_CAYMAN
-#define AUX_IRQ (START_EXT_IRQS + 6) /* SMSC SuperIO IRQ12 */
-#endif
-
-#define aux_request_irq(hand, dev_id)                                  \
-       request_irq(AUX_IRQ, hand, SA_SHIRQ, "PS/2 Mouse", dev_id)
-
-#define aux_free_irq(dev_id) free_irq(AUX_IRQ, dev_id)
-
-#endif /* __KERNEL__ */
-#endif /* __ASM_SH64_KEYBOARD_H */
-
diff --git a/include/asm-sh64/kmap_types.h b/include/asm-sh64/kmap_types.h
deleted file mode 100644 (file)
index 2ae7c75..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-#ifndef __ASM_SH64_KMAP_TYPES_H
-#define __ASM_SH64_KMAP_TYPES_H
-
-#include <asm-sh/kmap_types.h>
-
-#endif /* __ASM_SH64_KMAP_TYPES_H */
-
diff --git a/include/asm-sh64/linkage.h b/include/asm-sh64/linkage.h
deleted file mode 100644 (file)
index 1dd0e84..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-#ifndef __ASM_SH64_LINKAGE_H
-#define __ASM_SH64_LINKAGE_H
-
-#include <asm-sh/linkage.h>
-
-#endif /* __ASM_SH64_LINKAGE_H */
-
diff --git a/include/asm-sh64/local.h b/include/asm-sh64/local.h
deleted file mode 100644 (file)
index d9bd95d..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-#ifndef __ASM_SH64_LOCAL_H
-#define __ASM_SH64_LOCAL_H
-
-#include <asm-generic/local.h>
-
-#endif /* __ASM_SH64_LOCAL_H */
-
diff --git a/include/asm-sh64/mc146818rtc.h b/include/asm-sh64/mc146818rtc.h
deleted file mode 100644 (file)
index 6cd3aec..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-/*
- * linux/include/asm-sh64/mc146818rtc.h
- *
-*/
-
-/* For now, an empty place-holder to get IDE to compile. */
-
diff --git a/include/asm-sh64/mman.h b/include/asm-sh64/mman.h
deleted file mode 100644 (file)
index a9be6d8..0000000
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef __ASM_SH64_MMAN_H
-#define __ASM_SH64_MMAN_H
-
-#include <asm-sh/mman.h>
-
-#endif /* __ASM_SH64_MMAN_H */
diff --git a/include/asm-sh64/mmu.h b/include/asm-sh64/mmu.h
deleted file mode 100644 (file)
index ccd36d2..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-#ifndef __MMU_H
-#define __MMU_H
-
-/* Default "unsigned long" context */
-typedef unsigned long mm_context_t;
-
-#endif
diff --git a/include/asm-sh64/mmu_context.h b/include/asm-sh64/mmu_context.h
deleted file mode 100644 (file)
index f062e15..0000000
+++ /dev/null
@@ -1,209 +0,0 @@
-#ifndef __ASM_SH64_MMU_CONTEXT_H
-#define __ASM_SH64_MMU_CONTEXT_H
-
-/*
- * 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/asm-sh64/mmu_context.h
- *
- * Copyright (C) 2000, 2001  Paolo Alberelli
- * Copyright (C) 2003  Paul Mundt
- *
- * ASID handling idea taken from MIPS implementation.
- *
- */
-
-#ifndef __ASSEMBLY__
-
-/*
- * Cache of MMU context last used.
- *
- * The MMU "context" consists of two things:
- *   (a) TLB cache version (or cycle, top 24 bits of mmu_context_cache)
- *   (b) ASID (Address Space IDentifier, bottom 8 bits of mmu_context_cache)
- */
-extern unsigned long mmu_context_cache;
-
-#include <linux/config.h>
-#include <asm/page.h>
-
-
-/* Current mm's pgd */
-extern pgd_t *mmu_pdtp_cache;
-
-#define SR_ASID_MASK           0xffffffffff00ffffULL
-#define SR_ASID_SHIFT          16
-
-#define MMU_CONTEXT_ASID_MASK          0x000000ff
-#define MMU_CONTEXT_VERSION_MASK       0xffffff00
-#define MMU_CONTEXT_FIRST_VERSION      0x00000100
-#define NO_CONTEXT                     0
-
-/* ASID is 8-bit value, so it can't be 0x100 */
-#define MMU_NO_ASID                    0x100
-
-
-/*
- * Virtual Page Number mask
- */
-#define MMU_VPN_MASK   0xfffff000
-
-extern __inline__ void
-get_new_mmu_context(struct mm_struct *mm)
-{
-       extern void flush_tlb_all(void);
-       extern void flush_cache_all(void);
-
-       unsigned long mc = ++mmu_context_cache;
-
-       if (!(mc & MMU_CONTEXT_ASID_MASK)) {
-               /* We exhaust ASID of this version.
-                  Flush all TLB and start new cycle. */
-               flush_tlb_all();
-               /* We have to flush all caches as ASIDs are
-                   used in cache */
-               flush_cache_all();
-               /* Fix version if needed.
-                  Note that we avoid version #0/asid #0 to distingush NO_CONTEXT. */
-               if (!mc)
-                       mmu_context_cache = mc = MMU_CONTEXT_FIRST_VERSION;
-       }
-       mm->context = mc;
-}
-
-/*
- * Get MMU context if needed.
- */
-static __inline__ void
-get_mmu_context(struct mm_struct *mm)
-{
-       if (mm) {
-               unsigned long mc = mmu_context_cache;
-               /* Check if we have old version of context.
-                  If it's old, we need to get new context with new version. */
-               if ((mm->context ^ mc) & MMU_CONTEXT_VERSION_MASK)
-                       get_new_mmu_context(mm);
-       }
-}
-
-/*
- * Initialize the context related info for a new mm_struct
- * instance.
- */
-static inline int init_new_context(struct task_struct *tsk,
-                                       struct mm_struct *mm)
-{
-       mm->context = NO_CONTEXT;
-
-       return 0;
-}
-
-/*
- * Destroy context related info for an mm_struct that is about
- * to be put to rest.
- */
-static inline void destroy_context(struct mm_struct *mm)
-{
-       extern void flush_tlb_mm(struct mm_struct *mm);
-
-       /* Well, at least free TLB entries */
-       flush_tlb_mm(mm);
-}
-
-#endif /* __ASSEMBLY__ */
-
-/* Common defines */
-#define TLB_STEP       0x00000010
-#define TLB_PTEH       0x00000000
-#define TLB_PTEL       0x00000008
-
-/* PTEH defines */
-#define PTEH_ASID_SHIFT        2
-#define PTEH_VALID     0x0000000000000001
-#define PTEH_SHARED    0x0000000000000002
-#define PTEH_MATCH_ASID        0x00000000000003ff
-
-#ifndef __ASSEMBLY__
-/* This has to be a common function because the next location to fill
- * information is shared. */
-extern void __do_tlb_refill(unsigned long address, unsigned long long is_text_not_data, pte_t *pte);
-
-/* Profiling counter. */
-#ifdef CONFIG_SH64_PROC_TLB
-extern unsigned long long calls_to_do_fast_page_fault;
-#endif
-
-static inline unsigned long get_asid(void)
-{
-       unsigned long long sr;
-
-       asm volatile ("getcon   " __SR ", %0\n\t"
-                     : "=r" (sr));
-
-       sr = (sr >> SR_ASID_SHIFT) & MMU_CONTEXT_ASID_MASK;
-       return (unsigned long) sr;
-}
-
-/* Set ASID into SR */
-static inline void set_asid(unsigned long asid)
-{
-       unsigned long long sr, pc;
-
-       asm volatile ("getcon   " __SR ", %0" : "=r" (sr));
-
-       sr = (sr & SR_ASID_MASK) | (asid << SR_ASID_SHIFT);
-
-       /*
-        * It is possible that this function may be inlined and so to avoid
-        * the assembler reporting duplicate symbols we make use of the gas trick
-        * of generating symbols using numerics and forward reference.
-        */
-       asm volatile ("movi     1, %1\n\t"
-                     "shlli    %1, 28, %1\n\t"
-                     "or       %0, %1, %1\n\t"
-                     "putcon   %1, " __SR "\n\t"
-                     "putcon   %0, " __SSR "\n\t"
-                     "movi     1f, %1\n\t"
-                     "ori      %1, 1 , %1\n\t"
-                     "putcon   %1, " __SPC "\n\t"
-                     "rte\n"
-                     "1:\n\t"
-                     : "=r" (sr), "=r" (pc) : "0" (sr));
-}
-
-/*
- * After we have set current->mm to a new value, this activates
- * the context for the new mm so we see the new mappings.
- */
-static __inline__ void activate_context(struct mm_struct *mm)
-{
-       get_mmu_context(mm);
-       set_asid(mm->context & MMU_CONTEXT_ASID_MASK);
-}
-
-
-static __inline__ void switch_mm(struct mm_struct *prev,
-                                struct mm_struct *next,
-                                struct task_struct *tsk)
-{
-       if (prev != next) {
-               mmu_pdtp_cache = next->pgd;
-               activate_context(next);
-       }
-}
-
-#define deactivate_mm(tsk,mm)  do { } while (0)
-
-#define activate_mm(prev, next) \
-       switch_mm((prev),(next),NULL)
-
-static inline void
-enter_lazy_tlb(struct mm_struct *mm, struct task_struct *tsk)
-{
-}
-
-#endif /* __ASSEMBLY__ */
-
-#endif /* __ASM_SH64_MMU_CONTEXT_H */
diff --git a/include/asm-sh64/module.h b/include/asm-sh64/module.h
deleted file mode 100644 (file)
index bf382bc..0000000
+++ /dev/null
@@ -1,12 +0,0 @@
-#ifndef __ASM_SH64_MODULE_H
-#define __ASM_SH64_MODULE_H
-/*
- * This file contains the SH architecture specific module code.
- */
-
-#define module_map(x)          vmalloc(x)
-#define module_unmap(x)                vfree(x)
-#define module_arch_init(x)    (0)
-#define arch_init_modules(x)   do { } while (0)
-
-#endif /* __ASM_SH64_MODULE_H */
diff --git a/include/asm-sh64/msgbuf.h b/include/asm-sh64/msgbuf.h
deleted file mode 100644 (file)
index cf0494c..0000000
+++ /dev/null
@@ -1,42 +0,0 @@
-#ifndef __ASM_SH64_MSGBUF_H
-#define __ASM_SH64_MSGBUF_H
-
-/*
- * 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/asm-sh64/msgbuf.h
- *
- * Copyright (C) 2000, 2001  Paolo Alberelli
- *
- */
-
-/*
- * The msqid64_ds structure for i386 architecture.
- * Note extra padding because this structure is passed back and forth
- * between kernel and user space.
- *
- * Pad space is left for:
- * - 64-bit time_t to solve y2038 problem
- * - 2 miscellaneous 32-bit values
- */
-
-struct msqid64_ds {
-       struct ipc64_perm msg_perm;
-       __kernel_time_t msg_stime;      /* last msgsnd time */
-       unsigned long   __unused1;
-       __kernel_time_t msg_rtime;      /* last msgrcv time */
-       unsigned long   __unused2;
-       __kernel_time_t msg_ctime;      /* last change time */
-       unsigned long   __unused3;
-       unsigned long  msg_cbytes;      /* current number of bytes on queue */
-       unsigned long  msg_qnum;        /* number of messages in queue */
-       unsigned long  msg_qbytes;      /* max number of bytes on queue */
-       __kernel_pid_t msg_lspid;       /* pid of last msgsnd */
-       __kernel_pid_t msg_lrpid;       /* last receive pid */
-       unsigned long  __unused4;
-       unsigned long  __unused5;
-};
-
-#endif /* __ASM_SH64_MSGBUF_H */
diff --git a/include/asm-sh64/namei.h b/include/asm-sh64/namei.h
deleted file mode 100644 (file)
index 99d759a..0000000
+++ /dev/null
@@ -1,24 +0,0 @@
-#ifndef __ASM_SH64_NAMEI_H
-#define __ASM_SH64_NAMEI_H
-
-/*
- * 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/asm-sh64/namei.h
- *
- * Copyright (C) 2000, 2001  Paolo Alberelli
- *
- * Included from linux/fs/namei.c
- *
- */
-
-/* This dummy routine maybe changed to something useful
- * for /usr/gnemul/ emulation stuff.
- * Look at asm-sparc/namei.h for details.
- */
-
-#define __emul_prefix() NULL
-
-#endif /* __ASM_SH64_NAMEI_H */
diff --git a/include/asm-sh64/page.h b/include/asm-sh64/page.h
deleted file mode 100644 (file)
index e1f7f5a..0000000
+++ /dev/null
@@ -1,137 +0,0 @@
-#ifndef __ASM_SH64_PAGE_H
-#define __ASM_SH64_PAGE_H
-
-/*
- * 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/asm-sh64/page.h
- *
- * Copyright (C) 2000, 2001  Paolo Alberelli
- * Copyright (C) 2003, 2004  Paul Mundt
- *
- * benedict.gaster@superh.com 19th, 24th July 2002.
- *
- * Modified to take account of enabling for D-CACHE support.
- *
- */
-
-#include <linux/config.h>
-
-/* PAGE_SHIFT determines the page size */
-#define PAGE_SHIFT     12
-#ifdef __ASSEMBLY__
-#define PAGE_SIZE      4096
-#else
-#define PAGE_SIZE      (1UL << PAGE_SHIFT)
-#endif
-#define PAGE_MASK      (~(PAGE_SIZE-1))
-#define PTE_MASK       PAGE_MASK
-
-#if defined(CONFIG_HUGETLB_PAGE_SIZE_64K)
-#define HPAGE_SHIFT    16
-#elif defined(CONFIG_HUGETLB_PAGE_SIZE_1MB)
-#define HPAGE_SHIFT    20
-#elif defined(CONFIG_HUGETLB_PAGE_SIZE_512MB)
-#define HPAGE_SHIFT    29
-#endif
-
-#ifdef CONFIG_HUGETLB_PAGE
-#define HPAGE_SIZE             (1UL << HPAGE_SHIFT)
-#define HPAGE_MASK             (~(HPAGE_SIZE-1))
-#define HUGETLB_PAGE_ORDER     (HPAGE_SHIFT-PAGE_SHIFT)
-#endif
-
-#ifdef __KERNEL__
-#ifndef __ASSEMBLY__
-
-extern struct page *mem_map;
-extern void sh64_page_clear(void *page);
-extern void sh64_page_copy(void *from, void *to);
-
-#define clear_page(page)               sh64_page_clear(page)
-#define copy_page(to,from)             sh64_page_copy(from, to)
-
-#if defined(CONFIG_DCACHE_DISABLED)
-
-#define clear_user_page(page, vaddr, pg)       clear_page(page)
-#define copy_user_page(to, from, vaddr, pg)    copy_page(to, from)
-
-#else
-
-extern void clear_user_page(void *to, unsigned long address, struct page *pg);
-extern void copy_user_page(void *to, void *from, unsigned long address, struct page *pg);
-
-#endif /* defined(CONFIG_DCACHE_DISABLED) */
-
-/*
- * These are used to make use of C type-checking..
- */
-typedef struct { unsigned long long pte; } pte_t;
-typedef struct { unsigned long pmd; } pmd_t;
-typedef struct { unsigned long pgd; } pgd_t;
-typedef struct { unsigned long pgprot; } pgprot_t;
-
-#define pte_val(x)     ((x).pte)
-#define pmd_val(x)     ((x).pmd)
-#define pgd_val(x)     ((x).pgd)
-#define pgprot_val(x)  ((x).pgprot)
-
-#define __pte(x) ((pte_t) { (x) } )
-#define __pmd(x) ((pmd_t) { (x) } )
-#define __pgd(x) ((pgd_t) { (x) } )
-#define __pgprot(x)    ((pgprot_t) { (x) } )
-
-#endif /* !__ASSEMBLY__ */
-
-/* to align the pointer to the (next) page boundary */
-#define PAGE_ALIGN(addr)       (((addr)+PAGE_SIZE-1)&PAGE_MASK)
-
-/*
- * Kconfig defined.
- */
-#define __MEMORY_START         (CONFIG_MEMORY_START)
-#define PAGE_OFFSET            (CONFIG_CACHED_MEMORY_OFFSET)
-
-#define __pa(x)                        ((unsigned long)(x)-PAGE_OFFSET)
-#define __va(x)                        ((void *)((unsigned long)(x)+PAGE_OFFSET))
-#define MAP_NR(addr)           ((__pa(addr)-__MEMORY_START) >> PAGE_SHIFT)
-#define VALID_PAGE(page)       ((page - mem_map) < max_mapnr)
-
-#define phys_to_page(phys)     (mem_map + (((phys) - __MEMORY_START) >> PAGE_SHIFT))
-#define page_to_phys(page)     (((page - mem_map) << PAGE_SHIFT) + __MEMORY_START)
-
-/* PFN start number, because of __MEMORY_START */
-#define PFN_START              (__MEMORY_START >> PAGE_SHIFT)
-
-#define pfn_to_page(pfn)       (mem_map + (pfn) - PFN_START)
-#define page_to_pfn(page)      ((unsigned long)((page) - mem_map) + PFN_START)
-#define virt_to_page(kaddr)    pfn_to_page(__pa(kaddr) >> PAGE_SHIFT)
-#define pfn_valid(pfn)         (((pfn) - PFN_START) < max_mapnr)
-#define virt_addr_valid(kaddr) pfn_valid(__pa(kaddr) >> PAGE_SHIFT)
-
-#define VM_DATA_DEFAULT_FLAGS  (VM_READ | VM_WRITE | VM_EXEC | \
-                                VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
-
-#ifndef __ASSEMBLY__
-
-/* Pure 2^n version of get_order */
-extern __inline__ int get_order(unsigned long size)
-{
-       int order;
-
-       size = (size-1) >> (PAGE_SHIFT-1);
-       order = -1;
-       do {
-               size >>= 1;
-               order++;
-       } while (size);
-       return order;
-}
-
-#endif
-
-#endif /* __KERNEL__ */
-
-#endif /* __ASM_SH64_PAGE_H */
diff --git a/include/asm-sh64/param.h b/include/asm-sh64/param.h
deleted file mode 100644 (file)
index d18cc87..0000000
+++ /dev/null
@@ -1,43 +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.
- *
- * include/asm-sh64/param.h
- *
- * Copyright (C) 2000, 2001  Paolo Alberelli
- * Copyright (C) 2003  Paul Mundt
- *
- */
-#ifndef __ASM_SH64_PARAM_H
-#define __ASM_SH64_PARAM_H
-
-#include <linux/config.h>
-
-#ifdef __KERNEL__
-# ifdef CONFIG_SH_WDT
-#  define HZ           1000            /* Needed for high-res WOVF */
-# else
-#  define HZ           100
-# endif
-# define USER_HZ       100             /* User interfaces are in "ticks" */
-# define CLOCKS_PER_SEC        (USER_HZ)       /* frequency at which times() counts */
-#endif
-
-#ifndef HZ
-#define HZ 100
-#endif
-
-#define EXEC_PAGESIZE  4096
-
-#ifndef NGROUPS
-#define NGROUPS                32
-#endif
-
-#ifndef NOGROUP
-#define NOGROUP                (-1)
-#endif
-
-#define MAXHOSTNAMELEN 64      /* max length of hostname */
-
-#endif /* __ASM_SH64_PARAM_H */
diff --git a/include/asm-sh64/pci.h b/include/asm-sh64/pci.h
deleted file mode 100644 (file)
index 8cc14e1..0000000
+++ /dev/null
@@ -1,110 +0,0 @@
-#ifndef __ASM_SH64_PCI_H
-#define __ASM_SH64_PCI_H
-
-#ifdef __KERNEL__
-
-#include <linux/dma-mapping.h>
-
-/* Can be used to override the logic in pci_scan_bus for skipping
-   already-configured bus numbers - to be used for buggy BIOSes
-   or architectures with incomplete PCI setup by the loader */
-
-#define pcibios_assign_all_busses()     1
-
-/*
- * These are currently the correct values for the STM overdrive board
- * We need some way of setting this on a board specific way, it will
- * not be the same on other boards I think
- */
-#if defined(CONFIG_CPU_SUBTYPE_SH5_101) || defined(CONFIG_CPU_SUBTYPE_SH5_103)
-#define PCIBIOS_MIN_IO          0x2000
-#define PCIBIOS_MIN_MEM         0x40000000
-#endif
-
-extern void pcibios_set_master(struct pci_dev *dev);
-
-/*
- * Set penalize isa irq function
- */
-static inline void pcibios_penalize_isa_irq(int irq)
-{
-       /* We don't do dynamic PCI IRQ allocation */
-}
-
-/* Dynamic DMA mapping stuff.
- * SuperH has everything mapped statically like x86.
- */
-
-/* The PCI address space does equal the physical memory
- * address space.  The networking and block device layers use
- * this boolean for bounce buffer decisions.
- */
-#define PCI_DMA_BUS_IS_PHYS    (1)
-
-#include <linux/types.h>
-#include <linux/slab.h>
-#include <asm/scatterlist.h>
-#include <linux/string.h>
-#include <asm/io.h>
-
-/* pci_unmap_{single,page} being a nop depends upon the
- * configuration.
- */
-#ifdef CONFIG_SH_PCIDMA_NONCOHERENT
-#define DECLARE_PCI_UNMAP_ADDR(ADDR_NAME)      \
-       dma_addr_t ADDR_NAME;
-#define DECLARE_PCI_UNMAP_LEN(LEN_NAME)                \
-       __u32 LEN_NAME;
-#define pci_unmap_addr(PTR, ADDR_NAME)                 \
-       ((PTR)->ADDR_NAME)
-#define pci_unmap_addr_set(PTR, ADDR_NAME, VAL)                \
-       (((PTR)->ADDR_NAME) = (VAL))
-#define pci_unmap_len(PTR, LEN_NAME)                   \
-       ((PTR)->LEN_NAME)
-#define pci_unmap_len_set(PTR, LEN_NAME, VAL)          \
-       (((PTR)->LEN_NAME) = (VAL))
-#else
-#define DECLARE_PCI_UNMAP_ADDR(ADDR_NAME)
-#define DECLARE_PCI_UNMAP_LEN(LEN_NAME)
-#define pci_unmap_addr(PTR, ADDR_NAME)         (0)
-#define pci_unmap_addr_set(PTR, ADDR_NAME, VAL)        do { } while (0)
-#define pci_unmap_len(PTR, LEN_NAME)           (0)
-#define pci_unmap_len_set(PTR, LEN_NAME, VAL)  do { } while (0)
-#endif
-
-/* Not supporting more than 32-bit PCI bus addresses now, but
- * must satisfy references to this function.  Change if needed.
- */
-#define pci_dac_dma_supported(pci_dev, mask) (0)
-
-/* These macros should be used after a pci_map_sg call has been done
- * to get bus addresses of each of the SG entries and their lengths.
- * You should only work with the number of sg entries pci_map_sg
- * returns, or alternatively stop on the first sg_dma_len(sg) which
- * is 0.
- */
-#define sg_dma_address(sg)     ((sg)->dma_address)
-#define sg_dma_len(sg)         ((sg)->length)
-
-/* Board-specific fixup routines. */
-extern void pcibios_fixup(void);
-extern void pcibios_fixup_irqs(void);
-
-#ifdef CONFIG_PCI_AUTO
-extern int pciauto_assign_resources(int busno, struct pci_channel *hose);
-#endif
-
-static inline void pcibios_add_platform_entries(struct pci_dev *dev)
-{
-}
-
-#endif /* __KERNEL__ */
-
-/* generic pci stuff */
-#include <asm-generic/pci.h>
-
-/* generic DMA-mapping stuff */
-#include <asm-generic/pci-dma-compat.h>
-
-#endif /* __ASM_SH64_PCI_H */
-
diff --git a/include/asm-sh64/percpu.h b/include/asm-sh64/percpu.h
deleted file mode 100644 (file)
index a01d16c..0000000
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef __ASM_SH64_PERCPU
-#define __ASM_SH64_PERCPU
-
-#include <asm-generic/percpu.h>
-
-#endif /* __ASM_SH64_PERCPU */
diff --git a/include/asm-sh64/pgalloc.h b/include/asm-sh64/pgalloc.h
deleted file mode 100644 (file)
index 0272308..0000000
+++ /dev/null
@@ -1,202 +0,0 @@
-#ifndef __ASM_SH64_PGALLOC_H
-#define __ASM_SH64_PGALLOC_H
-
-/*
- * 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/asm-sh64/pgalloc.h
- *
- * Copyright (C) 2000, 2001  Paolo Alberelli
- * Copyright (C) 2003, 2004  Paul Mundt
- * Copyright (C) 2003, 2004  Richard Curnow
- *
- */
-
-#include <asm/processor.h>
-#include <linux/threads.h>
-#include <linux/mm.h>
-
-#define pgd_quicklist (current_cpu_data.pgd_quick)
-#define pmd_quicklist (current_cpu_data.pmd_quick)
-#define pte_quicklist (current_cpu_data.pte_quick)
-#define pgtable_cache_size (current_cpu_data.pgtable_cache_sz)
-
-static inline void pgd_init(unsigned long page)
-{
-       unsigned long *pgd = (unsigned long *)page;
-       extern pte_t empty_bad_pte_table[PTRS_PER_PTE];
-       int i;
-
-       for (i = 0; i < USER_PTRS_PER_PGD; i++)
-               pgd[i] = (unsigned long)empty_bad_pte_table;
-}
-
-/*
- * Allocate and free page tables. The xxx_kernel() versions are
- * used to allocate a kernel page table - this turns on ASN bits
- * if any.
- */
-
-extern __inline__ pgd_t *get_pgd_slow(void)
-{
-       unsigned int pgd_size = (USER_PTRS_PER_PGD * sizeof(pgd_t));
-       pgd_t *ret = (pgd_t *)kmalloc(pgd_size, GFP_KERNEL);
-       return ret;
-}
-
-extern __inline__ pgd_t *get_pgd_fast(void)
-{
-       unsigned long *ret;
-
-       if ((ret = pgd_quicklist) != NULL) {
-               pgd_quicklist = (unsigned long *)(*ret);
-               ret[0] = 0;
-               pgtable_cache_size--;
-       } else
-               ret = (unsigned long *)get_pgd_slow();
-
-       if (ret) {
-               memset(ret, 0, USER_PTRS_PER_PGD * sizeof(pgd_t));
-       }
-       return (pgd_t *)ret;
-}
-
-extern __inline__ void free_pgd_fast(pgd_t *pgd)
-{
-       *(unsigned long *)pgd = (unsigned long) pgd_quicklist;
-       pgd_quicklist = (unsigned long *) pgd;
-       pgtable_cache_size++;
-}
-
-extern __inline__ void free_pgd_slow(pgd_t *pgd)
-{
-       kfree((void *)pgd);
-}
-
-extern pte_t *get_pte_slow(pmd_t *pmd, unsigned long address_preadjusted);
-extern pte_t *get_pte_kernel_slow(pmd_t *pmd, unsigned long address_preadjusted);
-
-extern __inline__ pte_t *get_pte_fast(void)
-{
-       unsigned long *ret;
-
-       if((ret = (unsigned long *)pte_quicklist) != NULL) {
-               pte_quicklist = (unsigned long *)(*ret);
-               ret[0] = ret[1];
-               pgtable_cache_size--;
-       }
-       return (pte_t *)ret;
-}
-
-extern __inline__ void free_pte_fast(pte_t *pte)
-{
-       *(unsigned long *)pte = (unsigned long) pte_quicklist;
-       pte_quicklist = (unsigned long *) pte;
-       pgtable_cache_size++;
-}
-
-static inline void pte_free_kernel(pte_t *pte)
-{
-       free_page((unsigned long)pte);
-}
-
-static inline void pte_free(struct page *pte)
-{
-       __free_page(pte);
-}
-
-static inline pte_t *pte_alloc_one_kernel(struct mm_struct *mm,
-                                          unsigned long address)
-{
-       pte_t *pte;
-
-       pte = (pte_t *)__get_free_page(GFP_KERNEL | __GFP_REPEAT);
-       if (pte)
-               clear_page(pte);
-
-       return pte;
-}
-
-static inline struct page *pte_alloc_one(struct mm_struct *mm, unsigned long address)
-{
-       struct page *pte;
-
-       pte = alloc_pages(GFP_KERNEL|__GFP_REPEAT, 0);
-       if (pte)
-               clear_page(page_address(pte));
-
-       return pte;
-}
-
-#define __pte_free_tlb(tlb,pte) tlb_remove_page((tlb),(pte))
-
-/*
- * allocating and freeing a pmd is trivial: the 1-entry pmd is
- * inside the pgd, so has no extra memory associated with it.
- */
-
-#if defined(CONFIG_SH64_PGTABLE_2_LEVEL)
-
-#define pmd_alloc_one(mm, addr)                ({ BUG(); ((pmd_t *)2); })
-#define pmd_free(x)                    do { } while (0)
-#define pgd_populate(mm, pmd, pte)     BUG()
-#define __pte_free_tlb(tlb,pte)                tlb_remove_page((tlb),(pte))
-#define __pmd_free_tlb(tlb,pmd)                do { } while (0)
-
-#elif defined(CONFIG_SH64_PGTABLE_3_LEVEL)
-
-static __inline__ pmd_t *pmd_alloc_one(struct mm_struct *mm, unsigned long address)
-{
-       pmd_t *pmd;
-       pmd = (pmd_t *) __get_free_page(GFP_KERNEL|__GFP_REPEAT);
-       if (pmd)
-               clear_page(pmd);
-       return pmd;
-}
-
-static __inline__ void pmd_free(pmd_t *pmd)
-{
-       free_page((unsigned long) pmd);
-}
-
-#define pgd_populate(mm, pgd, pmd) pgd_set(pgd, pmd)
-#define __pmd_free_tlb(tlb,pmd)                pmd_free(pmd)
-
-#else
-#error "No defined page table size"
-#endif
-
-#define check_pgt_cache()              do { } while (0)
-#define pgd_free(pgd)          free_pgd_slow(pgd)
-#define pgd_alloc(mm)          get_pgd_fast()
-
-extern int do_check_pgt_cache(int, int);
-
-extern inline void set_pgdir(unsigned long address, pgd_t entry)
-{
-       struct task_struct * p;
-       pgd_t *pgd;
-
-       read_lock(&tasklist_lock);
-       for_each_process(p) {
-               if (!p->mm)
-                       continue;
-               *pgd_offset(p->mm,address) = entry;
-       }
-       read_unlock(&tasklist_lock);
-       for (pgd = (pgd_t *)pgd_quicklist; pgd; pgd = (pgd_t *)*(unsigned long *)pgd)
-               pgd[address >> PGDIR_SHIFT] = entry;
-}
-
-#define pmd_populate_kernel(mm, pmd, pte) \
-       set_pmd(pmd, __pmd(_PAGE_TABLE + (unsigned long) (pte)))
-
-static inline void pmd_populate(struct mm_struct *mm, pmd_t *pmd,
-                               struct page *pte)
-{
-       set_pmd(pmd, __pmd(_PAGE_TABLE + (unsigned long) page_address (pte)));
-}
-
-#endif /* __ASM_SH64_PGALLOC_H */
diff --git a/include/asm-sh64/pgtable.h b/include/asm-sh64/pgtable.h
deleted file mode 100644 (file)
index 1f333c1..0000000
+++ /dev/null
@@ -1,498 +0,0 @@
-#ifndef __ASM_SH64_PGTABLE_H
-#define __ASM_SH64_PGTABLE_H
-
-/*
- * 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/asm-sh64/pgtable.h
- *
- * Copyright (C) 2000, 2001  Paolo Alberelli
- * Copyright (C) 2003, 2004  Paul Mundt
- * Copyright (C) 2003, 2004  Richard Curnow
- *
- * This file contains the functions and defines necessary to modify and use
- * the SuperH page table tree.
- */
-
-#ifndef __ASSEMBLY__
-#include <asm/processor.h>
-#include <asm/page.h>
-#include <linux/threads.h>
-#include <linux/config.h>
-
-extern void paging_init(void);
-
-/* We provide our own get_unmapped_area to avoid cache synonym issue */
-#define HAVE_ARCH_UNMAPPED_AREA
-
-/*
- * Basically we have the same two-level (which is the logical three level
- * Linux page table layout folded) page tables as the i386.
- */
-
-/*
- * ZERO_PAGE is a global shared page that is always zero: used
- * for zero-mapped memory areas etc..
- */
-extern unsigned char empty_zero_page[PAGE_SIZE];
-#define ZERO_PAGE(vaddr) (mem_map + MAP_NR(empty_zero_page))
-
-#endif /* !__ASSEMBLY__ */
-
-/*
- * NEFF and NPHYS related defines.
- * FIXME : These need to be model-dependent.  For now this is OK, SH5-101 and SH5-103
- * implement 32 bits effective and 32 bits physical.  But future implementations may
- * extend beyond this.
- */
-#define NEFF           32
-#define        NEFF_SIGN       (1LL << (NEFF - 1))
-#define        NEFF_MASK       (-1LL << NEFF)
-
-#define NPHYS          32
-#define        NPHYS_SIGN      (1LL << (NPHYS - 1))
-#define        NPHYS_MASK      (-1LL << NPHYS)
-
-/* Typically 2-level is sufficient up to 32 bits of virtual address space, beyond
-   that 3-level would be appropriate. */
-#if defined(CONFIG_SH64_PGTABLE_2_LEVEL)
-/* For 4k pages, this contains 512 entries, i.e. 9 bits worth of address. */
-#define PTRS_PER_PTE   ((1<<PAGE_SHIFT)/sizeof(unsigned long long))
-#define PTE_MAGNITUDE  3             /* sizeof(unsigned long long) magnit. */
-#define PTE_SHIFT      PAGE_SHIFT
-#define PTE_BITS       (PAGE_SHIFT - PTE_MAGNITUDE)
-
-/* top level: PMD. */
-#define PGDIR_SHIFT    (PTE_SHIFT + PTE_BITS)
-#define PGD_BITS       (NEFF - PGDIR_SHIFT)
-#define PTRS_PER_PGD   (1<<PGD_BITS)
-
-/* middle level: PMD. This doesn't do anything for the 2-level case. */
-#define PTRS_PER_PMD   (1)
-
-#define PGDIR_SIZE     (1UL << PGDIR_SHIFT)
-#define PGDIR_MASK     (~(PGDIR_SIZE-1))
-#define PMD_SHIFT      PGDIR_SHIFT
-#define PMD_SIZE       PGDIR_SIZE
-#define PMD_MASK       PGDIR_MASK
-
-#elif defined(CONFIG_SH64_PGTABLE_3_LEVEL)
-/*
- * three-level asymmetric paging structure: PGD is top level.
- * The asymmetry comes from 32-bit pointers and 64-bit PTEs.
- */
-/* bottom level: PTE. It's 9 bits = 512 pointers */
-#define PTRS_PER_PTE   ((1<<PAGE_SHIFT)/sizeof(unsigned long long))
-#define PTE_MAGNITUDE  3             /* sizeof(unsigned long long) magnit. */
-#define PTE_SHIFT      PAGE_SHIFT
-#define PTE_BITS       (PAGE_SHIFT - PTE_MAGNITUDE)
-
-/* middle level: PMD. It's 10 bits = 1024 pointers */
-#define PTRS_PER_PMD   ((1<<PAGE_SHIFT)/sizeof(unsigned long long *))
-#define PMD_MAGNITUDE  2             /* sizeof(unsigned long long *) magnit. */
-#define PMD_SHIFT      (PTE_SHIFT + PTE_BITS)
-#define PMD_BITS       (PAGE_SHIFT - PMD_MAGNITUDE)
-
-/* top level: PMD. It's 1 bit = 2 pointers */
-#define PGDIR_SHIFT    (PMD_SHIFT + PMD_BITS)
-#define PGD_BITS       (NEFF - PGDIR_SHIFT)
-#define PTRS_PER_PGD   (1<<PGD_BITS)
-
-#define PMD_SIZE       (1UL << PMD_SHIFT)
-#define PMD_MASK       (~(PMD_SIZE-1))
-#define PGDIR_SIZE     (1UL << PGDIR_SHIFT)
-#define PGDIR_MASK     (~(PGDIR_SIZE-1))
-
-#else
-#error "No defined number of page table levels"
-#endif
-
-/*
- * Error outputs.
- */
-#define pte_ERROR(e) \
-       printk("%s:%d: bad pte %016Lx.\n", __FILE__, __LINE__, pte_val(e))
-#define pmd_ERROR(e) \
-       printk("%s:%d: bad pmd %08lx.\n", __FILE__, __LINE__, pmd_val(e))
-#define pgd_ERROR(e) \
-       printk("%s:%d: bad pgd %08lx.\n", __FILE__, __LINE__, pgd_val(e))
-
-/*
- * Table setting routines. Used within arch/mm only.
- */
-#define set_pgd(pgdptr, pgdval) (*(pgdptr) = pgdval)
-#define set_pmd(pmdptr, pmdval) (*(pmdptr) = pmdval)
-
-static __inline__ void set_pte(pte_t *pteptr, pte_t pteval)
-{
-       unsigned long long x = ((unsigned long long) pteval.pte);
-       unsigned long long *xp = (unsigned long long *) pteptr;
-       /*
-        * Sign-extend based on NPHYS.
-        */
-       *(xp) = (x & NPHYS_SIGN) ? (x | NPHYS_MASK) : x;
-}
-
-static __inline__ void pmd_set(pmd_t *pmdp,pte_t *ptep)
-{
-       pmd_val(*pmdp) = (unsigned long) ptep;
-}
-
-/*
- * PGD defines. Top level.
- */
-
-/* To find an entry in a generic PGD. */
-#define pgd_index(address) (((address) >> PGDIR_SHIFT) & (PTRS_PER_PGD-1))
-#define __pgd_offset(address) pgd_index(address)
-#define pgd_offset(mm, address) ((mm)->pgd+pgd_index(address))
-
-/* To find an entry in a kernel PGD. */
-#define pgd_offset_k(address) pgd_offset(&init_mm, address)
-
-/*
- * PGD level access routines.
- *
- * Note1:
- * There's no need to use physical addresses since the tree walk is all
- * in performed in software, until the PTE translation.
- *
- * Note 2:
- * A PGD entry can be uninitialized (_PGD_UNUSED), generically bad,
- * clear (_PGD_EMPTY), present. When present, lower 3 nibbles contain
- * _KERNPG_TABLE. Being a kernel virtual pointer also bit 31 must
- * be 1. Assuming an arbitrary clear value of bit 31 set to 0 and
- * lower 3 nibbles set to 0xFFF (_PGD_EMPTY) any other value is a
- * bad pgd that must be notified via printk().
- *
- */
-#define _PGD_EMPTY             0x0
-
-#if defined(CONFIG_SH64_PGTABLE_2_LEVEL)
-static inline int pgd_none(pgd_t pgd)          { return 0; }
-static inline int pgd_bad(pgd_t pgd)           { return 0; }
-#define pgd_present(pgd) ((pgd_val(pgd) & _PAGE_PRESENT) ? 1 : 0)
-#define pgd_clear(xx)                          do { } while(0)
-
-#elif defined(CONFIG_SH64_PGTABLE_3_LEVEL)
-#define pgd_present(pgd_entry) (1)
-#define pgd_none(pgd_entry)    (pgd_val((pgd_entry)) == _PGD_EMPTY)
-/* TODO: Think later about what a useful definition of 'bad' would be now. */
-#define pgd_bad(pgd_entry)     (0)
-#define pgd_clear(pgd_entry_p) (set_pgd((pgd_entry_p), __pgd(_PGD_EMPTY)))
-
-#endif
-
-
-#define pgd_page(pgd_entry)    ((unsigned long) (pgd_val(pgd_entry) & PAGE_MASK))
-
-/*
- * PMD defines. Middle level.
- */
-
-/* PGD to PMD dereferencing */
-#if defined(CONFIG_SH64_PGTABLE_2_LEVEL)
-static inline pmd_t * pmd_offset(pgd_t * dir, unsigned long address)
-{
-       return (pmd_t *) dir;
-}
-#elif defined(CONFIG_SH64_PGTABLE_3_LEVEL)
-#define __pmd_offset(address) \
-               (((address) >> PMD_SHIFT) & (PTRS_PER_PMD-1))
-#define pmd_offset(dir, addr) \
-               ((pmd_t *) ((pgd_val(*(dir))) & PAGE_MASK) + __pmd_offset((addr)))
-#endif
-
-/*
- * PMD level access routines. Same notes as above.
- */
-#define _PMD_EMPTY             0x0
-/* Either the PMD is empty or present, it's not paged out */
-#define pmd_present(pmd_entry) (pmd_val(pmd_entry) & _PAGE_PRESENT)
-#define pmd_clear(pmd_entry_p) (set_pmd((pmd_entry_p), __pmd(_PMD_EMPTY)))
-#define pmd_none(pmd_entry)    (pmd_val((pmd_entry)) == _PMD_EMPTY)
-#define pmd_bad(pmd_entry)     ((pmd_val(pmd_entry) & (~PAGE_MASK & ~_PAGE_USER)) != _KERNPG_TABLE)
-
-#define pmd_page_kernel(pmd_entry) \
-       ((unsigned long) __va(pmd_val(pmd_entry) & PAGE_MASK))
-
-#define pmd_page(pmd) \
-       (virt_to_page(pmd_val(pmd)))
-
-/* PMD to PTE dereferencing */
-#define pte_index(address) \
-               ((address >> PAGE_SHIFT) & (PTRS_PER_PTE - 1))
-
-#define pte_offset_kernel(dir, addr) \
-               ((pte_t *) ((pmd_val(*(dir))) & PAGE_MASK) + pte_index((addr)))
-
-#define pte_offset_map(dir,addr)       pte_offset_kernel(dir, addr)
-#define pte_offset_map_nested(dir,addr)        pte_offset_kernel(dir, addr)
-#define pte_unmap(pte)         do { } while (0)
-#define pte_unmap_nested(pte)  do { } while (0)
-
-/* Round it up ! */
-#define USER_PTRS_PER_PGD      ((TASK_SIZE+PGDIR_SIZE-1)/PGDIR_SIZE)
-#define FIRST_USER_PGD_NR      0
-
-#ifndef __ASSEMBLY__
-#define VMALLOC_END    0xff000000
-#define VMALLOC_START  0xf0000000
-#define VMALLOC_VMADDR(x) ((unsigned long)(x))
-
-#define IOBASE_VADDR   0xff000000
-#define IOBASE_END     0xffffffff
-
-/*
- * PTEL coherent flags.
- * See Chapter 17 ST50 CPU Core Volume 1, Architecture.
- */
-/* The bits that are required in the SH-5 TLB are placed in the h/w-defined
-   positions, to avoid expensive bit shuffling on every refill.  The remaining
-   bits are used for s/w purposes and masked out on each refill.
-
-   Note, the PTE slots are used to hold data of type swp_entry_t when a page is
-   swapped out.  Only the _PAGE_PRESENT flag is significant when the page is
-   swapped out, and it must be placed so that it doesn't overlap either the
-   type or offset fields of swp_entry_t.  For x86, offset is at [31:8] and type
-   at [6:1], with _PAGE_PRESENT at bit 0 for both pte_t and swp_entry_t.  This
-   scheme doesn't map to SH-5 because bit [0] controls cacheability.  So bit
-   [2] is used for _PAGE_PRESENT and the type field of swp_entry_t is split
-   into 2 pieces.  That is handled by SWP_ENTRY and SWP_TYPE below. */
-#define _PAGE_WT       0x001  /* CB0: if cacheable, 1->write-thru, 0->write-back */
-#define _PAGE_DEVICE   0x001  /* CB0: if uncacheable, 1->device (i.e. no write-combining or reordering at bus level) */
-#define _PAGE_CACHABLE 0x002  /* CB1: uncachable/cachable */
-#define _PAGE_PRESENT  0x004  /* software: page referenced */
-#define _PAGE_FILE     0x004  /* software: only when !present */
-#define _PAGE_SIZE0    0x008  /* SZ0-bit : size of page */
-#define _PAGE_SIZE1    0x010  /* SZ1-bit : size of page */
-#define _PAGE_SHARED   0x020  /* software: reflects PTEH's SH */
-#define _PAGE_READ     0x040  /* PR0-bit : read access allowed */
-#define _PAGE_EXECUTE  0x080  /* PR1-bit : execute access allowed */
-#define _PAGE_WRITE    0x100  /* PR2-bit : write access allowed */
-#define _PAGE_USER     0x200  /* PR3-bit : user space access allowed */
-#define _PAGE_DIRTY    0x400  /* software: page accessed in write */
-#define _PAGE_ACCESSED 0x800  /* software: page referenced */
-
-/* Mask which drops software flags */
-#define _PAGE_FLAGS_HARDWARE_MASK      0xfffffffffffff3dbLL
-/* Flags default: 4KB, Read, Not write, Not execute, Not user */
-#define _PAGE_FLAGS_HARDWARE_DEFAULT   0x0000000000000040LL
-
-/*
- * HugeTLB support
- */
-#if defined(CONFIG_HUGETLB_PAGE_SIZE_64K)
-#define _PAGE_SZHUGE   (_PAGE_SIZE0)
-#elif defined(CONFIG_HUGETLB_PAGE_SIZE_1MB)
-#define _PAGE_SZHUGE   (_PAGE_SIZE1)
-#elif defined(CONFIG_HUGETLB_PAGE_SIZE_512MB)
-#define _PAGE_SZHUGE   (_PAGE_SIZE0 | _PAGE_SIZE1)
-#endif
-
-/*
- * Default flags for a Kernel page.
- * This is fundametally also SHARED because the main use of this define
- * (other than for PGD/PMD entries) is for the VMALLOC pool which is
- * contextless.
- *
- * _PAGE_EXECUTE is required for modules
- *
- */
-#define _KERNPG_TABLE  (_PAGE_PRESENT | _PAGE_READ | _PAGE_WRITE | \
-                        _PAGE_EXECUTE | \
-                        _PAGE_CACHABLE | _PAGE_ACCESSED | _PAGE_DIRTY | \
-                        _PAGE_SHARED)
-
-/* Default flags for a User page */
-#define _PAGE_TABLE    (_KERNPG_TABLE | _PAGE_USER)
-
-#define _PAGE_CHG_MASK (PTE_MASK | _PAGE_ACCESSED | _PAGE_DIRTY)
-
-#define PAGE_NONE      __pgprot(_PAGE_CACHABLE | _PAGE_ACCESSED)
-#define PAGE_SHARED    __pgprot(_PAGE_PRESENT | _PAGE_READ | _PAGE_WRITE | \
-                                _PAGE_CACHABLE | _PAGE_ACCESSED | _PAGE_USER | \
-                                _PAGE_SHARED)
-/* We need to include PAGE_EXECUTE in PAGE_COPY because it is the default
- * protection mode for the stack. */
-#define PAGE_COPY      __pgprot(_PAGE_PRESENT | _PAGE_READ | _PAGE_CACHABLE | \
-                                _PAGE_ACCESSED | _PAGE_USER | _PAGE_EXECUTE)
-#define PAGE_READONLY  __pgprot(_PAGE_PRESENT | _PAGE_READ | _PAGE_CACHABLE | \
-                                _PAGE_ACCESSED | _PAGE_USER)
-#define PAGE_KERNEL    __pgprot(_KERNPG_TABLE)
-
-
-/*
- * In ST50 we have full permissions (Read/Write/Execute/Shared).
- * Just match'em all. These are for mmap(), therefore all at least
- * User/Cachable/Present/Accessed. No point in making Fault on Write.
- */
-#define __MMAP_COMMON  (_PAGE_PRESENT | _PAGE_USER | _PAGE_CACHABLE | _PAGE_ACCESSED)
-       /* sxwr */
-#define __P000 __pgprot(__MMAP_COMMON)
-#define __P001 __pgprot(__MMAP_COMMON | _PAGE_READ)
-#define __P010 __pgprot(__MMAP_COMMON)
-#define __P011 __pgprot(__MMAP_COMMON | _PAGE_READ)
-#define __P100 __pgprot(__MMAP_COMMON | _PAGE_EXECUTE)
-#define __P101 __pgprot(__MMAP_COMMON | _PAGE_EXECUTE | _PAGE_READ)
-#define __P110 __pgprot(__MMAP_COMMON | _PAGE_EXECUTE)
-#define __P111 __pgprot(__MMAP_COMMON | _PAGE_EXECUTE | _PAGE_READ)
-
-#define __S000 __pgprot(__MMAP_COMMON | _PAGE_SHARED)
-#define __S001 __pgprot(__MMAP_COMMON | _PAGE_SHARED | _PAGE_READ)
-#define __S010 __pgprot(__MMAP_COMMON | _PAGE_SHARED | _PAGE_WRITE)
-#define __S011 __pgprot(__MMAP_COMMON | _PAGE_SHARED | _PAGE_READ | _PAGE_WRITE)
-#define __S100 __pgprot(__MMAP_COMMON | _PAGE_SHARED | _PAGE_EXECUTE)
-#define __S101 __pgprot(__MMAP_COMMON | _PAGE_SHARED | _PAGE_EXECUTE | _PAGE_READ)
-#define __S110 __pgprot(__MMAP_COMMON | _PAGE_SHARED | _PAGE_EXECUTE | _PAGE_WRITE)
-#define __S111 __pgprot(__MMAP_COMMON | _PAGE_SHARED | _PAGE_EXECUTE | _PAGE_READ | _PAGE_WRITE)
-
-/* Make it a device mapping for maximum safety (e.g. for mapping device
-   registers into user-space via /dev/map).  */
-#define pgprot_noncached(x) __pgprot(((x).pgprot & ~(_PAGE_CACHABLE)) | _PAGE_DEVICE)
-#define pgprot_writecombine(prot) __pgprot(pgprot_val(prot) & ~_PAGE_CACHABLE)
-
-/*
- * Handling allocation failures during page table setup.
- */
-extern void __handle_bad_pmd_kernel(pmd_t * pmd);
-#define __handle_bad_pmd(x)    __handle_bad_pmd_kernel(x)
-
-/*
- * PTE level access routines.
- *
- * Note1:
- * It's the tree walk leaf. This is physical address to be stored.
- *
- * Note 2:
- * Regarding the choice of _PTE_EMPTY:
-
-   We must choose a bit pattern that cannot be valid, whether or not the page
-   is present.  bit[2]==1 => present, bit[2]==0 => swapped out.  If swapped
-   out, bits [31:8], [6:3], [1:0] are under swapper control, so only bit[7] is
-   left for us to select.  If we force bit[7]==0 when swapped out, we could use
-   the combination bit[7,2]=2'b10 to indicate an empty PTE.  Alternatively, if
-   we force bit[7]==1 when swapped out, we can use all zeroes to indicate
-   empty.  This is convenient, because the page tables get cleared to zero
-   when they are allocated.
-
- */
-#define _PTE_EMPTY     0x0
-#define pte_present(x) (pte_val(x) & _PAGE_PRESENT)
-#define pte_clear(xp)  (set_pte(xp, __pte(_PTE_EMPTY)))
-#define pte_none(x)    (pte_val(x) == _PTE_EMPTY)
-
-/*
- * Some definitions to translate between mem_map, PTEs, and page
- * addresses:
- */
-
-/*
- * Given a PTE, return the index of the mem_map[] entry corresponding
- * to the page frame the PTE. Get the absolute physical address, make
- * a relative physical address and translate it to an index.
- */
-#define pte_pagenr(x)          (((unsigned long) (pte_val(x)) - \
-                                __MEMORY_START) >> PAGE_SHIFT)
-
-/*
- * Given a PTE, return the "struct page *".
- */
-#define pte_page(x)            (mem_map + pte_pagenr(x))
-
-/*
- * Return number of (down rounded) MB corresponding to x pages.
- */
-#define pages_to_mb(x) ((x) >> (20-PAGE_SHIFT))
-
-
-/*
- * The following have defined behavior only work if pte_present() is true.
- */
-static inline int pte_read(pte_t pte) { return pte_val(pte) & _PAGE_READ; }
-static inline int pte_exec(pte_t pte) { return pte_val(pte) & _PAGE_EXECUTE; }
-static inline int pte_dirty(pte_t pte){ return pte_val(pte) & _PAGE_DIRTY; }
-static inline int pte_young(pte_t pte){ return pte_val(pte) & _PAGE_ACCESSED; }
-static inline int pte_file(pte_t pte) { return pte_val(pte) & _PAGE_FILE; }
-static inline int pte_write(pte_t pte){ return pte_val(pte) & _PAGE_WRITE; }
-
-extern inline pte_t pte_rdprotect(pte_t pte)   { set_pte(&pte, __pte(pte_val(pte) & ~_PAGE_READ)); return pte; }
-extern inline pte_t pte_wrprotect(pte_t pte)   { set_pte(&pte, __pte(pte_val(pte) & ~_PAGE_WRITE)); return pte; }
-extern inline pte_t pte_exprotect(pte_t pte)   { set_pte(&pte, __pte(pte_val(pte) & ~_PAGE_EXECUTE)); return pte; }
-extern inline pte_t pte_mkclean(pte_t pte)     { set_pte(&pte, __pte(pte_val(pte) & ~_PAGE_DIRTY)); return pte; }
-extern inline pte_t pte_mkold(pte_t pte)       { set_pte(&pte, __pte(pte_val(pte) & ~_PAGE_ACCESSED)); return pte; }
-
-extern inline pte_t pte_mkread(pte_t pte)      { set_pte(&pte, __pte(pte_val(pte) | _PAGE_READ)); return pte; }
-extern inline pte_t pte_mkwrite(pte_t pte)     { set_pte(&pte, __pte(pte_val(pte) | _PAGE_WRITE)); return pte; }
-extern inline pte_t pte_mkexec(pte_t pte)      { set_pte(&pte, __pte(pte_val(pte) | _PAGE_EXECUTE)); return pte; }
-extern inline pte_t pte_mkdirty(pte_t pte)     { set_pte(&pte, __pte(pte_val(pte) | _PAGE_DIRTY)); return pte; }
-extern inline pte_t pte_mkyoung(pte_t pte)     { set_pte(&pte, __pte(pte_val(pte) | _PAGE_ACCESSED)); return pte; }
-
-/*
- * Conversion functions: convert a page and protection to a page entry.
- *
- * extern pte_t mk_pte(struct page *page, pgprot_t pgprot)
- */
-#define mk_pte(page,pgprot)                                                    \
-({                                                                             \
-       pte_t __pte;                                                            \
-                                                                               \
-       set_pte(&__pte, __pte((((page)-mem_map) << PAGE_SHIFT) |                \
-               __MEMORY_START | pgprot_val((pgprot))));                        \
-       __pte;                                                                  \
-})
-
-/*
- * This takes a (absolute) physical page address that is used
- * by the remapping functions
- */
-#define mk_pte_phys(physpage, pgprot) \
-({ pte_t __pte; set_pte(&__pte, __pte(physpage | pgprot_val(pgprot))); __pte; })
-
-extern inline pte_t pte_modify(pte_t pte, pgprot_t newprot)
-{ set_pte(&pte, __pte((pte_val(pte) & _PAGE_CHG_MASK) | pgprot_val(newprot))); return pte; }
-
-#define page_pte_prot(page, prot) mk_pte(page, prot)
-#define page_pte(page) page_pte_prot(page, __pgprot(0))
-
-typedef pte_t *pte_addr_t;
-#define pgtable_cache_init()   do { } while (0)
-
-extern void update_mmu_cache(struct vm_area_struct * vma,
-                            unsigned long address, pte_t pte);
-
-/* Encode and decode a swap entry */
-#define __swp_type(x)                  (((x).val & 3) + (((x).val >> 1) & 0x3c))
-#define __swp_offset(x)                        ((x).val >> 8)
-#define __swp_entry(type, offset)      ((swp_entry_t) { ((offset << 8) + ((type & 0x3c) << 1) + (type & 3)) })
-#define __pte_to_swp_entry(pte)                ((swp_entry_t) { pte_val(pte) })
-#define __swp_entry_to_pte(x)          ((pte_t) { (x).val })
-
-/* Encode and decode a nonlinear file mapping entry */
-#define PTE_FILE_MAX_BITS              29
-#define pte_to_pgoff(pte)              (pte_val(pte))
-#define pgoff_to_pte(off)              ((pte_t) { (off) | _PAGE_FILE })
-
-/* Needs to be defined here and not in linux/mm.h, as it is arch dependent */
-#define PageSkip(page)         (0)
-#define kern_addr_valid(addr)  (1)
-
-#define io_remap_page_range remap_page_range
-#endif /* !__ASSEMBLY__ */
-
-/*
- * No page table caches to initialise
- */
-#define pgtable_cache_init()    do { } while (0)
-
-#define pte_pfn(x)             (((unsigned long)((x).pte)) >> PAGE_SHIFT)
-#define pfn_pte(pfn, prot)     __pte(((pfn) << PAGE_SHIFT) | pgprot_val(prot))
-#define pfn_pmd(pfn, prot)     __pmd(((pfn) << PAGE_SHIFT) | pgprot_val(prot))
-
-extern pgd_t swapper_pg_dir[PTRS_PER_PGD];
-
-#include <asm-generic/pgtable.h>
-
-#endif /* __ASM_SH64_PGTABLE_H */
diff --git a/include/asm-sh64/platform.h b/include/asm-sh64/platform.h
deleted file mode 100644 (file)
index 7046a90..0000000
+++ /dev/null
@@ -1,69 +0,0 @@
-#ifndef __ASM_SH64_PLATFORM_H
-#define __ASM_SH64_PLATFORM_H
-
-/*
- * 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/asm-sh64/platform.h
- *
- * Copyright (C) 2000, 2001  Paolo Alberelli
- *
- * benedict.gaster@superh.com:  3rd May 2002
- *    Added support for ramdisk, removing statically linked romfs at the same time.
- */
-
-#include <linux/ioport.h>
-#include <asm/irq.h>
-
-
-/*
- * Platform definition structure.
- */
-struct sh64_platform {
-       unsigned int readonly_rootfs;
-       unsigned int ramdisk_flags;
-       unsigned int initial_root_dev;
-       unsigned int loader_type;
-       unsigned int initrd_start;
-       unsigned int initrd_size;
-       unsigned int fpu_flags;
-       unsigned int io_res_count;
-       unsigned int kram_res_count;
-       unsigned int xram_res_count;
-       unsigned int rom_res_count;
-       struct resource *io_res_p;
-       struct resource *kram_res_p;
-       struct resource *xram_res_p;
-       struct resource *rom_res_p;
-};
-
-extern struct sh64_platform platform_parms;
-
-extern unsigned long long memory_start, memory_end;
-
-extern unsigned long long fpu_in_use;
-
-extern int platform_int_priority[NR_INTC_IRQS];
-
-#define FPU_FLAGS              (platform_parms.fpu_flags)
-#define STANDARD_IO_RESOURCES  (platform_parms.io_res_count)
-#define STANDARD_KRAM_RESOURCES        (platform_parms.kram_res_count)
-#define STANDARD_XRAM_RESOURCES        (platform_parms.xram_res_count)
-#define STANDARD_ROM_RESOURCES (platform_parms.rom_res_count)
-
-/*
- * Kernel Memory description, Respectively:
- * code = last but one memory descriptor
- * data = last memory descriptor
- */
-#define code_resource (platform_parms.kram_res_p[STANDARD_KRAM_RESOURCES - 2])
-#define data_resource (platform_parms.kram_res_p[STANDARD_KRAM_RESOURCES - 1])
-
-/* Be prepared to 64-bit sign extensions */
-#define PFN_UP(x)       ((((x) + PAGE_SIZE-1) >> PAGE_SHIFT) & 0x000fffff)
-#define PFN_DOWN(x)     (((x) >> PAGE_SHIFT) & 0x000fffff)
-#define PFN_PHYS(x)     ((x) << PAGE_SHIFT)
-
-#endif /* __ASM_SH64_PLATFORM_H */
diff --git a/include/asm-sh64/poll.h b/include/asm-sh64/poll.h
deleted file mode 100644 (file)
index a420d14..0000000
+++ /dev/null
@@ -1,36 +0,0 @@
-#ifndef __ASM_SH64_POLL_H
-#define __ASM_SH64_POLL_H
-
-/*
- * 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/asm-sh64/poll.h
- *
- * Copyright (C) 2000, 2001  Paolo Alberelli
- *
- */
-
-/* These are specified by iBCS2 */
-#define POLLIN         0x0001
-#define POLLPRI                0x0002
-#define POLLOUT                0x0004
-#define POLLERR                0x0008
-#define POLLHUP                0x0010
-#define POLLNVAL       0x0020
-
-/* The rest seem to be more-or-less nonstandard. Check them! */
-#define POLLRDNORM     0x0040
-#define POLLRDBAND     0x0080
-#define POLLWRNORM     0x0100
-#define POLLWRBAND     0x0200
-#define POLLMSG                0x0400
-
-struct pollfd {
-       int fd;
-       short events;
-       short revents;
-};
-
-#endif /* __ASM_SH64_POLL_H */
diff --git a/include/asm-sh64/posix_types.h b/include/asm-sh64/posix_types.h
deleted file mode 100644 (file)
index 0620317..0000000
+++ /dev/null
@@ -1,131 +0,0 @@
-#ifndef __ASM_SH64_POSIX_TYPES_H
-#define __ASM_SH64_POSIX_TYPES_H
-
-/*
- * 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/asm-sh64/posix_types.h
- *
- * Copyright (C) 2000, 2001  Paolo Alberelli
- * Copyright (C) 2003  Paul Mundt
- *
- * This file is generally used by user-level software, so you need to
- * be a little careful about namespace pollution etc.  Also, we cannot
- * assume GCC is being used.
- */
-
-typedef unsigned long  __kernel_ino_t;
-typedef unsigned short __kernel_mode_t;
-typedef unsigned short __kernel_nlink_t;
-typedef long           __kernel_off_t;
-typedef int            __kernel_pid_t;
-typedef unsigned short __kernel_ipc_pid_t;
-typedef unsigned short __kernel_uid_t;
-typedef unsigned short __kernel_gid_t;
-typedef long unsigned int      __kernel_size_t;
-typedef int            __kernel_ssize_t;
-typedef int            __kernel_ptrdiff_t;
-typedef long           __kernel_time_t;
-typedef long           __kernel_suseconds_t;
-typedef long           __kernel_clock_t;
-typedef int            __kernel_timer_t;
-typedef int            __kernel_clockid_t;
-typedef int            __kernel_daddr_t;
-typedef char *         __kernel_caddr_t;
-typedef unsigned short __kernel_uid16_t;
-typedef unsigned short __kernel_gid16_t;
-typedef unsigned int   __kernel_uid32_t;
-typedef unsigned int   __kernel_gid32_t;
-
-typedef unsigned short __kernel_old_uid_t;
-typedef unsigned short __kernel_old_gid_t;
-typedef unsigned short __kernel_old_dev_t;
-
-#ifdef __GNUC__
-typedef long long      __kernel_loff_t;
-#endif
-
-typedef struct {
-#if defined(__KERNEL__) || defined(__USE_ALL)
-       int     val[2];
-#else /* !defined(__KERNEL__) && !defined(__USE_ALL) */
-       int     __val[2];
-#endif /* !defined(__KERNEL__) && !defined(__USE_ALL) */
-} __kernel_fsid_t;
-
-#if defined(__KERNEL__) || !defined(__GLIBC__) || (__GLIBC__ < 2)
-
-#undef __FD_SET
-static __inline__ void __FD_SET(unsigned long __fd, __kernel_fd_set *__fdsetp)
-{
-       unsigned long __tmp = __fd / __NFDBITS;
-       unsigned long __rem = __fd % __NFDBITS;
-       __fdsetp->fds_bits[__tmp] |= (1UL<<__rem);
-}
-
-#undef __FD_CLR
-static __inline__ void __FD_CLR(unsigned long __fd, __kernel_fd_set *__fdsetp)
-{
-       unsigned long __tmp = __fd / __NFDBITS;
-       unsigned long __rem = __fd % __NFDBITS;
-       __fdsetp->fds_bits[__tmp] &= ~(1UL<<__rem);
-}
-
-
-#undef __FD_ISSET
-static __inline__ int __FD_ISSET(unsigned long __fd, const __kernel_fd_set *__p)
-{
-       unsigned long __tmp = __fd / __NFDBITS;
-       unsigned long __rem = __fd % __NFDBITS;
-       return (__p->fds_bits[__tmp] & (1UL<<__rem)) != 0;
-}
-
-/*
- * This will unroll the loop for the normal constant case (8 ints,
- * for a 256-bit fd_set)
- */
-#undef __FD_ZERO
-static __inline__ void __FD_ZERO(__kernel_fd_set *__p)
-{
-       unsigned long *__tmp = __p->fds_bits;
-       int __i;
-
-       if (__builtin_constant_p(__FDSET_LONGS)) {
-               switch (__FDSET_LONGS) {
-               case 16:
-                       __tmp[ 0] = 0; __tmp[ 1] = 0;
-                       __tmp[ 2] = 0; __tmp[ 3] = 0;
-                       __tmp[ 4] = 0; __tmp[ 5] = 0;
-                       __tmp[ 6] = 0; __tmp[ 7] = 0;
-                       __tmp[ 8] = 0; __tmp[ 9] = 0;
-                       __tmp[10] = 0; __tmp[11] = 0;
-                       __tmp[12] = 0; __tmp[13] = 0;
-                       __tmp[14] = 0; __tmp[15] = 0;
-                       return;
-
-               case 8:
-                       __tmp[ 0] = 0; __tmp[ 1] = 0;
-                       __tmp[ 2] = 0; __tmp[ 3] = 0;
-                       __tmp[ 4] = 0; __tmp[ 5] = 0;
-                       __tmp[ 6] = 0; __tmp[ 7] = 0;
-                       return;
-
-               case 4:
-                       __tmp[ 0] = 0; __tmp[ 1] = 0;
-                       __tmp[ 2] = 0; __tmp[ 3] = 0;
-                       return;
-               }
-       }
-       __i = __FDSET_LONGS;
-       while (__i) {
-               __i--;
-               *__tmp = 0;
-               __tmp++;
-       }
-}
-
-#endif /* defined(__KERNEL__) || !defined(__GLIBC__) || (__GLIBC__ < 2) */
-
-#endif /* __ASM_SH64_POSIX_TYPES_H */
diff --git a/include/asm-sh64/processor.h b/include/asm-sh64/processor.h
deleted file mode 100644 (file)
index 0f45ae6..0000000
+++ /dev/null
@@ -1,292 +0,0 @@
-#ifndef __ASM_SH64_PROCESSOR_H
-#define __ASM_SH64_PROCESSOR_H
-
-/*
- * 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/asm-sh64/processor.h
- *
- * Copyright (C) 2000, 2001  Paolo Alberelli
- * Copyright (C) 2003  Paul Mundt
- * Copyright (C) 2004  Richard Curnow
- *
- */
-
-#include <asm/page.h>
-
-#ifndef __ASSEMBLY__
-
-#include <asm/types.h>
-#include <asm/cache.h>
-#include <asm/registers.h>
-#include <linux/threads.h>
-
-/*
- * Default implementation of macro that returns current
- * instruction pointer ("program counter").
- */
-#define current_text_addr() ({ \
-void *pc; \
-unsigned long long __dummy = 0; \
-__asm__("gettr tr0, %1\n\t" \
-       "pta    4, tr0\n\t" \
-       "gettr  tr0, %0\n\t" \
-       "ptabs  %1, tr0\n\t"    \
-       :"=r" (pc), "=r" (__dummy) \
-       : "1" (__dummy)); \
-pc; })
-
-/*
- *  CPU type and hardware bug flags. Kept separately for each CPU.
- */
-enum cpu_type {
-       CPU_SH5_101,
-       CPU_SH5_103,
-       CPU_SH_NONE
-};
-
-/*
- * TLB information structure
- *
- * Defined for both I and D tlb, per-processor.
- */
-struct tlb_info {
-       unsigned long long next;
-       unsigned long long first;
-       unsigned long long last;
-
-       unsigned int entries;
-       unsigned int step;
-
-       unsigned long flags;
-};
-
-struct sh_cpuinfo {
-       enum cpu_type type;
-       unsigned long loops_per_jiffy;
-
-       char    hard_math;
-
-       unsigned long *pgd_quick;
-       unsigned long *pmd_quick;
-       unsigned long *pte_quick;
-       unsigned long pgtable_cache_sz;
-       unsigned int cpu_clock, master_clock, bus_clock, module_clock;
-
-       /* Cache info */
-       struct cache_info icache;
-       struct cache_info dcache;
-
-       /* TLB info */
-       struct tlb_info itlb;
-       struct tlb_info dtlb;
-};
-
-extern struct sh_cpuinfo boot_cpu_data;
-
-#define cpu_data (&boot_cpu_data)
-#define current_cpu_data boot_cpu_data
-
-#endif
-
-/*
- * User space process size: 2GB - 4k.
- */
-#define TASK_SIZE      0x7ffff000UL
-
-/* This decides where the kernel will search for a free chunk of vm
- * space during mmap's.
- */
-#define TASK_UNMAPPED_BASE     (TASK_SIZE / 3)
-
-/*
- * Bit of SR register
- *
- * FD-bit:
- *     When it's set, it means the processor doesn't have right to use FPU,
- *     and it results exception when the floating operation is executed.
- *
- * IMASK-bit:
- *     Interrupt level mask
- *
- * STEP-bit:
- *     Single step bit
- *
- */
-#define SR_FD    0x00008000
-
-#if defined(CONFIG_SH64_SR_WATCH)
-#define SR_MMU   0x84000000
-#else
-#define SR_MMU   0x80000000
-#endif
-
-#define SR_IMASK 0x000000f0
-#define SR_SSTEP 0x08000000
-
-#ifndef __ASSEMBLY__
-
-/*
- * FPU structure and data : require 8-byte alignment as we need to access it
-   with fld.p, fst.p
- */
-
-struct sh_fpu_hard_struct {
-       unsigned long fp_regs[64];
-       unsigned int fpscr;
-       /* long status; * software status information */
-};
-
-#if 0
-/* Dummy fpu emulator  */
-struct sh_fpu_soft_struct {
-       unsigned long long fp_regs[32];
-       unsigned int fpscr;
-       unsigned char lookahead;
-       unsigned long entry_pc;
-};
-#endif
-
-union sh_fpu_union {
-       struct sh_fpu_hard_struct hard;
-       /* 'hard' itself only produces 32 bit alignment, yet we need
-          to access it using 64 bit load/store as well. */
-       unsigned long long alignment_dummy;
-};
-
-struct thread_struct {
-       unsigned long sp;
-       unsigned long pc;
-       /* This stores the address of the pt_regs built during a context
-          switch, or of the register save area built for a kernel mode
-          exception.  It is used for backtracing the stack of a sleeping task
-          or one that traps in kernel mode. */
-        struct pt_regs *kregs;
-       /* This stores the address of the pt_regs constructed on entry from
-          user mode.  It is a fixed value over the lifetime of a process, or
-          NULL for a kernel thread. */
-       struct pt_regs *uregs;
-
-       unsigned long trap_no, error_code;
-       unsigned long address;
-       /* Hardware debugging registers may come here */
-
-       /* floating point info */
-       union sh_fpu_union fpu;
-};
-
-#define INIT_MMAP \
-{ &init_mm, 0, 0, NULL, PAGE_SHARED, VM_READ | VM_WRITE | VM_EXEC, 1, NULL, NULL }
-
-extern  struct pt_regs fake_swapper_regs;
-
-#define INIT_THREAD  {                         \
-       .sp             = sizeof(init_stack) +  \
-                         (long) &init_stack,   \
-       .pc             = 0,                    \
-        .kregs         = &fake_swapper_regs,   \
-       .uregs          = NULL,                 \
-       .trap_no        = 0,                    \
-       .error_code     = 0,                    \
-       .address        = 0,                    \
-       .fpu            = { { { 0, } }, }       \
-}
-
-/*
- * Do necessary setup to start up a newly executed thread.
- */
-#define SR_USER (SR_MMU | SR_FD)
-
-#define start_thread(regs, new_pc, new_sp)                     \
-       set_fs(USER_DS);                                        \
-       regs->sr = SR_USER;     /* User mode. */                \
-       regs->pc = new_pc - 4;  /* Compensate syscall exit */   \
-       regs->pc |= 1;          /* Set SHmedia ! */             \
-       regs->regs[18] = 0;                                     \
-       regs->regs[15] = new_sp
-
-/* Forward declaration, a strange C thing */
-struct task_struct;
-struct mm_struct;
-
-/* Free all resources held by a thread. */
-extern void release_thread(struct task_struct *);
-/*
- * create a kernel thread without removing it from tasklists
- */
-extern int kernel_thread(int (*fn)(void *), void * arg, unsigned long flags);
-
-/*
- * Bus types
- */
-#define MCA_bus 0
-#define MCA_bus__is_a_macro /* for versions in ksyms.c */
-
-
-/* Copy and release all segment info associated with a VM */
-#define copy_segments(p, mm)   do { } while (0)
-#define release_segments(mm)   do { } while (0)
-#define forget_segments()      do { } while (0)
-#define prepare_to_copy(tsk)   do { } while (0)
-/*
- * FPU lazy state save handling.
- */
-
-extern __inline__ void release_fpu(void)
-{
-       unsigned long long __dummy;
-
-       /* Set FD flag in SR */
-       __asm__ __volatile__("getcon    " __SR ", %0\n\t"
-                            "or        %0, %1, %0\n\t"
-                            "putcon    %0, " __SR "\n\t"
-                            : "=&r" (__dummy)
-                            : "r" (SR_FD));
-}
-
-extern __inline__ void grab_fpu(void)
-{
-       unsigned long long __dummy;
-
-       /* Clear out FD flag in SR */
-       __asm__ __volatile__("getcon    " __SR ", %0\n\t"
-                            "and       %0, %1, %0\n\t"
-                            "putcon    %0, " __SR "\n\t"
-                            : "=&r" (__dummy)
-                            : "r" (~SR_FD));
-}
-
-/* Round to nearest, no exceptions on inexact, overflow, underflow,
-   zero-divide, invalid.  Configure option for whether to flush denorms to
-   zero, or except if a denorm is encountered.  */
-#if defined(CONFIG_SH64_FPU_DENORM_FLUSH)
-#define FPSCR_INIT  0x00040000
-#else
-#define FPSCR_INIT  0x00000000
-#endif
-
-/* Save the current FP regs */
-void fpsave(struct sh_fpu_hard_struct *fpregs);
-
-/* Initialise the FP state of a task */
-void fpinit(struct sh_fpu_hard_struct *fpregs);
-
-extern struct task_struct *last_task_used_math;
-
-/*
- * Return saved PC of a blocked thread.
- */
-#define thread_saved_pc(tsk)   (tsk->thread.pc)
-
-extern unsigned long get_wchan(struct task_struct *p);
-
-#define KSTK_EIP(tsk)  ((tsk)->thread.pc)
-#define KSTK_ESP(tsk)  ((tsk)->thread.sp)
-
-#define cpu_relax()    do { } while (0)
-
-#endif /* __ASSEMBLY__ */
-#endif /* __ASM_SH64_PROCESSOR_H */
-
diff --git a/include/asm-sh64/ptrace.h b/include/asm-sh64/ptrace.h
deleted file mode 100644 (file)
index 56f836e..0000000
+++ /dev/null
@@ -1,36 +0,0 @@
-#ifndef __ASM_SH64_PTRACE_H
-#define __ASM_SH64_PTRACE_H
-
-/*
- * 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/asm-sh64/ptrace.h
- *
- * Copyright (C) 2000, 2001  Paolo Alberelli
- *
- */
-
-/*
- * This struct defines the way the registers are stored on the
- * kernel stack during a system call or other kernel entry.
- */
-struct pt_regs {
-       unsigned long long pc;
-       unsigned long long sr;
-       unsigned long long syscall_nr;
-       unsigned long long regs[63];
-       unsigned long long tregs[8];
-       unsigned long long pad[2];
-};
-
-#ifdef __KERNEL__
-#define user_mode(regs) (((regs)->sr & 0x40000000)==0)
-#define instruction_pointer(regs) ((regs)->pc)
-extern void show_regs(struct pt_regs *);
-#endif
-
-#define PTRACE_O_TRACESYSGOOD     0x00000001
-
-#endif /* __ASM_SH64_PTRACE_H */
diff --git a/include/asm-sh64/registers.h b/include/asm-sh64/registers.h
deleted file mode 100644 (file)
index 7eec666..0000000
+++ /dev/null
@@ -1,106 +0,0 @@
-#ifndef __ASM_SH64_REGISTERS_H
-#define __ASM_SH64_REGISTERS_H
-
-/*
- * 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/asm-sh64/registers.h
- *
- * Copyright (C) 2000, 2001  Paolo Alberelli
- * Copyright (C) 2004  Richard Curnow
- */
-
-#ifdef __ASSEMBLY__
-/* =====================================================================
-**
-** Section 1: acts on assembly sources pre-processed by GPP ( <source.S>).
-**           Assigns symbolic names to control & target registers.
-*/
-
-/*
- * Define some useful aliases for control registers.
- */
-#define SR     cr0
-#define SSR    cr1
-#define PSSR   cr2
-                       /* cr3 UNDEFINED */
-#define INTEVT cr4
-#define EXPEVT cr5
-#define PEXPEVT        cr6
-#define TRA    cr7
-#define SPC    cr8
-#define PSPC   cr9
-#define RESVEC cr10
-#define VBR    cr11
-                       /* cr12 UNDEFINED */
-#define TEA    cr13
-                       /* cr14-cr15 UNDEFINED */
-#define DCR    cr16
-#define KCR0   cr17
-#define KCR1   cr18
-                       /* cr19-cr31 UNDEFINED */
-                       /* cr32-cr61 RESERVED */
-#define CTC    cr62
-#define USR    cr63
-
-/*
- * ABI dependent registers (general purpose set)
- */
-#define RET    r2
-#define ARG1   r2
-#define ARG2   r3
-#define ARG3   r4
-#define ARG4   r5
-#define ARG5   r6
-#define ARG6   r7
-#define SP     r15
-#define LINK   r18
-#define ZERO   r63
-
-/*
- * Status register defines: used only by assembly sources (and
- *                         syntax independednt)
- */
-#define SR_RESET_VAL   0x0000000050008000
-#define SR_HARMLESS    0x00000000500080f0      /* Write ignores for most */
-#define SR_ENABLE_FPU  0xffffffffffff7fff      /* AND with this */
-
-#if defined (CONFIG_SH64_SR_WATCH)
-#define SR_ENABLE_MMU  0x0000000084000000      /* OR with this */
-#else
-#define SR_ENABLE_MMU  0x0000000080000000      /* OR with this */
-#endif
-
-#define SR_UNBLOCK_EXC 0xffffffffefffffff      /* AND with this */
-#define SR_BLOCK_EXC   0x0000000010000000      /* OR with this */
-
-#else  /* Not __ASSEMBLY__ syntax */
-
-/*
-** Stringify reg. name
-*/
-#define __str(x)  #x
-
-/* Stringify control register names for use in inline assembly */
-#define __SR __str(SR)
-#define __SSR __str(SSR)
-#define __PSSR __str(PSSR)
-#define __INTEVT __str(INTEVT)
-#define __EXPEVT __str(EXPEVT)
-#define __PEXPEVT __str(PEXPEVT)
-#define __TRA __str(TRA)
-#define __SPC __str(SPC)
-#define __PSPC __str(PSPC)
-#define __RESVEC __str(RESVEC)
-#define __VBR __str(VBR)
-#define __TEA __str(TEA)
-#define __DCR __str(DCR)
-#define __KCR0 __str(KCR0)
-#define __KCR1 __str(KCR1)
-#define __CTC __str(CTC)
-#define __USR __str(USR)
-
-#endif /* __ASSEMBLY__ */
-#endif /* __ASM_SH64_REGISTERS_H */
diff --git a/include/asm-sh64/resource.h b/include/asm-sh64/resource.h
deleted file mode 100644 (file)
index 8ff9394..0000000
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef __ASM_SH64_RESOURCE_H
-#define __ASM_SH64_RESOURCE_H
-
-#include <asm-sh/resource.h>
-
-#endif /* __ASM_SH64_RESOURCE_H */
diff --git a/include/asm-sh64/scatterlist.h b/include/asm-sh64/scatterlist.h
deleted file mode 100644 (file)
index 5d8fa32..0000000
+++ /dev/null
@@ -1,23 +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.
- *
- * include/asm-sh64/scatterlist.h
- *
- * Copyright (C) 2003  Paul Mundt
- *
- */
-#ifndef __ASM_SH64_SCATTERLIST_H
-#define __ASM_SH64_SCATTERLIST_H
-
-struct scatterlist {
-    struct page * page; /* Location for highmem page, if any */
-    unsigned int offset;/* for highmem, page offset */
-    dma_addr_t dma_address;
-    unsigned int length;
-};
-
-#define ISA_DMA_THRESHOLD (0xffffffff)
-
-#endif /* !__ASM_SH64_SCATTERLIST_H */
diff --git a/include/asm-sh64/sections.h b/include/asm-sh64/sections.h
deleted file mode 100644 (file)
index 897f36b..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-#ifndef __ASM_SH64_SECTIONS_H
-#define __ASM_SH64_SECTIONS_H
-
-#include <asm-sh/sections.h>
-
-#endif /* __ASM_SH64_SECTIONS_H */
-
diff --git a/include/asm-sh64/segment.h b/include/asm-sh64/segment.h
deleted file mode 100644 (file)
index 92ac001..0000000
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef _ASM_SEGMENT_H
-#define _ASM_SEGMENT_H
-
-/* Only here because we have some old header files that expect it.. */
-
-#endif /* _ASM_SEGMENT_H */
diff --git a/include/asm-sh64/semaphore-helper.h b/include/asm-sh64/semaphore-helper.h
deleted file mode 100644 (file)
index fcfafe2..0000000
+++ /dev/null
@@ -1,101 +0,0 @@
-#ifndef __ASM_SH64_SEMAPHORE_HELPER_H
-#define __ASM_SH64_SEMAPHORE_HELPER_H
-
-/*
- * 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/asm-sh64/semaphore-helper.h
- *
- * Copyright (C) 2000, 2001  Paolo Alberelli
- *
- */
-#include <asm/errno.h>
-
-/*
- * SMP- and interrupt-safe semaphores helper functions.
- *
- * (C) Copyright 1996 Linus Torvalds
- * (C) Copyright 1999 Andrea Arcangeli
- */
-
-/*
- * These two _must_ execute atomically wrt each other.
- *
- * This is trivially done with load_locked/store_cond,
- * which we have.  Let the rest of the losers suck eggs.
- */
-static __inline__ void wake_one_more(struct semaphore * sem)
-{
-       atomic_inc((atomic_t *)&sem->sleepers);
-}
-
-static __inline__ int waking_non_zero(struct semaphore *sem)
-{
-       unsigned long flags;
-       int ret = 0;
-
-       spin_lock_irqsave(&semaphore_wake_lock, flags);
-       if (sem->sleepers > 0) {
-               sem->sleepers--;
-               ret = 1;
-       }
-       spin_unlock_irqrestore(&semaphore_wake_lock, flags);
-       return ret;
-}
-
-/*
- * waking_non_zero_interruptible:
- *     1       got the lock
- *     0       go to sleep
- *     -EINTR  interrupted
- *
- * We must undo the sem->count down_interruptible() increment while we are
- * protected by the spinlock in order to make atomic this atomic_inc() with the
- * atomic_read() in wake_one_more(), otherwise we can race. -arca
- */
-static __inline__ int waking_non_zero_interruptible(struct semaphore *sem,
-                                               struct task_struct *tsk)
-{
-       unsigned long flags;
-       int ret = 0;
-
-       spin_lock_irqsave(&semaphore_wake_lock, flags);
-       if (sem->sleepers > 0) {
-               sem->sleepers--;
-               ret = 1;
-       } else if (signal_pending(tsk)) {
-               atomic_inc(&sem->count);
-               ret = -EINTR;
-       }
-       spin_unlock_irqrestore(&semaphore_wake_lock, flags);
-       return ret;
-}
-
-/*
- * waking_non_zero_trylock:
- *     1       failed to lock
- *     0       got the lock
- *
- * We must undo the sem->count down_trylock() increment while we are
- * protected by the spinlock in order to make atomic this atomic_inc() with the
- * atomic_read() in wake_one_more(), otherwise we can race. -arca
- */
-static __inline__ int waking_non_zero_trylock(struct semaphore *sem)
-{
-       unsigned long flags;
-       int ret = 1;
-
-       spin_lock_irqsave(&semaphore_wake_lock, flags);
-       if (sem->sleepers <= 0)
-               atomic_inc(&sem->count);
-       else {
-               sem->sleepers--;
-               ret = 0;
-       }
-       spin_unlock_irqrestore(&semaphore_wake_lock, flags);
-       return ret;
-}
-
-#endif /* __ASM_SH64_SEMAPHORE_HELPER_H */
diff --git a/include/asm-sh64/semaphore.h b/include/asm-sh64/semaphore.h
deleted file mode 100644 (file)
index 3e97ead..0000000
+++ /dev/null
@@ -1,146 +0,0 @@
-#ifndef __ASM_SH64_SEMAPHORE_H
-#define __ASM_SH64_SEMAPHORE_H
-
-/*
- * 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/asm-sh64/semaphore.h
- *
- * Copyright (C) 2000, 2001  Paolo Alberelli
- *
- * SMP- and interrupt-safe semaphores.
- *
- * (C) Copyright 1996 Linus Torvalds
- *
- * SuperH verison by Niibe Yutaka
- *  (Currently no asm implementation but generic C code...)
- *
- */
-
-#include <linux/linkage.h>
-#include <linux/spinlock.h>
-#include <linux/wait.h>
-#include <linux/rwsem.h>
-
-#include <asm/system.h>
-#include <asm/atomic.h>
-
-struct semaphore {
-       atomic_t count;
-       int sleepers;
-       wait_queue_head_t wait;
-#ifdef WAITQUEUE_DEBUG
-       long __magic;
-#endif
-};
-
-#ifdef WAITQUEUE_DEBUG
-# define __SEM_DEBUG_INIT(name) \
-               , (int)&(name).__magic
-#else
-# define __SEM_DEBUG_INIT(name)
-#endif
-
-#define __SEMAPHORE_INITIALIZER(name,count) \
-{ ATOMIC_INIT(count), 0, __WAIT_QUEUE_HEAD_INITIALIZER((name).wait) \
-       __SEM_DEBUG_INIT(name) }
-
-#define __MUTEX_INITIALIZER(name) \
-       __SEMAPHORE_INITIALIZER(name,1)
-
-#define __DECLARE_SEMAPHORE_GENERIC(name,count) \
-       struct semaphore name = __SEMAPHORE_INITIALIZER(name,count)
-
-#define DECLARE_MUTEX(name) __DECLARE_SEMAPHORE_GENERIC(name,1)
-#define DECLARE_MUTEX_LOCKED(name) __DECLARE_SEMAPHORE_GENERIC(name,0)
-
-static inline void sema_init (struct semaphore *sem, int val)
-{
-/*
- *     *sem = (struct semaphore)__SEMAPHORE_INITIALIZER((*sem),val);
- *
- * i'd rather use the more flexible initialization above, but sadly
- * GCC 2.7.2.3 emits a bogus warning. EGCS doesnt. Oh well.
- */
-       atomic_set(&sem->count, val);
-       sem->sleepers = 0;
-       init_waitqueue_head(&sem->wait);
-#ifdef WAITQUEUE_DEBUG
-       sem->__magic = (int)&sem->__magic;
-#endif
-}
-
-static inline void init_MUTEX (struct semaphore *sem)
-{
-       sema_init(sem, 1);
-}
-
-static inline void init_MUTEX_LOCKED (struct semaphore *sem)
-{
-       sema_init(sem, 0);
-}
-
-#if 0
-asmlinkage void __down_failed(void /* special register calling convention */);
-asmlinkage int  __down_failed_interruptible(void  /* params in registers */);
-asmlinkage int  __down_failed_trylock(void  /* params in registers */);
-asmlinkage void __up_wakeup(void /* special register calling convention */);
-#endif
-
-asmlinkage void __down(struct semaphore * sem);
-asmlinkage int  __down_interruptible(struct semaphore * sem);
-asmlinkage int  __down_trylock(struct semaphore * sem);
-asmlinkage void __up(struct semaphore * sem);
-
-extern spinlock_t semaphore_wake_lock;
-
-static inline void down(struct semaphore * sem)
-{
-#ifdef WAITQUEUE_DEBUG
-       CHECK_MAGIC(sem->__magic);
-#endif
-
-       if (atomic_dec_return(&sem->count) < 0)
-               __down(sem);
-}
-
-static inline int down_interruptible(struct semaphore * sem)
-{
-       int ret = 0;
-#ifdef WAITQUEUE_DEBUG
-       CHECK_MAGIC(sem->__magic);
-#endif
-
-       if (atomic_dec_return(&sem->count) < 0)
-               ret = __down_interruptible(sem);
-       return ret;
-}
-
-static inline int down_trylock(struct semaphore * sem)
-{
-       int ret = 0;
-#ifdef WAITQUEUE_DEBUG
-       CHECK_MAGIC(sem->__magic);
-#endif
-
-       if (atomic_dec_return(&sem->count) < 0)
-               ret = __down_trylock(sem);
-       return ret;
-}
-
-/*
- * Note! This is subtle. We jump to wake people up only if
- * the semaphore was negative (== somebody was waiting on it).
- */
-static inline void up(struct semaphore * sem)
-{
-#ifdef WAITQUEUE_DEBUG
-       CHECK_MAGIC(sem->__magic);
-#endif
-       if (atomic_inc_return(&sem->count) <= 0)
-               __up(sem);
-}
-
-#endif /* __ASM_SH64_SEMAPHORE_H */
diff --git a/include/asm-sh64/sembuf.h b/include/asm-sh64/sembuf.h
deleted file mode 100644 (file)
index ec4d9f1..0000000
+++ /dev/null
@@ -1,36 +0,0 @@
-#ifndef __ASM_SH64_SEMBUF_H
-#define __ASM_SH64_SEMBUF_H
-
-/*
- * 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/asm-sh64/sembuf.h
- *
- * Copyright (C) 2000, 2001  Paolo Alberelli
- *
- */
-
-/*
- * The semid64_ds structure for i386 architecture.
- * Note extra padding because this structure is passed back and forth
- * between kernel and user space.
- *
- * Pad space is left for:
- * - 64-bit time_t to solve y2038 problem
- * - 2 miscellaneous 32-bit values
- */
-
-struct semid64_ds {
-       struct ipc64_perm sem_perm;             /* permissions .. see ipc.h */
-       __kernel_time_t sem_otime;              /* last semop time */
-       unsigned long   __unused1;
-       __kernel_time_t sem_ctime;              /* last change time */
-       unsigned long   __unused2;
-       unsigned long   sem_nsems;              /* no. of semaphores in array */
-       unsigned long   __unused3;
-       unsigned long   __unused4;
-};
-
-#endif /* __ASM_SH64_SEMBUF_H */
diff --git a/include/asm-sh64/serial.h b/include/asm-sh64/serial.h
deleted file mode 100644 (file)
index 8e39b4e..0000000
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * include/asm-sh/serial.h
- *
- * Configuration details for 8250, 16450, 16550, etc. serial ports
- */
-
-#ifndef _ASM_SERIAL_H
-#define _ASM_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 RS_TABLE_SIZE  2
-
-#define STD_COM_FLAGS (ASYNC_BOOT_AUTOCONF | ASYNC_SKIP_TEST)
-
-#define STD_SERIAL_PORT_DEFNS                  \
-       /* UART CLK   PORT IRQ     FLAGS        */                      \
-       { 0, BASE_BAUD, 0x3F8, 4, STD_COM_FLAGS },      /* ttyS0 */     \
-       { 0, BASE_BAUD, 0x2F8, 3, STD_COM_FLAGS }       /* ttyS1 */
-
-#define SERIAL_PORT_DFNS STD_SERIAL_PORT_DEFNS
-
-/* XXX: This should be moved ino irq.h */
-#define irq_cannonicalize(x) (x)
-
-#endif /* _ASM_SERIAL_H */
diff --git a/include/asm-sh64/setup.h b/include/asm-sh64/setup.h
deleted file mode 100644 (file)
index ebd42eb..0000000
+++ /dev/null
@@ -1,16 +0,0 @@
-#ifndef __ASM_SH64_SETUP_H
-#define __ASM_SH64_SETUP_H
-
-#define PARAM ((unsigned char *)empty_zero_page)
-#define MOUNT_ROOT_RDONLY (*(unsigned long *) (PARAM+0x000))
-#define RAMDISK_FLAGS (*(unsigned long *) (PARAM+0x004))
-#define ORIG_ROOT_DEV (*(unsigned long *) (PARAM+0x008))
-#define LOADER_TYPE (*(unsigned long *) (PARAM+0x00c))
-#define INITRD_START (*(unsigned long *) (PARAM+0x010))
-#define INITRD_SIZE (*(unsigned long *) (PARAM+0x014))
-
-#define COMMAND_LINE ((char *) (PARAM+256))
-#define COMMAND_LINE_SIZE 256
-
-#endif /* __ASM_SH64_SETUP_H */
-
diff --git a/include/asm-sh64/shmbuf.h b/include/asm-sh64/shmbuf.h
deleted file mode 100644 (file)
index 022f349..0000000
+++ /dev/null
@@ -1,53 +0,0 @@
-#ifndef __ASM_SH64_SHMBUF_H
-#define __ASM_SH64_SHMBUF_H
-
-/*
- * 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/asm-sh64/shmbuf.h
- *
- * Copyright (C) 2000, 2001  Paolo Alberelli
- *
- */
-
-/*
- * The shmid64_ds structure for i386 architecture.
- * Note extra padding because this structure is passed back and forth
- * between kernel and user space.
- *
- * Pad space is left for:
- * - 64-bit time_t to solve y2038 problem
- * - 2 miscellaneous 32-bit values
- */
-
-struct shmid64_ds {
-       struct ipc64_perm       shm_perm;       /* operation perms */
-       size_t                  shm_segsz;      /* size of segment (bytes) */
-       __kernel_time_t         shm_atime;      /* last attach time */
-       unsigned long           __unused1;
-       __kernel_time_t         shm_dtime;      /* last detach time */
-       unsigned long           __unused2;
-       __kernel_time_t         shm_ctime;      /* last change time */
-       unsigned long           __unused3;
-       __kernel_pid_t          shm_cpid;       /* pid of creator */
-       __kernel_pid_t          shm_lpid;       /* pid of last operator */
-       unsigned long           shm_nattch;     /* no. of current attaches */
-       unsigned long           __unused4;
-       unsigned long           __unused5;
-};
-
-struct shminfo64 {
-       unsigned long   shmmax;
-       unsigned long   shmmin;
-       unsigned long   shmmni;
-       unsigned long   shmseg;
-       unsigned long   shmall;
-       unsigned long   __unused1;
-       unsigned long   __unused2;
-       unsigned long   __unused3;
-       unsigned long   __unused4;
-};
-
-#endif /* __ASM_SH64_SHMBUF_H */
diff --git a/include/asm-sh64/shmparam.h b/include/asm-sh64/shmparam.h
deleted file mode 100644 (file)
index d3a99a4..0000000
+++ /dev/null
@@ -1,20 +0,0 @@
-#ifndef __ASM_SH64_SHMPARAM_H
-#define __ASM_SH64_SHMPARAM_H
-
-/*
- * 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/asm-sh64/shmparam.h
- *
- * Copyright (C) 2000, 2001  Paolo Alberelli
- *
- */
-
-#include <asm/cache.h>
-
-/* attach addr a multiple of this */
-#define        SHMLBA  (cpu_data->dcache.sets * L1_CACHE_BYTES)
-
-#endif /* __ASM_SH64_SHMPARAM_H */
diff --git a/include/asm-sh64/sigcontext.h b/include/asm-sh64/sigcontext.h
deleted file mode 100644 (file)
index 6293509..0000000
+++ /dev/null
@@ -1,30 +0,0 @@
-#ifndef __ASM_SH64_SIGCONTEXT_H
-#define __ASM_SH64_SIGCONTEXT_H
-
-/*
- * 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/asm-sh64/sigcontext.h
- *
- * Copyright (C) 2000, 2001  Paolo Alberelli
- *
- */
-
-struct sigcontext {
-       unsigned long   oldmask;
-
-       /* CPU registers */
-       unsigned long long sc_regs[63];
-       unsigned long long sc_tregs[8];
-       unsigned long long sc_pc;
-       unsigned long long sc_sr;
-
-       /* FPU registers */
-       unsigned long long sc_fpregs[32];
-       unsigned int sc_fpscr;
-       unsigned int sc_fpvalid;
-};
-
-#endif /* __ASM_SH64_SIGCONTEXT_H */
diff --git a/include/asm-sh64/siginfo.h b/include/asm-sh64/siginfo.h
deleted file mode 100644 (file)
index 56ef1da..0000000
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef __ASM_SH64_SIGINFO_H
-#define __ASM_SH64_SIGINFO_H
-
-#include <asm-generic/siginfo.h>
-
-#endif /* __ASM_SH64_SIGINFO_H */
diff --git a/include/asm-sh64/signal.h b/include/asm-sh64/signal.h
deleted file mode 100644 (file)
index 77957e9..0000000
+++ /dev/null
@@ -1,185 +0,0 @@
-#ifndef __ASM_SH64_SIGNAL_H
-#define __ASM_SH64_SIGNAL_H
-
-/*
- * 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/asm-sh64/signal.h
- *
- * Copyright (C) 2000, 2001  Paolo Alberelli
- *
- */
-
-#include <linux/types.h>
-#include <asm/processor.h>
-
-/* Avoid too many header ordering problems.  */
-struct siginfo;
-
-#define _NSIG          64
-#define _NSIG_BPW      32
-#define _NSIG_WORDS    (_NSIG / _NSIG_BPW)
-
-typedef unsigned long old_sigset_t;            /* at least 32 bits */
-
-typedef struct {
-       unsigned long sig[_NSIG_WORDS];
-} sigset_t;
-
-#define SIGHUP          1
-#define SIGINT          2
-#define SIGQUIT                 3
-#define SIGILL          4
-#define SIGTRAP                 5
-#define SIGABRT                 6
-#define SIGIOT          6
-#define SIGBUS          7
-#define SIGFPE          8
-#define SIGKILL                 9
-#define SIGUSR1                10
-#define SIGSEGV                11
-#define SIGUSR2                12
-#define SIGPIPE                13
-#define SIGALRM                14
-#define SIGTERM                15
-#define SIGSTKFLT      16
-#define SIGCHLD                17
-#define SIGCONT                18
-#define SIGSTOP                19
-#define SIGTSTP                20
-#define SIGTTIN                21
-#define SIGTTOU                22
-#define SIGURG         23
-#define SIGXCPU                24
-#define SIGXFSZ                25
-#define SIGVTALRM      26
-#define SIGPROF                27
-#define SIGWINCH       28
-#define SIGIO          29
-#define SIGPOLL                SIGIO
-/*
-#define SIGLOST                29
-*/
-#define SIGPWR         30
-#define SIGSYS         31
-#define        SIGUNUSED       31
-
-/* These should not be considered constants from userland.  */
-#define SIGRTMIN       32
-#define SIGRTMAX       (_NSIG-1)
-
-/*
- * SA_FLAGS values:
- *
- * SA_ONSTACK indicates that a registered stack_t will be used.
- * SA_INTERRUPT is a no-op, but left due to historical reasons. Use the
- * SA_RESTART flag to get restarting signals (which were the default long ago)
- * SA_NOCLDSTOP flag to turn off SIGCHLD when children stop.
- * SA_RESETHAND clears the handler when the signal is delivered.
- * SA_NOCLDWAIT flag on SIGCHLD to inhibit zombies.
- * SA_NODEFER prevents the current signal from being masked in the handler.
- *
- * SA_ONESHOT and SA_NOMASK are the historical Linux names for the Single
- * Unix names RESETHAND and NODEFER respectively.
- */
-#define SA_NOCLDSTOP   0x00000001
-#define SA_NOCLDWAIT   0x00000002 /* not supported yet */
-#define SA_SIGINFO     0x00000004
-#define SA_ONSTACK     0x08000000
-#define SA_RESTART     0x10000000
-#define SA_NODEFER     0x40000000
-#define SA_RESETHAND   0x80000000
-
-#define SA_NOMASK      SA_NODEFER
-#define SA_ONESHOT     SA_RESETHAND
-#define SA_INTERRUPT   0x20000000 /* dummy -- ignored */
-
-#define SA_RESTORER    0x04000000
-
-/*
- * sigaltstack controls
- */
-#define SS_ONSTACK     1
-#define SS_DISABLE     2
-
-#define MINSIGSTKSZ    2048
-#define SIGSTKSZ       THREAD_SIZE
-
-#ifdef __KERNEL__
-
-/*
- * These values of sa_flags are used only by the kernel as part of the
- * irq handling routines.
- *
- * SA_INTERRUPT is also used by the irq handling routines.
- * SA_SHIRQ is for shared interrupt support on PCI and EISA.
- */
-#define SA_PROBE               SA_ONESHOT
-#define SA_SAMPLE_RANDOM       SA_RESTART
-#define SA_SHIRQ               0x04000000
-#endif
-
-#define SIG_BLOCK          0   /* for blocking signals */
-#define SIG_UNBLOCK        1   /* for unblocking signals */
-#define SIG_SETMASK        2   /* for setting the signal mask */
-
-/* Type of a signal handler.  */
-typedef void (*__sighandler_t)(int);
-
-#define SIG_DFL        ((__sighandler_t)0)     /* default signal handling */
-#define SIG_IGN        ((__sighandler_t)1)     /* ignore signal */
-#define SIG_ERR        ((__sighandler_t)-1)    /* error return from signal */
-
-#ifdef __KERNEL__
-struct old_sigaction {
-       __sighandler_t sa_handler;
-       old_sigset_t sa_mask;
-       unsigned long sa_flags;
-       void (*sa_restorer)(void);
-};
-
-struct sigaction {
-       __sighandler_t sa_handler;
-       unsigned long sa_flags;
-       void (*sa_restorer)(void);
-       sigset_t sa_mask;               /* mask last for extensibility */
-};
-
-struct k_sigaction {
-       struct sigaction sa;
-};
-#else
-/* Here we must cater to libcs that poke about in kernel headers.  */
-
-struct sigaction {
-       union {
-         __sighandler_t _sa_handler;
-         void (*_sa_sigaction)(int, struct siginfo *, void *);
-       } _u;
-       sigset_t sa_mask;
-       unsigned long sa_flags;
-       void (*sa_restorer)(void);
-};
-
-#define sa_handler     _u._sa_handler
-#define sa_sigaction   _u._sa_sigaction
-
-#endif /* __KERNEL__ */
-
-typedef struct sigaltstack {
-       void *ss_sp;
-       int ss_flags;
-       size_t ss_size;
-} stack_t;
-
-#ifdef __KERNEL__
-#include <asm/sigcontext.h>
-
-#define sigmask(sig)   (1UL << ((sig) - 1))
-#define ptrace_signal_deliver(regs, cookie) do { } while (0)
-
-#endif /* __KERNEL__ */
-
-#endif /* __ASM_SH64_SIGNAL_H */
diff --git a/include/asm-sh64/smp.h b/include/asm-sh64/smp.h
deleted file mode 100644 (file)
index 4a4d0da..0000000
+++ /dev/null
@@ -1,15 +0,0 @@
-#ifndef __ASM_SH64_SMP_H
-#define __ASM_SH64_SMP_H
-
-/*
- * 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/asm-sh64/smp.h
- *
- * Copyright (C) 2000, 2001  Paolo Alberelli
- *
- */
-
-#endif /* __ASM_SH64_SMP_H */
diff --git a/include/asm-sh64/smplock.h b/include/asm-sh64/smplock.h
deleted file mode 100644 (file)
index ff244b8..0000000
+++ /dev/null
@@ -1,77 +0,0 @@
-#ifndef __ASM_SH64_SMPLOCK_H
-#define __ASM_SH64_SMPLOCK_H
-
-/*
- * 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/asm-sh64/smplock.h
- *
- * Copyright (C) 2000, 2001  Paolo Alberelli
- *
- */
-
-#include <linux/config.h>
-
-#ifndef CONFIG_SMP
-
-#define lock_kernel()                          do { } while(0)
-#define unlock_kernel()                                do { } while(0)
-#define release_kernel_lock(task, cpu, depth)  ((depth) = 1)
-#define reacquire_kernel_lock(task, cpu, depth)        do { } while(0)
-
-#else
-
-#error "We do not support SMP on SH64 yet"
-/*
- * Default SMP lock implementation
- */
-
-#include <linux/interrupt.h>
-#include <asm/spinlock.h>
-
-extern spinlock_t kernel_flag;
-
-/*
- * Getting the big kernel lock.
- *
- * This cannot happen asynchronously,
- * so we only need to worry about other
- * CPU's.
- */
-extern __inline__ void lock_kernel(void)
-{
-       if (!++current->lock_depth)
-               spin_lock(&kernel_flag);
-}
-
-extern __inline__ void unlock_kernel(void)
-{
-       if (--current->lock_depth < 0)
-               spin_unlock(&kernel_flag);
-}
-
-/*
- * Release global kernel lock and global interrupt lock
- */
-#define release_kernel_lock(task, cpu) \
-do { \
-       if (task->lock_depth >= 0) \
-               spin_unlock(&kernel_flag); \
-       release_irqlock(cpu); \
-       __sti(); \
-} while (0)
-
-/*
- * Re-acquire the kernel lock
- */
-#define reacquire_kernel_lock(task) \
-do { \
-       if (task->lock_depth >= 0) \
-               spin_lock(&kernel_flag); \
-} while (0)
-
-#endif /* CONFIG_SMP */
-
-#endif /* __ASM_SH64_SMPLOCK_H */
diff --git a/include/asm-sh64/socket.h b/include/asm-sh64/socket.h
deleted file mode 100644 (file)
index 1853f72..0000000
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef __ASM_SH64_SOCKET_H
-#define __ASM_SH64_SOCKET_H
-
-#include <asm-sh/socket.h>
-
-#endif /* __ASM_SH64_SOCKET_H */
diff --git a/include/asm-sh64/sockios.h b/include/asm-sh64/sockios.h
deleted file mode 100644 (file)
index 1ae23ae..0000000
+++ /dev/null
@@ -1,24 +0,0 @@
-#ifndef __ASM_SH64_SOCKIOS_H
-#define __ASM_SH64_SOCKIOS_H
-
-/*
- * 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/asm-sh64/sockios.h
- *
- * Copyright (C) 2000, 2001  Paolo Alberelli
- *
- */
-
-/* Socket-level I/O control calls. */
-#define FIOGETOWN      _IOR('f', 123, int)
-#define FIOSETOWN      _IOW('f', 124, int)
-
-#define SIOCATMARK     _IOR('s', 7, int)
-#define SIOCSPGRP      _IOW('s', 8, pid_t)
-#define SIOCGPGRP      _IOR('s', 9, pid_t)
-
-#define SIOCGSTAMP     _IOR('s', 100, struct timeval) /* Get stamp - linux-specific */
-#endif /* __ASM_SH64_SOCKIOS_H */
diff --git a/include/asm-sh64/softirq.h b/include/asm-sh64/softirq.h
deleted file mode 100644 (file)
index 1c4229e..0000000
+++ /dev/null
@@ -1,30 +0,0 @@
-#ifndef __ASM_SH_SOFTIRQ_H
-#define __ASM_SH_SOFTIRQ_H
-
-#include <asm/atomic.h>
-#include <asm/hardirq.h>
-
-#define local_bh_disable()                     \
-do {                                           \
-       local_bh_count(smp_processor_id())++;   \
-       barrier();                              \
-} while (0)
-
-#define __local_bh_enable()                    \
-do {                                           \
-       barrier();                              \
-       local_bh_count(smp_processor_id())--;   \
-} while (0)
-
-#define local_bh_enable()                              \
-do {                                                   \
-       barrier();                                      \
-       if (!--local_bh_count(smp_processor_id())       \
-           && softirq_pending(smp_processor_id())) {   \
-               do_softirq();                           \
-       }                                               \
-} while (0)
-
-#define in_softirq() (local_bh_count(smp_processor_id()) != 0)
-
-#endif /* __ASM_SH_SOFTIRQ_H */
diff --git a/include/asm-sh64/spinlock.h b/include/asm-sh64/spinlock.h
deleted file mode 100644 (file)
index 296b0c9..0000000
+++ /dev/null
@@ -1,17 +0,0 @@
-#ifndef __ASM_SH64_SPINLOCK_H
-#define __ASM_SH64_SPINLOCK_H
-
-/*
- * 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/asm-sh64/spinlock.h
- *
- * Copyright (C) 2000, 2001  Paolo Alberelli
- *
- */
-
-#error "No SMP on SH64"
-
-#endif /* __ASM_SH64_SPINLOCK_H */
diff --git a/include/asm-sh64/stat.h b/include/asm-sh64/stat.h
deleted file mode 100644 (file)
index 86f551b..0000000
+++ /dev/null
@@ -1,88 +0,0 @@
-#ifndef __ASM_SH64_STAT_H
-#define __ASM_SH64_STAT_H
-
-/*
- * 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/asm-sh64/stat.h
- *
- * Copyright (C) 2000, 2001  Paolo Alberelli
- *
- */
-
-struct __old_kernel_stat {
-       unsigned short st_dev;
-       unsigned short st_ino;
-       unsigned short st_mode;
-       unsigned short st_nlink;
-       unsigned short st_uid;
-       unsigned short st_gid;
-       unsigned short st_rdev;
-       unsigned long  st_size;
-       unsigned long  st_atime;
-       unsigned long  st_mtime;
-       unsigned long  st_ctime;
-};
-
-struct stat {
-       unsigned short st_dev;
-       unsigned short __pad1;
-       unsigned long st_ino;
-       unsigned short st_mode;
-       unsigned short st_nlink;
-       unsigned short st_uid;
-       unsigned short st_gid;
-       unsigned short st_rdev;
-       unsigned short __pad2;
-       unsigned long  st_size;
-       unsigned long  st_blksize;
-       unsigned long  st_blocks;
-       unsigned long  st_atime;
-       unsigned long  st_atime_nsec;
-       unsigned long  st_mtime;
-       unsigned long  st_mtime_nsec;
-       unsigned long  st_ctime;
-       unsigned long  st_ctime_nsec;
-       unsigned long  __unused4;
-       unsigned long  __unused5;
-};
-
-/* This matches struct stat64 in glibc2.1, hence the absolutely
- * insane amounts of padding around dev_t's.
- */
-struct stat64 {
-       unsigned short  st_dev;
-       unsigned char   __pad0[10];
-
-       unsigned long   st_ino;
-       unsigned int    st_mode;
-       unsigned int    st_nlink;
-
-       unsigned long   st_uid;
-       unsigned long   st_gid;
-
-       unsigned short  st_rdev;
-       unsigned char   __pad3[10];
-
-       long long       st_size;
-       unsigned long   st_blksize;
-
-       unsigned long   st_blocks;      /* Number 512-byte blocks allocated. */
-       unsigned long   __pad4;         /* future possible st_blocks high bits */
-
-       unsigned long   st_atime;
-       unsigned long   st_atime_nsec;
-
-       unsigned long   st_mtime;
-       unsigned long   st_mtime_nsec;
-
-       unsigned long   st_ctime;
-       unsigned long   st_ctime_nsec;  /* will be high 32 bits of ctime someday */
-
-       unsigned long   __unused1;
-       unsigned long   __unused2;
-};
-
-#endif /* __ASM_SH64_STAT_H */
diff --git a/include/asm-sh64/statfs.h b/include/asm-sh64/statfs.h
deleted file mode 100644 (file)
index 083fd79..0000000
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef __ASM_SH64_STATFS_H
-#define __ASM_SH64_STATFS_H
-
-#include <asm-generic/statfs.h>
-
-#endif /* __ASM_SH64_STATFS_H */
diff --git a/include/asm-sh64/string.h b/include/asm-sh64/string.h
deleted file mode 100644 (file)
index 8a73573..0000000
+++ /dev/null
@@ -1,21 +0,0 @@
-#ifndef __ASM_SH64_STRING_H
-#define __ASM_SH64_STRING_H
-
-/*
- * 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/asm-sh64/string.h
- *
- * Copyright (C) 2000, 2001  Paolo Alberelli
- *
- * Empty on purpose. ARCH SH64 ASM libs are out of the current project scope.
- *
- */
-
-#define __HAVE_ARCH_MEMCPY
-
-extern void *memcpy(void *dest, const void *src, size_t count);
-
-#endif
diff --git a/include/asm-sh64/system.h b/include/asm-sh64/system.h
deleted file mode 100644 (file)
index 8b3a6f9..0000000
+++ /dev/null
@@ -1,194 +0,0 @@
-#ifndef __ASM_SH64_SYSTEM_H
-#define __ASM_SH64_SYSTEM_H
-
-/*
- * 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/asm-sh64/system.h
- *
- * Copyright (C) 2000, 2001  Paolo Alberelli
- * Copyright (C) 2003  Paul Mundt
- * Copyright (C) 2004  Richard Curnow
- *
- */
-
-#include <linux/config.h>
-#include <linux/kernel.h>
-#include <asm/registers.h>
-#include <asm/processor.h>
-
-/*
- *     switch_to() should switch tasks to task nr n, first
- */
-
-typedef struct {
-       unsigned long seg;
-} mm_segment_t;
-
-extern struct task_struct *sh64_switch_to(struct task_struct *prev,
-                                         struct thread_struct *prev_thread,
-                                         struct task_struct *next,
-                                         struct thread_struct *next_thread);
-
-#define switch_to(prev,next,last) \
-       do {\
-               if (last_task_used_math != next) {\
-                       struct pt_regs *regs = next->thread.uregs;\
-                       if (regs) regs->sr |= SR_FD;\
-               }\
-               last = sh64_switch_to(prev, &prev->thread, next, &next->thread);\
-       } while(0)
-
-#define nop() __asm__ __volatile__ ("nop")
-
-#define xchg(ptr,x) ((__typeof__(*(ptr)))__xchg((unsigned long)(x),(ptr),sizeof(*(ptr))))
-
-#define tas(ptr) (xchg((ptr), 1))
-
-extern void __xchg_called_with_bad_pointer(void);
-
-#define mb()   __asm__ __volatile__ ("synco": : :"memory")
-#define rmb()  mb()
-#define wmb()  __asm__ __volatile__ ("synco": : :"memory")
-#define read_barrier_depends() do { } while (0)
-
-#ifdef CONFIG_SMP
-#define smp_mb()       mb()
-#define smp_rmb()      rmb()
-#define smp_wmb()      wmb()
-#define smp_read_barrier_depends()     read_barrier_depends()
-#else
-#define smp_mb()       barrier()
-#define smp_rmb()      barrier()
-#define smp_wmb()      barrier()
-#define smp_read_barrier_depends()     do { } while (0)
-#endif /* CONFIG_SMP */
-
-#define set_rmb(var, value) do { xchg(&var, value); } while (0)
-#define set_mb(var, value) set_rmb(var, value)
-#define set_wmb(var, value) do { var = value; wmb(); } while (0)
-
-/* Interrupt Control */
-#ifndef HARD_CLI
-#define SR_MASK_L 0x000000f0L
-#define SR_MASK_LL 0x00000000000000f0LL
-#else
-#define SR_MASK_L 0x10000000L
-#define SR_MASK_LL 0x0000000010000000LL
-#endif
-
-static __inline__ void local_irq_enable(void)
-{
-       /* cli/sti based on SR.BL */
-       unsigned long long __dummy0, __dummy1=~SR_MASK_LL;
-
-       __asm__ __volatile__("getcon    " __SR ", %0\n\t"
-                            "and       %0, %1, %0\n\t"
-                            "putcon    %0, " __SR "\n\t"
-                            : "=&r" (__dummy0)
-                            : "r" (__dummy1));
-}
-
-static __inline__ void local_irq_disable(void)
-{
-       /* cli/sti based on SR.BL */
-       unsigned long long __dummy0, __dummy1=SR_MASK_LL;
-       __asm__ __volatile__("getcon    " __SR ", %0\n\t"
-                            "or        %0, %1, %0\n\t"
-                            "putcon    %0, " __SR "\n\t"
-                            : "=&r" (__dummy0)
-                            : "r" (__dummy1));
-}
-
-#define local_save_flags(x)                                            \
-(__extension__ ({      unsigned long long __dummy=SR_MASK_LL;          \
-       __asm__ __volatile__(                                           \
-               "getcon " __SR ", %0\n\t"                               \
-               "and    %0, %1, %0"                                     \
-               : "=&r" (x)                                             \
-               : "r" (__dummy));}))
-
-#define local_irq_save(x)                                              \
-(__extension__ ({      unsigned long long __d2=SR_MASK_LL, __d1;       \
-       __asm__ __volatile__(                                           \
-               "getcon " __SR ", %1\n\t"                               \
-               "or     %1, r63, %0\n\t"                                \
-               "or     %1, %2, %1\n\t"                                 \
-               "putcon %1, " __SR "\n\t"                               \
-               "and    %0, %2, %0"                                     \
-               : "=&r" (x), "=&r" (__d1)                               \
-               : "r" (__d2));}));
-
-#define local_irq_restore(x) do {                                      \
-       if ( ((x) & SR_MASK_L) == 0 )           /* dropping to 0 ? */   \
-               local_irq_enable();             /* yes...re-enable */   \
-} while (0)
-
-#define irqs_disabled()                        \
-({                                     \
-       unsigned long flags;            \
-       local_save_flags(flags);        \
-       (flags != 0);                   \
-})
-
-extern __inline__ unsigned long xchg_u32(volatile int * m, unsigned long val)
-{
-       unsigned long flags, retval;
-
-       local_irq_save(flags);
-       retval = *m;
-       *m = val;
-       local_irq_restore(flags);
-       return retval;
-}
-
-extern __inline__ unsigned long xchg_u8(volatile unsigned char * m, unsigned long val)
-{
-       unsigned long flags, retval;
-
-       local_irq_save(flags);
-       retval = *m;
-       *m = val & 0xff;
-       local_irq_restore(flags);
-       return retval;
-}
-
-static __inline__ unsigned long __xchg(unsigned long x, volatile void * ptr, int size)
-{
-       switch (size) {
-       case 4:
-               return xchg_u32(ptr, x);
-               break;
-       case 1:
-               return xchg_u8(ptr, x);
-               break;
-       }
-       __xchg_called_with_bad_pointer();
-       return x;
-}
-
-/* XXX
- * disable hlt during certain critical i/o operations
- */
-#define HAVE_DISABLE_HLT
-void disable_hlt(void);
-void enable_hlt(void);
-
-
-#define smp_mb()        barrier()
-#define smp_rmb()       barrier()
-#define smp_wmb()       barrier()
-
-#ifdef CONFIG_SH_ALPHANUMERIC
-/* This is only used for debugging. */
-extern void print_seg(char *file,int line);
-#define PLS() print_seg(__FILE__,__LINE__)
-#else  /* CONFIG_SH_ALPHANUMERIC */
-#define PLS()
-#endif /* CONFIG_SH_ALPHANUMERIC */
-
-#define PL() printk("@ <%s,%s:%d>\n",__FILE__,__FUNCTION__,__LINE__)
-
-#endif /* __ASM_SH64_SYSTEM_H */
diff --git a/include/asm-sh64/termbits.h b/include/asm-sh64/termbits.h
deleted file mode 100644 (file)
index 86bde5e..0000000
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef __ASM_SH64_TERMBITS_H
-#define __ASM_SH64_TERMBITS_H
-
-#include <asm-sh/termbits.h>
-
-#endif /* __ASM_SH64_TERMBITS_H */
diff --git a/include/asm-sh64/termios.h b/include/asm-sh64/termios.h
deleted file mode 100644 (file)
index 4a9c7fb..0000000
+++ /dev/null
@@ -1,117 +0,0 @@
-#ifndef __ASM_SH64_TERMIOS_H
-#define __ASM_SH64_TERMIOS_H
-
-/*
- * 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/asm-sh64/termios.h
- *
- * Copyright (C) 2000, 2001  Paolo Alberelli
- *
- */
-
-#include <asm/termbits.h>
-#include <asm/ioctls.h>
-
-struct winsize {
-       unsigned short ws_row;
-       unsigned short ws_col;
-       unsigned short ws_xpixel;
-       unsigned short ws_ypixel;
-};
-
-#define NCC 8
-struct termio {
-       unsigned short c_iflag;         /* input mode flags */
-       unsigned short c_oflag;         /* output mode flags */
-       unsigned short c_cflag;         /* control mode flags */
-       unsigned short c_lflag;         /* local mode flags */
-       unsigned char c_line;           /* line discipline */
-       unsigned char c_cc[NCC];        /* control characters */
-};
-
-/* modem lines */
-#define TIOCM_LE       0x001
-#define TIOCM_DTR      0x002
-#define TIOCM_RTS      0x004
-#define TIOCM_ST       0x008
-#define TIOCM_SR       0x010
-#define TIOCM_CTS      0x020
-#define TIOCM_CAR      0x040
-#define TIOCM_RNG      0x080
-#define TIOCM_DSR      0x100
-#define TIOCM_CD       TIOCM_CAR
-#define TIOCM_RI       TIOCM_RNG
-#define TIOCM_OUT1     0x2000
-#define TIOCM_OUT2     0x4000
-#define TIOCM_LOOP     0x8000
-
-/* ioctl (fd, TIOCSERGETLSR, &result) where result may be as below */
-
-/* line disciplines */
-#define N_TTY          0
-#define N_SLIP         1
-#define N_MOUSE                2
-#define N_PPP          3
-#define N_STRIP                4
-#define N_AX25         5
-#define N_X25          6       /* X.25 async */
-#define N_6PACK                7
-#define N_MASC         8       /* Reserved for Mobitex module <kaz@cafe.net> */
-#define N_R3964                9       /* Reserved for Simatic R3964 module */
-#define N_PROFIBUS_FDL 10      /* Reserved for Profibus <Dave@mvhi.com> */
-#define N_IRDA         11      /* Linux IR - http://www.cs.uit.no/~dagb/irda/irda.html */
-#define N_SMSBLOCK     12      /* SMS block mode - for talking to GSM data cards about SMS messages */
-#define N_HDLC         13      /* synchronous HDLC */
-#define N_SYNC_PPP     14
-#define N_HCI          15      /* Bluetooth HCI UART */
-
-#ifdef __KERNEL__
-
-/*     intr=^C         quit=^\         erase=del       kill=^U
-       eof=^D          vtime=\0        vmin=\1         sxtc=\0
-       start=^Q        stop=^S         susp=^Z         eol=\0
-       reprint=^R      discard=^U      werase=^W       lnext=^V
-       eol2=\0
-*/
-#define INIT_C_CC "\003\034\177\025\004\0\1\0\021\023\032\0\022\017\027\026\0"
-
-/*
- * Translate a "termio" structure into a "termios". Ugh.
- */
-#define SET_LOW_TERMIOS_BITS(termios, termio, x) { \
-       unsigned short __tmp; \
-       get_user(__tmp,&(termio)->x); \
-       *(unsigned short *) &(termios)->x = __tmp; \
-}
-
-#define user_termio_to_kernel_termios(termios, termio) \
-({ \
-       SET_LOW_TERMIOS_BITS(termios, termio, c_iflag); \
-       SET_LOW_TERMIOS_BITS(termios, termio, c_oflag); \
-       SET_LOW_TERMIOS_BITS(termios, termio, c_cflag); \
-       SET_LOW_TERMIOS_BITS(termios, termio, c_lflag); \
-       copy_from_user((termios)->c_cc, (termio)->c_cc, NCC); \
-})
-
-/*
- * Translate a "termios" structure into a "termio". Ugh.
- */
-#define kernel_termios_to_user_termio(termio, termios) \
-({ \
-       put_user((termios)->c_iflag, &(termio)->c_iflag); \
-       put_user((termios)->c_oflag, &(termio)->c_oflag); \
-       put_user((termios)->c_cflag, &(termio)->c_cflag); \
-       put_user((termios)->c_lflag, &(termio)->c_lflag); \
-       put_user((termios)->c_line,  &(termio)->c_line); \
-       copy_to_user((termio)->c_cc, (termios)->c_cc, NCC); \
-})
-
-#define user_termios_to_kernel_termios(k, u) copy_from_user(k, u, sizeof(struct termios))
-#define kernel_termios_to_user_termios(u, k) copy_to_user(u, k, sizeof(struct termios))
-
-#endif /* __KERNEL__ */
-
-#endif /* __ASM_SH64_TERMIOS_H */
diff --git a/include/asm-sh64/thread_info.h b/include/asm-sh64/thread_info.h
deleted file mode 100644 (file)
index f9d2a22..0000000
+++ /dev/null
@@ -1,82 +0,0 @@
-#ifndef __ASM_SH64_THREAD_INFO_H
-#define __ASM_SH64_THREAD_INFO_H
-
-/*
- * SuperH 5 version
- * Copyright (C) 2003  Paul Mundt
- */
-
-#ifdef __KERNEL__
-
-#ifndef __ASSEMBLY__
-#include <asm/registers.h>
-
-/*
- * low level task data that entry.S needs immediate access to
- * - this struct should fit entirely inside of one cache line
- * - this struct shares the supervisor stack pages
- * - if the contents of this structure are changed, the assembly constants must also be changed
- */
-struct thread_info {
-       struct task_struct      *task;          /* main task structure */
-       struct exec_domain      *exec_domain;   /* execution domain */
-       unsigned long           flags;          /* low level flags */
-       /* Put the 4 32-bit fields together to make asm offsetting easier. */
-       __s32                   preempt_count; /* 0 => preemptable, <0 => BUG */
-       __u16                   cpu;
-
-       mm_segment_t            addr_limit;
-       struct restart_block    restart_block;
-
-       __u8                    supervisor_stack[0];
-};
-
-/*
- * macros/functions for gaining access to the thread information structure
- */
-#define INIT_THREAD_INFO(tsk)                  \
-{                                              \
-       .task           = &tsk,                 \
-       .exec_domain    = &default_exec_domain, \
-       .flags          = 0,                    \
-       .cpu            = 0,                    \
-       .preempt_count  = 1,                    \
-       .addr_limit     = KERNEL_DS,            \
-       .restart_block  = {                     \
-               .fn = do_no_restart_syscall,    \
-       },                                      \
-}
-
-#define init_thread_info       (init_thread_union.thread_info)
-#define init_stack             (init_thread_union.stack)
-
-/* how to get the thread information struct from C */
-static inline struct thread_info *current_thread_info(void)
-{
-       struct thread_info *ti;
-
-       __asm__ __volatile__ ("getcon " __KCR0 ", %0\n\t" : "=r" (ti));
-
-       return ti;
-}
-
-/* thread information allocation */
-#define alloc_thread_info(ti) ((struct thread_info *) __get_free_pages(GFP_KERNEL,2))
-#define free_thread_info(ti) free_pages((unsigned long) (ti), 1)
-#define get_thread_info(ti) get_task_struct((ti)->task)
-#define put_thread_info(ti) put_task_struct((ti)->task)
-
-#endif /* __ASSEMBLY__ */
-
-#define PREEMPT_ACTIVE         0x4000000
-
-/* thread information flags */
-#define TIF_SYSCALL_TRACE      0       /* syscall trace active */
-#define TIF_SIGPENDING         2       /* signal pending */
-#define TIF_NEED_RESCHED       3       /* rescheduling necessary */
-
-#define THREAD_SIZE    16384
-
-#endif /* __KERNEL__ */
-
-#endif /* __ASM_SH64_THREAD_INFO_H */
diff --git a/include/asm-sh64/timex.h b/include/asm-sh64/timex.h
deleted file mode 100644 (file)
index e07fd9a..0000000
+++ /dev/null
@@ -1,36 +0,0 @@
-#ifndef __ASM_SH64_TIMEX_H
-#define __ASM_SH64_TIMEX_H
-
-/*
- * 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/asm-sh64/timex.h
- *
- * Copyright (C) 2000, 2001  Paolo Alberelli
- * Copyright (C) 2003  Paul Mundt
- *
- * sh-5 architecture timex specifications
- *
- */
-
-#define CLOCK_TICK_RATE        1193180 /* Underlying HZ */
-#define CLOCK_TICK_FACTOR      20      /* Factor of both 1000000 and CLOCK_TICK_RATE */
-#define FINETUNE ((((((long)LATCH * HZ - CLOCK_TICK_RATE) << SHIFT_HZ) * \
-       (1000000/CLOCK_TICK_FACTOR) / (CLOCK_TICK_RATE/CLOCK_TICK_FACTOR)) \
-               << (SHIFT_SCALE-SHIFT_HZ)) / HZ)
-
-typedef unsigned long cycles_t;
-
-extern cycles_t cacheflush_time;
-
-static __inline__ cycles_t get_cycles (void)
-{
-       return 0;
-}
-
-#define vxtime_lock()          do {} while (0)
-#define vxtime_unlock()                do {} while (0)
-
-#endif /* __ASM_SH64_TIMEX_H */
diff --git a/include/asm-sh64/tlb.h b/include/asm-sh64/tlb.h
deleted file mode 100644 (file)
index 4979408..0000000
+++ /dev/null
@@ -1,92 +0,0 @@
-/*
- * include/asm-sh64/tlb.h
- *
- * Copyright (C) 2003  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.
- *
- */
-#ifndef __ASM_SH64_TLB_H
-#define __ASM_SH64_TLB_H
-
-/*
- * Note! These are mostly unused, we just need the xTLB_LAST_VAR_UNRESTRICTED
- * for head.S! Once this limitation is gone, we can clean the rest of this up.
- */
-
-/* ITLB defines */
-#define ITLB_FIXED     0x00000000      /* First fixed ITLB, see head.S */
-#define ITLB_LAST_VAR_UNRESTRICTED     0x000003F0      /* Last ITLB */
-
-/* DTLB defines */
-#define DTLB_FIXED     0x00800000      /* First fixed DTLB, see head.S */
-#define DTLB_LAST_VAR_UNRESTRICTED     0x008003F0      /* Last DTLB */
-
-#ifndef __ASSEMBLY__
-
-/**
- * for_each_dtlb_entry
- *
- * @tlb:       TLB entry
- *
- * Iterate over free (non-wired) DTLB entries
- */
-#define for_each_dtlb_entry(tlb)               \
-       for (tlb  = cpu_data->dtlb.first;       \
-            tlb <= cpu_data->dtlb.last;        \
-            tlb += cpu_data->dtlb.step)
-
-/**
- * for_each_itlb_entry
- *
- * @tlb:       TLB entry
- *
- * Iterate over free (non-wired) ITLB entries
- */
-#define for_each_itlb_entry(tlb)               \
-       for (tlb  = cpu_data->itlb.first;       \
-            tlb <= cpu_data->itlb.last;        \
-            tlb += cpu_data->itlb.step)
-
-/**
- * __flush_tlb_slot
- *
- * @slot:      Address of TLB slot.
- *
- * Flushes TLB slot @slot.
- */
-static inline void __flush_tlb_slot(unsigned long long slot)
-{
-       __asm__ __volatile__ ("putcfg %0, 0, r63\n" : : "r" (slot));
-}
-
-/* arch/sh64/mm/tlb.c */
-extern int sh64_tlb_init(void);
-extern unsigned long long sh64_next_free_dtlb_entry(void);
-extern unsigned long long sh64_get_wired_dtlb_entry(void);
-extern int sh64_put_wired_dtlb_entry(unsigned long long entry);
-
-extern void sh64_setup_tlb_slot(unsigned long long config_addr, unsigned long eaddr, unsigned long asid, unsigned long paddr);
-extern void sh64_teardown_tlb_slot(unsigned long long config_addr);
-
-#define tlb_start_vma(tlb, vma) \
-       flush_cache_range(vma, vma->vm_start, vma->vm_end)
-
-#define tlb_end_vma(tlb, vma)  \
-       flush_tlb_range(vma, vma->vm_start, vma->vm_end)
-
-#define __tlb_remove_tlb_entry(tlb, pte, address)      do { } while (0)
-
-/*
- * Flush whole TLBs for MM
- */
-#define tlb_flush(tlb)         flush_tlb_mm((tlb)->mm)
-
-#include <asm-generic/tlb.h>
-
-#endif /* __ASSEMBLY__ */
-
-#endif /* __ASM_SH64_TLB_H */
-
diff --git a/include/asm-sh64/tlbflush.h b/include/asm-sh64/tlbflush.h
deleted file mode 100644 (file)
index 15c0719..0000000
+++ /dev/null
@@ -1,31 +0,0 @@
-#ifndef __ASM_SH64_TLBFLUSH_H
-#define __ASM_SH64_TLBFLUSH_H
-
-#include <asm/pgalloc.h>
-
-/*
- * TLB flushing:
- *
- *  - flush_tlb() flushes the current mm struct TLBs
- *  - flush_tlb_all() flushes all processes TLBs
- *  - flush_tlb_mm(mm) flushes the specified mm context TLB's
- *  - flush_tlb_page(vma, vmaddr) flushes one page
- *  - flush_tlb_range(mm, start, end) flushes a range of pages
- *
- */
-
-extern void flush_tlb(void);
-extern void flush_tlb_all(void);
-extern void flush_tlb_mm(struct mm_struct *mm);
-extern void flush_tlb_range(struct vm_area_struct *vma, unsigned long start,
-                           unsigned long end);
-extern void flush_tlb_page(struct vm_area_struct *vma, unsigned long page);
-extern inline void flush_tlb_pgtables(struct mm_struct *mm,
-                                     unsigned long start, unsigned long end)
-{
-}
-
-extern void flush_tlb_kernel_range(unsigned long start, unsigned long end);
-
-#endif /* __ASM_SH64_TLBFLUSH_H */
-
diff --git a/include/asm-sh64/topology.h b/include/asm-sh64/topology.h
deleted file mode 100644 (file)
index 3421178..0000000
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef __ASM_SH64_TOPOLOGY_H
-#define __ASM_SH64_TOPOLOGY_H
-
-#include <asm-generic/topology.h>
-
-#endif /* __ASM_SH64_TOPOLOGY_H */
diff --git a/include/asm-sh64/types.h b/include/asm-sh64/types.h
deleted file mode 100644 (file)
index 41d4d2f..0000000
+++ /dev/null
@@ -1,76 +0,0 @@
-#ifndef __ASM_SH64_TYPES_H
-#define __ASM_SH64_TYPES_H
-
-/*
- * 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/asm-sh64/types.h
- *
- * Copyright (C) 2000, 2001  Paolo Alberelli
- *
- */
-
-#ifndef __ASSEMBLY__
-
-typedef unsigned short umode_t;
-
-/*
- * __xx is ok: it doesn't pollute the POSIX namespace. Use these in the
- * header files exported to user space
- */
-
-typedef __signed__ char __s8;
-typedef unsigned char __u8;
-
-typedef __signed__ short __s16;
-typedef unsigned short __u16;
-
-typedef __signed__ int __s32;
-typedef unsigned int __u32;
-
-#if defined(__GNUC__) && !defined(__STRICT_ANSI__)
-typedef __signed__ long long __s64;
-typedef unsigned long long __u64;
-#endif
-
-#endif /* __ASSEMBLY__ */
-
-/*
- * These aren't exported outside the kernel to avoid name space clashes
- */
-#ifdef __KERNEL__
-
-#ifndef __ASSEMBLY__
-
-typedef __signed__ char s8;
-typedef unsigned char u8;
-
-typedef __signed__ short s16;
-typedef unsigned short u16;
-
-typedef __signed__ int s32;
-typedef unsigned int u32;
-
-typedef __signed__ long long s64;
-typedef unsigned long long u64;
-
-/* DMA addresses come in generic and 64-bit flavours.  */
-
-#ifdef CONFIG_HIGHMEM64G
-typedef u64 dma_addr_t;
-#else
-typedef u32 dma_addr_t;
-#endif
-typedef u64 dma64_addr_t;
-
-typedef unsigned int kmem_bufctl_t;
-
-#endif /* __ASSEMBLY__ */
-
-#define BITS_PER_LONG 32
-
-#endif /* __KERNEL__ */
-
-#endif /* __ASM_SH64_TYPES_H */
diff --git a/include/asm-sh64/uaccess.h b/include/asm-sh64/uaccess.h
deleted file mode 100644 (file)
index 588065c..0000000
+++ /dev/null
@@ -1,320 +0,0 @@
-#ifndef __ASM_SH64_UACCESS_H
-#define __ASM_SH64_UACCESS_H
-
-/*
- * 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/asm-sh64/uaccess.h
- *
- * Copyright (C) 2000, 2001  Paolo Alberelli
- * Copyright (C) 2003, 2004  Paul Mundt
- *
- * User space memory access functions
- *
- * Copyright (C) 1999  Niibe Yutaka
- *
- *  Based on:
- *     MIPS implementation version 1.15 by
- *              Copyright (C) 1996, 1997, 1998 by Ralf Baechle
- *     and i386 version.
- *
- */
-
-#include <linux/errno.h>
-#include <linux/sched.h>
-
-#define VERIFY_READ    0
-#define VERIFY_WRITE   1
-
-/*
- * The fs value determines whether argument validity checking should be
- * performed or not.  If get_fs() == USER_DS, checking is performed, with
- * get_fs() == KERNEL_DS, checking is bypassed.
- *
- * For historical reasons (Data Segment Register?), these macros are misnamed.
- */
-
-#define MAKE_MM_SEG(s) ((mm_segment_t) { (s) })
-
-#define KERNEL_DS      MAKE_MM_SEG(0xFFFFFFFF)
-#define USER_DS                MAKE_MM_SEG(0x80000000)
-
-#define get_ds()       (KERNEL_DS)
-#define get_fs()        (current_thread_info()->addr_limit)
-#define set_fs(x)       (current_thread_info()->addr_limit=(x))
-
-#define segment_eq(a,b)        ((a).seg == (b).seg)
-
-#define __addr_ok(addr) ((unsigned long)(addr) < (current_thread_info()->addr_limit.seg))
-
-/*
- * Uhhuh, this needs 33-bit arithmetic. We have a carry..
- *
- * sum := addr + size;  carry? --> flag = true;
- * if (sum >= addr_limit) flag = true;
- */
-#define __range_ok(addr,size) (((unsigned long) (addr) + (size) < (current_thread_info()->addr_limit.seg)) ? 0 : 1)
-
-#define access_ok(type,addr,size) (__range_ok(addr,size) == 0)
-#define __access_ok(addr,size) (__range_ok(addr,size) == 0)
-
-extern inline int verify_area(int type, const void __user * addr, unsigned long size)
-{
-       return access_ok(type,addr,size) ? 0 : -EFAULT;
-}
-
-/*
- * Uh, these should become the main single-value transfer routines ...
- * They automatically use the right size if we just have the right
- * pointer type ...
- *
- * As MIPS uses the same address space for kernel and user data, we
- * can just do these as direct assignments.
- *
- * Careful to not
- * (a) re-use the arguments for side effects (sizeof is ok)
- * (b) require any knowledge of processes at this stage
- */
-#define put_user(x,ptr)        __put_user_check((x),(ptr),sizeof(*(ptr)))
-#define get_user(x,ptr) __get_user_check((x),(ptr),sizeof(*(ptr)))
-
-/*
- * The "__xxx" versions do not do address space checking, useful when
- * doing multiple accesses to the same area (the user has to do the
- * checks by hand with "access_ok()")
- */
-#define __put_user(x,ptr) __put_user_nocheck((x),(ptr),sizeof(*(ptr)))
-#define __get_user(x,ptr) __get_user_nocheck((x),(ptr),sizeof(*(ptr)))
-
-/*
- * The "xxx_ret" versions return constant specified in third argument, if
- * something bad happens. These macros can be optimized for the
- * case of just returning from the function xxx_ret is used.
- */
-
-#define put_user_ret(x,ptr,ret) ({ \
-if (put_user(x,ptr)) return ret; })
-
-#define get_user_ret(x,ptr,ret) ({ \
-if (get_user(x,ptr)) return ret; })
-
-#define __put_user_ret(x,ptr,ret) ({ \
-if (__put_user(x,ptr)) return ret; })
-
-#define __get_user_ret(x,ptr,ret) ({ \
-if (__get_user(x,ptr)) return ret; })
-
-struct __large_struct { unsigned long buf[100]; };
-#define __m(x) (*(struct __large_struct *)(x))
-
-#define __get_user_size(x,ptr,size,retval)                     \
-do {                                                           \
-       retval = 0;                                             \
-       switch (size) {                                         \
-       case 1:                                                 \
-               retval = __get_user_asm_b(x, ptr);              \
-               break;                                          \
-       case 2:                                                 \
-               retval = __get_user_asm_w(x, ptr);              \
-               break;                                          \
-       case 4:                                                 \
-               retval = __get_user_asm_l(x, ptr);              \
-               break;                                          \
-       case 8:                                                 \
-               retval = __get_user_asm_q(x, ptr);              \
-               break;                                          \
-       default:                                                \
-               __get_user_unknown();                           \
-               break;                                          \
-       }                                                       \
-} while (0)
-
-#define __get_user_nocheck(x,ptr,size)                         \
-({                                                             \
-       long __gu_addr = (long)(ptr);                           \
-       long __gu_err;                                          \
-       __typeof(*(ptr)) __gu_val;                              \
-       __asm__ ("":"=r" (__gu_val));                           \
-       __asm__ ("":"=r" (__gu_err));                           \
-       __get_user_size((void *)&__gu_val, __gu_addr, (size), __gu_err); \
-       (x) = (__typeof__(*(ptr))) __gu_val;                    \
-       __gu_err;                                               \
-})
-
-#define __get_user_check(x,ptr,size)                           \
-({                                                             \
-       long __gu_addr = (long)(ptr);                           \
-       long __gu_err = -EFAULT;                                \
-       __typeof(*(ptr)) __gu_val;                              \
-       __asm__ ("":"=r" (__gu_val));                           \
-       __asm__ ("":"=r" (__gu_err));                           \
-       if (__access_ok(__gu_addr, (size)))                     \
-               __get_user_size((void *)&__gu_val, __gu_addr, (size), __gu_err); \
-       (x) = (__typeof__(*(ptr))) __gu_val;                    \
-       __gu_err;                                               \
-})
-
-extern long __get_user_asm_b(void *, long);
-extern long __get_user_asm_w(void *, long);
-extern long __get_user_asm_l(void *, long);
-extern long __get_user_asm_q(void *, long);
-extern void __get_user_unknown(void);
-
-#define __put_user_size(x,ptr,size,retval)                     \
-do {                                                           \
-       retval = 0;                                             \
-       switch (size) {                                         \
-       case 1:                                                 \
-               retval = __put_user_asm_b(x, ptr);              \
-               break;                                          \
-       case 2:                                                 \
-               retval = __put_user_asm_w(x, ptr);              \
-               break;                                          \
-       case 4:                                                 \
-               retval = __put_user_asm_l(x, ptr);              \
-               break;                                          \
-       case 8:                                                 \
-               retval = __put_user_asm_q(x, ptr);              \
-               break;                                          \
-       default:                                                \
-               __put_user_unknown();                           \
-       }                                                       \
-} while (0)
-
-#define __put_user_nocheck(x,ptr,size)                         \
-({                                                             \
-       long __pu_err;                                          \
-       __typeof__(*(ptr)) __pu_val = (x);                      \
-       __put_user_size((void *)&__pu_val, (long)(ptr), (size), __pu_err); \
-       __pu_err;                                               \
-})
-
-#define __put_user_check(x,ptr,size)                           \
-({                                                             \
-       long __pu_err = -EFAULT;                                \
-       long __pu_addr = (long)(ptr);                           \
-       __typeof__(*(ptr)) __pu_val = (x);                      \
-                                                               \
-       if (__access_ok(__pu_addr, (size)))                     \
-               __put_user_size((void *)&__pu_val, __pu_addr, (size), __pu_err);\
-       __pu_err;                                               \
-})
-
-extern long __put_user_asm_b(void *, long);
-extern long __put_user_asm_w(void *, long);
-extern long __put_user_asm_l(void *, long);
-extern long __put_user_asm_q(void *, long);
-extern void __put_user_unknown(void);
-
-\f
-/* Generic arbitrary sized copy.  */
-/* Return the number of bytes NOT copied */
-/* XXX: should be such that: 4byte and the rest. */
-extern __kernel_size_t __copy_user(void *__to, const void *__from, __kernel_size_t __n);
-
-#define copy_to_user(to,from,n) ({ \
-void *__copy_to = (void *) (to); \
-__kernel_size_t __copy_size = (__kernel_size_t) (n); \
-__kernel_size_t __copy_res; \
-if(__copy_size && __access_ok((unsigned long)__copy_to, __copy_size)) { \
-__copy_res = __copy_user(__copy_to, (void *) (from), __copy_size); \
-} else __copy_res = __copy_size; \
-__copy_res; })
-
-#define copy_to_user_ret(to,from,n,retval) ({ \
-if (copy_to_user(to,from,n)) \
-       return retval; \
-})
-
-#define __copy_to_user(to,from,n)              \
-       __copy_user((void *)(to),               \
-                   (void *)(from), n)
-
-#define __copy_to_user_ret(to,from,n,retval) ({ \
-if (__copy_to_user(to,from,n)) \
-       return retval; \
-})
-
-#define copy_from_user(to,from,n) ({ \
-void *__copy_to = (void *) (to); \
-void *__copy_from = (void *) (from); \
-__kernel_size_t __copy_size = (__kernel_size_t) (n); \
-__kernel_size_t __copy_res; \
-if(__copy_size && __access_ok((unsigned long)__copy_from, __copy_size)) { \
-__copy_res = __copy_user(__copy_to, __copy_from, __copy_size); \
-} else __copy_res = __copy_size; \
-__copy_res; })
-
-#define copy_from_user_ret(to,from,n,retval) ({ \
-if (copy_from_user(to,from,n)) \
-       return retval; \
-})
-
-#define __copy_from_user(to,from,n)            \
-       __copy_user((void *)(to),               \
-                   (void *)(from), n)
-
-#define __copy_from_user_ret(to,from,n,retval) ({ \
-if (__copy_from_user(to,from,n)) \
-       return retval; \
-})
-
-#define __copy_to_user_inatomic __copy_to_user
-#define __copy_from_user_inatomic __copy_from_user
-
-/* XXX: Not sure it works well..
-   should be such that: 4byte clear and the rest. */
-extern __kernel_size_t __clear_user(void *addr, __kernel_size_t size);
-
-#define clear_user(addr,n) ({ \
-void * __cl_addr = (addr); \
-unsigned long __cl_size = (n); \
-if (__cl_size && __access_ok(((unsigned long)(__cl_addr)), __cl_size)) \
-__cl_size = __clear_user(__cl_addr, __cl_size); \
-__cl_size; })
-
-extern int __strncpy_from_user(unsigned long __dest, unsigned long __src, int __count);
-
-#define strncpy_from_user(dest,src,count) ({ \
-unsigned long __sfu_src = (unsigned long) (src); \
-int __sfu_count = (int) (count); \
-long __sfu_res = -EFAULT; \
-if(__access_ok(__sfu_src, __sfu_count)) { \
-__sfu_res = __strncpy_from_user((unsigned long) (dest), __sfu_src, __sfu_count); \
-} __sfu_res; })
-
-#define strlen_user(str) strnlen_user(str, ~0UL >> 1)
-
-/*
- * Return the size of a string (including the ending 0!)
- */
-extern long __strnlen_user(const char *__s, long __n);
-
-extern __inline__ long strnlen_user(const char *s, long n)
-{
-       if (!__addr_ok(s))
-               return 0;
-       else
-               return __strnlen_user(s, n);
-}
-
-struct exception_table_entry
-{
-       unsigned long insn, fixup;
-};
-
-#define ARCH_HAS_SEARCH_EXTABLE
-
-/* If gcc inlines memset, it will use st.q instructions.  Therefore, we need
-   kmalloc allocations to be 8-byte aligned.  Without this, the alignment
-   becomes BYTE_PER_WORD i.e. only 4 (since sizeof(long)==sizeof(void*)==4 on
-   sh64 at the moment). */
-#define ARCH_KMALLOC_MINALIGN 8
-
-/* Returns 0 if exception not found and fixup.unit otherwise.  */
-extern unsigned long search_exception_table(unsigned long addr);
-extern const struct exception_table_entry *search_exception_tables (unsigned long addr);
-
-#endif /* __ASM_SH64_UACCESS_H */
diff --git a/include/asm-sh64/ucontext.h b/include/asm-sh64/ucontext.h
deleted file mode 100644 (file)
index cf77a08..0000000
+++ /dev/null
@@ -1,23 +0,0 @@
-#ifndef __ASM_SH64_UCONTEXT_H
-#define __ASM_SH64_UCONTEXT_H
-
-/*
- * 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/asm-sh64/ucontext.h
- *
- * Copyright (C) 2000, 2001  Paolo Alberelli
- *
- */
-
-struct ucontext {
-       unsigned long     uc_flags;
-       struct ucontext  *uc_link;
-       stack_t           uc_stack;
-       struct sigcontext uc_mcontext;
-       sigset_t          uc_sigmask;   /* mask last for extensibility */
-};
-
-#endif /* __ASM_SH64_UCONTEXT_H */
diff --git a/include/asm-sh64/unaligned.h b/include/asm-sh64/unaligned.h
deleted file mode 100644 (file)
index ad22487..0000000
+++ /dev/null
@@ -1,28 +0,0 @@
-#ifndef __ASM_SH64_UNALIGNED_H
-#define __ASM_SH64_UNALIGNED_H
-
-/*
- * 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/asm-sh64/unaligned.h
- *
- * Copyright (C) 2000, 2001  Paolo Alberelli
- *
- */
-
-#include <linux/string.h>
-
-
-/* Use memmove here, so gcc does not insert a __builtin_memcpy. */
-
-#define get_unaligned(ptr) \
-  ({ __typeof__(*(ptr)) __tmp; memmove(&__tmp, (ptr), sizeof(*(ptr))); __tmp; })
-
-#define put_unaligned(val, ptr)                                \
-  ({ __typeof__(*(ptr)) __tmp = (val);                 \
-     memmove((ptr), &__tmp, sizeof(*(ptr)));           \
-     (void)0; })
-
-#endif /* __ASM_SH64_UNALIGNED_H */
diff --git a/include/asm-sh64/unistd.h b/include/asm-sh64/unistd.h
deleted file mode 100644 (file)
index c7d9a52..0000000
+++ /dev/null
@@ -1,555 +0,0 @@
-#ifndef __ASM_SH64_UNISTD_H
-#define __ASM_SH64_UNISTD_H
-
-/*
- * 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/asm-sh64/unistd.h
- *
- * Copyright (C) 2000, 2001  Paolo Alberelli
- * Copyright (C) 2003  Paul Mundt
- * Copyright (C) 2004  Sean McGoogan
- *
- * This file contains the system call numbers.
- *
- */
-
-#define __NR_setup               0     /* used only by init, to get system going */
-#define __NR_exit                1
-#define __NR_fork                2
-#define __NR_read                3
-#define __NR_write               4
-#define __NR_open                5
-#define __NR_close               6
-#define __NR_waitpid             7
-#define __NR_creat               8
-#define __NR_link                9
-#define __NR_unlink             10
-#define __NR_execve             11
-#define __NR_chdir              12
-#define __NR_time               13
-#define __NR_mknod              14
-#define __NR_chmod              15
-#define __NR_lchown             16
-#define __NR_break              17
-#define __NR_oldstat            18
-#define __NR_lseek              19
-#define __NR_getpid             20
-#define __NR_mount              21
-#define __NR_umount             22
-#define __NR_setuid             23
-#define __NR_getuid             24
-#define __NR_stime              25
-#define __NR_ptrace             26
-#define __NR_alarm              27
-#define __NR_oldfstat           28
-#define __NR_pause              29
-#define __NR_utime              30
-#define __NR_stty               31
-#define __NR_gtty               32
-#define __NR_access             33
-#define __NR_nice               34
-#define __NR_ftime              35
-#define __NR_sync               36
-#define __NR_kill               37
-#define __NR_rename             38
-#define __NR_mkdir              39
-#define __NR_rmdir              40
-#define __NR_dup                41
-#define __NR_pipe               42
-#define __NR_times              43
-#define __NR_prof               44
-#define __NR_brk                45
-#define __NR_setgid             46
-#define __NR_getgid             47
-#define __NR_signal             48
-#define __NR_geteuid            49
-#define __NR_getegid            50
-#define __NR_acct               51
-#define __NR_umount2            52
-#define __NR_lock               53
-#define __NR_ioctl              54
-#define __NR_fcntl              55
-#define __NR_mpx                56
-#define __NR_setpgid            57
-#define __NR_ulimit             58
-#define __NR_oldolduname        59
-#define __NR_umask              60
-#define __NR_chroot             61
-#define __NR_ustat              62
-#define __NR_dup2               63
-#define __NR_getppid            64
-#define __NR_getpgrp            65
-#define __NR_setsid             66
-#define __NR_sigaction          67
-#define __NR_sgetmask           68
-#define __NR_ssetmask           69
-#define __NR_setreuid           70
-#define __NR_setregid           71
-#define __NR_sigsuspend                 72
-#define __NR_sigpending                 73
-#define __NR_sethostname        74
-#define __NR_setrlimit          75
-#define __NR_getrlimit          76     /* Back compatible 2Gig limited rlimit */
-#define __NR_getrusage          77
-#define __NR_gettimeofday       78
-#define __NR_settimeofday       79
-#define __NR_getgroups          80
-#define __NR_setgroups          81
-#define __NR_select             82
-#define __NR_symlink            83
-#define __NR_oldlstat           84
-#define __NR_readlink           85
-#define __NR_uselib             86
-#define __NR_swapon             87
-#define __NR_reboot             88
-#define __NR_readdir            89
-#define __NR_mmap               90
-#define __NR_munmap             91
-#define __NR_truncate           92
-#define __NR_ftruncate          93
-#define __NR_fchmod             94
-#define __NR_fchown             95
-#define __NR_getpriority        96
-#define __NR_setpriority        97
-#define __NR_profil             98
-#define __NR_statfs             99
-#define __NR_fstatfs           100
-#define __NR_ioperm            101
-#define __NR_socketcall                102     /* old implementation of socket systemcall */
-#define __NR_syslog            103
-#define __NR_setitimer         104
-#define __NR_getitimer         105
-#define __NR_stat              106
-#define __NR_lstat             107
-#define __NR_fstat             108
-#define __NR_olduname          109
-#define __NR_iopl              110
-#define __NR_vhangup           111
-#define __NR_idle              112
-#define __NR_vm86old           113
-#define __NR_wait4             114
-#define __NR_swapoff           115
-#define __NR_sysinfo           116
-#define __NR_ipc               117
-#define __NR_fsync             118
-#define __NR_sigreturn         119
-#define __NR_clone             120
-#define __NR_setdomainname     121
-#define __NR_uname             122
-#define __NR_modify_ldt                123
-#define __NR_adjtimex          124
-#define __NR_mprotect          125
-#define __NR_sigprocmask       126
-#define __NR_create_module     127
-#define __NR_init_module       128
-#define __NR_delete_module     129
-#define __NR_get_kernel_syms   130
-#define __NR_quotactl          131
-#define __NR_getpgid           132
-#define __NR_fchdir            133
-#define __NR_bdflush           134
-#define __NR_sysfs             135
-#define __NR_personality       136
-#define __NR_afs_syscall       137 /* Syscall for Andrew File System */
-#define __NR_setfsuid          138
-#define __NR_setfsgid          139
-#define __NR__llseek           140
-#define __NR_getdents          141
-#define __NR__newselect                142
-#define __NR_flock             143
-#define __NR_msync             144
-#define __NR_readv             145
-#define __NR_writev            146
-#define __NR_getsid            147
-#define __NR_fdatasync         148
-#define __NR__sysctl           149
-#define __NR_mlock             150
-#define __NR_munlock           151
-#define __NR_mlockall          152
-#define __NR_munlockall                153
-#define __NR_sched_setparam            154
-#define __NR_sched_getparam            155
-#define __NR_sched_setscheduler                156
-#define __NR_sched_getscheduler                157
-#define __NR_sched_yield               158
-#define __NR_sched_get_priority_max    159
-#define __NR_sched_get_priority_min    160
-#define __NR_sched_rr_get_interval     161
-#define __NR_nanosleep         162
-#define __NR_mremap            163
-#define __NR_setresuid         164
-#define __NR_getresuid         165
-#define __NR_vm86              166
-#define __NR_query_module      167
-#define __NR_poll              168
-#define __NR_nfsservctl                169
-#define __NR_setresgid         170
-#define __NR_getresgid         171
-#define __NR_prctl              172
-#define __NR_rt_sigreturn      173
-#define __NR_rt_sigaction      174
-#define __NR_rt_sigprocmask    175
-#define __NR_rt_sigpending     176
-#define __NR_rt_sigtimedwait   177
-#define __NR_rt_sigqueueinfo   178
-#define __NR_rt_sigsuspend     179
-#define __NR_pread             180
-#define __NR_pwrite            181
-#define __NR_chown             182
-#define __NR_getcwd            183
-#define __NR_capget            184
-#define __NR_capset            185
-#define __NR_sigaltstack       186
-#define __NR_sendfile          187
-#define __NR_streams1          188     /* some people actually want it */
-#define __NR_streams2          189     /* some people actually want it */
-#define __NR_vfork             190
-#define __NR_ugetrlimit                191     /* SuS compliant getrlimit */
-#define __NR_mmap2             192
-#define __NR_truncate64                193
-#define __NR_ftruncate64       194
-#define __NR_stat64            195
-#define __NR_lstat64           196
-#define __NR_fstat64           197
-#define __NR_lchown32          198
-#define __NR_getuid32          199
-#define __NR_getgid32          200
-#define __NR_geteuid32         201
-#define __NR_getegid32         202
-#define __NR_setreuid32                203
-#define __NR_setregid32                204
-#define __NR_getgroups32       205
-#define __NR_setgroups32       206
-#define __NR_fchown32          207
-#define __NR_setresuid32       208
-#define __NR_getresuid32       209
-#define __NR_setresgid32       210
-#define __NR_getresgid32       211
-#define __NR_chown32           212
-#define __NR_setuid32          213
-#define __NR_setgid32          214
-#define __NR_setfsuid32                215
-#define __NR_setfsgid32                216
-#define __NR_pivot_root                217
-#define __NR_mincore           218
-#define __NR_madvise           219
-
-/* Non-multiplexed socket family */
-#define __NR_socket            220
-#define __NR_bind              221
-#define __NR_connect           222
-#define __NR_listen            223
-#define __NR_accept            224
-#define __NR_getsockname       225
-#define __NR_getpeername       226
-#define __NR_socketpair                227
-#define __NR_send              228
-#define __NR_sendto            229
-#define __NR_recv              230
-#define __NR_recvfrom          231
-#define __NR_shutdown          232
-#define __NR_setsockopt                233
-#define __NR_getsockopt                234
-#define __NR_sendmsg           235
-#define __NR_recvmsg           236
-
-/* Non-multiplexed IPC family */
-#define __NR_semop             237
-#define __NR_semget            238
-#define __NR_semctl            239
-#define __NR_msgsnd            240
-#define __NR_msgrcv            241
-#define __NR_msgget            242
-#define __NR_msgctl            243
-#if 0
-#define __NR_shmatcall         244
-#endif
-#define __NR_shmdt             245
-#define __NR_shmget            246
-#define __NR_shmctl            247
-
-#define __NR_getdents64                248
-#define __NR_fcntl64           249
-/* 223 is unused */
-#define __NR_gettid            252
-#define __NR_readahead         253
-#define __NR_setxattr          254
-#define __NR_lsetxattr         255
-#define __NR_fsetxattr         256
-#define __NR_getxattr          257
-#define __NR_lgetxattr         258
-#define __NR_fgetxattr         269
-#define __NR_listxattr         260
-#define __NR_llistxattr                261
-#define __NR_flistxattr                262
-#define __NR_removexattr       263
-#define __NR_lremovexattr      264
-#define __NR_fremovexattr      265
-#define __NR_tkill             266
-#define __NR_sendfile64                267
-#define __NR_futex             268
-#define __NR_sched_setaffinity 269
-#define __NR_sched_getaffinity 270
-#define __NR_set_thread_area   271
-#define __NR_get_thread_area   272
-#define __NR_io_setup          273
-#define __NR_io_destroy                274
-#define __NR_io_getevents      275
-#define __NR_io_submit         276
-#define __NR_io_cancel         277
-#define __NR_fadvise64         278
-#define __NR_exit_group                280
-
-#define __NR_lookup_dcookie    281
-#define __NR_epoll_create      282
-#define __NR_epoll_ctl         283
-#define __NR_epoll_wait                284
-#define __NR_remap_file_pages  285
-#define __NR_set_tid_address   286
-#define __NR_timer_create      287
-#define __NR_timer_settime     (__NR_timer_create+1)
-#define __NR_timer_gettime     (__NR_timer_create+2)
-#define __NR_timer_getoverrun  (__NR_timer_create+3)
-#define __NR_timer_delete      (__NR_timer_create+4)
-#define __NR_clock_settime     (__NR_timer_create+5)
-#define __NR_clock_gettime     (__NR_timer_create+6)
-#define __NR_clock_getres      (__NR_timer_create+7)
-#define __NR_clock_nanosleep   (__NR_timer_create+8)
-#define __NR_statfs64          296
-#define __NR_fstatfs64         297
-#define __NR_tgkill            298
-#define __NR_utimes            299
-#define __NR_fadvise64_64      300
-#define __NR_vserver           301
-#define __NR_mbind              302
-#define __NR_get_mempolicy      303
-#define __NR_set_mempolicy      304
-#define __NR_mq_open            305
-#define __NR_mq_unlink          (__NR_mq_open+1)
-#define __NR_mq_timedsend       (__NR_mq_open+2)
-#define __NR_mq_timedreceive    (__NR_mq_open+3)
-#define __NR_mq_notify          (__NR_mq_open+4)
-#define __NR_mq_getsetattr      (__NR_mq_open+5)
-
-#define NR_syscalls 311
-
-/* user-visible error numbers are in the range -1 - -125: see <asm-sh64/errno.h> */
-
-#define __syscall_return(type, res) \
-do { \
-       /* Note: when returning from kernel the return value is in r9       \
-       **       This prevents conflicts between return value and arg1      \
-       **       when dispatching signal handler, in other words makes      \
-       **       life easier in the system call epilogue (see entry.S)      \
-       */                                                                  \
-        register unsigned long __sr2 __asm__ ("r2") = res;                 \
-       if ((unsigned long)(res) >= (unsigned long)(-125)) { \
-               errno = -(res);                                             \
-               __sr2 = -1;                                                 \
-       } \
-       return (type) (__sr2);                                              \
-} while (0)
-
-/* XXX - _foo needs to be __foo, while __NR_bar could be _NR_bar. */
-
-#define _syscall0(type,name) \
-type name(void) \
-{ \
-register unsigned long __sc0 __asm__ ("r9") = ((0x10 << 16) | __NR_##name); \
-__asm__ __volatile__ ("trapa   %1 !\t\t\t" #name "()"                      \
-       : "=r" (__sc0)                                                      \
-       : "r" (__sc0) );                                                    \
-__syscall_return(type,__sc0);                                              \
-}
-
-       /*
-        * The apparent spurious "dummy" assembler comment is *needed*,
-        * as without it, the compiler treats the arg<n> variables
-        * as no longer live just before the asm. The compiler can
-        * then optimize the storage into any registers it wishes.
-        * The additional dummy statement forces the compiler to put
-        * the arguments into the correct registers before the TRAPA.
-        */
-#define _syscall1(type,name,type1,arg1) \
-type name(type1 arg1) \
-{ \
-register unsigned long __sc0 __asm__ ("r9") = ((0x11 << 16) | __NR_##name); \
-register unsigned long __sc2 __asm__ ("r2") = (unsigned long) arg1;        \
-__asm__ __volatile__ ("trapa   %1 !\t\t\t" #name "(%2)"                    \
-       : "=r" (__sc0)                                                      \
-       : "r" (__sc0), "r" (__sc2));                                        \
-__asm__ __volatile__ ("!dummy  %0 %1"                                      \
-       :                                                                   \
-       : "r" (__sc0), "r" (__sc2));                                        \
-__syscall_return(type,__sc0);                                              \
-}
-
-#define _syscall2(type,name,type1,arg1,type2,arg2) \
-type name(type1 arg1,type2 arg2) \
-{ \
-register unsigned long __sc0 __asm__ ("r9") = ((0x12 << 16) | __NR_##name); \
-register unsigned long __sc2 __asm__ ("r2") = (unsigned long) arg1;        \
-register unsigned long __sc3 __asm__ ("r3") = (unsigned long) arg2;        \
-__asm__ __volatile__ ("trapa   %1 !\t\t\t" #name "(%2,%3)"                 \
-       : "=r" (__sc0)                                                      \
-       : "r" (__sc0), "r" (__sc2), "r" (__sc3) );                          \
-__asm__ __volatile__ ("!dummy  %0 %1 %2"                                   \
-       :                                                                   \
-       : "r" (__sc0), "r" (__sc2), "r" (__sc3) );                          \
-__syscall_return(type,__sc0);                                              \
-}
-
-#define _syscall3(type,name,type1,arg1,type2,arg2,type3,arg3) \
-type name(type1 arg1,type2 arg2,type3 arg3) \
-{ \
-register unsigned long __sc0 __asm__ ("r9") = ((0x13 << 16) | __NR_##name); \
-register unsigned long __sc2 __asm__ ("r2") = (unsigned long) arg1;        \
-register unsigned long __sc3 __asm__ ("r3") = (unsigned long) arg2;        \
-register unsigned long __sc4 __asm__ ("r4") = (unsigned long) arg3;        \
-__asm__ __volatile__ ("trapa   %1 !\t\t\t" #name "(%2,%3,%4)"              \
-       : "=r" (__sc0)                                                      \
-       : "r" (__sc0), "r" (__sc2), "r" (__sc3), "r" (__sc4) );             \
-__asm__ __volatile__ ("!dummy  %0 %1 %2 %3"                                \
-       :                                                                   \
-       : "r" (__sc0), "r" (__sc2), "r" (__sc3), "r" (__sc4) );             \
-__syscall_return(type,__sc0);                                              \
-}
-
-#define _syscall4(type,name,type1,arg1,type2,arg2,type3,arg3,type4,arg4) \
-type name (type1 arg1, type2 arg2, type3 arg3, type4 arg4) \
-{ \
-register unsigned long __sc0 __asm__ ("r9") = ((0x14 << 16) | __NR_##name); \
-register unsigned long __sc2 __asm__ ("r2") = (unsigned long) arg1;        \
-register unsigned long __sc3 __asm__ ("r3") = (unsigned long) arg2;        \
-register unsigned long __sc4 __asm__ ("r4") = (unsigned long) arg3;        \
-register unsigned long __sc5 __asm__ ("r5") = (unsigned long) arg4;        \
-__asm__ __volatile__ ("trapa   %1 !\t\t\t" #name "(%2,%3,%4,%5)"           \
-       : "=r" (__sc0)                                                      \
-       : "r" (__sc0), "r" (__sc2), "r" (__sc3), "r" (__sc4), "r" (__sc5) );\
-__asm__ __volatile__ ("!dummy  %0 %1 %2 %3 %4"                             \
-       :                                                                   \
-       : "r" (__sc0), "r" (__sc2), "r" (__sc3), "r" (__sc4), "r" (__sc5) );\
-__syscall_return(type,__sc0);                                              \
-}
-
-#define _syscall5(type,name,type1,arg1,type2,arg2,type3,arg3,type4,arg4,type5,arg5) \
-type name (type1 arg1, type2 arg2, type3 arg3, type4 arg4, type5 arg5) \
-{ \
-register unsigned long __sc0 __asm__ ("r9") = ((0x15 << 16) | __NR_##name); \
-register unsigned long __sc2 __asm__ ("r2") = (unsigned long) arg1;        \
-register unsigned long __sc3 __asm__ ("r3") = (unsigned long) arg2;        \
-register unsigned long __sc4 __asm__ ("r4") = (unsigned long) arg3;        \
-register unsigned long __sc5 __asm__ ("r5") = (unsigned long) arg4;        \
-register unsigned long __sc6 __asm__ ("r6") = (unsigned long) arg5;        \
-__asm__ __volatile__ ("trapa   %1 !\t\t\t" #name "(%2,%3,%4,%5,%6)"        \
-       : "=r" (__sc0)                                                      \
-       : "r" (__sc0), "r" (__sc2), "r" (__sc3), "r" (__sc4), "r" (__sc5),  \
-         "r" (__sc6));                                                     \
-__asm__ __volatile__ ("!dummy  %0 %1 %2 %3 %4 %5"                          \
-       :                                                                   \
-       : "r" (__sc0), "r" (__sc2), "r" (__sc3), "r" (__sc4), "r" (__sc5),  \
-         "r" (__sc6));                                                     \
-__syscall_return(type,__sc0);                                              \
-}
-
-#define _syscall6(type,name,type1,arg1,type2,arg2,type3,arg3,type4,arg4,type5,arg5, type6, arg6) \
-type name (type1 arg1, type2 arg2, type3 arg3, type4 arg4, type5 arg5, type6 arg6) \
-{ \
-register unsigned long __sc0 __asm__ ("r9") = ((0x16 << 16) | __NR_##name); \
-register unsigned long __sc2 __asm__ ("r2") = (unsigned long) arg1;        \
-register unsigned long __sc3 __asm__ ("r3") = (unsigned long) arg2;        \
-register unsigned long __sc4 __asm__ ("r4") = (unsigned long) arg3;        \
-register unsigned long __sc5 __asm__ ("r5") = (unsigned long) arg4;        \
-register unsigned long __sc6 __asm__ ("r6") = (unsigned long) arg5;        \
-register unsigned long __sc7 __asm__ ("r7") = (unsigned long) arg6;        \
-__asm__ __volatile__ ("trapa   %1 !\t\t\t" #name "(%2,%3,%4,%5,%6,%7)"     \
-       : "=r" (__sc0)                                                      \
-       : "r" (__sc0), "r" (__sc2), "r" (__sc3), "r" (__sc4), "r" (__sc5),  \
-         "r" (__sc6), "r" (__sc7));                                        \
-__asm__ __volatile__ ("!dummy  %0 %1 %2 %3 %4 %5 %6"                       \
-       :                                                                   \
-       : "r" (__sc0), "r" (__sc2), "r" (__sc3), "r" (__sc4), "r" (__sc5),  \
-         "r" (__sc6), "r" (__sc7));                                        \
-__syscall_return(type,__sc0);                                              \
-}
-
-#ifdef __KERNEL__
-#define __ARCH_WANT_IPC_PARSE_VERSION
-#define __ARCH_WANT_OLD_READDIR
-#define __ARCH_WANT_OLD_STAT
-#define __ARCH_WANT_STAT64
-#define __ARCH_WANT_SYS_ALARM
-#define __ARCH_WANT_SYS_GETHOSTNAME
-#define __ARCH_WANT_SYS_PAUSE
-#define __ARCH_WANT_SYS_SGETMASK
-#define __ARCH_WANT_SYS_SIGNAL
-#define __ARCH_WANT_SYS_TIME
-#define __ARCH_WANT_SYS_UTIME
-#define __ARCH_WANT_SYS_WAITPID
-#define __ARCH_WANT_SYS_SOCKETCALL
-#define __ARCH_WANT_SYS_FADVISE64
-#define __ARCH_WANT_SYS_GETPGRP
-#define __ARCH_WANT_SYS_LLSEEK
-#define __ARCH_WANT_SYS_NICE
-#define __ARCH_WANT_SYS_OLD_GETRLIMIT
-#define __ARCH_WANT_SYS_OLDUMOUNT
-#define __ARCH_WANT_SYS_SIGPENDING
-#define __ARCH_WANT_SYS_SIGPROCMASK
-#define __ARCH_WANT_SYS_RT_SIGACTION
-#endif
-
-#ifdef __KERNEL_SYSCALLS__
-
-/* Copy from sh */
-#include <linux/compiler.h>
-#include <linux/types.h>
-#include <asm/ptrace.h>
-
-/*
- * we need this inline - forking from kernel space will result
- * in NO COPY ON WRITE (!!!), until an execve is executed. This
- * is no problem, but for the stack. This is handled by not letting
- * main() use the stack at all after fork(). Thus, no function
- * calls - which means inline code for fork too, as otherwise we
- * would use the stack upon exit from 'fork()'.
- *
- * Actually only pause and fork are needed inline, so that there
- * won't be any messing with the stack from main(), but we define
- * some others too.
- */
-#define __NR__exit __NR_exit
-static inline _syscall0(int,pause)
-static inline _syscall1(int,setup,int,magic)
-static inline _syscall0(int,sync)
-static inline _syscall0(pid_t,setsid)
-static inline _syscall3(int,write,int,fd,const char *,buf,off_t,count)
-static inline _syscall3(int,read,int,fd,char *,buf,off_t,count)
-static inline _syscall3(off_t,lseek,int,fd,off_t,offset,int,count)
-static inline _syscall1(int,dup,int,fd)
-static inline _syscall3(int,execve,const char *,file,char **,argv,char **,envp)
-static inline _syscall3(int,open,const char *,file,int,flag,int,mode)
-static inline _syscall1(int,close,int,fd)
-static inline _syscall1(int,_exit,int,exitcode)
-static inline _syscall3(pid_t,waitpid,pid_t,pid,int *,wait_stat,int,options)
-static inline _syscall1(int,delete_module,const char *,name)
-
-static inline pid_t wait(int * wait_stat)
-{
-       return waitpid(-1,wait_stat,0);
-}
-#endif
-
-/*
- * "Conditional" syscalls
- *
- * What we want is __attribute__((weak,alias("sys_ni_syscall"))),
- * but it doesn't work on all toolchains, so we just do it by hand
- */
-#ifndef cond_syscall
-#define cond_syscall(x) asm(".weak\t" #x "\n\t.set\t" #x ",sys_ni_syscall");
-#endif
-
-#endif /* __ASM_SH64_UNISTD_H */
diff --git a/include/asm-sh64/user.h b/include/asm-sh64/user.h
deleted file mode 100644 (file)
index 8f32f39..0000000
+++ /dev/null
@@ -1,71 +0,0 @@
-#ifndef __ASM_SH64_USER_H
-#define __ASM_SH64_USER_H
-
-/*
- * 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/asm-sh64/user.h
- *
- * Copyright (C) 2000, 2001  Paolo Alberelli
- *
- */
-
-#include <linux/types.h>
-#include <asm/processor.h>
-#include <asm/ptrace.h>
-#include <asm/page.h>
-
-/*
- * Core file format: The core file is written in such a way that gdb
- * can understand it and provide useful information to the user (under
- * linux we use the `trad-core' bfd).  The file contents are as follows:
- *
- *  upage: 1 page consisting of a user struct that tells gdb
- *     what is present in the file.  Directly after this is a
- *     copy of the task_struct, which is currently not used by gdb,
- *     but it may come in handy at some point.  All of the registers
- *     are stored as part of the upage.  The upage should always be
- *     only one page long.
- *  data: The data segment follows next.  We use current->end_text to
- *     current->brk to pick up all of the user variables, plus any memory
- *     that may have been sbrk'ed.  No attempt is made to determine if a
- *     page is demand-zero or if a page is totally unused, we just cover
- *     the entire range.  All of the addresses are rounded in such a way
- *     that an integral number of pages is written.
- *  stack: We need the stack information in order to get a meaningful
- *     backtrace.  We need to write the data from usp to
- *     current->start_stack, so we round each of these in order to be able
- *     to write an integer number of pages.
- */
-
-struct user_fpu_struct {
-        unsigned long long fp_regs[32];
-       unsigned int fpscr;
-};
-
-struct user {
-       struct pt_regs  regs;                   /* entire machine state */
-       struct user_fpu_struct fpu;     /* Math Co-processor registers  */
-       int u_fpvalid;          /* True if math co-processor being used */
-       size_t          u_tsize;                /* text size (pages) */
-       size_t          u_dsize;                /* data size (pages) */
-       size_t          u_ssize;                /* stack size (pages) */
-       unsigned long   start_code;             /* text starting address */
-       unsigned long   start_data;             /* data starting address */
-       unsigned long   start_stack;            /* stack starting address */
-       long int        signal;                 /* signal causing core dump */
-       struct regs *   u_ar0;                  /* help gdb find registers */
-       struct user_fpu_struct* u_fpstate;      /* Math Co-processor pointer */
-       unsigned long   magic;                  /* identifies a core file */
-       char            u_comm[32];             /* user command name */
-};
-
-#define NBPG                   PAGE_SIZE
-#define UPAGES                 1
-#define HOST_TEXT_START_ADDR   (u.start_code)
-#define HOST_DATA_START_ADDR   (u.start_data)
-#define HOST_STACK_END_ADDR    (u.start_stack + u.u_ssize * NBPG)
-
-#endif /* __ASM_SH64_USER_H */
diff --git a/include/asm-sparc64/cmt.h b/include/asm-sparc64/cmt.h
deleted file mode 100644 (file)
index 870db59..0000000
+++ /dev/null
@@ -1,59 +0,0 @@
-#ifndef _SPARC64_CMT_H
-#define _SPARC64_CMT_H
-
-/* cmt.h: Chip Multi-Threading register definitions
- *
- * Copyright (C) 2004 David S. Miller (davem@redhat.com)
- */
-
-/* ASI_CORE_ID - private */
-#define LP_ID          0x0000000000000010UL
-#define  LP_ID_MAX     0x00000000003f0000UL
-#define  LP_ID_ID      0x000000000000003fUL
-
-/* ASI_INTR_ID - private */
-#define LP_INTR_ID     0x0000000000000000UL
-#define  LP_INTR_ID_ID 0x00000000000003ffUL
-
-/* ASI_CESR_ID - private */
-#define CESR_ID                0x0000000000000040UL
-#define  CESR_ID_ID    0x00000000000000ffUL
-
-/* ASI_CORE_AVAILABLE - shared */
-#define LP_AVAIL       0x0000000000000000UL
-#define  LP_AVAIL_1    0x0000000000000002UL
-#define  LP_AVAIL_0    0x0000000000000001UL
-
-/* ASI_CORE_ENABLE_STATUS - shared */
-#define LP_ENAB_STAT   0x0000000000000010UL
-#define  LP_ENAB_STAT_1        0x0000000000000002UL
-#define  LP_ENAB_STAT_0        0x0000000000000001UL
-
-/* ASI_CORE_ENABLE - shared */
-#define LP_ENAB                0x0000000000000020UL
-#define  LP_ENAB_1     0x0000000000000002UL
-#define  LP_ENAB_0     0x0000000000000001UL
-
-/* ASI_CORE_RUNNING - shared */
-#define LP_RUNNING_RW  0x0000000000000050UL
-#define LP_RUNNING_W1S 0x0000000000000060UL
-#define LP_RUNNING_W1C 0x0000000000000068UL
-#define  LP_RUNNING_1  0x0000000000000002UL
-#define  LP_RUNNING_0  0x0000000000000001UL
-
-/* ASI_CORE_RUNNING_STAT - shared */
-#define LP_RUN_STAT    0x0000000000000058UL
-#define  LP_RUN_STAT_1 0x0000000000000002UL
-#define  LP_RUN_STAT_0 0x0000000000000001UL
-
-/* ASI_XIR_STEERING - shared */
-#define LP_XIR_STEER   0x0000000000000030UL
-#define  LP_XIR_STEER_1        0x0000000000000002UL
-#define  LP_XIR_STEER_0        0x0000000000000001UL
-
-/* ASI_CMT_ERROR_STEERING - shared */
-#define CMT_ER_STEER   0x0000000000000040UL
-#define  CMT_ER_STEER_1        0x0000000000000002UL
-#define  CMT_ER_STEER_0        0x0000000000000001UL
-
-#endif /* _SPARC64_CMT_H */
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/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-um/setup.h b/include/asm-um/setup.h
deleted file mode 100644 (file)
index e5787bb..0000000
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef SETUP_H_INCLUDED
-#define SETUP_H_INCLUDED
-
-#define COMMAND_LINE_SIZE 512
-
-#endif         /* SETUP_H_INCLUDED */
diff --git a/include/asm-v850/setup.h b/include/asm-v850/setup.h
deleted file mode 100644 (file)
index c48a9b9..0000000
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef _V850_SETUP_H
-#define _V850_SETUP_H
-
-#define COMMAND_LINE_SIZE      512
-
-#endif /* __SETUP_H */
diff --git a/include/asm-x86_64/netdump.h b/include/asm-x86_64/netdump.h
deleted file mode 100644 (file)
index 3be9bad..0000000
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef _ASM_X86_64_NETDUMP_H_
-#define _ASM_X86_64_NETDUMP_H_
-
-#include <asm-generic/netdump.h>
-
-#endif /* _ASM_X86_64_NETDUMP_H_ */
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/crc-ccitt.h b/include/linux/crc-ccitt.h
deleted file mode 100644 (file)
index f52696a..0000000
+++ /dev/null
@@ -1,15 +0,0 @@
-#ifndef _LINUX_CRC_CCITT_H
-#define _LINUX_CRC_CCITT_H
-
-#include <linux/types.h>
-
-extern u16 const crc_ccitt_table[256];
-
-extern u16 crc_ccitt(u16 crc, const u8 *buffer, size_t len);
-
-static inline u16 crc_ccitt_byte(u16 crc, const u8 c)
-{
-       return (crc >> 8) ^ crc_ccitt_table[(crc ^ c) & 0xff];
-}
-
-#endif /* _LINUX_CRC_CCITT_H */
diff --git a/include/linux/crypto/ksign.h b/include/linux/crypto/ksign.h
deleted file mode 100644 (file)
index 5569cd3..0000000
+++ /dev/null
@@ -1,22 +0,0 @@
-/* ksign.h: in-kernel signature checker
- *
- * Copyright (C) 2004 Red Hat, Inc. All Rights Reserved.
- * Written by David Howells (dhowells@redhat.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.
- */
-
-#ifndef _LINUX_CRYPTO_KSIGN_H
-#define _LINUX_CRYPTO_KSIGN_H
-
-#include <linux/types.h>
-
-#ifdef CONFIG_CRYPTO_SIGNATURE
-extern int ksign_verify_signature(const char *sig, unsigned sig_size,
-                                 struct crypto_tfm *sha1);
-#endif
-
-#endif /* _LINUX_CRYPTO_KSIGN_H */
diff --git a/include/linux/crypto/mpi.h b/include/linux/crypto/mpi.h
deleted file mode 100644 (file)
index 4de3ba0..0000000
+++ /dev/null
@@ -1,147 +0,0 @@
-/* mpi.h  -  Multi Precision Integers
- *     Copyright (C) 1994, 1996, 1998, 1999,
- *                    2000, 2001 Free Software Foundation, Inc.
- *
- * This file is part of GNUPG.
- *
- * GNUPG 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.
- *
- * GNUPG 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
- *
- * Note: This code is heavily based on the GNU MP Library.
- *      Actually it's the same code with only minor changes in the
- *      way the data is stored; this is to support the abstraction
- *      of an optional secure memory allocation which may be used
- *      to avoid revealing of sensitive data due to paging etc.
- *      The GNU MP Library itself is published under the LGPL;
- *      however I decided to publish this code under the plain GPL.
- */
-
-#ifndef G10_MPI_H
-#define G10_MPI_H
-
-#include <linux/types.h>
-
-/* DSI defines */
-
-#define SHA1_DIGEST_LENGTH   20
-
-/*end of DSI defines */
-
-#define BYTES_PER_MPI_LIMB     (BITS_PER_LONG / 8)
-#define BITS_PER_MPI_LIMB      BITS_PER_LONG
-
-typedef unsigned long int mpi_limb_t;
-typedef   signed long int mpi_limb_signed_t;
-
-struct gcry_mpi {
-       int     alloced;    /* array size (# of allocated limbs) */
-       int     nlimbs;     /* number of valid limbs */
-       int     nbits;      /* the real number of valid bits (info only) */
-       int     sign;       /* indicates a negative number */
-       unsigned flags; /* bit 0: array must be allocated in secure memory space */
-       /* bit 1: not used */
-       /* bit 2: the limb is a pointer to some m_alloced data */
-       mpi_limb_t *d;  /* array with the limbs */
-};
-
-typedef struct gcry_mpi *MPI;
-
-#define MPI_NULL NULL
-
-#define mpi_get_nlimbs(a)     ((a)->nlimbs)
-#define mpi_is_neg(a)        ((a)->sign)
-
-/*-- mpiutil.c --*/
-MPI mpi_alloc( unsigned nlimbs );
-MPI mpi_alloc_secure( unsigned nlimbs );
-MPI mpi_alloc_like( MPI a );
-void mpi_free( MPI a );
-int mpi_resize( MPI a, unsigned nlimbs );
-int  mpi_copy( MPI *copy, const MPI a );
-void mpi_clear( MPI a );
-int mpi_set( MPI w, MPI u);
-int mpi_set_ui( MPI w, ulong u);
-MPI  mpi_alloc_set_ui( unsigned long u);
-void mpi_m_check( MPI a );
-void mpi_swap( MPI a, MPI b);
-
-/*-- mpicoder.c --*/
-MPI do_encode_md(const void *sha_buffer, unsigned nbits);
-MPI mpi_read_from_buffer(const void *buffer, unsigned *ret_nread);
-int mpi_fromstr(MPI val, const char *str);
-u32 mpi_get_keyid( MPI a, u32 *keyid );
-void *mpi_get_buffer( MPI a, unsigned *nbytes, int *sign );
-void *mpi_get_secure_buffer( MPI a, unsigned *nbytes, int *sign );
-int  mpi_set_buffer( MPI a, const void *buffer, unsigned nbytes, int sign );
-
-#define log_mpidump g10_log_mpidump
-
-/*-- mpi-add.c --*/
-int mpi_add_ui(MPI w, MPI u, ulong v );
-int mpi_add(MPI w, MPI u, MPI v);
-int mpi_addm(MPI w, MPI u, MPI v, MPI m);
-int mpi_sub_ui(MPI w, MPI u, ulong v );
-int mpi_sub( MPI w, MPI u, MPI v);
-int mpi_subm( MPI w, MPI u, MPI v, MPI m);
-
-/*-- mpi-mul.c --*/
-int mpi_mul_ui(MPI w, MPI u, ulong v );
-int mpi_mul_2exp( MPI w, MPI u, ulong cnt);
-int mpi_mul( MPI w, MPI u, MPI v);
-int mpi_mulm( MPI w, MPI u, MPI v, MPI m);
-
-/*-- mpi-div.c --*/
-ulong mpi_fdiv_r_ui( MPI rem, MPI dividend, ulong divisor );
-int mpi_fdiv_r( MPI rem, MPI dividend, MPI divisor );
-int mpi_fdiv_q( MPI quot, MPI dividend, MPI divisor );
-int mpi_fdiv_qr( MPI quot, MPI rem, MPI dividend, MPI divisor );
-int mpi_tdiv_r( MPI rem, MPI num, MPI den);
-int mpi_tdiv_qr( MPI quot, MPI rem, MPI num, MPI den);
-int mpi_tdiv_q_2exp( MPI w, MPI u, unsigned count );
-int   mpi_divisible_ui(const MPI dividend, ulong divisor );
-
-/*-- mpi-gcd.c --*/
-int mpi_gcd( MPI g, const MPI a, const MPI b );
-
-/*-- mpi-pow.c --*/
-int mpi_pow( MPI w, MPI u, MPI v);
-int mpi_powm( MPI res, MPI base, MPI exp, MPI mod);
-
-/*-- mpi-mpow.c --*/
-int mpi_mulpowm( MPI res, MPI *basearray, MPI *exparray, MPI mod);
-
-/*-- mpi-cmp.c --*/
-int mpi_cmp_ui( MPI u, ulong v );
-int mpi_cmp( MPI u, MPI v );
-
-/*-- mpi-scan.c --*/
-int mpi_getbyte( MPI a, unsigned idx );
-void mpi_putbyte( MPI a, unsigned idx, int value );
-unsigned mpi_trailing_zeros( MPI a );
-
-/*-- mpi-bit.c --*/
-void mpi_normalize( MPI a );
-unsigned mpi_get_nbits( MPI a );
-int  mpi_test_bit( MPI a, unsigned n );
-int mpi_set_bit( MPI a, unsigned n );
-int mpi_set_highbit( MPI a, unsigned n );
-void mpi_clear_highbit( MPI a, unsigned n );
-void mpi_clear_bit( MPI a, unsigned n );
-int mpi_rshift( MPI x, MPI a, unsigned n );
-
-/*-- mpi-inv.c --*/
-int mpi_invm( MPI x, MPI u, MPI v );
-
-
-#endif /*G10_MPI_H*/
diff --git a/include/linux/dmi.h b/include/linux/dmi.h
deleted file mode 100644 (file)
index d2bcf55..0000000
+++ /dev/null
@@ -1,47 +0,0 @@
-#ifndef __DMI_H__
-#define __DMI_H__
-
-enum dmi_field {
-       DMI_NONE,
-       DMI_BIOS_VENDOR,
-       DMI_BIOS_VERSION,
-       DMI_BIOS_DATE,
-       DMI_SYS_VENDOR,
-       DMI_PRODUCT_NAME,
-       DMI_PRODUCT_VERSION,
-       DMI_BOARD_VENDOR,
-       DMI_BOARD_NAME,
-       DMI_BOARD_VERSION,
-       DMI_STRING_MAX,
-};
-
-/*
- *     DMI callbacks for problem boards
- */
-struct dmi_strmatch {
-       u8 slot;
-       char *substr;
-};
-
-struct dmi_system_id {
-       int (*callback)(struct dmi_system_id *);
-       char *ident;
-       struct dmi_strmatch matches[4];
-       void *driver_data;
-};
-
-#define DMI_MATCH(a,b) { a, b }
-
-#if defined(CONFIG_X86) && !defined(CONFIG_X86_64)
-
-extern int dmi_check_system(struct dmi_system_id *list);
-extern char * dmi_get_system_info(int field);
-
-#else
-
-static inline int dmi_check_system(struct dmi_system_id *list) { return 0; }
-static inline char * dmi_get_system_info(int field) { return NULL; }
-
-#endif
-
-#endif /* __DMI_H__ */
diff --git a/include/linux/ds1286.h b/include/linux/ds1286.h
deleted file mode 100644 (file)
index d898986..0000000
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Copyright (C) 1998, 1999, 2003 Ralf Baechle
- *
- * 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.
- */
-#ifndef __LINUX_DS1286_H
-#define __LINUX_DS1286_H
-
-#include <asm/ds1286.h>
-
-/**********************************************************************
- * register summary
- **********************************************************************/
-#define RTC_HUNDREDTH_SECOND   0
-#define RTC_SECONDS            1
-#define RTC_MINUTES            2
-#define RTC_MINUTES_ALARM      3
-#define RTC_HOURS              4
-#define RTC_HOURS_ALARM                5
-#define RTC_DAY                        6
-#define RTC_DAY_ALARM          7
-#define RTC_DATE               8
-#define RTC_MONTH              9
-#define RTC_YEAR               10
-#define RTC_CMD                        11
-#define RTC_WHSEC              12
-#define RTC_WSEC               13
-#define RTC_UNUSED             14
-
-/* RTC_*_alarm is always true if 2 MSBs are set */
-# define RTC_ALARM_DONT_CARE   0xC0
-
-
-/*
- * Bits in the month register
- */
-#define RTC_EOSC               0x80
-#define RTC_ESQW               0x40
-
-/*
- * Bits in the Command register
- */
-#define RTC_TDF                        0x01
-#define RTC_WAF                        0x02
-#define RTC_TDM                        0x04
-#define RTC_WAM                        0x08
-#define RTC_PU_LVL             0x10
-#define RTC_IBH_LO             0x20
-#define RTC_IPSW               0x40
-#define RTC_TE                 0x80
-
-#endif /* __LINUX_DS1286_H */
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_ipv4/ipt_addrtype.h b/include/linux/netfilter_ipv4/ipt_addrtype.h
deleted file mode 100644 (file)
index 166ed01..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
-#ifndef _IPT_ADDRTYPE_H
-#define _IPT_ADDRTYPE_H
-
-struct ipt_addrtype_info {
-       u_int16_t       source;         /* source-type mask */
-       u_int16_t       dest;           /* dest-type mask */
-       u_int32_t       invert_source;
-       u_int32_t       invert_dest;
-};
-
-#endif
diff --git a/include/linux/netfilter_ipv4/ipt_realm.h b/include/linux/netfilter_ipv4/ipt_realm.h
deleted file mode 100644 (file)
index a4d6698..0000000
+++ /dev/null
@@ -1,10 +0,0 @@
-#ifndef _IPT_REALM_H
-#define _IPT_REALM_H
-
-struct ipt_realm_info {
-       u_int32_t id;
-       u_int32_t mask;
-       u_int8_t invert;
-};
-
-#endif /* _IPT_REALM_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/media/ovcamchip.h b/include/media/ovcamchip.h
deleted file mode 100644 (file)
index cb7c0aa..0000000
+++ /dev/null
@@ -1,104 +0,0 @@
-/* OmniVision* camera chip driver API
- *
- * Copyright (c) 1999-2004 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. NO WARRANTY OF ANY KIND is expressed or implied.
- *
- * * OmniVision is a trademark of OmniVision Technologies, Inc. This driver
- * is not sponsored or developed by them.
- */
-
-#ifndef __LINUX_OVCAMCHIP_H
-#define __LINUX_OVCAMCHIP_H
-
-#include <linux/videodev.h>
-#include <linux/i2c.h>
-
-/* Remove these once they are officially defined */
-#ifndef I2C_DRIVERID_OVCAMCHIP
-       #define I2C_DRIVERID_OVCAMCHIP  0xf00f
-#endif
-#ifndef I2C_HW_SMBUS_OV511
-       #define I2C_HW_SMBUS_OV511      0xfe
-#endif
-#ifndef I2C_HW_SMBUS_OV518
-       #define I2C_HW_SMBUS_OV518      0xff
-#endif
-#ifndef I2C_HW_SMBUS_OVFX2
-       #define I2C_HW_SMBUS_OVFX2      0xfd
-#endif
-
-/* --------------------------------- */
-/*           ENUMERATIONS            */
-/* --------------------------------- */
-
-/* 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 */
-};
-
-/* Chip types */
-#define NUM_CC_TYPES   9
-enum {
-       CC_UNKNOWN,
-       CC_OV76BE,
-       CC_OV7610,
-       CC_OV7620,
-       CC_OV7620AE,
-       CC_OV6620,
-       CC_OV6630,
-       CC_OV6630AE,
-       CC_OV6630AF,
-};
-
-/* --------------------------------- */
-/*           I2C ADDRESSES           */
-/* --------------------------------- */
-
-#define OV7xx0_SID   (0x42 >> 1)
-#define OV6xx0_SID   (0xC0 >> 1)
-
-/* --------------------------------- */
-/*                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 */
-#define OVCAMCHIP_CMD_Q_SUBTYPE     _IOR  (0x88, 0x00, int)
-#define OVCAMCHIP_CMD_INITIALIZE    _IOW  (0x88, 0x01, int)
-/* You must call OVCAMCHIP_CMD_INITIALIZE before any of commands below! */
-#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
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/ip6_checksum.h b/include/net/ip6_checksum.h
deleted file mode 100644 (file)
index 3dfc885..0000000
+++ /dev/null
@@ -1,94 +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.
- *
- *             Checksumming functions for IPv6
- *
- * Authors:    Jorge Cwik, <jorge@laser.satlink.net>
- *             Arnt Gulbrandsen, <agulbra@nvg.unit.no>
- *             Borrows very liberally from tcp.c and ip.c, see those
- *             files for more names.
- *
- *             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.
- */
-
-/*
- *     Fixes:
- *
- *     Ralf Baechle                    :       generic ipv6 checksum
- *     <ralf@waldorf-gmbh.de>
- */
-
-#ifndef _CHECKSUM_IPV6_H
-#define _CHECKSUM_IPV6_H
-
-#include <asm/types.h>
-#include <asm/byteorder.h>
-#include <net/ip.h>
-#include <asm/checksum.h>
-#include <linux/in6.h>
-
-#ifndef _HAVE_ARCH_IPV6_CSUM
-
-static __inline__ unsigned short int csum_ipv6_magic(struct in6_addr *saddr,
-                                                    struct in6_addr *daddr,
-                                                    __u16 len,
-                                                    unsigned short proto,
-                                                    unsigned int csum) 
-{
-
-       int carry;
-       __u32 ulen;
-       __u32 uproto;
-
-       csum += saddr->s6_addr32[0];
-       carry = (csum < saddr->s6_addr32[0]);
-       csum += carry;
-
-       csum += saddr->s6_addr32[1];
-       carry = (csum < saddr->s6_addr32[1]);
-       csum += carry;
-
-       csum += saddr->s6_addr32[2];
-       carry = (csum < saddr->s6_addr32[2]);
-       csum += carry;
-
-       csum += saddr->s6_addr32[3];
-       carry = (csum < saddr->s6_addr32[3]);
-       csum += carry;
-
-       csum += daddr->s6_addr32[0];
-       carry = (csum < daddr->s6_addr32[0]);
-       csum += carry;
-
-       csum += daddr->s6_addr32[1];
-       carry = (csum < daddr->s6_addr32[1]);
-       csum += carry;
-
-       csum += daddr->s6_addr32[2];
-       carry = (csum < daddr->s6_addr32[2]);
-       csum += carry;
-
-       csum += daddr->s6_addr32[3];
-       carry = (csum < daddr->s6_addr32[3]);
-       csum += carry;
-
-       ulen = htonl((__u32) len);
-       csum += ulen;
-       carry = (csum < ulen);
-       csum += carry;
-
-       uproto = htonl(proto);
-       csum += uproto;
-       carry = (csum < uproto);
-       csum += carry;
-
-       return csum_fold(csum);
-}
-
-#endif
-#endif
diff --git a/include/net/pkt_act.h b/include/net/pkt_act.h
deleted file mode 100644 (file)
index 09b899d..0000000
+++ /dev/null
@@ -1,286 +0,0 @@
-#ifndef __NET_PKT_ACT_H
-#define __NET_PKT_ACT_H
-
-#include <asm/uaccess.h>
-#include <asm/system.h>
-#include <asm/bitops.h>
-#include <linux/config.h>
-#include <linux/types.h>
-#include <linux/kernel.h>
-#include <linux/sched.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/netdevice.h>
-#include <linux/skbuff.h>
-#include <linux/rtnetlink.h>
-#include <linux/module.h>
-#include <linux/init.h>
-#include <linux/proc_fs.h>
-#include <net/sock.h>
-#include <net/pkt_sched.h>
-
-#define tca_st(val) (struct tcf_##val *)
-#define PRIV(a,name) ( tca_st(name) (a)->priv)
-
-#if 0 /* control */
-#define DPRINTK(format,args...) printk(KERN_DEBUG format,##args)
-#else
-#define DPRINTK(format,args...)
-#endif
-
-#if 0 /* data */
-#define D2PRINTK(format,args...) printk(KERN_DEBUG format,##args)
-#else
-#define D2PRINTK(format,args...)
-#endif
-
-static __inline__ unsigned
-tcf_hash(u32 index)
-{
-       return index & MY_TAB_MASK;
-}
-
-/* probably move this from being inline
- * and put into act_generic
-*/
-static inline void
-tcf_hash_destroy(struct tcf_st *p)
-{
-       unsigned h = tcf_hash(p->index);
-       struct tcf_st **p1p;
-
-       for (p1p = &tcf_ht[h]; *p1p; p1p = &(*p1p)->next) {
-               if (*p1p == p) {
-                       write_lock_bh(&tcf_t_lock);
-                       *p1p = p->next;
-                       write_unlock_bh(&tcf_t_lock);
-#ifdef CONFIG_NET_ESTIMATOR
-                       qdisc_kill_estimator(&p->stats);
-#endif
-                       kfree(p);
-                       return;
-               }
-       }
-       BUG_TRAP(0);
-}
-
-static inline int
-tcf_hash_release(struct tcf_st *p, int bind )
-{
-       int ret = 0;
-       if (p) {
-               if (bind) {
-                       p->bindcnt--;
-               }
-               p->refcnt--;
-               if(p->bindcnt <=0 && p->refcnt <= 0) {
-                       tcf_hash_destroy(p);
-                       ret = 1;
-               }
-       }
-       return ret;
-}
-
-static __inline__ int
-tcf_dump_walker(struct sk_buff *skb, struct netlink_callback *cb,
-               struct tc_action *a)
-{
-       struct tcf_st *p;
-       int err =0, index =  -1,i= 0, s_i = 0, n_i = 0;
-       struct rtattr *r ;
-
-       read_lock(&tcf_t_lock);
-
-       s_i = cb->args[0];
-
-       for (i = 0; i < MY_TAB_SIZE; i++) {
-               p = tcf_ht[tcf_hash(i)];
-
-               for (; p; p = p->next) {
-                       index++;
-                       if (index < s_i)
-                               continue;
-                       a->priv = p;
-                       a->order = n_i;
-                       r = (struct rtattr*) skb->tail;
-                       RTA_PUT(skb, a->order, 0, NULL);
-                       err = tcf_action_dump_1(skb, a, 0, 0);
-                       if (0 > err) {
-                               index--;
-                               skb_trim(skb, (u8*)r - skb->data);
-                               goto done;
-                       }
-                       r->rta_len = skb->tail - (u8*)r;
-                       n_i++;
-                       if (n_i >= TCA_ACT_MAX_PRIO) {
-                               goto done;
-                       }
-               }
-       }
-done:
-       read_unlock(&tcf_t_lock);
-       if (n_i)
-               cb->args[0] += n_i;
-       return n_i;
-
-rtattr_failure:
-       skb_trim(skb, (u8*)r - skb->data);
-       goto done;
-}
-
-static __inline__ int
-tcf_del_walker(struct sk_buff *skb, struct tc_action *a)
-{
-       struct tcf_st *p, *s_p;
-       struct rtattr *r ;
-       int i= 0, n_i = 0;
-
-       r = (struct rtattr*) skb->tail;
-       RTA_PUT(skb, a->order, 0, NULL);
-       RTA_PUT(skb, TCA_KIND, IFNAMSIZ, a->ops->kind);
-       for (i = 0; i < MY_TAB_SIZE; i++) {
-               p = tcf_ht[tcf_hash(i)];
-
-               while (p != NULL) {
-                       s_p = p->next;
-                       if (ACT_P_DELETED == tcf_hash_release(p, 0)) {
-                                module_put(a->ops->owner);
-                       }
-                       n_i++;
-                       p = s_p;
-               }
-       }
-       RTA_PUT(skb, TCA_FCNT, 4, &n_i);
-       r->rta_len = skb->tail - (u8*)r;
-
-       return n_i;
-rtattr_failure:
-       skb_trim(skb, (u8*)r - skb->data);
-       return -EINVAL;
-}
-
-static __inline__ int
-tcf_generic_walker(struct sk_buff *skb, struct netlink_callback *cb, int type,
-               struct tc_action *a)
-{
-               if (type == RTM_DELACTION) {
-                       return tcf_del_walker(skb,a);
-               } else if (type == RTM_GETACTION) {
-                       return tcf_dump_walker(skb,cb,a);
-               } else {
-                       printk("tcf_generic_walker: unknown action %d\n",type);
-                       return -EINVAL;
-               }
-}
-
-static __inline__ struct tcf_st *
-tcf_hash_lookup(u32 index)
-{
-       struct tcf_st *p;
-
-       read_lock(&tcf_t_lock);
-       for (p = tcf_ht[tcf_hash(index)]; p; p = p->next) {
-               if (p->index == index)
-                       break;
-       }
-       read_unlock(&tcf_t_lock);
-       return p;
-}
-
-static __inline__ u32
-tcf_hash_new_index(void)
-{
-       do {
-               if (++idx_gen == 0)
-                       idx_gen = 1;
-       } while (tcf_hash_lookup(idx_gen));
-
-       return idx_gen;
-}
-
-
-static inline int
-tcf_hash_search(struct tc_action *a, u32 index)
-{
-       struct tcf_st *p = tcf_hash_lookup(index);
-
-       if (p != NULL) {
-               a->priv = p;
-               return 1;
-       } else {
-               return 0;
-       }
-}
-
-#ifdef CONFIG_NET_ACT_INIT
-static inline struct tcf_st *
-tcf_hash_check(struct tc_st *parm, struct tc_action *a, int ovr, int bind)
-{
-       struct tcf_st *p = NULL;
-       if (parm->index && (p = tcf_hash_lookup(parm->index)) != NULL) {
-               spin_lock(&p->lock);
-               if (bind) {
-                       p->bindcnt++;
-                       p->refcnt++;
-               }
-               spin_unlock(&p->lock);
-               a->priv = (void *) p;
-       }
-       return p;
-}
-
-static inline struct tcf_st *
-tcf_hash_create(struct tc_st *parm, struct rtattr *est, struct tc_action *a, int size, int ovr, int bind)
-{
-       unsigned h;
-       struct tcf_st *p = NULL;
-
-       p = kmalloc(size, GFP_KERNEL);
-       if (p == NULL)
-               return p;
-
-       memset(p, 0, size);
-       p->refcnt = 1;
-
-       if (bind) {
-               p->bindcnt = 1;
-       }
-
-       spin_lock_init(&p->lock);
-       p->stats_lock = &p->lock;
-       p->index = parm->index ? : tcf_hash_new_index();
-       p->tm.install = jiffies;
-       p->tm.lastuse = jiffies;
-#ifdef CONFIG_NET_ESTIMATOR
-       if (est) {
-               qdisc_new_estimator(&p->stats, p->stats_lock, est);
-       }
-#endif
-       h = tcf_hash(p->index);
-       write_lock_bh(&tcf_t_lock);
-       p->next = tcf_ht[h];
-       tcf_ht[h] = p;
-       write_unlock_bh(&tcf_t_lock);
-
-       a->priv = (void *) p;
-       return p;
-}
-
-static inline struct tcf_st *
-tcf_hash_init(struct tc_st *parm, struct rtattr *est, struct tc_action *a, int size, int ovr, int bind)
-{
-       struct tcf_st *p;
-       p = tcf_hash_check (parm,a,ovr,bind);
-       if (NULL == p) {
-               return tcf_hash_create(parm, est, a, size, ovr, bind);
-       }
-}
-
-#endif
-
-#endif
diff --git a/kernel/module-verify.c b/kernel/module-verify.c
deleted file mode 100644 (file)
index 9dacc53..0000000
+++ /dev/null
@@ -1,127 +0,0 @@
-/* module-verify.c: description
- *
- * Written by David Howells (dhowells@redhat.com)
- * - Derived from GregKH's RSA module signer
- *
- * 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/module.h>
-#include <linux/slab.h>
-#include <linux/mm.h>
-#include <linux/vmalloc.h>
-#include <linux/elf.h>
-#include <linux/crypto.h>
-#include <linux/crypto/ksign.h>
-#include <asm/scatterlist.h>
-#include "module-verify.h"
-
-#if 0
-#define _debug(FMT, ...) printk(KERN_DEBUG FMT, ##__VA_ARGS__)
-#else
-#define _debug(FMT, ...) do { ; } while (0)
-#endif
-
-static int signedonly;
-
-/*****************************************************************************/
-/*
- * verify the signature attached to a module
- */
-int module_verify_sig(Elf_Ehdr *hdr, Elf_Shdr *sechdrs, const char *secstrings, struct module *mod)
-{
-       struct crypto_tfm *sha1_tfm;
-       unsigned sig_index, sig_size;
-       char *sig;
-       int i;
-
-       /* pull the signature out of the file */
-       sig_index = 0;
-       for (i = 1; i < hdr->e_shnum; i++) {
-               if (strcmp(secstrings + sechdrs[i].sh_name,
-                          "module_sig") == 0) {
-                       sig_index = i;
-                       break;
-               }
-       }
-
-       if (sig_index <= 0)
-               goto no_signature;
-
-       _debug("sig in section %d (size %d)\n",
-              sig_index, sechdrs[sig_index].sh_size);
-
-       sig = (char *) sechdrs[sig_index].sh_addr;
-       sig_size = sechdrs[sig_index].sh_size;
-
-       _debug("");
-
-
-
-
-       /* grab an SHA1 transformation context
-        * - !!! if this tries to load the sha1.ko module, we will deadlock!!!
-        */
-       sha1_tfm = crypto_alloc_tfm2("sha1", 0, 1);
-       if (!sha1_tfm) {
-               printk("Couldn't load module - SHA1 transform unavailable\n");
-               return -EPERM;
-       }
-
-       crypto_digest_init(sha1_tfm);
-
-       for (i = 1; i < hdr->e_shnum; i++) {
-               uint8_t *data;
-               int size;
-               const char *name = secstrings + sechdrs[i].sh_name;
-
-               /* We only care about sections with "text" or "data" in their names */
-               if ((strstr(name, "text") == NULL) &&
-                   (strstr(name, "data") == NULL))
-                       continue;
-
-               /* avoid the ".rel.*" sections too. */
-               if (strstr(name, ".rel.") != NULL)
-                       continue;
-
-               /* avoid the ".rel.*" sections too. */
-               if (strstr(name, ".rela.") != NULL)
-                       continue;
-
-               data = (uint8_t *) sechdrs[i].sh_addr;
-               size = sechdrs[i].sh_size;
-
-               _debug("SHA1ing the %s section, size %d\n", name, size);
-               _debug("idata [ %02x%02x%02x%02x ]\n",
-                      data[0], data[1], data[2], data[3]);
-
-               crypto_digest_update_kernel(sha1_tfm, data, size);
-       }
-
-       /* do the actual signature verification */
-       i = ksign_verify_signature(sig, sig_size, sha1_tfm);
-       if (!i)
-                mod->gpgsig_ok = 1;
-       
-       return i;
-
-       /* deal with the case of an unsigned module */
- no_signature:
-       if (!signedonly)
-               return 0;
-       printk("An attempt to load unsigned module was rejected\n");
-       return -EPERM;
-} /* end module_verify_sig() */
-
-static int __init sign_setup(char *str)
-{
-       signedonly = 1;
-       return 0;
-}
-__setup("enforcemodulesig", sign_setup);
-                        
diff --git a/kernel/module-verify.h b/kernel/module-verify.h
deleted file mode 100644 (file)
index 10efab8..0000000
+++ /dev/null
@@ -1,15 +0,0 @@
-/* module-verify.h: module verification definitions
- *
- * Copyright (C) 2004 Red Hat, Inc. All Rights Reserved.
- * Written by David Howells (dhowells@redhat.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.
- */
-
-#ifdef CONFIG_MODULE_SIG
-extern int module_verify_sig(Elf_Ehdr *hdr, Elf_Shdr *sechdrs,
-                            const char *secstrings, struct module *mod);
-#endif
diff --git a/kernel/power/smp.c b/kernel/power/smp.c
deleted file mode 100644 (file)
index cda77cd..0000000
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
- * drivers/power/smp.c - Functions for stopping other CPUs.
- *
- * Copyright 2004 Pavel Machek <pavel@suse.cz>
- * Copyright (C) 2002-2003 Nigel Cunningham <ncunningham@clear.net.nz>
- *
- * This file is released under the GPLv2.
- */
-
-#undef DEBUG
-
-#include <linux/smp_lock.h>
-#include <linux/interrupt.h>
-#include <linux/suspend.h>
-#include <linux/module.h>
-#include <asm/atomic.h>
-#include <asm/tlbflush.h>
-
-static atomic_t cpu_counter, freeze;
-
-
-static void smp_pause(void * data)
-{
-       struct saved_context ctxt;
-       __save_processor_state(&ctxt);
-       printk("Sleeping in:\n");
-       dump_stack();
-       atomic_inc(&cpu_counter);
-       while (atomic_read(&freeze)) {
-               /* FIXME: restore takes place at random piece inside this.
-                  This should probably be written in assembly, and
-                  preserve general-purpose registers, too
-
-                  What about stack? We may need to move to new stack here.
-
-                  This should better be ran with interrupts disabled.
-                */
-               cpu_relax();
-               barrier();
-       }
-       atomic_dec(&cpu_counter);
-       __restore_processor_state(&ctxt);
-}
-
-cpumask_t oldmask;
-
-void disable_nonboot_cpus(void)
-{
-       printk("Freezing CPUs (at %d)", smp_processor_id());
-       oldmask = current->cpus_allowed;
-       set_cpus_allowed(current, cpumask_of_cpu(0));
-       current->state = TASK_INTERRUPTIBLE;
-       schedule_timeout(HZ);
-       printk("...");
-       BUG_ON(smp_processor_id() != 0);
-
-       /* FIXME: for this to work, all the CPUs must be running
-        * "idle" thread (or we deadlock). Is that guaranteed? */
-
-       atomic_set(&cpu_counter, 0);
-       atomic_set(&freeze, 1);
-       smp_call_function(smp_pause, NULL, 0, 0);
-       while (atomic_read(&cpu_counter) < (num_online_cpus() - 1)) {
-               cpu_relax();
-               barrier();
-       }
-       printk("ok\n");
-}
-
-void enable_nonboot_cpus(void)
-{
-       printk("Restarting CPUs");
-       atomic_set(&freeze, 0);
-       while (atomic_read(&cpu_counter)) {
-               cpu_relax();
-               barrier();
-       }
-       printk("...");
-       set_cpus_allowed(current, oldmask);
-       schedule();
-       printk("ok\n");
-
-}
-
-
diff --git a/lib/crc-ccitt.c b/lib/crc-ccitt.c
deleted file mode 100644 (file)
index 115d149..0000000
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- *     linux/lib/crc-ccitt.c
- *
- *     This source code is licensed under the GNU General Public License,
- *     Version 2. See the file COPYING for more details.
- */
-
-#include <linux/types.h>
-#include <linux/module.h>
-#include <linux/crc-ccitt.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 crc_ccitt_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(crc_ccitt_table);
-
-/**
- *     crc_ccitt - recompute the CRC for the data buffer
- *     @crc - previous CRC value
- *     @buffer - data pointer
- *     @len - number of bytes in the buffer
- */
-u16 crc_ccitt(u16 crc, u8 const *buffer, size_t len)
-{
-       while (len--)
-               crc = crc_ccitt_byte(crc, *buffer++);
-       return crc;
-}
-EXPORT_SYMBOL(crc_ccitt);
-
-MODULE_DESCRIPTION("CRC-CCITT calculations");
-MODULE_LICENSE("GPL");
diff --git a/net/bluetooth/hidp/Kconfig b/net/bluetooth/hidp/Kconfig
deleted file mode 100644 (file)
index 4e958f7..0000000
+++ /dev/null
@@ -1,12 +0,0 @@
-config BT_HIDP
-       tristate "HIDP protocol support"
-       depends on BT && BT_L2CAP
-       select INPUT
-       help
-         HIDP (Human Interface Device Protocol) is a transport layer
-         for HID reports.  HIDP is required for the Bluetooth Human
-         Interface Device Profile.
-
-         Say Y here to compile HIDP support into the kernel or say M to
-         compile it as module (hidp).
-
diff --git a/net/bluetooth/hidp/Makefile b/net/bluetooth/hidp/Makefile
deleted file mode 100644 (file)
index a9ee115..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-#
-# Makefile for the Linux Bluetooth HIDP layer
-#
-
-obj-$(CONFIG_BT_HIDP) += hidp.o
-
-hidp-objs := core.o sock.o
diff --git a/net/bluetooth/hidp/core.c b/net/bluetooth/hidp/core.c
deleted file mode 100644 (file)
index 7e8e7ba..0000000
+++ /dev/null
@@ -1,649 +0,0 @@
-/* 
-   HIDP implementation for Linux Bluetooth stack (BlueZ).
-   Copyright (C) 2003-2004 Marcel Holtmann <marcel@holtmann.org>
-
-   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;
-
-   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-   OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-   FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS.
-   IN NO EVENT SHALL THE COPYRIGHT HOLDER(S) AND AUTHOR(S) BE LIABLE FOR ANY
-   CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES 
-   WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN 
-   ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF 
-   OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-   ALL LIABILITY, INCLUDING LIABILITY FOR INFRINGEMENT OF ANY PATENTS, 
-   COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS, RELATING TO USE OF THIS 
-   SOFTWARE IS DISCLAIMED.
-*/
-
-#include <linux/config.h>
-#include <linux/module.h>
-
-#include <linux/types.h>
-#include <linux/errno.h>
-#include <linux/kernel.h>
-#include <linux/major.h>
-#include <linux/sched.h>
-#include <linux/slab.h>
-#include <linux/poll.h>
-#include <linux/fcntl.h>
-#include <linux/skbuff.h>
-#include <linux/socket.h>
-#include <linux/ioctl.h>
-#include <linux/file.h>
-#include <linux/init.h>
-#include <net/sock.h>
-
-#include <linux/input.h>
-
-#include <net/bluetooth/bluetooth.h>
-#include <net/bluetooth/l2cap.h>
-
-#include "hidp.h"
-
-#ifndef CONFIG_BT_HIDP_DEBUG
-#undef  BT_DBG
-#define BT_DBG(D...)
-#endif
-
-#define VERSION "1.0"
-
-static DECLARE_RWSEM(hidp_session_sem);
-static LIST_HEAD(hidp_session_list);
-
-static unsigned char hidp_keycode[256] = {
-         0,  0,  0,  0, 30, 48, 46, 32, 18, 33, 34, 35, 23, 36, 37, 38,
-        50, 49, 24, 25, 16, 19, 31, 20, 22, 47, 17, 45, 21, 44,  2,  3,
-         4,  5,  6,  7,  8,  9, 10, 11, 28,  1, 14, 15, 57, 12, 13, 26,
-        27, 43, 43, 39, 40, 41, 51, 52, 53, 58, 59, 60, 61, 62, 63, 64,
-        65, 66, 67, 68, 87, 88, 99, 70,119,110,102,104,111,107,109,106,
-       105,108,103, 69, 98, 55, 74, 78, 96, 79, 80, 81, 75, 76, 77, 71,
-        72, 73, 82, 83, 86,127,116,117,183,184,185,186,187,188,189,190,
-       191,192,193,194,134,138,130,132,128,129,131,137,133,135,136,113,
-       115,114,  0,  0,  0,121,  0, 89, 93,124, 92, 94, 95,  0,  0,  0,
-       122,123, 90, 91, 85,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-         0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-         0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-         0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-         0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-        29, 42, 56,125, 97, 54,100,126,164,166,165,163,161,115,114,113,
-       150,158,159,128,136,177,178,176,142,152,173,140
-};
-
-static struct hidp_session *__hidp_get_session(bdaddr_t *bdaddr)
-{
-       struct hidp_session *session;
-       struct list_head *p;
-
-       BT_DBG("");
-
-       list_for_each(p, &hidp_session_list) {
-               session = list_entry(p, struct hidp_session, list);
-               if (!bacmp(bdaddr, &session->bdaddr))
-                       return session;
-       }
-       return NULL;
-}
-
-static void __hidp_link_session(struct hidp_session *session)
-{
-       __module_get(THIS_MODULE);
-       list_add(&session->list, &hidp_session_list);
-}
-
-static void __hidp_unlink_session(struct hidp_session *session)
-{
-       list_del(&session->list);
-       module_put(THIS_MODULE);
-}
-
-static void __hidp_copy_session(struct hidp_session *session, struct hidp_conninfo *ci)
-{
-       bacpy(&ci->bdaddr, &session->bdaddr);
-
-       ci->flags = session->flags;
-       ci->state = session->state;
-
-       ci->vendor  = 0x0000;
-       ci->product = 0x0000;
-       ci->version = 0x0000;
-       memset(ci->name, 0, 128);
-
-       if (session->input) {
-               ci->vendor  = session->input->id.vendor;
-               ci->product = session->input->id.product;
-               ci->version = session->input->id.version;
-               if (session->input->name)
-                       strncpy(ci->name, session->input->name, 128);
-               else
-                       strncpy(ci->name, "HID Boot Device", 128);
-       }
-}
-
-static int hidp_input_event(struct input_dev *dev, unsigned int type, unsigned int code, int value)
-{
-       struct hidp_session *session = dev->private;
-       struct sk_buff *skb;
-       unsigned char newleds;
-
-       BT_DBG("session %p hid %p data %p size %d", session, device, data, size);
-
-       if (type != EV_LED)
-               return -1;
-
-       newleds = (!!test_bit(LED_KANA,    dev->led) << 3) |
-                 (!!test_bit(LED_COMPOSE, dev->led) << 3) |
-                 (!!test_bit(LED_SCROLLL, dev->led) << 2) |
-                 (!!test_bit(LED_CAPSL,   dev->led) << 1) |
-                 (!!test_bit(LED_NUML,    dev->led));
-
-       if (session->leds == newleds)
-               return 0;
-
-       session->leds = newleds;
-
-       if (!(skb = alloc_skb(3, GFP_ATOMIC))) {
-               BT_ERR("Can't allocate memory for new frame");
-               return -ENOMEM;
-       }
-
-       *skb_put(skb, 1) = 0xa2;
-       *skb_put(skb, 1) = 0x01;
-       *skb_put(skb, 1) = newleds;
-
-       skb_queue_tail(&session->intr_transmit, skb);
-
-       hidp_schedule(session);
-
-       return 0;
-}
-
-static void hidp_input_report(struct hidp_session *session, struct sk_buff *skb)
-{
-       struct input_dev *dev = session->input;
-       unsigned char *keys = session->keys;
-       unsigned char *udata = skb->data + 1;
-       signed char *sdata = skb->data + 1;
-       int i, size = skb->len - 1;
-
-       switch (skb->data[0]) {
-       case 0x01:      /* Keyboard report */
-               for (i = 0; i < 8; i++)
-                       input_report_key(dev, hidp_keycode[i + 224], (udata[0] >> i) & 1);
-
-               for (i = 2; i < 8; i++) {
-                       if (keys[i] > 3 && memscan(udata + 2, keys[i], 6) == udata + 8) {
-                               if (hidp_keycode[keys[i]])
-                                       input_report_key(dev, hidp_keycode[keys[i]], 0);
-                               else
-                                       BT_ERR("Unknown key (scancode %#x) released.", keys[i]);
-                       }
-
-                       if (udata[i] > 3 && memscan(keys + 2, udata[i], 6) == keys + 8) {
-                               if (hidp_keycode[udata[i]])
-                                       input_report_key(dev, hidp_keycode[udata[i]], 1);
-                               else
-                                       BT_ERR("Unknown key (scancode %#x) pressed.", udata[i]);
-                       }
-               }
-
-               memcpy(keys, udata, 8);
-               break;
-
-       case 0x02:      /* Mouse report */
-               input_report_key(dev, BTN_LEFT,   sdata[0] & 0x01);
-               input_report_key(dev, BTN_RIGHT,  sdata[0] & 0x02);
-               input_report_key(dev, BTN_MIDDLE, sdata[0] & 0x04);
-               input_report_key(dev, BTN_SIDE,   sdata[0] & 0x08);
-               input_report_key(dev, BTN_EXTRA,  sdata[0] & 0x10);
-
-               input_report_rel(dev, REL_X, sdata[1]);
-               input_report_rel(dev, REL_Y, sdata[2]);
-
-               if (size > 3)
-                       input_report_rel(dev, REL_WHEEL, sdata[3]);
-               break;
-       }
-
-       input_sync(dev);
-}
-
-static void hidp_idle_timeout(unsigned long arg)
-{
-       struct hidp_session *session = (struct hidp_session *) arg;
-
-       atomic_inc(&session->terminate);
-       hidp_schedule(session);
-}
-
-static inline void hidp_set_timer(struct hidp_session *session)
-{
-       if (session->idle_to > 0)
-               mod_timer(&session->timer, jiffies + HZ * session->idle_to);
-}
-
-static inline void hidp_del_timer(struct hidp_session *session)
-{
-       if (session->idle_to > 0)
-               del_timer(&session->timer);
-}
-
-static inline void hidp_send_message(struct hidp_session *session, unsigned char hdr)
-{
-       struct sk_buff *skb;
-
-       BT_DBG("session %p", session);
-
-       if (!(skb = alloc_skb(1, GFP_ATOMIC))) {
-               BT_ERR("Can't allocate memory for message");
-               return;
-       }
-
-       *skb_put(skb, 1) = hdr;
-
-       skb_queue_tail(&session->ctrl_transmit, skb);
-
-       hidp_schedule(session);
-}
-
-static inline int hidp_recv_frame(struct hidp_session *session, struct sk_buff *skb)
-{
-       __u8 hdr;
-
-       BT_DBG("session %p skb %p len %d", session, skb, skb->len);
-
-       hdr = skb->data[0];
-       skb_pull(skb, 1);
-
-       if (hdr == 0xa1) {
-               hidp_set_timer(session);
-
-               if (session->input)
-                       hidp_input_report(session, skb);
-       } else {
-               BT_DBG("Unsupported protocol header 0x%02x", hdr);
-       }
-
-       kfree_skb(skb);
-       return 0;
-}
-
-static int hidp_send_frame(struct socket *sock, unsigned char *data, int len)
-{
-       struct iovec iv = { data, len };
-       struct msghdr msg;
-
-       BT_DBG("sock %p data %p len %d", sock, data, len);
-
-       if (!len)
-               return 0;
-
-       memset(&msg, 0, sizeof(msg));
-       msg.msg_iovlen = 1;
-       msg.msg_iov = &iv;
-
-       return sock_sendmsg(sock, &msg, len);
-}
-
-static int hidp_process_transmit(struct hidp_session *session)
-{
-       struct sk_buff *skb;
-
-       BT_DBG("session %p", session);
-
-       while ((skb = skb_dequeue(&session->ctrl_transmit))) {
-               if (hidp_send_frame(session->ctrl_sock, skb->data, skb->len) < 0) {
-                       skb_queue_head(&session->ctrl_transmit, skb);
-                       break;
-               }
-
-               hidp_set_timer(session);
-               kfree_skb(skb);
-       }
-
-       while ((skb = skb_dequeue(&session->intr_transmit))) {
-               if (hidp_send_frame(session->intr_sock, skb->data, skb->len) < 0) {
-                       skb_queue_head(&session->intr_transmit, skb);
-                       break;
-               }
-
-               hidp_set_timer(session);
-               kfree_skb(skb);
-       }
-
-       return skb_queue_len(&session->ctrl_transmit) +
-                               skb_queue_len(&session->intr_transmit);
-}
-
-static int hidp_session(void *arg)
-{
-       struct hidp_session *session = arg;
-       struct sock *ctrl_sk = session->ctrl_sock->sk;
-       struct sock *intr_sk = session->intr_sock->sk;
-       struct sk_buff *skb;
-       int vendor = 0x0000, product = 0x0000;
-       wait_queue_t ctrl_wait, intr_wait;
-       unsigned long timeo = HZ;
-
-       BT_DBG("session %p", session);
-
-       if (session->input) {
-               vendor  = session->input->id.vendor;
-               product = session->input->id.product;
-       }
-
-       daemonize("khidpd_%04x%04x", vendor, product);
-       set_user_nice(current, -15);
-       current->flags |= PF_NOFREEZE;
-
-       set_fs(KERNEL_DS);
-
-       init_waitqueue_entry(&ctrl_wait, current);
-       init_waitqueue_entry(&intr_wait, current);
-       add_wait_queue(ctrl_sk->sk_sleep, &ctrl_wait);
-       add_wait_queue(intr_sk->sk_sleep, &intr_wait);
-       while (!atomic_read(&session->terminate)) {
-               set_current_state(TASK_INTERRUPTIBLE);
-
-               if (ctrl_sk->sk_state != BT_CONNECTED || intr_sk->sk_state != BT_CONNECTED)
-                       break;
-
-               while ((skb = skb_dequeue(&ctrl_sk->sk_receive_queue))) {
-                       skb_orphan(skb);
-                       hidp_recv_frame(session, skb);
-               }
-
-               while ((skb = skb_dequeue(&intr_sk->sk_receive_queue))) {
-                       skb_orphan(skb);
-                       hidp_recv_frame(session, skb);
-               }
-
-               hidp_process_transmit(session);
-
-               schedule();
-       }
-       set_current_state(TASK_RUNNING);
-       remove_wait_queue(intr_sk->sk_sleep, &intr_wait);
-       remove_wait_queue(ctrl_sk->sk_sleep, &ctrl_wait);
-
-       down_write(&hidp_session_sem);
-
-       hidp_del_timer(session);
-
-       if (intr_sk->sk_state != BT_CONNECTED) {
-               init_waitqueue_entry(&ctrl_wait, current);
-               add_wait_queue(ctrl_sk->sk_sleep, &ctrl_wait);
-               while (timeo && ctrl_sk->sk_state != BT_CLOSED) {
-                       set_current_state(TASK_INTERRUPTIBLE);
-                       timeo = schedule_timeout(timeo);
-               }
-               set_current_state(TASK_RUNNING);
-               remove_wait_queue(ctrl_sk->sk_sleep, &ctrl_wait);
-               timeo = HZ;
-       }
-
-       fput(session->ctrl_sock->file);
-
-       init_waitqueue_entry(&intr_wait, current);
-       add_wait_queue(intr_sk->sk_sleep, &intr_wait);
-       while (timeo && intr_sk->sk_state != BT_CLOSED) {
-               set_current_state(TASK_INTERRUPTIBLE);
-               timeo = schedule_timeout(timeo);
-       }
-       set_current_state(TASK_RUNNING);
-       remove_wait_queue(intr_sk->sk_sleep, &intr_wait);
-
-       fput(session->intr_sock->file);
-
-       __hidp_unlink_session(session);
-
-       if (session->input) {
-               input_unregister_device(session->input);
-               kfree(session->input);
-       }
-
-       up_write(&hidp_session_sem);
-
-       kfree(session);
-       return 0;
-}
-
-static inline void hidp_setup_input(struct hidp_session *session, struct hidp_connadd_req *req)
-{
-       struct input_dev *input = session->input;
-       int i;
-
-       input->private = session;
-
-       input->id.bustype = BUS_BLUETOOTH;
-       input->id.vendor  = req->vendor;
-       input->id.product = req->product;
-       input->id.version = req->version;
-
-       if (req->subclass & 0x40) {
-               set_bit(EV_KEY, input->evbit);
-               set_bit(EV_LED, input->evbit);
-               set_bit(EV_REP, input->evbit);
-
-               set_bit(LED_NUML,    input->ledbit);
-               set_bit(LED_CAPSL,   input->ledbit);
-               set_bit(LED_SCROLLL, input->ledbit);
-               set_bit(LED_COMPOSE, input->ledbit);
-               set_bit(LED_KANA,    input->ledbit);
-
-               for (i = 0; i < sizeof(hidp_keycode); i++)
-                       set_bit(hidp_keycode[i], input->keybit);
-               clear_bit(0, input->keybit);
-       }
-
-       if (req->subclass & 0x80) {
-               input->evbit[0] = BIT(EV_KEY) | BIT(EV_REL);
-               input->keybit[LONG(BTN_MOUSE)] = BIT(BTN_LEFT) | BIT(BTN_RIGHT) | BIT(BTN_MIDDLE);
-               input->relbit[0] = BIT(REL_X) | BIT(REL_Y);
-               input->keybit[LONG(BTN_MOUSE)] |= BIT(BTN_SIDE) | BIT(BTN_EXTRA);
-               input->relbit[0] |= BIT(REL_WHEEL);
-       }
-
-       input->event = hidp_input_event;
-
-       input_register_device(input);
-}
-
-int hidp_add_connection(struct hidp_connadd_req *req, struct socket *ctrl_sock, struct socket *intr_sock)
-{
-       struct hidp_session *session, *s;
-       int err;
-
-       BT_DBG("");
-
-       if (bacmp(&bt_sk(ctrl_sock->sk)->src, &bt_sk(intr_sock->sk)->src) ||
-                       bacmp(&bt_sk(ctrl_sock->sk)->dst, &bt_sk(intr_sock->sk)->dst))
-               return -ENOTUNIQ;
-
-       session = kmalloc(sizeof(struct hidp_session), GFP_KERNEL);
-       if (!session) 
-               return -ENOMEM;
-       memset(session, 0, sizeof(struct hidp_session));
-
-       session->input = kmalloc(sizeof(struct input_dev), GFP_KERNEL);
-       if (!session->input) {
-               kfree(session);
-               return -ENOMEM;
-       }
-       memset(session->input, 0, sizeof(struct input_dev));
-
-       down_write(&hidp_session_sem);
-
-       s = __hidp_get_session(&bt_sk(ctrl_sock->sk)->dst);
-       if (s && s->state == BT_CONNECTED) {
-               err = -EEXIST;
-               goto failed;
-       }
-
-       bacpy(&session->bdaddr, &bt_sk(ctrl_sock->sk)->dst);
-
-       session->ctrl_mtu = min_t(uint, l2cap_pi(ctrl_sock->sk)->omtu, l2cap_pi(ctrl_sock->sk)->imtu);
-       session->intr_mtu = min_t(uint, l2cap_pi(intr_sock->sk)->omtu, l2cap_pi(intr_sock->sk)->imtu);
-
-       BT_DBG("ctrl mtu %d intr mtu %d", session->ctrl_mtu, session->intr_mtu);
-
-       session->ctrl_sock = ctrl_sock;
-       session->intr_sock = intr_sock;
-       session->state     = BT_CONNECTED;
-
-       init_timer(&session->timer);
-
-       session->timer.function = hidp_idle_timeout;
-       session->timer.data     = (unsigned long) session;
-
-       skb_queue_head_init(&session->ctrl_transmit);
-       skb_queue_head_init(&session->intr_transmit);
-
-       session->flags   = req->flags & (1 << HIDP_BLUETOOTH_VENDOR_ID);
-       session->idle_to = req->idle_to;
-
-       if (session->input)
-               hidp_setup_input(session, req);
-
-       __hidp_link_session(session);
-
-       hidp_set_timer(session);
-
-       err = kernel_thread(hidp_session, session, CLONE_KERNEL);
-       if (err < 0)
-               goto unlink;
-
-       if (session->input) {
-               hidp_send_message(session, 0x70);
-               session->flags |= (1 << HIDP_BOOT_PROTOCOL_MODE);
-
-               session->leds = 0xff;
-               hidp_input_event(session->input, EV_LED, 0, 0);
-       }
-
-       up_write(&hidp_session_sem);
-       return 0;
-
-unlink:
-       hidp_del_timer(session);
-
-       __hidp_unlink_session(session);
-
-       if (session->input)
-               input_unregister_device(session->input);
-
-failed:
-       up_write(&hidp_session_sem);
-
-       if (session->input)
-               kfree(session->input);
-
-       kfree(session);
-       return err;
-}
-
-int hidp_del_connection(struct hidp_conndel_req *req)
-{
-       struct hidp_session *session;
-       int err = 0;
-
-       BT_DBG("");
-
-       down_read(&hidp_session_sem);
-
-       session = __hidp_get_session(&req->bdaddr);
-       if (session) {
-               if (req->flags & (1 << HIDP_VIRTUAL_CABLE_UNPLUG)) {
-                       hidp_send_message(session, 0x15);
-               } else {
-                       /* Flush the transmit queues */
-                       skb_queue_purge(&session->ctrl_transmit);
-                       skb_queue_purge(&session->intr_transmit);
-
-                       /* Kill session thread */
-                       atomic_inc(&session->terminate);
-                       hidp_schedule(session);
-               }
-       } else
-               err = -ENOENT;
-
-       up_read(&hidp_session_sem);
-       return err;
-}
-
-int hidp_get_connlist(struct hidp_connlist_req *req)
-{
-       struct list_head *p;
-       int err = 0, n = 0;
-
-       BT_DBG("");
-
-       down_read(&hidp_session_sem);
-
-       list_for_each(p, &hidp_session_list) {
-               struct hidp_session *session;
-               struct hidp_conninfo ci;
-
-               session = list_entry(p, struct hidp_session, list);
-
-               __hidp_copy_session(session, &ci);
-
-               if (copy_to_user(req->ci, &ci, sizeof(ci))) {
-                       err = -EFAULT;
-                       break;
-               }
-
-               if (++n >= req->cnum)
-                       break;
-
-               req->ci++;
-       }
-       req->cnum = n;
-
-       up_read(&hidp_session_sem);
-       return err;
-}
-
-int hidp_get_conninfo(struct hidp_conninfo *ci)
-{
-       struct hidp_session *session;
-       int err = 0;
-
-       down_read(&hidp_session_sem);
-
-       session = __hidp_get_session(&ci->bdaddr);
-       if (session)
-               __hidp_copy_session(session, ci);
-       else
-               err = -ENOENT;
-
-       up_read(&hidp_session_sem);
-       return err;
-}
-
-static int __init hidp_init(void)
-{
-       l2cap_load();
-
-       BT_INFO("HIDP (Human Interface Emulation) ver %s", VERSION);
-
-       return hidp_init_sockets();
-}
-
-static void __exit hidp_exit(void)
-{
-       hidp_cleanup_sockets();
-}
-
-module_init(hidp_init);
-module_exit(hidp_exit);
-
-MODULE_AUTHOR("Marcel Holtmann <marcel@holtmann.org>");
-MODULE_DESCRIPTION("Bluetooth HIDP ver " VERSION);
-MODULE_VERSION(VERSION);
-MODULE_LICENSE("GPL");
-MODULE_ALIAS("bt-proto-6");
diff --git a/net/bluetooth/hidp/hidp.h b/net/bluetooth/hidp/hidp.h
deleted file mode 100644 (file)
index 98a742a..0000000
+++ /dev/null
@@ -1,122 +0,0 @@
-/* 
-   HIDP implementation for Linux Bluetooth stack (BlueZ).
-   Copyright (C) 2003-2004 Marcel Holtmann <marcel@holtmann.org>
-
-   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;
-
-   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-   OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-   FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS.
-   IN NO EVENT SHALL THE COPYRIGHT HOLDER(S) AND AUTHOR(S) BE LIABLE FOR ANY
-   CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES 
-   WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN 
-   ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF 
-   OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-   ALL LIABILITY, INCLUDING LIABILITY FOR INFRINGEMENT OF ANY PATENTS, 
-   COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS, RELATING TO USE OF THIS 
-   SOFTWARE IS DISCLAIMED.
-*/
-
-#ifndef __HIDP_H
-#define __HIDP_H
-
-#include <linux/types.h>
-#include <net/bluetooth/bluetooth.h>
-
-/* HIDP ioctl defines */
-#define HIDPCONNADD    _IOW('H', 200, int)
-#define HIDPCONNDEL    _IOW('H', 201, int)
-#define HIDPGETCONNLIST        _IOR('H', 210, int)
-#define HIDPGETCONNINFO        _IOR('H', 211, int)
-
-#define HIDP_VIRTUAL_CABLE_UNPLUG      0
-#define HIDP_BOOT_PROTOCOL_MODE                1
-#define HIDP_BLUETOOTH_VENDOR_ID       9
-
-struct hidp_connadd_req {
-       int   ctrl_sock;        // Connected control socket
-       int   intr_sock;        // Connteted interrupt socket
-       __u16 parser;
-       __u16 rd_size;
-       __u8 *rd_data;
-       __u8  country;
-       __u8  subclass;
-       __u16 vendor;
-       __u16 product;
-       __u16 version;
-       __u32 flags;
-       __u32 idle_to;
-       char  name[128];
-};
-
-struct hidp_conndel_req {
-       bdaddr_t bdaddr;
-       __u32    flags;
-};
-
-struct hidp_conninfo {
-       bdaddr_t bdaddr;
-       __u32    flags;
-       __u16    state;
-       __u16    vendor;
-       __u16    product;
-       __u16    version;
-       char     name[128];
-};
-
-struct hidp_connlist_req {
-       __u32  cnum;
-       struct hidp_conninfo __user *ci;
-};
-
-int hidp_add_connection(struct hidp_connadd_req *req, struct socket *ctrl_sock, struct socket *intr_sock);
-int hidp_del_connection(struct hidp_conndel_req *req);
-int hidp_get_connlist(struct hidp_connlist_req *req);
-int hidp_get_conninfo(struct hidp_conninfo *ci);
-
-/* HIDP session defines */
-struct hidp_session {
-       struct list_head list;
-
-       struct socket *ctrl_sock;
-       struct socket *intr_sock;
-
-       bdaddr_t bdaddr;
-
-       unsigned long state;
-       unsigned long flags;
-       unsigned long idle_to;
-
-       uint ctrl_mtu;
-       uint intr_mtu;
-
-       atomic_t terminate;
-
-       unsigned char keys[8];
-       unsigned char leds;
-
-       struct input_dev *input;
-
-       struct timer_list timer;
-
-       struct sk_buff_head ctrl_transmit;
-       struct sk_buff_head intr_transmit;
-};
-
-static inline void hidp_schedule(struct hidp_session *session)
-{
-       struct sock *ctrl_sk = session->ctrl_sock->sk;
-       struct sock *intr_sk = session->intr_sock->sk;
-
-       wake_up_interruptible(ctrl_sk->sk_sleep);
-       wake_up_interruptible(intr_sk->sk_sleep);
-}
-
-/* HIDP init defines */
-extern int __init hidp_init_sockets(void);
-extern void __exit hidp_cleanup_sockets(void);
-
-#endif /* __HIDP_H */
diff --git a/net/bluetooth/hidp/sock.c b/net/bluetooth/hidp/sock.c
deleted file mode 100644 (file)
index 315f435..0000000
+++ /dev/null
@@ -1,212 +0,0 @@
-/* 
-   HIDP implementation for Linux Bluetooth stack (BlueZ).
-   Copyright (C) 2003-2004 Marcel Holtmann <marcel@holtmann.org>
-
-   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;
-
-   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-   OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-   FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS.
-   IN NO EVENT SHALL THE COPYRIGHT HOLDER(S) AND AUTHOR(S) BE LIABLE FOR ANY
-   CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES 
-   WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN 
-   ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF 
-   OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-   ALL LIABILITY, INCLUDING LIABILITY FOR INFRINGEMENT OF ANY PATENTS, 
-   COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS, RELATING TO USE OF THIS 
-   SOFTWARE IS DISCLAIMED.
-*/
-
-#include <linux/config.h>
-#include <linux/module.h>
-
-#include <linux/types.h>
-#include <linux/errno.h>
-#include <linux/kernel.h>
-#include <linux/major.h>
-#include <linux/sched.h>
-#include <linux/slab.h>
-#include <linux/poll.h>
-#include <linux/fcntl.h>
-#include <linux/skbuff.h>
-#include <linux/socket.h>
-#include <linux/ioctl.h>
-#include <linux/file.h>
-#include <linux/init.h>
-#include <net/sock.h>
-
-#include "hidp.h"
-
-#ifndef CONFIG_BT_HIDP_DEBUG
-#undef  BT_DBG
-#define BT_DBG(D...)
-#endif
-
-static int hidp_sock_release(struct socket *sock)
-{
-       struct sock *sk = sock->sk;
-
-       BT_DBG("sock %p sk %p", sock, sk);
-
-       if (!sk)
-               return 0;
-
-       sock_orphan(sk);
-       sock_put(sk);
-
-       return 0;
-}
-
-static int hidp_sock_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg)
-{
-       void __user *argp = (void __user *) arg;
-       struct hidp_connadd_req ca;
-       struct hidp_conndel_req cd;
-       struct hidp_connlist_req cl;
-       struct hidp_conninfo ci;
-       struct socket *csock;
-       struct socket *isock;
-       int err;
-
-       BT_DBG("cmd %x arg %lx", cmd, arg);
-
-       switch (cmd) {
-       case HIDPCONNADD:
-               if (!capable(CAP_NET_ADMIN))
-                       return -EACCES;
-
-               if (copy_from_user(&ca, argp, sizeof(ca)))
-                       return -EFAULT;
-
-               csock = sockfd_lookup(ca.ctrl_sock, &err);
-               if (!csock)
-                       return err;
-
-               isock = sockfd_lookup(ca.intr_sock, &err);
-               if (!isock) {
-                       fput(csock->file);
-                       return err;
-               }
-
-               if (csock->sk->sk_state != BT_CONNECTED || isock->sk->sk_state != BT_CONNECTED) {
-                       fput(csock->file);
-                       fput(isock->file);
-                       return -EBADFD;
-               }
-
-               err = hidp_add_connection(&ca, csock, isock);
-               if (!err) {
-                       if (copy_to_user(argp, &ca, sizeof(ca)))
-                               err = -EFAULT;
-               } else {
-                       fput(csock->file);
-                       fput(isock->file);
-               }
-
-               return err;
-
-       case HIDPCONNDEL:
-               if (!capable(CAP_NET_ADMIN))
-                       return -EACCES;
-
-               if (copy_from_user(&cd, argp, sizeof(cd)))
-                       return -EFAULT;
-
-               return hidp_del_connection(&cd);
-
-       case HIDPGETCONNLIST:
-               if (copy_from_user(&cl, argp, sizeof(cl)))
-                       return -EFAULT;
-
-               if (cl.cnum <= 0)
-                       return -EINVAL;
-
-               err = hidp_get_connlist(&cl);
-               if (!err && copy_to_user(argp, &cl, sizeof(cl)))
-                       return -EFAULT;
-
-               return err;
-
-       case HIDPGETCONNINFO:
-               if (copy_from_user(&ci, argp, sizeof(ci)))
-                       return -EFAULT;
-
-               err = hidp_get_conninfo(&ci);
-               if (!err && copy_to_user(argp, &ci, sizeof(ci)))
-                       return -EFAULT;
-
-               return err;
-       }
-
-       return -EINVAL;
-}
-
-static struct proto_ops hidp_sock_ops = {
-       .family         = PF_BLUETOOTH,
-       .owner          = THIS_MODULE,
-       .release        = hidp_sock_release,
-       .ioctl          = hidp_sock_ioctl,
-       .bind           = sock_no_bind,
-       .getname        = sock_no_getname,
-       .sendmsg        = sock_no_sendmsg,
-       .recvmsg        = sock_no_recvmsg,
-       .poll           = sock_no_poll,
-       .listen         = sock_no_listen,
-       .shutdown       = sock_no_shutdown,
-       .setsockopt     = sock_no_setsockopt,
-       .getsockopt     = sock_no_getsockopt,
-       .connect        = sock_no_connect,
-       .socketpair     = sock_no_socketpair,
-       .accept         = sock_no_accept,
-       .mmap           = sock_no_mmap
-};
-
-static int hidp_sock_create(struct socket *sock, int protocol)
-{
-       struct sock *sk;
-
-       BT_DBG("sock %p", sock);
-
-       if (sock->type != SOCK_RAW)
-               return -ESOCKTNOSUPPORT;
-
-       if (!(sk = bt_sock_alloc(sock, PF_BLUETOOTH, 0, GFP_KERNEL)))
-               return -ENOMEM;
-
-       sk_set_owner(sk, THIS_MODULE);
-
-       sock->ops = &hidp_sock_ops;
-
-       sock->state = SS_UNCONNECTED;
-
-       sk->sk_destruct = NULL;
-       sk->sk_protocol = protocol;
-
-       return 0;
-}
-
-static struct net_proto_family hidp_sock_family_ops = {
-       .family = PF_BLUETOOTH,
-       .owner  = THIS_MODULE,
-       .create = hidp_sock_create
-};
-
-int __init hidp_init_sockets(void)
-{
-       int err;
-
-       err = bt_sock_register(BTPROTO_HIDP, &hidp_sock_family_ops);
-       if (err < 0)
-               BT_ERR("Can't register HIDP socket");
-
-       return err;
-}
-
-void __exit hidp_cleanup_sockets(void)
-{
-       if (bt_sock_unregister(BTPROTO_HIDP) < 0)
-               BT_ERR("Can't unregister HIDP socket");
-}
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/ipv4/netfilter/ipt_addrtype.c b/net/ipv4/netfilter/ipt_addrtype.c
deleted file mode 100644 (file)
index f5909a4..0000000
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
- *  iptables module to match inet_addr_type() of an ip.
- *
- *  Copyright (c) 2004 Patrick McHardy <kaber@trash.net>
- *
- *  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/skbuff.h>
-#include <linux/netdevice.h>
-#include <linux/ip.h>
-#include <net/route.h>
-
-#include <linux/netfilter_ipv4/ipt_addrtype.h>
-#include <linux/netfilter_ipv4/ip_tables.h>
-
-MODULE_LICENSE("GPL");
-MODULE_AUTHOR("Patrick McHardy <kaber@trash.net>");
-MODULE_DESCRIPTION("iptables addrtype match");
-
-static inline int match_type(u_int32_t addr, u_int16_t mask)
-{
-       return !!(mask & (1 << inet_addr_type(addr)));
-}
-
-static int match(const struct sk_buff *skb, const struct net_device *in,
-                const struct net_device *out, const void *matchinfo,
-                int offset, int *hotdrop)
-{
-       const struct ipt_addrtype_info *info = matchinfo;
-       const struct iphdr *iph = skb->nh.iph;
-       int ret = 1;
-
-       if (info->source)
-               ret &= match_type(iph->saddr, info->source)^info->invert_source;
-       if (info->dest)
-               ret &= match_type(iph->daddr, info->dest)^info->invert_dest;
-       
-       return ret;
-}
-
-static int checkentry(const char *tablename, const struct ipt_ip *ip,
-                     void *matchinfo, unsigned int matchsize,
-                     unsigned int hook_mask)
-{
-       if (matchsize != IPT_ALIGN(sizeof(struct ipt_addrtype_info))) {
-               printk(KERN_ERR "ipt_addrtype: invalid size (%u != %Zu)\n.",
-                      matchsize, IPT_ALIGN(sizeof(struct ipt_addrtype_info)));
-               return 0;
-       }
-
-       return 1;
-}
-
-static struct ipt_match addrtype_match = {
-       .name           = "addrtype",
-       .match          = match,
-       .checkentry     = checkentry,
-       .me             = THIS_MODULE
-};
-
-static int __init init(void)
-{
-       return ipt_register_match(&addrtype_match);
-}
-
-static void __exit fini(void)
-{
-       ipt_unregister_match(&addrtype_match);
-}
-
-module_init(init);
-module_exit(fini);
diff --git a/net/ipv4/netfilter/ipt_realm.c b/net/ipv4/netfilter/ipt_realm.c
deleted file mode 100644 (file)
index 54a6897..0000000
+++ /dev/null
@@ -1,76 +0,0 @@
-/* IP tables module for matching the routing realm
- *
- * $Id: ipt_realm.c,v 1.3 2004/03/05 13:25:40 laforge Exp $
- *
- * (C) 2003 by Sampsa Ranta <sampsa@netsonic.fi>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- */
-
-#include <linux/module.h>
-#include <linux/skbuff.h>
-#include <linux/netdevice.h>
-#include <net/route.h>
-
-#include <linux/netfilter_ipv4/ipt_realm.h>
-#include <linux/netfilter_ipv4/ip_tables.h>
-
-MODULE_AUTHOR("Sampsa Ranta <sampsa@netsonic.fi>");
-MODULE_LICENSE("GPL");
-MODULE_DESCRIPTION("iptables realm match");
-
-static int
-match(const struct sk_buff *skb,
-      const struct net_device *in,
-      const struct net_device *out,
-      const void *matchinfo,
-      int offset,
-      int *hotdrop)
-{
-       const struct ipt_realm_info *info = matchinfo;
-       struct dst_entry *dst = skb->dst;
-    
-       return (info->id == (dst->tclassid & info->mask)) ^ info->invert;
-}
-
-static int check(const char *tablename,
-                 const struct ipt_ip *ip,
-                 void *matchinfo,
-                 unsigned int matchsize,
-                 unsigned int hook_mask)
-{
-       if (hook_mask
-           & ~((1 << NF_IP_POST_ROUTING) | (1 << NF_IP_FORWARD) |
-               (1 << NF_IP_LOCAL_OUT) | (1 << NF_IP_LOCAL_IN))) {
-               printk("ipt_realm: only valid for POST_ROUTING, LOCAL_OUT, "
-                      "LOCAL_IN or FORWARD.\n");
-               return 0;
-       }
-       if (matchsize != IPT_ALIGN(sizeof(struct ipt_realm_info))) {
-               printk("ipt_realm: invalid matchsize.\n");
-               return 0;
-       }
-       return 1;
-}
-
-static struct ipt_match realm_match = {
-       .name           = "realm",
-       .match          = match, 
-       .checkentry     = check,
-       .me             = THIS_MODULE
-};
-
-static int __init init(void)
-{
-       return ipt_register_match(&realm_match);
-}
-
-static void __exit fini(void)
-{
-       ipt_unregister_match(&realm_match);
-}
-
-module_init(init);
-module_exit(fini);
diff --git a/net/ipv4/xfrm4_output.c b/net/ipv4/xfrm4_output.c
deleted file mode 100644 (file)
index f65ec86..0000000
+++ /dev/null
@@ -1,120 +0,0 @@
-/*
- * xfrm4_output.c - Common IPsec encapsulation code for IPv4.
- * 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 <net/inet_ecn.h>
-#include <net/ip.h>
-#include <net/xfrm.h>
-
-/* Add encapsulation header.
- *
- * In transport mode, the IP header 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:
- *     tot_len
- *     check
- *
- * On exit, skb->h will be set to the start of the payload to be processed
- * by x->type->output and skb->nh will be set to the top IP header.
- */
-static void xfrm4_encap(struct sk_buff *skb)
-{
-       struct dst_entry *dst = skb->dst;
-       struct xfrm_state *x = dst->xfrm;
-       struct iphdr *iph, *top_iph;
-
-       iph = skb->nh.iph;
-       skb->h.ipiph = iph;
-
-       skb->nh.raw = skb_push(skb, x->props.header_len);
-       top_iph = skb->nh.iph;
-
-       if (!x->props.mode) {
-               skb->h.raw += iph->ihl*4;
-               memmove(top_iph, iph, iph->ihl*4);
-               return;
-       }
-
-       top_iph->ihl = 5;
-       top_iph->version = 4;
-
-       /* DS disclosed */
-       top_iph->tos = INET_ECN_encapsulate(iph->tos, iph->tos);
-       if (x->props.flags & XFRM_STATE_NOECN)
-               IP_ECN_clear(top_iph);
-
-       top_iph->frag_off = iph->frag_off & htons(IP_DF);
-       if (!top_iph->frag_off)
-               __ip_select_ident(top_iph, dst, 0);
-
-       /* TTL disclosed */
-       top_iph->ttl = iph->ttl;
-
-       top_iph->saddr = x->props.saddr.a4;
-       top_iph->daddr = x->id.daddr.a4;
-       top_iph->protocol = IPPROTO_IPIP;
-
-       memset(&(IPCB(skb)->opt), 0, sizeof(struct ip_options));
-}
-
-int xfrm4_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 = xfrm4_tunnel_check_size(skb);
-               if (err)
-                       goto error;
-       }
-
-       xfrm4_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);
-       
-       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/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/ipv6/xfrm6_tunnel.c b/net/ipv6/xfrm6_tunnel.c
deleted file mode 100644 (file)
index f5a0654..0000000
+++ /dev/null
@@ -1,634 +0,0 @@
-/*
- * Copyright (C)2003,2004 USAGI/WIDE Project
- *
- * 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
- *
- * Authors     Mitsuru KANDA  <mk@linux-ipv6.org>
- *             YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
- *
- * Based on net/ipv4/xfrm4_tunnel.c
- *
- */
-#include <linux/config.h>
-#include <linux/module.h>
-#include <linux/xfrm.h>
-#include <linux/list.h>
-#include <net/ip.h>
-#include <net/xfrm.h>
-#include <net/icmp.h>
-#include <net/ipv6.h>
-#include <linux/ipv6.h>
-#include <linux/icmpv6.h>
-
-#ifdef CONFIG_IPV6_XFRM6_TUNNEL_DEBUG
-# define X6TDEBUG      3
-#else
-# define X6TDEBUG      1
-#endif
-
-#define X6TPRINTK(fmt, args...)                printk(fmt, ## args)
-#define X6TNOPRINTK(fmt, args...)      do { ; } while(0)
-
-#if X6TDEBUG >= 1
-# define X6TPRINTK1    X6TPRINTK
-#else
-# define X6TPRINTK1    X6TNOPRINTK
-#endif
-
-#if X6TDEBUG >= 3
-# define X6TPRINTK3    X6TPRINTK
-#else
-# define X6TPRINTK3    X6TNOPRINTK
-#endif
-
-/*
- * xfrm_tunnel_spi things are for allocating unique id ("spi") 
- * per xfrm_address_t.
- */
-struct xfrm6_tunnel_spi {
-       struct hlist_node list_byaddr;
-       struct hlist_node list_byspi;
-       xfrm_address_t addr;
-       u32 spi;
-       atomic_t refcnt;
-#ifdef XFRM6_TUNNEL_SPI_MAGIC
-       u32 magic;
-#endif
-};
-
-#ifdef CONFIG_IPV6_XFRM6_TUNNEL_DEBUG
-# define XFRM6_TUNNEL_SPI_MAGIC 0xdeadbeef
-#endif
-
-static rwlock_t xfrm6_tunnel_spi_lock = RW_LOCK_UNLOCKED;
-
-static u32 xfrm6_tunnel_spi;
-
-#define XFRM6_TUNNEL_SPI_MIN   1
-#define XFRM6_TUNNEL_SPI_MAX   0xffffffff
-
-static kmem_cache_t *xfrm6_tunnel_spi_kmem;
-
-#define XFRM6_TUNNEL_SPI_BYADDR_HSIZE 256
-#define XFRM6_TUNNEL_SPI_BYSPI_HSIZE 256
-
-static struct hlist_head xfrm6_tunnel_spi_byaddr[XFRM6_TUNNEL_SPI_BYADDR_HSIZE];
-static struct hlist_head xfrm6_tunnel_spi_byspi[XFRM6_TUNNEL_SPI_BYSPI_HSIZE];
-
-#ifdef XFRM6_TUNNEL_SPI_MAGIC
-static int x6spi_check_magic(const struct xfrm6_tunnel_spi *x6spi,
-                            const char *name)
-{
-       if (unlikely(x6spi->magic != XFRM6_TUNNEL_SPI_MAGIC)) {
-               X6TPRINTK3(KERN_DEBUG "%s(): x6spi object "
-                                     "at %p has corrupted magic %08x "
-                                     "(should be %08x)\n",
-                          name, x6spi, x6spi->magic, XFRM6_TUNNEL_SPI_MAGIC);
-               return -1;
-       }
-       return 0;
-}
-#else
-static int inline x6spi_check_magic(const struct xfrm6_tunnel_spi *x6spi,
-                                   const char *name)
-{
-       return 0;
-}
-#endif
-
-#define X6SPI_CHECK_MAGIC(x6spi) x6spi_check_magic((x6spi), __FUNCTION__)
-
-
-static unsigned inline xfrm6_tunnel_spi_hash_byaddr(xfrm_address_t *addr)
-{
-       unsigned h;
-
-       X6TPRINTK3(KERN_DEBUG "%s(addr=%p)\n", __FUNCTION__, addr);
-
-       h = addr->a6[0] ^ addr->a6[1] ^ addr->a6[2] ^ addr->a6[3];
-       h ^= h >> 16;
-       h ^= h >> 8;
-       h &= XFRM6_TUNNEL_SPI_BYADDR_HSIZE - 1;
-
-       X6TPRINTK3(KERN_DEBUG "%s() = %u\n", __FUNCTION__, h);
-
-       return h;
-}
-
-static unsigned inline xfrm6_tunnel_spi_hash_byspi(u32 spi)
-{
-       return spi % XFRM6_TUNNEL_SPI_BYSPI_HSIZE;
-}
-
-
-static int xfrm6_tunnel_spi_init(void)
-{
-       int i;
-
-       X6TPRINTK3(KERN_DEBUG "%s()\n", __FUNCTION__);
-
-       xfrm6_tunnel_spi = 0;
-       xfrm6_tunnel_spi_kmem = kmem_cache_create("xfrm6_tunnel_spi",
-                                                 sizeof(struct xfrm6_tunnel_spi),
-                                                 0, SLAB_HWCACHE_ALIGN,
-                                                 NULL, NULL);
-       if (!xfrm6_tunnel_spi_kmem) {
-               X6TPRINTK1(KERN_ERR
-                          "%s(): failed to allocate xfrm6_tunnel_spi_kmem\n",
-                          __FUNCTION__);
-               return -ENOMEM;
-       }
-
-       for (i = 0; i < XFRM6_TUNNEL_SPI_BYADDR_HSIZE; i++)
-               INIT_HLIST_HEAD(&xfrm6_tunnel_spi_byaddr[i]);
-       for (i = 0; i < XFRM6_TUNNEL_SPI_BYSPI_HSIZE; i++)
-               INIT_HLIST_HEAD(&xfrm6_tunnel_spi_byspi[i]);
-       return 0;
-}
-
-static void xfrm6_tunnel_spi_fini(void)
-{
-       int i;
-
-       X6TPRINTK3(KERN_DEBUG "%s()\n", __FUNCTION__);
-
-       for (i = 0; i < XFRM6_TUNNEL_SPI_BYADDR_HSIZE; i++) {
-               if (!hlist_empty(&xfrm6_tunnel_spi_byaddr[i]))
-                       goto err;
-       }
-       for (i = 0; i < XFRM6_TUNNEL_SPI_BYSPI_HSIZE; i++) {
-               if (!hlist_empty(&xfrm6_tunnel_spi_byspi[i]))
-                       goto err;
-       }
-       kmem_cache_destroy(xfrm6_tunnel_spi_kmem);
-       xfrm6_tunnel_spi_kmem = NULL;
-       return;
-err:
-       X6TPRINTK1(KERN_ERR "%s(): table is not empty\n", __FUNCTION__);
-       return;
-}
-
-static struct xfrm6_tunnel_spi *__xfrm6_tunnel_spi_lookup(xfrm_address_t *saddr)
-{
-       struct xfrm6_tunnel_spi *x6spi;
-       struct hlist_node *pos;
-
-       X6TPRINTK3(KERN_DEBUG "%s(saddr=%p)\n", __FUNCTION__, saddr);
-
-       hlist_for_each_entry(x6spi, pos,
-                            &xfrm6_tunnel_spi_byaddr[xfrm6_tunnel_spi_hash_byaddr(saddr)],
-                            list_byaddr) {
-               if (memcmp(&x6spi->addr, saddr, sizeof(x6spi->addr)) == 0) {
-                       X6SPI_CHECK_MAGIC(x6spi);
-                       X6TPRINTK3(KERN_DEBUG "%s() = %p(%u)\n", __FUNCTION__, x6spi, x6spi->spi);
-                       return x6spi;
-               }
-       }
-
-       X6TPRINTK3(KERN_DEBUG "%s() = NULL(0)\n", __FUNCTION__);
-       return NULL;
-}
-
-u32 xfrm6_tunnel_spi_lookup(xfrm_address_t *saddr)
-{
-       struct xfrm6_tunnel_spi *x6spi;
-       u32 spi;
-
-       X6TPRINTK3(KERN_DEBUG "%s(saddr=%p)\n", __FUNCTION__, saddr);
-
-       read_lock_bh(&xfrm6_tunnel_spi_lock);
-       x6spi = __xfrm6_tunnel_spi_lookup(saddr);
-       spi = x6spi ? x6spi->spi : 0;
-       read_unlock_bh(&xfrm6_tunnel_spi_lock);
-       return spi;
-}
-
-EXPORT_SYMBOL(xfrm6_tunnel_spi_lookup);
-
-static u32 __xfrm6_tunnel_alloc_spi(xfrm_address_t *saddr)
-{
-       u32 spi;
-       struct xfrm6_tunnel_spi *x6spi;
-       struct hlist_node *pos;
-       unsigned index;
-
-       X6TPRINTK3(KERN_DEBUG "%s(saddr=%p)\n", __FUNCTION__, saddr);
-
-       if (xfrm6_tunnel_spi < XFRM6_TUNNEL_SPI_MIN ||
-           xfrm6_tunnel_spi >= XFRM6_TUNNEL_SPI_MAX)
-               xfrm6_tunnel_spi = XFRM6_TUNNEL_SPI_MIN;
-       else
-               xfrm6_tunnel_spi++;
-
-       for (spi = xfrm6_tunnel_spi; spi <= XFRM6_TUNNEL_SPI_MAX; spi++) {
-               index = xfrm6_tunnel_spi_hash_byspi(spi);
-               hlist_for_each_entry(x6spi, pos, 
-                                    &xfrm6_tunnel_spi_byspi[index], 
-                                    list_byspi) {
-                       if (x6spi->spi == spi)
-                               goto try_next_1;
-               }
-               xfrm6_tunnel_spi = spi;
-               goto alloc_spi;
-try_next_1:;
-       }
-       for (spi = XFRM6_TUNNEL_SPI_MIN; spi < xfrm6_tunnel_spi; spi++) {
-               index = xfrm6_tunnel_spi_hash_byspi(spi);
-               hlist_for_each_entry(x6spi, pos, 
-                                    &xfrm6_tunnel_spi_byspi[index], 
-                                    list_byspi) {
-                       if (x6spi->spi == spi)
-                               goto try_next_2;
-               }
-               xfrm6_tunnel_spi = spi;
-               goto alloc_spi;
-try_next_2:;
-       }
-       spi = 0;
-       goto out;
-alloc_spi:
-       X6TPRINTK3(KERN_DEBUG "%s(): allocate new spi for "
-                             "%04x:%04x:%04x:%04x:%04x:%04x:%04x:%04x\n", 
-                             __FUNCTION__, 
-                             NIP6(*(struct in6_addr *)saddr));
-       x6spi = kmem_cache_alloc(xfrm6_tunnel_spi_kmem, SLAB_ATOMIC);
-       if (!x6spi) {
-               X6TPRINTK1(KERN_ERR "%s(): kmem_cache_alloc() failed\n", 
-                          __FUNCTION__);
-               goto out;
-       }
-#ifdef XFRM6_TUNNEL_SPI_MAGIC
-       x6spi->magic = XFRM6_TUNNEL_SPI_MAGIC;
-#endif
-       memcpy(&x6spi->addr, saddr, sizeof(x6spi->addr));
-       x6spi->spi = spi;
-       atomic_set(&x6spi->refcnt, 1);
-
-       hlist_add_head(&x6spi->list_byspi, &xfrm6_tunnel_spi_byspi[index]);
-
-       index = xfrm6_tunnel_spi_hash_byaddr(saddr);
-       hlist_add_head(&x6spi->list_byaddr, &xfrm6_tunnel_spi_byaddr[index]);
-       X6SPI_CHECK_MAGIC(x6spi);
-out:
-       X6TPRINTK3(KERN_DEBUG "%s() = %u\n", __FUNCTION__, spi);
-       return spi;
-}
-
-u32 xfrm6_tunnel_alloc_spi(xfrm_address_t *saddr)
-{
-       struct xfrm6_tunnel_spi *x6spi;
-       u32 spi;
-
-       X6TPRINTK3(KERN_DEBUG "%s(saddr=%p)\n", __FUNCTION__, saddr);
-
-       write_lock_bh(&xfrm6_tunnel_spi_lock);
-       x6spi = __xfrm6_tunnel_spi_lookup(saddr);
-       if (x6spi) {
-               atomic_inc(&x6spi->refcnt);
-               spi = x6spi->spi;
-       } else
-               spi = __xfrm6_tunnel_alloc_spi(saddr);
-       write_unlock_bh(&xfrm6_tunnel_spi_lock);
-
-       X6TPRINTK3(KERN_DEBUG "%s() = %u\n", __FUNCTION__, spi);
-
-       return spi;
-}
-
-EXPORT_SYMBOL(xfrm6_tunnel_alloc_spi);
-
-void xfrm6_tunnel_free_spi(xfrm_address_t *saddr)
-{
-       struct xfrm6_tunnel_spi *x6spi;
-       struct hlist_node *pos, *n;
-
-       X6TPRINTK3(KERN_DEBUG "%s(saddr=%p)\n", __FUNCTION__, saddr);
-
-       write_lock_bh(&xfrm6_tunnel_spi_lock);
-
-       hlist_for_each_entry_safe(x6spi, pos, n, 
-                                 &xfrm6_tunnel_spi_byaddr[xfrm6_tunnel_spi_hash_byaddr(saddr)],
-                                 list_byaddr)
-       {
-               if (memcmp(&x6spi->addr, saddr, sizeof(x6spi->addr)) == 0) {
-                       X6TPRINTK3(KERN_DEBUG "%s(): x6spi object "
-                                             "for %04x:%04x:%04x:%04x:%04x:%04x:%04x:%04x "
-                                             "found at %p\n",
-                                  __FUNCTION__, 
-                                  NIP6(*(struct in6_addr *)saddr),
-                                  x6spi);
-                       X6SPI_CHECK_MAGIC(x6spi);
-                       if (atomic_dec_and_test(&x6spi->refcnt)) {
-                               hlist_del(&x6spi->list_byaddr);
-                               hlist_del(&x6spi->list_byspi);
-                               kmem_cache_free(xfrm6_tunnel_spi_kmem, x6spi);
-                               break;
-                       }
-               }
-       }
-       write_unlock_bh(&xfrm6_tunnel_spi_lock);
-}
-
-EXPORT_SYMBOL(xfrm6_tunnel_free_spi);
-
-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;
-}
-
-EXPORT_SYMBOL(xfrm6_tunnel_check_size);
-
-static int xfrm6_tunnel_output(struct sk_buff **pskb)
-{
-       struct sk_buff *skb = *pskb;
-       struct dst_entry *dst = skb->dst;
-       struct xfrm_state *x = dst->xfrm;
-       struct ipv6hdr *iph, *top_iph;
-       int err;
-
-       if ((err = xfrm6_tunnel_check_size(skb)) != 0)
-               goto error_nolock;
-
-       iph = skb->nh.ipv6h;
-
-       top_iph = (struct ipv6hdr *)skb_push(skb, x->props.header_len);
-       top_iph->version = 6;
-       top_iph->priority = iph->priority;
-       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->payload_len = htons(skb->len - sizeof(struct ipv6hdr));
-       top_iph->hop_limit = iph->hop_limit;
-       memcpy(&top_iph->saddr, (struct in6_addr *)&x->props.saddr, sizeof(struct in6_addr));
-       memcpy(&top_iph->daddr, (struct in6_addr *)&x->id.daddr, sizeof(struct in6_addr));
-       skb->nh.raw = skb->data;
-       skb->h.raw = skb->nh.raw + sizeof(struct ipv6hdr);
-
-       x->curlft.bytes += skb->len;
-       x->curlft.packets++;
-
-       spin_unlock_bh(&x->lock);
-
-       if ((skb->dst = dst_pop(dst)) == NULL) { 
-               kfree_skb(skb);
-               err = -EHOSTUNREACH;
-               goto error_nolock;
-       }
-
-       return NET_XMIT_BYPASS;
-
-error_nolock:
-       kfree_skb(skb);
-       return err;
-}
-
-static int xfrm6_tunnel_input(struct xfrm_state *x, struct xfrm_decap_state *decap, struct sk_buff *skb)
-{
-       if (!pskb_may_pull(skb, sizeof(struct ipv6hdr))) 
-               return -EINVAL;
-
-       skb->mac.raw = skb->nh.raw;
-       skb->nh.raw = skb->data;
-       dst_release(skb->dst);
-       skb->dst = NULL;
-       skb->protocol = htons(ETH_P_IPV6);
-       skb->pkt_type = PACKET_HOST;
-       netif_rx(skb);
-
-       return 0;
-}
-
-static struct xfrm6_tunnel *xfrm6_tunnel_handler;
-static DECLARE_MUTEX(xfrm6_tunnel_sem);
-
-int xfrm6_tunnel_register(struct xfrm6_tunnel *handler)
-{
-       int ret;
-
-       down(&xfrm6_tunnel_sem);
-       ret = 0;
-       if (xfrm6_tunnel_handler != NULL)
-               ret = -EINVAL;
-       if (!ret)
-               xfrm6_tunnel_handler = handler;
-       up(&xfrm6_tunnel_sem);
-
-       return ret;
-}
-
-EXPORT_SYMBOL(xfrm6_tunnel_register);
-
-int xfrm6_tunnel_deregister(struct xfrm6_tunnel *handler)
-{
-       int ret;
-
-       down(&xfrm6_tunnel_sem);
-       ret = 0;
-       if (xfrm6_tunnel_handler != handler)
-               ret = -EINVAL;
-       if (!ret)
-               xfrm6_tunnel_handler = NULL;
-       up(&xfrm6_tunnel_sem);
-
-       synchronize_net();
-
-       return ret;
-}
-
-EXPORT_SYMBOL(xfrm6_tunnel_deregister);
-
-static int xfrm6_tunnel_rcv(struct sk_buff **pskb, unsigned int *nhoffp)
-{
-       struct sk_buff *skb = *pskb;
-       struct xfrm6_tunnel *handler = xfrm6_tunnel_handler;
-       struct xfrm_state *x = NULL;
-       struct ipv6hdr *iph = skb->nh.ipv6h;
-       int err = 0;
-       u32 spi;
-
-       /* device-like_ip6ip6_handler() */
-       if (handler) {
-               err = handler->handler(pskb, nhoffp);
-               if (!err)
-                       goto out;
-       }
-
-       spi = xfrm6_tunnel_spi_lookup((xfrm_address_t *)&iph->saddr);
-       x = xfrm_state_lookup((xfrm_address_t *)&iph->daddr, 
-                       spi,
-                       IPPROTO_IPV6, AF_INET6);
-
-       if (!x)
-               goto drop;
-
-       spin_lock(&x->lock);
-
-       if (unlikely(x->km.state != XFRM_STATE_VALID))
-               goto drop_unlock;
-
-       err = xfrm6_tunnel_input(x, NULL, skb);
-       if (err)
-               goto drop_unlock;
-
-       x->curlft.bytes += skb->len;
-       x->curlft.packets++; 
-       spin_unlock(&x->lock); 
-       xfrm_state_put(x); 
-
-out:
-       return 0;
-
-drop_unlock:
-       spin_unlock(&x->lock);
-       xfrm_state_put(x);
-drop:
-       kfree_skb(skb);
-       return -1;
-}
-
-static void xfrm6_tunnel_err(struct sk_buff *skb, struct inet6_skb_parm *opt,
-                            int type, int code, int offset, __u32 info)
-{
-       struct xfrm6_tunnel *handler = xfrm6_tunnel_handler;
-
-       /* call here first for device-like ip6ip6 err handling */
-       if (handler) {
-               handler->err_handler(skb, opt, type, code, offset, info);
-               return;
-       }
-
-       /* xfrm6_tunnel native err handling */
-       switch (type) {
-       case ICMPV6_DEST_UNREACH: 
-               switch (code) {
-               case ICMPV6_NOROUTE: 
-               case ICMPV6_ADM_PROHIBITED:
-               case ICMPV6_NOT_NEIGHBOUR:
-               case ICMPV6_ADDR_UNREACH:
-               case ICMPV6_PORT_UNREACH:
-               default:
-                       X6TPRINTK3(KERN_DEBUG
-                                  "xfrm6_tunnel: Destination Unreach.\n");
-                       break;
-               }
-               break;
-       case ICMPV6_PKT_TOOBIG:
-                       X6TPRINTK3(KERN_DEBUG 
-                                  "xfrm6_tunnel: Packet Too Big.\n");
-               break;
-       case ICMPV6_TIME_EXCEED:
-               switch (code) {
-               case ICMPV6_EXC_HOPLIMIT:
-                       X6TPRINTK3(KERN_DEBUG
-                                  "xfrm6_tunnel: Too small Hoplimit.\n");
-                       break;
-               case ICMPV6_EXC_FRAGTIME:
-               default: 
-                       break;
-               }
-               break;
-       case ICMPV6_PARAMPROB:
-               switch (code) {
-               case ICMPV6_HDR_FIELD: break;
-               case ICMPV6_UNK_NEXTHDR: break;
-               case ICMPV6_UNK_OPTION: break;
-               }
-               break;
-       default:
-               break;
-       }
-       return;
-}
-
-static int xfrm6_tunnel_init_state(struct xfrm_state *x, void *args)
-{
-       if (!x->props.mode)
-               return -EINVAL;
-
-       x->props.header_len = sizeof(struct ipv6hdr);
-
-       return 0;
-}
-
-static void xfrm6_tunnel_destroy(struct xfrm_state *x)
-{
-       xfrm6_tunnel_free_spi((xfrm_address_t *)&x->props.saddr);
-}
-
-static struct xfrm_type xfrm6_tunnel_type = {
-       .description    = "IP6IP6",
-       .owner          = THIS_MODULE,
-       .proto          = IPPROTO_IPV6,
-       .init_state     = xfrm6_tunnel_init_state,
-       .destructor     = xfrm6_tunnel_destroy,
-       .input          = xfrm6_tunnel_input,
-       .output         = xfrm6_tunnel_output,
-};
-
-static struct inet6_protocol xfrm6_tunnel_protocol = {
-       .handler        = xfrm6_tunnel_rcv,
-       .err_handler    = xfrm6_tunnel_err, 
-       .flags          = INET6_PROTO_NOPOLICY|INET6_PROTO_FINAL,
-};
-
-void __init xfrm6_tunnel_init(void)
-{
-       X6TPRINTK3(KERN_DEBUG "%s()\n", __FUNCTION__);
-
-       if (xfrm_register_type(&xfrm6_tunnel_type, AF_INET6) < 0) {
-               X6TPRINTK1(KERN_ERR
-                          "xfrm6_tunnel init: can't add xfrm type\n");
-               return;
-       }
-       if (inet6_add_protocol(&xfrm6_tunnel_protocol, IPPROTO_IPV6) < 0) {
-               X6TPRINTK1(KERN_ERR
-                          "xfrm6_tunnel init(): can't add protocol\n");
-               xfrm_unregister_type(&xfrm6_tunnel_type, AF_INET6);
-               return;
-       }
-       if (xfrm6_tunnel_spi_init() < 0) {
-               X6TPRINTK1(KERN_ERR
-                          "xfrm6_tunnel init: failed to initialize spi\n");
-               inet6_del_protocol(&xfrm6_tunnel_protocol, IPPROTO_IPV6);
-               xfrm_unregister_type(&xfrm6_tunnel_type, AF_INET6);
-               return;
-       }
-}
-
-void __exit xfrm6_tunnel_fini(void)
-{
-       X6TPRINTK3(KERN_DEBUG "%s()\n", __FUNCTION__);
-
-       xfrm6_tunnel_spi_fini();
-       if (inet6_del_protocol(&xfrm6_tunnel_protocol, IPPROTO_IPV6) < 0)
-               X6TPRINTK1(KERN_ERR 
-                          "xfrm6_tunnel close: can't remove protocol\n");
-       if (xfrm_unregister_type(&xfrm6_tunnel_type, AF_INET6) < 0)
-               X6TPRINTK1(KERN_ERR
-                          "xfrm6_tunnel close: can't remove xfrm type\n");
-}
diff --git a/net/sched/act_api.c b/net/sched/act_api.c
deleted file mode 100644 (file)
index 58d37d6..0000000
+++ /dev/null
@@ -1,1017 +0,0 @@
-/*
- * net/sched/act_api.c Packet action API.
- *
- *             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.
- *
- * Author:     Jamal Hadi Salim
- *
- *
- */
-
-#include <asm/uaccess.h>
-#include <asm/system.h>
-#include <asm/bitops.h>
-#include <linux/config.h>
-#include <linux/types.h>
-#include <linux/kernel.h>
-#include <linux/sched.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/netdevice.h>
-#include <linux/skbuff.h>
-#include <linux/rtnetlink.h>
-#include <linux/init.h>
-#include <linux/kmod.h>
-#include <net/sock.h>
-#include <net/pkt_sched.h>
-
-#if 1 /* control */
-#define DPRINTK(format,args...) printk(KERN_DEBUG format,##args)
-#else
-#define DPRINTK(format,args...)
-#endif
-#if 0 /* data */
-#define D2PRINTK(format,args...) printk(KERN_DEBUG format,##args)
-#else
-#define D2PRINTK(format,args...)
-#endif
-
-static struct tc_action_ops *act_base = NULL;
-static rwlock_t act_mod_lock = RW_LOCK_UNLOCKED;
-
-int tcf_register_action(struct tc_action_ops *act)
-{
-       struct tc_action_ops *a, **ap;
-
-       write_lock(&act_mod_lock);
-       for (ap = &act_base; (a=*ap)!=NULL; ap = &a->next) {
-               if (act->type == a->type || (strcmp(act->kind, a->kind) == 0)) {
-                       write_unlock(&act_mod_lock);
-                       return -EEXIST;
-               }
-       }
-
-        act->next = NULL;
-       *ap = act;
-
-       write_unlock(&act_mod_lock);
-
-       return 0;
-}
-
-int tcf_unregister_action(struct tc_action_ops *act)
-{
-       struct tc_action_ops *a, **ap;
-       int err = -ENOENT;
-
-       write_lock(&act_mod_lock);
-       for (ap = &act_base; (a=*ap)!=NULL; ap = &a->next) 
-               if(a == act)
-                       break;
-
-       if (a) {
-               *ap = a->next;
-               a->next = NULL;
-               err = 0;
-       }
-       write_unlock(&act_mod_lock);
-       return err;
-}
-
-/* lookup by name */
-struct tc_action_ops *tc_lookup_action_n(char *kind)
-{
-
-       struct tc_action_ops *a = NULL;
-
-       if (kind) {
-               read_lock(&act_mod_lock);
-               for (a = act_base; a; a = a->next) {
-                       if (strcmp(kind,a->kind) == 0) {
-                               if (!try_module_get(a->owner)) {
-                                       read_unlock(&act_mod_lock);
-                                       return NULL;
-                               } 
-                               break;
-                       }
-               }
-               read_unlock(&act_mod_lock);
-       }
-
-       return a;
-}
-
-/* lookup by rtattr */
-struct tc_action_ops *tc_lookup_action(struct rtattr *kind)
-{
-
-       struct tc_action_ops *a = NULL;
-
-       if (kind) {
-               read_lock(&act_mod_lock);
-               for (a = act_base; a; a = a->next) {
-
-                       if (strcmp((char*)RTA_DATA(kind),a->kind) == 0){
-                               if (!try_module_get(a->owner)) {
-                                       read_unlock(&act_mod_lock);
-                                       return NULL;
-                               } 
-                               break;
-                       }
-               }
-               read_unlock(&act_mod_lock);
-       }
-
-       return a;
-}
-
-/* lookup by id */
-struct tc_action_ops *tc_lookup_action_id(u32 type)
-{
-       struct tc_action_ops *a = NULL;
-
-       if (type) {
-               read_lock(&act_mod_lock);
-               for (a = act_base; a; a = a->next) {
-                       if (a->type == type) {
-                               if (!try_module_get(a->owner)) {
-                                       read_unlock(&act_mod_lock);
-                                       return NULL;
-                               } 
-                               break;
-                       }
-               }
-               read_unlock(&act_mod_lock);
-       }
-
-       return a;
-}
-
-int tcf_action_exec(struct sk_buff *skb,struct tc_action *act)
-{
-
-       struct tc_action *a;
-       int ret = -1; 
-
-       if (skb->tc_verd & TC_NCLS) {
-               skb->tc_verd = CLR_TC_NCLS(skb->tc_verd);
-               D2PRINTK("(%p)tcf_action_exec: cleared TC_NCLS in %s out %s\n",skb,skb->input_dev?skb->input_dev->name:"xxx",skb->dev->name);
-               return TC_ACT_OK;
-       }
-       while ((a = act) != NULL) {
-repeat:
-               if (a->ops && a->ops->act) {
-                       ret = a->ops->act(&skb,a);
-                               if (TC_MUNGED & skb->tc_verd) {
-                                       /* copied already, allow trampling */
-                                       skb->tc_verd = SET_TC_OK2MUNGE(skb->tc_verd);
-                                       skb->tc_verd = CLR_TC_MUNGED(skb->tc_verd);
-                               }
-
-                       if (ret != TC_ACT_PIPE)
-                               goto exec_done;
-                       if (ret == TC_ACT_REPEAT)
-                               goto repeat;    /* we need a ttl - JHS */
-
-               }
-               act = a->next;
-       }
-
-exec_done:
-
-       return ret;
-}
-
-void tcf_action_destroy(struct tc_action *act, int bind)
-{
-       struct tc_action *a;
-
-       for (a = act; act; a = act) {
-               if (a && a->ops && a->ops->cleanup) {
-                       DPRINTK("tcf_action_destroy destroying %p next %p\n", a,a->next?a->next:NULL);
-                       act = act->next;
-                       if (ACT_P_DELETED == a->ops->cleanup(a, bind)) {
-                               module_put(a->ops->owner);
-                       }
-                       
-                       a->ops = NULL;  
-                       kfree(a);
-               } else { /*FIXME: Remove later - catch insertion bugs*/
-                       printk("tcf_action_destroy: BUG? destroying NULL ops \n");
-                       if (a) {
-                               act = act->next;
-                               kfree(a);
-                       } else {
-                               printk("tcf_action_destroy: BUG? destroying NULL action! \n");
-                               break;
-                       }
-               }
-       }
-}
-
-int tcf_action_dump_old(struct sk_buff *skb, struct tc_action *a, int bind, int ref)
-{
-       int err = -EINVAL;
-
-
-       if ( (NULL == a) || (NULL == a->ops)
-          || (NULL == a->ops->dump) )
-               return err;
-       return a->ops->dump(skb, a, bind, ref);
-
-}
-
-
-int tcf_action_dump_1(struct sk_buff *skb, struct tc_action *a, int bind, int ref)
-{
-       int err = -EINVAL;
-       unsigned char    *b = skb->tail;
-       struct rtattr *r;
-
-
-       if ( (NULL == a) || (NULL == a->ops)
-          || (NULL == a->ops->dump) || (NULL == a->ops->kind))
-               return err;
-
-
-       RTA_PUT(skb, TCA_KIND, IFNAMSIZ, a->ops->kind);
-       if (tcf_action_copy_stats(skb,a))
-               goto rtattr_failure;
-       r = (struct rtattr*) skb->tail;
-       RTA_PUT(skb, TCA_OPTIONS, 0, NULL);
-       if ((err = tcf_action_dump_old(skb, a, bind, ref)) > 0) {
-               r->rta_len = skb->tail - (u8*)r;
-               return err;
-       }
-
-
-rtattr_failure:
-       skb_trim(skb, b - skb->data);
-       return -1;
-
-}
-
-int tcf_action_dump(struct sk_buff *skb, struct tc_action *act, int bind, int ref)
-{
-       struct tc_action *a;
-       int err = -EINVAL;
-       unsigned char    *b = skb->tail;
-       struct rtattr *r ;
-
-       while ((a = act) != NULL) {
-               r = (struct rtattr*) skb->tail;
-               act = a->next;
-               RTA_PUT(skb, a->order, 0, NULL);
-               err = tcf_action_dump_1(skb, a, bind, ref);
-               if (0 > err) 
-                       goto rtattr_failure;
-
-               r->rta_len = skb->tail - (u8*)r;
-       }
-
-       return 0;
-
-rtattr_failure:
-       skb_trim(skb, b - skb->data);
-       return -err;
-       
-}
-
-int tcf_action_init_1(struct rtattr *rta, struct rtattr *est, struct tc_action *a, char *name, int ovr, int bind )
-{
-       struct tc_action_ops *a_o;
-       char act_name[4 + IFNAMSIZ + 1];
-       struct rtattr *tb[TCA_ACT_MAX+1];
-       struct rtattr *kind = NULL;
-
-       int err = -EINVAL;
-
-       if (NULL == name) {
-               if (rtattr_parse(tb, TCA_ACT_MAX, RTA_DATA(rta), RTA_PAYLOAD(rta))<0)
-                       goto err_out;
-               kind = tb[TCA_ACT_KIND-1];
-               if (NULL != kind) {
-                       sprintf(act_name, "%s", (char*)RTA_DATA(kind));
-                       if (RTA_PAYLOAD(kind) >= IFNAMSIZ) {
-                               printk(" Action %s bad\n", (char*)RTA_DATA(kind));
-                               goto err_out;
-                       }
-
-               } else {
-                       printk("Action bad kind\n");
-                       goto err_out;
-               }
-               a_o = tc_lookup_action(kind);
-       } else {
-               sprintf(act_name, "%s", name);
-               DPRINTK("tcf_action_init_1: finding  %s\n",act_name);
-               a_o = tc_lookup_action_n(name);
-       }
-#ifdef CONFIG_KMOD
-       if (NULL == a_o) {
-               DPRINTK("tcf_action_init_1: trying to load module %s\n",act_name);
-               request_module (act_name);
-               a_o = tc_lookup_action_n(act_name);
-       }
-
-#endif
-       if (NULL == a_o) {
-               printk("failed to find %s\n",act_name);
-               goto err_out;
-       }
-
-       if (NULL == a) {
-               goto err_mod;
-       }
-
-       /* backward compatibility for policer */
-       if (NULL == name) {
-               err = a_o->init(tb[TCA_ACT_OPTIONS-1], est, a, ovr, bind);
-               if (0 > err ) {
-                       err = -EINVAL;
-                       goto err_mod;
-               }
-       } else {
-               err = a_o->init(rta, est, a, ovr, bind);
-               if (0 > err ) {
-                       err = -EINVAL;
-                       goto err_mod;
-               }
-       }
-
-       /* module count goes up only when brand new policy is created
-          if it exists and is only bound to in a_o->init() then
-           ACT_P_CREATED is not returned (a zero is).
-        */
-       if (ACT_P_CREATED != err) {
-               module_put(a_o->owner);
-       } 
-       a->ops = a_o;
-       DPRINTK("tcf_action_init_1: successfull %s \n",act_name);
-
-       return 0;
-err_mod:
-       module_put(a_o->owner);
-err_out:
-       return err;
-}
-
-int tcf_action_init(struct rtattr *rta, struct rtattr *est, struct tc_action *a, char *name, int ovr , int bind)
-{
-       struct rtattr *tb[TCA_ACT_MAX_PRIO+1];
-       int i;
-       struct tc_action *act = a, *a_s = a;
-
-       int err = -EINVAL;
-
-       if (rtattr_parse(tb, TCA_ACT_MAX_PRIO, RTA_DATA(rta), RTA_PAYLOAD(rta))<0)
-               return err;
-
-       for (i=0; i < TCA_ACT_MAX_PRIO ; i++) {
-               if (tb[i]) {
-                       if (NULL == act) {
-                               act = kmalloc(sizeof(*act),GFP_KERNEL);
-                               if (NULL == act) {
-                                       err = -ENOMEM;
-                                       goto bad_ret;
-                               }
-                               memset(act, 0,sizeof(*act));
-                       }
-                       act->next = NULL;
-                       if (0 > tcf_action_init_1(tb[i],est,act,name,ovr,bind)) {
-                               printk("Error processing action order %d\n",i);
-                               return err;
-                       }
-
-                       act->order = i+1;
-                       if (a_s != act) {
-                               a_s->next = act;
-                               a_s = act;
-                       }
-                       act = NULL;
-               }
-
-       }
-
-       return 0;
-bad_ret:
-       tcf_action_destroy(a, bind);
-       return err;
-}
-
-int tcf_action_copy_stats (struct sk_buff *skb,struct tc_action *a)
-{
-#ifdef CONFIG_KMOD
-       /* place holder */
-#endif
-
-       if (NULL == a->ops || NULL == a->ops->get_stats)
-               return 1;
-
-       return a->ops->get_stats(skb,a);
-}
-
-
-static int
-tca_get_fill(struct sk_buff *skb,  struct tc_action *a,
-             u32 pid, u32 seq, unsigned flags, int event, int bind, int ref)
-{
-       struct tcamsg *t;
-       struct nlmsghdr  *nlh;
-       unsigned char    *b = skb->tail;
-       struct rtattr *x;
-
-       nlh = NLMSG_PUT(skb, pid, seq, event, sizeof(*t));
-       nlh->nlmsg_flags = flags;
-       t = NLMSG_DATA(nlh);
-       t->tca_family = AF_UNSPEC;
-       
-       x = (struct rtattr*) skb->tail;
-       RTA_PUT(skb, TCA_ACT_TAB, 0, NULL);
-
-       if (0 > tcf_action_dump(skb, a, bind, ref)) {
-               goto rtattr_failure;
-       }
-
-       x->rta_len = skb->tail - (u8*)x;
-       
-       nlh->nlmsg_len = skb->tail - b;
-       return skb->len;
-
-rtattr_failure:
-nlmsg_failure:
-       skb_trim(skb, b - skb->data);
-       return -1;
-}
-
-static int act_get_notify(u32 pid, struct nlmsghdr *n,
-                          struct tc_action *a, int event)
-{
-       struct sk_buff *skb;
-
-       int err = 0;
-
-       skb = alloc_skb(NLMSG_GOODSIZE, GFP_KERNEL);
-       if (!skb)
-               return -ENOBUFS;
-
-       if (tca_get_fill(skb, a,  pid, n->nlmsg_seq, 0, event, 0, 0) <= 0) {
-               kfree_skb(skb);
-               return -EINVAL;
-       }
-
-       err =  netlink_unicast(rtnl,skb, pid, MSG_DONTWAIT);
-       if (err > 0)
-               err = 0;
-       return err;
-}
-
-int tcf_action_get_1(struct rtattr *rta, struct tc_action *a, struct nlmsghdr *n, u32 pid)
-{
-       struct tc_action_ops *a_o;
-       char act_name[4 + IFNAMSIZ + 1];
-       struct rtattr *tb[TCA_ACT_MAX+1];
-       struct rtattr *kind = NULL;
-       int index;
-
-       int err = -EINVAL;
-
-       if (rtattr_parse(tb, TCA_ACT_MAX, RTA_DATA(rta), RTA_PAYLOAD(rta))<0)
-               goto err_out;
-
-
-       kind = tb[TCA_ACT_KIND-1];
-       if (NULL != kind) {
-               sprintf(act_name, "%s", (char*)RTA_DATA(kind));
-               if (RTA_PAYLOAD(kind) >= IFNAMSIZ) {
-                       printk("tcf_action_get_1: action %s bad\n", (char*)RTA_DATA(kind));
-                       goto err_out;
-               }
-
-       } else {
-               printk("tcf_action_get_1: action bad kind\n");
-               goto err_out;
-       }
-
-       if (tb[TCA_ACT_INDEX - 1]) {
-               index = *(int *)RTA_DATA(tb[TCA_ACT_INDEX - 1]);
-       } else {
-               printk("tcf_action_get_1: index not received\n");
-               goto err_out;
-       }
-
-       a_o = tc_lookup_action(kind);
-#ifdef CONFIG_KMOD
-       if (NULL == a_o) {
-               request_module (act_name);
-               a_o = tc_lookup_action_n(act_name);
-       }
-
-#endif
-       if (NULL == a_o) {
-               printk("failed to find %s\n",act_name);
-               goto err_out;
-       }
-
-       if (NULL == a) {
-               goto err_mod;
-       }
-
-       a->ops = a_o;
-
-       if (NULL == a_o->lookup || 0 == a_o->lookup(a, index)) {
-               a->ops = NULL;
-               err = -EINVAL;
-               goto err_mod;
-       }
-
-       module_put(a_o->owner);
-       return 0;
-err_mod:
-       module_put(a_o->owner);
-err_out:
-       return err;
-}
-
-void cleanup_a (struct tc_action *act) 
-{
-       struct tc_action *a;
-
-       for (a = act; act; a = act) {
-               if (a) {
-                       act = act->next;
-                       a->ops = NULL;
-                       a->priv = NULL;
-                       kfree(a);
-               } else {
-                       printk("cleanup_a: BUG? empty action\n");
-               }
-       }
-}
-
-struct tc_action_ops *get_ao(struct rtattr *kind, struct tc_action *a)
-{
-       char act_name[4 + IFNAMSIZ + 1];
-       struct tc_action_ops *a_o = NULL;
-
-       if (NULL != kind) {
-               sprintf(act_name, "%s", (char*)RTA_DATA(kind));
-               if (RTA_PAYLOAD(kind) >= IFNAMSIZ) {
-                       printk("get_ao: action %s bad\n", (char*)RTA_DATA(kind));
-                       return NULL;
-               }
-
-       } else {
-               printk("get_ao: action bad kind\n");
-               return NULL;
-       }
-
-       a_o = tc_lookup_action(kind);
-#ifdef CONFIG_KMOD
-       if (NULL == a_o) {
-               DPRINTK("get_ao: trying to load module %s\n",act_name);
-               request_module (act_name);
-               a_o = tc_lookup_action_n(act_name);
-       }
-#endif
-
-       if (NULL == a_o) {
-               printk("get_ao: failed to find %s\n",act_name);
-               return NULL;
-       }
-
-       a->ops = a_o;
-       return a_o;
-}
-
-struct tc_action *create_a(int i)
-{
-       struct tc_action *act = NULL;
-
-       act = kmalloc(sizeof(*act),GFP_KERNEL);
-       if (NULL == act) { /* grrr .. */
-               printk("create_a: failed to alloc! \n");
-               return NULL;
-       }
-
-       memset(act, 0,sizeof(*act));
-
-       act->order = i;
-
-       return act;
-}
-
-int tca_action_flush(struct rtattr *rta, struct nlmsghdr *n, u32 pid)
-{
-       struct sk_buff *skb;
-       unsigned char *b;
-       struct nlmsghdr *nlh;
-       struct tcamsg *t;
-       struct netlink_callback dcb;
-       struct rtattr *x;
-       struct rtattr *tb[TCA_ACT_MAX+1];
-       struct rtattr *kind = NULL;
-       struct tc_action *a = create_a(0);
-       int err = -EINVAL;
-
-       if (NULL == a) {
-               printk("tca_action_flush: couldnt create tc_action\n");
-               return err;
-       }
-
-       skb = alloc_skb(NLMSG_GOODSIZE, GFP_KERNEL);
-       if (!skb) {
-               printk("tca_action_flush: failed skb alloc\n");
-               kfree(a);
-               return -ENOBUFS;
-       }
-
-       b = (unsigned char *)skb->tail;
-
-       if (rtattr_parse(tb, TCA_ACT_MAX, RTA_DATA(rta), RTA_PAYLOAD(rta))<0) {
-               goto err_out;
-       }
-
-       kind = tb[TCA_ACT_KIND-1];
-       if (NULL == get_ao(kind, a)) {
-               goto err_out;
-       }
-
-       nlh = NLMSG_PUT(skb, pid,  n->nlmsg_seq, RTM_DELACTION, sizeof (*t));
-       t = NLMSG_DATA(nlh);
-       t->tca_family = AF_UNSPEC;
-
-       x = (struct rtattr *) skb->tail;
-       RTA_PUT(skb, TCA_ACT_TAB, 0, NULL);
-
-       err = a->ops->walk(skb, &dcb, RTM_DELACTION, a);
-       if (0 > err ) {
-               goto rtattr_failure;
-       }
-
-       x->rta_len = skb->tail - (u8 *) x;
-
-       nlh->nlmsg_len = skb->tail - b;
-       nlh->nlmsg_flags |= NLM_F_ROOT;
-       module_put(a->ops->owner);
-       kfree(a);
-       err = rtnetlink_send(skb, pid, RTMGRP_TC, n->nlmsg_flags&NLM_F_ECHO);
-       if (err > 0)
-               return 0;
-
-       return err;
-
-
-rtattr_failure:
-       module_put(a->ops->owner);
-nlmsg_failure:
-err_out:
-       kfree_skb(skb);
-       kfree(a);
-       return err;
-}
-
-int tca_action_gd(struct rtattr *rta, struct nlmsghdr *n, u32 pid, int event )
-{
-
-       int s = 0;
-       int i, ret = 0;
-       struct tc_action *act = NULL;
-       struct rtattr *tb[TCA_ACT_MAX_PRIO+1];
-       struct tc_action *a = NULL, *a_s = NULL;
-
-       if (event != RTM_GETACTION  && event != RTM_DELACTION)
-               ret = -EINVAL;
-
-       if (rtattr_parse(tb, TCA_ACT_MAX_PRIO, RTA_DATA(rta), RTA_PAYLOAD(rta))<0) {
-               ret = -EINVAL;
-               goto nlmsg_failure;
-       }
-
-       if (event == RTM_DELACTION && n->nlmsg_flags&NLM_F_ROOT) {
-               if (NULL != tb[0]  && NULL == tb[1]) {
-                       return tca_action_flush(tb[0],n,pid);
-               }
-       }
-
-       for (i=0; i < TCA_ACT_MAX_PRIO ; i++) {
-
-               if (NULL == tb[i])
-                       break;
-
-               act = create_a(i+1);
-               if (NULL != a && a != act) {
-                       a->next = act;
-                       a = act;
-               } else {
-                       a = act;
-               }
-
-               if (!s) {
-                       s = 1;
-                       a_s = a;
-               }
-
-               ret = tcf_action_get_1(tb[i],act,n,pid);
-               if (ret < 0) {
-                       printk("tcf_action_get: failed to get! \n");
-                       ret = -EINVAL;
-                       goto rtattr_failure;
-               }
-
-       }
-
-
-       if (RTM_GETACTION == event) {
-               ret = act_get_notify(pid, n, a_s, event);
-       } else { /* delete */
-
-               struct sk_buff *skb;
-
-               skb = alloc_skb(NLMSG_GOODSIZE, GFP_KERNEL);
-               if (!skb) {
-                       ret = -ENOBUFS;
-                       goto nlmsg_failure;
-               }
-
-               if (tca_get_fill(skb, a_s,  pid, n->nlmsg_seq, 0, event, 0 , 1) <= 0) {
-                       kfree_skb(skb);
-                       ret = -EINVAL;
-                       goto nlmsg_failure;
-               }
-
-               /* now do the delete */
-               tcf_action_destroy(a_s, 0);
-
-               ret = rtnetlink_send(skb, pid, RTMGRP_TC, n->nlmsg_flags&NLM_F_ECHO);
-               if (ret > 0)
-                       return 0;
-               return ret;
-       }
-rtattr_failure:
-nlmsg_failure:
-       cleanup_a(a_s);
-       return ret;
-}
-
-
-int tcf_add_notify(struct tc_action *a, u32 pid, u32 seq, int event, unsigned flags) 
-{
-       struct tcamsg *t;
-       struct nlmsghdr  *nlh;
-       struct sk_buff *skb;
-       struct rtattr *x;
-       unsigned char *b;
-
-
-       int err = 0;
-
-       skb = alloc_skb(NLMSG_GOODSIZE, GFP_KERNEL);
-       if (!skb)
-               return -ENOBUFS;
-
-       b = (unsigned char *)skb->tail;
-
-       nlh = NLMSG_PUT(skb, pid, seq, event, sizeof(*t));
-       nlh->nlmsg_flags = flags;
-       t = NLMSG_DATA(nlh);
-       t->tca_family = AF_UNSPEC;
-       
-       x = (struct rtattr*) skb->tail;
-       RTA_PUT(skb, TCA_ACT_TAB, 0, NULL);
-
-       if (0 > tcf_action_dump(skb, a, 0, 0)) {
-               goto rtattr_failure;
-       }
-
-       x->rta_len = skb->tail - (u8*)x;
-       
-       nlh->nlmsg_len = skb->tail - b;
-       NETLINK_CB(skb).dst_groups = RTMGRP_TC;
-       
-       err = rtnetlink_send(skb, pid, RTMGRP_TC, flags&NLM_F_ECHO);
-       if (err > 0)
-               err = 0;
-
-       return err;
-
-rtattr_failure:
-nlmsg_failure:
-       skb_trim(skb, b - skb->data);
-       return -1;
-}
-
-       
-int tcf_action_add(struct rtattr *rta, struct nlmsghdr *n, u32 pid, int ovr ) 
-{
-       int ret = 0;
-       struct tc_action *act = NULL;
-       struct tc_action *a = NULL;
-       u32 seq = n->nlmsg_seq;
-
-       act = kmalloc(sizeof(*act),GFP_KERNEL);
-       if (NULL == act)
-               return -ENOMEM;
-
-       memset(act, 0, sizeof(*act));
-
-       ret = tcf_action_init(rta, NULL,act,NULL,ovr,0);
-       /* NOTE: We have an all-or-none model
-        * This means that of any of the actions fail
-        * to update then all are undone.
-        * */
-       if (0 > ret) {
-               tcf_action_destroy(act, 0);
-               goto done;
-       }
-
-       /* dump then free all the actions after update; inserted policy
-        * stays intact
-        * */
-       ret = tcf_add_notify(act, pid, seq, RTM_NEWACTION, n->nlmsg_flags); 
-       for (a = act; act; a = act) {
-               if (a) {
-                       act = act->next;
-                       a->ops = NULL;
-                       a->priv = NULL;
-                       kfree(a);
-               } else {
-                       printk("tcf_action_add: BUG? empty action\n");
-               }
-       }
-done:
-
-       return ret;
-}
-
-static int tc_ctl_action(struct sk_buff *skb, struct nlmsghdr *n, void *arg)
-{
-       struct rtattr **tca = arg;
-       u32 pid = skb ? NETLINK_CB(skb).pid : 0;
-
-       int ret = 0, ovr = 0;
-
-       if (NULL == tca[TCA_ACT_TAB-1]) {
-                       printk("tc_ctl_action: received NO action attribs\n");
-                       return -EINVAL;
-       }
-
-       /* n->nlmsg_flags&NLM_F_CREATE
-        * */
-       switch (n->nlmsg_type) {
-       case RTM_NEWACTION:    
-               /* we are going to assume all other flags
-                * imply create only if it doesnt exist
-                * Note that CREATE | EXCL implies that
-                * but since we want avoid ambiguity (eg when flags
-                * is zero) then just set this
-                */
-               if (n->nlmsg_flags&NLM_F_REPLACE) {
-                       ovr = 1;
-               }
-               ret =  tcf_action_add(tca[TCA_ACT_TAB-1], n, pid, ovr);
-               break;
-       case RTM_DELACTION:
-               ret = tca_action_gd(tca[TCA_ACT_TAB-1], n, pid,RTM_DELACTION);
-               break;
-       case RTM_GETACTION:
-               ret = tca_action_gd(tca[TCA_ACT_TAB-1], n, pid,RTM_GETACTION);
-               break;
-       default:
-               printk(" Unknown cmd was detected\n");
-               break;
-       }
-
-       return ret;
-}
-
-char *
-find_dump_kind(struct nlmsghdr *n)
-{
-       struct rtattr *tb1, *tb2[TCA_ACT_MAX+1];
-       struct rtattr *tb[TCA_ACT_MAX_PRIO + 1];
-       struct rtattr *rta[TCAA_MAX + 1];
-       struct rtattr *kind = NULL;
-       int min_len = NLMSG_LENGTH(sizeof (struct tcamsg));
-
-       int attrlen = n->nlmsg_len - NLMSG_ALIGN(min_len);
-       struct rtattr *attr = (void *) n + NLMSG_ALIGN(min_len);
-
-       if (rtattr_parse(rta, TCAA_MAX, attr, attrlen) < 0)
-               return NULL;
-       tb1 = rta[TCA_ACT_TAB - 1];
-       if (NULL == tb1) {
-               return NULL;
-       }
-
-       if (rtattr_parse(tb, TCA_ACT_MAX_PRIO, RTA_DATA(tb1), NLMSG_ALIGN(RTA_PAYLOAD(tb1))) < 0)
-               return NULL;
-       if (NULL == tb[0]) 
-               return NULL;
-
-       if (rtattr_parse(tb2, TCA_ACT_MAX, RTA_DATA(tb[0]), RTA_PAYLOAD(tb[0]))<0)
-               return NULL;
-       kind = tb2[TCA_ACT_KIND-1];
-
-       return (char *) RTA_DATA(kind);
-}
-
-static int
-tc_dump_action(struct sk_buff *skb, struct netlink_callback *cb)
-{
-       struct nlmsghdr *nlh;
-       unsigned char *b = skb->tail;
-       struct rtattr *x;
-       struct tc_action_ops *a_o;
-       struct tc_action a;
-       int ret = 0;
-
-       struct tcamsg *t = (struct tcamsg *) NLMSG_DATA(cb->nlh);
-       char *kind = find_dump_kind(cb->nlh);
-       if (NULL == kind) {
-               printk("tc_dump_action: action bad kind\n");
-               return 0;
-       }
-
-       a_o = tc_lookup_action_n(kind);
-
-       if (NULL == a_o) {
-               printk("failed to find %s\n", kind);
-               return 0;
-       }
-
-       memset(&a,0,sizeof(struct tc_action));
-       a.ops = a_o;
-
-       if (NULL == a_o->walk) {
-               printk("tc_dump_action: %s !capable of dumping table\n",kind);
-               goto rtattr_failure;
-       }
-
-       nlh = NLMSG_PUT(skb, NETLINK_CB(cb->skb).pid,  cb->nlh->nlmsg_seq, cb->nlh->nlmsg_type, sizeof (*t));
-       t = NLMSG_DATA(nlh);
-       t->tca_family = AF_UNSPEC;
-
-       x = (struct rtattr *) skb->tail;
-       RTA_PUT(skb, TCA_ACT_TAB, 0, NULL);
-
-       ret = a_o->walk(skb, cb, RTM_GETACTION, &a);
-       if (0 > ret ) {
-               goto rtattr_failure;
-       }
-
-       if (ret > 0) {
-               x->rta_len = skb->tail - (u8 *) x;
-               ret = skb->len;
-       } else {
-               skb_trim(skb, (u8*)x - skb->data);
-       }
-
-       nlh->nlmsg_len = skb->tail - b;
-       if (NETLINK_CB(cb->skb).pid && ret) 
-               nlh->nlmsg_flags |= NLM_F_MULTI;
-       module_put(a_o->owner);
-       return skb->len;
-
-rtattr_failure:
-nlmsg_failure:
-       module_put(a_o->owner);
-       skb_trim(skb, b - skb->data);
-       return skb->len;
-}
-
-static int __init tc_action_init(void)
-{
-       struct rtnetlink_link *link_p = rtnetlink_links[PF_UNSPEC];
-
-       if (link_p) {
-               link_p[RTM_NEWACTION-RTM_BASE].doit = tc_ctl_action;
-               link_p[RTM_DELACTION-RTM_BASE].doit = tc_ctl_action;
-               link_p[RTM_GETACTION-RTM_BASE].doit = tc_ctl_action;
-               link_p[RTM_GETACTION-RTM_BASE].dumpit = tc_dump_action;
-       }
-
-       printk("TC classifier action (bugs to netdev@oss.sgi.com cc hadi@cyberus.ca)\n");
-       return 0;
-}
-
-subsys_initcall(tc_action_init);
-
-EXPORT_SYMBOL(tcf_register_action);
-EXPORT_SYMBOL(tcf_unregister_action);
-EXPORT_SYMBOL(tcf_action_init_1);
-EXPORT_SYMBOL(tcf_action_init);
-EXPORT_SYMBOL(tcf_action_destroy);
-EXPORT_SYMBOL(tcf_action_exec);
-EXPORT_SYMBOL(tcf_action_copy_stats);
-EXPORT_SYMBOL(tcf_action_dump);
-EXPORT_SYMBOL(tcf_action_dump_1);
-EXPORT_SYMBOL(tcf_action_dump_old);
diff --git a/net/sched/sch_netem.c b/net/sched/sch_netem.c
deleted file mode 100644 (file)
index 70a3e8e..0000000
+++ /dev/null
@@ -1,858 +0,0 @@
-/*
- * net/sched/sch_netem.c       Network emulator
- *
- *             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>
- *             Catalin(ux aka Dino) BOIE <catab at umbrella dot ro>
- */
-
-#include <linux/config.h>
-#include <linux/module.h>
-#include <asm/bitops.h>
-#include <linux/types.h>
-#include <linux/kernel.h>
-#include <linux/errno.h>
-#include <linux/netdevice.h>
-#include <linux/skbuff.h>
-#include <linux/rtnetlink.h>
-
-#include <net/pkt_sched.h>
-
-/*     Network emulator
- *
- *     This scheduler can alters spacing and order
- *     Similar to NISTnet and BSD Dummynet.
- */
-
-struct netem_sched_data {
-       struct Qdisc    *qdisc;
-       struct sk_buff_head delayed;
-       struct timer_list timer;
-
-       u32 latency;
-       u32 loss;
-       u32 limit;
-       u32 counter;
-       u32 gap;
-       u32 jitter;
-};
-
-/* Time stamp put into socket buffer control block */
-struct netem_skb_cb {
-       psched_time_t   time_to_send;
-};
-
-/* This is the distribution table for the normal distribution produced
- * with NISTnet tools.
- * The entries represent a scaled inverse of the cumulative distribution
- * function.
- */
-#define TABLESIZE      2048
-#define TABLEFACTOR    8192
-
-static const short disttable[TABLESIZE] = {
-       -31473,         -26739,         -25226,         -24269,
-       -23560,         -22993,         -22518,         -22109,
-       -21749,         -21426,         -21133,         -20865,
-       -20618,         -20389,         -20174,         -19972,
-       -19782,         -19601,         -19430,         -19267,
-       -19112,         -18962,         -18819,         -18681,
-       -18549,         -18421,         -18298,         -18178,
-       -18062,         -17950,         -17841,         -17735,
-       -17632,         -17532,         -17434,         -17339,
-       -17245,         -17155,         -17066,         -16979,
-       -16894,         -16811,         -16729,         -16649,
-       -16571,         -16494,         -16419,         -16345,
-       -16272,         -16201,         -16130,         -16061,
-       -15993,         -15926,         -15861,         -15796,
-       -15732,         -15669,         -15607,         -15546,
-       -15486,         -15426,         -15368,         -15310,
-       -15253,         -15196,         -15140,         -15086,
-       -15031,         -14977,         -14925,         -14872,
-       -14821,         -14769,         -14719,         -14669,
-       -14619,         -14570,         -14522,         -14473,
-       -14426,         -14379,         -14332,         -14286,
-       -14241,         -14196,         -14150,         -14106,
-       -14062,         -14019,         -13976,         -13933,
-       -13890,         -13848,         -13807,         -13765,
-       -13724,         -13684,         -13643,         -13604,
-       -13564,         -13525,         -13486,         -13447,
-       -13408,         -13370,         -13332,         -13295,
-       -13258,         -13221,         -13184,         -13147,
-       -13111,         -13075,         -13040,         -13004,
-       -12969,         -12934,         -12899,         -12865,
-       -12830,         -12796,         -12762,         -12729,
-       -12695,         -12662,         -12629,         -12596,
-       -12564,         -12531,         -12499,         -12467,
-       -12435,         -12404,         -12372,         -12341,
-       -12310,         -12279,         -12248,         -12218,
-       -12187,         -12157,         -12127,         -12097,
-       -12067,         -12038,         -12008,         -11979,
-       -11950,         -11921,         -11892,         -11863,
-       -11835,         -11806,         -11778,         -11750,
-       -11722,         -11694,         -11666,         -11639,
-       -11611,         -11584,         -11557,         -11530,
-       -11503,         -11476,         -11450,         -11423,
-       -11396,         -11370,         -11344,         -11318,
-       -11292,         -11266,         -11240,         -11214,
-       -11189,         -11164,         -11138,         -11113,
-       -11088,         -11063,         -11038,         -11013,
-       -10988,         -10964,         -10939,         -10915,
-       -10891,         -10866,         -10843,         -10818,
-       -10794,         -10770,         -10747,         -10723,
-       -10700,         -10676,         -10652,         -10630,
-       -10606,         -10583,         -10560,         -10537,
-       -10514,         -10491,         -10469,         -10446,
-       -10424,         -10401,         -10378,         -10356,
-       -10334,         -10312,         -10290,         -10267,
-       -10246,         -10224,         -10202,         -10180,
-       -10158,         -10137,         -10115,         -10094,
-       -10072,         -10051,         -10030,         -10009,
-       -9988,          -9967,          -9945,          -9925,
-       -9904,          -9883,          -9862,          -9842,
-       -9821,          -9800,          -9780,          -9760,
-       -9739,          -9719,          -9699,          -9678,
-       -9658,          -9638,          -9618,          -9599,
-       -9578,          -9559,          -9539,          -9519,
-       -9499,          -9480,          -9461,          -9441,
-       -9422,          -9402,          -9383,          -9363,
-       -9344,          -9325,          -9306,          -9287,
-       -9268,          -9249,          -9230,          -9211,
-       -9192,          -9173,          -9155,          -9136,
-       -9117,          -9098,          -9080,          -9062,
-       -9043,          -9025,          -9006,          -8988,
-       -8970,          -8951,          -8933,          -8915,
-       -8897,          -8879,          -8861,          -8843,
-       -8825,          -8807,          -8789,          -8772,
-       -8754,          -8736,          -8718,          -8701,
-       -8683,          -8665,          -8648,          -8630,
-       -8613,          -8595,          -8578,          -8561,
-       -8543,          -8526,          -8509,          -8492,
-       -8475,          -8458,          -8441,          -8423,
-       -8407,          -8390,          -8373,          -8356,
-       -8339,          -8322,          -8305,          -8289,
-       -8272,          -8255,          -8239,          -8222,
-       -8206,          -8189,          -8172,          -8156,
-       -8140,          -8123,          -8107,          -8090,
-       -8074,          -8058,          -8042,          -8025,
-       -8009,          -7993,          -7977,          -7961,
-       -7945,          -7929,          -7913,          -7897,
-       -7881,          -7865,          -7849,          -7833,
-       -7817,          -7802,          -7786,          -7770,
-       -7754,          -7739,          -7723,          -7707,
-       -7692,          -7676,          -7661,          -7645,
-       -7630,          -7614,          -7599,          -7583,
-       -7568,          -7553,          -7537,          -7522,
-       -7507,          -7492,          -7476,          -7461,
-       -7446,          -7431,          -7416,          -7401,
-       -7385,          -7370,          -7356,          -7340,
-       -7325,          -7311,          -7296,          -7281,
-       -7266,          -7251,          -7236,          -7221,
-       -7207,          -7192,          -7177,          -7162,
-       -7148,          -7133,          -7118,          -7104,
-       -7089,          -7075,          -7060,          -7046,
-       -7031,          -7016,          -7002,          -6988,
-       -6973,          -6959,          -6944,          -6930,
-       -6916,          -6901,          -6887,          -6873,
-       -6859,          -6844,          -6830,          -6816,
-       -6802,          -6788,          -6774,          -6760,
-       -6746,          -6731,          -6717,          -6704,
-       -6690,          -6675,          -6661,          -6647,
-       -6633,          -6620,          -6606,          -6592,
-       -6578,          -6564,          -6550,          -6537,
-       -6523,          -6509,          -6495,          -6482,
-       -6468,          -6454,          -6441,          -6427,
-       -6413,          -6400,          -6386,          -6373,
-       -6359,          -6346,          -6332,          -6318,
-       -6305,          -6291,          -6278,          -6264,
-       -6251,          -6238,          -6224,          -6211,
-       -6198,          -6184,          -6171,          -6158,
-       -6144,          -6131,          -6118,          -6105,
-       -6091,          -6078,          -6065,          -6052,
-       -6039,          -6025,          -6012,          -5999,
-       -5986,          -5973,          -5960,          -5947,
-       -5934,          -5921,          -5908,          -5895,
-       -5882,          -5869,          -5856,          -5843,
-       -5830,          -5817,          -5804,          -5791,
-       -5779,          -5766,          -5753,          -5740,
-       -5727,          -5714,          -5702,          -5689,
-       -5676,          -5663,          -5650,          -5638,
-       -5625,          -5612,          -5600,          -5587,
-       -5575,          -5562,          -5549,          -5537,
-       -5524,          -5512,          -5499,          -5486,
-       -5474,          -5461,          -5449,          -5436,
-       -5424,          -5411,          -5399,          -5386,
-       -5374,          -5362,          -5349,          -5337,
-       -5324,          -5312,          -5299,          -5287,
-       -5275,          -5263,          -5250,          -5238,
-       -5226,          -5213,          -5201,          -5189,
-       -5177,          -5164,          -5152,          -5140,
-       -5128,          -5115,          -5103,          -5091,
-       -5079,          -5067,          -5055,          -5043,
-       -5030,          -5018,          -5006,          -4994,
-       -4982,          -4970,          -4958,          -4946,
-       -4934,          -4922,          -4910,          -4898,
-       -4886,          -4874,          -4862,          -4850,
-       -4838,          -4826,          -4814,          -4803,
-       -4791,          -4778,          -4767,          -4755,
-       -4743,          -4731,          -4719,          -4708,
-       -4696,          -4684,          -4672,          -4660,
-       -4649,          -4637,          -4625,          -4613,
-       -4601,          -4590,          -4578,          -4566,
-       -4554,          -4543,          -4531,          -4520,
-       -4508,          -4496,          -4484,          -4473,
-       -4461,          -4449,          -4438,          -4427,
-       -4415,          -4403,          -4392,          -4380,
-       -4368,          -4357,          -4345,          -4334,
-       -4322,          -4311,          -4299,          -4288,
-       -4276,          -4265,          -4253,          -4242,
-       -4230,          -4219,          -4207,          -4196,
-       -4184,          -4173,          -4162,          -4150,
-       -4139,          -4128,          -4116,          -4105,
-       -4094,          -4082,          -4071,          -4060,
-       -4048,          -4037,          -4026,          -4014,
-       -4003,          -3992,          -3980,          -3969,
-       -3958,          -3946,          -3935,          -3924,
-       -3913,          -3901,          -3890,          -3879,
-       -3868,          -3857,          -3845,          -3834,
-       -3823,          -3812,          -3801,          -3790,
-       -3779,          -3767,          -3756,          -3745,
-       -3734,          -3723,          -3712,          -3700,
-       -3689,          -3678,          -3667,          -3656,
-       -3645,          -3634,          -3623,          -3612,
-       -3601,          -3590,          -3579,          -3568,
-       -3557,          -3545,          -3535,          -3524,
-       -3513,          -3502,          -3491,          -3480,
-       -3469,          -3458,          -3447,          -3436,
-       -3425,          -3414,          -3403,          -3392,
-       -3381,          -3370,          -3360,          -3348,
-       -3337,          -3327,          -3316,          -3305,
-       -3294,          -3283,          -3272,          -3262,
-       -3251,          -3240,          -3229,          -3218,
-       -3207,          -3197,          -3185,          -3175,
-       -3164,          -3153,          -3142,          -3132,
-       -3121,          -3110,          -3099,          -3088,
-       -3078,          -3067,          -3056,          -3045,
-       -3035,          -3024,          -3013,          -3003,
-       -2992,          -2981,          -2970,          -2960,
-       -2949,          -2938,          -2928,          -2917,
-       -2906,          -2895,          -2885,          -2874,
-       -2864,          -2853,          -2842,          -2832,
-       -2821,          -2810,          -2800,          -2789,
-       -2778,          -2768,          -2757,          -2747,
-       -2736,          -2725,          -2715,          -2704,
-       -2694,          -2683,          -2673,          -2662,
-       -2651,          -2641,          -2630,          -2620,
-       -2609,          -2599,          -2588,          -2578,
-       -2567,          -2556,          -2546,          -2535,
-       -2525,          -2515,          -2504,          -2493,
-       -2483,          -2472,          -2462,          -2451,
-       -2441,          -2431,          -2420,          -2410,
-       -2399,          -2389,          -2378,          -2367,
-       -2357,          -2347,          -2336,          -2326,
-       -2315,          -2305,          -2295,          -2284,
-       -2274,          -2263,          -2253,          -2243,
-       -2232,          -2222,          -2211,          -2201,
-       -2191,          -2180,          -2170,          -2159,
-       -2149,          -2139,          -2128,          -2118,
-       -2107,          -2097,          -2087,          -2076,
-       -2066,          -2056,          -2046,          -2035,
-       -2025,          -2014,          -2004,          -1994,
-       -1983,          -1973,          -1963,          -1953,
-       -1942,          -1932,          -1921,          -1911,
-       -1901,          -1891,          -1880,          -1870,
-       -1860,          -1849,          -1839,          -1829,
-       -1819,          -1808,          -1798,          -1788,
-       -1778,          -1767,          -1757,          -1747,
-       -1736,          -1726,          -1716,          -1706,
-       -1695,          -1685,          -1675,          -1665,
-       -1654,          -1644,          -1634,          -1624,
-       -1613,          -1603,          -1593,          -1583,
-       -1573,          -1563,          -1552,          -1542,
-       -1532,          -1522,          -1511,          -1501,
-       -1491,          -1481,          -1471,          -1461,
-       -1450,          -1440,          -1430,          -1420,
-       -1409,          -1400,          -1389,          -1379,
-       -1369,          -1359,          -1348,          -1339,
-       -1328,          -1318,          -1308,          -1298,
-       -1288,          -1278,          -1267,          -1257,
-       -1247,          -1237,          -1227,          -1217,
-       -1207,          -1196,          -1186,          -1176,
-       -1166,          -1156,          -1146,          -1135,
-       -1126,          -1115,          -1105,          -1095,
-       -1085,          -1075,          -1065,          -1055,
-       -1044,          -1034,          -1024,          -1014,
-       -1004,          -994,           -984,           -974,
-       -964,           -954,           -944,           -933,
-       -923,           -913,           -903,           -893,
-       -883,           -873,           -863,           -853,
-       -843,           -833,           -822,           -812,
-       -802,           -792,           -782,           -772,
-       -762,           -752,           -742,           -732,
-       -722,           -712,           -702,           -691,
-       -682,           -671,           -662,           -651,
-       -641,           -631,           -621,           -611,
-       -601,           -591,           -581,           -571,
-       -561,           -551,           -541,           -531,
-       -521,           -511,           -501,           -491,
-       -480,           -471,           -460,           -451,
-       -440,           -430,           -420,           -410,
-       -400,           -390,           -380,           -370,
-       -360,           -350,           -340,           -330,
-       -320,           -310,           -300,           -290,
-       -280,           -270,           -260,           -250,
-       -240,           -230,           -220,           -210,
-       -199,           -190,           -179,           -170,
-       -159,           -150,           -139,           -129,
-       -119,           -109,           -99,            -89,
-       -79,            -69,            -59,            -49,
-       -39,            -29,            -19,            -9,
-       1,              11,             21,             31,
-       41,             51,             61,             71,
-       81,             91,             101,            111,
-       121,            131,            141,            152,
-       161,            172,            181,            192,
-       202,            212,            222,            232,
-       242,            252,            262,            272,
-       282,            292,            302,            312,
-       322,            332,            342,            352,
-       362,            372,            382,            392,
-       402,            412,            422,            433,
-       442,            453,            462,            473,
-       483,            493,            503,            513,
-       523,            533,            543,            553,
-       563,            573,            583,            593,
-       603,            613,            623,            633,
-       643,            653,            664,            673,
-       684,            694,            704,            714,
-       724,            734,            744,            754,
-       764,            774,            784,            794,
-       804,            815,            825,            835,
-       845,            855,            865,            875,
-       885,            895,            905,            915,
-       925,            936,            946,            956,
-       966,            976,            986,            996,
-       1006,           1016,           1026,           1037,
-       1047,           1057,           1067,           1077,
-       1087,           1097,           1107,           1117,
-       1128,           1138,           1148,           1158,
-       1168,           1178,           1188,           1198,
-       1209,           1219,           1229,           1239,
-       1249,           1259,           1269,           1280,
-       1290,           1300,           1310,           1320,
-       1330,           1341,           1351,           1361,
-       1371,           1381,           1391,           1402,
-       1412,           1422,           1432,           1442,
-       1452,           1463,           1473,           1483,
-       1493,           1503,           1513,           1524,
-       1534,           1544,           1554,           1565,
-       1575,           1585,           1595,           1606,
-       1616,           1626,           1636,           1647,
-       1656,           1667,           1677,           1687,
-       1697,           1708,           1718,           1729,
-       1739,           1749,           1759,           1769,
-       1780,           1790,           1800,           1810,
-       1821,           1831,           1841,           1851,
-       1862,           1872,           1883,           1893,
-       1903,           1913,           1923,           1934,
-       1944,           1955,           1965,           1975,
-       1985,           1996,           2006,           2016,
-       2027,           2037,           2048,           2058,
-       2068,           2079,           2089,           2099,
-       2110,           2120,           2130,           2141,
-       2151,           2161,           2172,           2182,
-       2193,           2203,           2213,           2224,
-       2234,           2245,           2255,           2265,
-       2276,           2286,           2297,           2307,
-       2318,           2328,           2338,           2349,
-       2359,           2370,           2380,           2391,
-       2401,           2412,           2422,           2433,
-       2443,           2454,           2464,           2475,
-       2485,           2496,           2506,           2517,
-       2527,           2537,           2548,           2559,
-       2569,           2580,           2590,           2601,
-       2612,           2622,           2632,           2643,
-       2654,           2664,           2675,           2685,
-       2696,           2707,           2717,           2728,
-       2738,           2749,           2759,           2770,
-       2781,           2791,           2802,           2813,
-       2823,           2834,           2845,           2855,
-       2866,           2877,           2887,           2898,
-       2909,           2919,           2930,           2941,
-       2951,           2962,           2973,           2984,
-       2994,           3005,           3015,           3027,
-       3037,           3048,           3058,           3069,
-       3080,           3091,           3101,           3113,
-       3123,           3134,           3145,           3156,
-       3166,           3177,           3188,           3199,
-       3210,           3220,           3231,           3242,
-       3253,           3264,           3275,           3285,
-       3296,           3307,           3318,           3329,
-       3340,           3351,           3362,           3373,
-       3384,           3394,           3405,           3416,
-       3427,           3438,           3449,           3460,
-       3471,           3482,           3493,           3504,
-       3515,           3526,           3537,           3548,
-       3559,           3570,           3581,           3592,
-       3603,           3614,           3625,           3636,
-       3647,           3659,           3670,           3681,
-       3692,           3703,           3714,           3725,
-       3736,           3747,           3758,           3770,
-       3781,           3792,           3803,           3814,
-       3825,           3837,           3848,           3859,
-       3870,           3881,           3893,           3904,
-       3915,           3926,           3937,           3949,
-       3960,           3971,           3983,           3994,
-       4005,           4017,           4028,           4039,
-       4051,           4062,           4073,           4085,
-       4096,           4107,           4119,           4130,
-       4141,           4153,           4164,           4175,
-       4187,           4198,           4210,           4221,
-       4233,           4244,           4256,           4267,
-       4279,           4290,           4302,           4313,
-       4325,           4336,           4348,           4359,
-       4371,           4382,           4394,           4406,
-       4417,           4429,           4440,           4452,
-       4464,           4475,           4487,           4499,
-       4510,           4522,           4533,           4545,
-       4557,           4569,           4581,           4592,
-       4604,           4616,           4627,           4639,
-       4651,           4663,           4674,           4686,
-       4698,           4710,           4722,           4734,
-       4746,           4758,           4769,           4781,
-       4793,           4805,           4817,           4829,
-       4841,           4853,           4865,           4877,
-       4889,           4900,           4913,           4925,
-       4936,           4949,           4961,           4973,
-       4985,           4997,           5009,           5021,
-       5033,           5045,           5057,           5070,
-       5081,           5094,           5106,           5118,
-       5130,           5143,           5155,           5167,
-       5179,           5191,           5204,           5216,
-       5228,           5240,           5253,           5265,
-       5278,           5290,           5302,           5315,
-       5327,           5340,           5352,           5364,
-       5377,           5389,           5401,           5414,
-       5426,           5439,           5451,           5464,
-       5476,           5489,           5502,           5514,
-       5527,           5539,           5552,           5564,
-       5577,           5590,           5603,           5615,
-       5628,           5641,           5653,           5666,
-       5679,           5691,           5704,           5717,
-       5730,           5743,           5756,           5768,
-       5781,           5794,           5807,           5820,
-       5833,           5846,           5859,           5872,
-       5885,           5897,           5911,           5924,
-       5937,           5950,           5963,           5976,
-       5989,           6002,           6015,           6028,
-       6042,           6055,           6068,           6081,
-       6094,           6108,           6121,           6134,
-       6147,           6160,           6174,           6187,
-       6201,           6214,           6227,           6241,
-       6254,           6267,           6281,           6294,
-       6308,           6321,           6335,           6348,
-       6362,           6375,           6389,           6403,
-       6416,           6430,           6443,           6457,
-       6471,           6485,           6498,           6512,
-       6526,           6540,           6554,           6567,
-       6581,           6595,           6609,           6623,
-       6637,           6651,           6665,           6679,
-       6692,           6706,           6721,           6735,
-       6749,           6763,           6777,           6791,
-       6805,           6819,           6833,           6848,
-       6862,           6876,           6890,           6905,
-       6919,           6933,           6948,           6962,
-       6976,           6991,           7005,           7020,
-       7034,           7049,           7064,           7078,
-       7093,           7107,           7122,           7136,
-       7151,           7166,           7180,           7195,
-       7210,           7225,           7240,           7254,
-       7269,           7284,           7299,           7314,
-       7329,           7344,           7359,           7374,
-       7389,           7404,           7419,           7434,
-       7449,           7465,           7480,           7495,
-       7510,           7526,           7541,           7556,
-       7571,           7587,           7602,           7618,
-       7633,           7648,           7664,           7680,
-       7695,           7711,           7726,           7742,
-       7758,           7773,           7789,           7805,
-       7821,           7836,           7852,           7868,
-       7884,           7900,           7916,           7932,
-       7948,           7964,           7981,           7997,
-       8013,           8029,           8045,           8061,
-       8078,           8094,           8110,           8127,
-       8143,           8160,           8176,           8193,
-       8209,           8226,           8242,           8259,
-       8276,           8292,           8309,           8326,
-       8343,           8360,           8377,           8394,
-       8410,           8428,           8444,           8462,
-       8479,           8496,           8513,           8530,
-       8548,           8565,           8582,           8600,
-       8617,           8634,           8652,           8670,
-       8687,           8704,           8722,           8740,
-       8758,           8775,           8793,           8811,
-       8829,           8847,           8865,           8883,
-       8901,           8919,           8937,           8955,
-       8974,           8992,           9010,           9029,
-       9047,           9066,           9084,           9103,
-       9121,           9140,           9159,           9177,
-       9196,           9215,           9234,           9253,
-       9272,           9291,           9310,           9329,
-       9349,           9368,           9387,           9406,
-       9426,           9445,           9465,           9484,
-       9504,           9524,           9544,           9563,
-       9583,           9603,           9623,           9643,
-       9663,           9683,           9703,           9723,
-       9744,           9764,           9785,           9805,
-       9826,           9846,           9867,           9888,
-       9909,           9930,           9950,           9971,
-       9993,           10013,          10035,          10056,
-       10077,          10099,          10120,          10142,
-       10163,          10185,          10207,          10229,
-       10251,          10273,          10294,          10317,
-       10339,          10361,          10384,          10406,
-       10428,          10451,          10474,          10496,
-       10519,          10542,          10565,          10588,
-       10612,          10635,          10658,          10682,
-       10705,          10729,          10752,          10776,
-       10800,          10824,          10848,          10872,
-       10896,          10921,          10945,          10969,
-       10994,          11019,          11044,          11069,
-       11094,          11119,          11144,          11169,
-       11195,          11221,          11246,          11272,
-       11298,          11324,          11350,          11376,
-       11402,          11429,          11456,          11482,
-       11509,          11536,          11563,          11590,
-       11618,          11645,          11673,          11701,
-       11728,          11756,          11785,          11813,
-       11842,          11870,          11899,          11928,
-       11957,          11986,          12015,          12045,
-       12074,          12104,          12134,          12164,
-       12194,          12225,          12255,          12286,
-       12317,          12348,          12380,          12411,
-       12443,          12475,          12507,          12539,
-       12571,          12604,          12637,          12670,
-       12703,          12737,          12771,          12804,
-       12839,          12873,          12907,          12942,
-       12977,          13013,          13048,          13084,
-       13120,          13156,          13192,          13229,
-       13267,          13304,          13341,          13379,
-       13418,          13456,          13495,          13534,
-       13573,          13613,          13653,          13693,
-       13734,          13775,          13817,          13858,
-       13901,          13943,          13986,          14029,
-       14073,          14117,          14162,          14206,
-       14252,          14297,          14343,          14390,
-       14437,          14485,          14533,          14582,
-       14631,          14680,          14731,          14782,
-       14833,          14885,          14937,          14991,
-       15044,          15099,          15154,          15210,
-       15266,          15324,          15382,          15441,
-       15500,          15561,          15622,          15684,
-       15747,          15811,          15877,          15943,
-       16010,          16078,          16148,          16218,
-       16290,          16363,          16437,          16513,
-       16590,          16669,          16749,          16831,
-       16915,          17000,          17088,          17177,
-       17268,          17362,          17458,          17556,
-       17657,          17761,          17868,          17977,
-       18090,          18207,          18328,          18452,
-       18581,          18715,          18854,          18998,
-       19149,          19307,          19472,          19645,
-       19828,          20021,          20226,          20444,
-       20678,          20930,          21204,          21503,
-       21835,          22206,          22630,          23124,
-       23721,          24478,          25529,          27316,
-};
-
-/* tabledist - return a pseudo-randomly distributed value with mean mu and
- * std deviation sigma.  Uses table lookup to approximate the desired
- * distribution, and a uniformly-distributed pseudo-random source.
- */
-static inline int tabledist(int mu, int sigma)
-{
-       int x;
-       int index;
-       int sigmamod, sigmadiv;
-
-       if (sigma == 0)
-               return mu;
-
-       index = (net_random() & (TABLESIZE-1));
-       sigmamod = sigma%TABLEFACTOR;
-       sigmadiv = sigma/TABLEFACTOR;
-       x = sigmamod*disttable[index];
-
-       if (x >= 0)
-               x += TABLEFACTOR/2;
-       else
-               x -= TABLEFACTOR/2;
-
-       x /= TABLEFACTOR;
-       x += sigmadiv*disttable[index];
-       x += mu;
-       return x;
-}
-
-/* Enqueue packets with underlying discipline (fifo)
- * but mark them with current time first.
- */
-static int netem_enqueue(struct sk_buff *skb, struct Qdisc *sch)
-{
-       struct netem_sched_data *q = (struct netem_sched_data *)sch->data;
-       struct netem_skb_cb *cb = (struct netem_skb_cb *)skb->cb;
-       psched_time_t now;
-       long delay;
-
-       pr_debug("netem_enqueue skb=%p @%lu\n", skb, jiffies);
-
-       /* Random packet drop 0 => none, ~0 => all */
-       if (q->loss && q->loss >= net_random()) {
-               sch->stats.drops++;
-               return 0;       /* lie about loss so TCP doesn't know */
-       }
-
-
-       /* If doing simple delay then gap == 0 so all packets
-        * go into the delayed holding queue
-        * otherwise if doing out of order only "1 out of gap"
-        * packets will be delayed.
-        */
-       if (q->counter < q->gap) {
-               int ret;
-
-               ++q->counter;
-               ret = q->qdisc->enqueue(skb, q->qdisc);
-               if (ret)
-                       sch->stats.drops++;
-               return ret;
-       }
-       
-       q->counter = 0;
-       
-       PSCHED_GET_TIME(now);
-       if (q->jitter) 
-               delay = tabledist(q->latency, q->jitter);
-       else
-               delay = q->latency;
-
-       PSCHED_TADD2(now, delay, cb->time_to_send);
-       
-       /* Always queue at tail to keep packets in order */
-       __skb_queue_tail(&q->delayed, skb);
-       sch->q.qlen++;
-       sch->stats.bytes += skb->len;
-       sch->stats.packets++;
-       return 0;
-}
-
-/* Requeue packets but don't change time stamp */
-static int netem_requeue(struct sk_buff *skb, struct Qdisc *sch)
-{
-       struct netem_sched_data *q = (struct netem_sched_data *)sch->data;
-       int ret;
-
-       if ((ret = q->qdisc->ops->requeue(skb, q->qdisc)) == 0)
-               sch->q.qlen++;
-
-       return ret;
-}
-
-static unsigned int netem_drop(struct Qdisc* sch)
-{
-       struct netem_sched_data *q = (struct netem_sched_data *)sch->data;
-       unsigned int len;
-
-       if ((len = q->qdisc->ops->drop(q->qdisc)) != 0) {
-               sch->q.qlen--;
-               sch->stats.drops++;
-       }
-       return len;
-}
-
-/* Dequeue packet.
- *  Move all packets that are ready to send from the delay holding
- *  list to the underlying qdisc, then just call dequeue
- */
-static struct sk_buff *netem_dequeue(struct Qdisc *sch)
-{
-       struct netem_sched_data *q = (struct netem_sched_data *)sch->data;
-       struct sk_buff *skb;
-       psched_time_t now;
-
-       PSCHED_GET_TIME(now);
-       while ((skb = skb_peek(&q->delayed)) != NULL) {
-               const struct netem_skb_cb *cb
-                       = (const struct netem_skb_cb *)skb->cb;
-               long delay 
-                       = PSCHED_US2JIFFIE(PSCHED_TDIFF(cb->time_to_send, now));
-               pr_debug("netem_dequeue: delay queue %p@%lu %ld\n",
-                        skb, jiffies, delay);
-
-               /* if more time remaining? */
-               if (delay > 0) {
-                       mod_timer(&q->timer, jiffies + delay);
-                       break;
-               }
-               __skb_unlink(skb, &q->delayed);
-
-               if (q->qdisc->enqueue(skb, q->qdisc))
-                       sch->stats.drops++;
-       }
-
-       skb = q->qdisc->dequeue(q->qdisc);
-       if (skb) 
-               sch->q.qlen--;
-       return skb;
-}
-
-static void netem_watchdog(unsigned long arg)
-{
-       struct Qdisc *sch = (struct Qdisc *)arg;
-
-       pr_debug("netem_watchdog: fired @%lu\n", jiffies);
-       netif_schedule(sch->dev);
-}
-
-static void netem_reset(struct Qdisc *sch)
-{
-       struct netem_sched_data *q = (struct netem_sched_data *)sch->data;
-
-       qdisc_reset(q->qdisc);
-       skb_queue_purge(&q->delayed);
-
-       sch->q.qlen = 0;
-       del_timer_sync(&q->timer);
-}
-
-static int set_fifo_limit(struct Qdisc *q, int limit)
-{
-        struct rtattr *rta;
-       int ret = -ENOMEM;
-
-       rta = kmalloc(RTA_LENGTH(sizeof(struct tc_fifo_qopt)), GFP_KERNEL);
-       if (rta) {
-               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;
-}
-
-static int netem_change(struct Qdisc *sch, struct rtattr *opt)
-{
-       struct netem_sched_data *q = (struct netem_sched_data *)sch->data;
-       struct tc_netem_qopt *qopt = RTA_DATA(opt);
-       struct Qdisc *child;
-       int ret;
-
-       if (opt->rta_len < RTA_LENGTH(sizeof(*qopt)))
-               return -EINVAL;
-
-       child = qdisc_create_dflt(sch->dev, &pfifo_qdisc_ops);
-       if (!child)
-               return -EINVAL;
-
-       ret = set_fifo_limit(child, qopt->limit);
-       if (ret) {
-               qdisc_destroy(child);
-               return ret;
-       }
-
-       sch_tree_lock(sch);
-       if (child) {
-               child = xchg(&q->qdisc, child);
-               if (child != &noop_qdisc)
-                       qdisc_destroy(child);
-       
-               q->latency = qopt->latency;
-               q->jitter = qopt->jitter;
-               q->limit = qopt->limit;
-               q->gap = qopt->gap;
-               q->loss = qopt->loss;
-       }
-       sch_tree_unlock(sch);
-
-       return 0;
-}
-
-static int netem_init(struct Qdisc *sch, struct rtattr *opt)
-{
-       struct netem_sched_data *q = (struct netem_sched_data *)sch->data;
-
-       if (!opt)
-               return -EINVAL;
-
-       skb_queue_head_init(&q->delayed);
-       q->qdisc = &noop_qdisc;
-
-       init_timer(&q->timer);
-       q->timer.function = netem_watchdog;
-       q->timer.data = (unsigned long) sch;
-       q->counter = 0;
-
-       return netem_change(sch, opt);
-}
-
-static void netem_destroy(struct Qdisc *sch)
-{
-       struct netem_sched_data *q = (struct netem_sched_data *)sch->data;
-
-       del_timer_sync(&q->timer);
-}
-
-static int netem_dump(struct Qdisc *sch, struct sk_buff *skb)
-{
-       struct netem_sched_data *q = (struct netem_sched_data *)sch->data;
-       unsigned char    *b = skb->tail;
-       struct tc_netem_qopt qopt;
-
-       qopt.latency = q->latency;
-       qopt.jitter = q->jitter;
-       qopt.limit = sch->dev->tx_queue_len;
-       qopt.loss = q->loss;
-       qopt.gap = q->gap;
-
-       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 netem_qdisc_ops = {
-       .id             =       "netem",
-       .priv_size      =       sizeof(struct netem_sched_data),
-       .enqueue        =       netem_enqueue,
-       .dequeue        =       netem_dequeue,
-       .requeue        =       netem_requeue,
-       .drop           =       netem_drop,
-       .init           =       netem_init,
-       .reset          =       netem_reset,
-       .destroy        =       netem_destroy,
-       .change         =       netem_change,
-       .dump           =       netem_dump,
-       .owner          =       THIS_MODULE,
-};
-
-
-static int __init netem_module_init(void)
-{
-       return register_qdisc(&netem_qdisc_ops);
-}
-static void __exit netem_module_exit(void)
-{
-       unregister_qdisc(&netem_qdisc_ops);
-}
-module_init(netem_module_init)
-module_exit(netem_module_exit)
-MODULE_LICENSE("GPL");
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/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/scripts/modsign/Makefile b/scripts/modsign/Makefile
deleted file mode 100644 (file)
index 947f5f9..0000000
+++ /dev/null
@@ -1,27 +0,0 @@
-# Set the following to `true' to make a debuggable build.
-# Leave this set to `false' for production use.
-DEBUG = true
-
-
-ROOT =         mod-extract
-VERSION =      0.1
-INSTALL_DIR =  /usr/local/bin
-RELEASE_NAME = $(ROOT)-$(VERSION)
-
-CC = gcc
-
-INCLUDES = 
-CFLAGS = -g -O -Wall
-
-OBJS = mod-extract.o
-
-all: $(ROOT)
-
-$(ROOT): $(OBJS)
-       $(CC) $(LDFLAGS) -o $(ROOT) $(OBJS) -lbfd -liberty $(LIB_OBJS) $(ARCH_LIB_OBJS)
-
-.c.o:
-       $(CC) $(INCLUDES) $(CFLAGS) -c $< -o $@
-
-clean:
-       -rm $(OBJS) $(ROOT)
diff --git a/scripts/modsign/mod-extract.c b/scripts/modsign/mod-extract.c
deleted file mode 100644 (file)
index f8502e7..0000000
+++ /dev/null
@@ -1,109 +0,0 @@
-
-
-
-#include <errno.h>
-#include <error.h>
-#include <fcntl.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <bfd.h>
-
-/* This should be set in a Makefile somehow */
-#define TARGET "i686-pc-linux-gnu"
-
-static FILE *out;
-
-static void dump_data(bfd *abfd)
-{
-       asection *section;
-       bfd_byte *data = 0;
-       bfd_size_type size;
-       bfd_size_type addr_offset;
-       bfd_size_type stop_offset;
-       unsigned int opb = bfd_octets_per_byte(abfd);
-       unsigned int cksum;
-
-       for (section = abfd->sections; section != NULL; section = section->next) {
-               if (section->flags & SEC_HAS_CONTENTS) {
-                       if (bfd_section_size(abfd, section) == 0)
-                               continue;
-
-                       /* We only care about sections with "text" or "data" in their names */
-                       if ((strstr(section->name, "text") == NULL) &&
-                           (strstr(section->name, "data") == NULL))
-                               continue;
-
-                       cksum = 0;
-
-                       size = bfd_section_size(abfd, section) / opb;
-
-                       printf("Contents of section %s size %lu", section->name, size);
-
-                       data = (bfd_byte *) malloc(size);
-
-                       bfd_get_section_contents(abfd, section, (PTR) data, 0, size);
-
-                       stop_offset = size;
-
-                       printf(" idata %02x%02x%02x%02x", data[0], data[1], data[2], data[3]);
-
-                       for (addr_offset = 0; addr_offset < stop_offset; ++addr_offset) {
-                               cksum += (unsigned int) data[addr_offset];
-                               fputc(data[addr_offset], out);
-                       }
-                       free (data);
-
-                       printf(" checksum %08x\n", cksum);
-               }
-       }
-}
-
-void set_default_bfd_target(void)
-{
-       const char *target = TARGET;
-
-       if (!bfd_set_default_target(target))
-               fprintf(stderr, "can't set BFD default target to `%s': %s", target, bfd_errmsg (bfd_get_error ()));
-}
-
-int main (int argc, char *argv[])
-{
-       char *in_file;
-       char *out_file;
-       bfd *file;
-       char **matching;
-
-       if (argc != 3) {
-               fprintf(stderr, "%s [infile] [outfile]\n", argv[0]);
-               exit(1);
-       }
-
-       in_file = argv[1];
-       out_file = argv[2];
-
-       bfd_init();
-       set_default_bfd_target();
-
-
-//     file = bfd_openr(in_file, "elf32-i386");
-       file = bfd_openr(in_file, NULL);
-       if (file == NULL) {
-               fprintf(stderr, "error \"%s\" trying to open %s\n", strerror(errno), in_file);
-               exit(1);
-       }
-
-       out = fopen(out_file, "w");
-       if (out == NULL) {
-               fprintf(stderr, "error \"%s\" trying to create %s\n", strerror(errno), out_file);
-               exit(1);
-       }
-
-       if (bfd_check_format_matches(file, bfd_object, &matching)) {
-               dump_data (file);
-       }
-
-       fclose(out);
-
-       return 0;
-}
diff --git a/scripts/modsign/mod-extract.sh b/scripts/modsign/mod-extract.sh
deleted file mode 100644 (file)
index a08cb08..0000000
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/bin/sh
-
-sections=`objdump -h $1 |
-egrep \(text\|data\) |
-    while read sid sname stuff
-do
-  echo $sname
-done`
-
-echo $sections
-
-#objcopy -O binary $sections $1 x.raw
-objcopy -O binary -j .text $1 x.raw
-
-echo -n >x.raw
-for i in $sections
-do
-  objcopy -O binary -j $i $1 x.raw.part
-  cat x.raw.part >>x.raw
-done
-rm x.raw.part
-mv x.raw $2
diff --git a/scripts/modsign/modsign.sh b/scripts/modsign/modsign.sh
deleted file mode 100644 (file)
index 4d3eaa2..0000000
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/bin/bash
-
-
-if [ $# = "0" ] ; then
-       echo
-#      echo "usage: $0 <module_to_sign> <key_name>"
-       echo "usage: $0 <module_to_sign>"
-       echo
-       exit 1
-fi
-
-module=$1
-#key=$2
-
-# strip out only the sections that we care about
-sh scripts/modsign/mod-extract.sh $module $module.out
-
-# sign the sections
-#gpg --no-greeting --default-key $key -b $module.out
-gpg --no-greeting --no-default-keyring --secret-keyring ../kernel.sec --keyring ../kernel.pub -b $module.out
-
-# check the signature
-#gpg --verify rxrpc.ko.out.sig rxrpc.ko.out
-
-## sha1 the sections
-#sha1sum $module.out | awk "{print \$1}" > $module.sha1
-#
-## encrypt the sections
-#gpg --no-greeting -e -o - -r $key $module.sha1 > $module.crypt
-
-# add the encrypted data to the module
-#objcopy --add-section module_sig=$module.crypt $module $module.signed
-objcopy --add-section module_sig=$module.out.sig $module $module.signed
-objcopy --set-section-flags module_sig=alloc $module.signed
-rm -f $module.out*
diff --git a/scripts/package/Makefile b/scripts/package/Makefile
deleted file mode 100644 (file)
index f3df4bc..0000000
+++ /dev/null
@@ -1,71 +0,0 @@
-# Makefile for the different targets used to generate full packages of a kernel
-# It uses the generic clean infrastructure of kbuild
-
-# Ignore the following files/directories during tar operation
-TAR_IGNORE := --exclude SCCS --exclude BitKeeper --exclude .svn --exclude CVS
-
-
-# RPM target
-# ---------------------------------------------------------------------------
-# The rpm target generates two rpm files:
-# /usr/src/packages/SRPMS/kernel-2.6.7rc2-1.src.rpm
-# /usr/src/packages/RPMS/i386/kernel-2.6.7rc2-1.<arch>.rpm
-# The src.rpm files includes all source for the kernel being built
-# The <arch>.rpm includes kernel configuration, modules etc.
-#
-# Process to create the rpm files
-# a) clean the kernel
-# b) Generate .spec file
-# c) Build a tar ball, using symlink to make kernel version
-#    first entry in the path
-# d) and pack the result to a tar.gz file
-# e) generate the rpm files, based on kernel.spec
-# - Use /. to avoid tar packing just the symlink
-
-# Do we have rpmbuild, otherwise fall back to the older rpm
-RPM := $(shell if [ -x "/usr/bin/rpmbuild" ]; then echo rpmbuild; \
-                  else echo rpm; fi)
-
-# Remove hyphens since they have special meaning in RPM filenames
-KERNELPATH := kernel-$(subst -,,$(KERNELRELEASE))
-MKSPEC     := $(srctree)/scripts/package/mkspec
-PREV       := set -e; cd ..;
-
-.PHONY: rpm-pkg rpm
-
-$(objtree)/kernel.spec: $(MKSPEC)
-       $(CONFIG_SHELL) $(MKSPEC) > $@
-
-rpm-pkg rpm: $(objtree)/kernel.spec
-       $(MAKE) clean
-       $(PREV) ln -sf $(srctree) $(KERNELPATH)
-       $(PREV) tar -cz $(RCS_TAR_IGNORE) -f $(KERNELPATH).tar.gz $(KERNELPATH)/.
-       $(PREV) rm $(KERNELPATH)
-
-       set -e; \
-       $(CONFIG_SHELL) $(srctree)/scripts/mkversion > $(objtree)/.tmp_version
-       set -e; \
-       mv -f $(objtree)/.tmp_version $(objtree)/.version
-
-       $(RPM) --target $(UTS_MACHINE) -ta ../$(KERNELPATH).tar.gz
-       rm ../$(KERNELPATH).tar.gz
-
-clean-rule +=  rm -f $(objtree)/kernel.spec
-
-# Deb target
-# ---------------------------------------------------------------------------
-#
-.PHONY: deb-pkg
-deb-pkg:
-       $(MAKE)
-       $(CONFIG_SHELL) $(srctree)/scripts/package/builddeb
-
-clean-rule += && rm -rf $(objtree)/debian/
-
-
-# Help text displayed when executing 'make help'
-# ---------------------------------------------------------------------------
-help:
-       @echo  '  rpm-pkg         - Build the kernel as an RPM package'
-       @echo  '  deb-pkg         - Build the kernel as an deb package'
-
diff --git a/scripts/package/builddeb b/scripts/package/builddeb
deleted file mode 100644 (file)
index 968a0a7..0000000
+++ /dev/null
@@ -1,79 +0,0 @@
-#!/bin/sh
-#
-# builddeb 1.2
-# Copyright 2003 Wichert Akkerman <wichert@wiggy.net>
-#
-# Simple script to generate a deb package for a Linux kernel. All the
-# complexity of what to do with a kernel after it is installer or removed
-# is left to other scripts and packages: they can install scripts in the
-# /etc/kernel/{pre,post}{inst,rm}.d/ directories that will be called on
-# package install and removal.
-
-set -e
-
-# Some variables and settings used throughout the script
-version="$VERSION.$PATCHLEVEL.$SUBLEVEL$EXTRAVERSION"
-tmpdir="$objtree/debian/tmp"
-
-# Setup the directory structure
-rm -rf "$tmpdir"
-mkdir -p "$tmpdir/DEBIAN" "$tmpdir/lib" "$tmpdir/boot"
-
-# Build and install the kernel
-cp System.map "$tmpdir/boot/System.map-$version"
-cp .config "$tmpdir/boot/config-$version"
-cp $KBUILD_IMAGE "$tmpdir/boot/vmlinuz-$version"
-
-if grep -q '^CONFIG_MODULES=y' .config ; then
-       INSTALL_MOD_PATH="$tmpdir" make modules_install
-fi
-
-# Install the maintainer scripts
-for script in postinst postrm preinst prerm ; do
-       mkdir -p "$tmpdir/etc/kernel/$script.d"
-       cat <<EOF > "$tmpdir/DEBIAN/$script"
-#!/bin/sh
-
-set -e
-
-test -d /etc/kernel/$script.d && run-parts --arg="$version" /etc/kernel/$script.d
-exit 0
-EOF
-       chmod 755 "$tmpdir/DEBIAN/$script"
-done
-
-name="Kernel Compiler <$(id -nu)@$(hostname -f)>"
-# Generate a simple changelog template
-cat <<EOF > debian/changelog
-linux ($version) unstable; urgency=low
-
-  * A standard release
-
- -- $name  $(date -R)
-EOF
-
-# Generate a control file
-cat <<EOF > debian/control
-Source: linux
-Section: base
-Priority: optional
-Maintainer: $name
-Standards-Version: 3.6.1
-
-Package: linux-$version
-Architecture: any
-Description: Linux kernel, version $version
- This package contains the Linux kernel, modules and corresponding other
- files version $version.
-EOF
-
-# Fix some ownership and permissions
-chown -R root:root "$tmpdir"
-chmod -R go-w "$tmpdir"
-
-# Perform the final magic
-dpkg-gencontrol -isp
-dpkg --build "$tmpdir" ..
-
-exit 0
-
diff --git a/scripts/package/mkspec b/scripts/package/mkspec
deleted file mode 100644 (file)
index 3ecfc23..0000000
+++ /dev/null
@@ -1,63 +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>
-#
-
-# 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 && make"
-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'
-echo 'cp $KBUILD_IMAGE $RPM_BUILD_ROOT'"/boot/vmlinuz-$VERSION.$PATCHLEVEL.$SUBLEVEL$EXTRAVERSION"
-
-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/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